aboutsummaryrefslogtreecommitdiff
path: root/packages/ncurses/6.5/ncurses-6.5-20240817.patch
diff options
context:
space:
mode:
Diffstat (limited to 'packages/ncurses/6.5/ncurses-6.5-20240817.patch')
-rw-r--r--packages/ncurses/6.5/ncurses-6.5-20240817.patch42091
1 files changed, 42091 insertions, 0 deletions
diff --git a/packages/ncurses/6.5/ncurses-6.5-20240817.patch b/packages/ncurses/6.5/ncurses-6.5-20240817.patch
new file mode 100644
index 00000000..55fe610c
--- /dev/null
+++ b/packages/ncurses/6.5/ncurses-6.5-20240817.patch
@@ -0,0 +1,42091 @@
+# ncurses 6.5 - patch 20240817 - 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-20240817.patch.gz
+# patch by Thomas E. Dickey <dickey@invisible-island.net>
+# created Sat Aug 17 23:27:01 UTC 2024
+# ------------------------------------------------------------------------------
+# Ada95/Makefile.in | 16
+# Ada95/aclocal.m4 | 36
+# Ada95/configure | 2992 ++++++++++-----------
+# Ada95/configure.in | 19
+# Ada95/doc/Makefile.in | 8
+# Ada95/gen/Makefile.in | 12
+# Ada95/samples/Makefile.in | 8
+# Ada95/src/Makefile.in | 6
+# INSTALL | 8
+# NEWS | 11
+# VERSION | 2
+# aclocal.m4 | 86
+# c++/Makefile.in | 10
+# configure | 5140 ++++++++++++++++++-------------------
+# configure.in | 21
+# dist.mk | 4
+# form/Makefile.in | 12
+# include/Makefile.in | 6
+# man/Makefile.in | 13
+# menu/Makefile.in | 12
+# misc/Makefile.in | 28
+# misc/terminfo.src | 63
+# mk-1st.awk | 70
+# ncurses/Makefile.in | 10
+# 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
+# panel/Makefile.in | 12
+# progs/Makefile.in | 55
+# test/Makefile.in | 12
+# test/aclocal.m4 | 36
+# test/configure | 3922 ++++++++++++++--------------
+# test/configure.in | 3
+# 37 files changed, 6455 insertions(+), 6200 deletions(-)
+# ------------------------------------------------------------------------------
+Index: Ada95/Makefile.in
+Prereq: 1.30
+--- ncurses-6.5-20240810+/Ada95/Makefile.in 2022-12-17 23:33:33.000000000 +0000
++++ ncurses-6.5-20240817/Ada95/Makefile.in 2024-08-11 00:24:28.000000000 +0000
+@@ -1,6 +1,6 @@
+-# $Id: Makefile.in,v 1.30 2022/12/17 23:33:33 tom Exp $
++# $Id: Makefile.in,v 1.31 2024/08/11 00:24:28 tom Exp $
+ ##############################################################################
+-# Copyright 2020-2021,2022 Thomas E. Dickey #
++# Copyright 2020-2022,2024 Thomas E. Dickey #
+ # Copyright 1998-2010,2015 Free Software Foundation, Inc. #
+ # #
+ # Permission is hereby granted, free of charge, to any person obtaining a #
+@@ -31,7 +31,7 @@
+ # Author: Juergen Pfeifer, 1996
+ #
+ # Version Control
+-# $Revision: 1.30 $
++# $Revision: 1.31 $
+ #
+ SHELL = @SHELL@
+ VPATH = @srcdir@
+@@ -47,12 +47,12 @@
+ libexecdir = @libexecdir@
+ includedir = @includedir@
+
+-BINDIR = $(DESTDIR)$(bindir)
+-DATADIR = $(DESTDIR)$(datadir)
+-LIBDIR = $(DESTDIR)$(libdir)
+-LIBEXECDIR = $(DESTDIR)$(libexecdir)
++BINDIR = $(DESTDIR)$(bindir@MERGE_PREFIX@)
++DATADIR = $(DESTDIR)$(datadir@MERGE_PREFIX@)
++LIBDIR = $(DESTDIR)$(libdir@MERGE_PREFIX@)
++LIBEXECDIR = $(DESTDIR)$(libexecdir@MERGE_PREFIX@)
+
+-SUBDIRS = @ADA_SUBDIRS@
++SUBDIRS = @ADA_SUBDIRS@
+
+ INSTALL = @INSTALL@ @INSTALL_OPT_O@
+ INSTALL_SCRIPT = @INSTALL@
+Index: Ada95/aclocal.m4
+Prereq: 1.220
+--- ncurses-6.5-20240810+/Ada95/aclocal.m4 2024-08-10 15:52:30.000000000 +0000
++++ ncurses-6.5-20240817/Ada95/aclocal.m4 2024-08-11 00:23:05.000000000 +0000
+@@ -29,7 +29,7 @@
+ dnl
+ dnl Author: Thomas E. Dickey
+ dnl
+-dnl $Id: aclocal.m4,v 1.220 2024/08/10 15:52:30 tom Exp $
++dnl $Id: aclocal.m4,v 1.221 2024/08/11 00:23:05 tom Exp $
+ dnl Macros used in NCURSES Ada95 auto-configuration script.
+ dnl
+ dnl These macros are maintained separately from NCURSES. The copyright on
+@@ -2265,6 +2265,40 @@
+ AC_SUBST(INSTALL_OPT_S)
+ ])dnl
+ dnl ---------------------------------------------------------------------------
++dnl CF_INSTALL_PREFIX version: 1 updated: 2024/08/10 20:16:32
++dnl -----------------
++dnl Special option for use by system-builders: the install-prefix is used to
++dnl adjust the location into which the actual install is done, so that an
++dnl archive can be built without modifying the host system's configuration.
++AC_DEFUN([CF_INSTALL_PREFIX],[
++AC_MSG_CHECKING(for an installation directory prefix)
++AC_ARG_WITH(install-prefix,
++ [ --with-install-prefix=DESTDIR use DESTDIR as installation directory prefix],
++ [case "x$withval" in
++ (xyes|xno)
++ ;;
++ (*) DESTDIR="$withval"
++ ;;
++ esac])
++AC_MSG_RESULT([${DESTDIR:-(none)}])
++AC_SUBST(DESTDIR)
++
++AC_MSG_CHECKING(if installation directory prefix should be merged)
++CF_ARG_ENABLE(install-prefix,
++ [ --enable-install-prefix merge DESTDIR with installation prefix],
++ cf_install_prefix=yes,
++ cf_install_prefix=no)
++AC_MSG_RESULT($cf_install_prefix)
++
++if test "$cf_install_prefix" = yes ; then
++ MERGE_PREFIX=':$(prefix)%=%'
++else
++ MERGE_PREFIX=''
++fi
++
++AC_SUBST(MERGE_PREFIX)
++])dnl
++dnl ---------------------------------------------------------------------------
+ dnl CF_INTEL_COMPILER version: 9 updated: 2023/02/18 17:41:25
+ dnl -----------------
+ dnl Check if the given compiler is really the Intel compiler for Linux. It
+Index: Ada95/configure
+--- ncurses-6.5-20240810+/Ada95/configure 2024-08-03 17:38:14.000000000 +0000
++++ ncurses-6.5-20240817/Ada95/configure 2024-08-11 00:23:38.000000000 +0000
+@@ -1,5 +1,5 @@
+ #! /bin/sh
+-# From configure.in Revision: 1.93 .
++# From configure.in Revision: 1.94 .
+ # Guess values for system-dependent variables and create Makefiles.
+ # Generated by Autoconf 2.52.20240618.
+ #
+@@ -714,7 +714,8 @@
+ --with-pkg-config-libdir[=XXX] use given directory for installing pc-files
+ --without-tests suppress build with test-programs
+ --enable-mixed-case tic should assume mixed-case filenames
+- --with-install-prefix prefixes actual install-location ($DESTDIR)
++ --with-install-prefix=DESTDIR use DESTDIR as installation directory prefix
++ --enable-install-prefix merge DESTDIR with installation prefix
+ Build-Tools Needed to Compile Temporary Applications for Cross-compiling:
+ --with-build-cc=XXX the build C compiler ($BUILD_CC)
+ --with-build-cpp=XXX the build C preprocessor ($BUILD_CPP)
+@@ -952,7 +953,7 @@
+ fi
+ for ac_site_file in $CONFIG_SITE; do
+ if test -r "$ac_site_file"; then
+- { echo "$as_me:955: loading site script $ac_site_file" >&5
++ { echo "$as_me:956: 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"
+@@ -963,7 +964,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:966: loading cache $cache_file" >&5
++ { echo "$as_me:967: loading cache $cache_file" >&5
+ echo "$as_me: loading cache $cache_file" >&6;}
+ case $cache_file in
+ [\\/]* | ?:[\\/]* ) . $cache_file;;
+@@ -971,7 +972,7 @@
+ esac
+ fi
+ else
+- { echo "$as_me:974: creating cache $cache_file" >&5
++ { echo "$as_me:975: creating cache $cache_file" >&5
+ echo "$as_me: creating cache $cache_file" >&6;}
+ >$cache_file
+ fi
+@@ -987,21 +988,21 @@
+ eval ac_new_val="\$ac_env_${ac_var}_value"
+ case "$ac_old_set,$ac_new_set" in
+ set,)
+- { echo "$as_me:990: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
++ { echo "$as_me:991: 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:994: error: \`$ac_var' was not set in the previous run" >&5
++ { echo "$as_me:995: 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:1000: error: \`$ac_var' has changed since the previous run:" >&5
++ { echo "$as_me:1001: 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:1002: former value: $ac_old_val" >&5
++ { echo "$as_me:1003: former value: $ac_old_val" >&5
+ echo "$as_me: former value: $ac_old_val" >&2;}
+- { echo "$as_me:1004: current value: $ac_new_val" >&5
++ { echo "$as_me:1005: current value: $ac_new_val" >&5
+ echo "$as_me: current value: $ac_new_val" >&2;}
+ ac_cache_corrupted=:
+ fi;;
+@@ -1020,9 +1021,9 @@
+ fi
+ done
+ if "$ac_cache_corrupted"; then
+- { echo "$as_me:1023: error: changes in the environment can compromise the build" >&5
++ { echo "$as_me:1024: 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:1025: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5
++ { { echo "$as_me:1026: 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
+@@ -1051,10 +1052,10 @@
+ echo "#! $SHELL" >conftest.sh
+ echo "exit 0" >>conftest.sh
+ chmod +x conftest.sh
+-if { (echo "$as_me:1054: PATH=\".;.\"; conftest.sh") >&5
++if { (echo "$as_me:1055: PATH=\".;.\"; conftest.sh") >&5
+ (PATH=".;."; conftest.sh) 2>&5
+ ac_status=$?
+- echo "$as_me:1057: \$? = $ac_status" >&5
++ echo "$as_me:1058: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; then
+ ac_path_separator=';'
+ else
+@@ -1086,7 +1087,7 @@
+ fi
+ done
+ if test -z "$ac_aux_dir"; then
+- { { echo "$as_me:1089: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&5
++ { { echo "$as_me:1090: 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
+@@ -1096,11 +1097,11 @@
+
+ # Make sure we can run config.sub.
+ $ac_config_sub sun4 >/dev/null 2>&1 ||
+- { { echo "$as_me:1099: error: cannot run $ac_config_sub" >&5
++ { { echo "$as_me:1100: error: cannot run $ac_config_sub" >&5
+ echo "$as_me: error: cannot run $ac_config_sub" >&2;}
+ { (exit 1); exit 1; }; }
+
+-echo "$as_me:1103: checking build system type" >&5
++echo "$as_me:1104: 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
+@@ -1109,23 +1110,23 @@
+ test -z "$ac_cv_build_alias" &&
+ ac_cv_build_alias=`$ac_config_guess`
+ test -z "$ac_cv_build_alias" &&
+- { { echo "$as_me:1112: error: cannot guess build type; you must specify one" >&5
++ { { echo "$as_me:1113: 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:1116: error: $ac_config_sub $ac_cv_build_alias failed." >&5
++ { { echo "$as_me:1117: 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:1121: result: $ac_cv_build" >&5
++echo "$as_me:1122: 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/'`
+
+-echo "$as_me:1128: checking host system type" >&5
++echo "$as_me:1129: 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
+@@ -1134,12 +1135,12 @@
+ 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:1137: error: $ac_config_sub $ac_cv_host_alias failed" >&5
++ { { echo "$as_me:1138: 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:1142: result: $ac_cv_host" >&5
++echo "$as_me:1143: 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/'`
+@@ -1147,7 +1148,7 @@
+ 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:1150: checking target system type" >&5
++ echo "$as_me:1151: 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
+@@ -1156,12 +1157,12 @@
+ 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:1159: error: $ac_config_sub $ac_cv_target_alias failed" >&5
++ { { echo "$as_me:1160: 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:1164: result: $ac_cv_target" >&5
++echo "$as_me:1165: 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/'`
+@@ -1193,13 +1194,13 @@
+ fi
+
+ test -z "$system_name" && system_name="$cf_cv_system_name"
+-test -n "$cf_cv_system_name" && echo "$as_me:1196: result: Configuring for $cf_cv_system_name" >&5
++test -n "$cf_cv_system_name" && echo "$as_me:1197: 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:1200: result: Cached system name ($system_name) does not agree with actual ($cf_cv_system_name)" >&5
++ echo "$as_me:1201: 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:1202: error: \"Please remove config.cache and try again.\"" >&5
++ { { echo "$as_me:1203: 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
+@@ -1207,7 +1208,7 @@
+ # 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:1210: WARNING: overriding system type to $withval" >&5
++ { echo "$as_me:1211: 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
+@@ -1222,7 +1223,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:1225: checking for $ac_word" >&5
++echo "$as_me:1226: 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
+@@ -1237,7 +1238,7 @@
+ test -z "$ac_dir" && ac_dir=.
+ $as_executable_p "$ac_dir/$ac_word" || continue
+ ac_cv_prog_GREP="$ac_prog"
+-echo "$as_me:1240: found $ac_dir/$ac_word" >&5
++echo "$as_me:1241: found $ac_dir/$ac_word" >&5
+ break
+ done
+
+@@ -1245,10 +1246,10 @@
+ fi
+ GREP=$ac_cv_prog_GREP
+ if test -n "$GREP"; then
+- echo "$as_me:1248: result: $GREP" >&5
++ echo "$as_me:1249: result: $GREP" >&5
+ echo "${ECHO_T}$GREP" >&6
+ else
+- echo "$as_me:1251: result: no" >&5
++ echo "$as_me:1252: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+
+@@ -1256,7 +1257,7 @@
+ done
+ test -n "$GREP" || GREP=": "
+
+-echo "$as_me:1259: checking for fgrep" >&5
++echo "$as_me:1260: 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
+@@ -1268,7 +1269,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:1271: 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_path_FGREP+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -1285,7 +1286,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:1288: found $ac_dir/$ac_word" >&5
++ echo "$as_me:1289: found $ac_dir/$ac_word" >&5
+ break
+ fi
+ done
+@@ -1296,10 +1297,10 @@
+ FGREP=$ac_cv_path_FGREP
+
+ if test -n "$FGREP"; then
+- echo "$as_me:1299: result: $FGREP" >&5
++ echo "$as_me:1300: result: $FGREP" >&5
+ echo "${ECHO_T}$FGREP" >&6
+ else
+- echo "$as_me:1302: result: no" >&5
++ echo "$as_me:1303: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+
+@@ -1307,16 +1308,16 @@
+ done
+ test -n "$FGREP" || FGREP=": "
+
+- test "x$ac_cv_path_FGREP" = "x:" && { { echo "$as_me:1310: error: cannot find workable fgrep" >&5
++ test "x$ac_cv_path_FGREP" = "x:" && { { echo "$as_me:1311: error: cannot find workable fgrep" >&5
+ echo "$as_me: error: cannot find workable fgrep" >&2;}
+ { (exit 1); exit 1; }; }
+ fi
+ fi
+-echo "$as_me:1315: result: $ac_cv_path_FGREP" >&5
++echo "$as_me:1316: result: $ac_cv_path_FGREP" >&5
+ echo "${ECHO_T}$ac_cv_path_FGREP" >&6
+ FGREP="$ac_cv_path_FGREP"
+
+-echo "$as_me:1319: checking for prefix" >&5
++echo "$as_me:1320: checking for prefix" >&5
+ echo $ECHO_N "checking for prefix... $ECHO_C" >&6
+ if test "x$prefix" = "xNONE" ; then
+ case "$cf_cv_system_name" in
+@@ -1328,11 +1329,11 @@
+ ;;
+ esac
+ fi
+-echo "$as_me:1331: result: $prefix" >&5
++echo "$as_me:1332: result: $prefix" >&5
+ echo "${ECHO_T}$prefix" >&6
+
+ if test "x$prefix" = "xNONE" ; then
+-echo "$as_me:1335: checking for default include-directory" >&5
++echo "$as_me:1336: checking for default include-directory" >&5
+ echo $ECHO_N "checking for default include-directory... $ECHO_C" >&6
+ test -n "$verbose" && echo 1>&6
+ for cf_symbol in \
+@@ -1355,7 +1356,7 @@
+ fi
+ test -n "$verbose" && echo " tested $cf_dir" 1>&6
+ done
+-echo "$as_me:1358: result: $includedir" >&5
++echo "$as_me:1359: result: $includedir" >&5
+ echo "${ECHO_T}$includedir" >&6
+ fi
+
+@@ -1382,7 +1383,7 @@
+ unset cf_TEMP_gnat
+ # Extract the first word of "$cf_prog_gnat", so it can be a program name with args.
+ set dummy $cf_prog_gnat; ac_word=$2
+-echo "$as_me:1385: checking for $ac_word" >&5
++echo "$as_me:1386: checking for $ac_word" >&5
+ echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+ if test "${ac_cv_path_cf_TEMP_gnat+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -1399,7 +1400,7 @@
+ test -z "$ac_dir" && ac_dir=.
+ if $as_executable_p "$ac_dir/$ac_word"; then
+ ac_cv_path_cf_TEMP_gnat="$ac_dir/$ac_word"
+- echo "$as_me:1402: found $ac_dir/$ac_word" >&5
++ echo "$as_me:1403: found $ac_dir/$ac_word" >&5
+ break
+ fi
+ done
+@@ -1411,10 +1412,10 @@
+ cf_TEMP_gnat=$ac_cv_path_cf_TEMP_gnat
+
+ if test -n "$cf_TEMP_gnat"; then
+- echo "$as_me:1414: result: $cf_TEMP_gnat" >&5
++ echo "$as_me:1415: result: $cf_TEMP_gnat" >&5
+ echo "${ECHO_T}$cf_TEMP_gnat" >&6
+ else
+- echo "$as_me:1417: result: no" >&5
++ echo "$as_me:1418: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+
+@@ -1424,7 +1425,7 @@
+ unset cf_cv_gnat_version
+ unset cf_TEMP_gnat
+
+-echo "$as_me:1427: checking for $cf_prog_gnat version" >&5
++echo "$as_me:1428: checking for $cf_prog_gnat version" >&5
+ echo $ECHO_N "checking for $cf_prog_gnat version... $ECHO_C" >&6
+ if test "${cf_cv_gnat_version+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -1435,7 +1436,7 @@
+ sed -e '2,$d' -e 's/[^0-9 \.]//g' -e 's/^[ ]*//' -e 's/ .*//'`
+
+ fi
+-echo "$as_me:1438: result: $cf_cv_gnat_version" >&5
++echo "$as_me:1439: result: $cf_cv_gnat_version" >&5
+ echo "${ECHO_T}$cf_cv_gnat_version" >&6
+ test -z "$cf_cv_gnat_version" && cf_cv_gnat_version=no
+ eval cf_TEMP_gnat=$cf_cv_gnat_version; unset cf_cv_gnat_version
+@@ -1464,7 +1465,7 @@
+ cd conftest.src
+ for cf_gprconfig in Ada C
+ do
+- echo "$as_me:1467: checking for gprconfig name for $cf_gprconfig" >&5
++ echo "$as_me:1468: checking for gprconfig name for $cf_gprconfig" >&5
+ echo $ECHO_N "checking for gprconfig name for $cf_gprconfig... $ECHO_C" >&6
+ if test "$cf_gprconfig" = C
+ then
+@@ -1483,10 +1484,10 @@
+ if test -n "$cf_gprconfig_value"
+ then
+ eval "cf_ada_config_$cf_gprconfig=$cf_gprconfig_value"
+- echo "$as_me:1486: result: $cf_gprconfig_value" >&5
++ echo "$as_me:1487: result: $cf_gprconfig_value" >&5
+ echo "${ECHO_T}$cf_gprconfig_value" >&6
+ else
+- echo "$as_me:1489: result: missing" >&5
++ echo "$as_me:1490: result: missing" >&5
+ echo "${ECHO_T}missing" >&6
+ cf_ada_config="#"
+ break
+@@ -1499,7 +1500,7 @@
+ if test "x$cf_ada_config" != "x#"
+ then
+
+-echo "$as_me:1502: checking for gnat version" >&5
++echo "$as_me:1503: checking for gnat version" >&5
+ echo $ECHO_N "checking for gnat version... $ECHO_C" >&6
+ if test "${cf_cv_gnat_version+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -1510,7 +1511,7 @@
+ sed -e '2,$d' -e 's/[^0-9 \.]//g' -e 's/^[ ]*//' -e 's/ .*//'`
+
+ fi
+-echo "$as_me:1513: result: $cf_cv_gnat_version" >&5
++echo "$as_me:1514: result: $cf_cv_gnat_version" >&5
+ echo "${ECHO_T}$cf_cv_gnat_version" >&6
+ test -z "$cf_cv_gnat_version" && cf_cv_gnat_version=no
+
+@@ -1519,7 +1520,7 @@
+ cf_cv_prog_gnat_correct=yes
+ ;;
+ (*)
+- { echo "$as_me:1522: WARNING: Unsupported GNAT version $cf_cv_gnat_version. We require 3.11 or better. Disabling Ada95 binding." >&5
++ { echo "$as_me:1523: WARNING: Unsupported GNAT version $cf_cv_gnat_version. We require 3.11 or better. Disabling Ada95 binding." >&5
+ echo "$as_me: WARNING: Unsupported GNAT version $cf_cv_gnat_version. We require 3.11 or better. Disabling Ada95 binding." >&2;}
+ cf_cv_prog_gnat_correct=no
+ ;;
+@@ -1527,7 +1528,7 @@
+
+ # Extract the first word of "m4", so it can be a program name with args.
+ set dummy m4; ac_word=$2
+-echo "$as_me:1530: checking for $ac_word" >&5
++echo "$as_me:1531: checking for $ac_word" >&5
+ echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+ if test "${ac_cv_prog_M4_exists+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -1542,7 +1543,7 @@
+ test -z "$ac_dir" && ac_dir=.
+ $as_executable_p "$ac_dir/$ac_word" || continue
+ ac_cv_prog_M4_exists="yes"
+-echo "$as_me:1545: found $ac_dir/$ac_word" >&5
++echo "$as_me:1546: found $ac_dir/$ac_word" >&5
+ break
+ done
+
+@@ -1551,20 +1552,20 @@
+ fi
+ M4_exists=$ac_cv_prog_M4_exists
+ if test -n "$M4_exists"; then
+- echo "$as_me:1554: result: $M4_exists" >&5
++ echo "$as_me:1555: result: $M4_exists" >&5
+ echo "${ECHO_T}$M4_exists" >&6
+ else
+- echo "$as_me:1557: result: no" >&5
++ echo "$as_me:1558: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+
+ if test "$ac_cv_prog_M4_exists" = no; then
+ cf_cv_prog_gnat_correct=no
+- { echo "$as_me:1563: WARNING: Ada95 binding required program m4 not found. Ada95 binding disabled" >&5
++ { echo "$as_me:1564: WARNING: Ada95 binding required program m4 not found. Ada95 binding disabled" >&5
+ echo "$as_me: WARNING: Ada95 binding required program m4 not found. Ada95 binding disabled" >&2;}
+ fi
+ if test "$cf_cv_prog_gnat_correct" = yes; then
+- echo "$as_me:1567: checking if GNAT works" >&5
++ echo "$as_me:1568: checking if GNAT works" >&5
+ echo $ECHO_N "checking if GNAT works... $ECHO_C" >&6
+
+ rm -rf ./conftest* ./*~conftest*
+@@ -1592,7 +1593,7 @@
+ fi
+ rm -rf ./conftest* ./*~conftest*
+
+- echo "$as_me:1595: result: $cf_cv_prog_gnat_correct" >&5
++ echo "$as_me:1596: result: $cf_cv_prog_gnat_correct" >&5
+ echo "${ECHO_T}$cf_cv_prog_gnat_correct" >&6
+ fi
+ else
+@@ -1608,7 +1609,7 @@
+ # Here is a workaround.
+ # Extract the first word of "gnatgcc", so it can be a program name with args.
+ set dummy gnatgcc; ac_word=$2
+-echo "$as_me:1611: checking for $ac_word" >&5
++echo "$as_me:1612: checking for $ac_word" >&5
+ echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+ if test "${ac_cv_path_cf_cv_path_gnatgcc+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -1625,7 +1626,7 @@
+ test -z "$ac_dir" && ac_dir=.
+ if $as_executable_p "$ac_dir/$ac_word"; then
+ ac_cv_path_cf_cv_path_gnatgcc="$ac_dir/$ac_word"
+- echo "$as_me:1628: found $ac_dir/$ac_word" >&5
++ echo "$as_me:1629: found $ac_dir/$ac_word" >&5
+ break
+ fi
+ done
+@@ -1637,16 +1638,16 @@
+ cf_cv_path_gnatgcc=$ac_cv_path_cf_cv_path_gnatgcc
+
+ if test -n "$cf_cv_path_gnatgcc"; then
+- echo "$as_me:1640: result: $cf_cv_path_gnatgcc" >&5
++ echo "$as_me:1641: result: $cf_cv_path_gnatgcc" >&5
+ echo "${ECHO_T}$cf_cv_path_gnatgcc" >&6
+ else
+- echo "$as_me:1643: result: no" >&5
++ echo "$as_me:1644: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+
+ if test "$cf_cv_path_gnatgcc" != no
+ then
+- echo "$as_me:1649: checking for improvement" >&5
++ echo "$as_me:1650: checking for improvement" >&5
+ echo $ECHO_N "checking for improvement... $ECHO_C" >&6
+ cf_file_gnatgcc=`file -L "$cf_cv_path_gnatgcc" 2>/dev/null`
+ case "x$cf_file_gnatgcc" in
+@@ -1657,7 +1658,7 @@
+ cf_cv_path_gnatgcc=no
+ ;;
+ esac
+- echo "$as_me:1660: result: $cf_cv_path_gnatgcc" >&5
++ echo "$as_me:1661: result: $cf_cv_path_gnatgcc" >&5
+ echo "${ECHO_T}$cf_cv_path_gnatgcc" >&6
+ test "$cf_cv_path_gnatgcc" = no && cf_cv_path_gnatgcc=gnatgcc
+ cf_prog_cc="$cf_cv_path_gnatgcc $cf_prog_cc"
+@@ -1682,7 +1683,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:1685: checking for $ac_word" >&5
++echo "$as_me:1686: 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
+@@ -1697,7 +1698,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:1700: found $ac_dir/$ac_word" >&5
++echo "$as_me:1701: found $ac_dir/$ac_word" >&5
+ break
+ done
+
+@@ -1705,10 +1706,10 @@
+ fi
+ CC=$ac_cv_prog_CC
+ if test -n "$CC"; then
+- echo "$as_me:1708: result: $CC" >&5
++ echo "$as_me:1709: result: $CC" >&5
+ echo "${ECHO_T}$CC" >&6
+ else
+- echo "$as_me:1711: result: no" >&5
++ echo "$as_me:1712: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+
+@@ -1721,7 +1722,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:1724: checking for $ac_word" >&5
++echo "$as_me:1725: 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
+@@ -1736,7 +1737,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:1739: found $ac_dir/$ac_word" >&5
++echo "$as_me:1740: found $ac_dir/$ac_word" >&5
+ break
+ done
+
+@@ -1744,10 +1745,10 @@
+ fi
+ ac_ct_CC=$ac_cv_prog_ac_ct_CC
+ if test -n "$ac_ct_CC"; then
+- echo "$as_me:1747: result: $ac_ct_CC" >&5
++ echo "$as_me:1748: result: $ac_ct_CC" >&5
+ echo "${ECHO_T}$ac_ct_CC" >&6
+ else
+- echo "$as_me:1750: result: no" >&5
++ echo "$as_me:1751: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+
+@@ -1757,32 +1758,32 @@
+ CC=$ac_ct_CC
+ fi
+
+-test -z "$CC" && { { echo "$as_me:1760: error: no acceptable cc found in \$PATH" >&5
++test -z "$CC" && { { echo "$as_me:1761: 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:1765:" \
++echo "$as_me:1766:" \
+ "checking for C compiler version" >&5
+ ac_compiler=`set X $ac_compile; echo "$2"`
+-{ (eval echo "$as_me:1768: \"$ac_compiler --version </dev/null >&5\"") >&5
++{ (eval echo "$as_me:1769: \"$ac_compiler --version </dev/null >&5\"") >&5
+ (eval $ac_compiler --version </dev/null >&5) 2>&5
+ ac_status=$?
+- echo "$as_me:1771: \$? = $ac_status" >&5
++ echo "$as_me:1772: \$? = $ac_status" >&5
+ (exit "$ac_status"); }
+-{ (eval echo "$as_me:1773: \"$ac_compiler -v </dev/null >&5\"") >&5
++{ (eval echo "$as_me:1774: \"$ac_compiler -v </dev/null >&5\"") >&5
+ (eval $ac_compiler -v </dev/null >&5) 2>&5
+ ac_status=$?
+- echo "$as_me:1776: \$? = $ac_status" >&5
++ echo "$as_me:1777: \$? = $ac_status" >&5
+ (exit "$ac_status"); }
+-{ (eval echo "$as_me:1778: \"$ac_compiler -V </dev/null >&5\"") >&5
++{ (eval echo "$as_me:1779: \"$ac_compiler -V </dev/null >&5\"") >&5
+ (eval $ac_compiler -V </dev/null >&5) 2>&5
+ ac_status=$?
+- echo "$as_me:1781: \$? = $ac_status" >&5
++ echo "$as_me:1782: \$? = $ac_status" >&5
+ (exit "$ac_status"); }
+
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 1785 "configure"
++#line 1786 "configure"
+ #include "confdefs.h"
+
+ int
+@@ -1798,13 +1799,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:1801: checking for C compiler default output" >&5
++echo "$as_me:1802: 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:1804: \"$ac_link_default\"") >&5
++if { (eval echo "$as_me:1805: \"$ac_link_default\"") >&5
+ (eval $ac_link_default) 2>&5
+ ac_status=$?
+- echo "$as_me:1807: \$? = $ac_status" >&5
++ echo "$as_me:1808: \$? = $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
+@@ -1827,34 +1828,34 @@
+ else
+ echo "$as_me: failed program was:" >&5
+ cat "conftest.$ac_ext" >&5
+-{ { echo "$as_me:1830: error: C compiler cannot create executables" >&5
++{ { echo "$as_me:1831: 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:1836: result: $ac_file" >&5
++echo "$as_me:1837: 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:1841: checking whether the C compiler works" >&5
++echo "$as_me:1842: 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:1847: \"$ac_try\"") >&5
++ { (eval echo "$as_me:1848: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:1850: \$? = $ac_status" >&5
++ echo "$as_me:1851: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cross_compiling=no
+ else
+ if test "$cross_compiling" = maybe; then
+ cross_compiling=yes
+ else
+- { { echo "$as_me:1857: error: cannot run C compiled programs.
++ { { echo "$as_me:1858: 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;}
+@@ -1862,24 +1863,24 @@
+ fi
+ fi
+ fi
+-echo "$as_me:1865: result: yes" >&5
++echo "$as_me:1866: 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:1872: checking whether we are cross compiling" >&5
++echo "$as_me:1873: checking whether we are cross compiling" >&5
+ echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6
+-echo "$as_me:1874: result: $cross_compiling" >&5
++echo "$as_me:1875: result: $cross_compiling" >&5
+ echo "${ECHO_T}$cross_compiling" >&6
+
+-echo "$as_me:1877: checking for executable suffix" >&5
++echo "$as_me:1878: checking for executable suffix" >&5
+ echo $ECHO_N "checking for executable suffix... $ECHO_C" >&6
+-if { (eval echo "$as_me:1879: \"$ac_link\"") >&5
++if { (eval echo "$as_me:1880: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:1882: \$? = $ac_status" >&5
++ echo "$as_me:1883: \$? = $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
+@@ -1895,25 +1896,25 @@
+ esac
+ done
+ else
+- { { echo "$as_me:1898: error: cannot compute EXEEXT: cannot compile and link" >&5
++ { { echo "$as_me:1899: 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:1904: result: $ac_cv_exeext" >&5
++echo "$as_me:1905: 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:1910: checking for object suffix" >&5
++echo "$as_me:1911: 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 1916 "configure"
++#line 1917 "configure"
+ #include "confdefs.h"
+
+ int
+@@ -1925,10 +1926,10 @@
+ }
+ _ACEOF
+ rm -f conftest.o conftest.obj
+-if { (eval echo "$as_me:1928: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:1929: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:1931: \$? = $ac_status" >&5
++ echo "$as_me:1932: \$? = $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
+@@ -1940,24 +1941,24 @@
+ else
+ echo "$as_me: failed program was:" >&5
+ cat "conftest.$ac_ext" >&5
+-{ { echo "$as_me:1943: error: cannot compute OBJEXT: cannot compile" >&5
++{ { echo "$as_me:1944: 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:1950: result: $ac_cv_objext" >&5
++echo "$as_me:1951: result: $ac_cv_objext" >&5
+ echo "${ECHO_T}$ac_cv_objext" >&6
+ OBJEXT=$ac_cv_objext
+ ac_objext=$OBJEXT
+-echo "$as_me:1954: checking whether we are using the GNU C compiler" >&5
++echo "$as_me:1955: 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 1960 "configure"
++#line 1961 "configure"
+ #include "confdefs.h"
+
+ int
+@@ -1972,16 +1973,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:1975: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:1976: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:1978: \$? = $ac_status" >&5
++ echo "$as_me:1979: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:1981: \"$ac_try\"") >&5
++ { (eval echo "$as_me:1982: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:1984: \$? = $ac_status" >&5
++ echo "$as_me:1985: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_compiler_gnu=yes
+ else
+@@ -1993,19 +1994,19 @@
+ ac_cv_c_compiler_gnu=$ac_compiler_gnu
+
+ fi
+-echo "$as_me:1996: result: $ac_cv_c_compiler_gnu" >&5
++echo "$as_me:1997: 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:2002: checking whether $CC accepts -g" >&5
++echo "$as_me:2003: 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 2008 "configure"
++#line 2009 "configure"
+ #include "confdefs.h"
+
+ int
+@@ -2017,16 +2018,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:2020: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:2021: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:2023: \$? = $ac_status" >&5
++ echo "$as_me:2024: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:2026: \"$ac_try\"") >&5
++ { (eval echo "$as_me:2027: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:2029: \$? = $ac_status" >&5
++ echo "$as_me:2030: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_prog_cc_g=yes
+ else
+@@ -2036,7 +2037,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:2039: result: $ac_cv_prog_cc_g" >&5
++echo "$as_me:2040: 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
+@@ -2063,16 +2064,16 @@
+ #endif
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:2066: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:2067: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:2069: \$? = $ac_status" >&5
++ echo "$as_me:2070: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:2072: \"$ac_try\"") >&5
++ { (eval echo "$as_me:2073: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:2075: \$? = $ac_status" >&5
++ echo "$as_me:2076: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ for ac_declaration in \
+ ''\
+@@ -2084,7 +2085,7 @@
+ 'void exit (int);'
+ do
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 2087 "configure"
++#line 2088 "configure"
+ #include "confdefs.h"
+ #include <stdlib.h>
+ $ac_declaration
+@@ -2097,16 +2098,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:2100: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:2101: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:2103: \$? = $ac_status" >&5
++ echo "$as_me:2104: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:2106: \"$ac_try\"") >&5
++ { (eval echo "$as_me:2107: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:2109: \$? = $ac_status" >&5
++ echo "$as_me:2110: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ :
+ else
+@@ -2116,7 +2117,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 2119 "configure"
++#line 2120 "configure"
+ #include "confdefs.h"
+ $ac_declaration
+ int
+@@ -2128,16 +2129,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:2131: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:2132: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:2134: \$? = $ac_status" >&5
++ echo "$as_me:2135: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:2137: \"$ac_try\"") >&5
++ { (eval echo "$as_me:2138: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:2140: \$? = $ac_status" >&5
++ echo "$as_me:2141: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ break
+ else
+@@ -2167,11 +2168,11 @@
+
+ GCC_VERSION=none
+ if test "$GCC" = yes ; then
+- echo "$as_me:2170: checking version of $CC" >&5
++ echo "$as_me:2171: 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:2174: result: $GCC_VERSION" >&5
++ echo "$as_me:2175: result: $GCC_VERSION" >&5
+ echo "${ECHO_T}$GCC_VERSION" >&6
+ fi
+
+@@ -2180,12 +2181,12 @@
+ if test "$GCC" = yes ; then
+ case "$host_os" in
+ (linux*|gnu*)
+- echo "$as_me:2183: checking if this is really Intel C compiler" >&5
++ echo "$as_me:2184: 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 2188 "configure"
++#line 2189 "configure"
+ #include "confdefs.h"
+
+ int
+@@ -2202,16 +2203,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:2205: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:2206: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:2208: \$? = $ac_status" >&5
++ echo "$as_me:2209: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:2211: \"$ac_try\"") >&5
++ { (eval echo "$as_me:2212: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:2214: \$? = $ac_status" >&5
++ echo "$as_me:2215: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ INTEL_COMPILER=yes
+ cf_save_CFLAGS="$cf_save_CFLAGS -we147"
+@@ -2222,7 +2223,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ CFLAGS="$cf_save_CFLAGS"
+- echo "$as_me:2225: result: $INTEL_COMPILER" >&5
++ echo "$as_me:2226: result: $INTEL_COMPILER" >&5
+ echo "${ECHO_T}$INTEL_COMPILER" >&6
+ ;;
+ esac
+@@ -2231,11 +2232,11 @@
+ CLANG_COMPILER=no
+
+ if test "$GCC" = yes ; then
+- echo "$as_me:2234: checking if this is really Clang C compiler" >&5
++ echo "$as_me:2235: 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 2238 "configure"
++#line 2239 "configure"
+ #include "confdefs.h"
+
+ int
+@@ -2252,16 +2253,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:2255: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:2256: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:2258: \$? = $ac_status" >&5
++ echo "$as_me:2259: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:2261: \"$ac_try\"") >&5
++ { (eval echo "$as_me:2262: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:2264: \$? = $ac_status" >&5
++ echo "$as_me:2265: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ CLANG_COMPILER=yes
+
+@@ -2271,7 +2272,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ CFLAGS="$cf_save_CFLAGS"
+- echo "$as_me:2274: result: $CLANG_COMPILER" >&5
++ echo "$as_me:2275: result: $CLANG_COMPILER" >&5
+ echo "${ECHO_T}$CLANG_COMPILER" >&6
+ fi
+
+@@ -2280,30 +2281,30 @@
+ if test "x$CLANG_COMPILER" = "xyes" ; then
+ case "$CC" in
+ (c[1-9][0-9]|*/c[1-9][0-9])
+- { echo "$as_me:2283: WARNING: replacing broken compiler alias $CC" >&5
++ { echo "$as_me:2284: 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:2290: checking version of $CC" >&5
++ echo "$as_me:2291: 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:2294: result: $CLANG_VERSION" >&5
++ echo "$as_me:2295: 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:2301: checking if option $cf_clang_opt works" >&5
++ echo "$as_me:2302: 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 2306 "configure"
++#line 2307 "configure"
+ #include "confdefs.h"
+
+ #include <stdio.h>
+@@ -2317,16 +2318,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:2320: \"$ac_link\"") >&5
++if { (eval echo "$as_me:2321: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:2323: \$? = $ac_status" >&5
++ echo "$as_me:2324: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:2326: \"$ac_try\"") >&5
++ { (eval echo "$as_me:2327: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:2329: \$? = $ac_status" >&5
++ echo "$as_me:2330: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+
+ cf_clang_optok=yes
+@@ -2337,13 +2338,13 @@
+ cf_clang_optok=no
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+- echo "$as_me:2340: result: $cf_clang_optok" >&5
++ echo "$as_me:2341: 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}:2346: testing adding option $cf_clang_opt ..." 1>&5
++echo "${as_me:-configure}:2347: testing adding option $cf_clang_opt ..." 1>&5
+
+ test -n "$CFLAGS" && CFLAGS="$CFLAGS "
+ CFLAGS="${CFLAGS}$cf_clang_opt"
+@@ -2352,7 +2353,7 @@
+ done
+ fi
+
+-echo "$as_me:2355: checking for $CC option to accept ANSI C" >&5
++echo "$as_me:2356: 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
+@@ -2360,7 +2361,7 @@
+ ac_cv_prog_cc_stdc=no
+ ac_save_CC=$CC
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 2363 "configure"
++#line 2364 "configure"
+ #include "confdefs.h"
+ #include <stdarg.h>
+ #include <stdio.h>
+@@ -2407,16 +2408,16 @@
+ do
+ CC="$ac_save_CC $ac_arg"
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:2410: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:2411: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:2413: \$? = $ac_status" >&5
++ echo "$as_me:2414: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:2416: \"$ac_try\"") >&5
++ { (eval echo "$as_me:2417: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:2419: \$? = $ac_status" >&5
++ echo "$as_me:2420: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_prog_cc_stdc=$ac_arg
+ break
+@@ -2433,10 +2434,10 @@
+
+ case "x$ac_cv_prog_cc_stdc" in
+ x|xno)
+- echo "$as_me:2436: result: none needed" >&5
++ echo "$as_me:2437: result: none needed" >&5
+ echo "${ECHO_T}none needed" >&6 ;;
+ *)
+- echo "$as_me:2439: result: $ac_cv_prog_cc_stdc" >&5
++ echo "$as_me:2440: result: $ac_cv_prog_cc_stdc" >&5
+ echo "${ECHO_T}$ac_cv_prog_cc_stdc" >&6
+ CC="$CC $ac_cv_prog_cc_stdc" ;;
+ esac
+@@ -2444,13 +2445,13 @@
+ # This should have been defined by AC_PROG_CC
+ : "${CC:=cc}"
+
+-echo "$as_me:2447: checking \$CFLAGS variable" >&5
++echo "$as_me:2448: checking \$CFLAGS variable" >&5
+ echo $ECHO_N "checking \$CFLAGS variable... $ECHO_C" >&6
+ case "x$CFLAGS" in
+ (*-[IUD]*)
+- echo "$as_me:2451: result: broken" >&5
++ echo "$as_me:2452: result: broken" >&5
+ echo "${ECHO_T}broken" >&6
+- { echo "$as_me:2453: WARNING: your environment uses the CFLAGS variable to hold CPPFLAGS options" >&5
++ { echo "$as_me:2454: 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=
+@@ -2558,18 +2559,18 @@
+ done
+ ;;
+ (*)
+- echo "$as_me:2561: result: ok" >&5
++ echo "$as_me:2562: result: ok" >&5
+ echo "${ECHO_T}ok" >&6
+ ;;
+ esac
+
+-echo "$as_me:2566: checking \$CC variable" >&5
++echo "$as_me:2567: checking \$CC variable" >&5
+ echo $ECHO_N "checking \$CC variable... $ECHO_C" >&6
+ case "$CC" in
+ (*[\ \ ]-*)
+- echo "$as_me:2570: result: broken" >&5
++ echo "$as_me:2571: result: broken" >&5
+ echo "${ECHO_T}broken" >&6
+- { echo "$as_me:2572: WARNING: your environment uses the CC variable to hold CFLAGS/CPPFLAGS options" >&5
++ { echo "$as_me:2573: 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/[ ]*[ ]-[^ ].*//'`
+@@ -2686,19 +2687,19 @@
+ done
+ test -n "$verbose" && echo " resulting CC: '$CC'" 1>&6
+
+-echo "${as_me:-configure}:2689: testing resulting CC: '$CC' ..." 1>&5
++echo "${as_me:-configure}:2690: testing resulting CC: '$CC' ..." 1>&5
+
+ test -n "$verbose" && echo " resulting CFLAGS: '$CFLAGS'" 1>&6
+
+-echo "${as_me:-configure}:2693: testing resulting CFLAGS: '$CFLAGS' ..." 1>&5
++echo "${as_me:-configure}:2694: testing resulting CFLAGS: '$CFLAGS' ..." 1>&5
+
+ test -n "$verbose" && echo " resulting CPPFLAGS: '$CPPFLAGS'" 1>&6
+
+-echo "${as_me:-configure}:2697: testing resulting CPPFLAGS: '$CPPFLAGS' ..." 1>&5
++echo "${as_me:-configure}:2698: testing resulting CPPFLAGS: '$CPPFLAGS' ..." 1>&5
+
+ ;;
+ (*)
+- echo "$as_me:2701: result: ok" >&5
++ echo "$as_me:2702: result: ok" >&5
+ echo "${ECHO_T}ok" >&6
+ ;;
+ esac
+@@ -2706,7 +2707,7 @@
+ ;;
+ esac
+
+-echo "$as_me:2709: checking for egrep" >&5
++echo "$as_me:2710: 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
+@@ -2718,7 +2719,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:2721: checking for $ac_word" >&5
++echo "$as_me:2722: 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
+@@ -2735,7 +2736,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:2738: found $ac_dir/$ac_word" >&5
++ echo "$as_me:2739: found $ac_dir/$ac_word" >&5
+ break
+ fi
+ done
+@@ -2746,10 +2747,10 @@
+ EGREP=$ac_cv_path_EGREP
+
+ if test -n "$EGREP"; then
+- echo "$as_me:2749: result: $EGREP" >&5
++ echo "$as_me:2750: result: $EGREP" >&5
+ echo "${ECHO_T}$EGREP" >&6
+ else
+- echo "$as_me:2752: result: no" >&5
++ echo "$as_me:2753: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+
+@@ -2757,12 +2758,12 @@
+ done
+ test -n "$EGREP" || EGREP=": "
+
+- test "x$ac_cv_path_EGREP" = "x:" && { { echo "$as_me:2760: error: cannot find workable egrep" >&5
++ test "x$ac_cv_path_EGREP" = "x:" && { { echo "$as_me:2761: error: cannot find workable egrep" >&5
+ echo "$as_me: error: cannot find workable egrep" >&2;}
+ { (exit 1); exit 1; }; }
+ fi
+ fi
+-echo "$as_me:2765: result: $ac_cv_path_EGREP" >&5
++echo "$as_me:2766: result: $ac_cv_path_EGREP" >&5
+ echo "${ECHO_T}$ac_cv_path_EGREP" >&6
+ EGREP="$ac_cv_path_EGREP"
+
+@@ -2772,7 +2773,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:2775: checking how to run the C preprocessor" >&5
++echo "$as_me:2776: 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
+@@ -2793,18 +2794,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 2796 "configure"
++#line 2797 "configure"
+ #include "confdefs.h"
+ #include <assert.h>
+ Syntax error
+ _ACEOF
+-if { (eval echo "$as_me:2801: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:2802: \"$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:2807: \$? = $ac_status" >&5
++ echo "$as_me:2808: \$? = $ac_status" >&5
+ (exit "$ac_status"); } >/dev/null; then
+ if test -s conftest.err; then
+ ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -2827,17 +2828,17 @@
+ # OK, works on sane cases. Now check whether non-existent headers
+ # can be detected and how.
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 2830 "configure"
++#line 2831 "configure"
+ #include "confdefs.h"
+ #include <ac_nonexistent.h>
+ _ACEOF
+-if { (eval echo "$as_me:2834: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:2835: \"$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:2840: \$? = $ac_status" >&5
++ echo "$as_me:2841: \$? = $ac_status" >&5
+ (exit "$ac_status"); } >/dev/null; then
+ if test -s conftest.err; then
+ ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -2874,7 +2875,7 @@
+ else
+ ac_cv_prog_CPP=$CPP
+ fi
+-echo "$as_me:2877: result: $CPP" >&5
++echo "$as_me:2878: result: $CPP" >&5
+ echo "${ECHO_T}$CPP" >&6
+ ac_preproc_ok=false
+ for ac_c_preproc_warn_flag in '' yes
+@@ -2884,18 +2885,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 2887 "configure"
++#line 2888 "configure"
+ #include "confdefs.h"
+ #include <assert.h>
+ Syntax error
+ _ACEOF
+-if { (eval echo "$as_me:2892: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:2893: \"$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:2898: \$? = $ac_status" >&5
++ echo "$as_me:2899: \$? = $ac_status" >&5
+ (exit "$ac_status"); } >/dev/null; then
+ if test -s conftest.err; then
+ ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -2918,17 +2919,17 @@
+ # OK, works on sane cases. Now check whether non-existent headers
+ # can be detected and how.
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 2921 "configure"
++#line 2922 "configure"
+ #include "confdefs.h"
+ #include <ac_nonexistent.h>
+ _ACEOF
+-if { (eval echo "$as_me:2925: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:2926: \"$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:2931: \$? = $ac_status" >&5
++ echo "$as_me:2932: \$? = $ac_status" >&5
+ (exit "$ac_status"); } >/dev/null; then
+ if test -s conftest.err; then
+ ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -2956,7 +2957,7 @@
+ if $ac_preproc_ok; then
+ :
+ else
+- { { echo "$as_me:2959: error: C preprocessor \"$CPP\" fails sanity check" >&5
++ { { echo "$as_me:2960: error: C preprocessor \"$CPP\" fails sanity check" >&5
+ echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check" >&2;}
+ { (exit 1); exit 1; }; }
+ fi
+@@ -2969,14 +2970,14 @@
+ ac_main_return="return"
+
+ if test $ac_cv_c_compiler_gnu = yes; then
+- echo "$as_me:2972: checking whether $CC needs -traditional" >&5
++ echo "$as_me:2973: checking whether $CC needs -traditional" >&5
+ echo $ECHO_N "checking whether $CC needs -traditional... $ECHO_C" >&6
+ if test "${ac_cv_prog_gcc_traditional+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ ac_pattern="Autoconf.*'x'"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 2979 "configure"
++#line 2980 "configure"
+ #include "confdefs.h"
+ #include <sgtty.h>
+ int Autoconf = TIOCGETP;
+@@ -2991,7 +2992,7 @@
+
+ if test $ac_cv_prog_gcc_traditional = no; then
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 2994 "configure"
++#line 2995 "configure"
+ #include "confdefs.h"
+ #include <termio.h>
+ int Autoconf = TCGETA;
+@@ -3004,14 +3005,14 @@
+
+ fi
+ fi
+-echo "$as_me:3007: result: $ac_cv_prog_gcc_traditional" >&5
++echo "$as_me:3008: result: $ac_cv_prog_gcc_traditional" >&5
+ echo "${ECHO_T}$ac_cv_prog_gcc_traditional" >&6
+ if test $ac_cv_prog_gcc_traditional = yes; then
+ CC="$CC -traditional"
+ fi
+ fi
+
+-echo "$as_me:3014: checking whether $CC understands -c and -o together" >&5
++echo "$as_me:3015: checking whether $CC understands -c and -o together" >&5
+ echo $ECHO_N "checking whether $CC understands -c and -o together... $ECHO_C" >&6
+ if test "${cf_cv_prog_CC_c_o+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -3026,15 +3027,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='$CC $CFLAGS $CPPFLAGS -c conftest.$ac_ext -o conftest2.$ac_objext >&5'
+-if { (eval echo "$as_me:3029: \"$ac_try\"") >&5
++if { (eval echo "$as_me:3030: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:3032: \$? = $ac_status" >&5
++ echo "$as_me:3033: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+- test -f conftest2.$ac_objext && { (eval echo "$as_me:3034: \"$ac_try\"") >&5
++ test -f conftest2.$ac_objext && { (eval echo "$as_me:3035: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:3037: \$? = $ac_status" >&5
++ echo "$as_me:3038: \$? = $ac_status" >&5
+ (exit "$ac_status"); };
+ then
+ eval cf_cv_prog_CC_c_o=yes
+@@ -3045,10 +3046,10 @@
+
+ fi
+ if test "$cf_cv_prog_CC_c_o" = yes; then
+- echo "$as_me:3048: result: yes" >&5
++ echo "$as_me:3049: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ else
+- echo "$as_me:3051: result: no" >&5
++ echo "$as_me:3052: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+
+@@ -3069,7 +3070,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:3072: checking for $ac_word" >&5
++echo "$as_me:3073: 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
+@@ -3084,7 +3085,7 @@
+ test -z "$ac_dir" && ac_dir=.
+ $as_executable_p "$ac_dir/$ac_word" || continue
+ ac_cv_prog_AWK="$ac_prog"
+-echo "$as_me:3087: found $ac_dir/$ac_word" >&5
++echo "$as_me:3088: found $ac_dir/$ac_word" >&5
+ break
+ done
+
+@@ -3092,21 +3093,21 @@
+ fi
+ AWK=$ac_cv_prog_AWK
+ if test -n "$AWK"; then
+- echo "$as_me:3095: result: $AWK" >&5
++ echo "$as_me:3096: result: $AWK" >&5
+ echo "${ECHO_T}$AWK" >&6
+ else
+- echo "$as_me:3098: result: no" >&5
++ echo "$as_me:3099: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+
+ test -n "$AWK" && break
+ done
+
+-test -z "$AWK" && { { echo "$as_me:3105: error: No awk program found" >&5
++test -z "$AWK" && { { echo "$as_me:3106: error: No awk program found" >&5
+ echo "$as_me: error: No awk program found" >&2;}
+ { (exit 1); exit 1; }; }
+
+-echo "$as_me:3109: checking for egrep" >&5
++echo "$as_me:3110: checking for egrep" >&5
+ echo $ECHO_N "checking for egrep... $ECHO_C" >&6
+ if test "${ac_cv_prog_egrep+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -3116,11 +3117,11 @@
+ else ac_cv_prog_egrep='egrep'
+ fi
+ fi
+-echo "$as_me:3119: result: $ac_cv_prog_egrep" >&5
++echo "$as_me:3120: result: $ac_cv_prog_egrep" >&5
+ echo "${ECHO_T}$ac_cv_prog_egrep" >&6
+ EGREP=$ac_cv_prog_egrep
+
+- test -z "$EGREP" && { { echo "$as_me:3123: error: No egrep program found" >&5
++ test -z "$EGREP" && { { echo "$as_me:3124: error: No egrep program found" >&5
+ echo "$as_me: error: No egrep program found" >&2;}
+ { (exit 1); exit 1; }; }
+
+@@ -3136,7 +3137,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:3139: checking for a BSD compatible install" >&5
++echo "$as_me:3140: 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
+@@ -3185,7 +3186,7 @@
+ INSTALL=$ac_install_sh
+ fi
+ fi
+-echo "$as_me:3188: result: $INSTALL" >&5
++echo "$as_me:3189: result: $INSTALL" >&5
+ echo "${ECHO_T}$INSTALL" >&6
+
+ # Use test -z because SunOS4 sh mishandles braces in ${var-val}.
+@@ -3196,18 +3197,18 @@
+
+ test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
+
+-echo "$as_me:3199: checking whether ln -s works" >&5
++echo "$as_me:3200: 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:3203: result: yes" >&5
++ echo "$as_me:3204: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ else
+- echo "$as_me:3206: result: no, using $LN_S" >&5
++ echo "$as_me:3207: result: no, using $LN_S" >&5
+ echo "${ECHO_T}no, using $LN_S" >&6
+ fi
+
+-echo "$as_me:3210: checking if $LN_S -f options work" >&5
++echo "$as_me:3211: 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
+@@ -3219,7 +3220,7 @@
+ cf_prog_ln_sf=no
+ fi
+ rm -f conf$$.dst conf$$src
+-echo "$as_me:3222: result: $cf_prog_ln_sf" >&5
++echo "$as_me:3223: 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"
+@@ -3247,7 +3248,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:3250: checking for a BSD compatible install" >&5
++echo "$as_me:3251: 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
+@@ -3296,7 +3297,7 @@
+ INSTALL=$ac_install_sh
+ fi
+ fi
+-echo "$as_me:3299: result: $INSTALL" >&5
++echo "$as_me:3300: result: $INSTALL" >&5
+ echo "${ECHO_T}$INSTALL" >&6
+
+ # Use test -z because SunOS4 sh mishandles braces in ${var-val}.
+@@ -3317,7 +3318,7 @@
+ ;;
+ esac
+
+-echo "$as_me:3320: checking if you want to install stripped executables" >&5
++echo "$as_me:3321: 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.
+@@ -3334,7 +3335,7 @@
+ enable_stripping=yes
+
+ fi;
+-echo "$as_me:3337: result: $enable_stripping" >&5
++echo "$as_me:3338: result: $enable_stripping" >&5
+ echo "${ECHO_T}$enable_stripping" >&6
+
+ if test "$enable_stripping" = yes
+@@ -3345,7 +3346,7 @@
+ fi
+
+ : "${INSTALL:=install}"
+-echo "$as_me:3348: checking if install accepts -p option" >&5
++echo "$as_me:3349: 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
+@@ -3376,10 +3377,10 @@
+ rm -rf ./conftest*
+
+ fi
+-echo "$as_me:3379: result: $cf_cv_install_p" >&5
++echo "$as_me:3380: result: $cf_cv_install_p" >&5
+ echo "${ECHO_T}$cf_cv_install_p" >&6
+
+-echo "$as_me:3382: checking if install needs to be told about ownership" >&5
++echo "$as_me:3383: 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)
+@@ -3390,7 +3391,7 @@
+ ;;
+ esac
+
+-echo "$as_me:3393: result: $with_install_o" >&5
++echo "$as_me:3394: result: $with_install_o" >&5
+ echo "${ECHO_T}$with_install_o" >&6
+ if test "x$with_install_o" = xyes
+ then
+@@ -3401,7 +3402,7 @@
+
+ if test -n "$INSTALL_OPT_S"
+ then
+- echo "$as_me:3404: checking if you want to specify strip-program" >&5
++ echo "$as_me:3405: 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.
+@@ -3411,11 +3412,11 @@
+ else
+ with_strip_program=no
+ fi;
+- echo "$as_me:3414: result: $with_strip_program" >&5
++ echo "$as_me:3415: result: $with_strip_program" >&5
+ echo "${ECHO_T}$with_strip_program" >&6
+ if test "$with_strip_program" != no
+ then
+- echo "$as_me:3418: checking if strip-program is supported with this installer" >&5
++ echo "$as_me:3419: 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
+@@ -3436,11 +3437,11 @@
+ done
+ fi
+ fi
+- echo "$as_me:3439: result: $check_install_strip" >&5
++ echo "$as_me:3440: result: $check_install_strip" >&5
+ echo "${ECHO_T}$check_install_strip" >&6
+ case "$check_install_strip" in
+ (no)
+- { echo "$as_me:3443: WARNING: $cf_install_program does not support strip program option" >&5
++ { echo "$as_me:3444: 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
+ ;;
+@@ -3455,7 +3456,7 @@
+ chmod +x "$INSTALL"
+ test -n "$verbose" && echo " created $INSTALL" 1>&6
+
+-echo "${as_me:-configure}:3458: testing created $INSTALL ..." 1>&5
++echo "${as_me:-configure}:3459: testing created $INSTALL ..." 1>&5
+
+ ;;
+ (option)
+@@ -3465,7 +3466,7 @@
+ fi
+ fi
+
+-echo "$as_me:3468: checking for long file names" >&5
++echo "$as_me:3469: 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
+@@ -3504,7 +3505,7 @@
+ rm -rf "$ac_xdir" 2>/dev/null
+ done
+ fi
+-echo "$as_me:3507: result: $ac_cv_sys_long_file_names" >&5
++echo "$as_me:3508: 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
+
+@@ -3516,7 +3517,7 @@
+
+ # if we find pkg-config, check if we should install the ".pc" files.
+
+-echo "$as_me:3519: checking if you want to use pkg-config" >&5
++echo "$as_me:3520: 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.
+@@ -3526,7 +3527,7 @@
+ else
+ cf_pkg_config=yes
+ fi;
+-echo "$as_me:3529: result: $cf_pkg_config" >&5
++echo "$as_me:3530: result: $cf_pkg_config" >&5
+ echo "${ECHO_T}$cf_pkg_config" >&6
+
+ case "$cf_pkg_config" in
+@@ -3538,7 +3539,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:3541: checking for $ac_word" >&5
++echo "$as_me:3542: 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
+@@ -3555,7 +3556,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:3558: found $ac_dir/$ac_word" >&5
++ echo "$as_me:3559: found $ac_dir/$ac_word" >&5
+ break
+ fi
+ done
+@@ -3566,10 +3567,10 @@
+ PKG_CONFIG=$ac_cv_path_PKG_CONFIG
+
+ if test -n "$PKG_CONFIG"; then
+- echo "$as_me:3569: result: $PKG_CONFIG" >&5
++ echo "$as_me:3570: result: $PKG_CONFIG" >&5
+ echo "${ECHO_T}$PKG_CONFIG" >&6
+ else
+- echo "$as_me:3572: result: no" >&5
++ echo "$as_me:3573: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+
+@@ -3578,7 +3579,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:3581: checking for $ac_word" >&5
++echo "$as_me:3582: 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
+@@ -3595,7 +3596,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:3598: found $ac_dir/$ac_word" >&5
++ echo "$as_me:3599: found $ac_dir/$ac_word" >&5
+ break
+ fi
+ done
+@@ -3607,10 +3608,10 @@
+ ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG
+
+ if test -n "$ac_pt_PKG_CONFIG"; then
+- echo "$as_me:3610: result: $ac_pt_PKG_CONFIG" >&5
++ echo "$as_me:3611: result: $ac_pt_PKG_CONFIG" >&5
+ echo "${ECHO_T}$ac_pt_PKG_CONFIG" >&6
+ else
+- echo "$as_me:3613: result: no" >&5
++ echo "$as_me:3614: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+
+@@ -3651,24 +3652,24 @@
+ PKG_CONFIG=`echo "$PKG_CONFIG" | sed -e s%NONE%$cf_path_syntax%`
+ ;;
+ (*)
+- { { echo "$as_me:3654: error: expected a pathname, not \"$PKG_CONFIG\"" >&5
++ { { echo "$as_me:3655: 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:3661: WARNING: pkg-config is not installed" >&5
++ { echo "$as_me:3662: 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:3667: checking for pkg-config library directory" >&5
++ echo "$as_me:3668: checking for pkg-config library directory" >&5
+ echo $ECHO_N "checking for pkg-config library directory... $ECHO_C" >&6
+ ;;
+ (*)
+- echo "$as_me:3671: checking for $PKG_CONFIG library directory" >&5
++ echo "$as_me:3672: checking for $PKG_CONFIG library directory" >&5
+ echo $ECHO_N "checking for $PKG_CONFIG library directory... $ECHO_C" >&6
+ ;;
+ esac
+@@ -3695,7 +3696,7 @@
+ case "x$cf_search_path" in
+ (xlibdir)
+ PKG_CONFIG_LIBDIR='${libdir}/pkgconfig'
+- echo "$as_me:3698: result: $PKG_CONFIG_LIBDIR" >&5
++ echo "$as_me:3699: result: $PKG_CONFIG_LIBDIR" >&5
+ echo "${ECHO_T}$PKG_CONFIG_LIBDIR" >&6
+ cf_search_path=
+ ;;
+@@ -3706,16 +3707,16 @@
+ ;;
+ (x$GLOB_FULLPATH_POSIX|x$GLOB_FULLPATH_OTHER)
+ PKG_CONFIG_LIBDIR="$cf_search_path"
+- echo "$as_me:3709: result: $PKG_CONFIG_LIBDIR" >&5
++ echo "$as_me:3710: result: $PKG_CONFIG_LIBDIR" >&5
+ echo "${ECHO_T}$PKG_CONFIG_LIBDIR" >&6
+ cf_search_path=
+ ;;
+ (xyes|xauto)
+- echo "$as_me:3714: result: auto" >&5
++ echo "$as_me:3715: 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:3718: checking for search-list" >&5
++ echo "$as_me:3719: checking for search-list" >&5
+ echo $ECHO_N "checking for search-list... $ECHO_C" >&6
+ if test "x$PKG_CONFIG" != xnone
+ then
+@@ -3750,11 +3751,11 @@
+ "`
+ fi
+
+- echo "$as_me:3753: result: $cf_search_path" >&5
++ echo "$as_me:3754: result: $cf_search_path" >&5
+ echo "${ECHO_T}$cf_search_path" >&6
+ ;;
+ (*)
+- { { echo "$as_me:3757: error: Unexpected option value: $cf_search_path" >&5
++ { { echo "$as_me:3758: error: Unexpected option value: $cf_search_path" >&5
+ echo "$as_me: error: Unexpected option value: $cf_search_path" >&2;}
+ { (exit 1); exit 1; }; }
+ ;;
+@@ -3762,7 +3763,7 @@
+
+ if test -n "$cf_search_path"
+ then
+- echo "$as_me:3765: checking for first directory" >&5
++ echo "$as_me:3766: 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
+@@ -3773,7 +3774,7 @@
+ break
+ fi
+ done
+- echo "$as_me:3776: result: $cf_pkg_config_path" >&5
++ echo "$as_me:3777: result: $cf_pkg_config_path" >&5
+ echo "${ECHO_T}$cf_pkg_config_path" >&6
+
+ if test "x$cf_pkg_config_path" != xnone ; then
+@@ -3783,7 +3784,7 @@
+
+ if test -z "$PKG_CONFIG_LIBDIR" && test -n "$cf_search_path"
+ then
+- echo "$as_me:3786: checking for workaround" >&5
++ echo "$as_me:3787: checking for workaround" >&5
+ echo $ECHO_N "checking for workaround... $ECHO_C" >&6
+ if test "$prefix" = "NONE" ; then
+ cf_prefix="$ac_default_prefix"
+@@ -3806,12 +3807,12 @@
+ esac
+ done
+ test -z "$PKG_CONFIG_LIBDIR" && PKG_CONFIG_LIBDIR=$cf_backup
+- echo "$as_me:3809: result: $PKG_CONFIG_LIBDIR" >&5
++ echo "$as_me:3810: result: $PKG_CONFIG_LIBDIR" >&5
+ echo "${ECHO_T}$PKG_CONFIG_LIBDIR" >&6
+ fi
+ fi
+
+-echo "$as_me:3814: checking if you want to build test-programs" >&5
++echo "$as_me:3815: 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.
+@@ -3821,10 +3822,10 @@
+ else
+ cf_with_tests=yes
+ fi;
+-echo "$as_me:3824: result: $cf_with_tests" >&5
++echo "$as_me:3825: result: $cf_with_tests" >&5
+ echo "${ECHO_T}$cf_with_tests" >&6
+
+-echo "$as_me:3827: checking if we should assume mixed-case filenames" >&5
++echo "$as_me:3828: 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.
+@@ -3834,11 +3835,11 @@
+ else
+ enable_mixedcase=auto
+ fi;
+-echo "$as_me:3837: result: $enable_mixedcase" >&5
++echo "$as_me:3838: result: $enable_mixedcase" >&5
+ echo "${ECHO_T}$enable_mixedcase" >&6
+ if test "$enable_mixedcase" = "auto" ; then
+
+-echo "$as_me:3841: checking if filesystem supports mixed-case filenames" >&5
++echo "$as_me:3842: 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
+@@ -3865,7 +3866,7 @@
+ fi
+
+ fi
+-echo "$as_me:3868: result: $cf_cv_mixedcase" >&5
++echo "$as_me:3869: result: $cf_cv_mixedcase" >&5
+ echo "${ECHO_T}$cf_cv_mixedcase" >&6
+ test "$cf_cv_mixedcase" = yes &&
+ cat >>confdefs.h <<\EOF
+@@ -3883,7 +3884,7 @@
+ fi
+
+ # do this after mixed-case option (tags/TAGS is not as important as tic).
+-echo "$as_me:3886: checking whether ${MAKE-make} sets \${MAKE}" >&5
++echo "$as_me:3887: 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
+@@ -3903,16 +3904,16 @@
+ rm -f conftest.make
+ fi
+ if eval "test \"`echo '$ac_cv_prog_make_'${ac_make}_set`\" = yes"; then
+- echo "$as_me:3906: result: yes" >&5
++ echo "$as_me:3907: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ SET_MAKE=
+ else
+- echo "$as_me:3910: result: no" >&5
++ echo "$as_me:3911: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ SET_MAKE="MAKE=${MAKE-make}"
+ fi
+
+-echo "$as_me:3915: checking for \".PHONY\" make-support" >&5
++echo "$as_me:3916: 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
+@@ -3967,7 +3968,7 @@
+ rm -rf conftest*
+
+ fi
+-echo "$as_me:3970: result: $cf_cv_make_PHONY" >&5
++echo "$as_me:3971: result: $cf_cv_make_PHONY" >&5
+ echo "${ECHO_T}$cf_cv_make_PHONY" >&6
+ MAKE_NO_PHONY="#"
+ MAKE_PHONY="#"
+@@ -3978,7 +3979,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:3981: checking for $ac_word" >&5
++echo "$as_me:3982: 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
+@@ -3993,7 +3994,7 @@
+ test -z "$ac_dir" && ac_dir=.
+ $as_executable_p "$ac_dir/$ac_word" || continue
+ ac_cv_prog_CTAGS="$ac_prog"
+-echo "$as_me:3996: found $ac_dir/$ac_word" >&5
++echo "$as_me:3997: found $ac_dir/$ac_word" >&5
+ break
+ done
+
+@@ -4001,10 +4002,10 @@
+ fi
+ CTAGS=$ac_cv_prog_CTAGS
+ if test -n "$CTAGS"; then
+- echo "$as_me:4004: result: $CTAGS" >&5
++ echo "$as_me:4005: result: $CTAGS" >&5
+ echo "${ECHO_T}$CTAGS" >&6
+ else
+- echo "$as_me:4007: result: no" >&5
++ echo "$as_me:4008: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+
+@@ -4015,7 +4016,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:4018: checking for $ac_word" >&5
++echo "$as_me:4019: 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
+@@ -4030,7 +4031,7 @@
+ test -z "$ac_dir" && ac_dir=.
+ $as_executable_p "$ac_dir/$ac_word" || continue
+ ac_cv_prog_ETAGS="$ac_prog"
+-echo "$as_me:4033: found $ac_dir/$ac_word" >&5
++echo "$as_me:4034: found $ac_dir/$ac_word" >&5
+ break
+ done
+
+@@ -4038,10 +4039,10 @@
+ fi
+ ETAGS=$ac_cv_prog_ETAGS
+ if test -n "$ETAGS"; then
+- echo "$as_me:4041: result: $ETAGS" >&5
++ echo "$as_me:4042: result: $ETAGS" >&5
+ echo "${ECHO_T}$ETAGS" >&6
+ else
+- echo "$as_me:4044: result: no" >&5
++ echo "$as_me:4045: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+
+@@ -4050,7 +4051,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:4053: checking for $ac_word" >&5
++echo "$as_me:4054: 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
+@@ -4065,7 +4066,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:4068: found $ac_dir/$ac_word" >&5
++echo "$as_me:4069: found $ac_dir/$ac_word" >&5
+ break
+ done
+
+@@ -4074,17 +4075,17 @@
+ fi
+ MAKE_LOWER_TAGS=$ac_cv_prog_MAKE_LOWER_TAGS
+ if test -n "$MAKE_LOWER_TAGS"; then
+- echo "$as_me:4077: result: $MAKE_LOWER_TAGS" >&5
++ echo "$as_me:4078: result: $MAKE_LOWER_TAGS" >&5
+ echo "${ECHO_T}$MAKE_LOWER_TAGS" >&6
+ else
+- echo "$as_me:4080: result: no" >&5
++ echo "$as_me:4081: 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:4087: checking for $ac_word" >&5
++echo "$as_me:4088: 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
+@@ -4099,7 +4100,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:4102: found $ac_dir/$ac_word" >&5
++echo "$as_me:4103: found $ac_dir/$ac_word" >&5
+ break
+ done
+
+@@ -4108,10 +4109,10 @@
+ fi
+ MAKE_UPPER_TAGS=$ac_cv_prog_MAKE_UPPER_TAGS
+ if test -n "$MAKE_UPPER_TAGS"; then
+- echo "$as_me:4111: result: $MAKE_UPPER_TAGS" >&5
++ echo "$as_me:4112: result: $MAKE_UPPER_TAGS" >&5
+ echo "${ECHO_T}$MAKE_UPPER_TAGS" >&6
+ else
+- echo "$as_me:4114: result: no" >&5
++ echo "$as_me:4115: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+
+@@ -4131,7 +4132,7 @@
+ MAKE_LOWER_TAGS="#"
+ fi
+
+-echo "$as_me:4134: checking for makeflags variable" >&5
++echo "$as_me:4135: 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
+@@ -4161,7 +4162,7 @@
+ ;;
+ (*)
+
+-echo "${as_me:-configure}:4164: testing given option \"$cf_option\",no match \"$cf_result\" ..." 1>&5
++echo "${as_me:-configure}:4165: testing given option \"$cf_option\",no match \"$cf_result\" ..." 1>&5
+
+ ;;
+ esac
+@@ -4169,13 +4170,13 @@
+ rm -f cf_makeflags.tmp
+
+ fi
+-echo "$as_me:4172: result: $cf_cv_makeflags" >&5
++echo "$as_me:4173: 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:4178: checking for $ac_word" >&5
++echo "$as_me:4179: 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
+@@ -4190,7 +4191,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:4193: found $ac_dir/$ac_word" >&5
++echo "$as_me:4194: found $ac_dir/$ac_word" >&5
+ break
+ done
+
+@@ -4198,10 +4199,10 @@
+ fi
+ RANLIB=$ac_cv_prog_RANLIB
+ if test -n "$RANLIB"; then
+- echo "$as_me:4201: result: $RANLIB" >&5
++ echo "$as_me:4202: result: $RANLIB" >&5
+ echo "${ECHO_T}$RANLIB" >&6
+ else
+- echo "$as_me:4204: result: no" >&5
++ echo "$as_me:4205: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+
+@@ -4210,7 +4211,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:4213: checking for $ac_word" >&5
++echo "$as_me:4214: 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
+@@ -4225,7 +4226,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:4228: found $ac_dir/$ac_word" >&5
++echo "$as_me:4229: found $ac_dir/$ac_word" >&5
+ break
+ done
+
+@@ -4234,10 +4235,10 @@
+ fi
+ ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB
+ if test -n "$ac_ct_RANLIB"; then
+- echo "$as_me:4237: result: $ac_ct_RANLIB" >&5
++ echo "$as_me:4238: result: $ac_ct_RANLIB" >&5
+ echo "${ECHO_T}$ac_ct_RANLIB" >&6
+ else
+- echo "$as_me:4240: result: no" >&5
++ echo "$as_me:4241: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+
+@@ -4249,7 +4250,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:4252: checking for $ac_word" >&5
++echo "$as_me:4253: 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
+@@ -4264,7 +4265,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:4267: found $ac_dir/$ac_word" >&5
++echo "$as_me:4268: found $ac_dir/$ac_word" >&5
+ break
+ done
+
+@@ -4272,10 +4273,10 @@
+ fi
+ LD=$ac_cv_prog_LD
+ if test -n "$LD"; then
+- echo "$as_me:4275: result: $LD" >&5
++ echo "$as_me:4276: result: $LD" >&5
+ echo "${ECHO_T}$LD" >&6
+ else
+- echo "$as_me:4278: result: no" >&5
++ echo "$as_me:4279: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+
+@@ -4284,7 +4285,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:4287: checking for $ac_word" >&5
++echo "$as_me:4288: 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
+@@ -4299,7 +4300,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:4302: found $ac_dir/$ac_word" >&5
++echo "$as_me:4303: found $ac_dir/$ac_word" >&5
+ break
+ done
+
+@@ -4308,10 +4309,10 @@
+ fi
+ ac_ct_LD=$ac_cv_prog_ac_ct_LD
+ if test -n "$ac_ct_LD"; then
+- echo "$as_me:4311: result: $ac_ct_LD" >&5
++ echo "$as_me:4312: result: $ac_ct_LD" >&5
+ echo "${ECHO_T}$ac_ct_LD" >&6
+ else
+- echo "$as_me:4314: result: no" >&5
++ echo "$as_me:4315: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+
+@@ -4323,7 +4324,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:4326: checking for $ac_word" >&5
++echo "$as_me:4327: 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
+@@ -4338,7 +4339,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:4341: found $ac_dir/$ac_word" >&5
++echo "$as_me:4342: found $ac_dir/$ac_word" >&5
+ break
+ done
+
+@@ -4346,10 +4347,10 @@
+ fi
+ AR=$ac_cv_prog_AR
+ if test -n "$AR"; then
+- echo "$as_me:4349: result: $AR" >&5
++ echo "$as_me:4350: result: $AR" >&5
+ echo "${ECHO_T}$AR" >&6
+ else
+- echo "$as_me:4352: result: no" >&5
++ echo "$as_me:4353: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+
+@@ -4358,7 +4359,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:4361: checking for $ac_word" >&5
++echo "$as_me:4362: 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
+@@ -4373,7 +4374,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:4376: found $ac_dir/$ac_word" >&5
++echo "$as_me:4377: found $ac_dir/$ac_word" >&5
+ break
+ done
+
+@@ -4382,10 +4383,10 @@
+ fi
+ ac_ct_AR=$ac_cv_prog_ac_ct_AR
+ if test -n "$ac_ct_AR"; then
+- echo "$as_me:4385: result: $ac_ct_AR" >&5
++ echo "$as_me:4386: result: $ac_ct_AR" >&5
+ echo "${ECHO_T}$ac_ct_AR" >&6
+ else
+- echo "$as_me:4388: result: no" >&5
++ echo "$as_me:4389: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+
+@@ -4397,7 +4398,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:4400: checking for $ac_word" >&5
++echo "$as_me:4401: 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
+@@ -4412,7 +4413,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:4415: found $ac_dir/$ac_word" >&5
++echo "$as_me:4416: found $ac_dir/$ac_word" >&5
+ break
+ done
+
+@@ -4420,10 +4421,10 @@
+ fi
+ AR=$ac_cv_prog_AR
+ if test -n "$AR"; then
+- echo "$as_me:4423: result: $AR" >&5
++ echo "$as_me:4424: result: $AR" >&5
+ echo "${ECHO_T}$AR" >&6
+ else
+- echo "$as_me:4426: result: no" >&5
++ echo "$as_me:4427: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+
+@@ -4432,7 +4433,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:4435: checking for $ac_word" >&5
++echo "$as_me:4436: 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
+@@ -4447,7 +4448,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:4450: found $ac_dir/$ac_word" >&5
++echo "$as_me:4451: found $ac_dir/$ac_word" >&5
+ break
+ done
+
+@@ -4456,10 +4457,10 @@
+ fi
+ ac_ct_AR=$ac_cv_prog_ac_ct_AR
+ if test -n "$ac_ct_AR"; then
+- echo "$as_me:4459: result: $ac_ct_AR" >&5
++ echo "$as_me:4460: result: $ac_ct_AR" >&5
+ echo "${ECHO_T}$ac_ct_AR" >&6
+ else
+- echo "$as_me:4462: result: no" >&5
++ echo "$as_me:4463: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+
+@@ -4468,7 +4469,7 @@
+ AR="$ac_cv_prog_AR"
+ fi
+
+-echo "$as_me:4471: checking for options to update archives" >&5
++echo "$as_me:4472: 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
+@@ -4505,13 +4506,13 @@
+ rm -f conftest.a
+
+ cat >"conftest.$ac_ext" <<EOF
+-#line 4508 "configure"
++#line 4509 "configure"
+ int testdata[3] = { 123, 456, 789 };
+ EOF
+- if { (eval echo "$as_me:4511: \"$ac_compile\"") >&5
++ if { (eval echo "$as_me:4512: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:4514: \$? = $ac_status" >&5
++ echo "$as_me:4515: \$? = $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
+@@ -4522,7 +4523,7 @@
+ else
+ test -n "$verbose" && echo " cannot compile test-program" 1>&6
+
+-echo "${as_me:-configure}:4525: testing cannot compile test-program ..." 1>&5
++echo "${as_me:-configure}:4526: testing cannot compile test-program ..." 1>&5
+
+ break
+ fi
+@@ -4532,7 +4533,7 @@
+ esac
+
+ fi
+-echo "$as_me:4535: result: $cf_cv_ar_flags" >&5
++echo "$as_me:4536: result: $cf_cv_ar_flags" >&5
+ echo "${ECHO_T}$cf_cv_ar_flags" >&6
+
+ if test -n "$ARFLAGS" ; then
+@@ -4543,31 +4544,57 @@
+ ARFLAGS=$cf_cv_ar_flags
+ fi
+
+- echo "$as_me:4546: checking for PATH separator" >&5
++ echo "$as_me:4547: 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:4553: result: $PATH_SEPARATOR" >&5
++ echo "$as_me:4554: result: $PATH_SEPARATOR" >&5
+ echo "${ECHO_T}$PATH_SEPARATOR" >&6
+
+-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
++echo "$as_me:4557: 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.
+ if test "${with_install_prefix+set}" = set; then
+ withval="$with_install_prefix"
+- case "$withval" in
+- (yes|no)
++ case "x$withval" in
++ (xyes|xno)
+ ;;
+ (*) DESTDIR="$withval"
+ ;;
+ esac
+ fi;
+-echo "$as_me:4569: result: $DESTDIR" >&5
+-echo "${ECHO_T}$DESTDIR" >&6
++echo "$as_me:4570: result: ${DESTDIR:-(none)}" >&5
++echo "${ECHO_T}${DESTDIR:-(none)}" >&6
++
++echo "$as_me:4573: checking if installation directory prefix should be merged" >&5
++echo $ECHO_N "checking if installation directory prefix should be merged... $ECHO_C" >&6
++
++# Check whether --enable-install-prefix or --disable-install-prefix was given.
++if test "${enable_install_prefix+set}" = set; then
++ enableval="$enable_install_prefix"
++ test "$enableval" != yes && enableval=no
++ if test "$enableval" != "no" ; then
++ cf_install_prefix=yes
++ else
++ cf_install_prefix=no
++ fi
++else
++ enableval=no
++ cf_install_prefix=no
++
++fi;
++echo "$as_me:4590: result: $cf_install_prefix" >&5
++echo "${ECHO_T}$cf_install_prefix" >&6
++
++if test "$cf_install_prefix" = yes ; then
++ MERGE_PREFIX=':$(prefix)%=%'
++else
++ MERGE_PREFIX=''
++fi
+
+ ###############################################################################
+
+@@ -4594,7 +4621,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:4597: checking for $ac_word" >&5
++echo "$as_me:4624: 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
+@@ -4609,7 +4636,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:4612: found $ac_dir/$ac_word" >&5
++echo "$as_me:4639: found $ac_dir/$ac_word" >&5
+ break
+ done
+
+@@ -4617,10 +4644,10 @@
+ fi
+ BUILD_CC=$ac_cv_prog_BUILD_CC
+ if test -n "$BUILD_CC"; then
+- echo "$as_me:4620: result: $BUILD_CC" >&5
++ echo "$as_me:4647: result: $BUILD_CC" >&5
+ echo "${ECHO_T}$BUILD_CC" >&6
+ else
+- echo "$as_me:4623: result: no" >&5
++ echo "$as_me:4650: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+
+@@ -4629,12 +4656,12 @@
+ test -n "$BUILD_CC" || BUILD_CC="none"
+
+ fi;
+- echo "$as_me:4632: checking for native build C compiler" >&5
++ echo "$as_me:4659: checking for native build C compiler" >&5
+ echo $ECHO_N "checking for native build C compiler... $ECHO_C" >&6
+- echo "$as_me:4634: result: $BUILD_CC" >&5
++ echo "$as_me:4661: result: $BUILD_CC" >&5
+ echo "${ECHO_T}$BUILD_CC" >&6
+
+- echo "$as_me:4637: checking for native build C preprocessor" >&5
++ echo "$as_me:4664: 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.
+@@ -4644,10 +4671,10 @@
+ else
+ BUILD_CPP='${BUILD_CC} -E'
+ fi;
+- echo "$as_me:4647: result: $BUILD_CPP" >&5
++ echo "$as_me:4674: result: $BUILD_CPP" >&5
+ echo "${ECHO_T}$BUILD_CPP" >&6
+
+- echo "$as_me:4650: checking for native build C flags" >&5
++ echo "$as_me:4677: 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.
+@@ -4655,10 +4682,10 @@
+ withval="$with_build_cflags"
+ BUILD_CFLAGS="$withval"
+ fi;
+- echo "$as_me:4658: result: $BUILD_CFLAGS" >&5
++ echo "$as_me:4685: result: $BUILD_CFLAGS" >&5
+ echo "${ECHO_T}$BUILD_CFLAGS" >&6
+
+- echo "$as_me:4661: checking for native build C preprocessor-flags" >&5
++ echo "$as_me:4688: 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.
+@@ -4666,10 +4693,10 @@
+ withval="$with_build_cppflags"
+ BUILD_CPPFLAGS="$withval"
+ fi;
+- echo "$as_me:4669: result: $BUILD_CPPFLAGS" >&5
++ echo "$as_me:4696: result: $BUILD_CPPFLAGS" >&5
+ echo "${ECHO_T}$BUILD_CPPFLAGS" >&6
+
+- echo "$as_me:4672: checking for native build linker-flags" >&5
++ echo "$as_me:4699: 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.
+@@ -4677,10 +4704,10 @@
+ withval="$with_build_ldflags"
+ BUILD_LDFLAGS="$withval"
+ fi;
+- echo "$as_me:4680: result: $BUILD_LDFLAGS" >&5
++ echo "$as_me:4707: result: $BUILD_LDFLAGS" >&5
+ echo "${ECHO_T}$BUILD_LDFLAGS" >&6
+
+- echo "$as_me:4683: checking for native build linker-libraries" >&5
++ echo "$as_me:4710: 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.
+@@ -4688,7 +4715,7 @@
+ withval="$with_build_libs"
+ BUILD_LIBS="$withval"
+ fi;
+- echo "$as_me:4691: result: $BUILD_LIBS" >&5
++ echo "$as_me:4718: result: $BUILD_LIBS" >&5
+ echo "${ECHO_T}$BUILD_LIBS" >&6
+
+ # this assumes we're on Unix.
+@@ -4697,7 +4724,7 @@
+
+ : ${BUILD_CC:='${CC}'}
+
+- echo "$as_me:4700: checking if the build-compiler \"$BUILD_CC\" works" >&5
++ echo "$as_me:4727: 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
+@@ -4711,7 +4738,7 @@
+ cf_ok_build_cc=unknown
+ else
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 4714 "configure"
++#line 4741 "configure"
+ #include "confdefs.h"
+ #include <stdio.h>
+ int main(int argc, char *argv[])
+@@ -4721,15 +4748,15 @@
+
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:4724: \"$ac_link\"") >&5
++if { (eval echo "$as_me:4751: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:4727: \$? = $ac_status" >&5
++ echo "$as_me:4754: \$? = $ac_status" >&5
+ (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+- { (eval echo "$as_me:4729: \"$ac_try\"") >&5
++ { (eval echo "$as_me:4756: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:4732: \$? = $ac_status" >&5
++ echo "$as_me:4759: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_ok_build_cc=yes
+ else
+@@ -4744,12 +4771,12 @@
+ cross_compiling=$cf_save_crossed
+ ac_link=$cf_save_ac_link
+
+- echo "$as_me:4747: result: $cf_ok_build_cc" >&5
++ echo "$as_me:4774: 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:4752: error: Cross-build requires two compilers.
++ { { echo "$as_me:4779: 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;}
+@@ -4774,7 +4801,7 @@
+ ### shared, for example.
+ cf_list_models=""
+
+-echo "$as_me:4777: checking if you want to build shared C-objects" >&5
++echo "$as_me:4804: 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.
+@@ -4784,27 +4811,27 @@
+ else
+ with_shared=no
+ fi;
+-echo "$as_me:4787: result: $with_shared" >&5
++echo "$as_me:4814: result: $with_shared" >&5
+ echo "${ECHO_T}$with_shared" >&6
+ test "$with_shared" = "yes" && cf_list_models="$cf_list_models shared"
+
+-echo "$as_me:4791: checking for specified models" >&5
++echo "$as_me:4818: 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:4794: result: $cf_list_models" >&5
++echo "$as_me:4821: 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:4799: checking for default model" >&5
++echo "$as_me:4826: 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:4802: result: $DFT_LWR_MODEL" >&5
++echo "$as_me:4829: 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:4807: checking for specific curses-directory" >&5
++echo "$as_me:4834: 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.
+@@ -4814,7 +4841,7 @@
+ else
+ cf_cv_curses_dir=no
+ fi;
+-echo "$as_me:4817: result: $cf_cv_curses_dir" >&5
++echo "$as_me:4844: 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"
+@@ -4843,7 +4870,7 @@
+ withval=`echo "$withval" | sed -e s%NONE%$cf_path_syntax%`
+ ;;
+ (*)
+- { { echo "$as_me:4846: error: expected a pathname, not \"$withval\"" >&5
++ { { echo "$as_me:4873: error: expected a pathname, not \"$withval\"" >&5
+ echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
+ { (exit 1); exit 1; }; }
+ ;;
+@@ -4879,7 +4906,7 @@
+ CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
+
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 4882 "configure"
++#line 4909 "configure"
+ #include "confdefs.h"
+ #include <stdio.h>
+ int
+@@ -4891,16 +4918,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:4894: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:4921: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:4897: \$? = $ac_status" >&5
++ echo "$as_me:4924: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:4900: \"$ac_try\"") >&5
++ { (eval echo "$as_me:4927: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:4903: \$? = $ac_status" >&5
++ echo "$as_me:4930: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ :
+ else
+@@ -4917,7 +4944,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}:4920: testing adding $cf_add_incdir to include-path ..." 1>&5
++echo "${as_me:-configure}:4947: testing adding $cf_add_incdir to include-path ..." 1>&5
+
+ CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
+
+@@ -4953,7 +4980,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}:4956: testing adding $cf_add_libdir to library-path ..." 1>&5
++echo "${as_me:-configure}:4983: testing adding $cf_add_libdir to library-path ..." 1>&5
+
+ LDFLAGS="-L$cf_add_libdir $LDFLAGS"
+ fi
+@@ -4968,13 +4995,13 @@
+ cf_have_ncuconfig=no
+
+ if test "x${PKG_CONFIG:=none}" != xnone; then
+- echo "$as_me:4971: checking pkg-config for $cf_ncuconfig_root" >&5
++ echo "$as_me:4998: 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:4974: result: yes" >&5
++ echo "$as_me:5001: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+
+- echo "$as_me:4977: checking if the $cf_ncuconfig_root package files work" >&5
++ echo "$as_me:5004: 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
+
+@@ -5107,7 +5134,7 @@
+ LIBS="$cf_add_libs"
+
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 5110 "configure"
++#line 5137 "configure"
+ #include "confdefs.h"
+ #include <${cf_cv_ncurses_header:-curses.h}>
+ int
+@@ -5119,37 +5146,37 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:5122: \"$ac_link\"") >&5
++if { (eval echo "$as_me:5149: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:5125: \$? = $ac_status" >&5
++ echo "$as_me:5152: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:5128: \"$ac_try\"") >&5
++ { (eval echo "$as_me:5155: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:5131: \$? = $ac_status" >&5
++ echo "$as_me:5158: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ if test "$cross_compiling" = yes; then
+ cf_test_ncuconfig=maybe
+ else
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 5137 "configure"
++#line 5164 "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:5144: \"$ac_link\"") >&5
++if { (eval echo "$as_me:5171: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:5147: \$? = $ac_status" >&5
++ echo "$as_me:5174: \$? = $ac_status" >&5
+ (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+- { (eval echo "$as_me:5149: \"$ac_try\"") >&5
++ { (eval echo "$as_me:5176: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:5152: \$? = $ac_status" >&5
++ echo "$as_me:5179: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_test_ncuconfig=yes
+ else
+@@ -5323,7 +5350,7 @@
+ LIBS="$cf_add_libs"
+
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 5326 "configure"
++#line 5353 "configure"
+ #include "confdefs.h"
+ #include <${cf_cv_ncurses_header:-curses.h}>
+ int
+@@ -5335,37 +5362,37 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:5338: \"$ac_link\"") >&5
++if { (eval echo "$as_me:5365: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:5341: \$? = $ac_status" >&5
++ echo "$as_me:5368: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:5344: \"$ac_try\"") >&5
++ { (eval echo "$as_me:5371: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:5347: \$? = $ac_status" >&5
++ echo "$as_me:5374: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ if test "$cross_compiling" = yes; then
+ cf_have_ncuconfig=maybe
+ else
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 5353 "configure"
++#line 5380 "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:5360: \"$ac_link\"") >&5
++if { (eval echo "$as_me:5387: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:5363: \$? = $ac_status" >&5
++ echo "$as_me:5390: \$? = $ac_status" >&5
+ (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+- { (eval echo "$as_me:5365: \"$ac_try\"") >&5
++ { (eval echo "$as_me:5392: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:5368: \$? = $ac_status" >&5
++ echo "$as_me:5395: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_have_ncuconfig=yes
+ else
+@@ -5382,7 +5409,7 @@
+ cf_have_ncuconfig=no
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+- echo "$as_me:5385: result: $cf_have_ncuconfig" >&5
++ echo "$as_me:5412: 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"
+@@ -5398,7 +5425,7 @@
+
+ NCURSES_CONFIG_PKG=$cf_ncuconfig_root
+
+-echo "$as_me:5401: checking for terminfo header" >&5
++echo "$as_me:5428: 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
+@@ -5416,7 +5443,7 @@
+ for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h"
+ do
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 5419 "configure"
++#line 5446 "configure"
+ #include "confdefs.h"
+ #include <stdio.h>
+ #include <${cf_cv_ncurses_header:-curses.h}>
+@@ -5431,16 +5458,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:5434: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:5461: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:5437: \$? = $ac_status" >&5
++ echo "$as_me:5464: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:5440: \"$ac_try\"") >&5
++ { (eval echo "$as_me:5467: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:5443: \$? = $ac_status" >&5
++ echo "$as_me:5470: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+
+ cf_cv_term_header="$cf_test"
+@@ -5456,7 +5483,7 @@
+ done
+
+ fi
+-echo "$as_me:5459: result: $cf_cv_term_header" >&5
++echo "$as_me:5486: result: $cf_cv_term_header" >&5
+ echo "${ECHO_T}$cf_cv_term_header" >&6
+
+ # Set definitions to allow ifdef'ing to accommodate subdirectories
+@@ -5491,7 +5518,7 @@
+ fi
+
+ else
+- echo "$as_me:5494: result: no" >&5
++ echo "$as_me:5521: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ NCURSES_CONFIG_PKG=none
+ fi
+@@ -5507,7 +5534,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:5510: checking for $ac_word" >&5
++echo "$as_me:5537: 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
+@@ -5522,7 +5549,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:5525: found $ac_dir/$ac_word" >&5
++echo "$as_me:5552: found $ac_dir/$ac_word" >&5
+ break
+ done
+
+@@ -5530,10 +5557,10 @@
+ fi
+ NCURSES_CONFIG=$ac_cv_prog_NCURSES_CONFIG
+ if test -n "$NCURSES_CONFIG"; then
+- echo "$as_me:5533: result: $NCURSES_CONFIG" >&5
++ echo "$as_me:5560: result: $NCURSES_CONFIG" >&5
+ echo "${ECHO_T}$NCURSES_CONFIG" >&6
+ else
+- echo "$as_me:5536: result: no" >&5
++ echo "$as_me:5563: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+
+@@ -5546,7 +5573,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:5549: checking for $ac_word" >&5
++echo "$as_me:5576: 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
+@@ -5561,7 +5588,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:5564: found $ac_dir/$ac_word" >&5
++echo "$as_me:5591: found $ac_dir/$ac_word" >&5
+ break
+ done
+
+@@ -5569,10 +5596,10 @@
+ fi
+ ac_ct_NCURSES_CONFIG=$ac_cv_prog_ac_ct_NCURSES_CONFIG
+ if test -n "$ac_ct_NCURSES_CONFIG"; then
+- echo "$as_me:5572: result: $ac_ct_NCURSES_CONFIG" >&5
++ echo "$as_me:5599: result: $ac_ct_NCURSES_CONFIG" >&5
+ echo "${ECHO_T}$ac_ct_NCURSES_CONFIG" >&6
+ else
+- echo "$as_me:5575: result: no" >&5
++ echo "$as_me:5602: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+
+@@ -5729,7 +5756,7 @@
+
+ # even with config script, some packages use no-override for curses.h
+
+-echo "$as_me:5732: checking if we have identified curses headers" >&5
++echo "$as_me:5759: 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
+@@ -5741,7 +5768,7 @@
+ curses.h ncurses/curses.h
+ do
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 5744 "configure"
++#line 5771 "configure"
+ #include "confdefs.h"
+ #include <${cf_header}>
+ int
+@@ -5753,16 +5780,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:5756: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:5783: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:5759: \$? = $ac_status" >&5
++ echo "$as_me:5786: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:5762: \"$ac_try\"") >&5
++ { (eval echo "$as_me:5789: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:5765: \$? = $ac_status" >&5
++ echo "$as_me:5792: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_ncurses_header=$cf_header; break
+ else
+@@ -5773,11 +5800,11 @@
+ done
+
+ fi
+-echo "$as_me:5776: result: $cf_cv_ncurses_header" >&5
++echo "$as_me:5803: 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:5780: error: No curses header-files found" >&5
++ { { echo "$as_me:5807: error: No curses header-files found" >&5
+ echo "$as_me: error: No curses header-files found" >&2;}
+ { (exit 1); exit 1; }; }
+ fi
+@@ -5787,23 +5814,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:5790: checking for $ac_header" >&5
++echo "$as_me:5817: 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 5796 "configure"
++#line 5823 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:5800: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:5827: \"$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:5806: \$? = $ac_status" >&5
++ echo "$as_me:5833: \$? = $ac_status" >&5
+ (exit "$ac_status"); } >/dev/null; then
+ if test -s conftest.err; then
+ ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -5822,7 +5849,7 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:5825: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
++echo "$as_me:5852: 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
+@@ -5878,7 +5905,7 @@
+ CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
+
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 5881 "configure"
++#line 5908 "configure"
+ #include "confdefs.h"
+ #include <stdio.h>
+ int
+@@ -5890,16 +5917,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:5893: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:5920: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:5896: \$? = $ac_status" >&5
++ echo "$as_me:5923: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:5899: \"$ac_try\"") >&5
++ { (eval echo "$as_me:5926: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:5902: \$? = $ac_status" >&5
++ echo "$as_me:5929: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ :
+ else
+@@ -5916,7 +5943,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}:5919: testing adding $cf_add_incdir to include-path ..." 1>&5
++echo "${as_me:-configure}:5946: testing adding $cf_add_incdir to include-path ..." 1>&5
+
+ CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
+
+@@ -5935,7 +5962,7 @@
+
+ }
+
+-echo "$as_me:5938: checking for $cf_ncuhdr_root header in include-path" >&5
++echo "$as_me:5965: 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
+@@ -5947,7 +5974,7 @@
+ do
+
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 5950 "configure"
++#line 5977 "configure"
+ #include "confdefs.h"
+
+ #include <$cf_header>
+@@ -5971,16 +5998,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:5974: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:6001: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:5977: \$? = $ac_status" >&5
++ echo "$as_me:6004: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:5980: \"$ac_try\"") >&5
++ { (eval echo "$as_me:6007: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:5983: \$? = $ac_status" >&5
++ echo "$as_me:6010: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_ncurses_h=$cf_header
+
+@@ -5995,14 +6022,14 @@
+ done
+
+ fi
+-echo "$as_me:5998: result: $cf_cv_ncurses_h" >&5
++echo "$as_me:6025: 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:6005: checking for $cf_ncuhdr_root include-path" >&5
++echo "$as_me:6032: 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
+@@ -6123,7 +6150,7 @@
+ CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
+
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 6126 "configure"
++#line 6153 "configure"
+ #include "confdefs.h"
+ #include <stdio.h>
+ int
+@@ -6135,16 +6162,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:6138: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:6165: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:6141: \$? = $ac_status" >&5
++ echo "$as_me:6168: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:6144: \"$ac_try\"") >&5
++ { (eval echo "$as_me:6171: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:6147: \$? = $ac_status" >&5
++ echo "$as_me:6174: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ :
+ else
+@@ -6161,7 +6188,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}:6164: testing adding $cf_add_incdir to include-path ..." 1>&5
++echo "${as_me:-configure}:6191: testing adding $cf_add_incdir to include-path ..." 1>&5
+
+ CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
+
+@@ -6184,7 +6211,7 @@
+ do
+
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 6187 "configure"
++#line 6214 "configure"
+ #include "confdefs.h"
+
+ #include <$cf_header>
+@@ -6208,16 +6235,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:6211: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:6238: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:6214: \$? = $ac_status" >&5
++ echo "$as_me:6241: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:6217: \"$ac_try\"") >&5
++ { (eval echo "$as_me:6244: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:6220: \$? = $ac_status" >&5
++ echo "$as_me:6247: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_ncurses_h2=$cf_header
+
+@@ -6238,12 +6265,12 @@
+ CPPFLAGS="$cf_save2_CPPFLAGS"
+ test "$cf_cv_ncurses_h2" != no && break
+ done
+- test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:6241: error: not found" >&5
++ test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:6268: error: not found" >&5
+ echo "$as_me: error: not found" >&2;}
+ { (exit 1); exit 1; }; }
+
+ fi
+-echo "$as_me:6246: result: $cf_cv_ncurses_h2" >&5
++echo "$as_me:6273: 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%/[^/]*$%%'`
+@@ -6279,7 +6306,7 @@
+ CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
+
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 6282 "configure"
++#line 6309 "configure"
+ #include "confdefs.h"
+ #include <stdio.h>
+ int
+@@ -6291,16 +6318,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:6294: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:6321: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:6297: \$? = $ac_status" >&5
++ echo "$as_me:6324: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:6300: \"$ac_try\"") >&5
++ { (eval echo "$as_me:6327: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:6303: \$? = $ac_status" >&5
++ echo "$as_me:6330: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ :
+ else
+@@ -6317,7 +6344,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}:6320: testing adding $cf_add_incdir to include-path ..." 1>&5
++echo "${as_me:-configure}:6347: testing adding $cf_add_incdir to include-path ..." 1>&5
+
+ CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
+
+@@ -6365,7 +6392,7 @@
+ ;;
+ esac
+
+-echo "$as_me:6368: checking for terminfo header" >&5
++echo "$as_me:6395: 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
+@@ -6383,7 +6410,7 @@
+ for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h"
+ do
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 6386 "configure"
++#line 6413 "configure"
+ #include "confdefs.h"
+ #include <stdio.h>
+ #include <${cf_cv_ncurses_header:-curses.h}>
+@@ -6398,16 +6425,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:6401: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:6428: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:6404: \$? = $ac_status" >&5
++ echo "$as_me:6431: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:6407: \"$ac_try\"") >&5
++ { (eval echo "$as_me:6434: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:6410: \$? = $ac_status" >&5
++ echo "$as_me:6437: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+
+ cf_cv_term_header="$cf_test"
+@@ -6423,7 +6450,7 @@
+ done
+
+ fi
+-echo "$as_me:6426: result: $cf_cv_term_header" >&5
++echo "$as_me:6453: result: $cf_cv_term_header" >&5
+ echo "${ECHO_T}$cf_cv_term_header" >&6
+
+ # Set definitions to allow ifdef'ing to accommodate subdirectories
+@@ -6461,7 +6488,7 @@
+ #define NCURSES 1
+ EOF
+
+-echo "$as_me:6464: checking for ncurses version" >&5
++echo "$as_me:6491: 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
+@@ -6487,10 +6514,10 @@
+ #endif
+ EOF
+ cf_try="$ac_cpp conftest.$ac_ext 2>&5 | grep '^Autoconf ' >conftest.out"
+- { (eval echo "$as_me:6490: \"$cf_try\"") >&5
++ { (eval echo "$as_me:6517: \"$cf_try\"") >&5
+ (eval $cf_try) 2>&5
+ ac_status=$?
+- echo "$as_me:6493: \$? = $ac_status" >&5
++ echo "$as_me:6520: \$? = $ac_status" >&5
+ (exit "$ac_status"); }
+ if test -f conftest.out ; then
+ cf_out=`sed -e 's%^Autoconf %%' -e 's%^[^"]*"%%' -e 's%".*%%' conftest.out`
+@@ -6500,7 +6527,7 @@
+
+ else
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 6503 "configure"
++#line 6530 "configure"
+ #include "confdefs.h"
+
+ $ac_includes_default
+@@ -6527,15 +6554,15 @@
+ }
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:6530: \"$ac_link\"") >&5
++if { (eval echo "$as_me:6557: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:6533: \$? = $ac_status" >&5
++ echo "$as_me:6560: \$? = $ac_status" >&5
+ (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+- { (eval echo "$as_me:6535: \"$ac_try\"") >&5
++ { (eval echo "$as_me:6562: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:6538: \$? = $ac_status" >&5
++ echo "$as_me:6565: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+
+ cf_cv_ncurses_version=`cat $cf_tempfile`
+@@ -6549,7 +6576,7 @@
+ rm -f "$cf_tempfile"
+
+ fi
+-echo "$as_me:6552: result: $cf_cv_ncurses_version" >&5
++echo "$as_me:6579: result: $cf_cv_ncurses_version" >&5
+ echo "${ECHO_T}$cf_cv_ncurses_version" >&6
+ test "$cf_cv_ncurses_version" = no ||
+ cat >>confdefs.h <<\EOF
+@@ -6562,7 +6589,7 @@
+ # to link gpm.
+ cf_ncurses_LIBS=""
+ cf_ncurses_SAVE="$LIBS"
+-echo "$as_me:6565: checking for Gpm_Open in -lgpm" >&5
++echo "$as_me:6592: 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
+@@ -6570,7 +6597,7 @@
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lgpm $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 6573 "configure"
++#line 6600 "configure"
+ #include "confdefs.h"
+
+ /* Override any gcc2 internal prototype to avoid an error. */
+@@ -6589,16 +6616,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:6592: \"$ac_link\"") >&5
++if { (eval echo "$as_me:6619: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:6595: \$? = $ac_status" >&5
++ echo "$as_me:6622: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:6598: \"$ac_try\"") >&5
++ { (eval echo "$as_me:6625: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:6601: \$? = $ac_status" >&5
++ echo "$as_me:6628: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_lib_gpm_Gpm_Open=yes
+ else
+@@ -6609,10 +6636,10 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:6612: result: $ac_cv_lib_gpm_Gpm_Open" >&5
++echo "$as_me:6639: 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:6615: checking for initscr in -lgpm" >&5
++ echo "$as_me:6642: 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
+@@ -6620,7 +6647,7 @@
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lgpm $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 6623 "configure"
++#line 6650 "configure"
+ #include "confdefs.h"
+
+ /* Override any gcc2 internal prototype to avoid an error. */
+@@ -6639,16 +6666,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:6642: \"$ac_link\"") >&5
++if { (eval echo "$as_me:6669: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:6645: \$? = $ac_status" >&5
++ echo "$as_me:6672: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:6648: \"$ac_try\"") >&5
++ { (eval echo "$as_me:6675: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:6651: \$? = $ac_status" >&5
++ echo "$as_me:6678: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_lib_gpm_initscr=yes
+ else
+@@ -6659,7 +6686,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:6662: result: $ac_cv_lib_gpm_initscr" >&5
++echo "$as_me:6689: 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"
+@@ -6674,7 +6701,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:6677: checking for tgoto in -lmytinfo" >&5
++ echo "$as_me:6704: 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
+@@ -6682,7 +6709,7 @@
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lmytinfo $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 6685 "configure"
++#line 6712 "configure"
+ #include "confdefs.h"
+
+ /* Override any gcc2 internal prototype to avoid an error. */
+@@ -6701,16 +6728,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:6704: \"$ac_link\"") >&5
++if { (eval echo "$as_me:6731: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:6707: \$? = $ac_status" >&5
++ echo "$as_me:6734: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:6710: \"$ac_try\"") >&5
++ { (eval echo "$as_me:6737: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:6713: \$? = $ac_status" >&5
++ echo "$as_me:6740: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_lib_mytinfo_tgoto=yes
+ else
+@@ -6721,7 +6748,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:6724: result: $ac_cv_lib_mytinfo_tgoto" >&5
++echo "$as_me:6751: 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"
+@@ -6770,13 +6797,13 @@
+
+ eval 'cf_cv_have_lib_'"$cf_nculib_root"'=no'
+ cf_libdir=""
+- echo "$as_me:6773: checking for initscr" >&5
++ echo "$as_me:6800: 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 6779 "configure"
++#line 6806 "configure"
+ #include "confdefs.h"
+ #define initscr autoconf_temporary
+ #include <limits.h> /* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -6807,16 +6834,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:6810: \"$ac_link\"") >&5
++if { (eval echo "$as_me:6837: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:6813: \$? = $ac_status" >&5
++ echo "$as_me:6840: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:6816: \"$ac_try\"") >&5
++ { (eval echo "$as_me:6843: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:6819: \$? = $ac_status" >&5
++ echo "$as_me:6846: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_func_initscr=yes
+ else
+@@ -6826,18 +6853,18 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:6829: result: $ac_cv_func_initscr" >&5
++echo "$as_me:6856: 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:6836: checking for initscr in -l$cf_nculib_root" >&5
++ echo "$as_me:6863: 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 6840 "configure"
++#line 6867 "configure"
+ #include "confdefs.h"
+ #include <${cf_cv_ncurses_header:-curses.h}>
+ int
+@@ -6849,25 +6876,25 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:6852: \"$ac_link\"") >&5
++if { (eval echo "$as_me:6879: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:6855: \$? = $ac_status" >&5
++ echo "$as_me:6882: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:6858: \"$ac_try\"") >&5
++ { (eval echo "$as_me:6885: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:6861: \$? = $ac_status" >&5
++ echo "$as_me:6888: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+- echo "$as_me:6863: result: yes" >&5
++ echo "$as_me:6890: 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:6870: result: no" >&5
++echo "$as_me:6897: result: no" >&5
+ echo "${ECHO_T}no" >&6
+
+ cf_search=
+@@ -6935,11 +6962,11 @@
+
+ for cf_libdir in $cf_search
+ do
+- echo "$as_me:6938: checking for -l$cf_nculib_root in $cf_libdir" >&5
++ echo "$as_me:6965: 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 6942 "configure"
++#line 6969 "configure"
+ #include "confdefs.h"
+ #include <${cf_cv_ncurses_header:-curses.h}>
+ int
+@@ -6951,25 +6978,25 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:6954: \"$ac_link\"") >&5
++if { (eval echo "$as_me:6981: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:6957: \$? = $ac_status" >&5
++ echo "$as_me:6984: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:6960: \"$ac_try\"") >&5
++ { (eval echo "$as_me:6987: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:6963: \$? = $ac_status" >&5
++ echo "$as_me:6990: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+- echo "$as_me:6965: result: yes" >&5
++ echo "$as_me:6992: 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:6972: result: no" >&5
++echo "$as_me:6999: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ LIBS="$cf_save_LIBS"
+ fi
+@@ -6984,7 +7011,7 @@
+ eval 'cf_found_library="$cf_cv_have_lib_'"$cf_nculib_root"\"
+
+ if test "$cf_found_library" = no ; then
+- { { echo "$as_me:6987: error: Cannot link $cf_nculib_root library" >&5
++ { { echo "$as_me:7014: error: Cannot link $cf_nculib_root library" >&5
+ echo "$as_me: error: Cannot link $cf_nculib_root library" >&2;}
+ { (exit 1); exit 1; }; }
+ fi
+@@ -6992,7 +7019,7 @@
+ fi
+
+ if test -n "$cf_ncurses_LIBS" ; then
+- echo "$as_me:6995: checking if we can link $cf_nculib_root without $cf_ncurses_LIBS" >&5
++ echo "$as_me:7022: 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
+@@ -7002,7 +7029,7 @@
+ fi
+ done
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 7005 "configure"
++#line 7032 "configure"
+ #include "confdefs.h"
+ #include <${cf_cv_ncurses_header:-curses.h}>
+ int
+@@ -7014,23 +7041,23 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:7017: \"$ac_link\"") >&5
++if { (eval echo "$as_me:7044: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:7020: \$? = $ac_status" >&5
++ echo "$as_me:7047: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:7023: \"$ac_try\"") >&5
++ { (eval echo "$as_me:7050: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:7026: \$? = $ac_status" >&5
++ echo "$as_me:7053: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+- echo "$as_me:7028: result: yes" >&5
++ echo "$as_me:7055: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ else
+ echo "$as_me: failed program was:" >&5
+ cat "conftest.$ac_ext" >&5
+-echo "$as_me:7033: result: no" >&5
++echo "$as_me:7060: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ LIBS="$cf_ncurses_SAVE"
+ fi
+@@ -7048,7 +7075,7 @@
+ NCURSES_CONFIG=none
+ fi
+
+-echo "$as_me:7051: checking for specified curses library type" >&5
++echo "$as_me:7078: 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.
+@@ -7068,23 +7095,23 @@
+ for ac_header in wchar.h
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-echo "$as_me:7071: checking for $ac_header" >&5
++echo "$as_me:7098: 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 7077 "configure"
++#line 7104 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:7081: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:7108: \"$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:7087: \$? = $ac_status" >&5
++ echo "$as_me:7114: \$? = $ac_status" >&5
+ (exit "$ac_status"); } >/dev/null; then
+ if test -s conftest.err; then
+ ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -7103,7 +7130,7 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:7106: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
++echo "$as_me:7133: 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
+@@ -7113,7 +7140,7 @@
+ fi
+ done
+
+-echo "$as_me:7116: checking for multibyte character support" >&5
++echo "$as_me:7143: 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
+@@ -7121,7 +7148,7 @@
+
+ cf_save_LIBS="$LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 7124 "configure"
++#line 7151 "configure"
+ #include "confdefs.h"
+
+ $ac_includes_default
+@@ -7138,16 +7165,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:7141: \"$ac_link\"") >&5
++if { (eval echo "$as_me:7168: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:7144: \$? = $ac_status" >&5
++ echo "$as_me:7171: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:7147: \"$ac_try\"") >&5
++ { (eval echo "$as_me:7174: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:7150: \$? = $ac_status" >&5
++ echo "$as_me:7177: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_utf8_lib=yes
+ else
+@@ -7159,12 +7186,12 @@
+ cf_cv_header_path_utf8=
+ cf_cv_library_path_utf8=
+
+-echo "${as_me:-configure}:7162: testing Starting FIND_LINKAGE(utf8,) ..." 1>&5
++echo "${as_me:-configure}:7189: testing Starting FIND_LINKAGE(utf8,) ..." 1>&5
+
+ cf_save_LIBS="$LIBS"
+
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 7167 "configure"
++#line 7194 "configure"
+ #include "confdefs.h"
+
+ #include <libutf8.h>
+@@ -7177,16 +7204,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:7180: \"$ac_link\"") >&5
++if { (eval echo "$as_me:7207: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:7183: \$? = $ac_status" >&5
++ echo "$as_me:7210: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:7186: \"$ac_try\"") >&5
++ { (eval echo "$as_me:7213: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:7189: \$? = $ac_status" >&5
++ echo "$as_me:7216: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+
+ cf_cv_find_linkage_utf8=yes
+@@ -7200,7 +7227,7 @@
+ LIBS="-lutf8 $cf_save_LIBS"
+
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 7203 "configure"
++#line 7230 "configure"
+ #include "confdefs.h"
+
+ #include <libutf8.h>
+@@ -7213,16 +7240,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:7216: \"$ac_link\"") >&5
++if { (eval echo "$as_me:7243: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:7219: \$? = $ac_status" >&5
++ echo "$as_me:7246: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:7222: \"$ac_try\"") >&5
++ { (eval echo "$as_me:7249: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:7225: \$? = $ac_status" >&5
++ echo "$as_me:7252: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+
+ cf_cv_find_linkage_utf8=yes
+@@ -7239,9 +7266,9 @@
+
+ test -n "$verbose" && echo " find linkage for utf8 library" 1>&6
+
+-echo "${as_me:-configure}:7242: testing find linkage for utf8 library ..." 1>&5
++echo "${as_me:-configure}:7269: testing find linkage for utf8 library ..." 1>&5
+
+-echo "${as_me:-configure}:7244: testing Searching for headers in FIND_LINKAGE(utf8,) ..." 1>&5
++echo "${as_me:-configure}:7271: testing Searching for headers in FIND_LINKAGE(utf8,) ..." 1>&5
+
+ cf_save_CPPFLAGS="$CPPFLAGS"
+ cf_test_CPPFLAGS="$CPPFLAGS"
+@@ -7332,7 +7359,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}:7335: testing ... testing $cf_cv_header_path_utf8 ..." 1>&5
++echo "${as_me:-configure}:7362: testing ... testing $cf_cv_header_path_utf8 ..." 1>&5
+
+ CPPFLAGS="$cf_save_CPPFLAGS"
+
+@@ -7340,7 +7367,7 @@
+ CPPFLAGS="${CPPFLAGS}-I$cf_cv_header_path_utf8"
+
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 7343 "configure"
++#line 7370 "configure"
+ #include "confdefs.h"
+
+ #include <libutf8.h>
+@@ -7353,21 +7380,21 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:7356: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:7383: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:7359: \$? = $ac_status" >&5
++ echo "$as_me:7386: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:7362: \"$ac_try\"") >&5
++ { (eval echo "$as_me:7389: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:7365: \$? = $ac_status" >&5
++ echo "$as_me:7392: \$? = $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}:7370: testing ... found utf8 headers in $cf_cv_header_path_utf8 ..." 1>&5
++echo "${as_me:-configure}:7397: testing ... found utf8 headers in $cf_cv_header_path_utf8 ..." 1>&5
+
+ cf_cv_find_linkage_utf8=maybe
+ cf_test_CPPFLAGS="$CPPFLAGS"
+@@ -7385,7 +7412,7 @@
+
+ if test "$cf_cv_find_linkage_utf8" = maybe ; then
+
+-echo "${as_me:-configure}:7388: testing Searching for utf8 library in FIND_LINKAGE(utf8,) ..." 1>&5
++echo "${as_me:-configure}:7415: testing Searching for utf8 library in FIND_LINKAGE(utf8,) ..." 1>&5
+
+ cf_save_LIBS="$LIBS"
+ cf_save_LDFLAGS="$LDFLAGS"
+@@ -7460,13 +7487,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}:7463: testing ... testing $cf_cv_library_path_utf8 ..." 1>&5
++echo "${as_me:-configure}:7490: 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 7469 "configure"
++#line 7496 "configure"
+ #include "confdefs.h"
+
+ #include <libutf8.h>
+@@ -7479,21 +7506,21 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:7482: \"$ac_link\"") >&5
++if { (eval echo "$as_me:7509: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:7485: \$? = $ac_status" >&5
++ echo "$as_me:7512: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:7488: \"$ac_try\"") >&5
++ { (eval echo "$as_me:7515: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:7491: \$? = $ac_status" >&5
++ echo "$as_me:7518: \$? = $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}:7496: testing ... found utf8 library in $cf_cv_library_path_utf8 ..." 1>&5
++echo "${as_me:-configure}:7523: testing ... found utf8 library in $cf_cv_library_path_utf8 ..." 1>&5
+
+ cf_cv_find_linkage_utf8=yes
+ cf_cv_library_file_utf8="-lutf8"
+@@ -7535,7 +7562,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:7538: result: $cf_cv_utf8_lib" >&5
++echo "$as_me:7565: 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
+@@ -7573,7 +7600,7 @@
+ CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
+
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 7576 "configure"
++#line 7603 "configure"
+ #include "confdefs.h"
+ #include <stdio.h>
+ int
+@@ -7585,16 +7612,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:7588: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:7615: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:7591: \$? = $ac_status" >&5
++ echo "$as_me:7618: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:7594: \"$ac_try\"") >&5
++ { (eval echo "$as_me:7621: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:7597: \$? = $ac_status" >&5
++ echo "$as_me:7624: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ :
+ else
+@@ -7611,7 +7638,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}:7614: testing adding $cf_add_incdir to include-path ..." 1>&5
++echo "${as_me:-configure}:7641: testing adding $cf_add_incdir to include-path ..." 1>&5
+
+ CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
+
+@@ -7647,7 +7674,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}:7650: testing adding $cf_add_libdir to library-path ..." 1>&5
++echo "${as_me:-configure}:7677: testing adding $cf_add_libdir to library-path ..." 1>&5
+
+ LDFLAGS="-L$cf_add_libdir $LDFLAGS"
+ fi
+@@ -7677,13 +7704,13 @@
+ cf_have_ncuconfig=no
+
+ if test "x${PKG_CONFIG:=none}" != xnone; then
+- echo "$as_me:7680: checking pkg-config for $cf_ncuconfig_root" >&5
++ echo "$as_me:7707: 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:7683: result: yes" >&5
++ echo "$as_me:7710: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+
+- echo "$as_me:7686: checking if the $cf_ncuconfig_root package files work" >&5
++ echo "$as_me:7713: 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
+
+@@ -7816,7 +7843,7 @@
+ LIBS="$cf_add_libs"
+
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 7819 "configure"
++#line 7846 "configure"
+ #include "confdefs.h"
+ #include <${cf_cv_ncurses_header:-curses.h}>
+ int
+@@ -7828,37 +7855,37 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:7831: \"$ac_link\"") >&5
++if { (eval echo "$as_me:7858: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:7834: \$? = $ac_status" >&5
++ echo "$as_me:7861: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:7837: \"$ac_try\"") >&5
++ { (eval echo "$as_me:7864: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:7840: \$? = $ac_status" >&5
++ echo "$as_me:7867: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ if test "$cross_compiling" = yes; then
+ cf_test_ncuconfig=maybe
+ else
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 7846 "configure"
++#line 7873 "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:7853: \"$ac_link\"") >&5
++if { (eval echo "$as_me:7880: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:7856: \$? = $ac_status" >&5
++ echo "$as_me:7883: \$? = $ac_status" >&5
+ (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+- { (eval echo "$as_me:7858: \"$ac_try\"") >&5
++ { (eval echo "$as_me:7885: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:7861: \$? = $ac_status" >&5
++ echo "$as_me:7888: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_test_ncuconfig=yes
+ else
+@@ -8032,7 +8059,7 @@
+ LIBS="$cf_add_libs"
+
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 8035 "configure"
++#line 8062 "configure"
+ #include "confdefs.h"
+ #include <${cf_cv_ncurses_header:-curses.h}>
+ int
+@@ -8044,37 +8071,37 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:8047: \"$ac_link\"") >&5
++if { (eval echo "$as_me:8074: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:8050: \$? = $ac_status" >&5
++ echo "$as_me:8077: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:8053: \"$ac_try\"") >&5
++ { (eval echo "$as_me:8080: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:8056: \$? = $ac_status" >&5
++ echo "$as_me:8083: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ if test "$cross_compiling" = yes; then
+ cf_have_ncuconfig=maybe
+ else
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 8062 "configure"
++#line 8089 "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:8069: \"$ac_link\"") >&5
++if { (eval echo "$as_me:8096: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:8072: \$? = $ac_status" >&5
++ echo "$as_me:8099: \$? = $ac_status" >&5
+ (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+- { (eval echo "$as_me:8074: \"$ac_try\"") >&5
++ { (eval echo "$as_me:8101: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:8077: \$? = $ac_status" >&5
++ echo "$as_me:8104: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_have_ncuconfig=yes
+ else
+@@ -8091,7 +8118,7 @@
+ cf_have_ncuconfig=no
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+- echo "$as_me:8094: result: $cf_have_ncuconfig" >&5
++ echo "$as_me:8121: 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"
+@@ -8107,7 +8134,7 @@
+
+ NCURSES_CONFIG_PKG=$cf_ncuconfig_root
+
+-echo "$as_me:8110: checking for terminfo header" >&5
++echo "$as_me:8137: 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
+@@ -8125,7 +8152,7 @@
+ for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h"
+ do
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 8128 "configure"
++#line 8155 "configure"
+ #include "confdefs.h"
+ #include <stdio.h>
+ #include <${cf_cv_ncurses_header:-curses.h}>
+@@ -8140,16 +8167,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:8143: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:8170: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:8146: \$? = $ac_status" >&5
++ echo "$as_me:8173: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:8149: \"$ac_try\"") >&5
++ { (eval echo "$as_me:8176: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:8152: \$? = $ac_status" >&5
++ echo "$as_me:8179: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+
+ cf_cv_term_header="$cf_test"
+@@ -8165,7 +8192,7 @@
+ done
+
+ fi
+-echo "$as_me:8168: result: $cf_cv_term_header" >&5
++echo "$as_me:8195: result: $cf_cv_term_header" >&5
+ echo "${ECHO_T}$cf_cv_term_header" >&6
+
+ # Set definitions to allow ifdef'ing to accommodate subdirectories
+@@ -8200,7 +8227,7 @@
+ fi
+
+ else
+- echo "$as_me:8203: result: no" >&5
++ echo "$as_me:8230: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ NCURSES_CONFIG_PKG=none
+ fi
+@@ -8216,7 +8243,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:8219: checking for $ac_word" >&5
++echo "$as_me:8246: 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
+@@ -8231,7 +8258,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:8234: found $ac_dir/$ac_word" >&5
++echo "$as_me:8261: found $ac_dir/$ac_word" >&5
+ break
+ done
+
+@@ -8239,10 +8266,10 @@
+ fi
+ NCURSES_CONFIG=$ac_cv_prog_NCURSES_CONFIG
+ if test -n "$NCURSES_CONFIG"; then
+- echo "$as_me:8242: result: $NCURSES_CONFIG" >&5
++ echo "$as_me:8269: result: $NCURSES_CONFIG" >&5
+ echo "${ECHO_T}$NCURSES_CONFIG" >&6
+ else
+- echo "$as_me:8245: result: no" >&5
++ echo "$as_me:8272: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+
+@@ -8255,7 +8282,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:8258: checking for $ac_word" >&5
++echo "$as_me:8285: 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
+@@ -8270,7 +8297,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:8273: found $ac_dir/$ac_word" >&5
++echo "$as_me:8300: found $ac_dir/$ac_word" >&5
+ break
+ done
+
+@@ -8278,10 +8305,10 @@
+ fi
+ ac_ct_NCURSES_CONFIG=$ac_cv_prog_ac_ct_NCURSES_CONFIG
+ if test -n "$ac_ct_NCURSES_CONFIG"; then
+- echo "$as_me:8281: result: $ac_ct_NCURSES_CONFIG" >&5
++ echo "$as_me:8308: result: $ac_ct_NCURSES_CONFIG" >&5
+ echo "${ECHO_T}$ac_ct_NCURSES_CONFIG" >&6
+ else
+- echo "$as_me:8284: result: no" >&5
++ echo "$as_me:8311: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+
+@@ -8438,7 +8465,7 @@
+
+ # even with config script, some packages use no-override for curses.h
+
+-echo "$as_me:8441: checking if we have identified curses headers" >&5
++echo "$as_me:8468: 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
+@@ -8450,7 +8477,7 @@
+ curses.h $cf_cv_screen/curses.h
+ do
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 8453 "configure"
++#line 8480 "configure"
+ #include "confdefs.h"
+ #include <${cf_header}>
+ int
+@@ -8462,16 +8489,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:8465: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:8492: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:8468: \$? = $ac_status" >&5
++ echo "$as_me:8495: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:8471: \"$ac_try\"") >&5
++ { (eval echo "$as_me:8498: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:8474: \$? = $ac_status" >&5
++ echo "$as_me:8501: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_ncurses_header=$cf_header; break
+ else
+@@ -8482,11 +8509,11 @@
+ done
+
+ fi
+-echo "$as_me:8485: result: $cf_cv_ncurses_header" >&5
++echo "$as_me:8512: 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:8489: error: No curses header-files found" >&5
++ { { echo "$as_me:8516: error: No curses header-files found" >&5
+ echo "$as_me: error: No curses header-files found" >&2;}
+ { (exit 1); exit 1; }; }
+ fi
+@@ -8496,23 +8523,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:8499: checking for $ac_header" >&5
++echo "$as_me:8526: 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 8505 "configure"
++#line 8532 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:8509: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:8536: \"$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:8515: \$? = $ac_status" >&5
++ echo "$as_me:8542: \$? = $ac_status" >&5
+ (exit "$ac_status"); } >/dev/null; then
+ if test -s conftest.err; then
+ ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -8531,7 +8558,7 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:8534: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
++echo "$as_me:8561: 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
+@@ -8587,7 +8614,7 @@
+ CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
+
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 8590 "configure"
++#line 8617 "configure"
+ #include "confdefs.h"
+ #include <stdio.h>
+ int
+@@ -8599,16 +8626,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:8602: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:8629: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:8605: \$? = $ac_status" >&5
++ echo "$as_me:8632: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:8608: \"$ac_try\"") >&5
++ { (eval echo "$as_me:8635: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:8611: \$? = $ac_status" >&5
++ echo "$as_me:8638: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ :
+ else
+@@ -8625,7 +8652,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}:8628: testing adding $cf_add_incdir to include-path ..." 1>&5
++echo "${as_me:-configure}:8655: testing adding $cf_add_incdir to include-path ..." 1>&5
+
+ CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
+
+@@ -8644,7 +8671,7 @@
+
+ }
+
+-echo "$as_me:8647: checking for $cf_ncuhdr_root header in include-path" >&5
++echo "$as_me:8674: 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
+@@ -8656,7 +8683,7 @@
+ do
+
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 8659 "configure"
++#line 8686 "configure"
+ #include "confdefs.h"
+
+ #include <$cf_header>
+@@ -8680,16 +8707,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:8683: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:8710: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:8686: \$? = $ac_status" >&5
++ echo "$as_me:8713: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:8689: \"$ac_try\"") >&5
++ { (eval echo "$as_me:8716: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:8692: \$? = $ac_status" >&5
++ echo "$as_me:8719: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_ncurses_h=$cf_header
+
+@@ -8704,14 +8731,14 @@
+ done
+
+ fi
+-echo "$as_me:8707: result: $cf_cv_ncurses_h" >&5
++echo "$as_me:8734: 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:8714: checking for $cf_ncuhdr_root include-path" >&5
++echo "$as_me:8741: 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
+@@ -8832,7 +8859,7 @@
+ CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
+
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 8835 "configure"
++#line 8862 "configure"
+ #include "confdefs.h"
+ #include <stdio.h>
+ int
+@@ -8844,16 +8871,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:8847: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:8874: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:8850: \$? = $ac_status" >&5
++ echo "$as_me:8877: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:8853: \"$ac_try\"") >&5
++ { (eval echo "$as_me:8880: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:8856: \$? = $ac_status" >&5
++ echo "$as_me:8883: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ :
+ else
+@@ -8870,7 +8897,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}:8873: testing adding $cf_add_incdir to include-path ..." 1>&5
++echo "${as_me:-configure}:8900: testing adding $cf_add_incdir to include-path ..." 1>&5
+
+ CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
+
+@@ -8893,7 +8920,7 @@
+ do
+
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 8896 "configure"
++#line 8923 "configure"
+ #include "confdefs.h"
+
+ #include <$cf_header>
+@@ -8917,16 +8944,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:8920: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:8947: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:8923: \$? = $ac_status" >&5
++ echo "$as_me:8950: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:8926: \"$ac_try\"") >&5
++ { (eval echo "$as_me:8953: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:8929: \$? = $ac_status" >&5
++ echo "$as_me:8956: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_ncurses_h2=$cf_header
+
+@@ -8947,12 +8974,12 @@
+ CPPFLAGS="$cf_save2_CPPFLAGS"
+ test "$cf_cv_ncurses_h2" != no && break
+ done
+- test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:8950: error: not found" >&5
++ test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:8977: error: not found" >&5
+ echo "$as_me: error: not found" >&2;}
+ { (exit 1); exit 1; }; }
+
+ fi
+-echo "$as_me:8955: result: $cf_cv_ncurses_h2" >&5
++echo "$as_me:8982: 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%/[^/]*$%%'`
+@@ -8988,7 +9015,7 @@
+ CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
+
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 8991 "configure"
++#line 9018 "configure"
+ #include "confdefs.h"
+ #include <stdio.h>
+ int
+@@ -9000,16 +9027,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:9003: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:9030: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:9006: \$? = $ac_status" >&5
++ echo "$as_me:9033: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:9009: \"$ac_try\"") >&5
++ { (eval echo "$as_me:9036: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:9012: \$? = $ac_status" >&5
++ echo "$as_me:9039: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ :
+ else
+@@ -9026,7 +9053,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}:9029: testing adding $cf_add_incdir to include-path ..." 1>&5
++echo "${as_me:-configure}:9056: testing adding $cf_add_incdir to include-path ..." 1>&5
+
+ CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
+
+@@ -9074,7 +9101,7 @@
+ ;;
+ esac
+
+-echo "$as_me:9077: checking for terminfo header" >&5
++echo "$as_me:9104: 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
+@@ -9092,7 +9119,7 @@
+ for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h"
+ do
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 9095 "configure"
++#line 9122 "configure"
+ #include "confdefs.h"
+ #include <stdio.h>
+ #include <${cf_cv_ncurses_header:-curses.h}>
+@@ -9107,16 +9134,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:9110: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:9137: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:9113: \$? = $ac_status" >&5
++ echo "$as_me:9140: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:9116: \"$ac_try\"") >&5
++ { (eval echo "$as_me:9143: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:9119: \$? = $ac_status" >&5
++ echo "$as_me:9146: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+
+ cf_cv_term_header="$cf_test"
+@@ -9132,7 +9159,7 @@
+ done
+
+ fi
+-echo "$as_me:9135: result: $cf_cv_term_header" >&5
++echo "$as_me:9162: result: $cf_cv_term_header" >&5
+ echo "${ECHO_T}$cf_cv_term_header" >&6
+
+ # Set definitions to allow ifdef'ing to accommodate subdirectories
+@@ -9170,7 +9197,7 @@
+ #define NCURSES 1
+ EOF
+
+-echo "$as_me:9173: checking for ncurses version" >&5
++echo "$as_me:9200: 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
+@@ -9196,10 +9223,10 @@
+ #endif
+ EOF
+ cf_try="$ac_cpp conftest.$ac_ext 2>&5 | grep '^Autoconf ' >conftest.out"
+- { (eval echo "$as_me:9199: \"$cf_try\"") >&5
++ { (eval echo "$as_me:9226: \"$cf_try\"") >&5
+ (eval $cf_try) 2>&5
+ ac_status=$?
+- echo "$as_me:9202: \$? = $ac_status" >&5
++ echo "$as_me:9229: \$? = $ac_status" >&5
+ (exit "$ac_status"); }
+ if test -f conftest.out ; then
+ cf_out=`sed -e 's%^Autoconf %%' -e 's%^[^"]*"%%' -e 's%".*%%' conftest.out`
+@@ -9209,7 +9236,7 @@
+
+ else
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 9212 "configure"
++#line 9239 "configure"
+ #include "confdefs.h"
+
+ $ac_includes_default
+@@ -9236,15 +9263,15 @@
+ }
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:9239: \"$ac_link\"") >&5
++if { (eval echo "$as_me:9266: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:9242: \$? = $ac_status" >&5
++ echo "$as_me:9269: \$? = $ac_status" >&5
+ (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+- { (eval echo "$as_me:9244: \"$ac_try\"") >&5
++ { (eval echo "$as_me:9271: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:9247: \$? = $ac_status" >&5
++ echo "$as_me:9274: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+
+ cf_cv_ncurses_version=`cat $cf_tempfile`
+@@ -9258,7 +9285,7 @@
+ rm -f "$cf_tempfile"
+
+ fi
+-echo "$as_me:9261: result: $cf_cv_ncurses_version" >&5
++echo "$as_me:9288: result: $cf_cv_ncurses_version" >&5
+ echo "${ECHO_T}$cf_cv_ncurses_version" >&6
+ test "$cf_cv_ncurses_version" = no ||
+ cat >>confdefs.h <<\EOF
+@@ -9271,7 +9298,7 @@
+ # to link gpm.
+ cf_ncurses_LIBS=""
+ cf_ncurses_SAVE="$LIBS"
+-echo "$as_me:9274: checking for Gpm_Open in -lgpm" >&5
++echo "$as_me:9301: 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
+@@ -9279,7 +9306,7 @@
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lgpm $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 9282 "configure"
++#line 9309 "configure"
+ #include "confdefs.h"
+
+ /* Override any gcc2 internal prototype to avoid an error. */
+@@ -9298,16 +9325,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:9301: \"$ac_link\"") >&5
++if { (eval echo "$as_me:9328: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:9304: \$? = $ac_status" >&5
++ echo "$as_me:9331: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:9307: \"$ac_try\"") >&5
++ { (eval echo "$as_me:9334: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:9310: \$? = $ac_status" >&5
++ echo "$as_me:9337: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_lib_gpm_Gpm_Open=yes
+ else
+@@ -9318,10 +9345,10 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:9321: result: $ac_cv_lib_gpm_Gpm_Open" >&5
++echo "$as_me:9348: 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:9324: checking for initscr in -lgpm" >&5
++ echo "$as_me:9351: 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
+@@ -9329,7 +9356,7 @@
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lgpm $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 9332 "configure"
++#line 9359 "configure"
+ #include "confdefs.h"
+
+ /* Override any gcc2 internal prototype to avoid an error. */
+@@ -9348,16 +9375,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:9351: \"$ac_link\"") >&5
++if { (eval echo "$as_me:9378: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:9354: \$? = $ac_status" >&5
++ echo "$as_me:9381: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:9357: \"$ac_try\"") >&5
++ { (eval echo "$as_me:9384: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:9360: \$? = $ac_status" >&5
++ echo "$as_me:9387: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_lib_gpm_initscr=yes
+ else
+@@ -9368,7 +9395,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:9371: result: $ac_cv_lib_gpm_initscr" >&5
++echo "$as_me:9398: 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"
+@@ -9383,7 +9410,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:9386: checking for tgoto in -lmytinfo" >&5
++ echo "$as_me:9413: 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
+@@ -9391,7 +9418,7 @@
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lmytinfo $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 9394 "configure"
++#line 9421 "configure"
+ #include "confdefs.h"
+
+ /* Override any gcc2 internal prototype to avoid an error. */
+@@ -9410,16 +9437,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:9413: \"$ac_link\"") >&5
++if { (eval echo "$as_me:9440: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:9416: \$? = $ac_status" >&5
++ echo "$as_me:9443: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:9419: \"$ac_try\"") >&5
++ { (eval echo "$as_me:9446: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:9422: \$? = $ac_status" >&5
++ echo "$as_me:9449: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_lib_mytinfo_tgoto=yes
+ else
+@@ -9430,7 +9457,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:9433: result: $ac_cv_lib_mytinfo_tgoto" >&5
++echo "$as_me:9460: 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"
+@@ -9479,13 +9506,13 @@
+
+ eval 'cf_cv_have_lib_'"$cf_nculib_root"'=no'
+ cf_libdir=""
+- echo "$as_me:9482: checking for initscr" >&5
++ echo "$as_me:9509: 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 9488 "configure"
++#line 9515 "configure"
+ #include "confdefs.h"
+ #define initscr autoconf_temporary
+ #include <limits.h> /* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -9516,16 +9543,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:9519: \"$ac_link\"") >&5
++if { (eval echo "$as_me:9546: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:9522: \$? = $ac_status" >&5
++ echo "$as_me:9549: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:9525: \"$ac_try\"") >&5
++ { (eval echo "$as_me:9552: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:9528: \$? = $ac_status" >&5
++ echo "$as_me:9555: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_func_initscr=yes
+ else
+@@ -9535,18 +9562,18 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:9538: result: $ac_cv_func_initscr" >&5
++echo "$as_me:9565: 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:9545: checking for initscr in -l$cf_nculib_root" >&5
++ echo "$as_me:9572: 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 9549 "configure"
++#line 9576 "configure"
+ #include "confdefs.h"
+ #include <${cf_cv_ncurses_header:-curses.h}>
+ int
+@@ -9558,25 +9585,25 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:9561: \"$ac_link\"") >&5
++if { (eval echo "$as_me:9588: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:9564: \$? = $ac_status" >&5
++ echo "$as_me:9591: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:9567: \"$ac_try\"") >&5
++ { (eval echo "$as_me:9594: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:9570: \$? = $ac_status" >&5
++ echo "$as_me:9597: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+- echo "$as_me:9572: result: yes" >&5
++ echo "$as_me:9599: 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:9579: result: no" >&5
++echo "$as_me:9606: result: no" >&5
+ echo "${ECHO_T}no" >&6
+
+ cf_search=
+@@ -9644,11 +9671,11 @@
+
+ for cf_libdir in $cf_search
+ do
+- echo "$as_me:9647: checking for -l$cf_nculib_root in $cf_libdir" >&5
++ echo "$as_me:9674: 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 9651 "configure"
++#line 9678 "configure"
+ #include "confdefs.h"
+ #include <${cf_cv_ncurses_header:-curses.h}>
+ int
+@@ -9660,25 +9687,25 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:9663: \"$ac_link\"") >&5
++if { (eval echo "$as_me:9690: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:9666: \$? = $ac_status" >&5
++ echo "$as_me:9693: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:9669: \"$ac_try\"") >&5
++ { (eval echo "$as_me:9696: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:9672: \$? = $ac_status" >&5
++ echo "$as_me:9699: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+- echo "$as_me:9674: result: yes" >&5
++ echo "$as_me:9701: 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:9681: result: no" >&5
++echo "$as_me:9708: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ LIBS="$cf_save_LIBS"
+ fi
+@@ -9693,7 +9720,7 @@
+ eval 'cf_found_library="$cf_cv_have_lib_'"$cf_nculib_root"\"
+
+ if test "$cf_found_library" = no ; then
+- { { echo "$as_me:9696: error: Cannot link $cf_nculib_root library" >&5
++ { { echo "$as_me:9723: error: Cannot link $cf_nculib_root library" >&5
+ echo "$as_me: error: Cannot link $cf_nculib_root library" >&2;}
+ { (exit 1); exit 1; }; }
+ fi
+@@ -9701,7 +9728,7 @@
+ fi
+
+ if test -n "$cf_ncurses_LIBS" ; then
+- echo "$as_me:9704: checking if we can link $cf_nculib_root without $cf_ncurses_LIBS" >&5
++ echo "$as_me:9731: 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
+@@ -9711,7 +9738,7 @@
+ fi
+ done
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 9714 "configure"
++#line 9741 "configure"
+ #include "confdefs.h"
+ #include <${cf_cv_ncurses_header:-curses.h}>
+ int
+@@ -9723,23 +9750,23 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:9726: \"$ac_link\"") >&5
++if { (eval echo "$as_me:9753: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:9729: \$? = $ac_status" >&5
++ echo "$as_me:9756: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:9732: \"$ac_try\"") >&5
++ { (eval echo "$as_me:9759: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:9735: \$? = $ac_status" >&5
++ echo "$as_me:9762: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+- echo "$as_me:9737: result: yes" >&5
++ echo "$as_me:9764: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ else
+ echo "$as_me: failed program was:" >&5
+ cat "conftest.$ac_ext" >&5
+-echo "$as_me:9742: result: no" >&5
++echo "$as_me:9769: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ LIBS="$cf_ncurses_SAVE"
+ fi
+@@ -9764,13 +9791,13 @@
+ cf_have_ncuconfig=no
+
+ if test "x${PKG_CONFIG:=none}" != xnone; then
+- echo "$as_me:9767: checking pkg-config for $cf_ncuconfig_root" >&5
++ echo "$as_me:9794: 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:9770: result: yes" >&5
++ echo "$as_me:9797: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+
+- echo "$as_me:9773: checking if the $cf_ncuconfig_root package files work" >&5
++ echo "$as_me:9800: 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
+
+@@ -9903,7 +9930,7 @@
+ LIBS="$cf_add_libs"
+
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 9906 "configure"
++#line 9933 "configure"
+ #include "confdefs.h"
+ #include <${cf_cv_ncurses_header:-curses.h}>
+ int
+@@ -9915,37 +9942,37 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:9918: \"$ac_link\"") >&5
++if { (eval echo "$as_me:9945: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:9921: \$? = $ac_status" >&5
++ echo "$as_me:9948: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:9924: \"$ac_try\"") >&5
++ { (eval echo "$as_me:9951: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:9927: \$? = $ac_status" >&5
++ echo "$as_me:9954: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ if test "$cross_compiling" = yes; then
+ cf_test_ncuconfig=maybe
+ else
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 9933 "configure"
++#line 9960 "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:9940: \"$ac_link\"") >&5
++if { (eval echo "$as_me:9967: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:9943: \$? = $ac_status" >&5
++ echo "$as_me:9970: \$? = $ac_status" >&5
+ (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+- { (eval echo "$as_me:9945: \"$ac_try\"") >&5
++ { (eval echo "$as_me:9972: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:9948: \$? = $ac_status" >&5
++ echo "$as_me:9975: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_test_ncuconfig=yes
+ else
+@@ -10119,7 +10146,7 @@
+ LIBS="$cf_add_libs"
+
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 10122 "configure"
++#line 10149 "configure"
+ #include "confdefs.h"
+ #include <${cf_cv_ncurses_header:-curses.h}>
+ int
+@@ -10131,37 +10158,37 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:10134: \"$ac_link\"") >&5
++if { (eval echo "$as_me:10161: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:10137: \$? = $ac_status" >&5
++ echo "$as_me:10164: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:10140: \"$ac_try\"") >&5
++ { (eval echo "$as_me:10167: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:10143: \$? = $ac_status" >&5
++ echo "$as_me:10170: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ if test "$cross_compiling" = yes; then
+ cf_have_ncuconfig=maybe
+ else
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 10149 "configure"
++#line 10176 "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:10156: \"$ac_link\"") >&5
++if { (eval echo "$as_me:10183: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:10159: \$? = $ac_status" >&5
++ echo "$as_me:10186: \$? = $ac_status" >&5
+ (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+- { (eval echo "$as_me:10161: \"$ac_try\"") >&5
++ { (eval echo "$as_me:10188: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:10164: \$? = $ac_status" >&5
++ echo "$as_me:10191: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_have_ncuconfig=yes
+ else
+@@ -10178,7 +10205,7 @@
+ cf_have_ncuconfig=no
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+- echo "$as_me:10181: result: $cf_have_ncuconfig" >&5
++ echo "$as_me:10208: 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"
+@@ -10194,7 +10221,7 @@
+
+ NCURSES_CONFIG_PKG=$cf_ncuconfig_root
+
+-echo "$as_me:10197: checking for terminfo header" >&5
++echo "$as_me:10224: 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
+@@ -10212,7 +10239,7 @@
+ for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h"
+ do
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 10215 "configure"
++#line 10242 "configure"
+ #include "confdefs.h"
+ #include <stdio.h>
+ #include <${cf_cv_ncurses_header:-curses.h}>
+@@ -10227,16 +10254,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:10230: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:10257: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:10233: \$? = $ac_status" >&5
++ echo "$as_me:10260: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:10236: \"$ac_try\"") >&5
++ { (eval echo "$as_me:10263: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:10239: \$? = $ac_status" >&5
++ echo "$as_me:10266: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+
+ cf_cv_term_header="$cf_test"
+@@ -10252,7 +10279,7 @@
+ done
+
+ fi
+-echo "$as_me:10255: result: $cf_cv_term_header" >&5
++echo "$as_me:10282: result: $cf_cv_term_header" >&5
+ echo "${ECHO_T}$cf_cv_term_header" >&6
+
+ # Set definitions to allow ifdef'ing to accommodate subdirectories
+@@ -10287,7 +10314,7 @@
+ fi
+
+ else
+- echo "$as_me:10290: result: no" >&5
++ echo "$as_me:10317: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ NCURSES_CONFIG_PKG=none
+ fi
+@@ -10303,7 +10330,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:10306: checking for $ac_word" >&5
++echo "$as_me:10333: 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
+@@ -10318,7 +10345,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:10321: found $ac_dir/$ac_word" >&5
++echo "$as_me:10348: found $ac_dir/$ac_word" >&5
+ break
+ done
+
+@@ -10326,10 +10353,10 @@
+ fi
+ NCURSES_CONFIG=$ac_cv_prog_NCURSES_CONFIG
+ if test -n "$NCURSES_CONFIG"; then
+- echo "$as_me:10329: result: $NCURSES_CONFIG" >&5
++ echo "$as_me:10356: result: $NCURSES_CONFIG" >&5
+ echo "${ECHO_T}$NCURSES_CONFIG" >&6
+ else
+- echo "$as_me:10332: result: no" >&5
++ echo "$as_me:10359: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+
+@@ -10342,7 +10369,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:10345: checking for $ac_word" >&5
++echo "$as_me:10372: 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
+@@ -10357,7 +10384,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:10360: found $ac_dir/$ac_word" >&5
++echo "$as_me:10387: found $ac_dir/$ac_word" >&5
+ break
+ done
+
+@@ -10365,10 +10392,10 @@
+ fi
+ ac_ct_NCURSES_CONFIG=$ac_cv_prog_ac_ct_NCURSES_CONFIG
+ if test -n "$ac_ct_NCURSES_CONFIG"; then
+- echo "$as_me:10368: result: $ac_ct_NCURSES_CONFIG" >&5
++ echo "$as_me:10395: result: $ac_ct_NCURSES_CONFIG" >&5
+ echo "${ECHO_T}$ac_ct_NCURSES_CONFIG" >&6
+ else
+- echo "$as_me:10371: result: no" >&5
++ echo "$as_me:10398: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+
+@@ -10525,7 +10552,7 @@
+
+ # even with config script, some packages use no-override for curses.h
+
+-echo "$as_me:10528: checking if we have identified curses headers" >&5
++echo "$as_me:10555: 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
+@@ -10537,7 +10564,7 @@
+ curses.h $cf_cv_screen/curses.h
+ do
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 10540 "configure"
++#line 10567 "configure"
+ #include "confdefs.h"
+ #include <${cf_header}>
+ int
+@@ -10549,16 +10576,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:10552: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:10579: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:10555: \$? = $ac_status" >&5
++ echo "$as_me:10582: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:10558: \"$ac_try\"") >&5
++ { (eval echo "$as_me:10585: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:10561: \$? = $ac_status" >&5
++ echo "$as_me:10588: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_ncurses_header=$cf_header; break
+ else
+@@ -10569,11 +10596,11 @@
+ done
+
+ fi
+-echo "$as_me:10572: result: $cf_cv_ncurses_header" >&5
++echo "$as_me:10599: 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:10576: error: No curses header-files found" >&5
++ { { echo "$as_me:10603: error: No curses header-files found" >&5
+ echo "$as_me: error: No curses header-files found" >&2;}
+ { (exit 1); exit 1; }; }
+ fi
+@@ -10583,23 +10610,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:10586: checking for $ac_header" >&5
++echo "$as_me:10613: 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 10592 "configure"
++#line 10619 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:10596: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:10623: \"$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:10602: \$? = $ac_status" >&5
++ echo "$as_me:10629: \$? = $ac_status" >&5
+ (exit "$ac_status"); } >/dev/null; then
+ if test -s conftest.err; then
+ ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -10618,7 +10645,7 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:10621: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
++echo "$as_me:10648: 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
+@@ -10674,7 +10701,7 @@
+ CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
+
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 10677 "configure"
++#line 10704 "configure"
+ #include "confdefs.h"
+ #include <stdio.h>
+ int
+@@ -10686,16 +10713,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:10689: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:10716: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:10692: \$? = $ac_status" >&5
++ echo "$as_me:10719: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:10695: \"$ac_try\"") >&5
++ { (eval echo "$as_me:10722: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:10698: \$? = $ac_status" >&5
++ echo "$as_me:10725: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ :
+ else
+@@ -10712,7 +10739,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}:10715: testing adding $cf_add_incdir to include-path ..." 1>&5
++echo "${as_me:-configure}:10742: testing adding $cf_add_incdir to include-path ..." 1>&5
+
+ CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
+
+@@ -10731,7 +10758,7 @@
+
+ }
+
+-echo "$as_me:10734: checking for $cf_ncuhdr_root header in include-path" >&5
++echo "$as_me:10761: 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
+@@ -10743,7 +10770,7 @@
+ do
+
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 10746 "configure"
++#line 10773 "configure"
+ #include "confdefs.h"
+
+ #include <$cf_header>
+@@ -10767,16 +10794,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:10770: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:10797: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:10773: \$? = $ac_status" >&5
++ echo "$as_me:10800: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:10776: \"$ac_try\"") >&5
++ { (eval echo "$as_me:10803: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:10779: \$? = $ac_status" >&5
++ echo "$as_me:10806: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_ncurses_h=$cf_header
+
+@@ -10791,14 +10818,14 @@
+ done
+
+ fi
+-echo "$as_me:10794: result: $cf_cv_ncurses_h" >&5
++echo "$as_me:10821: 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:10801: checking for $cf_ncuhdr_root include-path" >&5
++echo "$as_me:10828: 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
+@@ -10919,7 +10946,7 @@
+ CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
+
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 10922 "configure"
++#line 10949 "configure"
+ #include "confdefs.h"
+ #include <stdio.h>
+ int
+@@ -10931,16 +10958,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:10934: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:10961: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:10937: \$? = $ac_status" >&5
++ echo "$as_me:10964: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:10940: \"$ac_try\"") >&5
++ { (eval echo "$as_me:10967: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:10943: \$? = $ac_status" >&5
++ echo "$as_me:10970: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ :
+ else
+@@ -10957,7 +10984,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}:10960: testing adding $cf_add_incdir to include-path ..." 1>&5
++echo "${as_me:-configure}:10987: testing adding $cf_add_incdir to include-path ..." 1>&5
+
+ CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
+
+@@ -10980,7 +11007,7 @@
+ do
+
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 10983 "configure"
++#line 11010 "configure"
+ #include "confdefs.h"
+
+ #include <$cf_header>
+@@ -11004,16 +11031,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:11007: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:11034: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:11010: \$? = $ac_status" >&5
++ echo "$as_me:11037: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:11013: \"$ac_try\"") >&5
++ { (eval echo "$as_me:11040: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:11016: \$? = $ac_status" >&5
++ echo "$as_me:11043: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_ncurses_h2=$cf_header
+
+@@ -11034,12 +11061,12 @@
+ CPPFLAGS="$cf_save2_CPPFLAGS"
+ test "$cf_cv_ncurses_h2" != no && break
+ done
+- test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:11037: error: not found" >&5
++ test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:11064: error: not found" >&5
+ echo "$as_me: error: not found" >&2;}
+ { (exit 1); exit 1; }; }
+
+ fi
+-echo "$as_me:11042: result: $cf_cv_ncurses_h2" >&5
++echo "$as_me:11069: 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%/[^/]*$%%'`
+@@ -11075,7 +11102,7 @@
+ CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
+
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 11078 "configure"
++#line 11105 "configure"
+ #include "confdefs.h"
+ #include <stdio.h>
+ int
+@@ -11087,16 +11114,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:11090: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:11117: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:11093: \$? = $ac_status" >&5
++ echo "$as_me:11120: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:11096: \"$ac_try\"") >&5
++ { (eval echo "$as_me:11123: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:11099: \$? = $ac_status" >&5
++ echo "$as_me:11126: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ :
+ else
+@@ -11113,7 +11140,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}:11116: testing adding $cf_add_incdir to include-path ..." 1>&5
++echo "${as_me:-configure}:11143: testing adding $cf_add_incdir to include-path ..." 1>&5
+
+ CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
+
+@@ -11161,7 +11188,7 @@
+ ;;
+ esac
+
+-echo "$as_me:11164: checking for terminfo header" >&5
++echo "$as_me:11191: 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
+@@ -11179,7 +11206,7 @@
+ for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h"
+ do
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 11182 "configure"
++#line 11209 "configure"
+ #include "confdefs.h"
+ #include <stdio.h>
+ #include <${cf_cv_ncurses_header:-curses.h}>
+@@ -11194,16 +11221,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:11197: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:11224: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:11200: \$? = $ac_status" >&5
++ echo "$as_me:11227: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:11203: \"$ac_try\"") >&5
++ { (eval echo "$as_me:11230: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:11206: \$? = $ac_status" >&5
++ echo "$as_me:11233: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+
+ cf_cv_term_header="$cf_test"
+@@ -11219,7 +11246,7 @@
+ done
+
+ fi
+-echo "$as_me:11222: result: $cf_cv_term_header" >&5
++echo "$as_me:11249: result: $cf_cv_term_header" >&5
+ echo "${ECHO_T}$cf_cv_term_header" >&6
+
+ # Set definitions to allow ifdef'ing to accommodate subdirectories
+@@ -11257,7 +11284,7 @@
+ #define NCURSES 1
+ EOF
+
+-echo "$as_me:11260: checking for ncurses version" >&5
++echo "$as_me:11287: 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
+@@ -11283,10 +11310,10 @@
+ #endif
+ EOF
+ cf_try="$ac_cpp conftest.$ac_ext 2>&5 | grep '^Autoconf ' >conftest.out"
+- { (eval echo "$as_me:11286: \"$cf_try\"") >&5
++ { (eval echo "$as_me:11313: \"$cf_try\"") >&5
+ (eval $cf_try) 2>&5
+ ac_status=$?
+- echo "$as_me:11289: \$? = $ac_status" >&5
++ echo "$as_me:11316: \$? = $ac_status" >&5
+ (exit "$ac_status"); }
+ if test -f conftest.out ; then
+ cf_out=`sed -e 's%^Autoconf %%' -e 's%^[^"]*"%%' -e 's%".*%%' conftest.out`
+@@ -11296,7 +11323,7 @@
+
+ else
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 11299 "configure"
++#line 11326 "configure"
+ #include "confdefs.h"
+
+ $ac_includes_default
+@@ -11323,15 +11350,15 @@
+ }
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:11326: \"$ac_link\"") >&5
++if { (eval echo "$as_me:11353: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:11329: \$? = $ac_status" >&5
++ echo "$as_me:11356: \$? = $ac_status" >&5
+ (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+- { (eval echo "$as_me:11331: \"$ac_try\"") >&5
++ { (eval echo "$as_me:11358: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:11334: \$? = $ac_status" >&5
++ echo "$as_me:11361: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+
+ cf_cv_ncurses_version=`cat $cf_tempfile`
+@@ -11345,7 +11372,7 @@
+ rm -f "$cf_tempfile"
+
+ fi
+-echo "$as_me:11348: result: $cf_cv_ncurses_version" >&5
++echo "$as_me:11375: result: $cf_cv_ncurses_version" >&5
+ echo "${ECHO_T}$cf_cv_ncurses_version" >&6
+ test "$cf_cv_ncurses_version" = no ||
+ cat >>confdefs.h <<\EOF
+@@ -11358,7 +11385,7 @@
+ # to link gpm.
+ cf_ncurses_LIBS=""
+ cf_ncurses_SAVE="$LIBS"
+-echo "$as_me:11361: checking for Gpm_Open in -lgpm" >&5
++echo "$as_me:11388: 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
+@@ -11366,7 +11393,7 @@
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lgpm $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 11369 "configure"
++#line 11396 "configure"
+ #include "confdefs.h"
+
+ /* Override any gcc2 internal prototype to avoid an error. */
+@@ -11385,16 +11412,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:11388: \"$ac_link\"") >&5
++if { (eval echo "$as_me:11415: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:11391: \$? = $ac_status" >&5
++ echo "$as_me:11418: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:11394: \"$ac_try\"") >&5
++ { (eval echo "$as_me:11421: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:11397: \$? = $ac_status" >&5
++ echo "$as_me:11424: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_lib_gpm_Gpm_Open=yes
+ else
+@@ -11405,10 +11432,10 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:11408: result: $ac_cv_lib_gpm_Gpm_Open" >&5
++echo "$as_me:11435: 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:11411: checking for initscr in -lgpm" >&5
++ echo "$as_me:11438: 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
+@@ -11416,7 +11443,7 @@
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lgpm $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 11419 "configure"
++#line 11446 "configure"
+ #include "confdefs.h"
+
+ /* Override any gcc2 internal prototype to avoid an error. */
+@@ -11435,16 +11462,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:11438: \"$ac_link\"") >&5
++if { (eval echo "$as_me:11465: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:11441: \$? = $ac_status" >&5
++ echo "$as_me:11468: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:11444: \"$ac_try\"") >&5
++ { (eval echo "$as_me:11471: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:11447: \$? = $ac_status" >&5
++ echo "$as_me:11474: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_lib_gpm_initscr=yes
+ else
+@@ -11455,7 +11482,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:11458: result: $ac_cv_lib_gpm_initscr" >&5
++echo "$as_me:11485: 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"
+@@ -11470,7 +11497,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:11473: checking for tgoto in -lmytinfo" >&5
++ echo "$as_me:11500: 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
+@@ -11478,7 +11505,7 @@
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lmytinfo $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 11481 "configure"
++#line 11508 "configure"
+ #include "confdefs.h"
+
+ /* Override any gcc2 internal prototype to avoid an error. */
+@@ -11497,16 +11524,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:11500: \"$ac_link\"") >&5
++if { (eval echo "$as_me:11527: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:11503: \$? = $ac_status" >&5
++ echo "$as_me:11530: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:11506: \"$ac_try\"") >&5
++ { (eval echo "$as_me:11533: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:11509: \$? = $ac_status" >&5
++ echo "$as_me:11536: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_lib_mytinfo_tgoto=yes
+ else
+@@ -11517,7 +11544,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:11520: result: $ac_cv_lib_mytinfo_tgoto" >&5
++echo "$as_me:11547: 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"
+@@ -11566,13 +11593,13 @@
+
+ eval 'cf_cv_have_lib_'"$cf_nculib_root"'=no'
+ cf_libdir=""
+- echo "$as_me:11569: checking for initscr" >&5
++ echo "$as_me:11596: 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 11575 "configure"
++#line 11602 "configure"
+ #include "confdefs.h"
+ #define initscr autoconf_temporary
+ #include <limits.h> /* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -11603,16 +11630,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:11606: \"$ac_link\"") >&5
++if { (eval echo "$as_me:11633: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:11609: \$? = $ac_status" >&5
++ echo "$as_me:11636: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:11612: \"$ac_try\"") >&5
++ { (eval echo "$as_me:11639: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:11615: \$? = $ac_status" >&5
++ echo "$as_me:11642: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_func_initscr=yes
+ else
+@@ -11622,18 +11649,18 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:11625: result: $ac_cv_func_initscr" >&5
++echo "$as_me:11652: 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:11632: checking for initscr in -l$cf_nculib_root" >&5
++ echo "$as_me:11659: 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 11636 "configure"
++#line 11663 "configure"
+ #include "confdefs.h"
+ #include <${cf_cv_ncurses_header:-curses.h}>
+ int
+@@ -11645,25 +11672,25 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:11648: \"$ac_link\"") >&5
++if { (eval echo "$as_me:11675: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:11651: \$? = $ac_status" >&5
++ echo "$as_me:11678: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:11654: \"$ac_try\"") >&5
++ { (eval echo "$as_me:11681: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:11657: \$? = $ac_status" >&5
++ echo "$as_me:11684: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+- echo "$as_me:11659: result: yes" >&5
++ echo "$as_me:11686: 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:11666: result: no" >&5
++echo "$as_me:11693: result: no" >&5
+ echo "${ECHO_T}no" >&6
+
+ cf_search=
+@@ -11731,11 +11758,11 @@
+
+ for cf_libdir in $cf_search
+ do
+- echo "$as_me:11734: checking for -l$cf_nculib_root in $cf_libdir" >&5
++ echo "$as_me:11761: 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 11738 "configure"
++#line 11765 "configure"
+ #include "confdefs.h"
+ #include <${cf_cv_ncurses_header:-curses.h}>
+ int
+@@ -11747,25 +11774,25 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:11750: \"$ac_link\"") >&5
++if { (eval echo "$as_me:11777: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:11753: \$? = $ac_status" >&5
++ echo "$as_me:11780: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:11756: \"$ac_try\"") >&5
++ { (eval echo "$as_me:11783: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:11759: \$? = $ac_status" >&5
++ echo "$as_me:11786: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+- echo "$as_me:11761: result: yes" >&5
++ echo "$as_me:11788: 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:11768: result: no" >&5
++echo "$as_me:11795: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ LIBS="$cf_save_LIBS"
+ fi
+@@ -11780,7 +11807,7 @@
+ eval 'cf_found_library="$cf_cv_have_lib_'"$cf_nculib_root"\"
+
+ if test "$cf_found_library" = no ; then
+- { { echo "$as_me:11783: error: Cannot link $cf_nculib_root library" >&5
++ { { echo "$as_me:11810: error: Cannot link $cf_nculib_root library" >&5
+ echo "$as_me: error: Cannot link $cf_nculib_root library" >&2;}
+ { (exit 1); exit 1; }; }
+ fi
+@@ -11788,7 +11815,7 @@
+ fi
+
+ if test -n "$cf_ncurses_LIBS" ; then
+- echo "$as_me:11791: checking if we can link $cf_nculib_root without $cf_ncurses_LIBS" >&5
++ echo "$as_me:11818: 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
+@@ -11798,7 +11825,7 @@
+ fi
+ done
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 11801 "configure"
++#line 11828 "configure"
+ #include "confdefs.h"
+ #include <${cf_cv_ncurses_header:-curses.h}>
+ int
+@@ -11810,23 +11837,23 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:11813: \"$ac_link\"") >&5
++if { (eval echo "$as_me:11840: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:11816: \$? = $ac_status" >&5
++ echo "$as_me:11843: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:11819: \"$ac_try\"") >&5
++ { (eval echo "$as_me:11846: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:11822: \$? = $ac_status" >&5
++ echo "$as_me:11849: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+- echo "$as_me:11824: result: yes" >&5
++ echo "$as_me:11851: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ else
+ echo "$as_me: failed program was:" >&5
+ cat "conftest.$ac_ext" >&5
+-echo "$as_me:11829: result: no" >&5
++echo "$as_me:11856: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ LIBS="$cf_ncurses_SAVE"
+ fi
+@@ -11846,7 +11873,7 @@
+
+ ;;
+ (*)
+- { { echo "$as_me:11849: error: unexpected screen-value: $cf_cv_screen" >&5
++ { { echo "$as_me:11876: error: unexpected screen-value: $cf_cv_screen" >&5
+ echo "$as_me: error: unexpected screen-value: $cf_cv_screen" >&2;}
+ { (exit 1); exit 1; }; }
+ ;;
+@@ -11885,10 +11912,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:11888: \"$cf_try\"") >&5
++ { (eval echo "$as_me:11915: \"$cf_try\"") >&5
+ (eval $cf_try) 2>&5
+ ac_status=$?
+- echo "$as_me:11891: \$? = $ac_status" >&5
++ echo "$as_me:11918: \$? = $ac_status" >&5
+ (exit "$ac_status"); }
+ if test -f conftest.out ; then
+ cf_result=`sed -e "s/^.*AUTOCONF_${cf_name}[ ][ ]*//" conftest.out`
+@@ -11906,17 +11933,17 @@
+
+ cf_cv_timestamp=`date`
+
+-echo "$as_me:11909: result: Configuring NCURSES $cf_cv_rel_version ABI $cf_cv_abi_version ($cf_cv_timestamp)" >&5
++echo "$as_me:11936: 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:11912: checking if KEY_RESIZE is supported" >&5
++echo "$as_me:11939: 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 11919 "configure"
++#line 11946 "configure"
+ #include "confdefs.h"
+ #include <${cf_cv_ncurses_header:-curses.h}>
+ int
+@@ -11928,16 +11955,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:11931: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:11958: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:11934: \$? = $ac_status" >&5
++ echo "$as_me:11961: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:11937: \"$ac_try\"") >&5
++ { (eval echo "$as_me:11964: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:11940: \$? = $ac_status" >&5
++ echo "$as_me:11967: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_curses_resizes=yes
+ else
+@@ -11947,12 +11974,12 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:11950: result: $cf_cv_curses_resizes" >&5
++echo "$as_me:11977: 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:11955: checking if you want to have a library-prefix" >&5
++echo "$as_me:11982: 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.
+@@ -11962,7 +11989,7 @@
+ else
+ with_lib_prefix=auto
+ fi;
+-echo "$as_me:11965: result: $with_lib_prefix" >&5
++echo "$as_me:11992: result: $with_lib_prefix" >&5
+ echo "${ECHO_T}$with_lib_prefix" >&6
+
+ if test "$with_lib_prefix" = auto
+@@ -12000,7 +12027,7 @@
+ test -n "$GCC" && test "${ac_cv_prog_cc_g}" != yes && CC_G_OPT=''
+ fi
+
+-echo "$as_me:12003: checking for default loader flags" >&5
++echo "$as_me:12030: 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='' ;;
+@@ -12008,13 +12035,13 @@
+ (profile) LD_MODEL='-pg';;
+ (shared) LD_MODEL='' ;;
+ esac
+-echo "$as_me:12011: result: $LD_MODEL" >&5
++echo "$as_me:12038: 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:12017: checking for an rpath option" >&5
++ echo "$as_me:12044: checking for an rpath option" >&5
+ echo $ECHO_N "checking for an rpath option... $ECHO_C" >&6
+ case "$cf_cv_system_name" in
+ (irix*)
+@@ -12045,12 +12072,12 @@
+ (*)
+ ;;
+ esac
+- echo "$as_me:12048: result: $LD_RPATH_OPT" >&5
++ echo "$as_me:12075: result: $LD_RPATH_OPT" >&5
+ echo "${ECHO_T}$LD_RPATH_OPT" >&6
+
+ case "x$LD_RPATH_OPT" in
+ (x-R*)
+- echo "$as_me:12053: checking if we need a space after rpath option" >&5
++ echo "$as_me:12080: 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"
+
+@@ -12071,7 +12098,7 @@
+ LIBS="$cf_add_libs"
+
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 12074 "configure"
++#line 12101 "configure"
+ #include "confdefs.h"
+
+ int
+@@ -12083,16 +12110,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:12086: \"$ac_link\"") >&5
++if { (eval echo "$as_me:12113: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:12089: \$? = $ac_status" >&5
++ echo "$as_me:12116: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:12092: \"$ac_try\"") >&5
++ { (eval echo "$as_me:12119: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:12095: \$? = $ac_status" >&5
++ echo "$as_me:12122: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_rpath_space=no
+ else
+@@ -12102,7 +12129,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS="$cf_save_LIBS"
+- echo "$as_me:12105: result: $cf_rpath_space" >&5
++ echo "$as_me:12132: result: $cf_rpath_space" >&5
+ echo "${ECHO_T}$cf_rpath_space" >&6
+ test "$cf_rpath_space" = yes && LD_RPATH_OPT="$LD_RPATH_OPT "
+ ;;
+@@ -12124,7 +12151,7 @@
+ cf_ld_rpath_opt=
+ test "$cf_cv_enable_rpath" = yes && cf_ld_rpath_opt="$LD_RPATH_OPT"
+
+- echo "$as_me:12127: checking whether to use release or ABI version in shared library file names" >&5
++ echo "$as_me:12154: 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.
+@@ -12139,9 +12166,9 @@
+ cf_cv_shlib_version=$withval
+ ;;
+ (*)
+- echo "$as_me:12142: result: $withval" >&5
++ echo "$as_me:12169: result: $withval" >&5
+ echo "${ECHO_T}$withval" >&6
+- { { echo "$as_me:12144: error: option value must be one of: rel, abi, or auto" >&5
++ { { echo "$as_me:12171: 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; }; }
+ ;;
+@@ -12150,7 +12177,7 @@
+ else
+ cf_cv_shlib_version=auto
+ fi;
+- echo "$as_me:12153: result: $cf_cv_shlib_version" >&5
++ echo "$as_me:12180: result: $cf_cv_shlib_version" >&5
+ echo "${ECHO_T}$cf_cv_shlib_version" >&6
+
+ cf_cv_rm_so_locs=no
+@@ -12173,14 +12200,14 @@
+
+ if test "$cf_try_fPIC" = yes
+ then
+- echo "$as_me:12176: checking which $CC option to use" >&5
++ echo "$as_me:12203: 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 12183 "configure"
++#line 12210 "configure"
+ #include "confdefs.h"
+ #include <stdio.h>
+ int
+@@ -12192,16 +12219,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:12195: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:12222: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:12198: \$? = $ac_status" >&5
++ echo "$as_me:12225: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:12201: \"$ac_try\"") >&5
++ { (eval echo "$as_me:12228: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:12204: \$? = $ac_status" >&5
++ echo "$as_me:12231: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ break
+ else
+@@ -12210,7 +12237,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ done
+- echo "$as_me:12213: result: $CC_SHARED_OPTS" >&5
++ echo "$as_me:12240: result: $CC_SHARED_OPTS" >&5
+ echo "${ECHO_T}$CC_SHARED_OPTS" >&6
+ CFLAGS="$cf_save_CFLAGS"
+ fi
+@@ -12281,7 +12308,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:12284: checking if ld -search_paths_first works" >&5
++ echo "$as_me:12311: 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
+@@ -12290,7 +12317,7 @@
+ cf_save_LDFLAGS=$LDFLAGS
+ LDFLAGS="$LDFLAGS -Wl,-search_paths_first"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 12293 "configure"
++#line 12320 "configure"
+ #include "confdefs.h"
+
+ int
+@@ -12302,16 +12329,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:12305: \"$ac_link\"") >&5
++if { (eval echo "$as_me:12332: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:12308: \$? = $ac_status" >&5
++ echo "$as_me:12335: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:12311: \"$ac_try\"") >&5
++ { (eval echo "$as_me:12338: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:12314: \$? = $ac_status" >&5
++ echo "$as_me:12341: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_ldflags_search_paths_first=yes
+ else
+@@ -12322,7 +12349,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LDFLAGS=$cf_save_LDFLAGS
+ fi
+-echo "$as_me:12325: result: $cf_cv_ldflags_search_paths_first" >&5
++echo "$as_me:12352: 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"
+@@ -12672,7 +12699,7 @@
+ do
+ CFLAGS="$cf_shared_opts $cf_save_CFLAGS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 12675 "configure"
++#line 12702 "configure"
+ #include "confdefs.h"
+ #include <stdio.h>
+ int
+@@ -12684,16 +12711,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:12687: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:12714: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:12690: \$? = $ac_status" >&5
++ echo "$as_me:12717: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:12693: \"$ac_try\"") >&5
++ { (eval echo "$as_me:12720: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:12696: \$? = $ac_status" >&5
++ echo "$as_me:12723: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ break
+ else
+@@ -12730,7 +12757,7 @@
+ test "$cf_cv_do_symlinks" = no && cf_cv_do_symlinks=yes
+ ;;
+ (*)
+- { echo "$as_me:12733: WARNING: ignored --with-shlib-version" >&5
++ { echo "$as_me:12760: WARNING: ignored --with-shlib-version" >&5
+ echo "$as_me: WARNING: ignored --with-shlib-version" >&2;}
+ ;;
+ esac
+@@ -12740,7 +12767,7 @@
+ if test -n "$cf_try_cflags"
+ then
+ cat > conftest.$ac_ext <<EOF
+-#line 12743 "${as_me:-configure}"
++#line 12770 "${as_me:-configure}"
+ #include <stdio.h>
+ int main(int argc, char *argv[])
+ {
+@@ -12752,18 +12779,18 @@
+ for cf_opt in $cf_try_cflags
+ do
+ CFLAGS="$cf_save_CFLAGS -$cf_opt"
+- echo "$as_me:12755: checking if CFLAGS option -$cf_opt works" >&5
++ echo "$as_me:12782: 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:12757: \"$ac_compile\"") >&5
++ if { (eval echo "$as_me:12784: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:12760: \$? = $ac_status" >&5
++ echo "$as_me:12787: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; then
+- echo "$as_me:12762: result: yes" >&5
++ echo "$as_me:12789: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ cf_save_CFLAGS="$CFLAGS"
+ else
+- echo "$as_me:12766: result: no" >&5
++ echo "$as_me:12793: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ done
+@@ -12778,17 +12805,17 @@
+
+ test -n "$verbose" && echo " CC_SHARED_OPTS: $CC_SHARED_OPTS" 1>&6
+
+-echo "${as_me:-configure}:12781: testing CC_SHARED_OPTS: $CC_SHARED_OPTS ..." 1>&5
++echo "${as_me:-configure}:12808: 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}:12785: testing MK_SHARED_LIB: $MK_SHARED_LIB ..." 1>&5
++echo "${as_me:-configure}:12812: 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:12791: checking if you want to link sample programs with rpath option" >&5
++ echo "$as_me:12818: 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.
+@@ -12798,7 +12825,7 @@
+ else
+ with_rpath_link=yes
+ fi;
+- echo "$as_me:12801: result: $with_rpath_link" >&5
++ echo "$as_me:12828: result: $with_rpath_link" >&5
+ echo "${ECHO_T}$with_rpath_link" >&6
+ if test "$with_rpath_link" = no
+ then
+@@ -12811,7 +12838,7 @@
+
+ ### use option --enable-broken-linker to force on use of broken-linker support
+
+-echo "$as_me:12814: checking if you want broken-linker support code" >&5
++echo "$as_me:12841: 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.
+@@ -12821,7 +12848,7 @@
+ else
+ with_broken_linker=no
+ fi;
+-echo "$as_me:12824: result: $with_broken_linker" >&5
++echo "$as_me:12851: result: $with_broken_linker" >&5
+ echo "${ECHO_T}$with_broken_linker" >&6
+
+ : "${BROKEN_LINKER:=0}"
+@@ -12836,14 +12863,14 @@
+
+ # Check to define _XOPEN_SOURCE "automatically"
+
+-echo "$as_me:12839: checking if the POSIX test-macros are already defined" >&5
++echo "$as_me:12866: 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 12846 "configure"
++#line 12873 "configure"
+ #include "confdefs.h"
+ #include <stdio.h>
+ int
+@@ -12862,16 +12889,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:12865: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:12892: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:12868: \$? = $ac_status" >&5
++ echo "$as_me:12895: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:12871: \"$ac_try\"") >&5
++ { (eval echo "$as_me:12898: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:12874: \$? = $ac_status" >&5
++ echo "$as_me:12901: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_posix_visible=no
+ else
+@@ -12882,7 +12909,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+
+ fi
+-echo "$as_me:12885: result: $cf_cv_posix_visible" >&5
++echo "$as_me:12912: result: $cf_cv_posix_visible" >&5
+ echo "${ECHO_T}$cf_cv_posix_visible" >&6
+
+ if test "$cf_cv_posix_visible" = no; then
+@@ -12924,14 +12951,14 @@
+
+ cf_gnu_xopen_source=$cf_XOPEN_SOURCE
+
+-echo "$as_me:12927: checking if this is the GNU C library" >&5
++echo "$as_me:12954: 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 12934 "configure"
++#line 12961 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ int
+@@ -12950,16 +12977,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:12953: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:12980: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:12956: \$? = $ac_status" >&5
++ echo "$as_me:12983: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:12959: \"$ac_try\"") >&5
++ { (eval echo "$as_me:12986: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:12962: \$? = $ac_status" >&5
++ echo "$as_me:12989: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_gnu_library=yes
+ else
+@@ -12970,7 +12997,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+
+ fi
+-echo "$as_me:12973: result: $cf_cv_gnu_library" >&5
++echo "$as_me:13000: result: $cf_cv_gnu_library" >&5
+ echo "${ECHO_T}$cf_cv_gnu_library" >&6
+
+ if test x$cf_cv_gnu_library = xyes; then
+@@ -12978,7 +13005,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:12981: checking if _DEFAULT_SOURCE can be used as a basis" >&5
++ echo "$as_me:13008: 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
+@@ -12990,7 +13017,7 @@
+ CPPFLAGS="${CPPFLAGS}-D_DEFAULT_SOURCE"
+
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 12993 "configure"
++#line 13020 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ int
+@@ -13009,16 +13036,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:13012: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:13039: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:13015: \$? = $ac_status" >&5
++ echo "$as_me:13042: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:13018: \"$ac_try\"") >&5
++ { (eval echo "$as_me:13045: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:13021: \$? = $ac_status" >&5
++ echo "$as_me:13048: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_gnu_library_219=yes
+ else
+@@ -13030,12 +13057,12 @@
+ CPPFLAGS="$cf_save"
+
+ fi
+-echo "$as_me:13033: result: $cf_cv_gnu_library_219" >&5
++echo "$as_me:13060: 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:13038: checking if _XOPEN_SOURCE=$cf_gnu_xopen_source works with _DEFAULT_SOURCE" >&5
++ echo "$as_me:13065: 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
+@@ -13140,7 +13167,7 @@
+ fi
+
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 13143 "configure"
++#line 13170 "configure"
+ #include "confdefs.h"
+
+ #include <limits.h>
+@@ -13160,16 +13187,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:13163: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:13190: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:13166: \$? = $ac_status" >&5
++ echo "$as_me:13193: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:13169: \"$ac_try\"") >&5
++ { (eval echo "$as_me:13196: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:13172: \$? = $ac_status" >&5
++ echo "$as_me:13199: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_gnu_dftsrc_219=yes
+ else
+@@ -13180,7 +13207,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+
+ fi
+-echo "$as_me:13183: result: $cf_cv_gnu_dftsrc_219" >&5
++echo "$as_me:13210: 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
+@@ -13189,14 +13216,14 @@
+
+ if test "x$cf_cv_gnu_dftsrc_219" != xyes; then
+
+- echo "$as_me:13192: checking if we must define _GNU_SOURCE" >&5
++ echo "$as_me:13219: 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 13199 "configure"
++#line 13226 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ int
+@@ -13211,16 +13238,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:13214: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:13241: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:13217: \$? = $ac_status" >&5
++ echo "$as_me:13244: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:13220: \"$ac_try\"") >&5
++ { (eval echo "$as_me:13247: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:13223: \$? = $ac_status" >&5
++ echo "$as_me:13250: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_gnu_source=no
+ else
+@@ -13327,7 +13354,7 @@
+ fi
+
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 13330 "configure"
++#line 13357 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ int
+@@ -13342,16 +13369,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:13345: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:13372: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:13348: \$? = $ac_status" >&5
++ echo "$as_me:13375: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:13351: \"$ac_try\"") >&5
++ { (eval echo "$as_me:13378: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:13354: \$? = $ac_status" >&5
++ echo "$as_me:13381: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_gnu_source=no
+ else
+@@ -13366,12 +13393,12 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+
+ fi
+-echo "$as_me:13369: result: $cf_cv_gnu_source" >&5
++echo "$as_me:13396: 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:13374: checking if we should also define _DEFAULT_SOURCE" >&5
++ echo "$as_me:13401: 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
+@@ -13381,7 +13408,7 @@
+ CPPFLAGS="${CPPFLAGS}-D_GNU_SOURCE"
+
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 13384 "configure"
++#line 13411 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ int
+@@ -13396,16 +13423,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:13399: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:13426: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:13402: \$? = $ac_status" >&5
++ echo "$as_me:13429: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:13405: \"$ac_try\"") >&5
++ { (eval echo "$as_me:13432: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:13408: \$? = $ac_status" >&5
++ echo "$as_me:13435: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_default_source=no
+ else
+@@ -13416,7 +13443,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+
+ fi
+-echo "$as_me:13419: result: $cf_cv_default_source" >&5
++echo "$as_me:13446: result: $cf_cv_default_source" >&5
+ echo "${ECHO_T}$cf_cv_default_source" >&6
+ if test "$cf_cv_default_source" = yes
+ then
+@@ -13453,16 +13480,16 @@
+ sed -e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ ]*\)\?[ ]/ /g' \
+ -e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ ]*\)\?$//g'`
+
+-echo "$as_me:13456: checking if we should define _POSIX_C_SOURCE" >&5
++echo "$as_me:13483: 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}:13462: testing if the symbol is already defined go no further ..." 1>&5
++echo "${as_me:-configure}:13489: testing if the symbol is already defined go no further ..." 1>&5
+
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 13465 "configure"
++#line 13492 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ int
+@@ -13477,16 +13504,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:13480: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:13507: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:13483: \$? = $ac_status" >&5
++ echo "$as_me:13510: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:13486: \"$ac_try\"") >&5
++ { (eval echo "$as_me:13513: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:13489: \$? = $ac_status" >&5
++ echo "$as_me:13516: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_posix_c_source=no
+ else
+@@ -13507,7 +13534,7 @@
+ esac
+ if test "$cf_want_posix_source" = yes ; then
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 13510 "configure"
++#line 13537 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ int
+@@ -13522,16 +13549,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:13525: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:13552: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:13528: \$? = $ac_status" >&5
++ echo "$as_me:13555: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:13531: \"$ac_try\"") >&5
++ { (eval echo "$as_me:13558: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:13534: \$? = $ac_status" >&5
++ echo "$as_me:13561: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ :
+ else
+@@ -13542,7 +13569,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+
+-echo "${as_me:-configure}:13545: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
++echo "${as_me:-configure}:13572: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
+
+ CFLAGS="$cf_trim_CFLAGS"
+ CPPFLAGS="$cf_trim_CPPFLAGS"
+@@ -13550,10 +13577,10 @@
+ test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
+ CPPFLAGS="${CPPFLAGS}$cf_cv_posix_c_source"
+
+-echo "${as_me:-configure}:13553: testing if the second compile does not leave our definition intact error ..." 1>&5
++echo "${as_me:-configure}:13580: testing if the second compile does not leave our definition intact error ..." 1>&5
+
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 13556 "configure"
++#line 13583 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ int
+@@ -13568,16 +13595,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:13571: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:13598: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:13574: \$? = $ac_status" >&5
++ echo "$as_me:13601: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:13577: \"$ac_try\"") >&5
++ { (eval echo "$as_me:13604: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:13580: \$? = $ac_status" >&5
++ echo "$as_me:13607: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ :
+ else
+@@ -13593,7 +13620,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+
+ fi
+-echo "$as_me:13596: result: $cf_cv_posix_c_source" >&5
++echo "$as_me:13623: 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
+@@ -13710,7 +13737,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:13713: WARNING: this system does not provide usable locale support" >&5
++ { echo "$as_me:13740: 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
+@@ -13742,14 +13769,14 @@
+ ;;
+ (*)
+
+-echo "$as_me:13745: checking if we should define _XOPEN_SOURCE" >&5
++echo "$as_me:13772: 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 13752 "configure"
++#line 13779 "configure"
+ #include "confdefs.h"
+
+ $ac_includes_default
+@@ -13767,16 +13794,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:13770: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:13797: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:13773: \$? = $ac_status" >&5
++ echo "$as_me:13800: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:13776: \"$ac_try\"") >&5
++ { (eval echo "$as_me:13803: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:13779: \$? = $ac_status" >&5
++ echo "$as_me:13806: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_xopen_source=no
+ else
+@@ -13788,7 +13815,7 @@
+ CPPFLAGS="${CPPFLAGS}-D_XOPEN_SOURCE=$cf_XOPEN_SOURCE"
+
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 13791 "configure"
++#line 13818 "configure"
+ #include "confdefs.h"
+
+ $ac_includes_default
+@@ -13806,16 +13833,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:13809: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:13836: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:13812: \$? = $ac_status" >&5
++ echo "$as_me:13839: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:13815: \"$ac_try\"") >&5
++ { (eval echo "$as_me:13842: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:13818: \$? = $ac_status" >&5
++ echo "$as_me:13845: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_xopen_source=no
+ else
+@@ -13830,7 +13857,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+
+ fi
+-echo "$as_me:13833: result: $cf_cv_xopen_source" >&5
++echo "$as_me:13860: result: $cf_cv_xopen_source" >&5
+ echo "${ECHO_T}$cf_cv_xopen_source" >&6
+
+ if test "$cf_cv_xopen_source" != no ; then
+@@ -13990,16 +14017,16 @@
+ sed -e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ ]*\)\?[ ]/ /g' \
+ -e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ ]*\)\?$//g'`
+
+-echo "$as_me:13993: checking if we should define _POSIX_C_SOURCE" >&5
++echo "$as_me:14020: 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}:13999: testing if the symbol is already defined go no further ..." 1>&5
++echo "${as_me:-configure}:14026: testing if the symbol is already defined go no further ..." 1>&5
+
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 14002 "configure"
++#line 14029 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ int
+@@ -14014,16 +14041,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:14017: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:14044: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:14020: \$? = $ac_status" >&5
++ echo "$as_me:14047: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:14023: \"$ac_try\"") >&5
++ { (eval echo "$as_me:14050: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:14026: \$? = $ac_status" >&5
++ echo "$as_me:14053: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_posix_c_source=no
+ else
+@@ -14044,7 +14071,7 @@
+ esac
+ if test "$cf_want_posix_source" = yes ; then
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 14047 "configure"
++#line 14074 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ int
+@@ -14059,16 +14086,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:14062: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:14089: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:14065: \$? = $ac_status" >&5
++ echo "$as_me:14092: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:14068: \"$ac_try\"") >&5
++ { (eval echo "$as_me:14095: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:14071: \$? = $ac_status" >&5
++ echo "$as_me:14098: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ :
+ else
+@@ -14079,7 +14106,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+
+-echo "${as_me:-configure}:14082: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
++echo "${as_me:-configure}:14109: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
+
+ CFLAGS="$cf_trim_CFLAGS"
+ CPPFLAGS="$cf_trim_CPPFLAGS"
+@@ -14087,10 +14114,10 @@
+ test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
+ CPPFLAGS="${CPPFLAGS}$cf_cv_posix_c_source"
+
+-echo "${as_me:-configure}:14090: testing if the second compile does not leave our definition intact error ..." 1>&5
++echo "${as_me:-configure}:14117: testing if the second compile does not leave our definition intact error ..." 1>&5
+
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 14093 "configure"
++#line 14120 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ int
+@@ -14105,16 +14132,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:14108: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:14135: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:14111: \$? = $ac_status" >&5
++ echo "$as_me:14138: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:14114: \"$ac_try\"") >&5
++ { (eval echo "$as_me:14141: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:14117: \$? = $ac_status" >&5
++ echo "$as_me:14144: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ :
+ else
+@@ -14130,7 +14157,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+
+ fi
+-echo "$as_me:14133: result: $cf_cv_posix_c_source" >&5
++echo "$as_me:14160: 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
+@@ -14243,10 +14270,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}:14246: testing checking if _POSIX_C_SOURCE interferes with _XOPEN_SOURCE ..." 1>&5
++echo "${as_me:-configure}:14273: testing checking if _POSIX_C_SOURCE interferes with _XOPEN_SOURCE ..." 1>&5
+
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 14249 "configure"
++#line 14276 "configure"
+ #include "confdefs.h"
+
+ $ac_includes_default
+@@ -14264,23 +14291,23 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:14267: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:14294: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:14270: \$? = $ac_status" >&5
++ echo "$as_me:14297: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:14273: \"$ac_try\"") >&5
++ { (eval echo "$as_me:14300: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:14276: \$? = $ac_status" >&5
++ echo "$as_me:14303: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ :
+ else
+ echo "$as_me: failed program was:" >&5
+ cat "conftest.$ac_ext" >&5
+
+- { echo "$as_me:14283: WARNING: _POSIX_C_SOURCE definition is not usable" >&5
++ { echo "$as_me:14310: 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
+@@ -14303,7 +14330,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}:14306: testing removing old option $cf_add_cflags from CFLAGS ..." 1>&5
++echo "${as_me:-configure}:14333: testing removing old option $cf_add_cflags from CFLAGS ..." 1>&5
+
+ CFLAGS="$cf_old_cflag"
+ done
+@@ -14315,7 +14342,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}:14318: testing removing old option $cf_add_cflags from CPPFLAGS ..." 1>&5
++echo "${as_me:-configure}:14345: testing removing old option $cf_add_cflags from CPPFLAGS ..." 1>&5
+
+ CPPFLAGS="$cf_old_cflag"
+ done
+@@ -14403,7 +14430,7 @@
+ if test -n "$cf_new_cflags" ; then
+ test -n "$verbose" && echo " add to \$CFLAGS $cf_new_cflags" 1>&6
+
+-echo "${as_me:-configure}:14406: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
++echo "${as_me:-configure}:14433: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
+
+ test -n "$CFLAGS" && CFLAGS="$CFLAGS "
+ CFLAGS="${CFLAGS}$cf_new_cflags"
+@@ -14413,7 +14440,7 @@
+ if test -n "$cf_new_cppflags" ; then
+ test -n "$verbose" && echo " add to \$CPPFLAGS $cf_new_cppflags" 1>&6
+
+-echo "${as_me:-configure}:14416: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
++echo "${as_me:-configure}:14443: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
+
+ test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
+ CPPFLAGS="${CPPFLAGS}$cf_new_cppflags"
+@@ -14423,7 +14450,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}:14426: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5
++echo "${as_me:-configure}:14453: 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"
+@@ -14435,10 +14462,10 @@
+ fi
+
+ if test -n "$cf_XOPEN_SOURCE" && test -z "$cf_cv_xopen_source" ; then
+- echo "$as_me:14438: checking if _XOPEN_SOURCE really is set" >&5
++ echo "$as_me:14465: 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 14441 "configure"
++#line 14468 "configure"
+ #include "confdefs.h"
+ #include <stdlib.h>
+ int
+@@ -14453,16 +14480,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:14456: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:14483: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:14459: \$? = $ac_status" >&5
++ echo "$as_me:14486: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:14462: \"$ac_try\"") >&5
++ { (eval echo "$as_me:14489: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:14465: \$? = $ac_status" >&5
++ echo "$as_me:14492: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_XOPEN_SOURCE_set=yes
+ else
+@@ -14471,12 +14498,12 @@
+ cf_XOPEN_SOURCE_set=no
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+- echo "$as_me:14474: result: $cf_XOPEN_SOURCE_set" >&5
++ echo "$as_me:14501: 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 14479 "configure"
++#line 14506 "configure"
+ #include "confdefs.h"
+ #include <stdlib.h>
+ int
+@@ -14491,16 +14518,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:14494: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:14521: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:14497: \$? = $ac_status" >&5
++ echo "$as_me:14524: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:14500: \"$ac_try\"") >&5
++ { (eval echo "$as_me:14527: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:14503: \$? = $ac_status" >&5
++ echo "$as_me:14530: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_XOPEN_SOURCE_set_ok=yes
+ else
+@@ -14511,19 +14538,19 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ if test "$cf_XOPEN_SOURCE_set_ok" = no
+ then
+- { echo "$as_me:14514: WARNING: _XOPEN_SOURCE is lower than requested" >&5
++ { echo "$as_me:14541: WARNING: _XOPEN_SOURCE is lower than requested" >&5
+ echo "$as_me: WARNING: _XOPEN_SOURCE is lower than requested" >&2;}
+ fi
+ else
+
+-echo "$as_me:14519: checking if we should define _XOPEN_SOURCE" >&5
++echo "$as_me:14546: 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 14526 "configure"
++#line 14553 "configure"
+ #include "confdefs.h"
+
+ $ac_includes_default
+@@ -14541,16 +14568,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:14544: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:14571: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:14547: \$? = $ac_status" >&5
++ echo "$as_me:14574: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:14550: \"$ac_try\"") >&5
++ { (eval echo "$as_me:14577: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:14553: \$? = $ac_status" >&5
++ echo "$as_me:14580: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_xopen_source=no
+ else
+@@ -14562,7 +14589,7 @@
+ CPPFLAGS="${CPPFLAGS}-D_XOPEN_SOURCE=$cf_XOPEN_SOURCE"
+
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 14565 "configure"
++#line 14592 "configure"
+ #include "confdefs.h"
+
+ $ac_includes_default
+@@ -14580,16 +14607,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:14583: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:14610: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:14586: \$? = $ac_status" >&5
++ echo "$as_me:14613: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:14589: \"$ac_try\"") >&5
++ { (eval echo "$as_me:14616: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:14592: \$? = $ac_status" >&5
++ echo "$as_me:14619: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_xopen_source=no
+ else
+@@ -14604,7 +14631,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+
+ fi
+-echo "$as_me:14607: result: $cf_cv_xopen_source" >&5
++echo "$as_me:14634: result: $cf_cv_xopen_source" >&5
+ echo "${ECHO_T}$cf_cv_xopen_source" >&6
+
+ if test "$cf_cv_xopen_source" != no ; then
+@@ -14751,13 +14778,13 @@
+ fi
+ fi # cf_cv_posix_visible
+
+-echo "$as_me:14754: checking for ANSI C header files" >&5
++echo "$as_me:14781: 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 14760 "configure"
++#line 14787 "configure"
+ #include "confdefs.h"
+ #include <stdlib.h>
+ #include <stdarg.h>
+@@ -14765,13 +14792,13 @@
+ #include <float.h>
+
+ _ACEOF
+-if { (eval echo "$as_me:14768: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:14795: \"$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:14774: \$? = $ac_status" >&5
++ echo "$as_me:14801: \$? = $ac_status" >&5
+ (exit "$ac_status"); } >/dev/null; then
+ if test -s conftest.err; then
+ ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -14793,7 +14820,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 14796 "configure"
++#line 14823 "configure"
+ #include "confdefs.h"
+ #include <string.h>
+
+@@ -14811,7 +14838,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 14814 "configure"
++#line 14841 "configure"
+ #include "confdefs.h"
+ #include <stdlib.h>
+
+@@ -14832,7 +14859,7 @@
+ :
+ else
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 14835 "configure"
++#line 14862 "configure"
+ #include "confdefs.h"
+ #include <ctype.h>
+ #if ((' ' & 0x0FF) == 0x020)
+@@ -14858,15 +14885,15 @@
+ }
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:14861: \"$ac_link\"") >&5
++if { (eval echo "$as_me:14888: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:14864: \$? = $ac_status" >&5
++ echo "$as_me:14891: \$? = $ac_status" >&5
+ (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+- { (eval echo "$as_me:14866: \"$ac_try\"") >&5
++ { (eval echo "$as_me:14893: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:14869: \$? = $ac_status" >&5
++ echo "$as_me:14896: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ :
+ else
+@@ -14879,7 +14906,7 @@
+ fi
+ fi
+ fi
+-echo "$as_me:14882: result: $ac_cv_header_stdc" >&5
++echo "$as_me:14909: result: $ac_cv_header_stdc" >&5
+ echo "${ECHO_T}$ac_cv_header_stdc" >&6
+ if test $ac_cv_header_stdc = yes; then
+
+@@ -14895,28 +14922,28 @@
+ inttypes.h stdint.h unistd.h
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-echo "$as_me:14898: checking for $ac_header" >&5
++echo "$as_me:14925: 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 14904 "configure"
++#line 14931 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ #include <$ac_header>
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:14910: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:14937: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:14913: \$? = $ac_status" >&5
++ echo "$as_me:14940: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:14916: \"$ac_try\"") >&5
++ { (eval echo "$as_me:14943: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:14919: \$? = $ac_status" >&5
++ echo "$as_me:14946: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ eval "$as_ac_Header=yes"
+ else
+@@ -14926,7 +14953,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:14929: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
++echo "$as_me:14956: 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
+@@ -14936,13 +14963,13 @@
+ fi
+ done
+
+-echo "$as_me:14939: checking whether exit is declared" >&5
++echo "$as_me:14966: 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 14945 "configure"
++#line 14972 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -14957,16 +14984,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:14960: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:14987: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:14963: \$? = $ac_status" >&5
++ echo "$as_me:14990: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:14966: \"$ac_try\"") >&5
++ { (eval echo "$as_me:14993: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:14969: \$? = $ac_status" >&5
++ echo "$as_me:14996: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_have_decl_exit=yes
+ else
+@@ -14976,7 +15003,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:14979: result: $ac_cv_have_decl_exit" >&5
++echo "$as_me:15006: 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.
+@@ -14986,7 +15013,7 @@
+ fi;
+ if test "$enable_largefile" != no; then
+
+- echo "$as_me:14989: checking for special C compiler options needed for large files" >&5
++ echo "$as_me:15016: 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
+@@ -14998,7 +15025,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 15001 "configure"
++#line 15028 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ /* Check that off_t can represent 2**63 - 1 correctly.
+@@ -15018,16 +15045,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:15021: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:15048: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:15024: \$? = $ac_status" >&5
++ echo "$as_me:15051: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:15027: \"$ac_try\"") >&5
++ { (eval echo "$as_me:15054: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:15030: \$? = $ac_status" >&5
++ echo "$as_me:15057: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ break
+ else
+@@ -15037,16 +15064,16 @@
+ rm -f "conftest.$ac_objext"
+ CC="$CC -n32"
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:15040: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:15067: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:15043: \$? = $ac_status" >&5
++ echo "$as_me:15070: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:15046: \"$ac_try\"") >&5
++ { (eval echo "$as_me:15073: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:15049: \$? = $ac_status" >&5
++ echo "$as_me:15076: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_sys_largefile_CC=' -n32'; break
+ else
+@@ -15060,13 +15087,13 @@
+ rm -f "conftest.$ac_ext"
+ fi
+ fi
+-echo "$as_me:15063: result: $ac_cv_sys_largefile_CC" >&5
++echo "$as_me:15090: 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:15069: checking for _FILE_OFFSET_BITS value needed for large files" >&5
++ echo "$as_me:15096: 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
+@@ -15074,7 +15101,7 @@
+ while :; do
+ ac_cv_sys_file_offset_bits=no
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 15077 "configure"
++#line 15104 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ /* Check that off_t can represent 2**63 - 1 correctly.
+@@ -15094,16 +15121,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:15097: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:15124: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:15100: \$? = $ac_status" >&5
++ echo "$as_me:15127: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:15103: \"$ac_try\"") >&5
++ { (eval echo "$as_me:15130: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:15106: \$? = $ac_status" >&5
++ echo "$as_me:15133: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ break
+ else
+@@ -15112,7 +15139,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 15115 "configure"
++#line 15142 "configure"
+ #include "confdefs.h"
+ #define _FILE_OFFSET_BITS 64
+ #include <sys/types.h>
+@@ -15133,16 +15160,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:15136: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:15163: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:15139: \$? = $ac_status" >&5
++ echo "$as_me:15166: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:15142: \"$ac_try\"") >&5
++ { (eval echo "$as_me:15169: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:15145: \$? = $ac_status" >&5
++ echo "$as_me:15172: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_sys_file_offset_bits=64; break
+ else
+@@ -15153,7 +15180,7 @@
+ break
+ done
+ fi
+-echo "$as_me:15156: result: $ac_cv_sys_file_offset_bits" >&5
++echo "$as_me:15183: 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
+
+@@ -15163,7 +15190,7 @@
+
+ fi
+ rm -rf conftest*
+- echo "$as_me:15166: checking for _LARGE_FILES value needed for large files" >&5
++ echo "$as_me:15193: 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
+@@ -15171,7 +15198,7 @@
+ while :; do
+ ac_cv_sys_large_files=no
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 15174 "configure"
++#line 15201 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ /* Check that off_t can represent 2**63 - 1 correctly.
+@@ -15191,16 +15218,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:15194: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:15221: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:15197: \$? = $ac_status" >&5
++ echo "$as_me:15224: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:15200: \"$ac_try\"") >&5
++ { (eval echo "$as_me:15227: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:15203: \$? = $ac_status" >&5
++ echo "$as_me:15230: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ break
+ else
+@@ -15209,7 +15236,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 15212 "configure"
++#line 15239 "configure"
+ #include "confdefs.h"
+ #define _LARGE_FILES 1
+ #include <sys/types.h>
+@@ -15230,16 +15257,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:15233: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:15260: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:15236: \$? = $ac_status" >&5
++ echo "$as_me:15263: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:15239: \"$ac_try\"") >&5
++ { (eval echo "$as_me:15266: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:15242: \$? = $ac_status" >&5
++ echo "$as_me:15269: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_sys_large_files=1; break
+ else
+@@ -15250,7 +15277,7 @@
+ break
+ done
+ fi
+-echo "$as_me:15253: result: $ac_cv_sys_large_files" >&5
++echo "$as_me:15280: 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
+
+@@ -15263,7 +15290,7 @@
+ fi
+
+ if test "$enable_largefile" != no ; then
+- echo "$as_me:15266: checking for _LARGEFILE_SOURCE value needed for large files" >&5
++ echo "$as_me:15293: 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
+@@ -15271,7 +15298,7 @@
+ while :; do
+ ac_cv_sys_largefile_source=no
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 15274 "configure"
++#line 15301 "configure"
+ #include "confdefs.h"
+ #include <stdio.h>
+ #include <sys/types.h>
+@@ -15286,16 +15313,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:15289: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:15316: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:15292: \$? = $ac_status" >&5
++ echo "$as_me:15319: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:15295: \"$ac_try\"") >&5
++ { (eval echo "$as_me:15322: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:15298: \$? = $ac_status" >&5
++ echo "$as_me:15325: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ break
+ else
+@@ -15304,7 +15331,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 15307 "configure"
++#line 15334 "configure"
+ #include "confdefs.h"
+ #define _LARGEFILE_SOURCE 1
+ #include <stdio.h>
+@@ -15320,16 +15347,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:15323: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:15350: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:15326: \$? = $ac_status" >&5
++ echo "$as_me:15353: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:15329: \"$ac_try\"") >&5
++ { (eval echo "$as_me:15356: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:15332: \$? = $ac_status" >&5
++ echo "$as_me:15359: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_sys_largefile_source=1; break
+ else
+@@ -15340,7 +15367,7 @@
+ break
+ done
+ fi
+-echo "$as_me:15343: result: $ac_cv_sys_largefile_source" >&5
++echo "$as_me:15370: 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
+
+@@ -15354,13 +15381,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:15357: checking for fseeko" >&5
++echo "$as_me:15384: 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 15363 "configure"
++#line 15390 "configure"
+ #include "confdefs.h"
+ #include <stdio.h>
+ #include <sys/types.h>
+@@ -15374,16 +15401,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:15377: \"$ac_link\"") >&5
++if { (eval echo "$as_me:15404: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:15380: \$? = $ac_status" >&5
++ echo "$as_me:15407: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:15383: \"$ac_try\"") >&5
++ { (eval echo "$as_me:15410: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:15386: \$? = $ac_status" >&5
++ echo "$as_me:15413: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_func_fseeko=yes
+ else
+@@ -15393,7 +15420,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:15396: result: $ac_cv_func_fseeko" >&5
++echo "$as_me:15423: result: $ac_cv_func_fseeko" >&5
+ echo "${ECHO_T}$ac_cv_func_fseeko" >&6
+ if test $ac_cv_func_fseeko = yes; then
+
+@@ -15432,14 +15459,14 @@
+
+ fi
+
+- echo "$as_me:15435: checking whether to use struct dirent64" >&5
++ echo "$as_me:15462: 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 15442 "configure"
++#line 15469 "configure"
+ #include "confdefs.h"
+
+ #pragma GCC diagnostic error "-Wincompatible-pointer-types"
+@@ -15466,16 +15493,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:15469: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:15496: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:15472: \$? = $ac_status" >&5
++ echo "$as_me:15499: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:15475: \"$ac_try\"") >&5
++ { (eval echo "$as_me:15502: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:15478: \$? = $ac_status" >&5
++ echo "$as_me:15505: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_struct_dirent64=yes
+ else
+@@ -15486,7 +15513,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+
+ fi
+-echo "$as_me:15489: result: $cf_cv_struct_dirent64" >&5
++echo "$as_me:15516: result: $cf_cv_struct_dirent64" >&5
+ echo "${ECHO_T}$cf_cv_struct_dirent64" >&6
+ test "$cf_cv_struct_dirent64" = yes &&
+ cat >>confdefs.h <<\EOF
+@@ -15496,7 +15523,7 @@
+ fi
+
+ ### Enable compiling-in rcs id's
+-echo "$as_me:15499: checking if RCS identifiers should be compiled-in" >&5
++echo "$as_me:15526: 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.
+@@ -15506,7 +15533,7 @@
+ else
+ with_rcs_ids=no
+ fi;
+-echo "$as_me:15509: result: $with_rcs_ids" >&5
++echo "$as_me:15536: result: $with_rcs_ids" >&5
+ echo "${ECHO_T}$with_rcs_ids" >&6
+ test "$with_rcs_ids" = yes &&
+ cat >>confdefs.h <<\EOF
+@@ -15516,7 +15543,7 @@
+ ###############################################################################
+
+ ### Note that some functions (such as const) are normally disabled anyway.
+-echo "$as_me:15519: checking if you want to build with function extensions" >&5
++echo "$as_me:15546: 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.
+@@ -15526,7 +15553,7 @@
+ else
+ with_ext_funcs=yes
+ fi;
+-echo "$as_me:15529: result: $with_ext_funcs" >&5
++echo "$as_me:15556: result: $with_ext_funcs" >&5
+ echo "${ECHO_T}$with_ext_funcs" >&6
+ if test "$with_ext_funcs" = yes ; then
+ NCURSES_EXT_FUNCS=1
+@@ -15544,7 +15571,7 @@
+ fi
+
+ ### use option --enable-const to turn on use of const beyond that in XSI.
+-echo "$as_me:15547: checking for extended use of const keyword" >&5
++echo "$as_me:15574: 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.
+@@ -15554,7 +15581,7 @@
+ else
+ with_ext_const=no
+ fi;
+-echo "$as_me:15557: result: $with_ext_const" >&5
++echo "$as_me:15584: result: $with_ext_const" >&5
+ echo "${ECHO_T}$with_ext_const" >&6
+ NCURSES_CONST='/*nothing*/'
+ if test "$with_ext_const" = yes ; then
+@@ -15564,7 +15591,7 @@
+ ###############################################################################
+ # These options are relatively safe to experiment with.
+
+-echo "$as_me:15567: checking if you want all development code" >&5
++echo "$as_me:15594: 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.
+@@ -15574,7 +15601,7 @@
+ else
+ with_develop=no
+ fi;
+-echo "$as_me:15577: result: $with_develop" >&5
++echo "$as_me:15604: result: $with_develop" >&5
+ echo "${ECHO_T}$with_develop" >&6
+
+ ###############################################################################
+@@ -15583,7 +15610,7 @@
+ # This is still experimental (20080329), but should ultimately be moved to
+ # the script-block --with-normal, etc.
+
+-echo "$as_me:15586: checking if you want to link with the pthread library" >&5
++echo "$as_me:15613: 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.
+@@ -15593,27 +15620,27 @@
+ else
+ with_pthread=no
+ fi;
+-echo "$as_me:15596: result: $with_pthread" >&5
++echo "$as_me:15623: result: $with_pthread" >&5
+ echo "${ECHO_T}$with_pthread" >&6
+
+ if test "$with_pthread" != no ; then
+- echo "$as_me:15600: checking for pthread.h" >&5
++ echo "$as_me:15627: 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 15606 "configure"
++#line 15633 "configure"
+ #include "confdefs.h"
+ #include <pthread.h>
+ _ACEOF
+-if { (eval echo "$as_me:15610: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:15637: \"$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:15616: \$? = $ac_status" >&5
++ echo "$as_me:15643: \$? = $ac_status" >&5
+ (exit "$ac_status"); } >/dev/null; then
+ if test -s conftest.err; then
+ ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -15632,7 +15659,7 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:15635: result: $ac_cv_header_pthread_h" >&5
++echo "$as_me:15662: 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
+
+@@ -15642,7 +15669,7 @@
+
+ for cf_lib_pthread in pthread c_r
+ do
+- echo "$as_me:15645: checking if we can link with the $cf_lib_pthread library" >&5
++ echo "$as_me:15672: 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"
+
+@@ -15663,7 +15690,7 @@
+ LIBS="$cf_add_libs"
+
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 15666 "configure"
++#line 15693 "configure"
+ #include "confdefs.h"
+
+ #include <pthread.h>
+@@ -15680,16 +15707,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:15683: \"$ac_link\"") >&5
++if { (eval echo "$as_me:15710: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:15686: \$? = $ac_status" >&5
++ echo "$as_me:15713: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:15689: \"$ac_try\"") >&5
++ { (eval echo "$as_me:15716: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:15692: \$? = $ac_status" >&5
++ echo "$as_me:15719: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ with_pthread=yes
+ else
+@@ -15699,7 +15726,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS="$cf_save_LIBS"
+- echo "$as_me:15702: result: $with_pthread" >&5
++ echo "$as_me:15729: result: $with_pthread" >&5
+ echo "${ECHO_T}$with_pthread" >&6
+ test "$with_pthread" = yes && break
+ done
+@@ -15727,7 +15754,7 @@
+ EOF
+
+ else
+- { { echo "$as_me:15730: error: Cannot link with pthread library" >&5
++ { { echo "$as_me:15757: error: Cannot link with pthread library" >&5
+ echo "$as_me: error: Cannot link with pthread library" >&2;}
+ { (exit 1); exit 1; }; }
+ fi
+@@ -15736,7 +15763,7 @@
+
+ fi
+
+-echo "$as_me:15739: checking if you want to use weak-symbols for pthreads" >&5
++echo "$as_me:15766: 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.
+@@ -15746,18 +15773,18 @@
+ else
+ use_weak_symbols=no
+ fi;
+-echo "$as_me:15749: result: $use_weak_symbols" >&5
++echo "$as_me:15776: result: $use_weak_symbols" >&5
+ echo "${ECHO_T}$use_weak_symbols" >&6
+ if test "$use_weak_symbols" = yes ; then
+
+-echo "$as_me:15753: checking if $CC supports weak symbols" >&5
++echo "$as_me:15780: 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 15760 "configure"
++#line 15787 "configure"
+ #include "confdefs.h"
+
+ #include <stdio.h>
+@@ -15783,16 +15810,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:15786: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:15813: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:15789: \$? = $ac_status" >&5
++ echo "$as_me:15816: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:15792: \"$ac_try\"") >&5
++ { (eval echo "$as_me:15819: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:15795: \$? = $ac_status" >&5
++ echo "$as_me:15822: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_weak_symbols=yes
+ else
+@@ -15803,7 +15830,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+
+ fi
+-echo "$as_me:15806: result: $cf_cv_weak_symbols" >&5
++echo "$as_me:15833: result: $cf_cv_weak_symbols" >&5
+ echo "${ECHO_T}$cf_cv_weak_symbols" >&6
+
+ else
+@@ -15832,13 +15859,13 @@
+ fi
+
+ # OpenSUSE is installing ncurses6, using reentrant option.
+-echo "$as_me:15835: checking for _nc_TABSIZE" >&5
++echo "$as_me:15862: 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 15841 "configure"
++#line 15868 "configure"
+ #include "confdefs.h"
+ #define _nc_TABSIZE autoconf_temporary
+ #include <limits.h> /* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -15869,16 +15896,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:15872: \"$ac_link\"") >&5
++if { (eval echo "$as_me:15899: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:15875: \$? = $ac_status" >&5
++ echo "$as_me:15902: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:15878: \"$ac_try\"") >&5
++ { (eval echo "$as_me:15905: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:15881: \$? = $ac_status" >&5
++ echo "$as_me:15908: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_func__nc_TABSIZE=yes
+ else
+@@ -15888,7 +15915,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:15891: result: $ac_cv_func__nc_TABSIZE" >&5
++echo "$as_me:15918: 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
+@@ -15900,7 +15927,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:15903: checking if you want experimental reentrant code" >&5
++echo "$as_me:15930: 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.
+@@ -15910,7 +15937,7 @@
+ else
+ with_reentrant=$assume_reentrant
+ fi;
+-echo "$as_me:15913: result: $with_reentrant" >&5
++echo "$as_me:15940: result: $with_reentrant" >&5
+ echo "${ECHO_T}$with_reentrant" >&6
+ if test "$with_reentrant" = yes ; then
+ cf_cv_enable_reentrant=1
+@@ -15933,7 +15960,7 @@
+
+ ### Allow using a different wrap-prefix
+ if test "$cf_cv_enable_reentrant" != 0 || test "$BROKEN_LINKER" = 1 ; then
+- echo "$as_me:15936: checking for prefix used to wrap public variables" >&5
++ echo "$as_me:15963: 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.
+@@ -15943,7 +15970,7 @@
+ else
+ NCURSES_WRAP_PREFIX=_nc_
+ fi;
+- echo "$as_me:15946: result: $NCURSES_WRAP_PREFIX" >&5
++ echo "$as_me:15973: result: $NCURSES_WRAP_PREFIX" >&5
+ echo "${ECHO_T}$NCURSES_WRAP_PREFIX" >&6
+ else
+ NCURSES_WRAP_PREFIX=_nc_
+@@ -15957,7 +15984,7 @@
+
+ ### use option --disable-echo to suppress full display compiling commands
+
+-echo "$as_me:15960: checking if you want to see long compiling messages" >&5
++echo "$as_me:15987: 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.
+@@ -15991,10 +16018,10 @@
+ ECHO_CC=''
+
+ fi;
+-echo "$as_me:15994: result: $enableval" >&5
++echo "$as_me:16021: result: $enableval" >&5
+ echo "${ECHO_T}$enableval" >&6
+
+-echo "$as_me:15997: checking if you want to use C11 _Noreturn feature" >&5
++echo "$as_me:16024: 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.
+@@ -16011,17 +16038,17 @@
+ enable_stdnoreturn=no
+
+ fi;
+-echo "$as_me:16014: result: $enable_stdnoreturn" >&5
++echo "$as_me:16041: result: $enable_stdnoreturn" >&5
+ echo "${ECHO_T}$enable_stdnoreturn" >&6
+
+ if test $enable_stdnoreturn = yes; then
+-echo "$as_me:16018: checking for C11 _Noreturn feature" >&5
++echo "$as_me:16045: 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 16024 "configure"
++#line 16051 "configure"
+ #include "confdefs.h"
+
+ $ac_includes_default
+@@ -16037,16 +16064,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:16040: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:16067: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:16043: \$? = $ac_status" >&5
++ echo "$as_me:16070: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:16046: \"$ac_try\"") >&5
++ { (eval echo "$as_me:16073: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:16049: \$? = $ac_status" >&5
++ echo "$as_me:16076: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_c11_noreturn=yes
+ else
+@@ -16057,7 +16084,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+
+ fi
+-echo "$as_me:16060: result: $cf_cv_c11_noreturn" >&5
++echo "$as_me:16087: result: $cf_cv_c11_noreturn" >&5
+ echo "${ECHO_T}$cf_cv_c11_noreturn" >&6
+ else
+ cf_cv_c11_noreturn=no,
+@@ -16113,16 +16140,16 @@
+ then
+ test -n "$verbose" && echo " repairing CFLAGS: $CFLAGS" 1>&6
+
+-echo "${as_me:-configure}:16116: testing repairing CFLAGS: $CFLAGS ..." 1>&5
++echo "${as_me:-configure}:16143: testing repairing CFLAGS: $CFLAGS ..." 1>&5
+
+ CFLAGS="$cf_temp_flags"
+ test -n "$verbose" && echo " ... fixed $CFLAGS" 1>&6
+
+-echo "${as_me:-configure}:16121: testing ... fixed $CFLAGS ..." 1>&5
++echo "${as_me:-configure}:16148: testing ... fixed $CFLAGS ..." 1>&5
+
+ test -n "$verbose" && echo " ... extra $EXTRA_CFLAGS" 1>&6
+
+-echo "${as_me:-configure}:16125: testing ... extra $EXTRA_CFLAGS ..." 1>&5
++echo "${as_me:-configure}:16152: testing ... extra $EXTRA_CFLAGS ..." 1>&5
+
+ fi
+ ;;
+@@ -16161,16 +16188,16 @@
+ then
+ test -n "$verbose" && echo " repairing CPPFLAGS: $CPPFLAGS" 1>&6
+
+-echo "${as_me:-configure}:16164: testing repairing CPPFLAGS: $CPPFLAGS ..." 1>&5
++echo "${as_me:-configure}:16191: testing repairing CPPFLAGS: $CPPFLAGS ..." 1>&5
+
+ CPPFLAGS="$cf_temp_flags"
+ test -n "$verbose" && echo " ... fixed $CPPFLAGS" 1>&6
+
+-echo "${as_me:-configure}:16169: testing ... fixed $CPPFLAGS ..." 1>&5
++echo "${as_me:-configure}:16196: testing ... fixed $CPPFLAGS ..." 1>&5
+
+ test -n "$verbose" && echo " ... extra $EXTRA_CFLAGS" 1>&6
+
+-echo "${as_me:-configure}:16173: testing ... extra $EXTRA_CFLAGS ..." 1>&5
++echo "${as_me:-configure}:16200: testing ... extra $EXTRA_CFLAGS ..." 1>&5
+
+ fi
+ ;;
+@@ -16209,23 +16236,23 @@
+ then
+ test -n "$verbose" && echo " repairing LDFLAGS: $LDFLAGS" 1>&6
+
+-echo "${as_me:-configure}:16212: testing repairing LDFLAGS: $LDFLAGS ..." 1>&5
++echo "${as_me:-configure}:16239: testing repairing LDFLAGS: $LDFLAGS ..." 1>&5
+
+ LDFLAGS="$cf_temp_flags"
+ test -n "$verbose" && echo " ... fixed $LDFLAGS" 1>&6
+
+-echo "${as_me:-configure}:16217: testing ... fixed $LDFLAGS ..." 1>&5
++echo "${as_me:-configure}:16244: testing ... fixed $LDFLAGS ..." 1>&5
+
+ test -n "$verbose" && echo " ... extra $EXTRA_CFLAGS" 1>&6
+
+-echo "${as_me:-configure}:16221: testing ... extra $EXTRA_CFLAGS ..." 1>&5
++echo "${as_me:-configure}:16248: testing ... extra $EXTRA_CFLAGS ..." 1>&5
+
+ fi
+ ;;
+ esac
+ fi
+
+-echo "$as_me:16228: checking if you want to turn on gcc warnings" >&5
++echo "$as_me:16255: 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.
+@@ -16242,7 +16269,7 @@
+ enable_warnings=no
+
+ fi;
+-echo "$as_me:16245: result: $enable_warnings" >&5
++echo "$as_me:16272: result: $enable_warnings" >&5
+ echo "${ECHO_T}$enable_warnings" >&6
+ if test "$enable_warnings" = "yes"
+ then
+@@ -16266,7 +16293,7 @@
+ done
+
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 16269 "configure"
++#line 16296 "configure"
+ #include "confdefs.h"
+
+ #include <stdlib.h>
+@@ -16281,26 +16308,26 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:16284: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:16311: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:16287: \$? = $ac_status" >&5
++ echo "$as_me:16314: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:16290: \"$ac_try\"") >&5
++ { (eval echo "$as_me:16317: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:16293: \$? = $ac_status" >&5
++ echo "$as_me:16320: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+
+-echo "$as_me:16296: checking for X11/Xt const-feature" >&5
++echo "$as_me:16323: 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 16303 "configure"
++#line 16330 "configure"
+ #include "confdefs.h"
+
+ #undef _CONST_X_STRING
+@@ -16318,16 +16345,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:16321: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:16348: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:16324: \$? = $ac_status" >&5
++ echo "$as_me:16351: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:16327: \"$ac_try\"") >&5
++ { (eval echo "$as_me:16354: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:16330: \$? = $ac_status" >&5
++ echo "$as_me:16357: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+
+ cf_cv_const_x_string=no
+@@ -16342,7 +16369,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+
+ fi
+-echo "$as_me:16345: result: $cf_cv_const_x_string" >&5
++echo "$as_me:16372: result: $cf_cv_const_x_string" >&5
+ echo "${ECHO_T}$cf_cv_const_x_string" >&6
+
+ LIBS="$cf_save_LIBS_CF_CONST_X_STRING"
+@@ -16371,7 +16398,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+ cat > "conftest.$ac_ext" <<EOF
+-#line 16374 "${as_me:-configure}"
++#line 16401 "${as_me:-configure}"
+ int main(int argc, char *argv[]) { return (argv[argc-1] == 0) ; }
+ EOF
+ if test "$INTEL_COMPILER" = yes
+@@ -16387,7 +16414,7 @@
+ # remark #981: operands are evaluated in unspecified order
+ # warning #279: controlling expression is constant
+
+- { echo "$as_me:16390: checking for $CC warning options..." >&5
++ { echo "$as_me:16417: checking for $CC warning options..." >&5
+ echo "$as_me: checking for $CC warning options..." >&6;}
+ cf_save_CFLAGS="$CFLAGS"
+ EXTRA_CFLAGS="$EXTRA_CFLAGS -Wall"
+@@ -16403,12 +16430,12 @@
+ wd981
+ do
+ CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt"
+- if { (eval echo "$as_me:16406: \"$ac_compile\"") >&5
++ if { (eval echo "$as_me:16433: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:16409: \$? = $ac_status" >&5
++ echo "$as_me:16436: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; then
+- test -n "$verbose" && echo "$as_me:16411: result: ... -$cf_opt" >&5
++ test -n "$verbose" && echo "$as_me:16438: result: ... -$cf_opt" >&5
+ echo "${ECHO_T}... -$cf_opt" >&6
+ EXTRA_CFLAGS="$EXTRA_CFLAGS -$cf_opt"
+ fi
+@@ -16416,7 +16443,7 @@
+ CFLAGS="$cf_save_CFLAGS"
+ elif test "$GCC" = yes && test "$GCC_VERSION" != "unknown"
+ then
+- { echo "$as_me:16419: checking for $CC warning options..." >&5
++ { echo "$as_me:16446: checking for $CC warning options..." >&5
+ echo "$as_me: checking for $CC warning options..." >&6;}
+ cf_save_CFLAGS="$CFLAGS"
+ cf_warn_CONST=""
+@@ -16439,12 +16466,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:16442: \"$ac_compile\"") >&5
++ if { (eval echo "$as_me:16469: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:16445: \$? = $ac_status" >&5
++ echo "$as_me:16472: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; then
+- test -n "$verbose" && echo "$as_me:16447: result: ... -$cf_opt" >&5
++ test -n "$verbose" && echo "$as_me:16474: result: ... -$cf_opt" >&5
+ echo "${ECHO_T}... -$cf_opt" >&6
+ case "$cf_opt" in
+ (Winline)
+@@ -16452,7 +16479,7 @@
+ ([34].*)
+ test -n "$verbose" && echo " feature is broken in gcc $GCC_VERSION" 1>&6
+
+-echo "${as_me:-configure}:16455: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
++echo "${as_me:-configure}:16482: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
+
+ continue;;
+ esac
+@@ -16462,7 +16489,7 @@
+ ([12].*)
+ test -n "$verbose" && echo " feature is broken in gcc $GCC_VERSION" 1>&6
+
+-echo "${as_me:-configure}:16465: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
++echo "${as_me:-configure}:16492: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
+
+ continue;;
+ esac
+@@ -16495,10 +16522,10 @@
+ EOF
+ if test "$GCC" = yes
+ then
+- { echo "$as_me:16498: checking for $CC __attribute__ directives..." >&5
++ { echo "$as_me:16525: checking for $CC __attribute__ directives..." >&5
+ echo "$as_me: checking for $CC __attribute__ directives..." >&6;}
+ cat > "conftest.$ac_ext" <<EOF
+-#line 16501 "${as_me:-configure}"
++#line 16528 "${as_me:-configure}"
+ #include <stdio.h>
+ #include "confdefs.h"
+ #include "conftest.h"
+@@ -16548,12 +16575,12 @@
+ ;;
+ esac
+
+- if { (eval echo "$as_me:16551: \"$ac_compile\"") >&5
++ if { (eval echo "$as_me:16578: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:16554: \$? = $ac_status" >&5
++ echo "$as_me:16581: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; then
+- test -n "$verbose" && echo "$as_me:16556: result: ... $cf_attribute" >&5
++ test -n "$verbose" && echo "$as_me:16583: result: ... $cf_attribute" >&5
+ echo "${ECHO_T}... $cf_attribute" >&6
+ cat conftest.h >>confdefs.h
+ case "$cf_attribute" in
+@@ -16621,7 +16648,7 @@
+ fi
+
+ ### use option --enable-assertions to turn on generation of assertion code
+-echo "$as_me:16624: checking if you want to enable runtime assertions" >&5
++echo "$as_me:16651: 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.
+@@ -16631,7 +16658,7 @@
+ else
+ with_assertions=no
+ fi;
+-echo "$as_me:16634: result: $with_assertions" >&5
++echo "$as_me:16661: result: $with_assertions" >&5
+ echo "${ECHO_T}$with_assertions" >&6
+ if test -n "$GCC"
+ then
+@@ -16684,7 +16711,7 @@
+ ;;
+ esac
+
+-echo "$as_me:16687: checking whether to add trace feature to all models" >&5
++echo "$as_me:16714: 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.
+@@ -16694,7 +16721,7 @@
+ else
+ cf_with_trace=$cf_all_traces
+ fi;
+-echo "$as_me:16697: result: $cf_with_trace" >&5
++echo "$as_me:16724: result: $cf_with_trace" >&5
+ echo "${ECHO_T}$cf_with_trace" >&6
+
+ if test "$cf_with_trace" = yes ; then
+@@ -16708,7 +16735,7 @@
+ ADA_TRACE=FALSE
+ fi
+
+-echo "$as_me:16711: checking if we want to use GNAT projects" >&5
++echo "$as_me:16738: 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.
+@@ -16725,21 +16752,21 @@
+ enable_gnat_projects=yes
+
+ fi;
+-echo "$as_me:16728: result: $enable_gnat_projects" >&5
++echo "$as_me:16755: 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:16735: checking if ssp library is needed" >&5
++echo "$as_me:16762: 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 16742 "configure"
++#line 16769 "configure"
+ #include "confdefs.h"
+
+ #include <sys/types.h>
+@@ -16756,16 +16783,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:16759: \"$ac_link\"") >&5
++if { (eval echo "$as_me:16786: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:16762: \$? = $ac_status" >&5
++ echo "$as_me:16789: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:16765: \"$ac_try\"") >&5
++ { (eval echo "$as_me:16792: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:16768: \$? = $ac_status" >&5
++ echo "$as_me:16795: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_need_libssp=no
+ else
+@@ -16775,7 +16802,7 @@
+ cf_save_LIBS="$LIBS"
+ LIBS="$LIBS -lssp"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 16778 "configure"
++#line 16805 "configure"
+ #include "confdefs.h"
+
+ #include <sys/types.h>
+@@ -16792,16 +16819,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:16795: \"$ac_link\"") >&5
++if { (eval echo "$as_me:16822: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:16798: \$? = $ac_status" >&5
++ echo "$as_me:16825: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:16801: \"$ac_try\"") >&5
++ { (eval echo "$as_me:16828: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:16804: \$? = $ac_status" >&5
++ echo "$as_me:16831: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_need_libssp=yes
+ else
+@@ -16815,7 +16842,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:16818: result: $cf_cv_need_libssp" >&5
++echo "$as_me:16845: result: $cf_cv_need_libssp" >&5
+ echo "${ECHO_T}$cf_cv_need_libssp" >&6
+
+ if test "x$cf_cv_need_libssp" = xyes
+@@ -16843,13 +16870,13 @@
+ (*)
+
+ cf_save_libs="$LIBS"
+-echo "$as_me:16846: checking for clock_gettime" >&5
++echo "$as_me:16873: 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 16852 "configure"
++#line 16879 "configure"
+ #include "confdefs.h"
+ #define clock_gettime autoconf_temporary
+ #include <limits.h> /* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -16880,16 +16907,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:16883: \"$ac_link\"") >&5
++if { (eval echo "$as_me:16910: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:16886: \$? = $ac_status" >&5
++ echo "$as_me:16913: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:16889: \"$ac_try\"") >&5
++ { (eval echo "$as_me:16916: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:16892: \$? = $ac_status" >&5
++ echo "$as_me:16919: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_func_clock_gettime=yes
+ else
+@@ -16899,12 +16926,12 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:16902: result: $ac_cv_func_clock_gettime" >&5
++echo "$as_me:16929: 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:16907: checking for clock_gettime in -lrt" >&5
++ echo "$as_me:16934: 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
+@@ -16912,7 +16939,7 @@
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lrt $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 16915 "configure"
++#line 16942 "configure"
+ #include "confdefs.h"
+
+ /* Override any gcc2 internal prototype to avoid an error. */
+@@ -16931,16 +16958,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:16934: \"$ac_link\"") >&5
++if { (eval echo "$as_me:16961: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:16937: \$? = $ac_status" >&5
++ echo "$as_me:16964: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:16940: \"$ac_try\"") >&5
++ { (eval echo "$as_me:16967: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:16943: \$? = $ac_status" >&5
++ echo "$as_me:16970: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_lib_rt_clock_gettime=yes
+ else
+@@ -16951,7 +16978,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:16954: result: $ac_cv_lib_rt_clock_gettime" >&5
++echo "$as_me:16981: 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"
+@@ -16963,14 +16990,14 @@
+ fi
+
+ if test "$cf_cv_test_clock_gettime" = yes ; then
+-echo "$as_me:16966: checking if clock_gettime links" >&5
++echo "$as_me:16993: 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 16973 "configure"
++#line 17000 "configure"
+ #include "confdefs.h"
+
+ $ac_includes_default
+@@ -16988,16 +17015,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:16991: \"$ac_link\"") >&5
++if { (eval echo "$as_me:17018: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:16994: \$? = $ac_status" >&5
++ echo "$as_me:17021: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:16997: \"$ac_try\"") >&5
++ { (eval echo "$as_me:17024: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:17000: \$? = $ac_status" >&5
++ echo "$as_me:17027: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_func_clock_gettime=yes
+ else
+@@ -17008,7 +17035,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+
+ fi
+-echo "$as_me:17011: result: $cf_cv_func_clock_gettime" >&5
++echo "$as_me:17038: result: $cf_cv_func_clock_gettime" >&5
+ echo "${ECHO_T}$cf_cv_func_clock_gettime" >&6
+ else
+ cf_cv_func_clock_gettime=no
+@@ -17022,13 +17049,13 @@
+ EOF
+
+ else
+-echo "$as_me:17025: checking for gettimeofday" >&5
++echo "$as_me:17052: 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 17031 "configure"
++#line 17058 "configure"
+ #include "confdefs.h"
+ #define gettimeofday autoconf_temporary
+ #include <limits.h> /* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -17059,16 +17086,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:17062: \"$ac_link\"") >&5
++if { (eval echo "$as_me:17089: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:17065: \$? = $ac_status" >&5
++ echo "$as_me:17092: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:17068: \"$ac_try\"") >&5
++ { (eval echo "$as_me:17095: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:17071: \$? = $ac_status" >&5
++ echo "$as_me:17098: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_func_gettimeofday=yes
+ else
+@@ -17078,7 +17105,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:17081: result: $ac_cv_func_gettimeofday" >&5
++echo "$as_me:17108: result: $ac_cv_func_gettimeofday" >&5
+ echo "${ECHO_T}$ac_cv_func_gettimeofday" >&6
+ if test "$ac_cv_func_gettimeofday" = yes; then
+
+@@ -17088,7 +17115,7 @@
+
+ else
+
+-echo "$as_me:17091: checking for gettimeofday in -lbsd" >&5
++echo "$as_me:17118: 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
+@@ -17096,7 +17123,7 @@
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lbsd $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 17099 "configure"
++#line 17126 "configure"
+ #include "confdefs.h"
+
+ /* Override any gcc2 internal prototype to avoid an error. */
+@@ -17115,16 +17142,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:17118: \"$ac_link\"") >&5
++if { (eval echo "$as_me:17145: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:17121: \$? = $ac_status" >&5
++ echo "$as_me:17148: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:17124: \"$ac_try\"") >&5
++ { (eval echo "$as_me:17151: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:17127: \$? = $ac_status" >&5
++ echo "$as_me:17154: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_lib_bsd_gettimeofday=yes
+ else
+@@ -17135,7 +17162,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:17138: result: $ac_cv_lib_bsd_gettimeofday" >&5
++echo "$as_me:17165: 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
+
+@@ -17168,13 +17195,13 @@
+ esac
+
+ ### Checks for header files.
+-echo "$as_me:17171: checking for signed char" >&5
++echo "$as_me:17198: 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 17177 "configure"
++#line 17204 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -17189,16 +17216,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:17192: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:17219: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:17195: \$? = $ac_status" >&5
++ echo "$as_me:17222: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:17198: \"$ac_try\"") >&5
++ { (eval echo "$as_me:17225: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:17201: \$? = $ac_status" >&5
++ echo "$as_me:17228: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_type_signed_char=yes
+ else
+@@ -17208,10 +17235,10 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:17211: result: $ac_cv_type_signed_char" >&5
++echo "$as_me:17238: result: $ac_cv_type_signed_char" >&5
+ echo "${ECHO_T}$ac_cv_type_signed_char" >&6
+
+-echo "$as_me:17214: checking size of signed char" >&5
++echo "$as_me:17241: 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
+@@ -17220,7 +17247,7 @@
+ if test "$cross_compiling" = yes; then
+ # Depending upon the size, compute the lo and hi bounds.
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 17223 "configure"
++#line 17250 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -17232,21 +17259,21 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:17235: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:17262: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:17238: \$? = $ac_status" >&5
++ echo "$as_me:17265: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:17241: \"$ac_try\"") >&5
++ { (eval echo "$as_me:17268: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:17244: \$? = $ac_status" >&5
++ echo "$as_me:17271: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_lo=0 ac_mid=0
+ while :; do
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 17249 "configure"
++#line 17276 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -17258,16 +17285,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:17261: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:17288: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:17264: \$? = $ac_status" >&5
++ echo "$as_me:17291: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:17267: \"$ac_try\"") >&5
++ { (eval echo "$as_me:17294: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:17270: \$? = $ac_status" >&5
++ echo "$as_me:17297: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_hi=$ac_mid; break
+ else
+@@ -17283,7 +17310,7 @@
+ ac_hi=-1 ac_mid=-1
+ while :; do
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 17286 "configure"
++#line 17313 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -17295,16 +17322,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:17298: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:17325: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:17301: \$? = $ac_status" >&5
++ echo "$as_me:17328: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:17304: \"$ac_try\"") >&5
++ { (eval echo "$as_me:17331: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:17307: \$? = $ac_status" >&5
++ echo "$as_me:17334: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_lo=$ac_mid; break
+ else
+@@ -17320,7 +17347,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 17323 "configure"
++#line 17350 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -17332,16 +17359,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:17335: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:17362: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:17338: \$? = $ac_status" >&5
++ echo "$as_me:17365: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:17341: \"$ac_try\"") >&5
++ { (eval echo "$as_me:17368: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:17344: \$? = $ac_status" >&5
++ echo "$as_me:17371: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_hi=$ac_mid
+ else
+@@ -17354,12 +17381,12 @@
+ ac_cv_sizeof_signed_char=$ac_lo
+ else
+ if test "$cross_compiling" = yes; then
+- { { echo "$as_me:17357: error: cannot run test program while cross compiling" >&5
++ { { echo "$as_me:17384: 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 17362 "configure"
++#line 17389 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -17375,15 +17402,15 @@
+ }
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:17378: \"$ac_link\"") >&5
++if { (eval echo "$as_me:17405: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:17381: \$? = $ac_status" >&5
++ echo "$as_me:17408: \$? = $ac_status" >&5
+ (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+- { (eval echo "$as_me:17383: \"$ac_try\"") >&5
++ { (eval echo "$as_me:17410: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:17386: \$? = $ac_status" >&5
++ echo "$as_me:17413: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_sizeof_signed_char=`cat conftest.val`
+ else
+@@ -17399,7 +17426,7 @@
+ ac_cv_sizeof_signed_char=0
+ fi
+ fi
+-echo "$as_me:17402: result: $ac_cv_sizeof_signed_char" >&5
++echo "$as_me:17429: 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
+@@ -17408,13 +17435,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:17411: checking for $ac_hdr that defines DIR" >&5
++echo "$as_me:17438: 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 17417 "configure"
++#line 17444 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ #include <$ac_hdr>
+@@ -17429,16 +17456,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:17432: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:17459: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:17435: \$? = $ac_status" >&5
++ echo "$as_me:17462: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:17438: \"$ac_try\"") >&5
++ { (eval echo "$as_me:17465: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:17441: \$? = $ac_status" >&5
++ echo "$as_me:17468: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ eval "$as_ac_Header=yes"
+ else
+@@ -17448,7 +17475,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:17451: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
++echo "$as_me:17478: 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
+@@ -17461,7 +17488,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:17464: checking for opendir in -ldir" >&5
++ echo "$as_me:17491: 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
+@@ -17469,7 +17496,7 @@
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-ldir $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 17472 "configure"
++#line 17499 "configure"
+ #include "confdefs.h"
+
+ /* Override any gcc2 internal prototype to avoid an error. */
+@@ -17488,16 +17515,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:17491: \"$ac_link\"") >&5
++if { (eval echo "$as_me:17518: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:17494: \$? = $ac_status" >&5
++ echo "$as_me:17521: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:17497: \"$ac_try\"") >&5
++ { (eval echo "$as_me:17524: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:17500: \$? = $ac_status" >&5
++ echo "$as_me:17527: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_lib_dir_opendir=yes
+ else
+@@ -17508,14 +17535,14 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:17511: result: $ac_cv_lib_dir_opendir" >&5
++echo "$as_me:17538: 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:17518: checking for opendir in -lx" >&5
++ echo "$as_me:17545: 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
+@@ -17523,7 +17550,7 @@
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lx $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 17526 "configure"
++#line 17553 "configure"
+ #include "confdefs.h"
+
+ /* Override any gcc2 internal prototype to avoid an error. */
+@@ -17542,16 +17569,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:17545: \"$ac_link\"") >&5
++if { (eval echo "$as_me:17572: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:17548: \$? = $ac_status" >&5
++ echo "$as_me:17575: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:17551: \"$ac_try\"") >&5
++ { (eval echo "$as_me:17578: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:17554: \$? = $ac_status" >&5
++ echo "$as_me:17581: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_lib_x_opendir=yes
+ else
+@@ -17562,7 +17589,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:17565: result: $ac_cv_lib_x_opendir" >&5
++echo "$as_me:17592: 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"
+@@ -17570,13 +17597,13 @@
+
+ fi
+
+-echo "$as_me:17573: checking whether time.h and sys/time.h may both be included" >&5
++echo "$as_me:17600: 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 17579 "configure"
++#line 17606 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ #include <sys/time.h>
+@@ -17592,16 +17619,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:17595: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:17622: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:17598: \$? = $ac_status" >&5
++ echo "$as_me:17625: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:17601: \"$ac_try\"") >&5
++ { (eval echo "$as_me:17628: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:17604: \$? = $ac_status" >&5
++ echo "$as_me:17631: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_header_time=yes
+ else
+@@ -17611,7 +17638,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:17614: result: $ac_cv_header_time" >&5
++echo "$as_me:17641: result: $ac_cv_header_time" >&5
+ echo "${ECHO_T}$ac_cv_header_time" >&6
+ if test $ac_cv_header_time = yes; then
+
+@@ -17629,13 +17656,13 @@
+ ac_compiler_gnu=$ac_cv_c_compiler_gnu
+ ac_main_return="return"
+
+-echo "$as_me:17632: checking for an ANSI C-conforming const" >&5
++echo "$as_me:17659: 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 17638 "configure"
++#line 17665 "configure"
+ #include "confdefs.h"
+
+ int
+@@ -17697,16 +17724,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:17700: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:17727: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:17703: \$? = $ac_status" >&5
++ echo "$as_me:17730: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:17706: \"$ac_try\"") >&5
++ { (eval echo "$as_me:17733: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:17709: \$? = $ac_status" >&5
++ echo "$as_me:17736: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_c_const=yes
+ else
+@@ -17716,7 +17743,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:17719: result: $ac_cv_c_const" >&5
++echo "$as_me:17746: result: $ac_cv_c_const" >&5
+ echo "${ECHO_T}$ac_cv_c_const" >&6
+ if test $ac_cv_c_const = no; then
+
+@@ -17728,7 +17755,7 @@
+
+ ### Checks for external-data
+
+-echo "$as_me:17731: checking if data-only library module links" >&5
++echo "$as_me:17758: 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
+@@ -17736,20 +17763,20 @@
+
+ rm -f conftest.a
+ cat >conftest.$ac_ext <<EOF
+-#line 17739 "configure"
++#line 17766 "configure"
+ int testdata[3] = { 123, 456, 789 };
+ EOF
+- if { (eval echo "$as_me:17742: \"$ac_compile\"") >&5
++ if { (eval echo "$as_me:17769: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:17745: \$? = $ac_status" >&5
++ echo "$as_me:17772: \$? = $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 17752 "configure"
++#line 17779 "configure"
+ extern int testfunc(void);
+ #if defined(NeXT)
+ int testfunc(void)
+@@ -17766,10 +17793,10 @@
+ }
+ #endif
+ EOF
+- if { (eval echo "$as_me:17769: \"$ac_compile\"") >&5
++ if { (eval echo "$as_me:17796: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:17772: \$? = $ac_status" >&5
++ echo "$as_me:17799: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; then
+ mv conftest.o func.o && \
+ ( $AR $ARFLAGS conftest.a func.o ) 2>&5 1>/dev/null
+@@ -17782,7 +17809,7 @@
+ cf_cv_link_dataonly=unknown
+ else
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 17785 "configure"
++#line 17812 "configure"
+ #include "confdefs.h"
+
+ extern int testfunc(void);
+@@ -17793,15 +17820,15 @@
+
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:17796: \"$ac_link\"") >&5
++if { (eval echo "$as_me:17823: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:17799: \$? = $ac_status" >&5
++ echo "$as_me:17826: \$? = $ac_status" >&5
+ (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+- { (eval echo "$as_me:17801: \"$ac_try\"") >&5
++ { (eval echo "$as_me:17828: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:17804: \$? = $ac_status" >&5
++ echo "$as_me:17831: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_link_dataonly=yes
+ else
+@@ -17816,7 +17843,7 @@
+
+ fi
+
+-echo "$as_me:17819: result: $cf_cv_link_dataonly" >&5
++echo "$as_me:17846: result: $cf_cv_link_dataonly" >&5
+ echo "${ECHO_T}$cf_cv_link_dataonly" >&6
+
+ if test "$cf_cv_link_dataonly" = no ; then
+@@ -17835,23 +17862,23 @@
+
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-echo "$as_me:17838: checking for $ac_header" >&5
++echo "$as_me:17865: 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 17844 "configure"
++#line 17871 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:17848: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:17875: \"$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:17854: \$? = $ac_status" >&5
++ echo "$as_me:17881: \$? = $ac_status" >&5
+ (exit "$ac_status"); } >/dev/null; then
+ if test -s conftest.err; then
+ ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -17870,7 +17897,7 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:17873: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
++echo "$as_me:17900: 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
+@@ -17880,7 +17907,7 @@
+ fi
+ done
+
+-echo "$as_me:17883: checking for working mkstemp" >&5
++echo "$as_me:17910: 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
+@@ -17891,7 +17918,7 @@
+ cf_cv_func_mkstemp=maybe
+ else
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 17894 "configure"
++#line 17921 "configure"
+ #include "confdefs.h"
+
+ $ac_includes_default
+@@ -17926,15 +17953,15 @@
+
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:17929: \"$ac_link\"") >&5
++if { (eval echo "$as_me:17956: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:17932: \$? = $ac_status" >&5
++ echo "$as_me:17959: \$? = $ac_status" >&5
+ (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+- { (eval echo "$as_me:17934: \"$ac_try\"") >&5
++ { (eval echo "$as_me:17961: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:17937: \$? = $ac_status" >&5
++ echo "$as_me:17964: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_func_mkstemp=yes
+
+@@ -17949,16 +17976,16 @@
+ fi
+
+ fi
+-echo "$as_me:17952: result: $cf_cv_func_mkstemp" >&5
++echo "$as_me:17979: 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:17955: checking for mkstemp" >&5
++ echo "$as_me:17982: 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 17961 "configure"
++#line 17988 "configure"
+ #include "confdefs.h"
+ #define mkstemp autoconf_temporary
+ #include <limits.h> /* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -17989,16 +18016,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:17992: \"$ac_link\"") >&5
++if { (eval echo "$as_me:18019: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:17995: \$? = $ac_status" >&5
++ echo "$as_me:18022: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:17998: \"$ac_try\"") >&5
++ { (eval echo "$as_me:18025: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:18001: \$? = $ac_status" >&5
++ echo "$as_me:18028: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_func_mkstemp=yes
+ else
+@@ -18008,7 +18035,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:18011: result: $ac_cv_func_mkstemp" >&5
++echo "$as_me:18038: result: $ac_cv_func_mkstemp" >&5
+ echo "${ECHO_T}$ac_cv_func_mkstemp" >&6
+
+ fi
+@@ -18029,7 +18056,7 @@
+ if test "$cf_with_ada" != "no" ; then
+ if test "$cf_cv_prog_gnat_correct" = yes; then
+
+- echo "$as_me:18032: checking optimization options for ADAFLAGS" >&5
++ echo "$as_me:18059: checking optimization options for ADAFLAGS" >&5
+ echo $ECHO_N "checking optimization options for ADAFLAGS... $ECHO_C" >&6
+ case "$CFLAGS" in
+ (*-g*)
+@@ -18046,10 +18073,10 @@
+
+ ;;
+ esac
+- echo "$as_me:18049: result: $ADAFLAGS" >&5
++ echo "$as_me:18076: result: $ADAFLAGS" >&5
+ echo "${ECHO_T}$ADAFLAGS" >&6
+
+-echo "$as_me:18052: checking if GNATPREP supports -T option" >&5
++echo "$as_me:18079: 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
+@@ -18059,11 +18086,11 @@
+ gnatprep -T 2>/dev/null >/dev/null && cf_cv_gnatprep_opt_t=yes
+
+ fi
+-echo "$as_me:18062: result: $cf_cv_gnatprep_opt_t" >&5
++echo "$as_me:18089: 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:18066: checking if GNAT supports generics" >&5
++echo "$as_me:18093: 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])
+@@ -18073,7 +18100,7 @@
+ cf_gnat_generics=no
+ ;;
+ esac
+-echo "$as_me:18076: result: $cf_gnat_generics" >&5
++echo "$as_me:18103: result: $cf_gnat_generics" >&5
+ echo "${ECHO_T}$cf_gnat_generics" >&6
+
+ if test "$cf_gnat_generics" = yes
+@@ -18085,7 +18112,7 @@
+ cf_generic_objects=
+ fi
+
+-echo "$as_me:18088: checking if GNAT supports SIGINT" >&5
++echo "$as_me:18115: 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
+@@ -18133,7 +18160,7 @@
+ rm -rf ./conftest* ./*~conftest*
+
+ fi
+-echo "$as_me:18136: result: $cf_cv_gnat_sigint" >&5
++echo "$as_me:18163: result: $cf_cv_gnat_sigint" >&5
+ echo "${ECHO_T}$cf_cv_gnat_sigint" >&6
+
+ if test "$cf_cv_gnat_sigint" = yes ; then
+@@ -18146,7 +18173,7 @@
+ cf_gnat_projects=no
+
+ if test "$enable_gnat_projects" != no ; then
+-echo "$as_me:18149: checking if GNAT supports project files" >&5
++echo "$as_me:18176: 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]*)
+@@ -18209,15 +18236,15 @@
+ esac
+ ;;
+ esac
+-echo "$as_me:18212: result: $cf_gnat_projects" >&5
++echo "$as_me:18239: 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:18218: checking if GNAT supports libraries" >&5
++ echo "$as_me:18245: checking if GNAT supports libraries" >&5
+ echo $ECHO_N "checking if GNAT supports libraries... $ECHO_C" >&6
+- echo "$as_me:18220: result: $cf_gnat_libraries" >&5
++ echo "$as_me:18247: result: $cf_gnat_libraries" >&5
+ echo "${ECHO_T}$cf_gnat_libraries" >&6
+ fi
+
+@@ -18237,7 +18264,7 @@
+ then
+ USE_GNAT_MAKE_GPR=""
+ else
+- { echo "$as_me:18240: WARNING: use old makefile rules since tools are missing" >&5
++ { echo "$as_me:18267: 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
+@@ -18249,7 +18276,7 @@
+ USE_GNAT_LIBRARIES="#"
+ fi
+
+-echo "$as_me:18252: checking for Ada95 compiler" >&5
++echo "$as_me:18279: 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.
+@@ -18260,12 +18287,12 @@
+ cf_ada_compiler=gnatmake
+ fi;
+
+-echo "$as_me:18263: result: $cf_ada_compiler" >&5
++echo "$as_me:18290: result: $cf_ada_compiler" >&5
+ echo "${ECHO_T}$cf_ada_compiler" >&6
+
+ cf_ada_package=terminal_interface
+
+-echo "$as_me:18268: checking for Ada95 include directory" >&5
++echo "$as_me:18295: 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.
+@@ -18299,7 +18326,7 @@
+ withval=`echo "$withval" | sed -e s%NONE%$cf_path_syntax%`
+ ;;
+ (*)
+- { { echo "$as_me:18302: error: expected a pathname, not \"$withval\"" >&5
++ { { echo "$as_me:18329: error: expected a pathname, not \"$withval\"" >&5
+ echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
+ { (exit 1); exit 1; }; }
+ ;;
+@@ -18308,10 +18335,10 @@
+ fi
+ eval ADA_INCLUDE="$withval"
+
+-echo "$as_me:18311: result: $ADA_INCLUDE" >&5
++echo "$as_me:18338: result: $ADA_INCLUDE" >&5
+ echo "${ECHO_T}$ADA_INCLUDE" >&6
+
+-echo "$as_me:18314: checking for Ada95 object directory" >&5
++echo "$as_me:18341: 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.
+@@ -18345,7 +18372,7 @@
+ withval=`echo "$withval" | sed -e s%NONE%$cf_path_syntax%`
+ ;;
+ (*)
+- { { echo "$as_me:18348: error: expected a pathname, not \"$withval\"" >&5
++ { { echo "$as_me:18375: error: expected a pathname, not \"$withval\"" >&5
+ echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
+ { (exit 1); exit 1; }; }
+ ;;
+@@ -18354,10 +18381,10 @@
+ fi
+ eval ADA_OBJECTS="$withval"
+
+-echo "$as_me:18357: result: $ADA_OBJECTS" >&5
++echo "$as_me:18384: result: $ADA_OBJECTS" >&5
+ echo "${ECHO_T}$ADA_OBJECTS" >&6
+
+-echo "$as_me:18360: checking whether to build an Ada95 shared library" >&5
++echo "$as_me:18387: 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.
+@@ -18378,11 +18405,11 @@
+ fi
+ fi
+
+-echo "$as_me:18381: result: $with_ada_sharedlib" >&5
++echo "$as_me:18408: result: $with_ada_sharedlib" >&5
+ echo "${ECHO_T}$with_ada_sharedlib" >&6
+ if test "x$cf_ada_sharedlib_warn" != xno
+ then
+- { echo "$as_me:18385: WARNING: disabling Ada95 shared library since GNAT projects are not supported" >&5
++ { echo "$as_me:18412: 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
+
+@@ -18400,7 +18427,7 @@
+
+ # allow the Ada binding to be renamed
+
+-echo "$as_me:18403: checking for Ada95 curses library name" >&5
++echo "$as_me:18430: 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.
+@@ -18416,16 +18443,16 @@
+ ;;
+ esac
+
+-echo "$as_me:18419: result: $ADA_LIBNAME" >&5
++echo "$as_me:18446: result: $ADA_LIBNAME" >&5
+ echo "${ECHO_T}$ADA_LIBNAME" >&6
+
+ else
+- { { echo "$as_me:18423: error: No usable Ada compiler found" >&5
++ { { echo "$as_me:18450: 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:18428: error: The Ada compiler is needed for this package" >&5
++ { { echo "$as_me:18455: 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
+@@ -18465,7 +18492,7 @@
+ fi
+
+ ### Build up pieces for makefile rules
+-echo "$as_me:18468: checking default library suffix" >&5
++echo "$as_me:18495: checking default library suffix" >&5
+ echo $ECHO_N "checking default library suffix... $ECHO_C" >&6
+
+ case $DFT_LWR_MODEL in
+@@ -18476,10 +18503,10 @@
+ (shared) DFT_ARG_SUFFIX='' ;;
+ esac
+ test -n "$LIB_SUFFIX" && DFT_ARG_SUFFIX="${LIB_SUFFIX}${DFT_ARG_SUFFIX}"
+-echo "$as_me:18479: result: $DFT_ARG_SUFFIX" >&5
++echo "$as_me:18506: result: $DFT_ARG_SUFFIX" >&5
+ echo "${ECHO_T}$DFT_ARG_SUFFIX" >&6
+
+-echo "$as_me:18482: checking default library-dependency suffix" >&5
++echo "$as_me:18509: checking default library-dependency suffix" >&5
+ echo $ECHO_N "checking default library-dependency suffix... $ECHO_C" >&6
+
+ case X$DFT_LWR_MODEL in
+@@ -18562,10 +18589,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:18565: result: $DFT_DEP_SUFFIX" >&5
++echo "$as_me:18592: result: $DFT_DEP_SUFFIX" >&5
+ echo "${ECHO_T}$DFT_DEP_SUFFIX" >&6
+
+-echo "$as_me:18568: checking default object directory" >&5
++echo "$as_me:18595: checking default object directory" >&5
+ echo $ECHO_N "checking default object directory... $ECHO_C" >&6
+
+ case $DFT_LWR_MODEL in
+@@ -18581,7 +18608,7 @@
+ DFT_OBJ_SUBDIR='obj_s' ;;
+ esac
+ esac
+-echo "$as_me:18584: result: $DFT_OBJ_SUBDIR" >&5
++echo "$as_me:18611: result: $DFT_OBJ_SUBDIR" >&5
+ echo "${ECHO_T}$DFT_OBJ_SUBDIR" >&6
+
+ ### Set up low-level terminfo dependencies for makefiles.
+@@ -18723,7 +18750,7 @@
+ : "${CONFIG_STATUS=./config.status}"
+ ac_clean_files_save=$ac_clean_files
+ ac_clean_files="$ac_clean_files $CONFIG_STATUS"
+-{ echo "$as_me:18726: creating $CONFIG_STATUS" >&5
++{ echo "$as_me:18753: creating $CONFIG_STATUS" >&5
+ echo "$as_me: creating $CONFIG_STATUS" >&6;}
+ cat >"$CONFIG_STATUS" <<_ACEOF
+ #! $SHELL
+@@ -18904,7 +18931,7 @@
+ echo "$ac_cs_version"; exit 0 ;;
+ --he | --h)
+ # Conflict between --help and --header
+- { { echo "$as_me:18907: error: ambiguous option: $1
++ { { echo "$as_me:18934: 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;}
+@@ -18923,7 +18950,7 @@
+ ac_need_defaults=false;;
+
+ # This is an error.
+- -*) { { echo "$as_me:18926: error: unrecognized option: $1
++ -*) { { echo "$as_me:18953: 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;}
+@@ -18998,7 +19025,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:19001: error: invalid argument: $ac_config_target" >&5
++ *) { { echo "$as_me:19028: error: invalid argument: $ac_config_target" >&5
+ echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
+ { (exit 1); exit 1; }; };;
+ esac
+@@ -19143,6 +19170,7 @@
+ s,@ac_ct_AR@,$ac_ct_AR,;t t
+ s,@ARFLAGS@,$ARFLAGS,;t t
+ s,@DESTDIR@,$DESTDIR,;t t
++s,@MERGE_PREFIX@,$MERGE_PREFIX,;t t
+ s,@BUILD_CC@,$BUILD_CC,;t t
+ s,@BUILD_CPP@,$BUILD_CPP,;t t
+ s,@BUILD_CFLAGS@,$BUILD_CFLAGS,;t t
+@@ -19364,7 +19392,7 @@
+ esac
+
+ if test x"$ac_file" != x-; then
+- { echo "$as_me:19367: creating $ac_file" >&5
++ { echo "$as_me:19395: creating $ac_file" >&5
+ echo "$as_me: creating $ac_file" >&6;}
+ rm -f "$ac_file"
+ fi
+@@ -19382,7 +19410,7 @@
+ -) echo "$tmp"/stdin ;;
+ [\\/$]*)
+ # Absolute (can't be DOS-style, as IFS=:)
+- test -f "$f" || { { echo "$as_me:19385: error: cannot find input file: $f" >&5
++ test -f "$f" || { { echo "$as_me:19413: error: cannot find input file: $f" >&5
+ echo "$as_me: error: cannot find input file: $f" >&2;}
+ { (exit 1); exit 1; }; }
+ echo "$f";;
+@@ -19395,7 +19423,7 @@
+ echo "$srcdir/$f"
+ else
+ # /dev/null tree
+- { { echo "$as_me:19398: error: cannot find input file: $f" >&5
++ { { echo "$as_me:19426: error: cannot find input file: $f" >&5
+ echo "$as_me: error: cannot find input file: $f" >&2;}
+ { (exit 1); exit 1; }; }
+ fi;;
+@@ -19411,7 +19439,7 @@
+ if test -n "$ac_seen"; then
+ ac_used=`grep '@datarootdir@' "$ac_item"`
+ if test -z "$ac_used"; then
+- { echo "$as_me:19414: WARNING: datarootdir was used implicitly but not set:
++ { echo "$as_me:19442: 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;}
+@@ -19420,7 +19448,7 @@
+ fi
+ ac_seen=`grep '${datarootdir}' "$ac_item"`
+ if test -n "$ac_seen"; then
+- { echo "$as_me:19423: WARNING: datarootdir was used explicitly but not set:
++ { echo "$as_me:19451: 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;}
+@@ -19465,7 +19493,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:19468: WARNING: Variable $ac_name is used but was not set:
++ { echo "$as_me:19496: 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;}
+@@ -19476,7 +19504,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:19479: WARNING: Some variables may not be substituted:
++ { echo "$as_me:19507: WARNING: Some variables may not be substituted:
+ $ac_seen" >&5
+ echo "$as_me: WARNING: Some variables may not be substituted:
+ $ac_seen" >&2;}
+@@ -19525,7 +19553,7 @@
+ * ) ac_file_in=$ac_file.in ;;
+ esac
+
+- test x"$ac_file" != x- && { echo "$as_me:19528: creating $ac_file" >&5
++ test x"$ac_file" != x- && { echo "$as_me:19556: creating $ac_file" >&5
+ echo "$as_me: creating $ac_file" >&6;}
+
+ # First look for the input files in the build tree, otherwise in the
+@@ -19536,7 +19564,7 @@
+ -) echo "$tmp"/stdin ;;
+ [\\/$]*)
+ # Absolute (can't be DOS-style, as IFS=:)
+- test -f "$f" || { { echo "$as_me:19539: error: cannot find input file: $f" >&5
++ test -f "$f" || { { echo "$as_me:19567: error: cannot find input file: $f" >&5
+ echo "$as_me: error: cannot find input file: $f" >&2;}
+ { (exit 1); exit 1; }; }
+ echo $f;;
+@@ -19549,7 +19577,7 @@
+ echo "$srcdir/$f"
+ else
+ # /dev/null tree
+- { { echo "$as_me:19552: error: cannot find input file: $f" >&5
++ { { echo "$as_me:19580: error: cannot find input file: $f" >&5
+ echo "$as_me: error: cannot find input file: $f" >&2;}
+ { (exit 1); exit 1; }; }
+ fi;;
+@@ -19607,7 +19635,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:19610: $ac_file is unchanged" >&5
++ { echo "$as_me:19638: $ac_file is unchanged" >&5
+ echo "$as_me: $ac_file is unchanged" >&6;}
+ else
+ ac_dir=`$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+Index: Ada95/configure.in
+Prereq: 1.93
+--- ncurses-6.5-20240810+/Ada95/configure.in 2024-05-19 09:12:05.000000000 +0000
++++ ncurses-6.5-20240817/Ada95/configure.in 2024-08-11 00:22:07.000000000 +0000
+@@ -29,7 +29,7 @@
+ dnl
+ dnl Author: Thomas E. Dickey
+ dnl
+-dnl $Id: configure.in,v 1.93 2024/05/19 09:12:05 tom Exp $
++dnl $Id: configure.in,v 1.94 2024/08/11 00:22:07 tom Exp $
+ dnl Process this file with autoconf to produce a configure script.
+ dnl
+ dnl For additional information, see
+@@ -38,7 +38,7 @@
+ dnl
+ dnl ---------------------------------------------------------------------------
+ AC_PREREQ(2.52.20210509)
+-AC_REVISION($Revision: 1.93 $)
++AC_REVISION($Revision: 1.94 $)
+ AC_INIT(gen/gen.c)
+ AC_CONFIG_HEADER(include/ncurses_cfg.h:include/ncurses_cfg.hin)
+
+@@ -115,20 +115,7 @@
+ CF_AR_FLAGS
+ CF_PATHSEP
+
+-dnl Special option for use by system-builders: the install-prefix is used to
+-dnl adjust the location into which the actual install is done, so that an
+-dnl archive can be built without modifying the host system's configuration.
+-AC_MSG_CHECKING(if you have specified an install-prefix)
+-AC_ARG_WITH(install-prefix,
+- [ --with-install-prefix prefixes actual install-location ($DESTDIR)],
+- [case "$withval" in
+- (yes|no)
+- ;;
+- (*) DESTDIR="$withval"
+- ;;
+- esac])
+-AC_MSG_RESULT($DESTDIR)
+-AC_SUBST(DESTDIR)
++CF_INSTALL_PREFIX
+
+ ###############################################################################
+ CF_HELP_MESSAGE(Build-Tools Needed to Compile Temporary Applications for Cross-compiling:)
+Index: Ada95/doc/Makefile.in
+Prereq: 1.9
+--- ncurses-6.5-20240810+/Ada95/doc/Makefile.in 2021-07-03 15:45:33.000000000 +0000
++++ ncurses-6.5-20240817/Ada95/doc/Makefile.in 2024-08-10 18:18:19.000000000 +0000
+@@ -1,6 +1,6 @@
+-# $Id: Makefile.in,v 1.9 2021/07/03 15:45:33 tom Exp $
++# $Id: Makefile.in,v 1.10 2024/08/10 18:18:19 tom Exp $
+ ##############################################################################
+-# Copyright 2019-2020,2021 Thomas E. Dickey #
++# Copyright 2019-2021,2024 Thomas E. Dickey #
+ # Copyright 2011-2015,2018 Free Software Foundation, Inc. #
+ # #
+ # Permission is hereby granted, free of charge, to any person obtaining a #
+@@ -49,8 +49,8 @@
+ DFT_ARG_SUFFIX = @DFT_ARG_SUFFIX@
+
+ THIS = @ADA_LIBNAME@
+-DOCDIR = $(DESTDIR)$(datadir)/doc/$(THIS)
+-MANDIR = $(DESTDIR)$(mandir)/man1
++DOCDIR = $(DESTDIR)$(datadir@MERGE_PREFIX@)/doc/$(THIS)
++MANDIR = $(DESTDIR)$(mandir@MERGE_PREFIX@)/man1
+
+ ################################################################################
+
+Index: Ada95/gen/Makefile.in
+Prereq: 1.104
+--- ncurses-6.5-20240810+/Ada95/gen/Makefile.in 2024-06-15 14:56:14.000000000 +0000
++++ ncurses-6.5-20240817/Ada95/gen/Makefile.in 2024-08-10 17:55:15.000000000 +0000
+@@ -30,7 +30,7 @@
+ # Author: Juergen Pfeifer, 1996
+ # and: Thomas E. Dickey, 1997
+ #
+-# $Id: Makefile.in,v 1.104 2024/06/15 14:56:14 tom Exp $
++# $Id: Makefile.in,v 1.105 2024/08/10 17:55:15 tom Exp $
+ #
+ .SUFFIXES:
+
+@@ -48,6 +48,8 @@
+ bindir = @bindir@
+ includedir = @includedir@
+
++BINDIR = $(DESTDIR)$(bindir@MERGE_PREFIX@)
++
+ INSTALL = @INSTALL@ @INSTALL_OPT_O@
+ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -163,19 +165,19 @@
+
+ sources:
+
+-$(DESTDIR)$(bindir) :
++$(BINDIR) :
+ mkdir -p $@
+
+ install \
+ install.libs :: \
+ $(GEN_TARGETS) \
+- $(DESTDIR)$(bindir) \
++ $(BINDIR) \
+ $(ADACURSES_CONFIG)
+- $(INSTALL_SCRIPT) $(ADACURSES_CONFIG) $(DESTDIR)$(bindir)/$(ADACURSES_CONFIG)
++ $(INSTALL_SCRIPT) $(ADACURSES_CONFIG) $(BINDIR)/$(ADACURSES_CONFIG)
+
+ uninstall \
+ uninstall.libs ::
+- -rm -f $(DESTDIR)$(bindir)/$(ADACURSES_CONFIG)
++ -rm -f $(BINDIR)/$(ADACURSES_CONFIG)
+
+ $(PROG_GENERATE): gen.o
+ @ECHO_LD@ $(LINK) $(CFLAGS_NORMAL) gen.o $(ACTUAL_LDFLAGS) -o $@
+Index: Ada95/samples/Makefile.in
+Prereq: 1.65
+--- ncurses-6.5-20240810+/Ada95/samples/Makefile.in 2024-06-15 15:13:11.000000000 +0000
++++ ncurses-6.5-20240817/Ada95/samples/Makefile.in 2024-08-10 17:56:19.000000000 +0000
+@@ -29,7 +29,7 @@
+ #
+ # Author: Juergen Pfeifer, 1996
+ #
+-# $Id: Makefile.in,v 1.65 2024/06/15 15:13:11 tom Exp $
++# $Id: Makefile.in,v 1.66 2024/08/10 17:56:19 tom Exp $
+ #
+ .SUFFIXES:
+
+@@ -78,9 +78,9 @@
+
+ RANLIB = @RANLIB@
+ ################################################################################
+-BINDIR = $(DESTDIR)$(bindir)
+-DATADIR = $(DESTDIR)$(datadir)
+-LIBDIR = $(DESTDIR)$(libdir)
++BINDIR = $(DESTDIR)$(bindir@MERGE_PREFIX@)
++DATADIR = $(DESTDIR)$(datadir@MERGE_PREFIX@)
++LIBDIR = $(DESTDIR)$(libdir@MERGE_PREFIX@)
+
+ MY_DATADIR = $(DATADIR)/@ADA_LIBNAME@
+ THIS_DATADIR = $(datadir)/@ADA_LIBNAME@
+Index: Ada95/src/Makefile.in
+Prereq: 1.96
+--- ncurses-6.5-20240810+/Ada95/src/Makefile.in 2021-07-03 15:45:33.000000000 +0000
++++ ncurses-6.5-20240817/Ada95/src/Makefile.in 2024-08-10 18:18:44.000000000 +0000
+@@ -1,5 +1,5 @@
+ ##############################################################################
+-# Copyright 2018-2020,2021 Thomas E. Dickey #
++# Copyright 2018-2021,2024 Thomas E. Dickey #
+ # Copyright 1999-2016,2018 Free Software Foundation, Inc. #
+ # #
+ # Permission is hereby granted, free of charge, to any person obtaining a #
+@@ -29,7 +29,7 @@
+ #
+ # Author: Juergen Pfeifer, 1996
+ #
+-# $Id: Makefile.in,v 1.96 2021/07/03 15:45:33 tom Exp $
++# $Id: Makefile.in,v 1.97 2024/08/10 18:18:44 tom Exp $
+ #
+ .SUFFIXES:
+
+@@ -51,7 +51,7 @@
+ includedir = @includedir@
+ libdir = @libdir@
+
+-LIBDIR = $(DESTDIR)$(libdir)
++LIBDIR = $(DESTDIR)$(libdir@MERGE_PREFIX@)
+ ADA_INCLUDE = $(DESTDIR)@ADA_INCLUDE@
+ ADA_OBJECTS = $(DESTDIR)@ADA_OBJECTS@
+
+Index: INSTALL
+Prereq: 1.256
+--- ncurses-6.5-20240810+/INSTALL 2024-06-08 21:06:02.000000000 +0000
++++ ncurses-6.5-20240817/INSTALL 2024-08-10 17:43:39.000000000 +0000
+@@ -26,7 +26,7 @@
+ -- sale, use or other dealings in this Software without prior written --
+ -- authorization. --
+ -------------------------------------------------------------------------------
+--- $Id: INSTALL,v 1.256 2024/06/08 21:06:02 Branden.Robinson Exp $
++-- $Id: INSTALL,v 1.257 2024/08/10 17:43:39 tom Exp $
+ ---------------------------------------------------------------------
+ How to install Ncurses/Terminfo on your system
+ ---------------------------------------------------------------------
+@@ -650,6 +650,12 @@
+ may not be accurate, or that your stty settings have disabled the use
+ of tabs.
+
++ --enable-install-prefix
++ Extend the --with-install-prefix feature to replace the prefix value
++ with $DESTDIR rather than simply prepending $DESTDIR to install
++ pathnames. This works with any "make" which supports AT&T style
++ variable substitution.
++
+ --enable-interop
+ Compile-in experimental interop bindings. These provide generic types
+ for the form-library.
+Index: NEWS
+Prereq: 1.4160
+--- ncurses-6.5-20240810+/NEWS 2024-08-10 09:45:21.000000000 +0000
++++ ncurses-6.5-20240817/NEWS 2024-08-17 22:54:38.000000000 +0000
+@@ -26,7 +26,7 @@
+ -- sale, use or other dealings in this Software without prior written --
+ -- authorization. --
+ -------------------------------------------------------------------------------
+--- $Id: NEWS,v 1.4160 2024/08/10 09:45:21 tom Exp $
++-- $Id: NEWS,v 1.4164 2024/08/17 22:54:38 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.
+
++20240817
++ + review/update foot for 1.18.1 -TD
++ + add a note about DomTerm 3.2.0 -TD
++ + add new glob-expressions variables to list in config.status script
++ (patch by Werner Fink).
++ + add --enable-install-prefix to modify behavior of $DESTDIR to merge
++ or replace the value set by --prefix (adapted from suggestion by
++ Eli Zaretskii).
++
+ 20240810
+ + modify misc/Makefile.in and misc/run_tic.in so that $DESTDIR is set
+ and used only in the makefile.
+Index: VERSION
+--- ncurses-6.5-20240810+/VERSION 2024-08-10 09:45:21.000000000 +0000
++++ ncurses-6.5-20240817/VERSION 2024-08-17 09:37:53.000000000 +0000
+@@ -1 +1 @@
+-5:0:10 6.5 20240810
++5:0:10 6.5 20240817
+Index: aclocal.m4
+Prereq: 1.1087
+--- ncurses-6.5-20240810+/aclocal.m4 2024-08-10 15:51:16.000000000 +0000
++++ ncurses-6.5-20240817/aclocal.m4 2024-08-11 00:17:28.000000000 +0000
+@@ -29,7 +29,7 @@
+ dnl
+ dnl Author: Thomas E. Dickey 1995-on
+ dnl
+-dnl $Id: aclocal.m4,v 1.1087 2024/08/10 15:51:16 tom Exp $
++dnl $Id: aclocal.m4,v 1.1088 2024/08/11 00:17:28 tom Exp $
+ dnl Macros used in NCURSES auto-configuration script.
+ dnl
+ dnl These macros are maintained separately from NCURSES. The copyright on
+@@ -4218,6 +4218,40 @@
+ AC_SUBST(INSTALL_OPT_S)
+ ])dnl
+ dnl ---------------------------------------------------------------------------
++dnl CF_INSTALL_PREFIX version: 1 updated: 2024/08/10 20:16:32
++dnl -----------------
++dnl Special option for use by system-builders: the install-prefix is used to
++dnl adjust the location into which the actual install is done, so that an
++dnl archive can be built without modifying the host system's configuration.
++AC_DEFUN([CF_INSTALL_PREFIX],[
++AC_MSG_CHECKING(for an installation directory prefix)
++AC_ARG_WITH(install-prefix,
++ [ --with-install-prefix=DESTDIR use DESTDIR as installation directory prefix],
++ [case "x$withval" in
++ (xyes|xno)
++ ;;
++ (*) DESTDIR="$withval"
++ ;;
++ esac])
++AC_MSG_RESULT([${DESTDIR:-(none)}])
++AC_SUBST(DESTDIR)
++
++AC_MSG_CHECKING(if installation directory prefix should be merged)
++CF_ARG_ENABLE(install-prefix,
++ [ --enable-install-prefix merge DESTDIR with installation prefix],
++ cf_install_prefix=yes,
++ cf_install_prefix=no)
++AC_MSG_RESULT($cf_install_prefix)
++
++if test "$cf_install_prefix" = yes ; then
++ MERGE_PREFIX=':$(prefix)%=%'
++else
++ MERGE_PREFIX=''
++fi
++
++AC_SUBST(MERGE_PREFIX)
++])dnl
++dnl ---------------------------------------------------------------------------
+ dnl CF_INTEL_COMPILER version: 9 updated: 2023/02/18 17:41:25
+ dnl -----------------
+ dnl Check if the given compiler is really the Intel compiler for Linux. It
+@@ -5986,31 +6020,6 @@
+ AC_MSG_RESULT($MANPAGE_TBL)
+ ])dnl
+ dnl ---------------------------------------------------------------------------
+-dnl CF_MB_LEN_MAX version: 1 updated: 2024/03/02 15:45:10
+-dnl -------------
+-dnl Check if <limits.h> defines a usable MB_LEN_MAX. That may be because it is
+-dnl not defined, or it may be a bogus value.
+-AC_DEFUN([CF_MB_LEN_MAX],[
+-AC_CACHE_CHECK(if MB_LEN_MAX is usable,cf_cv_mb_len_max,[
+-AC_TRY_COMPILE([
+-$ac_includes_default
+-#include <limits.h>],
+-[
+-#if defined(MB_LEN_MAX) && MB_LEN_MAX >= 6
+- ${cf_cv_main_return:-return}(0);
+-#else
+-#error MB_LEN_MAX is not usable
+-#endif
+-], [cf_cv_mb_len_max=yes],
+- [cf_cv_mb_len_max=no])])
+-if test "$cf_cv_mb_len_max" = yes
+-then
+- AC_DEFINE(HAVE_CONSISTENT_MB_LEN_MAX,1,[Define to 1 if MB_LEN_MAX is usable])
+-else
+- AC_MSG_WARN(MB_LEN_MAX is missing/inconsistent in system headers)
+-fi
+-])dnl
+-dnl ---------------------------------------------------------------------------
+ dnl CF_MAN_PAGES version: 59 updated: 2024/03/30 08:27:40
+ dnl ------------
+ dnl Try to determine if the man-pages on the system are compressed, and if
+@@ -6398,6 +6407,31 @@
+ fi
+ ])
+ dnl ---------------------------------------------------------------------------
++dnl CF_MB_LEN_MAX version: 1 updated: 2024/03/02 15:45:10
++dnl -------------
++dnl Check if <limits.h> defines a usable MB_LEN_MAX. That may be because it is
++dnl not defined, or it may be a bogus value.
++AC_DEFUN([CF_MB_LEN_MAX],[
++AC_CACHE_CHECK(if MB_LEN_MAX is usable,cf_cv_mb_len_max,[
++AC_TRY_COMPILE([
++$ac_includes_default
++#include <limits.h>],
++[
++#if defined(MB_LEN_MAX) && MB_LEN_MAX >= 6
++ ${cf_cv_main_return:-return}(0);
++#else
++#error MB_LEN_MAX is not usable
++#endif
++], [cf_cv_mb_len_max=yes],
++ [cf_cv_mb_len_max=no])])
++if test "$cf_cv_mb_len_max" = yes
++then
++ AC_DEFINE(HAVE_CONSISTENT_MB_LEN_MAX,1,[Define to 1 if MB_LEN_MAX is usable])
++else
++ AC_MSG_WARN(MB_LEN_MAX is missing/inconsistent in system headers)
++fi
++])dnl
++dnl ---------------------------------------------------------------------------
+ dnl CF_MIXEDCASE_FILENAMES version: 9 updated: 2021/01/01 16:53:59
+ dnl ----------------------
+ dnl Check if the file-system supports mixed-case filenames. If we're able to
+Index: c++/Makefile.in
+Prereq: 1.133
+--- ncurses-6.5-20240810+/c++/Makefile.in 2021-07-03 18:53:57.000000000 +0000
++++ ncurses-6.5-20240817/c++/Makefile.in 2024-08-11 15:48:44.000000000 +0000
+@@ -1,6 +1,6 @@
+-# $Id: Makefile.in,v 1.133 2021/07/03 18:53:57 tom Exp $
++# $Id: Makefile.in,v 1.135 2024/08/11 15:48:44 tom Exp $
+ ##############################################################################
+-# Copyright 2018-2020,2021 Thomas E. Dickey #
++# Copyright 2018-2021,2024 Thomas E. Dickey #
+ # Copyright 1998-2015,2016 Free Software Foundation, Inc. #
+ # #
+ # Permission is hereby granted, free of charge, to any person obtaining a #
+@@ -54,7 +54,9 @@
+ includedir = @includedir@
+ includesubdir = @includesubdir@
+
+-INCLUDEDIR = $(DESTDIR)$(includedir)$(includesubdir)
++INCLUDEDIR = $(DESTDIR)$(includedir@MERGE_PREFIX@)$(includesubdir)
++BINDIR = $(DESTDIR)$(bindir@MERGE_PREFIX@)
++LIBDIR = $(DESTDIR)$(libdir@MERGE_PREFIX@)
+
+ PACKAGE = @PACKAGE@
+
+@@ -191,7 +193,7 @@
+ tags:
+ $(CTAGS) *.[h] *.cc
+
+-$(DESTDIR)$(libdir) :
++$(LIBDIR) :
+ mkdir -p $@
+
+ mostlyclean ::
+Index: configure
+--- ncurses-6.5-20240810+/configure 2024-08-10 15:51:41.000000000 +0000
++++ ncurses-6.5-20240817/configure 2024-08-17 13:44:13.000000000 +0000
+@@ -1,5 +1,5 @@
+ #! /bin/sh
+-# From configure.in Revision: 1.783 .
++# From configure.in Revision: 1.785 .
+ # Guess values for system-dependent variables and create Makefiles.
+ # Generated by Autoconf 2.52.20240618.
+ #
+@@ -736,6 +736,7 @@
+ --with-pc-suffix[=XXX] suffix pkg-config files with XXX
+ --enable-mixed-case tic should assume mixed-case filenames
+ --with-install-prefix=DESTDIR use DESTDIR as installation directory prefix
++ --enable-install-prefix merge DESTDIR with installation prefix
+ Build-Tools Needed to Compile Temporary Applications for Cross-compiling:
+ --with-build-cc=XXX the build C compiler ($BUILD_CC)
+ --with-build-cpp=XXX the build C preprocessor ($BUILD_CPP)
+@@ -1077,7 +1078,7 @@
+ fi
+ for ac_site_file in $CONFIG_SITE; do
+ if test -r "$ac_site_file"; then
+- { echo "$as_me:1080: loading site script $ac_site_file" >&5
++ { echo "$as_me:1081: 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"
+@@ -1088,7 +1089,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:1091: loading cache $cache_file" >&5
++ { echo "$as_me:1092: loading cache $cache_file" >&5
+ echo "$as_me: loading cache $cache_file" >&6;}
+ case $cache_file in
+ [\\/]* | ?:[\\/]* ) . $cache_file;;
+@@ -1096,7 +1097,7 @@
+ esac
+ fi
+ else
+- { echo "$as_me:1099: creating cache $cache_file" >&5
++ { echo "$as_me:1100: creating cache $cache_file" >&5
+ echo "$as_me: creating cache $cache_file" >&6;}
+ >$cache_file
+ fi
+@@ -1112,21 +1113,21 @@
+ eval ac_new_val="\$ac_env_${ac_var}_value"
+ case "$ac_old_set,$ac_new_set" in
+ set,)
+- { echo "$as_me:1115: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
++ { echo "$as_me:1116: 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:1119: error: \`$ac_var' was not set in the previous run" >&5
++ { echo "$as_me:1120: 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:1125: error: \`$ac_var' has changed since the previous run:" >&5
++ { echo "$as_me:1126: 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:1127: former value: $ac_old_val" >&5
++ { echo "$as_me:1128: former value: $ac_old_val" >&5
+ echo "$as_me: former value: $ac_old_val" >&2;}
+- { echo "$as_me:1129: current value: $ac_new_val" >&5
++ { echo "$as_me:1130: current value: $ac_new_val" >&5
+ echo "$as_me: current value: $ac_new_val" >&2;}
+ ac_cache_corrupted=:
+ fi;;
+@@ -1145,9 +1146,9 @@
+ fi
+ done
+ if "$ac_cache_corrupted"; then
+- { echo "$as_me:1148: error: changes in the environment can compromise the build" >&5
++ { echo "$as_me:1149: 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:1150: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5
++ { { echo "$as_me:1151: 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
+@@ -1176,10 +1177,10 @@
+ echo "#! $SHELL" >conftest.sh
+ echo "exit 0" >>conftest.sh
+ chmod +x conftest.sh
+-if { (echo "$as_me:1179: PATH=\".;.\"; conftest.sh") >&5
++if { (echo "$as_me:1180: PATH=\".;.\"; conftest.sh") >&5
+ (PATH=".;."; conftest.sh) 2>&5
+ ac_status=$?
+- echo "$as_me:1182: \$? = $ac_status" >&5
++ echo "$as_me:1183: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; then
+ ac_path_separator=';'
+ else
+@@ -1196,7 +1197,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:1199: checking for $ac_word" >&5
++echo "$as_me:1200: 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
+@@ -1211,7 +1212,7 @@
+ test -z "$ac_dir" && ac_dir=.
+ $as_executable_p "$ac_dir/$ac_word" || continue
+ ac_cv_prog_GREP="$ac_prog"
+-echo "$as_me:1214: found $ac_dir/$ac_word" >&5
++echo "$as_me:1215: found $ac_dir/$ac_word" >&5
+ break
+ done
+
+@@ -1219,10 +1220,10 @@
+ fi
+ GREP=$ac_cv_prog_GREP
+ if test -n "$GREP"; then
+- echo "$as_me:1222: result: $GREP" >&5
++ echo "$as_me:1223: result: $GREP" >&5
+ echo "${ECHO_T}$GREP" >&6
+ else
+- echo "$as_me:1225: result: no" >&5
++ echo "$as_me:1226: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+
+@@ -1230,7 +1231,7 @@
+ done
+ test -n "$GREP" || GREP=": "
+
+-echo "$as_me:1233: checking for egrep" >&5
++echo "$as_me:1234: 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
+@@ -1242,7 +1243,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:1245: checking for $ac_word" >&5
++echo "$as_me:1246: 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
+@@ -1259,7 +1260,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:1262: found $ac_dir/$ac_word" >&5
++ echo "$as_me:1263: found $ac_dir/$ac_word" >&5
+ break
+ fi
+ done
+@@ -1270,10 +1271,10 @@
+ EGREP=$ac_cv_path_EGREP
+
+ if test -n "$EGREP"; then
+- echo "$as_me:1273: result: $EGREP" >&5
++ echo "$as_me:1274: result: $EGREP" >&5
+ echo "${ECHO_T}$EGREP" >&6
+ else
+- echo "$as_me:1276: result: no" >&5
++ echo "$as_me:1277: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+
+@@ -1281,12 +1282,12 @@
+ done
+ test -n "$EGREP" || EGREP=": "
+
+- test "x$ac_cv_path_EGREP" = "x:" && { { echo "$as_me:1284: error: cannot find workable egrep" >&5
++ test "x$ac_cv_path_EGREP" = "x:" && { { echo "$as_me:1285: error: cannot find workable egrep" >&5
+ echo "$as_me: error: cannot find workable egrep" >&2;}
+ { (exit 1); exit 1; }; }
+ fi
+ fi
+-echo "$as_me:1289: result: $ac_cv_path_EGREP" >&5
++echo "$as_me:1290: result: $ac_cv_path_EGREP" >&5
+ echo "${ECHO_T}$ac_cv_path_EGREP" >&6
+ EGREP="$ac_cv_path_EGREP"
+
+@@ -1297,11 +1298,11 @@
+ cf_cv_abi_default=${NCURSES_MAJOR}
+ cf_cv_rel_version=${NCURSES_MAJOR}.${NCURSES_MINOR}
+ cf_cv_timestamp=`date`
+-echo "$as_me:1300: result: Configuring NCURSES $cf_cv_rel_version ABI $cf_cv_abi_default ($cf_cv_timestamp)" >&5
++echo "$as_me:1301: result: Configuring NCURSES $cf_cv_rel_version ABI $cf_cv_abi_default ($cf_cv_timestamp)" >&5
+ echo "${ECHO_T}Configuring NCURSES $cf_cv_rel_version ABI $cf_cv_abi_default ($cf_cv_timestamp)" >&6
+
+ if test -f "$srcdir/VERSION" ; then
+- echo "$as_me:1304: checking for package version" >&5
++ echo "$as_me:1305: checking for package version" >&5
+ echo $ECHO_N "checking for package version... $ECHO_C" >&6
+
+ # if there are not enough fields, cut returns the last one...
+@@ -1313,39 +1314,39 @@
+ VERSION="$cf_field1"
+
+ VERSION_MAJOR=`echo "$cf_field2" | sed -e 's/\..*//'`
+- test -z "$VERSION_MAJOR" && { { echo "$as_me:1316: error: missing major-version" >&5
++ test -z "$VERSION_MAJOR" && { { echo "$as_me:1317: error: missing major-version" >&5
+ echo "$as_me: error: missing major-version" >&2;}
+ { (exit 1); exit 1; }; }
+
+ VERSION_MINOR=`echo "$cf_field2" | sed -e 's/^[^.]*\.//' -e 's/-.*//'`
+- test -z "$VERSION_MINOR" && { { echo "$as_me:1321: error: missing minor-version" >&5
++ test -z "$VERSION_MINOR" && { { echo "$as_me:1322: error: missing minor-version" >&5
+ echo "$as_me: error: missing minor-version" >&2;}
+ { (exit 1); exit 1; }; }
+
+- echo "$as_me:1325: result: ${VERSION_MAJOR}.${VERSION_MINOR}" >&5
++ echo "$as_me:1326: result: ${VERSION_MAJOR}.${VERSION_MINOR}" >&5
+ echo "${ECHO_T}${VERSION_MAJOR}.${VERSION_MINOR}" >&6
+
+- echo "$as_me:1328: checking for package patch date" >&5
++ echo "$as_me:1329: checking for package patch date" >&5
+ echo $ECHO_N "checking for package patch date... $ECHO_C" >&6
+ VERSION_PATCH=`echo "$cf_field3" | sed -e 's/^[^-]*-//'`
+ case .$VERSION_PATCH in
+ (.)
+- { { echo "$as_me:1333: error: missing patch-date $VERSION_PATCH" >&5
++ { { echo "$as_me:1334: error: missing patch-date $VERSION_PATCH" >&5
+ echo "$as_me: error: missing patch-date $VERSION_PATCH" >&2;}
+ { (exit 1); exit 1; }; }
+ ;;
+ (.[0-9][0-9][0-9][0-9][0-9][0-9][0-9][0-9])
+ ;;
+ (*)
+- { { echo "$as_me:1340: error: illegal patch-date $VERSION_PATCH" >&5
++ { { echo "$as_me:1341: error: illegal patch-date $VERSION_PATCH" >&5
+ echo "$as_me: error: illegal patch-date $VERSION_PATCH" >&2;}
+ { (exit 1); exit 1; }; }
+ ;;
+ esac
+- echo "$as_me:1345: result: $VERSION_PATCH" >&5
++ echo "$as_me:1346: result: $VERSION_PATCH" >&5
+ echo "${ECHO_T}$VERSION_PATCH" >&6
+ else
+- { { echo "$as_me:1348: error: did not find $srcdir/VERSION" >&5
++ { { echo "$as_me:1349: error: did not find $srcdir/VERSION" >&5
+ echo "$as_me: error: did not find $srcdir/VERSION" >&2;}
+ { (exit 1); exit 1; }; }
+ fi
+@@ -1353,19 +1354,19 @@
+ # show the actual data that we have for versions:
+ test -n "$verbose" && echo " ABI VERSION $VERSION" 1>&6
+
+-echo "${as_me:-configure}:1356: testing ABI VERSION $VERSION ..." 1>&5
++echo "${as_me:-configure}:1357: testing ABI VERSION $VERSION ..." 1>&5
+
+ test -n "$verbose" && echo " VERSION_MAJOR $VERSION_MAJOR" 1>&6
+
+-echo "${as_me:-configure}:1360: testing VERSION_MAJOR $VERSION_MAJOR ..." 1>&5
++echo "${as_me:-configure}:1361: testing VERSION_MAJOR $VERSION_MAJOR ..." 1>&5
+
+ test -n "$verbose" && echo " VERSION_MINOR $VERSION_MINOR" 1>&6
+
+-echo "${as_me:-configure}:1364: testing VERSION_MINOR $VERSION_MINOR ..." 1>&5
++echo "${as_me:-configure}:1365: testing VERSION_MINOR $VERSION_MINOR ..." 1>&5
+
+ test -n "$verbose" && echo " VERSION_PATCH $VERSION_PATCH" 1>&6
+
+-echo "${as_me:-configure}:1368: testing VERSION_PATCH $VERSION_PATCH ..." 1>&5
++echo "${as_me:-configure}:1369: testing VERSION_PATCH $VERSION_PATCH ..." 1>&5
+
+ PACKAGE=ncurses
+
+@@ -1386,7 +1387,7 @@
+ # Check whether --with-rel-version or --without-rel-version was given.
+ if test "${with_rel_version+set}" = set; then
+ withval="$with_rel_version"
+- { echo "$as_me:1389: WARNING: overriding release version $cf_cv_rel_version to $withval" >&5
++ { echo "$as_me:1390: WARNING: overriding release version $cf_cv_rel_version to $withval" >&5
+ echo "$as_me: WARNING: overriding release version $cf_cv_rel_version to $withval" >&2;}
+ cf_cv_rel_version=$withval
+ fi;
+@@ -1400,13 +1401,13 @@
+ (0)
+ ;;
+ (*)
+- { { echo "$as_me:1403: error: Release major-version is not a number: $NCURSES_MAJOR" >&5
++ { { echo "$as_me:1404: error: Release major-version is not a number: $NCURSES_MAJOR" >&5
+ echo "$as_me: error: Release major-version is not a number: $NCURSES_MAJOR" >&2;}
+ { (exit 1); exit 1; }; }
+ ;;
+ esac
+ else
+- { { echo "$as_me:1409: error: Release major-version value is empty" >&5
++ { { echo "$as_me:1410: error: Release major-version value is empty" >&5
+ echo "$as_me: error: Release major-version value is empty" >&2;}
+ { (exit 1); exit 1; }; }
+ fi
+@@ -1416,13 +1417,13 @@
+ (0)
+ ;;
+ (*)
+- { { echo "$as_me:1419: error: Release minor-version is not a number: $NCURSES_MINOR" >&5
++ { { echo "$as_me:1420: error: Release minor-version is not a number: $NCURSES_MINOR" >&5
+ echo "$as_me: error: Release minor-version is not a number: $NCURSES_MINOR" >&2;}
+ { (exit 1); exit 1; }; }
+ ;;
+ esac
+ else
+- { { echo "$as_me:1425: error: Release minor-version value is empty" >&5
++ { { echo "$as_me:1426: error: Release minor-version value is empty" >&5
+ echo "$as_me: error: Release minor-version value is empty" >&2;}
+ { (exit 1); exit 1; }; }
+ fi
+@@ -1435,7 +1436,7 @@
+
+ if test "x$cf_cv_abi_version" != "x$withval"
+ then
+- { echo "$as_me:1438: WARNING: overriding ABI version $cf_cv_abi_version to $withval" >&5
++ { echo "$as_me:1439: WARNING: overriding ABI version $cf_cv_abi_version to $withval" >&5
+ echo "$as_me: WARNING: overriding ABI version $cf_cv_abi_version to $withval" >&2;}
+ case "$cf_cv_rel_version" in
+ (5.*)
+@@ -1454,13 +1455,13 @@
+ (0)
+ ;;
+ (*)
+- { { echo "$as_me:1457: error: ABI version is not a number: $cf_cv_abi_version" >&5
++ { { echo "$as_me:1458: error: ABI version is not a number: $cf_cv_abi_version" >&5
+ echo "$as_me: error: ABI version is not a number: $cf_cv_abi_version" >&2;}
+ { (exit 1); exit 1; }; }
+ ;;
+ esac
+ else
+- { { echo "$as_me:1463: error: ABI version value is empty" >&5
++ { { echo "$as_me:1464: error: ABI version value is empty" >&5
+ echo "$as_me: error: ABI version value is empty" >&2;}
+ { (exit 1); exit 1; }; }
+ fi
+@@ -1493,7 +1494,7 @@
+ fi
+ done
+ if test -z "$ac_aux_dir"; then
+- { { echo "$as_me:1496: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&5
++ { { echo "$as_me:1497: 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
+@@ -1503,11 +1504,11 @@
+
+ # Make sure we can run config.sub.
+ $ac_config_sub sun4 >/dev/null 2>&1 ||
+- { { echo "$as_me:1506: error: cannot run $ac_config_sub" >&5
++ { { echo "$as_me:1507: error: cannot run $ac_config_sub" >&5
+ echo "$as_me: error: cannot run $ac_config_sub" >&2;}
+ { (exit 1); exit 1; }; }
+
+-echo "$as_me:1510: checking build system type" >&5
++echo "$as_me:1511: 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
+@@ -1516,23 +1517,23 @@
+ test -z "$ac_cv_build_alias" &&
+ ac_cv_build_alias=`$ac_config_guess`
+ test -z "$ac_cv_build_alias" &&
+- { { echo "$as_me:1519: error: cannot guess build type; you must specify one" >&5
++ { { echo "$as_me:1520: 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:1523: error: $ac_config_sub $ac_cv_build_alias failed." >&5
++ { { echo "$as_me:1524: 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:1528: result: $ac_cv_build" >&5
++echo "$as_me:1529: 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/'`
+
+-echo "$as_me:1535: checking host system type" >&5
++echo "$as_me:1536: 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
+@@ -1541,12 +1542,12 @@
+ 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:1544: error: $ac_config_sub $ac_cv_host_alias failed" >&5
++ { { echo "$as_me:1545: 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:1549: result: $ac_cv_host" >&5
++echo "$as_me:1550: 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/'`
+@@ -1554,7 +1555,7 @@
+ 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:1557: checking target system type" >&5
++ echo "$as_me:1558: 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
+@@ -1563,12 +1564,12 @@
+ 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:1566: error: $ac_config_sub $ac_cv_target_alias failed" >&5
++ { { echo "$as_me:1567: 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:1571: result: $ac_cv_target" >&5
++echo "$as_me:1572: 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/'`
+@@ -1600,13 +1601,13 @@
+ fi
+
+ test -z "$system_name" && system_name="$cf_cv_system_name"
+-test -n "$cf_cv_system_name" && echo "$as_me:1603: result: Configuring for $cf_cv_system_name" >&5
++test -n "$cf_cv_system_name" && echo "$as_me:1604: 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:1607: result: Cached system name ($system_name) does not agree with actual ($cf_cv_system_name)" >&5
++ echo "$as_me:1608: 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:1609: error: \"Please remove config.cache and try again.\"" >&5
++ { { echo "$as_me:1610: 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
+@@ -1614,7 +1615,7 @@
+ # 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:1617: WARNING: overriding system type to $withval" >&5
++ { echo "$as_me:1618: 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
+@@ -1625,7 +1626,7 @@
+ cf_user_CFLAGS="$CFLAGS"
+
+ ### Default install-location
+-echo "$as_me:1628: checking for fgrep" >&5
++echo "$as_me:1629: 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
+@@ -1637,7 +1638,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:1640: checking for $ac_word" >&5
++echo "$as_me:1641: 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
+@@ -1654,7 +1655,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:1657: found $ac_dir/$ac_word" >&5
++ echo "$as_me:1658: found $ac_dir/$ac_word" >&5
+ break
+ fi
+ done
+@@ -1665,10 +1666,10 @@
+ FGREP=$ac_cv_path_FGREP
+
+ if test -n "$FGREP"; then
+- echo "$as_me:1668: result: $FGREP" >&5
++ echo "$as_me:1669: result: $FGREP" >&5
+ echo "${ECHO_T}$FGREP" >&6
+ else
+- echo "$as_me:1671: result: no" >&5
++ echo "$as_me:1672: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+
+@@ -1676,16 +1677,16 @@
+ done
+ test -n "$FGREP" || FGREP=": "
+
+- test "x$ac_cv_path_FGREP" = "x:" && { { echo "$as_me:1679: error: cannot find workable fgrep" >&5
++ test "x$ac_cv_path_FGREP" = "x:" && { { echo "$as_me:1680: error: cannot find workable fgrep" >&5
+ echo "$as_me: error: cannot find workable fgrep" >&2;}
+ { (exit 1); exit 1; }; }
+ fi
+ fi
+-echo "$as_me:1684: result: $ac_cv_path_FGREP" >&5
++echo "$as_me:1685: result: $ac_cv_path_FGREP" >&5
+ echo "${ECHO_T}$ac_cv_path_FGREP" >&6
+ FGREP="$ac_cv_path_FGREP"
+
+-echo "$as_me:1688: checking for prefix" >&5
++echo "$as_me:1689: checking for prefix" >&5
+ echo $ECHO_N "checking for prefix... $ECHO_C" >&6
+ if test "x$prefix" = "xNONE" ; then
+ case "$cf_cv_system_name" in
+@@ -1697,11 +1698,11 @@
+ ;;
+ esac
+ fi
+-echo "$as_me:1700: result: $prefix" >&5
++echo "$as_me:1701: result: $prefix" >&5
+ echo "${ECHO_T}$prefix" >&6
+
+ if test "x$prefix" = "xNONE" ; then
+-echo "$as_me:1704: checking for default include-directory" >&5
++echo "$as_me:1705: checking for default include-directory" >&5
+ echo $ECHO_N "checking for default include-directory... $ECHO_C" >&6
+ test -n "$verbose" && echo 1>&6
+ for cf_symbol in \
+@@ -1724,7 +1725,7 @@
+ fi
+ test -n "$verbose" && echo " tested $cf_dir" 1>&6
+ done
+-echo "$as_me:1727: result: $includedir" >&5
++echo "$as_me:1728: result: $includedir" >&5
+ echo "${ECHO_T}$includedir" >&6
+ fi
+
+@@ -1789,20 +1790,20 @@
+ (0)
+ ;;
+ (*)
+- { { echo "$as_me:1792: error: ABI altered is not a number: $withval" >&5
++ { { echo "$as_me:1793: error: ABI altered is not a number: $withval" >&5
+ echo "$as_me: error: ABI altered is not a number: $withval" >&2;}
+ { (exit 1); exit 1; }; }
+ ;;
+ esac
+ else
+- { { echo "$as_me:1798: error: ABI altered value is empty" >&5
++ { { echo "$as_me:1799: error: ABI altered value is empty" >&5
+ echo "$as_me: error: ABI altered value is empty" >&2;}
+ { (exit 1); exit 1; }; }
+ fi
+
+ if test "$cf_cv_abi_version" != "$withval"
+ then
+- { echo "$as_me:1805: WARNING: altering visible ABI from $cf_cv_abi_version to $withval" >&5
++ { echo "$as_me:1806: WARNING: altering visible ABI from $cf_cv_abi_version to $withval" >&5
+ echo "$as_me: WARNING: altering visible ABI from $cf_cv_abi_version to $withval" >&2;}
+ cf_cv_abi_version=$withval
+ fi
+@@ -1832,7 +1833,7 @@
+ unset cf_TEMP_gnat
+ # Extract the first word of "$cf_prog_gnat", so it can be a program name with args.
+ set dummy $cf_prog_gnat; ac_word=$2
+-echo "$as_me:1835: checking for $ac_word" >&5
++echo "$as_me:1836: checking for $ac_word" >&5
+ echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+ if test "${ac_cv_path_cf_TEMP_gnat+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -1849,7 +1850,7 @@
+ test -z "$ac_dir" && ac_dir=.
+ if $as_executable_p "$ac_dir/$ac_word"; then
+ ac_cv_path_cf_TEMP_gnat="$ac_dir/$ac_word"
+- echo "$as_me:1852: found $ac_dir/$ac_word" >&5
++ echo "$as_me:1853: found $ac_dir/$ac_word" >&5
+ break
+ fi
+ done
+@@ -1861,10 +1862,10 @@
+ cf_TEMP_gnat=$ac_cv_path_cf_TEMP_gnat
+
+ if test -n "$cf_TEMP_gnat"; then
+- echo "$as_me:1864: result: $cf_TEMP_gnat" >&5
++ echo "$as_me:1865: result: $cf_TEMP_gnat" >&5
+ echo "${ECHO_T}$cf_TEMP_gnat" >&6
+ else
+- echo "$as_me:1867: result: no" >&5
++ echo "$as_me:1868: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+
+@@ -1874,7 +1875,7 @@
+ unset cf_cv_gnat_version
+ unset cf_TEMP_gnat
+
+-echo "$as_me:1877: checking for $cf_prog_gnat version" >&5
++echo "$as_me:1878: checking for $cf_prog_gnat version" >&5
+ echo $ECHO_N "checking for $cf_prog_gnat version... $ECHO_C" >&6
+ if test "${cf_cv_gnat_version+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -1885,7 +1886,7 @@
+ sed -e '2,$d' -e 's/[^0-9 \.]//g' -e 's/^[ ]*//' -e 's/ .*//'`
+
+ fi
+-echo "$as_me:1888: result: $cf_cv_gnat_version" >&5
++echo "$as_me:1889: result: $cf_cv_gnat_version" >&5
+ echo "${ECHO_T}$cf_cv_gnat_version" >&6
+ test -z "$cf_cv_gnat_version" && cf_cv_gnat_version=no
+ eval cf_TEMP_gnat=$cf_cv_gnat_version; unset cf_cv_gnat_version
+@@ -1914,7 +1915,7 @@
+ cd conftest.src
+ for cf_gprconfig in Ada C
+ do
+- echo "$as_me:1917: checking for gprconfig name for $cf_gprconfig" >&5
++ echo "$as_me:1918: checking for gprconfig name for $cf_gprconfig" >&5
+ echo $ECHO_N "checking for gprconfig name for $cf_gprconfig... $ECHO_C" >&6
+ if test "$cf_gprconfig" = C
+ then
+@@ -1933,10 +1934,10 @@
+ if test -n "$cf_gprconfig_value"
+ then
+ eval "cf_ada_config_$cf_gprconfig=$cf_gprconfig_value"
+- echo "$as_me:1936: result: $cf_gprconfig_value" >&5
++ echo "$as_me:1937: result: $cf_gprconfig_value" >&5
+ echo "${ECHO_T}$cf_gprconfig_value" >&6
+ else
+- echo "$as_me:1939: result: missing" >&5
++ echo "$as_me:1940: result: missing" >&5
+ echo "${ECHO_T}missing" >&6
+ cf_ada_config="#"
+ break
+@@ -1949,7 +1950,7 @@
+ if test "x$cf_ada_config" != "x#"
+ then
+
+-echo "$as_me:1952: checking for gnat version" >&5
++echo "$as_me:1953: checking for gnat version" >&5
+ echo $ECHO_N "checking for gnat version... $ECHO_C" >&6
+ if test "${cf_cv_gnat_version+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -1960,7 +1961,7 @@
+ sed -e '2,$d' -e 's/[^0-9 \.]//g' -e 's/^[ ]*//' -e 's/ .*//'`
+
+ fi
+-echo "$as_me:1963: result: $cf_cv_gnat_version" >&5
++echo "$as_me:1964: result: $cf_cv_gnat_version" >&5
+ echo "${ECHO_T}$cf_cv_gnat_version" >&6
+ test -z "$cf_cv_gnat_version" && cf_cv_gnat_version=no
+
+@@ -1969,7 +1970,7 @@
+ cf_cv_prog_gnat_correct=yes
+ ;;
+ (*)
+- { echo "$as_me:1972: WARNING: Unsupported GNAT version $cf_cv_gnat_version. We require 3.11 or better. Disabling Ada95 binding." >&5
++ { echo "$as_me:1973: WARNING: Unsupported GNAT version $cf_cv_gnat_version. We require 3.11 or better. Disabling Ada95 binding." >&5
+ echo "$as_me: WARNING: Unsupported GNAT version $cf_cv_gnat_version. We require 3.11 or better. Disabling Ada95 binding." >&2;}
+ cf_cv_prog_gnat_correct=no
+ ;;
+@@ -1977,7 +1978,7 @@
+
+ # Extract the first word of "m4", so it can be a program name with args.
+ set dummy m4; ac_word=$2
+-echo "$as_me:1980: checking for $ac_word" >&5
++echo "$as_me:1981: checking for $ac_word" >&5
+ echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+ if test "${ac_cv_prog_M4_exists+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -1992,7 +1993,7 @@
+ test -z "$ac_dir" && ac_dir=.
+ $as_executable_p "$ac_dir/$ac_word" || continue
+ ac_cv_prog_M4_exists="yes"
+-echo "$as_me:1995: found $ac_dir/$ac_word" >&5
++echo "$as_me:1996: found $ac_dir/$ac_word" >&5
+ break
+ done
+
+@@ -2001,20 +2002,20 @@
+ fi
+ M4_exists=$ac_cv_prog_M4_exists
+ if test -n "$M4_exists"; then
+- echo "$as_me:2004: result: $M4_exists" >&5
++ echo "$as_me:2005: result: $M4_exists" >&5
+ echo "${ECHO_T}$M4_exists" >&6
+ else
+- echo "$as_me:2007: result: no" >&5
++ echo "$as_me:2008: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+
+ if test "$ac_cv_prog_M4_exists" = no; then
+ cf_cv_prog_gnat_correct=no
+- { echo "$as_me:2013: WARNING: Ada95 binding required program m4 not found. Ada95 binding disabled" >&5
++ { echo "$as_me:2014: WARNING: Ada95 binding required program m4 not found. Ada95 binding disabled" >&5
+ echo "$as_me: WARNING: Ada95 binding required program m4 not found. Ada95 binding disabled" >&2;}
+ fi
+ if test "$cf_cv_prog_gnat_correct" = yes; then
+- echo "$as_me:2017: checking if GNAT works" >&5
++ echo "$as_me:2018: checking if GNAT works" >&5
+ echo $ECHO_N "checking if GNAT works... $ECHO_C" >&6
+
+ rm -rf ./conftest* ./*~conftest*
+@@ -2042,7 +2043,7 @@
+ fi
+ rm -rf ./conftest* ./*~conftest*
+
+- echo "$as_me:2045: result: $cf_cv_prog_gnat_correct" >&5
++ echo "$as_me:2046: result: $cf_cv_prog_gnat_correct" >&5
+ echo "${ECHO_T}$cf_cv_prog_gnat_correct" >&6
+ fi
+ else
+@@ -2058,7 +2059,7 @@
+ # Here is a workaround.
+ # Extract the first word of "gnatgcc", so it can be a program name with args.
+ set dummy gnatgcc; ac_word=$2
+-echo "$as_me:2061: checking for $ac_word" >&5
++echo "$as_me:2062: checking for $ac_word" >&5
+ echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+ if test "${ac_cv_path_cf_cv_path_gnatgcc+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -2075,7 +2076,7 @@
+ test -z "$ac_dir" && ac_dir=.
+ if $as_executable_p "$ac_dir/$ac_word"; then
+ ac_cv_path_cf_cv_path_gnatgcc="$ac_dir/$ac_word"
+- echo "$as_me:2078: found $ac_dir/$ac_word" >&5
++ echo "$as_me:2079: found $ac_dir/$ac_word" >&5
+ break
+ fi
+ done
+@@ -2087,16 +2088,16 @@
+ cf_cv_path_gnatgcc=$ac_cv_path_cf_cv_path_gnatgcc
+
+ if test -n "$cf_cv_path_gnatgcc"; then
+- echo "$as_me:2090: result: $cf_cv_path_gnatgcc" >&5
++ echo "$as_me:2091: result: $cf_cv_path_gnatgcc" >&5
+ echo "${ECHO_T}$cf_cv_path_gnatgcc" >&6
+ else
+- echo "$as_me:2093: result: no" >&5
++ echo "$as_me:2094: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+
+ if test "$cf_cv_path_gnatgcc" != no
+ then
+- echo "$as_me:2099: checking for improvement" >&5
++ echo "$as_me:2100: checking for improvement" >&5
+ echo $ECHO_N "checking for improvement... $ECHO_C" >&6
+ cf_file_gnatgcc=`file -L "$cf_cv_path_gnatgcc" 2>/dev/null`
+ case "x$cf_file_gnatgcc" in
+@@ -2107,7 +2108,7 @@
+ cf_cv_path_gnatgcc=no
+ ;;
+ esac
+- echo "$as_me:2110: result: $cf_cv_path_gnatgcc" >&5
++ echo "$as_me:2111: result: $cf_cv_path_gnatgcc" >&5
+ echo "${ECHO_T}$cf_cv_path_gnatgcc" >&6
+ test "$cf_cv_path_gnatgcc" = no && cf_cv_path_gnatgcc=gnatgcc
+ cf_prog_cc="$cf_cv_path_gnatgcc $cf_prog_cc"
+@@ -2132,7 +2133,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:2135: checking for $ac_word" >&5
++echo "$as_me:2136: 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
+@@ -2147,7 +2148,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:2150: found $ac_dir/$ac_word" >&5
++echo "$as_me:2151: found $ac_dir/$ac_word" >&5
+ break
+ done
+
+@@ -2155,10 +2156,10 @@
+ fi
+ CC=$ac_cv_prog_CC
+ if test -n "$CC"; then
+- echo "$as_me:2158: result: $CC" >&5
++ echo "$as_me:2159: result: $CC" >&5
+ echo "${ECHO_T}$CC" >&6
+ else
+- echo "$as_me:2161: result: no" >&5
++ echo "$as_me:2162: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+
+@@ -2171,7 +2172,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:2174: checking for $ac_word" >&5
++echo "$as_me:2175: 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
+@@ -2186,7 +2187,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:2189: found $ac_dir/$ac_word" >&5
++echo "$as_me:2190: found $ac_dir/$ac_word" >&5
+ break
+ done
+
+@@ -2194,10 +2195,10 @@
+ fi
+ ac_ct_CC=$ac_cv_prog_ac_ct_CC
+ if test -n "$ac_ct_CC"; then
+- echo "$as_me:2197: result: $ac_ct_CC" >&5
++ echo "$as_me:2198: result: $ac_ct_CC" >&5
+ echo "${ECHO_T}$ac_ct_CC" >&6
+ else
+- echo "$as_me:2200: result: no" >&5
++ echo "$as_me:2201: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+
+@@ -2207,32 +2208,32 @@
+ CC=$ac_ct_CC
+ fi
+
+-test -z "$CC" && { { echo "$as_me:2210: error: no acceptable cc found in \$PATH" >&5
++test -z "$CC" && { { echo "$as_me:2211: 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:2215:" \
++echo "$as_me:2216:" \
+ "checking for C compiler version" >&5
+ ac_compiler=`set X $ac_compile; echo "$2"`
+-{ (eval echo "$as_me:2218: \"$ac_compiler --version </dev/null >&5\"") >&5
++{ (eval echo "$as_me:2219: \"$ac_compiler --version </dev/null >&5\"") >&5
+ (eval $ac_compiler --version </dev/null >&5) 2>&5
+ ac_status=$?
+- echo "$as_me:2221: \$? = $ac_status" >&5
++ echo "$as_me:2222: \$? = $ac_status" >&5
+ (exit "$ac_status"); }
+-{ (eval echo "$as_me:2223: \"$ac_compiler -v </dev/null >&5\"") >&5
++{ (eval echo "$as_me:2224: \"$ac_compiler -v </dev/null >&5\"") >&5
+ (eval $ac_compiler -v </dev/null >&5) 2>&5
+ ac_status=$?
+- echo "$as_me:2226: \$? = $ac_status" >&5
++ echo "$as_me:2227: \$? = $ac_status" >&5
+ (exit "$ac_status"); }
+-{ (eval echo "$as_me:2228: \"$ac_compiler -V </dev/null >&5\"") >&5
++{ (eval echo "$as_me:2229: \"$ac_compiler -V </dev/null >&5\"") >&5
+ (eval $ac_compiler -V </dev/null >&5) 2>&5
+ ac_status=$?
+- echo "$as_me:2231: \$? = $ac_status" >&5
++ echo "$as_me:2232: \$? = $ac_status" >&5
+ (exit "$ac_status"); }
+
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 2235 "configure"
++#line 2236 "configure"
+ #include "confdefs.h"
+
+ int
+@@ -2248,13 +2249,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:2251: checking for C compiler default output" >&5
++echo "$as_me:2252: 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:2254: \"$ac_link_default\"") >&5
++if { (eval echo "$as_me:2255: \"$ac_link_default\"") >&5
+ (eval $ac_link_default) 2>&5
+ ac_status=$?
+- echo "$as_me:2257: \$? = $ac_status" >&5
++ echo "$as_me:2258: \$? = $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
+@@ -2277,34 +2278,34 @@
+ else
+ echo "$as_me: failed program was:" >&5
+ cat "conftest.$ac_ext" >&5
+-{ { echo "$as_me:2280: error: C compiler cannot create executables" >&5
++{ { echo "$as_me:2281: 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:2286: result: $ac_file" >&5
++echo "$as_me:2287: 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:2291: checking whether the C compiler works" >&5
++echo "$as_me:2292: 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:2297: \"$ac_try\"") >&5
++ { (eval echo "$as_me:2298: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:2300: \$? = $ac_status" >&5
++ echo "$as_me:2301: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cross_compiling=no
+ else
+ if test "$cross_compiling" = maybe; then
+ cross_compiling=yes
+ else
+- { { echo "$as_me:2307: error: cannot run C compiled programs.
++ { { echo "$as_me:2308: 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;}
+@@ -2312,24 +2313,24 @@
+ fi
+ fi
+ fi
+-echo "$as_me:2315: result: yes" >&5
++echo "$as_me:2316: 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:2322: checking whether we are cross compiling" >&5
++echo "$as_me:2323: checking whether we are cross compiling" >&5
+ echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6
+-echo "$as_me:2324: result: $cross_compiling" >&5
++echo "$as_me:2325: result: $cross_compiling" >&5
+ echo "${ECHO_T}$cross_compiling" >&6
+
+-echo "$as_me:2327: checking for executable suffix" >&5
++echo "$as_me:2328: checking for executable suffix" >&5
+ echo $ECHO_N "checking for executable suffix... $ECHO_C" >&6
+-if { (eval echo "$as_me:2329: \"$ac_link\"") >&5
++if { (eval echo "$as_me:2330: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:2332: \$? = $ac_status" >&5
++ echo "$as_me:2333: \$? = $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
+@@ -2345,25 +2346,25 @@
+ esac
+ done
+ else
+- { { echo "$as_me:2348: error: cannot compute EXEEXT: cannot compile and link" >&5
++ { { echo "$as_me:2349: 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:2354: result: $ac_cv_exeext" >&5
++echo "$as_me:2355: 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:2360: checking for object suffix" >&5
++echo "$as_me:2361: 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 2366 "configure"
++#line 2367 "configure"
+ #include "confdefs.h"
+
+ int
+@@ -2375,10 +2376,10 @@
+ }
+ _ACEOF
+ rm -f conftest.o conftest.obj
+-if { (eval echo "$as_me:2378: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:2379: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:2381: \$? = $ac_status" >&5
++ echo "$as_me:2382: \$? = $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
+@@ -2390,24 +2391,24 @@
+ else
+ echo "$as_me: failed program was:" >&5
+ cat "conftest.$ac_ext" >&5
+-{ { echo "$as_me:2393: error: cannot compute OBJEXT: cannot compile" >&5
++{ { echo "$as_me:2394: 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:2400: result: $ac_cv_objext" >&5
++echo "$as_me:2401: result: $ac_cv_objext" >&5
+ echo "${ECHO_T}$ac_cv_objext" >&6
+ OBJEXT=$ac_cv_objext
+ ac_objext=$OBJEXT
+-echo "$as_me:2404: checking whether we are using the GNU C compiler" >&5
++echo "$as_me:2405: 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 2410 "configure"
++#line 2411 "configure"
+ #include "confdefs.h"
+
+ int
+@@ -2422,16 +2423,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:2425: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:2426: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:2428: \$? = $ac_status" >&5
++ echo "$as_me:2429: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:2431: \"$ac_try\"") >&5
++ { (eval echo "$as_me:2432: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:2434: \$? = $ac_status" >&5
++ echo "$as_me:2435: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_compiler_gnu=yes
+ else
+@@ -2443,19 +2444,19 @@
+ ac_cv_c_compiler_gnu=$ac_compiler_gnu
+
+ fi
+-echo "$as_me:2446: result: $ac_cv_c_compiler_gnu" >&5
++echo "$as_me:2447: 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:2452: checking whether $CC accepts -g" >&5
++echo "$as_me:2453: 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 2458 "configure"
++#line 2459 "configure"
+ #include "confdefs.h"
+
+ int
+@@ -2467,16 +2468,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:2470: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:2471: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:2473: \$? = $ac_status" >&5
++ echo "$as_me:2474: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:2476: \"$ac_try\"") >&5
++ { (eval echo "$as_me:2477: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:2479: \$? = $ac_status" >&5
++ echo "$as_me:2480: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_prog_cc_g=yes
+ else
+@@ -2486,7 +2487,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:2489: result: $ac_cv_prog_cc_g" >&5
++echo "$as_me:2490: 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
+@@ -2513,16 +2514,16 @@
+ #endif
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:2516: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:2517: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:2519: \$? = $ac_status" >&5
++ echo "$as_me:2520: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:2522: \"$ac_try\"") >&5
++ { (eval echo "$as_me:2523: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:2525: \$? = $ac_status" >&5
++ echo "$as_me:2526: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ for ac_declaration in \
+ ''\
+@@ -2534,7 +2535,7 @@
+ 'void exit (int);'
+ do
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 2537 "configure"
++#line 2538 "configure"
+ #include "confdefs.h"
+ #include <stdlib.h>
+ $ac_declaration
+@@ -2547,16 +2548,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:2550: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:2551: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:2553: \$? = $ac_status" >&5
++ echo "$as_me:2554: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:2556: \"$ac_try\"") >&5
++ { (eval echo "$as_me:2557: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:2559: \$? = $ac_status" >&5
++ echo "$as_me:2560: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ :
+ else
+@@ -2566,7 +2567,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 2569 "configure"
++#line 2570 "configure"
+ #include "confdefs.h"
+ $ac_declaration
+ int
+@@ -2578,16 +2579,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:2581: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:2582: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:2584: \$? = $ac_status" >&5
++ echo "$as_me:2585: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:2587: \"$ac_try\"") >&5
++ { (eval echo "$as_me:2588: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:2590: \$? = $ac_status" >&5
++ echo "$as_me:2591: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ break
+ else
+@@ -2617,11 +2618,11 @@
+
+ GCC_VERSION=none
+ if test "$GCC" = yes ; then
+- echo "$as_me:2620: checking version of $CC" >&5
++ echo "$as_me:2621: 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:2624: result: $GCC_VERSION" >&5
++ echo "$as_me:2625: result: $GCC_VERSION" >&5
+ echo "${ECHO_T}$GCC_VERSION" >&6
+ fi
+
+@@ -2630,12 +2631,12 @@
+ if test "$GCC" = yes ; then
+ case "$host_os" in
+ (linux*|gnu*)
+- echo "$as_me:2633: checking if this is really Intel C compiler" >&5
++ echo "$as_me:2634: 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 2638 "configure"
++#line 2639 "configure"
+ #include "confdefs.h"
+
+ int
+@@ -2652,16 +2653,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:2655: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:2656: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:2658: \$? = $ac_status" >&5
++ echo "$as_me:2659: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:2661: \"$ac_try\"") >&5
++ { (eval echo "$as_me:2662: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:2664: \$? = $ac_status" >&5
++ echo "$as_me:2665: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ INTEL_COMPILER=yes
+ cf_save_CFLAGS="$cf_save_CFLAGS -we147"
+@@ -2672,7 +2673,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ CFLAGS="$cf_save_CFLAGS"
+- echo "$as_me:2675: result: $INTEL_COMPILER" >&5
++ echo "$as_me:2676: result: $INTEL_COMPILER" >&5
+ echo "${ECHO_T}$INTEL_COMPILER" >&6
+ ;;
+ esac
+@@ -2681,11 +2682,11 @@
+ CLANG_COMPILER=no
+
+ if test "$GCC" = yes ; then
+- echo "$as_me:2684: checking if this is really Clang C compiler" >&5
++ echo "$as_me:2685: 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 2688 "configure"
++#line 2689 "configure"
+ #include "confdefs.h"
+
+ int
+@@ -2702,16 +2703,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:2705: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:2706: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:2708: \$? = $ac_status" >&5
++ echo "$as_me:2709: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:2711: \"$ac_try\"") >&5
++ { (eval echo "$as_me:2712: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:2714: \$? = $ac_status" >&5
++ echo "$as_me:2715: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ CLANG_COMPILER=yes
+
+@@ -2721,7 +2722,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ CFLAGS="$cf_save_CFLAGS"
+- echo "$as_me:2724: result: $CLANG_COMPILER" >&5
++ echo "$as_me:2725: result: $CLANG_COMPILER" >&5
+ echo "${ECHO_T}$CLANG_COMPILER" >&6
+ fi
+
+@@ -2730,30 +2731,30 @@
+ if test "x$CLANG_COMPILER" = "xyes" ; then
+ case "$CC" in
+ (c[1-9][0-9]|*/c[1-9][0-9])
+- { echo "$as_me:2733: WARNING: replacing broken compiler alias $CC" >&5
++ { echo "$as_me:2734: 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:2740: checking version of $CC" >&5
++ echo "$as_me:2741: 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:2744: result: $CLANG_VERSION" >&5
++ echo "$as_me:2745: 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:2751: checking if option $cf_clang_opt works" >&5
++ echo "$as_me:2752: 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 2756 "configure"
++#line 2757 "configure"
+ #include "confdefs.h"
+
+ #include <stdio.h>
+@@ -2767,16 +2768,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:2770: \"$ac_link\"") >&5
++if { (eval echo "$as_me:2771: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:2773: \$? = $ac_status" >&5
++ echo "$as_me:2774: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:2776: \"$ac_try\"") >&5
++ { (eval echo "$as_me:2777: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:2779: \$? = $ac_status" >&5
++ echo "$as_me:2780: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+
+ cf_clang_optok=yes
+@@ -2787,13 +2788,13 @@
+ cf_clang_optok=no
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+- echo "$as_me:2790: result: $cf_clang_optok" >&5
++ echo "$as_me:2791: 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}:2796: testing adding option $cf_clang_opt ..." 1>&5
++echo "${as_me:-configure}:2797: testing adding option $cf_clang_opt ..." 1>&5
+
+ test -n "$CFLAGS" && CFLAGS="$CFLAGS "
+ CFLAGS="${CFLAGS}$cf_clang_opt"
+@@ -2802,7 +2803,7 @@
+ done
+ fi
+
+-echo "$as_me:2805: checking for $CC option to accept ANSI C" >&5
++echo "$as_me:2806: 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
+@@ -2810,7 +2811,7 @@
+ ac_cv_prog_cc_stdc=no
+ ac_save_CC=$CC
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 2813 "configure"
++#line 2814 "configure"
+ #include "confdefs.h"
+ #include <stdarg.h>
+ #include <stdio.h>
+@@ -2857,16 +2858,16 @@
+ do
+ CC="$ac_save_CC $ac_arg"
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:2860: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:2861: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:2863: \$? = $ac_status" >&5
++ echo "$as_me:2864: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:2866: \"$ac_try\"") >&5
++ { (eval echo "$as_me:2867: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:2869: \$? = $ac_status" >&5
++ echo "$as_me:2870: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_prog_cc_stdc=$ac_arg
+ break
+@@ -2883,10 +2884,10 @@
+
+ case "x$ac_cv_prog_cc_stdc" in
+ x|xno)
+- echo "$as_me:2886: result: none needed" >&5
++ echo "$as_me:2887: result: none needed" >&5
+ echo "${ECHO_T}none needed" >&6 ;;
+ *)
+- echo "$as_me:2889: result: $ac_cv_prog_cc_stdc" >&5
++ echo "$as_me:2890: result: $ac_cv_prog_cc_stdc" >&5
+ echo "${ECHO_T}$ac_cv_prog_cc_stdc" >&6
+ CC="$CC $ac_cv_prog_cc_stdc" ;;
+ esac
+@@ -2894,13 +2895,13 @@
+ # This should have been defined by AC_PROG_CC
+ : "${CC:=cc}"
+
+-echo "$as_me:2897: checking \$CFLAGS variable" >&5
++echo "$as_me:2898: checking \$CFLAGS variable" >&5
+ echo $ECHO_N "checking \$CFLAGS variable... $ECHO_C" >&6
+ case "x$CFLAGS" in
+ (*-[IUD]*)
+- echo "$as_me:2901: result: broken" >&5
++ echo "$as_me:2902: result: broken" >&5
+ echo "${ECHO_T}broken" >&6
+- { echo "$as_me:2903: WARNING: your environment uses the CFLAGS variable to hold CPPFLAGS options" >&5
++ { echo "$as_me:2904: 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=
+@@ -3008,18 +3009,18 @@
+ done
+ ;;
+ (*)
+- echo "$as_me:3011: result: ok" >&5
++ echo "$as_me:3012: result: ok" >&5
+ echo "${ECHO_T}ok" >&6
+ ;;
+ esac
+
+-echo "$as_me:3016: checking \$CC variable" >&5
++echo "$as_me:3017: checking \$CC variable" >&5
+ echo $ECHO_N "checking \$CC variable... $ECHO_C" >&6
+ case "$CC" in
+ (*[\ \ ]-*)
+- echo "$as_me:3020: result: broken" >&5
++ echo "$as_me:3021: result: broken" >&5
+ echo "${ECHO_T}broken" >&6
+- { echo "$as_me:3022: WARNING: your environment uses the CC variable to hold CFLAGS/CPPFLAGS options" >&5
++ { echo "$as_me:3023: 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/[ ]*[ ]-[^ ].*//'`
+@@ -3136,19 +3137,19 @@
+ done
+ test -n "$verbose" && echo " resulting CC: '$CC'" 1>&6
+
+-echo "${as_me:-configure}:3139: testing resulting CC: '$CC' ..." 1>&5
++echo "${as_me:-configure}:3140: testing resulting CC: '$CC' ..." 1>&5
+
+ test -n "$verbose" && echo " resulting CFLAGS: '$CFLAGS'" 1>&6
+
+-echo "${as_me:-configure}:3143: testing resulting CFLAGS: '$CFLAGS' ..." 1>&5
++echo "${as_me:-configure}:3144: testing resulting CFLAGS: '$CFLAGS' ..." 1>&5
+
+ test -n "$verbose" && echo " resulting CPPFLAGS: '$CPPFLAGS'" 1>&6
+
+-echo "${as_me:-configure}:3147: testing resulting CPPFLAGS: '$CPPFLAGS' ..." 1>&5
++echo "${as_me:-configure}:3148: testing resulting CPPFLAGS: '$CPPFLAGS' ..." 1>&5
+
+ ;;
+ (*)
+- echo "$as_me:3151: result: ok" >&5
++ echo "$as_me:3152: result: ok" >&5
+ echo "${ECHO_T}ok" >&6
+ ;;
+ esac
+@@ -3162,7 +3163,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:3165: checking how to run the C preprocessor" >&5
++echo "$as_me:3166: 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
+@@ -3183,18 +3184,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 3186 "configure"
++#line 3187 "configure"
+ #include "confdefs.h"
+ #include <assert.h>
+ Syntax error
+ _ACEOF
+-if { (eval echo "$as_me:3191: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:3192: \"$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:3197: \$? = $ac_status" >&5
++ echo "$as_me:3198: \$? = $ac_status" >&5
+ (exit "$ac_status"); } >/dev/null; then
+ if test -s conftest.err; then
+ ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -3217,17 +3218,17 @@
+ # OK, works on sane cases. Now check whether non-existent headers
+ # can be detected and how.
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 3220 "configure"
++#line 3221 "configure"
+ #include "confdefs.h"
+ #include <ac_nonexistent.h>
+ _ACEOF
+-if { (eval echo "$as_me:3224: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:3225: \"$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:3230: \$? = $ac_status" >&5
++ echo "$as_me:3231: \$? = $ac_status" >&5
+ (exit "$ac_status"); } >/dev/null; then
+ if test -s conftest.err; then
+ ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -3264,7 +3265,7 @@
+ else
+ ac_cv_prog_CPP=$CPP
+ fi
+-echo "$as_me:3267: result: $CPP" >&5
++echo "$as_me:3268: result: $CPP" >&5
+ echo "${ECHO_T}$CPP" >&6
+ ac_preproc_ok=false
+ for ac_c_preproc_warn_flag in '' yes
+@@ -3274,18 +3275,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 3277 "configure"
++#line 3278 "configure"
+ #include "confdefs.h"
+ #include <assert.h>
+ Syntax error
+ _ACEOF
+-if { (eval echo "$as_me:3282: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:3283: \"$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:3288: \$? = $ac_status" >&5
++ echo "$as_me:3289: \$? = $ac_status" >&5
+ (exit "$ac_status"); } >/dev/null; then
+ if test -s conftest.err; then
+ ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -3308,17 +3309,17 @@
+ # OK, works on sane cases. Now check whether non-existent headers
+ # can be detected and how.
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 3311 "configure"
++#line 3312 "configure"
+ #include "confdefs.h"
+ #include <ac_nonexistent.h>
+ _ACEOF
+-if { (eval echo "$as_me:3315: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:3316: \"$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:3321: \$? = $ac_status" >&5
++ echo "$as_me:3322: \$? = $ac_status" >&5
+ (exit "$ac_status"); } >/dev/null; then
+ if test -s conftest.err; then
+ ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -3346,7 +3347,7 @@
+ if $ac_preproc_ok; then
+ :
+ else
+- { { echo "$as_me:3349: error: C preprocessor \"$CPP\" fails sanity check" >&5
++ { { echo "$as_me:3350: error: C preprocessor \"$CPP\" fails sanity check" >&5
+ echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check" >&2;}
+ { (exit 1); exit 1; }; }
+ fi
+@@ -3359,14 +3360,14 @@
+ ac_main_return="return"
+
+ if test $ac_cv_c_compiler_gnu = yes; then
+- echo "$as_me:3362: checking whether $CC needs -traditional" >&5
++ echo "$as_me:3363: checking whether $CC needs -traditional" >&5
+ echo $ECHO_N "checking whether $CC needs -traditional... $ECHO_C" >&6
+ if test "${ac_cv_prog_gcc_traditional+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ ac_pattern="Autoconf.*'x'"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 3369 "configure"
++#line 3370 "configure"
+ #include "confdefs.h"
+ #include <sgtty.h>
+ int Autoconf = TIOCGETP;
+@@ -3381,7 +3382,7 @@
+
+ if test $ac_cv_prog_gcc_traditional = no; then
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 3384 "configure"
++#line 3385 "configure"
+ #include "confdefs.h"
+ #include <termio.h>
+ int Autoconf = TCGETA;
+@@ -3394,14 +3395,14 @@
+
+ fi
+ fi
+-echo "$as_me:3397: result: $ac_cv_prog_gcc_traditional" >&5
++echo "$as_me:3398: result: $ac_cv_prog_gcc_traditional" >&5
+ echo "${ECHO_T}$ac_cv_prog_gcc_traditional" >&6
+ if test $ac_cv_prog_gcc_traditional = yes; then
+ CC="$CC -traditional"
+ fi
+ fi
+
+-echo "$as_me:3404: checking whether $CC understands -c and -o together" >&5
++echo "$as_me:3405: checking whether $CC understands -c and -o together" >&5
+ echo $ECHO_N "checking whether $CC understands -c and -o together... $ECHO_C" >&6
+ if test "${cf_cv_prog_CC_c_o+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -3416,15 +3417,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='$CC $CFLAGS $CPPFLAGS -c conftest.$ac_ext -o conftest2.$ac_objext >&5'
+-if { (eval echo "$as_me:3419: \"$ac_try\"") >&5
++if { (eval echo "$as_me:3420: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:3422: \$? = $ac_status" >&5
++ echo "$as_me:3423: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+- test -f conftest2.$ac_objext && { (eval echo "$as_me:3424: \"$ac_try\"") >&5
++ test -f conftest2.$ac_objext && { (eval echo "$as_me:3425: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:3427: \$? = $ac_status" >&5
++ echo "$as_me:3428: \$? = $ac_status" >&5
+ (exit "$ac_status"); };
+ then
+ eval cf_cv_prog_CC_c_o=yes
+@@ -3435,10 +3436,10 @@
+
+ fi
+ if test "$cf_cv_prog_CC_c_o" = yes; then
+- echo "$as_me:3438: result: yes" >&5
++ echo "$as_me:3439: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ else
+- echo "$as_me:3441: result: no" >&5
++ echo "$as_me:3442: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+
+@@ -3452,7 +3453,7 @@
+ (*) LDPATH=$PATH:/sbin:/usr/sbin
+ # Extract the first word of "ldconfig", so it can be a program name with args.
+ set dummy ldconfig; ac_word=$2
+-echo "$as_me:3455: checking for $ac_word" >&5
++echo "$as_me:3456: checking for $ac_word" >&5
+ echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+ if test "${ac_cv_path_LDCONFIG+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -3469,7 +3470,7 @@
+ test -z "$ac_dir" && ac_dir=.
+ if $as_executable_p "$ac_dir/$ac_word"; then
+ ac_cv_path_LDCONFIG="$ac_dir/$ac_word"
+- echo "$as_me:3472: found $ac_dir/$ac_word" >&5
++ echo "$as_me:3473: found $ac_dir/$ac_word" >&5
+ break
+ fi
+ done
+@@ -3480,10 +3481,10 @@
+ LDCONFIG=$ac_cv_path_LDCONFIG
+
+ if test -n "$LDCONFIG"; then
+- echo "$as_me:3483: result: $LDCONFIG" >&5
++ echo "$as_me:3484: result: $LDCONFIG" >&5
+ echo "${ECHO_T}$LDCONFIG" >&6
+ else
+- echo "$as_me:3486: result: no" >&5
++ echo "$as_me:3487: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+
+@@ -3491,7 +3492,7 @@
+ esac
+ fi
+
+-echo "$as_me:3494: checking if you want to ensure bool is consistent with C++" >&5
++echo "$as_me:3495: checking if you want to ensure bool is consistent with C++" >&5
+ echo $ECHO_N "checking if you want to ensure bool is consistent with C++... $ECHO_C" >&6
+
+ # Check whether --with-cxx or --without-cxx was given.
+@@ -3501,7 +3502,7 @@
+ else
+ cf_with_cxx=yes
+ fi;
+-echo "$as_me:3504: result: $cf_with_cxx" >&5
++echo "$as_me:3505: result: $cf_with_cxx" >&5
+ echo "${ECHO_T}$cf_with_cxx" >&6
+ if test "X$cf_with_cxx" = Xno ; then
+ CXX=""
+@@ -3519,7 +3520,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:3522: checking for $ac_word" >&5
++echo "$as_me:3523: checking for $ac_word" >&5
+ echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+ if test "${ac_cv_prog_CXX+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -3534,7 +3535,7 @@
+ test -z "$ac_dir" && ac_dir=.
+ $as_executable_p "$ac_dir/$ac_word" || continue
+ ac_cv_prog_CXX="$ac_tool_prefix$ac_prog"
+-echo "$as_me:3537: found $ac_dir/$ac_word" >&5
++echo "$as_me:3538: found $ac_dir/$ac_word" >&5
+ break
+ done
+
+@@ -3542,10 +3543,10 @@
+ fi
+ CXX=$ac_cv_prog_CXX
+ if test -n "$CXX"; then
+- echo "$as_me:3545: result: $CXX" >&5
++ echo "$as_me:3546: result: $CXX" >&5
+ echo "${ECHO_T}$CXX" >&6
+ else
+- echo "$as_me:3548: result: no" >&5
++ echo "$as_me:3549: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+
+@@ -3558,7 +3559,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:3561: checking for $ac_word" >&5
++echo "$as_me:3562: checking for $ac_word" >&5
+ echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+ if test "${ac_cv_prog_ac_ct_CXX+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -3573,7 +3574,7 @@
+ test -z "$ac_dir" && ac_dir=.
+ $as_executable_p "$ac_dir/$ac_word" || continue
+ ac_cv_prog_ac_ct_CXX="$ac_prog"
+-echo "$as_me:3576: found $ac_dir/$ac_word" >&5
++echo "$as_me:3577: found $ac_dir/$ac_word" >&5
+ break
+ done
+
+@@ -3581,10 +3582,10 @@
+ fi
+ ac_ct_CXX=$ac_cv_prog_ac_ct_CXX
+ if test -n "$ac_ct_CXX"; then
+- echo "$as_me:3584: result: $ac_ct_CXX" >&5
++ echo "$as_me:3585: result: $ac_ct_CXX" >&5
+ echo "${ECHO_T}$ac_ct_CXX" >&6
+ else
+- echo "$as_me:3587: result: no" >&5
++ echo "$as_me:3588: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+
+@@ -3596,32 +3597,32 @@
+ fi
+
+ # Provide some information about the compiler.
+-echo "$as_me:3599:" \
++echo "$as_me:3600:" \
+ "checking for C++ compiler version" >&5
+ ac_compiler=`set X $ac_compile; echo $2`
+-{ (eval echo "$as_me:3602: \"$ac_compiler --version </dev/null >&5\"") >&5
++{ (eval echo "$as_me:3603: \"$ac_compiler --version </dev/null >&5\"") >&5
+ (eval $ac_compiler --version </dev/null >&5) 2>&5
+ ac_status=$?
+- echo "$as_me:3605: \$? = $ac_status" >&5
++ echo "$as_me:3606: \$? = $ac_status" >&5
+ (exit "$ac_status"); }
+-{ (eval echo "$as_me:3607: \"$ac_compiler -v </dev/null >&5\"") >&5
++{ (eval echo "$as_me:3608: \"$ac_compiler -v </dev/null >&5\"") >&5
+ (eval $ac_compiler -v </dev/null >&5) 2>&5
+ ac_status=$?
+- echo "$as_me:3610: \$? = $ac_status" >&5
++ echo "$as_me:3611: \$? = $ac_status" >&5
+ (exit "$ac_status"); }
+-{ (eval echo "$as_me:3612: \"$ac_compiler -V </dev/null >&5\"") >&5
++{ (eval echo "$as_me:3613: \"$ac_compiler -V </dev/null >&5\"") >&5
+ (eval $ac_compiler -V </dev/null >&5) 2>&5
+ ac_status=$?
+- echo "$as_me:3615: \$? = $ac_status" >&5
++ echo "$as_me:3616: \$? = $ac_status" >&5
+ (exit "$ac_status"); }
+
+-echo "$as_me:3618: checking whether we are using the GNU C++ compiler" >&5
++echo "$as_me:3619: 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_cxx_compiler_gnu+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 3624 "configure"
++#line 3625 "configure"
+ #include "confdefs.h"
+
+ int
+@@ -3636,16 +3637,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:3639: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:3640: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:3642: \$? = $ac_status" >&5
++ echo "$as_me:3643: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:3645: \"$ac_try\"") >&5
++ { (eval echo "$as_me:3646: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:3648: \$? = $ac_status" >&5
++ echo "$as_me:3649: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_compiler_gnu=yes
+ else
+@@ -3657,19 +3658,19 @@
+ ac_cv_cxx_compiler_gnu=$ac_compiler_gnu
+
+ fi
+-echo "$as_me:3660: result: $ac_cv_cxx_compiler_gnu" >&5
++echo "$as_me:3661: result: $ac_cv_cxx_compiler_gnu" >&5
+ echo "${ECHO_T}$ac_cv_cxx_compiler_gnu" >&6
+ GXX=`test $ac_compiler_gnu = yes && echo yes`
+ ac_test_CXXFLAGS=${CXXFLAGS+set}
+ ac_save_CXXFLAGS=$CXXFLAGS
+ CXXFLAGS="-g"
+-echo "$as_me:3666: checking whether $CXX accepts -g" >&5
++echo "$as_me:3667: checking whether $CXX accepts -g" >&5
+ echo $ECHO_N "checking whether $CXX accepts -g... $ECHO_C" >&6
+ if test "${ac_cv_prog_cxx_g+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 3672 "configure"
++#line 3673 "configure"
+ #include "confdefs.h"
+
+ int
+@@ -3681,16 +3682,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:3684: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:3685: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:3687: \$? = $ac_status" >&5
++ echo "$as_me:3688: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:3690: \"$ac_try\"") >&5
++ { (eval echo "$as_me:3691: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:3693: \$? = $ac_status" >&5
++ echo "$as_me:3694: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_prog_cxx_g=yes
+ else
+@@ -3700,7 +3701,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:3703: result: $ac_cv_prog_cxx_g" >&5
++echo "$as_me:3704: result: $ac_cv_prog_cxx_g" >&5
+ echo "${ECHO_T}$ac_cv_prog_cxx_g" >&6
+ if test "$ac_test_CXXFLAGS" = set; then
+ CXXFLAGS=$ac_save_CXXFLAGS
+@@ -3727,7 +3728,7 @@
+ 'void exit (int);'
+ do
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 3730 "configure"
++#line 3731 "configure"
+ #include "confdefs.h"
+ #include <stdlib.h>
+ $ac_declaration
+@@ -3740,16 +3741,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:3743: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:3744: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:3746: \$? = $ac_status" >&5
++ echo "$as_me:3747: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:3749: \"$ac_try\"") >&5
++ { (eval echo "$as_me:3750: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:3752: \$? = $ac_status" >&5
++ echo "$as_me:3753: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ :
+ else
+@@ -3759,7 +3760,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 3762 "configure"
++#line 3763 "configure"
+ #include "confdefs.h"
+ $ac_declaration
+ int
+@@ -3771,16 +3772,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:3774: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:3775: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:3777: \$? = $ac_status" >&5
++ echo "$as_me:3778: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:3780: \"$ac_try\"") >&5
++ { (eval echo "$as_me:3781: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:3783: \$? = $ac_status" >&5
++ echo "$as_me:3784: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ break
+ else
+@@ -3814,7 +3815,7 @@
+ then
+ # Several of the C++ configurations do not work, particularly when
+ # cross-compiling (20140913 -TD)
+- echo "$as_me:3817: checking if $CXX works" >&5
++ echo "$as_me:3818: checking if $CXX works" >&5
+ echo $ECHO_N "checking if $CXX works... $ECHO_C" >&6
+
+ save_CPPFLAGS="$CPPFLAGS"
+@@ -3822,7 +3823,7 @@
+ CPPFLAGS="$CPPFLAGS -I${cf_includedir}"
+
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 3825 "configure"
++#line 3826 "configure"
+ #include "confdefs.h"
+
+ #include <stdlib.h>
+@@ -3839,16 +3840,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:3842: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:3843: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:3845: \$? = $ac_status" >&5
++ echo "$as_me:3846: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:3848: \"$ac_try\"") >&5
++ { (eval echo "$as_me:3849: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:3851: \$? = $ac_status" >&5
++ echo "$as_me:3852: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cxx_works=yes
+ else
+@@ -3859,11 +3860,11 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ CPPFLAGS="$save_CPPFLAGS"
+
+- echo "$as_me:3862: result: $cf_cxx_works" >&5
++ echo "$as_me:3863: result: $cf_cxx_works" >&5
+ echo "${ECHO_T}$cf_cxx_works" >&6
+ if test "x$cf_cxx_works" = xno
+ then
+- { echo "$as_me:3866: WARNING: Ignore $CXX, since it cannot compile hello-world." >&5
++ { echo "$as_me:3867: WARNING: Ignore $CXX, since it cannot compile hello-world." >&5
+ echo "$as_me: WARNING: Ignore $CXX, since it cannot compile hello-world." >&2;}
+ cf_with_cxx=no; CXX=""; GXX="";
+ fi
+@@ -3879,7 +3880,7 @@
+ if test "$CXX" = "g++" ; then
+ # Extract the first word of "g++", so it can be a program name with args.
+ set dummy g++; ac_word=$2
+-echo "$as_me:3882: checking for $ac_word" >&5
++echo "$as_me:3883: checking for $ac_word" >&5
+ echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+ if test "${ac_cv_path_CXX+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -3896,7 +3897,7 @@
+ test -z "$ac_dir" && ac_dir=.
+ if $as_executable_p "$ac_dir/$ac_word"; then
+ ac_cv_path_CXX="$ac_dir/$ac_word"
+- echo "$as_me:3899: found $ac_dir/$ac_word" >&5
++ echo "$as_me:3900: found $ac_dir/$ac_word" >&5
+ break
+ fi
+ done
+@@ -3907,17 +3908,17 @@
+ CXX=$ac_cv_path_CXX
+
+ if test -n "$CXX"; then
+- echo "$as_me:3910: result: $CXX" >&5
++ echo "$as_me:3911: result: $CXX" >&5
+ echo "${ECHO_T}$CXX" >&6
+ else
+- echo "$as_me:3913: result: no" >&5
++ echo "$as_me:3914: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+
+ fi
+ case "x$CXX" in
+ (x|xg++)
+- { echo "$as_me:3920: WARNING: You don't have any C++ compiler, too bad" >&5
++ { echo "$as_me:3921: WARNING: You don't have any C++ compiler, too bad" >&5
+ echo "$as_me: WARNING: You don't have any C++ compiler, too bad" >&2;}
+ cf_with_cxx=no; CXX=""; GXX="";
+ ;;
+@@ -3926,7 +3927,7 @@
+
+ GXX_VERSION=none
+ if test "$GXX" = yes; then
+- echo "$as_me:3929: checking version of ${CXX:-g++}" >&5
++ echo "$as_me:3930: checking version of ${CXX:-g++}" >&5
+ echo $ECHO_N "checking version of ${CXX:-g++}... $ECHO_C" >&6
+ GXX_VERSION="`${CXX:-g++} --version 2>/dev/null | sed -e '2,$d' -e 's/^[^(]*([^)][^)]*) //' -e 's/^[^0-9.]*//' -e 's/[^0-9.].*//'`"
+ if test -z "$GXX_VERSION"
+@@ -3934,7 +3935,7 @@
+ GXX_VERSION=unknown
+ GXX=no
+ fi
+- echo "$as_me:3937: result: $GXX_VERSION" >&5
++ echo "$as_me:3938: result: $GXX_VERSION" >&5
+ echo "${ECHO_T}$GXX_VERSION" >&6
+ fi
+
+@@ -3942,12 +3943,12 @@
+ ([1-9][0-9].*)
+ ;;
+ (1.*|2.[0-6]*)
+- { echo "$as_me:3945: WARNING: templates do not work" >&5
++ { echo "$as_me:3946: WARNING: templates do not work" >&5
+ echo "$as_me: WARNING: templates do not work" >&2;}
+ ;;
+ esac
+
+-echo "$as_me:3950: checking if you want to build C++ binding and demo" >&5
++echo "$as_me:3951: checking if you want to build C++ binding and demo" >&5
+ echo $ECHO_N "checking if you want to build C++ binding and demo... $ECHO_C" >&6
+
+ # Check whether --with-cxx-binding or --without-cxx-binding was given.
+@@ -3957,15 +3958,15 @@
+ else
+ cf_with_cxx_binding=$cf_with_cxx
+ fi;
+-echo "$as_me:3960: result: $cf_with_cxx_binding" >&5
++echo "$as_me:3961: result: $cf_with_cxx_binding" >&5
+ echo "${ECHO_T}$cf_with_cxx_binding" >&6
+
+-echo "$as_me:3963: checking if you want to build with Ada" >&5
++echo "$as_me:3964: checking if you want to build with Ada" >&5
+ echo $ECHO_N "checking if you want to build with Ada... $ECHO_C" >&6
+-echo "$as_me:3965: result: $cf_with_ada" >&5
++echo "$as_me:3966: result: $cf_with_ada" >&5
+ echo "${ECHO_T}$cf_with_ada" >&6
+
+-echo "$as_me:3968: checking if you want to install terminal database" >&5
++echo "$as_me:3969: checking if you want to install terminal database" >&5
+ echo $ECHO_N "checking if you want to install terminal database... $ECHO_C" >&6
+
+ # Check whether --enable-db-install or --disable-db-install was given.
+@@ -3975,10 +3976,10 @@
+ else
+ cf_with_db_install=yes
+ fi;
+-echo "$as_me:3978: result: $cf_with_db_install" >&5
++echo "$as_me:3979: result: $cf_with_db_install" >&5
+ echo "${ECHO_T}$cf_with_db_install" >&6
+
+-echo "$as_me:3981: checking if you want to install manpages" >&5
++echo "$as_me:3982: checking if you want to install manpages" >&5
+ echo $ECHO_N "checking if you want to install manpages... $ECHO_C" >&6
+
+ # Check whether --with-manpages or --without-manpages was given.
+@@ -3988,10 +3989,10 @@
+ else
+ cf_with_manpages=yes
+ fi;
+-echo "$as_me:3991: result: $cf_with_manpages" >&5
++echo "$as_me:3992: result: $cf_with_manpages" >&5
+ echo "${ECHO_T}$cf_with_manpages" >&6
+
+-echo "$as_me:3994: checking if you want to build programs such as tic" >&5
++echo "$as_me:3995: checking if you want to build programs such as tic" >&5
+ echo $ECHO_N "checking if you want to build programs such as tic... $ECHO_C" >&6
+
+ # Check whether --with-progs or --without-progs was given.
+@@ -4001,10 +4002,10 @@
+ else
+ cf_with_progs=yes
+ fi;
+-echo "$as_me:4004: result: $cf_with_progs" >&5
++echo "$as_me:4005: result: $cf_with_progs" >&5
+ echo "${ECHO_T}$cf_with_progs" >&6
+
+-echo "$as_me:4007: checking if you want to build test-programs" >&5
++echo "$as_me:4008: 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.
+@@ -4014,10 +4015,10 @@
+ else
+ cf_with_tests=yes
+ fi;
+-echo "$as_me:4017: result: $cf_with_tests" >&5
++echo "$as_me:4018: result: $cf_with_tests" >&5
+ echo "${ECHO_T}$cf_with_tests" >&6
+
+-echo "$as_me:4020: checking if you wish to install curses.h" >&5
++echo "$as_me:4021: checking if you wish to install curses.h" >&5
+ echo $ECHO_N "checking if you wish to install curses.h... $ECHO_C" >&6
+
+ # Check whether --with-curses-h or --without-curses-h was given.
+@@ -4027,7 +4028,7 @@
+ else
+ with_curses_h=yes
+ fi;
+-echo "$as_me:4030: result: $with_curses_h" >&5
++echo "$as_me:4031: result: $with_curses_h" >&5
+ echo "${ECHO_T}$with_curses_h" >&6
+
+ modules_to_build="ncurses"
+@@ -4051,7 +4052,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:4054: checking for $ac_word" >&5
++echo "$as_me:4055: 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
+@@ -4066,7 +4067,7 @@
+ test -z "$ac_dir" && ac_dir=.
+ $as_executable_p "$ac_dir/$ac_word" || continue
+ ac_cv_prog_AWK="$ac_prog"
+-echo "$as_me:4069: found $ac_dir/$ac_word" >&5
++echo "$as_me:4070: found $ac_dir/$ac_word" >&5
+ break
+ done
+
+@@ -4074,17 +4075,17 @@
+ fi
+ AWK=$ac_cv_prog_AWK
+ if test -n "$AWK"; then
+- echo "$as_me:4077: result: $AWK" >&5
++ echo "$as_me:4078: result: $AWK" >&5
+ echo "${ECHO_T}$AWK" >&6
+ else
+- echo "$as_me:4080: result: no" >&5
++ echo "$as_me:4081: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+
+ test -n "$AWK" && break
+ done
+
+-test -z "$AWK" && { { echo "$as_me:4087: error: No awk program found" >&5
++test -z "$AWK" && { { echo "$as_me:4088: error: No awk program found" >&5
+ echo "$as_me: error: No awk program found" >&2;}
+ { (exit 1); exit 1; }; }
+
+@@ -4111,7 +4112,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:4114: checking for a BSD compatible install" >&5
++echo "$as_me:4115: 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
+@@ -4160,7 +4161,7 @@
+ INSTALL=$ac_install_sh
+ fi
+ fi
+-echo "$as_me:4163: result: $INSTALL" >&5
++echo "$as_me:4164: result: $INSTALL" >&5
+ echo "${ECHO_T}$INSTALL" >&6
+
+ # Use test -z because SunOS4 sh mishandles braces in ${var-val}.
+@@ -4185,7 +4186,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:4188: checking for $ac_word" >&5
++echo "$as_me:4189: 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
+@@ -4200,7 +4201,7 @@
+ test -z "$ac_dir" && ac_dir=.
+ $as_executable_p "$ac_dir/$ac_word" || continue
+ ac_cv_prog_LINT="$ac_prog"
+-echo "$as_me:4203: found $ac_dir/$ac_word" >&5
++echo "$as_me:4204: found $ac_dir/$ac_word" >&5
+ break
+ done
+
+@@ -4208,10 +4209,10 @@
+ fi
+ LINT=$ac_cv_prog_LINT
+ if test -n "$LINT"; then
+- echo "$as_me:4211: result: $LINT" >&5
++ echo "$as_me:4212: result: $LINT" >&5
+ echo "${ECHO_T}$LINT" >&6
+ else
+- echo "$as_me:4214: result: no" >&5
++ echo "$as_me:4215: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+
+@@ -4224,18 +4225,18 @@
+ ;;
+ esac
+
+-echo "$as_me:4227: checking whether ln -s works" >&5
++echo "$as_me:4228: 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:4231: result: yes" >&5
++ echo "$as_me:4232: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ else
+- echo "$as_me:4234: result: no, using $LN_S" >&5
++ echo "$as_me:4235: result: no, using $LN_S" >&5
+ echo "${ECHO_T}no, using $LN_S" >&6
+ fi
+
+-echo "$as_me:4238: checking if $LN_S -f options work" >&5
++echo "$as_me:4239: 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
+@@ -4247,12 +4248,12 @@
+ cf_prog_ln_sf=no
+ fi
+ rm -f conf$$.dst conf$$src
+-echo "$as_me:4250: result: $cf_prog_ln_sf" >&5
++echo "$as_me:4251: 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:4255: checking for long file names" >&5
++echo "$as_me:4256: 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
+@@ -4291,7 +4292,7 @@
+ rm -rf "$ac_xdir" 2>/dev/null
+ done
+ fi
+-echo "$as_me:4294: result: $ac_cv_sys_long_file_names" >&5
++echo "$as_me:4295: 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
+
+@@ -4310,7 +4311,7 @@
+ withval="$with_config_suffix"
+ case "x$withval" in
+ (xyes|xno)
+- { echo "$as_me:4313: WARNING: expected a value for config-suffix option" >&5
++ { echo "$as_me:4314: 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"
+@@ -4320,7 +4321,7 @@
+
+ # If we find pkg-config, check if we should install the ".pc" files.
+
+-echo "$as_me:4323: checking if you want to use pkg-config" >&5
++echo "$as_me:4324: 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.
+@@ -4330,7 +4331,7 @@
+ else
+ cf_pkg_config=yes
+ fi;
+-echo "$as_me:4333: result: $cf_pkg_config" >&5
++echo "$as_me:4334: result: $cf_pkg_config" >&5
+ echo "${ECHO_T}$cf_pkg_config" >&6
+
+ case "$cf_pkg_config" in
+@@ -4342,7 +4343,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:4345: checking for $ac_word" >&5
++echo "$as_me:4346: 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
+@@ -4359,7 +4360,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:4362: found $ac_dir/$ac_word" >&5
++ echo "$as_me:4363: found $ac_dir/$ac_word" >&5
+ break
+ fi
+ done
+@@ -4370,10 +4371,10 @@
+ PKG_CONFIG=$ac_cv_path_PKG_CONFIG
+
+ if test -n "$PKG_CONFIG"; then
+- echo "$as_me:4373: result: $PKG_CONFIG" >&5
++ echo "$as_me:4374: result: $PKG_CONFIG" >&5
+ echo "${ECHO_T}$PKG_CONFIG" >&6
+ else
+- echo "$as_me:4376: result: no" >&5
++ echo "$as_me:4377: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+
+@@ -4382,7 +4383,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:4385: checking for $ac_word" >&5
++echo "$as_me:4386: 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
+@@ -4399,7 +4400,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:4402: found $ac_dir/$ac_word" >&5
++ echo "$as_me:4403: found $ac_dir/$ac_word" >&5
+ break
+ fi
+ done
+@@ -4411,10 +4412,10 @@
+ ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG
+
+ if test -n "$ac_pt_PKG_CONFIG"; then
+- echo "$as_me:4414: result: $ac_pt_PKG_CONFIG" >&5
++ echo "$as_me:4415: result: $ac_pt_PKG_CONFIG" >&5
+ echo "${ECHO_T}$ac_pt_PKG_CONFIG" >&6
+ else
+- echo "$as_me:4417: result: no" >&5
++ echo "$as_me:4418: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+
+@@ -4455,24 +4456,24 @@
+ PKG_CONFIG=`echo "$PKG_CONFIG" | sed -e s%NONE%$cf_path_syntax%`
+ ;;
+ (*)
+- { { echo "$as_me:4458: error: expected a pathname, not \"$PKG_CONFIG\"" >&5
++ { { echo "$as_me:4459: 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:4465: WARNING: pkg-config is not installed" >&5
++ { echo "$as_me:4466: 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:4471: checking for pkg-config library directory" >&5
++ echo "$as_me:4472: checking for pkg-config library directory" >&5
+ echo $ECHO_N "checking for pkg-config library directory... $ECHO_C" >&6
+ ;;
+ (*)
+- echo "$as_me:4475: checking for $PKG_CONFIG library directory" >&5
++ echo "$as_me:4476: checking for $PKG_CONFIG library directory" >&5
+ echo $ECHO_N "checking for $PKG_CONFIG library directory... $ECHO_C" >&6
+ ;;
+ esac
+@@ -4499,7 +4500,7 @@
+ case "x$cf_search_path" in
+ (xlibdir)
+ PKG_CONFIG_LIBDIR='${libdir}/pkgconfig'
+- echo "$as_me:4502: result: $PKG_CONFIG_LIBDIR" >&5
++ echo "$as_me:4503: result: $PKG_CONFIG_LIBDIR" >&5
+ echo "${ECHO_T}$PKG_CONFIG_LIBDIR" >&6
+ cf_search_path=
+ ;;
+@@ -4510,16 +4511,16 @@
+ ;;
+ (x$GLOB_FULLPATH_POSIX|x$GLOB_FULLPATH_OTHER)
+ PKG_CONFIG_LIBDIR="$cf_search_path"
+- echo "$as_me:4513: result: $PKG_CONFIG_LIBDIR" >&5
++ echo "$as_me:4514: result: $PKG_CONFIG_LIBDIR" >&5
+ echo "${ECHO_T}$PKG_CONFIG_LIBDIR" >&6
+ cf_search_path=
+ ;;
+ (xyes|xauto)
+- echo "$as_me:4518: result: auto" >&5
++ echo "$as_me:4519: 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:4522: checking for search-list" >&5
++ echo "$as_me:4523: checking for search-list" >&5
+ echo $ECHO_N "checking for search-list... $ECHO_C" >&6
+ if test "x$PKG_CONFIG" != xnone
+ then
+@@ -4554,11 +4555,11 @@
+ "`
+ fi
+
+- echo "$as_me:4557: result: $cf_search_path" >&5
++ echo "$as_me:4558: result: $cf_search_path" >&5
+ echo "${ECHO_T}$cf_search_path" >&6
+ ;;
+ (*)
+- { { echo "$as_me:4561: error: Unexpected option value: $cf_search_path" >&5
++ { { echo "$as_me:4562: error: Unexpected option value: $cf_search_path" >&5
+ echo "$as_me: error: Unexpected option value: $cf_search_path" >&2;}
+ { (exit 1); exit 1; }; }
+ ;;
+@@ -4566,7 +4567,7 @@
+
+ if test -n "$cf_search_path"
+ then
+- echo "$as_me:4569: checking for first directory" >&5
++ echo "$as_me:4570: 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
+@@ -4577,7 +4578,7 @@
+ break
+ fi
+ done
+- echo "$as_me:4580: result: $cf_pkg_config_path" >&5
++ echo "$as_me:4581: result: $cf_pkg_config_path" >&5
+ echo "${ECHO_T}$cf_pkg_config_path" >&6
+
+ if test "x$cf_pkg_config_path" != xnone ; then
+@@ -4587,7 +4588,7 @@
+
+ if test -z "$PKG_CONFIG_LIBDIR" && test -n "$cf_search_path"
+ then
+- echo "$as_me:4590: checking for workaround" >&5
++ echo "$as_me:4591: checking for workaround" >&5
+ echo $ECHO_N "checking for workaround... $ECHO_C" >&6
+ if test "$prefix" = "NONE" ; then
+ cf_prefix="$ac_default_prefix"
+@@ -4610,17 +4611,17 @@
+ esac
+ done
+ test -z "$PKG_CONFIG_LIBDIR" && PKG_CONFIG_LIBDIR=$cf_backup
+- echo "$as_me:4613: result: $PKG_CONFIG_LIBDIR" >&5
++ echo "$as_me:4614: result: $PKG_CONFIG_LIBDIR" >&5
+ echo "${ECHO_T}$PKG_CONFIG_LIBDIR" >&6
+ fi
+ fi
+
+ if test "x$PKG_CONFIG" != xnone
+ then
+- echo "$as_me:4620: checking if we should install .pc files for $PKG_CONFIG" >&5
++ echo "$as_me:4621: 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:4623: checking if we should install .pc files" >&5
++ echo "$as_me:4624: checking if we should install .pc files" >&5
+ echo $ECHO_N "checking if we should install .pc files... $ECHO_C" >&6
+ fi
+
+@@ -4631,7 +4632,7 @@
+ else
+ enable_pc_files=no
+ fi;
+-echo "$as_me:4634: result: $enable_pc_files" >&5
++echo "$as_me:4635: result: $enable_pc_files" >&5
+ echo "${ECHO_T}$enable_pc_files" >&6
+
+ if test "x$enable_pc_files" != xno
+@@ -4639,7 +4640,7 @@
+ MAKE_PC_FILES=
+ case "x$PKG_CONFIG_LIBDIR" in
+ (xno|xnone|xyes|x)
+- { echo "$as_me:4642: WARNING: no PKG_CONFIG_LIBDIR was found" >&5
++ { echo "$as_me:4643: WARNING: no PKG_CONFIG_LIBDIR was found" >&5
+ echo "$as_me: WARNING: no PKG_CONFIG_LIBDIR was found" >&2;}
+ ;;
+ (*)
+@@ -4668,7 +4669,7 @@
+ cf_pkg_config_libdir=`echo "$cf_pkg_config_libdir" | sed -e s%NONE%$cf_path_syntax%`
+ ;;
+ (*)
+- { { echo "$as_me:4671: error: expected a pathname, not \"$cf_pkg_config_libdir\"" >&5
++ { { echo "$as_me:4672: 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; }; }
+ ;;
+@@ -4682,7 +4683,7 @@
+
+ if test -z "$MAKE_PC_FILES"
+ then
+- echo "$as_me:4685: checking for suffix to add to pkg-config files" >&5
++ echo "$as_me:4686: 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.
+@@ -4697,13 +4698,13 @@
+ esac
+ fi;
+ test -z "$PC_MODULE_SUFFIX" && PC_MODULE_SUFFIX=none
+- echo "$as_me:4700: result: $PC_MODULE_SUFFIX" >&5
++ echo "$as_me:4701: result: $PC_MODULE_SUFFIX" >&5
+ echo "${ECHO_T}$PC_MODULE_SUFFIX" >&6
+ test "$PC_MODULE_SUFFIX" = none && PC_MODULE_SUFFIX=
+
+ fi
+
+-echo "$as_me:4706: checking if we should assume mixed-case filenames" >&5
++echo "$as_me:4707: 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.
+@@ -4713,11 +4714,11 @@
+ else
+ enable_mixedcase=auto
+ fi;
+-echo "$as_me:4716: result: $enable_mixedcase" >&5
++echo "$as_me:4717: result: $enable_mixedcase" >&5
+ echo "${ECHO_T}$enable_mixedcase" >&6
+ if test "$enable_mixedcase" = "auto" ; then
+
+-echo "$as_me:4720: checking if filesystem supports mixed-case filenames" >&5
++echo "$as_me:4721: 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
+@@ -4744,7 +4745,7 @@
+ fi
+
+ fi
+-echo "$as_me:4747: result: $cf_cv_mixedcase" >&5
++echo "$as_me:4748: result: $cf_cv_mixedcase" >&5
+ echo "${ECHO_T}$cf_cv_mixedcase" >&6
+ test "$cf_cv_mixedcase" = yes &&
+ cat >>confdefs.h <<\EOF
+@@ -4763,7 +4764,7 @@
+ fi
+
+ # do this after mixed-case option (tags/TAGS is not as important as tic).
+-echo "$as_me:4766: checking whether ${MAKE-make} sets \${MAKE}" >&5
++echo "$as_me:4767: 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
+@@ -4783,16 +4784,16 @@
+ rm -f conftest.make
+ fi
+ if eval "test \"`echo '$ac_cv_prog_make_'${ac_make}_set`\" = yes"; then
+- echo "$as_me:4786: result: yes" >&5
++ echo "$as_me:4787: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ SET_MAKE=
+ else
+- echo "$as_me:4790: result: no" >&5
++ echo "$as_me:4791: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ SET_MAKE="MAKE=${MAKE-make}"
+ fi
+
+-echo "$as_me:4795: checking for \".PHONY\" make-support" >&5
++echo "$as_me:4796: 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
+@@ -4847,7 +4848,7 @@
+ rm -rf conftest*
+
+ fi
+-echo "$as_me:4850: result: $cf_cv_make_PHONY" >&5
++echo "$as_me:4851: result: $cf_cv_make_PHONY" >&5
+ echo "${ECHO_T}$cf_cv_make_PHONY" >&6
+ MAKE_NO_PHONY="#"
+ MAKE_PHONY="#"
+@@ -4858,7 +4859,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:4861: checking for $ac_word" >&5
++echo "$as_me:4862: 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
+@@ -4873,7 +4874,7 @@
+ test -z "$ac_dir" && ac_dir=.
+ $as_executable_p "$ac_dir/$ac_word" || continue
+ ac_cv_prog_CTAGS="$ac_prog"
+-echo "$as_me:4876: found $ac_dir/$ac_word" >&5
++echo "$as_me:4877: found $ac_dir/$ac_word" >&5
+ break
+ done
+
+@@ -4881,10 +4882,10 @@
+ fi
+ CTAGS=$ac_cv_prog_CTAGS
+ if test -n "$CTAGS"; then
+- echo "$as_me:4884: result: $CTAGS" >&5
++ echo "$as_me:4885: result: $CTAGS" >&5
+ echo "${ECHO_T}$CTAGS" >&6
+ else
+- echo "$as_me:4887: result: no" >&5
++ echo "$as_me:4888: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+
+@@ -4895,7 +4896,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:4898: checking for $ac_word" >&5
++echo "$as_me:4899: 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
+@@ -4910,7 +4911,7 @@
+ test -z "$ac_dir" && ac_dir=.
+ $as_executable_p "$ac_dir/$ac_word" || continue
+ ac_cv_prog_ETAGS="$ac_prog"
+-echo "$as_me:4913: found $ac_dir/$ac_word" >&5
++echo "$as_me:4914: found $ac_dir/$ac_word" >&5
+ break
+ done
+
+@@ -4918,10 +4919,10 @@
+ fi
+ ETAGS=$ac_cv_prog_ETAGS
+ if test -n "$ETAGS"; then
+- echo "$as_me:4921: result: $ETAGS" >&5
++ echo "$as_me:4922: result: $ETAGS" >&5
+ echo "${ECHO_T}$ETAGS" >&6
+ else
+- echo "$as_me:4924: result: no" >&5
++ echo "$as_me:4925: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+
+@@ -4930,7 +4931,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:4933: checking for $ac_word" >&5
++echo "$as_me:4934: 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
+@@ -4945,7 +4946,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:4948: found $ac_dir/$ac_word" >&5
++echo "$as_me:4949: found $ac_dir/$ac_word" >&5
+ break
+ done
+
+@@ -4954,17 +4955,17 @@
+ fi
+ MAKE_LOWER_TAGS=$ac_cv_prog_MAKE_LOWER_TAGS
+ if test -n "$MAKE_LOWER_TAGS"; then
+- echo "$as_me:4957: result: $MAKE_LOWER_TAGS" >&5
++ echo "$as_me:4958: result: $MAKE_LOWER_TAGS" >&5
+ echo "${ECHO_T}$MAKE_LOWER_TAGS" >&6
+ else
+- echo "$as_me:4960: result: no" >&5
++ echo "$as_me:4961: 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:4967: checking for $ac_word" >&5
++echo "$as_me:4968: 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
+@@ -4979,7 +4980,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:4982: found $ac_dir/$ac_word" >&5
++echo "$as_me:4983: found $ac_dir/$ac_word" >&5
+ break
+ done
+
+@@ -4988,10 +4989,10 @@
+ fi
+ MAKE_UPPER_TAGS=$ac_cv_prog_MAKE_UPPER_TAGS
+ if test -n "$MAKE_UPPER_TAGS"; then
+- echo "$as_me:4991: result: $MAKE_UPPER_TAGS" >&5
++ echo "$as_me:4992: result: $MAKE_UPPER_TAGS" >&5
+ echo "${ECHO_T}$MAKE_UPPER_TAGS" >&6
+ else
+- echo "$as_me:4994: result: no" >&5
++ echo "$as_me:4995: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+
+@@ -5011,7 +5012,7 @@
+ MAKE_LOWER_TAGS="#"
+ fi
+
+-echo "$as_me:5014: checking for makeflags variable" >&5
++echo "$as_me:5015: 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
+@@ -5041,7 +5042,7 @@
+ ;;
+ (*)
+
+-echo "${as_me:-configure}:5044: testing given option \"$cf_option\",no match \"$cf_result\" ..." 1>&5
++echo "${as_me:-configure}:5045: testing given option \"$cf_option\",no match \"$cf_result\" ..." 1>&5
+
+ ;;
+ esac
+@@ -5049,13 +5050,13 @@
+ rm -f cf_makeflags.tmp
+
+ fi
+-echo "$as_me:5052: result: $cf_cv_makeflags" >&5
++echo "$as_me:5053: 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:5058: checking for $ac_word" >&5
++echo "$as_me:5059: 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
+@@ -5070,7 +5071,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:5073: found $ac_dir/$ac_word" >&5
++echo "$as_me:5074: found $ac_dir/$ac_word" >&5
+ break
+ done
+
+@@ -5078,10 +5079,10 @@
+ fi
+ RANLIB=$ac_cv_prog_RANLIB
+ if test -n "$RANLIB"; then
+- echo "$as_me:5081: result: $RANLIB" >&5
++ echo "$as_me:5082: result: $RANLIB" >&5
+ echo "${ECHO_T}$RANLIB" >&6
+ else
+- echo "$as_me:5084: result: no" >&5
++ echo "$as_me:5085: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+
+@@ -5090,7 +5091,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:5093: checking for $ac_word" >&5
++echo "$as_me:5094: 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
+@@ -5105,7 +5106,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:5108: found $ac_dir/$ac_word" >&5
++echo "$as_me:5109: found $ac_dir/$ac_word" >&5
+ break
+ done
+
+@@ -5114,10 +5115,10 @@
+ fi
+ ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB
+ if test -n "$ac_ct_RANLIB"; then
+- echo "$as_me:5117: result: $ac_ct_RANLIB" >&5
++ echo "$as_me:5118: result: $ac_ct_RANLIB" >&5
+ echo "${ECHO_T}$ac_ct_RANLIB" >&6
+ else
+- echo "$as_me:5120: result: no" >&5
++ echo "$as_me:5121: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+
+@@ -5129,7 +5130,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:5132: checking for $ac_word" >&5
++echo "$as_me:5133: 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
+@@ -5144,7 +5145,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:5147: found $ac_dir/$ac_word" >&5
++echo "$as_me:5148: found $ac_dir/$ac_word" >&5
+ break
+ done
+
+@@ -5152,10 +5153,10 @@
+ fi
+ LD=$ac_cv_prog_LD
+ if test -n "$LD"; then
+- echo "$as_me:5155: result: $LD" >&5
++ echo "$as_me:5156: result: $LD" >&5
+ echo "${ECHO_T}$LD" >&6
+ else
+- echo "$as_me:5158: result: no" >&5
++ echo "$as_me:5159: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+
+@@ -5164,7 +5165,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:5167: checking for $ac_word" >&5
++echo "$as_me:5168: 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
+@@ -5179,7 +5180,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:5182: found $ac_dir/$ac_word" >&5
++echo "$as_me:5183: found $ac_dir/$ac_word" >&5
+ break
+ done
+
+@@ -5188,10 +5189,10 @@
+ fi
+ ac_ct_LD=$ac_cv_prog_ac_ct_LD
+ if test -n "$ac_ct_LD"; then
+- echo "$as_me:5191: result: $ac_ct_LD" >&5
++ echo "$as_me:5192: result: $ac_ct_LD" >&5
+ echo "${ECHO_T}$ac_ct_LD" >&6
+ else
+- echo "$as_me:5194: result: no" >&5
++ echo "$as_me:5195: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+
+@@ -5203,7 +5204,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:5206: checking for $ac_word" >&5
++echo "$as_me:5207: 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
+@@ -5218,7 +5219,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:5221: found $ac_dir/$ac_word" >&5
++echo "$as_me:5222: found $ac_dir/$ac_word" >&5
+ break
+ done
+
+@@ -5226,10 +5227,10 @@
+ fi
+ AR=$ac_cv_prog_AR
+ if test -n "$AR"; then
+- echo "$as_me:5229: result: $AR" >&5
++ echo "$as_me:5230: result: $AR" >&5
+ echo "${ECHO_T}$AR" >&6
+ else
+- echo "$as_me:5232: result: no" >&5
++ echo "$as_me:5233: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+
+@@ -5238,7 +5239,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:5241: checking for $ac_word" >&5
++echo "$as_me:5242: 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
+@@ -5253,7 +5254,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:5256: found $ac_dir/$ac_word" >&5
++echo "$as_me:5257: found $ac_dir/$ac_word" >&5
+ break
+ done
+
+@@ -5262,10 +5263,10 @@
+ fi
+ ac_ct_AR=$ac_cv_prog_ac_ct_AR
+ if test -n "$ac_ct_AR"; then
+- echo "$as_me:5265: result: $ac_ct_AR" >&5
++ echo "$as_me:5266: result: $ac_ct_AR" >&5
+ echo "${ECHO_T}$ac_ct_AR" >&6
+ else
+- echo "$as_me:5268: result: no" >&5
++ echo "$as_me:5269: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+
+@@ -5277,7 +5278,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:5280: checking for $ac_word" >&5
++echo "$as_me:5281: 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
+@@ -5292,7 +5293,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:5295: found $ac_dir/$ac_word" >&5
++echo "$as_me:5296: found $ac_dir/$ac_word" >&5
+ break
+ done
+
+@@ -5300,10 +5301,10 @@
+ fi
+ NM=$ac_cv_prog_NM
+ if test -n "$NM"; then
+- echo "$as_me:5303: result: $NM" >&5
++ echo "$as_me:5304: result: $NM" >&5
+ echo "${ECHO_T}$NM" >&6
+ else
+- echo "$as_me:5306: result: no" >&5
++ echo "$as_me:5307: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+
+@@ -5312,7 +5313,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:5315: checking for $ac_word" >&5
++echo "$as_me:5316: 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
+@@ -5327,7 +5328,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:5330: found $ac_dir/$ac_word" >&5
++echo "$as_me:5331: found $ac_dir/$ac_word" >&5
+ break
+ done
+
+@@ -5336,10 +5337,10 @@
+ fi
+ ac_ct_NM=$ac_cv_prog_ac_ct_NM
+ if test -n "$ac_ct_NM"; then
+- echo "$as_me:5339: result: $ac_ct_NM" >&5
++ echo "$as_me:5340: result: $ac_ct_NM" >&5
+ echo "${ECHO_T}$ac_ct_NM" >&6
+ else
+- echo "$as_me:5342: result: no" >&5
++ echo "$as_me:5343: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+
+@@ -5351,7 +5352,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:5354: checking for $ac_word" >&5
++echo "$as_me:5355: 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
+@@ -5366,7 +5367,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:5369: found $ac_dir/$ac_word" >&5
++echo "$as_me:5370: found $ac_dir/$ac_word" >&5
+ break
+ done
+
+@@ -5374,10 +5375,10 @@
+ fi
+ AR=$ac_cv_prog_AR
+ if test -n "$AR"; then
+- echo "$as_me:5377: result: $AR" >&5
++ echo "$as_me:5378: result: $AR" >&5
+ echo "${ECHO_T}$AR" >&6
+ else
+- echo "$as_me:5380: result: no" >&5
++ echo "$as_me:5381: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+
+@@ -5386,7 +5387,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:5389: checking for $ac_word" >&5
++echo "$as_me:5390: 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
+@@ -5401,7 +5402,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:5404: found $ac_dir/$ac_word" >&5
++echo "$as_me:5405: found $ac_dir/$ac_word" >&5
+ break
+ done
+
+@@ -5410,10 +5411,10 @@
+ fi
+ ac_ct_AR=$ac_cv_prog_ac_ct_AR
+ if test -n "$ac_ct_AR"; then
+- echo "$as_me:5413: result: $ac_ct_AR" >&5
++ echo "$as_me:5414: result: $ac_ct_AR" >&5
+ echo "${ECHO_T}$ac_ct_AR" >&6
+ else
+- echo "$as_me:5416: result: no" >&5
++ echo "$as_me:5417: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+
+@@ -5422,7 +5423,7 @@
+ AR="$ac_cv_prog_AR"
+ fi
+
+-echo "$as_me:5425: checking for options to update archives" >&5
++echo "$as_me:5426: 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
+@@ -5459,13 +5460,13 @@
+ rm -f conftest.a
+
+ cat >"conftest.$ac_ext" <<EOF
+-#line 5462 "configure"
++#line 5463 "configure"
+ int testdata[3] = { 123, 456, 789 };
+ EOF
+- if { (eval echo "$as_me:5465: \"$ac_compile\"") >&5
++ if { (eval echo "$as_me:5466: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:5468: \$? = $ac_status" >&5
++ echo "$as_me:5469: \$? = $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
+@@ -5476,7 +5477,7 @@
+ else
+ test -n "$verbose" && echo " cannot compile test-program" 1>&6
+
+-echo "${as_me:-configure}:5479: testing cannot compile test-program ..." 1>&5
++echo "${as_me:-configure}:5480: testing cannot compile test-program ..." 1>&5
+
+ break
+ fi
+@@ -5486,7 +5487,7 @@
+ esac
+
+ fi
+-echo "$as_me:5489: result: $cf_cv_ar_flags" >&5
++echo "$as_me:5490: result: $cf_cv_ar_flags" >&5
+ echo "${ECHO_T}$cf_cv_ar_flags" >&6
+
+ if test -n "$ARFLAGS" ; then
+@@ -5497,7 +5498,7 @@
+ ARFLAGS=$cf_cv_ar_flags
+ fi
+
+-echo "$as_me:5500: checking for an installation directory prefix" >&5
++echo "$as_me:5501: 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.
+@@ -5510,9 +5511,35 @@
+ ;;
+ esac
+ fi;
+-echo "$as_me:5513: result: ${DESTDIR:-(none)}" >&5
++echo "$as_me:5514: result: ${DESTDIR:-(none)}" >&5
+ echo "${ECHO_T}${DESTDIR:-(none)}" >&6
+
++echo "$as_me:5517: checking if installation directory prefix should be merged" >&5
++echo $ECHO_N "checking if installation directory prefix should be merged... $ECHO_C" >&6
++
++# Check whether --enable-install-prefix or --disable-install-prefix was given.
++if test "${enable_install_prefix+set}" = set; then
++ enableval="$enable_install_prefix"
++ test "$enableval" != yes && enableval=no
++ if test "$enableval" != "no" ; then
++ cf_install_prefix=yes
++ else
++ cf_install_prefix=no
++ fi
++else
++ enableval=no
++ cf_install_prefix=no
++
++fi;
++echo "$as_me:5534: result: $cf_install_prefix" >&5
++echo "${ECHO_T}$cf_install_prefix" >&6
++
++if test "$cf_install_prefix" = yes ; then
++ MERGE_PREFIX=':$(prefix)%=%'
++else
++ MERGE_PREFIX=''
++fi
++
+ ###############################################################################
+
+ # If we're cross-compiling, allow the user to override the tools and their
+@@ -5545,7 +5572,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:5548: checking for $ac_word" >&5
++echo "$as_me:5575: 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
+@@ -5560,7 +5587,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:5563: found $ac_dir/$ac_word" >&5
++echo "$as_me:5590: found $ac_dir/$ac_word" >&5
+ break
+ done
+
+@@ -5568,10 +5595,10 @@
+ fi
+ BUILD_CC=$ac_cv_prog_BUILD_CC
+ if test -n "$BUILD_CC"; then
+- echo "$as_me:5571: result: $BUILD_CC" >&5
++ echo "$as_me:5598: result: $BUILD_CC" >&5
+ echo "${ECHO_T}$BUILD_CC" >&6
+ else
+- echo "$as_me:5574: result: no" >&5
++ echo "$as_me:5601: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+
+@@ -5580,12 +5607,12 @@
+ test -n "$BUILD_CC" || BUILD_CC="none"
+
+ fi;
+- echo "$as_me:5583: checking for native build C compiler" >&5
++ echo "$as_me:5610: checking for native build C compiler" >&5
+ echo $ECHO_N "checking for native build C compiler... $ECHO_C" >&6
+- echo "$as_me:5585: result: $BUILD_CC" >&5
++ echo "$as_me:5612: result: $BUILD_CC" >&5
+ echo "${ECHO_T}$BUILD_CC" >&6
+
+- echo "$as_me:5588: checking for native build C preprocessor" >&5
++ echo "$as_me:5615: 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.
+@@ -5595,10 +5622,10 @@
+ else
+ BUILD_CPP='${BUILD_CC} -E'
+ fi;
+- echo "$as_me:5598: result: $BUILD_CPP" >&5
++ echo "$as_me:5625: result: $BUILD_CPP" >&5
+ echo "${ECHO_T}$BUILD_CPP" >&6
+
+- echo "$as_me:5601: checking for native build C flags" >&5
++ echo "$as_me:5628: 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.
+@@ -5606,10 +5633,10 @@
+ withval="$with_build_cflags"
+ BUILD_CFLAGS="$withval"
+ fi;
+- echo "$as_me:5609: result: $BUILD_CFLAGS" >&5
++ echo "$as_me:5636: result: $BUILD_CFLAGS" >&5
+ echo "${ECHO_T}$BUILD_CFLAGS" >&6
+
+- echo "$as_me:5612: checking for native build C preprocessor-flags" >&5
++ echo "$as_me:5639: 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.
+@@ -5617,10 +5644,10 @@
+ withval="$with_build_cppflags"
+ BUILD_CPPFLAGS="$withval"
+ fi;
+- echo "$as_me:5620: result: $BUILD_CPPFLAGS" >&5
++ echo "$as_me:5647: result: $BUILD_CPPFLAGS" >&5
+ echo "${ECHO_T}$BUILD_CPPFLAGS" >&6
+
+- echo "$as_me:5623: checking for native build linker-flags" >&5
++ echo "$as_me:5650: 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.
+@@ -5628,10 +5655,10 @@
+ withval="$with_build_ldflags"
+ BUILD_LDFLAGS="$withval"
+ fi;
+- echo "$as_me:5631: result: $BUILD_LDFLAGS" >&5
++ echo "$as_me:5658: result: $BUILD_LDFLAGS" >&5
+ echo "${ECHO_T}$BUILD_LDFLAGS" >&6
+
+- echo "$as_me:5634: checking for native build linker-libraries" >&5
++ echo "$as_me:5661: 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.
+@@ -5639,7 +5666,7 @@
+ withval="$with_build_libs"
+ BUILD_LIBS="$withval"
+ fi;
+- echo "$as_me:5642: result: $BUILD_LIBS" >&5
++ echo "$as_me:5669: result: $BUILD_LIBS" >&5
+ echo "${ECHO_T}$BUILD_LIBS" >&6
+
+ # this assumes we're on Unix.
+@@ -5648,7 +5675,7 @@
+
+ : ${BUILD_CC:='${CC}'}
+
+- echo "$as_me:5651: checking if the build-compiler \"$BUILD_CC\" works" >&5
++ echo "$as_me:5678: 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
+@@ -5662,7 +5689,7 @@
+ cf_ok_build_cc=unknown
+ else
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 5665 "configure"
++#line 5692 "configure"
+ #include "confdefs.h"
+ #include <stdio.h>
+ int main(int argc, char *argv[])
+@@ -5672,15 +5699,15 @@
+
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:5675: \"$ac_link\"") >&5
++if { (eval echo "$as_me:5702: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:5678: \$? = $ac_status" >&5
++ echo "$as_me:5705: \$? = $ac_status" >&5
+ (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+- { (eval echo "$as_me:5680: \"$ac_try\"") >&5
++ { (eval echo "$as_me:5707: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:5683: \$? = $ac_status" >&5
++ echo "$as_me:5710: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_ok_build_cc=yes
+ else
+@@ -5695,12 +5722,12 @@
+ cross_compiling=$cf_save_crossed
+ ac_link=$cf_save_ac_link
+
+- echo "$as_me:5698: result: $cf_ok_build_cc" >&5
++ echo "$as_me:5725: 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:5703: error: Cross-build requires two compilers.
++ { { echo "$as_me:5730: 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;}
+@@ -5725,7 +5752,7 @@
+ ### shared, for example.
+ cf_list_models=""
+
+-echo "$as_me:5728: checking if libtool -version-number should be used" >&5
++echo "$as_me:5755: 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.
+@@ -5742,7 +5769,7 @@
+ cf_libtool_version=yes
+
+ fi;
+-echo "$as_me:5745: result: $cf_libtool_version" >&5
++echo "$as_me:5772: result: $cf_libtool_version" >&5
+ echo "${ECHO_T}$cf_libtool_version" >&6
+
+ if test "$cf_libtool_version" = yes ; then
+@@ -5751,25 +5778,25 @@
+ LIBTOOL_VERSION="-version-info"
+ case "x$VERSION" in
+ (x)
+- { echo "$as_me:5754: WARNING: VERSION was not set" >&5
++ { echo "$as_me:5781: 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}:5761: testing ABI_VERSION: $ABI_VERSION ..." 1>&5
++echo "${as_me:-configure}:5788: 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}:5768: testing ABI_VERSION: $ABI_VERSION ..." 1>&5
++echo "${as_me:-configure}:5795: testing ABI_VERSION: $ABI_VERSION ..." 1>&5
+
+ ;;
+ (*)
+- { echo "$as_me:5772: WARNING: unexpected VERSION value: $VERSION" >&5
++ { echo "$as_me:5799: WARNING: unexpected VERSION value: $VERSION" >&5
+ echo "$as_me: WARNING: unexpected VERSION value: $VERSION" >&2;}
+ ;;
+ esac
+@@ -5791,7 +5818,7 @@
+ LIB_INSTALL=
+ LIB_UNINSTALL=
+
+-echo "$as_me:5794: checking if you want to build libraries with libtool" >&5
++echo "$as_me:5821: 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.
+@@ -5801,7 +5828,7 @@
+ else
+ with_libtool=no
+ fi;
+-echo "$as_me:5804: result: $with_libtool" >&5
++echo "$as_me:5831: result: $with_libtool" >&5
+ echo "${ECHO_T}$with_libtool" >&6
+ if test "$with_libtool" != "no"; then
+
+@@ -5830,7 +5857,7 @@
+ with_libtool=`echo "$with_libtool" | sed -e s%NONE%$cf_path_syntax%`
+ ;;
+ (*)
+- { { echo "$as_me:5833: error: expected a pathname, not \"$with_libtool\"" >&5
++ { { echo "$as_me:5860: error: expected a pathname, not \"$with_libtool\"" >&5
+ echo "$as_me: error: expected a pathname, not \"$with_libtool\"" >&2;}
+ { (exit 1); exit 1; }; }
+ ;;
+@@ -5843,7 +5870,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:5846: checking for $ac_word" >&5
++echo "$as_me:5873: 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
+@@ -5858,7 +5885,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:5861: found $ac_dir/$ac_word" >&5
++echo "$as_me:5888: found $ac_dir/$ac_word" >&5
+ break
+ done
+
+@@ -5866,10 +5893,10 @@
+ fi
+ LIBTOOL=$ac_cv_prog_LIBTOOL
+ if test -n "$LIBTOOL"; then
+- echo "$as_me:5869: result: $LIBTOOL" >&5
++ echo "$as_me:5896: result: $LIBTOOL" >&5
+ echo "${ECHO_T}$LIBTOOL" >&6
+ else
+- echo "$as_me:5872: result: no" >&5
++ echo "$as_me:5899: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+
+@@ -5882,7 +5909,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:5885: checking for $ac_word" >&5
++echo "$as_me:5912: 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
+@@ -5897,7 +5924,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:5900: found $ac_dir/$ac_word" >&5
++echo "$as_me:5927: found $ac_dir/$ac_word" >&5
+ break
+ done
+
+@@ -5905,10 +5932,10 @@
+ fi
+ ac_ct_LIBTOOL=$ac_cv_prog_ac_ct_LIBTOOL
+ if test -n "$ac_ct_LIBTOOL"; then
+- echo "$as_me:5908: result: $ac_ct_LIBTOOL" >&5
++ echo "$as_me:5935: result: $ac_ct_LIBTOOL" >&5
+ echo "${ECHO_T}$ac_ct_LIBTOOL" >&6
+ else
+- echo "$as_me:5911: result: no" >&5
++ echo "$as_me:5938: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+
+@@ -5939,7 +5966,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:5942: checking for $ac_word" >&5
++echo "$as_me:5969: 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
+@@ -5954,7 +5981,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:5957: found $ac_dir/$ac_word" >&5
++echo "$as_me:5984: found $ac_dir/$ac_word" >&5
+ break
+ done
+
+@@ -5962,10 +5989,10 @@
+ fi
+ LIBTOOL=$ac_cv_prog_LIBTOOL
+ if test -n "$LIBTOOL"; then
+- echo "$as_me:5965: result: $LIBTOOL" >&5
++ echo "$as_me:5992: result: $LIBTOOL" >&5
+ echo "${ECHO_T}$LIBTOOL" >&6
+ else
+- echo "$as_me:5968: result: no" >&5
++ echo "$as_me:5995: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+
+@@ -5978,7 +6005,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:5981: checking for $ac_word" >&5
++echo "$as_me:6008: 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
+@@ -5993,7 +6020,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:5996: found $ac_dir/$ac_word" >&5
++echo "$as_me:6023: found $ac_dir/$ac_word" >&5
+ break
+ done
+
+@@ -6001,10 +6028,10 @@
+ fi
+ ac_ct_LIBTOOL=$ac_cv_prog_ac_ct_LIBTOOL
+ if test -n "$ac_ct_LIBTOOL"; then
+- echo "$as_me:6004: result: $ac_ct_LIBTOOL" >&5
++ echo "$as_me:6031: result: $ac_ct_LIBTOOL" >&5
+ echo "${ECHO_T}$ac_ct_LIBTOOL" >&6
+ else
+- echo "$as_me:6007: result: no" >&5
++ echo "$as_me:6034: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+
+@@ -6026,7 +6053,7 @@
+ fi
+ fi
+ if test -z "$LIBTOOL" ; then
+- { { echo "$as_me:6029: error: Cannot find libtool" >&5
++ { { echo "$as_me:6056: error: Cannot find libtool" >&5
+ echo "$as_me: error: Cannot find libtool" >&2;}
+ { (exit 1); exit 1; }; }
+ fi
+@@ -6042,7 +6069,7 @@
+
+ if test -n "$LIBTOOL" && test "$LIBTOOL" != none
+ then
+- echo "$as_me:6045: checking version of $LIBTOOL" >&5
++ echo "$as_me:6072: checking version of $LIBTOOL" >&5
+ echo $ECHO_N "checking version of $LIBTOOL... $ECHO_C" >&6
+
+ if test -n "$LIBTOOL" && test "$LIBTOOL" != none
+@@ -6053,7 +6080,7 @@
+ fi
+ test -z "$cf_cv_libtool_version" && unset cf_cv_libtool_version
+
+- echo "$as_me:6056: result: $cf_cv_libtool_version" >&5
++ echo "$as_me:6083: result: $cf_cv_libtool_version" >&5
+ echo "${ECHO_T}$cf_cv_libtool_version" >&6
+
+ if test -n "$cf_cv_libtool_version"
+@@ -6063,19 +6090,19 @@
+ (*...GNU-libtool...*)
+ ;;
+ (*)
+- { { echo "$as_me:6066: error: This is not GNU libtool" >&5
++ { { echo "$as_me:6093: 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:6072: error: No version found for $LIBTOOL" >&5
++ { { echo "$as_me:6099: 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:6078: error: GNU libtool has not been found" >&5
++ { { echo "$as_me:6105: error: GNU libtool has not been found" >&5
+ echo "$as_me: error: GNU libtool has not been found" >&2;}
+ { (exit 1); exit 1; }; }
+ fi
+@@ -6111,7 +6138,7 @@
+
+ else
+
+-echo "$as_me:6114: checking if you want to build shared libraries" >&5
++echo "$as_me:6141: 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.
+@@ -6121,11 +6148,11 @@
+ else
+ with_shared=no
+ fi;
+-echo "$as_me:6124: result: $with_shared" >&5
++echo "$as_me:6151: 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:6128: checking if you want to build static libraries" >&5
++echo "$as_me:6155: 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.
+@@ -6135,11 +6162,11 @@
+ else
+ with_normal=yes
+ fi;
+-echo "$as_me:6138: result: $with_normal" >&5
++echo "$as_me:6165: 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:6142: checking if you want to build debug libraries" >&5
++echo "$as_me:6169: 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.
+@@ -6149,11 +6176,11 @@
+ else
+ with_debug=yes
+ fi;
+-echo "$as_me:6152: result: $with_debug" >&5
++echo "$as_me:6179: 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:6156: checking if you want to build profiling libraries" >&5
++echo "$as_me:6183: 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.
+@@ -6163,7 +6190,7 @@
+ else
+ with_profile=no
+ fi;
+-echo "$as_me:6166: result: $with_profile" >&5
++echo "$as_me:6193: result: $with_profile" >&5
+ echo "${ECHO_T}$with_profile" >&6
+ test "x$with_profile" = "xyes" && cf_list_models="$cf_list_models profile"
+
+@@ -6171,7 +6198,7 @@
+
+ if test "X$cf_with_cxx_binding" != Xno; then
+ if test "x$with_shared" = "xyes"; then
+-echo "$as_me:6174: checking if you want to build C++ shared libraries" >&5
++echo "$as_me:6201: 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.
+@@ -6181,26 +6208,26 @@
+ else
+ with_shared_cxx=no
+ fi;
+-echo "$as_me:6184: result: $with_shared_cxx" >&5
++echo "$as_me:6211: result: $with_shared_cxx" >&5
+ echo "${ECHO_T}$with_shared_cxx" >&6
+ fi
+ fi
+
+ ###############################################################################
+
+-echo "$as_me:6191: checking for specified models" >&5
++echo "$as_me:6218: 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:6195: result: $cf_list_models" >&5
++echo "$as_me:6222: 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:6200: checking for default model" >&5
++echo "$as_me:6227: 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:6203: result: $DFT_LWR_MODEL" >&5
++echo "$as_me:6230: result: $DFT_LWR_MODEL" >&5
+ echo "${ECHO_T}$DFT_LWR_MODEL" >&6
+
+ DFT_UPR_MODEL=`echo "$DFT_LWR_MODEL" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%`
+@@ -6214,7 +6241,7 @@
+ LIB_DIR=../lib
+ LIB_2ND=../../lib
+
+-echo "$as_me:6217: checking if you want to have a library-prefix" >&5
++echo "$as_me:6244: 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.
+@@ -6224,7 +6251,7 @@
+ else
+ with_lib_prefix=auto
+ fi;
+-echo "$as_me:6227: result: $with_lib_prefix" >&5
++echo "$as_me:6254: result: $with_lib_prefix" >&5
+ echo "${ECHO_T}$with_lib_prefix" >&6
+
+ if test "$with_lib_prefix" = auto
+@@ -6255,24 +6282,24 @@
+
+ LIB_SUFFIX=
+
+- echo "$as_me:6258: checking for PATH separator" >&5
++ echo "$as_me:6285: 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:6265: result: $PATH_SEPARATOR" >&5
++ echo "$as_me:6292: result: $PATH_SEPARATOR" >&5
+ echo "${ECHO_T}$PATH_SEPARATOR" >&6
+
+ # headers needed for checks...
+-echo "$as_me:6269: checking for ANSI C header files" >&5
++echo "$as_me:6296: 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 6275 "configure"
++#line 6302 "configure"
+ #include "confdefs.h"
+ #include <stdlib.h>
+ #include <stdarg.h>
+@@ -6280,13 +6307,13 @@
+ #include <float.h>
+
+ _ACEOF
+-if { (eval echo "$as_me:6283: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:6310: \"$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:6289: \$? = $ac_status" >&5
++ echo "$as_me:6316: \$? = $ac_status" >&5
+ (exit "$ac_status"); } >/dev/null; then
+ if test -s conftest.err; then
+ ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -6308,7 +6335,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 6311 "configure"
++#line 6338 "configure"
+ #include "confdefs.h"
+ #include <string.h>
+
+@@ -6326,7 +6353,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 6329 "configure"
++#line 6356 "configure"
+ #include "confdefs.h"
+ #include <stdlib.h>
+
+@@ -6347,7 +6374,7 @@
+ :
+ else
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 6350 "configure"
++#line 6377 "configure"
+ #include "confdefs.h"
+ #include <ctype.h>
+ #if ((' ' & 0x0FF) == 0x020)
+@@ -6373,15 +6400,15 @@
+ }
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:6376: \"$ac_link\"") >&5
++if { (eval echo "$as_me:6403: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:6379: \$? = $ac_status" >&5
++ echo "$as_me:6406: \$? = $ac_status" >&5
+ (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+- { (eval echo "$as_me:6381: \"$ac_try\"") >&5
++ { (eval echo "$as_me:6408: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:6384: \$? = $ac_status" >&5
++ echo "$as_me:6411: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ :
+ else
+@@ -6394,7 +6421,7 @@
+ fi
+ fi
+ fi
+-echo "$as_me:6397: result: $ac_cv_header_stdc" >&5
++echo "$as_me:6424: result: $ac_cv_header_stdc" >&5
+ echo "${ECHO_T}$ac_cv_header_stdc" >&6
+ if test $ac_cv_header_stdc = yes; then
+
+@@ -6410,28 +6437,28 @@
+ inttypes.h stdint.h unistd.h
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-echo "$as_me:6413: checking for $ac_header" >&5
++echo "$as_me:6440: 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 6419 "configure"
++#line 6446 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ #include <$ac_header>
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:6425: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:6452: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:6428: \$? = $ac_status" >&5
++ echo "$as_me:6455: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:6431: \"$ac_try\"") >&5
++ { (eval echo "$as_me:6458: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:6434: \$? = $ac_status" >&5
++ echo "$as_me:6461: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ eval "$as_ac_Header=yes"
+ else
+@@ -6441,7 +6468,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:6444: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
++echo "$as_me:6471: 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
+@@ -6451,13 +6478,13 @@
+ fi
+ done
+
+-echo "$as_me:6454: checking whether exit is declared" >&5
++echo "$as_me:6481: 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 6460 "configure"
++#line 6487 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -6472,16 +6499,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:6475: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:6502: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:6478: \$? = $ac_status" >&5
++ echo "$as_me:6505: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:6481: \"$ac_try\"") >&5
++ { (eval echo "$as_me:6508: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:6484: \$? = $ac_status" >&5
++ echo "$as_me:6511: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_have_decl_exit=yes
+ else
+@@ -6491,19 +6518,19 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:6494: result: $ac_cv_have_decl_exit" >&5
++echo "$as_me:6521: 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:6500: checking for $ac_hdr that defines DIR" >&5
++echo "$as_me:6527: 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 6506 "configure"
++#line 6533 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ #include <$ac_hdr>
+@@ -6518,16 +6545,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:6521: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:6548: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:6524: \$? = $ac_status" >&5
++ echo "$as_me:6551: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:6527: \"$ac_try\"") >&5
++ { (eval echo "$as_me:6554: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:6530: \$? = $ac_status" >&5
++ echo "$as_me:6557: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ eval "$as_ac_Header=yes"
+ else
+@@ -6537,7 +6564,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:6540: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
++echo "$as_me:6567: 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
+@@ -6550,7 +6577,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:6553: checking for opendir in -ldir" >&5
++ echo "$as_me:6580: 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
+@@ -6558,7 +6585,7 @@
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-ldir $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 6561 "configure"
++#line 6588 "configure"
+ #include "confdefs.h"
+
+ /* Override any gcc2 internal prototype to avoid an error. */
+@@ -6577,16 +6604,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:6580: \"$ac_link\"") >&5
++if { (eval echo "$as_me:6607: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:6583: \$? = $ac_status" >&5
++ echo "$as_me:6610: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:6586: \"$ac_try\"") >&5
++ { (eval echo "$as_me:6613: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:6589: \$? = $ac_status" >&5
++ echo "$as_me:6616: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_lib_dir_opendir=yes
+ else
+@@ -6597,14 +6624,14 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:6600: result: $ac_cv_lib_dir_opendir" >&5
++echo "$as_me:6627: 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:6607: checking for opendir in -lx" >&5
++ echo "$as_me:6634: 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
+@@ -6612,7 +6639,7 @@
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lx $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 6615 "configure"
++#line 6642 "configure"
+ #include "confdefs.h"
+
+ /* Override any gcc2 internal prototype to avoid an error. */
+@@ -6631,16 +6658,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:6634: \"$ac_link\"") >&5
++if { (eval echo "$as_me:6661: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:6637: \$? = $ac_status" >&5
++ echo "$as_me:6664: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:6640: \"$ac_try\"") >&5
++ { (eval echo "$as_me:6667: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:6643: \$? = $ac_status" >&5
++ echo "$as_me:6670: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_lib_x_opendir=yes
+ else
+@@ -6651,7 +6678,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:6654: result: $ac_cv_lib_x_opendir" >&5
++echo "$as_me:6681: 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"
+@@ -6661,7 +6688,7 @@
+
+ ###############################################################################
+
+-echo "$as_me:6664: checking if you want to build a separate terminfo library" >&5
++echo "$as_me:6691: 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.
+@@ -6671,10 +6698,10 @@
+ else
+ with_termlib=no
+ fi;
+-echo "$as_me:6674: result: $with_termlib" >&5
++echo "$as_me:6701: result: $with_termlib" >&5
+ echo "${ECHO_T}$with_termlib" >&6
+
+-echo "$as_me:6677: checking if you want to build a separate tic library" >&5
++echo "$as_me:6704: 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.
+@@ -6684,7 +6711,7 @@
+ else
+ with_ticlib=no
+ fi;
+-echo "$as_me:6687: result: $with_ticlib" >&5
++echo "$as_me:6714: result: $with_ticlib" >&5
+ echo "${ECHO_T}$with_ticlib" >&6
+
+ if test X"$CC_G_OPT" = X"" ; then
+@@ -6697,7 +6724,7 @@
+ test -n "$GXX" && test "x${ac_cv_prog_cxx_g}" != xyes && CXX_G_OPT=''
+ fi
+
+-echo "$as_me:6700: checking for default loader flags" >&5
++echo "$as_me:6727: 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='' ;;
+@@ -6706,13 +6733,13 @@
+ (profile) LD_MODEL='-pg';;
+ (shared) LD_MODEL='' ;;
+ esac
+-echo "$as_me:6709: result: ${LD_MODEL:-(none)}" >&5
++echo "$as_me:6736: result: ${LD_MODEL:-(none)}" >&5
+ echo "${ECHO_T}${LD_MODEL:-(none)}" >&6
+
+ case "$DFT_LWR_MODEL" in
+ (shared)
+
+-echo "$as_me:6715: checking if rpath option should be used" >&5
++echo "$as_me:6742: 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.
+@@ -6722,10 +6749,10 @@
+ else
+ cf_cv_enable_rpath=no
+ fi;
+-echo "$as_me:6725: result: $cf_cv_enable_rpath" >&5
++echo "$as_me:6752: result: $cf_cv_enable_rpath" >&5
+ echo "${ECHO_T}$cf_cv_enable_rpath" >&6
+
+-echo "$as_me:6728: checking if shared libraries should be relinked during install" >&5
++echo "$as_me:6755: 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.
+@@ -6735,7 +6762,7 @@
+ else
+ cf_cv_do_relink=yes
+ fi;
+-echo "$as_me:6738: result: $cf_cv_do_relink" >&5
++echo "$as_me:6765: result: $cf_cv_do_relink" >&5
+ echo "${ECHO_T}$cf_cv_do_relink" >&6
+ ;;
+ esac
+@@ -6746,7 +6773,7 @@
+ LD_RPATH_OPT=
+ if test "x$cf_cv_enable_rpath" != xno
+ then
+- echo "$as_me:6749: checking for an rpath option" >&5
++ echo "$as_me:6776: checking for an rpath option" >&5
+ echo $ECHO_N "checking for an rpath option... $ECHO_C" >&6
+ case "$cf_cv_system_name" in
+ (irix*)
+@@ -6777,12 +6804,12 @@
+ (*)
+ ;;
+ esac
+- echo "$as_me:6780: result: $LD_RPATH_OPT" >&5
++ echo "$as_me:6807: result: $LD_RPATH_OPT" >&5
+ echo "${ECHO_T}$LD_RPATH_OPT" >&6
+
+ case "x$LD_RPATH_OPT" in
+ (x-R*)
+- echo "$as_me:6785: checking if we need a space after rpath option" >&5
++ echo "$as_me:6812: 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"
+
+@@ -6803,7 +6830,7 @@
+ LIBS="$cf_add_libs"
+
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 6806 "configure"
++#line 6833 "configure"
+ #include "confdefs.h"
+
+ int
+@@ -6815,16 +6842,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:6818: \"$ac_link\"") >&5
++if { (eval echo "$as_me:6845: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:6821: \$? = $ac_status" >&5
++ echo "$as_me:6848: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:6824: \"$ac_try\"") >&5
++ { (eval echo "$as_me:6851: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:6827: \$? = $ac_status" >&5
++ echo "$as_me:6854: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_rpath_space=no
+ else
+@@ -6834,7 +6861,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS="$cf_save_LIBS"
+- echo "$as_me:6837: result: $cf_rpath_space" >&5
++ echo "$as_me:6864: result: $cf_rpath_space" >&5
+ echo "${ECHO_T}$cf_rpath_space" >&6
+ test "$cf_rpath_space" = yes && LD_RPATH_OPT="$LD_RPATH_OPT "
+ ;;
+@@ -6856,7 +6883,7 @@
+ cf_ld_rpath_opt=
+ test "$cf_cv_enable_rpath" = yes && cf_ld_rpath_opt="$LD_RPATH_OPT"
+
+- echo "$as_me:6859: checking whether to use release or ABI version in shared library file names" >&5
++ echo "$as_me:6886: 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.
+@@ -6871,9 +6898,9 @@
+ cf_cv_shlib_version=$withval
+ ;;
+ (*)
+- echo "$as_me:6874: result: $withval" >&5
++ echo "$as_me:6901: result: $withval" >&5
+ echo "${ECHO_T}$withval" >&6
+- { { echo "$as_me:6876: error: option value must be one of: rel, abi, or auto" >&5
++ { { echo "$as_me:6903: 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; }; }
+ ;;
+@@ -6882,7 +6909,7 @@
+ else
+ cf_cv_shlib_version=auto
+ fi;
+- echo "$as_me:6885: result: $cf_cv_shlib_version" >&5
++ echo "$as_me:6912: result: $cf_cv_shlib_version" >&5
+ echo "${ECHO_T}$cf_cv_shlib_version" >&6
+
+ cf_cv_rm_so_locs=no
+@@ -6905,14 +6932,14 @@
+
+ if test "$cf_try_fPIC" = yes
+ then
+- echo "$as_me:6908: checking which $CC option to use" >&5
++ echo "$as_me:6935: 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 6915 "configure"
++#line 6942 "configure"
+ #include "confdefs.h"
+ #include <stdio.h>
+ int
+@@ -6924,16 +6951,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:6927: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:6954: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:6930: \$? = $ac_status" >&5
++ echo "$as_me:6957: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:6933: \"$ac_try\"") >&5
++ { (eval echo "$as_me:6960: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:6936: \$? = $ac_status" >&5
++ echo "$as_me:6963: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ break
+ else
+@@ -6942,7 +6969,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ done
+- echo "$as_me:6945: result: $CC_SHARED_OPTS" >&5
++ echo "$as_me:6972: result: $CC_SHARED_OPTS" >&5
+ echo "${ECHO_T}$CC_SHARED_OPTS" >&6
+ CFLAGS="$cf_save_CFLAGS"
+ fi
+@@ -7013,7 +7040,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:7016: checking if ld -search_paths_first works" >&5
++ echo "$as_me:7043: 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
+@@ -7022,7 +7049,7 @@
+ cf_save_LDFLAGS=$LDFLAGS
+ LDFLAGS="$LDFLAGS -Wl,-search_paths_first"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 7025 "configure"
++#line 7052 "configure"
+ #include "confdefs.h"
+
+ int
+@@ -7034,16 +7061,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:7037: \"$ac_link\"") >&5
++if { (eval echo "$as_me:7064: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:7040: \$? = $ac_status" >&5
++ echo "$as_me:7067: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:7043: \"$ac_try\"") >&5
++ { (eval echo "$as_me:7070: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:7046: \$? = $ac_status" >&5
++ echo "$as_me:7073: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_ldflags_search_paths_first=yes
+ else
+@@ -7054,7 +7081,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LDFLAGS=$cf_save_LDFLAGS
+ fi
+-echo "$as_me:7057: result: $cf_cv_ldflags_search_paths_first" >&5
++echo "$as_me:7084: 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"
+@@ -7404,7 +7431,7 @@
+ do
+ CFLAGS="$cf_shared_opts $cf_save_CFLAGS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 7407 "configure"
++#line 7434 "configure"
+ #include "confdefs.h"
+ #include <stdio.h>
+ int
+@@ -7416,16 +7443,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:7419: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:7446: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:7422: \$? = $ac_status" >&5
++ echo "$as_me:7449: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:7425: \"$ac_try\"") >&5
++ { (eval echo "$as_me:7452: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:7428: \$? = $ac_status" >&5
++ echo "$as_me:7455: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ break
+ else
+@@ -7462,7 +7489,7 @@
+ test "$cf_cv_do_symlinks" = no && cf_cv_do_symlinks=yes
+ ;;
+ (*)
+- { echo "$as_me:7465: WARNING: ignored --with-shlib-version" >&5
++ { echo "$as_me:7492: WARNING: ignored --with-shlib-version" >&5
+ echo "$as_me: WARNING: ignored --with-shlib-version" >&2;}
+ ;;
+ esac
+@@ -7472,7 +7499,7 @@
+ if test -n "$cf_try_cflags"
+ then
+ cat > conftest.$ac_ext <<EOF
+-#line 7475 "${as_me:-configure}"
++#line 7502 "${as_me:-configure}"
+ #include <stdio.h>
+ int main(int argc, char *argv[])
+ {
+@@ -7484,18 +7511,18 @@
+ for cf_opt in $cf_try_cflags
+ do
+ CFLAGS="$cf_save_CFLAGS -$cf_opt"
+- echo "$as_me:7487: checking if CFLAGS option -$cf_opt works" >&5
++ echo "$as_me:7514: 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:7489: \"$ac_compile\"") >&5
++ if { (eval echo "$as_me:7516: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:7492: \$? = $ac_status" >&5
++ echo "$as_me:7519: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; then
+- echo "$as_me:7494: result: yes" >&5
++ echo "$as_me:7521: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ cf_save_CFLAGS="$CFLAGS"
+ else
+- echo "$as_me:7498: result: no" >&5
++ echo "$as_me:7525: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ done
+@@ -7510,17 +7537,17 @@
+
+ test -n "$verbose" && echo " CC_SHARED_OPTS: $CC_SHARED_OPTS" 1>&6
+
+-echo "${as_me:-configure}:7513: testing CC_SHARED_OPTS: $CC_SHARED_OPTS ..." 1>&5
++echo "${as_me:-configure}:7540: 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}:7517: testing MK_SHARED_LIB: $MK_SHARED_LIB ..." 1>&5
++echo "${as_me:-configure}:7544: testing MK_SHARED_LIB: $MK_SHARED_LIB ..." 1>&5
+
+ for model in $cf_list_models ; do
+ case "$model" in
+ (libtool)
+
+-echo "$as_me:7523: checking for additional libtool options" >&5
++echo "$as_me:7550: 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.
+@@ -7530,7 +7557,7 @@
+ else
+ with_libtool_opts=no
+ fi;
+-echo "$as_me:7533: result: $with_libtool_opts" >&5
++echo "$as_me:7560: result: $with_libtool_opts" >&5
+ echo "${ECHO_T}$with_libtool_opts" >&6
+
+ case .$with_libtool_opts in
+@@ -7541,7 +7568,7 @@
+ ;;
+ esac
+
+-echo "$as_me:7544: checking if exported-symbols file should be used" >&5
++echo "$as_me:7571: 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.
+@@ -7556,7 +7583,7 @@
+ with_export_syms='${top_srcdir}/package/${PACKAGE}.sym'
+
+ fi
+-echo "$as_me:7559: result: $with_export_syms" >&5
++echo "$as_me:7586: result: $with_export_syms" >&5
+ echo "${ECHO_T}$with_export_syms" >&6
+ if test "x$with_export_syms" != xno
+ then
+@@ -7567,15 +7594,15 @@
+ ;;
+ (shared)
+ if test "$CC_SHARED_OPTS" = "unknown"; then
+- { { echo "$as_me:7570: error: Shared libraries are not supported in this version" >&5
++ { { echo "$as_me:7597: 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:7575: checking if current CFLAGS link properly" >&5
++ echo "$as_me:7602: 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 7578 "configure"
++#line 7605 "configure"
+ #include "confdefs.h"
+ #include <stdio.h>
+ int
+@@ -7587,16 +7614,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:7590: \"$ac_link\"") >&5
++if { (eval echo "$as_me:7617: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:7593: \$? = $ac_status" >&5
++ echo "$as_me:7620: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:7596: \"$ac_try\"") >&5
++ { (eval echo "$as_me:7623: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:7599: \$? = $ac_status" >&5
++ echo "$as_me:7626: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cflags_work=yes
+ else
+@@ -7605,18 +7632,18 @@
+ cf_cflags_work=no
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+- echo "$as_me:7608: result: $cf_cflags_work" >&5
++ echo "$as_me:7635: 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}:7614: testing try to work around by appending shared-options ..." 1>&5
++echo "${as_me:-configure}:7641: testing try to work around by appending shared-options ..." 1>&5
+
+ CFLAGS="$CFLAGS $CC_SHARED_OPTS"
+ fi
+
+-echo "$as_me:7619: checking if versioned-symbols file should be used" >&5
++echo "$as_me:7646: 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.
+@@ -7634,18 +7661,18 @@
+ (xno)
+ ;;
+ (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
++ test -f "$with_versioned_syms" || { { echo "$as_me:7664: 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:7642: error: expected a filename: $with_versioned_syms" >&5
++ test -f "$with_versioned_syms" || { { echo "$as_me:7669: 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:7648: result: $with_versioned_syms" >&5
++echo "$as_me:7675: result: $with_versioned_syms" >&5
+ echo "${ECHO_T}$with_versioned_syms" >&6
+
+ RESULTING_SYMS=
+@@ -7661,7 +7688,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}:7664: testing MK_SHARED_LIB: $MK_SHARED_LIB ..." 1>&5
++echo "${as_me:-configure}:7691: testing MK_SHARED_LIB: $MK_SHARED_LIB ..." 1>&5
+
+ ;;
+ (*-dy\ *)
+@@ -7669,11 +7696,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}:7672: testing MK_SHARED_LIB: $MK_SHARED_LIB ..." 1>&5
++echo "${as_me:-configure}:7699: testing MK_SHARED_LIB: $MK_SHARED_LIB ..." 1>&5
+
+ ;;
+ (*)
+- { echo "$as_me:7676: WARNING: this system does not support versioned-symbols" >&5
++ { echo "$as_me:7703: WARNING: this system does not support versioned-symbols" >&5
+ echo "$as_me: WARNING: this system does not support versioned-symbols" >&2;}
+ ;;
+ esac
+@@ -7685,7 +7712,7 @@
+ # symbols.
+ if test "x$VERSIONED_SYMS" != "x"
+ then
+- echo "$as_me:7688: checking if wildcards can be used to selectively omit symbols" >&5
++ echo "$as_me:7715: 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
+
+@@ -7722,7 +7749,7 @@
+ } submodule_1.0;
+ EOF
+ cat >conftest.$ac_ext <<EOF
+-#line 7725 "configure"
++#line 7752 "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; }
+@@ -7753,7 +7780,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:7756: result: $WILDCARD_SYMS" >&5
++ echo "$as_me:7783: result: $WILDCARD_SYMS" >&5
+ echo "${ECHO_T}$WILDCARD_SYMS" >&6
+ rm -f conftest.*
+ fi
+@@ -7766,7 +7793,7 @@
+ ### Checks for special libraries, must be done up-front.
+ SHLIB_LIST=""
+
+-echo "$as_me:7769: checking if you want to link with the GPM mouse library" >&5
++echo "$as_me:7796: 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.
+@@ -7776,27 +7803,27 @@
+ else
+ with_gpm=maybe
+ fi;
+-echo "$as_me:7779: result: $with_gpm" >&5
++echo "$as_me:7806: result: $with_gpm" >&5
+ echo "${ECHO_T}$with_gpm" >&6
+
+ if test "$with_gpm" != no ; then
+- echo "$as_me:7783: checking for gpm.h" >&5
++ echo "$as_me:7810: 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 7789 "configure"
++#line 7816 "configure"
+ #include "confdefs.h"
+ #include <gpm.h>
+ _ACEOF
+-if { (eval echo "$as_me:7793: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:7820: \"$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:7799: \$? = $ac_status" >&5
++ echo "$as_me:7826: \$? = $ac_status" >&5
+ (exit "$ac_status"); } >/dev/null; then
+ if test -s conftest.err; then
+ ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -7815,7 +7842,7 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:7818: result: $ac_cv_header_gpm_h" >&5
++echo "$as_me:7845: 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
+
+@@ -7826,7 +7853,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}:7829: testing assuming we really have GPM library ..." 1>&5
++echo "${as_me:-configure}:7856: testing assuming we really have GPM library ..." 1>&5
+
+ cat >>confdefs.h <<\EOF
+ #define HAVE_LIBGPM 1
+@@ -7834,7 +7861,7 @@
+
+ with_gpm=yes
+ else
+- echo "$as_me:7837: checking for Gpm_Open in -lgpm" >&5
++ echo "$as_me:7864: 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
+@@ -7842,7 +7869,7 @@
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lgpm $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 7845 "configure"
++#line 7872 "configure"
+ #include "confdefs.h"
+
+ /* Override any gcc2 internal prototype to avoid an error. */
+@@ -7861,16 +7888,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:7864: \"$ac_link\"") >&5
++if { (eval echo "$as_me:7891: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:7867: \$? = $ac_status" >&5
++ echo "$as_me:7894: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:7870: \"$ac_try\"") >&5
++ { (eval echo "$as_me:7897: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:7873: \$? = $ac_status" >&5
++ echo "$as_me:7900: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_lib_gpm_Gpm_Open=yes
+ else
+@@ -7881,18 +7908,18 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:7884: result: $ac_cv_lib_gpm_Gpm_Open" >&5
++echo "$as_me:7911: 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:7891: WARNING: Cannot link with GPM library" >&5
++ { echo "$as_me:7918: WARNING: Cannot link with GPM library" >&5
+ echo "$as_me: WARNING: Cannot link with GPM library" >&2;}
+ with_gpm=no
+ else
+- { { echo "$as_me:7895: error: Cannot link with GPM library" >&5
++ { { echo "$as_me:7922: error: Cannot link with GPM library" >&5
+ echo "$as_me: error: Cannot link with GPM library" >&2;}
+ { (exit 1); exit 1; }; }
+ fi
+@@ -7903,7 +7930,7 @@
+
+ else
+
+- test "$with_gpm" != maybe && { echo "$as_me:7906: WARNING: Cannot find GPM header" >&5
++ test "$with_gpm" != maybe && { echo "$as_me:7933: WARNING: Cannot find GPM header" >&5
+ echo "$as_me: WARNING: Cannot find GPM header" >&2;}
+ with_gpm=no
+
+@@ -7912,7 +7939,7 @@
+ fi
+
+ if test "$with_gpm" != no ; then
+- echo "$as_me:7915: checking if you want to load GPM dynamically" >&5
++ echo "$as_me:7942: 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.
+@@ -7922,18 +7949,18 @@
+ else
+ with_dlsym=yes
+ fi;
+- echo "$as_me:7925: result: $with_dlsym" >&5
++ echo "$as_me:7952: result: $with_dlsym" >&5
+ echo "${ECHO_T}$with_dlsym" >&6
+ if test "x$with_dlsym" = xyes ; then
+
+ cf_have_dlsym=no
+-echo "$as_me:7930: checking for dlsym" >&5
++echo "$as_me:7957: 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 7936 "configure"
++#line 7963 "configure"
+ #include "confdefs.h"
+ #define dlsym autoconf_temporary
+ #include <limits.h> /* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -7964,16 +7991,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:7967: \"$ac_link\"") >&5
++if { (eval echo "$as_me:7994: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:7970: \$? = $ac_status" >&5
++ echo "$as_me:7997: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:7973: \"$ac_try\"") >&5
++ { (eval echo "$as_me:8000: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:7976: \$? = $ac_status" >&5
++ echo "$as_me:8003: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_func_dlsym=yes
+ else
+@@ -7983,14 +8010,14 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:7986: result: $ac_cv_func_dlsym" >&5
++echo "$as_me:8013: 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:7993: checking for dlsym in -ldl" >&5
++echo "$as_me:8020: 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
+@@ -7998,7 +8025,7 @@
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-ldl $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 8001 "configure"
++#line 8028 "configure"
+ #include "confdefs.h"
+
+ /* Override any gcc2 internal prototype to avoid an error. */
+@@ -8017,16 +8044,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:8020: \"$ac_link\"") >&5
++if { (eval echo "$as_me:8047: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:8023: \$? = $ac_status" >&5
++ echo "$as_me:8050: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:8026: \"$ac_try\"") >&5
++ { (eval echo "$as_me:8053: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:8029: \$? = $ac_status" >&5
++ echo "$as_me:8056: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_lib_dl_dlsym=yes
+ else
+@@ -8037,7 +8064,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:8040: result: $ac_cv_lib_dl_dlsym" >&5
++echo "$as_me:8067: 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
+
+@@ -8066,10 +8093,10 @@
+ LIBS="$cf_add_libs"
+ }
+
+- echo "$as_me:8069: checking whether able to link to dl*() functions" >&5
++ echo "$as_me:8096: 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 8072 "configure"
++#line 8099 "configure"
+ #include "confdefs.h"
+ #include <dlfcn.h>
+ int
+@@ -8087,16 +8114,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:8090: \"$ac_link\"") >&5
++if { (eval echo "$as_me:8117: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:8093: \$? = $ac_status" >&5
++ echo "$as_me:8120: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:8096: \"$ac_try\"") >&5
++ { (eval echo "$as_me:8123: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:8099: \$? = $ac_status" >&5
++ echo "$as_me:8126: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+
+ cat >>confdefs.h <<\EOF
+@@ -8107,15 +8134,15 @@
+ echo "$as_me: failed program was:" >&5
+ cat "conftest.$ac_ext" >&5
+
+- { { echo "$as_me:8110: error: Cannot link test program for libdl" >&5
++ { { echo "$as_me:8137: 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:8115: result: ok" >&5
++ echo "$as_me:8142: result: ok" >&5
+ echo "${ECHO_T}ok" >&6
+ else
+- { { echo "$as_me:8118: error: Cannot find dlsym function" >&5
++ { { echo "$as_me:8145: error: Cannot find dlsym function" >&5
+ echo "$as_me: error: Cannot find dlsym function" >&2;}
+ { (exit 1); exit 1; }; }
+ fi
+@@ -8123,12 +8150,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}:8126: testing assuming soname for gpm is $with_gpm ..." 1>&5
++echo "${as_me:-configure}:8153: testing assuming soname for gpm is $with_gpm ..." 1>&5
+
+ cf_cv_gpm_soname="$with_gpm"
+ else
+
+-echo "$as_me:8131: checking for soname of gpm library" >&5
++echo "$as_me:8158: 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
+@@ -8162,15 +8189,15 @@
+ done
+ LIBS="$cf_add_libs"
+
+- if { (eval echo "$as_me:8165: \"$ac_compile\"") >&5
++ if { (eval echo "$as_me:8192: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:8168: \$? = $ac_status" >&5
++ echo "$as_me:8195: \$? = $ac_status" >&5
+ (exit "$ac_status"); } ; then
+- if { (eval echo "$as_me:8170: \"$ac_link\"") >&5
++ if { (eval echo "$as_me:8197: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:8173: \$? = $ac_status" >&5
++ echo "$as_me:8200: \$? = $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
+@@ -8181,7 +8208,7 @@
+ fi
+
+ fi
+-echo "$as_me:8184: result: $cf_cv_gpm_soname" >&5
++echo "$as_me:8211: result: $cf_cv_gpm_soname" >&5
+ echo "${ECHO_T}$cf_cv_gpm_soname" >&6
+
+ fi
+@@ -8249,7 +8276,7 @@
+ #define HAVE_LIBGPM 1
+ EOF
+
+-echo "$as_me:8252: checking for Gpm_Wgetch in -lgpm" >&5
++echo "$as_me:8279: 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
+@@ -8257,7 +8284,7 @@
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lgpm $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 8260 "configure"
++#line 8287 "configure"
+ #include "confdefs.h"
+
+ /* Override any gcc2 internal prototype to avoid an error. */
+@@ -8276,16 +8303,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:8279: \"$ac_link\"") >&5
++if { (eval echo "$as_me:8306: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:8282: \$? = $ac_status" >&5
++ echo "$as_me:8309: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:8285: \"$ac_try\"") >&5
++ { (eval echo "$as_me:8312: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:8288: \$? = $ac_status" >&5
++ echo "$as_me:8315: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_lib_gpm_Gpm_Wgetch=yes
+ else
+@@ -8296,11 +8323,11 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:8299: result: $ac_cv_lib_gpm_Gpm_Wgetch" >&5
++echo "$as_me:8326: 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:8303: checking if GPM is weakly bound to curses library" >&5
++echo "$as_me:8330: 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
+@@ -8324,15 +8351,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:8327: \"$ac_compile\"") >&5
++ if { (eval echo "$as_me:8354: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:8330: \$? = $ac_status" >&5
++ echo "$as_me:8357: \$? = $ac_status" >&5
+ (exit "$ac_status"); } ; then
+- if { (eval echo "$as_me:8332: \"$ac_link\"") >&5
++ if { (eval echo "$as_me:8359: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:8335: \$? = $ac_status" >&5
++ echo "$as_me:8362: \$? = $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
+@@ -8344,11 +8371,11 @@
+ fi
+
+ fi
+-echo "$as_me:8347: result: $cf_cv_check_gpm_wgetch" >&5
++echo "$as_me:8374: 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:8351: WARNING: GPM library is already linked with curses - read the FAQ" >&5
++ { echo "$as_me:8378: 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
+
+@@ -8356,7 +8383,7 @@
+
+ fi
+
+-echo "$as_me:8359: checking if you want to use PCRE2 for regular-expressions" >&5
++echo "$as_me:8386: 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.
+@@ -8365,7 +8392,7 @@
+
+ fi;
+ test -z "$with_pcre2" && with_pcre2=no
+-echo "$as_me:8368: result: $with_pcre2" >&5
++echo "$as_me:8395: result: $with_pcre2" >&5
+ echo "${ECHO_T}$with_pcre2" >&6
+
+ if test "x$with_pcre2" != xno ; then
+@@ -8376,17 +8403,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}:8379: testing found package $cf_with_pcre2 ..." 1>&5
++echo "${as_me:-configure}:8406: 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}:8385: testing package $cf_with_pcre2 CFLAGS: $cf_pkgconfig_incs ..." 1>&5
++echo "${as_me:-configure}:8412: 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}:8389: testing package $cf_with_pcre2 LIBS: $cf_pkgconfig_libs ..." 1>&5
++echo "${as_me:-configure}:8416: testing package $cf_with_pcre2 LIBS: $cf_pkgconfig_libs ..." 1>&5
+
+ cf_fix_cppflags=no
+ cf_new_cflags=
+@@ -8510,7 +8537,7 @@
+ fi
+
+ done
+- cf_with_pcre2_ok=yes || { { echo "$as_me:8513: error: Cannot find PCRE2 library" >&5
++ cf_with_pcre2_ok=yes || { { echo "$as_me:8540: error: Cannot find PCRE2 library" >&5
+ echo "$as_me: error: Cannot find PCRE2 library" >&2;}
+ { (exit 1); exit 1; }; }
+
+@@ -8523,7 +8550,7 @@
+ (*pcre2-posix*|*pcreposix*)
+ ;;
+ (*)
+- echo "$as_me:8526: checking for regcomp in -lpcre2-posix" >&5
++ echo "$as_me:8553: 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
+@@ -8531,7 +8558,7 @@
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lpcre2-posix $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 8534 "configure"
++#line 8561 "configure"
+ #include "confdefs.h"
+
+ /* Override any gcc2 internal prototype to avoid an error. */
+@@ -8550,16 +8577,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:8553: \"$ac_link\"") >&5
++if { (eval echo "$as_me:8580: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:8556: \$? = $ac_status" >&5
++ echo "$as_me:8583: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:8559: \"$ac_try\"") >&5
++ { (eval echo "$as_me:8586: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:8562: \$? = $ac_status" >&5
++ echo "$as_me:8589: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_lib_pcre2_posix_regcomp=yes
+ else
+@@ -8570,7 +8597,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:8573: result: $ac_cv_lib_pcre2_posix_regcomp" >&5
++echo "$as_me:8600: 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
+
+@@ -8591,7 +8618,7 @@
+ LIBS="$cf_add_libs"
+
+ else
+- echo "$as_me:8594: checking for regcomp in -lpcreposix" >&5
++ echo "$as_me:8621: 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
+@@ -8599,7 +8626,7 @@
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lpcreposix $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 8602 "configure"
++#line 8629 "configure"
+ #include "confdefs.h"
+
+ /* Override any gcc2 internal prototype to avoid an error. */
+@@ -8618,16 +8645,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:8621: \"$ac_link\"") >&5
++if { (eval echo "$as_me:8648: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:8624: \$? = $ac_status" >&5
++ echo "$as_me:8651: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:8627: \"$ac_try\"") >&5
++ { (eval echo "$as_me:8654: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:8630: \$? = $ac_status" >&5
++ echo "$as_me:8657: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_lib_pcreposix_regcomp=yes
+ else
+@@ -8638,7 +8665,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:8641: result: $ac_cv_lib_pcreposix_regcomp" >&5
++echo "$as_me:8668: 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
+
+@@ -8659,7 +8686,7 @@
+ LIBS="$cf_add_libs"
+
+ else
+- { { echo "$as_me:8662: error: Cannot find PCRE2 POSIX library" >&5
++ { { echo "$as_me:8689: error: Cannot find PCRE2 POSIX library" >&5
+ echo "$as_me: error: Cannot find PCRE2 POSIX library" >&2;}
+ { (exit 1); exit 1; }; }
+ fi
+@@ -8674,23 +8701,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:8677: checking for $ac_header" >&5
++echo "$as_me:8704: 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 8683 "configure"
++#line 8710 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:8687: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:8714: \"$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:8693: \$? = $ac_status" >&5
++ echo "$as_me:8720: \$? = $ac_status" >&5
+ (exit "$ac_status"); } >/dev/null; then
+ if test -s conftest.err; then
+ ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -8709,7 +8736,7 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:8712: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
++echo "$as_me:8739: 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
+@@ -8722,13 +8749,13 @@
+ for ac_func in PCRE2regcomp
+ do
+ as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+-echo "$as_me:8725: checking for $ac_func" >&5
++echo "$as_me:8752: 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 8731 "configure"
++#line 8758 "configure"
+ #include "confdefs.h"
+ #define $ac_func autoconf_temporary
+ #include <limits.h> /* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -8759,16 +8786,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:8762: \"$ac_link\"") >&5
++if { (eval echo "$as_me:8789: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:8765: \$? = $ac_status" >&5
++ echo "$as_me:8792: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:8768: \"$ac_try\"") >&5
++ { (eval echo "$as_me:8795: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:8771: \$? = $ac_status" >&5
++ echo "$as_me:8798: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ eval "$as_ac_var=yes"
+ else
+@@ -8778,7 +8805,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:8781: result: `eval echo '${'"$as_ac_var"'}'`" >&5
++echo "$as_me:8808: 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
+@@ -8792,7 +8819,7 @@
+
+ # not everyone has "test -c"
+ if test -c /dev/sysmouse 2>/dev/null ; then
+-echo "$as_me:8795: checking if you want to use sysmouse" >&5
++echo "$as_me:8822: 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.
+@@ -8804,7 +8831,7 @@
+ fi;
+ if test "$cf_with_sysmouse" != no ; then
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 8807 "configure"
++#line 8834 "configure"
+ #include "confdefs.h"
+
+ #include <osreldate.h>
+@@ -8827,16 +8854,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:8830: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:8857: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:8833: \$? = $ac_status" >&5
++ echo "$as_me:8860: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:8836: \"$ac_try\"") >&5
++ { (eval echo "$as_me:8863: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:8839: \$? = $ac_status" >&5
++ echo "$as_me:8866: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_with_sysmouse=yes
+ else
+@@ -8846,7 +8873,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:8849: result: $cf_with_sysmouse" >&5
++echo "$as_me:8876: result: $cf_with_sysmouse" >&5
+ echo "${ECHO_T}$cf_with_sysmouse" >&6
+ test "$cf_with_sysmouse" = yes &&
+ cat >>confdefs.h <<\EOF
+@@ -8856,7 +8883,7 @@
+ fi
+
+ # pretend that ncurses==ncursesw==ncursest
+-echo "$as_me:8859: checking if you want to disable library suffixes" >&5
++echo "$as_me:8886: 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.
+@@ -8873,13 +8900,13 @@
+ disable_lib_suffixes=no
+
+ fi;
+-echo "$as_me:8876: result: $disable_lib_suffixes" >&5
++echo "$as_me:8903: 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:8882: checking if rpath-hack should be disabled" >&5
++echo "$as_me:8909: 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.
+@@ -8897,22 +8924,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:8900: result: $cf_disable_rpath_hack" >&5
++echo "$as_me:8927: result: $cf_disable_rpath_hack" >&5
+ echo "${ECHO_T}$cf_disable_rpath_hack" >&6
+
+ if test "$enable_rpath_hack" = yes ; then
+
+-echo "$as_me:8905: checking for updated LDFLAGS" >&5
++echo "$as_me:8932: 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:8908: result: maybe" >&5
++ echo "$as_me:8935: 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:8915: checking for $ac_word" >&5
++echo "$as_me:8942: 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
+@@ -8927,7 +8954,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:8930: found $ac_dir/$ac_word" >&5
++echo "$as_me:8957: found $ac_dir/$ac_word" >&5
+ break
+ done
+
+@@ -8935,10 +8962,10 @@
+ fi
+ cf_ldd_prog=$ac_cv_prog_cf_ldd_prog
+ if test -n "$cf_ldd_prog"; then
+- echo "$as_me:8938: result: $cf_ldd_prog" >&5
++ echo "$as_me:8965: result: $cf_ldd_prog" >&5
+ echo "${ECHO_T}$cf_ldd_prog" >&6
+ else
+- echo "$as_me:8941: result: no" >&5
++ echo "$as_me:8968: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+
+@@ -8952,7 +8979,7 @@
+ cf_rpath_oops=
+
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 8955 "configure"
++#line 8982 "configure"
+ #include "confdefs.h"
+ #include <stdio.h>
+ int
+@@ -8964,16 +8991,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:8967: \"$ac_link\"") >&5
++if { (eval echo "$as_me:8994: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:8970: \$? = $ac_status" >&5
++ echo "$as_me:8997: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:8973: \"$ac_try\"") >&5
++ { (eval echo "$as_me:9000: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:8976: \$? = $ac_status" >&5
++ echo "$as_me:9003: \$? = $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`
+@@ -9001,7 +9028,7 @@
+ then
+ test -n "$verbose" && echo " ...adding -L$cf_rpath_dir/lib to LDFLAGS for $cf_rpath_src" 1>&6
+
+-echo "${as_me:-configure}:9004: testing ...adding -L$cf_rpath_dir/lib to LDFLAGS for $cf_rpath_src ..." 1>&5
++echo "${as_me:-configure}:9031: testing ...adding -L$cf_rpath_dir/lib to LDFLAGS for $cf_rpath_src ..." 1>&5
+
+ LDFLAGS="$LDFLAGS -L$cf_rpath_dir/lib"
+ break
+@@ -9013,11 +9040,11 @@
+
+ test -n "$verbose" && echo " ...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS" 1>&6
+
+-echo "${as_me:-configure}:9016: testing ...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
++echo "${as_me:-configure}:9043: testing ...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
+
+ test -n "$verbose" && echo " ...checking LDFLAGS $LDFLAGS" 1>&6
+
+-echo "${as_me:-configure}:9020: testing ...checking LDFLAGS $LDFLAGS ..." 1>&5
++echo "${as_me:-configure}:9047: testing ...checking LDFLAGS $LDFLAGS ..." 1>&5
+
+ cf_rpath_dst=
+ for cf_rpath_src in $LDFLAGS
+@@ -9054,7 +9081,7 @@
+ then
+ test -n "$verbose" && echo " ...Filter $cf_rpath_src ->$cf_rpath_tmp" 1>&6
+
+-echo "${as_me:-configure}:9057: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
++echo "${as_me:-configure}:9084: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
+
+ EXTRA_LDFLAGS="$cf_rpath_tmp $EXTRA_LDFLAGS"
+ fi
+@@ -9067,11 +9094,11 @@
+
+ test -n "$verbose" && echo " ...checked LDFLAGS $LDFLAGS" 1>&6
+
+-echo "${as_me:-configure}:9070: testing ...checked LDFLAGS $LDFLAGS ..." 1>&5
++echo "${as_me:-configure}:9097: testing ...checked LDFLAGS $LDFLAGS ..." 1>&5
+
+ test -n "$verbose" && echo " ...checking LIBS $LIBS" 1>&6
+
+-echo "${as_me:-configure}:9074: testing ...checking LIBS $LIBS ..." 1>&5
++echo "${as_me:-configure}:9101: testing ...checking LIBS $LIBS ..." 1>&5
+
+ cf_rpath_dst=
+ for cf_rpath_src in $LIBS
+@@ -9108,7 +9135,7 @@
+ then
+ test -n "$verbose" && echo " ...Filter $cf_rpath_src ->$cf_rpath_tmp" 1>&6
+
+-echo "${as_me:-configure}:9111: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
++echo "${as_me:-configure}:9138: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
+
+ EXTRA_LDFLAGS="$cf_rpath_tmp $EXTRA_LDFLAGS"
+ fi
+@@ -9121,14 +9148,14 @@
+
+ test -n "$verbose" && echo " ...checked LIBS $LIBS" 1>&6
+
+-echo "${as_me:-configure}:9124: testing ...checked LIBS $LIBS ..." 1>&5
++echo "${as_me:-configure}:9151: testing ...checked LIBS $LIBS ..." 1>&5
+
+ test -n "$verbose" && echo " ...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS" 1>&6
+
+-echo "${as_me:-configure}:9128: testing ...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
++echo "${as_me:-configure}:9155: testing ...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
+
+ else
+- echo "$as_me:9131: result: no" >&5
++ echo "$as_me:9158: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+
+@@ -9142,7 +9169,7 @@
+ EXTRA_PKG_LDFLAGS="$LDFLAGS $EXTRA_LDFLAGS"
+ if test -n "$EXTRA_PKG_LDFLAGS"
+ then
+- echo "$as_me:9145: checking if you want to disable extra LDFLAGS for package-scripts" >&5
++ echo "$as_me:9172: 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.
+@@ -9159,7 +9186,7 @@
+ disable_pkg_ldflags=no
+
+ fi;
+- echo "$as_me:9162: result: $disable_pkg_ldflags" >&5
++ echo "$as_me:9189: result: $disable_pkg_ldflags" >&5
+ echo "${ECHO_T}$disable_pkg_ldflags" >&6
+ test "$disable_pkg_ldflags" = yes && EXTRA_PKG_LDFLAGS=
+ fi
+@@ -9167,7 +9194,7 @@
+ ###############################################################################
+
+ ### use option --with-extra-suffix to append suffix to headers and libraries
+-echo "$as_me:9170: checking for extra suffix to append to header/library paths" >&5
++echo "$as_me:9197: 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=
+
+@@ -9186,11 +9213,11 @@
+ esac
+
+ fi;
+-echo "$as_me:9189: result: ${EXTRA_SUFFIX:-(none)}" >&5
++echo "$as_me:9216: 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:9193: checking if you wish to install ncurses overwriting curses" >&5
++echo "$as_me:9220: 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.
+@@ -9200,10 +9227,10 @@
+ else
+ if test "$prefix" = "/usr" ; then with_overwrite=yes; else with_overwrite=no; fi
+ fi;
+-echo "$as_me:9203: result: $with_overwrite" >&5
++echo "$as_me:9230: result: $with_overwrite" >&5
+ echo "${ECHO_T}$with_overwrite" >&6
+
+-echo "$as_me:9206: checking if external terminfo-database is used" >&5
++echo "$as_me:9233: 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.
+@@ -9213,7 +9240,7 @@
+ else
+ use_database=yes
+ fi;
+-echo "$as_me:9216: result: $use_database" >&5
++echo "$as_me:9243: result: $use_database" >&5
+ echo "${ECHO_T}$use_database" >&6
+
+ case "$host_os" in
+@@ -9229,7 +9256,7 @@
+ if test "$use_database" != no ; then
+ NCURSES_USE_DATABASE=1
+
+- echo "$as_me:9232: checking which terminfo source-file will be installed" >&5
++ echo "$as_me:9259: 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.
+@@ -9237,10 +9264,10 @@
+ withval="$with_database"
+ TERMINFO_SRC=$withval
+ fi;
+- echo "$as_me:9240: result: $TERMINFO_SRC" >&5
++ echo "$as_me:9267: result: $TERMINFO_SRC" >&5
+ echo "${ECHO_T}$TERMINFO_SRC" >&6
+
+- echo "$as_me:9243: checking whether to use hashed database instead of directory/tree" >&5
++ echo "$as_me:9270: 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.
+@@ -9250,13 +9277,13 @@
+ else
+ with_hashed_db=no
+ fi;
+- echo "$as_me:9253: result: $with_hashed_db" >&5
++ echo "$as_me:9280: result: $with_hashed_db" >&5
+ echo "${ECHO_T}$with_hashed_db" >&6
+ else
+ with_hashed_db=no
+ fi
+
+-echo "$as_me:9259: checking for list of fallback terminal descriptions" >&5
++echo "$as_me:9286: 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.
+@@ -9266,7 +9293,7 @@
+ else
+ with_fallback=
+ fi;
+-echo "$as_me:9269: result: ${with_fallback:-(none)}" >&5
++echo "$as_me:9296: result: ${with_fallback:-(none)}" >&5
+ echo "${ECHO_T}${with_fallback:-(none)}" >&6
+
+ case ".$with_fallback" in
+@@ -9274,7 +9301,7 @@
+ FALLBACK_LIST=
+ ;;
+ (.yes)
+- { echo "$as_me:9277: WARNING: expected a list of terminal descriptions" >&5
++ { echo "$as_me:9304: WARNING: expected a list of terminal descriptions" >&5
+ echo "$as_me: WARNING: expected a list of terminal descriptions" >&2;}
+ ;;
+ (*)
+@@ -9290,7 +9317,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:9293: checking for $ac_word" >&5
++echo "$as_me:9320: 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
+@@ -9305,7 +9332,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:9308: found $ac_dir/$ac_word" >&5
++echo "$as_me:9335: found $ac_dir/$ac_word" >&5
+ break
+ done
+
+@@ -9313,10 +9340,10 @@
+ fi
+ TIC=$ac_cv_prog_TIC
+ if test -n "$TIC"; then
+- echo "$as_me:9316: result: $TIC" >&5
++ echo "$as_me:9343: result: $TIC" >&5
+ echo "${ECHO_T}$TIC" >&6
+ else
+- echo "$as_me:9319: result: no" >&5
++ echo "$as_me:9346: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+
+@@ -9325,7 +9352,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:9328: checking for $ac_word" >&5
++echo "$as_me:9355: 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
+@@ -9340,7 +9367,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:9343: found $ac_dir/$ac_word" >&5
++echo "$as_me:9370: found $ac_dir/$ac_word" >&5
+ break
+ done
+
+@@ -9348,10 +9375,10 @@
+ fi
+ ac_ct_TIC=$ac_cv_prog_ac_ct_TIC
+ if test -n "$ac_ct_TIC"; then
+- echo "$as_me:9351: result: $ac_ct_TIC" >&5
++ echo "$as_me:9378: result: $ac_ct_TIC" >&5
+ echo "${ECHO_T}$ac_ct_TIC" >&6
+ else
+- echo "$as_me:9354: result: no" >&5
++ echo "$as_me:9381: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+
+@@ -9363,7 +9390,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:9366: checking for $ac_word" >&5
++echo "$as_me:9393: 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
+@@ -9378,7 +9405,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:9381: found $ac_dir/$ac_word" >&5
++echo "$as_me:9408: found $ac_dir/$ac_word" >&5
+ break
+ done
+
+@@ -9386,10 +9413,10 @@
+ fi
+ INFOCMP=$ac_cv_prog_INFOCMP
+ if test -n "$INFOCMP"; then
+- echo "$as_me:9389: result: $INFOCMP" >&5
++ echo "$as_me:9416: result: $INFOCMP" >&5
+ echo "${ECHO_T}$INFOCMP" >&6
+ else
+- echo "$as_me:9392: result: no" >&5
++ echo "$as_me:9419: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+
+@@ -9398,7 +9425,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:9401: checking for $ac_word" >&5
++echo "$as_me:9428: 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
+@@ -9413,7 +9440,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:9416: found $ac_dir/$ac_word" >&5
++echo "$as_me:9443: found $ac_dir/$ac_word" >&5
+ break
+ done
+
+@@ -9421,10 +9448,10 @@
+ fi
+ ac_ct_INFOCMP=$ac_cv_prog_ac_ct_INFOCMP
+ if test -n "$ac_ct_INFOCMP"; then
+- echo "$as_me:9424: result: $ac_ct_INFOCMP" >&5
++ echo "$as_me:9451: result: $ac_ct_INFOCMP" >&5
+ echo "${ECHO_T}$ac_ct_INFOCMP" >&6
+ else
+- echo "$as_me:9427: result: no" >&5
++ echo "$as_me:9454: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+
+@@ -9439,10 +9466,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:9442: checking for tic program for fallbacks" >&5
++ echo "$as_me:9469: checking for tic program for fallbacks" >&5
+ echo $ECHO_N "checking for tic program for fallbacks... $ECHO_C" >&6
+ TIC=$withval
+- echo "$as_me:9445: result: $TIC" >&5
++ echo "$as_me:9472: result: $TIC" >&5
+ echo "${ECHO_T}$TIC" >&6
+
+ if test "x$prefix" != xNONE; then
+@@ -9468,7 +9495,7 @@
+ TIC=`echo "$TIC" | sed -e s%NONE%$cf_path_syntax%`
+ ;;
+ (*)
+- { { echo "$as_me:9471: error: expected a pathname, not \"$TIC\"" >&5
++ { { echo "$as_me:9498: error: expected a pathname, not \"$TIC\"" >&5
+ echo "$as_me: error: expected a pathname, not \"$TIC\"" >&2;}
+ { (exit 1); exit 1; }; }
+ ;;
+@@ -9481,7 +9508,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:9484: checking for $ac_word" >&5
++echo "$as_me:9511: 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
+@@ -9498,7 +9525,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:9501: found $ac_dir/$ac_word" >&5
++ echo "$as_me:9528: found $ac_dir/$ac_word" >&5
+ break
+ fi
+ done
+@@ -9509,10 +9536,10 @@
+ TIC=$ac_cv_path_TIC
+
+ if test -n "$TIC"; then
+- echo "$as_me:9512: result: $TIC" >&5
++ echo "$as_me:9539: result: $TIC" >&5
+ echo "${ECHO_T}$TIC" >&6
+ else
+- echo "$as_me:9515: result: no" >&5
++ echo "$as_me:9542: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+
+@@ -9569,7 +9596,7 @@
+
+ if test -n "$cf_path_prog" ; then
+
+-echo "${as_me:-configure}:9572: testing defining path for ${cf_path_prog} ..." 1>&5
++echo "${as_me:-configure}:9599: testing defining path for ${cf_path_prog} ..." 1>&5
+
+ cat >>confdefs.h <<EOF
+ #define TIC_PATH "$cf_path_prog"
+@@ -9584,7 +9611,7 @@
+
+ if test -z "$TIC"
+ then
+- { echo "$as_me:9587: WARNING: no tic program found for fallbacks" >&5
++ { echo "$as_me:9614: WARNING: no tic program found for fallbacks" >&5
+ echo "$as_me: WARNING: no tic program found for fallbacks" >&2;}
+ fi
+
+@@ -9593,10 +9620,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:9596: checking for infocmp program for fallbacks" >&5
++ echo "$as_me:9623: checking for infocmp program for fallbacks" >&5
+ echo $ECHO_N "checking for infocmp program for fallbacks... $ECHO_C" >&6
+ INFOCMP=$withval
+- echo "$as_me:9599: result: $INFOCMP" >&5
++ echo "$as_me:9626: result: $INFOCMP" >&5
+ echo "${ECHO_T}$INFOCMP" >&6
+
+ if test "x$prefix" != xNONE; then
+@@ -9622,7 +9649,7 @@
+ INFOCMP=`echo "$INFOCMP" | sed -e s%NONE%$cf_path_syntax%`
+ ;;
+ (*)
+- { { echo "$as_me:9625: error: expected a pathname, not \"$INFOCMP\"" >&5
++ { { echo "$as_me:9652: error: expected a pathname, not \"$INFOCMP\"" >&5
+ echo "$as_me: error: expected a pathname, not \"$INFOCMP\"" >&2;}
+ { (exit 1); exit 1; }; }
+ ;;
+@@ -9635,7 +9662,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:9638: checking for $ac_word" >&5
++echo "$as_me:9665: 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
+@@ -9652,7 +9679,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:9655: found $ac_dir/$ac_word" >&5
++ echo "$as_me:9682: found $ac_dir/$ac_word" >&5
+ break
+ fi
+ done
+@@ -9663,10 +9690,10 @@
+ INFOCMP=$ac_cv_path_INFOCMP
+
+ if test -n "$INFOCMP"; then
+- echo "$as_me:9666: result: $INFOCMP" >&5
++ echo "$as_me:9693: result: $INFOCMP" >&5
+ echo "${ECHO_T}$INFOCMP" >&6
+ else
+- echo "$as_me:9669: result: no" >&5
++ echo "$as_me:9696: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+
+@@ -9723,7 +9750,7 @@
+
+ if test -n "$cf_path_prog" ; then
+
+-echo "${as_me:-configure}:9726: testing defining path for ${cf_path_prog} ..." 1>&5
++echo "${as_me:-configure}:9753: testing defining path for ${cf_path_prog} ..." 1>&5
+
+ cat >>confdefs.h <<EOF
+ #define INFOCMP_PATH "$cf_path_prog"
+@@ -9738,7 +9765,7 @@
+
+ if test -z "$INFOCMP"
+ then
+- { echo "$as_me:9741: WARNING: no infocmp program found for fallbacks" >&5
++ { echo "$as_me:9768: WARNING: no infocmp program found for fallbacks" >&5
+ echo "$as_me: WARNING: no infocmp program found for fallbacks" >&2;}
+ fi
+
+@@ -9748,7 +9775,7 @@
+ test -z "$INFOCMP" && FALLBACK_LIST=
+ if test -z "$FALLBACK_LIST"
+ then
+- { echo "$as_me:9751: WARNING: ignoring fallback option because tic/infocmp are not available" >&5
++ { echo "$as_me:9778: 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
+@@ -9756,7 +9783,7 @@
+ USE_FALLBACKS=
+ test -z "$FALLBACK_LIST" && USE_FALLBACKS="#"
+
+-echo "$as_me:9759: checking if you want modern xterm or antique" >&5
++echo "$as_me:9786: 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.
+@@ -9770,7 +9797,7 @@
+ (no) with_xterm_new=xterm-old;;
+ (*) with_xterm_new=xterm-new;;
+ esac
+-echo "$as_me:9773: result: $with_xterm_new" >&5
++echo "$as_me:9800: result: $with_xterm_new" >&5
+ echo "${ECHO_T}$with_xterm_new" >&6
+ WHICH_XTERM=$with_xterm_new
+
+@@ -9783,7 +9810,7 @@
+ ;;
+ esac
+
+-echo "$as_me:9786: checking if xterm backspace sends BS or DEL" >&5
++echo "$as_me:9813: 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.
+@@ -9807,13 +9834,13 @@
+ with_xterm_kbs=$withval
+ ;;
+ esac
+-echo "$as_me:9810: result: $with_xterm_kbs" >&5
++echo "$as_me:9837: 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:9816: WARNING: expected --with-xterm-kbs=$want_xterm_kbs for $host_os, have $with_xterm_kbs" >&5
++ { echo "$as_me:9843: 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
+
+@@ -9823,7 +9850,7 @@
+ MAKE_TERMINFO="#"
+ else
+
+-echo "$as_me:9826: checking for list of terminfo directories" >&5
++echo "$as_me:9853: 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.
+@@ -9861,7 +9888,7 @@
+ cf_src_path=`echo "$cf_src_path" | sed -e s%NONE%$cf_path_syntax%`
+ ;;
+ (*)
+- { { echo "$as_me:9864: error: expected a pathname, not \"$cf_src_path\"" >&5
++ { { echo "$as_me:9891: 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; }; }
+ ;;
+@@ -9884,7 +9911,7 @@
+ ;;
+ esac
+
+-echo "$as_me:9887: result: $TERMINFO_DIRS" >&5
++echo "$as_me:9914: result: $TERMINFO_DIRS" >&5
+ echo "${ECHO_T}$TERMINFO_DIRS" >&6
+ test -n "$TERMINFO_DIRS" &&
+ cat >>confdefs.h <<EOF
+@@ -9893,13 +9920,13 @@
+
+ case "x$TERMINFO" in
+ x???:*)
+- { echo "$as_me:9896: WARNING: ignoring non-directory/file TERMINFO value" >&5
++ { echo "$as_me:9923: 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:9902: checking for default terminfo directory" >&5
++echo "$as_me:9929: 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.
+@@ -9933,7 +9960,7 @@
+ withval=`echo "$withval" | sed -e s%NONE%$cf_path_syntax%`
+ ;;
+ (*)
+- { { echo "$as_me:9936: error: expected a pathname, not \"$withval\"" >&5
++ { { echo "$as_me:9963: error: expected a pathname, not \"$withval\"" >&5
+ echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
+ { (exit 1); exit 1; }; }
+ ;;
+@@ -9942,7 +9969,7 @@
+ fi
+ eval TERMINFO="$withval"
+
+-echo "$as_me:9945: result: $TERMINFO" >&5
++echo "$as_me:9972: result: $TERMINFO" >&5
+ echo "${ECHO_T}$TERMINFO" >&6
+
+ cat >>confdefs.h <<EOF
+@@ -9953,7 +9980,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:9956: checking if big-core option selected" >&5
++echo "$as_me:9983: 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.
+@@ -9965,7 +9992,7 @@
+ with_big_core=no
+ else
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 9968 "configure"
++#line 9995 "configure"
+ #include "confdefs.h"
+
+ #include <stdlib.h>
+@@ -9979,15 +10006,15 @@
+ }
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:9982: \"$ac_link\"") >&5
++if { (eval echo "$as_me:10009: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:9985: \$? = $ac_status" >&5
++ echo "$as_me:10012: \$? = $ac_status" >&5
+ (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+- { (eval echo "$as_me:9987: \"$ac_try\"") >&5
++ { (eval echo "$as_me:10014: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:9990: \$? = $ac_status" >&5
++ echo "$as_me:10017: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ with_big_core=yes
+ else
+@@ -9999,7 +10026,7 @@
+ rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+ fi;
+-echo "$as_me:10002: result: $with_big_core" >&5
++echo "$as_me:10029: result: $with_big_core" >&5
+ echo "${ECHO_T}$with_big_core" >&6
+ test "x$with_big_core" = "xyes" &&
+ cat >>confdefs.h <<\EOF
+@@ -10009,7 +10036,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:10012: checking if big-strings option selected" >&5
++echo "$as_me:10039: 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.
+@@ -10033,14 +10060,14 @@
+ esac
+
+ fi;
+-echo "$as_me:10036: result: $with_big_strings" >&5
++echo "$as_me:10063: 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:10043: checking if you want termcap-fallback support" >&5
++echo "$as_me:10070: 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.
+@@ -10050,14 +10077,14 @@
+ else
+ with_termcap=no
+ fi;
+-echo "$as_me:10053: result: $with_termcap" >&5
++echo "$as_me:10080: 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:10060: error: You have disabled the database w/o specifying fallbacks" >&5
++ { { echo "$as_me:10087: 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
+@@ -10070,13 +10097,13 @@
+ else
+
+ if test "$with_ticlib" != no ; then
+- { { echo "$as_me:10073: error: Options --with-ticlib and --enable-termcap cannot be combined" >&5
++ { { echo "$as_me:10100: 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:10079: checking for list of termcap files" >&5
++ echo "$as_me:10106: 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.
+@@ -10114,7 +10141,7 @@
+ cf_src_path=`echo "$cf_src_path" | sed -e s%NONE%$cf_path_syntax%`
+ ;;
+ (*)
+- { { echo "$as_me:10117: error: expected a pathname, not \"$cf_src_path\"" >&5
++ { { echo "$as_me:10144: 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; }; }
+ ;;
+@@ -10137,7 +10164,7 @@
+ ;;
+ esac
+
+- echo "$as_me:10140: result: $TERMPATH" >&5
++ echo "$as_me:10167: result: $TERMPATH" >&5
+ echo "${ECHO_T}$TERMPATH" >&6
+ test -n "$TERMPATH" &&
+ cat >>confdefs.h <<EOF
+@@ -10145,7 +10172,7 @@
+ EOF
+
+ ### use option --enable-getcap to use a hacked getcap for reading termcaps
+- echo "$as_me:10148: checking if fast termcap-loader is needed" >&5
++ echo "$as_me:10175: 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.
+@@ -10155,14 +10182,14 @@
+ else
+ with_getcap=no
+ fi;
+- echo "$as_me:10158: result: $with_getcap" >&5
++ echo "$as_me:10185: 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:10165: checking if translated termcaps will be cached in ~/.terminfo" >&5
++ echo "$as_me:10192: 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.
+@@ -10172,7 +10199,7 @@
+ else
+ with_getcap_cache=no
+ fi;
+- echo "$as_me:10175: result: $with_getcap_cache" >&5
++ echo "$as_me:10202: result: $with_getcap_cache" >&5
+ echo "${ECHO_T}$with_getcap_cache" >&6
+ test "x$with_getcap_cache" = "xyes" &&
+ cat >>confdefs.h <<\EOF
+@@ -10182,7 +10209,7 @@
+ fi
+
+ ### Use option --disable-home-terminfo to completely remove ~/.terminfo
+-echo "$as_me:10185: checking if ~/.terminfo is wanted" >&5
++echo "$as_me:10212: 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.
+@@ -10192,14 +10219,14 @@
+ else
+ with_home_terminfo=yes
+ fi;
+-echo "$as_me:10195: result: $with_home_terminfo" >&5
++echo "$as_me:10222: 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:10202: checking if you want to permit root to use ncurses environment variables" >&5
++echo "$as_me:10229: 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.
+@@ -10209,14 +10236,14 @@
+ else
+ with_root_environ=yes
+ fi;
+-echo "$as_me:10212: result: $with_root_environ" >&5
++echo "$as_me:10239: 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:10219: checking if you want to permit setuid programs to access all files" >&5
++echo "$as_me:10246: 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.
+@@ -10226,14 +10253,14 @@
+ else
+ with_root_access=yes
+ fi;
+-echo "$as_me:10229: result: $with_root_access" >&5
++echo "$as_me:10256: 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:10236: checking if you want to permit setuid use of ncurses environment variables" >&5
++echo "$as_me:10263: 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.
+@@ -10243,7 +10270,7 @@
+ else
+ with_setuid_environ=$with_root_environ
+ fi;
+-echo "$as_me:10246: result: $with_setuid_environ" >&5
++echo "$as_me:10273: result: $with_setuid_environ" >&5
+ echo "${ECHO_T}$with_setuid_environ" >&6
+ test "x$with_setuid_environ" = xyes &&
+ cat >>confdefs.h <<\EOF
+@@ -10258,23 +10285,23 @@
+
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-echo "$as_me:10261: checking for $ac_header" >&5
++echo "$as_me:10288: 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 10267 "configure"
++#line 10294 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:10271: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:10298: \"$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:10277: \$? = $ac_status" >&5
++ echo "$as_me:10304: \$? = $ac_status" >&5
+ (exit "$ac_status"); } >/dev/null; then
+ if test -s conftest.err; then
+ ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -10293,7 +10320,7 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:10296: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
++echo "$as_me:10323: 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
+@@ -10308,13 +10335,13 @@
+ unlink
+ do
+ as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+-echo "$as_me:10311: checking for $ac_func" >&5
++echo "$as_me:10338: 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 10317 "configure"
++#line 10344 "configure"
+ #include "confdefs.h"
+ #define $ac_func autoconf_temporary
+ #include <limits.h> /* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -10345,16 +10372,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:10348: \"$ac_link\"") >&5
++if { (eval echo "$as_me:10375: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:10351: \$? = $ac_status" >&5
++ echo "$as_me:10378: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:10354: \"$ac_try\"") >&5
++ { (eval echo "$as_me:10381: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:10357: \$? = $ac_status" >&5
++ echo "$as_me:10384: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ eval "$as_ac_var=yes"
+ else
+@@ -10364,7 +10391,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:10367: result: `eval echo '${'"$as_ac_var"'}'`" >&5
++echo "$as_me:10394: 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
+@@ -10381,13 +10408,13 @@
+ symlink
+ do
+ as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+-echo "$as_me:10384: checking for $ac_func" >&5
++echo "$as_me:10411: 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 10390 "configure"
++#line 10417 "configure"
+ #include "confdefs.h"
+ #define $ac_func autoconf_temporary
+ #include <limits.h> /* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -10418,16 +10445,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:10421: \"$ac_link\"") >&5
++if { (eval echo "$as_me:10448: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:10424: \$? = $ac_status" >&5
++ echo "$as_me:10451: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:10427: \"$ac_try\"") >&5
++ { (eval echo "$as_me:10454: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:10430: \$? = $ac_status" >&5
++ echo "$as_me:10457: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ eval "$as_ac_var=yes"
+ else
+@@ -10437,7 +10464,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:10440: result: `eval echo '${'"$as_ac_var"'}'`" >&5
++echo "$as_me:10467: 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
+@@ -10448,7 +10475,7 @@
+ done
+
+ else
+- echo "$as_me:10451: checking if link/symlink functions work" >&5
++ echo "$as_me:10478: 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
+@@ -10461,7 +10488,7 @@
+ eval 'ac_cv_func_'$cf_func'=error'
+ else
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 10464 "configure"
++#line 10491 "configure"
+ #include "confdefs.h"
+
+ $ac_includes_default
+@@ -10495,15 +10522,15 @@
+
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:10498: \"$ac_link\"") >&5
++if { (eval echo "$as_me:10525: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:10501: \$? = $ac_status" >&5
++ echo "$as_me:10528: \$? = $ac_status" >&5
+ (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+- { (eval echo "$as_me:10503: \"$ac_try\"") >&5
++ { (eval echo "$as_me:10530: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:10506: \$? = $ac_status" >&5
++ echo "$as_me:10533: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+
+ cf_cv_link_funcs="$cf_cv_link_funcs $cf_func"
+@@ -10521,7 +10548,7 @@
+ test -z "$cf_cv_link_funcs" && cf_cv_link_funcs=no
+
+ fi
+-echo "$as_me:10524: result: $cf_cv_link_funcs" >&5
++echo "$as_me:10551: result: $cf_cv_link_funcs" >&5
+ echo "${ECHO_T}$cf_cv_link_funcs" >&6
+ test "$ac_cv_func_link" = yes &&
+ cat >>confdefs.h <<\EOF
+@@ -10541,7 +10568,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:10544: checking if tic should use symbolic links" >&5
++ echo "$as_me:10571: 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.
+@@ -10551,21 +10578,21 @@
+ else
+ with_symlinks=no
+ fi;
+- echo "$as_me:10554: result: $with_symlinks" >&5
++ echo "$as_me:10581: 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:10561: checking if tic should use hard links" >&5
++ echo "$as_me:10588: 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:10568: result: $with_links" >&5
++ echo "$as_me:10595: result: $with_links" >&5
+ echo "${ECHO_T}$with_links" >&6
+ fi
+
+@@ -10581,7 +10608,7 @@
+
+ ### use option --enable-broken-linker to force on use of broken-linker support
+
+-echo "$as_me:10584: checking if you want broken-linker support code" >&5
++echo "$as_me:10611: 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.
+@@ -10591,7 +10618,7 @@
+ else
+ with_broken_linker=no
+ fi;
+-echo "$as_me:10594: result: $with_broken_linker" >&5
++echo "$as_me:10621: result: $with_broken_linker" >&5
+ echo "${ECHO_T}$with_broken_linker" >&6
+
+ : "${BROKEN_LINKER:=0}"
+@@ -10605,7 +10632,7 @@
+ fi
+
+ ### use option --enable-bsdpad to have tputs process BSD-style prefix padding
+-echo "$as_me:10608: checking if tputs should process BSD-style prefix padding" >&5
++echo "$as_me:10635: 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.
+@@ -10615,7 +10642,7 @@
+ else
+ with_bsdpad=no
+ fi;
+-echo "$as_me:10618: result: $with_bsdpad" >&5
++echo "$as_me:10645: result: $with_bsdpad" >&5
+ echo "${ECHO_T}$with_bsdpad" >&6
+ test "x$with_bsdpad" = xyes &&
+ cat >>confdefs.h <<\EOF
+@@ -10634,14 +10661,14 @@
+ # Check to define _XOPEN_SOURCE "automatically"
+ CPPFLAGS_before_XOPEN="$CPPFLAGS"
+
+-echo "$as_me:10637: checking if the POSIX test-macros are already defined" >&5
++echo "$as_me:10664: 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 10644 "configure"
++#line 10671 "configure"
+ #include "confdefs.h"
+ #include <stdio.h>
+ int
+@@ -10660,16 +10687,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:10663: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:10690: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:10666: \$? = $ac_status" >&5
++ echo "$as_me:10693: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:10669: \"$ac_try\"") >&5
++ { (eval echo "$as_me:10696: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:10672: \$? = $ac_status" >&5
++ echo "$as_me:10699: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_posix_visible=no
+ else
+@@ -10680,7 +10707,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+
+ fi
+-echo "$as_me:10683: result: $cf_cv_posix_visible" >&5
++echo "$as_me:10710: result: $cf_cv_posix_visible" >&5
+ echo "${ECHO_T}$cf_cv_posix_visible" >&6
+
+ if test "$cf_cv_posix_visible" = no; then
+@@ -10722,14 +10749,14 @@
+
+ cf_gnu_xopen_source=$cf_XOPEN_SOURCE
+
+-echo "$as_me:10725: checking if this is the GNU C library" >&5
++echo "$as_me:10752: 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 10732 "configure"
++#line 10759 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ int
+@@ -10748,16 +10775,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:10751: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:10778: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:10754: \$? = $ac_status" >&5
++ echo "$as_me:10781: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:10757: \"$ac_try\"") >&5
++ { (eval echo "$as_me:10784: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:10760: \$? = $ac_status" >&5
++ echo "$as_me:10787: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_gnu_library=yes
+ else
+@@ -10768,7 +10795,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+
+ fi
+-echo "$as_me:10771: result: $cf_cv_gnu_library" >&5
++echo "$as_me:10798: result: $cf_cv_gnu_library" >&5
+ echo "${ECHO_T}$cf_cv_gnu_library" >&6
+
+ if test x$cf_cv_gnu_library = xyes; then
+@@ -10776,7 +10803,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:10779: checking if _DEFAULT_SOURCE can be used as a basis" >&5
++ echo "$as_me:10806: 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
+@@ -10788,7 +10815,7 @@
+ CPPFLAGS="${CPPFLAGS}-D_DEFAULT_SOURCE"
+
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 10791 "configure"
++#line 10818 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ int
+@@ -10807,16 +10834,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:10810: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:10837: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:10813: \$? = $ac_status" >&5
++ echo "$as_me:10840: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:10816: \"$ac_try\"") >&5
++ { (eval echo "$as_me:10843: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:10819: \$? = $ac_status" >&5
++ echo "$as_me:10846: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_gnu_library_219=yes
+ else
+@@ -10828,12 +10855,12 @@
+ CPPFLAGS="$cf_save"
+
+ fi
+-echo "$as_me:10831: result: $cf_cv_gnu_library_219" >&5
++echo "$as_me:10858: 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:10836: checking if _XOPEN_SOURCE=$cf_gnu_xopen_source works with _DEFAULT_SOURCE" >&5
++ echo "$as_me:10863: 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
+@@ -10938,7 +10965,7 @@
+ fi
+
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 10941 "configure"
++#line 10968 "configure"
+ #include "confdefs.h"
+
+ #include <limits.h>
+@@ -10958,16 +10985,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:10961: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:10988: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:10964: \$? = $ac_status" >&5
++ echo "$as_me:10991: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:10967: \"$ac_try\"") >&5
++ { (eval echo "$as_me:10994: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:10970: \$? = $ac_status" >&5
++ echo "$as_me:10997: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_gnu_dftsrc_219=yes
+ else
+@@ -10978,7 +11005,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+
+ fi
+-echo "$as_me:10981: result: $cf_cv_gnu_dftsrc_219" >&5
++echo "$as_me:11008: 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
+@@ -10987,14 +11014,14 @@
+
+ if test "x$cf_cv_gnu_dftsrc_219" != xyes; then
+
+- echo "$as_me:10990: checking if we must define _GNU_SOURCE" >&5
++ echo "$as_me:11017: 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 10997 "configure"
++#line 11024 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ int
+@@ -11009,16 +11036,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:11012: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:11039: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:11015: \$? = $ac_status" >&5
++ echo "$as_me:11042: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:11018: \"$ac_try\"") >&5
++ { (eval echo "$as_me:11045: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:11021: \$? = $ac_status" >&5
++ echo "$as_me:11048: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_gnu_source=no
+ else
+@@ -11125,7 +11152,7 @@
+ fi
+
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 11128 "configure"
++#line 11155 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ int
+@@ -11140,16 +11167,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:11143: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:11170: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:11146: \$? = $ac_status" >&5
++ echo "$as_me:11173: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:11149: \"$ac_try\"") >&5
++ { (eval echo "$as_me:11176: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:11152: \$? = $ac_status" >&5
++ echo "$as_me:11179: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_gnu_source=no
+ else
+@@ -11164,12 +11191,12 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+
+ fi
+-echo "$as_me:11167: result: $cf_cv_gnu_source" >&5
++echo "$as_me:11194: 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:11172: checking if we should also define _DEFAULT_SOURCE" >&5
++ echo "$as_me:11199: 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
+@@ -11179,7 +11206,7 @@
+ CPPFLAGS="${CPPFLAGS}-D_GNU_SOURCE"
+
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 11182 "configure"
++#line 11209 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ int
+@@ -11194,16 +11221,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:11197: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:11224: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:11200: \$? = $ac_status" >&5
++ echo "$as_me:11227: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:11203: \"$ac_try\"") >&5
++ { (eval echo "$as_me:11230: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:11206: \$? = $ac_status" >&5
++ echo "$as_me:11233: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_default_source=no
+ else
+@@ -11214,7 +11241,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+
+ fi
+-echo "$as_me:11217: result: $cf_cv_default_source" >&5
++echo "$as_me:11244: result: $cf_cv_default_source" >&5
+ echo "${ECHO_T}$cf_cv_default_source" >&6
+ if test "$cf_cv_default_source" = yes
+ then
+@@ -11251,16 +11278,16 @@
+ sed -e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ ]*\)\?[ ]/ /g' \
+ -e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ ]*\)\?$//g'`
+
+-echo "$as_me:11254: checking if we should define _POSIX_C_SOURCE" >&5
++echo "$as_me:11281: 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}:11260: testing if the symbol is already defined go no further ..." 1>&5
++echo "${as_me:-configure}:11287: testing if the symbol is already defined go no further ..." 1>&5
+
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 11263 "configure"
++#line 11290 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ int
+@@ -11275,16 +11302,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:11278: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:11305: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:11281: \$? = $ac_status" >&5
++ echo "$as_me:11308: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:11284: \"$ac_try\"") >&5
++ { (eval echo "$as_me:11311: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:11287: \$? = $ac_status" >&5
++ echo "$as_me:11314: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_posix_c_source=no
+ else
+@@ -11305,7 +11332,7 @@
+ esac
+ if test "$cf_want_posix_source" = yes ; then
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 11308 "configure"
++#line 11335 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ int
+@@ -11320,16 +11347,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:11323: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:11350: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:11326: \$? = $ac_status" >&5
++ echo "$as_me:11353: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:11329: \"$ac_try\"") >&5
++ { (eval echo "$as_me:11356: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:11332: \$? = $ac_status" >&5
++ echo "$as_me:11359: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ :
+ else
+@@ -11340,7 +11367,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+
+-echo "${as_me:-configure}:11343: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
++echo "${as_me:-configure}:11370: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
+
+ CFLAGS="$cf_trim_CFLAGS"
+ CPPFLAGS="$cf_trim_CPPFLAGS"
+@@ -11348,10 +11375,10 @@
+ test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
+ CPPFLAGS="${CPPFLAGS}$cf_cv_posix_c_source"
+
+-echo "${as_me:-configure}:11351: testing if the second compile does not leave our definition intact error ..." 1>&5
++echo "${as_me:-configure}:11378: testing if the second compile does not leave our definition intact error ..." 1>&5
+
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 11354 "configure"
++#line 11381 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ int
+@@ -11366,16 +11393,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:11369: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:11396: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:11372: \$? = $ac_status" >&5
++ echo "$as_me:11399: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:11375: \"$ac_try\"") >&5
++ { (eval echo "$as_me:11402: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:11378: \$? = $ac_status" >&5
++ echo "$as_me:11405: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ :
+ else
+@@ -11391,7 +11418,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+
+ fi
+-echo "$as_me:11394: result: $cf_cv_posix_c_source" >&5
++echo "$as_me:11421: 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
+@@ -11508,7 +11535,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:11511: WARNING: this system does not provide usable locale support" >&5
++ { echo "$as_me:11538: 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
+@@ -11540,14 +11567,14 @@
+ ;;
+ (*)
+
+-echo "$as_me:11543: checking if we should define _XOPEN_SOURCE" >&5
++echo "$as_me:11570: 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 11550 "configure"
++#line 11577 "configure"
+ #include "confdefs.h"
+
+ $ac_includes_default
+@@ -11565,16 +11592,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:11568: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:11595: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:11571: \$? = $ac_status" >&5
++ echo "$as_me:11598: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:11574: \"$ac_try\"") >&5
++ { (eval echo "$as_me:11601: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:11577: \$? = $ac_status" >&5
++ echo "$as_me:11604: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_xopen_source=no
+ else
+@@ -11586,7 +11613,7 @@
+ CPPFLAGS="${CPPFLAGS}-D_XOPEN_SOURCE=$cf_XOPEN_SOURCE"
+
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 11589 "configure"
++#line 11616 "configure"
+ #include "confdefs.h"
+
+ $ac_includes_default
+@@ -11604,16 +11631,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:11607: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:11634: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:11610: \$? = $ac_status" >&5
++ echo "$as_me:11637: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:11613: \"$ac_try\"") >&5
++ { (eval echo "$as_me:11640: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:11616: \$? = $ac_status" >&5
++ echo "$as_me:11643: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_xopen_source=no
+ else
+@@ -11628,7 +11655,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+
+ fi
+-echo "$as_me:11631: result: $cf_cv_xopen_source" >&5
++echo "$as_me:11658: result: $cf_cv_xopen_source" >&5
+ echo "${ECHO_T}$cf_cv_xopen_source" >&6
+
+ if test "$cf_cv_xopen_source" != no ; then
+@@ -11788,16 +11815,16 @@
+ sed -e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ ]*\)\?[ ]/ /g' \
+ -e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ ]*\)\?$//g'`
+
+-echo "$as_me:11791: checking if we should define _POSIX_C_SOURCE" >&5
++echo "$as_me:11818: 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}:11797: testing if the symbol is already defined go no further ..." 1>&5
++echo "${as_me:-configure}:11824: testing if the symbol is already defined go no further ..." 1>&5
+
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 11800 "configure"
++#line 11827 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ int
+@@ -11812,16 +11839,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:11815: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:11842: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:11818: \$? = $ac_status" >&5
++ echo "$as_me:11845: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:11821: \"$ac_try\"") >&5
++ { (eval echo "$as_me:11848: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:11824: \$? = $ac_status" >&5
++ echo "$as_me:11851: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_posix_c_source=no
+ else
+@@ -11842,7 +11869,7 @@
+ esac
+ if test "$cf_want_posix_source" = yes ; then
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 11845 "configure"
++#line 11872 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ int
+@@ -11857,16 +11884,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:11860: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:11887: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:11863: \$? = $ac_status" >&5
++ echo "$as_me:11890: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:11866: \"$ac_try\"") >&5
++ { (eval echo "$as_me:11893: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:11869: \$? = $ac_status" >&5
++ echo "$as_me:11896: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ :
+ else
+@@ -11877,7 +11904,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+
+-echo "${as_me:-configure}:11880: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
++echo "${as_me:-configure}:11907: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
+
+ CFLAGS="$cf_trim_CFLAGS"
+ CPPFLAGS="$cf_trim_CPPFLAGS"
+@@ -11885,10 +11912,10 @@
+ test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
+ CPPFLAGS="${CPPFLAGS}$cf_cv_posix_c_source"
+
+-echo "${as_me:-configure}:11888: testing if the second compile does not leave our definition intact error ..." 1>&5
++echo "${as_me:-configure}:11915: testing if the second compile does not leave our definition intact error ..." 1>&5
+
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 11891 "configure"
++#line 11918 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ int
+@@ -11903,16 +11930,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:11906: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:11933: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:11909: \$? = $ac_status" >&5
++ echo "$as_me:11936: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:11912: \"$ac_try\"") >&5
++ { (eval echo "$as_me:11939: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:11915: \$? = $ac_status" >&5
++ echo "$as_me:11942: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ :
+ else
+@@ -11928,7 +11955,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+
+ fi
+-echo "$as_me:11931: result: $cf_cv_posix_c_source" >&5
++echo "$as_me:11958: 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
+@@ -12041,10 +12068,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}:12044: testing checking if _POSIX_C_SOURCE interferes with _XOPEN_SOURCE ..." 1>&5
++echo "${as_me:-configure}:12071: testing checking if _POSIX_C_SOURCE interferes with _XOPEN_SOURCE ..." 1>&5
+
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 12047 "configure"
++#line 12074 "configure"
+ #include "confdefs.h"
+
+ $ac_includes_default
+@@ -12062,23 +12089,23 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:12065: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:12092: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:12068: \$? = $ac_status" >&5
++ echo "$as_me:12095: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:12071: \"$ac_try\"") >&5
++ { (eval echo "$as_me:12098: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:12074: \$? = $ac_status" >&5
++ echo "$as_me:12101: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ :
+ else
+ echo "$as_me: failed program was:" >&5
+ cat "conftest.$ac_ext" >&5
+
+- { echo "$as_me:12081: WARNING: _POSIX_C_SOURCE definition is not usable" >&5
++ { echo "$as_me:12108: 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
+@@ -12101,7 +12128,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}:12104: testing removing old option $cf_add_cflags from CFLAGS ..." 1>&5
++echo "${as_me:-configure}:12131: testing removing old option $cf_add_cflags from CFLAGS ..." 1>&5
+
+ CFLAGS="$cf_old_cflag"
+ done
+@@ -12113,7 +12140,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}:12116: testing removing old option $cf_add_cflags from CPPFLAGS ..." 1>&5
++echo "${as_me:-configure}:12143: testing removing old option $cf_add_cflags from CPPFLAGS ..." 1>&5
+
+ CPPFLAGS="$cf_old_cflag"
+ done
+@@ -12201,7 +12228,7 @@
+ if test -n "$cf_new_cflags" ; then
+ test -n "$verbose" && echo " add to \$CFLAGS $cf_new_cflags" 1>&6
+
+-echo "${as_me:-configure}:12204: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
++echo "${as_me:-configure}:12231: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
+
+ test -n "$CFLAGS" && CFLAGS="$CFLAGS "
+ CFLAGS="${CFLAGS}$cf_new_cflags"
+@@ -12211,7 +12238,7 @@
+ if test -n "$cf_new_cppflags" ; then
+ test -n "$verbose" && echo " add to \$CPPFLAGS $cf_new_cppflags" 1>&6
+
+-echo "${as_me:-configure}:12214: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
++echo "${as_me:-configure}:12241: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
+
+ test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
+ CPPFLAGS="${CPPFLAGS}$cf_new_cppflags"
+@@ -12221,7 +12248,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}:12224: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5
++echo "${as_me:-configure}:12251: 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"
+@@ -12233,10 +12260,10 @@
+ fi
+
+ if test -n "$cf_XOPEN_SOURCE" && test -z "$cf_cv_xopen_source" ; then
+- echo "$as_me:12236: checking if _XOPEN_SOURCE really is set" >&5
++ echo "$as_me:12263: 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 12239 "configure"
++#line 12266 "configure"
+ #include "confdefs.h"
+ #include <stdlib.h>
+ int
+@@ -12251,16 +12278,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:12254: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:12281: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:12257: \$? = $ac_status" >&5
++ echo "$as_me:12284: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:12260: \"$ac_try\"") >&5
++ { (eval echo "$as_me:12287: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:12263: \$? = $ac_status" >&5
++ echo "$as_me:12290: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_XOPEN_SOURCE_set=yes
+ else
+@@ -12269,12 +12296,12 @@
+ cf_XOPEN_SOURCE_set=no
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+- echo "$as_me:12272: result: $cf_XOPEN_SOURCE_set" >&5
++ echo "$as_me:12299: 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 12277 "configure"
++#line 12304 "configure"
+ #include "confdefs.h"
+ #include <stdlib.h>
+ int
+@@ -12289,16 +12316,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:12292: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:12319: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:12295: \$? = $ac_status" >&5
++ echo "$as_me:12322: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:12298: \"$ac_try\"") >&5
++ { (eval echo "$as_me:12325: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:12301: \$? = $ac_status" >&5
++ echo "$as_me:12328: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_XOPEN_SOURCE_set_ok=yes
+ else
+@@ -12309,19 +12336,19 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ if test "$cf_XOPEN_SOURCE_set_ok" = no
+ then
+- { echo "$as_me:12312: WARNING: _XOPEN_SOURCE is lower than requested" >&5
++ { echo "$as_me:12339: WARNING: _XOPEN_SOURCE is lower than requested" >&5
+ echo "$as_me: WARNING: _XOPEN_SOURCE is lower than requested" >&2;}
+ fi
+ else
+
+-echo "$as_me:12317: checking if we should define _XOPEN_SOURCE" >&5
++echo "$as_me:12344: 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 12324 "configure"
++#line 12351 "configure"
+ #include "confdefs.h"
+
+ $ac_includes_default
+@@ -12339,16 +12366,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:12342: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:12369: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:12345: \$? = $ac_status" >&5
++ echo "$as_me:12372: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:12348: \"$ac_try\"") >&5
++ { (eval echo "$as_me:12375: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:12351: \$? = $ac_status" >&5
++ echo "$as_me:12378: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_xopen_source=no
+ else
+@@ -12360,7 +12387,7 @@
+ CPPFLAGS="${CPPFLAGS}-D_XOPEN_SOURCE=$cf_XOPEN_SOURCE"
+
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 12363 "configure"
++#line 12390 "configure"
+ #include "confdefs.h"
+
+ $ac_includes_default
+@@ -12378,16 +12405,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:12381: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:12408: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:12384: \$? = $ac_status" >&5
++ echo "$as_me:12411: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:12387: \"$ac_try\"") >&5
++ { (eval echo "$as_me:12414: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:12390: \$? = $ac_status" >&5
++ echo "$as_me:12417: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_xopen_source=no
+ else
+@@ -12402,7 +12429,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+
+ fi
+-echo "$as_me:12405: result: $cf_cv_xopen_source" >&5
++echo "$as_me:12432: result: $cf_cv_xopen_source" >&5
+ echo "${ECHO_T}$cf_cv_xopen_source" >&6
+
+ if test "$cf_cv_xopen_source" != no ; then
+@@ -12553,14 +12580,14 @@
+
+ # Work around breakage on OS X
+
+-echo "$as_me:12556: checking if SIGWINCH is defined" >&5
++echo "$as_me:12583: 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 12563 "configure"
++#line 12590 "configure"
+ #include "confdefs.h"
+
+ #include <sys/types.h>
+@@ -12575,23 +12602,23 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:12578: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:12605: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:12581: \$? = $ac_status" >&5
++ echo "$as_me:12608: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:12584: \"$ac_try\"") >&5
++ { (eval echo "$as_me:12611: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:12587: \$? = $ac_status" >&5
++ echo "$as_me:12614: \$? = $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 12594 "configure"
++#line 12621 "configure"
+ #include "confdefs.h"
+
+ #undef _XOPEN_SOURCE
+@@ -12609,16 +12636,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:12612: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:12639: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:12615: \$? = $ac_status" >&5
++ echo "$as_me:12642: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:12618: \"$ac_try\"") >&5
++ { (eval echo "$as_me:12645: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:12621: \$? = $ac_status" >&5
++ echo "$as_me:12648: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_define_sigwinch=maybe
+ else
+@@ -12632,11 +12659,11 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+
+ fi
+-echo "$as_me:12635: result: $cf_cv_define_sigwinch" >&5
++echo "$as_me:12662: 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:12639: checking for actual SIGWINCH definition" >&5
++echo "$as_me:12666: 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
+@@ -12647,7 +12674,7 @@
+ while test "$cf_sigwinch" != 1
+ do
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 12650 "configure"
++#line 12677 "configure"
+ #include "confdefs.h"
+
+ #undef _XOPEN_SOURCE
+@@ -12669,16 +12696,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:12672: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:12699: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:12675: \$? = $ac_status" >&5
++ echo "$as_me:12702: \$? = $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:12705: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:12681: \$? = $ac_status" >&5
++ echo "$as_me:12708: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_fixup_sigwinch=$cf_sigwinch
+ break
+@@ -12692,7 +12719,7 @@
+ done
+
+ fi
+-echo "$as_me:12695: result: $cf_cv_fixup_sigwinch" >&5
++echo "$as_me:12722: result: $cf_cv_fixup_sigwinch" >&5
+ echo "${ECHO_T}$cf_cv_fixup_sigwinch" >&6
+
+ if test "$cf_cv_fixup_sigwinch" != unknown ; then
+@@ -12702,13 +12729,13 @@
+
+ # Checks for CODESET support.
+
+-echo "$as_me:12705: checking for nl_langinfo and CODESET" >&5
++echo "$as_me:12732: 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 12711 "configure"
++#line 12738 "configure"
+ #include "confdefs.h"
+
+ $ac_includes_default
+@@ -12722,16 +12749,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:12725: \"$ac_link\"") >&5
++if { (eval echo "$as_me:12752: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:12728: \$? = $ac_status" >&5
++ echo "$as_me:12755: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:12731: \"$ac_try\"") >&5
++ { (eval echo "$as_me:12758: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:12734: \$? = $ac_status" >&5
++ echo "$as_me:12761: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ am_cv_langinfo_codeset=yes
+ else
+@@ -12742,7 +12769,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+
+ fi
+-echo "$as_me:12745: result: $am_cv_langinfo_codeset" >&5
++echo "$as_me:12772: result: $am_cv_langinfo_codeset" >&5
+ echo "${ECHO_T}$am_cv_langinfo_codeset" >&6
+ if test "$am_cv_langinfo_codeset" = yes; then
+
+@@ -12756,7 +12783,7 @@
+ NCURSES_OK_WCHAR_T=
+ NCURSES_OK_WINT_T=
+
+-echo "$as_me:12759: checking if you want wide-character code" >&5
++echo "$as_me:12786: 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.
+@@ -12766,7 +12793,7 @@
+ else
+ with_widec=$cf_dft_widec
+ fi;
+-echo "$as_me:12769: result: $with_widec" >&5
++echo "$as_me:12796: result: $with_widec" >&5
+ echo "${ECHO_T}$with_widec" >&6
+
+ NCURSES_WCWIDTH_GRAPHICS=1
+@@ -12788,7 +12815,7 @@
+ (*_XOPEN_SOURCE=*)
+ ;;
+ (*)
+- { echo "$as_me:12791: WARNING: _XOPEN_SOURCE feature test macro appears to be predefined" >&5
++ { echo "$as_me:12818: 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"
+@@ -12801,23 +12828,23 @@
+
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-echo "$as_me:12804: checking for $ac_header" >&5
++echo "$as_me:12831: 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 12810 "configure"
++#line 12837 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:12814: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:12841: \"$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:12820: \$? = $ac_status" >&5
++ echo "$as_me:12847: \$? = $ac_status" >&5
+ (exit "$ac_status"); } >/dev/null; then
+ if test -s conftest.err; then
+ ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -12836,7 +12863,7 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:12839: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
++echo "$as_me:12866: 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
+@@ -12846,14 +12873,14 @@
+ fi
+ done
+
+-echo "$as_me:12849: checking if wchar.h can be used as is" >&5
++echo "$as_me:12876: 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 12856 "configure"
++#line 12883 "configure"
+ #include "confdefs.h"
+
+ $ac_includes_default
+@@ -12875,16 +12902,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:12878: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:12905: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:12881: \$? = $ac_status" >&5
++ echo "$as_me:12908: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:12884: \"$ac_try\"") >&5
++ { (eval echo "$as_me:12911: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:12887: \$? = $ac_status" >&5
++ echo "$as_me:12914: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_wchar_h_okay=yes
+ else
+@@ -12894,16 +12921,16 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:12897: result: $cf_cv_wchar_h_okay" >&5
++echo "$as_me:12924: 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:12903: checking if we must define _XOPEN_SOURCE_EXTENDED" >&5
++echo "$as_me:12930: 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 12906 "configure"
++#line 12933 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+
+@@ -12919,16 +12946,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:12922: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:12949: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:12925: \$? = $ac_status" >&5
++ echo "$as_me:12952: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:12928: \"$ac_try\"") >&5
++ { (eval echo "$as_me:12955: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:12931: \$? = $ac_status" >&5
++ echo "$as_me:12958: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_result=no
+ else
+@@ -12937,16 +12964,16 @@
+ cf_result=yes
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+-echo "$as_me:12940: result: $cf_result" >&5
++echo "$as_me:12967: 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:12946: checking checking for compatible value versus " >&5
++ echo "$as_me:12973: 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 12949 "configure"
++#line 12976 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+
+@@ -12962,16 +12989,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:12965: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:12992: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:12968: \$? = $ac_status" >&5
++ echo "$as_me:12995: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:12971: \"$ac_try\"") >&5
++ { (eval echo "$as_me:12998: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:12974: \$? = $ac_status" >&5
++ echo "$as_me:13001: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_result=yes
+ else
+@@ -12980,7 +13007,7 @@
+ cf_result=no
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+- echo "$as_me:12983: result: $cf_result" >&5
++ echo "$as_me:13010: result: $cf_result" >&5
+ echo "${ECHO_T}$cf_result" >&6
+ if test "$cf_result" = no ; then
+ # perhaps we can override it - try...
+@@ -12990,7 +13017,7 @@
+
+ fi
+
+-echo "$as_me:12993: checking if wcwidth agrees graphics are single-width" >&5
++echo "$as_me:13020: 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
+@@ -13061,7 +13088,7 @@
+ cf_cv_wcwidth_graphics=unknown
+ else
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 13064 "configure"
++#line 13091 "configure"
+ #include "confdefs.h"
+
+ $ac_includes_default
+@@ -13106,15 +13133,15 @@
+
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:13109: \"$ac_link\"") >&5
++if { (eval echo "$as_me:13136: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:13112: \$? = $ac_status" >&5
++ echo "$as_me:13139: \$? = $ac_status" >&5
+ (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+- { (eval echo "$as_me:13114: \"$ac_try\"") >&5
++ { (eval echo "$as_me:13141: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:13117: \$? = $ac_status" >&5
++ echo "$as_me:13144: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_wcwidth_graphics=yes
+ else
+@@ -13127,7 +13154,7 @@
+ fi
+
+ fi
+-echo "$as_me:13130: result: $cf_cv_wcwidth_graphics" >&5
++echo "$as_me:13157: result: $cf_cv_wcwidth_graphics" >&5
+ echo "${ECHO_T}$cf_cv_wcwidth_graphics" >&6
+
+ test "$cf_cv_wcwidth_graphics" = no && NCURSES_WCWIDTH_GRAPHICS=0
+@@ -13138,13 +13165,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:13141: checking for $ac_func" >&5
++echo "$as_me:13168: 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 13147 "configure"
++#line 13174 "configure"
+ #include "confdefs.h"
+ #define $ac_func autoconf_temporary
+ #include <limits.h> /* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -13175,16 +13202,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:13178: \"$ac_link\"") >&5
++if { (eval echo "$as_me:13205: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:13181: \$? = $ac_status" >&5
++ echo "$as_me:13208: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:13184: \"$ac_try\"") >&5
++ { (eval echo "$as_me:13211: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:13187: \$? = $ac_status" >&5
++ echo "$as_me:13214: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ eval "$as_ac_var=yes"
+ else
+@@ -13194,7 +13221,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:13197: result: `eval echo '${'"$as_ac_var"'}'`" >&5
++echo "$as_me:13224: 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
+@@ -13209,23 +13236,23 @@
+ for ac_header in wchar.h
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-echo "$as_me:13212: checking for $ac_header" >&5
++echo "$as_me:13239: 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 13218 "configure"
++#line 13245 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:13222: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:13249: \"$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:13228: \$? = $ac_status" >&5
++ echo "$as_me:13255: \$? = $ac_status" >&5
+ (exit "$ac_status"); } >/dev/null; then
+ if test -s conftest.err; then
+ ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -13244,7 +13271,7 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:13247: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
++echo "$as_me:13274: 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
+@@ -13254,7 +13281,7 @@
+ fi
+ done
+
+-echo "$as_me:13257: checking for multibyte character support" >&5
++echo "$as_me:13284: 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
+@@ -13262,7 +13289,7 @@
+
+ cf_save_LIBS="$LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 13265 "configure"
++#line 13292 "configure"
+ #include "confdefs.h"
+
+ $ac_includes_default
+@@ -13279,16 +13306,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:13282: \"$ac_link\"") >&5
++if { (eval echo "$as_me:13309: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:13285: \$? = $ac_status" >&5
++ echo "$as_me:13312: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:13288: \"$ac_try\"") >&5
++ { (eval echo "$as_me:13315: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:13291: \$? = $ac_status" >&5
++ echo "$as_me:13318: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_utf8_lib=yes
+ else
+@@ -13300,12 +13327,12 @@
+ cf_cv_header_path_utf8=
+ cf_cv_library_path_utf8=
+
+-echo "${as_me:-configure}:13303: testing Starting FIND_LINKAGE(utf8,) ..." 1>&5
++echo "${as_me:-configure}:13330: testing Starting FIND_LINKAGE(utf8,) ..." 1>&5
+
+ cf_save_LIBS="$LIBS"
+
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 13308 "configure"
++#line 13335 "configure"
+ #include "confdefs.h"
+
+ #include <libutf8.h>
+@@ -13318,16 +13345,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:13321: \"$ac_link\"") >&5
++if { (eval echo "$as_me:13348: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:13324: \$? = $ac_status" >&5
++ echo "$as_me:13351: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:13327: \"$ac_try\"") >&5
++ { (eval echo "$as_me:13354: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:13330: \$? = $ac_status" >&5
++ echo "$as_me:13357: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+
+ cf_cv_find_linkage_utf8=yes
+@@ -13341,7 +13368,7 @@
+ LIBS="-lutf8 $cf_save_LIBS"
+
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 13344 "configure"
++#line 13371 "configure"
+ #include "confdefs.h"
+
+ #include <libutf8.h>
+@@ -13354,16 +13381,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:13357: \"$ac_link\"") >&5
++if { (eval echo "$as_me:13384: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:13360: \$? = $ac_status" >&5
++ echo "$as_me:13387: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:13363: \"$ac_try\"") >&5
++ { (eval echo "$as_me:13390: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:13366: \$? = $ac_status" >&5
++ echo "$as_me:13393: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+
+ cf_cv_find_linkage_utf8=yes
+@@ -13380,9 +13407,9 @@
+
+ test -n "$verbose" && echo " find linkage for utf8 library" 1>&6
+
+-echo "${as_me:-configure}:13383: testing find linkage for utf8 library ..." 1>&5
++echo "${as_me:-configure}:13410: testing find linkage for utf8 library ..." 1>&5
+
+-echo "${as_me:-configure}:13385: testing Searching for headers in FIND_LINKAGE(utf8,) ..." 1>&5
++echo "${as_me:-configure}:13412: testing Searching for headers in FIND_LINKAGE(utf8,) ..." 1>&5
+
+ cf_save_CPPFLAGS="$CPPFLAGS"
+ cf_test_CPPFLAGS="$CPPFLAGS"
+@@ -13473,7 +13500,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}:13476: testing ... testing $cf_cv_header_path_utf8 ..." 1>&5
++echo "${as_me:-configure}:13503: testing ... testing $cf_cv_header_path_utf8 ..." 1>&5
+
+ CPPFLAGS="$cf_save_CPPFLAGS"
+
+@@ -13481,7 +13508,7 @@
+ CPPFLAGS="${CPPFLAGS}-I$cf_cv_header_path_utf8"
+
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 13484 "configure"
++#line 13511 "configure"
+ #include "confdefs.h"
+
+ #include <libutf8.h>
+@@ -13494,21 +13521,21 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:13497: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:13524: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:13500: \$? = $ac_status" >&5
++ echo "$as_me:13527: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:13503: \"$ac_try\"") >&5
++ { (eval echo "$as_me:13530: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:13506: \$? = $ac_status" >&5
++ echo "$as_me:13533: \$? = $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}:13511: testing ... found utf8 headers in $cf_cv_header_path_utf8 ..." 1>&5
++echo "${as_me:-configure}:13538: testing ... found utf8 headers in $cf_cv_header_path_utf8 ..." 1>&5
+
+ cf_cv_find_linkage_utf8=maybe
+ cf_test_CPPFLAGS="$CPPFLAGS"
+@@ -13526,7 +13553,7 @@
+
+ if test "$cf_cv_find_linkage_utf8" = maybe ; then
+
+-echo "${as_me:-configure}:13529: testing Searching for utf8 library in FIND_LINKAGE(utf8,) ..." 1>&5
++echo "${as_me:-configure}:13556: testing Searching for utf8 library in FIND_LINKAGE(utf8,) ..." 1>&5
+
+ cf_save_LIBS="$LIBS"
+ cf_save_LDFLAGS="$LDFLAGS"
+@@ -13601,13 +13628,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}:13604: testing ... testing $cf_cv_library_path_utf8 ..." 1>&5
++echo "${as_me:-configure}:13631: 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 13610 "configure"
++#line 13637 "configure"
+ #include "confdefs.h"
+
+ #include <libutf8.h>
+@@ -13620,21 +13647,21 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:13623: \"$ac_link\"") >&5
++if { (eval echo "$as_me:13650: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:13626: \$? = $ac_status" >&5
++ echo "$as_me:13653: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:13629: \"$ac_try\"") >&5
++ { (eval echo "$as_me:13656: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:13632: \$? = $ac_status" >&5
++ echo "$as_me:13659: \$? = $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}:13637: testing ... found utf8 library in $cf_cv_library_path_utf8 ..." 1>&5
++echo "${as_me:-configure}:13664: testing ... found utf8 library in $cf_cv_library_path_utf8 ..." 1>&5
+
+ cf_cv_find_linkage_utf8=yes
+ cf_cv_library_file_utf8="-lutf8"
+@@ -13676,7 +13703,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:13679: result: $cf_cv_utf8_lib" >&5
++echo "$as_me:13706: 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
+@@ -13714,7 +13741,7 @@
+ CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
+
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 13717 "configure"
++#line 13744 "configure"
+ #include "confdefs.h"
+ #include <stdio.h>
+ int
+@@ -13726,16 +13753,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:13729: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:13756: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:13732: \$? = $ac_status" >&5
++ echo "$as_me:13759: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:13735: \"$ac_try\"") >&5
++ { (eval echo "$as_me:13762: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:13738: \$? = $ac_status" >&5
++ echo "$as_me:13765: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ :
+ else
+@@ -13752,7 +13779,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}:13755: testing adding $cf_add_incdir to include-path ..." 1>&5
++echo "${as_me:-configure}:13782: testing adding $cf_add_incdir to include-path ..." 1>&5
+
+ CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
+
+@@ -13788,7 +13815,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}:13791: testing adding $cf_add_libdir to library-path ..." 1>&5
++echo "${as_me:-configure}:13818: testing adding $cf_add_libdir to library-path ..." 1>&5
+
+ LDFLAGS="-L$cf_add_libdir $LDFLAGS"
+ fi
+@@ -13820,14 +13847,14 @@
+ fi
+
+ # This is needed on Tru64 5.0 to declare mbstate_t
+-echo "$as_me:13823: checking if we must include wchar.h to declare mbstate_t" >&5
++echo "$as_me:13850: 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 13830 "configure"
++#line 13857 "configure"
+ #include "confdefs.h"
+
+ #include <stdlib.h>
+@@ -13845,23 +13872,23 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:13848: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:13875: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:13851: \$? = $ac_status" >&5
++ echo "$as_me:13878: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:13854: \"$ac_try\"") >&5
++ { (eval echo "$as_me:13881: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:13857: \$? = $ac_status" >&5
++ echo "$as_me:13884: \$? = $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 13864 "configure"
++#line 13891 "configure"
+ #include "confdefs.h"
+
+ #include <stdlib.h>
+@@ -13880,16 +13907,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:13883: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:13910: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:13886: \$? = $ac_status" >&5
++ echo "$as_me:13913: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:13889: \"$ac_try\"") >&5
++ { (eval echo "$as_me:13916: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:13892: \$? = $ac_status" >&5
++ echo "$as_me:13919: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_mbstate_t=yes
+ else
+@@ -13901,7 +13928,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:13904: result: $cf_cv_mbstate_t" >&5
++echo "$as_me:13931: result: $cf_cv_mbstate_t" >&5
+ echo "${ECHO_T}$cf_cv_mbstate_t" >&6
+
+ if test "$cf_cv_mbstate_t" = yes ; then
+@@ -13919,14 +13946,14 @@
+ fi
+
+ # This is needed on Tru64 5.0 to declare wchar_t
+-echo "$as_me:13922: checking if we must include wchar.h to declare wchar_t" >&5
++echo "$as_me:13949: 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 13929 "configure"
++#line 13956 "configure"
+ #include "confdefs.h"
+
+ #include <stdlib.h>
+@@ -13944,23 +13971,23 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:13947: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:13974: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:13950: \$? = $ac_status" >&5
++ echo "$as_me:13977: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:13953: \"$ac_try\"") >&5
++ { (eval echo "$as_me:13980: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:13956: \$? = $ac_status" >&5
++ echo "$as_me:13983: \$? = $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 13963 "configure"
++#line 13990 "configure"
+ #include "confdefs.h"
+
+ #include <stdlib.h>
+@@ -13979,16 +14006,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:13982: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:14009: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:13985: \$? = $ac_status" >&5
++ echo "$as_me:14012: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:13988: \"$ac_try\"") >&5
++ { (eval echo "$as_me:14015: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:13991: \$? = $ac_status" >&5
++ echo "$as_me:14018: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_wchar_t=yes
+ else
+@@ -14000,7 +14027,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:14003: result: $cf_cv_wchar_t" >&5
++echo "$as_me:14030: result: $cf_cv_wchar_t" >&5
+ echo "${ECHO_T}$cf_cv_wchar_t" >&6
+
+ if test "$cf_cv_wchar_t" = yes ; then
+@@ -14023,14 +14050,14 @@
+ fi
+
+ # This is needed on Tru64 5.0 to declare wint_t
+-echo "$as_me:14026: checking if we must include wchar.h to declare wint_t" >&5
++echo "$as_me:14053: 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 14033 "configure"
++#line 14060 "configure"
+ #include "confdefs.h"
+
+ #include <stdlib.h>
+@@ -14048,23 +14075,23 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:14051: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:14078: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:14054: \$? = $ac_status" >&5
++ echo "$as_me:14081: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:14057: \"$ac_try\"") >&5
++ { (eval echo "$as_me:14084: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:14060: \$? = $ac_status" >&5
++ echo "$as_me:14087: \$? = $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 14067 "configure"
++#line 14094 "configure"
+ #include "confdefs.h"
+
+ #include <stdlib.h>
+@@ -14083,16 +14110,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:14086: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:14113: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:14089: \$? = $ac_status" >&5
++ echo "$as_me:14116: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:14092: \"$ac_try\"") >&5
++ { (eval echo "$as_me:14119: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:14095: \$? = $ac_status" >&5
++ echo "$as_me:14122: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_wint_t=yes
+ else
+@@ -14104,7 +14131,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:14107: result: $cf_cv_wint_t" >&5
++echo "$as_me:14134: result: $cf_cv_wint_t" >&5
+ echo "${ECHO_T}$cf_cv_wint_t" >&6
+
+ if test "$cf_cv_wint_t" = yes ; then
+@@ -14136,7 +14163,7 @@
+ fi
+
+ ### use option --disable-lp64 to allow long chtype
+-echo "$as_me:14139: checking whether to enable _LP64 definition in curses.h" >&5
++echo "$as_me:14166: 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.
+@@ -14146,7 +14173,7 @@
+ else
+ with_lp64=$cf_dft_with_lp64
+ fi;
+-echo "$as_me:14149: result: $with_lp64" >&5
++echo "$as_me:14176: result: $with_lp64" >&5
+ echo "${ECHO_T}$with_lp64" >&6
+
+ if test "x$with_lp64" = xyes ; then
+@@ -14162,7 +14189,7 @@
+ fi;
+ if test "$enable_largefile" != no; then
+
+- echo "$as_me:14165: checking for special C compiler options needed for large files" >&5
++ echo "$as_me:14192: 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
+@@ -14174,7 +14201,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 14177 "configure"
++#line 14204 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ /* Check that off_t can represent 2**63 - 1 correctly.
+@@ -14194,16 +14221,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:14197: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:14224: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:14200: \$? = $ac_status" >&5
++ echo "$as_me:14227: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:14203: \"$ac_try\"") >&5
++ { (eval echo "$as_me:14230: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:14206: \$? = $ac_status" >&5
++ echo "$as_me:14233: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ break
+ else
+@@ -14213,16 +14240,16 @@
+ rm -f "conftest.$ac_objext"
+ CC="$CC -n32"
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:14216: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:14243: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:14219: \$? = $ac_status" >&5
++ echo "$as_me:14246: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:14222: \"$ac_try\"") >&5
++ { (eval echo "$as_me:14249: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:14225: \$? = $ac_status" >&5
++ echo "$as_me:14252: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_sys_largefile_CC=' -n32'; break
+ else
+@@ -14236,13 +14263,13 @@
+ rm -f "conftest.$ac_ext"
+ fi
+ fi
+-echo "$as_me:14239: result: $ac_cv_sys_largefile_CC" >&5
++echo "$as_me:14266: 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:14245: checking for _FILE_OFFSET_BITS value needed for large files" >&5
++ echo "$as_me:14272: 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
+@@ -14250,7 +14277,7 @@
+ while :; do
+ ac_cv_sys_file_offset_bits=no
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 14253 "configure"
++#line 14280 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ /* Check that off_t can represent 2**63 - 1 correctly.
+@@ -14270,16 +14297,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:14273: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:14300: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:14276: \$? = $ac_status" >&5
++ echo "$as_me:14303: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:14279: \"$ac_try\"") >&5
++ { (eval echo "$as_me:14306: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:14282: \$? = $ac_status" >&5
++ echo "$as_me:14309: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ break
+ else
+@@ -14288,7 +14315,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 14291 "configure"
++#line 14318 "configure"
+ #include "confdefs.h"
+ #define _FILE_OFFSET_BITS 64
+ #include <sys/types.h>
+@@ -14309,16 +14336,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:14312: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:14339: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:14315: \$? = $ac_status" >&5
++ echo "$as_me:14342: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:14318: \"$ac_try\"") >&5
++ { (eval echo "$as_me:14345: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:14321: \$? = $ac_status" >&5
++ echo "$as_me:14348: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_sys_file_offset_bits=64; break
+ else
+@@ -14329,7 +14356,7 @@
+ break
+ done
+ fi
+-echo "$as_me:14332: result: $ac_cv_sys_file_offset_bits" >&5
++echo "$as_me:14359: 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
+
+@@ -14339,7 +14366,7 @@
+
+ fi
+ rm -rf conftest*
+- echo "$as_me:14342: checking for _LARGE_FILES value needed for large files" >&5
++ echo "$as_me:14369: 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
+@@ -14347,7 +14374,7 @@
+ while :; do
+ ac_cv_sys_large_files=no
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 14350 "configure"
++#line 14377 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ /* Check that off_t can represent 2**63 - 1 correctly.
+@@ -14367,16 +14394,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:14370: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:14397: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:14373: \$? = $ac_status" >&5
++ echo "$as_me:14400: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:14376: \"$ac_try\"") >&5
++ { (eval echo "$as_me:14403: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:14379: \$? = $ac_status" >&5
++ echo "$as_me:14406: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ break
+ else
+@@ -14385,7 +14412,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 14388 "configure"
++#line 14415 "configure"
+ #include "confdefs.h"
+ #define _LARGE_FILES 1
+ #include <sys/types.h>
+@@ -14406,16 +14433,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:14409: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:14436: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:14412: \$? = $ac_status" >&5
++ echo "$as_me:14439: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:14415: \"$ac_try\"") >&5
++ { (eval echo "$as_me:14442: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:14418: \$? = $ac_status" >&5
++ echo "$as_me:14445: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_sys_large_files=1; break
+ else
+@@ -14426,7 +14453,7 @@
+ break
+ done
+ fi
+-echo "$as_me:14429: result: $ac_cv_sys_large_files" >&5
++echo "$as_me:14456: 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
+
+@@ -14439,7 +14466,7 @@
+ fi
+
+ if test "$enable_largefile" != no ; then
+- echo "$as_me:14442: checking for _LARGEFILE_SOURCE value needed for large files" >&5
++ echo "$as_me:14469: 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
+@@ -14447,7 +14474,7 @@
+ while :; do
+ ac_cv_sys_largefile_source=no
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 14450 "configure"
++#line 14477 "configure"
+ #include "confdefs.h"
+ #include <stdio.h>
+ #include <sys/types.h>
+@@ -14462,16 +14489,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:14465: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:14492: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:14468: \$? = $ac_status" >&5
++ echo "$as_me:14495: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:14471: \"$ac_try\"") >&5
++ { (eval echo "$as_me:14498: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:14474: \$? = $ac_status" >&5
++ echo "$as_me:14501: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ break
+ else
+@@ -14480,7 +14507,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 14483 "configure"
++#line 14510 "configure"
+ #include "confdefs.h"
+ #define _LARGEFILE_SOURCE 1
+ #include <stdio.h>
+@@ -14496,16 +14523,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:14499: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:14526: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:14502: \$? = $ac_status" >&5
++ echo "$as_me:14529: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:14505: \"$ac_try\"") >&5
++ { (eval echo "$as_me:14532: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:14508: \$? = $ac_status" >&5
++ echo "$as_me:14535: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_sys_largefile_source=1; break
+ else
+@@ -14516,7 +14543,7 @@
+ break
+ done
+ fi
+-echo "$as_me:14519: result: $ac_cv_sys_largefile_source" >&5
++echo "$as_me:14546: 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
+
+@@ -14530,13 +14557,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:14533: checking for fseeko" >&5
++echo "$as_me:14560: 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 14539 "configure"
++#line 14566 "configure"
+ #include "confdefs.h"
+ #include <stdio.h>
+ #include <sys/types.h>
+@@ -14550,16 +14577,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:14553: \"$ac_link\"") >&5
++if { (eval echo "$as_me:14580: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:14556: \$? = $ac_status" >&5
++ echo "$as_me:14583: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:14559: \"$ac_try\"") >&5
++ { (eval echo "$as_me:14586: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:14562: \$? = $ac_status" >&5
++ echo "$as_me:14589: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_func_fseeko=yes
+ else
+@@ -14569,7 +14596,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:14572: result: $ac_cv_func_fseeko" >&5
++echo "$as_me:14599: result: $ac_cv_func_fseeko" >&5
+ echo "${ECHO_T}$ac_cv_func_fseeko" >&6
+ if test $ac_cv_func_fseeko = yes; then
+
+@@ -14608,14 +14635,14 @@
+
+ fi
+
+- echo "$as_me:14611: checking whether to use struct dirent64" >&5
++ echo "$as_me:14638: 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 14618 "configure"
++#line 14645 "configure"
+ #include "confdefs.h"
+
+ #pragma GCC diagnostic error "-Wincompatible-pointer-types"
+@@ -14642,16 +14669,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:14645: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:14672: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:14648: \$? = $ac_status" >&5
++ echo "$as_me:14675: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:14651: \"$ac_try\"") >&5
++ { (eval echo "$as_me:14678: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:14654: \$? = $ac_status" >&5
++ echo "$as_me:14681: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_struct_dirent64=yes
+ else
+@@ -14662,7 +14689,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+
+ fi
+-echo "$as_me:14665: result: $cf_cv_struct_dirent64" >&5
++echo "$as_me:14692: result: $cf_cv_struct_dirent64" >&5
+ echo "${ECHO_T}$cf_cv_struct_dirent64" >&6
+ test "$cf_cv_struct_dirent64" = yes &&
+ cat >>confdefs.h <<\EOF
+@@ -14672,7 +14699,7 @@
+ fi
+
+ ### use option --disable-tparm-varargs to make tparm() conform to X/Open
+-echo "$as_me:14675: checking if you want tparm not to use X/Open fixed-parameter list" >&5
++echo "$as_me:14702: 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.
+@@ -14682,14 +14709,14 @@
+ else
+ with_tparm_varargs=yes
+ fi;
+-echo "$as_me:14685: result: $with_tparm_varargs" >&5
++echo "$as_me:14712: 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:14692: checking if you want tic library to use explicit dependency on ncurses$LIB_SUFFIX library" >&5
++echo "$as_me:14719: 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.
+@@ -14699,14 +14726,14 @@
+ else
+ with_tic_depends=yes
+ fi;
+-echo "$as_me:14702: result: $with_tic_depends" >&5
++echo "$as_me:14729: 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:14709: checking if you want to enable wattr* macros" >&5
++echo "$as_me:14736: 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.
+@@ -14718,15 +14745,15 @@
+ fi;
+ if [ "x$with_wattr_macros" != xyes ]; then
+ NCURSES_WATTR_MACROS=0
+- echo "$as_me:14721: result: no" >&5
++ echo "$as_me:14748: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ else
+ NCURSES_WATTR_MACROS=1
+- echo "$as_me:14725: result: yes" >&5
++ echo "$as_me:14752: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ fi
+
+-echo "$as_me:14729: checking for X11 rgb file" >&5
++echo "$as_me:14756: 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.
+@@ -14788,7 +14815,7 @@
+ cf_path=`echo "$cf_path" | sed -e s%NONE%$cf_path_syntax%`
+ ;;
+ (*)
+- { { echo "$as_me:14791: error: expected a pathname, not \"$cf_path\"" >&5
++ { { echo "$as_me:14818: error: expected a pathname, not \"$cf_path\"" >&5
+ echo "$as_me: error: expected a pathname, not \"$cf_path\"" >&2;}
+ { (exit 1); exit 1; }; }
+ ;;
+@@ -14796,7 +14823,7 @@
+
+ fi
+
+-echo "$as_me:14799: result: $RGB_PATH" >&5
++echo "$as_me:14826: result: $RGB_PATH" >&5
+ echo "${ECHO_T}$RGB_PATH" >&6
+
+ cat >>confdefs.h <<EOF
+@@ -14811,7 +14838,7 @@
+
+ ### use option --with-bool to override bool's type
+
+-echo "$as_me:14814: checking for type of bool" >&5
++echo "$as_me:14841: 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.
+@@ -14821,17 +14848,17 @@
+ else
+ NCURSES_BOOL=auto
+ fi;
+-echo "$as_me:14824: result: $NCURSES_BOOL" >&5
++echo "$as_me:14851: result: $NCURSES_BOOL" >&5
+ echo "${ECHO_T}$NCURSES_BOOL" >&6
+ case x$NCURSES_BOOL in
+ (x|xyes|xno)
+- { { echo "$as_me:14828: error: expected a type name for bool" >&5
++ { { echo "$as_me:14855: 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:14834: checking for alternate terminal capabilities file" >&5
++echo "$as_me:14861: 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.
+@@ -14843,16 +14870,16 @@
+ fi;
+ if test ! -f "${srcdir}/include/${TERMINFO_CAPS}"
+ then
+- { echo "$as_me:14846: WARNING: file not found: \"${srcdir}/include/${TERMINFO_CAPS}\"" >&5
++ { echo "$as_me:14873: 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:14850: result: $TERMINFO_CAPS" >&5
++echo "$as_me:14877: result: $TERMINFO_CAPS" >&5
+ echo "${ECHO_T}$TERMINFO_CAPS" >&6
+
+ ### use option --with-chtype to override chtype's type
+
+-echo "$as_me:14855: checking for type of chtype" >&5
++echo "$as_me:14882: 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.
+@@ -14862,11 +14889,11 @@
+ else
+ NCURSES_CHTYPE=$cf_dft_chtype
+ fi;
+-echo "$as_me:14865: result: $NCURSES_CHTYPE" >&5
++echo "$as_me:14892: result: $NCURSES_CHTYPE" >&5
+ echo "${ECHO_T}$NCURSES_CHTYPE" >&6
+ case x$NCURSES_CHTYPE in
+ (x|xyes|xno)
+- { { echo "$as_me:14869: error: expected a type name for chtype" >&5
++ { { echo "$as_me:14896: error: expected a type name for chtype" >&5
+ echo "$as_me: error: expected a type name for chtype" >&2;}
+ { (exit 1); exit 1; }; }
+ ;;
+@@ -14874,7 +14901,7 @@
+
+ ### use option --with-ospeed to override ospeed's type
+
+-echo "$as_me:14877: checking for type of ospeed" >&5
++echo "$as_me:14904: 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.
+@@ -14884,11 +14911,11 @@
+ else
+ NCURSES_OSPEED=short
+ fi;
+-echo "$as_me:14887: result: $NCURSES_OSPEED" >&5
++echo "$as_me:14914: result: $NCURSES_OSPEED" >&5
+ echo "${ECHO_T}$NCURSES_OSPEED" >&6
+ case x$NCURSES_OSPEED in
+ (x|xyes|xno)
+- { { echo "$as_me:14891: error: expected a type name for ospeed" >&5
++ { { echo "$as_me:14918: error: expected a type name for ospeed" >&5
+ echo "$as_me: error: expected a type name for ospeed" >&2;}
+ { (exit 1); exit 1; }; }
+ ;;
+@@ -14896,7 +14923,7 @@
+
+ ### use option --with-mmask-t to override mmask_t's type
+
+-echo "$as_me:14899: checking for type of mmask-t" >&5
++echo "$as_me:14926: 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.
+@@ -14906,18 +14933,18 @@
+ else
+ NCURSES_MMASK_T=$cf_dft_mmask_t
+ fi;
+-echo "$as_me:14909: result: $NCURSES_MMASK_T" >&5
++echo "$as_me:14936: result: $NCURSES_MMASK_T" >&5
+ echo "${ECHO_T}$NCURSES_MMASK_T" >&6
+ case x$NCURSES_MMASK_T in
+ (x|xyes|xno)
+- { { echo "$as_me:14913: error: expected a type name for mmask-t" >&5
++ { { echo "$as_me:14940: 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:14920: checking for size CCHARW_MAX" >&5
++echo "$as_me:14947: 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.
+@@ -14927,16 +14954,16 @@
+ else
+ NCURSES_CCHARW_MAX=$cf_dft_ccharw_max
+ fi;
+-echo "$as_me:14930: result: $NCURSES_CCHARW_MAX" >&5
++echo "$as_me:14957: result: $NCURSES_CCHARW_MAX" >&5
+ echo "${ECHO_T}$NCURSES_CCHARW_MAX" >&6
+
+-echo "$as_me:14933: checking for signed char" >&5
++echo "$as_me:14960: 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 14939 "configure"
++#line 14966 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -14951,16 +14978,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:14954: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:14981: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:14957: \$? = $ac_status" >&5
++ echo "$as_me:14984: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:14960: \"$ac_try\"") >&5
++ { (eval echo "$as_me:14987: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:14963: \$? = $ac_status" >&5
++ echo "$as_me:14990: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_type_signed_char=yes
+ else
+@@ -14970,10 +14997,10 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:14973: result: $ac_cv_type_signed_char" >&5
++echo "$as_me:15000: result: $ac_cv_type_signed_char" >&5
+ echo "${ECHO_T}$ac_cv_type_signed_char" >&6
+
+-echo "$as_me:14976: checking size of signed char" >&5
++echo "$as_me:15003: 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
+@@ -14982,7 +15009,7 @@
+ if test "$cross_compiling" = yes; then
+ # Depending upon the size, compute the lo and hi bounds.
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 14985 "configure"
++#line 15012 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -14994,21 +15021,21 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:14997: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:15024: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:15000: \$? = $ac_status" >&5
++ echo "$as_me:15027: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:15003: \"$ac_try\"") >&5
++ { (eval echo "$as_me:15030: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:15006: \$? = $ac_status" >&5
++ echo "$as_me:15033: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_lo=0 ac_mid=0
+ while :; do
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 15011 "configure"
++#line 15038 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -15020,16 +15047,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:15023: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:15050: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:15026: \$? = $ac_status" >&5
++ echo "$as_me:15053: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:15029: \"$ac_try\"") >&5
++ { (eval echo "$as_me:15056: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:15032: \$? = $ac_status" >&5
++ echo "$as_me:15059: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_hi=$ac_mid; break
+ else
+@@ -15045,7 +15072,7 @@
+ ac_hi=-1 ac_mid=-1
+ while :; do
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 15048 "configure"
++#line 15075 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -15057,16 +15084,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:15060: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:15087: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:15063: \$? = $ac_status" >&5
++ echo "$as_me:15090: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:15066: \"$ac_try\"") >&5
++ { (eval echo "$as_me:15093: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:15069: \$? = $ac_status" >&5
++ echo "$as_me:15096: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_lo=$ac_mid; break
+ else
+@@ -15082,7 +15109,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 15085 "configure"
++#line 15112 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -15094,16 +15121,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:15097: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:15124: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:15100: \$? = $ac_status" >&5
++ echo "$as_me:15127: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:15103: \"$ac_try\"") >&5
++ { (eval echo "$as_me:15130: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:15106: \$? = $ac_status" >&5
++ echo "$as_me:15133: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_hi=$ac_mid
+ else
+@@ -15116,12 +15143,12 @@
+ ac_cv_sizeof_signed_char=$ac_lo
+ else
+ if test "$cross_compiling" = yes; then
+- { { echo "$as_me:15119: error: cannot run test program while cross compiling" >&5
++ { { echo "$as_me:15146: 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 15124 "configure"
++#line 15151 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -15137,15 +15164,15 @@
+ }
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:15140: \"$ac_link\"") >&5
++if { (eval echo "$as_me:15167: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:15143: \$? = $ac_status" >&5
++ echo "$as_me:15170: \$? = $ac_status" >&5
+ (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+- { (eval echo "$as_me:15145: \"$ac_try\"") >&5
++ { (eval echo "$as_me:15172: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:15148: \$? = $ac_status" >&5
++ echo "$as_me:15175: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_sizeof_signed_char=`cat conftest.val`
+ else
+@@ -15161,7 +15188,7 @@
+ ac_cv_sizeof_signed_char=0
+ fi
+ fi
+-echo "$as_me:15164: result: $ac_cv_sizeof_signed_char" >&5
++echo "$as_me:15191: 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
+@@ -15172,7 +15199,7 @@
+ else
+ NCURSES_SBOOL="char"
+ fi
+-echo "$as_me:15175: checking whether to use signed chars for Boolean array in term.h" >&5
++echo "$as_me:15202: 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.
+@@ -15182,13 +15209,13 @@
+ else
+ with_signed_char=$cf_dft_signed_char
+ fi;
+-echo "$as_me:15185: result: $with_signed_char" >&5
++echo "$as_me:15212: 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:15191: checking for type of tparm-arg" >&5
++echo "$as_me:15218: 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.
+@@ -15198,18 +15225,18 @@
+ else
+ NCURSES_TPARM_ARG=$cf_dft_tparm_arg
+ fi;
+-echo "$as_me:15201: result: $NCURSES_TPARM_ARG" >&5
++echo "$as_me:15228: result: $NCURSES_TPARM_ARG" >&5
+ echo "${ECHO_T}$NCURSES_TPARM_ARG" >&6
+ case x$NCURSES_TPARM_ARG in
+ (x|xyes|xno)
+- { { echo "$as_me:15205: error: expected a type name for tparm-arg" >&5
++ { { echo "$as_me:15232: 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:15212: checking if RCS identifiers should be compiled-in" >&5
++echo "$as_me:15239: 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.
+@@ -15219,7 +15246,7 @@
+ else
+ with_rcs_ids=no
+ fi;
+-echo "$as_me:15222: result: $with_rcs_ids" >&5
++echo "$as_me:15249: result: $with_rcs_ids" >&5
+ echo "${ECHO_T}$with_rcs_ids" >&6
+ test "x$with_rcs_ids" = xyes &&
+ cat >>confdefs.h <<\EOF
+@@ -15228,7 +15255,7 @@
+
+ ###############################################################################
+
+-echo "$as_me:15231: checking format of man-pages" >&5
++echo "$as_me:15258: 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.
+@@ -15319,10 +15346,10 @@
+ ;;
+ esac
+
+-echo "$as_me:15322: result: $MANPAGE_FORMAT" >&5
++echo "$as_me:15349: result: $MANPAGE_FORMAT" >&5
+ echo "${ECHO_T}$MANPAGE_FORMAT" >&6
+ if test -n "$cf_unknown" ; then
+- { echo "$as_me:15325: WARNING: Unexpected manpage-format $cf_unknown" >&5
++ { echo "$as_me:15352: WARNING: Unexpected manpage-format $cf_unknown" >&5
+ echo "$as_me: WARNING: Unexpected manpage-format $cf_unknown" >&2;}
+ fi
+
+@@ -15363,7 +15390,7 @@
+ esac
+ done
+
+-echo "$as_me:15366: checking for manpage renaming" >&5
++echo "$as_me:15393: 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.
+@@ -15392,15 +15419,15 @@
+ elif test "$MANPAGE_RENAMES" = no ; then
+ :
+ elif test ! -f "$MANPAGE_RENAMES" ; then
+- { { echo "$as_me:15395: error: not a filename: $MANPAGE_RENAMES" >&5
++ { { echo "$as_me:15422: 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:15400: result: $MANPAGE_RENAMES" >&5
++echo "$as_me:15427: result: $MANPAGE_RENAMES" >&5
+ echo "${ECHO_T}$MANPAGE_RENAMES" >&6
+
+-echo "$as_me:15403: checking if manpage aliases will be installed" >&5
++echo "$as_me:15430: 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.
+@@ -15411,7 +15438,7 @@
+ MANPAGE_ALIASES=yes
+ fi;
+
+-echo "$as_me:15414: result: $MANPAGE_ALIASES" >&5
++echo "$as_me:15441: result: $MANPAGE_ALIASES" >&5
+ echo "${ECHO_T}$MANPAGE_ALIASES" >&6
+
+ case "x$LN_S" in
+@@ -15425,7 +15452,7 @@
+
+ MANPAGE_SYMLINKS=no
+ if test "$MANPAGE_ALIASES" = yes ; then
+-echo "$as_me:15428: checking if manpage symlinks should be used" >&5
++echo "$as_me:15455: 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.
+@@ -15438,17 +15465,17 @@
+
+ if test "$cf_use_symlinks" = no; then
+ if test "$MANPAGE_SYMLINKS" = yes ; then
+- { echo "$as_me:15441: WARNING: cannot make symlinks" >&5
++ { echo "$as_me:15468: WARNING: cannot make symlinks" >&5
+ echo "$as_me: WARNING: cannot make symlinks" >&2;}
+ MANPAGE_SYMLINKS=no
+ fi
+ fi
+
+-echo "$as_me:15447: result: $MANPAGE_SYMLINKS" >&5
++echo "$as_me:15474: result: $MANPAGE_SYMLINKS" >&5
+ echo "${ECHO_T}$MANPAGE_SYMLINKS" >&6
+ fi
+
+-echo "$as_me:15451: checking for manpage tbl" >&5
++echo "$as_me:15478: 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.
+@@ -15459,7 +15486,7 @@
+ MANPAGE_TBL=no
+ fi;
+
+-echo "$as_me:15462: result: $MANPAGE_TBL" >&5
++echo "$as_me:15489: result: $MANPAGE_TBL" >&5
+ echo "${ECHO_T}$MANPAGE_TBL" >&6
+
+ if test "$prefix" = "NONE" ; then
+@@ -15777,7 +15804,7 @@
+ ###############################################################################
+
+ ### Note that some functions (such as const) are normally disabled anyway.
+-echo "$as_me:15780: checking if you want to build with function extensions" >&5
++echo "$as_me:15807: 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.
+@@ -15787,7 +15814,7 @@
+ else
+ with_ext_funcs=yes
+ fi;
+-echo "$as_me:15790: result: $with_ext_funcs" >&5
++echo "$as_me:15817: result: $with_ext_funcs" >&5
+ echo "${ECHO_T}$with_ext_funcs" >&6
+ if test "x$with_ext_funcs" = xyes ; then
+ NCURSES_EXT_FUNCS=1
+@@ -15844,7 +15871,7 @@
+ GENERATED_EXT_FUNCS=
+ fi
+
+-echo "$as_me:15847: checking if you want to build with SCREEN extensions" >&5
++echo "$as_me:15874: 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.
+@@ -15854,7 +15881,7 @@
+ else
+ with_sp_funcs=$cf_dft_ext_spfuncs
+ fi;
+-echo "$as_me:15857: result: $with_sp_funcs" >&5
++echo "$as_me:15884: result: $with_sp_funcs" >&5
+ echo "${ECHO_T}$with_sp_funcs" >&6
+ if test "x$with_sp_funcs" = xyes ; then
+ NCURSES_SP_FUNCS=1
+@@ -15873,7 +15900,7 @@
+ GENERATED_SP_FUNCS=
+ fi
+
+-echo "$as_me:15876: checking if you want to build with terminal-driver" >&5
++echo "$as_me:15903: 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.
+@@ -15883,7 +15910,7 @@
+ else
+ with_term_driver=no
+ fi;
+-echo "$as_me:15886: result: $with_term_driver" >&5
++echo "$as_me:15913: result: $with_term_driver" >&5
+ echo "${ECHO_T}$with_term_driver" >&6
+ if test "x$with_term_driver" = xyes ; then
+
+@@ -15892,19 +15919,19 @@
+ EOF
+
+ if test "x$with_termlib" != xno ; then
+- { { echo "$as_me:15895: error: The term-driver option conflicts with the termlib option" >&5
++ { { echo "$as_me:15922: 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:15900: error: The term-driver option relies upon sp-funcs" >&5
++ { { echo "$as_me:15927: 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:15907: checking for extended use of const keyword" >&5
++echo "$as_me:15934: 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.
+@@ -15914,7 +15941,7 @@
+ else
+ with_ext_const=$cf_dft_ext_const
+ fi;
+-echo "$as_me:15917: result: $with_ext_const" >&5
++echo "$as_me:15944: result: $with_ext_const" >&5
+ echo "${ECHO_T}$with_ext_const" >&6
+ NCURSES_CONST='/*nothing*/'
+ if test "x$with_ext_const" = xyes ; then
+@@ -15922,7 +15949,7 @@
+ fi
+
+ ### use option --enable-ext-colors to turn on use of colors beyond 16.
+-echo "$as_me:15925: checking if you want to use extended colors" >&5
++echo "$as_me:15952: 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.
+@@ -15932,12 +15959,12 @@
+ else
+ with_ext_colors=$cf_dft_ext_colors
+ fi;
+-echo "$as_me:15935: result: $with_ext_colors" >&5
++echo "$as_me:15962: 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:15940: WARNING: This option applies only to wide-character library" >&5
++ { echo "$as_me:15967: 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)
+@@ -15948,7 +15975,7 @@
+ cf_cv_rel_version=6.0
+ cf_cv_abi_version=6
+ cf_cv_abi_default=6
+- { echo "$as_me:15951: WARNING: overriding ABI version to $cf_cv_abi_default" >&5
++ { echo "$as_me:15978: WARNING: overriding ABI version to $cf_cv_abi_default" >&5
+ echo "$as_me: WARNING: overriding ABI version to $cf_cv_abi_default" >&2;}
+ ;;
+ esac
+@@ -15976,7 +16003,7 @@
+ fi
+
+ ### use option --enable-ext-mouse to modify coding to support 5-button mice
+-echo "$as_me:15979: checking if you want to use extended mouse encoding" >&5
++echo "$as_me:16006: 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.
+@@ -15986,7 +16013,7 @@
+ else
+ with_ext_mouse=$cf_dft_ext_mouse
+ fi;
+-echo "$as_me:15989: result: $with_ext_mouse" >&5
++echo "$as_me:16016: result: $with_ext_mouse" >&5
+ echo "${ECHO_T}$with_ext_mouse" >&6
+ if test "x$with_ext_mouse" = xyes ; then
+
+@@ -15996,7 +16023,7 @@
+ cf_cv_rel_version=6.0
+ cf_cv_abi_version=6
+ cf_cv_abi_default=6
+- { echo "$as_me:15999: WARNING: overriding ABI version to $cf_cv_abi_default" >&5
++ { echo "$as_me:16026: WARNING: overriding ABI version to $cf_cv_abi_default" >&5
+ echo "$as_me: WARNING: overriding ABI version to $cf_cv_abi_default" >&2;}
+ ;;
+ esac
+@@ -16013,7 +16040,7 @@
+ fi
+
+ ### use option --enable-ext-putwin to turn on extended screendumps
+-echo "$as_me:16016: checking if you want to use extended putwin/screendump" >&5
++echo "$as_me:16043: 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.
+@@ -16023,7 +16050,7 @@
+ else
+ with_ext_putwin=$cf_dft_ext_putwin
+ fi;
+-echo "$as_me:16026: result: $with_ext_putwin" >&5
++echo "$as_me:16053: result: $with_ext_putwin" >&5
+ echo "${ECHO_T}$with_ext_putwin" >&6
+ if test "x$with_ext_putwin" = xyes ; then
+
+@@ -16033,7 +16060,7 @@
+
+ fi
+
+-echo "$as_me:16036: checking if you want \$NCURSES_NO_PADDING code" >&5
++echo "$as_me:16063: 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.
+@@ -16043,7 +16070,7 @@
+ else
+ with_no_padding=$with_ext_funcs
+ fi;
+-echo "$as_me:16046: result: $with_no_padding" >&5
++echo "$as_me:16073: result: $with_no_padding" >&5
+ echo "${ECHO_T}$with_no_padding" >&6
+ test "x$with_no_padding" = xyes &&
+ cat >>confdefs.h <<\EOF
+@@ -16051,7 +16078,7 @@
+ EOF
+
+ ### use option --enable-sigwinch to turn on use of SIGWINCH logic
+-echo "$as_me:16054: checking if you want SIGWINCH handler" >&5
++echo "$as_me:16081: 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.
+@@ -16061,7 +16088,7 @@
+ else
+ with_sigwinch=$with_ext_funcs
+ fi;
+-echo "$as_me:16064: result: $with_sigwinch" >&5
++echo "$as_me:16091: result: $with_sigwinch" >&5
+ echo "${ECHO_T}$with_sigwinch" >&6
+ if test "x$with_sigwinch" = xyes
+ then
+@@ -16076,7 +16103,7 @@
+ fi
+
+ ### use option --enable-tcap-names to allow user to define new capabilities
+-echo "$as_me:16079: checking if you want user-definable terminal capabilities like termcap" >&5
++echo "$as_me:16106: 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.
+@@ -16086,7 +16113,7 @@
+ else
+ with_tcap_names=$with_ext_funcs
+ fi;
+-echo "$as_me:16089: result: $with_tcap_names" >&5
++echo "$as_me:16116: result: $with_tcap_names" >&5
+ echo "${ECHO_T}$with_tcap_names" >&6
+ NCURSES_XNAMES=0
+ if test "x$with_tcap_names" = xyes; then
+@@ -16100,7 +16127,7 @@
+
+ ##############################################################################
+
+-echo "$as_me:16103: checking if you want to link with the pthread library" >&5
++echo "$as_me:16130: 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.
+@@ -16110,27 +16137,27 @@
+ else
+ with_pthread=no
+ fi;
+-echo "$as_me:16113: result: $with_pthread" >&5
++echo "$as_me:16140: result: $with_pthread" >&5
+ echo "${ECHO_T}$with_pthread" >&6
+
+ if test "$with_pthread" != no ; then
+- echo "$as_me:16117: checking for pthread.h" >&5
++ echo "$as_me:16144: 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 16123 "configure"
++#line 16150 "configure"
+ #include "confdefs.h"
+ #include <pthread.h>
+ _ACEOF
+-if { (eval echo "$as_me:16127: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:16154: \"$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:16133: \$? = $ac_status" >&5
++ echo "$as_me:16160: \$? = $ac_status" >&5
+ (exit "$ac_status"); } >/dev/null; then
+ if test -s conftest.err; then
+ ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -16149,7 +16176,7 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:16152: result: $ac_cv_header_pthread_h" >&5
++echo "$as_me:16179: 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
+
+@@ -16159,7 +16186,7 @@
+
+ for cf_lib_pthread in pthread c_r
+ do
+- echo "$as_me:16162: checking if we can link with the $cf_lib_pthread library" >&5
++ echo "$as_me:16189: 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"
+
+@@ -16180,7 +16207,7 @@
+ LIBS="$cf_add_libs"
+
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 16183 "configure"
++#line 16210 "configure"
+ #include "confdefs.h"
+
+ #include <pthread.h>
+@@ -16197,16 +16224,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:16200: \"$ac_link\"") >&5
++if { (eval echo "$as_me:16227: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:16203: \$? = $ac_status" >&5
++ echo "$as_me:16230: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:16206: \"$ac_try\"") >&5
++ { (eval echo "$as_me:16233: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:16209: \$? = $ac_status" >&5
++ echo "$as_me:16236: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ with_pthread=yes
+ else
+@@ -16216,7 +16243,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS="$cf_save_LIBS"
+- echo "$as_me:16219: result: $with_pthread" >&5
++ echo "$as_me:16246: result: $with_pthread" >&5
+ echo "${ECHO_T}$with_pthread" >&6
+ test "$with_pthread" = yes && break
+ done
+@@ -16244,7 +16271,7 @@
+ EOF
+
+ else
+- { { echo "$as_me:16247: error: Cannot link with pthread library" >&5
++ { { echo "$as_me:16274: error: Cannot link with pthread library" >&5
+ echo "$as_me: error: Cannot link with pthread library" >&2;}
+ { (exit 1); exit 1; }; }
+ fi
+@@ -16254,13 +16281,13 @@
+ fi
+
+ if test "x$with_pthread" != xno; then
+- echo "$as_me:16257: checking for pthread_kill" >&5
++ echo "$as_me:16284: 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 16263 "configure"
++#line 16290 "configure"
+ #include "confdefs.h"
+ #define pthread_kill autoconf_temporary
+ #include <limits.h> /* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -16291,16 +16318,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:16294: \"$ac_link\"") >&5
++if { (eval echo "$as_me:16321: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:16297: \$? = $ac_status" >&5
++ echo "$as_me:16324: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:16300: \"$ac_try\"") >&5
++ { (eval echo "$as_me:16327: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:16303: \$? = $ac_status" >&5
++ echo "$as_me:16330: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_func_pthread_kill=yes
+ else
+@@ -16310,11 +16337,11 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:16313: result: $ac_cv_func_pthread_kill" >&5
++echo "$as_me:16340: 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:16317: checking if you want to allow EINTR in wgetch with pthreads" >&5
++ echo "$as_me:16344: 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.
+@@ -16324,7 +16351,7 @@
+ else
+ use_pthreads_eintr=no
+ fi;
+- echo "$as_me:16327: result: $use_pthreads_eintr" >&5
++ echo "$as_me:16354: result: $use_pthreads_eintr" >&5
+ echo "${ECHO_T}$use_pthreads_eintr" >&6
+ if test "x$use_pthreads_eintr" = xyes ; then
+
+@@ -16335,7 +16362,7 @@
+ fi
+ fi
+
+- echo "$as_me:16338: checking if you want to use weak-symbols for pthreads" >&5
++ echo "$as_me:16365: 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.
+@@ -16345,18 +16372,18 @@
+ else
+ use_weak_symbols=no
+ fi;
+- echo "$as_me:16348: result: $use_weak_symbols" >&5
++ echo "$as_me:16375: result: $use_weak_symbols" >&5
+ echo "${ECHO_T}$use_weak_symbols" >&6
+ if test "x$use_weak_symbols" = xyes ; then
+
+-echo "$as_me:16352: checking if $CC supports weak symbols" >&5
++echo "$as_me:16379: 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 16359 "configure"
++#line 16386 "configure"
+ #include "confdefs.h"
+
+ #include <stdio.h>
+@@ -16382,16 +16409,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:16385: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:16412: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:16388: \$? = $ac_status" >&5
++ echo "$as_me:16415: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:16391: \"$ac_try\"") >&5
++ { (eval echo "$as_me:16418: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:16394: \$? = $ac_status" >&5
++ echo "$as_me:16421: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_weak_symbols=yes
+ else
+@@ -16402,7 +16429,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+
+ fi
+-echo "$as_me:16405: result: $cf_cv_weak_symbols" >&5
++echo "$as_me:16432: result: $cf_cv_weak_symbols" >&5
+ echo "${ECHO_T}$cf_cv_weak_symbols" >&6
+
+ else
+@@ -16452,7 +16479,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:16455: checking if you want reentrant code" >&5
++echo "$as_me:16482: 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.
+@@ -16462,7 +16489,7 @@
+ else
+ with_reentrant=no
+ fi;
+-echo "$as_me:16465: result: $with_reentrant" >&5
++echo "$as_me:16492: result: $with_reentrant" >&5
+ echo "${ECHO_T}$with_reentrant" >&6
+ if test "x$with_reentrant" = xyes ; then
+ cf_cv_enable_reentrant=1
+@@ -16551,7 +16578,7 @@
+ cf_cv_rel_version=6.0
+ cf_cv_abi_version=6
+ cf_cv_abi_default=6
+- { echo "$as_me:16554: WARNING: overriding ABI version to $cf_cv_abi_default" >&5
++ { echo "$as_me:16581: WARNING: overriding ABI version to $cf_cv_abi_default" >&5
+ echo "$as_me: WARNING: overriding ABI version to $cf_cv_abi_default" >&2;}
+ ;;
+ esac
+@@ -16563,7 +16590,7 @@
+ NCURSES_SIZE_T=$cf_dft_ordinate_type
+ fi
+
+-echo "$as_me:16566: checking whether curses library structures should be opaque" >&5
++echo "$as_me:16593: 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.
+@@ -16585,16 +16612,16 @@
+ test "$cf_cv_enable_reentrant" = 1 || enable_opaque_curses=$cf_dft_opaque_curses
+
+ fi;
+-echo "$as_me:16588: result: $enable_opaque_curses" >&5
++echo "$as_me:16615: 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:16593: error: reentrant configuration requires opaque library" >&5
++{ { echo "$as_me:16620: error: reentrant configuration requires opaque library" >&5
+ echo "$as_me: error: reentrant configuration requires opaque library" >&2;}
+ { (exit 1); exit 1; }; }
+
+-echo "$as_me:16597: checking whether form library structures should be opaque" >&5
++echo "$as_me:16624: 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.
+@@ -16611,10 +16638,10 @@
+ enable_opaque_form=$cf_dft_opaque_curses
+
+ fi;
+-echo "$as_me:16614: result: $enable_opaque_form" >&5
++echo "$as_me:16641: result: $enable_opaque_form" >&5
+ echo "${ECHO_T}$enable_opaque_form" >&6
+
+-echo "$as_me:16617: checking whether menu library structures should be opaque" >&5
++echo "$as_me:16644: 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.
+@@ -16631,10 +16658,10 @@
+ enable_opaque_menu=$cf_dft_opaque_curses
+
+ fi;
+-echo "$as_me:16634: result: $enable_opaque_menu" >&5
++echo "$as_me:16661: result: $enable_opaque_menu" >&5
+ echo "${ECHO_T}$enable_opaque_menu" >&6
+
+-echo "$as_me:16637: checking whether panel library structures should be opaque" >&5
++echo "$as_me:16664: 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.
+@@ -16651,7 +16678,7 @@
+ enable_opaque_panel=$cf_dft_opaque_curses
+
+ fi;
+-echo "$as_me:16654: result: $enable_opaque_panel" >&5
++echo "$as_me:16681: result: $enable_opaque_panel" >&5
+ echo "${ECHO_T}$enable_opaque_panel" >&6
+
+ NCURSES_OPAQUE=0; test "$enable_opaque_curses" = yes && NCURSES_OPAQUE=1
+@@ -16661,7 +16688,7 @@
+
+ ### Allow using a different wrap-prefix
+ if test "$cf_cv_enable_reentrant" != 0 || test "$BROKEN_LINKER" = 1 ; then
+- echo "$as_me:16664: checking for prefix used to wrap public variables" >&5
++ echo "$as_me:16691: 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.
+@@ -16671,7 +16698,7 @@
+ else
+ NCURSES_WRAP_PREFIX=_nc_
+ fi;
+- echo "$as_me:16674: result: $NCURSES_WRAP_PREFIX" >&5
++ echo "$as_me:16701: result: $NCURSES_WRAP_PREFIX" >&5
+ echo "${ECHO_T}$NCURSES_WRAP_PREFIX" >&6
+ else
+ NCURSES_WRAP_PREFIX=_nc_
+@@ -16684,7 +16711,7 @@
+ ###############################################################################
+ # These options are relatively safe to experiment with.
+
+-echo "$as_me:16687: checking if you want all development code" >&5
++echo "$as_me:16714: 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.
+@@ -16694,11 +16721,11 @@
+ else
+ with_develop=no
+ fi;
+-echo "$as_me:16697: result: $with_develop" >&5
++echo "$as_me:16724: result: $with_develop" >&5
+ echo "${ECHO_T}$with_develop" >&6
+
+ ### use option --enable-check-size to detect screensize with CPR
+-echo "$as_me:16701: checking if you want to check screensize of serial terminals" >&5
++echo "$as_me:16728: 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.
+@@ -16708,7 +16735,7 @@
+ else
+ enable_check_size=$with_develop
+ fi;
+-echo "$as_me:16711: result: $enable_check_size" >&5
++echo "$as_me:16738: result: $enable_check_size" >&5
+ echo "${ECHO_T}$enable_check_size" >&6
+ test "x$enable_check_size" = xyes &&
+ cat >>confdefs.h <<\EOF
+@@ -16716,7 +16743,7 @@
+ EOF
+
+ ### use option --enable-hard-tabs to turn on use of hard-tabs optimize
+-echo "$as_me:16719: checking if you want hard-tabs code" >&5
++echo "$as_me:16746: 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.
+@@ -16726,7 +16753,7 @@
+ else
+ enable_hard_tabs=$with_develop
+ fi;
+-echo "$as_me:16729: result: $enable_hard_tabs" >&5
++echo "$as_me:16756: result: $enable_hard_tabs" >&5
+ echo "${ECHO_T}$enable_hard_tabs" >&6
+ test "x$enable_hard_tabs" = xyes &&
+ cat >>confdefs.h <<\EOF
+@@ -16734,7 +16761,7 @@
+ EOF
+
+ ### use option --enable-xmc-glitch to turn on use of magic-cookie optimize
+-echo "$as_me:16737: checking if you want limited support for xmc" >&5
++echo "$as_me:16764: 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.
+@@ -16744,7 +16771,7 @@
+ else
+ enable_xmc_glitch=$with_develop
+ fi;
+-echo "$as_me:16747: result: $enable_xmc_glitch" >&5
++echo "$as_me:16774: result: $enable_xmc_glitch" >&5
+ echo "${ECHO_T}$enable_xmc_glitch" >&6
+ test "x$enable_xmc_glitch" = xyes &&
+ cat >>confdefs.h <<\EOF
+@@ -16754,7 +16781,7 @@
+ ###############################################################################
+ # These are just experimental, probably should not be in a package:
+
+-echo "$as_me:16757: checking if you do not want to assume colors are white-on-black" >&5
++echo "$as_me:16784: 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.
+@@ -16764,7 +16791,7 @@
+ else
+ with_assumed_color=yes
+ fi;
+-echo "$as_me:16767: result: $with_assumed_color" >&5
++echo "$as_me:16794: result: $with_assumed_color" >&5
+ echo "${ECHO_T}$with_assumed_color" >&6
+ test "x$with_assumed_color" = xyes &&
+ cat >>confdefs.h <<\EOF
+@@ -16772,7 +16799,7 @@
+ EOF
+
+ ### use option --enable-hashmap to turn on use of hashmap scrolling logic
+-echo "$as_me:16775: checking if you want hashmap scrolling-optimization code" >&5
++echo "$as_me:16802: 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.
+@@ -16782,7 +16809,7 @@
+ else
+ with_hashmap=yes
+ fi;
+-echo "$as_me:16785: result: $with_hashmap" >&5
++echo "$as_me:16812: result: $with_hashmap" >&5
+ echo "${ECHO_T}$with_hashmap" >&6
+ test "x$with_hashmap" = xyes &&
+ cat >>confdefs.h <<\EOF
+@@ -16790,7 +16817,7 @@
+ EOF
+
+ ### use option --enable-colorfgbg to turn on use of $COLORFGBG environment
+-echo "$as_me:16793: checking if you want colorfgbg code" >&5
++echo "$as_me:16820: 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.
+@@ -16800,7 +16827,7 @@
+ else
+ with_colorfgbg=no
+ fi;
+-echo "$as_me:16803: result: $with_colorfgbg" >&5
++echo "$as_me:16830: result: $with_colorfgbg" >&5
+ echo "${ECHO_T}$with_colorfgbg" >&6
+ test "x$with_colorfgbg" = xyes &&
+ cat >>confdefs.h <<\EOF
+@@ -16808,7 +16835,7 @@
+ EOF
+
+ ### use option --enable-fvisibility to turn on use of gcc-specific feature
+-echo "$as_me:16811: checking if you want to use gcc -fvisibility option" >&5
++echo "$as_me:16838: 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.
+@@ -16818,14 +16845,14 @@
+ else
+ cf_with_fvisibility=no
+ fi;
+-echo "$as_me:16821: result: $cf_with_fvisibility" >&5
++echo "$as_me:16848: 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:16828: checking if $CC -fvisibility=hidden option works" >&5
++echo "$as_me:16855: 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
+@@ -16834,7 +16861,7 @@
+ cf_save_cflags="$CFLAGS"
+ CFLAGS="$CFLAGS -fvisibility=hidden"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 16837 "configure"
++#line 16864 "configure"
+ #include "confdefs.h"
+
+ __attribute__ ((visibility("default"))) int somefunc() {return 42;}
+@@ -16850,16 +16877,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:16853: \"$ac_link\"") >&5
++if { (eval echo "$as_me:16880: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:16856: \$? = $ac_status" >&5
++ echo "$as_me:16883: \$? = $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:16886: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:16862: \$? = $ac_status" >&5
++ echo "$as_me:16889: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_fvisibility_hidden=yes
+ else
+@@ -16871,7 +16898,7 @@
+ CFLAGS=$cf_save_cflags
+
+ fi
+-echo "$as_me:16874: result: $cf_cv_fvisibility_hidden" >&5
++echo "$as_me:16901: result: $cf_cv_fvisibility_hidden" >&5
+ echo "${ECHO_T}$cf_cv_fvisibility_hidden" >&6
+
+ if test "x$cf_cv_fvisibility_hidden" = xyes
+@@ -16986,7 +17013,7 @@
+ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
+ ac_main_return="return"
+
+-echo "$as_me:16989: checking if $CXX -fvisibility=hidden option works" >&5
++echo "$as_me:17016: 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
+@@ -16995,7 +17022,7 @@
+ cf_save_cflags="$CXXFLAGS"
+ CXXFLAGS="$CXXFLAGS -fvisibility=hidden"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 16998 "configure"
++#line 17025 "configure"
+ #include "confdefs.h"
+
+ __attribute__ ((visibility("default"))) int somefunc() {return 42;}
+@@ -17011,16 +17038,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:17014: \"$ac_link\"") >&5
++if { (eval echo "$as_me:17041: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:17017: \$? = $ac_status" >&5
++ echo "$as_me:17044: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:17020: \"$ac_try\"") >&5
++ { (eval echo "$as_me:17047: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:17023: \$? = $ac_status" >&5
++ echo "$as_me:17050: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_fvisibility_hidden2=yes
+ else
+@@ -17032,7 +17059,7 @@
+ CXXFLAGS=$cf_save_cflags
+
+ fi
+-echo "$as_me:17035: result: $cf_cv_fvisibility_hidden2" >&5
++echo "$as_me:17062: result: $cf_cv_fvisibility_hidden2" >&5
+ echo "${ECHO_T}$cf_cv_fvisibility_hidden2" >&6
+
+ if test "x$cf_cv_fvisibility_hidden2" = xyes
+@@ -17155,7 +17182,7 @@
+ fi
+
+ ### use option --enable-interop to turn on use of bindings used for interop
+-echo "$as_me:17158: checking if you want interop bindings" >&5
++echo "$as_me:17185: 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.
+@@ -17165,13 +17192,13 @@
+ else
+ with_exp_interop=$cf_dft_interop
+ fi;
+-echo "$as_me:17168: result: $with_exp_interop" >&5
++echo "$as_me:17195: 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:17174: checking if you want experimental safe-sprintf code" >&5
++echo "$as_me:17201: 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.
+@@ -17181,13 +17208,13 @@
+ else
+ with_safe_sprintf=no
+ fi;
+-echo "$as_me:17184: result: $with_safe_sprintf" >&5
++echo "$as_me:17211: 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:17190: checking if you want to experiment without scrolling-hints code" >&5
++echo "$as_me:17217: 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.
+@@ -17197,7 +17224,7 @@
+ else
+ with_scroll_hints=yes
+ fi;
+-echo "$as_me:17200: result: $with_scroll_hints" >&5
++echo "$as_me:17227: result: $with_scroll_hints" >&5
+ echo "${ECHO_T}$with_scroll_hints" >&6
+ test "x$with_scroll_hints" = xyes &&
+ cat >>confdefs.h <<\EOF
+@@ -17206,7 +17233,7 @@
+
+ fi
+
+-echo "$as_me:17209: checking if you want wgetch-events code" >&5
++echo "$as_me:17236: 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.
+@@ -17216,7 +17243,7 @@
+ else
+ with_wgetch_events=no
+ fi;
+-echo "$as_me:17219: result: $with_wgetch_events" >&5
++echo "$as_me:17246: result: $with_wgetch_events" >&5
+ echo "${ECHO_T}$with_wgetch_events" >&6
+ if test "x$with_wgetch_events" = xyes ; then
+
+@@ -17231,7 +17258,7 @@
+
+ case "$cf_cv_system_name" in
+ (*mingw32*|*mingw64*|*-msvc*)
+- echo "$as_me:17234: checking if you want experimental-Windows driver" >&5
++ echo "$as_me:17261: 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.
+@@ -17241,7 +17268,7 @@
+ else
+ with_exp_win32=no
+ fi;
+- echo "$as_me:17244: result: $with_exp_win32" >&5
++ echo "$as_me:17271: result: $with_exp_win32" >&5
+ echo "${ECHO_T}$with_exp_win32" >&6
+ if test "x$with_exp_win32" = xyes
+ then
+@@ -17267,7 +17294,7 @@
+
+ ### use option --disable-echo to suppress full display compiling commands
+
+-echo "$as_me:17270: checking if you want to see long compiling messages" >&5
++echo "$as_me:17297: 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.
+@@ -17301,7 +17328,7 @@
+ ECHO_CC=''
+
+ fi;
+-echo "$as_me:17304: result: $enableval" >&5
++echo "$as_me:17331: result: $enableval" >&5
+ echo "${ECHO_T}$enableval" >&6
+
+ if test "x$enable_echo" = xyes; then
+@@ -17314,7 +17341,7 @@
+
+ # --disable-stripping is used for debugging
+
+-echo "$as_me:17317: checking if you want to install stripped executables" >&5
++echo "$as_me:17344: 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.
+@@ -17331,7 +17358,7 @@
+ enable_stripping=yes
+
+ fi;
+-echo "$as_me:17334: result: $enable_stripping" >&5
++echo "$as_me:17361: result: $enable_stripping" >&5
+ echo "${ECHO_T}$enable_stripping" >&6
+
+ if test "$enable_stripping" = yes
+@@ -17342,7 +17369,7 @@
+ fi
+
+ : "${INSTALL:=install}"
+-echo "$as_me:17345: checking if install accepts -p option" >&5
++echo "$as_me:17372: 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
+@@ -17373,10 +17400,10 @@
+ rm -rf ./conftest*
+
+ fi
+-echo "$as_me:17376: result: $cf_cv_install_p" >&5
++echo "$as_me:17403: result: $cf_cv_install_p" >&5
+ echo "${ECHO_T}$cf_cv_install_p" >&6
+
+-echo "$as_me:17379: checking if install needs to be told about ownership" >&5
++echo "$as_me:17406: 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)
+@@ -17387,7 +17414,7 @@
+ ;;
+ esac
+
+-echo "$as_me:17390: result: $with_install_o" >&5
++echo "$as_me:17417: result: $with_install_o" >&5
+ echo "${ECHO_T}$with_install_o" >&6
+ if test "x$with_install_o" = xyes
+ then
+@@ -17398,7 +17425,7 @@
+
+ if test -n "$INSTALL_OPT_S"
+ then
+- echo "$as_me:17401: checking if you want to specify strip-program" >&5
++ echo "$as_me:17428: 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.
+@@ -17408,11 +17435,11 @@
+ else
+ with_strip_program=no
+ fi;
+- echo "$as_me:17411: result: $with_strip_program" >&5
++ echo "$as_me:17438: result: $with_strip_program" >&5
+ echo "${ECHO_T}$with_strip_program" >&6
+ if test "$with_strip_program" != no
+ then
+- echo "$as_me:17415: checking if strip-program is supported with this installer" >&5
++ echo "$as_me:17442: 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
+@@ -17433,11 +17460,11 @@
+ done
+ fi
+ fi
+- echo "$as_me:17436: result: $check_install_strip" >&5
++ echo "$as_me:17463: result: $check_install_strip" >&5
+ echo "${ECHO_T}$check_install_strip" >&6
+ case "$check_install_strip" in
+ (no)
+- { echo "$as_me:17440: WARNING: $cf_install_program does not support strip program option" >&5
++ { echo "$as_me:17467: 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
+ ;;
+@@ -17452,7 +17479,7 @@
+ chmod +x "$INSTALL"
+ test -n "$verbose" && echo " created $INSTALL" 1>&6
+
+-echo "${as_me:-configure}:17455: testing created $INSTALL ..." 1>&5
++echo "${as_me:-configure}:17482: testing created $INSTALL ..." 1>&5
+
+ ;;
+ (option)
+@@ -17478,7 +17505,7 @@
+
+ ### use option --enable-warnings to turn on all gcc warnings
+
+-echo "$as_me:17481: checking if you want to use C11 _Noreturn feature" >&5
++echo "$as_me:17508: 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.
+@@ -17495,17 +17522,17 @@
+ enable_stdnoreturn=no
+
+ fi;
+-echo "$as_me:17498: result: $enable_stdnoreturn" >&5
++echo "$as_me:17525: result: $enable_stdnoreturn" >&5
+ echo "${ECHO_T}$enable_stdnoreturn" >&6
+
+ if test $enable_stdnoreturn = yes; then
+-echo "$as_me:17502: checking for C11 _Noreturn feature" >&5
++echo "$as_me:17529: 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 17508 "configure"
++#line 17535 "configure"
+ #include "confdefs.h"
+
+ $ac_includes_default
+@@ -17521,16 +17548,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:17524: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:17551: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:17527: \$? = $ac_status" >&5
++ echo "$as_me:17554: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:17530: \"$ac_try\"") >&5
++ { (eval echo "$as_me:17557: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:17533: \$? = $ac_status" >&5
++ echo "$as_me:17560: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_c11_noreturn=yes
+ else
+@@ -17541,7 +17568,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+
+ fi
+-echo "$as_me:17544: result: $cf_cv_c11_noreturn" >&5
++echo "$as_me:17571: result: $cf_cv_c11_noreturn" >&5
+ echo "${ECHO_T}$cf_cv_c11_noreturn" >&6
+ else
+ cf_cv_c11_noreturn=no,
+@@ -17597,16 +17624,16 @@
+ then
+ test -n "$verbose" && echo " repairing CFLAGS: $CFLAGS" 1>&6
+
+-echo "${as_me:-configure}:17600: testing repairing CFLAGS: $CFLAGS ..." 1>&5
++echo "${as_me:-configure}:17627: testing repairing CFLAGS: $CFLAGS ..." 1>&5
+
+ CFLAGS="$cf_temp_flags"
+ test -n "$verbose" && echo " ... fixed $CFLAGS" 1>&6
+
+-echo "${as_me:-configure}:17605: testing ... fixed $CFLAGS ..." 1>&5
++echo "${as_me:-configure}:17632: testing ... fixed $CFLAGS ..." 1>&5
+
+ test -n "$verbose" && echo " ... extra $EXTRA_CFLAGS" 1>&6
+
+-echo "${as_me:-configure}:17609: testing ... extra $EXTRA_CFLAGS ..." 1>&5
++echo "${as_me:-configure}:17636: testing ... extra $EXTRA_CFLAGS ..." 1>&5
+
+ fi
+ ;;
+@@ -17645,16 +17672,16 @@
+ then
+ test -n "$verbose" && echo " repairing CPPFLAGS: $CPPFLAGS" 1>&6
+
+-echo "${as_me:-configure}:17648: testing repairing CPPFLAGS: $CPPFLAGS ..." 1>&5
++echo "${as_me:-configure}:17675: testing repairing CPPFLAGS: $CPPFLAGS ..." 1>&5
+
+ CPPFLAGS="$cf_temp_flags"
+ test -n "$verbose" && echo " ... fixed $CPPFLAGS" 1>&6
+
+-echo "${as_me:-configure}:17653: testing ... fixed $CPPFLAGS ..." 1>&5
++echo "${as_me:-configure}:17680: testing ... fixed $CPPFLAGS ..." 1>&5
+
+ test -n "$verbose" && echo " ... extra $EXTRA_CFLAGS" 1>&6
+
+-echo "${as_me:-configure}:17657: testing ... extra $EXTRA_CFLAGS ..." 1>&5
++echo "${as_me:-configure}:17684: testing ... extra $EXTRA_CFLAGS ..." 1>&5
+
+ fi
+ ;;
+@@ -17693,23 +17720,23 @@
+ then
+ test -n "$verbose" && echo " repairing LDFLAGS: $LDFLAGS" 1>&6
+
+-echo "${as_me:-configure}:17696: testing repairing LDFLAGS: $LDFLAGS ..." 1>&5
++echo "${as_me:-configure}:17723: testing repairing LDFLAGS: $LDFLAGS ..." 1>&5
+
+ LDFLAGS="$cf_temp_flags"
+ test -n "$verbose" && echo " ... fixed $LDFLAGS" 1>&6
+
+-echo "${as_me:-configure}:17701: testing ... fixed $LDFLAGS ..." 1>&5
++echo "${as_me:-configure}:17728: testing ... fixed $LDFLAGS ..." 1>&5
+
+ test -n "$verbose" && echo " ... extra $EXTRA_CFLAGS" 1>&6
+
+-echo "${as_me:-configure}:17705: testing ... extra $EXTRA_CFLAGS ..." 1>&5
++echo "${as_me:-configure}:17732: testing ... extra $EXTRA_CFLAGS ..." 1>&5
+
+ fi
+ ;;
+ esac
+ fi
+
+-echo "$as_me:17712: checking if you want to turn on gcc warnings" >&5
++echo "$as_me:17739: 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.
+@@ -17726,7 +17753,7 @@
+ enable_warnings=no
+
+ fi;
+-echo "$as_me:17729: result: $enable_warnings" >&5
++echo "$as_me:17756: result: $enable_warnings" >&5
+ echo "${ECHO_T}$enable_warnings" >&6
+ if test "$enable_warnings" = "yes"
+ then
+@@ -17750,7 +17777,7 @@
+ done
+
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 17753 "configure"
++#line 17780 "configure"
+ #include "confdefs.h"
+
+ #include <stdlib.h>
+@@ -17765,26 +17792,26 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:17768: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:17795: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:17771: \$? = $ac_status" >&5
++ echo "$as_me:17798: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:17774: \"$ac_try\"") >&5
++ { (eval echo "$as_me:17801: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:17777: \$? = $ac_status" >&5
++ echo "$as_me:17804: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+
+-echo "$as_me:17780: checking for X11/Xt const-feature" >&5
++echo "$as_me:17807: 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 17787 "configure"
++#line 17814 "configure"
+ #include "confdefs.h"
+
+ #undef _CONST_X_STRING
+@@ -17802,16 +17829,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:17805: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:17832: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:17808: \$? = $ac_status" >&5
++ echo "$as_me:17835: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:17811: \"$ac_try\"") >&5
++ { (eval echo "$as_me:17838: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:17814: \$? = $ac_status" >&5
++ echo "$as_me:17841: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+
+ cf_cv_const_x_string=no
+@@ -17826,7 +17853,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+
+ fi
+-echo "$as_me:17829: result: $cf_cv_const_x_string" >&5
++echo "$as_me:17856: result: $cf_cv_const_x_string" >&5
+ echo "${ECHO_T}$cf_cv_const_x_string" >&6
+
+ LIBS="$cf_save_LIBS_CF_CONST_X_STRING"
+@@ -17855,7 +17882,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+ cat > "conftest.$ac_ext" <<EOF
+-#line 17858 "${as_me:-configure}"
++#line 17885 "${as_me:-configure}"
+ int main(int argc, char *argv[]) { return (argv[argc-1] == 0) ; }
+ EOF
+ if test "$INTEL_COMPILER" = yes
+@@ -17871,7 +17898,7 @@
+ # remark #981: operands are evaluated in unspecified order
+ # warning #279: controlling expression is constant
+
+- { echo "$as_me:17874: checking for $CC warning options..." >&5
++ { echo "$as_me:17901: checking for $CC warning options..." >&5
+ echo "$as_me: checking for $CC warning options..." >&6;}
+ cf_save_CFLAGS="$CFLAGS"
+ EXTRA_CFLAGS="$EXTRA_CFLAGS -Wall"
+@@ -17887,12 +17914,12 @@
+ wd981
+ do
+ CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt"
+- if { (eval echo "$as_me:17890: \"$ac_compile\"") >&5
++ if { (eval echo "$as_me:17917: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:17893: \$? = $ac_status" >&5
++ echo "$as_me:17920: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; then
+- test -n "$verbose" && echo "$as_me:17895: result: ... -$cf_opt" >&5
++ test -n "$verbose" && echo "$as_me:17922: result: ... -$cf_opt" >&5
+ echo "${ECHO_T}... -$cf_opt" >&6
+ EXTRA_CFLAGS="$EXTRA_CFLAGS -$cf_opt"
+ fi
+@@ -17900,7 +17927,7 @@
+ CFLAGS="$cf_save_CFLAGS"
+ elif test "$GCC" = yes && test "$GCC_VERSION" != "unknown"
+ then
+- { echo "$as_me:17903: checking for $CC warning options..." >&5
++ { echo "$as_me:17930: checking for $CC warning options..." >&5
+ echo "$as_me: checking for $CC warning options..." >&6;}
+ cf_save_CFLAGS="$CFLAGS"
+ cf_warn_CONST=""
+@@ -17923,12 +17950,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:17926: \"$ac_compile\"") >&5
++ if { (eval echo "$as_me:17953: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:17929: \$? = $ac_status" >&5
++ echo "$as_me:17956: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; then
+- test -n "$verbose" && echo "$as_me:17931: result: ... -$cf_opt" >&5
++ test -n "$verbose" && echo "$as_me:17958: result: ... -$cf_opt" >&5
+ echo "${ECHO_T}... -$cf_opt" >&6
+ case "$cf_opt" in
+ (Winline)
+@@ -17936,7 +17963,7 @@
+ ([34].*)
+ test -n "$verbose" && echo " feature is broken in gcc $GCC_VERSION" 1>&6
+
+-echo "${as_me:-configure}:17939: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
++echo "${as_me:-configure}:17966: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
+
+ continue;;
+ esac
+@@ -17946,7 +17973,7 @@
+ ([12].*)
+ test -n "$verbose" && echo " feature is broken in gcc $GCC_VERSION" 1>&6
+
+-echo "${as_me:-configure}:17949: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
++echo "${as_me:-configure}:17976: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
+
+ continue;;
+ esac
+@@ -17979,10 +18006,10 @@
+ EOF
+ if test "$GCC" = yes
+ then
+- { echo "$as_me:17982: checking for $CC __attribute__ directives..." >&5
++ { echo "$as_me:18009: checking for $CC __attribute__ directives..." >&5
+ echo "$as_me: checking for $CC __attribute__ directives..." >&6;}
+ cat > "conftest.$ac_ext" <<EOF
+-#line 17985 "${as_me:-configure}"
++#line 18012 "${as_me:-configure}"
+ #include <stdio.h>
+ #include "confdefs.h"
+ #include "conftest.h"
+@@ -18032,12 +18059,12 @@
+ ;;
+ esac
+
+- if { (eval echo "$as_me:18035: \"$ac_compile\"") >&5
++ if { (eval echo "$as_me:18062: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:18038: \$? = $ac_status" >&5
++ echo "$as_me:18065: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; then
+- test -n "$verbose" && echo "$as_me:18040: result: ... $cf_attribute" >&5
++ test -n "$verbose" && echo "$as_me:18067: result: ... $cf_attribute" >&5
+ echo "${ECHO_T}... $cf_attribute" >&6
+ cat conftest.h >>confdefs.h
+ case "$cf_attribute" in
+@@ -18109,12 +18136,12 @@
+ if test "$GCC" = yes ; then
+ case "$host_os" in
+ (linux*|gnu*)
+- echo "$as_me:18112: checking if this is really Intel C++ compiler" >&5
++ echo "$as_me:18139: 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 18117 "configure"
++#line 18144 "configure"
+ #include "confdefs.h"
+
+ int
+@@ -18131,16 +18158,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:18134: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:18161: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:18137: \$? = $ac_status" >&5
++ echo "$as_me:18164: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:18140: \"$ac_try\"") >&5
++ { (eval echo "$as_me:18167: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:18143: \$? = $ac_status" >&5
++ echo "$as_me:18170: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ INTEL_CPLUSPLUS=yes
+ cf_save_CFLAGS="$cf_save_CFLAGS -we147"
+@@ -18151,7 +18178,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ CXXFLAGS="$cf_save_CFLAGS"
+- echo "$as_me:18154: result: $INTEL_CPLUSPLUS" >&5
++ echo "$as_me:18181: result: $INTEL_CPLUSPLUS" >&5
+ echo "${ECHO_T}$INTEL_CPLUSPLUS" >&6
+ ;;
+ esac
+@@ -18160,11 +18187,11 @@
+ CLANG_CPLUSPLUS=no
+
+ if test "$GCC" = yes ; then
+- echo "$as_me:18163: checking if this is really Clang C++ compiler" >&5
++ echo "$as_me:18190: 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 18167 "configure"
++#line 18194 "configure"
+ #include "confdefs.h"
+
+ int
+@@ -18181,16 +18208,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:18184: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:18211: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:18187: \$? = $ac_status" >&5
++ echo "$as_me:18214: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:18190: \"$ac_try\"") >&5
++ { (eval echo "$as_me:18217: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:18193: \$? = $ac_status" >&5
++ echo "$as_me:18220: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ CLANG_CPLUSPLUS=yes
+
+@@ -18200,7 +18227,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ CXXFLAGS="$cf_save_CFLAGS"
+- echo "$as_me:18203: result: $CLANG_CPLUSPLUS" >&5
++ echo "$as_me:18230: result: $CLANG_CPLUSPLUS" >&5
+ echo "${ECHO_T}$CLANG_CPLUSPLUS" >&6
+ fi
+
+@@ -18209,30 +18236,30 @@
+ if test "x$CLANG_CPLUSPLUS" = "xyes" ; then
+ case "$CC" in
+ (c[1-9][0-9]|*/c[1-9][0-9])
+- { echo "$as_me:18212: WARNING: replacing broken compiler alias $CC" >&5
++ { echo "$as_me:18239: 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:18219: checking version of $CC" >&5
++ echo "$as_me:18246: 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:18223: result: $CLANG_VERSION" >&5
++ echo "$as_me:18250: 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:18230: checking if option $cf_clang_opt works" >&5
++ echo "$as_me:18257: 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 18235 "configure"
++#line 18262 "configure"
+ #include "confdefs.h"
+
+ #include <stdio.h>
+@@ -18246,16 +18273,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:18249: \"$ac_link\"") >&5
++if { (eval echo "$as_me:18276: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:18252: \$? = $ac_status" >&5
++ echo "$as_me:18279: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:18255: \"$ac_try\"") >&5
++ { (eval echo "$as_me:18282: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:18258: \$? = $ac_status" >&5
++ echo "$as_me:18285: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+
+ cf_clang_optok=yes
+@@ -18266,13 +18293,13 @@
+ cf_clang_optok=no
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+- echo "$as_me:18269: result: $cf_clang_optok" >&5
++ echo "$as_me:18296: 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}:18275: testing adding option $cf_clang_opt ..." 1>&5
++echo "${as_me:-configure}:18302: testing adding option $cf_clang_opt ..." 1>&5
+
+ test -n "$CFLAGS" && CFLAGS="$CFLAGS "
+ CFLAGS="${CFLAGS}$cf_clang_opt"
+@@ -18289,7 +18316,7 @@
+ ac_main_return="return"
+
+ cat > conftest.$ac_ext <<EOF
+-#line 18292 "configure"
++#line 18319 "configure"
+ int main(int argc, char *argv[]) { return (argv[argc-1] == 0) ; }
+ EOF
+
+@@ -18307,7 +18334,7 @@
+ # remark #981: operands are evaluated in unspecified order
+ # warning #269: invalid format string conversion
+
+- { echo "$as_me:18310: checking for $CC warning options..." >&5
++ { echo "$as_me:18337: checking for $CC warning options..." >&5
+ echo "$as_me: checking for $CC warning options..." >&6;}
+ cf_save_CXXFLAGS="$CXXFLAGS"
+ EXTRA_CXXFLAGS="-Wall"
+@@ -18324,12 +18351,12 @@
+ wd981
+ do
+ CXXFLAGS="$cf_save_CXXFLAGS $EXTRA_CXXFLAGS -$cf_opt"
+- if { (eval echo "$as_me:18327: \"$ac_compile\"") >&5
++ if { (eval echo "$as_me:18354: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:18330: \$? = $ac_status" >&5
++ echo "$as_me:18357: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; then
+- test -n "$verbose" && echo "$as_me:18332: result: ... -$cf_opt" >&5
++ test -n "$verbose" && echo "$as_me:18359: result: ... -$cf_opt" >&5
+ echo "${ECHO_T}... -$cf_opt" >&6
+ EXTRA_CXXFLAGS="$EXTRA_CXXFLAGS -$cf_opt"
+ fi
+@@ -18338,7 +18365,7 @@
+
+ elif test "$GXX" = yes
+ then
+- { echo "$as_me:18341: checking for $CXX warning options..." >&5
++ { echo "$as_me:18368: checking for $CXX warning options..." >&5
+ echo "$as_me: checking for $CXX warning options..." >&6;}
+ cf_save_CXXFLAGS="$CXXFLAGS"
+ EXTRA_CXXFLAGS="-W -Wall"
+@@ -18368,16 +18395,16 @@
+ Wundef $cf_gxx_extra_warnings Wno-unused
+ do
+ CXXFLAGS="$cf_save_CXXFLAGS $EXTRA_CXXFLAGS -Werror -$cf_opt"
+- if { (eval echo "$as_me:18371: \"$ac_compile\"") >&5
++ if { (eval echo "$as_me:18398: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:18374: \$? = $ac_status" >&5
++ echo "$as_me:18401: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; then
+- test -n "$verbose" && echo "$as_me:18376: result: ... -$cf_opt" >&5
++ test -n "$verbose" && echo "$as_me:18403: result: ... -$cf_opt" >&5
+ echo "${ECHO_T}... -$cf_opt" >&6
+ EXTRA_CXXFLAGS="$EXTRA_CXXFLAGS -$cf_opt"
+ else
+- test -n "$verbose" && echo "$as_me:18380: result: ... no -$cf_opt" >&5
++ test -n "$verbose" && echo "$as_me:18407: result: ... no -$cf_opt" >&5
+ echo "${ECHO_T}... no -$cf_opt" >&6
+ fi
+ done
+@@ -18395,7 +18422,7 @@
+ fi
+ fi
+
+-echo "$as_me:18398: checking if you want to work around bogus compiler/loader warnings" >&5
++echo "$as_me:18425: 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.
+@@ -18405,7 +18432,7 @@
+ else
+ enable_string_hacks=no
+ fi;
+-echo "$as_me:18408: result: $enable_string_hacks" >&5
++echo "$as_me:18435: result: $enable_string_hacks" >&5
+ echo "${ECHO_T}$enable_string_hacks" >&6
+
+ if test "x$enable_string_hacks" = "xyes"; then
+@@ -18414,15 +18441,15 @@
+ #define USE_STRING_HACKS 1
+ EOF
+
+- { echo "$as_me:18417: WARNING: enabling string-hacks to work around bogus compiler/loader warnings" >&5
++ { echo "$as_me:18444: 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:18419: checking for strlcat" >&5
++ echo "$as_me:18446: 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 18425 "configure"
++#line 18452 "configure"
+ #include "confdefs.h"
+ #define strlcat autoconf_temporary
+ #include <limits.h> /* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -18453,16 +18480,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:18456: \"$ac_link\"") >&5
++if { (eval echo "$as_me:18483: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:18459: \$? = $ac_status" >&5
++ echo "$as_me:18486: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:18462: \"$ac_try\"") >&5
++ { (eval echo "$as_me:18489: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:18465: \$? = $ac_status" >&5
++ echo "$as_me:18492: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_func_strlcat=yes
+ else
+@@ -18472,7 +18499,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:18475: result: $ac_cv_func_strlcat" >&5
++echo "$as_me:18502: result: $ac_cv_func_strlcat" >&5
+ echo "${ECHO_T}$ac_cv_func_strlcat" >&6
+ if test "$ac_cv_func_strlcat" = yes; then
+
+@@ -18482,7 +18509,7 @@
+
+ else
+
+- echo "$as_me:18485: checking for strlcat in -lbsd" >&5
++ echo "$as_me:18512: 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
+@@ -18490,7 +18517,7 @@
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lbsd $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 18493 "configure"
++#line 18520 "configure"
+ #include "confdefs.h"
+
+ /* Override any gcc2 internal prototype to avoid an error. */
+@@ -18509,16 +18536,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:18512: \"$ac_link\"") >&5
++if { (eval echo "$as_me:18539: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:18515: \$? = $ac_status" >&5
++ echo "$as_me:18542: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:18518: \"$ac_try\"") >&5
++ { (eval echo "$as_me:18545: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:18521: \$? = $ac_status" >&5
++ echo "$as_me:18548: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_lib_bsd_strlcat=yes
+ else
+@@ -18529,7 +18556,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:18532: result: $ac_cv_lib_bsd_strlcat" >&5
++echo "$as_me:18559: 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
+
+@@ -18552,23 +18579,23 @@
+ for ac_header in bsd/string.h
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-echo "$as_me:18555: checking for $ac_header" >&5
++echo "$as_me:18582: 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 18561 "configure"
++#line 18588 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:18565: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:18592: \"$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:18571: \$? = $ac_status" >&5
++ echo "$as_me:18598: \$? = $ac_status" >&5
+ (exit "$ac_status"); } >/dev/null; then
+ if test -s conftest.err; then
+ ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -18587,7 +18614,7 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:18590: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
++echo "$as_me:18617: 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
+@@ -18608,13 +18635,13 @@
+ for ac_func in strlcpy snprintf
+ do
+ as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+-echo "$as_me:18611: checking for $ac_func" >&5
++echo "$as_me:18638: 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 18617 "configure"
++#line 18644 "configure"
+ #include "confdefs.h"
+ #define $ac_func autoconf_temporary
+ #include <limits.h> /* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -18645,16 +18672,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:18648: \"$ac_link\"") >&5
++if { (eval echo "$as_me:18675: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:18651: \$? = $ac_status" >&5
++ echo "$as_me:18678: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:18654: \"$ac_try\"") >&5
++ { (eval echo "$as_me:18681: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:18657: \$? = $ac_status" >&5
++ echo "$as_me:18684: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ eval "$as_ac_var=yes"
+ else
+@@ -18664,7 +18691,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:18667: result: `eval echo '${'"$as_ac_var"'}'`" >&5
++echo "$as_me:18694: 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
+@@ -18677,7 +18704,7 @@
+ fi
+
+ ### use option --enable-assertions to turn on generation of assertion code
+-echo "$as_me:18680: checking if you want to enable runtime assertions" >&5
++echo "$as_me:18707: 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.
+@@ -18687,7 +18714,7 @@
+ else
+ with_assertions=no
+ fi;
+-echo "$as_me:18690: result: $with_assertions" >&5
++echo "$as_me:18717: result: $with_assertions" >&5
+ echo "${ECHO_T}$with_assertions" >&6
+ if test -n "$GCC"
+ then
+@@ -18703,7 +18730,7 @@
+
+ ### use option --disable-leaks to suppress "permanent" leaks, for testing
+
+-echo "$as_me:18706: checking if you want to use dmalloc for testing" >&5
++echo "$as_me:18733: 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.
+@@ -18725,7 +18752,7 @@
+ else
+ with_dmalloc=
+ fi;
+-echo "$as_me:18728: result: ${with_dmalloc:-no}" >&5
++echo "$as_me:18755: result: ${with_dmalloc:-no}" >&5
+ echo "${ECHO_T}${with_dmalloc:-no}" >&6
+
+ case ".$with_cflags" in
+@@ -18839,23 +18866,23 @@
+ esac
+
+ if test "$with_dmalloc" = yes ; then
+- echo "$as_me:18842: checking for dmalloc.h" >&5
++ echo "$as_me:18869: 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 18848 "configure"
++#line 18875 "configure"
+ #include "confdefs.h"
+ #include <dmalloc.h>
+ _ACEOF
+-if { (eval echo "$as_me:18852: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:18879: \"$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:18858: \$? = $ac_status" >&5
++ echo "$as_me:18885: \$? = $ac_status" >&5
+ (exit "$ac_status"); } >/dev/null; then
+ if test -s conftest.err; then
+ ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -18874,11 +18901,11 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:18877: result: $ac_cv_header_dmalloc_h" >&5
++echo "$as_me:18904: 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:18881: checking for dmalloc_debug in -ldmalloc" >&5
++echo "$as_me:18908: 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
+@@ -18886,7 +18913,7 @@
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-ldmalloc $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 18889 "configure"
++#line 18916 "configure"
+ #include "confdefs.h"
+
+ /* Override any gcc2 internal prototype to avoid an error. */
+@@ -18905,16 +18932,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:18908: \"$ac_link\"") >&5
++if { (eval echo "$as_me:18935: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:18911: \$? = $ac_status" >&5
++ echo "$as_me:18938: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:18914: \"$ac_try\"") >&5
++ { (eval echo "$as_me:18941: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:18917: \$? = $ac_status" >&5
++ echo "$as_me:18944: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_lib_dmalloc_dmalloc_debug=yes
+ else
+@@ -18925,7 +18952,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:18928: result: $ac_cv_lib_dmalloc_dmalloc_debug" >&5
++echo "$as_me:18955: 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
+@@ -18940,7 +18967,7 @@
+
+ fi
+
+-echo "$as_me:18943: checking if you want to use dbmalloc for testing" >&5
++echo "$as_me:18970: 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.
+@@ -18962,7 +18989,7 @@
+ else
+ with_dbmalloc=
+ fi;
+-echo "$as_me:18965: result: ${with_dbmalloc:-no}" >&5
++echo "$as_me:18992: result: ${with_dbmalloc:-no}" >&5
+ echo "${ECHO_T}${with_dbmalloc:-no}" >&6
+
+ case ".$with_cflags" in
+@@ -19076,23 +19103,23 @@
+ esac
+
+ if test "$with_dbmalloc" = yes ; then
+- echo "$as_me:19079: checking for dbmalloc.h" >&5
++ echo "$as_me:19106: 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 19085 "configure"
++#line 19112 "configure"
+ #include "confdefs.h"
+ #include <dbmalloc.h>
+ _ACEOF
+-if { (eval echo "$as_me:19089: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:19116: \"$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:19095: \$? = $ac_status" >&5
++ echo "$as_me:19122: \$? = $ac_status" >&5
+ (exit "$ac_status"); } >/dev/null; then
+ if test -s conftest.err; then
+ ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -19111,11 +19138,11 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:19114: result: $ac_cv_header_dbmalloc_h" >&5
++echo "$as_me:19141: 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:19118: checking for debug_malloc in -ldbmalloc" >&5
++echo "$as_me:19145: 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
+@@ -19123,7 +19150,7 @@
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-ldbmalloc $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 19126 "configure"
++#line 19153 "configure"
+ #include "confdefs.h"
+
+ /* Override any gcc2 internal prototype to avoid an error. */
+@@ -19142,16 +19169,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:19145: \"$ac_link\"") >&5
++if { (eval echo "$as_me:19172: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:19148: \$? = $ac_status" >&5
++ echo "$as_me:19175: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:19151: \"$ac_try\"") >&5
++ { (eval echo "$as_me:19178: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:19154: \$? = $ac_status" >&5
++ echo "$as_me:19181: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_lib_dbmalloc_debug_malloc=yes
+ else
+@@ -19162,7 +19189,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:19165: result: $ac_cv_lib_dbmalloc_debug_malloc" >&5
++echo "$as_me:19192: 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
+@@ -19177,7 +19204,7 @@
+
+ fi
+
+-echo "$as_me:19180: checking if you want to use valgrind for testing" >&5
++echo "$as_me:19207: 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.
+@@ -19199,7 +19226,7 @@
+ else
+ with_valgrind=
+ fi;
+-echo "$as_me:19202: result: ${with_valgrind:-no}" >&5
++echo "$as_me:19229: result: ${with_valgrind:-no}" >&5
+ echo "${ECHO_T}${with_valgrind:-no}" >&6
+
+ case ".$with_cflags" in
+@@ -19312,7 +19339,7 @@
+ ;;
+ esac
+
+-echo "$as_me:19315: checking if you want to perform memory-leak testing" >&5
++echo "$as_me:19342: 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.
+@@ -19323,7 +19350,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:19326: result: $with_no_leaks" >&5
++echo "$as_me:19353: result: $with_no_leaks" >&5
+ echo "${ECHO_T}$with_no_leaks" >&6
+
+ if test "$enable_leaks" = no ; then
+@@ -19375,7 +19402,7 @@
+ ;;
+ esac
+
+-echo "$as_me:19378: checking whether to add trace feature to all models" >&5
++echo "$as_me:19405: 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.
+@@ -19385,7 +19412,7 @@
+ else
+ cf_with_trace=$cf_all_traces
+ fi;
+-echo "$as_me:19388: result: $cf_with_trace" >&5
++echo "$as_me:19415: result: $cf_with_trace" >&5
+ echo "${ECHO_T}$cf_with_trace" >&6
+
+ if test "x$cf_with_trace" = xyes ; then
+@@ -19405,7 +19432,7 @@
+ ADA_TRACE=FALSE
+ fi
+
+-echo "$as_me:19408: checking if we want to use GNAT projects" >&5
++echo "$as_me:19435: 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.
+@@ -19422,7 +19449,7 @@
+ enable_gnat_projects=yes
+
+ fi;
+-echo "$as_me:19425: result: $enable_gnat_projects" >&5
++echo "$as_me:19452: result: $enable_gnat_projects" >&5
+ echo "${ECHO_T}$enable_gnat_projects" >&6
+
+ ### Checks for libraries.
+@@ -19435,14 +19462,14 @@
+ CPPFLAGS="$CPPFLAGS -DWINVER=0x0501 -DWIN32_LEAN_AND_MEAN"
+ fi
+
+-echo "$as_me:19438: checking if ssp library is needed" >&5
++echo "$as_me:19465: 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 19445 "configure"
++#line 19472 "configure"
+ #include "confdefs.h"
+
+ #include <sys/types.h>
+@@ -19459,16 +19486,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:19462: \"$ac_link\"") >&5
++if { (eval echo "$as_me:19489: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:19465: \$? = $ac_status" >&5
++ echo "$as_me:19492: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:19468: \"$ac_try\"") >&5
++ { (eval echo "$as_me:19495: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:19471: \$? = $ac_status" >&5
++ echo "$as_me:19498: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_need_libssp=no
+ else
+@@ -19478,7 +19505,7 @@
+ cf_save_LIBS="$LIBS"
+ LIBS="$LIBS -lssp"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 19481 "configure"
++#line 19508 "configure"
+ #include "confdefs.h"
+
+ #include <sys/types.h>
+@@ -19495,16 +19522,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:19498: \"$ac_link\"") >&5
++if { (eval echo "$as_me:19525: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:19501: \$? = $ac_status" >&5
++ echo "$as_me:19528: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:19504: \"$ac_try\"") >&5
++ { (eval echo "$as_me:19531: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:19507: \$? = $ac_status" >&5
++ echo "$as_me:19534: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_need_libssp=yes
+ else
+@@ -19518,7 +19545,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:19521: result: $cf_cv_need_libssp" >&5
++echo "$as_me:19548: result: $cf_cv_need_libssp" >&5
+ echo "${ECHO_T}$cf_cv_need_libssp" >&6
+
+ if test "x$cf_cv_need_libssp" = xyes
+@@ -19547,14 +19574,14 @@
+ ;;
+ esac
+
+-echo "$as_me:19550: checking if -lm needed for math functions" >&5
++echo "$as_me:19577: 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 19557 "configure"
++#line 19584 "configure"
+ #include "confdefs.h"
+
+ #include <stdio.h>
+@@ -19570,16 +19597,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:19573: \"$ac_link\"") >&5
++if { (eval echo "$as_me:19600: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:19576: \$? = $ac_status" >&5
++ echo "$as_me:19603: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:19579: \"$ac_try\"") >&5
++ { (eval echo "$as_me:19606: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:19582: \$? = $ac_status" >&5
++ echo "$as_me:19609: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_need_libm=no
+ else
+@@ -19589,7 +19616,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:19592: result: $cf_cv_need_libm" >&5
++echo "$as_me:19619: result: $cf_cv_need_libm" >&5
+ echo "${ECHO_T}$cf_cv_need_libm" >&6
+
+ if test "$cf_cv_need_libm" = yes
+@@ -19597,14 +19624,14 @@
+
+ cf_save_LIBS="$LIBS"
+ LIBS="$LIBS -lm"
+- echo "$as_me:19600: checking if -lm is available for math functions" >&5
++ echo "$as_me:19627: 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 19607 "configure"
++#line 19634 "configure"
+ #include "confdefs.h"
+
+ #include <stdio.h>
+@@ -19620,16 +19647,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:19623: \"$ac_link\"") >&5
++if { (eval echo "$as_me:19650: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:19626: \$? = $ac_status" >&5
++ echo "$as_me:19653: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:19629: \"$ac_try\"") >&5
++ { (eval echo "$as_me:19656: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:19632: \$? = $ac_status" >&5
++ echo "$as_me:19659: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_have_libm=yes
+ else
+@@ -19639,7 +19666,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:19642: result: $cf_cv_have_libm" >&5
++echo "$as_me:19669: result: $cf_cv_have_libm" >&5
+ echo "${ECHO_T}$cf_cv_have_libm" >&6
+ LIBS="$cf_save_LIBS"
+
+@@ -19661,13 +19688,13 @@
+ fi
+
+ ### Checks for header files.
+-echo "$as_me:19664: checking whether time.h and sys/time.h may both be included" >&5
++echo "$as_me:19691: 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 19670 "configure"
++#line 19697 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ #include <sys/time.h>
+@@ -19683,16 +19710,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:19686: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:19713: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:19689: \$? = $ac_status" >&5
++ echo "$as_me:19716: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:19692: \"$ac_try\"") >&5
++ { (eval echo "$as_me:19719: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:19695: \$? = $ac_status" >&5
++ echo "$as_me:19722: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_header_time=yes
+ else
+@@ -19702,7 +19729,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:19705: result: $ac_cv_header_time" >&5
++echo "$as_me:19732: result: $ac_cv_header_time" >&5
+ echo "${ECHO_T}$ac_cv_header_time" >&6
+ if test $ac_cv_header_time = yes; then
+
+@@ -19717,7 +19744,7 @@
+ case "$host_os" in
+ (mingw*)
+ # -lsystre -ltre -lintl -liconv
+- echo "$as_me:19720: checking for regcomp in -lsystre" >&5
++ echo "$as_me:19747: 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
+@@ -19725,7 +19752,7 @@
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lsystre $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 19728 "configure"
++#line 19755 "configure"
+ #include "confdefs.h"
+
+ /* Override any gcc2 internal prototype to avoid an error. */
+@@ -19744,16 +19771,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:19747: \"$ac_link\"") >&5
++if { (eval echo "$as_me:19774: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:19750: \$? = $ac_status" >&5
++ echo "$as_me:19777: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:19753: \"$ac_try\"") >&5
++ { (eval echo "$as_me:19780: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:19756: \$? = $ac_status" >&5
++ echo "$as_me:19783: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_lib_systre_regcomp=yes
+ else
+@@ -19764,11 +19791,11 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:19767: result: $ac_cv_lib_systre_regcomp" >&5
++echo "$as_me:19794: 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:19771: checking for libiconv_open in -liconv" >&5
++ echo "$as_me:19798: 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
+@@ -19776,7 +19803,7 @@
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-liconv $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 19779 "configure"
++#line 19806 "configure"
+ #include "confdefs.h"
+
+ /* Override any gcc2 internal prototype to avoid an error. */
+@@ -19795,16 +19822,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:19798: \"$ac_link\"") >&5
++if { (eval echo "$as_me:19825: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:19801: \$? = $ac_status" >&5
++ echo "$as_me:19828: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:19804: \"$ac_try\"") >&5
++ { (eval echo "$as_me:19831: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:19807: \$? = $ac_status" >&5
++ echo "$as_me:19834: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_lib_iconv_libiconv_open=yes
+ else
+@@ -19815,7 +19842,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:19818: result: $ac_cv_lib_iconv_libiconv_open" >&5
++echo "$as_me:19845: 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
+
+@@ -19837,7 +19864,7 @@
+
+ fi
+
+- echo "$as_me:19840: checking for libintl_gettext in -lintl" >&5
++ echo "$as_me:19867: 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
+@@ -19845,7 +19872,7 @@
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lintl $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 19848 "configure"
++#line 19875 "configure"
+ #include "confdefs.h"
+
+ /* Override any gcc2 internal prototype to avoid an error. */
+@@ -19864,16 +19891,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:19867: \"$ac_link\"") >&5
++if { (eval echo "$as_me:19894: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:19870: \$? = $ac_status" >&5
++ echo "$as_me:19897: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:19873: \"$ac_try\"") >&5
++ { (eval echo "$as_me:19900: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:19876: \$? = $ac_status" >&5
++ echo "$as_me:19903: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_lib_intl_libintl_gettext=yes
+ else
+@@ -19884,7 +19911,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:19887: result: $ac_cv_lib_intl_libintl_gettext" >&5
++echo "$as_me:19914: 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
+
+@@ -19906,7 +19933,7 @@
+
+ fi
+
+- echo "$as_me:19909: checking for tre_regcomp in -ltre" >&5
++ echo "$as_me:19936: 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
+@@ -19914,7 +19941,7 @@
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-ltre $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 19917 "configure"
++#line 19944 "configure"
+ #include "confdefs.h"
+
+ /* Override any gcc2 internal prototype to avoid an error. */
+@@ -19933,16 +19960,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:19936: \"$ac_link\"") >&5
++if { (eval echo "$as_me:19963: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:19939: \$? = $ac_status" >&5
++ echo "$as_me:19966: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:19942: \"$ac_try\"") >&5
++ { (eval echo "$as_me:19969: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:19945: \$? = $ac_status" >&5
++ echo "$as_me:19972: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_lib_tre_tre_regcomp=yes
+ else
+@@ -19953,7 +19980,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:19956: result: $ac_cv_lib_tre_tre_regcomp" >&5
++echo "$as_me:19983: 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
+
+@@ -19995,7 +20022,7 @@
+
+ else
+
+- echo "$as_me:19998: checking for regcomp in -lgnurx" >&5
++ echo "$as_me:20025: 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
+@@ -20003,7 +20030,7 @@
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lgnurx $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 20006 "configure"
++#line 20033 "configure"
+ #include "confdefs.h"
+
+ /* Override any gcc2 internal prototype to avoid an error. */
+@@ -20022,16 +20049,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:20025: \"$ac_link\"") >&5
++if { (eval echo "$as_me:20052: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:20028: \$? = $ac_status" >&5
++ echo "$as_me:20055: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:20031: \"$ac_try\"") >&5
++ { (eval echo "$as_me:20058: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:20034: \$? = $ac_status" >&5
++ echo "$as_me:20061: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_lib_gnurx_regcomp=yes
+ else
+@@ -20042,7 +20069,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:20045: result: $ac_cv_lib_gnurx_regcomp" >&5
++echo "$as_me:20072: 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
+
+@@ -20070,13 +20097,13 @@
+ ;;
+ (*)
+ cf_regex_libs="regex re"
+- echo "$as_me:20073: checking for regcomp" >&5
++ echo "$as_me:20100: 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 20079 "configure"
++#line 20106 "configure"
+ #include "confdefs.h"
+ #define regcomp autoconf_temporary
+ #include <limits.h> /* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -20107,16 +20134,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:20110: \"$ac_link\"") >&5
++if { (eval echo "$as_me:20137: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:20113: \$? = $ac_status" >&5
++ echo "$as_me:20140: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:20116: \"$ac_try\"") >&5
++ { (eval echo "$as_me:20143: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:20119: \$? = $ac_status" >&5
++ echo "$as_me:20146: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_func_regcomp=yes
+ else
+@@ -20126,7 +20153,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:20129: result: $ac_cv_func_regcomp" >&5
++echo "$as_me:20156: 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
+@@ -20135,7 +20162,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:20138: checking for regcomp in -l$cf_regex_lib" >&5
++echo "$as_me:20165: 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
+@@ -20143,7 +20170,7 @@
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-l$cf_regex_lib $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 20146 "configure"
++#line 20173 "configure"
+ #include "confdefs.h"
+
+ /* Override any gcc2 internal prototype to avoid an error. */
+@@ -20162,16 +20189,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:20165: \"$ac_link\"") >&5
++if { (eval echo "$as_me:20192: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:20168: \$? = $ac_status" >&5
++ echo "$as_me:20195: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:20171: \"$ac_try\"") >&5
++ { (eval echo "$as_me:20198: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:20174: \$? = $ac_status" >&5
++ echo "$as_me:20201: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ eval "$as_ac_Lib=yes"
+ else
+@@ -20182,7 +20209,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:20185: result: `eval echo '${'"$as_ac_Lib"'}'`" >&5
++echo "$as_me:20212: 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
+
+@@ -20214,13 +20241,13 @@
+ esac
+
+ if test "$cf_regex_func" = no ; then
+- echo "$as_me:20217: checking for compile" >&5
++ echo "$as_me:20244: 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 20223 "configure"
++#line 20250 "configure"
+ #include "confdefs.h"
+ #define compile autoconf_temporary
+ #include <limits.h> /* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -20251,16 +20278,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:20254: \"$ac_link\"") >&5
++if { (eval echo "$as_me:20281: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:20257: \$? = $ac_status" >&5
++ echo "$as_me:20284: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:20260: \"$ac_try\"") >&5
++ { (eval echo "$as_me:20287: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:20263: \$? = $ac_status" >&5
++ echo "$as_me:20290: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_func_compile=yes
+ else
+@@ -20270,13 +20297,13 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:20273: result: $ac_cv_func_compile" >&5
++echo "$as_me:20300: 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:20279: checking for compile in -lgen" >&5
++ echo "$as_me:20306: 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
+@@ -20284,7 +20311,7 @@
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lgen $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 20287 "configure"
++#line 20314 "configure"
+ #include "confdefs.h"
+
+ /* Override any gcc2 internal prototype to avoid an error. */
+@@ -20303,16 +20330,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:20306: \"$ac_link\"") >&5
++if { (eval echo "$as_me:20333: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:20309: \$? = $ac_status" >&5
++ echo "$as_me:20336: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:20312: \"$ac_try\"") >&5
++ { (eval echo "$as_me:20339: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:20315: \$? = $ac_status" >&5
++ echo "$as_me:20342: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_lib_gen_compile=yes
+ else
+@@ -20323,7 +20350,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:20326: result: $ac_cv_lib_gen_compile" >&5
++echo "$as_me:20353: 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
+
+@@ -20351,11 +20378,11 @@
+ fi
+
+ if test "$cf_regex_func" = no ; then
+- { echo "$as_me:20354: WARNING: cannot find regular expression library" >&5
++ { echo "$as_me:20381: WARNING: cannot find regular expression library" >&5
+ echo "$as_me: WARNING: cannot find regular expression library" >&2;}
+ fi
+
+-echo "$as_me:20358: checking for regular-expression headers" >&5
++echo "$as_me:20385: 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
+@@ -20367,7 +20394,7 @@
+ for cf_regex_hdr in regexp.h regexpr.h
+ do
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 20370 "configure"
++#line 20397 "configure"
+ #include "confdefs.h"
+ #include <$cf_regex_hdr>
+ int
+@@ -20384,16 +20411,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:20387: \"$ac_link\"") >&5
++if { (eval echo "$as_me:20414: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:20390: \$? = $ac_status" >&5
++ echo "$as_me:20417: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:20393: \"$ac_try\"") >&5
++ { (eval echo "$as_me:20420: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:20396: \$? = $ac_status" >&5
++ echo "$as_me:20423: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+
+ cf_cv_regex_hdrs=$cf_regex_hdr
+@@ -20410,7 +20437,7 @@
+ for cf_regex_hdr in regex.h
+ do
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 20413 "configure"
++#line 20440 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ #include <$cf_regex_hdr>
+@@ -20430,16 +20457,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:20433: \"$ac_link\"") >&5
++if { (eval echo "$as_me:20460: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:20436: \$? = $ac_status" >&5
++ echo "$as_me:20463: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:20439: \"$ac_try\"") >&5
++ { (eval echo "$as_me:20466: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:20442: \$? = $ac_status" >&5
++ echo "$as_me:20469: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+
+ cf_cv_regex_hdrs=$cf_regex_hdr
+@@ -20455,11 +20482,11 @@
+ esac
+
+ fi
+-echo "$as_me:20458: result: $cf_cv_regex_hdrs" >&5
++echo "$as_me:20485: result: $cf_cv_regex_hdrs" >&5
+ echo "${ECHO_T}$cf_cv_regex_hdrs" >&6
+
+ case "$cf_cv_regex_hdrs" in
+- (no) { echo "$as_me:20462: WARNING: no regular expression header found" >&5
++ (no) { echo "$as_me:20489: WARNING: no regular expression header found" >&5
+ echo "$as_me: WARNING: no regular expression header found" >&2;} ;;
+ (regex.h)
+ cat >>confdefs.h <<\EOF
+@@ -20497,23 +20524,23 @@
+
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-echo "$as_me:20500: checking for $ac_header" >&5
++echo "$as_me:20527: 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 20506 "configure"
++#line 20533 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:20510: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:20537: \"$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:20516: \$? = $ac_status" >&5
++ echo "$as_me:20543: \$? = $ac_status" >&5
+ (exit "$ac_status"); } >/dev/null; then
+ if test -s conftest.err; then
+ ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -20532,7 +20559,7 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:20535: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
++echo "$as_me:20562: 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,23 +20572,23 @@
+ for ac_header in getopt.h
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-echo "$as_me:20548: checking for $ac_header" >&5
++echo "$as_me:20575: 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 20554 "configure"
++#line 20581 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:20558: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:20585: \"$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:20564: \$? = $ac_status" >&5
++ echo "$as_me:20591: \$? = $ac_status" >&5
+ (exit "$ac_status"); } >/dev/null; then
+ if test -s conftest.err; then
+ ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -20580,7 +20607,7 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:20583: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
++echo "$as_me:20610: 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
+@@ -20590,7 +20617,7 @@
+ fi
+ done
+
+-echo "$as_me:20593: checking for header declaring getopt variables" >&5
++echo "$as_me:20620: 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
+@@ -20600,7 +20627,7 @@
+ for cf_header in stdio.h stdlib.h unistd.h getopt.h
+ do
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 20603 "configure"
++#line 20630 "configure"
+ #include "confdefs.h"
+
+ #include <$cf_header>
+@@ -20613,16 +20640,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:20616: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:20643: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:20619: \$? = $ac_status" >&5
++ echo "$as_me:20646: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:20622: \"$ac_try\"") >&5
++ { (eval echo "$as_me:20649: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:20625: \$? = $ac_status" >&5
++ echo "$as_me:20652: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_getopt_header=$cf_header
+ break
+@@ -20634,7 +20661,7 @@
+ done
+
+ fi
+-echo "$as_me:20637: result: $cf_cv_getopt_header" >&5
++echo "$as_me:20664: result: $cf_cv_getopt_header" >&5
+ echo "${ECHO_T}$cf_cv_getopt_header" >&6
+ if test "$cf_cv_getopt_header" != none ; then
+
+@@ -20651,14 +20678,14 @@
+
+ fi
+
+-echo "$as_me:20654: checking if external environ is declared" >&5
++echo "$as_me:20681: 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 20661 "configure"
++#line 20688 "configure"
+ #include "confdefs.h"
+
+ $ac_includes_default
+@@ -20671,16 +20698,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:20674: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:20701: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:20677: \$? = $ac_status" >&5
++ echo "$as_me:20704: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:20680: \"$ac_try\"") >&5
++ { (eval echo "$as_me:20707: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:20683: \$? = $ac_status" >&5
++ echo "$as_me:20710: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_dcl_environ=yes
+ else
+@@ -20691,7 +20718,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+
+ fi
+-echo "$as_me:20694: result: $cf_cv_dcl_environ" >&5
++echo "$as_me:20721: result: $cf_cv_dcl_environ" >&5
+ echo "${ECHO_T}$cf_cv_dcl_environ" >&6
+
+ if test "$cf_cv_dcl_environ" = no ; then
+@@ -20706,14 +20733,14 @@
+
+ # It's possible (for near-UNIX clones) that the data doesn't exist
+
+-echo "$as_me:20709: checking if external environ exists" >&5
++echo "$as_me:20736: 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 20716 "configure"
++#line 20743 "configure"
+ #include "confdefs.h"
+
+ #undef environ
+@@ -20728,16 +20755,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:20731: \"$ac_link\"") >&5
++if { (eval echo "$as_me:20758: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:20734: \$? = $ac_status" >&5
++ echo "$as_me:20761: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:20737: \"$ac_try\"") >&5
++ { (eval echo "$as_me:20764: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:20740: \$? = $ac_status" >&5
++ echo "$as_me:20767: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_have_environ=yes
+ else
+@@ -20748,7 +20775,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+
+ fi
+-echo "$as_me:20751: result: $cf_cv_have_environ" >&5
++echo "$as_me:20778: result: $cf_cv_have_environ" >&5
+ echo "${ECHO_T}$cf_cv_have_environ" >&6
+
+ if test "$cf_cv_have_environ" = yes ; then
+@@ -20761,13 +20788,13 @@
+
+ fi
+
+-echo "$as_me:20764: checking for getenv" >&5
++echo "$as_me:20791: 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 20770 "configure"
++#line 20797 "configure"
+ #include "confdefs.h"
+ #define getenv autoconf_temporary
+ #include <limits.h> /* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -20798,16 +20825,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:20801: \"$ac_link\"") >&5
++if { (eval echo "$as_me:20828: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:20804: \$? = $ac_status" >&5
++ echo "$as_me:20831: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:20807: \"$ac_try\"") >&5
++ { (eval echo "$as_me:20834: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:20810: \$? = $ac_status" >&5
++ echo "$as_me:20837: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_func_getenv=yes
+ else
+@@ -20817,19 +20844,19 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:20820: result: $ac_cv_func_getenv" >&5
++echo "$as_me:20847: 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:20826: checking for $ac_func" >&5
++echo "$as_me:20853: 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 20832 "configure"
++#line 20859 "configure"
+ #include "confdefs.h"
+ #define $ac_func autoconf_temporary
+ #include <limits.h> /* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -20860,16 +20887,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:20863: \"$ac_link\"") >&5
++if { (eval echo "$as_me:20890: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:20866: \$? = $ac_status" >&5
++ echo "$as_me:20893: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:20869: \"$ac_try\"") >&5
++ { (eval echo "$as_me:20896: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:20872: \$? = $ac_status" >&5
++ echo "$as_me:20899: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ eval "$as_ac_var=yes"
+ else
+@@ -20879,7 +20906,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:20882: result: `eval echo '${'"$as_ac_var"'}'`" >&5
++echo "$as_me:20909: 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
+@@ -20889,7 +20916,7 @@
+ fi
+ done
+
+-echo "$as_me:20892: checking if getenv returns consistent values" >&5
++echo "$as_me:20919: 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
+@@ -20899,7 +20926,7 @@
+ cf_cv_consistent_getenv=unknown
+ else
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 20902 "configure"
++#line 20929 "configure"
+ #include "confdefs.h"
+
+ $ac_includes_default
+@@ -21004,15 +21031,15 @@
+
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:21007: \"$ac_link\"") >&5
++if { (eval echo "$as_me:21034: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:21010: \$? = $ac_status" >&5
++ echo "$as_me:21037: \$? = $ac_status" >&5
+ (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+- { (eval echo "$as_me:21012: \"$ac_try\"") >&5
++ { (eval echo "$as_me:21039: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:21015: \$? = $ac_status" >&5
++ echo "$as_me:21042: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_consistent_getenv=yes
+ else
+@@ -21025,7 +21052,7 @@
+ fi
+
+ fi
+-echo "$as_me:21028: result: $cf_cv_consistent_getenv" >&5
++echo "$as_me:21055: result: $cf_cv_consistent_getenv" >&5
+ echo "${ECHO_T}$cf_cv_consistent_getenv" >&6
+
+ if test "x$cf_cv_consistent_getenv" = xno
+@@ -21040,18 +21067,18 @@
+ if test "x$cf_cv_consistent_getenv" = xno && \
+ test "x$cf_with_trace" = xyes
+ then
+- { echo "$as_me:21043: WARNING: The NCURSES_TRACE environment variable is not supported with this configuration" >&5
++ { echo "$as_me:21070: 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:21047: checking if sys/time.h works with sys/select.h" >&5
++echo "$as_me:21074: 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 21054 "configure"
++#line 21081 "configure"
+ #include "confdefs.h"
+
+ #include <sys/types.h>
+@@ -21071,16 +21098,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:21074: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:21101: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:21077: \$? = $ac_status" >&5
++ echo "$as_me:21104: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:21080: \"$ac_try\"") >&5
++ { (eval echo "$as_me:21107: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:21083: \$? = $ac_status" >&5
++ echo "$as_me:21110: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_sys_time_select=yes
+ else
+@@ -21092,7 +21119,7 @@
+
+ fi
+
+-echo "$as_me:21095: result: $cf_cv_sys_time_select" >&5
++echo "$as_me:21122: 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
+@@ -21107,13 +21134,13 @@
+ ac_compiler_gnu=$ac_cv_c_compiler_gnu
+ ac_main_return="return"
+
+-echo "$as_me:21110: checking for an ANSI C-conforming const" >&5
++echo "$as_me:21137: 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 21116 "configure"
++#line 21143 "configure"
+ #include "confdefs.h"
+
+ int
+@@ -21175,16 +21202,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:21178: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:21205: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:21181: \$? = $ac_status" >&5
++ echo "$as_me:21208: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:21184: \"$ac_try\"") >&5
++ { (eval echo "$as_me:21211: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:21187: \$? = $ac_status" >&5
++ echo "$as_me:21214: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_c_const=yes
+ else
+@@ -21194,7 +21221,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:21197: result: $ac_cv_c_const" >&5
++echo "$as_me:21224: result: $ac_cv_c_const" >&5
+ echo "${ECHO_T}$ac_cv_c_const" >&6
+ if test $ac_cv_c_const = no; then
+
+@@ -21204,7 +21231,7 @@
+
+ fi
+
+-echo "$as_me:21207: checking for inline" >&5
++echo "$as_me:21234: 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
+@@ -21212,7 +21239,7 @@
+ ac_cv_c_inline=no
+ for ac_kw in inline __inline__ __inline; do
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 21215 "configure"
++#line 21242 "configure"
+ #include "confdefs.h"
+ #ifndef __cplusplus
+ static $ac_kw int static_foo (void) {return 0; }
+@@ -21221,16 +21248,16 @@
+
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:21224: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:21251: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:21227: \$? = $ac_status" >&5
++ echo "$as_me:21254: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:21230: \"$ac_try\"") >&5
++ { (eval echo "$as_me:21257: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:21233: \$? = $ac_status" >&5
++ echo "$as_me:21260: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_c_inline=$ac_kw; break
+ else
+@@ -21241,7 +21268,7 @@
+ done
+
+ fi
+-echo "$as_me:21244: result: $ac_cv_c_inline" >&5
++echo "$as_me:21271: result: $ac_cv_c_inline" >&5
+ echo "${ECHO_T}$ac_cv_c_inline" >&6
+ case $ac_cv_c_inline in
+ inline | yes) ;;
+@@ -21267,7 +21294,7 @@
+ :
+ elif test "$GCC" = yes
+ then
+- echo "$as_me:21270: checking if $CC supports options to tune inlining" >&5
++ echo "$as_me:21297: 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
+@@ -21276,7 +21303,7 @@
+ cf_save_CFLAGS=$CFLAGS
+ CFLAGS="$CFLAGS --param max-inline-insns-single=1200"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 21279 "configure"
++#line 21306 "configure"
+ #include "confdefs.h"
+ inline int foo(void) { return 1; }
+ int
+@@ -21288,16 +21315,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:21291: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:21318: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:21294: \$? = $ac_status" >&5
++ echo "$as_me:21321: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:21297: \"$ac_try\"") >&5
++ { (eval echo "$as_me:21324: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:21300: \$? = $ac_status" >&5
++ echo "$as_me:21327: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_gcc_inline=yes
+ else
+@@ -21309,7 +21336,7 @@
+ CFLAGS=$cf_save_CFLAGS
+
+ fi
+-echo "$as_me:21312: result: $cf_cv_gcc_inline" >&5
++echo "$as_me:21339: result: $cf_cv_gcc_inline" >&5
+ echo "${ECHO_T}$cf_cv_gcc_inline" >&6
+ if test "$cf_cv_gcc_inline" = yes ; then
+
+@@ -21415,7 +21442,7 @@
+ fi
+ fi
+
+-echo "$as_me:21418: checking for signal global datatype" >&5
++echo "$as_me:21445: 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
+@@ -21427,7 +21454,7 @@
+ "int"
+ do
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 21430 "configure"
++#line 21457 "configure"
+ #include "confdefs.h"
+
+ #include <sys/types.h>
+@@ -21451,16 +21478,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:21454: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:21481: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:21457: \$? = $ac_status" >&5
++ echo "$as_me:21484: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:21460: \"$ac_try\"") >&5
++ { (eval echo "$as_me:21487: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:21463: \$? = $ac_status" >&5
++ echo "$as_me:21490: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_sig_atomic_t=$cf_type
+ else
+@@ -21474,7 +21501,7 @@
+
+ fi
+
+-echo "$as_me:21477: result: $cf_cv_sig_atomic_t" >&5
++echo "$as_me:21504: 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
+@@ -21483,7 +21510,7 @@
+
+ if test "$NCURSES_CHTYPE" = auto ; then
+
+-echo "$as_me:21486: checking for type of chtype" >&5
++echo "$as_me:21513: 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
+@@ -21493,7 +21520,7 @@
+ cf_cv_typeof_chtype=long
+ else
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 21496 "configure"
++#line 21523 "configure"
+ #include "confdefs.h"
+
+ $ac_includes_default
+@@ -21528,15 +21555,15 @@
+
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:21531: \"$ac_link\"") >&5
++if { (eval echo "$as_me:21558: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:21534: \$? = $ac_status" >&5
++ echo "$as_me:21561: \$? = $ac_status" >&5
+ (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+- { (eval echo "$as_me:21536: \"$ac_try\"") >&5
++ { (eval echo "$as_me:21563: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:21539: \$? = $ac_status" >&5
++ echo "$as_me:21566: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_typeof_chtype=`cat cf_test.out`
+ else
+@@ -21551,7 +21578,7 @@
+
+ fi
+
+-echo "$as_me:21554: result: $cf_cv_typeof_chtype" >&5
++echo "$as_me:21581: result: $cf_cv_typeof_chtype" >&5
+ echo "${ECHO_T}$cf_cv_typeof_chtype" >&6
+
+ cat >>confdefs.h <<EOF
+@@ -21563,14 +21590,14 @@
+ fi
+ test "$cf_cv_typeof_chtype" = unsigned && cf_cv_typeof_chtype=""
+
+-echo "$as_me:21566: checking if unsigned literals are legal" >&5
++echo "$as_me:21593: 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 21573 "configure"
++#line 21600 "configure"
+ #include "confdefs.h"
+
+ int
+@@ -21582,16 +21609,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:21585: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:21612: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:21588: \$? = $ac_status" >&5
++ echo "$as_me:21615: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:21591: \"$ac_try\"") >&5
++ { (eval echo "$as_me:21618: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:21594: \$? = $ac_status" >&5
++ echo "$as_me:21621: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_unsigned_literals=yes
+ else
+@@ -21603,7 +21630,7 @@
+
+ fi
+
+-echo "$as_me:21606: result: $cf_cv_unsigned_literals" >&5
++echo "$as_me:21633: result: $cf_cv_unsigned_literals" >&5
+ echo "${ECHO_T}$cf_cv_unsigned_literals" >&6
+
+ cf_cv_1UL="1"
+@@ -21619,14 +21646,14 @@
+
+ ### Checks for external-data
+
+-echo "$as_me:21622: checking if external errno is declared" >&5
++echo "$as_me:21649: 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 21629 "configure"
++#line 21656 "configure"
+ #include "confdefs.h"
+
+ $ac_includes_default
+@@ -21640,16 +21667,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:21643: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:21670: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:21646: \$? = $ac_status" >&5
++ echo "$as_me:21673: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:21649: \"$ac_try\"") >&5
++ { (eval echo "$as_me:21676: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:21652: \$? = $ac_status" >&5
++ echo "$as_me:21679: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_dcl_errno=yes
+ else
+@@ -21660,7 +21687,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+
+ fi
+-echo "$as_me:21663: result: $cf_cv_dcl_errno" >&5
++echo "$as_me:21690: result: $cf_cv_dcl_errno" >&5
+ echo "${ECHO_T}$cf_cv_dcl_errno" >&6
+
+ if test "$cf_cv_dcl_errno" = no ; then
+@@ -21675,14 +21702,14 @@
+
+ # It's possible (for near-UNIX clones) that the data doesn't exist
+
+-echo "$as_me:21678: checking if external errno exists" >&5
++echo "$as_me:21705: 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 21685 "configure"
++#line 21712 "configure"
+ #include "confdefs.h"
+
+ #undef errno
+@@ -21697,16 +21724,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:21700: \"$ac_link\"") >&5
++if { (eval echo "$as_me:21727: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:21703: \$? = $ac_status" >&5
++ echo "$as_me:21730: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:21706: \"$ac_try\"") >&5
++ { (eval echo "$as_me:21733: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:21709: \$? = $ac_status" >&5
++ echo "$as_me:21736: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_have_errno=yes
+ else
+@@ -21717,7 +21744,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+
+ fi
+-echo "$as_me:21720: result: $cf_cv_have_errno" >&5
++echo "$as_me:21747: result: $cf_cv_have_errno" >&5
+ echo "${ECHO_T}$cf_cv_have_errno" >&6
+
+ if test "$cf_cv_have_errno" = yes ; then
+@@ -21730,7 +21757,7 @@
+
+ fi
+
+-echo "$as_me:21733: checking if data-only library module links" >&5
++echo "$as_me:21760: 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
+@@ -21738,20 +21765,20 @@
+
+ rm -f conftest.a
+ cat >conftest.$ac_ext <<EOF
+-#line 21741 "configure"
++#line 21768 "configure"
+ int testdata[3] = { 123, 456, 789 };
+ EOF
+- if { (eval echo "$as_me:21744: \"$ac_compile\"") >&5
++ if { (eval echo "$as_me:21771: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:21747: \$? = $ac_status" >&5
++ echo "$as_me:21774: \$? = $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 21754 "configure"
++#line 21781 "configure"
+ extern int testfunc(void);
+ #if defined(NeXT)
+ int testfunc(void)
+@@ -21768,10 +21795,10 @@
+ }
+ #endif
+ EOF
+- if { (eval echo "$as_me:21771: \"$ac_compile\"") >&5
++ if { (eval echo "$as_me:21798: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:21774: \$? = $ac_status" >&5
++ echo "$as_me:21801: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; then
+ mv conftest.o func.o && \
+ ( $AR $ARFLAGS conftest.a func.o ) 2>&5 1>/dev/null
+@@ -21784,7 +21811,7 @@
+ cf_cv_link_dataonly=unknown
+ else
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 21787 "configure"
++#line 21814 "configure"
+ #include "confdefs.h"
+
+ extern int testfunc(void);
+@@ -21795,15 +21822,15 @@
+
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:21798: \"$ac_link\"") >&5
++if { (eval echo "$as_me:21825: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:21801: \$? = $ac_status" >&5
++ echo "$as_me:21828: \$? = $ac_status" >&5
+ (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+- { (eval echo "$as_me:21803: \"$ac_try\"") >&5
++ { (eval echo "$as_me:21830: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:21806: \$? = $ac_status" >&5
++ echo "$as_me:21833: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_link_dataonly=yes
+ else
+@@ -21818,7 +21845,7 @@
+
+ fi
+
+-echo "$as_me:21821: result: $cf_cv_link_dataonly" >&5
++echo "$as_me:21848: result: $cf_cv_link_dataonly" >&5
+ echo "${ECHO_T}$cf_cv_link_dataonly" >&6
+
+ if test "$cf_cv_link_dataonly" = no ; then
+@@ -21833,13 +21860,13 @@
+ ### Checks for library functions.
+
+ cf_save_libs="$LIBS"
+-echo "$as_me:21836: checking for clock_gettime" >&5
++echo "$as_me:21863: 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 21842 "configure"
++#line 21869 "configure"
+ #include "confdefs.h"
+ #define clock_gettime autoconf_temporary
+ #include <limits.h> /* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -21870,16 +21897,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:21873: \"$ac_link\"") >&5
++if { (eval echo "$as_me:21900: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:21876: \$? = $ac_status" >&5
++ echo "$as_me:21903: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:21879: \"$ac_try\"") >&5
++ { (eval echo "$as_me:21906: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:21882: \$? = $ac_status" >&5
++ echo "$as_me:21909: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_func_clock_gettime=yes
+ else
+@@ -21889,12 +21916,12 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:21892: result: $ac_cv_func_clock_gettime" >&5
++echo "$as_me:21919: 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:21897: checking for clock_gettime in -lrt" >&5
++ echo "$as_me:21924: 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
+@@ -21902,7 +21929,7 @@
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lrt $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 21905 "configure"
++#line 21932 "configure"
+ #include "confdefs.h"
+
+ /* Override any gcc2 internal prototype to avoid an error. */
+@@ -21921,16 +21948,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:21924: \"$ac_link\"") >&5
++if { (eval echo "$as_me:21951: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:21927: \$? = $ac_status" >&5
++ echo "$as_me:21954: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:21930: \"$ac_try\"") >&5
++ { (eval echo "$as_me:21957: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:21933: \$? = $ac_status" >&5
++ echo "$as_me:21960: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_lib_rt_clock_gettime=yes
+ else
+@@ -21941,7 +21968,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:21944: result: $ac_cv_lib_rt_clock_gettime" >&5
++echo "$as_me:21971: 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"
+@@ -21953,14 +21980,14 @@
+ fi
+
+ if test "$cf_cv_test_clock_gettime" = yes ; then
+-echo "$as_me:21956: checking if clock_gettime links" >&5
++echo "$as_me:21983: 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 21963 "configure"
++#line 21990 "configure"
+ #include "confdefs.h"
+
+ $ac_includes_default
+@@ -21978,16 +22005,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:21981: \"$ac_link\"") >&5
++if { (eval echo "$as_me:22008: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:21984: \$? = $ac_status" >&5
++ echo "$as_me:22011: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:21987: \"$ac_try\"") >&5
++ { (eval echo "$as_me:22014: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:21990: \$? = $ac_status" >&5
++ echo "$as_me:22017: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_func_clock_gettime=yes
+ else
+@@ -21998,7 +22025,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+
+ fi
+-echo "$as_me:22001: result: $cf_cv_func_clock_gettime" >&5
++echo "$as_me:22028: result: $cf_cv_func_clock_gettime" >&5
+ echo "${ECHO_T}$cf_cv_func_clock_gettime" >&6
+ else
+ cf_cv_func_clock_gettime=no
+@@ -22012,13 +22039,13 @@
+ EOF
+
+ else
+-echo "$as_me:22015: checking for gettimeofday" >&5
++echo "$as_me:22042: 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 22021 "configure"
++#line 22048 "configure"
+ #include "confdefs.h"
+ #define gettimeofday autoconf_temporary
+ #include <limits.h> /* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -22049,16 +22076,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:22052: \"$ac_link\"") >&5
++if { (eval echo "$as_me:22079: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:22055: \$? = $ac_status" >&5
++ echo "$as_me:22082: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:22058: \"$ac_try\"") >&5
++ { (eval echo "$as_me:22085: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:22061: \$? = $ac_status" >&5
++ echo "$as_me:22088: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_func_gettimeofday=yes
+ else
+@@ -22068,7 +22095,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:22071: result: $ac_cv_func_gettimeofday" >&5
++echo "$as_me:22098: result: $ac_cv_func_gettimeofday" >&5
+ echo "${ECHO_T}$ac_cv_func_gettimeofday" >&6
+ if test "$ac_cv_func_gettimeofday" = yes; then
+
+@@ -22078,7 +22105,7 @@
+
+ else
+
+-echo "$as_me:22081: checking for gettimeofday in -lbsd" >&5
++echo "$as_me:22108: 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
+@@ -22086,7 +22113,7 @@
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lbsd $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 22089 "configure"
++#line 22116 "configure"
+ #include "confdefs.h"
+
+ /* Override any gcc2 internal prototype to avoid an error. */
+@@ -22105,16 +22132,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:22108: \"$ac_link\"") >&5
++if { (eval echo "$as_me:22135: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:22111: \$? = $ac_status" >&5
++ echo "$as_me:22138: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:22114: \"$ac_try\"") >&5
++ { (eval echo "$as_me:22141: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:22117: \$? = $ac_status" >&5
++ echo "$as_me:22144: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_lib_bsd_gettimeofday=yes
+ else
+@@ -22125,7 +22152,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:22128: result: $ac_cv_lib_bsd_gettimeofday" >&5
++echo "$as_me:22155: 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
+
+@@ -22184,13 +22211,13 @@
+
+ do
+ as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+-echo "$as_me:22187: checking for $ac_func" >&5
++echo "$as_me:22214: 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 22193 "configure"
++#line 22220 "configure"
+ #include "confdefs.h"
+ #define $ac_func autoconf_temporary
+ #include <limits.h> /* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -22221,16 +22248,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:22224: \"$ac_link\"") >&5
++if { (eval echo "$as_me:22251: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:22227: \$? = $ac_status" >&5
++ echo "$as_me:22254: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:22230: \"$ac_try\"") >&5
++ { (eval echo "$as_me:22257: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:22233: \$? = $ac_status" >&5
++ echo "$as_me:22260: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ eval "$as_ac_var=yes"
+ else
+@@ -22240,7 +22267,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:22243: result: `eval echo '${'"$as_ac_var"'}'`" >&5
++echo "$as_me:22270: 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
+@@ -22250,14 +22277,14 @@
+ fi
+ done
+
+-echo "$as_me:22253: checking if _PATH_TTYS is defined in ttyent.h" >&5
++echo "$as_me:22280: 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 22260 "configure"
++#line 22287 "configure"
+ #include "confdefs.h"
+
+ #include <stdio.h>
+@@ -22272,16 +22299,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:22275: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:22302: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:22278: \$? = $ac_status" >&5
++ echo "$as_me:22305: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:22281: \"$ac_try\"") >&5
++ { (eval echo "$as_me:22308: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:22284: \$? = $ac_status" >&5
++ echo "$as_me:22311: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_PATH_TTYS=yes
+ else
+@@ -22291,7 +22318,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:22294: result: $cf_cv_PATH_TTYS" >&5
++echo "$as_me:22321: result: $cf_cv_PATH_TTYS" >&5
+ echo "${ECHO_T}$cf_cv_PATH_TTYS" >&6
+
+ if test $cf_cv_PATH_TTYS = no
+@@ -22313,7 +22340,7 @@
+
+ if test $cf_cv_PATH_TTYS != no
+ then
+- echo "$as_me:22316: checking if _PATH_TTYS file exists" >&5
++ echo "$as_me:22343: 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
+@@ -22323,7 +22350,7 @@
+ cf_cv_have_PATH_TTYS=unknown
+ else
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 22326 "configure"
++#line 22353 "configure"
+ #include "confdefs.h"
+
+ $ac_includes_default
+@@ -22336,15 +22363,15 @@
+ }
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:22339: \"$ac_link\"") >&5
++if { (eval echo "$as_me:22366: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:22342: \$? = $ac_status" >&5
++ echo "$as_me:22369: \$? = $ac_status" >&5
+ (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+- { (eval echo "$as_me:22344: \"$ac_try\"") >&5
++ { (eval echo "$as_me:22371: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:22347: \$? = $ac_status" >&5
++ echo "$as_me:22374: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_have_PATH_TTYS=yes
+ else
+@@ -22356,7 +22383,7 @@
+ rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+ fi
+-echo "$as_me:22359: result: $cf_cv_have_PATH_TTYS" >&5
++echo "$as_me:22386: 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
+@@ -22368,14 +22395,14 @@
+ #define HAVE_PATH_TTYS 1
+ EOF
+
+- echo "$as_me:22371: checking for getttynam" >&5
++ echo "$as_me:22398: 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 22378 "configure"
++#line 22405 "configure"
+ #include "confdefs.h"
+ #include <ttyent.h>
+ int
+@@ -22387,16 +22414,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:22390: \"$ac_link\"") >&5
++if { (eval echo "$as_me:22417: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:22393: \$? = $ac_status" >&5
++ echo "$as_me:22420: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:22396: \"$ac_try\"") >&5
++ { (eval echo "$as_me:22423: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:22399: \$? = $ac_status" >&5
++ echo "$as_me:22426: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_func_getttynam=yes
+ else
+@@ -22406,7 +22433,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:22409: result: $cf_cv_func_getttynam" >&5
++echo "$as_me:22436: 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
+@@ -22416,7 +22443,7 @@
+
+ if test "x$ac_cv_func_getopt" = xno && \
+ test "x$cf_with_progs$cf_with_tests" != xnono; then
+- { { echo "$as_me:22419: error: getopt is required for building programs" >&5
++ { { echo "$as_me:22446: error: getopt is required for building programs" >&5
+ echo "$as_me: error: getopt is required for building programs" >&2;}
+ { (exit 1); exit 1; }; }
+ fi
+@@ -22425,7 +22452,7 @@
+ then
+ if test "x$ac_cv_func_vsnprintf" = xyes
+ then
+- { echo "$as_me:22428: WARNING: will use vsnprintf instead of safe-sprintf option" >&5
++ { echo "$as_me:22455: WARNING: will use vsnprintf instead of safe-sprintf option" >&5
+ echo "$as_me: WARNING: will use vsnprintf instead of safe-sprintf option" >&2;}
+ else
+
+@@ -22438,14 +22465,14 @@
+
+ if test "x$with_getcap" = "xyes" ; then
+
+-echo "$as_me:22441: checking for terminal-capability database functions" >&5
++echo "$as_me:22468: 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 22448 "configure"
++#line 22475 "configure"
+ #include "confdefs.h"
+
+ $ac_includes_default
+@@ -22465,16 +22492,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:22468: \"$ac_link\"") >&5
++if { (eval echo "$as_me:22495: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:22471: \$? = $ac_status" >&5
++ echo "$as_me:22498: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:22474: \"$ac_try\"") >&5
++ { (eval echo "$as_me:22501: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:22477: \$? = $ac_status" >&5
++ echo "$as_me:22504: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_cgetent=yes
+ else
+@@ -22485,7 +22512,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+
+ fi
+-echo "$as_me:22488: result: $cf_cv_cgetent" >&5
++echo "$as_me:22515: result: $cf_cv_cgetent" >&5
+ echo "${ECHO_T}$cf_cv_cgetent" >&6
+
+ if test "$cf_cv_cgetent" = yes
+@@ -22495,14 +22522,14 @@
+ #define HAVE_BSD_CGETENT 1
+ EOF
+
+-echo "$as_me:22498: checking if cgetent uses const parameter" >&5
++echo "$as_me:22525: 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 22505 "configure"
++#line 22532 "configure"
+ #include "confdefs.h"
+
+ #pragma GCC diagnostic error "-Wincompatible-pointer-types-discards-qualifiers"
+@@ -22525,16 +22552,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:22528: \"$ac_link\"") >&5
++if { (eval echo "$as_me:22555: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:22531: \$? = $ac_status" >&5
++ echo "$as_me:22558: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:22534: \"$ac_try\"") >&5
++ { (eval echo "$as_me:22561: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:22537: \$? = $ac_status" >&5
++ echo "$as_me:22564: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_cgetent_const=yes
+ else
+@@ -22545,7 +22572,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+
+ fi
+-echo "$as_me:22548: result: $cf_cv_cgetent_const" >&5
++echo "$as_me:22575: result: $cf_cv_cgetent_const" >&5
+ echo "${ECHO_T}$cf_cv_cgetent_const" >&6
+ if test "$cf_cv_cgetent_const" = yes
+ then
+@@ -22559,14 +22586,14 @@
+
+ fi
+
+-echo "$as_me:22562: checking for isascii" >&5
++echo "$as_me:22589: 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 22569 "configure"
++#line 22596 "configure"
+ #include "confdefs.h"
+ #include <ctype.h>
+ int
+@@ -22578,16 +22605,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:22581: \"$ac_link\"") >&5
++if { (eval echo "$as_me:22608: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:22584: \$? = $ac_status" >&5
++ echo "$as_me:22611: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:22587: \"$ac_try\"") >&5
++ { (eval echo "$as_me:22614: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:22590: \$? = $ac_status" >&5
++ echo "$as_me:22617: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_have_isascii=yes
+ else
+@@ -22598,7 +22625,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+
+ fi
+-echo "$as_me:22601: result: $cf_cv_have_isascii" >&5
++echo "$as_me:22628: result: $cf_cv_have_isascii" >&5
+ echo "${ECHO_T}$cf_cv_have_isascii" >&6
+ test "$cf_cv_have_isascii" = yes &&
+ cat >>confdefs.h <<\EOF
+@@ -22606,10 +22633,10 @@
+ EOF
+
+ if test "$ac_cv_func_sigaction" = yes; then
+-echo "$as_me:22609: checking whether sigaction needs _POSIX_SOURCE" >&5
++echo "$as_me:22636: 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 22612 "configure"
++#line 22639 "configure"
+ #include "confdefs.h"
+
+ #include <sys/types.h>
+@@ -22623,16 +22650,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:22626: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:22653: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:22629: \$? = $ac_status" >&5
++ echo "$as_me:22656: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:22632: \"$ac_try\"") >&5
++ { (eval echo "$as_me:22659: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:22635: \$? = $ac_status" >&5
++ echo "$as_me:22662: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ sigact_bad=no
+ else
+@@ -22640,7 +22667,7 @@
+ cat "conftest.$ac_ext" >&5
+
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 22643 "configure"
++#line 22670 "configure"
+ #include "confdefs.h"
+
+ #define _POSIX_SOURCE
+@@ -22655,16 +22682,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:22658: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:22685: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:22661: \$? = $ac_status" >&5
++ echo "$as_me:22688: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:22664: \"$ac_try\"") >&5
++ { (eval echo "$as_me:22691: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:22667: \$? = $ac_status" >&5
++ echo "$as_me:22694: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ sigact_bad=yes
+
+@@ -22680,11 +22707,11 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+-echo "$as_me:22683: result: $sigact_bad" >&5
++echo "$as_me:22710: result: $sigact_bad" >&5
+ echo "${ECHO_T}$sigact_bad" >&6
+ fi
+
+-echo "$as_me:22687: checking if nanosleep really works" >&5
++echo "$as_me:22714: 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
+@@ -22694,7 +22721,7 @@
+ cf_cv_func_nanosleep=unknown
+ else
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 22697 "configure"
++#line 22724 "configure"
+ #include "confdefs.h"
+
+ $ac_includes_default
+@@ -22720,15 +22747,15 @@
+
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:22723: \"$ac_link\"") >&5
++if { (eval echo "$as_me:22750: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:22726: \$? = $ac_status" >&5
++ echo "$as_me:22753: \$? = $ac_status" >&5
+ (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+- { (eval echo "$as_me:22728: \"$ac_try\"") >&5
++ { (eval echo "$as_me:22755: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:22731: \$? = $ac_status" >&5
++ echo "$as_me:22758: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_func_nanosleep=yes
+ else
+@@ -22740,7 +22767,7 @@
+ rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+ fi
+-echo "$as_me:22743: result: $cf_cv_func_nanosleep" >&5
++echo "$as_me:22770: result: $cf_cv_func_nanosleep" >&5
+ echo "${ECHO_T}$cf_cv_func_nanosleep" >&6
+
+ test "$cf_cv_func_nanosleep" = "yes" &&
+@@ -22757,23 +22784,23 @@
+
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-echo "$as_me:22760: checking for $ac_header" >&5
++echo "$as_me:22787: 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 22766 "configure"
++#line 22793 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:22770: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:22797: \"$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:22776: \$? = $ac_status" >&5
++ echo "$as_me:22803: \$? = $ac_status" >&5
+ (exit "$ac_status"); } >/dev/null; then
+ if test -s conftest.err; then
+ ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -22792,7 +22819,7 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:22795: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
++echo "$as_me:22822: 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
+@@ -22809,10 +22836,10 @@
+ (*) termios_bad=maybe ;;
+ esac
+ if test "$termios_bad" = maybe ; then
+- echo "$as_me:22812: checking whether termios.h needs _POSIX_SOURCE" >&5
++ echo "$as_me:22839: 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 22815 "configure"
++#line 22842 "configure"
+ #include "confdefs.h"
+ #include <termios.h>
+ int
+@@ -22824,16 +22851,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:22827: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:22854: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:22830: \$? = $ac_status" >&5
++ echo "$as_me:22857: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:22833: \"$ac_try\"") >&5
++ { (eval echo "$as_me:22860: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:22836: \$? = $ac_status" >&5
++ echo "$as_me:22863: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ termios_bad=no
+ else
+@@ -22841,7 +22868,7 @@
+ cat "conftest.$ac_ext" >&5
+
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 22844 "configure"
++#line 22871 "configure"
+ #include "confdefs.h"
+
+ #define _POSIX_SOURCE
+@@ -22855,16 +22882,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:22858: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:22885: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:22861: \$? = $ac_status" >&5
++ echo "$as_me:22888: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:22864: \"$ac_try\"") >&5
++ { (eval echo "$as_me:22891: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:22867: \$? = $ac_status" >&5
++ echo "$as_me:22894: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ termios_bad=unknown
+ else
+@@ -22880,19 +22907,19 @@
+
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+- echo "$as_me:22883: result: $termios_bad" >&5
++ echo "$as_me:22910: result: $termios_bad" >&5
+ echo "${ECHO_T}$termios_bad" >&6
+ fi
+ fi
+
+-echo "$as_me:22888: checking for tcgetattr" >&5
++echo "$as_me:22915: 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 22895 "configure"
++#line 22922 "configure"
+ #include "confdefs.h"
+
+ #include <sys/types.h>
+@@ -22920,16 +22947,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:22923: \"$ac_link\"") >&5
++if { (eval echo "$as_me:22950: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:22926: \$? = $ac_status" >&5
++ echo "$as_me:22953: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:22929: \"$ac_try\"") >&5
++ { (eval echo "$as_me:22956: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:22932: \$? = $ac_status" >&5
++ echo "$as_me:22959: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_have_tcgetattr=yes
+ else
+@@ -22939,21 +22966,21 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:22942: result: $cf_cv_have_tcgetattr" >&5
++echo "$as_me:22969: 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:22949: checking for vsscanf function or workaround" >&5
++echo "$as_me:22976: 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 22956 "configure"
++#line 22983 "configure"
+ #include "confdefs.h"
+
+ #include <stdarg.h>
+@@ -22979,16 +23006,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:22982: \"$ac_link\"") >&5
++if { (eval echo "$as_me:23009: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:22985: \$? = $ac_status" >&5
++ echo "$as_me:23012: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:22988: \"$ac_try\"") >&5
++ { (eval echo "$as_me:23015: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:22991: \$? = $ac_status" >&5
++ echo "$as_me:23018: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_func_vsscanf=vsscanf
+ else
+@@ -22996,7 +23023,7 @@
+ cat "conftest.$ac_ext" >&5
+
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 22999 "configure"
++#line 23026 "configure"
+ #include "confdefs.h"
+
+ #include <stdarg.h>
+@@ -23018,16 +23045,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:23021: \"$ac_link\"") >&5
++if { (eval echo "$as_me:23048: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:23024: \$? = $ac_status" >&5
++ echo "$as_me:23051: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:23027: \"$ac_try\"") >&5
++ { (eval echo "$as_me:23054: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:23030: \$? = $ac_status" >&5
++ echo "$as_me:23057: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_func_vsscanf=vfscanf
+ else
+@@ -23035,7 +23062,7 @@
+ cat "conftest.$ac_ext" >&5
+
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 23038 "configure"
++#line 23065 "configure"
+ #include "confdefs.h"
+
+ #include <stdarg.h>
+@@ -23057,16 +23084,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:23060: \"$ac_link\"") >&5
++if { (eval echo "$as_me:23087: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:23063: \$? = $ac_status" >&5
++ echo "$as_me:23090: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:23066: \"$ac_try\"") >&5
++ { (eval echo "$as_me:23093: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:23069: \$? = $ac_status" >&5
++ echo "$as_me:23096: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_func_vsscanf=_doscan
+ else
+@@ -23081,7 +23108,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:23084: result: $cf_cv_func_vsscanf" >&5
++echo "$as_me:23111: result: $cf_cv_func_vsscanf" >&5
+ echo "${ECHO_T}$cf_cv_func_vsscanf" >&6
+
+ case "$cf_cv_func_vsscanf" in
+@@ -23107,23 +23134,23 @@
+
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-echo "$as_me:23110: checking for $ac_header" >&5
++echo "$as_me:23137: 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 23116 "configure"
++#line 23143 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:23120: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:23147: \"$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:23126: \$? = $ac_status" >&5
++ echo "$as_me:23153: \$? = $ac_status" >&5
+ (exit "$ac_status"); } >/dev/null; then
+ if test -s conftest.err; then
+ ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -23142,7 +23169,7 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:23145: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
++echo "$as_me:23172: 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
+@@ -23152,7 +23179,7 @@
+ fi
+ done
+
+-echo "$as_me:23155: checking for working mkstemp" >&5
++echo "$as_me:23182: 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
+@@ -23163,7 +23190,7 @@
+ cf_cv_func_mkstemp=maybe
+ else
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 23166 "configure"
++#line 23193 "configure"
+ #include "confdefs.h"
+
+ $ac_includes_default
+@@ -23198,15 +23225,15 @@
+
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:23201: \"$ac_link\"") >&5
++if { (eval echo "$as_me:23228: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:23204: \$? = $ac_status" >&5
++ echo "$as_me:23231: \$? = $ac_status" >&5
+ (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+- { (eval echo "$as_me:23206: \"$ac_try\"") >&5
++ { (eval echo "$as_me:23233: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:23209: \$? = $ac_status" >&5
++ echo "$as_me:23236: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_func_mkstemp=yes
+
+@@ -23221,16 +23248,16 @@
+ fi
+
+ fi
+-echo "$as_me:23224: result: $cf_cv_func_mkstemp" >&5
++echo "$as_me:23251: 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:23227: checking for mkstemp" >&5
++ echo "$as_me:23254: 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 23233 "configure"
++#line 23260 "configure"
+ #include "confdefs.h"
+ #define mkstemp autoconf_temporary
+ #include <limits.h> /* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -23261,16 +23288,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:23264: \"$ac_link\"") >&5
++if { (eval echo "$as_me:23291: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:23267: \$? = $ac_status" >&5
++ echo "$as_me:23294: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:23270: \"$ac_try\"") >&5
++ { (eval echo "$as_me:23297: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:23273: \$? = $ac_status" >&5
++ echo "$as_me:23300: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_func_mkstemp=yes
+ else
+@@ -23280,7 +23307,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:23283: result: $ac_cv_func_mkstemp" >&5
++echo "$as_me:23310: result: $ac_cv_func_mkstemp" >&5
+ echo "${ECHO_T}$ac_cv_func_mkstemp" >&6
+
+ fi
+@@ -23301,21 +23328,21 @@
+ fi
+
+ if test "x$cross_compiling" = xyes ; then
+- { echo "$as_me:23304: WARNING: cross compiling: assume setvbuf params not reversed" >&5
++ { echo "$as_me:23331: 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:23307: checking whether setvbuf arguments are reversed" >&5
++ echo "$as_me:23334: 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:23313: error: cannot run test program while cross compiling" >&5
++ { { echo "$as_me:23340: 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 23318 "configure"
++#line 23345 "configure"
+ #include "confdefs.h"
+ #include <stdio.h>
+ /* If setvbuf has the reversed format, exit 0. */
+@@ -23332,15 +23359,15 @@
+ }
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:23335: \"$ac_link\"") >&5
++if { (eval echo "$as_me:23362: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:23338: \$? = $ac_status" >&5
++ echo "$as_me:23365: \$? = $ac_status" >&5
+ (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+- { (eval echo "$as_me:23340: \"$ac_try\"") >&5
++ { (eval echo "$as_me:23367: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:23343: \$? = $ac_status" >&5
++ echo "$as_me:23370: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_func_setvbuf_reversed=yes
+ else
+@@ -23353,7 +23380,7 @@
+ fi
+ rm -f core ./core.* ./*.core
+ fi
+-echo "$as_me:23356: result: $ac_cv_func_setvbuf_reversed" >&5
++echo "$as_me:23383: 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
+
+@@ -23364,13 +23391,13 @@
+ fi
+
+ fi
+-echo "$as_me:23367: checking for intptr_t" >&5
++echo "$as_me:23394: 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 23373 "configure"
++#line 23400 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -23385,16 +23412,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:23388: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:23415: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:23391: \$? = $ac_status" >&5
++ echo "$as_me:23418: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:23394: \"$ac_try\"") >&5
++ { (eval echo "$as_me:23421: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:23397: \$? = $ac_status" >&5
++ echo "$as_me:23424: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_type_intptr_t=yes
+ else
+@@ -23404,7 +23431,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:23407: result: $ac_cv_type_intptr_t" >&5
++echo "$as_me:23434: 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
+ :
+@@ -23416,13 +23443,13 @@
+
+ fi
+
+-echo "$as_me:23419: checking for ssize_t" >&5
++echo "$as_me:23446: 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 23425 "configure"
++#line 23452 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -23437,16 +23464,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:23440: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:23467: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:23443: \$? = $ac_status" >&5
++ echo "$as_me:23470: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:23446: \"$ac_try\"") >&5
++ { (eval echo "$as_me:23473: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:23449: \$? = $ac_status" >&5
++ echo "$as_me:23476: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_type_ssize_t=yes
+ else
+@@ -23456,7 +23483,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:23459: result: $ac_cv_type_ssize_t" >&5
++echo "$as_me:23486: 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
+ :
+@@ -23468,14 +23495,14 @@
+
+ fi
+
+-echo "$as_me:23471: checking for type sigaction_t" >&5
++echo "$as_me:23498: 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 23478 "configure"
++#line 23505 "configure"
+ #include "confdefs.h"
+
+ #include <signal.h>
+@@ -23488,16 +23515,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:23491: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:23518: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:23494: \$? = $ac_status" >&5
++ echo "$as_me:23521: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:23497: \"$ac_try\"") >&5
++ { (eval echo "$as_me:23524: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:23500: \$? = $ac_status" >&5
++ echo "$as_me:23527: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_type_sigaction=yes
+ else
+@@ -23508,14 +23535,14 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+
+-echo "$as_me:23511: result: $cf_cv_type_sigaction" >&5
++echo "$as_me:23538: 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:23518: checking declaration of size-change" >&5
++echo "$as_me:23545: 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
+@@ -23536,7 +23563,7 @@
+
+ fi
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 23539 "configure"
++#line 23566 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ #ifdef HAVE_TERMIOS_H
+@@ -23586,16 +23613,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:23589: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:23616: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:23592: \$? = $ac_status" >&5
++ echo "$as_me:23619: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:23595: \"$ac_try\"") >&5
++ { (eval echo "$as_me:23622: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:23598: \$? = $ac_status" >&5
++ echo "$as_me:23625: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_sizechange=yes
+ else
+@@ -23614,7 +23641,7 @@
+ done
+
+ fi
+-echo "$as_me:23617: result: $cf_cv_sizechange" >&5
++echo "$as_me:23644: result: $cf_cv_sizechange" >&5
+ echo "${ECHO_T}$cf_cv_sizechange" >&6
+ if test "$cf_cv_sizechange" != no ; then
+
+@@ -23632,13 +23659,13 @@
+ esac
+ fi
+
+-echo "$as_me:23635: checking for memmove" >&5
++echo "$as_me:23662: 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 23641 "configure"
++#line 23668 "configure"
+ #include "confdefs.h"
+ #define memmove autoconf_temporary
+ #include <limits.h> /* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -23669,16 +23696,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:23672: \"$ac_link\"") >&5
++if { (eval echo "$as_me:23699: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:23675: \$? = $ac_status" >&5
++ echo "$as_me:23702: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:23678: \"$ac_try\"") >&5
++ { (eval echo "$as_me:23705: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:23681: \$? = $ac_status" >&5
++ echo "$as_me:23708: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_func_memmove=yes
+ else
+@@ -23688,19 +23715,19 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:23691: result: $ac_cv_func_memmove" >&5
++echo "$as_me:23718: 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:23697: checking for bcopy" >&5
++echo "$as_me:23724: 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 23703 "configure"
++#line 23730 "configure"
+ #include "confdefs.h"
+ #define bcopy autoconf_temporary
+ #include <limits.h> /* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -23731,16 +23758,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:23734: \"$ac_link\"") >&5
++if { (eval echo "$as_me:23761: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:23737: \$? = $ac_status" >&5
++ echo "$as_me:23764: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:23740: \"$ac_try\"") >&5
++ { (eval echo "$as_me:23767: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:23743: \$? = $ac_status" >&5
++ echo "$as_me:23770: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_func_bcopy=yes
+ else
+@@ -23750,11 +23777,11 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:23753: result: $ac_cv_func_bcopy" >&5
++echo "$as_me:23780: 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:23757: checking if bcopy does overlapping moves" >&5
++ echo "$as_me:23784: 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
+@@ -23764,7 +23791,7 @@
+ cf_cv_good_bcopy=unknown
+ else
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 23767 "configure"
++#line 23794 "configure"
+ #include "confdefs.h"
+
+ $ac_includes_default
+@@ -23780,15 +23807,15 @@
+
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:23783: \"$ac_link\"") >&5
++if { (eval echo "$as_me:23810: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:23786: \$? = $ac_status" >&5
++ echo "$as_me:23813: \$? = $ac_status" >&5
+ (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+- { (eval echo "$as_me:23788: \"$ac_try\"") >&5
++ { (eval echo "$as_me:23815: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:23791: \$? = $ac_status" >&5
++ echo "$as_me:23818: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_good_bcopy=yes
+ else
+@@ -23801,7 +23828,7 @@
+ fi
+
+ fi
+-echo "$as_me:23804: result: $cf_cv_good_bcopy" >&5
++echo "$as_me:23831: result: $cf_cv_good_bcopy" >&5
+ echo "${ECHO_T}$cf_cv_good_bcopy" >&6
+
+ else
+@@ -23828,13 +23855,13 @@
+ for ac_func in posix_openpt
+ do
+ as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+-echo "$as_me:23831: checking for $ac_func" >&5
++echo "$as_me:23858: 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 23837 "configure"
++#line 23864 "configure"
+ #include "confdefs.h"
+ #define $ac_func autoconf_temporary
+ #include <limits.h> /* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -23865,16 +23892,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:23868: \"$ac_link\"") >&5
++if { (eval echo "$as_me:23895: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:23871: \$? = $ac_status" >&5
++ echo "$as_me:23898: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:23874: \"$ac_try\"") >&5
++ { (eval echo "$as_me:23901: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:23877: \$? = $ac_status" >&5
++ echo "$as_me:23904: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ eval "$as_ac_var=yes"
+ else
+@@ -23884,7 +23911,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:23887: result: `eval echo '${'"$as_ac_var"'}'`" >&5
++echo "$as_me:23914: 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
+@@ -23894,7 +23921,7 @@
+ fi
+ done
+ }
+-echo "$as_me:23897: checking if poll really works" >&5
++echo "$as_me:23924: 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
+@@ -23904,7 +23931,7 @@
+ cf_cv_working_poll=unknown
+ else
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 23907 "configure"
++#line 23934 "configure"
+ #include "confdefs.h"
+
+ $ac_includes_default
+@@ -23957,15 +23984,15 @@
+ }
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:23960: \"$ac_link\"") >&5
++if { (eval echo "$as_me:23987: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:23963: \$? = $ac_status" >&5
++ echo "$as_me:23990: \$? = $ac_status" >&5
+ (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+- { (eval echo "$as_me:23965: \"$ac_try\"") >&5
++ { (eval echo "$as_me:23992: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:23968: \$? = $ac_status" >&5
++ echo "$as_me:23995: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_working_poll=yes
+ else
+@@ -23977,21 +24004,21 @@
+ rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+ fi
+-echo "$as_me:23980: result: $cf_cv_working_poll" >&5
++echo "$as_me:24007: 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:23987: checking if MB_LEN_MAX is usable" >&5
++echo "$as_me:24014: 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 23994 "configure"
++#line 24021 "configure"
+ #include "confdefs.h"
+
+ $ac_includes_default
+@@ -24011,16 +24038,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:24014: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:24041: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:24017: \$? = $ac_status" >&5
++ echo "$as_me:24044: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:24020: \"$ac_try\"") >&5
++ { (eval echo "$as_me:24047: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:24023: \$? = $ac_status" >&5
++ echo "$as_me:24050: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_mb_len_max=yes
+ else
+@@ -24030,7 +24057,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:24033: result: $cf_cv_mb_len_max" >&5
++echo "$as_me:24060: 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
+@@ -24040,18 +24067,18 @@
+ EOF
+
+ else
+- { echo "$as_me:24043: WARNING: MB_LEN_MAX is missing/inconsistent in system headers" >&5
++ { echo "$as_me:24070: 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:24047: checking for va_copy" >&5
++echo "$as_me:24074: 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 24054 "configure"
++#line 24081 "configure"
+ #include "confdefs.h"
+
+ #include <stdarg.h>
+@@ -24068,16 +24095,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:24071: \"$ac_link\"") >&5
++if { (eval echo "$as_me:24098: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:24074: \$? = $ac_status" >&5
++ echo "$as_me:24101: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:24077: \"$ac_try\"") >&5
++ { (eval echo "$as_me:24104: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:24080: \$? = $ac_status" >&5
++ echo "$as_me:24107: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_have_va_copy=yes
+ else
+@@ -24087,7 +24114,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:24090: result: $cf_cv_have_va_copy" >&5
++echo "$as_me:24117: result: $cf_cv_have_va_copy" >&5
+ echo "${ECHO_T}$cf_cv_have_va_copy" >&6
+
+ if test "$cf_cv_have_va_copy" = yes;
+@@ -24099,14 +24126,14 @@
+
+ else # !cf_cv_have_va_copy
+
+-echo "$as_me:24102: checking for __va_copy" >&5
++echo "$as_me:24129: 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 24109 "configure"
++#line 24136 "configure"
+ #include "confdefs.h"
+
+ #include <stdarg.h>
+@@ -24123,16 +24150,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:24126: \"$ac_link\"") >&5
++if { (eval echo "$as_me:24153: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:24129: \$? = $ac_status" >&5
++ echo "$as_me:24156: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:24132: \"$ac_try\"") >&5
++ { (eval echo "$as_me:24159: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:24135: \$? = $ac_status" >&5
++ echo "$as_me:24162: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_have___va_copy=yes
+ else
+@@ -24142,7 +24169,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:24145: result: $cf_cv_have___va_copy" >&5
++echo "$as_me:24172: result: $cf_cv_have___va_copy" >&5
+ echo "${ECHO_T}$cf_cv_have___va_copy" >&6
+
+ if test "$cf_cv_have___va_copy" = yes
+@@ -24154,14 +24181,14 @@
+
+ else # !cf_cv_have___va_copy
+
+-echo "$as_me:24157: checking for __builtin_va_copy" >&5
++echo "$as_me:24184: 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 24164 "configure"
++#line 24191 "configure"
+ #include "confdefs.h"
+
+ #include <stdarg.h>
+@@ -24178,16 +24205,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:24181: \"$ac_link\"") >&5
++if { (eval echo "$as_me:24208: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:24184: \$? = $ac_status" >&5
++ echo "$as_me:24211: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:24187: \"$ac_try\"") >&5
++ { (eval echo "$as_me:24214: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:24190: \$? = $ac_status" >&5
++ echo "$as_me:24217: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_have___builtin_va_copy=yes
+ else
+@@ -24197,7 +24224,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:24200: result: $cf_cv_have___builtin_va_copy" >&5
++echo "$as_me:24227: 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 &&
+@@ -24215,14 +24242,14 @@
+ ;;
+
+ (*)
+- echo "$as_me:24218: checking if we can simply copy va_list" >&5
++ echo "$as_me:24245: 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 24225 "configure"
++#line 24252 "configure"
+ #include "confdefs.h"
+
+ #include <stdarg.h>
+@@ -24239,16 +24266,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:24242: \"$ac_link\"") >&5
++if { (eval echo "$as_me:24269: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:24245: \$? = $ac_status" >&5
++ echo "$as_me:24272: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:24248: \"$ac_try\"") >&5
++ { (eval echo "$as_me:24275: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:24251: \$? = $ac_status" >&5
++ echo "$as_me:24278: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_pointer_va_list=yes
+ else
+@@ -24258,19 +24285,19 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:24261: result: $cf_cv_pointer_va_list" >&5
++echo "$as_me:24288: 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:24266: checking if we can copy va_list indirectly" >&5
++ echo "$as_me:24293: 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 24273 "configure"
++#line 24300 "configure"
+ #include "confdefs.h"
+
+ #include <stdarg.h>
+@@ -24287,16 +24314,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:24290: \"$ac_link\"") >&5
++if { (eval echo "$as_me:24317: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:24293: \$? = $ac_status" >&5
++ echo "$as_me:24320: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:24296: \"$ac_try\"") >&5
++ { (eval echo "$as_me:24323: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:24299: \$? = $ac_status" >&5
++ echo "$as_me:24326: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_array_va_list=yes
+ else
+@@ -24306,7 +24333,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:24309: result: $cf_cv_array_va_list" >&5
++echo "$as_me:24336: 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
+@@ -24317,13 +24344,13 @@
+ ;;
+ esac
+
+-echo "$as_me:24320: checking for pid_t" >&5
++echo "$as_me:24347: 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 24326 "configure"
++#line 24353 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -24338,16 +24365,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:24341: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:24368: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:24344: \$? = $ac_status" >&5
++ echo "$as_me:24371: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:24347: \"$ac_try\"") >&5
++ { (eval echo "$as_me:24374: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:24350: \$? = $ac_status" >&5
++ echo "$as_me:24377: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_type_pid_t=yes
+ else
+@@ -24357,7 +24384,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:24360: result: $ac_cv_type_pid_t" >&5
++echo "$as_me:24387: 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
+ :
+@@ -24372,23 +24399,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:24375: checking for $ac_header" >&5
++echo "$as_me:24402: 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 24381 "configure"
++#line 24408 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:24385: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:24412: \"$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:24391: \$? = $ac_status" >&5
++ echo "$as_me:24418: \$? = $ac_status" >&5
+ (exit "$ac_status"); } >/dev/null; then
+ if test -s conftest.err; then
+ ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -24407,7 +24434,7 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:24410: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
++echo "$as_me:24437: 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
+@@ -24420,13 +24447,13 @@
+ for ac_func in fork vfork
+ do
+ as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+-echo "$as_me:24423: checking for $ac_func" >&5
++echo "$as_me:24450: 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 24429 "configure"
++#line 24456 "configure"
+ #include "confdefs.h"
+ #define $ac_func autoconf_temporary
+ #include <limits.h> /* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -24457,16 +24484,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:24460: \"$ac_link\"") >&5
++if { (eval echo "$as_me:24487: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:24463: \$? = $ac_status" >&5
++ echo "$as_me:24490: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:24466: \"$ac_try\"") >&5
++ { (eval echo "$as_me:24493: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:24469: \$? = $ac_status" >&5
++ echo "$as_me:24496: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ eval "$as_ac_var=yes"
+ else
+@@ -24476,7 +24503,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:24479: result: `eval echo '${'"$as_ac_var"'}'`" >&5
++echo "$as_me:24506: 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
+@@ -24488,7 +24515,7 @@
+
+ ac_cv_func_fork_works=$ac_cv_func_fork
+ if test "x$ac_cv_func_fork" = xyes; then
+- echo "$as_me:24491: checking for working fork" >&5
++ echo "$as_me:24518: 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
+@@ -24511,15 +24538,15 @@
+ }
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:24514: \"$ac_link\"") >&5
++if { (eval echo "$as_me:24541: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:24517: \$? = $ac_status" >&5
++ echo "$as_me:24544: \$? = $ac_status" >&5
+ (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+- { (eval echo "$as_me:24519: \"$ac_try\"") >&5
++ { (eval echo "$as_me:24546: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:24522: \$? = $ac_status" >&5
++ echo "$as_me:24549: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_func_fork_works=yes
+ else
+@@ -24531,7 +24558,7 @@
+ rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+ fi
+-echo "$as_me:24534: result: $ac_cv_func_fork_works" >&5
++echo "$as_me:24561: result: $ac_cv_func_fork_works" >&5
+ echo "${ECHO_T}$ac_cv_func_fork_works" >&6
+
+ fi
+@@ -24545,12 +24572,12 @@
+ ac_cv_func_fork_works=yes
+ ;;
+ esac
+- { echo "$as_me:24548: WARNING: CROSS: Result $ac_cv_func_fork_works guessed due to cross-compiling." >&5
++ { echo "$as_me:24575: 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:24553: checking for working vfork" >&5
++ echo "$as_me:24580: 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
+@@ -24559,7 +24586,7 @@
+ ac_cv_func_vfork_works=cross
+ else
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 24562 "configure"
++#line 24589 "configure"
+ #include "confdefs.h"
+ /* Thanks to Paul Eggert for this test. */
+ #include <stdio.h>
+@@ -24652,15 +24679,15 @@
+ }
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:24655: \"$ac_link\"") >&5
++if { (eval echo "$as_me:24682: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:24658: \$? = $ac_status" >&5
++ echo "$as_me:24685: \$? = $ac_status" >&5
+ (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+- { (eval echo "$as_me:24660: \"$ac_try\"") >&5
++ { (eval echo "$as_me:24687: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:24663: \$? = $ac_status" >&5
++ echo "$as_me:24690: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_func_vfork_works=yes
+ else
+@@ -24672,13 +24699,13 @@
+ rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+ fi
+-echo "$as_me:24675: result: $ac_cv_func_vfork_works" >&5
++echo "$as_me:24702: 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:24681: WARNING: CROSS: Result $ac_cv_func_vfork_works guessed due to cross-compiling." >&5
++ { echo "$as_me:24708: 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
+
+@@ -24703,7 +24730,7 @@
+
+ fi
+
+-echo "$as_me:24706: checking if fopen accepts explicit binary mode" >&5
++echo "$as_me:24733: 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
+@@ -24713,7 +24740,7 @@
+ cf_cv_fopen_bin_r=unknown
+ else
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 24716 "configure"
++#line 24743 "configure"
+ #include "confdefs.h"
+
+ $ac_includes_default
+@@ -24748,15 +24775,15 @@
+
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:24751: \"$ac_link\"") >&5
++if { (eval echo "$as_me:24778: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:24754: \$? = $ac_status" >&5
++ echo "$as_me:24781: \$? = $ac_status" >&5
+ (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+- { (eval echo "$as_me:24756: \"$ac_try\"") >&5
++ { (eval echo "$as_me:24783: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:24759: \$? = $ac_status" >&5
++ echo "$as_me:24786: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_fopen_bin_r=yes
+ else
+@@ -24769,7 +24796,7 @@
+ fi
+
+ fi
+-echo "$as_me:24772: result: $cf_cv_fopen_bin_r" >&5
++echo "$as_me:24799: 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
+@@ -24778,7 +24805,7 @@
+
+ # special check for test/ditto.c
+
+-echo "$as_me:24781: checking for openpty in -lutil" >&5
++echo "$as_me:24808: 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
+@@ -24786,7 +24813,7 @@
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lutil $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 24789 "configure"
++#line 24816 "configure"
+ #include "confdefs.h"
+
+ /* Override any gcc2 internal prototype to avoid an error. */
+@@ -24805,16 +24832,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:24808: \"$ac_link\"") >&5
++if { (eval echo "$as_me:24835: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:24811: \$? = $ac_status" >&5
++ echo "$as_me:24838: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:24814: \"$ac_try\"") >&5
++ { (eval echo "$as_me:24841: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:24817: \$? = $ac_status" >&5
++ echo "$as_me:24844: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_lib_util_openpty=yes
+ else
+@@ -24825,7 +24852,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:24828: result: $ac_cv_lib_util_openpty" >&5
++echo "$as_me:24855: 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
+@@ -24833,7 +24860,7 @@
+ cf_cv_lib_util=no
+ fi
+
+-echo "$as_me:24836: checking for openpty header" >&5
++echo "$as_me:24863: 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
+@@ -24860,7 +24887,7 @@
+ for cf_header in pty.h libutil.h util.h
+ do
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 24863 "configure"
++#line 24890 "configure"
+ #include "confdefs.h"
+
+ #include <$cf_header>
+@@ -24878,16 +24905,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:24881: \"$ac_link\"") >&5
++if { (eval echo "$as_me:24908: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:24884: \$? = $ac_status" >&5
++ echo "$as_me:24911: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:24887: \"$ac_try\"") >&5
++ { (eval echo "$as_me:24914: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:24890: \$? = $ac_status" >&5
++ echo "$as_me:24917: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+
+ cf_cv_func_openpty=$cf_header
+@@ -24905,7 +24932,7 @@
+ LIBS="$cf_save_LIBS"
+
+ fi
+-echo "$as_me:24908: result: $cf_cv_func_openpty" >&5
++echo "$as_me:24935: result: $cf_cv_func_openpty" >&5
+ echo "${ECHO_T}$cf_cv_func_openpty" >&6
+
+ if test "$cf_cv_func_openpty" != no ; then
+@@ -24978,7 +25005,7 @@
+ CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
+
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 24981 "configure"
++#line 25008 "configure"
+ #include "confdefs.h"
+ #include <stdio.h>
+ int
+@@ -24990,16 +25017,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:24993: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:25020: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:24996: \$? = $ac_status" >&5
++ echo "$as_me:25023: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:24999: \"$ac_try\"") >&5
++ { (eval echo "$as_me:25026: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:25002: \$? = $ac_status" >&5
++ echo "$as_me:25029: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ :
+ else
+@@ -25016,7 +25043,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}:25019: testing adding $cf_add_incdir to include-path ..." 1>&5
++echo "${as_me:-configure}:25046: testing adding $cf_add_incdir to include-path ..." 1>&5
+
+ CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
+
+@@ -25052,7 +25079,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}:25055: testing adding $cf_add_libdir to library-path ..." 1>&5
++echo "${as_me:-configure}:25082: testing adding $cf_add_libdir to library-path ..." 1>&5
+
+ LDFLAGS="-L$cf_add_libdir $LDFLAGS"
+ fi
+@@ -25063,7 +25090,7 @@
+ else
+ case "$with_hashed_db" in
+ (./*|../*|/*)
+- { echo "$as_me:25066: WARNING: no such directory $with_hashed_db" >&5
++ { echo "$as_me:25093: WARNING: no such directory $with_hashed_db" >&5
+ echo "$as_me: WARNING: no such directory $with_hashed_db" >&2;}
+ ;;
+ (*)
+@@ -25135,7 +25162,7 @@
+ CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
+
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 25138 "configure"
++#line 25165 "configure"
+ #include "confdefs.h"
+ #include <stdio.h>
+ int
+@@ -25147,16 +25174,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:25150: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:25177: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:25153: \$? = $ac_status" >&5
++ echo "$as_me:25180: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:25156: \"$ac_try\"") >&5
++ { (eval echo "$as_me:25183: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:25159: \$? = $ac_status" >&5
++ echo "$as_me:25186: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ :
+ else
+@@ -25173,7 +25200,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}:25176: testing adding $cf_add_incdir to include-path ..." 1>&5
++echo "${as_me:-configure}:25203: testing adding $cf_add_incdir to include-path ..." 1>&5
+
+ CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
+
+@@ -25253,7 +25280,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}:25256: testing adding $cf_add_libdir to library-path ..." 1>&5
++echo "${as_me:-configure}:25283: testing adding $cf_add_libdir to library-path ..." 1>&5
+
+ LDFLAGS="-L$cf_add_libdir $LDFLAGS"
+ fi
+@@ -25270,23 +25297,23 @@
+ fi
+ esac
+
+-echo "$as_me:25273: checking for db.h" >&5
++echo "$as_me:25300: 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 25279 "configure"
++#line 25306 "configure"
+ #include "confdefs.h"
+ #include <db.h>
+ _ACEOF
+-if { (eval echo "$as_me:25283: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:25310: \"$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:25289: \$? = $ac_status" >&5
++ echo "$as_me:25316: \$? = $ac_status" >&5
+ (exit "$ac_status"); } >/dev/null; then
+ if test -s conftest.err; then
+ ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -25305,11 +25332,11 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:25308: result: $ac_cv_header_db_h" >&5
++echo "$as_me:25335: 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:25312: checking for version of db" >&5
++echo "$as_me:25339: 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
+@@ -25320,10 +25347,10 @@
+ for cf_db_version in 1 2 3 4 5 6
+ do
+
+-echo "${as_me:-configure}:25323: testing checking for db version $cf_db_version ..." 1>&5
++echo "${as_me:-configure}:25350: testing checking for db version $cf_db_version ..." 1>&5
+
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 25326 "configure"
++#line 25353 "configure"
+ #include "confdefs.h"
+
+ $ac_includes_default
+@@ -25353,16 +25380,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:25356: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:25383: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:25359: \$? = $ac_status" >&5
++ echo "$as_me:25386: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:25362: \"$ac_try\"") >&5
++ { (eval echo "$as_me:25389: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:25365: \$? = $ac_status" >&5
++ echo "$as_me:25392: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+
+ cf_cv_hashed_db_version=$cf_db_version
+@@ -25376,16 +25403,16 @@
+ done
+
+ fi
+-echo "$as_me:25379: result: $cf_cv_hashed_db_version" >&5
++echo "$as_me:25406: 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:25383: error: Cannot determine version of db" >&5
++ { { echo "$as_me:25410: 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:25388: checking for db libraries" >&5
++echo "$as_me:25415: 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
+@@ -25415,10 +25442,10 @@
+
+ fi
+
+-echo "${as_me:-configure}:25418: testing checking for library $cf_db_libs ..." 1>&5
++echo "${as_me:-configure}:25445: testing checking for library $cf_db_libs ..." 1>&5
+
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 25421 "configure"
++#line 25448 "configure"
+ #include "confdefs.h"
+
+ $ac_includes_default
+@@ -25473,16 +25500,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:25476: \"$ac_link\"") >&5
++if { (eval echo "$as_me:25503: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:25479: \$? = $ac_status" >&5
++ echo "$as_me:25506: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:25482: \"$ac_try\"") >&5
++ { (eval echo "$as_me:25509: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:25485: \$? = $ac_status" >&5
++ echo "$as_me:25512: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+
+ if test -n "$cf_db_libs" ; then
+@@ -25502,11 +25529,11 @@
+ done
+
+ fi
+-echo "$as_me:25505: result: $cf_cv_hashed_db_libs" >&5
++echo "$as_me:25532: 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:25509: error: Cannot determine library for db" >&5
++ { { echo "$as_me:25536: 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
+@@ -25532,7 +25559,7 @@
+
+ else
+
+- { { echo "$as_me:25535: error: Cannot find db.h" >&5
++ { { echo "$as_me:25562: error: Cannot find db.h" >&5
+ echo "$as_me: error: Cannot find db.h" >&2;}
+ { (exit 1); exit 1; }; }
+
+@@ -25547,7 +25574,7 @@
+
+ # Just in case, check if the C compiler has a bool type.
+
+-echo "$as_me:25550: checking if we should include stdbool.h" >&5
++echo "$as_me:25577: 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
+@@ -25555,7 +25582,7 @@
+ else
+
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 25558 "configure"
++#line 25585 "configure"
+ #include "confdefs.h"
+
+ int
+@@ -25567,23 +25594,23 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:25570: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:25597: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:25573: \$? = $ac_status" >&5
++ echo "$as_me:25600: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:25576: \"$ac_try\"") >&5
++ { (eval echo "$as_me:25603: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:25579: \$? = $ac_status" >&5
++ echo "$as_me:25606: \$? = $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 25586 "configure"
++#line 25613 "configure"
+ #include "confdefs.h"
+
+ #ifndef __BEOS__
+@@ -25599,16 +25626,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:25602: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:25629: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:25605: \$? = $ac_status" >&5
++ echo "$as_me:25632: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:25608: \"$ac_try\"") >&5
++ { (eval echo "$as_me:25635: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:25611: \$? = $ac_status" >&5
++ echo "$as_me:25638: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_header_stdbool_h=1
+ else
+@@ -25622,13 +25649,13 @@
+ fi
+
+ if test "$cf_cv_header_stdbool_h" = 1
+-then echo "$as_me:25625: result: yes" >&5
++then echo "$as_me:25652: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+-else echo "$as_me:25627: result: no" >&5
++else echo "$as_me:25654: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+
+-echo "$as_me:25631: checking for builtin bool type" >&5
++echo "$as_me:25658: 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
+@@ -25636,7 +25663,7 @@
+ else
+
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 25639 "configure"
++#line 25666 "configure"
+ #include "confdefs.h"
+
+ #include <stdio.h>
+@@ -25651,16 +25678,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:25654: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:25681: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:25657: \$? = $ac_status" >&5
++ echo "$as_me:25684: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:25660: \"$ac_try\"") >&5
++ { (eval echo "$as_me:25687: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:25663: \$? = $ac_status" >&5
++ echo "$as_me:25690: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_cc_bool_type=1
+ else
+@@ -25673,9 +25700,9 @@
+ fi
+
+ if test "$cf_cv_cc_bool_type" = 1
+-then echo "$as_me:25676: result: yes" >&5
++then echo "$as_me:25703: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+-else echo "$as_me:25678: result: no" >&5
++else echo "$as_me:25705: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+
+@@ -25692,10 +25719,10 @@
+
+ cf_save="$LIBS"
+ LIBS="$LIBS $CXXLIBS"
+- echo "$as_me:25695: checking if we already have C++ library" >&5
++ echo "$as_me:25722: 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 25698 "configure"
++#line 25725 "configure"
+ #include "confdefs.h"
+
+ #include <iostream>
+@@ -25709,16 +25736,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:25712: \"$ac_link\"") >&5
++if { (eval echo "$as_me:25739: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:25715: \$? = $ac_status" >&5
++ echo "$as_me:25742: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:25718: \"$ac_try\"") >&5
++ { (eval echo "$as_me:25745: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:25721: \$? = $ac_status" >&5
++ echo "$as_me:25748: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_have_libstdcpp=yes
+ else
+@@ -25727,7 +25754,7 @@
+ cf_have_libstdcpp=no
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+- echo "$as_me:25730: result: $cf_have_libstdcpp" >&5
++ echo "$as_me:25757: result: $cf_have_libstdcpp" >&5
+ echo "${ECHO_T}$cf_have_libstdcpp" >&6
+ LIBS="$cf_save"
+
+@@ -25746,7 +25773,7 @@
+ ;;
+ esac
+
+- echo "$as_me:25749: checking for library $cf_stdcpp_libname" >&5
++ echo "$as_me:25776: 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
+@@ -25772,7 +25799,7 @@
+ LIBS="$cf_add_libs"
+
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 25775 "configure"
++#line 25802 "configure"
+ #include "confdefs.h"
+
+ #include <iostream>
+@@ -25786,16 +25813,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:25789: \"$ac_link\"") >&5
++if { (eval echo "$as_me:25816: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:25792: \$? = $ac_status" >&5
++ echo "$as_me:25819: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:25795: \"$ac_try\"") >&5
++ { (eval echo "$as_me:25822: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:25798: \$? = $ac_status" >&5
++ echo "$as_me:25825: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_libstdcpp=yes
+ else
+@@ -25807,7 +25834,7 @@
+ LIBS="$cf_save"
+
+ fi
+-echo "$as_me:25810: result: $cf_cv_libstdcpp" >&5
++echo "$as_me:25837: result: $cf_cv_libstdcpp" >&5
+ echo "${ECHO_T}$cf_cv_libstdcpp" >&6
+ test "$cf_cv_libstdcpp" = yes && {
+ cf_add_libs="$CXXLIBS"
+@@ -25829,7 +25856,7 @@
+ fi
+ fi
+
+- echo "$as_me:25832: checking whether $CXX understands -c and -o together" >&5
++ echo "$as_me:25859: 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
+@@ -25844,15 +25871,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:25847: \"$ac_try\"") >&5
++if { (eval echo "$as_me:25874: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:25850: \$? = $ac_status" >&5
++ echo "$as_me:25877: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+- test -f conftest2.$ac_objext && { (eval echo "$as_me:25852: \"$ac_try\"") >&5
++ test -f conftest2.$ac_objext && { (eval echo "$as_me:25879: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:25855: \$? = $ac_status" >&5
++ echo "$as_me:25882: \$? = $ac_status" >&5
+ (exit "$ac_status"); };
+ then
+ eval cf_cv_prog_CXX_c_o=yes
+@@ -25863,10 +25890,10 @@
+
+ fi
+ if test "$cf_cv_prog_CXX_c_o" = yes; then
+- echo "$as_me:25866: result: yes" >&5
++ echo "$as_me:25893: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ else
+- echo "$as_me:25869: result: no" >&5
++ echo "$as_me:25896: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+
+@@ -25886,7 +25913,7 @@
+ ;;
+ esac
+ if test "$GXX" = yes; then
+- echo "$as_me:25889: checking for lib$cf_gpp_libname" >&5
++ echo "$as_me:25916: checking for lib$cf_gpp_libname" >&5
+ echo $ECHO_N "checking for lib$cf_gpp_libname... $ECHO_C" >&6
+ cf_save="$LIBS"
+
+@@ -25907,7 +25934,7 @@
+ LIBS="$cf_add_libs"
+
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 25910 "configure"
++#line 25937 "configure"
+ #include "confdefs.h"
+
+ #include <$cf_gpp_libname/builtin.h>
+@@ -25921,16 +25948,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:25924: \"$ac_link\"") >&5
++if { (eval echo "$as_me:25951: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:25927: \$? = $ac_status" >&5
++ echo "$as_me:25954: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:25930: \"$ac_try\"") >&5
++ { (eval echo "$as_me:25957: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:25933: \$? = $ac_status" >&5
++ echo "$as_me:25960: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cxx_library=yes
+
+@@ -25967,7 +25994,7 @@
+ echo "$as_me: failed program was:" >&5
+ cat "conftest.$ac_ext" >&5
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 25970 "configure"
++#line 25997 "configure"
+ #include "confdefs.h"
+
+ #include <builtin.h>
+@@ -25981,16 +26008,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:25984: \"$ac_link\"") >&5
++if { (eval echo "$as_me:26011: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:25987: \$? = $ac_status" >&5
++ echo "$as_me:26014: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:25990: \"$ac_try\"") >&5
++ { (eval echo "$as_me:26017: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:25993: \$? = $ac_status" >&5
++ echo "$as_me:26020: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cxx_library=yes
+
+@@ -26023,7 +26050,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS="$cf_save"
+- echo "$as_me:26026: result: $cf_cxx_library" >&5
++ echo "$as_me:26053: result: $cf_cxx_library" >&5
+ echo "${ECHO_T}$cf_cxx_library" >&6
+ fi
+
+@@ -26039,7 +26066,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:26042: checking how to run the C++ preprocessor" >&5
++echo "$as_me:26069: 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
+@@ -26056,18 +26083,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 26059 "configure"
++#line 26086 "configure"
+ #include "confdefs.h"
+ #include <assert.h>
+ Syntax error
+ _ACEOF
+-if { (eval echo "$as_me:26064: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:26091: \"$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:26070: \$? = $ac_status" >&5
++ echo "$as_me:26097: \$? = $ac_status" >&5
+ (exit "$ac_status"); } >/dev/null; then
+ if test -s conftest.err; then
+ ac_cpp_err=$ac_cxx_preproc_warn_flag
+@@ -26090,17 +26117,17 @@
+ # OK, works on sane cases. Now check whether non-existent headers
+ # can be detected and how.
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 26093 "configure"
++#line 26120 "configure"
+ #include "confdefs.h"
+ #include <ac_nonexistent.h>
+ _ACEOF
+-if { (eval echo "$as_me:26097: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:26124: \"$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:26103: \$? = $ac_status" >&5
++ echo "$as_me:26130: \$? = $ac_status" >&5
+ (exit "$ac_status"); } >/dev/null; then
+ if test -s conftest.err; then
+ ac_cpp_err=$ac_cxx_preproc_warn_flag
+@@ -26137,7 +26164,7 @@
+ else
+ ac_cv_prog_CXXCPP=$CXXCPP
+ fi
+-echo "$as_me:26140: result: $CXXCPP" >&5
++echo "$as_me:26167: result: $CXXCPP" >&5
+ echo "${ECHO_T}$CXXCPP" >&6
+ ac_preproc_ok=false
+ for ac_cxx_preproc_warn_flag in '' yes
+@@ -26147,18 +26174,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 26150 "configure"
++#line 26177 "configure"
+ #include "confdefs.h"
+ #include <assert.h>
+ Syntax error
+ _ACEOF
+-if { (eval echo "$as_me:26155: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:26182: \"$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:26161: \$? = $ac_status" >&5
++ echo "$as_me:26188: \$? = $ac_status" >&5
+ (exit "$ac_status"); } >/dev/null; then
+ if test -s conftest.err; then
+ ac_cpp_err=$ac_cxx_preproc_warn_flag
+@@ -26181,17 +26208,17 @@
+ # OK, works on sane cases. Now check whether non-existent headers
+ # can be detected and how.
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 26184 "configure"
++#line 26211 "configure"
+ #include "confdefs.h"
+ #include <ac_nonexistent.h>
+ _ACEOF
+-if { (eval echo "$as_me:26188: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:26215: \"$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:26194: \$? = $ac_status" >&5
++ echo "$as_me:26221: \$? = $ac_status" >&5
+ (exit "$ac_status"); } >/dev/null; then
+ if test -s conftest.err; then
+ ac_cpp_err=$ac_cxx_preproc_warn_flag
+@@ -26219,7 +26246,7 @@
+ if $ac_preproc_ok; then
+ :
+ else
+- { { echo "$as_me:26222: error: C++ preprocessor \"$CXXCPP\" fails sanity check" >&5
++ { { echo "$as_me:26249: error: C++ preprocessor \"$CXXCPP\" fails sanity check" >&5
+ echo "$as_me: error: C++ preprocessor \"$CXXCPP\" fails sanity check" >&2;}
+ { (exit 1); exit 1; }; }
+ fi
+@@ -26234,23 +26261,23 @@
+ for ac_header in typeinfo
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-echo "$as_me:26237: checking for $ac_header" >&5
++echo "$as_me:26264: 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 26243 "configure"
++#line 26270 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:26247: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:26274: \"$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:26253: \$? = $ac_status" >&5
++ echo "$as_me:26280: \$? = $ac_status" >&5
+ (exit "$ac_status"); } >/dev/null; then
+ if test -s conftest.err; then
+ ac_cpp_err=$ac_cxx_preproc_warn_flag
+@@ -26269,7 +26296,7 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:26272: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
++echo "$as_me:26299: 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
+@@ -26282,23 +26309,23 @@
+ for ac_header in iostream
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-echo "$as_me:26285: checking for $ac_header" >&5
++echo "$as_me:26312: 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 26291 "configure"
++#line 26318 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:26295: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:26322: \"$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:26301: \$? = $ac_status" >&5
++ echo "$as_me:26328: \$? = $ac_status" >&5
+ (exit "$ac_status"); } >/dev/null; then
+ if test -s conftest.err; then
+ ac_cpp_err=$ac_cxx_preproc_warn_flag
+@@ -26317,7 +26344,7 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:26320: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
++echo "$as_me:26347: 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
+@@ -26328,10 +26355,10 @@
+ done
+
+ if test x"$ac_cv_header_iostream" = xyes ; then
+- echo "$as_me:26331: checking if iostream uses std-namespace" >&5
++ echo "$as_me:26358: 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 26334 "configure"
++#line 26361 "configure"
+ #include "confdefs.h"
+
+ #include <iostream>
+@@ -26348,16 +26375,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:26351: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:26378: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:26354: \$? = $ac_status" >&5
++ echo "$as_me:26381: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:26357: \"$ac_try\"") >&5
++ { (eval echo "$as_me:26384: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:26360: \$? = $ac_status" >&5
++ echo "$as_me:26387: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_iostream_namespace=yes
+ else
+@@ -26366,7 +26393,7 @@
+ cf_iostream_namespace=no
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+- echo "$as_me:26369: result: $cf_iostream_namespace" >&5
++ echo "$as_me:26396: result: $cf_iostream_namespace" >&5
+ echo "${ECHO_T}$cf_iostream_namespace" >&6
+ if test "$cf_iostream_namespace" = yes ; then
+
+@@ -26377,7 +26404,7 @@
+ fi
+ fi
+
+-echo "$as_me:26380: checking if we should include stdbool.h" >&5
++echo "$as_me:26407: 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
+@@ -26385,7 +26412,7 @@
+ else
+
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 26388 "configure"
++#line 26415 "configure"
+ #include "confdefs.h"
+
+ int
+@@ -26397,23 +26424,23 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:26400: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:26427: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:26403: \$? = $ac_status" >&5
++ echo "$as_me:26430: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:26406: \"$ac_try\"") >&5
++ { (eval echo "$as_me:26433: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:26409: \$? = $ac_status" >&5
++ echo "$as_me:26436: \$? = $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 26416 "configure"
++#line 26443 "configure"
+ #include "confdefs.h"
+
+ #ifndef __BEOS__
+@@ -26429,16 +26456,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:26432: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:26459: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:26435: \$? = $ac_status" >&5
++ echo "$as_me:26462: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:26438: \"$ac_try\"") >&5
++ { (eval echo "$as_me:26465: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:26441: \$? = $ac_status" >&5
++ echo "$as_me:26468: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_header_stdbool_h=1
+ else
+@@ -26452,13 +26479,13 @@
+ fi
+
+ if test "$cf_cv_header_stdbool_h" = 1
+-then echo "$as_me:26455: result: yes" >&5
++then echo "$as_me:26482: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+-else echo "$as_me:26457: result: no" >&5
++else echo "$as_me:26484: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+
+-echo "$as_me:26461: checking for builtin bool type" >&5
++echo "$as_me:26488: 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
+@@ -26466,7 +26493,7 @@
+ else
+
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 26469 "configure"
++#line 26496 "configure"
+ #include "confdefs.h"
+
+ #include <stdio.h>
+@@ -26481,16 +26508,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:26484: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:26511: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:26487: \$? = $ac_status" >&5
++ echo "$as_me:26514: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:26490: \"$ac_try\"") >&5
++ { (eval echo "$as_me:26517: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:26493: \$? = $ac_status" >&5
++ echo "$as_me:26520: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_builtin_bool=1
+ else
+@@ -26503,19 +26530,19 @@
+ fi
+
+ if test "$cf_cv_builtin_bool" = 1
+-then echo "$as_me:26506: result: yes" >&5
++then echo "$as_me:26533: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+-else echo "$as_me:26508: result: no" >&5
++else echo "$as_me:26535: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+
+-echo "$as_me:26512: checking for bool" >&5
++echo "$as_me:26539: 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 26518 "configure"
++#line 26545 "configure"
+ #include "confdefs.h"
+
+ $ac_includes_default
+@@ -26550,16 +26577,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:26553: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:26580: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:26556: \$? = $ac_status" >&5
++ echo "$as_me:26583: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:26559: \"$ac_try\"") >&5
++ { (eval echo "$as_me:26586: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:26562: \$? = $ac_status" >&5
++ echo "$as_me:26589: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_type_bool=yes
+ else
+@@ -26569,10 +26596,10 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:26572: result: $ac_cv_type_bool" >&5
++echo "$as_me:26599: result: $ac_cv_type_bool" >&5
+ echo "${ECHO_T}$ac_cv_type_bool" >&6
+
+-echo "$as_me:26575: checking size of bool" >&5
++echo "$as_me:26602: 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
+@@ -26581,7 +26608,7 @@
+ if test "$cross_compiling" = yes; then
+ # Depending upon the size, compute the lo and hi bounds.
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 26584 "configure"
++#line 26611 "configure"
+ #include "confdefs.h"
+
+ $ac_includes_default
+@@ -26613,21 +26640,21 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:26616: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:26643: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:26619: \$? = $ac_status" >&5
++ echo "$as_me:26646: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:26622: \"$ac_try\"") >&5
++ { (eval echo "$as_me:26649: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:26625: \$? = $ac_status" >&5
++ echo "$as_me:26652: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_lo=0 ac_mid=0
+ while :; do
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 26630 "configure"
++#line 26657 "configure"
+ #include "confdefs.h"
+
+ $ac_includes_default
+@@ -26659,16 +26686,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:26662: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:26689: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:26665: \$? = $ac_status" >&5
++ echo "$as_me:26692: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:26668: \"$ac_try\"") >&5
++ { (eval echo "$as_me:26695: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:26671: \$? = $ac_status" >&5
++ echo "$as_me:26698: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_hi=$ac_mid; break
+ else
+@@ -26684,7 +26711,7 @@
+ ac_hi=-1 ac_mid=-1
+ while :; do
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 26687 "configure"
++#line 26714 "configure"
+ #include "confdefs.h"
+
+ $ac_includes_default
+@@ -26716,16 +26743,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:26719: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:26746: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:26722: \$? = $ac_status" >&5
++ echo "$as_me:26749: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:26725: \"$ac_try\"") >&5
++ { (eval echo "$as_me:26752: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:26728: \$? = $ac_status" >&5
++ echo "$as_me:26755: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_lo=$ac_mid; break
+ else
+@@ -26741,7 +26768,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 26744 "configure"
++#line 26771 "configure"
+ #include "confdefs.h"
+
+ $ac_includes_default
+@@ -26773,16 +26800,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:26776: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:26803: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:26779: \$? = $ac_status" >&5
++ echo "$as_me:26806: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:26782: \"$ac_try\"") >&5
++ { (eval echo "$as_me:26809: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:26785: \$? = $ac_status" >&5
++ echo "$as_me:26812: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_hi=$ac_mid
+ else
+@@ -26795,12 +26822,12 @@
+ ac_cv_sizeof_bool=$ac_lo
+ else
+ if test "$cross_compiling" = yes; then
+- { { echo "$as_me:26798: error: cannot run test program while cross compiling" >&5
++ { { echo "$as_me:26825: 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 26803 "configure"
++#line 26830 "configure"
+ #include "confdefs.h"
+
+ $ac_includes_default
+@@ -26836,15 +26863,15 @@
+ }
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:26839: \"$ac_link\"") >&5
++if { (eval echo "$as_me:26866: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:26842: \$? = $ac_status" >&5
++ echo "$as_me:26869: \$? = $ac_status" >&5
+ (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+- { (eval echo "$as_me:26844: \"$ac_try\"") >&5
++ { (eval echo "$as_me:26871: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:26847: \$? = $ac_status" >&5
++ echo "$as_me:26874: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_sizeof_bool=`cat conftest.val`
+ else
+@@ -26860,13 +26887,13 @@
+ ac_cv_sizeof_bool=0
+ fi
+ fi
+-echo "$as_me:26863: result: $ac_cv_sizeof_bool" >&5
++echo "$as_me:26890: 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:26869: checking for type of bool" >&5
++echo "$as_me:26896: 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
+@@ -26885,7 +26912,7 @@
+
+ else
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 26888 "configure"
++#line 26915 "configure"
+ #include "confdefs.h"
+
+ $ac_includes_default
+@@ -26926,15 +26953,15 @@
+
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:26929: \"$ac_link\"") >&5
++if { (eval echo "$as_me:26956: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:26932: \$? = $ac_status" >&5
++ echo "$as_me:26959: \$? = $ac_status" >&5
+ (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+- { (eval echo "$as_me:26934: \"$ac_try\"") >&5
++ { (eval echo "$as_me:26961: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:26937: \$? = $ac_status" >&5
++ echo "$as_me:26964: \$? = $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
+@@ -26951,19 +26978,19 @@
+ rm -f cf_test.out
+
+ fi
+-echo "$as_me:26954: result: $cf_cv_type_of_bool" >&5
++echo "$as_me:26981: 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:26961: WARNING: Assuming $NCURSES_BOOL for type of bool" >&5
++ { echo "$as_me:26988: 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:26966: checking for special defines needed for etip.h" >&5
++echo "$as_me:26993: 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"
+@@ -26981,7 +27008,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 26984 "configure"
++#line 27011 "configure"
+ #include "confdefs.h"
+
+ #include <etip.h.in>
+@@ -26995,16 +27022,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:26998: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:27025: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:27001: \$? = $ac_status" >&5
++ echo "$as_me:27028: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:27004: \"$ac_try\"") >&5
++ { (eval echo "$as_me:27031: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:27007: \$? = $ac_status" >&5
++ echo "$as_me:27034: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+
+ test -n "$cf_math" && cat >>confdefs.h <<EOF
+@@ -27025,12 +27052,12 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ done
+ done
+-echo "$as_me:27028: result: ${cf_result:-(none)}" >&5
++echo "$as_me:27055: result: ${cf_result:-(none)}" >&5
+ echo "${ECHO_T}${cf_result:-(none)}" >&6
+ CXXFLAGS="$cf_save_CXXFLAGS"
+
+ if test -n "$CXX"; then
+-echo "$as_me:27033: checking if $CXX accepts override keyword" >&5
++echo "$as_me:27060: 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
+@@ -27047,7 +27074,7 @@
+ cf_cv_cpp_override=unknown
+ else
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 27050 "configure"
++#line 27077 "configure"
+ #include "confdefs.h"
+
+ class base
+@@ -27066,15 +27093,15 @@
+
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:27069: \"$ac_link\"") >&5
++if { (eval echo "$as_me:27096: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:27072: \$? = $ac_status" >&5
++ echo "$as_me:27099: \$? = $ac_status" >&5
+ (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+- { (eval echo "$as_me:27074: \"$ac_try\"") >&5
++ { (eval echo "$as_me:27101: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:27077: \$? = $ac_status" >&5
++ echo "$as_me:27104: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_cpp_override=yes
+ else
+@@ -27093,7 +27120,7 @@
+ ac_main_return="return"
+
+ fi
+-echo "$as_me:27096: result: $cf_cv_cpp_override" >&5
++echo "$as_me:27123: result: $cf_cv_cpp_override" >&5
+ echo "${ECHO_T}$cf_cv_cpp_override" >&6
+ fi
+ test "$cf_cv_cpp_override" = yes &&
+@@ -27102,7 +27129,7 @@
+ EOF
+
+ if test -n "$CXX"; then
+-echo "$as_me:27105: checking if $CXX accepts parameter initialization" >&5
++echo "$as_me:27132: 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
+@@ -27119,7 +27146,7 @@
+ cf_cv_cpp_param_init=unknown
+ else
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 27122 "configure"
++#line 27149 "configure"
+ #include "confdefs.h"
+
+ class TEST {
+@@ -27138,15 +27165,15 @@
+
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:27141: \"$ac_link\"") >&5
++if { (eval echo "$as_me:27168: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:27144: \$? = $ac_status" >&5
++ echo "$as_me:27171: \$? = $ac_status" >&5
+ (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+- { (eval echo "$as_me:27146: \"$ac_try\"") >&5
++ { (eval echo "$as_me:27173: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:27149: \$? = $ac_status" >&5
++ echo "$as_me:27176: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_cpp_param_init=yes
+ else
+@@ -27165,7 +27192,7 @@
+ ac_main_return="return"
+
+ fi
+-echo "$as_me:27168: result: $cf_cv_cpp_param_init" >&5
++echo "$as_me:27195: result: $cf_cv_cpp_param_init" >&5
+ echo "${ECHO_T}$cf_cv_cpp_param_init" >&6
+ fi
+ test "$cf_cv_cpp_param_init" = yes &&
+@@ -27175,7 +27202,7 @@
+
+ if test -n "$CXX"; then
+
+-echo "$as_me:27178: checking if $CXX accepts static_cast" >&5
++echo "$as_me:27205: 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
+@@ -27189,7 +27216,7 @@
+ ac_main_return="return"
+
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 27192 "configure"
++#line 27219 "configure"
+ #include "confdefs.h"
+
+ class NCursesPanel
+@@ -27233,16 +27260,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:27236: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:27263: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:27239: \$? = $ac_status" >&5
++ echo "$as_me:27266: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:27242: \"$ac_try\"") >&5
++ { (eval echo "$as_me:27269: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:27245: \$? = $ac_status" >&5
++ echo "$as_me:27272: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_cpp_static_cast=yes
+ else
+@@ -27260,7 +27287,7 @@
+ ac_main_return="return"
+
+ fi
+-echo "$as_me:27263: result: $cf_cv_cpp_static_cast" >&5
++echo "$as_me:27290: result: $cf_cv_cpp_static_cast" >&5
+ echo "${ECHO_T}$cf_cv_cpp_static_cast" >&6
+
+ fi
+@@ -27309,13 +27336,13 @@
+ else
+ if test "$cf_cv_header_stdbool_h" = 1 ; then
+
+-echo "$as_me:27312: checking for bool" >&5
++echo "$as_me:27339: 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 27318 "configure"
++#line 27345 "configure"
+ #include "confdefs.h"
+
+ $ac_includes_default
+@@ -27350,16 +27377,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:27353: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:27380: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:27356: \$? = $ac_status" >&5
++ echo "$as_me:27383: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:27359: \"$ac_try\"") >&5
++ { (eval echo "$as_me:27386: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:27362: \$? = $ac_status" >&5
++ echo "$as_me:27389: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_type_bool=yes
+ else
+@@ -27369,10 +27396,10 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:27372: result: $ac_cv_type_bool" >&5
++echo "$as_me:27399: result: $ac_cv_type_bool" >&5
+ echo "${ECHO_T}$ac_cv_type_bool" >&6
+
+-echo "$as_me:27375: checking size of bool" >&5
++echo "$as_me:27402: 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
+@@ -27381,7 +27408,7 @@
+ if test "$cross_compiling" = yes; then
+ # Depending upon the size, compute the lo and hi bounds.
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 27384 "configure"
++#line 27411 "configure"
+ #include "confdefs.h"
+
+ $ac_includes_default
+@@ -27413,21 +27440,21 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:27416: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:27443: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:27419: \$? = $ac_status" >&5
++ echo "$as_me:27446: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:27422: \"$ac_try\"") >&5
++ { (eval echo "$as_me:27449: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:27425: \$? = $ac_status" >&5
++ echo "$as_me:27452: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_lo=0 ac_mid=0
+ while :; do
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 27430 "configure"
++#line 27457 "configure"
+ #include "confdefs.h"
+
+ $ac_includes_default
+@@ -27459,16 +27486,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:27462: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:27489: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:27465: \$? = $ac_status" >&5
++ echo "$as_me:27492: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:27468: \"$ac_try\"") >&5
++ { (eval echo "$as_me:27495: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:27471: \$? = $ac_status" >&5
++ echo "$as_me:27498: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_hi=$ac_mid; break
+ else
+@@ -27484,7 +27511,7 @@
+ ac_hi=-1 ac_mid=-1
+ while :; do
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 27487 "configure"
++#line 27514 "configure"
+ #include "confdefs.h"
+
+ $ac_includes_default
+@@ -27516,16 +27543,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:27519: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:27546: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:27522: \$? = $ac_status" >&5
++ echo "$as_me:27549: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:27525: \"$ac_try\"") >&5
++ { (eval echo "$as_me:27552: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:27528: \$? = $ac_status" >&5
++ echo "$as_me:27555: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_lo=$ac_mid; break
+ else
+@@ -27541,7 +27568,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 27544 "configure"
++#line 27571 "configure"
+ #include "confdefs.h"
+
+ $ac_includes_default
+@@ -27573,16 +27600,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:27576: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:27603: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:27579: \$? = $ac_status" >&5
++ echo "$as_me:27606: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:27582: \"$ac_try\"") >&5
++ { (eval echo "$as_me:27609: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:27585: \$? = $ac_status" >&5
++ echo "$as_me:27612: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_hi=$ac_mid
+ else
+@@ -27595,12 +27622,12 @@
+ ac_cv_sizeof_bool=$ac_lo
+ else
+ if test "$cross_compiling" = yes; then
+- { { echo "$as_me:27598: error: cannot run test program while cross compiling" >&5
++ { { echo "$as_me:27625: 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 27603 "configure"
++#line 27630 "configure"
+ #include "confdefs.h"
+
+ $ac_includes_default
+@@ -27636,15 +27663,15 @@
+ }
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:27639: \"$ac_link\"") >&5
++if { (eval echo "$as_me:27666: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:27642: \$? = $ac_status" >&5
++ echo "$as_me:27669: \$? = $ac_status" >&5
+ (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+- { (eval echo "$as_me:27644: \"$ac_try\"") >&5
++ { (eval echo "$as_me:27671: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:27647: \$? = $ac_status" >&5
++ echo "$as_me:27674: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_sizeof_bool=`cat conftest.val`
+ else
+@@ -27660,13 +27687,13 @@
+ ac_cv_sizeof_bool=0
+ fi
+ fi
+-echo "$as_me:27663: result: $ac_cv_sizeof_bool" >&5
++echo "$as_me:27690: 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:27669: checking for type of bool" >&5
++echo "$as_me:27696: 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
+@@ -27685,7 +27712,7 @@
+
+ else
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 27688 "configure"
++#line 27715 "configure"
+ #include "confdefs.h"
+
+ $ac_includes_default
+@@ -27726,15 +27753,15 @@
+
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:27729: \"$ac_link\"") >&5
++if { (eval echo "$as_me:27756: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:27732: \$? = $ac_status" >&5
++ echo "$as_me:27759: \$? = $ac_status" >&5
+ (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+- { (eval echo "$as_me:27734: \"$ac_try\"") >&5
++ { (eval echo "$as_me:27761: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:27737: \$? = $ac_status" >&5
++ echo "$as_me:27764: \$? = $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
+@@ -27751,26 +27778,26 @@
+ rm -f cf_test.out
+
+ fi
+-echo "$as_me:27754: result: $cf_cv_type_of_bool" >&5
++echo "$as_me:27781: 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:27761: WARNING: Assuming $NCURSES_BOOL for type of bool" >&5
++ { echo "$as_me:27788: 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:27767: checking for fallback type of bool" >&5
++ echo "$as_me:27794: 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:27773: result: $cf_cv_type_of_bool" >&5
++ echo "$as_me:27800: result: $cf_cv_type_of_bool" >&5
+ echo "${ECHO_T}$cf_cv_type_of_bool" >&6
+ fi
+ fi
+@@ -27799,7 +27826,7 @@
+
+ if test "$cf_with_ada" != "no" ; then
+ if test "$with_libtool" != "no"; then
+- { echo "$as_me:27802: WARNING: libtool does not support Ada - disabling feature" >&5
++ { echo "$as_me:27829: 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
+@@ -27810,7 +27837,7 @@
+
+ ADAFLAGS="$ADAFLAGS -gnatpn"
+
+- echo "$as_me:27813: checking optimization options for ADAFLAGS" >&5
++ echo "$as_me:27840: checking optimization options for ADAFLAGS" >&5
+ echo $ECHO_N "checking optimization options for ADAFLAGS... $ECHO_C" >&6
+ case "$CFLAGS" in
+ (*-g*)
+@@ -27827,10 +27854,10 @@
+
+ ;;
+ esac
+- echo "$as_me:27830: result: $ADAFLAGS" >&5
++ echo "$as_me:27857: result: $ADAFLAGS" >&5
+ echo "${ECHO_T}$ADAFLAGS" >&6
+
+-echo "$as_me:27833: checking if GNATPREP supports -T option" >&5
++echo "$as_me:27860: 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
+@@ -27840,11 +27867,11 @@
+ gnatprep -T 2>/dev/null >/dev/null && cf_cv_gnatprep_opt_t=yes
+
+ fi
+-echo "$as_me:27843: result: $cf_cv_gnatprep_opt_t" >&5
++echo "$as_me:27870: 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:27847: checking if GNAT supports generics" >&5
++echo "$as_me:27874: 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])
+@@ -27854,7 +27881,7 @@
+ cf_gnat_generics=no
+ ;;
+ esac
+-echo "$as_me:27857: result: $cf_gnat_generics" >&5
++echo "$as_me:27884: result: $cf_gnat_generics" >&5
+ echo "${ECHO_T}$cf_gnat_generics" >&6
+
+ if test "$cf_gnat_generics" = yes
+@@ -27866,7 +27893,7 @@
+ cf_generic_objects=
+ fi
+
+-echo "$as_me:27869: checking if GNAT supports SIGINT" >&5
++echo "$as_me:27896: 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
+@@ -27914,7 +27941,7 @@
+ rm -rf ./conftest* ./*~conftest*
+
+ fi
+-echo "$as_me:27917: result: $cf_cv_gnat_sigint" >&5
++echo "$as_me:27944: result: $cf_cv_gnat_sigint" >&5
+ echo "${ECHO_T}$cf_cv_gnat_sigint" >&6
+
+ if test "$cf_cv_gnat_sigint" = yes ; then
+@@ -27927,7 +27954,7 @@
+ cf_gnat_projects=no
+
+ if test "$enable_gnat_projects" != no ; then
+-echo "$as_me:27930: checking if GNAT supports project files" >&5
++echo "$as_me:27957: 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]*)
+@@ -27990,15 +28017,15 @@
+ esac
+ ;;
+ esac
+-echo "$as_me:27993: result: $cf_gnat_projects" >&5
++echo "$as_me:28020: 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:27999: checking if GNAT supports libraries" >&5
++ echo "$as_me:28026: checking if GNAT supports libraries" >&5
+ echo $ECHO_N "checking if GNAT supports libraries... $ECHO_C" >&6
+- echo "$as_me:28001: result: $cf_gnat_libraries" >&5
++ echo "$as_me:28028: result: $cf_gnat_libraries" >&5
+ echo "${ECHO_T}$cf_gnat_libraries" >&6
+ fi
+
+@@ -28018,7 +28045,7 @@
+ then
+ USE_GNAT_MAKE_GPR=""
+ else
+- { echo "$as_me:28021: WARNING: use old makefile rules since tools are missing" >&5
++ { echo "$as_me:28048: 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
+@@ -28030,7 +28057,7 @@
+ USE_GNAT_LIBRARIES="#"
+ fi
+
+-echo "$as_me:28033: checking for Ada95 compiler" >&5
++echo "$as_me:28060: 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.
+@@ -28041,12 +28068,12 @@
+ cf_ada_compiler=gnatmake
+ fi;
+
+-echo "$as_me:28044: result: $cf_ada_compiler" >&5
++echo "$as_me:28071: result: $cf_ada_compiler" >&5
+ echo "${ECHO_T}$cf_ada_compiler" >&6
+
+ cf_ada_package=terminal_interface
+
+-echo "$as_me:28049: checking for Ada95 include directory" >&5
++echo "$as_me:28076: 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.
+@@ -28080,7 +28107,7 @@
+ withval=`echo "$withval" | sed -e s%NONE%$cf_path_syntax%`
+ ;;
+ (*)
+- { { echo "$as_me:28083: error: expected a pathname, not \"$withval\"" >&5
++ { { echo "$as_me:28110: error: expected a pathname, not \"$withval\"" >&5
+ echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
+ { (exit 1); exit 1; }; }
+ ;;
+@@ -28089,10 +28116,10 @@
+ fi
+ eval ADA_INCLUDE="$withval"
+
+-echo "$as_me:28092: result: $ADA_INCLUDE" >&5
++echo "$as_me:28119: result: $ADA_INCLUDE" >&5
+ echo "${ECHO_T}$ADA_INCLUDE" >&6
+
+-echo "$as_me:28095: checking for Ada95 object directory" >&5
++echo "$as_me:28122: 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.
+@@ -28126,7 +28153,7 @@
+ withval=`echo "$withval" | sed -e s%NONE%$cf_path_syntax%`
+ ;;
+ (*)
+- { { echo "$as_me:28129: error: expected a pathname, not \"$withval\"" >&5
++ { { echo "$as_me:28156: error: expected a pathname, not \"$withval\"" >&5
+ echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
+ { (exit 1); exit 1; }; }
+ ;;
+@@ -28135,10 +28162,10 @@
+ fi
+ eval ADA_OBJECTS="$withval"
+
+-echo "$as_me:28138: result: $ADA_OBJECTS" >&5
++echo "$as_me:28165: result: $ADA_OBJECTS" >&5
+ echo "${ECHO_T}$ADA_OBJECTS" >&6
+
+-echo "$as_me:28141: checking whether to build an Ada95 shared library" >&5
++echo "$as_me:28168: 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.
+@@ -28159,11 +28186,11 @@
+ fi
+ fi
+
+-echo "$as_me:28162: result: $with_ada_sharedlib" >&5
++echo "$as_me:28189: result: $with_ada_sharedlib" >&5
+ echo "${ECHO_T}$with_ada_sharedlib" >&6
+ if test "x$cf_ada_sharedlib_warn" != xno
+ then
+- { echo "$as_me:28166: WARNING: disabling Ada95 shared library since GNAT projects are not supported" >&5
++ { echo "$as_me:28193: 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
+
+@@ -28181,7 +28208,7 @@
+
+ # allow the Ada binding to be renamed
+
+-echo "$as_me:28184: checking for Ada95 curses library name" >&5
++echo "$as_me:28211: 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.
+@@ -28197,7 +28224,7 @@
+ ;;
+ esac
+
+-echo "$as_me:28200: result: $ADA_LIBNAME" >&5
++echo "$as_me:28227: result: $ADA_LIBNAME" >&5
+ echo "${ECHO_T}$ADA_LIBNAME" >&6
+
+ fi
+@@ -28208,13 +28235,13 @@
+
+ # do this "late" to avoid conflict with header-checks
+ if test "x$with_widec" = xyes ; then
+- echo "$as_me:28211: checking for wchar_t" >&5
++ echo "$as_me:28238: 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 28217 "configure"
++#line 28244 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -28229,16 +28256,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:28232: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:28259: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:28235: \$? = $ac_status" >&5
++ echo "$as_me:28262: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:28238: \"$ac_try\"") >&5
++ { (eval echo "$as_me:28265: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:28241: \$? = $ac_status" >&5
++ echo "$as_me:28268: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_type_wchar_t=yes
+ else
+@@ -28248,10 +28275,10 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:28251: result: $ac_cv_type_wchar_t" >&5
++echo "$as_me:28278: result: $ac_cv_type_wchar_t" >&5
+ echo "${ECHO_T}$ac_cv_type_wchar_t" >&6
+
+-echo "$as_me:28254: checking size of wchar_t" >&5
++echo "$as_me:28281: 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
+@@ -28260,7 +28287,7 @@
+ if test "$cross_compiling" = yes; then
+ # Depending upon the size, compute the lo and hi bounds.
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 28263 "configure"
++#line 28290 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -28272,21 +28299,21 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:28275: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:28302: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:28278: \$? = $ac_status" >&5
++ echo "$as_me:28305: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:28281: \"$ac_try\"") >&5
++ { (eval echo "$as_me:28308: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:28284: \$? = $ac_status" >&5
++ echo "$as_me:28311: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_lo=0 ac_mid=0
+ while :; do
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 28289 "configure"
++#line 28316 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -28298,16 +28325,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:28301: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:28328: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:28304: \$? = $ac_status" >&5
++ echo "$as_me:28331: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:28307: \"$ac_try\"") >&5
++ { (eval echo "$as_me:28334: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:28310: \$? = $ac_status" >&5
++ echo "$as_me:28337: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_hi=$ac_mid; break
+ else
+@@ -28323,7 +28350,7 @@
+ ac_hi=-1 ac_mid=-1
+ while :; do
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 28326 "configure"
++#line 28353 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -28335,16 +28362,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:28338: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:28365: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:28341: \$? = $ac_status" >&5
++ echo "$as_me:28368: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:28344: \"$ac_try\"") >&5
++ { (eval echo "$as_me:28371: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:28347: \$? = $ac_status" >&5
++ echo "$as_me:28374: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_lo=$ac_mid; break
+ else
+@@ -28360,7 +28387,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 28363 "configure"
++#line 28390 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -28372,16 +28399,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:28375: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:28402: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:28378: \$? = $ac_status" >&5
++ echo "$as_me:28405: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:28381: \"$ac_try\"") >&5
++ { (eval echo "$as_me:28408: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:28384: \$? = $ac_status" >&5
++ echo "$as_me:28411: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_hi=$ac_mid
+ else
+@@ -28394,12 +28421,12 @@
+ ac_cv_sizeof_wchar_t=$ac_lo
+ else
+ if test "$cross_compiling" = yes; then
+- { { echo "$as_me:28397: error: cannot run test program while cross compiling" >&5
++ { { echo "$as_me:28424: 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 28402 "configure"
++#line 28429 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -28415,15 +28442,15 @@
+ }
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:28418: \"$ac_link\"") >&5
++if { (eval echo "$as_me:28445: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:28421: \$? = $ac_status" >&5
++ echo "$as_me:28448: \$? = $ac_status" >&5
+ (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+- { (eval echo "$as_me:28423: \"$ac_try\"") >&5
++ { (eval echo "$as_me:28450: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:28426: \$? = $ac_status" >&5
++ echo "$as_me:28453: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_sizeof_wchar_t=`cat conftest.val`
+ else
+@@ -28439,7 +28466,7 @@
+ ac_cv_sizeof_wchar_t=0
+ fi
+ fi
+-echo "$as_me:28442: result: $ac_cv_sizeof_wchar_t" >&5
++echo "$as_me:28469: 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
+@@ -28452,7 +28479,7 @@
+ then
+ test -n "$verbose" && echo " test failed (assume 2)" 1>&6
+
+-echo "${as_me:-configure}:28455: testing test failed (assume 2) ..." 1>&5
++echo "${as_me:-configure}:28482: testing test failed (assume 2) ..." 1>&5
+
+ sed /SIZEOF_WCHAR_T/d confdefs.h >confdefs.tmp
+ mv confdefs.tmp confdefs.h
+@@ -28470,7 +28497,7 @@
+ ### chooses to split module lists into libraries.
+ ###
+ ### (see CF_LIB_RULES).
+-echo "$as_me:28473: checking for library subsets" >&5
++echo "$as_me:28500: checking for library subsets" >&5
+ echo $ECHO_N "checking for library subsets... $ECHO_C" >&6
+ LIB_SUBSETS=
+
+@@ -28524,7 +28551,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:28527: result: $LIB_SUBSETS" >&5
++echo "$as_me:28554: result: $LIB_SUBSETS" >&5
+ echo "${ECHO_T}$LIB_SUBSETS" >&6
+
+ ### Construct the list of include-directories to be generated
+@@ -28555,7 +28582,7 @@
+ fi
+
+ ### Build up pieces for makefile rules
+-echo "$as_me:28558: checking default library suffix" >&5
++echo "$as_me:28585: checking default library suffix" >&5
+ echo $ECHO_N "checking default library suffix... $ECHO_C" >&6
+
+ case $DFT_LWR_MODEL in
+@@ -28566,10 +28593,10 @@
+ (shared) DFT_ARG_SUFFIX='' ;;
+ esac
+ test -n "$LIB_SUFFIX" && DFT_ARG_SUFFIX="${LIB_SUFFIX}${DFT_ARG_SUFFIX}"
+-echo "$as_me:28569: result: $DFT_ARG_SUFFIX" >&5
++echo "$as_me:28596: result: $DFT_ARG_SUFFIX" >&5
+ echo "${ECHO_T}$DFT_ARG_SUFFIX" >&6
+
+-echo "$as_me:28572: checking default library-dependency suffix" >&5
++echo "$as_me:28599: checking default library-dependency suffix" >&5
+ echo $ECHO_N "checking default library-dependency suffix... $ECHO_C" >&6
+
+ case X$DFT_LWR_MODEL in
+@@ -28652,10 +28679,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:28655: result: $DFT_DEP_SUFFIX" >&5
++echo "$as_me:28682: result: $DFT_DEP_SUFFIX" >&5
+ echo "${ECHO_T}$DFT_DEP_SUFFIX" >&6
+
+-echo "$as_me:28658: checking default object directory" >&5
++echo "$as_me:28685: checking default object directory" >&5
+ echo $ECHO_N "checking default object directory... $ECHO_C" >&6
+
+ case $DFT_LWR_MODEL in
+@@ -28671,11 +28698,11 @@
+ DFT_OBJ_SUBDIR='obj_s' ;;
+ esac
+ esac
+-echo "$as_me:28674: result: $DFT_OBJ_SUBDIR" >&5
++echo "$as_me:28701: result: $DFT_OBJ_SUBDIR" >&5
+ echo "${ECHO_T}$DFT_OBJ_SUBDIR" >&6
+
+ if test "x$cf_with_cxx" = xyes ; then
+-echo "$as_me:28678: checking c++ library-dependency suffix" >&5
++echo "$as_me:28705: 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++)
+@@ -28768,7 +28795,7 @@
+ fi
+
+ fi
+-echo "$as_me:28771: result: $CXX_LIB_SUFFIX" >&5
++echo "$as_me:28798: result: $CXX_LIB_SUFFIX" >&5
+ echo "${ECHO_T}$CXX_LIB_SUFFIX" >&6
+
+ fi
+@@ -28944,19 +28971,19 @@
+
+ if test -n "$LDFLAGS_STATIC" && test -n "$LDFLAGS_SHARED"
+ then
+- echo "$as_me:28947: checking if linker supports switching between static/dynamic" >&5
++ echo "$as_me:28974: 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 28952 "configure"
++#line 28979 "configure"
+ #include <stdio.h>
+ int cf_ldflags_static(FILE *fp) { return fflush(fp); }
+ EOF
+- if { (eval echo "$as_me:28956: \"$ac_compile\"") >&5
++ if { (eval echo "$as_me:28983: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:28959: \$? = $ac_status" >&5
++ echo "$as_me:28986: \$? = $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
+@@ -28967,10 +28994,10 @@
+
+ LIBS="$LDFLAGS_STATIC -L`pwd` -lconftest $LDFLAGS_DYNAMIC $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 28970 "configure"
++#line 28997 "configure"
+ #include "confdefs.h"
+
+-#line 28973 "configure"
++#line 29000 "configure"
+ #include <stdio.h>
+ int cf_ldflags_static(FILE *fp);
+
+@@ -28985,16 +29012,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:28988: \"$ac_link\"") >&5
++if { (eval echo "$as_me:29015: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:28991: \$? = $ac_status" >&5
++ echo "$as_me:29018: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:28994: \"$ac_try\"") >&5
++ { (eval echo "$as_me:29021: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:28997: \$? = $ac_status" >&5
++ echo "$as_me:29024: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+
+ # some linkers simply ignore the -dynamic
+@@ -29017,7 +29044,7 @@
+ rm -f libconftest.*
+ LIBS="$cf_save_LIBS"
+
+- echo "$as_me:29020: result: $cf_ldflags_static" >&5
++ echo "$as_me:29047: result: $cf_ldflags_static" >&5
+ echo "${ECHO_T}$cf_ldflags_static" >&6
+
+ if test "$cf_ldflags_static" != yes
+@@ -29033,7 +29060,7 @@
+ ;;
+ esac
+
+-echo "$as_me:29036: checking where we will install curses.h" >&5
++echo "$as_me:29063: checking where we will install curses.h" >&5
+ echo $ECHO_N "checking where we will install curses.h... $ECHO_C" >&6
+
+ includesubdir=
+@@ -29043,7 +29070,7 @@
+ then
+ includesubdir="/ncurses${USE_LIB_SUFFIX}"
+ fi
+-echo "$as_me:29046: result: ${includedir}${includesubdir}" >&5
++echo "$as_me:29073: result: ${includedir}${includesubdir}" >&5
+ echo "${ECHO_T}${includedir}${includesubdir}" >&6
+
+ ### Resolve a conflict between normal and wide-curses by forcing applications
+@@ -29051,7 +29078,7 @@
+ if test "$with_overwrite" != no ; then
+ if test "$NCURSES_LIBUTF8" = 1 ; then
+ NCURSES_LIBUTF8='defined(HAVE_LIBUTF8_H)'
+- { echo "$as_me:29054: WARNING: Wide-character applications must define HAVE_LIBUTF8_H to include curses.h" >&5
++ { echo "$as_me:29081: 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
+@@ -29076,7 +29103,7 @@
+
+ # pkgsrc uses these
+
+-echo "$as_me:29079: checking for desired basename for form library" >&5
++echo "$as_me:29106: 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.
+@@ -29096,10 +29123,10 @@
+ ;;
+ esac
+
+-echo "$as_me:29099: result: $FORM_NAME" >&5
++echo "$as_me:29126: result: $FORM_NAME" >&5
+ echo "${ECHO_T}$FORM_NAME" >&6
+
+-echo "$as_me:29102: checking for desired basename for menu library" >&5
++echo "$as_me:29129: 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.
+@@ -29119,10 +29146,10 @@
+ ;;
+ esac
+
+-echo "$as_me:29122: result: $MENU_NAME" >&5
++echo "$as_me:29149: result: $MENU_NAME" >&5
+ echo "${ECHO_T}$MENU_NAME" >&6
+
+-echo "$as_me:29125: checking for desired basename for panel library" >&5
++echo "$as_me:29152: 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.
+@@ -29142,10 +29169,10 @@
+ ;;
+ esac
+
+-echo "$as_me:29145: result: $PANEL_NAME" >&5
++echo "$as_me:29172: result: $PANEL_NAME" >&5
+ echo "${ECHO_T}$PANEL_NAME" >&6
+
+-echo "$as_me:29148: checking for desired basename for cxx library" >&5
++echo "$as_me:29175: 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.
+@@ -29165,13 +29192,13 @@
+ ;;
+ esac
+
+-echo "$as_me:29168: result: $CXX_NAME" >&5
++echo "$as_me:29195: 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:29174: checking for src modules" >&5
++echo "$as_me:29201: checking for src modules" >&5
+ echo $ECHO_N "checking for src modules... $ECHO_C" >&6
+
+ # dependencies and linker-arguments for test-programs
+@@ -29230,7 +29257,7 @@
+ fi
+ fi
+ done
+-echo "$as_me:29233: result: $cf_cv_src_modules" >&5
++echo "$as_me:29260: result: $cf_cv_src_modules" >&5
+ echo "${ECHO_T}$cf_cv_src_modules" >&6
+
+ TEST_ARGS="-L${LIB_DIR} $TEST_ARGS"
+@@ -29391,7 +29418,7 @@
+ (*-D_XOPEN_SOURCE_EXTENDED*)
+ test -n "$verbose" && echo " moving _XOPEN_SOURCE_EXTENDED to work around g++ problem" 1>&6
+
+-echo "${as_me:-configure}:29394: testing moving _XOPEN_SOURCE_EXTENDED to work around g++ problem ..." 1>&5
++echo "${as_me:-configure}:29421: 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//'`
+@@ -29402,7 +29429,7 @@
+
+ # Help to automatically enable the extended curses features when using either
+ # the *-config or the ".pc" files by adding defines.
+-echo "$as_me:29405: checking for defines to add to ncurses${USE_CFG_SUFFIX}${cf_config_suffix}-config script" >&5
++echo "$as_me:29432: 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
+@@ -29418,7 +29445,7 @@
+ done
+ test "$cf_found" = no && PKG_CFLAGS="$PKG_CFLAGS $cf_loop1"
+ done
+-echo "$as_me:29421: result: $PKG_CFLAGS" >&5
++echo "$as_me:29448: result: $PKG_CFLAGS" >&5
+ echo "${ECHO_T}$PKG_CFLAGS" >&6
+
+ case "$cf_cv_system_name" in
+@@ -29490,7 +29517,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}:29493: testing will map symbols to ABI=$cf_cv_abi_default ..." 1>&5
++echo "${as_me:-configure}:29520: testing will map symbols to ABI=$cf_cv_abi_default ..." 1>&5
+
+ fi
+
+@@ -29517,7 +29544,7 @@
+
+ # This is used for the *-config script and *.pc data files.
+
+-echo "$as_me:29520: checking for linker search path" >&5
++echo "$as_me:29547: 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
+@@ -29565,7 +29592,7 @@
+ cf_pathlist="$cf_pathlist /lib /usr/lib"
+ ;;
+ (*)
+- { echo "$as_me:29568: WARNING: problem with Solaris architecture" >&5
++ { echo "$as_me:29595: WARNING: problem with Solaris architecture" >&5
+ echo "$as_me: WARNING: problem with Solaris architecture" >&2;}
+ ;;
+ esac
+@@ -29606,7 +29633,7 @@
+ test -z "$cf_cv_ld_searchpath" && cf_cv_ld_searchpath=/usr/lib
+
+ fi
+-echo "$as_me:29609: result: $cf_cv_ld_searchpath" >&5
++echo "$as_me:29636: 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'`
+@@ -29692,7 +29719,7 @@
+ : "${CONFIG_STATUS=./config.status}"
+ ac_clean_files_save=$ac_clean_files
+ ac_clean_files="$ac_clean_files $CONFIG_STATUS"
+-{ echo "$as_me:29695: creating $CONFIG_STATUS" >&5
++{ echo "$as_me:29722: creating $CONFIG_STATUS" >&5
+ echo "$as_me: creating $CONFIG_STATUS" >&6;}
+ cat >"$CONFIG_STATUS" <<_ACEOF
+ #! $SHELL
+@@ -29873,7 +29900,7 @@
+ echo "$ac_cs_version"; exit 0 ;;
+ --he | --h)
+ # Conflict between --help and --header
+- { { echo "$as_me:29876: error: ambiguous option: $1
++ { { echo "$as_me:29903: 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;}
+@@ -29892,7 +29919,7 @@
+ ac_need_defaults=false;;
+
+ # This is an error.
+- -*) { { echo "$as_me:29895: error: unrecognized option: $1
++ -*) { { echo "$as_me:29922: 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;}
+@@ -29938,6 +29965,8 @@
+ ECHO_LD="$ECHO_LD"
+ EXTRA_SUFFIX="$EXTRA_SUFFIX"
+ FORM_NAME="$FORM_NAME"
++GLOB_FULLPATH_OTHER="$GLOB_FULLPATH_OTHER"
++GLOB_FULLPATH_POSIX="$GLOB_FULLPATH_POSIX"
+ LDCONFIG="$LDCONFIG"
+ LIBTOOL_VERSION="$LIBTOOL_VERSION"
+ LIB_NAME="$LIB_NAME"
+@@ -30022,7 +30051,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:30025: error: invalid argument: $ac_config_target" >&5
++ *) { { echo "$as_me:30054: error: invalid argument: $ac_config_target" >&5
+ echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
+ { (exit 1); exit 1; }; };;
+ esac
+@@ -30190,6 +30219,7 @@
+ s,@ac_ct_NM@,$ac_ct_NM,;t t
+ s,@ARFLAGS@,$ARFLAGS,;t t
+ s,@DESTDIR@,$DESTDIR,;t t
++s,@MERGE_PREFIX@,$MERGE_PREFIX,;t t
+ s,@BUILD_CC@,$BUILD_CC,;t t
+ s,@BUILD_CPP@,$BUILD_CPP,;t t
+ s,@BUILD_CFLAGS@,$BUILD_CFLAGS,;t t
+@@ -30546,7 +30576,7 @@
+ esac
+
+ if test x"$ac_file" != x-; then
+- { echo "$as_me:30549: creating $ac_file" >&5
++ { echo "$as_me:30579: creating $ac_file" >&5
+ echo "$as_me: creating $ac_file" >&6;}
+ rm -f "$ac_file"
+ fi
+@@ -30564,7 +30594,7 @@
+ -) echo "$tmp"/stdin ;;
+ [\\/$]*)
+ # Absolute (can't be DOS-style, as IFS=:)
+- test -f "$f" || { { echo "$as_me:30567: error: cannot find input file: $f" >&5
++ test -f "$f" || { { echo "$as_me:30597: error: cannot find input file: $f" >&5
+ echo "$as_me: error: cannot find input file: $f" >&2;}
+ { (exit 1); exit 1; }; }
+ echo "$f";;
+@@ -30577,7 +30607,7 @@
+ echo "$srcdir/$f"
+ else
+ # /dev/null tree
+- { { echo "$as_me:30580: error: cannot find input file: $f" >&5
++ { { echo "$as_me:30610: error: cannot find input file: $f" >&5
+ echo "$as_me: error: cannot find input file: $f" >&2;}
+ { (exit 1); exit 1; }; }
+ fi;;
+@@ -30593,7 +30623,7 @@
+ if test -n "$ac_seen"; then
+ ac_used=`grep '@datarootdir@' "$ac_item"`
+ if test -z "$ac_used"; then
+- { echo "$as_me:30596: WARNING: datarootdir was used implicitly but not set:
++ { echo "$as_me:30626: 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;}
+@@ -30602,7 +30632,7 @@
+ fi
+ ac_seen=`grep '${datarootdir}' "$ac_item"`
+ if test -n "$ac_seen"; then
+- { echo "$as_me:30605: WARNING: datarootdir was used explicitly but not set:
++ { echo "$as_me:30635: 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;}
+@@ -30647,7 +30677,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:30650: WARNING: Variable $ac_name is used but was not set:
++ { echo "$as_me:30680: 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;}
+@@ -30658,7 +30688,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:30661: WARNING: Some variables may not be substituted:
++ { echo "$as_me:30691: WARNING: Some variables may not be substituted:
+ $ac_seen" >&5
+ echo "$as_me: WARNING: Some variables may not be substituted:
+ $ac_seen" >&2;}
+@@ -30707,7 +30737,7 @@
+ * ) ac_file_in=$ac_file.in ;;
+ esac
+
+- test x"$ac_file" != x- && { echo "$as_me:30710: creating $ac_file" >&5
++ test x"$ac_file" != x- && { echo "$as_me:30740: creating $ac_file" >&5
+ echo "$as_me: creating $ac_file" >&6;}
+
+ # First look for the input files in the build tree, otherwise in the
+@@ -30718,7 +30748,7 @@
+ -) echo "$tmp"/stdin ;;
+ [\\/$]*)
+ # Absolute (can't be DOS-style, as IFS=:)
+- test -f "$f" || { { echo "$as_me:30721: error: cannot find input file: $f" >&5
++ test -f "$f" || { { echo "$as_me:30751: error: cannot find input file: $f" >&5
+ echo "$as_me: error: cannot find input file: $f" >&2;}
+ { (exit 1); exit 1; }; }
+ echo $f;;
+@@ -30731,7 +30761,7 @@
+ echo "$srcdir/$f"
+ else
+ # /dev/null tree
+- { { echo "$as_me:30734: error: cannot find input file: $f" >&5
++ { { echo "$as_me:30764: error: cannot find input file: $f" >&5
+ echo "$as_me: error: cannot find input file: $f" >&2;}
+ { (exit 1); exit 1; }; }
+ fi;;
+@@ -30789,7 +30819,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:30792: $ac_file is unchanged" >&5
++ { echo "$as_me:30822: $ac_file is unchanged" >&5
+ echo "$as_me: $ac_file is unchanged" >&6;}
+ else
+ ac_dir=`$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+@@ -31176,7 +31206,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}:31179: testing overriding CXX_MODEL to SHARED ..." 1>&5
++echo "${as_me:-configure}:31209: testing overriding CXX_MODEL to SHARED ..." 1>&5
+
+ with_shared_cxx=yes
+ ;;
+Index: configure.in
+Prereq: 1.783
+--- ncurses-6.5-20240810+/configure.in 2024-07-20 23:46:58.000000000 +0000
++++ ncurses-6.5-20240817/configure.in 2024-08-17 13:44:13.000000000 +0000
+@@ -29,7 +29,7 @@
+ dnl
+ dnl Author: Thomas E. Dickey 1995-on
+ dnl
+-dnl $Id: configure.in,v 1.783 2024/07/20 23:46:58 tom Exp $
++dnl $Id: configure.in,v 1.785 2024/08/17 13:44:13 tom Exp $
+ dnl Process this file with autoconf to produce a configure script.
+ dnl
+ dnl For additional information, see
+@@ -38,7 +38,7 @@
+ dnl
+ dnl ---------------------------------------------------------------------------
+ AC_PREREQ(2.52.20210101)
+-AC_REVISION($Revision: 1.783 $)
++AC_REVISION($Revision: 1.785 $)
+ AC_INIT(ncurses/base/lib_initscr.c)
+ AC_CONFIG_HEADER(include/ncurses_cfg.h:include/ncurses_cfg.hin)
+
+@@ -265,20 +265,7 @@
+ AC_CHECK_TOOL(NM, nm, nm)
+ CF_AR_FLAGS
+
+-dnl Special option for use by system-builders: the install-prefix is used to
+-dnl adjust the location into which the actual install is done, so that an
+-dnl archive can be built without modifying the host system's configuration.
+-AC_MSG_CHECKING(for an installation directory prefix)
+-AC_ARG_WITH(install-prefix,
+- [ --with-install-prefix=DESTDIR use DESTDIR as installation directory prefix],
+- [case "x$withval" in
+- (xyes|xno)
+- ;;
+- (*) DESTDIR="$withval"
+- ;;
+- esac])
+-AC_MSG_RESULT([${DESTDIR:-(none)}])
+-AC_SUBST(DESTDIR)
++CF_INSTALL_PREFIX
+
+ ###############################################################################
+ CF_HELP_MESSAGE(Build-Tools Needed to Compile Temporary Applications for Cross-compiling:)
+@@ -2553,6 +2540,8 @@
+ ECHO_LD="$ECHO_LD"
+ EXTRA_SUFFIX="$EXTRA_SUFFIX"
+ FORM_NAME="$FORM_NAME"
++GLOB_FULLPATH_OTHER="$GLOB_FULLPATH_OTHER"
++GLOB_FULLPATH_POSIX="$GLOB_FULLPATH_POSIX"
+ LDCONFIG="$LDCONFIG"
+ LIBTOOL_VERSION="$LIBTOOL_VERSION"
+ LIB_NAME="$LIB_NAME"
+Index: dist.mk
+Prereq: 1.1626
+--- ncurses-6.5-20240810+/dist.mk 2024-08-10 09:45:21.000000000 +0000
++++ ncurses-6.5-20240817/dist.mk 2024-08-17 09:37:53.000000000 +0000
+@@ -26,7 +26,7 @@
+ # use or other dealings in this Software without prior written #
+ # authorization. #
+ ##############################################################################
+-# $Id: dist.mk,v 1.1626 2024/08/10 09:45:21 tom Exp $
++# $Id: dist.mk,v 1.1627 2024/08/17 09:37:53 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 = 20240810
++NCURSES_PATCH = 20240817
+
+ # We don't append the patch to the version, since this only applies to releases
+ VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR)
+Index: form/Makefile.in
+Prereq: 1.72
+--- ncurses-6.5-20240810+/form/Makefile.in 2021-07-03 15:45:33.000000000 +0000
++++ ncurses-6.5-20240817/form/Makefile.in 2024-08-11 00:51:41.000000000 +0000
+@@ -1,6 +1,6 @@
+-# $Id: Makefile.in,v 1.72 2021/07/03 15:45:33 tom Exp $
++# $Id: Makefile.in,v 1.74 2024/08/11 00:51:41 tom Exp $
+ ##############################################################################
+-# Copyright 2020,2021 Thomas E. Dickey #
++# Copyright 2020-2021,2024 Thomas E. Dickey #
+ # Copyright 1998-2015,2018 Free Software Foundation, Inc. #
+ # #
+ # Permission is hereby granted, free of charge, to any person obtaining a #
+@@ -61,7 +61,9 @@
+ includedir = @includedir@
+ includesubdir = @includesubdir@
+
+-INCLUDEDIR = $(DESTDIR)$(includedir)$(includesubdir)
++INCLUDEDIR = $(DESTDIR)$(includedir@MERGE_PREFIX@)$(includesubdir)
++BINDIR = $(DESTDIR)$(bindir@MERGE_PREFIX@)
++LIBDIR = $(DESTDIR)$(libdir@MERGE_PREFIX@)
+
+ PACKAGE = @PACKAGE@
+
+@@ -153,8 +155,8 @@
+
+ sources : $(AUTO_SRC)
+
+-$(DESTDIR)$(bindir) \
+-$(DESTDIR)$(libdir) :
++$(BINDIR) \
++$(LIBDIR) :
+ mkdir -p $@
+
+ # make copies to simplify include-paths while still keeping form's include
+Index: include/Makefile.in
+Prereq: 1.53
+--- ncurses-6.5-20240810+/include/Makefile.in 2021-07-03 18:56:51.000000000 +0000
++++ ncurses-6.5-20240817/include/Makefile.in 2024-08-10 18:19:10.000000000 +0000
+@@ -1,6 +1,6 @@
+-# $Id: Makefile.in,v 1.53 2021/07/03 18:56:51 tom Exp $
++# $Id: Makefile.in,v 1.54 2024/08/10 18:19:10 tom Exp $
+ ##############################################################################
+-# Copyright 2019-2020,2021 Thomas E. Dickey #
++# Copyright 2019-2021,2024 Thomas E. Dickey #
+ # Copyright 1998-2013,2015 Free Software Foundation, Inc. #
+ # #
+ # Permission is hereby granted, free of charge, to any person obtaining a #
+@@ -51,7 +51,7 @@
+ includedir = @includedir@
+ includesubdir = @includesubdir@
+
+-INCLUDEDIR = $(DESTDIR)$(includedir)$(includesubdir)
++INCLUDEDIR = $(DESTDIR)$(includedir@MERGE_PREFIX@)$(includesubdir)
+
+ INSTALL = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@
+Index: man/Makefile.in
+Prereq: 1.54
+--- ncurses-6.5-20240810+/man/Makefile.in 2022-10-22 16:36:40.000000000 +0000
++++ ncurses-6.5-20240817/man/Makefile.in 2024-08-10 18:19:16.000000000 +0000
+@@ -1,6 +1,6 @@
+-# $Id: Makefile.in,v 1.54 2022/10/22 16:36:40 tom Exp $
++# $Id: Makefile.in,v 1.55 2024/08/10 18:19:16 tom Exp $
+ ##############################################################################
+-# Copyright 2019-2021,2022 Thomas E. Dickey #
++# Copyright 2019-2022,2024 Thomas E. Dickey #
+ # Copyright 1998-2013,2015 Free Software Foundation, Inc. #
+ # #
+ # Permission is hereby granted, free of charge, to any person obtaining a #
+@@ -47,7 +47,8 @@
+ mandir = @mandir@
+ includesubdir = @includesubdir@
+
+-INCLUDEDIR = $(DESTDIR)$(includedir)$(includesubdir)
++INCLUDEDIR = $(DESTDIR)$(includedir@MERGE_PREFIX@)$(includesubdir)
++MANDIR = $(DESTDIR)$(mandir@MERGE_PREFIX@)
+
+ INSTALL = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -72,12 +73,12 @@
+ depend :
+ tags :
+
+-$(DESTDIR)$(mandir) :
++$(MANDIR) :
+ mkdir -p $@
+
+-EDITARGS = $(DESTDIR)$(mandir) $(srcdir) terminfo.5 *-config.1 $(srcdir)/*.[0-9]*
++EDITARGS = $(MANDIR) $(srcdir) terminfo.5 *-config.1 $(srcdir)/*.[0-9]*
+
+-install install.man : terminfo.5 $(DESTDIR)$(mandir)
++install install.man : terminfo.5 $(MANDIR)
+ $(SHELL) ../edit_man.sh normal installing $(EDITARGS)
+
+ uninstall uninstall.man :
+Index: menu/Makefile.in
+Prereq: 1.71
+--- ncurses-6.5-20240810+/menu/Makefile.in 2021-07-03 15:45:33.000000000 +0000
++++ ncurses-6.5-20240817/menu/Makefile.in 2024-08-11 00:51:30.000000000 +0000
+@@ -1,6 +1,6 @@
+-# $Id: Makefile.in,v 1.71 2021/07/03 15:45:33 tom Exp $
++# $Id: Makefile.in,v 1.72 2024/08/11 00:51:30 tom Exp $
+ ##############################################################################
+-# Copyright 2020,2021 Thomas E. Dickey #
++# Copyright 2020-2021,2024 Thomas E. Dickey #
+ # Copyright 1998-2015,2018 Free Software Foundation, Inc. #
+ # #
+ # Permission is hereby granted, free of charge, to any person obtaining a #
+@@ -61,7 +61,9 @@
+ includedir = @includedir@
+ includesubdir = @includesubdir@
+
+-INCLUDEDIR = $(DESTDIR)$(includedir)$(includesubdir)
++INCLUDEDIR = $(DESTDIR)$(includedir@MERGE_PREFIX@)$(includesubdir)
++BINDIR = $(DESTDIR)$(bindir@MERGE_PREFIX@)
++LIBDIR = $(DESTDIR)$(libdir@MERGE_PREFIX@)
+
+ PACKAGE = @PACKAGE@
+
+@@ -155,8 +157,8 @@
+
+ sources : $(AUTO_SRC)
+
+-$(DESTDIR)$(bindir) \
+-$(DESTDIR)$(libdir) :
++$(BINDIR) \
++$(LIBDIR) :
+ mkdir -p $@
+
+ # make copies to simplify include-paths while still keeping menu's include
+Index: misc/Makefile.in
+Prereq: 1.82
+--- ncurses-6.5-20240810+/misc/Makefile.in 2024-08-04 14:49:08.000000000 +0000
++++ ncurses-6.5-20240817/misc/Makefile.in 2024-08-10 18:06:18.000000000 +0000
+@@ -1,4 +1,4 @@
+-# $Id: Makefile.in,v 1.82 2024/08/04 14:49:08 tom Exp $
++# $Id: Makefile.in,v 1.83 2024/08/10 18:06:18 tom Exp $
+ ##############################################################################
+ # Copyright 2018-2021,2024 Thomas E. Dickey #
+ # Copyright 1998-2016,2017 Free Software Foundation, Inc. #
+@@ -61,7 +61,7 @@
+ datadir = @datadir@
+ includesubdir = @includesubdir@
+
+-INCLUDEDIR = $(DESTDIR)$(includedir)$(includesubdir)
++INCLUDEDIR = $(DESTDIR)$(includedir@MERGE_PREFIX@)$(includesubdir)
+
+ tabsetdir = $(datadir)/tabset
+ ticdir = @TERMINFO@
+@@ -75,14 +75,16 @@
+
+ PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+
+-BINDIR = $(DESTDIR)$(bindir)
+-DATADIR = $(DESTDIR)$(datadir)
++BINDIR = $(DESTDIR)$(bindir@MERGE_PREFIX@)
++DATADIR = $(DESTDIR)$(datadir@MERGE_PREFIX@)
+
+-@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_DATABASE@INSTALL_PREFIX = $(DESTDIR)$(prefix@MERGE_PREFIX@)
++@MAKE_DATABASE@LIBDIR = $(DESTDIR)$(libdir@MERGE_PREFIX@)
++@MAKE_DATABASE@TICDIR = $(DESTDIR)$(ticdir@MERGE_PREFIX@)
++@MAKE_DATABASE@TICFILE = $(DESTDIR)$(ticfile@MERGE_PREFIX@)
++@MAKE_DATABASE@TABSETDIR = $(DESTDIR)$(tabsetdir@MERGE_PREFIX@)
++
++@MAKE_PC_FILES@INSTALL_CONFIG = $(DESTDIR)$(PKG_CONFIG_LIBDIR@MERGE_PREFIX@)
+
+ ################################################################################
+
+@@ -152,11 +154,11 @@
+ @MAKE_PC_FILES@install.libs :: pc-files
+ @MAKE_PC_FILES@ @$(SHELL) -c 'case "x$(PKG_CONFIG_LIBDIR)" in \
+ @MAKE_PC_FILES@ x@GLOB_FULLPATH_POSIX@|x@GLOB_FULLPATH_OTHER@) \
+-@MAKE_PC_FILES@ mkdir -p $(DESTDIR)$(PKG_CONFIG_LIBDIR); \
++@MAKE_PC_FILES@ mkdir -p $(INSTALL_CONFIG); \
+ @MAKE_PC_FILES@ for name in $(PC_FILES); do \
+ @MAKE_PC_FILES@ test -f $$name || continue; \
+ @MAKE_PC_FILES@ echo installing $$name; \
+-@MAKE_PC_FILES@ $(INSTALL_DATA) $$name $(DESTDIR)$(PKG_CONFIG_LIBDIR)/$$name; \
++@MAKE_PC_FILES@ $(INSTALL_DATA) $$name $(INSTALL_CONFIG)/$$name; \
+ @MAKE_PC_FILES@ done \
+ @MAKE_PC_FILES@ ;; \
+ @MAKE_PC_FILES@ *) \
+@@ -197,12 +199,12 @@
+
+ uninstall.libs :
+ -rm -f $(BINDIR)/$(NCURSES_CONFIG)
+-@MAKE_PC_FILES@ @$(SHELL) -c 'case x$(DESTDIR)$(PKG_CONFIG_LIBDIR) in \
++@MAKE_PC_FILES@ @$(SHELL) -c 'case x$(INSTALL_CONFIG) in \
+ @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; \
+-@MAKE_PC_FILES@ rm -f $(DESTDIR)$(PKG_CONFIG_LIBDIR)/$$name; \
++@MAKE_PC_FILES@ rm -f $(INSTALL_CONFIG)/$$name; \
+ @MAKE_PC_FILES@ done \
+ @MAKE_PC_FILES@ ;; \
+ @MAKE_PC_FILES@ esac'
+Index: misc/terminfo.src
+--- ncurses-6.5-20240810+/misc/terminfo.src 2024-07-27 16:58:08.000000000 +0000
++++ ncurses-6.5-20240817/misc/terminfo.src 2024-08-17 22:45:40.000000000 +0000
+@@ -6,8 +6,8 @@
+ # Report bugs and new terminal descriptions to
+ # bug-ncurses@gnu.org
+ #
+-# $Revision: 1.1146 $
+-# $Date: 2024/07/27 16:58:08 $
++# $Revision: 1.1149 $
++# $Date: 2024/08/17 22:45:40 $
+ #
+ # The original header is preserved below for reference. It is noted that there
+ # is a "newer" version which differs in some cosmetic details (but actually
+@@ -7903,7 +7903,15 @@
+
+ #### Foot
+ # https://codeberg.org/dnkl/foot/
+-# Version 1.8.2
++# Version 1.18.1 2024/08/17
++#
++# vttest:
++# device attributes list 28=rectangular editing
++# supports rectangle operations, but problems with left/right margins
++# reports window-size, but not icon or window label
++# numeric keypad has no application-mode
++#
++# Version 1.8.2 2021/07/31
+ #
+ # This identifies as a VT220 with 4=sixel and 22=color, however:
+ # tack:
+@@ -7940,20 +7948,25 @@
+ bel=^G, clear=\E[H\E[2J, cr=\r, cub1=^H, cud1=\n, dim=\E[2m,
+ ech=\E[%p1%dX, ed=\E[J, el=\E[K, el1=\E[1K,
+ flash=\E]555\E\\, ind=\n, is2=\E[!p\E[4l\E>, kbs=^?,
+- kcbt=\E[Z, oc=\E]104\E\\, op=\E[39;49m, ri=\EM,
+- rmam=\E[?7l, rmkx=\E[?1l\E>, rmso=\E[27m, rmul=\E[24m,
+- rs1=\Ec, rs2=\E[!p\E[4l\E>,
++ kcbt=\E[Z, nel=\EE, oc=\E]104\E\\, op=\E[39;49m, ri=\EM,
++ rmam=\E[?7l, rmkx=\E[?1l\E>, rmm=\E[?1036h\E[?1034l,
++ rmso=\E[27m, rmul=\E[24m, rs1=\Ec, rs2=\E[!p\E[4l\E>,
+ sgr=%?%p9%t\E(0%e\E(B%;\E[0%?%p6%t;1%;%?%p5%t;2%;%?%p2%t;4%;
+ %?%p1%p3%|%t;7%;%?%p4%t;5%;%?%p7%t;8%;m,
+- sgr0=\E(B\E[m, smam=\E[?7h, smkx=\E[?1h\E=, E3=\E[3J,
++ sgr0=\E(B\E[m, smam=\E[?7h, smkx=\E[?1h\E=,
++ smm=\E[?1036l\E[?1034h, E3=\E[3J, Smulx=\E[4:%p1%dm,
++ rv=\E\\[>1;[0-9][0-9][0-9][0-9][0-9][0-9];0c,
++ xr=\EP>\\|foot\\([0-9]+\\.[0-9]+\\.[0-9]+(-[0-9]+-g[a-f[0-9]
++ +)?\\)?\E\\\\,
+ use=att610+cvis, use=ansi+csr, use=ansi+cup,
+ use=ansi+enq, use=ansi+local, use=ansi+idc, use=ansi+idl,
+ use=ansi+rca2, use=ansi+rep, use=ansi+tabs,
+ use=ansi+sgrbold, use=ecma+index, use=ecma+italics,
+- use=ecma+strikeout, use=xterm+acs, use=xterm+alt+title,
+- use=xterm+pcfkeys, use=xterm+sm+1006, use=xterm+tmux2,
+- use=xterm+sl-alt, use=bracketed+paste,
+- use=report+version, use=xterm+focus,
++ use=ecma+strikeout, use=kitty+setal, use=xterm+acs,
++ use=xterm+alt+title, use=xterm+pcfkeys,
++ use=xterm+sm+1006, use=xterm+tmux2, use=xterm+sl-alt,
++ use=bracketed+paste, use=report+version,
++ use=xterm+focus,
+
+ ######## WEB CLIENTS
+
+@@ -7969,6 +7982,30 @@
+ # it can connect to, and display in, a web browser, or as a standalone Qt
+ # application. Either way, it displays in the current desktop session.
+ #
++# Testing AppImage for 3.2.0, on Fedora 40:
++# + appears to implement erase-display by painting a double-line on the screen,
++# doesn't use full screen for ded though it sort-of works for vi.
++# + sets TERMINFO in its shell, and TERM=domterm-xterm which doesn't work when
++# doing sudo. According to the git log, that was April 1, 2023. The VTE
++# developers copied this feature (i.e., a partially workable private terminal
++# database) in February 2024.
++# + the canonical name for the terminal description is still "domterm", and
++# presumably the "domterm-xterm" alias is a workaround for hardcoded scripts
++# that look for "xterm".
++# + almost all of the differences between ncurses's "domterm" and DomTerm's
++# are additions, but (read further) most are untestable due to breakage in
++# the program.
++# + DomTerm's updated terminal description says it implements italics, but
++# + hangs in tack when doing blink (just before testing italics)
++# + vttest, ncurses test-program also fare badly, e.g., due to improper line
++# wrapping and/or inability to consistently clear the screen.
++#
++# The review of DomTerm 3.2.0 was prompted by noticing this page
++# https://domterm.org/Wire-byte-protocol.html
++# which goes on at length for extensions which collide with a commonly-used
++# control for restoring a saved cursor position:
++# CSI u Restore cursor (SCORC, also ANSI.SYS).
++#
+ # Testing current code (2019/07/06) with Fedora 30:
+ # tack
+ # no flash
+@@ -27599,4 +27636,8 @@
+ # + modify wezterm, omitting its broken left/right margin feature (report
+ # by Thayne McCombs) -TD
+ #
++# 2024-08-17
++# + review/update foot for 1.18.1 -TD
++# + add a note about DomTerm 3.2.0 -TD
++#
+ ######## SHANTIH! SHANTIH! SHANTIH!
+Index: mk-1st.awk
+Prereq: 1.125
+--- ncurses-6.5-20240810+/mk-1st.awk 2023-04-22 15:49:59.000000000 +0000
++++ ncurses-6.5-20240817/mk-1st.awk 2024-08-11 09:04:32.000000000 +0000
+@@ -1,6 +1,6 @@
+-# $Id: mk-1st.awk,v 1.125 2023/04/22 15:49:59 tom Exp $
++# $Id: mk-1st.awk,v 1.128 2024/08/11 09:04:32 tom Exp $
+ ##############################################################################
+-# Copyright 2018-2021,2023 Thomas E. Dickey #
++# Copyright 2018-2023,2024 Thomas E. Dickey #
+ # Copyright 1998-2016,2017 Free Software Foundation, Inc. #
+ # #
+ # Permission is hereby granted, free of charge, to any person obtaining a #
+@@ -253,9 +253,9 @@
+ }
+ function install_dll(directory,filename) {
+ src_name = sprintf("../lib/%s", filename);
+- dst_name = sprintf("$(DESTDIR)%s/%s", directory, filename);
++ dst_name = sprintf("%s/%s", directory, filename);
+ printf "\t@echo installing %s as %s\n", src_name, dst_name
+- if ( directory == "$(bindir)" ) {
++ if ( directory == "$(BINDIR)" ) {
+ program = "$(INSTALL) -m 755";
+ } else {
+ program = "$(INSTALL_LIB)";
+@@ -403,14 +403,14 @@
+
+ if ( ShlibVer == "cygdll" || ShlibVer == "msysdll" || ShlibVer == "mingw" || ShlibVer == "msvcdll") {
+
+- dst_dirs = "$(DESTDIR)$(bindir) $(DESTDIR)$(libdir)";
++ dst_dirs = "$(BINDIR) $(LIBDIR)";
+ printf "install.%s :: %s $(LIBRARIES)\n", name, dst_dirs
+- install_dll("$(bindir)",end_name);
+- install_dll("$(libdir)",imp_name);
++ install_dll("$(BINDIR)",end_name);
++ install_dll("$(LIBDIR)",imp_name);
+
+ } else {
+
+- lib_dir = "$(DESTDIR)$(libdir)";
++ lib_dir = "$(LIBDIR)";
+ printf "install.%s :: %s/%s\n", name, lib_dir, end_name
+ print ""
+ if ( ReLink == "yes" ) {
+@@ -430,13 +430,13 @@
+ }
+ ovr_name = sprintf("%scurses%s.a", curses_prefix, suffix)
+ printf "\t@echo linking %s to %s\n", imp_name, ovr_name
+- printf "\tcd $(DESTDIR)$(libdir) && ("
++ printf "\tcd $(LIBDIR) && ("
+ symlink(imp_name, ovr_name)
+ printf ")\n"
+ } else {
+ ovr_name = sprintf("libcurses%s", suffix)
+ printf "\t@echo linking %s to %s\n", end_name, ovr_name
+- printf "\tcd $(DESTDIR)$(libdir) && ("
++ printf "\tcd $(LIBDIR) && ("
+ symlink(end_name, ovr_name)
+ printf ")\n"
+ }
+@@ -450,19 +450,19 @@
+ printf "uninstall.%s ::\n", name
+ if ( ShlibVer == "cygdll" || ShlibVer == "msysdll" || ShlibVer == "mingw" || ShlibVer == "msvcdll") {
+
+- printf "\t@echo uninstalling $(DESTDIR)$(bindir)/%s\n", end_name
+- printf "\t-@rm -f $(DESTDIR)$(bindir)/%s\n", end_name
++ printf "\t@echo uninstalling $(BINDIR)/%s\n", end_name
++ printf "\t-@rm -f $(BINDIR)/%s\n", end_name
+
+- printf "\t@echo uninstalling $(DESTDIR)$(libdir)/%s\n", imp_name
+- printf "\t-@rm -f $(DESTDIR)$(libdir)/%s\n", imp_name
++ printf "\t@echo uninstalling $(LIBDIR)/%s\n", imp_name
++ printf "\t-@rm -f $(LIBDIR)/%s\n", imp_name
+
+ } else {
+- printf "\t@echo uninstalling $(DESTDIR)$(libdir)/%s\n", end_name
+- removelinks("$(DESTDIR)$(libdir)")
++ printf "\t@echo uninstalling $(LIBDIR)/%s\n", end_name
++ removelinks("$(LIBDIR)")
+ if ( overwrite == "yes" && name == "ncurses" )
+ {
+ ovr_name = sprintf("libcurses%s", suffix)
+- printf "\t-@rm -f $(DESTDIR)$(libdir)/%s\n", ovr_name
++ printf "\t-@rm -f $(LIBDIR)/%s\n", ovr_name
+ }
+ }
+ if ( rmSoLocs == "yes" ) {
+@@ -503,7 +503,7 @@
+ print "install \\"
+ print "install.libs \\"
+ printf "install.%s :: \\\n", trim_suffix(name);
+- printf "\t\t$(DESTDIR)$(libdir) \\\n";
++ printf "\t\t$(LIBDIR) \\\n";
+ use_name = TermlibRoot USE_LIB_SUFFIX
+ if ( (name != use_name ) && ( index(name, "++") == 0 ) && ( index(name, "tic") == 1 || index(name, "ncurses") == 1 ) ) {
+ if ( trim_suffix(TermlibRoot) != trim_suffix(name) ) {
+@@ -514,14 +514,14 @@
+ }
+ }
+ printf "\t\t../lib/%s\n", lib_name
+- printf "\t@echo installing ../lib/%s as $(DESTDIR)$(libdir)/%s\n", lib_name, lib_name
+- printf "\tcd ../lib; $(LIBTOOL_INSTALL) $(INSTALL) %s $(DESTDIR)$(libdir)\n", lib_name
++ printf "\t@echo installing ../lib/%s as $(LIBDIR)/%s\n", lib_name, lib_name
++ printf "\tcd ../lib; $(LIBTOOL_INSTALL) $(INSTALL) %s $(LIBDIR)\n", lib_name
+ print ""
+ print "uninstall \\"
+ print "uninstall.libs \\"
+ printf "uninstall.%s ::\n", trim_suffix(name)
+- printf "\t@echo uninstalling $(DESTDIR)$(libdir)/%s\n", lib_name
+- printf "\t-@$(LIBTOOL_UNINSTALL) rm -f $(DESTDIR)$(libdir)/%s\n", lib_name
++ printf "\t@echo uninstalling $(LIBDIR)/%s\n", lib_name
++ printf "\t-@$(LIBTOOL_UNINSTALL) rm -f $(LIBDIR)/%s\n", lib_name
+ }
+ else
+ {
+@@ -542,41 +542,41 @@
+ print ""
+ print "install \\"
+ print "install.libs \\"
+- printf "install.%s :: $(DESTDIR)$(libdir) ../lib/%s\n", name, lib_name
+- printf "\t@echo installing ../lib/%s as $(DESTDIR)$(libdir)/%s\n", lib_name, lib_name
+- printf "\t$(INSTALL_DATA) ../lib/%s $(DESTDIR)$(libdir)/%s\n", lib_name, lib_name
++ printf "install.%s :: $(LIBDIR) ../lib/%s\n", name, lib_name
++ printf "\t@echo installing ../lib/%s as $(LIBDIR)/%s\n", lib_name, lib_name
++ printf "\t$(INSTALL_DATA) ../lib/%s $(LIBDIR)/%s\n", lib_name, lib_name
+ if ( overwrite == "yes" && lib_name == "libncurses.a" )
+ {
+ printf "\t@echo linking libcurses.a to libncurses.a\n"
+- printf "\t-@rm -f $(DESTDIR)$(libdir)/libcurses.a\n"
+- printf "\t(cd $(DESTDIR)$(libdir) && "
++ printf "\t-@rm -f $(LIBDIR)/libcurses.a\n"
++ printf "\t(cd $(LIBDIR) && "
+ symlink("libncurses.a", "libcurses.a")
+ printf ")\n"
+ }
+ if ( ReRanlib == "yes" )
+ {
+- printf "\t$(RANLIB) $(DESTDIR)$(libdir)/%s\n", lib_name
++ printf "\t$(RANLIB) $(LIBDIR)/%s\n", lib_name
+ }
+ if ( host == "vxworks" )
+ {
+- printf "\t@echo installing ../lib/lib%s$o as $(DESTDIR)$(libdir)/lib%s$o\n", name, name
+- printf "\t$(INSTALL_DATA) ../lib/lib%s$o $(DESTDIR)$(libdir)/lib%s$o\n", name, name
++ printf "\t@echo installing ../lib/lib%s$o as $(LIBDIR)/lib%s$o\n", name, name
++ printf "\t$(INSTALL_DATA) ../lib/lib%s$o $(LIBDIR)/lib%s$o\n", name, name
+ }
+ print ""
+ print "uninstall \\"
+ print "uninstall.libs \\"
+ printf "uninstall.%s ::\n", name
+- printf "\t@echo uninstalling $(DESTDIR)$(libdir)/%s\n", lib_name
+- printf "\t-@rm -f $(DESTDIR)$(libdir)/%s\n", lib_name
++ printf "\t@echo uninstalling $(LIBDIR)/%s\n", lib_name
++ printf "\t-@rm -f $(LIBDIR)/%s\n", lib_name
+ if ( overwrite == "yes" && lib_name == "libncurses.a" )
+ {
+ printf "\t@echo linking libcurses.a to libncurses.a\n"
+- printf "\t-@rm -f $(DESTDIR)$(libdir)/libcurses.a\n"
++ printf "\t-@rm -f $(LIBDIR)/libcurses.a\n"
+ }
+ if ( host == "vxworks" )
+ {
+- printf "\t@echo uninstalling $(DESTDIR)$(libdir)/lib%s$o\n", name
+- printf "\t-@rm -f $(DESTDIR)$(libdir)/lib%s$o\n", name
++ printf "\t@echo uninstalling $(LIBDIR)/lib%s$o\n", name
++ printf "\t-@rm -f $(LIBDIR)/lib%s$o\n", name
+ }
+ }
+ print ""
+Index: ncurses/Makefile.in
+Prereq: 1.184
+--- ncurses-6.5-20240810+/ncurses/Makefile.in 2024-01-19 12:00:00.000000000 +0000
++++ ncurses-6.5-20240817/ncurses/Makefile.in 2024-08-10 18:07:57.000000000 +0000
+@@ -1,4 +1,4 @@
+-# $Id: Makefile.in,v 1.184 2024/01/19 12:00:00 tom Exp $
++# $Id: Makefile.in,v 1.185 2024/08/10 18:07:57 tom Exp $
+ ##############################################################################
+ # Copyright 2018-2022,2024 Thomas E. Dickey #
+ # Copyright 1998-2017,2018 Free Software Foundation, Inc. #
+@@ -69,7 +69,9 @@
+ datadir = @datadir@
+ includesubdir = @includesubdir@
+
+-INCLUDEDIR = $(DESTDIR)$(includedir)$(includesubdir)
++INCLUDEDIR = $(DESTDIR)$(includedir@MERGE_PREFIX@)$(includesubdir)
++BINDIR = $(DESTDIR)$(bindir@MERGE_PREFIX@)
++LIBDIR = $(DESTDIR)$(libdir@MERGE_PREFIX@)
+
+ PACKAGE = @PACKAGE@
+
+@@ -235,8 +237,8 @@
+
+ sources: $(AUTO_SRC)
+
+-$(DESTDIR)$(bindir) \
+-$(DESTDIR)$(libdir) :
++$(BINDIR) \
++$(LIBDIR) :
+ mkdir -p $@
+
+ ../lib : ; mkdir $@
+Index: package/debian-mingw/changelog
+--- ncurses-6.5-20240810+/package/debian-mingw/changelog 2024-08-10 09:45:21.000000000 +0000
++++ ncurses-6.5-20240817/package/debian-mingw/changelog 2024-08-11 00:14:44.000000000 +0000
+@@ -1,8 +1,8 @@
+-ncurses6td (6.5+20240810) unstable; urgency=low
++ncurses6td (6.5+20240817) unstable; urgency=low
+
+ * latest weekly patch
+
+- -- Thomas E. Dickey <dickey@invisible-island.net> Sat, 10 Aug 2024 05:45:21 -0400
++ -- Thomas E. Dickey <dickey@invisible-island.net> Sat, 10 Aug 2024 20:14:44 -0400
+
+ ncurses6 (5.9+20131005) unstable; urgency=low
+
+Index: package/debian-mingw64/changelog
+--- ncurses-6.5-20240810+/package/debian-mingw64/changelog 2024-08-10 09:45:21.000000000 +0000
++++ ncurses-6.5-20240817/package/debian-mingw64/changelog 2024-08-11 00:14:44.000000000 +0000
+@@ -1,8 +1,8 @@
+-ncurses6td (6.5+20240810) unstable; urgency=low
++ncurses6td (6.5+20240817) unstable; urgency=low
+
+ * latest weekly patch
+
+- -- Thomas E. Dickey <dickey@invisible-island.net> Sat, 10 Aug 2024 05:45:21 -0400
++ -- Thomas E. Dickey <dickey@invisible-island.net> Sat, 10 Aug 2024 20:14:44 -0400
+
+ ncurses6 (5.9+20131005) unstable; urgency=low
+
+Index: package/debian/changelog
+--- ncurses-6.5-20240810+/package/debian/changelog 2024-08-10 09:45:21.000000000 +0000
++++ ncurses-6.5-20240817/package/debian/changelog 2024-08-11 00:14:44.000000000 +0000
+@@ -1,8 +1,8 @@
+-ncurses6td (6.5+20240810) unstable; urgency=low
++ncurses6td (6.5+20240817) unstable; urgency=low
+
+ * latest weekly patch
+
+- -- Thomas E. Dickey <dickey@invisible-island.net> Sat, 10 Aug 2024 05:45:21 -0400
++ -- Thomas E. Dickey <dickey@invisible-island.net> Sat, 10 Aug 2024 20:14:44 -0400
+
+ ncurses6 (5.9+20120608) unstable; urgency=low
+
+Index: package/mingw-ncurses.nsi
+Prereq: 1.661
+--- ncurses-6.5-20240810+/package/mingw-ncurses.nsi 2024-08-10 09:45:21.000000000 +0000
++++ ncurses-6.5-20240817/package/mingw-ncurses.nsi 2024-08-11 00:14:44.000000000 +0000
+@@ -1,4 +1,4 @@
+-; $Id: mingw-ncurses.nsi,v 1.661 2024/08/10 09:45:21 tom Exp $
++; $Id: mingw-ncurses.nsi,v 1.662 2024/08/11 00:14:44 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 "0810"
++!define VERSION_MMDD "0817"
+ !define VERSION_PATCH ${VERSION_YYYY}${VERSION_MMDD}
+
+ !define MY_ABI "5"
+Index: package/mingw-ncurses.spec
+--- ncurses-6.5-20240810+/package/mingw-ncurses.spec 2024-08-10 09:45:21.000000000 +0000
++++ ncurses-6.5-20240817/package/mingw-ncurses.spec 2024-08-11 00:14:44.000000000 +0000
+@@ -3,7 +3,7 @@
+ Summary: shared libraries for terminal handling
+ Name: mingw32-ncurses6
+ Version: 6.5
+-Release: 20240810
++Release: 20240817
+ License: X11
+ Group: Development/Libraries
+ URL: https://invisible-island.net/ncurses/
+Index: package/ncurses.spec
+--- ncurses-6.5-20240810+/package/ncurses.spec 2024-08-10 09:45:21.000000000 +0000
++++ ncurses-6.5-20240817/package/ncurses.spec 2024-08-11 00:14:44.000000000 +0000
+@@ -1,7 +1,7 @@
+ Summary: shared libraries for terminal handling
+ Name: ncurses6
+ Version: 6.5
+-Release: 20240810
++Release: 20240817
+ License: X11
+ Group: Development/Libraries
+ URL: https://invisible-island.net/ncurses/
+Index: package/ncursest.spec
+--- ncurses-6.5-20240810+/package/ncursest.spec 2024-08-10 09:45:21.000000000 +0000
++++ ncurses-6.5-20240817/package/ncursest.spec 2024-08-11 00:14:44.000000000 +0000
+@@ -1,7 +1,7 @@
+ Summary: Curses library with POSIX thread support.
+ Name: ncursest6
+ Version: 6.5
+-Release: 20240810
++Release: 20240817
+ License: X11
+ Group: Development/Libraries
+ Source: ncurses-%{version}-%{release}.tgz
+Index: panel/Makefile.in
+Prereq: 1.76
+--- ncurses-6.5-20240810+/panel/Makefile.in 2021-07-03 15:45:33.000000000 +0000
++++ ncurses-6.5-20240817/panel/Makefile.in 2024-08-10 18:19:45.000000000 +0000
+@@ -1,6 +1,6 @@
+-# $Id: Makefile.in,v 1.76 2021/07/03 15:45:33 tom Exp $
++# $Id: Makefile.in,v 1.77 2024/08/10 18:19:45 tom Exp $
+ ##############################################################################
+-# Copyright 2020,2021 Thomas E. Dickey #
++# Copyright 2020-2021,2024 Thomas E. Dickey #
+ # Copyright 1998-2015,2018 Free Software Foundation, Inc. #
+ # #
+ # Permission is hereby granted, free of charge, to any person obtaining a #
+@@ -63,7 +63,9 @@
+ datadir = @datadir@
+ includesubdir = @includesubdir@
+
+-INCLUDEDIR = $(DESTDIR)$(includedir)$(includesubdir)
++INCLUDEDIR = $(DESTDIR)$(includedir@MERGE_PREFIX@)$(includesubdir)
++BINDIR = $(DESTDIR)$(bindir@MERGE_PREFIX@)
++LIBDIR = $(DESTDIR)$(libdir@MERGE_PREFIX@)
+
+ PACKAGE = @PACKAGE@
+
+@@ -155,8 +157,8 @@
+
+ sources: $(AUTO_SRC)
+
+-$(DESTDIR)$(bindir) \
+-$(DESTDIR)$(libdir) :
++$(BINDIR) \
++$(LIBDIR) :
+ mkdir -p $@
+
+ # make a copy to simplify include-paths while still keeping panel's include
+Index: progs/Makefile.in
+Prereq: 1.115
+--- ncurses-6.5-20240810+/progs/Makefile.in 2024-04-08 18:33:54.000000000 +0000
++++ ncurses-6.5-20240817/progs/Makefile.in 2024-08-10 18:13:22.000000000 +0000
+@@ -1,4 +1,4 @@
+-# $Id: Makefile.in,v 1.115 2024/04/08 18:33:54 tom Exp $
++# $Id: Makefile.in,v 1.116 2024/08/10 18:13:22 tom Exp $
+ ##############################################################################
+ # Copyright 2020-2021,2024 Thomas E. Dickey #
+ # Copyright 1998-2016,2018 Free Software Foundation, Inc. #
+@@ -66,7 +66,8 @@
+ datadir = @datadir@
+ includesubdir = @includesubdir@
+
+-INCLUDEDIR = $(DESTDIR)$(includedir)$(includesubdir)
++INCLUDEDIR = $(DESTDIR)$(includedir@MERGE_PREFIX@)$(includesubdir)
++BINDIR = $(DESTDIR)$(bindir@MERGE_PREFIX@)
+
+ PACKAGE = @PACKAGE@
+
+@@ -230,37 +231,37 @@
+ echo "#define PROG_INIT \"$(define_init)\"" >>$@
+ echo "#endif /* __TRANSFORM_H */" >>$@
+
+-install.progs: $(AUTO_SRC) $(PROGS) $(DESTDIR)$(bindir)
+-@MAKE_TERMINFO@ $(LIBTOOL_INSTALL) $(INSTALL_PROG) tic$x $(DESTDIR)$(bindir)/$(actual_tic)
+-@MAKE_TERMINFO@ $(LIBTOOL_INSTALL) $(INSTALL_PROG) toe$x $(DESTDIR)$(bindir)/$(actual_toe)
++install.progs: $(AUTO_SRC) $(PROGS) $(BINDIR)
++@MAKE_TERMINFO@ $(LIBTOOL_INSTALL) $(INSTALL_PROG) tic$x $(BINDIR)/$(actual_tic)
++@MAKE_TERMINFO@ $(LIBTOOL_INSTALL) $(INSTALL_PROG) toe$x $(BINDIR)/$(actual_toe)
+ @MAKE_TERMINFO@ @echo "linking $(actual_infotocap) to $(actual_tic)"
+-@MAKE_TERMINFO@ -@rm -f $(DESTDIR)$(bindir)/$(actual_infotocap)
+-@MAKE_TERMINFO@ ( cd $(DESTDIR)$(bindir) && $(LN_S) $(actual_tic) $(actual_infotocap) )
++@MAKE_TERMINFO@ -@rm -f $(BINDIR)/$(actual_infotocap)
++@MAKE_TERMINFO@ ( cd $(BINDIR) && $(LN_S) $(actual_tic) $(actual_infotocap) )
+ @MAKE_TERMINFO@ @echo "linking $(actual_captoinfo) to $(actual_tic)"
+-@MAKE_TERMINFO@ -@rm -f $(DESTDIR)$(bindir)/$(actual_captoinfo)
+-@MAKE_TERMINFO@ ( cd $(DESTDIR)$(bindir) && $(LN_S) $(actual_tic) $(actual_captoinfo) )
+- $(LIBTOOL_INSTALL) $(INSTALL_PROG) infocmp$x $(DESTDIR)$(bindir)/$(actual_infocmp)
+- $(LIBTOOL_INSTALL) $(INSTALL_PROG) clear$x $(DESTDIR)$(bindir)/$(actual_clear)
+- $(LIBTOOL_INSTALL) $(INSTALL_PROG) tabs$x $(DESTDIR)$(bindir)/$(actual_tabs)
+- $(LIBTOOL_INSTALL) $(INSTALL_PROG) tput$x $(DESTDIR)$(bindir)/$(actual_tput)
+- $(LIBTOOL_INSTALL) $(INSTALL_PROG) tset$x $(DESTDIR)$(bindir)/$(actual_tset)
++@MAKE_TERMINFO@ -@rm -f $(BINDIR)/$(actual_captoinfo)
++@MAKE_TERMINFO@ ( cd $(BINDIR) && $(LN_S) $(actual_tic) $(actual_captoinfo) )
++ $(LIBTOOL_INSTALL) $(INSTALL_PROG) infocmp$x $(BINDIR)/$(actual_infocmp)
++ $(LIBTOOL_INSTALL) $(INSTALL_PROG) clear$x $(BINDIR)/$(actual_clear)
++ $(LIBTOOL_INSTALL) $(INSTALL_PROG) tabs$x $(BINDIR)/$(actual_tabs)
++ $(LIBTOOL_INSTALL) $(INSTALL_PROG) tput$x $(BINDIR)/$(actual_tput)
++ $(LIBTOOL_INSTALL) $(INSTALL_PROG) tset$x $(BINDIR)/$(actual_tset)
+ @echo "linking $(actual_reset) to $(actual_tset)"
+- -@rm -f $(DESTDIR)$(bindir)/$(actual_reset)
+- ( cd $(DESTDIR)$(bindir) && $(LN_S) $(actual_tset) $(actual_reset) )
++ -@rm -f $(BINDIR)/$(actual_reset)
++ ( cd $(BINDIR) && $(LN_S) $(actual_tset) $(actual_reset) )
+
+ uninstall.progs:
+-@MAKE_TERMINFO@ -@$(LIBTOOL_CLEAN) rm -f $(DESTDIR)$(bindir)/$(actual_tic)
+-@MAKE_TERMINFO@ -@$(LIBTOOL_CLEAN) rm -f $(DESTDIR)$(bindir)/$(actual_toe)
+-@MAKE_TERMINFO@ -@rm -f $(DESTDIR)$(bindir)/$(actual_captoinfo)
+-@MAKE_TERMINFO@ -@rm -f $(DESTDIR)$(bindir)/$(actual_infotocap)
+- -@$(LIBTOOL_CLEAN) rm -f $(DESTDIR)$(bindir)/$(actual_infocmp)
+- -@$(LIBTOOL_CLEAN) rm -f $(DESTDIR)$(bindir)/$(actual_clear)
+- -@$(LIBTOOL_CLEAN) rm -f $(DESTDIR)$(bindir)/$(actual_tabs)
+- -@$(LIBTOOL_CLEAN) rm -f $(DESTDIR)$(bindir)/$(actual_tput)
+- -@$(LIBTOOL_CLEAN) rm -f $(DESTDIR)$(bindir)/$(actual_tset)
+- -@rm -f $(DESTDIR)$(bindir)/$(actual_reset)
++@MAKE_TERMINFO@ -@$(LIBTOOL_CLEAN) rm -f $(BINDIR)/$(actual_tic)
++@MAKE_TERMINFO@ -@$(LIBTOOL_CLEAN) rm -f $(BINDIR)/$(actual_toe)
++@MAKE_TERMINFO@ -@rm -f $(BINDIR)/$(actual_captoinfo)
++@MAKE_TERMINFO@ -@rm -f $(BINDIR)/$(actual_infotocap)
++ -@$(LIBTOOL_CLEAN) rm -f $(BINDIR)/$(actual_infocmp)
++ -@$(LIBTOOL_CLEAN) rm -f $(BINDIR)/$(actual_clear)
++ -@$(LIBTOOL_CLEAN) rm -f $(BINDIR)/$(actual_tabs)
++ -@$(LIBTOOL_CLEAN) rm -f $(BINDIR)/$(actual_tput)
++ -@$(LIBTOOL_CLEAN) rm -f $(BINDIR)/$(actual_tset)
++ -@rm -f $(BINDIR)/$(actual_reset)
+
+-$(DESTDIR)$(bindir) :
++$(BINDIR) :
+ mkdir -p $@
+
+ #
+Index: test/Makefile.in
+Prereq: 1.130
+--- ncurses-6.5-20240810+/test/Makefile.in 2021-12-18 23:00:28.000000000 +0000
++++ ncurses-6.5-20240817/test/Makefile.in 2024-08-10 18:19:56.000000000 +0000
+@@ -1,6 +1,6 @@
+-# $Id: Makefile.in,v 1.130 2021/12/18 23:00:28 tom Exp $
++# $Id: Makefile.in,v 1.131 2024/08/10 18:19:56 tom Exp $
+ ##############################################################################
+-# Copyright 2020,2021 Thomas E. Dickey #
++# Copyright 2020-2021,2024 Thomas E. Dickey #
+ # Copyright 1998-2017,2018 Free Software Foundation, Inc. #
+ # #
+ # Permission is hereby granted, free of charge, to any person obtaining a #
+@@ -61,10 +61,10 @@
+
+ real_bindir = $(libexecdir)/$(PACKAGE)
+
+-BINDIR = $(DESTDIR)$(bindir)
+-LIBEXECDIR = $(DESTDIR)$(libexecdir)
+-LIBDIR = $(DESTDIR)$(libdir)
+-DATADIR = $(DESTDIR)$(datadir)
++BINDIR = $(DESTDIR)$(bindir@MERGE_PREFIX@)
++LIBEXECDIR = $(DESTDIR)$(libexecdir@MERGE_PREFIX@)
++LIBDIR = $(DESTDIR)$(libdir@MERGE_PREFIX@)
++DATADIR = $(DESTDIR)$(datadir@MERGE_PREFIX@)
+
+ REAL_BINDIR = $(LIBEXECDIR)/$(PACKAGE)
+
+Index: test/aclocal.m4
+Prereq: 1.227
+--- ncurses-6.5-20240810+/test/aclocal.m4 2024-08-10 14:31:42.000000000 +0000
++++ ncurses-6.5-20240817/test/aclocal.m4 2024-08-11 09:11:30.000000000 +0000
+@@ -27,7 +27,7 @@
+ dnl authorization. *
+ dnl***************************************************************************
+ dnl
+-dnl $Id: aclocal.m4,v 1.227 2024/08/10 14:31:42 tom Exp $
++dnl $Id: aclocal.m4,v 1.228 2024/08/11 09:11:30 tom Exp $
+ dnl
+ dnl Author: Thomas E. Dickey
+ dnl
+@@ -2390,6 +2390,40 @@
+ AC_SUBST(INSTALL_OPT_S)
+ ])dnl
+ dnl ---------------------------------------------------------------------------
++dnl CF_INSTALL_PREFIX version: 1 updated: 2024/08/10 20:16:32
++dnl -----------------
++dnl Special option for use by system-builders: the install-prefix is used to
++dnl adjust the location into which the actual install is done, so that an
++dnl archive can be built without modifying the host system's configuration.
++AC_DEFUN([CF_INSTALL_PREFIX],[
++AC_MSG_CHECKING(for an installation directory prefix)
++AC_ARG_WITH(install-prefix,
++ [ --with-install-prefix=DESTDIR use DESTDIR as installation directory prefix],
++ [case "x$withval" in
++ (xyes|xno)
++ ;;
++ (*) DESTDIR="$withval"
++ ;;
++ esac])
++AC_MSG_RESULT([${DESTDIR:-(none)}])
++AC_SUBST(DESTDIR)
++
++AC_MSG_CHECKING(if installation directory prefix should be merged)
++CF_ARG_ENABLE(install-prefix,
++ [ --enable-install-prefix merge DESTDIR with installation prefix],
++ cf_install_prefix=yes,
++ cf_install_prefix=no)
++AC_MSG_RESULT($cf_install_prefix)
++
++if test "$cf_install_prefix" = yes ; then
++ MERGE_PREFIX=':$(prefix)%=%'
++else
++ MERGE_PREFIX=''
++fi
++
++AC_SUBST(MERGE_PREFIX)
++])dnl
++dnl ---------------------------------------------------------------------------
+ dnl CF_INTEL_COMPILER version: 9 updated: 2023/02/18 17:41:25
+ dnl -----------------
+ dnl Check if the given compiler is really the Intel compiler for Linux. It
+Index: test/configure
+--- ncurses-6.5-20240810+/test/configure 2024-08-10 15:48:47.000000000 +0000
++++ ncurses-6.5-20240817/test/configure 2024-08-11 09:11:55.000000000 +0000
+@@ -711,6 +711,8 @@
+ --enable-string-hacks work around bogus compiler/loader warnings
+ --with-pkg-config[=CMD] enable/disable use of pkg-config and its name CMD
+ --disable-echo do not display "compiling" commands
++ --with-install-prefix=DESTDIR use DESTDIR as installation directory prefix
++ --enable-install-prefix merge DESTDIR with installation prefix
+ Curses Version-dependent Options:
+ --with-ncurses-wrap-prefix naming-prefix for ncurses wrapped-variables
+ --disable-widec disable checks for wide-character functions
+@@ -934,7 +936,7 @@
+ fi
+ for ac_site_file in $CONFIG_SITE; do
+ if test -r "$ac_site_file"; then
+- { echo "$as_me:937: loading site script $ac_site_file" >&5
++ { echo "$as_me:939: 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"
+@@ -945,7 +947,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:948: loading cache $cache_file" >&5
++ { echo "$as_me:950: loading cache $cache_file" >&5
+ echo "$as_me: loading cache $cache_file" >&6;}
+ case $cache_file in
+ [\\/]* | ?:[\\/]* ) . $cache_file;;
+@@ -953,7 +955,7 @@
+ esac
+ fi
+ else
+- { echo "$as_me:956: creating cache $cache_file" >&5
++ { echo "$as_me:958: creating cache $cache_file" >&5
+ echo "$as_me: creating cache $cache_file" >&6;}
+ >$cache_file
+ fi
+@@ -969,21 +971,21 @@
+ eval ac_new_val="\$ac_env_${ac_var}_value"
+ case "$ac_old_set,$ac_new_set" in
+ set,)
+- { echo "$as_me:972: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
++ { echo "$as_me:974: 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:976: error: \`$ac_var' was not set in the previous run" >&5
++ { echo "$as_me:978: 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:982: error: \`$ac_var' has changed since the previous run:" >&5
++ { echo "$as_me:984: 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:984: former value: $ac_old_val" >&5
++ { echo "$as_me:986: former value: $ac_old_val" >&5
+ echo "$as_me: former value: $ac_old_val" >&2;}
+- { echo "$as_me:986: current value: $ac_new_val" >&5
++ { echo "$as_me:988: current value: $ac_new_val" >&5
+ echo "$as_me: current value: $ac_new_val" >&2;}
+ ac_cache_corrupted=:
+ fi;;
+@@ -1002,9 +1004,9 @@
+ fi
+ done
+ if "$ac_cache_corrupted"; then
+- { echo "$as_me:1005: error: changes in the environment can compromise the build" >&5
++ { echo "$as_me:1007: 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:1007: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5
++ { { echo "$as_me:1009: 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
+@@ -1033,10 +1035,10 @@
+ echo "#! $SHELL" >conftest.sh
+ echo "exit 0" >>conftest.sh
+ chmod +x conftest.sh
+-if { (echo "$as_me:1036: PATH=\".;.\"; conftest.sh") >&5
++if { (echo "$as_me:1038: PATH=\".;.\"; conftest.sh") >&5
+ (PATH=".;."; conftest.sh) 2>&5
+ ac_status=$?
+- echo "$as_me:1039: \$? = $ac_status" >&5
++ echo "$as_me:1041: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; then
+ ac_path_separator=';'
+ else
+@@ -1068,7 +1070,7 @@
+ fi
+ done
+ if test -z "$ac_aux_dir"; then
+- { { echo "$as_me:1071: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&5
++ { { echo "$as_me:1073: 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
+@@ -1078,11 +1080,11 @@
+
+ # Make sure we can run config.sub.
+ $ac_config_sub sun4 >/dev/null 2>&1 ||
+- { { echo "$as_me:1081: error: cannot run $ac_config_sub" >&5
++ { { echo "$as_me:1083: error: cannot run $ac_config_sub" >&5
+ echo "$as_me: error: cannot run $ac_config_sub" >&2;}
+ { (exit 1); exit 1; }; }
+
+-echo "$as_me:1085: checking build system type" >&5
++echo "$as_me:1087: 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
+@@ -1091,23 +1093,23 @@
+ test -z "$ac_cv_build_alias" &&
+ ac_cv_build_alias=`$ac_config_guess`
+ test -z "$ac_cv_build_alias" &&
+- { { echo "$as_me:1094: error: cannot guess build type; you must specify one" >&5
++ { { echo "$as_me:1096: 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:1098: error: $ac_config_sub $ac_cv_build_alias failed." >&5
++ { { echo "$as_me:1100: 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:1103: result: $ac_cv_build" >&5
++echo "$as_me:1105: 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/'`
+
+-echo "$as_me:1110: checking host system type" >&5
++echo "$as_me:1112: 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
+@@ -1116,12 +1118,12 @@
+ 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:1119: error: $ac_config_sub $ac_cv_host_alias failed" >&5
++ { { echo "$as_me:1121: 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:1124: result: $ac_cv_host" >&5
++echo "$as_me:1126: 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/'`
+@@ -1129,7 +1131,7 @@
+ 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 "$as_me:1134: 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
+@@ -1138,12 +1140,12 @@
+ 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:1143: 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 "$as_me:1148: 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/'`
+@@ -1175,13 +1177,13 @@
+ fi
+
+ test -z "$system_name" && system_name="$cf_cv_system_name"
+-test -n "$cf_cv_system_name" && echo "$as_me:1178: result: Configuring for $cf_cv_system_name" >&5
++test -n "$cf_cv_system_name" && echo "$as_me:1180: 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:1182: result: Cached system name ($system_name) does not agree with actual ($cf_cv_system_name)" >&5
++ echo "$as_me:1184: 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:1184: error: \"Please remove config.cache and try again.\"" >&5
++ { { echo "$as_me:1186: 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
+@@ -1189,14 +1191,14 @@
+ # 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:1194: 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:1199: checking whether ${MAKE-make} sets \${MAKE}" >&5
++echo "$as_me:1201: 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
+@@ -1216,11 +1218,11 @@
+ rm -f conftest.make
+ fi
+ if eval "test \"`echo '$ac_cv_prog_make_'${ac_make}_set`\" = yes"; then
+- echo "$as_me:1219: result: yes" >&5
++ echo "$as_me:1221: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ SET_MAKE=
+ else
+- echo "$as_me:1223: result: no" >&5
++ echo "$as_me:1225: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ SET_MAKE="MAKE=${MAKE-make}"
+ fi
+@@ -1234,7 +1236,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:1237: checking for $ac_word" >&5
++echo "$as_me:1239: 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
+@@ -1249,7 +1251,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:1252: found $ac_dir/$ac_word" >&5
++echo "$as_me:1254: found $ac_dir/$ac_word" >&5
+ break
+ done
+
+@@ -1257,10 +1259,10 @@
+ fi
+ CC=$ac_cv_prog_CC
+ if test -n "$CC"; then
+- echo "$as_me:1260: result: $CC" >&5
++ echo "$as_me:1262: result: $CC" >&5
+ echo "${ECHO_T}$CC" >&6
+ else
+- echo "$as_me:1263: result: no" >&5
++ echo "$as_me:1265: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+
+@@ -1269,7 +1271,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:1272: checking for $ac_word" >&5
++echo "$as_me:1274: 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
+@@ -1284,7 +1286,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:1287: found $ac_dir/$ac_word" >&5
++echo "$as_me:1289: found $ac_dir/$ac_word" >&5
+ break
+ done
+
+@@ -1292,10 +1294,10 @@
+ fi
+ ac_ct_CC=$ac_cv_prog_ac_ct_CC
+ if test -n "$ac_ct_CC"; then
+- echo "$as_me:1295: result: $ac_ct_CC" >&5
++ echo "$as_me:1297: result: $ac_ct_CC" >&5
+ echo "${ECHO_T}$ac_ct_CC" >&6
+ else
+- echo "$as_me:1298: result: no" >&5
++ echo "$as_me:1300: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+
+@@ -1308,7 +1310,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:1311: checking for $ac_word" >&5
++echo "$as_me:1313: 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
+@@ -1323,7 +1325,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:1326: found $ac_dir/$ac_word" >&5
++echo "$as_me:1328: found $ac_dir/$ac_word" >&5
+ break
+ done
+
+@@ -1331,10 +1333,10 @@
+ fi
+ CC=$ac_cv_prog_CC
+ if test -n "$CC"; then
+- echo "$as_me:1334: result: $CC" >&5
++ echo "$as_me:1336: result: $CC" >&5
+ echo "${ECHO_T}$CC" >&6
+ else
+- echo "$as_me:1337: result: no" >&5
++ echo "$as_me:1339: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+
+@@ -1343,7 +1345,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:1346: checking for $ac_word" >&5
++echo "$as_me:1348: 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
+@@ -1358,7 +1360,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:1361: found $ac_dir/$ac_word" >&5
++echo "$as_me:1363: found $ac_dir/$ac_word" >&5
+ break
+ done
+
+@@ -1366,10 +1368,10 @@
+ fi
+ ac_ct_CC=$ac_cv_prog_ac_ct_CC
+ if test -n "$ac_ct_CC"; then
+- echo "$as_me:1369: result: $ac_ct_CC" >&5
++ echo "$as_me:1371: result: $ac_ct_CC" >&5
+ echo "${ECHO_T}$ac_ct_CC" >&6
+ else
+- echo "$as_me:1372: result: no" >&5
++ echo "$as_me:1374: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+
+@@ -1382,7 +1384,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:1385: checking for $ac_word" >&5
++echo "$as_me:1387: 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
+@@ -1402,7 +1404,7 @@
+ continue
+ fi
+ ac_cv_prog_CC="cc"
+-echo "$as_me:1405: found $ac_dir/$ac_word" >&5
++echo "$as_me:1407: found $ac_dir/$ac_word" >&5
+ break
+ done
+
+@@ -1424,10 +1426,10 @@
+ fi
+ CC=$ac_cv_prog_CC
+ if test -n "$CC"; then
+- echo "$as_me:1427: result: $CC" >&5
++ echo "$as_me:1429: result: $CC" >&5
+ echo "${ECHO_T}$CC" >&6
+ else
+- echo "$as_me:1430: result: no" >&5
++ echo "$as_me:1432: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+
+@@ -1438,7 +1440,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:1441: checking for $ac_word" >&5
++echo "$as_me:1443: 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
+@@ -1453,7 +1455,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:1456: found $ac_dir/$ac_word" >&5
++echo "$as_me:1458: found $ac_dir/$ac_word" >&5
+ break
+ done
+
+@@ -1461,10 +1463,10 @@
+ fi
+ CC=$ac_cv_prog_CC
+ if test -n "$CC"; then
+- echo "$as_me:1464: result: $CC" >&5
++ echo "$as_me:1466: result: $CC" >&5
+ echo "${ECHO_T}$CC" >&6
+ else
+- echo "$as_me:1467: result: no" >&5
++ echo "$as_me:1469: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+
+@@ -1477,7 +1479,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:1480: checking for $ac_word" >&5
++echo "$as_me:1482: 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
+@@ -1492,7 +1494,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:1495: found $ac_dir/$ac_word" >&5
++echo "$as_me:1497: found $ac_dir/$ac_word" >&5
+ break
+ done
+
+@@ -1500,10 +1502,10 @@
+ fi
+ ac_ct_CC=$ac_cv_prog_ac_ct_CC
+ if test -n "$ac_ct_CC"; then
+- echo "$as_me:1503: result: $ac_ct_CC" >&5
++ echo "$as_me:1505: result: $ac_ct_CC" >&5
+ echo "${ECHO_T}$ac_ct_CC" >&6
+ else
+- echo "$as_me:1506: result: no" >&5
++ echo "$as_me:1508: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+
+@@ -1515,32 +1517,32 @@
+
+ fi
+
+-test -z "$CC" && { { echo "$as_me:1518: error: no acceptable cc found in \$PATH" >&5
++test -z "$CC" && { { echo "$as_me:1520: 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:1523:" \
++echo "$as_me:1525:" \
+ "checking for C compiler version" >&5
+ ac_compiler=`set X $ac_compile; echo "$2"`
+-{ (eval echo "$as_me:1526: \"$ac_compiler --version </dev/null >&5\"") >&5
++{ (eval echo "$as_me:1528: \"$ac_compiler --version </dev/null >&5\"") >&5
+ (eval $ac_compiler --version </dev/null >&5) 2>&5
+ ac_status=$?
+- echo "$as_me:1529: \$? = $ac_status" >&5
++ echo "$as_me:1531: \$? = $ac_status" >&5
+ (exit "$ac_status"); }
+-{ (eval echo "$as_me:1531: \"$ac_compiler -v </dev/null >&5\"") >&5
++{ (eval echo "$as_me:1533: \"$ac_compiler -v </dev/null >&5\"") >&5
+ (eval $ac_compiler -v </dev/null >&5) 2>&5
+ ac_status=$?
+- echo "$as_me:1534: \$? = $ac_status" >&5
++ echo "$as_me:1536: \$? = $ac_status" >&5
+ (exit "$ac_status"); }
+-{ (eval echo "$as_me:1536: \"$ac_compiler -V </dev/null >&5\"") >&5
++{ (eval echo "$as_me:1538: \"$ac_compiler -V </dev/null >&5\"") >&5
+ (eval $ac_compiler -V </dev/null >&5) 2>&5
+ ac_status=$?
+- echo "$as_me:1539: \$? = $ac_status" >&5
++ echo "$as_me:1541: \$? = $ac_status" >&5
+ (exit "$ac_status"); }
+
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 1543 "configure"
++#line 1545 "configure"
+ #include "confdefs.h"
+
+ int
+@@ -1556,13 +1558,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:1559: checking for C compiler default output" >&5
++echo "$as_me:1561: 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:1562: \"$ac_link_default\"") >&5
++if { (eval echo "$as_me:1564: \"$ac_link_default\"") >&5
+ (eval $ac_link_default) 2>&5
+ ac_status=$?
+- echo "$as_me:1565: \$? = $ac_status" >&5
++ echo "$as_me:1567: \$? = $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
+@@ -1585,34 +1587,34 @@
+ else
+ echo "$as_me: failed program was:" >&5
+ cat "conftest.$ac_ext" >&5
+-{ { echo "$as_me:1588: error: C compiler cannot create executables" >&5
++{ { echo "$as_me:1590: 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:1594: result: $ac_file" >&5
++echo "$as_me:1596: 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:1599: checking whether the C compiler works" >&5
++echo "$as_me:1601: 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:1605: \"$ac_try\"") >&5
++ { (eval echo "$as_me:1607: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:1608: \$? = $ac_status" >&5
++ echo "$as_me:1610: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cross_compiling=no
+ else
+ if test "$cross_compiling" = maybe; then
+ cross_compiling=yes
+ else
+- { { echo "$as_me:1615: error: cannot run C compiled programs.
++ { { echo "$as_me:1617: 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;}
+@@ -1620,24 +1622,24 @@
+ fi
+ fi
+ fi
+-echo "$as_me:1623: result: yes" >&5
++echo "$as_me:1625: 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:1630: checking whether we are cross compiling" >&5
++echo "$as_me:1632: checking whether we are cross compiling" >&5
+ echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6
+-echo "$as_me:1632: result: $cross_compiling" >&5
++echo "$as_me:1634: result: $cross_compiling" >&5
+ echo "${ECHO_T}$cross_compiling" >&6
+
+-echo "$as_me:1635: checking for executable suffix" >&5
++echo "$as_me:1637: checking for executable suffix" >&5
+ echo $ECHO_N "checking for executable suffix... $ECHO_C" >&6
+-if { (eval echo "$as_me:1637: \"$ac_link\"") >&5
++if { (eval echo "$as_me:1639: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:1640: \$? = $ac_status" >&5
++ echo "$as_me:1642: \$? = $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
+@@ -1653,25 +1655,25 @@
+ esac
+ done
+ else
+- { { echo "$as_me:1656: error: cannot compute EXEEXT: cannot compile and link" >&5
++ { { echo "$as_me:1658: 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:1662: result: $ac_cv_exeext" >&5
++echo "$as_me:1664: 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:1668: checking for object suffix" >&5
++echo "$as_me:1670: 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 1674 "configure"
++#line 1676 "configure"
+ #include "confdefs.h"
+
+ int
+@@ -1683,10 +1685,10 @@
+ }
+ _ACEOF
+ rm -f conftest.o conftest.obj
+-if { (eval echo "$as_me:1686: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:1688: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:1689: \$? = $ac_status" >&5
++ echo "$as_me:1691: \$? = $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
+@@ -1698,24 +1700,24 @@
+ else
+ echo "$as_me: failed program was:" >&5
+ cat "conftest.$ac_ext" >&5
+-{ { echo "$as_me:1701: error: cannot compute OBJEXT: cannot compile" >&5
++{ { echo "$as_me:1703: 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:1708: result: $ac_cv_objext" >&5
++echo "$as_me:1710: result: $ac_cv_objext" >&5
+ echo "${ECHO_T}$ac_cv_objext" >&6
+ OBJEXT=$ac_cv_objext
+ ac_objext=$OBJEXT
+-echo "$as_me:1712: checking whether we are using the GNU C compiler" >&5
++echo "$as_me:1714: 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 1718 "configure"
++#line 1720 "configure"
+ #include "confdefs.h"
+
+ int
+@@ -1730,16 +1732,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:1733: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:1735: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:1736: \$? = $ac_status" >&5
++ echo "$as_me:1738: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:1739: \"$ac_try\"") >&5
++ { (eval echo "$as_me:1741: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:1742: \$? = $ac_status" >&5
++ echo "$as_me:1744: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_compiler_gnu=yes
+ else
+@@ -1751,19 +1753,19 @@
+ ac_cv_c_compiler_gnu=$ac_compiler_gnu
+
+ fi
+-echo "$as_me:1754: result: $ac_cv_c_compiler_gnu" >&5
++echo "$as_me:1756: 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:1760: checking whether $CC accepts -g" >&5
++echo "$as_me:1762: 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 1766 "configure"
++#line 1768 "configure"
+ #include "confdefs.h"
+
+ int
+@@ -1775,16 +1777,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:1778: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:1780: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:1781: \$? = $ac_status" >&5
++ echo "$as_me:1783: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:1784: \"$ac_try\"") >&5
++ { (eval echo "$as_me:1786: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:1787: \$? = $ac_status" >&5
++ echo "$as_me:1789: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_prog_cc_g=yes
+ else
+@@ -1794,7 +1796,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:1797: result: $ac_cv_prog_cc_g" >&5
++echo "$as_me:1799: 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
+@@ -1821,16 +1823,16 @@
+ #endif
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:1824: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:1826: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:1827: \$? = $ac_status" >&5
++ echo "$as_me:1829: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:1830: \"$ac_try\"") >&5
++ { (eval echo "$as_me:1832: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:1833: \$? = $ac_status" >&5
++ echo "$as_me:1835: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ for ac_declaration in \
+ ''\
+@@ -1842,7 +1844,7 @@
+ 'void exit (int);'
+ do
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 1845 "configure"
++#line 1847 "configure"
+ #include "confdefs.h"
+ #include <stdlib.h>
+ $ac_declaration
+@@ -1855,16 +1857,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:1858: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:1860: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:1861: \$? = $ac_status" >&5
++ echo "$as_me:1863: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:1864: \"$ac_try\"") >&5
++ { (eval echo "$as_me:1866: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:1867: \$? = $ac_status" >&5
++ echo "$as_me:1869: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ :
+ else
+@@ -1874,7 +1876,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 1877 "configure"
++#line 1879 "configure"
+ #include "confdefs.h"
+ $ac_declaration
+ int
+@@ -1886,16 +1888,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:1889: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:1891: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:1892: \$? = $ac_status" >&5
++ echo "$as_me:1894: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:1895: \"$ac_try\"") >&5
++ { (eval echo "$as_me:1897: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:1898: \$? = $ac_status" >&5
++ echo "$as_me:1900: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ break
+ else
+@@ -1925,11 +1927,11 @@
+
+ GCC_VERSION=none
+ if test "$GCC" = yes ; then
+- echo "$as_me:1928: checking version of $CC" >&5
++ echo "$as_me:1930: 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:1932: result: $GCC_VERSION" >&5
++ echo "$as_me:1934: result: $GCC_VERSION" >&5
+ echo "${ECHO_T}$GCC_VERSION" >&6
+ fi
+
+@@ -1938,12 +1940,12 @@
+ if test "$GCC" = yes ; then
+ case "$host_os" in
+ (linux*|gnu*)
+- echo "$as_me:1941: checking if this is really Intel C compiler" >&5
++ echo "$as_me:1943: 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 1946 "configure"
++#line 1948 "configure"
+ #include "confdefs.h"
+
+ int
+@@ -1960,16 +1962,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:1963: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:1965: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:1966: \$? = $ac_status" >&5
++ echo "$as_me:1968: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:1969: \"$ac_try\"") >&5
++ { (eval echo "$as_me:1971: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:1972: \$? = $ac_status" >&5
++ echo "$as_me:1974: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ INTEL_COMPILER=yes
+ cf_save_CFLAGS="$cf_save_CFLAGS -we147"
+@@ -1980,7 +1982,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ CFLAGS="$cf_save_CFLAGS"
+- echo "$as_me:1983: result: $INTEL_COMPILER" >&5
++ echo "$as_me:1985: result: $INTEL_COMPILER" >&5
+ echo "${ECHO_T}$INTEL_COMPILER" >&6
+ ;;
+ esac
+@@ -1989,11 +1991,11 @@
+ CLANG_COMPILER=no
+
+ if test "$GCC" = yes ; then
+- echo "$as_me:1992: checking if this is really Clang C compiler" >&5
++ echo "$as_me:1994: 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 1996 "configure"
++#line 1998 "configure"
+ #include "confdefs.h"
+
+ int
+@@ -2010,16 +2012,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:2013: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:2015: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:2016: \$? = $ac_status" >&5
++ echo "$as_me:2018: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:2019: \"$ac_try\"") >&5
++ { (eval echo "$as_me:2021: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:2022: \$? = $ac_status" >&5
++ echo "$as_me:2024: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ CLANG_COMPILER=yes
+
+@@ -2029,7 +2031,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ CFLAGS="$cf_save_CFLAGS"
+- echo "$as_me:2032: result: $CLANG_COMPILER" >&5
++ echo "$as_me:2034: result: $CLANG_COMPILER" >&5
+ echo "${ECHO_T}$CLANG_COMPILER" >&6
+ fi
+
+@@ -2038,30 +2040,30 @@
+ if test "x$CLANG_COMPILER" = "xyes" ; then
+ case "$CC" in
+ (c[1-9][0-9]|*/c[1-9][0-9])
+- { echo "$as_me:2041: WARNING: replacing broken compiler alias $CC" >&5
++ { echo "$as_me:2043: 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:2048: checking version of $CC" >&5
++ echo "$as_me:2050: 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:2052: result: $CLANG_VERSION" >&5
++ echo "$as_me:2054: 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:2059: checking if option $cf_clang_opt works" >&5
++ echo "$as_me:2061: 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 2064 "configure"
++#line 2066 "configure"
+ #include "confdefs.h"
+
+ #include <stdio.h>
+@@ -2075,16 +2077,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:2078: \"$ac_link\"") >&5
++if { (eval echo "$as_me:2080: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:2081: \$? = $ac_status" >&5
++ echo "$as_me:2083: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:2084: \"$ac_try\"") >&5
++ { (eval echo "$as_me:2086: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:2087: \$? = $ac_status" >&5
++ echo "$as_me:2089: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+
+ cf_clang_optok=yes
+@@ -2095,13 +2097,13 @@
+ cf_clang_optok=no
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+- echo "$as_me:2098: result: $cf_clang_optok" >&5
++ echo "$as_me:2100: 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}:2104: testing adding option $cf_clang_opt ..." 1>&5
++echo "${as_me:-configure}:2106: testing adding option $cf_clang_opt ..." 1>&5
+
+ test -n "$CFLAGS" && CFLAGS="$CFLAGS "
+ CFLAGS="${CFLAGS}$cf_clang_opt"
+@@ -2110,7 +2112,7 @@
+ done
+ fi
+
+-echo "$as_me:2113: checking for $CC option to accept ANSI C" >&5
++echo "$as_me:2115: 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
+@@ -2118,7 +2120,7 @@
+ ac_cv_prog_cc_stdc=no
+ ac_save_CC=$CC
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 2121 "configure"
++#line 2123 "configure"
+ #include "confdefs.h"
+ #include <stdarg.h>
+ #include <stdio.h>
+@@ -2165,16 +2167,16 @@
+ do
+ CC="$ac_save_CC $ac_arg"
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:2168: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:2170: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:2171: \$? = $ac_status" >&5
++ echo "$as_me:2173: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:2174: \"$ac_try\"") >&5
++ { (eval echo "$as_me:2176: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:2177: \$? = $ac_status" >&5
++ echo "$as_me:2179: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_prog_cc_stdc=$ac_arg
+ break
+@@ -2191,10 +2193,10 @@
+
+ case "x$ac_cv_prog_cc_stdc" in
+ x|xno)
+- echo "$as_me:2194: result: none needed" >&5
++ echo "$as_me:2196: result: none needed" >&5
+ echo "${ECHO_T}none needed" >&6 ;;
+ *)
+- echo "$as_me:2197: result: $ac_cv_prog_cc_stdc" >&5
++ echo "$as_me:2199: result: $ac_cv_prog_cc_stdc" >&5
+ echo "${ECHO_T}$ac_cv_prog_cc_stdc" >&6
+ CC="$CC $ac_cv_prog_cc_stdc" ;;
+ esac
+@@ -2202,13 +2204,13 @@
+ # This should have been defined by AC_PROG_CC
+ : "${CC:=cc}"
+
+-echo "$as_me:2205: checking \$CFLAGS variable" >&5
++echo "$as_me:2207: checking \$CFLAGS variable" >&5
+ echo $ECHO_N "checking \$CFLAGS variable... $ECHO_C" >&6
+ case "x$CFLAGS" in
+ (*-[IUD]*)
+- echo "$as_me:2209: result: broken" >&5
++ echo "$as_me:2211: result: broken" >&5
+ echo "${ECHO_T}broken" >&6
+- { echo "$as_me:2211: WARNING: your environment uses the CFLAGS variable to hold CPPFLAGS options" >&5
++ { echo "$as_me:2213: 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=
+@@ -2316,18 +2318,18 @@
+ done
+ ;;
+ (*)
+- echo "$as_me:2319: result: ok" >&5
++ echo "$as_me:2321: result: ok" >&5
+ echo "${ECHO_T}ok" >&6
+ ;;
+ esac
+
+-echo "$as_me:2324: checking \$CC variable" >&5
++echo "$as_me:2326: checking \$CC variable" >&5
+ echo $ECHO_N "checking \$CC variable... $ECHO_C" >&6
+ case "$CC" in
+ (*[\ \ ]-*)
+- echo "$as_me:2328: result: broken" >&5
++ echo "$as_me:2330: result: broken" >&5
+ echo "${ECHO_T}broken" >&6
+- { echo "$as_me:2330: WARNING: your environment uses the CC variable to hold CFLAGS/CPPFLAGS options" >&5
++ { echo "$as_me:2332: 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/[ ]*[ ]-[^ ].*//'`
+@@ -2444,24 +2446,24 @@
+ done
+ test -n "$verbose" && echo " resulting CC: '$CC'" 1>&6
+
+-echo "${as_me:-configure}:2447: testing resulting CC: '$CC' ..." 1>&5
++echo "${as_me:-configure}:2449: testing resulting CC: '$CC' ..." 1>&5
+
+ test -n "$verbose" && echo " resulting CFLAGS: '$CFLAGS'" 1>&6
+
+-echo "${as_me:-configure}:2451: testing resulting CFLAGS: '$CFLAGS' ..." 1>&5
++echo "${as_me:-configure}:2453: testing resulting CFLAGS: '$CFLAGS' ..." 1>&5
+
+ test -n "$verbose" && echo " resulting CPPFLAGS: '$CPPFLAGS'" 1>&6
+
+-echo "${as_me:-configure}:2455: testing resulting CPPFLAGS: '$CPPFLAGS' ..." 1>&5
++echo "${as_me:-configure}:2457: testing resulting CPPFLAGS: '$CPPFLAGS' ..." 1>&5
+
+ ;;
+ (*)
+- echo "$as_me:2459: result: ok" >&5
++ echo "$as_me:2461: result: ok" >&5
+ echo "${ECHO_T}ok" >&6
+ ;;
+ esac
+
+-echo "$as_me:2464: checking for inline" >&5
++echo "$as_me:2466: 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
+@@ -2469,7 +2471,7 @@
+ ac_cv_c_inline=no
+ for ac_kw in inline __inline__ __inline; do
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 2472 "configure"
++#line 2474 "configure"
+ #include "confdefs.h"
+ #ifndef __cplusplus
+ static $ac_kw int static_foo (void) {return 0; }
+@@ -2478,16 +2480,16 @@
+
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:2481: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:2483: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:2484: \$? = $ac_status" >&5
++ echo "$as_me:2486: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:2487: \"$ac_try\"") >&5
++ { (eval echo "$as_me:2489: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:2490: \$? = $ac_status" >&5
++ echo "$as_me:2492: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_c_inline=$ac_kw; break
+ else
+@@ -2498,7 +2500,7 @@
+ done
+
+ fi
+-echo "$as_me:2501: result: $ac_cv_c_inline" >&5
++echo "$as_me:2503: result: $ac_cv_c_inline" >&5
+ echo "${ECHO_T}$ac_cv_c_inline" >&6
+ case $ac_cv_c_inline in
+ inline | yes) ;;
+@@ -2517,7 +2519,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:2520: checking for $ac_word" >&5
++echo "$as_me:2522: 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
+@@ -2532,7 +2534,7 @@
+ test -z "$ac_dir" && ac_dir=.
+ $as_executable_p "$ac_dir/$ac_word" || continue
+ ac_cv_prog_GREP="$ac_prog"
+-echo "$as_me:2535: found $ac_dir/$ac_word" >&5
++echo "$as_me:2537: found $ac_dir/$ac_word" >&5
+ break
+ done
+
+@@ -2540,10 +2542,10 @@
+ fi
+ GREP=$ac_cv_prog_GREP
+ if test -n "$GREP"; then
+- echo "$as_me:2543: result: $GREP" >&5
++ echo "$as_me:2545: result: $GREP" >&5
+ echo "${ECHO_T}$GREP" >&6
+ else
+- echo "$as_me:2546: result: no" >&5
++ echo "$as_me:2548: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+
+@@ -2551,7 +2553,7 @@
+ done
+ test -n "$GREP" || GREP=": "
+
+-echo "$as_me:2554: checking for egrep" >&5
++echo "$as_me:2556: 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
+@@ -2563,7 +2565,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:2566: checking for $ac_word" >&5
++echo "$as_me:2568: 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
+@@ -2580,7 +2582,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:2583: found $ac_dir/$ac_word" >&5
++ echo "$as_me:2585: found $ac_dir/$ac_word" >&5
+ break
+ fi
+ done
+@@ -2591,10 +2593,10 @@
+ EGREP=$ac_cv_path_EGREP
+
+ if test -n "$EGREP"; then
+- echo "$as_me:2594: result: $EGREP" >&5
++ echo "$as_me:2596: result: $EGREP" >&5
+ echo "${ECHO_T}$EGREP" >&6
+ else
+- echo "$as_me:2597: result: no" >&5
++ echo "$as_me:2599: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+
+@@ -2602,12 +2604,12 @@
+ done
+ test -n "$EGREP" || EGREP=": "
+
+- test "x$ac_cv_path_EGREP" = "x:" && { { echo "$as_me:2605: error: cannot find workable egrep" >&5
++ test "x$ac_cv_path_EGREP" = "x:" && { { echo "$as_me:2607: error: cannot find workable egrep" >&5
+ echo "$as_me: error: cannot find workable egrep" >&2;}
+ { (exit 1); exit 1; }; }
+ fi
+ fi
+-echo "$as_me:2610: result: $ac_cv_path_EGREP" >&5
++echo "$as_me:2612: result: $ac_cv_path_EGREP" >&5
+ echo "${ECHO_T}$ac_cv_path_EGREP" >&6
+ EGREP="$ac_cv_path_EGREP"
+
+@@ -2617,7 +2619,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:2620: checking how to run the C preprocessor" >&5
++echo "$as_me:2622: 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
+@@ -2638,18 +2640,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 2641 "configure"
++#line 2643 "configure"
+ #include "confdefs.h"
+ #include <assert.h>
+ Syntax error
+ _ACEOF
+-if { (eval echo "$as_me:2646: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:2648: \"$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:2652: \$? = $ac_status" >&5
++ echo "$as_me:2654: \$? = $ac_status" >&5
+ (exit "$ac_status"); } >/dev/null; then
+ if test -s conftest.err; then
+ ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -2672,17 +2674,17 @@
+ # OK, works on sane cases. Now check whether non-existent headers
+ # can be detected and how.
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 2675 "configure"
++#line 2677 "configure"
+ #include "confdefs.h"
+ #include <ac_nonexistent.h>
+ _ACEOF
+-if { (eval echo "$as_me:2679: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:2681: \"$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:2685: \$? = $ac_status" >&5
++ echo "$as_me:2687: \$? = $ac_status" >&5
+ (exit "$ac_status"); } >/dev/null; then
+ if test -s conftest.err; then
+ ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -2719,7 +2721,7 @@
+ else
+ ac_cv_prog_CPP=$CPP
+ fi
+-echo "$as_me:2722: result: $CPP" >&5
++echo "$as_me:2724: result: $CPP" >&5
+ echo "${ECHO_T}$CPP" >&6
+ ac_preproc_ok=false
+ for ac_c_preproc_warn_flag in '' yes
+@@ -2729,18 +2731,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 2732 "configure"
++#line 2734 "configure"
+ #include "confdefs.h"
+ #include <assert.h>
+ Syntax error
+ _ACEOF
+-if { (eval echo "$as_me:2737: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:2739: \"$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:2743: \$? = $ac_status" >&5
++ echo "$as_me:2745: \$? = $ac_status" >&5
+ (exit "$ac_status"); } >/dev/null; then
+ if test -s conftest.err; then
+ ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -2763,17 +2765,17 @@
+ # OK, works on sane cases. Now check whether non-existent headers
+ # can be detected and how.
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 2766 "configure"
++#line 2768 "configure"
+ #include "confdefs.h"
+ #include <ac_nonexistent.h>
+ _ACEOF
+-if { (eval echo "$as_me:2770: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:2772: \"$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:2776: \$? = $ac_status" >&5
++ echo "$as_me:2778: \$? = $ac_status" >&5
+ (exit "$ac_status"); } >/dev/null; then
+ if test -s conftest.err; then
+ ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -2801,7 +2803,7 @@
+ if $ac_preproc_ok; then
+ :
+ else
+- { { echo "$as_me:2804: error: C preprocessor \"$CPP\" fails sanity check" >&5
++ { { echo "$as_me:2806: error: C preprocessor \"$CPP\" fails sanity check" >&5
+ echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check" >&2;}
+ { (exit 1); exit 1; }; }
+ fi
+@@ -2817,7 +2819,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:2820: checking for $ac_word" >&5
++echo "$as_me:2822: 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
+@@ -2832,7 +2834,7 @@
+ test -z "$ac_dir" && ac_dir=.
+ $as_executable_p "$ac_dir/$ac_word" || continue
+ ac_cv_prog_AWK="$ac_prog"
+-echo "$as_me:2835: found $ac_dir/$ac_word" >&5
++echo "$as_me:2837: found $ac_dir/$ac_word" >&5
+ break
+ done
+
+@@ -2840,10 +2842,10 @@
+ fi
+ AWK=$ac_cv_prog_AWK
+ if test -n "$AWK"; then
+- echo "$as_me:2843: result: $AWK" >&5
++ echo "$as_me:2845: result: $AWK" >&5
+ echo "${ECHO_T}$AWK" >&6
+ else
+- echo "$as_me:2846: result: no" >&5
++ echo "$as_me:2848: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+
+@@ -2873,7 +2875,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:2876: checking for a BSD compatible install" >&5
++echo "$as_me:2878: 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
+@@ -2922,7 +2924,7 @@
+ INSTALL=$ac_install_sh
+ fi
+ fi
+-echo "$as_me:2925: result: $INSTALL" >&5
++echo "$as_me:2927: result: $INSTALL" >&5
+ echo "${ECHO_T}$INSTALL" >&6
+
+ # Use test -z because SunOS4 sh mishandles braces in ${var-val}.
+@@ -2943,7 +2945,7 @@
+ ;;
+ esac
+
+-echo "$as_me:2946: checking if you want to install stripped executables" >&5
++echo "$as_me:2948: 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.
+@@ -2960,7 +2962,7 @@
+ enable_stripping=yes
+
+ fi;
+-echo "$as_me:2963: result: $enable_stripping" >&5
++echo "$as_me:2965: result: $enable_stripping" >&5
+ echo "${ECHO_T}$enable_stripping" >&6
+
+ if test "$enable_stripping" = yes
+@@ -2971,7 +2973,7 @@
+ fi
+
+ : "${INSTALL:=install}"
+-echo "$as_me:2974: checking if install accepts -p option" >&5
++echo "$as_me:2976: 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
+@@ -3002,10 +3004,10 @@
+ rm -rf ./conftest*
+
+ fi
+-echo "$as_me:3005: result: $cf_cv_install_p" >&5
++echo "$as_me:3007: result: $cf_cv_install_p" >&5
+ echo "${ECHO_T}$cf_cv_install_p" >&6
+
+-echo "$as_me:3008: checking if install needs to be told about ownership" >&5
++echo "$as_me:3010: 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)
+@@ -3016,7 +3018,7 @@
+ ;;
+ esac
+
+-echo "$as_me:3019: result: $with_install_o" >&5
++echo "$as_me:3021: result: $with_install_o" >&5
+ echo "${ECHO_T}$with_install_o" >&6
+ if test "x$with_install_o" = xyes
+ then
+@@ -3027,7 +3029,7 @@
+
+ if test -n "$INSTALL_OPT_S"
+ then
+- echo "$as_me:3030: checking if you want to specify strip-program" >&5
++ echo "$as_me:3032: 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.
+@@ -3037,11 +3039,11 @@
+ else
+ with_strip_program=no
+ fi;
+- echo "$as_me:3040: result: $with_strip_program" >&5
++ echo "$as_me:3042: result: $with_strip_program" >&5
+ echo "${ECHO_T}$with_strip_program" >&6
+ if test "$with_strip_program" != no
+ then
+- echo "$as_me:3044: checking if strip-program is supported with this installer" >&5
++ echo "$as_me:3046: 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
+@@ -3062,11 +3064,11 @@
+ done
+ fi
+ fi
+- echo "$as_me:3065: result: $check_install_strip" >&5
++ echo "$as_me:3067: result: $check_install_strip" >&5
+ echo "${ECHO_T}$check_install_strip" >&6
+ case "$check_install_strip" in
+ (no)
+- { echo "$as_me:3069: WARNING: $cf_install_program does not support strip program option" >&5
++ { echo "$as_me:3071: 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
+ ;;
+@@ -3081,7 +3083,7 @@
+ chmod +x "$INSTALL"
+ test -n "$verbose" && echo " created $INSTALL" 1>&6
+
+-echo "${as_me:-configure}:3084: testing created $INSTALL ..." 1>&5
++echo "${as_me:-configure}:3086: testing created $INSTALL ..." 1>&5
+
+ ;;
+ (option)
+@@ -3095,7 +3097,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:3098: checking for $ac_word" >&5
++echo "$as_me:3100: 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
+@@ -3110,7 +3112,7 @@
+ test -z "$ac_dir" && ac_dir=.
+ $as_executable_p "$ac_dir/$ac_word" || continue
+ ac_cv_prog_LINT="$ac_prog"
+-echo "$as_me:3113: found $ac_dir/$ac_word" >&5
++echo "$as_me:3115: found $ac_dir/$ac_word" >&5
+ break
+ done
+
+@@ -3118,10 +3120,10 @@
+ fi
+ LINT=$ac_cv_prog_LINT
+ if test -n "$LINT"; then
+- echo "$as_me:3121: result: $LINT" >&5
++ echo "$as_me:3123: result: $LINT" >&5
+ echo "${ECHO_T}$LINT" >&6
+ else
+- echo "$as_me:3124: result: no" >&5
++ echo "$as_me:3126: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+
+@@ -3134,7 +3136,7 @@
+ ;;
+ esac
+
+-echo "$as_me:3137: checking for \".PHONY\" make-support" >&5
++echo "$as_me:3139: 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
+@@ -3189,14 +3191,14 @@
+ rm -rf conftest*
+
+ fi
+-echo "$as_me:3192: result: $cf_cv_make_PHONY" >&5
++echo "$as_me:3194: 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:3199: checking if filesystem supports mixed-case filenames" >&5
++echo "$as_me:3201: 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
+@@ -3223,7 +3225,7 @@
+ fi
+
+ fi
+-echo "$as_me:3226: result: $cf_cv_mixedcase" >&5
++echo "$as_me:3228: result: $cf_cv_mixedcase" >&5
+ echo "${ECHO_T}$cf_cv_mixedcase" >&6
+ test "$cf_cv_mixedcase" = yes &&
+ cat >>confdefs.h <<\EOF
+@@ -3234,7 +3236,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:3237: checking for $ac_word" >&5
++echo "$as_me:3239: 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
+@@ -3249,7 +3251,7 @@
+ test -z "$ac_dir" && ac_dir=.
+ $as_executable_p "$ac_dir/$ac_word" || continue
+ ac_cv_prog_CTAGS="$ac_prog"
+-echo "$as_me:3252: found $ac_dir/$ac_word" >&5
++echo "$as_me:3254: found $ac_dir/$ac_word" >&5
+ break
+ done
+
+@@ -3257,10 +3259,10 @@
+ fi
+ CTAGS=$ac_cv_prog_CTAGS
+ if test -n "$CTAGS"; then
+- echo "$as_me:3260: result: $CTAGS" >&5
++ echo "$as_me:3262: result: $CTAGS" >&5
+ echo "${ECHO_T}$CTAGS" >&6
+ else
+- echo "$as_me:3263: result: no" >&5
++ echo "$as_me:3265: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+
+@@ -3271,7 +3273,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:3274: checking for $ac_word" >&5
++echo "$as_me:3276: 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
+@@ -3286,7 +3288,7 @@
+ test -z "$ac_dir" && ac_dir=.
+ $as_executable_p "$ac_dir/$ac_word" || continue
+ ac_cv_prog_ETAGS="$ac_prog"
+-echo "$as_me:3289: found $ac_dir/$ac_word" >&5
++echo "$as_me:3291: found $ac_dir/$ac_word" >&5
+ break
+ done
+
+@@ -3294,10 +3296,10 @@
+ fi
+ ETAGS=$ac_cv_prog_ETAGS
+ if test -n "$ETAGS"; then
+- echo "$as_me:3297: result: $ETAGS" >&5
++ echo "$as_me:3299: result: $ETAGS" >&5
+ echo "${ECHO_T}$ETAGS" >&6
+ else
+- echo "$as_me:3300: result: no" >&5
++ echo "$as_me:3302: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+
+@@ -3306,7 +3308,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:3309: checking for $ac_word" >&5
++echo "$as_me:3311: 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
+@@ -3321,7 +3323,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:3324: found $ac_dir/$ac_word" >&5
++echo "$as_me:3326: found $ac_dir/$ac_word" >&5
+ break
+ done
+
+@@ -3330,17 +3332,17 @@
+ fi
+ MAKE_LOWER_TAGS=$ac_cv_prog_MAKE_LOWER_TAGS
+ if test -n "$MAKE_LOWER_TAGS"; then
+- echo "$as_me:3333: result: $MAKE_LOWER_TAGS" >&5
++ echo "$as_me:3335: result: $MAKE_LOWER_TAGS" >&5
+ echo "${ECHO_T}$MAKE_LOWER_TAGS" >&6
+ else
+- echo "$as_me:3336: result: no" >&5
++ echo "$as_me:3338: 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:3343: checking for $ac_word" >&5
++echo "$as_me:3345: 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
+@@ -3355,7 +3357,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:3358: found $ac_dir/$ac_word" >&5
++echo "$as_me:3360: found $ac_dir/$ac_word" >&5
+ break
+ done
+
+@@ -3364,10 +3366,10 @@
+ fi
+ MAKE_UPPER_TAGS=$ac_cv_prog_MAKE_UPPER_TAGS
+ if test -n "$MAKE_UPPER_TAGS"; then
+- echo "$as_me:3367: result: $MAKE_UPPER_TAGS" >&5
++ echo "$as_me:3369: result: $MAKE_UPPER_TAGS" >&5
+ echo "${ECHO_T}$MAKE_UPPER_TAGS" >&6
+ else
+- echo "$as_me:3370: result: no" >&5
++ echo "$as_me:3372: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+
+@@ -3387,14 +3389,14 @@
+ MAKE_LOWER_TAGS="#"
+ fi
+
+-echo "$as_me:3390: checking if -lm needed for math functions" >&5
++echo "$as_me:3392: 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 3397 "configure"
++#line 3399 "configure"
+ #include "confdefs.h"
+
+ #include <stdio.h>
+@@ -3410,16 +3412,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:3413: \"$ac_link\"") >&5
++if { (eval echo "$as_me:3415: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:3416: \$? = $ac_status" >&5
++ echo "$as_me:3418: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:3419: \"$ac_try\"") >&5
++ { (eval echo "$as_me:3421: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:3422: \$? = $ac_status" >&5
++ echo "$as_me:3424: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_need_libm=no
+ else
+@@ -3429,7 +3431,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:3432: result: $cf_cv_need_libm" >&5
++echo "$as_me:3434: result: $cf_cv_need_libm" >&5
+ echo "${ECHO_T}$cf_cv_need_libm" >&6
+
+ if test "$cf_cv_need_libm" = yes
+@@ -3437,14 +3439,14 @@
+
+ cf_save_LIBS="$LIBS"
+ LIBS="$LIBS -lm"
+- echo "$as_me:3440: checking if -lm is available for math functions" >&5
++ echo "$as_me:3442: 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 3447 "configure"
++#line 3449 "configure"
+ #include "confdefs.h"
+
+ #include <stdio.h>
+@@ -3460,16 +3462,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:3463: \"$ac_link\"") >&5
++if { (eval echo "$as_me:3465: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:3466: \$? = $ac_status" >&5
++ echo "$as_me:3468: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:3469: \"$ac_try\"") >&5
++ { (eval echo "$as_me:3471: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:3472: \$? = $ac_status" >&5
++ echo "$as_me:3474: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_have_libm=yes
+ else
+@@ -3479,7 +3481,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:3482: result: $cf_cv_have_libm" >&5
++echo "$as_me:3484: result: $cf_cv_have_libm" >&5
+ echo "${ECHO_T}$cf_cv_have_libm" >&6
+ LIBS="$cf_save_LIBS"
+
+@@ -3534,7 +3536,7 @@
+ cf_cv_screen=curses
+ cf_cv_libtype=
+
+-echo "$as_me:3537: checking for fgrep" >&5
++echo "$as_me:3539: 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
+@@ -3546,7 +3548,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:3549: checking for $ac_word" >&5
++echo "$as_me:3551: 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
+@@ -3563,7 +3565,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:3566: found $ac_dir/$ac_word" >&5
++ echo "$as_me:3568: found $ac_dir/$ac_word" >&5
+ break
+ fi
+ done
+@@ -3574,10 +3576,10 @@
+ FGREP=$ac_cv_path_FGREP
+
+ if test -n "$FGREP"; then
+- echo "$as_me:3577: result: $FGREP" >&5
++ echo "$as_me:3579: result: $FGREP" >&5
+ echo "${ECHO_T}$FGREP" >&6
+ else
+- echo "$as_me:3580: result: no" >&5
++ echo "$as_me:3582: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+
+@@ -3585,16 +3587,16 @@
+ done
+ test -n "$FGREP" || FGREP=": "
+
+- test "x$ac_cv_path_FGREP" = "x:" && { { echo "$as_me:3588: error: cannot find workable fgrep" >&5
++ test "x$ac_cv_path_FGREP" = "x:" && { { echo "$as_me:3590: error: cannot find workable fgrep" >&5
+ echo "$as_me: error: cannot find workable fgrep" >&2;}
+ { (exit 1); exit 1; }; }
+ fi
+ fi
+-echo "$as_me:3593: result: $ac_cv_path_FGREP" >&5
++echo "$as_me:3595: result: $ac_cv_path_FGREP" >&5
+ echo "${ECHO_T}$ac_cv_path_FGREP" >&6
+ FGREP="$ac_cv_path_FGREP"
+
+-echo "$as_me:3597: checking if you want to use C11 _Noreturn feature" >&5
++echo "$as_me:3599: 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.
+@@ -3611,17 +3613,17 @@
+ enable_stdnoreturn=no
+
+ fi;
+-echo "$as_me:3614: result: $enable_stdnoreturn" >&5
++echo "$as_me:3616: result: $enable_stdnoreturn" >&5
+ echo "${ECHO_T}$enable_stdnoreturn" >&6
+
+ if test $enable_stdnoreturn = yes; then
+-echo "$as_me:3618: checking for C11 _Noreturn feature" >&5
++echo "$as_me:3620: 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 3624 "configure"
++#line 3626 "configure"
+ #include "confdefs.h"
+
+ $ac_includes_default
+@@ -3637,16 +3639,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:3640: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:3642: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:3643: \$? = $ac_status" >&5
++ echo "$as_me:3645: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:3646: \"$ac_try\"") >&5
++ { (eval echo "$as_me:3648: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:3649: \$? = $ac_status" >&5
++ echo "$as_me:3651: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_c11_noreturn=yes
+ else
+@@ -3657,7 +3659,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+
+ fi
+-echo "$as_me:3660: result: $cf_cv_c11_noreturn" >&5
++echo "$as_me:3662: result: $cf_cv_c11_noreturn" >&5
+ echo "${ECHO_T}$cf_cv_c11_noreturn" >&6
+ else
+ cf_cv_c11_noreturn=no,
+@@ -3696,10 +3698,10 @@
+ EOF
+ if test "$GCC" = yes
+ then
+- { echo "$as_me:3699: checking for $CC __attribute__ directives..." >&5
++ { echo "$as_me:3701: checking for $CC __attribute__ directives..." >&5
+ echo "$as_me: checking for $CC __attribute__ directives..." >&6;}
+ cat > "conftest.$ac_ext" <<EOF
+-#line 3702 "${as_me:-configure}"
++#line 3704 "${as_me:-configure}"
+ #include <stdio.h>
+ #include "confdefs.h"
+ #include "conftest.h"
+@@ -3749,12 +3751,12 @@
+ ;;
+ esac
+
+- if { (eval echo "$as_me:3752: \"$ac_compile\"") >&5
++ if { (eval echo "$as_me:3754: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:3755: \$? = $ac_status" >&5
++ echo "$as_me:3757: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; then
+- test -n "$verbose" && echo "$as_me:3757: result: ... $cf_attribute" >&5
++ test -n "$verbose" && echo "$as_me:3759: result: ... $cf_attribute" >&5
+ echo "${ECHO_T}... $cf_attribute" >&6
+ cat conftest.h >>confdefs.h
+ case "$cf_attribute" in
+@@ -3813,7 +3815,7 @@
+ rm -rf ./conftest*
+ fi
+
+-echo "$as_me:3816: checking if you want to work around bogus compiler/loader warnings" >&5
++echo "$as_me:3818: 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.
+@@ -3823,7 +3825,7 @@
+ else
+ enable_string_hacks=no
+ fi;
+-echo "$as_me:3826: result: $enable_string_hacks" >&5
++echo "$as_me:3828: result: $enable_string_hacks" >&5
+ echo "${ECHO_T}$enable_string_hacks" >&6
+
+ if test "x$enable_string_hacks" = "xyes"; then
+@@ -3832,15 +3834,15 @@
+ #define USE_STRING_HACKS 1
+ EOF
+
+- { echo "$as_me:3835: WARNING: enabling string-hacks to work around bogus compiler/loader warnings" >&5
++ { echo "$as_me:3837: 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:3837: checking for strlcat" >&5
++ echo "$as_me:3839: 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 3843 "configure"
++#line 3845 "configure"
+ #include "confdefs.h"
+ #define strlcat autoconf_temporary
+ #include <limits.h> /* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -3871,16 +3873,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:3874: \"$ac_link\"") >&5
++if { (eval echo "$as_me:3876: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:3877: \$? = $ac_status" >&5
++ echo "$as_me:3879: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:3880: \"$ac_try\"") >&5
++ { (eval echo "$as_me:3882: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:3883: \$? = $ac_status" >&5
++ echo "$as_me:3885: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_func_strlcat=yes
+ else
+@@ -3890,7 +3892,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:3893: result: $ac_cv_func_strlcat" >&5
++echo "$as_me:3895: result: $ac_cv_func_strlcat" >&5
+ echo "${ECHO_T}$ac_cv_func_strlcat" >&6
+ if test "$ac_cv_func_strlcat" = yes; then
+
+@@ -3900,7 +3902,7 @@
+
+ else
+
+- echo "$as_me:3903: checking for strlcat in -lbsd" >&5
++ echo "$as_me:3905: 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
+@@ -3908,7 +3910,7 @@
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lbsd $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 3911 "configure"
++#line 3913 "configure"
+ #include "confdefs.h"
+
+ /* Override any gcc2 internal prototype to avoid an error. */
+@@ -3927,16 +3929,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:3930: \"$ac_link\"") >&5
++if { (eval echo "$as_me:3932: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:3933: \$? = $ac_status" >&5
++ echo "$as_me:3935: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:3936: \"$ac_try\"") >&5
++ { (eval echo "$as_me:3938: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:3939: \$? = $ac_status" >&5
++ echo "$as_me:3941: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_lib_bsd_strlcat=yes
+ else
+@@ -3947,7 +3949,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:3950: result: $ac_cv_lib_bsd_strlcat" >&5
++echo "$as_me:3952: 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
+
+@@ -3970,23 +3972,23 @@
+ for ac_header in bsd/string.h
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-echo "$as_me:3973: checking for $ac_header" >&5
++echo "$as_me:3975: 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 3979 "configure"
++#line 3981 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:3983: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:3985: \"$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:3989: \$? = $ac_status" >&5
++ echo "$as_me:3991: \$? = $ac_status" >&5
+ (exit "$ac_status"); } >/dev/null; then
+ if test -s conftest.err; then
+ ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -4005,7 +4007,7 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:4008: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
++echo "$as_me:4010: 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
+@@ -4026,13 +4028,13 @@
+ for ac_func in strlcpy snprintf
+ do
+ as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+-echo "$as_me:4029: checking for $ac_func" >&5
++echo "$as_me:4031: 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 4035 "configure"
++#line 4037 "configure"
+ #include "confdefs.h"
+ #define $ac_func autoconf_temporary
+ #include <limits.h> /* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -4063,16 +4065,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:4066: \"$ac_link\"") >&5
++if { (eval echo "$as_me:4068: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:4069: \$? = $ac_status" >&5
++ echo "$as_me:4071: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:4072: \"$ac_try\"") >&5
++ { (eval echo "$as_me:4074: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:4075: \$? = $ac_status" >&5
++ echo "$as_me:4077: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ eval "$as_ac_var=yes"
+ else
+@@ -4082,7 +4084,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:4085: result: `eval echo '${'"$as_ac_var"'}'`" >&5
++echo "$as_me:4087: 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
+@@ -4094,14 +4096,14 @@
+
+ fi
+
+-echo "$as_me:4097: checking if the POSIX test-macros are already defined" >&5
++echo "$as_me:4099: 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 4104 "configure"
++#line 4106 "configure"
+ #include "confdefs.h"
+ #include <stdio.h>
+ int
+@@ -4120,16 +4122,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:4123: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:4125: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:4126: \$? = $ac_status" >&5
++ echo "$as_me:4128: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:4129: \"$ac_try\"") >&5
++ { (eval echo "$as_me:4131: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:4132: \$? = $ac_status" >&5
++ echo "$as_me:4134: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_posix_visible=no
+ else
+@@ -4140,7 +4142,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+
+ fi
+-echo "$as_me:4143: result: $cf_cv_posix_visible" >&5
++echo "$as_me:4145: result: $cf_cv_posix_visible" >&5
+ echo "${ECHO_T}$cf_cv_posix_visible" >&6
+
+ if test "$cf_cv_posix_visible" = no; then
+@@ -4182,14 +4184,14 @@
+
+ cf_gnu_xopen_source=$cf_XOPEN_SOURCE
+
+-echo "$as_me:4185: checking if this is the GNU C library" >&5
++echo "$as_me:4187: 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 4192 "configure"
++#line 4194 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ int
+@@ -4208,16 +4210,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:4211: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:4213: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:4214: \$? = $ac_status" >&5
++ echo "$as_me:4216: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:4217: \"$ac_try\"") >&5
++ { (eval echo "$as_me:4219: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:4220: \$? = $ac_status" >&5
++ echo "$as_me:4222: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_gnu_library=yes
+ else
+@@ -4228,7 +4230,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+
+ fi
+-echo "$as_me:4231: result: $cf_cv_gnu_library" >&5
++echo "$as_me:4233: result: $cf_cv_gnu_library" >&5
+ echo "${ECHO_T}$cf_cv_gnu_library" >&6
+
+ if test x$cf_cv_gnu_library = xyes; then
+@@ -4236,7 +4238,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:4239: checking if _DEFAULT_SOURCE can be used as a basis" >&5
++ echo "$as_me:4241: 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
+@@ -4248,7 +4250,7 @@
+ CPPFLAGS="${CPPFLAGS}-D_DEFAULT_SOURCE"
+
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 4251 "configure"
++#line 4253 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ int
+@@ -4267,16 +4269,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:4270: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:4272: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:4273: \$? = $ac_status" >&5
++ echo "$as_me:4275: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:4276: \"$ac_try\"") >&5
++ { (eval echo "$as_me:4278: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:4279: \$? = $ac_status" >&5
++ echo "$as_me:4281: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_gnu_library_219=yes
+ else
+@@ -4288,12 +4290,12 @@
+ CPPFLAGS="$cf_save"
+
+ fi
+-echo "$as_me:4291: result: $cf_cv_gnu_library_219" >&5
++echo "$as_me:4293: 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:4296: checking if _XOPEN_SOURCE=$cf_gnu_xopen_source works with _DEFAULT_SOURCE" >&5
++ echo "$as_me:4298: 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
+@@ -4398,7 +4400,7 @@
+ fi
+
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 4401 "configure"
++#line 4403 "configure"
+ #include "confdefs.h"
+
+ #include <limits.h>
+@@ -4418,16 +4420,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:4421: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:4423: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:4424: \$? = $ac_status" >&5
++ echo "$as_me:4426: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:4427: \"$ac_try\"") >&5
++ { (eval echo "$as_me:4429: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:4430: \$? = $ac_status" >&5
++ echo "$as_me:4432: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_gnu_dftsrc_219=yes
+ else
+@@ -4438,7 +4440,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+
+ fi
+-echo "$as_me:4441: result: $cf_cv_gnu_dftsrc_219" >&5
++echo "$as_me:4443: 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
+@@ -4447,14 +4449,14 @@
+
+ if test "x$cf_cv_gnu_dftsrc_219" != xyes; then
+
+- echo "$as_me:4450: checking if we must define _GNU_SOURCE" >&5
++ echo "$as_me:4452: 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 4457 "configure"
++#line 4459 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ int
+@@ -4469,16 +4471,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:4472: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:4474: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:4475: \$? = $ac_status" >&5
++ echo "$as_me:4477: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:4478: \"$ac_try\"") >&5
++ { (eval echo "$as_me:4480: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:4481: \$? = $ac_status" >&5
++ echo "$as_me:4483: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_gnu_source=no
+ else
+@@ -4585,7 +4587,7 @@
+ fi
+
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 4588 "configure"
++#line 4590 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ int
+@@ -4600,16 +4602,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:4603: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:4605: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:4606: \$? = $ac_status" >&5
++ echo "$as_me:4608: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:4609: \"$ac_try\"") >&5
++ { (eval echo "$as_me:4611: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:4612: \$? = $ac_status" >&5
++ echo "$as_me:4614: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_gnu_source=no
+ else
+@@ -4624,12 +4626,12 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+
+ fi
+-echo "$as_me:4627: result: $cf_cv_gnu_source" >&5
++echo "$as_me:4629: 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:4632: checking if we should also define _DEFAULT_SOURCE" >&5
++ echo "$as_me:4634: 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
+@@ -4639,7 +4641,7 @@
+ CPPFLAGS="${CPPFLAGS}-D_GNU_SOURCE"
+
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 4642 "configure"
++#line 4644 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ int
+@@ -4654,16 +4656,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:4657: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:4659: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:4660: \$? = $ac_status" >&5
++ echo "$as_me:4662: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:4663: \"$ac_try\"") >&5
++ { (eval echo "$as_me:4665: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:4666: \$? = $ac_status" >&5
++ echo "$as_me:4668: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_default_source=no
+ else
+@@ -4674,7 +4676,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+
+ fi
+-echo "$as_me:4677: result: $cf_cv_default_source" >&5
++echo "$as_me:4679: result: $cf_cv_default_source" >&5
+ echo "${ECHO_T}$cf_cv_default_source" >&6
+ if test "$cf_cv_default_source" = yes
+ then
+@@ -4711,16 +4713,16 @@
+ sed -e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ ]*\)\?[ ]/ /g' \
+ -e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ ]*\)\?$//g'`
+
+-echo "$as_me:4714: checking if we should define _POSIX_C_SOURCE" >&5
++echo "$as_me:4716: 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}:4720: testing if the symbol is already defined go no further ..." 1>&5
++echo "${as_me:-configure}:4722: testing if the symbol is already defined go no further ..." 1>&5
+
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 4723 "configure"
++#line 4725 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ int
+@@ -4735,16 +4737,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:4738: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:4740: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:4741: \$? = $ac_status" >&5
++ echo "$as_me:4743: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:4744: \"$ac_try\"") >&5
++ { (eval echo "$as_me:4746: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:4747: \$? = $ac_status" >&5
++ echo "$as_me:4749: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_posix_c_source=no
+ else
+@@ -4765,7 +4767,7 @@
+ esac
+ if test "$cf_want_posix_source" = yes ; then
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 4768 "configure"
++#line 4770 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ int
+@@ -4780,16 +4782,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:4783: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:4785: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:4786: \$? = $ac_status" >&5
++ echo "$as_me:4788: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:4789: \"$ac_try\"") >&5
++ { (eval echo "$as_me:4791: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:4792: \$? = $ac_status" >&5
++ echo "$as_me:4794: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ :
+ else
+@@ -4800,7 +4802,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+
+-echo "${as_me:-configure}:4803: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
++echo "${as_me:-configure}:4805: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
+
+ CFLAGS="$cf_trim_CFLAGS"
+ CPPFLAGS="$cf_trim_CPPFLAGS"
+@@ -4808,10 +4810,10 @@
+ test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
+ CPPFLAGS="${CPPFLAGS}$cf_cv_posix_c_source"
+
+-echo "${as_me:-configure}:4811: testing if the second compile does not leave our definition intact error ..." 1>&5
++echo "${as_me:-configure}:4813: testing if the second compile does not leave our definition intact error ..." 1>&5
+
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 4814 "configure"
++#line 4816 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ int
+@@ -4826,16 +4828,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:4829: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:4831: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:4832: \$? = $ac_status" >&5
++ echo "$as_me:4834: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:4835: \"$ac_try\"") >&5
++ { (eval echo "$as_me:4837: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:4838: \$? = $ac_status" >&5
++ echo "$as_me:4840: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ :
+ else
+@@ -4851,7 +4853,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+
+ fi
+-echo "$as_me:4854: result: $cf_cv_posix_c_source" >&5
++echo "$as_me:4856: 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
+@@ -4968,7 +4970,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:4971: WARNING: this system does not provide usable locale support" >&5
++ { echo "$as_me:4973: 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
+@@ -5000,14 +5002,14 @@
+ ;;
+ (*)
+
+-echo "$as_me:5003: checking if we should define _XOPEN_SOURCE" >&5
++echo "$as_me:5005: 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 5010 "configure"
++#line 5012 "configure"
+ #include "confdefs.h"
+
+ $ac_includes_default
+@@ -5025,16 +5027,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:5028: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:5030: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:5031: \$? = $ac_status" >&5
++ echo "$as_me:5033: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:5034: \"$ac_try\"") >&5
++ { (eval echo "$as_me:5036: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:5037: \$? = $ac_status" >&5
++ echo "$as_me:5039: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_xopen_source=no
+ else
+@@ -5046,7 +5048,7 @@
+ CPPFLAGS="${CPPFLAGS}-D_XOPEN_SOURCE=$cf_XOPEN_SOURCE"
+
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 5049 "configure"
++#line 5051 "configure"
+ #include "confdefs.h"
+
+ $ac_includes_default
+@@ -5064,16 +5066,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:5067: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:5069: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:5070: \$? = $ac_status" >&5
++ echo "$as_me:5072: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:5073: \"$ac_try\"") >&5
++ { (eval echo "$as_me:5075: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:5076: \$? = $ac_status" >&5
++ echo "$as_me:5078: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_xopen_source=no
+ else
+@@ -5088,7 +5090,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+
+ fi
+-echo "$as_me:5091: result: $cf_cv_xopen_source" >&5
++echo "$as_me:5093: result: $cf_cv_xopen_source" >&5
+ echo "${ECHO_T}$cf_cv_xopen_source" >&6
+
+ if test "$cf_cv_xopen_source" != no ; then
+@@ -5248,16 +5250,16 @@
+ sed -e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ ]*\)\?[ ]/ /g' \
+ -e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ ]*\)\?$//g'`
+
+-echo "$as_me:5251: checking if we should define _POSIX_C_SOURCE" >&5
++echo "$as_me:5253: 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}:5257: testing if the symbol is already defined go no further ..." 1>&5
++echo "${as_me:-configure}:5259: testing if the symbol is already defined go no further ..." 1>&5
+
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 5260 "configure"
++#line 5262 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ int
+@@ -5272,16 +5274,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:5275: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:5277: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:5278: \$? = $ac_status" >&5
++ echo "$as_me:5280: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:5281: \"$ac_try\"") >&5
++ { (eval echo "$as_me:5283: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:5284: \$? = $ac_status" >&5
++ echo "$as_me:5286: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_posix_c_source=no
+ else
+@@ -5302,7 +5304,7 @@
+ esac
+ if test "$cf_want_posix_source" = yes ; then
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 5305 "configure"
++#line 5307 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ int
+@@ -5317,16 +5319,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:5320: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:5322: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:5323: \$? = $ac_status" >&5
++ echo "$as_me:5325: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:5326: \"$ac_try\"") >&5
++ { (eval echo "$as_me:5328: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:5329: \$? = $ac_status" >&5
++ echo "$as_me:5331: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ :
+ else
+@@ -5337,7 +5339,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+
+-echo "${as_me:-configure}:5340: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
++echo "${as_me:-configure}:5342: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
+
+ CFLAGS="$cf_trim_CFLAGS"
+ CPPFLAGS="$cf_trim_CPPFLAGS"
+@@ -5345,10 +5347,10 @@
+ test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
+ CPPFLAGS="${CPPFLAGS}$cf_cv_posix_c_source"
+
+-echo "${as_me:-configure}:5348: testing if the second compile does not leave our definition intact error ..." 1>&5
++echo "${as_me:-configure}:5350: testing if the second compile does not leave our definition intact error ..." 1>&5
+
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 5351 "configure"
++#line 5353 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ int
+@@ -5363,16 +5365,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:5366: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:5368: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:5369: \$? = $ac_status" >&5
++ echo "$as_me:5371: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:5372: \"$ac_try\"") >&5
++ { (eval echo "$as_me:5374: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:5375: \$? = $ac_status" >&5
++ echo "$as_me:5377: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ :
+ else
+@@ -5388,7 +5390,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+
+ fi
+-echo "$as_me:5391: result: $cf_cv_posix_c_source" >&5
++echo "$as_me:5393: 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
+@@ -5501,10 +5503,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}:5504: testing checking if _POSIX_C_SOURCE interferes with _XOPEN_SOURCE ..." 1>&5
++echo "${as_me:-configure}:5506: testing checking if _POSIX_C_SOURCE interferes with _XOPEN_SOURCE ..." 1>&5
+
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 5507 "configure"
++#line 5509 "configure"
+ #include "confdefs.h"
+
+ $ac_includes_default
+@@ -5522,23 +5524,23 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:5525: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:5527: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:5528: \$? = $ac_status" >&5
++ echo "$as_me:5530: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:5531: \"$ac_try\"") >&5
++ { (eval echo "$as_me:5533: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:5534: \$? = $ac_status" >&5
++ echo "$as_me:5536: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ :
+ else
+ echo "$as_me: failed program was:" >&5
+ cat "conftest.$ac_ext" >&5
+
+- { echo "$as_me:5541: WARNING: _POSIX_C_SOURCE definition is not usable" >&5
++ { echo "$as_me:5543: 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
+@@ -5561,7 +5563,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}:5564: testing removing old option $cf_add_cflags from CFLAGS ..." 1>&5
++echo "${as_me:-configure}:5566: testing removing old option $cf_add_cflags from CFLAGS ..." 1>&5
+
+ CFLAGS="$cf_old_cflag"
+ done
+@@ -5573,7 +5575,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}:5576: testing removing old option $cf_add_cflags from CPPFLAGS ..." 1>&5
++echo "${as_me:-configure}:5578: testing removing old option $cf_add_cflags from CPPFLAGS ..." 1>&5
+
+ CPPFLAGS="$cf_old_cflag"
+ done
+@@ -5661,7 +5663,7 @@
+ if test -n "$cf_new_cflags" ; then
+ test -n "$verbose" && echo " add to \$CFLAGS $cf_new_cflags" 1>&6
+
+-echo "${as_me:-configure}:5664: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
++echo "${as_me:-configure}:5666: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
+
+ test -n "$CFLAGS" && CFLAGS="$CFLAGS "
+ CFLAGS="${CFLAGS}$cf_new_cflags"
+@@ -5671,7 +5673,7 @@
+ if test -n "$cf_new_cppflags" ; then
+ test -n "$verbose" && echo " add to \$CPPFLAGS $cf_new_cppflags" 1>&6
+
+-echo "${as_me:-configure}:5674: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
++echo "${as_me:-configure}:5676: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
+
+ test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
+ CPPFLAGS="${CPPFLAGS}$cf_new_cppflags"
+@@ -5681,7 +5683,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}:5684: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5
++echo "${as_me:-configure}:5686: 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"
+@@ -5693,10 +5695,10 @@
+ fi
+
+ if test -n "$cf_XOPEN_SOURCE" && test -z "$cf_cv_xopen_source" ; then
+- echo "$as_me:5696: checking if _XOPEN_SOURCE really is set" >&5
++ echo "$as_me:5698: 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 5699 "configure"
++#line 5701 "configure"
+ #include "confdefs.h"
+ #include <stdlib.h>
+ int
+@@ -5711,16 +5713,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:5714: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:5716: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:5717: \$? = $ac_status" >&5
++ echo "$as_me:5719: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:5720: \"$ac_try\"") >&5
++ { (eval echo "$as_me:5722: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:5723: \$? = $ac_status" >&5
++ echo "$as_me:5725: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_XOPEN_SOURCE_set=yes
+ else
+@@ -5729,12 +5731,12 @@
+ cf_XOPEN_SOURCE_set=no
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+- echo "$as_me:5732: result: $cf_XOPEN_SOURCE_set" >&5
++ echo "$as_me:5734: 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 5737 "configure"
++#line 5739 "configure"
+ #include "confdefs.h"
+ #include <stdlib.h>
+ int
+@@ -5749,16 +5751,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:5752: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:5754: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:5755: \$? = $ac_status" >&5
++ echo "$as_me:5757: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:5758: \"$ac_try\"") >&5
++ { (eval echo "$as_me:5760: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:5761: \$? = $ac_status" >&5
++ echo "$as_me:5763: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_XOPEN_SOURCE_set_ok=yes
+ else
+@@ -5769,19 +5771,19 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ if test "$cf_XOPEN_SOURCE_set_ok" = no
+ then
+- { echo "$as_me:5772: WARNING: _XOPEN_SOURCE is lower than requested" >&5
++ { echo "$as_me:5774: WARNING: _XOPEN_SOURCE is lower than requested" >&5
+ echo "$as_me: WARNING: _XOPEN_SOURCE is lower than requested" >&2;}
+ fi
+ else
+
+-echo "$as_me:5777: checking if we should define _XOPEN_SOURCE" >&5
++echo "$as_me:5779: 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 5784 "configure"
++#line 5786 "configure"
+ #include "confdefs.h"
+
+ $ac_includes_default
+@@ -5799,16 +5801,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:5802: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:5804: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:5805: \$? = $ac_status" >&5
++ echo "$as_me:5807: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:5808: \"$ac_try\"") >&5
++ { (eval echo "$as_me:5810: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:5811: \$? = $ac_status" >&5
++ echo "$as_me:5813: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_xopen_source=no
+ else
+@@ -5820,7 +5822,7 @@
+ CPPFLAGS="${CPPFLAGS}-D_XOPEN_SOURCE=$cf_XOPEN_SOURCE"
+
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 5823 "configure"
++#line 5825 "configure"
+ #include "confdefs.h"
+
+ $ac_includes_default
+@@ -5838,16 +5840,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:5841: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:5843: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:5844: \$? = $ac_status" >&5
++ echo "$as_me:5846: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:5847: \"$ac_try\"") >&5
++ { (eval echo "$as_me:5849: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:5850: \$? = $ac_status" >&5
++ echo "$as_me:5852: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_xopen_source=no
+ else
+@@ -5862,7 +5864,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+
+ fi
+-echo "$as_me:5865: result: $cf_cv_xopen_source" >&5
++echo "$as_me:5867: result: $cf_cv_xopen_source" >&5
+ echo "${ECHO_T}$cf_cv_xopen_source" >&6
+
+ if test "$cf_cv_xopen_source" != no ; then
+@@ -6009,13 +6011,13 @@
+ fi
+ fi # cf_cv_posix_visible
+
+-echo "$as_me:6012: checking for ANSI C header files" >&5
++echo "$as_me:6014: 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 6018 "configure"
++#line 6020 "configure"
+ #include "confdefs.h"
+ #include <stdlib.h>
+ #include <stdarg.h>
+@@ -6023,13 +6025,13 @@
+ #include <float.h>
+
+ _ACEOF
+-if { (eval echo "$as_me:6026: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:6028: \"$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:6032: \$? = $ac_status" >&5
++ echo "$as_me:6034: \$? = $ac_status" >&5
+ (exit "$ac_status"); } >/dev/null; then
+ if test -s conftest.err; then
+ ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -6051,7 +6053,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 6054 "configure"
++#line 6056 "configure"
+ #include "confdefs.h"
+ #include <string.h>
+
+@@ -6069,7 +6071,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 6072 "configure"
++#line 6074 "configure"
+ #include "confdefs.h"
+ #include <stdlib.h>
+
+@@ -6090,7 +6092,7 @@
+ :
+ else
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 6093 "configure"
++#line 6095 "configure"
+ #include "confdefs.h"
+ #include <ctype.h>
+ #if ((' ' & 0x0FF) == 0x020)
+@@ -6116,15 +6118,15 @@
+ }
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:6119: \"$ac_link\"") >&5
++if { (eval echo "$as_me:6121: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:6122: \$? = $ac_status" >&5
++ echo "$as_me:6124: \$? = $ac_status" >&5
+ (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+- { (eval echo "$as_me:6124: \"$ac_try\"") >&5
++ { (eval echo "$as_me:6126: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:6127: \$? = $ac_status" >&5
++ echo "$as_me:6129: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ :
+ else
+@@ -6137,7 +6139,7 @@
+ fi
+ fi
+ fi
+-echo "$as_me:6140: result: $ac_cv_header_stdc" >&5
++echo "$as_me:6142: result: $ac_cv_header_stdc" >&5
+ echo "${ECHO_T}$ac_cv_header_stdc" >&6
+ if test $ac_cv_header_stdc = yes; then
+
+@@ -6153,28 +6155,28 @@
+ inttypes.h stdint.h unistd.h
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-echo "$as_me:6156: checking for $ac_header" >&5
++echo "$as_me:6158: 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 6162 "configure"
++#line 6164 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ #include <$ac_header>
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:6168: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:6170: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:6171: \$? = $ac_status" >&5
++ echo "$as_me:6173: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:6174: \"$ac_try\"") >&5
++ { (eval echo "$as_me:6176: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:6177: \$? = $ac_status" >&5
++ echo "$as_me:6179: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ eval "$as_ac_Header=yes"
+ else
+@@ -6184,7 +6186,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:6187: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
++echo "$as_me:6189: 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
+@@ -6194,13 +6196,13 @@
+ fi
+ done
+
+-echo "$as_me:6197: checking whether exit is declared" >&5
++echo "$as_me:6199: 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 6203 "configure"
++#line 6205 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -6215,16 +6217,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:6218: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:6220: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:6221: \$? = $ac_status" >&5
++ echo "$as_me:6223: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:6224: \"$ac_try\"") >&5
++ { (eval echo "$as_me:6226: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:6227: \$? = $ac_status" >&5
++ echo "$as_me:6229: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_have_decl_exit=yes
+ else
+@@ -6234,10 +6236,10 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:6237: result: $ac_cv_have_decl_exit" >&5
++echo "$as_me:6239: result: $ac_cv_have_decl_exit" >&5
+ echo "${ECHO_T}$ac_cv_have_decl_exit" >&6
+
+-echo "$as_me:6240: checking for signal global datatype" >&5
++echo "$as_me:6242: 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
+@@ -6249,7 +6251,7 @@
+ "int"
+ do
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 6252 "configure"
++#line 6254 "configure"
+ #include "confdefs.h"
+
+ #include <sys/types.h>
+@@ -6273,16 +6275,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:6276: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:6278: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:6279: \$? = $ac_status" >&5
++ echo "$as_me:6281: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:6282: \"$ac_try\"") >&5
++ { (eval echo "$as_me:6284: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:6285: \$? = $ac_status" >&5
++ echo "$as_me:6287: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_sig_atomic_t=$cf_type
+ else
+@@ -6296,7 +6298,7 @@
+
+ fi
+
+-echo "$as_me:6299: result: $cf_cv_sig_atomic_t" >&5
++echo "$as_me:6301: 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
+@@ -6305,14 +6307,14 @@
+
+ # Work around breakage on OS X
+
+-echo "$as_me:6308: checking if SIGWINCH is defined" >&5
++echo "$as_me:6310: 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 6315 "configure"
++#line 6317 "configure"
+ #include "confdefs.h"
+
+ #include <sys/types.h>
+@@ -6327,23 +6329,23 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:6330: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:6332: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:6333: \$? = $ac_status" >&5
++ echo "$as_me:6335: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:6336: \"$ac_try\"") >&5
++ { (eval echo "$as_me:6338: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:6339: \$? = $ac_status" >&5
++ echo "$as_me:6341: \$? = $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 6346 "configure"
++#line 6348 "configure"
+ #include "confdefs.h"
+
+ #undef _XOPEN_SOURCE
+@@ -6361,16 +6363,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:6364: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:6366: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:6367: \$? = $ac_status" >&5
++ echo "$as_me:6369: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:6370: \"$ac_try\"") >&5
++ { (eval echo "$as_me:6372: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:6373: \$? = $ac_status" >&5
++ echo "$as_me:6375: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_define_sigwinch=maybe
+ else
+@@ -6384,11 +6386,11 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+
+ fi
+-echo "$as_me:6387: result: $cf_cv_define_sigwinch" >&5
++echo "$as_me:6389: 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:6391: checking for actual SIGWINCH definition" >&5
++echo "$as_me:6393: 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
+@@ -6399,7 +6401,7 @@
+ while test "$cf_sigwinch" != 1
+ do
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 6402 "configure"
++#line 6404 "configure"
+ #include "confdefs.h"
+
+ #undef _XOPEN_SOURCE
+@@ -6421,16 +6423,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:6424: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:6426: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:6427: \$? = $ac_status" >&5
++ echo "$as_me:6429: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:6430: \"$ac_try\"") >&5
++ { (eval echo "$as_me:6432: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:6433: \$? = $ac_status" >&5
++ echo "$as_me:6435: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_fixup_sigwinch=$cf_sigwinch
+ break
+@@ -6444,7 +6446,7 @@
+ done
+
+ fi
+-echo "$as_me:6447: result: $cf_cv_fixup_sigwinch" >&5
++echo "$as_me:6449: result: $cf_cv_fixup_sigwinch" >&5
+ echo "${ECHO_T}$cf_cv_fixup_sigwinch" >&6
+
+ if test "$cf_cv_fixup_sigwinch" != unknown ; then
+@@ -6454,13 +6456,13 @@
+
+ # Checks for CODESET support.
+
+-echo "$as_me:6457: checking for nl_langinfo and CODESET" >&5
++echo "$as_me:6459: 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 6463 "configure"
++#line 6465 "configure"
+ #include "confdefs.h"
+
+ $ac_includes_default
+@@ -6474,16 +6476,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:6477: \"$ac_link\"") >&5
++if { (eval echo "$as_me:6479: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:6480: \$? = $ac_status" >&5
++ echo "$as_me:6482: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:6483: \"$ac_try\"") >&5
++ { (eval echo "$as_me:6485: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:6486: \$? = $ac_status" >&5
++ echo "$as_me:6488: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ am_cv_langinfo_codeset=yes
+ else
+@@ -6494,7 +6496,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+
+ fi
+-echo "$as_me:6497: result: $am_cv_langinfo_codeset" >&5
++echo "$as_me:6499: result: $am_cv_langinfo_codeset" >&5
+ echo "${ECHO_T}$am_cv_langinfo_codeset" >&6
+ if test "$am_cv_langinfo_codeset" = yes; then
+
+@@ -6504,7 +6506,7 @@
+
+ fi
+
+-echo "$as_me:6507: checking if you want to use pkg-config" >&5
++echo "$as_me:6509: 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.
+@@ -6514,7 +6516,7 @@
+ else
+ cf_pkg_config=yes
+ fi;
+-echo "$as_me:6517: result: $cf_pkg_config" >&5
++echo "$as_me:6519: result: $cf_pkg_config" >&5
+ echo "${ECHO_T}$cf_pkg_config" >&6
+
+ case "$cf_pkg_config" in
+@@ -6526,7 +6528,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:6529: checking for $ac_word" >&5
++echo "$as_me:6531: 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
+@@ -6543,7 +6545,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:6546: found $ac_dir/$ac_word" >&5
++ echo "$as_me:6548: found $ac_dir/$ac_word" >&5
+ break
+ fi
+ done
+@@ -6554,10 +6556,10 @@
+ PKG_CONFIG=$ac_cv_path_PKG_CONFIG
+
+ if test -n "$PKG_CONFIG"; then
+- echo "$as_me:6557: result: $PKG_CONFIG" >&5
++ echo "$as_me:6559: result: $PKG_CONFIG" >&5
+ echo "${ECHO_T}$PKG_CONFIG" >&6
+ else
+- echo "$as_me:6560: result: no" >&5
++ echo "$as_me:6562: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+
+@@ -6566,7 +6568,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:6569: checking for $ac_word" >&5
++echo "$as_me:6571: 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
+@@ -6583,7 +6585,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:6586: found $ac_dir/$ac_word" >&5
++ echo "$as_me:6588: found $ac_dir/$ac_word" >&5
+ break
+ fi
+ done
+@@ -6595,10 +6597,10 @@
+ ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG
+
+ if test -n "$ac_pt_PKG_CONFIG"; then
+- echo "$as_me:6598: result: $ac_pt_PKG_CONFIG" >&5
++ echo "$as_me:6600: result: $ac_pt_PKG_CONFIG" >&5
+ echo "${ECHO_T}$ac_pt_PKG_CONFIG" >&6
+ else
+- echo "$as_me:6601: result: no" >&5
++ echo "$as_me:6603: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+
+@@ -6639,18 +6641,18 @@
+ PKG_CONFIG=`echo "$PKG_CONFIG" | sed -e s%NONE%$cf_path_syntax%`
+ ;;
+ (*)
+- { { echo "$as_me:6642: error: expected a pathname, not \"$PKG_CONFIG\"" >&5
++ { { echo "$as_me:6644: 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:6649: WARNING: pkg-config is not installed" >&5
++ { echo "$as_me:6651: WARNING: pkg-config is not installed" >&5
+ echo "$as_me: WARNING: pkg-config is not installed" >&2;}
+ fi
+
+-echo "$as_me:6653: checking if you want to see long compiling messages" >&5
++echo "$as_me:6655: 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.
+@@ -6684,10 +6686,52 @@
+ ECHO_CC=''
+
+ fi;
+-echo "$as_me:6687: result: $enableval" >&5
++echo "$as_me:6689: result: $enableval" >&5
+ echo "${ECHO_T}$enableval" >&6
+
+-echo "$as_me:6690: checking for ncurses wrap-prefix" >&5
++echo "$as_me:6692: 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.
++if test "${with_install_prefix+set}" = set; then
++ withval="$with_install_prefix"
++ case "x$withval" in
++ (xyes|xno)
++ ;;
++ (*) DESTDIR="$withval"
++ ;;
++ esac
++fi;
++echo "$as_me:6705: result: ${DESTDIR:-(none)}" >&5
++echo "${ECHO_T}${DESTDIR:-(none)}" >&6
++
++echo "$as_me:6708: checking if installation directory prefix should be merged" >&5
++echo $ECHO_N "checking if installation directory prefix should be merged... $ECHO_C" >&6
++
++# Check whether --enable-install-prefix or --disable-install-prefix was given.
++if test "${enable_install_prefix+set}" = set; then
++ enableval="$enable_install_prefix"
++ test "$enableval" != yes && enableval=no
++ if test "$enableval" != "no" ; then
++ cf_install_prefix=yes
++ else
++ cf_install_prefix=no
++ fi
++else
++ enableval=no
++ cf_install_prefix=no
++
++fi;
++echo "$as_me:6725: result: $cf_install_prefix" >&5
++echo "${ECHO_T}$cf_install_prefix" >&6
++
++if test "$cf_install_prefix" = yes ; then
++ MERGE_PREFIX=':$(prefix)%=%'
++else
++ MERGE_PREFIX=''
++fi
++
++echo "$as_me:6734: 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.
+@@ -6697,10 +6741,10 @@
+ else
+ NCURSES_WRAP_PREFIX=_nc_
+ fi;
+-echo "$as_me:6700: result: $NCURSES_WRAP_PREFIX" >&5
++echo "$as_me:6744: result: $NCURSES_WRAP_PREFIX" >&5
+ echo "${ECHO_T}$NCURSES_WRAP_PREFIX" >&6
+
+-echo "$as_me:6703: checking if you want to check for wide-character functions" >&5
++echo "$as_me:6747: 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.
+@@ -6717,10 +6761,10 @@
+ cf_enable_widec=yes
+
+ fi;
+-echo "$as_me:6720: result: $cf_enable_widec" >&5
++echo "$as_me:6764: result: $cf_enable_widec" >&5
+ echo "${ECHO_T}$cf_enable_widec" >&6
+
+-echo "$as_me:6723: checking for specific curses-directory" >&5
++echo "$as_me:6767: 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.
+@@ -6730,7 +6774,7 @@
+ else
+ cf_cv_curses_dir=no
+ fi;
+-echo "$as_me:6733: result: $cf_cv_curses_dir" >&5
++echo "$as_me:6777: 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"
+@@ -6759,7 +6803,7 @@
+ withval=`echo "$withval" | sed -e s%NONE%$cf_path_syntax%`
+ ;;
+ (*)
+- { { echo "$as_me:6762: error: expected a pathname, not \"$withval\"" >&5
++ { { echo "$as_me:6806: error: expected a pathname, not \"$withval\"" >&5
+ echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
+ { (exit 1); exit 1; }; }
+ ;;
+@@ -6795,7 +6839,7 @@
+ CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
+
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 6798 "configure"
++#line 6842 "configure"
+ #include "confdefs.h"
+ #include <stdio.h>
+ int
+@@ -6807,16 +6851,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:6810: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:6854: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:6813: \$? = $ac_status" >&5
++ echo "$as_me:6857: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:6816: \"$ac_try\"") >&5
++ { (eval echo "$as_me:6860: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:6819: \$? = $ac_status" >&5
++ echo "$as_me:6863: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ :
+ else
+@@ -6833,7 +6877,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}:6836: testing adding $cf_add_incdir to include-path ..." 1>&5
++echo "${as_me:-configure}:6880: testing adding $cf_add_incdir to include-path ..." 1>&5
+
+ CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
+
+@@ -6869,7 +6913,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}:6872: testing adding $cf_add_libdir to library-path ..." 1>&5
++echo "${as_me:-configure}:6916: testing adding $cf_add_libdir to library-path ..." 1>&5
+
+ LDFLAGS="-L$cf_add_libdir $LDFLAGS"
+ fi
+@@ -6882,7 +6926,7 @@
+
+ cf_cv_screen=curses
+
+-echo "$as_me:6885: checking for specified curses library type" >&5
++echo "$as_me:6929: 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.
+@@ -6926,13 +6970,13 @@
+ fi;
+ fi;
+
+-echo "$as_me:6929: result: $cf_cv_screen" >&5
++echo "$as_me:6973: result: $cf_cv_screen" >&5
+ echo "${ECHO_T}$cf_cv_screen" >&6
+
+ case $cf_cv_screen in
+ (curses|curses_*)
+
+-echo "$as_me:6935: checking for extra include directories" >&5
++echo "$as_me:6979: 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
+@@ -6958,7 +7002,7 @@
+ esac
+
+ fi
+-echo "$as_me:6961: result: $cf_cv_curses_incdir" >&5
++echo "$as_me:7005: result: $cf_cv_curses_incdir" >&5
+ echo "${ECHO_T}$cf_cv_curses_incdir" >&6
+ if test "$cf_cv_curses_incdir" != no
+ then
+@@ -6968,7 +7012,7 @@
+
+ fi
+
+-echo "$as_me:6971: checking if we have identified curses headers" >&5
++echo "$as_me:7015: 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
+@@ -6980,7 +7024,7 @@
+ curses.h ncurses/ncurses.h ncurses/curses.h
+ do
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 6983 "configure"
++#line 7027 "configure"
+ #include "confdefs.h"
+ #include <${cf_header}>
+ int
+@@ -6992,16 +7036,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:6995: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:7039: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:6998: \$? = $ac_status" >&5
++ echo "$as_me:7042: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:7001: \"$ac_try\"") >&5
++ { (eval echo "$as_me:7045: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:7004: \$? = $ac_status" >&5
++ echo "$as_me:7048: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_ncurses_header=$cf_header; break
+ else
+@@ -7012,11 +7056,11 @@
+ done
+
+ fi
+-echo "$as_me:7015: result: $cf_cv_ncurses_header" >&5
++echo "$as_me:7059: 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:7019: error: No curses header-files found" >&5
++ { { echo "$as_me:7063: error: No curses header-files found" >&5
+ echo "$as_me: error: No curses header-files found" >&2;}
+ { (exit 1); exit 1; }; }
+ fi
+@@ -7026,23 +7070,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:7029: checking for $ac_header" >&5
++echo "$as_me:7073: 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 7035 "configure"
++#line 7079 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:7039: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:7083: \"$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:7045: \$? = $ac_status" >&5
++ echo "$as_me:7089: \$? = $ac_status" >&5
+ (exit "$ac_status"); } >/dev/null; then
+ if test -s conftest.err; then
+ ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -7061,7 +7105,7 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:7064: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
++echo "$as_me:7108: 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
+@@ -7071,7 +7115,7 @@
+ fi
+ done
+
+-echo "$as_me:7074: checking for terminfo header" >&5
++echo "$as_me:7118: 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
+@@ -7089,7 +7133,7 @@
+ for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h"
+ do
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 7092 "configure"
++#line 7136 "configure"
+ #include "confdefs.h"
+ #include <stdio.h>
+ #include <${cf_cv_ncurses_header:-curses.h}>
+@@ -7104,16 +7148,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:7107: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:7151: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:7110: \$? = $ac_status" >&5
++ echo "$as_me:7154: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:7113: \"$ac_try\"") >&5
++ { (eval echo "$as_me:7157: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:7116: \$? = $ac_status" >&5
++ echo "$as_me:7160: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+
+ cf_cv_term_header="$cf_test"
+@@ -7129,7 +7173,7 @@
+ done
+
+ fi
+-echo "$as_me:7132: result: $cf_cv_term_header" >&5
++echo "$as_me:7176: result: $cf_cv_term_header" >&5
+ echo "${ECHO_T}$cf_cv_term_header" >&6
+
+ # Set definitions to allow ifdef'ing to accommodate subdirectories
+@@ -7161,7 +7205,7 @@
+ ;;
+ esac
+
+-echo "$as_me:7164: checking for ncurses version" >&5
++echo "$as_me:7208: 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
+@@ -7187,10 +7231,10 @@
+ #endif
+ EOF
+ cf_try="$ac_cpp conftest.$ac_ext 2>&5 | grep '^Autoconf ' >conftest.out"
+- { (eval echo "$as_me:7190: \"$cf_try\"") >&5
++ { (eval echo "$as_me:7234: \"$cf_try\"") >&5
+ (eval $cf_try) 2>&5
+ ac_status=$?
+- echo "$as_me:7193: \$? = $ac_status" >&5
++ echo "$as_me:7237: \$? = $ac_status" >&5
+ (exit "$ac_status"); }
+ if test -f conftest.out ; then
+ cf_out=`sed -e 's%^Autoconf %%' -e 's%^[^"]*"%%' -e 's%".*%%' conftest.out`
+@@ -7200,7 +7244,7 @@
+
+ else
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 7203 "configure"
++#line 7247 "configure"
+ #include "confdefs.h"
+
+ $ac_includes_default
+@@ -7227,15 +7271,15 @@
+ }
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:7230: \"$ac_link\"") >&5
++if { (eval echo "$as_me:7274: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:7233: \$? = $ac_status" >&5
++ echo "$as_me:7277: \$? = $ac_status" >&5
+ (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+- { (eval echo "$as_me:7235: \"$ac_try\"") >&5
++ { (eval echo "$as_me:7279: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:7238: \$? = $ac_status" >&5
++ echo "$as_me:7282: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+
+ cf_cv_ncurses_version=`cat $cf_tempfile`
+@@ -7249,17 +7293,17 @@
+ rm -f "$cf_tempfile"
+
+ fi
+-echo "$as_me:7252: result: $cf_cv_ncurses_version" >&5
++echo "$as_me:7296: 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:7259: checking if we have identified curses libraries" >&5
++echo "$as_me:7303: 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 7262 "configure"
++#line 7306 "configure"
+ #include "confdefs.h"
+ #include <${cf_cv_ncurses_header:-curses.h}>
+ int
+@@ -7271,16 +7315,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:7274: \"$ac_link\"") >&5
++if { (eval echo "$as_me:7318: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:7277: \$? = $ac_status" >&5
++ echo "$as_me:7321: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:7280: \"$ac_try\"") >&5
++ { (eval echo "$as_me:7324: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:7283: \$? = $ac_status" >&5
++ echo "$as_me:7327: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_result=yes
+ else
+@@ -7289,13 +7333,13 @@
+ cf_result=no
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+-echo "$as_me:7292: result: $cf_result" >&5
++echo "$as_me:7336: result: $cf_result" >&5
+ echo "${ECHO_T}$cf_result" >&6
+
+ if test "$cf_result" = no ; then
+ case "$host_os" in
+ (freebsd*)
+- echo "$as_me:7298: checking for tgoto in -lmytinfo" >&5
++ echo "$as_me:7342: 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
+@@ -7303,7 +7347,7 @@
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lmytinfo $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 7306 "configure"
++#line 7350 "configure"
+ #include "confdefs.h"
+
+ /* Override any gcc2 internal prototype to avoid an error. */
+@@ -7322,16 +7366,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:7325: \"$ac_link\"") >&5
++if { (eval echo "$as_me:7369: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:7328: \$? = $ac_status" >&5
++ echo "$as_me:7372: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:7331: \"$ac_try\"") >&5
++ { (eval echo "$as_me:7375: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:7334: \$? = $ac_status" >&5
++ echo "$as_me:7378: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_lib_mytinfo_tgoto=yes
+ else
+@@ -7342,7 +7386,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:7345: result: $ac_cv_lib_mytinfo_tgoto" >&5
++echo "$as_me:7389: 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
+
+@@ -7372,7 +7416,7 @@
+ # term.h) for cur_colr
+ if test "x$cf_cv_screen" = "xcurses_colr"
+ then
+- echo "$as_me:7375: checking for initscr in -lcur_colr" >&5
++ echo "$as_me:7419: 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
+@@ -7380,7 +7424,7 @@
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lcur_colr $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 7383 "configure"
++#line 7427 "configure"
+ #include "confdefs.h"
+
+ /* Override any gcc2 internal prototype to avoid an error. */
+@@ -7399,16 +7443,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:7402: \"$ac_link\"") >&5
++if { (eval echo "$as_me:7446: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:7405: \$? = $ac_status" >&5
++ echo "$as_me:7449: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:7408: \"$ac_try\"") >&5
++ { (eval echo "$as_me:7452: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:7411: \$? = $ac_status" >&5
++ echo "$as_me:7455: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_lib_cur_colr_initscr=yes
+ else
+@@ -7419,7 +7463,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:7422: result: $ac_cv_lib_cur_colr_initscr" >&5
++echo "$as_me:7466: 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
+
+@@ -7443,7 +7487,7 @@
+
+ else
+
+- echo "$as_me:7446: checking for initscr in -lHcurses" >&5
++ echo "$as_me:7490: 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
+@@ -7451,7 +7495,7 @@
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lHcurses $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 7454 "configure"
++#line 7498 "configure"
+ #include "confdefs.h"
+
+ /* Override any gcc2 internal prototype to avoid an error. */
+@@ -7470,16 +7514,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:7473: \"$ac_link\"") >&5
++if { (eval echo "$as_me:7517: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:7476: \$? = $ac_status" >&5
++ echo "$as_me:7520: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:7479: \"$ac_try\"") >&5
++ { (eval echo "$as_me:7523: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:7482: \$? = $ac_status" >&5
++ echo "$as_me:7526: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_lib_Hcurses_initscr=yes
+ else
+@@ -7490,7 +7534,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:7493: result: $ac_cv_lib_Hcurses_initscr" >&5
++echo "$as_me:7537: 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
+
+@@ -7548,7 +7592,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}:7551: testing adding $cf_add_libdir to library-path ..." 1>&5
++echo "${as_me:-configure}:7595: testing adding $cf_add_libdir to library-path ..." 1>&5
+
+ LDFLAGS="-L$cf_add_libdir $LDFLAGS"
+ fi
+@@ -7577,7 +7621,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}:7580: testing adding $cf_add_libdir to library-path ..." 1>&5
++echo "${as_me:-configure}:7624: testing adding $cf_add_libdir to library-path ..." 1>&5
+
+ LDFLAGS="-L$cf_add_libdir $LDFLAGS"
+ fi
+@@ -7608,7 +7652,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}:7611: testing adding $cf_add_libdir to library-path ..." 1>&5
++echo "${as_me:-configure}:7655: testing adding $cf_add_libdir to library-path ..." 1>&5
+
+ LDFLAGS="-L$cf_add_libdir $LDFLAGS"
+ fi
+@@ -7643,7 +7687,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}:7646: testing adding $cf_add_libdir to library-path ..." 1>&5
++echo "${as_me:-configure}:7690: testing adding $cf_add_libdir to library-path ..." 1>&5
+
+ LDFLAGS="-L$cf_add_libdir $LDFLAGS"
+ fi
+@@ -7687,13 +7731,13 @@
+ # because it may be needed to link the test-case for initscr.
+ if test "x$cf_term_lib" = x
+ then
+- echo "$as_me:7690: checking for tgoto" >&5
++ echo "$as_me:7734: 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 7696 "configure"
++#line 7740 "configure"
+ #include "confdefs.h"
+ #define tgoto autoconf_temporary
+ #include <limits.h> /* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -7724,16 +7768,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:7727: \"$ac_link\"") >&5
++if { (eval echo "$as_me:7771: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:7730: \$? = $ac_status" >&5
++ echo "$as_me:7774: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:7733: \"$ac_try\"") >&5
++ { (eval echo "$as_me:7777: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:7736: \$? = $ac_status" >&5
++ echo "$as_me:7780: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_func_tgoto=yes
+ else
+@@ -7743,7 +7787,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:7746: result: $ac_cv_func_tgoto" >&5
++echo "$as_me:7790: 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
+@@ -7752,7 +7796,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:7755: checking for tgoto in -l$cf_term_lib" >&5
++echo "$as_me:7799: 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
+@@ -7760,7 +7804,7 @@
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-l$cf_term_lib $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 7763 "configure"
++#line 7807 "configure"
+ #include "confdefs.h"
+
+ /* Override any gcc2 internal prototype to avoid an error. */
+@@ -7779,16 +7823,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:7782: \"$ac_link\"") >&5
++if { (eval echo "$as_me:7826: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:7785: \$? = $ac_status" >&5
++ echo "$as_me:7829: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:7788: \"$ac_try\"") >&5
++ { (eval echo "$as_me:7832: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:7791: \$? = $ac_status" >&5
++ echo "$as_me:7835: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ eval "$as_ac_Lib=yes"
+ else
+@@ -7799,7 +7843,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:7802: result: `eval echo '${'"$as_ac_Lib"'}'`" >&5
++echo "$as_me:7846: 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
+
+@@ -7822,10 +7866,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:7825: checking if we can link with $cf_curs_lib library" >&5
++ echo "$as_me:7869: 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 7828 "configure"
++#line 7872 "configure"
+ #include "confdefs.h"
+ #include <${cf_cv_ncurses_header:-curses.h}>
+ int
+@@ -7837,16 +7881,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:7840: \"$ac_link\"") >&5
++if { (eval echo "$as_me:7884: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:7843: \$? = $ac_status" >&5
++ echo "$as_me:7887: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:7846: \"$ac_try\"") >&5
++ { (eval echo "$as_me:7890: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:7849: \$? = $ac_status" >&5
++ echo "$as_me:7893: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_result=yes
+ else
+@@ -7855,16 +7899,16 @@
+ cf_result=no
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+- echo "$as_me:7858: result: $cf_result" >&5
++ echo "$as_me:7902: 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:7864: checking if we need both $cf_curs_lib and $cf_term_lib libraries" >&5
++ echo "$as_me:7908: 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 7867 "configure"
++#line 7911 "configure"
+ #include "confdefs.h"
+ #include <${cf_cv_ncurses_header:-curses.h}>
+ int
+@@ -7876,16 +7920,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:7879: \"$ac_link\"") >&5
++if { (eval echo "$as_me:7923: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:7882: \$? = $ac_status" >&5
++ echo "$as_me:7926: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:7885: \"$ac_try\"") >&5
++ { (eval echo "$as_me:7929: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:7888: \$? = $ac_status" >&5
++ echo "$as_me:7932: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_result=no
+ else
+@@ -7894,7 +7938,7 @@
+
+ LIBS="-l$cf_curs_lib -l$cf_term_lib $cf_save_LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 7897 "configure"
++#line 7941 "configure"
+ #include "confdefs.h"
+ #include <${cf_cv_ncurses_header:-curses.h}>
+ int
+@@ -7906,16 +7950,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:7909: \"$ac_link\"") >&5
++if { (eval echo "$as_me:7953: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:7912: \$? = $ac_status" >&5
++ echo "$as_me:7956: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:7915: \"$ac_try\"") >&5
++ { (eval echo "$as_me:7959: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:7918: \$? = $ac_status" >&5
++ echo "$as_me:7962: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_result=yes
+ else
+@@ -7927,13 +7971,13 @@
+
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+- echo "$as_me:7930: result: $cf_result" >&5
++ echo "$as_me:7974: 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:7936: error: no curses library found" >&5
++ test "$cf_curs_lib" = unknown && { { echo "$as_me:7980: error: no curses library found" >&5
+ echo "$as_me: error: no curses library found" >&2;}
+ { (exit 1); exit 1; }; }
+ fi
+@@ -7945,23 +7989,23 @@
+ for ac_header in wchar.h
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-echo "$as_me:7948: checking for $ac_header" >&5
++echo "$as_me:7992: 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 7954 "configure"
++#line 7998 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:7958: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:8002: \"$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:7964: \$? = $ac_status" >&5
++ echo "$as_me:8008: \$? = $ac_status" >&5
+ (exit "$ac_status"); } >/dev/null; then
+ if test -s conftest.err; then
+ ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -7980,7 +8024,7 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:7983: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
++echo "$as_me:8027: 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
+@@ -7990,7 +8034,7 @@
+ fi
+ done
+
+-echo "$as_me:7993: checking for multibyte character support" >&5
++echo "$as_me:8037: 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
+@@ -7998,7 +8042,7 @@
+
+ cf_save_LIBS="$LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 8001 "configure"
++#line 8045 "configure"
+ #include "confdefs.h"
+
+ $ac_includes_default
+@@ -8015,16 +8059,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:8018: \"$ac_link\"") >&5
++if { (eval echo "$as_me:8062: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:8021: \$? = $ac_status" >&5
++ echo "$as_me:8065: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:8024: \"$ac_try\"") >&5
++ { (eval echo "$as_me:8068: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:8027: \$? = $ac_status" >&5
++ echo "$as_me:8071: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_utf8_lib=yes
+ else
+@@ -8036,12 +8080,12 @@
+ cf_cv_header_path_utf8=
+ cf_cv_library_path_utf8=
+
+-echo "${as_me:-configure}:8039: testing Starting FIND_LINKAGE(utf8,) ..." 1>&5
++echo "${as_me:-configure}:8083: testing Starting FIND_LINKAGE(utf8,) ..." 1>&5
+
+ cf_save_LIBS="$LIBS"
+
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 8044 "configure"
++#line 8088 "configure"
+ #include "confdefs.h"
+
+ #include <libutf8.h>
+@@ -8054,16 +8098,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:8057: \"$ac_link\"") >&5
++if { (eval echo "$as_me:8101: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:8060: \$? = $ac_status" >&5
++ echo "$as_me:8104: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:8063: \"$ac_try\"") >&5
++ { (eval echo "$as_me:8107: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:8066: \$? = $ac_status" >&5
++ echo "$as_me:8110: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+
+ cf_cv_find_linkage_utf8=yes
+@@ -8077,7 +8121,7 @@
+ LIBS="-lutf8 $cf_save_LIBS"
+
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 8080 "configure"
++#line 8124 "configure"
+ #include "confdefs.h"
+
+ #include <libutf8.h>
+@@ -8090,16 +8134,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:8093: \"$ac_link\"") >&5
++if { (eval echo "$as_me:8137: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:8096: \$? = $ac_status" >&5
++ echo "$as_me:8140: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:8099: \"$ac_try\"") >&5
++ { (eval echo "$as_me:8143: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:8102: \$? = $ac_status" >&5
++ echo "$as_me:8146: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+
+ cf_cv_find_linkage_utf8=yes
+@@ -8116,9 +8160,9 @@
+
+ test -n "$verbose" && echo " find linkage for utf8 library" 1>&6
+
+-echo "${as_me:-configure}:8119: testing find linkage for utf8 library ..." 1>&5
++echo "${as_me:-configure}:8163: testing find linkage for utf8 library ..." 1>&5
+
+-echo "${as_me:-configure}:8121: testing Searching for headers in FIND_LINKAGE(utf8,) ..." 1>&5
++echo "${as_me:-configure}:8165: testing Searching for headers in FIND_LINKAGE(utf8,) ..." 1>&5
+
+ cf_save_CPPFLAGS="$CPPFLAGS"
+ cf_test_CPPFLAGS="$CPPFLAGS"
+@@ -8209,7 +8253,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}:8212: testing ... testing $cf_cv_header_path_utf8 ..." 1>&5
++echo "${as_me:-configure}:8256: testing ... testing $cf_cv_header_path_utf8 ..." 1>&5
+
+ CPPFLAGS="$cf_save_CPPFLAGS"
+
+@@ -8217,7 +8261,7 @@
+ CPPFLAGS="${CPPFLAGS}-I$cf_cv_header_path_utf8"
+
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 8220 "configure"
++#line 8264 "configure"
+ #include "confdefs.h"
+
+ #include <libutf8.h>
+@@ -8230,21 +8274,21 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:8233: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:8277: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:8236: \$? = $ac_status" >&5
++ echo "$as_me:8280: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:8239: \"$ac_try\"") >&5
++ { (eval echo "$as_me:8283: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:8242: \$? = $ac_status" >&5
++ echo "$as_me:8286: \$? = $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}:8247: testing ... found utf8 headers in $cf_cv_header_path_utf8 ..." 1>&5
++echo "${as_me:-configure}:8291: testing ... found utf8 headers in $cf_cv_header_path_utf8 ..." 1>&5
+
+ cf_cv_find_linkage_utf8=maybe
+ cf_test_CPPFLAGS="$CPPFLAGS"
+@@ -8262,7 +8306,7 @@
+
+ if test "$cf_cv_find_linkage_utf8" = maybe ; then
+
+-echo "${as_me:-configure}:8265: testing Searching for utf8 library in FIND_LINKAGE(utf8,) ..." 1>&5
++echo "${as_me:-configure}:8309: testing Searching for utf8 library in FIND_LINKAGE(utf8,) ..." 1>&5
+
+ cf_save_LIBS="$LIBS"
+ cf_save_LDFLAGS="$LDFLAGS"
+@@ -8337,13 +8381,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}:8340: testing ... testing $cf_cv_library_path_utf8 ..." 1>&5
++echo "${as_me:-configure}:8384: 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 8346 "configure"
++#line 8390 "configure"
+ #include "confdefs.h"
+
+ #include <libutf8.h>
+@@ -8356,21 +8400,21 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:8359: \"$ac_link\"") >&5
++if { (eval echo "$as_me:8403: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:8362: \$? = $ac_status" >&5
++ echo "$as_me:8406: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:8365: \"$ac_try\"") >&5
++ { (eval echo "$as_me:8409: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:8368: \$? = $ac_status" >&5
++ echo "$as_me:8412: \$? = $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}:8373: testing ... found utf8 library in $cf_cv_library_path_utf8 ..." 1>&5
++echo "${as_me:-configure}:8417: testing ... found utf8 library in $cf_cv_library_path_utf8 ..." 1>&5
+
+ cf_cv_find_linkage_utf8=yes
+ cf_cv_library_file_utf8="-lutf8"
+@@ -8412,7 +8456,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:8415: result: $cf_cv_utf8_lib" >&5
++echo "$as_me:8459: 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
+@@ -8450,7 +8494,7 @@
+ CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
+
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 8453 "configure"
++#line 8497 "configure"
+ #include "confdefs.h"
+ #include <stdio.h>
+ int
+@@ -8462,16 +8506,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:8465: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:8509: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:8468: \$? = $ac_status" >&5
++ echo "$as_me:8512: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:8471: \"$ac_try\"") >&5
++ { (eval echo "$as_me:8515: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:8474: \$? = $ac_status" >&5
++ echo "$as_me:8518: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ :
+ else
+@@ -8488,7 +8532,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}:8491: testing adding $cf_add_incdir to include-path ..." 1>&5
++echo "${as_me:-configure}:8535: testing adding $cf_add_incdir to include-path ..." 1>&5
+
+ CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
+
+@@ -8524,7 +8568,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}:8527: testing adding $cf_add_libdir to library-path ..." 1>&5
++echo "${as_me:-configure}:8571: testing adding $cf_add_libdir to library-path ..." 1>&5
+
+ LDFLAGS="-L$cf_add_libdir $LDFLAGS"
+ fi
+@@ -8554,13 +8598,13 @@
+ cf_have_ncuconfig=no
+
+ if test "x${PKG_CONFIG:=none}" != xnone; then
+- echo "$as_me:8557: checking pkg-config for $cf_ncuconfig_root" >&5
++ echo "$as_me:8601: 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:8560: result: yes" >&5
++ echo "$as_me:8604: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+
+- echo "$as_me:8563: checking if the $cf_ncuconfig_root package files work" >&5
++ echo "$as_me:8607: 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
+
+@@ -8693,7 +8737,7 @@
+ LIBS="$cf_add_libs"
+
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 8696 "configure"
++#line 8740 "configure"
+ #include "confdefs.h"
+ #include <${cf_cv_ncurses_header:-curses.h}>
+ int
+@@ -8705,37 +8749,37 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:8708: \"$ac_link\"") >&5
++if { (eval echo "$as_me:8752: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:8711: \$? = $ac_status" >&5
++ echo "$as_me:8755: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:8714: \"$ac_try\"") >&5
++ { (eval echo "$as_me:8758: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:8717: \$? = $ac_status" >&5
++ echo "$as_me:8761: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ if test "$cross_compiling" = yes; then
+ cf_test_ncuconfig=maybe
+ else
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 8723 "configure"
++#line 8767 "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:8730: \"$ac_link\"") >&5
++if { (eval echo "$as_me:8774: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:8733: \$? = $ac_status" >&5
++ echo "$as_me:8777: \$? = $ac_status" >&5
+ (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+- { (eval echo "$as_me:8735: \"$ac_try\"") >&5
++ { (eval echo "$as_me:8779: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:8738: \$? = $ac_status" >&5
++ echo "$as_me:8782: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_test_ncuconfig=yes
+ else
+@@ -8909,7 +8953,7 @@
+ LIBS="$cf_add_libs"
+
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 8912 "configure"
++#line 8956 "configure"
+ #include "confdefs.h"
+ #include <${cf_cv_ncurses_header:-curses.h}>
+ int
+@@ -8921,37 +8965,37 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:8924: \"$ac_link\"") >&5
++if { (eval echo "$as_me:8968: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:8927: \$? = $ac_status" >&5
++ echo "$as_me:8971: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:8930: \"$ac_try\"") >&5
++ { (eval echo "$as_me:8974: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:8933: \$? = $ac_status" >&5
++ echo "$as_me:8977: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ if test "$cross_compiling" = yes; then
+ cf_have_ncuconfig=maybe
+ else
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 8939 "configure"
++#line 8983 "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:8946: \"$ac_link\"") >&5
++if { (eval echo "$as_me:8990: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:8949: \$? = $ac_status" >&5
++ echo "$as_me:8993: \$? = $ac_status" >&5
+ (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+- { (eval echo "$as_me:8951: \"$ac_try\"") >&5
++ { (eval echo "$as_me:8995: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:8954: \$? = $ac_status" >&5
++ echo "$as_me:8998: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_have_ncuconfig=yes
+ else
+@@ -8968,7 +9012,7 @@
+ cf_have_ncuconfig=no
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+- echo "$as_me:8971: result: $cf_have_ncuconfig" >&5
++ echo "$as_me:9015: 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"
+@@ -8984,7 +9028,7 @@
+
+ NCURSES_CONFIG_PKG=$cf_ncuconfig_root
+
+-echo "$as_me:8987: checking for terminfo header" >&5
++echo "$as_me:9031: 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
+@@ -9002,7 +9046,7 @@
+ for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h"
+ do
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 9005 "configure"
++#line 9049 "configure"
+ #include "confdefs.h"
+ #include <stdio.h>
+ #include <${cf_cv_ncurses_header:-curses.h}>
+@@ -9017,16 +9061,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:9020: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:9064: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:9023: \$? = $ac_status" >&5
++ echo "$as_me:9067: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:9026: \"$ac_try\"") >&5
++ { (eval echo "$as_me:9070: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:9029: \$? = $ac_status" >&5
++ echo "$as_me:9073: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+
+ cf_cv_term_header="$cf_test"
+@@ -9042,7 +9086,7 @@
+ done
+
+ fi
+-echo "$as_me:9045: result: $cf_cv_term_header" >&5
++echo "$as_me:9089: result: $cf_cv_term_header" >&5
+ echo "${ECHO_T}$cf_cv_term_header" >&6
+
+ # Set definitions to allow ifdef'ing to accommodate subdirectories
+@@ -9077,7 +9121,7 @@
+ fi
+
+ else
+- echo "$as_me:9080: result: no" >&5
++ echo "$as_me:9124: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ NCURSES_CONFIG_PKG=none
+ fi
+@@ -9093,7 +9137,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:9096: checking for $ac_word" >&5
++echo "$as_me:9140: 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
+@@ -9108,7 +9152,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:9111: found $ac_dir/$ac_word" >&5
++echo "$as_me:9155: found $ac_dir/$ac_word" >&5
+ break
+ done
+
+@@ -9116,10 +9160,10 @@
+ fi
+ NCURSES_CONFIG=$ac_cv_prog_NCURSES_CONFIG
+ if test -n "$NCURSES_CONFIG"; then
+- echo "$as_me:9119: result: $NCURSES_CONFIG" >&5
++ echo "$as_me:9163: result: $NCURSES_CONFIG" >&5
+ echo "${ECHO_T}$NCURSES_CONFIG" >&6
+ else
+- echo "$as_me:9122: result: no" >&5
++ echo "$as_me:9166: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+
+@@ -9132,7 +9176,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:9135: checking for $ac_word" >&5
++echo "$as_me:9179: 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
+@@ -9147,7 +9191,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:9150: found $ac_dir/$ac_word" >&5
++echo "$as_me:9194: found $ac_dir/$ac_word" >&5
+ break
+ done
+
+@@ -9155,10 +9199,10 @@
+ fi
+ ac_ct_NCURSES_CONFIG=$ac_cv_prog_ac_ct_NCURSES_CONFIG
+ if test -n "$ac_ct_NCURSES_CONFIG"; then
+- echo "$as_me:9158: result: $ac_ct_NCURSES_CONFIG" >&5
++ echo "$as_me:9202: result: $ac_ct_NCURSES_CONFIG" >&5
+ echo "${ECHO_T}$ac_ct_NCURSES_CONFIG" >&6
+ else
+- echo "$as_me:9161: result: no" >&5
++ echo "$as_me:9205: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+
+@@ -9315,7 +9359,7 @@
+
+ # even with config script, some packages use no-override for curses.h
+
+-echo "$as_me:9318: checking if we have identified curses headers" >&5
++echo "$as_me:9362: 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
+@@ -9327,7 +9371,7 @@
+ curses.h $cf_cv_screen/curses.h
+ do
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 9330 "configure"
++#line 9374 "configure"
+ #include "confdefs.h"
+ #include <${cf_header}>
+ int
+@@ -9339,16 +9383,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:9342: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:9386: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:9345: \$? = $ac_status" >&5
++ echo "$as_me:9389: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:9348: \"$ac_try\"") >&5
++ { (eval echo "$as_me:9392: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:9351: \$? = $ac_status" >&5
++ echo "$as_me:9395: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_ncurses_header=$cf_header; break
+ else
+@@ -9359,11 +9403,11 @@
+ done
+
+ fi
+-echo "$as_me:9362: result: $cf_cv_ncurses_header" >&5
++echo "$as_me:9406: 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:9366: error: No curses header-files found" >&5
++ { { echo "$as_me:9410: error: No curses header-files found" >&5
+ echo "$as_me: error: No curses header-files found" >&2;}
+ { (exit 1); exit 1; }; }
+ fi
+@@ -9373,23 +9417,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:9376: checking for $ac_header" >&5
++echo "$as_me:9420: 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 9382 "configure"
++#line 9426 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:9386: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:9430: \"$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:9392: \$? = $ac_status" >&5
++ echo "$as_me:9436: \$? = $ac_status" >&5
+ (exit "$ac_status"); } >/dev/null; then
+ if test -s conftest.err; then
+ ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -9408,7 +9452,7 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:9411: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
++echo "$as_me:9455: 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
+@@ -9464,7 +9508,7 @@
+ CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
+
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 9467 "configure"
++#line 9511 "configure"
+ #include "confdefs.h"
+ #include <stdio.h>
+ int
+@@ -9476,16 +9520,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:9479: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:9523: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:9482: \$? = $ac_status" >&5
++ echo "$as_me:9526: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:9485: \"$ac_try\"") >&5
++ { (eval echo "$as_me:9529: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:9488: \$? = $ac_status" >&5
++ echo "$as_me:9532: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ :
+ else
+@@ -9502,7 +9546,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}:9505: testing adding $cf_add_incdir to include-path ..." 1>&5
++echo "${as_me:-configure}:9549: testing adding $cf_add_incdir to include-path ..." 1>&5
+
+ CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
+
+@@ -9521,7 +9565,7 @@
+
+ }
+
+-echo "$as_me:9524: checking for $cf_ncuhdr_root header in include-path" >&5
++echo "$as_me:9568: 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
+@@ -9533,7 +9577,7 @@
+ do
+
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 9536 "configure"
++#line 9580 "configure"
+ #include "confdefs.h"
+
+ #include <$cf_header>
+@@ -9557,16 +9601,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:9560: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:9604: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:9563: \$? = $ac_status" >&5
++ echo "$as_me:9607: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:9566: \"$ac_try\"") >&5
++ { (eval echo "$as_me:9610: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:9569: \$? = $ac_status" >&5
++ echo "$as_me:9613: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_ncurses_h=$cf_header
+
+@@ -9581,14 +9625,14 @@
+ done
+
+ fi
+-echo "$as_me:9584: result: $cf_cv_ncurses_h" >&5
++echo "$as_me:9628: 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:9591: checking for $cf_ncuhdr_root include-path" >&5
++echo "$as_me:9635: 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
+@@ -9709,7 +9753,7 @@
+ CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
+
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 9712 "configure"
++#line 9756 "configure"
+ #include "confdefs.h"
+ #include <stdio.h>
+ int
+@@ -9721,16 +9765,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:9724: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:9768: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:9727: \$? = $ac_status" >&5
++ echo "$as_me:9771: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:9730: \"$ac_try\"") >&5
++ { (eval echo "$as_me:9774: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:9733: \$? = $ac_status" >&5
++ echo "$as_me:9777: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ :
+ else
+@@ -9747,7 +9791,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}:9750: testing adding $cf_add_incdir to include-path ..." 1>&5
++echo "${as_me:-configure}:9794: testing adding $cf_add_incdir to include-path ..." 1>&5
+
+ CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
+
+@@ -9770,7 +9814,7 @@
+ do
+
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 9773 "configure"
++#line 9817 "configure"
+ #include "confdefs.h"
+
+ #include <$cf_header>
+@@ -9794,16 +9838,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:9797: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:9841: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:9800: \$? = $ac_status" >&5
++ echo "$as_me:9844: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:9803: \"$ac_try\"") >&5
++ { (eval echo "$as_me:9847: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:9806: \$? = $ac_status" >&5
++ echo "$as_me:9850: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_ncurses_h2=$cf_header
+
+@@ -9824,12 +9868,12 @@
+ CPPFLAGS="$cf_save2_CPPFLAGS"
+ test "$cf_cv_ncurses_h2" != no && break
+ done
+- test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:9827: error: not found" >&5
++ test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:9871: error: not found" >&5
+ echo "$as_me: error: not found" >&2;}
+ { (exit 1); exit 1; }; }
+
+ fi
+-echo "$as_me:9832: result: $cf_cv_ncurses_h2" >&5
++echo "$as_me:9876: 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%/[^/]*$%%'`
+@@ -9865,7 +9909,7 @@
+ CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
+
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 9868 "configure"
++#line 9912 "configure"
+ #include "confdefs.h"
+ #include <stdio.h>
+ int
+@@ -9877,16 +9921,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:9880: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:9924: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:9883: \$? = $ac_status" >&5
++ echo "$as_me:9927: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:9886: \"$ac_try\"") >&5
++ { (eval echo "$as_me:9930: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:9889: \$? = $ac_status" >&5
++ echo "$as_me:9933: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ :
+ else
+@@ -9903,7 +9947,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}:9906: testing adding $cf_add_incdir to include-path ..." 1>&5
++echo "${as_me:-configure}:9950: testing adding $cf_add_incdir to include-path ..." 1>&5
+
+ CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
+
+@@ -9951,7 +9995,7 @@
+ ;;
+ esac
+
+-echo "$as_me:9954: checking for terminfo header" >&5
++echo "$as_me:9998: 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
+@@ -9969,7 +10013,7 @@
+ for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h"
+ do
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 9972 "configure"
++#line 10016 "configure"
+ #include "confdefs.h"
+ #include <stdio.h>
+ #include <${cf_cv_ncurses_header:-curses.h}>
+@@ -9984,16 +10028,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:9987: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:10031: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:9990: \$? = $ac_status" >&5
++ echo "$as_me:10034: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:9993: \"$ac_try\"") >&5
++ { (eval echo "$as_me:10037: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:9996: \$? = $ac_status" >&5
++ echo "$as_me:10040: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+
+ cf_cv_term_header="$cf_test"
+@@ -10009,7 +10053,7 @@
+ done
+
+ fi
+-echo "$as_me:10012: result: $cf_cv_term_header" >&5
++echo "$as_me:10056: result: $cf_cv_term_header" >&5
+ echo "${ECHO_T}$cf_cv_term_header" >&6
+
+ # Set definitions to allow ifdef'ing to accommodate subdirectories
+@@ -10047,7 +10091,7 @@
+ #define NCURSES 1
+ EOF
+
+-echo "$as_me:10050: checking for ncurses version" >&5
++echo "$as_me:10094: 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
+@@ -10073,10 +10117,10 @@
+ #endif
+ EOF
+ cf_try="$ac_cpp conftest.$ac_ext 2>&5 | grep '^Autoconf ' >conftest.out"
+- { (eval echo "$as_me:10076: \"$cf_try\"") >&5
++ { (eval echo "$as_me:10120: \"$cf_try\"") >&5
+ (eval $cf_try) 2>&5
+ ac_status=$?
+- echo "$as_me:10079: \$? = $ac_status" >&5
++ echo "$as_me:10123: \$? = $ac_status" >&5
+ (exit "$ac_status"); }
+ if test -f conftest.out ; then
+ cf_out=`sed -e 's%^Autoconf %%' -e 's%^[^"]*"%%' -e 's%".*%%' conftest.out`
+@@ -10086,7 +10130,7 @@
+
+ else
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 10089 "configure"
++#line 10133 "configure"
+ #include "confdefs.h"
+
+ $ac_includes_default
+@@ -10113,15 +10157,15 @@
+ }
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:10116: \"$ac_link\"") >&5
++if { (eval echo "$as_me:10160: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:10119: \$? = $ac_status" >&5
++ echo "$as_me:10163: \$? = $ac_status" >&5
+ (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+- { (eval echo "$as_me:10121: \"$ac_try\"") >&5
++ { (eval echo "$as_me:10165: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:10124: \$? = $ac_status" >&5
++ echo "$as_me:10168: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+
+ cf_cv_ncurses_version=`cat $cf_tempfile`
+@@ -10135,7 +10179,7 @@
+ rm -f "$cf_tempfile"
+
+ fi
+-echo "$as_me:10138: result: $cf_cv_ncurses_version" >&5
++echo "$as_me:10182: result: $cf_cv_ncurses_version" >&5
+ echo "${ECHO_T}$cf_cv_ncurses_version" >&6
+ test "$cf_cv_ncurses_version" = no ||
+ cat >>confdefs.h <<\EOF
+@@ -10148,7 +10192,7 @@
+ # to link gpm.
+ cf_ncurses_LIBS=""
+ cf_ncurses_SAVE="$LIBS"
+-echo "$as_me:10151: checking for Gpm_Open in -lgpm" >&5
++echo "$as_me:10195: 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
+@@ -10156,7 +10200,7 @@
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lgpm $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 10159 "configure"
++#line 10203 "configure"
+ #include "confdefs.h"
+
+ /* Override any gcc2 internal prototype to avoid an error. */
+@@ -10175,16 +10219,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:10178: \"$ac_link\"") >&5
++if { (eval echo "$as_me:10222: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:10181: \$? = $ac_status" >&5
++ echo "$as_me:10225: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:10184: \"$ac_try\"") >&5
++ { (eval echo "$as_me:10228: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:10187: \$? = $ac_status" >&5
++ echo "$as_me:10231: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_lib_gpm_Gpm_Open=yes
+ else
+@@ -10195,10 +10239,10 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:10198: result: $ac_cv_lib_gpm_Gpm_Open" >&5
++echo "$as_me:10242: 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:10201: checking for initscr in -lgpm" >&5
++ echo "$as_me:10245: 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
+@@ -10206,7 +10250,7 @@
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lgpm $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 10209 "configure"
++#line 10253 "configure"
+ #include "confdefs.h"
+
+ /* Override any gcc2 internal prototype to avoid an error. */
+@@ -10225,16 +10269,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:10228: \"$ac_link\"") >&5
++if { (eval echo "$as_me:10272: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:10231: \$? = $ac_status" >&5
++ echo "$as_me:10275: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:10234: \"$ac_try\"") >&5
++ { (eval echo "$as_me:10278: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:10237: \$? = $ac_status" >&5
++ echo "$as_me:10281: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_lib_gpm_initscr=yes
+ else
+@@ -10245,7 +10289,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:10248: result: $ac_cv_lib_gpm_initscr" >&5
++echo "$as_me:10292: 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"
+@@ -10260,7 +10304,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:10263: checking for tgoto in -lmytinfo" >&5
++ echo "$as_me:10307: 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
+@@ -10268,7 +10312,7 @@
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lmytinfo $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 10271 "configure"
++#line 10315 "configure"
+ #include "confdefs.h"
+
+ /* Override any gcc2 internal prototype to avoid an error. */
+@@ -10287,16 +10331,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:10290: \"$ac_link\"") >&5
++if { (eval echo "$as_me:10334: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:10293: \$? = $ac_status" >&5
++ echo "$as_me:10337: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:10296: \"$ac_try\"") >&5
++ { (eval echo "$as_me:10340: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:10299: \$? = $ac_status" >&5
++ echo "$as_me:10343: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_lib_mytinfo_tgoto=yes
+ else
+@@ -10307,7 +10351,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:10310: result: $ac_cv_lib_mytinfo_tgoto" >&5
++echo "$as_me:10354: 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"
+@@ -10356,13 +10400,13 @@
+
+ eval 'cf_cv_have_lib_'"$cf_nculib_root"'=no'
+ cf_libdir=""
+- echo "$as_me:10359: checking for initscr" >&5
++ echo "$as_me:10403: 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 10365 "configure"
++#line 10409 "configure"
+ #include "confdefs.h"
+ #define initscr autoconf_temporary
+ #include <limits.h> /* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -10393,16 +10437,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:10396: \"$ac_link\"") >&5
++if { (eval echo "$as_me:10440: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:10399: \$? = $ac_status" >&5
++ echo "$as_me:10443: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:10402: \"$ac_try\"") >&5
++ { (eval echo "$as_me:10446: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:10405: \$? = $ac_status" >&5
++ echo "$as_me:10449: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_func_initscr=yes
+ else
+@@ -10412,18 +10456,18 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:10415: result: $ac_cv_func_initscr" >&5
++echo "$as_me:10459: 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:10422: checking for initscr in -l$cf_nculib_root" >&5
++ echo "$as_me:10466: 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 10426 "configure"
++#line 10470 "configure"
+ #include "confdefs.h"
+ #include <${cf_cv_ncurses_header:-curses.h}>
+ int
+@@ -10435,25 +10479,25 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:10438: \"$ac_link\"") >&5
++if { (eval echo "$as_me:10482: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:10441: \$? = $ac_status" >&5
++ echo "$as_me:10485: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:10444: \"$ac_try\"") >&5
++ { (eval echo "$as_me:10488: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:10447: \$? = $ac_status" >&5
++ echo "$as_me:10491: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+- echo "$as_me:10449: result: yes" >&5
++ echo "$as_me:10493: 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:10456: result: no" >&5
++echo "$as_me:10500: result: no" >&5
+ echo "${ECHO_T}no" >&6
+
+ cf_search=
+@@ -10521,11 +10565,11 @@
+
+ for cf_libdir in $cf_search
+ do
+- echo "$as_me:10524: checking for -l$cf_nculib_root in $cf_libdir" >&5
++ echo "$as_me:10568: 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 10528 "configure"
++#line 10572 "configure"
+ #include "confdefs.h"
+ #include <${cf_cv_ncurses_header:-curses.h}>
+ int
+@@ -10537,25 +10581,25 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:10540: \"$ac_link\"") >&5
++if { (eval echo "$as_me:10584: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:10543: \$? = $ac_status" >&5
++ echo "$as_me:10587: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:10546: \"$ac_try\"") >&5
++ { (eval echo "$as_me:10590: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:10549: \$? = $ac_status" >&5
++ echo "$as_me:10593: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+- echo "$as_me:10551: result: yes" >&5
++ echo "$as_me:10595: 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:10558: result: no" >&5
++echo "$as_me:10602: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ LIBS="$cf_save_LIBS"
+ fi
+@@ -10570,7 +10614,7 @@
+ eval 'cf_found_library="$cf_cv_have_lib_'"$cf_nculib_root"\"
+
+ if test "$cf_found_library" = no ; then
+- { { echo "$as_me:10573: error: Cannot link $cf_nculib_root library" >&5
++ { { echo "$as_me:10617: error: Cannot link $cf_nculib_root library" >&5
+ echo "$as_me: error: Cannot link $cf_nculib_root library" >&2;}
+ { (exit 1); exit 1; }; }
+ fi
+@@ -10578,7 +10622,7 @@
+ fi
+
+ if test -n "$cf_ncurses_LIBS" ; then
+- echo "$as_me:10581: checking if we can link $cf_nculib_root without $cf_ncurses_LIBS" >&5
++ echo "$as_me:10625: 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
+@@ -10588,7 +10632,7 @@
+ fi
+ done
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 10591 "configure"
++#line 10635 "configure"
+ #include "confdefs.h"
+ #include <${cf_cv_ncurses_header:-curses.h}>
+ int
+@@ -10600,23 +10644,23 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:10603: \"$ac_link\"") >&5
++if { (eval echo "$as_me:10647: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:10606: \$? = $ac_status" >&5
++ echo "$as_me:10650: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:10609: \"$ac_try\"") >&5
++ { (eval echo "$as_me:10653: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:10612: \$? = $ac_status" >&5
++ echo "$as_me:10656: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+- echo "$as_me:10614: result: yes" >&5
++ echo "$as_me:10658: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ else
+ echo "$as_me: failed program was:" >&5
+ cat "conftest.$ac_ext" >&5
+-echo "$as_me:10619: result: no" >&5
++echo "$as_me:10663: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ LIBS="$cf_ncurses_SAVE"
+ fi
+@@ -10641,13 +10685,13 @@
+ cf_have_ncuconfig=no
+
+ if test "x${PKG_CONFIG:=none}" != xnone; then
+- echo "$as_me:10644: checking pkg-config for $cf_ncuconfig_root" >&5
++ echo "$as_me:10688: 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:10647: result: yes" >&5
++ echo "$as_me:10691: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+
+- echo "$as_me:10650: checking if the $cf_ncuconfig_root package files work" >&5
++ echo "$as_me:10694: 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
+
+@@ -10780,7 +10824,7 @@
+ LIBS="$cf_add_libs"
+
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 10783 "configure"
++#line 10827 "configure"
+ #include "confdefs.h"
+ #include <${cf_cv_ncurses_header:-curses.h}>
+ int
+@@ -10792,37 +10836,37 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:10795: \"$ac_link\"") >&5
++if { (eval echo "$as_me:10839: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:10798: \$? = $ac_status" >&5
++ echo "$as_me:10842: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:10801: \"$ac_try\"") >&5
++ { (eval echo "$as_me:10845: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:10804: \$? = $ac_status" >&5
++ echo "$as_me:10848: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ if test "$cross_compiling" = yes; then
+ cf_test_ncuconfig=maybe
+ else
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 10810 "configure"
++#line 10854 "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:10817: \"$ac_link\"") >&5
++if { (eval echo "$as_me:10861: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:10820: \$? = $ac_status" >&5
++ echo "$as_me:10864: \$? = $ac_status" >&5
+ (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+- { (eval echo "$as_me:10822: \"$ac_try\"") >&5
++ { (eval echo "$as_me:10866: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:10825: \$? = $ac_status" >&5
++ echo "$as_me:10869: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_test_ncuconfig=yes
+ else
+@@ -10996,7 +11040,7 @@
+ LIBS="$cf_add_libs"
+
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 10999 "configure"
++#line 11043 "configure"
+ #include "confdefs.h"
+ #include <${cf_cv_ncurses_header:-curses.h}>
+ int
+@@ -11008,37 +11052,37 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:11011: \"$ac_link\"") >&5
++if { (eval echo "$as_me:11055: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:11014: \$? = $ac_status" >&5
++ echo "$as_me:11058: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:11017: \"$ac_try\"") >&5
++ { (eval echo "$as_me:11061: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:11020: \$? = $ac_status" >&5
++ echo "$as_me:11064: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ if test "$cross_compiling" = yes; then
+ cf_have_ncuconfig=maybe
+ else
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 11026 "configure"
++#line 11070 "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:11033: \"$ac_link\"") >&5
++if { (eval echo "$as_me:11077: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:11036: \$? = $ac_status" >&5
++ echo "$as_me:11080: \$? = $ac_status" >&5
+ (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+- { (eval echo "$as_me:11038: \"$ac_try\"") >&5
++ { (eval echo "$as_me:11082: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:11041: \$? = $ac_status" >&5
++ echo "$as_me:11085: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_have_ncuconfig=yes
+ else
+@@ -11055,7 +11099,7 @@
+ cf_have_ncuconfig=no
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+- echo "$as_me:11058: result: $cf_have_ncuconfig" >&5
++ echo "$as_me:11102: 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"
+@@ -11071,7 +11115,7 @@
+
+ NCURSES_CONFIG_PKG=$cf_ncuconfig_root
+
+-echo "$as_me:11074: checking for terminfo header" >&5
++echo "$as_me:11118: 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
+@@ -11089,7 +11133,7 @@
+ for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h"
+ do
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 11092 "configure"
++#line 11136 "configure"
+ #include "confdefs.h"
+ #include <stdio.h>
+ #include <${cf_cv_ncurses_header:-curses.h}>
+@@ -11104,16 +11148,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:11107: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:11151: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:11110: \$? = $ac_status" >&5
++ echo "$as_me:11154: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:11113: \"$ac_try\"") >&5
++ { (eval echo "$as_me:11157: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:11116: \$? = $ac_status" >&5
++ echo "$as_me:11160: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+
+ cf_cv_term_header="$cf_test"
+@@ -11129,7 +11173,7 @@
+ done
+
+ fi
+-echo "$as_me:11132: result: $cf_cv_term_header" >&5
++echo "$as_me:11176: result: $cf_cv_term_header" >&5
+ echo "${ECHO_T}$cf_cv_term_header" >&6
+
+ # Set definitions to allow ifdef'ing to accommodate subdirectories
+@@ -11164,7 +11208,7 @@
+ fi
+
+ else
+- echo "$as_me:11167: result: no" >&5
++ echo "$as_me:11211: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ NCURSES_CONFIG_PKG=none
+ fi
+@@ -11180,7 +11224,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:11183: checking for $ac_word" >&5
++echo "$as_me:11227: 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
+@@ -11195,7 +11239,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:11198: found $ac_dir/$ac_word" >&5
++echo "$as_me:11242: found $ac_dir/$ac_word" >&5
+ break
+ done
+
+@@ -11203,10 +11247,10 @@
+ fi
+ NCURSES_CONFIG=$ac_cv_prog_NCURSES_CONFIG
+ if test -n "$NCURSES_CONFIG"; then
+- echo "$as_me:11206: result: $NCURSES_CONFIG" >&5
++ echo "$as_me:11250: result: $NCURSES_CONFIG" >&5
+ echo "${ECHO_T}$NCURSES_CONFIG" >&6
+ else
+- echo "$as_me:11209: result: no" >&5
++ echo "$as_me:11253: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+
+@@ -11219,7 +11263,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:11222: checking for $ac_word" >&5
++echo "$as_me:11266: 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
+@@ -11234,7 +11278,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:11237: found $ac_dir/$ac_word" >&5
++echo "$as_me:11281: found $ac_dir/$ac_word" >&5
+ break
+ done
+
+@@ -11242,10 +11286,10 @@
+ fi
+ ac_ct_NCURSES_CONFIG=$ac_cv_prog_ac_ct_NCURSES_CONFIG
+ if test -n "$ac_ct_NCURSES_CONFIG"; then
+- echo "$as_me:11245: result: $ac_ct_NCURSES_CONFIG" >&5
++ echo "$as_me:11289: result: $ac_ct_NCURSES_CONFIG" >&5
+ echo "${ECHO_T}$ac_ct_NCURSES_CONFIG" >&6
+ else
+- echo "$as_me:11248: result: no" >&5
++ echo "$as_me:11292: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+
+@@ -11402,7 +11446,7 @@
+
+ # even with config script, some packages use no-override for curses.h
+
+-echo "$as_me:11405: checking if we have identified curses headers" >&5
++echo "$as_me:11449: 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
+@@ -11414,7 +11458,7 @@
+ curses.h $cf_cv_screen/curses.h
+ do
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 11417 "configure"
++#line 11461 "configure"
+ #include "confdefs.h"
+ #include <${cf_header}>
+ int
+@@ -11426,16 +11470,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:11429: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:11473: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:11432: \$? = $ac_status" >&5
++ echo "$as_me:11476: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:11435: \"$ac_try\"") >&5
++ { (eval echo "$as_me:11479: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:11438: \$? = $ac_status" >&5
++ echo "$as_me:11482: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_ncurses_header=$cf_header; break
+ else
+@@ -11446,11 +11490,11 @@
+ done
+
+ fi
+-echo "$as_me:11449: result: $cf_cv_ncurses_header" >&5
++echo "$as_me:11493: 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:11453: error: No curses header-files found" >&5
++ { { echo "$as_me:11497: error: No curses header-files found" >&5
+ echo "$as_me: error: No curses header-files found" >&2;}
+ { (exit 1); exit 1; }; }
+ fi
+@@ -11460,23 +11504,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:11463: checking for $ac_header" >&5
++echo "$as_me:11507: 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 11469 "configure"
++#line 11513 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:11473: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:11517: \"$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:11479: \$? = $ac_status" >&5
++ echo "$as_me:11523: \$? = $ac_status" >&5
+ (exit "$ac_status"); } >/dev/null; then
+ if test -s conftest.err; then
+ ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -11495,7 +11539,7 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:11498: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
++echo "$as_me:11542: 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
+@@ -11551,7 +11595,7 @@
+ CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
+
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 11554 "configure"
++#line 11598 "configure"
+ #include "confdefs.h"
+ #include <stdio.h>
+ int
+@@ -11563,16 +11607,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:11566: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:11610: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:11569: \$? = $ac_status" >&5
++ echo "$as_me:11613: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:11572: \"$ac_try\"") >&5
++ { (eval echo "$as_me:11616: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:11575: \$? = $ac_status" >&5
++ echo "$as_me:11619: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ :
+ else
+@@ -11589,7 +11633,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}:11592: testing adding $cf_add_incdir to include-path ..." 1>&5
++echo "${as_me:-configure}:11636: testing adding $cf_add_incdir to include-path ..." 1>&5
+
+ CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
+
+@@ -11608,7 +11652,7 @@
+
+ }
+
+-echo "$as_me:11611: checking for $cf_ncuhdr_root header in include-path" >&5
++echo "$as_me:11655: 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
+@@ -11620,7 +11664,7 @@
+ do
+
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 11623 "configure"
++#line 11667 "configure"
+ #include "confdefs.h"
+
+ #include <$cf_header>
+@@ -11644,16 +11688,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:11647: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:11691: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:11650: \$? = $ac_status" >&5
++ echo "$as_me:11694: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:11653: \"$ac_try\"") >&5
++ { (eval echo "$as_me:11697: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:11656: \$? = $ac_status" >&5
++ echo "$as_me:11700: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_ncurses_h=$cf_header
+
+@@ -11668,14 +11712,14 @@
+ done
+
+ fi
+-echo "$as_me:11671: result: $cf_cv_ncurses_h" >&5
++echo "$as_me:11715: 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:11678: checking for $cf_ncuhdr_root include-path" >&5
++echo "$as_me:11722: 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
+@@ -11796,7 +11840,7 @@
+ CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
+
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 11799 "configure"
++#line 11843 "configure"
+ #include "confdefs.h"
+ #include <stdio.h>
+ int
+@@ -11808,16 +11852,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:11811: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:11855: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:11814: \$? = $ac_status" >&5
++ echo "$as_me:11858: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:11817: \"$ac_try\"") >&5
++ { (eval echo "$as_me:11861: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:11820: \$? = $ac_status" >&5
++ echo "$as_me:11864: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ :
+ else
+@@ -11834,7 +11878,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}:11837: testing adding $cf_add_incdir to include-path ..." 1>&5
++echo "${as_me:-configure}:11881: testing adding $cf_add_incdir to include-path ..." 1>&5
+
+ CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
+
+@@ -11857,7 +11901,7 @@
+ do
+
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 11860 "configure"
++#line 11904 "configure"
+ #include "confdefs.h"
+
+ #include <$cf_header>
+@@ -11881,16 +11925,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:11884: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:11928: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:11887: \$? = $ac_status" >&5
++ echo "$as_me:11931: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:11890: \"$ac_try\"") >&5
++ { (eval echo "$as_me:11934: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:11893: \$? = $ac_status" >&5
++ echo "$as_me:11937: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_ncurses_h2=$cf_header
+
+@@ -11911,12 +11955,12 @@
+ CPPFLAGS="$cf_save2_CPPFLAGS"
+ test "$cf_cv_ncurses_h2" != no && break
+ done
+- test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:11914: error: not found" >&5
++ test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:11958: error: not found" >&5
+ echo "$as_me: error: not found" >&2;}
+ { (exit 1); exit 1; }; }
+
+ fi
+-echo "$as_me:11919: result: $cf_cv_ncurses_h2" >&5
++echo "$as_me:11963: 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%/[^/]*$%%'`
+@@ -11952,7 +11996,7 @@
+ CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
+
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 11955 "configure"
++#line 11999 "configure"
+ #include "confdefs.h"
+ #include <stdio.h>
+ int
+@@ -11964,16 +12008,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:11967: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:12011: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:11970: \$? = $ac_status" >&5
++ echo "$as_me:12014: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:11973: \"$ac_try\"") >&5
++ { (eval echo "$as_me:12017: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:11976: \$? = $ac_status" >&5
++ echo "$as_me:12020: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ :
+ else
+@@ -11990,7 +12034,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}:11993: testing adding $cf_add_incdir to include-path ..." 1>&5
++echo "${as_me:-configure}:12037: testing adding $cf_add_incdir to include-path ..." 1>&5
+
+ CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
+
+@@ -12038,7 +12082,7 @@
+ ;;
+ esac
+
+-echo "$as_me:12041: checking for terminfo header" >&5
++echo "$as_me:12085: 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
+@@ -12056,7 +12100,7 @@
+ for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h"
+ do
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 12059 "configure"
++#line 12103 "configure"
+ #include "confdefs.h"
+ #include <stdio.h>
+ #include <${cf_cv_ncurses_header:-curses.h}>
+@@ -12071,16 +12115,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:12074: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:12118: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:12077: \$? = $ac_status" >&5
++ echo "$as_me:12121: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:12080: \"$ac_try\"") >&5
++ { (eval echo "$as_me:12124: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:12083: \$? = $ac_status" >&5
++ echo "$as_me:12127: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+
+ cf_cv_term_header="$cf_test"
+@@ -12096,7 +12140,7 @@
+ done
+
+ fi
+-echo "$as_me:12099: result: $cf_cv_term_header" >&5
++echo "$as_me:12143: result: $cf_cv_term_header" >&5
+ echo "${ECHO_T}$cf_cv_term_header" >&6
+
+ # Set definitions to allow ifdef'ing to accommodate subdirectories
+@@ -12134,7 +12178,7 @@
+ #define NCURSES 1
+ EOF
+
+-echo "$as_me:12137: checking for ncurses version" >&5
++echo "$as_me:12181: 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
+@@ -12160,10 +12204,10 @@
+ #endif
+ EOF
+ cf_try="$ac_cpp conftest.$ac_ext 2>&5 | grep '^Autoconf ' >conftest.out"
+- { (eval echo "$as_me:12163: \"$cf_try\"") >&5
++ { (eval echo "$as_me:12207: \"$cf_try\"") >&5
+ (eval $cf_try) 2>&5
+ ac_status=$?
+- echo "$as_me:12166: \$? = $ac_status" >&5
++ echo "$as_me:12210: \$? = $ac_status" >&5
+ (exit "$ac_status"); }
+ if test -f conftest.out ; then
+ cf_out=`sed -e 's%^Autoconf %%' -e 's%^[^"]*"%%' -e 's%".*%%' conftest.out`
+@@ -12173,7 +12217,7 @@
+
+ else
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 12176 "configure"
++#line 12220 "configure"
+ #include "confdefs.h"
+
+ $ac_includes_default
+@@ -12200,15 +12244,15 @@
+ }
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:12203: \"$ac_link\"") >&5
++if { (eval echo "$as_me:12247: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:12206: \$? = $ac_status" >&5
++ echo "$as_me:12250: \$? = $ac_status" >&5
+ (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+- { (eval echo "$as_me:12208: \"$ac_try\"") >&5
++ { (eval echo "$as_me:12252: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:12211: \$? = $ac_status" >&5
++ echo "$as_me:12255: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+
+ cf_cv_ncurses_version=`cat $cf_tempfile`
+@@ -12222,7 +12266,7 @@
+ rm -f "$cf_tempfile"
+
+ fi
+-echo "$as_me:12225: result: $cf_cv_ncurses_version" >&5
++echo "$as_me:12269: result: $cf_cv_ncurses_version" >&5
+ echo "${ECHO_T}$cf_cv_ncurses_version" >&6
+ test "$cf_cv_ncurses_version" = no ||
+ cat >>confdefs.h <<\EOF
+@@ -12235,7 +12279,7 @@
+ # to link gpm.
+ cf_ncurses_LIBS=""
+ cf_ncurses_SAVE="$LIBS"
+-echo "$as_me:12238: checking for Gpm_Open in -lgpm" >&5
++echo "$as_me:12282: 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
+@@ -12243,7 +12287,7 @@
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lgpm $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 12246 "configure"
++#line 12290 "configure"
+ #include "confdefs.h"
+
+ /* Override any gcc2 internal prototype to avoid an error. */
+@@ -12262,16 +12306,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:12265: \"$ac_link\"") >&5
++if { (eval echo "$as_me:12309: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:12268: \$? = $ac_status" >&5
++ echo "$as_me:12312: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:12271: \"$ac_try\"") >&5
++ { (eval echo "$as_me:12315: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:12274: \$? = $ac_status" >&5
++ echo "$as_me:12318: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_lib_gpm_Gpm_Open=yes
+ else
+@@ -12282,10 +12326,10 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:12285: result: $ac_cv_lib_gpm_Gpm_Open" >&5
++echo "$as_me:12329: 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:12288: checking for initscr in -lgpm" >&5
++ echo "$as_me:12332: 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
+@@ -12293,7 +12337,7 @@
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lgpm $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 12296 "configure"
++#line 12340 "configure"
+ #include "confdefs.h"
+
+ /* Override any gcc2 internal prototype to avoid an error. */
+@@ -12312,16 +12356,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:12315: \"$ac_link\"") >&5
++if { (eval echo "$as_me:12359: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:12318: \$? = $ac_status" >&5
++ echo "$as_me:12362: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:12321: \"$ac_try\"") >&5
++ { (eval echo "$as_me:12365: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:12324: \$? = $ac_status" >&5
++ echo "$as_me:12368: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_lib_gpm_initscr=yes
+ else
+@@ -12332,7 +12376,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:12335: result: $ac_cv_lib_gpm_initscr" >&5
++echo "$as_me:12379: 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"
+@@ -12347,7 +12391,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:12350: checking for tgoto in -lmytinfo" >&5
++ echo "$as_me:12394: 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
+@@ -12355,7 +12399,7 @@
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lmytinfo $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 12358 "configure"
++#line 12402 "configure"
+ #include "confdefs.h"
+
+ /* Override any gcc2 internal prototype to avoid an error. */
+@@ -12374,16 +12418,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:12377: \"$ac_link\"") >&5
++if { (eval echo "$as_me:12421: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:12380: \$? = $ac_status" >&5
++ echo "$as_me:12424: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:12383: \"$ac_try\"") >&5
++ { (eval echo "$as_me:12427: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:12386: \$? = $ac_status" >&5
++ echo "$as_me:12430: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_lib_mytinfo_tgoto=yes
+ else
+@@ -12394,7 +12438,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:12397: result: $ac_cv_lib_mytinfo_tgoto" >&5
++echo "$as_me:12441: 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"
+@@ -12443,13 +12487,13 @@
+
+ eval 'cf_cv_have_lib_'"$cf_nculib_root"'=no'
+ cf_libdir=""
+- echo "$as_me:12446: checking for initscr" >&5
++ echo "$as_me:12490: 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 12452 "configure"
++#line 12496 "configure"
+ #include "confdefs.h"
+ #define initscr autoconf_temporary
+ #include <limits.h> /* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -12480,16 +12524,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:12483: \"$ac_link\"") >&5
++if { (eval echo "$as_me:12527: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:12486: \$? = $ac_status" >&5
++ echo "$as_me:12530: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:12489: \"$ac_try\"") >&5
++ { (eval echo "$as_me:12533: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:12492: \$? = $ac_status" >&5
++ echo "$as_me:12536: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_func_initscr=yes
+ else
+@@ -12499,18 +12543,18 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:12502: result: $ac_cv_func_initscr" >&5
++echo "$as_me:12546: 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:12509: checking for initscr in -l$cf_nculib_root" >&5
++ echo "$as_me:12553: 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 12513 "configure"
++#line 12557 "configure"
+ #include "confdefs.h"
+ #include <${cf_cv_ncurses_header:-curses.h}>
+ int
+@@ -12522,25 +12566,25 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:12525: \"$ac_link\"") >&5
++if { (eval echo "$as_me:12569: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:12528: \$? = $ac_status" >&5
++ echo "$as_me:12572: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:12531: \"$ac_try\"") >&5
++ { (eval echo "$as_me:12575: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:12534: \$? = $ac_status" >&5
++ echo "$as_me:12578: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+- echo "$as_me:12536: result: yes" >&5
++ echo "$as_me:12580: 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:12543: result: no" >&5
++echo "$as_me:12587: result: no" >&5
+ echo "${ECHO_T}no" >&6
+
+ cf_search=
+@@ -12608,11 +12652,11 @@
+
+ for cf_libdir in $cf_search
+ do
+- echo "$as_me:12611: checking for -l$cf_nculib_root in $cf_libdir" >&5
++ echo "$as_me:12655: 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 12615 "configure"
++#line 12659 "configure"
+ #include "confdefs.h"
+ #include <${cf_cv_ncurses_header:-curses.h}>
+ int
+@@ -12624,25 +12668,25 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:12627: \"$ac_link\"") >&5
++if { (eval echo "$as_me:12671: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:12630: \$? = $ac_status" >&5
++ echo "$as_me:12674: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:12633: \"$ac_try\"") >&5
++ { (eval echo "$as_me:12677: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:12636: \$? = $ac_status" >&5
++ echo "$as_me:12680: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+- echo "$as_me:12638: result: yes" >&5
++ echo "$as_me:12682: 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:12645: result: no" >&5
++echo "$as_me:12689: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ LIBS="$cf_save_LIBS"
+ fi
+@@ -12657,7 +12701,7 @@
+ eval 'cf_found_library="$cf_cv_have_lib_'"$cf_nculib_root"\"
+
+ if test "$cf_found_library" = no ; then
+- { { echo "$as_me:12660: error: Cannot link $cf_nculib_root library" >&5
++ { { echo "$as_me:12704: error: Cannot link $cf_nculib_root library" >&5
+ echo "$as_me: error: Cannot link $cf_nculib_root library" >&2;}
+ { (exit 1); exit 1; }; }
+ fi
+@@ -12665,7 +12709,7 @@
+ fi
+
+ if test -n "$cf_ncurses_LIBS" ; then
+- echo "$as_me:12668: checking if we can link $cf_nculib_root without $cf_ncurses_LIBS" >&5
++ echo "$as_me:12712: 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
+@@ -12675,7 +12719,7 @@
+ fi
+ done
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 12678 "configure"
++#line 12722 "configure"
+ #include "confdefs.h"
+ #include <${cf_cv_ncurses_header:-curses.h}>
+ int
+@@ -12687,23 +12731,23 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:12690: \"$ac_link\"") >&5
++if { (eval echo "$as_me:12734: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:12693: \$? = $ac_status" >&5
++ echo "$as_me:12737: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:12696: \"$ac_try\"") >&5
++ { (eval echo "$as_me:12740: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:12699: \$? = $ac_status" >&5
++ echo "$as_me:12743: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+- echo "$as_me:12701: result: yes" >&5
++ echo "$as_me:12745: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ else
+ echo "$as_me: failed program was:" >&5
+ cat "conftest.$ac_ext" >&5
+-echo "$as_me:12706: result: no" >&5
++echo "$as_me:12750: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ LIBS="$cf_ncurses_SAVE"
+ fi
+@@ -12723,7 +12767,7 @@
+
+ ;;
+ (pdcurses)
+- echo "$as_me:12726: checking for X" >&5
++ echo "$as_me:12770: checking for X" >&5
+ echo $ECHO_N "checking for X... $ECHO_C" >&6
+
+ # Check whether --with-x or --without-x was given.
+@@ -12827,17 +12871,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 12830 "configure"
++#line 12874 "configure"
+ #include "confdefs.h"
+ #include <X11/Intrinsic.h>
+ _ACEOF
+-if { (eval echo "$as_me:12834: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:12878: \"$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:12840: \$? = $ac_status" >&5
++ echo "$as_me:12884: \$? = $ac_status" >&5
+ (exit "$ac_status"); } >/dev/null; then
+ if test -s conftest.err; then
+ ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -12870,7 +12914,7 @@
+ ac_save_LIBS=$LIBS
+ LIBS="-lXt $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 12873 "configure"
++#line 12917 "configure"
+ #include "confdefs.h"
+ #include <X11/Intrinsic.h>
+ int
+@@ -12882,16 +12926,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:12885: \"$ac_link\"") >&5
++if { (eval echo "$as_me:12929: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:12888: \$? = $ac_status" >&5
++ echo "$as_me:12932: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:12891: \"$ac_try\"") >&5
++ { (eval echo "$as_me:12935: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:12894: \$? = $ac_status" >&5
++ echo "$as_me:12938: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ LIBS=$ac_save_LIBS
+ # We can link X programs with no special library path.
+@@ -12929,7 +12973,7 @@
+ fi # $with_x != no
+
+ if test "$have_x" != yes; then
+- echo "$as_me:12932: result: $have_x" >&5
++ echo "$as_me:12976: result: $have_x" >&5
+ echo "${ECHO_T}$have_x" >&6
+ no_x=yes
+ else
+@@ -12939,7 +12983,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:12942: result: libraries $x_libraries, headers $x_includes" >&5
++ echo "$as_me:12986: result: libraries $x_libraries, headers $x_includes" >&5
+ echo "${ECHO_T}libraries $x_libraries, headers $x_includes" >&6
+ fi
+
+@@ -12966,11 +13010,11 @@
+ # others require no space. Words are not sufficient . . . .
+ case `(uname -sr) 2>/dev/null` in
+ "SunOS 5"*)
+- echo "$as_me:12969: checking whether -R must be followed by a space" >&5
++ echo "$as_me:13013: 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 12973 "configure"
++#line 13017 "configure"
+ #include "confdefs.h"
+
+ int
+@@ -12982,16 +13026,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:12985: \"$ac_link\"") >&5
++if { (eval echo "$as_me:13029: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:12988: \$? = $ac_status" >&5
++ echo "$as_me:13032: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:12991: \"$ac_try\"") >&5
++ { (eval echo "$as_me:13035: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:12994: \$? = $ac_status" >&5
++ echo "$as_me:13038: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_R_nospace=yes
+ else
+@@ -13001,13 +13045,13 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ if test $ac_R_nospace = yes; then
+- echo "$as_me:13004: result: no" >&5
++ echo "$as_me:13048: 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 13010 "configure"
++#line 13054 "configure"
+ #include "confdefs.h"
+
+ int
+@@ -13019,16 +13063,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:13022: \"$ac_link\"") >&5
++if { (eval echo "$as_me:13066: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:13025: \$? = $ac_status" >&5
++ echo "$as_me:13069: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:13028: \"$ac_try\"") >&5
++ { (eval echo "$as_me:13072: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:13031: \$? = $ac_status" >&5
++ echo "$as_me:13075: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_R_space=yes
+ else
+@@ -13038,11 +13082,11 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ if test $ac_R_space = yes; then
+- echo "$as_me:13041: result: yes" >&5
++ echo "$as_me:13085: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ X_LIBS="$X_LIBS -R $x_libraries"
+ else
+- echo "$as_me:13045: result: neither works" >&5
++ echo "$as_me:13089: result: neither works" >&5
+ echo "${ECHO_T}neither works" >&6
+ fi
+ fi
+@@ -13062,7 +13106,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 13065 "configure"
++#line 13109 "configure"
+ #include "confdefs.h"
+
+ /* Override any gcc2 internal prototype to avoid an error. */
+@@ -13081,22 +13125,22 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:13084: \"$ac_link\"") >&5
++if { (eval echo "$as_me:13128: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:13087: \$? = $ac_status" >&5
++ echo "$as_me:13131: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:13090: \"$ac_try\"") >&5
++ { (eval echo "$as_me:13134: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:13093: \$? = $ac_status" >&5
++ echo "$as_me:13137: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ :
+ else
+ echo "$as_me: failed program was:" >&5
+ cat "conftest.$ac_ext" >&5
+-echo "$as_me:13099: checking for dnet_ntoa in -ldnet" >&5
++echo "$as_me:13143: 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
+@@ -13104,7 +13148,7 @@
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-ldnet $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 13107 "configure"
++#line 13151 "configure"
+ #include "confdefs.h"
+
+ /* Override any gcc2 internal prototype to avoid an error. */
+@@ -13123,16 +13167,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:13126: \"$ac_link\"") >&5
++if { (eval echo "$as_me:13170: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:13129: \$? = $ac_status" >&5
++ echo "$as_me:13173: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:13132: \"$ac_try\"") >&5
++ { (eval echo "$as_me:13176: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:13135: \$? = $ac_status" >&5
++ echo "$as_me:13179: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_lib_dnet_dnet_ntoa=yes
+ else
+@@ -13143,14 +13187,14 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:13146: result: $ac_cv_lib_dnet_dnet_ntoa" >&5
++echo "$as_me:13190: 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:13153: checking for dnet_ntoa in -ldnet_stub" >&5
++ echo "$as_me:13197: 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
+@@ -13158,7 +13202,7 @@
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-ldnet_stub $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 13161 "configure"
++#line 13205 "configure"
+ #include "confdefs.h"
+
+ /* Override any gcc2 internal prototype to avoid an error. */
+@@ -13177,16 +13221,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:13180: \"$ac_link\"") >&5
++if { (eval echo "$as_me:13224: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:13183: \$? = $ac_status" >&5
++ echo "$as_me:13227: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:13186: \"$ac_try\"") >&5
++ { (eval echo "$as_me:13230: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:13189: \$? = $ac_status" >&5
++ echo "$as_me:13233: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_lib_dnet_stub_dnet_ntoa=yes
+ else
+@@ -13197,7 +13241,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:13200: result: $ac_cv_lib_dnet_stub_dnet_ntoa" >&5
++echo "$as_me:13244: 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"
+@@ -13216,13 +13260,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:13219: checking for gethostbyname" >&5
++ echo "$as_me:13263: 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 13225 "configure"
++#line 13269 "configure"
+ #include "confdefs.h"
+ #define gethostbyname autoconf_temporary
+ #include <limits.h> /* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -13253,16 +13297,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:13256: \"$ac_link\"") >&5
++if { (eval echo "$as_me:13300: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:13259: \$? = $ac_status" >&5
++ echo "$as_me:13303: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:13262: \"$ac_try\"") >&5
++ { (eval echo "$as_me:13306: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:13265: \$? = $ac_status" >&5
++ echo "$as_me:13309: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_func_gethostbyname=yes
+ else
+@@ -13272,11 +13316,11 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:13275: result: $ac_cv_func_gethostbyname" >&5
++echo "$as_me:13319: 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:13279: checking for gethostbyname in -lnsl" >&5
++ echo "$as_me:13323: 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
+@@ -13284,7 +13328,7 @@
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lnsl $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 13287 "configure"
++#line 13331 "configure"
+ #include "confdefs.h"
+
+ /* Override any gcc2 internal prototype to avoid an error. */
+@@ -13303,16 +13347,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:13306: \"$ac_link\"") >&5
++if { (eval echo "$as_me:13350: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:13309: \$? = $ac_status" >&5
++ echo "$as_me:13353: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:13312: \"$ac_try\"") >&5
++ { (eval echo "$as_me:13356: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:13315: \$? = $ac_status" >&5
++ echo "$as_me:13359: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_lib_nsl_gethostbyname=yes
+ else
+@@ -13323,14 +13367,14 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:13326: result: $ac_cv_lib_nsl_gethostbyname" >&5
++echo "$as_me:13370: 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:13333: checking for gethostbyname in -lbsd" >&5
++ echo "$as_me:13377: 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
+@@ -13338,7 +13382,7 @@
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lbsd $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 13341 "configure"
++#line 13385 "configure"
+ #include "confdefs.h"
+
+ /* Override any gcc2 internal prototype to avoid an error. */
+@@ -13357,16 +13401,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:13360: \"$ac_link\"") >&5
++if { (eval echo "$as_me:13404: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:13363: \$? = $ac_status" >&5
++ echo "$as_me:13407: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:13366: \"$ac_try\"") >&5
++ { (eval echo "$as_me:13410: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:13369: \$? = $ac_status" >&5
++ echo "$as_me:13413: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_lib_bsd_gethostbyname=yes
+ else
+@@ -13377,7 +13421,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:13380: result: $ac_cv_lib_bsd_gethostbyname" >&5
++echo "$as_me:13424: 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"
+@@ -13393,13 +13437,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:13396: checking for connect" >&5
++ echo "$as_me:13440: 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 13402 "configure"
++#line 13446 "configure"
+ #include "confdefs.h"
+ #define connect autoconf_temporary
+ #include <limits.h> /* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -13430,16 +13474,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:13433: \"$ac_link\"") >&5
++if { (eval echo "$as_me:13477: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:13436: \$? = $ac_status" >&5
++ echo "$as_me:13480: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:13439: \"$ac_try\"") >&5
++ { (eval echo "$as_me:13483: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:13442: \$? = $ac_status" >&5
++ echo "$as_me:13486: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_func_connect=yes
+ else
+@@ -13449,11 +13493,11 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:13452: result: $ac_cv_func_connect" >&5
++echo "$as_me:13496: 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:13456: checking for connect in -lsocket" >&5
++ echo "$as_me:13500: 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
+@@ -13461,7 +13505,7 @@
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lsocket $X_EXTRA_LIBS $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 13464 "configure"
++#line 13508 "configure"
+ #include "confdefs.h"
+
+ /* Override any gcc2 internal prototype to avoid an error. */
+@@ -13480,16 +13524,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:13483: \"$ac_link\"") >&5
++if { (eval echo "$as_me:13527: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:13486: \$? = $ac_status" >&5
++ echo "$as_me:13530: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:13489: \"$ac_try\"") >&5
++ { (eval echo "$as_me:13533: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:13492: \$? = $ac_status" >&5
++ echo "$as_me:13536: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_lib_socket_connect=yes
+ else
+@@ -13500,7 +13544,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:13503: result: $ac_cv_lib_socket_connect" >&5
++echo "$as_me:13547: 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"
+@@ -13509,13 +13553,13 @@
+ fi
+
+ # Guillermo Gomez says -lposix is necessary on A/UX.
+- echo "$as_me:13512: checking for remove" >&5
++ echo "$as_me:13556: 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 13518 "configure"
++#line 13562 "configure"
+ #include "confdefs.h"
+ #define remove autoconf_temporary
+ #include <limits.h> /* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -13546,16 +13590,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:13549: \"$ac_link\"") >&5
++if { (eval echo "$as_me:13593: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:13552: \$? = $ac_status" >&5
++ echo "$as_me:13596: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:13555: \"$ac_try\"") >&5
++ { (eval echo "$as_me:13599: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:13558: \$? = $ac_status" >&5
++ echo "$as_me:13602: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_func_remove=yes
+ else
+@@ -13565,11 +13609,11 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:13568: result: $ac_cv_func_remove" >&5
++echo "$as_me:13612: 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:13572: checking for remove in -lposix" >&5
++ echo "$as_me:13616: 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
+@@ -13577,7 +13621,7 @@
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lposix $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 13580 "configure"
++#line 13624 "configure"
+ #include "confdefs.h"
+
+ /* Override any gcc2 internal prototype to avoid an error. */
+@@ -13596,16 +13640,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:13599: \"$ac_link\"") >&5
++if { (eval echo "$as_me:13643: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:13602: \$? = $ac_status" >&5
++ echo "$as_me:13646: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:13605: \"$ac_try\"") >&5
++ { (eval echo "$as_me:13649: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:13608: \$? = $ac_status" >&5
++ echo "$as_me:13652: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_lib_posix_remove=yes
+ else
+@@ -13616,7 +13660,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:13619: result: $ac_cv_lib_posix_remove" >&5
++echo "$as_me:13663: 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"
+@@ -13625,13 +13669,13 @@
+ fi
+
+ # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay.
+- echo "$as_me:13628: checking for shmat" >&5
++ echo "$as_me:13672: 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 13634 "configure"
++#line 13678 "configure"
+ #include "confdefs.h"
+ #define shmat autoconf_temporary
+ #include <limits.h> /* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -13662,16 +13706,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:13665: \"$ac_link\"") >&5
++if { (eval echo "$as_me:13709: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:13668: \$? = $ac_status" >&5
++ echo "$as_me:13712: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:13671: \"$ac_try\"") >&5
++ { (eval echo "$as_me:13715: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:13674: \$? = $ac_status" >&5
++ echo "$as_me:13718: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_func_shmat=yes
+ else
+@@ -13681,11 +13725,11 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:13684: result: $ac_cv_func_shmat" >&5
++echo "$as_me:13728: 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:13688: checking for shmat in -lipc" >&5
++ echo "$as_me:13732: 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
+@@ -13693,7 +13737,7 @@
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lipc $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 13696 "configure"
++#line 13740 "configure"
+ #include "confdefs.h"
+
+ /* Override any gcc2 internal prototype to avoid an error. */
+@@ -13712,16 +13756,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:13715: \"$ac_link\"") >&5
++if { (eval echo "$as_me:13759: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:13718: \$? = $ac_status" >&5
++ echo "$as_me:13762: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:13721: \"$ac_try\"") >&5
++ { (eval echo "$as_me:13765: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:13724: \$? = $ac_status" >&5
++ echo "$as_me:13768: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_lib_ipc_shmat=yes
+ else
+@@ -13732,7 +13776,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:13735: result: $ac_cv_lib_ipc_shmat" >&5
++echo "$as_me:13779: 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"
+@@ -13750,7 +13794,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:13753: checking for IceConnectionNumber in -lICE" >&5
++ echo "$as_me:13797: 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
+@@ -13758,7 +13802,7 @@
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lICE $X_EXTRA_LIBS $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 13761 "configure"
++#line 13805 "configure"
+ #include "confdefs.h"
+
+ /* Override any gcc2 internal prototype to avoid an error. */
+@@ -13777,16 +13821,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:13780: \"$ac_link\"") >&5
++if { (eval echo "$as_me:13824: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:13783: \$? = $ac_status" >&5
++ echo "$as_me:13827: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:13786: \"$ac_try\"") >&5
++ { (eval echo "$as_me:13830: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:13789: \$? = $ac_status" >&5
++ echo "$as_me:13833: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_lib_ICE_IceConnectionNumber=yes
+ else
+@@ -13797,7 +13841,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:13800: result: $ac_cv_lib_ICE_IceConnectionNumber" >&5
++echo "$as_me:13844: 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"
+@@ -13809,7 +13853,7 @@
+
+ cf_x_athena=${cf_x_athena:-Xaw}
+
+-echo "$as_me:13812: checking if you want to link with Xaw 3d library" >&5
++echo "$as_me:13856: 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=
+
+@@ -13820,14 +13864,14 @@
+ fi;
+ if test "$withval" = yes ; then
+ cf_x_athena=Xaw3d
+- echo "$as_me:13823: result: yes" >&5
++ echo "$as_me:13867: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ else
+- echo "$as_me:13826: result: no" >&5
++ echo "$as_me:13870: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+
+-echo "$as_me:13830: checking if you want to link with Xaw 3d xft library" >&5
++echo "$as_me:13874: 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=
+
+@@ -13838,14 +13882,14 @@
+ fi;
+ if test "$withval" = yes ; then
+ cf_x_athena=Xaw3dxft
+- echo "$as_me:13841: result: yes" >&5
++ echo "$as_me:13885: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ else
+- echo "$as_me:13844: result: no" >&5
++ echo "$as_me:13888: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+
+-echo "$as_me:13848: checking if you want to link with neXT Athena library" >&5
++echo "$as_me:13892: 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=
+
+@@ -13856,14 +13900,14 @@
+ fi;
+ if test "$withval" = yes ; then
+ cf_x_athena=neXtaw
+- echo "$as_me:13859: result: yes" >&5
++ echo "$as_me:13903: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ else
+- echo "$as_me:13862: result: no" >&5
++ echo "$as_me:13906: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+
+-echo "$as_me:13866: checking if you want to link with Athena-Plus library" >&5
++echo "$as_me:13910: 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=
+
+@@ -13874,10 +13918,10 @@
+ fi;
+ if test "$withval" = yes ; then
+ cf_x_athena=XawPlus
+- echo "$as_me:13877: result: yes" >&5
++ echo "$as_me:13921: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ else
+- echo "$as_me:13880: result: no" >&5
++ echo "$as_me:13924: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+
+@@ -13897,17 +13941,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}:13900: testing found package $cf_athena_pkg ..." 1>&5
++echo "${as_me:-configure}:13944: 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}:13906: testing package $cf_athena_pkg CFLAGS: $cf_pkgconfig_incs ..." 1>&5
++echo "${as_me:-configure}:13950: 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}:13910: testing package $cf_athena_pkg LIBS: $cf_pkgconfig_libs ..." 1>&5
++echo "${as_me:-configure}:13954: testing package $cf_athena_pkg LIBS: $cf_pkgconfig_libs ..." 1>&5
+
+ cf_fix_cppflags=no
+ cf_new_cflags=
+@@ -14038,20 +14082,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}:14041: testing ..trimmed $LIBS ..." 1>&5
++echo "${as_me:-configure}:14085: testing ..trimmed $LIBS ..." 1>&5
+
+ ;;
+ esac
+ done
+
+-echo "$as_me:14047: checking for usable $cf_x_athena/Xmu package" >&5
++echo "$as_me:14091: 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 14054 "configure"
++#line 14098 "configure"
+ #include "confdefs.h"
+
+ $ac_includes_default
+@@ -14069,16 +14113,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:14072: \"$ac_link\"") >&5
++if { (eval echo "$as_me:14116: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:14075: \$? = $ac_status" >&5
++ echo "$as_me:14119: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:14078: \"$ac_try\"") >&5
++ { (eval echo "$as_me:14122: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:14081: \$? = $ac_status" >&5
++ echo "$as_me:14125: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_xaw_compat=yes
+ else
+@@ -14088,7 +14132,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:14091: result: $cf_cv_xaw_compat" >&5
++echo "$as_me:14135: result: $cf_cv_xaw_compat" >&5
+ echo "${ECHO_T}$cf_cv_xaw_compat" >&6
+
+ if test "$cf_cv_xaw_compat" = no
+@@ -14100,7 +14144,7 @@
+ (*)
+ test -n "$verbose" && echo " work around broken package" 1>&6
+
+-echo "${as_me:-configure}:14103: testing work around broken package ..." 1>&5
++echo "${as_me:-configure}:14147: testing work around broken package ..." 1>&5
+
+ cf_save_xmu="$LIBS"
+ cf_first_lib=`echo "$cf_save_xmu" | sed -e 's/^ *//' -e 's/ .*//'`
+@@ -14108,17 +14152,17 @@
+ if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists "xmu"; then
+ test -n "$verbose" && echo " found package xmu" 1>&6
+
+-echo "${as_me:-configure}:14111: testing found package xmu ..." 1>&5
++echo "${as_me:-configure}:14155: 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}:14117: testing package xmu CFLAGS: $cf_pkgconfig_incs ..." 1>&5
++echo "${as_me:-configure}:14161: 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}:14121: testing package xmu LIBS: $cf_pkgconfig_libs ..." 1>&5
++echo "${as_me:-configure}:14165: testing package xmu LIBS: $cf_pkgconfig_libs ..." 1>&5
+
+ cf_fix_cppflags=no
+ cf_new_cflags=
+@@ -14238,12 +14282,12 @@
+
+ test -n "$verbose" && echo " ...before $LIBS" 1>&6
+
+-echo "${as_me:-configure}:14241: testing ...before $LIBS ..." 1>&5
++echo "${as_me:-configure}:14285: 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}:14246: testing ...after $LIBS ..." 1>&5
++echo "${as_me:-configure}:14290: testing ...after $LIBS ..." 1>&5
+
+ else
+ cf_pkgconfig_incs=
+@@ -14251,12 +14295,12 @@
+
+ test -n "$verbose" && echo " ...before $LIBS" 1>&6
+
+-echo "${as_me:-configure}:14254: testing ...before $LIBS ..." 1>&5
++echo "${as_me:-configure}:14298: 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}:14259: testing ...after $LIBS ..." 1>&5
++echo "${as_me:-configure}:14303: testing ...after $LIBS ..." 1>&5
+
+ fi
+
+@@ -14267,7 +14311,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}:14270: testing ..trimmed $LIBS ..." 1>&5
++echo "${as_me:-configure}:14314: testing ..trimmed $LIBS ..." 1>&5
+
+ ;;
+ esac
+@@ -14292,17 +14336,17 @@
+ if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists "Xext"; then
+ test -n "$verbose" && echo " found package Xext" 1>&6
+
+-echo "${as_me:-configure}:14295: testing found package Xext ..." 1>&5
++echo "${as_me:-configure}:14339: 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}:14301: testing package Xext CFLAGS: $cf_pkgconfig_incs ..." 1>&5
++echo "${as_me:-configure}:14345: 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}:14305: testing package Xext LIBS: $cf_pkgconfig_libs ..." 1>&5
++echo "${as_me:-configure}:14349: testing package Xext LIBS: $cf_pkgconfig_libs ..." 1>&5
+
+ cf_fix_cppflags=no
+ cf_new_cflags=
+@@ -14423,7 +14467,7 @@
+ cf_pkgconfig_incs=
+ cf_pkgconfig_libs=
+
+- echo "$as_me:14426: checking for XextCreateExtension in -lXext" >&5
++ echo "$as_me:14470: 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
+@@ -14431,7 +14475,7 @@
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lXext $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 14434 "configure"
++#line 14478 "configure"
+ #include "confdefs.h"
+
+ /* Override any gcc2 internal prototype to avoid an error. */
+@@ -14450,16 +14494,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:14453: \"$ac_link\"") >&5
++if { (eval echo "$as_me:14497: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:14456: \$? = $ac_status" >&5
++ echo "$as_me:14500: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:14459: \"$ac_try\"") >&5
++ { (eval echo "$as_me:14503: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:14462: \$? = $ac_status" >&5
++ echo "$as_me:14506: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_lib_Xext_XextCreateExtension=yes
+ else
+@@ -14470,7 +14514,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:14473: result: $ac_cv_lib_Xext_XextCreateExtension" >&5
++echo "$as_me:14517: 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
+
+@@ -14506,17 +14550,17 @@
+ if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists "x11"; then
+ test -n "$verbose" && echo " found package x11" 1>&6
+
+-echo "${as_me:-configure}:14509: testing found package x11 ..." 1>&5
++echo "${as_me:-configure}:14553: 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}:14515: testing package x11 CFLAGS: $cf_pkgconfig_incs ..." 1>&5
++echo "${as_me:-configure}:14559: 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}:14519: testing package x11 LIBS: $cf_pkgconfig_libs ..." 1>&5
++echo "${as_me:-configure}:14563: testing package x11 LIBS: $cf_pkgconfig_libs ..." 1>&5
+
+ cf_fix_cppflags=no
+ cf_new_cflags=
+@@ -14636,24 +14680,24 @@
+ else
+ cf_pkgconfig_incs=
+ cf_pkgconfig_libs=
+- { echo "$as_me:14639: WARNING: unable to find X11 library" >&5
++ { echo "$as_me:14683: 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}:14646: testing found package ice ..." 1>&5
++echo "${as_me:-configure}:14690: 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}:14652: testing package ice CFLAGS: $cf_pkgconfig_incs ..." 1>&5
++echo "${as_me:-configure}:14696: 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}:14656: testing package ice LIBS: $cf_pkgconfig_libs ..." 1>&5
++echo "${as_me:-configure}:14700: testing package ice LIBS: $cf_pkgconfig_libs ..." 1>&5
+
+ cf_fix_cppflags=no
+ cf_new_cflags=
+@@ -14773,24 +14817,24 @@
+ else
+ cf_pkgconfig_incs=
+ cf_pkgconfig_libs=
+- { echo "$as_me:14776: WARNING: unable to find ICE library" >&5
++ { echo "$as_me:14820: 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}:14783: testing found package sm ..." 1>&5
++echo "${as_me:-configure}:14827: 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}:14789: testing package sm CFLAGS: $cf_pkgconfig_incs ..." 1>&5
++echo "${as_me:-configure}:14833: 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}:14793: testing package sm LIBS: $cf_pkgconfig_libs ..." 1>&5
++echo "${as_me:-configure}:14837: testing package sm LIBS: $cf_pkgconfig_libs ..." 1>&5
+
+ cf_fix_cppflags=no
+ cf_new_cflags=
+@@ -14910,24 +14954,24 @@
+ else
+ cf_pkgconfig_incs=
+ cf_pkgconfig_libs=
+- { echo "$as_me:14913: WARNING: unable to find SM library" >&5
++ { echo "$as_me:14957: 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}:14920: testing found package xt ..." 1>&5
++echo "${as_me:-configure}:14964: 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}:14926: testing package xt CFLAGS: $cf_pkgconfig_incs ..." 1>&5
++echo "${as_me:-configure}:14970: 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}:14930: testing package xt LIBS: $cf_pkgconfig_libs ..." 1>&5
++echo "${as_me:-configure}:14974: testing package xt LIBS: $cf_pkgconfig_libs ..." 1>&5
+
+ cf_fix_cppflags=no
+ cf_new_cflags=
+@@ -15047,7 +15091,7 @@
+ else
+ cf_pkgconfig_incs=
+ cf_pkgconfig_libs=
+- { echo "$as_me:15050: WARNING: unable to find Xt library" >&5
++ { echo "$as_me:15094: WARNING: unable to find Xt library" >&5
+ echo "$as_me: WARNING: unable to find Xt library" >&2;}
+ fi
+
+@@ -15060,17 +15104,17 @@
+ if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists "xt"; then
+ test -n "$verbose" && echo " found package xt" 1>&6
+
+-echo "${as_me:-configure}:15063: testing found package xt ..." 1>&5
++echo "${as_me:-configure}:15107: 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}:15069: testing package xt CFLAGS: $cf_pkgconfig_incs ..." 1>&5
++echo "${as_me:-configure}:15113: 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}:15073: testing package xt LIBS: $cf_pkgconfig_libs ..." 1>&5
++echo "${as_me:-configure}:15117: testing package xt LIBS: $cf_pkgconfig_libs ..." 1>&5
+
+ cf_fix_cppflags=no
+ cf_new_cflags=
+@@ -15191,14 +15235,14 @@
+ ;;
+ (*)
+ # we have an "xt" package, but it may omit Xt's dependency on X11
+-echo "$as_me:15194: checking for usable X dependency" >&5
++echo "$as_me:15238: 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 15201 "configure"
++#line 15245 "configure"
+ #include "confdefs.h"
+
+ $ac_includes_default
+@@ -15218,16 +15262,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:15221: \"$ac_link\"") >&5
++if { (eval echo "$as_me:15265: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:15224: \$? = $ac_status" >&5
++ echo "$as_me:15268: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:15227: \"$ac_try\"") >&5
++ { (eval echo "$as_me:15271: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:15230: \$? = $ac_status" >&5
++ echo "$as_me:15274: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_xt_x11_compat=yes
+ else
+@@ -15237,30 +15281,30 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:15240: result: $cf_cv_xt_x11_compat" >&5
++echo "$as_me:15284: 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}:15246: testing work around broken X11 dependency ..." 1>&5
++echo "${as_me:-configure}:15290: 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}:15253: testing found package x11 ..." 1>&5
++echo "${as_me:-configure}:15297: 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}:15259: testing package x11 CFLAGS: $cf_pkgconfig_incs ..." 1>&5
++echo "${as_me:-configure}:15303: 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}:15263: testing package x11 LIBS: $cf_pkgconfig_libs ..." 1>&5
++echo "${as_me:-configure}:15307: testing package x11 LIBS: $cf_pkgconfig_libs ..." 1>&5
+
+ cf_fix_cppflags=no
+ cf_new_cflags=
+@@ -15383,12 +15427,12 @@
+
+ test -n "$verbose" && echo " ...before $LIBS" 1>&6
+
+-echo "${as_me:-configure}:15386: testing ...before $LIBS ..." 1>&5
++echo "${as_me:-configure}:15430: 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}:15391: testing ...after $LIBS ..." 1>&5
++echo "${as_me:-configure}:15435: testing ...after $LIBS ..." 1>&5
+
+ fi
+
+@@ -15396,14 +15440,14 @@
+ ;;
+ esac
+
+-echo "$as_me:15399: checking for usable X Toolkit package" >&5
++echo "$as_me:15443: 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 15406 "configure"
++#line 15450 "configure"
+ #include "confdefs.h"
+
+ $ac_includes_default
+@@ -15419,16 +15463,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:15422: \"$ac_link\"") >&5
++if { (eval echo "$as_me:15466: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:15425: \$? = $ac_status" >&5
++ echo "$as_me:15469: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:15428: \"$ac_try\"") >&5
++ { (eval echo "$as_me:15472: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:15431: \$? = $ac_status" >&5
++ echo "$as_me:15475: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_xt_ice_compat=yes
+ else
+@@ -15438,7 +15482,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:15441: result: $cf_cv_xt_ice_compat" >&5
++echo "$as_me:15485: result: $cf_cv_xt_ice_compat" >&5
+ echo "${ECHO_T}$cf_cv_xt_ice_compat" >&6
+
+ if test "$cf_cv_xt_ice_compat" = no
+@@ -15452,22 +15496,22 @@
+ (*)
+ test -n "$verbose" && echo " work around broken ICE dependency" 1>&6
+
+-echo "${as_me:-configure}:15455: testing work around broken ICE dependency ..." 1>&5
++echo "${as_me:-configure}:15499: 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}:15460: testing found package ice ..." 1>&5
++echo "${as_me:-configure}:15504: 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}:15466: testing package ice CFLAGS: $cf_pkgconfig_incs ..." 1>&5
++echo "${as_me:-configure}:15510: 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}:15470: testing package ice LIBS: $cf_pkgconfig_libs ..." 1>&5
++echo "${as_me:-configure}:15514: testing package ice LIBS: $cf_pkgconfig_libs ..." 1>&5
+
+ cf_fix_cppflags=no
+ cf_new_cflags=
+@@ -15586,17 +15630,17 @@
+ if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists "sm"; then
+ test -n "$verbose" && echo " found package sm" 1>&6
+
+-echo "${as_me:-configure}:15589: testing found package sm ..." 1>&5
++echo "${as_me:-configure}:15633: 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}:15595: testing package sm CFLAGS: $cf_pkgconfig_incs ..." 1>&5
++echo "${as_me:-configure}:15639: 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}:15599: testing package sm LIBS: $cf_pkgconfig_libs ..." 1>&5
++echo "${as_me:-configure}:15643: testing package sm LIBS: $cf_pkgconfig_libs ..." 1>&5
+
+ cf_fix_cppflags=no
+ cf_new_cflags=
+@@ -15725,12 +15769,12 @@
+
+ test -n "$verbose" && echo " ...before $LIBS" 1>&6
+
+-echo "${as_me:-configure}:15728: testing ...before $LIBS ..." 1>&5
++echo "${as_me:-configure}:15772: 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}:15733: testing ...after $LIBS ..." 1>&5
++echo "${as_me:-configure}:15777: testing ...after $LIBS ..." 1>&5
+
+ fi
+
+@@ -15750,7 +15794,7 @@
+
+ test -n "$verbose" && echo " checking additions to CFLAGS" 1>&6
+
+-echo "${as_me:-configure}:15753: testing checking additions to CFLAGS ..." 1>&5
++echo "${as_me:-configure}:15797: testing checking additions to CFLAGS ..." 1>&5
+
+ cf_check_cflags="$CFLAGS"
+ cf_check_cppflags="$CPPFLAGS"
+@@ -15835,7 +15879,7 @@
+ if test -n "$cf_new_cflags" ; then
+ test -n "$verbose" && echo " add to \$CFLAGS $cf_new_cflags" 1>&6
+
+-echo "${as_me:-configure}:15838: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
++echo "${as_me:-configure}:15882: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
+
+ test -n "$CFLAGS" && CFLAGS="$CFLAGS "
+ CFLAGS="${CFLAGS}$cf_new_cflags"
+@@ -15845,7 +15889,7 @@
+ if test -n "$cf_new_cppflags" ; then
+ test -n "$verbose" && echo " add to \$CPPFLAGS $cf_new_cppflags" 1>&6
+
+-echo "${as_me:-configure}:15848: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
++echo "${as_me:-configure}:15892: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
+
+ test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
+ CPPFLAGS="${CPPFLAGS}$cf_new_cppflags"
+@@ -15855,7 +15899,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}:15858: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5
++echo "${as_me:-configure}:15902: 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"
+@@ -15864,7 +15908,7 @@
+
+ if test "x$cf_check_cflags" != "x$CFLAGS" ; then
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 15867 "configure"
++#line 15911 "configure"
+ #include "confdefs.h"
+ #include <stdio.h>
+ int
+@@ -15876,16 +15920,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:15879: \"$ac_link\"") >&5
++if { (eval echo "$as_me:15923: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:15882: \$? = $ac_status" >&5
++ echo "$as_me:15926: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:15885: \"$ac_try\"") >&5
++ { (eval echo "$as_me:15929: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:15888: \$? = $ac_status" >&5
++ echo "$as_me:15932: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ :
+ else
+@@ -15893,12 +15937,12 @@
+ cat "conftest.$ac_ext" >&5
+ test -n "$verbose" && echo " test-compile failed. Undoing change to \$CFLAGS" 1>&6
+
+-echo "${as_me:-configure}:15896: testing test-compile failed. Undoing change to \$CFLAGS ..." 1>&5
++echo "${as_me:-configure}:15940: 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}:15901: testing but keeping change to \$CPPFLAGS ..." 1>&5
++echo "${as_me:-configure}:15945: testing but keeping change to \$CPPFLAGS ..." 1>&5
+
+ fi
+ CFLAGS="$cf_check_cflags"
+@@ -15906,13 +15950,13 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+
+- echo "$as_me:15909: checking for XOpenDisplay" >&5
++ echo "$as_me:15953: 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 15915 "configure"
++#line 15959 "configure"
+ #include "confdefs.h"
+ #define XOpenDisplay autoconf_temporary
+ #include <limits.h> /* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -15943,16 +15987,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:15946: \"$ac_link\"") >&5
++if { (eval echo "$as_me:15990: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:15949: \$? = $ac_status" >&5
++ echo "$as_me:15993: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:15952: \"$ac_try\"") >&5
++ { (eval echo "$as_me:15996: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:15955: \$? = $ac_status" >&5
++ echo "$as_me:15999: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_func_XOpenDisplay=yes
+ else
+@@ -15962,13 +16006,13 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:15965: result: $ac_cv_func_XOpenDisplay" >&5
++echo "$as_me:16009: 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:15971: checking for XOpenDisplay in -lX11" >&5
++ echo "$as_me:16015: 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
+@@ -15976,7 +16020,7 @@
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lX11 $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 15979 "configure"
++#line 16023 "configure"
+ #include "confdefs.h"
+
+ /* Override any gcc2 internal prototype to avoid an error. */
+@@ -15995,16 +16039,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:15998: \"$ac_link\"") >&5
++if { (eval echo "$as_me:16042: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:16001: \$? = $ac_status" >&5
++ echo "$as_me:16045: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:16004: \"$ac_try\"") >&5
++ { (eval echo "$as_me:16048: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:16007: \$? = $ac_status" >&5
++ echo "$as_me:16051: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_lib_X11_XOpenDisplay=yes
+ else
+@@ -16015,7 +16059,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:16018: result: $ac_cv_lib_X11_XOpenDisplay" >&5
++echo "$as_me:16062: 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
+
+@@ -16039,13 +16083,13 @@
+
+ fi
+
+- echo "$as_me:16042: checking for XtAppInitialize" >&5
++ echo "$as_me:16086: 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 16048 "configure"
++#line 16092 "configure"
+ #include "confdefs.h"
+ #define XtAppInitialize autoconf_temporary
+ #include <limits.h> /* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -16076,16 +16120,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:16079: \"$ac_link\"") >&5
++if { (eval echo "$as_me:16123: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:16082: \$? = $ac_status" >&5
++ echo "$as_me:16126: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:16085: \"$ac_try\"") >&5
++ { (eval echo "$as_me:16129: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:16088: \$? = $ac_status" >&5
++ echo "$as_me:16132: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_func_XtAppInitialize=yes
+ else
+@@ -16095,13 +16139,13 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:16098: result: $ac_cv_func_XtAppInitialize" >&5
++echo "$as_me:16142: 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:16104: checking for XtAppInitialize in -lXt" >&5
++ echo "$as_me:16148: 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
+@@ -16109,7 +16153,7 @@
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lXt $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 16112 "configure"
++#line 16156 "configure"
+ #include "confdefs.h"
+
+ /* Override any gcc2 internal prototype to avoid an error. */
+@@ -16128,16 +16172,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:16131: \"$ac_link\"") >&5
++if { (eval echo "$as_me:16175: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:16134: \$? = $ac_status" >&5
++ echo "$as_me:16178: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:16137: \"$ac_try\"") >&5
++ { (eval echo "$as_me:16181: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:16140: \$? = $ac_status" >&5
++ echo "$as_me:16184: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_lib_Xt_XtAppInitialize=yes
+ else
+@@ -16148,7 +16192,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:16151: result: $ac_cv_lib_Xt_XtAppInitialize" >&5
++echo "$as_me:16195: 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
+
+@@ -16165,7 +16209,7 @@
+ fi
+
+ if test "$cf_have_X_LIBS" = no ; then
+- { echo "$as_me:16168: WARNING: Unable to successfully link X Toolkit library (-lXt) with
++ { echo "$as_me:16212: 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
+@@ -16206,14 +16250,14 @@
+ test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
+ CPPFLAGS="${CPPFLAGS}-I$cf_path/include"
+
+- echo "$as_me:16209: checking for $cf_test in $cf_path" >&5
++ echo "$as_me:16253: 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:16212: checking for $cf_test" >&5
++ echo "$as_me:16256: checking for $cf_test" >&5
+ echo $ECHO_N "checking for $cf_test... $ECHO_C" >&6
+ fi
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 16216 "configure"
++#line 16260 "configure"
+ #include "confdefs.h"
+
+ #include <X11/Intrinsic.h>
+@@ -16227,16 +16271,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:16230: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:16274: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:16233: \$? = $ac_status" >&5
++ echo "$as_me:16277: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:16236: \"$ac_try\"") >&5
++ { (eval echo "$as_me:16280: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:16239: \$? = $ac_status" >&5
++ echo "$as_me:16283: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_result=yes
+ else
+@@ -16245,7 +16289,7 @@
+ cf_result=no
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+- echo "$as_me:16248: result: $cf_result" >&5
++ echo "$as_me:16292: result: $cf_result" >&5
+ echo "${ECHO_T}$cf_result" >&6
+
+ LIBS="$cf_save_LIBS_CF_X_ATHENA_CPPFLAGS"
+@@ -16261,7 +16305,7 @@
+ done
+
+ if test -z "$cf_x_athena_inc" ; then
+- { echo "$as_me:16264: WARNING: Unable to find Athena header files" >&5
++ { echo "$as_me:16308: 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
+
+@@ -16326,10 +16370,10 @@
+ done
+ LIBS="$cf_add_libs"
+
+- echo "$as_me:16329: checking for $cf_test in $cf_libs" >&5
++ echo "$as_me:16373: 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 16332 "configure"
++#line 16376 "configure"
+ #include "confdefs.h"
+
+ $ac_includes_default
+@@ -16346,16 +16390,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:16349: \"$ac_link\"") >&5
++if { (eval echo "$as_me:16393: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:16352: \$? = $ac_status" >&5
++ echo "$as_me:16396: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:16355: \"$ac_try\"") >&5
++ { (eval echo "$as_me:16399: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:16358: \$? = $ac_status" >&5
++ echo "$as_me:16402: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_result=yes
+ else
+@@ -16364,7 +16408,7 @@
+ cf_result=no
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+- echo "$as_me:16367: result: $cf_result" >&5
++ echo "$as_me:16411: result: $cf_result" >&5
+ echo "${ECHO_T}$cf_result" >&6
+
+ LIBS="$cf_save_LIBS_CF_X_ATHENA_LIBS"
+@@ -16381,7 +16425,7 @@
+ done
+
+ if test -z "$cf_x_athena_lib" ; then
+- { { echo "$as_me:16384: error: Unable to successfully link Athena library (-l$cf_x_athena_root) with test program" >&5
++ { { echo "$as_me:16428: 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
+@@ -16415,7 +16459,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:16418: checking for $ac_word" >&5
++echo "$as_me:16462: 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
+@@ -16430,7 +16474,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:16433: found $ac_dir/$ac_word" >&5
++echo "$as_me:16477: found $ac_dir/$ac_word" >&5
+ break
+ done
+
+@@ -16438,10 +16482,10 @@
+ fi
+ XCURSES_CONFIG=$ac_cv_prog_XCURSES_CONFIG
+ if test -n "$XCURSES_CONFIG"; then
+- echo "$as_me:16441: result: $XCURSES_CONFIG" >&5
++ echo "$as_me:16485: result: $XCURSES_CONFIG" >&5
+ echo "${ECHO_T}$XCURSES_CONFIG" >&6
+ else
+- echo "$as_me:16444: result: no" >&5
++ echo "$as_me:16488: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+
+@@ -16454,7 +16498,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:16457: checking for $ac_word" >&5
++echo "$as_me:16501: 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
+@@ -16469,7 +16513,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:16472: found $ac_dir/$ac_word" >&5
++echo "$as_me:16516: found $ac_dir/$ac_word" >&5
+ break
+ done
+
+@@ -16477,10 +16521,10 @@
+ fi
+ ac_ct_XCURSES_CONFIG=$ac_cv_prog_ac_ct_XCURSES_CONFIG
+ if test -n "$ac_ct_XCURSES_CONFIG"; then
+- echo "$as_me:16480: result: $ac_ct_XCURSES_CONFIG" >&5
++ echo "$as_me:16524: result: $ac_ct_XCURSES_CONFIG" >&5
+ echo "${ECHO_T}$ac_ct_XCURSES_CONFIG" >&6
+ else
+- echo "$as_me:16483: result: no" >&5
++ echo "$as_me:16527: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+
+@@ -16615,7 +16659,7 @@
+
+ test -n "$verbose" && echo " checking additions to CFLAGS" 1>&6
+
+-echo "${as_me:-configure}:16618: testing checking additions to CFLAGS ..." 1>&5
++echo "${as_me:-configure}:16662: testing checking additions to CFLAGS ..." 1>&5
+
+ cf_check_cflags="$CFLAGS"
+ cf_check_cppflags="$CPPFLAGS"
+@@ -16700,7 +16744,7 @@
+ if test -n "$cf_new_cflags" ; then
+ test -n "$verbose" && echo " add to \$CFLAGS $cf_new_cflags" 1>&6
+
+-echo "${as_me:-configure}:16703: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
++echo "${as_me:-configure}:16747: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
+
+ test -n "$CFLAGS" && CFLAGS="$CFLAGS "
+ CFLAGS="${CFLAGS}$cf_new_cflags"
+@@ -16710,7 +16754,7 @@
+ if test -n "$cf_new_cppflags" ; then
+ test -n "$verbose" && echo " add to \$CPPFLAGS $cf_new_cppflags" 1>&6
+
+-echo "${as_me:-configure}:16713: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
++echo "${as_me:-configure}:16757: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
+
+ test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
+ CPPFLAGS="${CPPFLAGS}$cf_new_cppflags"
+@@ -16720,7 +16764,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}:16723: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5
++echo "${as_me:-configure}:16767: 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"
+@@ -16729,7 +16773,7 @@
+
+ if test "x$cf_check_cflags" != "x$CFLAGS" ; then
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 16732 "configure"
++#line 16776 "configure"
+ #include "confdefs.h"
+ #include <stdio.h>
+ int
+@@ -16741,16 +16785,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:16744: \"$ac_link\"") >&5
++if { (eval echo "$as_me:16788: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:16747: \$? = $ac_status" >&5
++ echo "$as_me:16791: \$? = $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:16794: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:16753: \$? = $ac_status" >&5
++ echo "$as_me:16797: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ :
+ else
+@@ -16758,12 +16802,12 @@
+ cat "conftest.$ac_ext" >&5
+ test -n "$verbose" && echo " test-compile failed. Undoing change to \$CFLAGS" 1>&6
+
+-echo "${as_me:-configure}:16761: testing test-compile failed. Undoing change to \$CFLAGS ..." 1>&5
++echo "${as_me:-configure}:16805: 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}:16766: testing but keeping change to \$CPPFLAGS ..." 1>&5
++echo "${as_me:-configure}:16810: testing but keeping change to \$CPPFLAGS ..." 1>&5
+
+ fi
+ CFLAGS="$cf_check_cflags"
+@@ -16771,7 +16815,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+
+-echo "$as_me:16774: checking for XOpenDisplay in -lX11" >&5
++echo "$as_me:16818: 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
+@@ -16779,7 +16823,7 @@
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lX11 $X_PRE_LIBS $LIBS $X_EXTRA_LIBS $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 16782 "configure"
++#line 16826 "configure"
+ #include "confdefs.h"
+
+ /* Override any gcc2 internal prototype to avoid an error. */
+@@ -16798,16 +16842,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:16801: \"$ac_link\"") >&5
++if { (eval echo "$as_me:16845: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:16804: \$? = $ac_status" >&5
++ echo "$as_me:16848: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:16807: \"$ac_try\"") >&5
++ { (eval echo "$as_me:16851: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:16810: \$? = $ac_status" >&5
++ echo "$as_me:16854: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_lib_X11_XOpenDisplay=yes
+ else
+@@ -16818,7 +16862,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:16821: result: $ac_cv_lib_X11_XOpenDisplay" >&5
++echo "$as_me:16865: 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
+
+@@ -16840,7 +16884,7 @@
+
+ fi
+
+-echo "$as_me:16843: checking for XCurses library" >&5
++echo "$as_me:16887: 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
+@@ -16863,7 +16907,7 @@
+ LIBS="$cf_add_libs"
+
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 16866 "configure"
++#line 16910 "configure"
+ #include "confdefs.h"
+
+ #include <xcurses.h>
+@@ -16878,16 +16922,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:16881: \"$ac_link\"") >&5
++if { (eval echo "$as_me:16925: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:16884: \$? = $ac_status" >&5
++ echo "$as_me:16928: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:16887: \"$ac_try\"") >&5
++ { (eval echo "$as_me:16931: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:16890: \$? = $ac_status" >&5
++ echo "$as_me:16934: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_lib_XCurses=yes
+ else
+@@ -16898,7 +16942,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+
+ fi
+-echo "$as_me:16901: result: $cf_cv_lib_XCurses" >&5
++echo "$as_me:16945: result: $cf_cv_lib_XCurses" >&5
+ echo "${ECHO_T}$cf_cv_lib_XCurses" >&6
+
+ fi
+@@ -16913,23 +16957,23 @@
+ #define XCURSES 1
+ EOF
+
+- echo "$as_me:16916: checking for xcurses.h" >&5
++ echo "$as_me:16960: 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 16922 "configure"
++#line 16966 "configure"
+ #include "confdefs.h"
+ #include <xcurses.h>
+ _ACEOF
+-if { (eval echo "$as_me:16926: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:16970: \"$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:16932: \$? = $ac_status" >&5
++ echo "$as_me:16976: \$? = $ac_status" >&5
+ (exit "$ac_status"); } >/dev/null; then
+ if test -s conftest.err; then
+ ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -16948,7 +16992,7 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:16951: result: $ac_cv_header_xcurses_h" >&5
++echo "$as_me:16995: 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
+
+@@ -16959,26 +17003,26 @@
+ fi
+
+ else
+- { { echo "$as_me:16962: error: Cannot link with XCurses" >&5
++ { { echo "$as_me:17006: error: Cannot link with XCurses" >&5
+ echo "$as_me: error: Cannot link with XCurses" >&2;}
+ { (exit 1); exit 1; }; }
+ fi
+
+ ;;
+ (*)
+- { { echo "$as_me:16969: error: unexpected screen-value: $cf_cv_screen" >&5
++ { { echo "$as_me:17013: 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:16975: checking for _nc_init_pthreads" >&5
++echo "$as_me:17019: 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 16981 "configure"
++#line 17025 "configure"
+ #include "confdefs.h"
+ #define _nc_init_pthreads autoconf_temporary
+ #include <limits.h> /* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -17009,16 +17053,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:17012: \"$ac_link\"") >&5
++if { (eval echo "$as_me:17056: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:17015: \$? = $ac_status" >&5
++ echo "$as_me:17059: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:17018: \"$ac_try\"") >&5
++ { (eval echo "$as_me:17062: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:17021: \$? = $ac_status" >&5
++ echo "$as_me:17065: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_func__nc_init_pthreads=yes
+ else
+@@ -17028,7 +17072,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:17031: result: $ac_cv_func__nc_init_pthreads" >&5
++echo "$as_me:17075: 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
+@@ -17063,7 +17107,7 @@
+ ;;
+ esac
+
+-echo "$as_me:17066: checking for X11 rgb file" >&5
++echo "$as_me:17110: 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.
+@@ -17125,7 +17169,7 @@
+ cf_path=`echo "$cf_path" | sed -e s%NONE%$cf_path_syntax%`
+ ;;
+ (*)
+- { { echo "$as_me:17128: error: expected a pathname, not \"$cf_path\"" >&5
++ { { echo "$as_me:17172: error: expected a pathname, not \"$cf_path\"" >&5
+ echo "$as_me: error: expected a pathname, not \"$cf_path\"" >&2;}
+ { (exit 1); exit 1; }; }
+ ;;
+@@ -17133,7 +17177,7 @@
+
+ fi
+
+-echo "$as_me:17136: result: $RGB_PATH" >&5
++echo "$as_me:17180: result: $RGB_PATH" >&5
+ echo "${ECHO_T}$RGB_PATH" >&6
+
+ cat >>confdefs.h <<EOF
+@@ -17174,7 +17218,7 @@
+ ;;
+ esac
+
+-echo "$as_me:17177: checking for desired basename for form library" >&5
++echo "$as_me:17221: 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.
+@@ -17194,10 +17238,10 @@
+ ;;
+ esac
+
+-echo "$as_me:17197: result: $FORM_NAME" >&5
++echo "$as_me:17241: result: $FORM_NAME" >&5
+ echo "${ECHO_T}$FORM_NAME" >&6
+
+-echo "$as_me:17200: checking for desired basename for menu library" >&5
++echo "$as_me:17244: 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.
+@@ -17217,10 +17261,10 @@
+ ;;
+ esac
+
+-echo "$as_me:17220: result: $MENU_NAME" >&5
++echo "$as_me:17264: result: $MENU_NAME" >&5
+ echo "${ECHO_T}$MENU_NAME" >&6
+
+-echo "$as_me:17223: checking for desired basename for panel library" >&5
++echo "$as_me:17267: 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.
+@@ -17240,10 +17284,10 @@
+ ;;
+ esac
+
+-echo "$as_me:17243: result: $PANEL_NAME" >&5
++echo "$as_me:17287: result: $PANEL_NAME" >&5
+ echo "${ECHO_T}$PANEL_NAME" >&6
+
+-echo "$as_me:17246: checking if you want to check for panel functions" >&5
++echo "$as_me:17290: 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.
+@@ -17260,7 +17304,7 @@
+ cf_enable_panel=$cf_default_panel
+
+ fi;
+-echo "$as_me:17263: result: $cf_enable_panel" >&5
++echo "$as_me:17307: result: $cf_enable_panel" >&5
+ echo "${ECHO_T}$cf_enable_panel" >&6
+ if test $cf_enable_panel = yes
+ then
+@@ -17271,13 +17315,13 @@
+ if test "x${NCURSES_CONFIG_PKG}" = xnone; then
+ :
+ elif test "x${PKG_CONFIG:=none}" != xnone; then
+- echo "$as_me:17274: checking pkg-config for $PANEL_NAME$cf_cv_libtype" >&5
++ echo "$as_me:17318: 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:17277: result: yes" >&5
++ echo "$as_me:17321: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+
+- echo "$as_me:17280: checking if the $PANEL_NAME$cf_cv_libtype package files work" >&5
++ echo "$as_me:17324: 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"
+@@ -17427,7 +17471,7 @@
+ LIBS="$cf_add_libs"
+
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 17430 "configure"
++#line 17474 "configure"
+ #include "confdefs.h"
+ #include <$PANEL_NAME.h>
+ int
+@@ -17439,37 +17483,37 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:17442: \"$ac_link\"") >&5
++if { (eval echo "$as_me:17486: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:17445: \$? = $ac_status" >&5
++ echo "$as_me:17489: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:17448: \"$ac_try\"") >&5
++ { (eval echo "$as_me:17492: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:17451: \$? = $ac_status" >&5
++ echo "$as_me:17495: \$? = $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 17457 "configure"
++#line 17501 "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:17464: \"$ac_link\"") >&5
++if { (eval echo "$as_me:17508: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:17467: \$? = $ac_status" >&5
++ echo "$as_me:17511: \$? = $ac_status" >&5
+ (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+- { (eval echo "$as_me:17469: \"$ac_try\"") >&5
++ { (eval echo "$as_me:17513: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:17472: \$? = $ac_status" >&5
++ echo "$as_me:17516: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_have_curses_lib=yes
+ else
+@@ -17486,7 +17530,7 @@
+ cf_have_curses_lib=no
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+- echo "$as_me:17489: result: $cf_have_curses_lib" >&5
++ echo "$as_me:17533: 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"
+@@ -17507,7 +17551,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:17510: checking for new_panel in -l$PANEL_NAME$cf_cv_libtype" >&5
++echo "$as_me:17554: 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
+@@ -17515,7 +17559,7 @@
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-l$PANEL_NAME$cf_cv_libtype $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 17518 "configure"
++#line 17562 "configure"
+ #include "confdefs.h"
+
+ /* Override any gcc2 internal prototype to avoid an error. */
+@@ -17534,16 +17578,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:17537: \"$ac_link\"") >&5
++if { (eval echo "$as_me:17581: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:17540: \$? = $ac_status" >&5
++ echo "$as_me:17584: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:17543: \"$ac_try\"") >&5
++ { (eval echo "$as_me:17587: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:17546: \$? = $ac_status" >&5
++ echo "$as_me:17590: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ eval "$as_ac_Lib=yes"
+ else
+@@ -17554,7 +17598,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:17557: result: `eval echo '${'"$as_ac_Lib"'}'`" >&5
++echo "$as_me:17601: 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
+
+@@ -17587,7 +17631,7 @@
+ cf_curses_headers="$cf_curses_headers panel.h"
+ fi
+
+-echo "$as_me:17590: checking if you want to check for menu functions" >&5
++echo "$as_me:17634: 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.
+@@ -17604,7 +17648,7 @@
+ cf_enable_menu=$cf_default_menu
+
+ fi;
+-echo "$as_me:17607: result: $cf_enable_menu" >&5
++echo "$as_me:17651: result: $cf_enable_menu" >&5
+ echo "${ECHO_T}$cf_enable_menu" >&6
+ if test $cf_enable_menu = yes
+ then
+@@ -17613,14 +17657,14 @@
+ ;;
+ (curses*)
+
+-echo "$as_me:17616: checking for NetBSD menu.h" >&5
++echo "$as_me:17660: 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 17623 "configure"
++#line 17667 "configure"
+ #include "confdefs.h"
+
+ #include <${cf_cv_ncurses_header:-curses.h}>
+@@ -17638,16 +17682,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:17641: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:17685: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:17644: \$? = $ac_status" >&5
++ echo "$as_me:17688: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:17647: \"$ac_try\"") >&5
++ { (eval echo "$as_me:17691: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:17650: \$? = $ac_status" >&5
++ echo "$as_me:17694: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_netbsd_menu_h=yes
+
+@@ -17659,7 +17703,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+
+ fi
+-echo "$as_me:17662: result: $cf_cv_netbsd_menu_h" >&5
++echo "$as_me:17706: result: $cf_cv_netbsd_menu_h" >&5
+ echo "${ECHO_T}$cf_cv_netbsd_menu_h" >&6
+
+ test "$cf_cv_netbsd_menu_h" = yes &&
+@@ -17676,13 +17720,13 @@
+ if test "x${NCURSES_CONFIG_PKG}" = xnone; then
+ :
+ elif test "x${PKG_CONFIG:=none}" != xnone; then
+- echo "$as_me:17679: checking pkg-config for $MENU_NAME$cf_cv_libtype" >&5
++ echo "$as_me:17723: 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:17682: result: yes" >&5
++ echo "$as_me:17726: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+
+- echo "$as_me:17685: checking if the $MENU_NAME$cf_cv_libtype package files work" >&5
++ echo "$as_me:17729: 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"
+@@ -17832,7 +17876,7 @@
+ LIBS="$cf_add_libs"
+
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 17835 "configure"
++#line 17879 "configure"
+ #include "confdefs.h"
+ #include <$MENU_NAME.h>
+ int
+@@ -17844,37 +17888,37 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:17847: \"$ac_link\"") >&5
++if { (eval echo "$as_me:17891: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:17850: \$? = $ac_status" >&5
++ echo "$as_me:17894: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:17853: \"$ac_try\"") >&5
++ { (eval echo "$as_me:17897: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:17856: \$? = $ac_status" >&5
++ echo "$as_me:17900: \$? = $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 17862 "configure"
++#line 17906 "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:17869: \"$ac_link\"") >&5
++if { (eval echo "$as_me:17913: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:17872: \$? = $ac_status" >&5
++ echo "$as_me:17916: \$? = $ac_status" >&5
+ (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+- { (eval echo "$as_me:17874: \"$ac_try\"") >&5
++ { (eval echo "$as_me:17918: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:17877: \$? = $ac_status" >&5
++ echo "$as_me:17921: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_have_curses_lib=yes
+ else
+@@ -17891,7 +17935,7 @@
+ cf_have_curses_lib=no
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+- echo "$as_me:17894: result: $cf_have_curses_lib" >&5
++ echo "$as_me:17938: 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"
+@@ -17912,7 +17956,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:17915: checking for menu_driver in -l$MENU_NAME$cf_cv_libtype" >&5
++echo "$as_me:17959: 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
+@@ -17920,7 +17964,7 @@
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-l$MENU_NAME$cf_cv_libtype $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 17923 "configure"
++#line 17967 "configure"
+ #include "confdefs.h"
+
+ /* Override any gcc2 internal prototype to avoid an error. */
+@@ -17939,16 +17983,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:17942: \"$ac_link\"") >&5
++if { (eval echo "$as_me:17986: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:17945: \$? = $ac_status" >&5
++ echo "$as_me:17989: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:17948: \"$ac_try\"") >&5
++ { (eval echo "$as_me:17992: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:17951: \$? = $ac_status" >&5
++ echo "$as_me:17995: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ eval "$as_ac_Lib=yes"
+ else
+@@ -17959,7 +18003,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:17962: result: `eval echo '${'"$as_ac_Lib"'}'`" >&5
++echo "$as_me:18006: 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
+
+@@ -17992,7 +18036,7 @@
+ cf_curses_headers="$cf_curses_headers menu.h"
+ fi
+
+-echo "$as_me:17995: checking if you want to check for form functions" >&5
++echo "$as_me:18039: 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.
+@@ -18009,7 +18053,7 @@
+ cf_enable_form=$cf_default_form
+
+ fi;
+-echo "$as_me:18012: result: $cf_enable_form" >&5
++echo "$as_me:18056: result: $cf_enable_form" >&5
+ echo "${ECHO_T}$cf_enable_form" >&6
+ if test $cf_enable_form = yes
+ then
+@@ -18018,14 +18062,14 @@
+ ;;
+ (curses*)
+
+-echo "$as_me:18021: checking for NetBSD form.h" >&5
++echo "$as_me:18065: 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 18028 "configure"
++#line 18072 "configure"
+ #include "confdefs.h"
+
+ #include <${cf_cv_ncurses_header:-curses.h}>
+@@ -18044,16 +18088,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:18047: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:18091: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:18050: \$? = $ac_status" >&5
++ echo "$as_me:18094: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:18053: \"$ac_try\"") >&5
++ { (eval echo "$as_me:18097: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:18056: \$? = $ac_status" >&5
++ echo "$as_me:18100: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_netbsd_form_h=yes
+
+@@ -18065,7 +18109,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+
+ fi
+-echo "$as_me:18068: result: $cf_cv_netbsd_form_h" >&5
++echo "$as_me:18112: result: $cf_cv_netbsd_form_h" >&5
+ echo "${ECHO_T}$cf_cv_netbsd_form_h" >&6
+
+ test "$cf_cv_netbsd_form_h" = yes &&
+@@ -18082,13 +18126,13 @@
+ if test "x${NCURSES_CONFIG_PKG}" = xnone; then
+ :
+ elif test "x${PKG_CONFIG:=none}" != xnone; then
+- echo "$as_me:18085: checking pkg-config for $FORM_NAME$cf_cv_libtype" >&5
++ echo "$as_me:18129: 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:18088: result: yes" >&5
++ echo "$as_me:18132: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+
+- echo "$as_me:18091: checking if the $FORM_NAME$cf_cv_libtype package files work" >&5
++ echo "$as_me:18135: 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"
+@@ -18238,7 +18282,7 @@
+ LIBS="$cf_add_libs"
+
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 18241 "configure"
++#line 18285 "configure"
+ #include "confdefs.h"
+ #include <$FORM_NAME.h>
+ int
+@@ -18250,37 +18294,37 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:18253: \"$ac_link\"") >&5
++if { (eval echo "$as_me:18297: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:18256: \$? = $ac_status" >&5
++ echo "$as_me:18300: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:18259: \"$ac_try\"") >&5
++ { (eval echo "$as_me:18303: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:18262: \$? = $ac_status" >&5
++ echo "$as_me:18306: \$? = $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 18268 "configure"
++#line 18312 "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:18275: \"$ac_link\"") >&5
++if { (eval echo "$as_me:18319: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:18278: \$? = $ac_status" >&5
++ echo "$as_me:18322: \$? = $ac_status" >&5
+ (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+- { (eval echo "$as_me:18280: \"$ac_try\"") >&5
++ { (eval echo "$as_me:18324: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:18283: \$? = $ac_status" >&5
++ echo "$as_me:18327: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_have_curses_lib=yes
+ else
+@@ -18297,7 +18341,7 @@
+ cf_have_curses_lib=no
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+- echo "$as_me:18300: result: $cf_have_curses_lib" >&5
++ echo "$as_me:18344: 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"
+@@ -18318,7 +18362,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:18321: checking for form_driver in -l$FORM_NAME$cf_cv_libtype" >&5
++echo "$as_me:18365: 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
+@@ -18326,7 +18370,7 @@
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-l$FORM_NAME$cf_cv_libtype $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 18329 "configure"
++#line 18373 "configure"
+ #include "confdefs.h"
+
+ /* Override any gcc2 internal prototype to avoid an error. */
+@@ -18345,16 +18389,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:18348: \"$ac_link\"") >&5
++if { (eval echo "$as_me:18392: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:18351: \$? = $ac_status" >&5
++ echo "$as_me:18395: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:18354: \"$ac_try\"") >&5
++ { (eval echo "$as_me:18398: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:18357: \$? = $ac_status" >&5
++ echo "$as_me:18401: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ eval "$as_ac_Lib=yes"
+ else
+@@ -18365,7 +18409,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:18368: result: `eval echo '${'"$as_ac_Lib"'}'`" >&5
++echo "$as_me:18412: 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
+
+@@ -18403,23 +18447,23 @@
+ for ac_header in $cf_curses_headers
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-echo "$as_me:18406: checking for $ac_header" >&5
++echo "$as_me:18450: 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 18412 "configure"
++#line 18456 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:18416: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:18460: \"$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:18422: \$? = $ac_status" >&5
++ echo "$as_me:18466: \$? = $ac_status" >&5
+ (exit "$ac_status"); } >/dev/null; then
+ if test -s conftest.err; then
+ ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -18438,7 +18482,7 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:18441: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
++echo "$as_me:18485: 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
+@@ -18448,13 +18492,13 @@
+ fi
+ done
+
+-echo "$as_me:18451: checking whether time.h and sys/time.h may both be included" >&5
++echo "$as_me:18495: 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 18457 "configure"
++#line 18501 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ #include <sys/time.h>
+@@ -18470,16 +18514,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:18473: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:18517: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:18476: \$? = $ac_status" >&5
++ echo "$as_me:18520: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:18479: \"$ac_try\"") >&5
++ { (eval echo "$as_me:18523: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:18482: \$? = $ac_status" >&5
++ echo "$as_me:18526: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_header_time=yes
+ else
+@@ -18489,7 +18533,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:18492: result: $ac_cv_header_time" >&5
++echo "$as_me:18536: result: $ac_cv_header_time" >&5
+ echo "${ECHO_T}$ac_cv_header_time" >&6
+ if test $ac_cv_header_time = yes; then
+
+@@ -18510,23 +18554,23 @@
+
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-echo "$as_me:18513: checking for $ac_header" >&5
++echo "$as_me:18557: 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 18519 "configure"
++#line 18563 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:18523: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:18567: \"$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:18529: \$? = $ac_status" >&5
++ echo "$as_me:18573: \$? = $ac_status" >&5
+ (exit "$ac_status"); } >/dev/null; then
+ if test -s conftest.err; then
+ ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -18545,7 +18589,7 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:18548: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
++echo "$as_me:18592: 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
+@@ -18558,23 +18602,23 @@
+ for ac_header in getopt.h
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-echo "$as_me:18561: checking for $ac_header" >&5
++echo "$as_me:18605: 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 18567 "configure"
++#line 18611 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:18571: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:18615: \"$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:18577: \$? = $ac_status" >&5
++ echo "$as_me:18621: \$? = $ac_status" >&5
+ (exit "$ac_status"); } >/dev/null; then
+ if test -s conftest.err; then
+ ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -18593,7 +18637,7 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:18596: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
++echo "$as_me:18640: 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
+@@ -18603,7 +18647,7 @@
+ fi
+ done
+
+-echo "$as_me:18606: checking for header declaring getopt variables" >&5
++echo "$as_me:18650: 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
+@@ -18613,7 +18657,7 @@
+ for cf_header in stdio.h stdlib.h unistd.h getopt.h
+ do
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 18616 "configure"
++#line 18660 "configure"
+ #include "confdefs.h"
+
+ #include <$cf_header>
+@@ -18626,16 +18670,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:18629: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:18673: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:18632: \$? = $ac_status" >&5
++ echo "$as_me:18676: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:18635: \"$ac_try\"") >&5
++ { (eval echo "$as_me:18679: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:18638: \$? = $ac_status" >&5
++ echo "$as_me:18682: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_getopt_header=$cf_header
+ break
+@@ -18647,7 +18691,7 @@
+ done
+
+ fi
+-echo "$as_me:18650: result: $cf_cv_getopt_header" >&5
++echo "$as_me:18694: result: $cf_cv_getopt_header" >&5
+ echo "${ECHO_T}$cf_cv_getopt_header" >&6
+ if test "$cf_cv_getopt_header" != none ; then
+
+@@ -18665,13 +18709,13 @@
+ fi
+
+ cf_save_libs="$LIBS"
+-echo "$as_me:18668: checking for clock_gettime" >&5
++echo "$as_me:18712: 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 18674 "configure"
++#line 18718 "configure"
+ #include "confdefs.h"
+ #define clock_gettime autoconf_temporary
+ #include <limits.h> /* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -18702,16 +18746,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:18705: \"$ac_link\"") >&5
++if { (eval echo "$as_me:18749: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:18708: \$? = $ac_status" >&5
++ echo "$as_me:18752: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:18711: \"$ac_try\"") >&5
++ { (eval echo "$as_me:18755: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:18714: \$? = $ac_status" >&5
++ echo "$as_me:18758: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_func_clock_gettime=yes
+ else
+@@ -18721,12 +18765,12 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:18724: result: $ac_cv_func_clock_gettime" >&5
++echo "$as_me:18768: 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:18729: checking for clock_gettime in -lrt" >&5
++ echo "$as_me:18773: 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
+@@ -18734,7 +18778,7 @@
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lrt $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 18737 "configure"
++#line 18781 "configure"
+ #include "confdefs.h"
+
+ /* Override any gcc2 internal prototype to avoid an error. */
+@@ -18753,16 +18797,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:18756: \"$ac_link\"") >&5
++if { (eval echo "$as_me:18800: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:18759: \$? = $ac_status" >&5
++ echo "$as_me:18803: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:18762: \"$ac_try\"") >&5
++ { (eval echo "$as_me:18806: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:18765: \$? = $ac_status" >&5
++ echo "$as_me:18809: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_lib_rt_clock_gettime=yes
+ else
+@@ -18773,7 +18817,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:18776: result: $ac_cv_lib_rt_clock_gettime" >&5
++echo "$as_me:18820: 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"
+@@ -18785,14 +18829,14 @@
+ fi
+
+ if test "$cf_cv_test_clock_gettime" = yes ; then
+-echo "$as_me:18788: checking if clock_gettime links" >&5
++echo "$as_me:18832: 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 18795 "configure"
++#line 18839 "configure"
+ #include "confdefs.h"
+
+ $ac_includes_default
+@@ -18810,16 +18854,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:18813: \"$ac_link\"") >&5
++if { (eval echo "$as_me:18857: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:18816: \$? = $ac_status" >&5
++ echo "$as_me:18860: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:18819: \"$ac_try\"") >&5
++ { (eval echo "$as_me:18863: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:18822: \$? = $ac_status" >&5
++ echo "$as_me:18866: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_func_clock_gettime=yes
+ else
+@@ -18830,7 +18874,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+
+ fi
+-echo "$as_me:18833: result: $cf_cv_func_clock_gettime" >&5
++echo "$as_me:18877: result: $cf_cv_func_clock_gettime" >&5
+ echo "${ECHO_T}$cf_cv_func_clock_gettime" >&6
+ else
+ cf_cv_func_clock_gettime=no
+@@ -18844,13 +18888,13 @@
+ EOF
+
+ else
+-echo "$as_me:18847: checking for gettimeofday" >&5
++echo "$as_me:18891: 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 18853 "configure"
++#line 18897 "configure"
+ #include "confdefs.h"
+ #define gettimeofday autoconf_temporary
+ #include <limits.h> /* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -18881,16 +18925,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:18884: \"$ac_link\"") >&5
++if { (eval echo "$as_me:18928: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:18887: \$? = $ac_status" >&5
++ echo "$as_me:18931: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:18890: \"$ac_try\"") >&5
++ { (eval echo "$as_me:18934: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:18893: \$? = $ac_status" >&5
++ echo "$as_me:18937: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_func_gettimeofday=yes
+ else
+@@ -18900,7 +18944,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:18903: result: $ac_cv_func_gettimeofday" >&5
++echo "$as_me:18947: result: $ac_cv_func_gettimeofday" >&5
+ echo "${ECHO_T}$ac_cv_func_gettimeofday" >&6
+ if test "$ac_cv_func_gettimeofday" = yes; then
+
+@@ -18910,7 +18954,7 @@
+
+ else
+
+-echo "$as_me:18913: checking for gettimeofday in -lbsd" >&5
++echo "$as_me:18957: 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
+@@ -18918,7 +18962,7 @@
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lbsd $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 18921 "configure"
++#line 18965 "configure"
+ #include "confdefs.h"
+
+ /* Override any gcc2 internal prototype to avoid an error. */
+@@ -18937,16 +18981,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:18940: \"$ac_link\"") >&5
++if { (eval echo "$as_me:18984: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:18943: \$? = $ac_status" >&5
++ echo "$as_me:18987: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:18946: \"$ac_try\"") >&5
++ { (eval echo "$as_me:18990: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:18949: \$? = $ac_status" >&5
++ echo "$as_me:18993: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_lib_bsd_gettimeofday=yes
+ else
+@@ -18957,7 +19001,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:18960: result: $ac_cv_lib_bsd_gettimeofday" >&5
++echo "$as_me:19004: 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
+
+@@ -18995,13 +19039,13 @@
+
+ do
+ as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+-echo "$as_me:18998: checking for $ac_func" >&5
++echo "$as_me:19042: 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 19004 "configure"
++#line 19048 "configure"
+ #include "confdefs.h"
+ #define $ac_func autoconf_temporary
+ #include <limits.h> /* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -19032,16 +19076,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:19035: \"$ac_link\"") >&5
++if { (eval echo "$as_me:19079: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:19038: \$? = $ac_status" >&5
++ echo "$as_me:19082: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:19041: \"$ac_try\"") >&5
++ { (eval echo "$as_me:19085: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:19044: \$? = $ac_status" >&5
++ echo "$as_me:19088: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ eval "$as_ac_var=yes"
+ else
+@@ -19051,7 +19095,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:19054: result: `eval echo '${'"$as_ac_var"'}'`" >&5
++echo "$as_me:19098: 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
+@@ -19062,14 +19106,14 @@
+ done
+
+ # use a compile-check to work with ncurses*-config and subdirectory includes
+-echo "$as_me:19065: checking if we can use termcap.h" >&5
++echo "$as_me:19109: 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 19072 "configure"
++#line 19116 "configure"
+ #include "confdefs.h"
+
+ #include <curses.h>
+@@ -19090,16 +19134,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:19093: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:19137: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:19096: \$? = $ac_status" >&5
++ echo "$as_me:19140: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:19099: \"$ac_try\"") >&5
++ { (eval echo "$as_me:19143: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:19102: \$? = $ac_status" >&5
++ echo "$as_me:19146: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_have_termcap_h=yes
+ else
+@@ -19109,7 +19153,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:19112: result: $cf_cv_have_termcap_h" >&5
++echo "$as_me:19156: 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
+@@ -19119,14 +19163,14 @@
+ EOF
+
+ else
+-echo "$as_me:19122: checking if we can use ncurses/termcap.h" >&5
++echo "$as_me:19166: 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 19129 "configure"
++#line 19173 "configure"
+ #include "confdefs.h"
+
+ #include <ncurses/curses.h>
+@@ -19147,16 +19191,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:19150: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:19194: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:19153: \$? = $ac_status" >&5
++ echo "$as_me:19197: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:19156: \"$ac_try\"") >&5
++ { (eval echo "$as_me:19200: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:19159: \$? = $ac_status" >&5
++ echo "$as_me:19203: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_have_ncurses_termcap_h=yes
+ else
+@@ -19166,7 +19210,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:19169: result: $cf_cv_have_ncurses_termcap_h" >&5
++echo "$as_me:19213: 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
+@@ -19176,7 +19220,7 @@
+ fi
+
+ if test "x$ac_cv_func_getopt" = xno; then
+- { { echo "$as_me:19179: error: getopt is required for building programs" >&5
++ { { echo "$as_me:19223: error: getopt is required for building programs" >&5
+ echo "$as_me: error: getopt is required for building programs" >&2;}
+ { (exit 1); exit 1; }; }
+ fi
+@@ -19195,13 +19239,13 @@
+
+ do
+ as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+-echo "$as_me:19198: checking for $ac_func" >&5
++echo "$as_me:19242: 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 19204 "configure"
++#line 19248 "configure"
+ #include "confdefs.h"
+ #define $ac_func autoconf_temporary
+ #include <limits.h> /* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -19232,16 +19276,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:19235: \"$ac_link\"") >&5
++if { (eval echo "$as_me:19279: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:19238: \$? = $ac_status" >&5
++ echo "$as_me:19282: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:19241: \"$ac_try\"") >&5
++ { (eval echo "$as_me:19285: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:19244: \$? = $ac_status" >&5
++ echo "$as_me:19288: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ eval "$as_ac_var=yes"
+ else
+@@ -19251,7 +19295,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:19254: result: `eval echo '${'"$as_ac_var"'}'`" >&5
++echo "$as_me:19298: 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
+@@ -19263,7 +19307,7 @@
+
+ fi
+
+-echo "$as_me:19266: checking definition to turn on extended curses functions" >&5
++echo "$as_me:19310: 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
+@@ -19271,7 +19315,7 @@
+
+ cf_cv_need_xopen_extension=unknown
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 19274 "configure"
++#line 19318 "configure"
+ #include "confdefs.h"
+
+ $ac_includes_default
+@@ -19304,16 +19348,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:19307: \"$ac_link\"") >&5
++if { (eval echo "$as_me:19351: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:19310: \$? = $ac_status" >&5
++ echo "$as_me:19354: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:19313: \"$ac_try\"") >&5
++ { (eval echo "$as_me:19357: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:19316: \$? = $ac_status" >&5
++ echo "$as_me:19360: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_need_xopen_extension=none
+ else
+@@ -19323,7 +19367,7 @@
+ for cf_try_xopen_extension in _XOPEN_SOURCE_EXTENDED NCURSES_WIDECHAR
+ do
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 19326 "configure"
++#line 19370 "configure"
+ #include "confdefs.h"
+
+ #define $cf_try_xopen_extension 1
+@@ -19349,16 +19393,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:19352: \"$ac_link\"") >&5
++if { (eval echo "$as_me:19396: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:19355: \$? = $ac_status" >&5
++ echo "$as_me:19399: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:19358: \"$ac_try\"") >&5
++ { (eval echo "$as_me:19402: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:19361: \$? = $ac_status" >&5
++ echo "$as_me:19405: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_need_xopen_extension=$cf_try_xopen_extension; break
+ else
+@@ -19372,7 +19416,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+
+ fi
+-echo "$as_me:19375: result: $cf_cv_need_xopen_extension" >&5
++echo "$as_me:19419: result: $cf_cv_need_xopen_extension" >&5
+ echo "${ECHO_T}$cf_cv_need_xopen_extension" >&6
+
+ case "$cf_cv_need_xopen_extension" in
+@@ -19384,7 +19428,7 @@
+ ;;
+ esac
+
+-echo "$as_me:19387: checking for term.h" >&5
++echo "$as_me:19431: 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
+@@ -19405,7 +19449,7 @@
+ for cf_header in $cf_header_list
+ do
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 19408 "configure"
++#line 19452 "configure"
+ #include "confdefs.h"
+
+ #include <${cf_cv_ncurses_header:-curses.h}>
+@@ -19419,16 +19463,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:19422: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:19466: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:19425: \$? = $ac_status" >&5
++ echo "$as_me:19469: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:19428: \"$ac_try\"") >&5
++ { (eval echo "$as_me:19472: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:19431: \$? = $ac_status" >&5
++ echo "$as_me:19475: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_term_header=$cf_header
+ break
+@@ -19447,7 +19491,7 @@
+ for cf_header in ncurses/term.h ncursesw/term.h
+ do
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 19450 "configure"
++#line 19494 "configure"
+ #include "confdefs.h"
+
+ #include <${cf_cv_ncurses_header:-curses.h}>
+@@ -19465,16 +19509,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:19468: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:19512: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:19471: \$? = $ac_status" >&5
++ echo "$as_me:19515: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:19474: \"$ac_try\"") >&5
++ { (eval echo "$as_me:19518: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:19477: \$? = $ac_status" >&5
++ echo "$as_me:19521: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_term_header=$cf_header
+ break
+@@ -19489,7 +19533,7 @@
+ esac
+
+ fi
+-echo "$as_me:19492: result: $cf_cv_term_header" >&5
++echo "$as_me:19536: result: $cf_cv_term_header" >&5
+ echo "${ECHO_T}$cf_cv_term_header" >&6
+
+ case "$cf_cv_term_header" in
+@@ -19516,7 +19560,7 @@
+ ;;
+ esac
+
+-echo "$as_me:19519: checking for unctrl.h" >&5
++echo "$as_me:19563: 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
+@@ -19537,7 +19581,7 @@
+ for cf_header in $cf_header_list
+ do
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 19540 "configure"
++#line 19584 "configure"
+ #include "confdefs.h"
+
+ #include <${cf_cv_ncurses_header:-curses.h}>
+@@ -19551,16 +19595,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:19554: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:19598: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:19557: \$? = $ac_status" >&5
++ echo "$as_me:19601: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:19560: \"$ac_try\"") >&5
++ { (eval echo "$as_me:19604: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:19563: \$? = $ac_status" >&5
++ echo "$as_me:19607: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_unctrl_header=$cf_header
+ break
+@@ -19573,12 +19617,12 @@
+ done
+
+ fi
+-echo "$as_me:19576: result: $cf_cv_unctrl_header" >&5
++echo "$as_me:19620: result: $cf_cv_unctrl_header" >&5
+ echo "${ECHO_T}$cf_cv_unctrl_header" >&6
+
+ case "$cf_cv_unctrl_header" in
+ (no)
+- { echo "$as_me:19581: WARNING: unctrl.h header not found" >&5
++ { echo "$as_me:19625: WARNING: unctrl.h header not found" >&5
+ echo "$as_me: WARNING: unctrl.h header not found" >&2;}
+ ;;
+ esac
+@@ -19676,10 +19720,10 @@
+
+ cf_tr_func=`echo "$cf_func" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%`
+
+- echo "$as_me:19679: checking for ${cf_func}" >&5
++ echo "$as_me:19723: checking for ${cf_func}" >&5
+ echo $ECHO_N "checking for ${cf_func}... $ECHO_C" >&6
+
+-echo "${as_me:-configure}:19682: testing ${cf_func} ..." 1>&5
++echo "${as_me:-configure}:19726: testing ${cf_func} ..." 1>&5
+
+ if eval "test \"\${cf_cv_func_$cf_func+set}\" = set"; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -19688,7 +19732,7 @@
+ eval cf_result='$ac_cv_func_'$cf_func
+ if test ".$cf_result" != ".no"; then
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 19691 "configure"
++#line 19735 "configure"
+ #include "confdefs.h"
+
+ #ifdef HAVE_XCURSES
+@@ -19721,16 +19765,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:19724: \"$ac_link\"") >&5
++if { (eval echo "$as_me:19768: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:19727: \$? = $ac_status" >&5
++ echo "$as_me:19771: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:19730: \"$ac_try\"") >&5
++ { (eval echo "$as_me:19774: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:19733: \$? = $ac_status" >&5
++ echo "$as_me:19777: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_result=yes
+ else
+@@ -19746,7 +19790,7 @@
+
+ # use the computed/retrieved cache-value:
+ eval 'cf_result=$cf_cv_func_'$cf_func
+- echo "$as_me:19749: result: $cf_result" >&5
++ echo "$as_me:19793: result: $cf_result" >&5
+ echo "${ECHO_T}$cf_result" >&6
+ if test "$cf_result" != no; then
+ cat >>confdefs.h <<EOF
+@@ -19761,10 +19805,10 @@
+
+ cf_tr_func=`echo "$cf_func" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%`
+
+- echo "$as_me:19764: checking for ${cf_func}" >&5
++ echo "$as_me:19808: checking for ${cf_func}" >&5
+ echo $ECHO_N "checking for ${cf_func}... $ECHO_C" >&6
+
+-echo "${as_me:-configure}:19767: testing ${cf_func} ..." 1>&5
++echo "${as_me:-configure}:19811: testing ${cf_func} ..." 1>&5
+
+ if eval "test \"\${cf_cv_func_$cf_func+set}\" = set"; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -19773,7 +19817,7 @@
+ eval cf_result='$ac_cv_func_'$cf_func
+ if test ".$cf_result" != ".no"; then
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 19776 "configure"
++#line 19820 "configure"
+ #include "confdefs.h"
+
+ #ifdef HAVE_XCURSES
+@@ -19806,16 +19850,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:19809: \"$ac_link\"") >&5
++if { (eval echo "$as_me:19853: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:19812: \$? = $ac_status" >&5
++ echo "$as_me:19856: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:19815: \"$ac_try\"") >&5
++ { (eval echo "$as_me:19859: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:19818: \$? = $ac_status" >&5
++ echo "$as_me:19862: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_result=yes
+ else
+@@ -19831,7 +19875,7 @@
+
+ # use the computed/retrieved cache-value:
+ eval 'cf_result=$cf_cv_func_'$cf_func
+- echo "$as_me:19834: result: $cf_result" >&5
++ echo "$as_me:19878: result: $cf_result" >&5
+ echo "${ECHO_T}$cf_result" >&6
+ if test "$cf_result" != no; then
+ cat >>confdefs.h <<EOF
+@@ -19855,7 +19899,7 @@
+ cf_return="return value"
+ fi
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 19858 "configure"
++#line 19902 "configure"
+ #include "confdefs.h"
+
+ #include <${cf_cv_ncurses_header:-curses.h}>
+@@ -19875,21 +19919,21 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:19878: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:19922: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:19881: \$? = $ac_status" >&5
++ echo "$as_me:19925: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:19884: \"$ac_try\"") >&5
++ { (eval echo "$as_me:19928: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:19887: \$? = $ac_status" >&5
++ echo "$as_me:19931: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+
+ test -n "$verbose" && echo " prototype $cf_ret func($cf_arg value)" 1>&6
+
+-echo "${as_me:-configure}:19892: testing prototype $cf_ret func($cf_arg value) ..." 1>&5
++echo "${as_me:-configure}:19936: testing prototype $cf_ret func($cf_arg value) ..." 1>&5
+
+ cat >>confdefs.h <<EOF
+ #define TPUTS_ARG $cf_arg
+@@ -19909,14 +19953,14 @@
+ done
+ fi
+
+-echo "$as_me:19912: checking for ncurses extended functions" >&5
++echo "$as_me:19956: 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 19919 "configure"
++#line 19963 "configure"
+ #include "confdefs.h"
+
+ #include <${cf_cv_ncurses_header:-curses.h}>
+@@ -19931,16 +19975,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:19934: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:19978: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:19937: \$? = $ac_status" >&5
++ echo "$as_me:19981: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:19940: \"$ac_try\"") >&5
++ { (eval echo "$as_me:19984: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:19943: \$? = $ac_status" >&5
++ echo "$as_me:19987: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_ncurses_ext_funcs=defined
+ else
+@@ -19948,7 +19992,7 @@
+ cat "conftest.$ac_ext" >&5
+
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 19951 "configure"
++#line 19995 "configure"
+ #include "confdefs.h"
+
+ #include <${cf_cv_ncurses_header:-curses.h}>
+@@ -19973,16 +20017,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:19976: \"$ac_link\"") >&5
++if { (eval echo "$as_me:20020: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:19979: \$? = $ac_status" >&5
++ echo "$as_me:20023: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:19982: \"$ac_try\"") >&5
++ { (eval echo "$as_me:20026: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:19985: \$? = $ac_status" >&5
++ echo "$as_me:20029: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_ncurses_ext_funcs=yes
+ else
+@@ -19996,7 +20040,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+
+ fi
+-echo "$as_me:19999: result: $cf_cv_ncurses_ext_funcs" >&5
++echo "$as_me:20043: 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
+@@ -20010,11 +20054,11 @@
+ if test -n "$cf_cv_ncurses_version" && test "x$cf_cv_ncurses_version" != xno
+ then
+ cf_define_xpg5=no
+- echo "$as_me:20013: checking if _XPG5 should be defined to enable wide-characters" >&5
++ echo "$as_me:20057: 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 20017 "configure"
++#line 20061 "configure"
+ #include "confdefs.h"
+
+ #include <${cf_cv_ncurses_header:-curses.h}>
+@@ -20027,16 +20071,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:20030: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:20074: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:20033: \$? = $ac_status" >&5
++ echo "$as_me:20077: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:20036: \"$ac_try\"") >&5
++ { (eval echo "$as_me:20080: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:20039: \$? = $ac_status" >&5
++ echo "$as_me:20083: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ :
+ else
+@@ -20045,7 +20089,7 @@
+ cf_save_cppflags="$CPPFLAGS"
+ CPPFLAGS="$CPPFLAGS -D_XPG5"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 20048 "configure"
++#line 20092 "configure"
+ #include "confdefs.h"
+
+ #include <${cf_cv_ncurses_header:-curses.h}>
+@@ -20058,16 +20102,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:20061: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:20105: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:20064: \$? = $ac_status" >&5
++ echo "$as_me:20108: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:20067: \"$ac_try\"") >&5
++ { (eval echo "$as_me:20111: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:20070: \$? = $ac_status" >&5
++ echo "$as_me:20114: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_define_xpg5=yes
+ else
+@@ -20078,7 +20122,7 @@
+ CPPFLAGS="$cf_save_cppflags"
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+- echo "$as_me:20081: result: $cf_define_xpg5" >&5
++ echo "$as_me:20125: result: $cf_define_xpg5" >&5
+ echo "${ECHO_T}$cf_define_xpg5" >&6
+
+ if test "$cf_define_xpg5" = yes
+@@ -20087,14 +20131,14 @@
+ fi
+ fi
+
+- echo "$as_me:20090: checking for wide-character functions" >&5
++ echo "$as_me:20134: 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 20097 "configure"
++#line 20141 "configure"
+ #include "confdefs.h"
+
+ #include <${cf_cv_ncurses_header:-curses.h}>
+@@ -20111,16 +20155,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:20114: \"$ac_link\"") >&5
++if { (eval echo "$as_me:20158: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:20117: \$? = $ac_status" >&5
++ echo "$as_me:20161: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:20120: \"$ac_try\"") >&5
++ { (eval echo "$as_me:20164: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:20123: \$? = $ac_status" >&5
++ echo "$as_me:20167: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_widechar_funcs=yes
+ else
+@@ -20131,7 +20175,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+
+ fi
+-echo "$as_me:20134: result: $cf_cv_widechar_funcs" >&5
++echo "$as_me:20178: result: $cf_cv_widechar_funcs" >&5
+ echo "${ECHO_T}$cf_cv_widechar_funcs" >&6
+ if test "$cf_cv_widechar_funcs" != no ; then
+
+@@ -20152,14 +20196,14 @@
+
+ fi
+
+-echo "$as_me:20155: checking if $cf_cv_screen library uses pthreads" >&5
++echo "$as_me:20199: 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 20162 "configure"
++#line 20206 "configure"
+ #include "confdefs.h"
+
+ #include <${cf_cv_ncurses_header:-curses.h}>
+@@ -20177,16 +20221,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:20180: \"$ac_link\"") >&5
++if { (eval echo "$as_me:20224: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:20183: \$? = $ac_status" >&5
++ echo "$as_me:20227: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:20186: \"$ac_try\"") >&5
++ { (eval echo "$as_me:20230: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:20189: \$? = $ac_status" >&5
++ echo "$as_me:20233: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_use_pthreads=yes
+ else
+@@ -20197,21 +20241,21 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+
+ fi
+-echo "$as_me:20200: result: $cf_cv_use_pthreads" >&5
++echo "$as_me:20244: 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:20207: checking if sys/time.h works with sys/select.h" >&5
++echo "$as_me:20251: 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 20214 "configure"
++#line 20258 "configure"
+ #include "confdefs.h"
+
+ #include <sys/types.h>
+@@ -20231,16 +20275,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:20234: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:20278: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:20237: \$? = $ac_status" >&5
++ echo "$as_me:20281: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:20240: \"$ac_try\"") >&5
++ { (eval echo "$as_me:20284: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:20243: \$? = $ac_status" >&5
++ echo "$as_me:20287: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_sys_time_select=yes
+ else
+@@ -20252,7 +20296,7 @@
+
+ fi
+
+-echo "$as_me:20255: result: $cf_cv_sys_time_select" >&5
++echo "$as_me:20299: 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
+@@ -20261,7 +20305,7 @@
+
+ # special check for test/ditto.c
+
+-echo "$as_me:20264: checking for openpty in -lutil" >&5
++echo "$as_me:20308: 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
+@@ -20269,7 +20313,7 @@
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lutil $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 20272 "configure"
++#line 20316 "configure"
+ #include "confdefs.h"
+
+ /* Override any gcc2 internal prototype to avoid an error. */
+@@ -20288,16 +20332,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:20291: \"$ac_link\"") >&5
++if { (eval echo "$as_me:20335: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:20294: \$? = $ac_status" >&5
++ echo "$as_me:20338: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:20297: \"$ac_try\"") >&5
++ { (eval echo "$as_me:20341: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:20300: \$? = $ac_status" >&5
++ echo "$as_me:20344: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_lib_util_openpty=yes
+ else
+@@ -20308,7 +20352,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:20311: result: $ac_cv_lib_util_openpty" >&5
++echo "$as_me:20355: 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
+@@ -20316,7 +20360,7 @@
+ cf_cv_lib_util=no
+ fi
+
+-echo "$as_me:20319: checking for openpty header" >&5
++echo "$as_me:20363: 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
+@@ -20343,7 +20387,7 @@
+ for cf_header in pty.h libutil.h util.h
+ do
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 20346 "configure"
++#line 20390 "configure"
+ #include "confdefs.h"
+
+ #include <$cf_header>
+@@ -20361,16 +20405,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:20364: \"$ac_link\"") >&5
++if { (eval echo "$as_me:20408: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:20367: \$? = $ac_status" >&5
++ echo "$as_me:20411: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:20370: \"$ac_try\"") >&5
++ { (eval echo "$as_me:20414: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:20373: \$? = $ac_status" >&5
++ echo "$as_me:20417: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+
+ cf_cv_func_openpty=$cf_header
+@@ -20388,7 +20432,7 @@
+ LIBS="$cf_save_LIBS"
+
+ fi
+-echo "$as_me:20391: result: $cf_cv_func_openpty" >&5
++echo "$as_me:20435: result: $cf_cv_func_openpty" >&5
+ echo "${ECHO_T}$cf_cv_func_openpty" >&6
+
+ if test "$cf_cv_func_openpty" != no ; then
+@@ -20422,7 +20466,7 @@
+ fi
+ fi
+
+-echo "$as_me:20425: checking for function curses_version" >&5
++echo "$as_me:20469: 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
+@@ -20432,7 +20476,7 @@
+ cf_cv_func_curses_version=unknown
+ else
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 20435 "configure"
++#line 20479 "configure"
+ #include "confdefs.h"
+
+ $ac_includes_default
+@@ -20448,15 +20492,15 @@
+
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:20451: \"$ac_link\"") >&5
++if { (eval echo "$as_me:20495: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:20454: \$? = $ac_status" >&5
++ echo "$as_me:20498: \$? = $ac_status" >&5
+ (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+- { (eval echo "$as_me:20456: \"$ac_try\"") >&5
++ { (eval echo "$as_me:20500: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:20459: \$? = $ac_status" >&5
++ echo "$as_me:20503: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_func_curses_version=yes
+
+@@ -20471,14 +20515,14 @@
+ fi
+ rm -f core
+ fi
+-echo "$as_me:20474: result: $cf_cv_func_curses_version" >&5
++echo "$as_me:20518: 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:20481: checking for alternate character set array" >&5
++echo "$as_me:20525: 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
+@@ -20488,7 +20532,7 @@
+ for name in acs_map _acs_map __acs_map ${NCURSES_WRAP_PREFIX}acs_map
+ do
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 20491 "configure"
++#line 20535 "configure"
+ #include "confdefs.h"
+
+ #include <${cf_cv_ncurses_header:-curses.h}>
+@@ -20504,16 +20548,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:20507: \"$ac_link\"") >&5
++if { (eval echo "$as_me:20551: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:20510: \$? = $ac_status" >&5
++ echo "$as_me:20554: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:20513: \"$ac_try\"") >&5
++ { (eval echo "$as_me:20557: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:20516: \$? = $ac_status" >&5
++ echo "$as_me:20560: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_curses_acs_map=$name; break
+ else
+@@ -20524,7 +20568,7 @@
+ done
+
+ fi
+-echo "$as_me:20527: result: $cf_cv_curses_acs_map" >&5
++echo "$as_me:20571: result: $cf_cv_curses_acs_map" >&5
+ echo "${ECHO_T}$cf_cv_curses_acs_map" >&6
+
+ test "$cf_cv_curses_acs_map" != unknown &&
+@@ -20534,7 +20578,7 @@
+
+ if test "$cf_enable_widec" = yes; then
+
+-echo "$as_me:20537: checking for wide alternate character set array" >&5
++echo "$as_me:20581: 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
+@@ -20544,7 +20588,7 @@
+ for name in wacs_map _wacs_map __wacs_map _nc_wacs _wacs_char
+ do
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 20547 "configure"
++#line 20591 "configure"
+ #include "confdefs.h"
+
+ #ifndef _XOPEN_SOURCE_EXTENDED
+@@ -20560,16 +20604,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:20563: \"$ac_link\"") >&5
++if { (eval echo "$as_me:20607: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:20566: \$? = $ac_status" >&5
++ echo "$as_me:20610: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:20569: \"$ac_try\"") >&5
++ { (eval echo "$as_me:20613: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:20572: \$? = $ac_status" >&5
++ echo "$as_me:20616: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_curses_wacs_map=$name
+ break
+@@ -20580,7 +20624,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ done
+ fi
+-echo "$as_me:20583: result: $cf_cv_curses_wacs_map" >&5
++echo "$as_me:20627: result: $cf_cv_curses_wacs_map" >&5
+ echo "${ECHO_T}$cf_cv_curses_wacs_map" >&6
+
+ test "$cf_cv_curses_wacs_map" != unknown &&
+@@ -20588,7 +20632,7 @@
+ #define CURSES_WACS_ARRAY $cf_cv_curses_wacs_map
+ EOF
+
+-echo "$as_me:20591: checking for wide alternate character constants" >&5
++echo "$as_me:20635: 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
+@@ -20598,7 +20642,7 @@
+ if test "$cf_cv_curses_wacs_map" != unknown
+ then
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 20601 "configure"
++#line 20645 "configure"
+ #include "confdefs.h"
+
+ #ifndef _XOPEN_SOURCE_EXTENDED
+@@ -20615,16 +20659,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:20618: \"$ac_link\"") >&5
++if { (eval echo "$as_me:20662: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:20621: \$? = $ac_status" >&5
++ echo "$as_me:20665: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:20624: \"$ac_try\"") >&5
++ { (eval echo "$as_me:20668: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:20627: \$? = $ac_status" >&5
++ echo "$as_me:20671: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_curses_wacs_symbols=yes
+ else
+@@ -20634,7 +20678,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ else
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 20637 "configure"
++#line 20681 "configure"
+ #include "confdefs.h"
+
+ #ifndef _XOPEN_SOURCE_EXTENDED
+@@ -20650,16 +20694,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:20653: \"$ac_link\"") >&5
++if { (eval echo "$as_me:20697: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:20656: \$? = $ac_status" >&5
++ echo "$as_me:20700: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:20659: \"$ac_try\"") >&5
++ { (eval echo "$as_me:20703: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:20662: \$? = $ac_status" >&5
++ echo "$as_me:20706: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_curses_wacs_symbols=yes
+ else
+@@ -20670,7 +20714,7 @@
+ fi
+
+ fi
+-echo "$as_me:20673: result: $cf_cv_curses_wacs_symbols" >&5
++echo "$as_me:20717: result: $cf_cv_curses_wacs_symbols" >&5
+ echo "${ECHO_T}$cf_cv_curses_wacs_symbols" >&6
+
+ test "$cf_cv_curses_wacs_symbols" != no &&
+@@ -20680,10 +20724,10 @@
+
+ fi
+
+-echo "$as_me:20683: checking for type attr_t in ${cf_cv_ncurses_header:-curses.h}" >&5
++echo "$as_me:20727: 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 20686 "configure"
++#line 20730 "configure"
+ #include "confdefs.h"
+
+ #ifndef _XOPEN_SOURCE_EXTENDED
+@@ -20701,16 +20745,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:20704: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:20748: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:20707: \$? = $ac_status" >&5
++ echo "$as_me:20751: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:20710: \"$ac_try\"") >&5
++ { (eval echo "$as_me:20754: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:20713: \$? = $ac_status" >&5
++ echo "$as_me:20757: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_result=yes
+ else
+@@ -20719,7 +20763,7 @@
+ cf_result=no
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+-echo "$as_me:20722: result: $cf_result" >&5
++echo "$as_me:20766: result: $cf_result" >&5
+ echo "${ECHO_T}$cf_result" >&6
+ if test "$cf_result" = yes ; then
+
+@@ -20740,14 +20784,14 @@
+ if test "$cf_enable_widec" = yes; then
+
+ # This is needed on Tru64 5.0 to declare mbstate_t
+-echo "$as_me:20743: checking if we must include wchar.h to declare mbstate_t" >&5
++echo "$as_me:20787: 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 20750 "configure"
++#line 20794 "configure"
+ #include "confdefs.h"
+
+ #include <stdlib.h>
+@@ -20765,23 +20809,23 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:20768: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:20812: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:20771: \$? = $ac_status" >&5
++ echo "$as_me:20815: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:20774: \"$ac_try\"") >&5
++ { (eval echo "$as_me:20818: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:20777: \$? = $ac_status" >&5
++ echo "$as_me:20821: \$? = $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 20784 "configure"
++#line 20828 "configure"
+ #include "confdefs.h"
+
+ #include <stdlib.h>
+@@ -20800,16 +20844,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:20803: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:20847: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:20806: \$? = $ac_status" >&5
++ echo "$as_me:20850: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:20809: \"$ac_try\"") >&5
++ { (eval echo "$as_me:20853: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:20812: \$? = $ac_status" >&5
++ echo "$as_me:20856: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_mbstate_t=yes
+ else
+@@ -20821,7 +20865,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:20824: result: $cf_cv_mbstate_t" >&5
++echo "$as_me:20868: result: $cf_cv_mbstate_t" >&5
+ echo "${ECHO_T}$cf_cv_mbstate_t" >&6
+
+ if test "$cf_cv_mbstate_t" = yes ; then
+@@ -20844,14 +20888,14 @@
+ fi
+
+ # This is needed on Tru64 5.0 to declare wchar_t
+-echo "$as_me:20847: checking if we must include wchar.h to declare wchar_t" >&5
++echo "$as_me:20891: 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 20854 "configure"
++#line 20898 "configure"
+ #include "confdefs.h"
+
+ #include <stdlib.h>
+@@ -20869,23 +20913,23 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:20872: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:20916: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:20875: \$? = $ac_status" >&5
++ echo "$as_me:20919: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:20878: \"$ac_try\"") >&5
++ { (eval echo "$as_me:20922: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:20881: \$? = $ac_status" >&5
++ echo "$as_me:20925: \$? = $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 20888 "configure"
++#line 20932 "configure"
+ #include "confdefs.h"
+
+ #include <stdlib.h>
+@@ -20904,16 +20948,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:20907: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:20951: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:20910: \$? = $ac_status" >&5
++ echo "$as_me:20954: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:20913: \"$ac_try\"") >&5
++ { (eval echo "$as_me:20957: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:20916: \$? = $ac_status" >&5
++ echo "$as_me:20960: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_wchar_t=yes
+ else
+@@ -20925,7 +20969,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:20928: result: $cf_cv_wchar_t" >&5
++echo "$as_me:20972: result: $cf_cv_wchar_t" >&5
+ echo "${ECHO_T}$cf_cv_wchar_t" >&6
+
+ if test "$cf_cv_wchar_t" = yes ; then
+@@ -20948,14 +20992,14 @@
+ fi
+
+ # This is needed on Tru64 5.0 to declare wint_t
+-echo "$as_me:20951: checking if we must include wchar.h to declare wint_t" >&5
++echo "$as_me:20995: 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 20958 "configure"
++#line 21002 "configure"
+ #include "confdefs.h"
+
+ #include <stdlib.h>
+@@ -20973,23 +21017,23 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:20976: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:21020: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:20979: \$? = $ac_status" >&5
++ echo "$as_me:21023: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:20982: \"$ac_try\"") >&5
++ { (eval echo "$as_me:21026: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:20985: \$? = $ac_status" >&5
++ echo "$as_me:21029: \$? = $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 20992 "configure"
++#line 21036 "configure"
+ #include "confdefs.h"
+
+ #include <stdlib.h>
+@@ -21008,16 +21052,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:21011: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:21055: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:21014: \$? = $ac_status" >&5
++ echo "$as_me:21058: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:21017: \"$ac_try\"") >&5
++ { (eval echo "$as_me:21061: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:21020: \$? = $ac_status" >&5
++ echo "$as_me:21064: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_wint_t=yes
+ else
+@@ -21029,7 +21073,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:21032: result: $cf_cv_wint_t" >&5
++echo "$as_me:21076: result: $cf_cv_wint_t" >&5
+ echo "${ECHO_T}$cf_cv_wint_t" >&6
+
+ if test "$cf_cv_wint_t" = yes ; then
+@@ -21053,10 +21097,10 @@
+
+ if test "$NCURSES_OK_MBSTATE_T" = 0 ; then
+
+-echo "$as_me:21056: checking for type mbstate_t in ${cf_cv_ncurses_header:-curses.h}" >&5
++echo "$as_me:21100: 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 21059 "configure"
++#line 21103 "configure"
+ #include "confdefs.h"
+
+ #ifndef _XOPEN_SOURCE_EXTENDED
+@@ -21074,16 +21118,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:21077: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:21121: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:21080: \$? = $ac_status" >&5
++ echo "$as_me:21124: \$? = $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:21127: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:21086: \$? = $ac_status" >&5
++ echo "$as_me:21130: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_result=yes
+ else
+@@ -21092,7 +21136,7 @@
+ cf_result=no
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+-echo "$as_me:21095: result: $cf_result" >&5
++echo "$as_me:21139: result: $cf_result" >&5
+ echo "${ECHO_T}$cf_result" >&6
+ if test "$cf_result" = yes ; then
+
+@@ -21114,10 +21158,10 @@
+
+ if test "$NCURSES_OK_WCHAR_T" = 0 ; then
+
+-echo "$as_me:21117: checking for type wchar_t in ${cf_cv_ncurses_header:-curses.h}" >&5
++echo "$as_me:21161: 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 21120 "configure"
++#line 21164 "configure"
+ #include "confdefs.h"
+
+ #ifndef _XOPEN_SOURCE_EXTENDED
+@@ -21135,16 +21179,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:21138: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:21182: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:21141: \$? = $ac_status" >&5
++ echo "$as_me:21185: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:21144: \"$ac_try\"") >&5
++ { (eval echo "$as_me:21188: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:21147: \$? = $ac_status" >&5
++ echo "$as_me:21191: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_result=yes
+ else
+@@ -21153,7 +21197,7 @@
+ cf_result=no
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+-echo "$as_me:21156: result: $cf_result" >&5
++echo "$as_me:21200: result: $cf_result" >&5
+ echo "${ECHO_T}$cf_result" >&6
+ if test "$cf_result" = yes ; then
+
+@@ -21175,10 +21219,10 @@
+
+ if test "$NCURSES_OK_WINT_T" = 0 ; then
+
+-echo "$as_me:21178: checking for type wint_t in ${cf_cv_ncurses_header:-curses.h}" >&5
++echo "$as_me:21222: 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 21181 "configure"
++#line 21225 "configure"
+ #include "confdefs.h"
+
+ #ifndef _XOPEN_SOURCE_EXTENDED
+@@ -21196,16 +21240,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:21199: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:21243: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:21202: \$? = $ac_status" >&5
++ echo "$as_me:21246: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:21205: \"$ac_try\"") >&5
++ { (eval echo "$as_me:21249: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:21208: \$? = $ac_status" >&5
++ echo "$as_me:21252: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_result=yes
+ else
+@@ -21214,7 +21258,7 @@
+ cf_result=no
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+-echo "$as_me:21217: result: $cf_result" >&5
++echo "$as_me:21261: result: $cf_result" >&5
+ echo "${ECHO_T}$cf_result" >&6
+ if test "$cf_result" = yes ; then
+
+@@ -21243,11 +21287,11 @@
+ boolfnames \
+ ttytype
+ do
+-echo "$as_me:21246: checking for data $cf_data declaration in ${cf_cv_ncurses_header:-curses.h}" >&5
++echo "$as_me:21290: 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 21250 "configure"
++#line 21294 "configure"
+ #include "confdefs.h"
+
+ #ifdef HAVE_XCURSES
+@@ -21280,16 +21324,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:21283: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:21327: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:21286: \$? = $ac_status" >&5
++ echo "$as_me:21330: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:21289: \"$ac_try\"") >&5
++ { (eval echo "$as_me:21333: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:21292: \$? = $ac_status" >&5
++ echo "$as_me:21336: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_result=yes
+
+@@ -21299,7 +21343,7 @@
+ cf_result=no
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+-echo "$as_me:21302: result: $cf_result" >&5
++echo "$as_me:21346: result: $cf_result" >&5
+ echo "${ECHO_T}$cf_result" >&6
+
+ if test "$cf_result" = yes ; then
+@@ -21311,14 +21355,14 @@
+ EOF
+
+ else
+- echo "$as_me:21314: checking for data $cf_data in library" >&5
++ echo "$as_me:21358: 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 21321 "configure"
++#line 21365 "configure"
+ #include "confdefs.h"
+
+ #ifdef HAVE_XCURSES
+@@ -21357,16 +21401,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:21360: \"$ac_link\"") >&5
++if { (eval echo "$as_me:21404: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:21363: \$? = $ac_status" >&5
++ echo "$as_me:21407: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:21366: \"$ac_try\"") >&5
++ { (eval echo "$as_me:21410: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:21369: \$? = $ac_status" >&5
++ echo "$as_me:21413: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_result=yes
+ else
+@@ -21378,7 +21422,7 @@
+
+ else
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 21381 "configure"
++#line 21425 "configure"
+ #include "confdefs.h"
+
+ #ifdef HAVE_XCURSES
+@@ -21410,15 +21454,15 @@
+ }
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:21413: \"$ac_link\"") >&5
++if { (eval echo "$as_me:21457: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:21416: \$? = $ac_status" >&5
++ echo "$as_me:21460: \$? = $ac_status" >&5
+ (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+- { (eval echo "$as_me:21418: \"$ac_try\"") >&5
++ { (eval echo "$as_me:21462: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:21421: \$? = $ac_status" >&5
++ echo "$as_me:21465: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_result=yes
+
+@@ -21430,7 +21474,7 @@
+ fi
+ rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+- echo "$as_me:21433: result: $cf_result" >&5
++ echo "$as_me:21477: result: $cf_result" >&5
+ echo "${ECHO_T}$cf_result" >&6
+ if test "$cf_result" = yes ; then
+
+@@ -21447,7 +21491,7 @@
+
+ if test -n "$with_screen" && test "x$with_screen" = "xpdcurses"
+ then
+- echo "$as_me:21450: checking for X" >&5
++ echo "$as_me:21494: checking for X" >&5
+ echo $ECHO_N "checking for X... $ECHO_C" >&6
+
+ # Check whether --with-x or --without-x was given.
+@@ -21551,17 +21595,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 21554 "configure"
++#line 21598 "configure"
+ #include "confdefs.h"
+ #include <X11/Intrinsic.h>
+ _ACEOF
+-if { (eval echo "$as_me:21558: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:21602: \"$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:21564: \$? = $ac_status" >&5
++ echo "$as_me:21608: \$? = $ac_status" >&5
+ (exit "$ac_status"); } >/dev/null; then
+ if test -s conftest.err; then
+ ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -21594,7 +21638,7 @@
+ ac_save_LIBS=$LIBS
+ LIBS="-lXt $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 21597 "configure"
++#line 21641 "configure"
+ #include "confdefs.h"
+ #include <X11/Intrinsic.h>
+ int
+@@ -21606,16 +21650,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:21609: \"$ac_link\"") >&5
++if { (eval echo "$as_me:21653: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:21612: \$? = $ac_status" >&5
++ echo "$as_me:21656: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:21615: \"$ac_try\"") >&5
++ { (eval echo "$as_me:21659: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:21618: \$? = $ac_status" >&5
++ echo "$as_me:21662: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ LIBS=$ac_save_LIBS
+ # We can link X programs with no special library path.
+@@ -21653,7 +21697,7 @@
+ fi # $with_x != no
+
+ if test "$have_x" != yes; then
+- echo "$as_me:21656: result: $have_x" >&5
++ echo "$as_me:21700: result: $have_x" >&5
+ echo "${ECHO_T}$have_x" >&6
+ no_x=yes
+ else
+@@ -21663,7 +21707,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:21666: result: libraries $x_libraries, headers $x_includes" >&5
++ echo "$as_me:21710: result: libraries $x_libraries, headers $x_includes" >&5
+ echo "${ECHO_T}libraries $x_libraries, headers $x_includes" >&6
+ fi
+
+@@ -21690,11 +21734,11 @@
+ # others require no space. Words are not sufficient . . . .
+ case `(uname -sr) 2>/dev/null` in
+ "SunOS 5"*)
+- echo "$as_me:21693: checking whether -R must be followed by a space" >&5
++ echo "$as_me:21737: 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 21697 "configure"
++#line 21741 "configure"
+ #include "confdefs.h"
+
+ int
+@@ -21706,16 +21750,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:21709: \"$ac_link\"") >&5
++if { (eval echo "$as_me:21753: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:21712: \$? = $ac_status" >&5
++ echo "$as_me:21756: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:21715: \"$ac_try\"") >&5
++ { (eval echo "$as_me:21759: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:21718: \$? = $ac_status" >&5
++ echo "$as_me:21762: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_R_nospace=yes
+ else
+@@ -21725,13 +21769,13 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ if test $ac_R_nospace = yes; then
+- echo "$as_me:21728: result: no" >&5
++ echo "$as_me:21772: 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 21734 "configure"
++#line 21778 "configure"
+ #include "confdefs.h"
+
+ int
+@@ -21743,16 +21787,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:21746: \"$ac_link\"") >&5
++if { (eval echo "$as_me:21790: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:21749: \$? = $ac_status" >&5
++ echo "$as_me:21793: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:21752: \"$ac_try\"") >&5
++ { (eval echo "$as_me:21796: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:21755: \$? = $ac_status" >&5
++ echo "$as_me:21799: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_R_space=yes
+ else
+@@ -21762,11 +21806,11 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ if test $ac_R_space = yes; then
+- echo "$as_me:21765: result: yes" >&5
++ echo "$as_me:21809: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ X_LIBS="$X_LIBS -R $x_libraries"
+ else
+- echo "$as_me:21769: result: neither works" >&5
++ echo "$as_me:21813: result: neither works" >&5
+ echo "${ECHO_T}neither works" >&6
+ fi
+ fi
+@@ -21786,7 +21830,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 21789 "configure"
++#line 21833 "configure"
+ #include "confdefs.h"
+
+ /* Override any gcc2 internal prototype to avoid an error. */
+@@ -21805,22 +21849,22 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:21808: \"$ac_link\"") >&5
++if { (eval echo "$as_me:21852: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:21811: \$? = $ac_status" >&5
++ echo "$as_me:21855: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:21814: \"$ac_try\"") >&5
++ { (eval echo "$as_me:21858: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:21817: \$? = $ac_status" >&5
++ echo "$as_me:21861: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ :
+ else
+ echo "$as_me: failed program was:" >&5
+ cat "conftest.$ac_ext" >&5
+-echo "$as_me:21823: checking for dnet_ntoa in -ldnet" >&5
++echo "$as_me:21867: 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
+@@ -21828,7 +21872,7 @@
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-ldnet $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 21831 "configure"
++#line 21875 "configure"
+ #include "confdefs.h"
+
+ /* Override any gcc2 internal prototype to avoid an error. */
+@@ -21847,16 +21891,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:21850: \"$ac_link\"") >&5
++if { (eval echo "$as_me:21894: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:21853: \$? = $ac_status" >&5
++ echo "$as_me:21897: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:21856: \"$ac_try\"") >&5
++ { (eval echo "$as_me:21900: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:21859: \$? = $ac_status" >&5
++ echo "$as_me:21903: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_lib_dnet_dnet_ntoa=yes
+ else
+@@ -21867,14 +21911,14 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:21870: result: $ac_cv_lib_dnet_dnet_ntoa" >&5
++echo "$as_me:21914: 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:21877: checking for dnet_ntoa in -ldnet_stub" >&5
++ echo "$as_me:21921: 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
+@@ -21882,7 +21926,7 @@
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-ldnet_stub $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 21885 "configure"
++#line 21929 "configure"
+ #include "confdefs.h"
+
+ /* Override any gcc2 internal prototype to avoid an error. */
+@@ -21901,16 +21945,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:21904: \"$ac_link\"") >&5
++if { (eval echo "$as_me:21948: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:21907: \$? = $ac_status" >&5
++ echo "$as_me:21951: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:21910: \"$ac_try\"") >&5
++ { (eval echo "$as_me:21954: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:21913: \$? = $ac_status" >&5
++ echo "$as_me:21957: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_lib_dnet_stub_dnet_ntoa=yes
+ else
+@@ -21921,7 +21965,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:21924: result: $ac_cv_lib_dnet_stub_dnet_ntoa" >&5
++echo "$as_me:21968: 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"
+@@ -21940,13 +21984,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:21943: checking for gethostbyname" >&5
++ echo "$as_me:21987: 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 21949 "configure"
++#line 21993 "configure"
+ #include "confdefs.h"
+ #define gethostbyname autoconf_temporary
+ #include <limits.h> /* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -21977,16 +22021,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:21980: \"$ac_link\"") >&5
++if { (eval echo "$as_me:22024: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:21983: \$? = $ac_status" >&5
++ echo "$as_me:22027: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:21986: \"$ac_try\"") >&5
++ { (eval echo "$as_me:22030: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:21989: \$? = $ac_status" >&5
++ echo "$as_me:22033: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_func_gethostbyname=yes
+ else
+@@ -21996,11 +22040,11 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:21999: result: $ac_cv_func_gethostbyname" >&5
++echo "$as_me:22043: 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:22003: checking for gethostbyname in -lnsl" >&5
++ echo "$as_me:22047: 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
+@@ -22008,7 +22052,7 @@
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lnsl $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 22011 "configure"
++#line 22055 "configure"
+ #include "confdefs.h"
+
+ /* Override any gcc2 internal prototype to avoid an error. */
+@@ -22027,16 +22071,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:22030: \"$ac_link\"") >&5
++if { (eval echo "$as_me:22074: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:22033: \$? = $ac_status" >&5
++ echo "$as_me:22077: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:22036: \"$ac_try\"") >&5
++ { (eval echo "$as_me:22080: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:22039: \$? = $ac_status" >&5
++ echo "$as_me:22083: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_lib_nsl_gethostbyname=yes
+ else
+@@ -22047,14 +22091,14 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:22050: result: $ac_cv_lib_nsl_gethostbyname" >&5
++echo "$as_me:22094: 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:22057: checking for gethostbyname in -lbsd" >&5
++ echo "$as_me:22101: 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
+@@ -22062,7 +22106,7 @@
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lbsd $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 22065 "configure"
++#line 22109 "configure"
+ #include "confdefs.h"
+
+ /* Override any gcc2 internal prototype to avoid an error. */
+@@ -22081,16 +22125,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:22084: \"$ac_link\"") >&5
++if { (eval echo "$as_me:22128: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:22087: \$? = $ac_status" >&5
++ echo "$as_me:22131: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:22090: \"$ac_try\"") >&5
++ { (eval echo "$as_me:22134: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:22093: \$? = $ac_status" >&5
++ echo "$as_me:22137: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_lib_bsd_gethostbyname=yes
+ else
+@@ -22101,7 +22145,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:22104: result: $ac_cv_lib_bsd_gethostbyname" >&5
++echo "$as_me:22148: 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"
+@@ -22117,13 +22161,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:22120: checking for connect" >&5
++ echo "$as_me:22164: 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 22126 "configure"
++#line 22170 "configure"
+ #include "confdefs.h"
+ #define connect autoconf_temporary
+ #include <limits.h> /* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -22154,16 +22198,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:22157: \"$ac_link\"") >&5
++if { (eval echo "$as_me:22201: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:22160: \$? = $ac_status" >&5
++ echo "$as_me:22204: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:22163: \"$ac_try\"") >&5
++ { (eval echo "$as_me:22207: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:22166: \$? = $ac_status" >&5
++ echo "$as_me:22210: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_func_connect=yes
+ else
+@@ -22173,11 +22217,11 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:22176: result: $ac_cv_func_connect" >&5
++echo "$as_me:22220: 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:22180: checking for connect in -lsocket" >&5
++ echo "$as_me:22224: 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
+@@ -22185,7 +22229,7 @@
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lsocket $X_EXTRA_LIBS $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 22188 "configure"
++#line 22232 "configure"
+ #include "confdefs.h"
+
+ /* Override any gcc2 internal prototype to avoid an error. */
+@@ -22204,16 +22248,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:22207: \"$ac_link\"") >&5
++if { (eval echo "$as_me:22251: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:22210: \$? = $ac_status" >&5
++ echo "$as_me:22254: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:22213: \"$ac_try\"") >&5
++ { (eval echo "$as_me:22257: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:22216: \$? = $ac_status" >&5
++ echo "$as_me:22260: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_lib_socket_connect=yes
+ else
+@@ -22224,7 +22268,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:22227: result: $ac_cv_lib_socket_connect" >&5
++echo "$as_me:22271: 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"
+@@ -22233,13 +22277,13 @@
+ fi
+
+ # Guillermo Gomez says -lposix is necessary on A/UX.
+- echo "$as_me:22236: checking for remove" >&5
++ echo "$as_me:22280: 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 22242 "configure"
++#line 22286 "configure"
+ #include "confdefs.h"
+ #define remove autoconf_temporary
+ #include <limits.h> /* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -22270,16 +22314,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:22273: \"$ac_link\"") >&5
++if { (eval echo "$as_me:22317: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:22276: \$? = $ac_status" >&5
++ echo "$as_me:22320: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:22279: \"$ac_try\"") >&5
++ { (eval echo "$as_me:22323: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:22282: \$? = $ac_status" >&5
++ echo "$as_me:22326: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_func_remove=yes
+ else
+@@ -22289,11 +22333,11 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:22292: result: $ac_cv_func_remove" >&5
++echo "$as_me:22336: 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:22296: checking for remove in -lposix" >&5
++ echo "$as_me:22340: 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
+@@ -22301,7 +22345,7 @@
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lposix $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 22304 "configure"
++#line 22348 "configure"
+ #include "confdefs.h"
+
+ /* Override any gcc2 internal prototype to avoid an error. */
+@@ -22320,16 +22364,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:22323: \"$ac_link\"") >&5
++if { (eval echo "$as_me:22367: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:22326: \$? = $ac_status" >&5
++ echo "$as_me:22370: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:22329: \"$ac_try\"") >&5
++ { (eval echo "$as_me:22373: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:22332: \$? = $ac_status" >&5
++ echo "$as_me:22376: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_lib_posix_remove=yes
+ else
+@@ -22340,7 +22384,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:22343: result: $ac_cv_lib_posix_remove" >&5
++echo "$as_me:22387: 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"
+@@ -22349,13 +22393,13 @@
+ fi
+
+ # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay.
+- echo "$as_me:22352: checking for shmat" >&5
++ echo "$as_me:22396: 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 22358 "configure"
++#line 22402 "configure"
+ #include "confdefs.h"
+ #define shmat autoconf_temporary
+ #include <limits.h> /* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -22386,16 +22430,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:22389: \"$ac_link\"") >&5
++if { (eval echo "$as_me:22433: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:22392: \$? = $ac_status" >&5
++ echo "$as_me:22436: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:22395: \"$ac_try\"") >&5
++ { (eval echo "$as_me:22439: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:22398: \$? = $ac_status" >&5
++ echo "$as_me:22442: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_func_shmat=yes
+ else
+@@ -22405,11 +22449,11 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:22408: result: $ac_cv_func_shmat" >&5
++echo "$as_me:22452: 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:22412: checking for shmat in -lipc" >&5
++ echo "$as_me:22456: 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
+@@ -22417,7 +22461,7 @@
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lipc $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 22420 "configure"
++#line 22464 "configure"
+ #include "confdefs.h"
+
+ /* Override any gcc2 internal prototype to avoid an error. */
+@@ -22436,16 +22480,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:22439: \"$ac_link\"") >&5
++if { (eval echo "$as_me:22483: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:22442: \$? = $ac_status" >&5
++ echo "$as_me:22486: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:22445: \"$ac_try\"") >&5
++ { (eval echo "$as_me:22489: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:22448: \$? = $ac_status" >&5
++ echo "$as_me:22492: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_lib_ipc_shmat=yes
+ else
+@@ -22456,7 +22500,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:22459: result: $ac_cv_lib_ipc_shmat" >&5
++echo "$as_me:22503: 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"
+@@ -22474,7 +22518,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:22477: checking for IceConnectionNumber in -lICE" >&5
++ echo "$as_me:22521: 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
+@@ -22482,7 +22526,7 @@
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lICE $X_EXTRA_LIBS $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 22485 "configure"
++#line 22529 "configure"
+ #include "confdefs.h"
+
+ /* Override any gcc2 internal prototype to avoid an error. */
+@@ -22501,16 +22545,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:22504: \"$ac_link\"") >&5
++if { (eval echo "$as_me:22548: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:22507: \$? = $ac_status" >&5
++ echo "$as_me:22551: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:22510: \"$ac_try\"") >&5
++ { (eval echo "$as_me:22554: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:22513: \$? = $ac_status" >&5
++ echo "$as_me:22557: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_lib_ICE_IceConnectionNumber=yes
+ else
+@@ -22521,7 +22565,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:22524: result: $ac_cv_lib_ICE_IceConnectionNumber" >&5
++echo "$as_me:22568: 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"
+@@ -22568,16 +22612,16 @@
+ then
+ test -n "$verbose" && echo " repairing CFLAGS: $CFLAGS" 1>&6
+
+-echo "${as_me:-configure}:22571: testing repairing CFLAGS: $CFLAGS ..." 1>&5
++echo "${as_me:-configure}:22615: testing repairing CFLAGS: $CFLAGS ..." 1>&5
+
+ CFLAGS="$cf_temp_flags"
+ test -n "$verbose" && echo " ... fixed $CFLAGS" 1>&6
+
+-echo "${as_me:-configure}:22576: testing ... fixed $CFLAGS ..." 1>&5
++echo "${as_me:-configure}:22620: testing ... fixed $CFLAGS ..." 1>&5
+
+ test -n "$verbose" && echo " ... extra $EXTRA_CFLAGS" 1>&6
+
+-echo "${as_me:-configure}:22580: testing ... extra $EXTRA_CFLAGS ..." 1>&5
++echo "${as_me:-configure}:22624: testing ... extra $EXTRA_CFLAGS ..." 1>&5
+
+ fi
+ ;;
+@@ -22616,16 +22660,16 @@
+ then
+ test -n "$verbose" && echo " repairing CPPFLAGS: $CPPFLAGS" 1>&6
+
+-echo "${as_me:-configure}:22619: testing repairing CPPFLAGS: $CPPFLAGS ..." 1>&5
++echo "${as_me:-configure}:22663: testing repairing CPPFLAGS: $CPPFLAGS ..." 1>&5
+
+ CPPFLAGS="$cf_temp_flags"
+ test -n "$verbose" && echo " ... fixed $CPPFLAGS" 1>&6
+
+-echo "${as_me:-configure}:22624: testing ... fixed $CPPFLAGS ..." 1>&5
++echo "${as_me:-configure}:22668: testing ... fixed $CPPFLAGS ..." 1>&5
+
+ test -n "$verbose" && echo " ... extra $EXTRA_CFLAGS" 1>&6
+
+-echo "${as_me:-configure}:22628: testing ... extra $EXTRA_CFLAGS ..." 1>&5
++echo "${as_me:-configure}:22672: testing ... extra $EXTRA_CFLAGS ..." 1>&5
+
+ fi
+ ;;
+@@ -22664,23 +22708,23 @@
+ then
+ test -n "$verbose" && echo " repairing LDFLAGS: $LDFLAGS" 1>&6
+
+-echo "${as_me:-configure}:22667: testing repairing LDFLAGS: $LDFLAGS ..." 1>&5
++echo "${as_me:-configure}:22711: testing repairing LDFLAGS: $LDFLAGS ..." 1>&5
+
+ LDFLAGS="$cf_temp_flags"
+ test -n "$verbose" && echo " ... fixed $LDFLAGS" 1>&6
+
+-echo "${as_me:-configure}:22672: testing ... fixed $LDFLAGS ..." 1>&5
++echo "${as_me:-configure}:22716: testing ... fixed $LDFLAGS ..." 1>&5
+
+ test -n "$verbose" && echo " ... extra $EXTRA_CFLAGS" 1>&6
+
+-echo "${as_me:-configure}:22676: testing ... extra $EXTRA_CFLAGS ..." 1>&5
++echo "${as_me:-configure}:22720: testing ... extra $EXTRA_CFLAGS ..." 1>&5
+
+ fi
+ ;;
+ esac
+ fi
+
+-echo "$as_me:22683: checking if you want to turn on gcc warnings" >&5
++echo "$as_me:22727: 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.
+@@ -22697,7 +22741,7 @@
+ enable_warnings=no
+
+ fi;
+-echo "$as_me:22700: result: $enable_warnings" >&5
++echo "$as_me:22744: result: $enable_warnings" >&5
+ echo "${ECHO_T}$enable_warnings" >&6
+ if test "$enable_warnings" = "yes"
+ then
+@@ -22720,10 +22764,10 @@
+ EOF
+ if test "$GCC" = yes
+ then
+- { echo "$as_me:22723: checking for $CC __attribute__ directives..." >&5
++ { echo "$as_me:22767: checking for $CC __attribute__ directives..." >&5
+ echo "$as_me: checking for $CC __attribute__ directives..." >&6;}
+ cat > "conftest.$ac_ext" <<EOF
+-#line 22726 "${as_me:-configure}"
++#line 22770 "${as_me:-configure}"
+ #include <stdio.h>
+ #include "confdefs.h"
+ #include "conftest.h"
+@@ -22773,12 +22817,12 @@
+ ;;
+ esac
+
+- if { (eval echo "$as_me:22776: \"$ac_compile\"") >&5
++ if { (eval echo "$as_me:22820: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:22779: \$? = $ac_status" >&5
++ echo "$as_me:22823: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; then
+- test -n "$verbose" && echo "$as_me:22781: result: ... $cf_attribute" >&5
++ test -n "$verbose" && echo "$as_me:22825: result: ... $cf_attribute" >&5
+ echo "${ECHO_T}... $cf_attribute" >&6
+ cat conftest.h >>confdefs.h
+ case "$cf_attribute" in
+@@ -22856,7 +22900,7 @@
+ done
+
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 22859 "configure"
++#line 22903 "configure"
+ #include "confdefs.h"
+
+ #include <stdlib.h>
+@@ -22871,26 +22915,26 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:22874: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:22918: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:22877: \$? = $ac_status" >&5
++ echo "$as_me:22921: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:22880: \"$ac_try\"") >&5
++ { (eval echo "$as_me:22924: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:22883: \$? = $ac_status" >&5
++ echo "$as_me:22927: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+
+-echo "$as_me:22886: checking for X11/Xt const-feature" >&5
++echo "$as_me:22930: 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 22893 "configure"
++#line 22937 "configure"
+ #include "confdefs.h"
+
+ #undef _CONST_X_STRING
+@@ -22908,16 +22952,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:22911: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:22955: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:22914: \$? = $ac_status" >&5
++ echo "$as_me:22958: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:22917: \"$ac_try\"") >&5
++ { (eval echo "$as_me:22961: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:22920: \$? = $ac_status" >&5
++ echo "$as_me:22964: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+
+ cf_cv_const_x_string=no
+@@ -22932,7 +22976,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+
+ fi
+-echo "$as_me:22935: result: $cf_cv_const_x_string" >&5
++echo "$as_me:22979: result: $cf_cv_const_x_string" >&5
+ echo "${ECHO_T}$cf_cv_const_x_string" >&6
+
+ LIBS="$cf_save_LIBS_CF_CONST_X_STRING"
+@@ -22961,7 +23005,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+ cat > "conftest.$ac_ext" <<EOF
+-#line 22964 "${as_me:-configure}"
++#line 23008 "${as_me:-configure}"
+ int main(int argc, char *argv[]) { return (argv[argc-1] == 0) ; }
+ EOF
+ if test "$INTEL_COMPILER" = yes
+@@ -22977,7 +23021,7 @@
+ # remark #981: operands are evaluated in unspecified order
+ # warning #279: controlling expression is constant
+
+- { echo "$as_me:22980: checking for $CC warning options..." >&5
++ { echo "$as_me:23024: checking for $CC warning options..." >&5
+ echo "$as_me: checking for $CC warning options..." >&6;}
+ cf_save_CFLAGS="$CFLAGS"
+ EXTRA_CFLAGS="$EXTRA_CFLAGS -Wall"
+@@ -22993,12 +23037,12 @@
+ wd981
+ do
+ CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt"
+- if { (eval echo "$as_me:22996: \"$ac_compile\"") >&5
++ if { (eval echo "$as_me:23040: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:22999: \$? = $ac_status" >&5
++ echo "$as_me:23043: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; then
+- test -n "$verbose" && echo "$as_me:23001: result: ... -$cf_opt" >&5
++ test -n "$verbose" && echo "$as_me:23045: result: ... -$cf_opt" >&5
+ echo "${ECHO_T}... -$cf_opt" >&6
+ EXTRA_CFLAGS="$EXTRA_CFLAGS -$cf_opt"
+ fi
+@@ -23006,7 +23050,7 @@
+ CFLAGS="$cf_save_CFLAGS"
+ elif test "$GCC" = yes && test "$GCC_VERSION" != "unknown"
+ then
+- { echo "$as_me:23009: checking for $CC warning options..." >&5
++ { echo "$as_me:23053: checking for $CC warning options..." >&5
+ echo "$as_me: checking for $CC warning options..." >&6;}
+ cf_save_CFLAGS="$CFLAGS"
+ cf_warn_CONST=""
+@@ -23029,12 +23073,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:23032: \"$ac_compile\"") >&5
++ if { (eval echo "$as_me:23076: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:23035: \$? = $ac_status" >&5
++ echo "$as_me:23079: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; then
+- test -n "$verbose" && echo "$as_me:23037: result: ... -$cf_opt" >&5
++ test -n "$verbose" && echo "$as_me:23081: result: ... -$cf_opt" >&5
+ echo "${ECHO_T}... -$cf_opt" >&6
+ case "$cf_opt" in
+ (Winline)
+@@ -23042,7 +23086,7 @@
+ ([34].*)
+ test -n "$verbose" && echo " feature is broken in gcc $GCC_VERSION" 1>&6
+
+-echo "${as_me:-configure}:23045: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
++echo "${as_me:-configure}:23089: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
+
+ continue;;
+ esac
+@@ -23052,7 +23096,7 @@
+ ([12].*)
+ test -n "$verbose" && echo " feature is broken in gcc $GCC_VERSION" 1>&6
+
+-echo "${as_me:-configure}:23055: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
++echo "${as_me:-configure}:23099: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
+
+ continue;;
+ esac
+@@ -23069,7 +23113,7 @@
+
+ fi
+
+-echo "$as_me:23072: checking if you want to use dmalloc for testing" >&5
++echo "$as_me:23116: 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.
+@@ -23091,7 +23135,7 @@
+ else
+ with_dmalloc=
+ fi;
+-echo "$as_me:23094: result: ${with_dmalloc:-no}" >&5
++echo "$as_me:23138: result: ${with_dmalloc:-no}" >&5
+ echo "${ECHO_T}${with_dmalloc:-no}" >&6
+
+ case ".$with_cflags" in
+@@ -23205,23 +23249,23 @@
+ esac
+
+ if test "$with_dmalloc" = yes ; then
+- echo "$as_me:23208: checking for dmalloc.h" >&5
++ echo "$as_me:23252: 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 23214 "configure"
++#line 23258 "configure"
+ #include "confdefs.h"
+ #include <dmalloc.h>
+ _ACEOF
+-if { (eval echo "$as_me:23218: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:23262: \"$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:23224: \$? = $ac_status" >&5
++ echo "$as_me:23268: \$? = $ac_status" >&5
+ (exit "$ac_status"); } >/dev/null; then
+ if test -s conftest.err; then
+ ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -23240,11 +23284,11 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:23243: result: $ac_cv_header_dmalloc_h" >&5
++echo "$as_me:23287: 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:23247: checking for dmalloc_debug in -ldmalloc" >&5
++echo "$as_me:23291: 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
+@@ -23252,7 +23296,7 @@
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-ldmalloc $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 23255 "configure"
++#line 23299 "configure"
+ #include "confdefs.h"
+
+ /* Override any gcc2 internal prototype to avoid an error. */
+@@ -23271,16 +23315,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:23274: \"$ac_link\"") >&5
++if { (eval echo "$as_me:23318: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:23277: \$? = $ac_status" >&5
++ echo "$as_me:23321: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:23280: \"$ac_try\"") >&5
++ { (eval echo "$as_me:23324: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:23283: \$? = $ac_status" >&5
++ echo "$as_me:23327: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_lib_dmalloc_dmalloc_debug=yes
+ else
+@@ -23291,7 +23335,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:23294: result: $ac_cv_lib_dmalloc_dmalloc_debug" >&5
++echo "$as_me:23338: 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
+@@ -23306,7 +23350,7 @@
+
+ fi
+
+-echo "$as_me:23309: checking if you want to use dbmalloc for testing" >&5
++echo "$as_me:23353: 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.
+@@ -23328,7 +23372,7 @@
+ else
+ with_dbmalloc=
+ fi;
+-echo "$as_me:23331: result: ${with_dbmalloc:-no}" >&5
++echo "$as_me:23375: result: ${with_dbmalloc:-no}" >&5
+ echo "${ECHO_T}${with_dbmalloc:-no}" >&6
+
+ case ".$with_cflags" in
+@@ -23442,23 +23486,23 @@
+ esac
+
+ if test "$with_dbmalloc" = yes ; then
+- echo "$as_me:23445: checking for dbmalloc.h" >&5
++ echo "$as_me:23489: 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 23451 "configure"
++#line 23495 "configure"
+ #include "confdefs.h"
+ #include <dbmalloc.h>
+ _ACEOF
+-if { (eval echo "$as_me:23455: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:23499: \"$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:23461: \$? = $ac_status" >&5
++ echo "$as_me:23505: \$? = $ac_status" >&5
+ (exit "$ac_status"); } >/dev/null; then
+ if test -s conftest.err; then
+ ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -23477,11 +23521,11 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:23480: result: $ac_cv_header_dbmalloc_h" >&5
++echo "$as_me:23524: 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:23484: checking for debug_malloc in -ldbmalloc" >&5
++echo "$as_me:23528: 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
+@@ -23489,7 +23533,7 @@
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-ldbmalloc $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 23492 "configure"
++#line 23536 "configure"
+ #include "confdefs.h"
+
+ /* Override any gcc2 internal prototype to avoid an error. */
+@@ -23508,16 +23552,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:23511: \"$ac_link\"") >&5
++if { (eval echo "$as_me:23555: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:23514: \$? = $ac_status" >&5
++ echo "$as_me:23558: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:23517: \"$ac_try\"") >&5
++ { (eval echo "$as_me:23561: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:23520: \$? = $ac_status" >&5
++ echo "$as_me:23564: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_lib_dbmalloc_debug_malloc=yes
+ else
+@@ -23528,7 +23572,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:23531: result: $ac_cv_lib_dbmalloc_debug_malloc" >&5
++echo "$as_me:23575: 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
+@@ -23543,7 +23587,7 @@
+
+ fi
+
+-echo "$as_me:23546: checking if you want to use valgrind for testing" >&5
++echo "$as_me:23590: 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.
+@@ -23565,7 +23609,7 @@
+ else
+ with_valgrind=
+ fi;
+-echo "$as_me:23568: result: ${with_valgrind:-no}" >&5
++echo "$as_me:23612: result: ${with_valgrind:-no}" >&5
+ echo "${ECHO_T}${with_valgrind:-no}" >&6
+
+ case ".$with_cflags" in
+@@ -23678,7 +23722,7 @@
+ ;;
+ esac
+
+-echo "$as_me:23681: checking if you want to perform memory-leak testing" >&5
++echo "$as_me:23725: 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.
+@@ -23689,7 +23733,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:23692: result: $with_no_leaks" >&5
++echo "$as_me:23736: result: $with_no_leaks" >&5
+ echo "${ECHO_T}$with_no_leaks" >&6
+
+ if test "$enable_leaks" = no ; then
+@@ -23707,7 +23751,7 @@
+ LD_RPATH_OPT=
+ if test "x$cf_cv_enable_rpath" != xno
+ then
+- echo "$as_me:23710: checking for an rpath option" >&5
++ echo "$as_me:23754: checking for an rpath option" >&5
+ echo $ECHO_N "checking for an rpath option... $ECHO_C" >&6
+ case "$cf_cv_system_name" in
+ (irix*)
+@@ -23738,12 +23782,12 @@
+ (*)
+ ;;
+ esac
+- echo "$as_me:23741: result: $LD_RPATH_OPT" >&5
++ echo "$as_me:23785: result: $LD_RPATH_OPT" >&5
+ echo "${ECHO_T}$LD_RPATH_OPT" >&6
+
+ case "x$LD_RPATH_OPT" in
+ (x-R*)
+- echo "$as_me:23746: checking if we need a space after rpath option" >&5
++ echo "$as_me:23790: 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"
+
+@@ -23764,7 +23808,7 @@
+ LIBS="$cf_add_libs"
+
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 23767 "configure"
++#line 23811 "configure"
+ #include "confdefs.h"
+
+ int
+@@ -23776,16 +23820,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:23779: \"$ac_link\"") >&5
++if { (eval echo "$as_me:23823: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:23782: \$? = $ac_status" >&5
++ echo "$as_me:23826: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:23785: \"$ac_try\"") >&5
++ { (eval echo "$as_me:23829: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:23788: \$? = $ac_status" >&5
++ echo "$as_me:23832: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_rpath_space=no
+ else
+@@ -23795,14 +23839,14 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS="$cf_save_LIBS"
+- echo "$as_me:23798: result: $cf_rpath_space" >&5
++ echo "$as_me:23842: 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:23805: checking if rpath-hack should be disabled" >&5
++echo "$as_me:23849: 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.
+@@ -23820,22 +23864,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:23823: result: $cf_disable_rpath_hack" >&5
++echo "$as_me:23867: result: $cf_disable_rpath_hack" >&5
+ echo "${ECHO_T}$cf_disable_rpath_hack" >&6
+
+ if test "$enable_rpath_hack" = yes ; then
+
+-echo "$as_me:23828: checking for updated LDFLAGS" >&5
++echo "$as_me:23872: 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:23831: result: maybe" >&5
++ echo "$as_me:23875: 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:23838: checking for $ac_word" >&5
++echo "$as_me:23882: 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
+@@ -23850,7 +23894,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:23853: found $ac_dir/$ac_word" >&5
++echo "$as_me:23897: found $ac_dir/$ac_word" >&5
+ break
+ done
+
+@@ -23858,10 +23902,10 @@
+ fi
+ cf_ldd_prog=$ac_cv_prog_cf_ldd_prog
+ if test -n "$cf_ldd_prog"; then
+- echo "$as_me:23861: result: $cf_ldd_prog" >&5
++ echo "$as_me:23905: result: $cf_ldd_prog" >&5
+ echo "${ECHO_T}$cf_ldd_prog" >&6
+ else
+- echo "$as_me:23864: result: no" >&5
++ echo "$as_me:23908: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+
+@@ -23875,7 +23919,7 @@
+ cf_rpath_oops=
+
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 23878 "configure"
++#line 23922 "configure"
+ #include "confdefs.h"
+ #include <stdio.h>
+ int
+@@ -23887,16 +23931,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:23890: \"$ac_link\"") >&5
++if { (eval echo "$as_me:23934: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:23893: \$? = $ac_status" >&5
++ echo "$as_me:23937: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:23896: \"$ac_try\"") >&5
++ { (eval echo "$as_me:23940: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:23899: \$? = $ac_status" >&5
++ echo "$as_me:23943: \$? = $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`
+@@ -23924,7 +23968,7 @@
+ then
+ test -n "$verbose" && echo " ...adding -L$cf_rpath_dir/lib to LDFLAGS for $cf_rpath_src" 1>&6
+
+-echo "${as_me:-configure}:23927: testing ...adding -L$cf_rpath_dir/lib to LDFLAGS for $cf_rpath_src ..." 1>&5
++echo "${as_me:-configure}:23971: testing ...adding -L$cf_rpath_dir/lib to LDFLAGS for $cf_rpath_src ..." 1>&5
+
+ LDFLAGS="$LDFLAGS -L$cf_rpath_dir/lib"
+ break
+@@ -23936,11 +23980,11 @@
+
+ test -n "$verbose" && echo " ...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS" 1>&6
+
+-echo "${as_me:-configure}:23939: testing ...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
++echo "${as_me:-configure}:23983: testing ...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
+
+ test -n "$verbose" && echo " ...checking LDFLAGS $LDFLAGS" 1>&6
+
+-echo "${as_me:-configure}:23943: testing ...checking LDFLAGS $LDFLAGS ..." 1>&5
++echo "${as_me:-configure}:23987: testing ...checking LDFLAGS $LDFLAGS ..." 1>&5
+
+ cf_rpath_dst=
+ for cf_rpath_src in $LDFLAGS
+@@ -23977,7 +24021,7 @@
+ then
+ test -n "$verbose" && echo " ...Filter $cf_rpath_src ->$cf_rpath_tmp" 1>&6
+
+-echo "${as_me:-configure}:23980: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
++echo "${as_me:-configure}:24024: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
+
+ EXTRA_LDFLAGS="$cf_rpath_tmp $EXTRA_LDFLAGS"
+ fi
+@@ -23990,11 +24034,11 @@
+
+ test -n "$verbose" && echo " ...checked LDFLAGS $LDFLAGS" 1>&6
+
+-echo "${as_me:-configure}:23993: testing ...checked LDFLAGS $LDFLAGS ..." 1>&5
++echo "${as_me:-configure}:24037: testing ...checked LDFLAGS $LDFLAGS ..." 1>&5
+
+ test -n "$verbose" && echo " ...checking LIBS $LIBS" 1>&6
+
+-echo "${as_me:-configure}:23997: testing ...checking LIBS $LIBS ..." 1>&5
++echo "${as_me:-configure}:24041: testing ...checking LIBS $LIBS ..." 1>&5
+
+ cf_rpath_dst=
+ for cf_rpath_src in $LIBS
+@@ -24031,7 +24075,7 @@
+ then
+ test -n "$verbose" && echo " ...Filter $cf_rpath_src ->$cf_rpath_tmp" 1>&6
+
+-echo "${as_me:-configure}:24034: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
++echo "${as_me:-configure}:24078: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
+
+ EXTRA_LDFLAGS="$cf_rpath_tmp $EXTRA_LDFLAGS"
+ fi
+@@ -24044,14 +24088,14 @@
+
+ test -n "$verbose" && echo " ...checked LIBS $LIBS" 1>&6
+
+-echo "${as_me:-configure}:24047: testing ...checked LIBS $LIBS ..." 1>&5
++echo "${as_me:-configure}:24091: testing ...checked LIBS $LIBS ..." 1>&5
+
+ test -n "$verbose" && echo " ...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS" 1>&6
+
+-echo "${as_me:-configure}:24051: testing ...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
++echo "${as_me:-configure}:24095: testing ...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
+
+ else
+- echo "$as_me:24054: result: no" >&5
++ echo "$as_me:24098: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+
+@@ -24141,7 +24185,7 @@
+ : "${CONFIG_STATUS=./config.status}"
+ ac_clean_files_save=$ac_clean_files
+ ac_clean_files="$ac_clean_files $CONFIG_STATUS"
+-{ echo "$as_me:24144: creating $CONFIG_STATUS" >&5
++{ echo "$as_me:24188: creating $CONFIG_STATUS" >&5
+ echo "$as_me: creating $CONFIG_STATUS" >&6;}
+ cat >"$CONFIG_STATUS" <<_ACEOF
+ #! $SHELL
+@@ -24322,7 +24366,7 @@
+ echo "$ac_cs_version"; exit 0 ;;
+ --he | --h)
+ # Conflict between --help and --header
+- { { echo "$as_me:24325: error: ambiguous option: $1
++ { { echo "$as_me:24369: 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;}
+@@ -24341,7 +24385,7 @@
+ ac_need_defaults=false;;
+
+ # This is an error.
+- -*) { { echo "$as_me:24344: error: unrecognized option: $1
++ -*) { { echo "$as_me:24388: 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;}
+@@ -24391,7 +24435,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:24394: error: invalid argument: $ac_config_target" >&5
++ *) { { echo "$as_me:24438: error: invalid argument: $ac_config_target" >&5
+ echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
+ { (exit 1); exit 1; }; };;
+ esac
+@@ -24555,6 +24599,8 @@
+ s,@RULE_CC@,$RULE_CC,;t t
+ s,@SHOW_CC@,$SHOW_CC,;t t
+ s,@ECHO_CC@,$ECHO_CC,;t t
++s,@DESTDIR@,$DESTDIR,;t t
++s,@MERGE_PREFIX@,$MERGE_PREFIX,;t t
+ s,@NCURSES_WRAP_PREFIX@,$NCURSES_WRAP_PREFIX,;t t
+ s,@NCURSES_CONFIG@,$NCURSES_CONFIG,;t t
+ s,@ac_ct_NCURSES_CONFIG@,$ac_ct_NCURSES_CONFIG,;t t
+@@ -24705,7 +24751,7 @@
+ esac
+
+ if test x"$ac_file" != x-; then
+- { echo "$as_me:24708: creating $ac_file" >&5
++ { echo "$as_me:24754: creating $ac_file" >&5
+ echo "$as_me: creating $ac_file" >&6;}
+ rm -f "$ac_file"
+ fi
+@@ -24723,7 +24769,7 @@
+ -) echo "$tmp"/stdin ;;
+ [\\/$]*)
+ # Absolute (can't be DOS-style, as IFS=:)
+- test -f "$f" || { { echo "$as_me:24726: error: cannot find input file: $f" >&5
++ test -f "$f" || { { echo "$as_me:24772: error: cannot find input file: $f" >&5
+ echo "$as_me: error: cannot find input file: $f" >&2;}
+ { (exit 1); exit 1; }; }
+ echo "$f";;
+@@ -24736,7 +24782,7 @@
+ echo "$srcdir/$f"
+ else
+ # /dev/null tree
+- { { echo "$as_me:24739: error: cannot find input file: $f" >&5
++ { { echo "$as_me:24785: error: cannot find input file: $f" >&5
+ echo "$as_me: error: cannot find input file: $f" >&2;}
+ { (exit 1); exit 1; }; }
+ fi;;
+@@ -24752,7 +24798,7 @@
+ if test -n "$ac_seen"; then
+ ac_used=`grep '@datarootdir@' "$ac_item"`
+ if test -z "$ac_used"; then
+- { echo "$as_me:24755: WARNING: datarootdir was used implicitly but not set:
++ { echo "$as_me:24801: 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;}
+@@ -24761,7 +24807,7 @@
+ fi
+ ac_seen=`grep '${datarootdir}' "$ac_item"`
+ if test -n "$ac_seen"; then
+- { echo "$as_me:24764: WARNING: datarootdir was used explicitly but not set:
++ { echo "$as_me:24810: 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;}
+@@ -24806,7 +24852,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:24809: WARNING: Variable $ac_name is used but was not set:
++ { echo "$as_me:24855: 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;}
+@@ -24817,7 +24863,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:24820: WARNING: Some variables may not be substituted:
++ { echo "$as_me:24866: WARNING: Some variables may not be substituted:
+ $ac_seen" >&5
+ echo "$as_me: WARNING: Some variables may not be substituted:
+ $ac_seen" >&2;}
+@@ -24866,7 +24912,7 @@
+ * ) ac_file_in=$ac_file.in ;;
+ esac
+
+- test x"$ac_file" != x- && { echo "$as_me:24869: creating $ac_file" >&5
++ test x"$ac_file" != x- && { echo "$as_me:24915: creating $ac_file" >&5
+ echo "$as_me: creating $ac_file" >&6;}
+
+ # First look for the input files in the build tree, otherwise in the
+@@ -24877,7 +24923,7 @@
+ -) echo "$tmp"/stdin ;;
+ [\\/$]*)
+ # Absolute (can't be DOS-style, as IFS=:)
+- test -f "$f" || { { echo "$as_me:24880: error: cannot find input file: $f" >&5
++ test -f "$f" || { { echo "$as_me:24926: error: cannot find input file: $f" >&5
+ echo "$as_me: error: cannot find input file: $f" >&2;}
+ { (exit 1); exit 1; }; }
+ echo $f;;
+@@ -24890,7 +24936,7 @@
+ echo "$srcdir/$f"
+ else
+ # /dev/null tree
+- { { echo "$as_me:24893: error: cannot find input file: $f" >&5
++ { { echo "$as_me:24939: error: cannot find input file: $f" >&5
+ echo "$as_me: error: cannot find input file: $f" >&2;}
+ { (exit 1); exit 1; }; }
+ fi;;
+@@ -24948,7 +24994,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:24951: $ac_file is unchanged" >&5
++ { echo "$as_me:24997: $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.177
+--- ncurses-6.5-20240810+/test/configure.in 2024-08-10 14:11:56.000000000 +0000
++++ ncurses-6.5-20240817/test/configure.in 2024-08-11 09:08:54.000000000 +0000
+@@ -29,7 +29,7 @@
+ dnl
+ dnl Author: Thomas E. Dickey 1996-on
+ dnl
+-dnl $Id: configure.in,v 1.177 2024/08/10 14:11:56 tom Exp $
++dnl $Id: configure.in,v 1.178 2024/08/11 09:08:54 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)
+@@ -118,6 +118,7 @@
+ dnl ---------------------------------------------------------------------------
+ CF_PKG_CONFIG
+ CF_DISABLE_ECHO
++CF_INSTALL_PREFIX
+
+ dnl ---------------------------------------------------------------------------
+ CF_HELP_MESSAGE(Curses Version-dependent Options:)