aboutsummaryrefslogtreecommitdiff
path: root/packages/ncurses/6.5/ncurses-6.5-20240706.patch
diff options
context:
space:
mode:
Diffstat (limited to 'packages/ncurses/6.5/ncurses-6.5-20240706.patch')
-rw-r--r--packages/ncurses/6.5/ncurses-6.5-20240706.patch41069
1 files changed, 41069 insertions, 0 deletions
diff --git a/packages/ncurses/6.5/ncurses-6.5-20240706.patch b/packages/ncurses/6.5/ncurses-6.5-20240706.patch
new file mode 100644
index 00000000..85bf88b6
--- /dev/null
+++ b/packages/ncurses/6.5/ncurses-6.5-20240706.patch
@@ -0,0 +1,41069 @@
+# ncurses 6.5 - patch 20240706 - 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-20240706.patch.gz
+# patch by Thomas E. Dickey <dickey@invisible-island.net>
+# created Sat Jul 6 23:21:31 UTC 2024
+# ------------------------------------------------------------------------------
+# Ada95/aclocal.m4 | 8
+# Ada95/configure | 2972 ++++++++++-----------
+# NEWS | 7
+# VERSION | 2
+# aclocal.m4 | 22
+# configure | 5133 ++++++++++++++++++-------------------
+# dist.mk | 4
+# package/debian-mingw/changelog | 4
+# package/debian-mingw64/changelog | 4
+# package/debian/changelog | 4
+# package/mingw-ncurses.nsi | 4
+# package/mingw-ncurses.spec | 2
+# package/ncurses.spec | 2
+# package/ncursest.spec | 2
+# test/aclocal.m4 | 20
+# test/configure | 3917 ++++++++++++++--------------
+# 16 files changed, 6071 insertions(+), 6036 deletions(-)
+# ------------------------------------------------------------------------------
+Index: Ada95/aclocal.m4
+Prereq: 1.216
+--- ncurses-6.5-20240629+/Ada95/aclocal.m4 2024-06-01 21:38:29.000000000 +0000
++++ ncurses-6.5-20240706/Ada95/aclocal.m4 2024-06-22 17:42:22.000000000 +0000
+@@ -29,7 +29,7 @@
+ dnl
+ dnl Author: Thomas E. Dickey
+ dnl
+-dnl $Id: aclocal.m4,v 1.216 2024/06/01 21:38:29 tom Exp $
++dnl $Id: aclocal.m4,v 1.217 2024/06/22 17:42:22 tom Exp $
+ dnl Macros used in NCURSES Ada95 auto-configuration script.
+ dnl
+ dnl These macros are maintained separately from NCURSES. The copyright on
+@@ -477,7 +477,7 @@
+ AC_SUBST(ARFLAGS)
+ ])
+ dnl ---------------------------------------------------------------------------
+-dnl CF_BUILD_CC version: 12 updated: 2024/03/17 09:17:26
++dnl CF_BUILD_CC version: 13 updated: 2024/06/22 13:42:22
+ dnl -----------
+ dnl If we're cross-compiling, allow the user to override the tools and their
+ dnl options. The configure script is oriented toward identifying the host
+@@ -577,9 +577,9 @@
+ : ${BUILD_CC:='${CC}'}
+ : ${BUILD_CPP:='${CPP}'}
+ : ${BUILD_CFLAGS:='${CFLAGS}'}
+- : ${BUILD_CPPFLAGS:='ifelse([$1],,'${CPPFLAGS}',[$1])'}
++ : ${BUILD_CPPFLAGS:='${CPPFLAGS}'}
+ : ${BUILD_LDFLAGS:='${LDFLAGS}'}
+- : ${BUILD_LIBS:='ifelse([$2],,'${LIBS}',[$2])'}
++ : ${BUILD_LIBS:='${LIBS}'}
+ : ${BUILD_EXEEXT:='$x'}
+ : ${BUILD_OBJEXT:='o'}
+ fi
+Index: Ada95/configure
+--- ncurses-6.5-20240629+/Ada95/configure 2024-06-01 21:38:47.000000000 +0000
++++ ncurses-6.5-20240706/Ada95/configure 2024-07-06 18:15:37.000000000 +0000
+@@ -1,7 +1,7 @@
+ #! /bin/sh
+ # From configure.in Revision: 1.93 .
+ # Guess values for system-dependent variables and create Makefiles.
+-# Generated by Autoconf 2.52.20231210.
++# Generated by Autoconf 2.52.20240618.
+ #
+ # Copyright 2003-2022,2023 Thomas E. Dickey
+ # Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001
+@@ -481,6 +481,10 @@
+ | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
+ x_libraries=$ac_optarg ;;
+
++ -*dir | -dvi* | -doc* | -html* | -local* | -pdf* | -ps* )
++ echo "$as_me: WARNING: unsupported option: $ac_option" >&2
++ ;;
++
+ -*) { echo "$as_me: error: unrecognized option: $ac_option
+ Try \`$0 --help' for more information." >&2
+ { (exit 1); exit 1; }; }
+@@ -824,7 +828,7 @@
+ running configure, to aid debugging if configure makes a mistake.
+
+ It was created by $as_me, which was
+-generated by GNU Autoconf 2.52.20231210. Invocation command line was
++generated by GNU Autoconf 2.52.20240618. Invocation command line was
+
+ $ $0 $@
+
+@@ -948,7 +952,7 @@
+ fi
+ for ac_site_file in $CONFIG_SITE; do
+ if test -r "$ac_site_file"; then
+- { echo "$as_me:951: loading site script $ac_site_file" >&5
++ { echo "$as_me:955: 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"
+@@ -959,7 +963,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:962: loading cache $cache_file" >&5
++ { echo "$as_me:966: loading cache $cache_file" >&5
+ echo "$as_me: loading cache $cache_file" >&6;}
+ case $cache_file in
+ [\\/]* | ?:[\\/]* ) . $cache_file;;
+@@ -967,7 +971,7 @@
+ esac
+ fi
+ else
+- { echo "$as_me:970: creating cache $cache_file" >&5
++ { echo "$as_me:974: creating cache $cache_file" >&5
+ echo "$as_me: creating cache $cache_file" >&6;}
+ >$cache_file
+ fi
+@@ -983,21 +987,21 @@
+ eval ac_new_val="\$ac_env_${ac_var}_value"
+ case "$ac_old_set,$ac_new_set" in
+ set,)
+- { echo "$as_me:986: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
++ { echo "$as_me:990: 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:990: error: \`$ac_var' was not set in the previous run" >&5
++ { echo "$as_me:994: 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:996: error: \`$ac_var' has changed since the previous run:" >&5
++ { echo "$as_me:1000: 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:998: former value: $ac_old_val" >&5
++ { echo "$as_me:1002: former value: $ac_old_val" >&5
+ echo "$as_me: former value: $ac_old_val" >&2;}
+- { echo "$as_me:1000: current value: $ac_new_val" >&5
++ { echo "$as_me:1004: current value: $ac_new_val" >&5
+ echo "$as_me: current value: $ac_new_val" >&2;}
+ ac_cache_corrupted=:
+ fi;;
+@@ -1016,9 +1020,9 @@
+ fi
+ done
+ if "$ac_cache_corrupted"; then
+- { echo "$as_me:1019: error: changes in the environment can compromise the build" >&5
++ { echo "$as_me:1023: 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:1021: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5
++ { { echo "$as_me:1025: 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
+@@ -1047,10 +1051,10 @@
+ echo "#! $SHELL" >conftest.sh
+ echo "exit 0" >>conftest.sh
+ chmod +x conftest.sh
+-if { (echo "$as_me:1050: PATH=\".;.\"; conftest.sh") >&5
++if { (echo "$as_me:1054: PATH=\".;.\"; conftest.sh") >&5
+ (PATH=".;."; conftest.sh) 2>&5
+ ac_status=$?
+- echo "$as_me:1053: \$? = $ac_status" >&5
++ echo "$as_me:1057: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; then
+ ac_path_separator=';'
+ else
+@@ -1082,7 +1086,7 @@
+ fi
+ done
+ if test -z "$ac_aux_dir"; then
+- { { echo "$as_me:1085: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&5
++ { { echo "$as_me:1089: 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
+@@ -1092,11 +1096,11 @@
+
+ # Make sure we can run config.sub.
+ $ac_config_sub sun4 >/dev/null 2>&1 ||
+- { { echo "$as_me:1095: error: cannot run $ac_config_sub" >&5
++ { { echo "$as_me:1099: error: cannot run $ac_config_sub" >&5
+ echo "$as_me: error: cannot run $ac_config_sub" >&2;}
+ { (exit 1); exit 1; }; }
+
+-echo "$as_me:1099: checking build system type" >&5
++echo "$as_me:1103: 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
+@@ -1105,23 +1109,23 @@
+ test -z "$ac_cv_build_alias" &&
+ ac_cv_build_alias=`$ac_config_guess`
+ test -z "$ac_cv_build_alias" &&
+- { { echo "$as_me:1108: error: cannot guess build type; you must specify one" >&5
++ { { echo "$as_me:1112: 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:1112: error: $ac_config_sub $ac_cv_build_alias failed." >&5
++ { { echo "$as_me:1116: 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:1117: result: $ac_cv_build" >&5
++echo "$as_me:1121: 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:1124: checking host system type" >&5
++echo "$as_me:1128: 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
+@@ -1130,12 +1134,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:1133: error: $ac_config_sub $ac_cv_host_alias failed" >&5
++ { { echo "$as_me:1137: 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:1138: result: $ac_cv_host" >&5
++echo "$as_me:1142: 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/'`
+@@ -1143,7 +1147,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:1146: checking target system type" >&5
++ echo "$as_me:1150: 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
+@@ -1152,12 +1156,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:1155: error: $ac_config_sub $ac_cv_target_alias failed" >&5
++ { { echo "$as_me:1159: 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:1160: result: $ac_cv_target" >&5
++echo "$as_me:1164: 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/'`
+@@ -1189,13 +1193,13 @@
+ fi
+
+ test -z "$system_name" && system_name="$cf_cv_system_name"
+-test -n "$cf_cv_system_name" && echo "$as_me:1192: result: Configuring for $cf_cv_system_name" >&5
++test -n "$cf_cv_system_name" && echo "$as_me:1196: 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:1196: result: Cached system name ($system_name) does not agree with actual ($cf_cv_system_name)" >&5
++ echo "$as_me:1200: 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:1198: error: \"Please remove config.cache and try again.\"" >&5
++ { { echo "$as_me:1202: 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
+@@ -1203,7 +1207,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:1206: WARNING: overriding system type to $withval" >&5
++ { echo "$as_me:1210: 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
+@@ -1218,7 +1222,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:1221: checking for $ac_word" >&5
++echo "$as_me:1225: 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
+@@ -1233,7 +1237,7 @@
+ test -z "$ac_dir" && ac_dir=.
+ $as_executable_p "$ac_dir/$ac_word" || continue
+ ac_cv_prog_GREP="$ac_prog"
+-echo "$as_me:1236: found $ac_dir/$ac_word" >&5
++echo "$as_me:1240: found $ac_dir/$ac_word" >&5
+ break
+ done
+
+@@ -1241,10 +1245,10 @@
+ fi
+ GREP=$ac_cv_prog_GREP
+ if test -n "$GREP"; then
+- echo "$as_me:1244: result: $GREP" >&5
++ echo "$as_me:1248: result: $GREP" >&5
+ echo "${ECHO_T}$GREP" >&6
+ else
+- echo "$as_me:1247: result: no" >&5
++ echo "$as_me:1251: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+
+@@ -1252,7 +1256,7 @@
+ done
+ test -n "$GREP" || GREP=": "
+
+-echo "$as_me:1255: checking for fgrep" >&5
++echo "$as_me:1259: 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
+@@ -1264,7 +1268,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:1267: checking for $ac_word" >&5
++echo "$as_me:1271: 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
+@@ -1281,7 +1285,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:1284: found $ac_dir/$ac_word" >&5
++ echo "$as_me:1288: found $ac_dir/$ac_word" >&5
+ break
+ fi
+ done
+@@ -1292,10 +1296,10 @@
+ FGREP=$ac_cv_path_FGREP
+
+ if test -n "$FGREP"; then
+- echo "$as_me:1295: result: $FGREP" >&5
++ echo "$as_me:1299: result: $FGREP" >&5
+ echo "${ECHO_T}$FGREP" >&6
+ else
+- echo "$as_me:1298: result: no" >&5
++ echo "$as_me:1302: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+
+@@ -1303,16 +1307,16 @@
+ done
+ test -n "$FGREP" || FGREP=": "
+
+- test "x$ac_cv_path_FGREP" = "x:" && { { echo "$as_me:1306: error: cannot find workable fgrep" >&5
++ test "x$ac_cv_path_FGREP" = "x:" && { { echo "$as_me:1310: error: cannot find workable fgrep" >&5
+ echo "$as_me: error: cannot find workable fgrep" >&2;}
+ { (exit 1); exit 1; }; }
+ fi
+ fi
+-echo "$as_me:1311: result: $ac_cv_path_FGREP" >&5
++echo "$as_me:1315: result: $ac_cv_path_FGREP" >&5
+ echo "${ECHO_T}$ac_cv_path_FGREP" >&6
+ FGREP="$ac_cv_path_FGREP"
+
+-echo "$as_me:1315: checking for prefix" >&5
++echo "$as_me:1319: 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
+@@ -1324,11 +1328,11 @@
+ ;;
+ esac
+ fi
+-echo "$as_me:1327: result: $prefix" >&5
++echo "$as_me:1331: result: $prefix" >&5
+ echo "${ECHO_T}$prefix" >&6
+
+ if test "x$prefix" = "xNONE" ; then
+-echo "$as_me:1331: checking for default include-directory" >&5
++echo "$as_me:1335: 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 \
+@@ -1351,7 +1355,7 @@
+ fi
+ test -n "$verbose" && echo " tested $cf_dir" 1>&6
+ done
+-echo "$as_me:1354: result: $includedir" >&5
++echo "$as_me:1358: result: $includedir" >&5
+ echo "${ECHO_T}$includedir" >&6
+ fi
+
+@@ -1378,7 +1382,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:1381: checking for $ac_word" >&5
++echo "$as_me:1385: checking for $ac_word" >&5
+ echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+ if test "${ac_cv_path_cf_TEMP_gnat+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -1395,7 +1399,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:1398: found $ac_dir/$ac_word" >&5
++ echo "$as_me:1402: found $ac_dir/$ac_word" >&5
+ break
+ fi
+ done
+@@ -1407,10 +1411,10 @@
+ cf_TEMP_gnat=$ac_cv_path_cf_TEMP_gnat
+
+ if test -n "$cf_TEMP_gnat"; then
+- echo "$as_me:1410: result: $cf_TEMP_gnat" >&5
++ echo "$as_me:1414: result: $cf_TEMP_gnat" >&5
+ echo "${ECHO_T}$cf_TEMP_gnat" >&6
+ else
+- echo "$as_me:1413: result: no" >&5
++ echo "$as_me:1417: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+
+@@ -1420,7 +1424,7 @@
+ unset cf_cv_gnat_version
+ unset cf_TEMP_gnat
+
+-echo "$as_me:1423: checking for $cf_prog_gnat version" >&5
++echo "$as_me:1427: 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
+@@ -1431,7 +1435,7 @@
+ sed -e '2,$d' -e 's/[^0-9 \.]//g' -e 's/^[ ]*//' -e 's/ .*//'`
+
+ fi
+-echo "$as_me:1434: result: $cf_cv_gnat_version" >&5
++echo "$as_me:1438: 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
+@@ -1460,7 +1464,7 @@
+ cd conftest.src
+ for cf_gprconfig in Ada C
+ do
+- echo "$as_me:1463: checking for gprconfig name for $cf_gprconfig" >&5
++ echo "$as_me:1467: 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
+@@ -1479,10 +1483,10 @@
+ if test -n "$cf_gprconfig_value"
+ then
+ eval "cf_ada_config_$cf_gprconfig=$cf_gprconfig_value"
+- echo "$as_me:1482: result: $cf_gprconfig_value" >&5
++ echo "$as_me:1486: result: $cf_gprconfig_value" >&5
+ echo "${ECHO_T}$cf_gprconfig_value" >&6
+ else
+- echo "$as_me:1485: result: missing" >&5
++ echo "$as_me:1489: result: missing" >&5
+ echo "${ECHO_T}missing" >&6
+ cf_ada_config="#"
+ break
+@@ -1495,7 +1499,7 @@
+ if test "x$cf_ada_config" != "x#"
+ then
+
+-echo "$as_me:1498: checking for gnat version" >&5
++echo "$as_me:1502: 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
+@@ -1506,7 +1510,7 @@
+ sed -e '2,$d' -e 's/[^0-9 \.]//g' -e 's/^[ ]*//' -e 's/ .*//'`
+
+ fi
+-echo "$as_me:1509: result: $cf_cv_gnat_version" >&5
++echo "$as_me:1513: 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
+
+@@ -1515,7 +1519,7 @@
+ cf_cv_prog_gnat_correct=yes
+ ;;
+ (*)
+- { echo "$as_me:1518: WARNING: Unsupported GNAT version $cf_cv_gnat_version. We require 3.11 or better. Disabling Ada95 binding." >&5
++ { 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: WARNING: Unsupported GNAT version $cf_cv_gnat_version. We require 3.11 or better. Disabling Ada95 binding." >&2;}
+ cf_cv_prog_gnat_correct=no
+ ;;
+@@ -1523,7 +1527,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:1526: checking for $ac_word" >&5
++echo "$as_me:1530: 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
+@@ -1538,7 +1542,7 @@
+ test -z "$ac_dir" && ac_dir=.
+ $as_executable_p "$ac_dir/$ac_word" || continue
+ ac_cv_prog_M4_exists="yes"
+-echo "$as_me:1541: found $ac_dir/$ac_word" >&5
++echo "$as_me:1545: found $ac_dir/$ac_word" >&5
+ break
+ done
+
+@@ -1547,20 +1551,20 @@
+ fi
+ M4_exists=$ac_cv_prog_M4_exists
+ if test -n "$M4_exists"; then
+- echo "$as_me:1550: result: $M4_exists" >&5
++ echo "$as_me:1554: result: $M4_exists" >&5
+ echo "${ECHO_T}$M4_exists" >&6
+ else
+- echo "$as_me:1553: result: no" >&5
++ echo "$as_me:1557: 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:1559: WARNING: Ada95 binding required program m4 not found. Ada95 binding disabled" >&5
++ { echo "$as_me:1563: 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:1563: checking if GNAT works" >&5
++ echo "$as_me:1567: checking if GNAT works" >&5
+ echo $ECHO_N "checking if GNAT works... $ECHO_C" >&6
+
+ rm -rf ./conftest* ./*~conftest*
+@@ -1588,7 +1592,7 @@
+ fi
+ rm -rf ./conftest* ./*~conftest*
+
+- echo "$as_me:1591: result: $cf_cv_prog_gnat_correct" >&5
++ echo "$as_me:1595: result: $cf_cv_prog_gnat_correct" >&5
+ echo "${ECHO_T}$cf_cv_prog_gnat_correct" >&6
+ fi
+ else
+@@ -1604,7 +1608,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:1607: checking for $ac_word" >&5
++echo "$as_me:1611: 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
+@@ -1621,7 +1625,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:1624: found $ac_dir/$ac_word" >&5
++ echo "$as_me:1628: found $ac_dir/$ac_word" >&5
+ break
+ fi
+ done
+@@ -1633,16 +1637,16 @@
+ cf_cv_path_gnatgcc=$ac_cv_path_cf_cv_path_gnatgcc
+
+ if test -n "$cf_cv_path_gnatgcc"; then
+- echo "$as_me:1636: result: $cf_cv_path_gnatgcc" >&5
++ echo "$as_me:1640: result: $cf_cv_path_gnatgcc" >&5
+ echo "${ECHO_T}$cf_cv_path_gnatgcc" >&6
+ else
+- echo "$as_me:1639: result: no" >&5
++ echo "$as_me:1643: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+
+ if test "$cf_cv_path_gnatgcc" != no
+ then
+- echo "$as_me:1645: checking for improvement" >&5
++ echo "$as_me:1649: 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
+@@ -1653,7 +1657,7 @@
+ cf_cv_path_gnatgcc=no
+ ;;
+ esac
+- echo "$as_me:1656: result: $cf_cv_path_gnatgcc" >&5
++ echo "$as_me:1660: 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"
+@@ -1678,7 +1682,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:1681: checking for $ac_word" >&5
++echo "$as_me:1685: 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
+@@ -1693,7 +1697,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:1696: found $ac_dir/$ac_word" >&5
++echo "$as_me:1700: found $ac_dir/$ac_word" >&5
+ break
+ done
+
+@@ -1701,10 +1705,10 @@
+ fi
+ CC=$ac_cv_prog_CC
+ if test -n "$CC"; then
+- echo "$as_me:1704: result: $CC" >&5
++ echo "$as_me:1708: result: $CC" >&5
+ echo "${ECHO_T}$CC" >&6
+ else
+- echo "$as_me:1707: result: no" >&5
++ echo "$as_me:1711: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+
+@@ -1717,7 +1721,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:1720: checking for $ac_word" >&5
++echo "$as_me:1724: 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
+@@ -1732,7 +1736,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:1735: found $ac_dir/$ac_word" >&5
++echo "$as_me:1739: found $ac_dir/$ac_word" >&5
+ break
+ done
+
+@@ -1740,10 +1744,10 @@
+ fi
+ ac_ct_CC=$ac_cv_prog_ac_ct_CC
+ if test -n "$ac_ct_CC"; then
+- echo "$as_me:1743: result: $ac_ct_CC" >&5
++ echo "$as_me:1747: result: $ac_ct_CC" >&5
+ echo "${ECHO_T}$ac_ct_CC" >&6
+ else
+- echo "$as_me:1746: result: no" >&5
++ echo "$as_me:1750: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+
+@@ -1753,32 +1757,32 @@
+ CC=$ac_ct_CC
+ fi
+
+-test -z "$CC" && { { echo "$as_me:1756: error: no acceptable cc found in \$PATH" >&5
++test -z "$CC" && { { echo "$as_me:1760: 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:1761:" \
++echo "$as_me:1765:" \
+ "checking for C compiler version" >&5
+ ac_compiler=`set X $ac_compile; echo "$2"`
+-{ (eval echo "$as_me:1764: \"$ac_compiler --version </dev/null >&5\"") >&5
++{ (eval echo "$as_me:1768: \"$ac_compiler --version </dev/null >&5\"") >&5
+ (eval $ac_compiler --version </dev/null >&5) 2>&5
+ ac_status=$?
+- echo "$as_me:1767: \$? = $ac_status" >&5
++ echo "$as_me:1771: \$? = $ac_status" >&5
+ (exit "$ac_status"); }
+-{ (eval echo "$as_me:1769: \"$ac_compiler -v </dev/null >&5\"") >&5
++{ (eval echo "$as_me:1773: \"$ac_compiler -v </dev/null >&5\"") >&5
+ (eval $ac_compiler -v </dev/null >&5) 2>&5
+ ac_status=$?
+- echo "$as_me:1772: \$? = $ac_status" >&5
++ echo "$as_me:1776: \$? = $ac_status" >&5
+ (exit "$ac_status"); }
+-{ (eval echo "$as_me:1774: \"$ac_compiler -V </dev/null >&5\"") >&5
++{ (eval echo "$as_me:1778: \"$ac_compiler -V </dev/null >&5\"") >&5
+ (eval $ac_compiler -V </dev/null >&5) 2>&5
+ ac_status=$?
+- echo "$as_me:1777: \$? = $ac_status" >&5
++ echo "$as_me:1781: \$? = $ac_status" >&5
+ (exit "$ac_status"); }
+
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 1781 "configure"
++#line 1785 "configure"
+ #include "confdefs.h"
+
+ int
+@@ -1794,13 +1798,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:1797: checking for C compiler default output" >&5
++echo "$as_me:1801: 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:1800: \"$ac_link_default\"") >&5
++if { (eval echo "$as_me:1804: \"$ac_link_default\"") >&5
+ (eval $ac_link_default) 2>&5
+ ac_status=$?
+- echo "$as_me:1803: \$? = $ac_status" >&5
++ echo "$as_me:1807: \$? = $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
+@@ -1823,34 +1827,34 @@
+ else
+ echo "$as_me: failed program was:" >&5
+ cat "conftest.$ac_ext" >&5
+-{ { echo "$as_me:1826: error: C compiler cannot create executables" >&5
++{ { echo "$as_me:1830: 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:1832: result: $ac_file" >&5
++echo "$as_me:1836: 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:1837: checking whether the C compiler works" >&5
++echo "$as_me:1841: 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:1843: \"$ac_try\"") >&5
++ { (eval echo "$as_me:1847: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:1846: \$? = $ac_status" >&5
++ echo "$as_me:1850: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cross_compiling=no
+ else
+ if test "$cross_compiling" = maybe; then
+ cross_compiling=yes
+ else
+- { { echo "$as_me:1853: error: cannot run C compiled programs.
++ { { echo "$as_me:1857: 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;}
+@@ -1858,24 +1862,24 @@
+ fi
+ fi
+ fi
+-echo "$as_me:1861: result: yes" >&5
++echo "$as_me:1865: 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:1868: checking whether we are cross compiling" >&5
++echo "$as_me:1872: checking whether we are cross compiling" >&5
+ echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6
+-echo "$as_me:1870: result: $cross_compiling" >&5
++echo "$as_me:1874: result: $cross_compiling" >&5
+ echo "${ECHO_T}$cross_compiling" >&6
+
+-echo "$as_me:1873: checking for executable suffix" >&5
++echo "$as_me:1877: checking for executable suffix" >&5
+ echo $ECHO_N "checking for executable suffix... $ECHO_C" >&6
+-if { (eval echo "$as_me:1875: \"$ac_link\"") >&5
++if { (eval echo "$as_me:1879: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:1878: \$? = $ac_status" >&5
++ echo "$as_me:1882: \$? = $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
+@@ -1891,25 +1895,25 @@
+ esac
+ done
+ else
+- { { echo "$as_me:1894: error: cannot compute EXEEXT: cannot compile and link" >&5
++ { { echo "$as_me:1898: 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:1900: result: $ac_cv_exeext" >&5
++echo "$as_me:1904: 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:1906: checking for object suffix" >&5
++echo "$as_me:1910: 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 1912 "configure"
++#line 1916 "configure"
+ #include "confdefs.h"
+
+ int
+@@ -1921,10 +1925,10 @@
+ }
+ _ACEOF
+ rm -f conftest.o conftest.obj
+-if { (eval echo "$as_me:1924: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:1928: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:1927: \$? = $ac_status" >&5
++ echo "$as_me:1931: \$? = $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
+@@ -1936,24 +1940,24 @@
+ else
+ echo "$as_me: failed program was:" >&5
+ cat "conftest.$ac_ext" >&5
+-{ { echo "$as_me:1939: error: cannot compute OBJEXT: cannot compile" >&5
++{ { echo "$as_me:1943: 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:1946: result: $ac_cv_objext" >&5
++echo "$as_me:1950: result: $ac_cv_objext" >&5
+ echo "${ECHO_T}$ac_cv_objext" >&6
+ OBJEXT=$ac_cv_objext
+ ac_objext=$OBJEXT
+-echo "$as_me:1950: checking whether we are using the GNU C compiler" >&5
++echo "$as_me:1954: 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 1956 "configure"
++#line 1960 "configure"
+ #include "confdefs.h"
+
+ int
+@@ -1968,16 +1972,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:1971: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:1975: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:1974: \$? = $ac_status" >&5
++ echo "$as_me:1978: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:1977: \"$ac_try\"") >&5
++ { (eval echo "$as_me:1981: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:1980: \$? = $ac_status" >&5
++ echo "$as_me:1984: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_compiler_gnu=yes
+ else
+@@ -1989,19 +1993,19 @@
+ ac_cv_c_compiler_gnu=$ac_compiler_gnu
+
+ fi
+-echo "$as_me:1992: result: $ac_cv_c_compiler_gnu" >&5
++echo "$as_me:1996: 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:1998: checking whether $CC accepts -g" >&5
++echo "$as_me:2002: 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 2004 "configure"
++#line 2008 "configure"
+ #include "confdefs.h"
+
+ int
+@@ -2013,16 +2017,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:2016: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:2020: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:2019: \$? = $ac_status" >&5
++ echo "$as_me:2023: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:2022: \"$ac_try\"") >&5
++ { (eval echo "$as_me:2026: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:2025: \$? = $ac_status" >&5
++ echo "$as_me:2029: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_prog_cc_g=yes
+ else
+@@ -2032,7 +2036,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:2035: result: $ac_cv_prog_cc_g" >&5
++echo "$as_me:2039: 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
+@@ -2059,16 +2063,16 @@
+ #endif
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:2062: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:2066: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:2065: \$? = $ac_status" >&5
++ echo "$as_me:2069: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:2068: \"$ac_try\"") >&5
++ { (eval echo "$as_me:2072: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:2071: \$? = $ac_status" >&5
++ echo "$as_me:2075: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ for ac_declaration in \
+ ''\
+@@ -2080,7 +2084,7 @@
+ 'void exit (int);'
+ do
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 2083 "configure"
++#line 2087 "configure"
+ #include "confdefs.h"
+ #include <stdlib.h>
+ $ac_declaration
+@@ -2093,16 +2097,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:2096: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:2100: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:2099: \$? = $ac_status" >&5
++ echo "$as_me:2103: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:2102: \"$ac_try\"") >&5
++ { (eval echo "$as_me:2106: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:2105: \$? = $ac_status" >&5
++ echo "$as_me:2109: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ :
+ else
+@@ -2112,7 +2116,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 2115 "configure"
++#line 2119 "configure"
+ #include "confdefs.h"
+ $ac_declaration
+ int
+@@ -2124,16 +2128,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:2127: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:2131: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:2130: \$? = $ac_status" >&5
++ echo "$as_me:2134: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:2133: \"$ac_try\"") >&5
++ { (eval echo "$as_me:2137: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:2136: \$? = $ac_status" >&5
++ echo "$as_me:2140: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ break
+ else
+@@ -2163,11 +2167,11 @@
+
+ GCC_VERSION=none
+ if test "$GCC" = yes ; then
+- echo "$as_me:2166: checking version of $CC" >&5
++ echo "$as_me:2170: 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:2170: result: $GCC_VERSION" >&5
++ echo "$as_me:2174: result: $GCC_VERSION" >&5
+ echo "${ECHO_T}$GCC_VERSION" >&6
+ fi
+
+@@ -2176,12 +2180,12 @@
+ if test "$GCC" = yes ; then
+ case "$host_os" in
+ (linux*|gnu*)
+- echo "$as_me:2179: checking if this is really Intel C compiler" >&5
++ echo "$as_me:2183: 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 2184 "configure"
++#line 2188 "configure"
+ #include "confdefs.h"
+
+ int
+@@ -2198,16 +2202,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:2201: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:2205: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:2204: \$? = $ac_status" >&5
++ echo "$as_me:2208: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:2207: \"$ac_try\"") >&5
++ { (eval echo "$as_me:2211: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:2210: \$? = $ac_status" >&5
++ echo "$as_me:2214: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ INTEL_COMPILER=yes
+ cf_save_CFLAGS="$cf_save_CFLAGS -we147"
+@@ -2218,7 +2222,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ CFLAGS="$cf_save_CFLAGS"
+- echo "$as_me:2221: result: $INTEL_COMPILER" >&5
++ echo "$as_me:2225: result: $INTEL_COMPILER" >&5
+ echo "${ECHO_T}$INTEL_COMPILER" >&6
+ ;;
+ esac
+@@ -2227,11 +2231,11 @@
+ CLANG_COMPILER=no
+
+ if test "$GCC" = yes ; then
+- echo "$as_me:2230: checking if this is really Clang C compiler" >&5
++ echo "$as_me:2234: 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 2234 "configure"
++#line 2238 "configure"
+ #include "confdefs.h"
+
+ int
+@@ -2248,16 +2252,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:2251: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:2255: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:2254: \$? = $ac_status" >&5
++ echo "$as_me:2258: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:2257: \"$ac_try\"") >&5
++ { (eval echo "$as_me:2261: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:2260: \$? = $ac_status" >&5
++ echo "$as_me:2264: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ CLANG_COMPILER=yes
+
+@@ -2267,7 +2271,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ CFLAGS="$cf_save_CFLAGS"
+- echo "$as_me:2270: result: $CLANG_COMPILER" >&5
++ echo "$as_me:2274: result: $CLANG_COMPILER" >&5
+ echo "${ECHO_T}$CLANG_COMPILER" >&6
+ fi
+
+@@ -2276,30 +2280,30 @@
+ if test "x$CLANG_COMPILER" = "xyes" ; then
+ case "$CC" in
+ (c[1-9][0-9]|*/c[1-9][0-9])
+- { echo "$as_me:2279: WARNING: replacing broken compiler alias $CC" >&5
++ { echo "$as_me:2283: 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:2286: checking version of $CC" >&5
++ echo "$as_me:2290: 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:2290: result: $CLANG_VERSION" >&5
++ echo "$as_me:2294: 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:2297: checking if option $cf_clang_opt works" >&5
++ echo "$as_me:2301: 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 2302 "configure"
++#line 2306 "configure"
+ #include "confdefs.h"
+
+ #include <stdio.h>
+@@ -2313,16 +2317,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:2316: \"$ac_link\"") >&5
++if { (eval echo "$as_me:2320: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:2319: \$? = $ac_status" >&5
++ echo "$as_me:2323: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:2322: \"$ac_try\"") >&5
++ { (eval echo "$as_me:2326: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:2325: \$? = $ac_status" >&5
++ echo "$as_me:2329: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+
+ cf_clang_optok=yes
+@@ -2333,13 +2337,13 @@
+ cf_clang_optok=no
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+- echo "$as_me:2336: result: $cf_clang_optok" >&5
++ echo "$as_me:2340: 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}:2342: testing adding option $cf_clang_opt ..." 1>&5
++echo "${as_me:-configure}:2346: testing adding option $cf_clang_opt ..." 1>&5
+
+ test -n "$CFLAGS" && CFLAGS="$CFLAGS "
+ CFLAGS="${CFLAGS}$cf_clang_opt"
+@@ -2348,7 +2352,7 @@
+ done
+ fi
+
+-echo "$as_me:2351: checking for $CC option to accept ANSI C" >&5
++echo "$as_me:2355: 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
+@@ -2356,7 +2360,7 @@
+ ac_cv_prog_cc_stdc=no
+ ac_save_CC=$CC
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 2359 "configure"
++#line 2363 "configure"
+ #include "confdefs.h"
+ #include <stdarg.h>
+ #include <stdio.h>
+@@ -2403,16 +2407,16 @@
+ do
+ CC="$ac_save_CC $ac_arg"
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:2406: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:2410: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:2409: \$? = $ac_status" >&5
++ echo "$as_me:2413: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:2412: \"$ac_try\"") >&5
++ { (eval echo "$as_me:2416: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:2415: \$? = $ac_status" >&5
++ echo "$as_me:2419: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_prog_cc_stdc=$ac_arg
+ break
+@@ -2429,10 +2433,10 @@
+
+ case "x$ac_cv_prog_cc_stdc" in
+ x|xno)
+- echo "$as_me:2432: result: none needed" >&5
++ echo "$as_me:2436: result: none needed" >&5
+ echo "${ECHO_T}none needed" >&6 ;;
+ *)
+- echo "$as_me:2435: result: $ac_cv_prog_cc_stdc" >&5
++ echo "$as_me:2439: result: $ac_cv_prog_cc_stdc" >&5
+ echo "${ECHO_T}$ac_cv_prog_cc_stdc" >&6
+ CC="$CC $ac_cv_prog_cc_stdc" ;;
+ esac
+@@ -2440,13 +2444,13 @@
+ # This should have been defined by AC_PROG_CC
+ : "${CC:=cc}"
+
+-echo "$as_me:2443: checking \$CFLAGS variable" >&5
++echo "$as_me:2447: checking \$CFLAGS variable" >&5
+ echo $ECHO_N "checking \$CFLAGS variable... $ECHO_C" >&6
+ case "x$CFLAGS" in
+ (*-[IUD]*)
+- echo "$as_me:2447: result: broken" >&5
++ echo "$as_me:2451: result: broken" >&5
+ echo "${ECHO_T}broken" >&6
+- { echo "$as_me:2449: WARNING: your environment uses the CFLAGS variable to hold CPPFLAGS options" >&5
++ { echo "$as_me:2453: 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=
+@@ -2554,18 +2558,18 @@
+ done
+ ;;
+ (*)
+- echo "$as_me:2557: result: ok" >&5
++ echo "$as_me:2561: result: ok" >&5
+ echo "${ECHO_T}ok" >&6
+ ;;
+ esac
+
+-echo "$as_me:2562: checking \$CC variable" >&5
++echo "$as_me:2566: checking \$CC variable" >&5
+ echo $ECHO_N "checking \$CC variable... $ECHO_C" >&6
+ case "$CC" in
+ (*[\ \ ]-*)
+- echo "$as_me:2566: result: broken" >&5
++ echo "$as_me:2570: result: broken" >&5
+ echo "${ECHO_T}broken" >&6
+- { echo "$as_me:2568: WARNING: your environment uses the CC variable to hold CFLAGS/CPPFLAGS options" >&5
++ { echo "$as_me:2572: 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/[ ]*[ ]-[^ ].*//'`
+@@ -2682,19 +2686,19 @@
+ done
+ test -n "$verbose" && echo " resulting CC: '$CC'" 1>&6
+
+-echo "${as_me:-configure}:2685: testing resulting CC: '$CC' ..." 1>&5
++echo "${as_me:-configure}:2689: testing resulting CC: '$CC' ..." 1>&5
+
+ test -n "$verbose" && echo " resulting CFLAGS: '$CFLAGS'" 1>&6
+
+-echo "${as_me:-configure}:2689: testing resulting CFLAGS: '$CFLAGS' ..." 1>&5
++echo "${as_me:-configure}:2693: testing resulting CFLAGS: '$CFLAGS' ..." 1>&5
+
+ test -n "$verbose" && echo " resulting CPPFLAGS: '$CPPFLAGS'" 1>&6
+
+-echo "${as_me:-configure}:2693: testing resulting CPPFLAGS: '$CPPFLAGS' ..." 1>&5
++echo "${as_me:-configure}:2697: testing resulting CPPFLAGS: '$CPPFLAGS' ..." 1>&5
+
+ ;;
+ (*)
+- echo "$as_me:2697: result: ok" >&5
++ echo "$as_me:2701: result: ok" >&5
+ echo "${ECHO_T}ok" >&6
+ ;;
+ esac
+@@ -2702,7 +2706,7 @@
+ ;;
+ esac
+
+-echo "$as_me:2705: checking for egrep" >&5
++echo "$as_me:2709: 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
+@@ -2714,7 +2718,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:2717: checking for $ac_word" >&5
++echo "$as_me:2721: 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
+@@ -2731,7 +2735,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:2734: found $ac_dir/$ac_word" >&5
++ echo "$as_me:2738: found $ac_dir/$ac_word" >&5
+ break
+ fi
+ done
+@@ -2742,10 +2746,10 @@
+ EGREP=$ac_cv_path_EGREP
+
+ if test -n "$EGREP"; then
+- echo "$as_me:2745: result: $EGREP" >&5
++ echo "$as_me:2749: result: $EGREP" >&5
+ echo "${ECHO_T}$EGREP" >&6
+ else
+- echo "$as_me:2748: result: no" >&5
++ echo "$as_me:2752: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+
+@@ -2753,12 +2757,12 @@
+ done
+ test -n "$EGREP" || EGREP=": "
+
+- test "x$ac_cv_path_EGREP" = "x:" && { { echo "$as_me:2756: error: cannot find workable egrep" >&5
++ test "x$ac_cv_path_EGREP" = "x:" && { { echo "$as_me:2760: error: cannot find workable egrep" >&5
+ echo "$as_me: error: cannot find workable egrep" >&2;}
+ { (exit 1); exit 1; }; }
+ fi
+ fi
+-echo "$as_me:2761: result: $ac_cv_path_EGREP" >&5
++echo "$as_me:2765: result: $ac_cv_path_EGREP" >&5
+ echo "${ECHO_T}$ac_cv_path_EGREP" >&6
+ EGREP="$ac_cv_path_EGREP"
+
+@@ -2768,7 +2772,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:2771: checking how to run the C preprocessor" >&5
++echo "$as_me:2775: 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
+@@ -2789,18 +2793,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 2792 "configure"
++#line 2796 "configure"
+ #include "confdefs.h"
+ #include <assert.h>
+ Syntax error
+ _ACEOF
+-if { (eval echo "$as_me:2797: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:2801: \"$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:2803: \$? = $ac_status" >&5
++ echo "$as_me:2807: \$? = $ac_status" >&5
+ (exit "$ac_status"); } >/dev/null; then
+ if test -s conftest.err; then
+ ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -2823,17 +2827,17 @@
+ # OK, works on sane cases. Now check whether non-existent headers
+ # can be detected and how.
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 2826 "configure"
++#line 2830 "configure"
+ #include "confdefs.h"
+ #include <ac_nonexistent.h>
+ _ACEOF
+-if { (eval echo "$as_me:2830: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:2834: \"$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:2836: \$? = $ac_status" >&5
++ echo "$as_me:2840: \$? = $ac_status" >&5
+ (exit "$ac_status"); } >/dev/null; then
+ if test -s conftest.err; then
+ ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -2870,7 +2874,7 @@
+ else
+ ac_cv_prog_CPP=$CPP
+ fi
+-echo "$as_me:2873: result: $CPP" >&5
++echo "$as_me:2877: result: $CPP" >&5
+ echo "${ECHO_T}$CPP" >&6
+ ac_preproc_ok=false
+ for ac_c_preproc_warn_flag in '' yes
+@@ -2880,18 +2884,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 2883 "configure"
++#line 2887 "configure"
+ #include "confdefs.h"
+ #include <assert.h>
+ Syntax error
+ _ACEOF
+-if { (eval echo "$as_me:2888: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:2892: \"$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:2894: \$? = $ac_status" >&5
++ echo "$as_me:2898: \$? = $ac_status" >&5
+ (exit "$ac_status"); } >/dev/null; then
+ if test -s conftest.err; then
+ ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -2914,17 +2918,17 @@
+ # OK, works on sane cases. Now check whether non-existent headers
+ # can be detected and how.
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 2917 "configure"
++#line 2921 "configure"
+ #include "confdefs.h"
+ #include <ac_nonexistent.h>
+ _ACEOF
+-if { (eval echo "$as_me:2921: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:2925: \"$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:2927: \$? = $ac_status" >&5
++ echo "$as_me:2931: \$? = $ac_status" >&5
+ (exit "$ac_status"); } >/dev/null; then
+ if test -s conftest.err; then
+ ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -2952,7 +2956,7 @@
+ if $ac_preproc_ok; then
+ :
+ else
+- { { echo "$as_me:2955: error: C preprocessor \"$CPP\" fails sanity check" >&5
++ { { echo "$as_me:2959: error: C preprocessor \"$CPP\" fails sanity check" >&5
+ echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check" >&2;}
+ { (exit 1); exit 1; }; }
+ fi
+@@ -2965,14 +2969,14 @@
+ ac_main_return="return"
+
+ if test $ac_cv_c_compiler_gnu = yes; then
+- echo "$as_me:2968: checking whether $CC needs -traditional" >&5
++ echo "$as_me:2972: 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 2975 "configure"
++#line 2979 "configure"
+ #include "confdefs.h"
+ #include <sgtty.h>
+ int Autoconf = TIOCGETP;
+@@ -2987,7 +2991,7 @@
+
+ if test $ac_cv_prog_gcc_traditional = no; then
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 2990 "configure"
++#line 2994 "configure"
+ #include "confdefs.h"
+ #include <termio.h>
+ int Autoconf = TCGETA;
+@@ -3000,14 +3004,14 @@
+
+ fi
+ fi
+-echo "$as_me:3003: result: $ac_cv_prog_gcc_traditional" >&5
++echo "$as_me:3007: 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:3010: checking whether $CC understands -c and -o together" >&5
++echo "$as_me:3014: 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
+@@ -3022,15 +3026,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:3025: \"$ac_try\"") >&5
++if { (eval echo "$as_me:3029: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:3028: \$? = $ac_status" >&5
++ echo "$as_me:3032: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+- test -f conftest2.$ac_objext && { (eval echo "$as_me:3030: \"$ac_try\"") >&5
++ test -f conftest2.$ac_objext && { (eval echo "$as_me:3034: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:3033: \$? = $ac_status" >&5
++ echo "$as_me:3037: \$? = $ac_status" >&5
+ (exit "$ac_status"); };
+ then
+ eval cf_cv_prog_CC_c_o=yes
+@@ -3041,10 +3045,10 @@
+
+ fi
+ if test "$cf_cv_prog_CC_c_o" = yes; then
+- echo "$as_me:3044: result: yes" >&5
++ echo "$as_me:3048: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ else
+- echo "$as_me:3047: result: no" >&5
++ echo "$as_me:3051: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+
+@@ -3065,7 +3069,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:3068: checking for $ac_word" >&5
++echo "$as_me:3072: 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
+@@ -3080,7 +3084,7 @@
+ test -z "$ac_dir" && ac_dir=.
+ $as_executable_p "$ac_dir/$ac_word" || continue
+ ac_cv_prog_AWK="$ac_prog"
+-echo "$as_me:3083: found $ac_dir/$ac_word" >&5
++echo "$as_me:3087: found $ac_dir/$ac_word" >&5
+ break
+ done
+
+@@ -3088,21 +3092,21 @@
+ fi
+ AWK=$ac_cv_prog_AWK
+ if test -n "$AWK"; then
+- echo "$as_me:3091: result: $AWK" >&5
++ echo "$as_me:3095: result: $AWK" >&5
+ echo "${ECHO_T}$AWK" >&6
+ else
+- echo "$as_me:3094: result: no" >&5
++ echo "$as_me:3098: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+
+ test -n "$AWK" && break
+ done
+
+-test -z "$AWK" && { { echo "$as_me:3101: error: No awk program found" >&5
++test -z "$AWK" && { { echo "$as_me:3105: error: No awk program found" >&5
+ echo "$as_me: error: No awk program found" >&2;}
+ { (exit 1); exit 1; }; }
+
+-echo "$as_me:3105: checking for egrep" >&5
++echo "$as_me:3109: 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
+@@ -3112,11 +3116,11 @@
+ else ac_cv_prog_egrep='egrep'
+ fi
+ fi
+-echo "$as_me:3115: result: $ac_cv_prog_egrep" >&5
++echo "$as_me:3119: 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:3119: error: No egrep program found" >&5
++ test -z "$EGREP" && { { echo "$as_me:3123: error: No egrep program found" >&5
+ echo "$as_me: error: No egrep program found" >&2;}
+ { (exit 1); exit 1; }; }
+
+@@ -3132,7 +3136,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:3135: checking for a BSD compatible install" >&5
++echo "$as_me:3139: 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
+@@ -3181,7 +3185,7 @@
+ INSTALL=$ac_install_sh
+ fi
+ fi
+-echo "$as_me:3184: result: $INSTALL" >&5
++echo "$as_me:3188: result: $INSTALL" >&5
+ echo "${ECHO_T}$INSTALL" >&6
+
+ # Use test -z because SunOS4 sh mishandles braces in ${var-val}.
+@@ -3192,18 +3196,18 @@
+
+ test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
+
+-echo "$as_me:3195: checking whether ln -s works" >&5
++echo "$as_me:3199: 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:3199: result: yes" >&5
++ echo "$as_me:3203: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ else
+- echo "$as_me:3202: result: no, using $LN_S" >&5
++ echo "$as_me:3206: result: no, using $LN_S" >&5
+ echo "${ECHO_T}no, using $LN_S" >&6
+ fi
+
+-echo "$as_me:3206: checking if $LN_S -f options work" >&5
++echo "$as_me:3210: 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
+@@ -3215,7 +3219,7 @@
+ cf_prog_ln_sf=no
+ fi
+ rm -f conf$$.dst conf$$src
+-echo "$as_me:3218: result: $cf_prog_ln_sf" >&5
++echo "$as_me:3222: 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"
+@@ -3232,7 +3236,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:3235: checking for a BSD compatible install" >&5
++echo "$as_me:3239: 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
+@@ -3281,7 +3285,7 @@
+ INSTALL=$ac_install_sh
+ fi
+ fi
+-echo "$as_me:3284: result: $INSTALL" >&5
++echo "$as_me:3288: result: $INSTALL" >&5
+ echo "${ECHO_T}$INSTALL" >&6
+
+ # Use test -z because SunOS4 sh mishandles braces in ${var-val}.
+@@ -3302,7 +3306,7 @@
+ ;;
+ esac
+
+-echo "$as_me:3305: checking if you want to install stripped executables" >&5
++echo "$as_me:3309: 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.
+@@ -3319,7 +3323,7 @@
+ enable_stripping=yes
+
+ fi;
+-echo "$as_me:3322: result: $enable_stripping" >&5
++echo "$as_me:3326: result: $enable_stripping" >&5
+ echo "${ECHO_T}$enable_stripping" >&6
+
+ if test "$enable_stripping" = yes
+@@ -3330,7 +3334,7 @@
+ fi
+
+ : "${INSTALL:=install}"
+-echo "$as_me:3333: checking if install accepts -p option" >&5
++echo "$as_me:3337: 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
+@@ -3361,10 +3365,10 @@
+ rm -rf ./conftest*
+
+ fi
+-echo "$as_me:3364: result: $cf_cv_install_p" >&5
++echo "$as_me:3368: result: $cf_cv_install_p" >&5
+ echo "${ECHO_T}$cf_cv_install_p" >&6
+
+-echo "$as_me:3367: checking if install needs to be told about ownership" >&5
++echo "$as_me:3371: 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)
+@@ -3375,7 +3379,7 @@
+ ;;
+ esac
+
+-echo "$as_me:3378: result: $with_install_o" >&5
++echo "$as_me:3382: result: $with_install_o" >&5
+ echo "${ECHO_T}$with_install_o" >&6
+ if test "x$with_install_o" = xyes
+ then
+@@ -3386,7 +3390,7 @@
+
+ if test -n "$INSTALL_OPT_S"
+ then
+- echo "$as_me:3389: checking if you want to specify strip-program" >&5
++ echo "$as_me:3393: 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.
+@@ -3396,11 +3400,11 @@
+ else
+ with_strip_program=no
+ fi;
+- echo "$as_me:3399: result: $with_strip_program" >&5
++ echo "$as_me:3403: result: $with_strip_program" >&5
+ echo "${ECHO_T}$with_strip_program" >&6
+ if test "$with_strip_program" != no
+ then
+- echo "$as_me:3403: checking if strip-program is supported with this installer" >&5
++ echo "$as_me:3407: 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
+@@ -3421,11 +3425,11 @@
+ done
+ fi
+ fi
+- echo "$as_me:3424: result: $check_install_strip" >&5
++ echo "$as_me:3428: result: $check_install_strip" >&5
+ echo "${ECHO_T}$check_install_strip" >&6
+ case "$check_install_strip" in
+ (no)
+- { echo "$as_me:3428: WARNING: $cf_install_program does not support strip program option" >&5
++ { echo "$as_me:3432: 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
+ ;;
+@@ -3440,7 +3444,7 @@
+ chmod +x "$INSTALL"
+ test -n "$verbose" && echo " created $INSTALL" 1>&6
+
+-echo "${as_me:-configure}:3443: testing created $INSTALL ..." 1>&5
++echo "${as_me:-configure}:3447: testing created $INSTALL ..." 1>&5
+
+ ;;
+ (option)
+@@ -3450,7 +3454,7 @@
+ fi
+ fi
+
+-echo "$as_me:3453: checking for long file names" >&5
++echo "$as_me:3457: 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
+@@ -3489,7 +3493,7 @@
+ rm -rf "$ac_xdir" 2>/dev/null
+ done
+ fi
+-echo "$as_me:3492: result: $ac_cv_sys_long_file_names" >&5
++echo "$as_me:3496: 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
+
+@@ -3501,7 +3505,7 @@
+
+ # if we find pkg-config, check if we should install the ".pc" files.
+
+-echo "$as_me:3504: checking if you want to use pkg-config" >&5
++echo "$as_me:3508: 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.
+@@ -3511,7 +3515,7 @@
+ else
+ cf_pkg_config=yes
+ fi;
+-echo "$as_me:3514: result: $cf_pkg_config" >&5
++echo "$as_me:3518: result: $cf_pkg_config" >&5
+ echo "${ECHO_T}$cf_pkg_config" >&6
+
+ case "$cf_pkg_config" in
+@@ -3523,7 +3527,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:3526: checking for $ac_word" >&5
++echo "$as_me:3530: 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
+@@ -3540,7 +3544,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:3543: found $ac_dir/$ac_word" >&5
++ echo "$as_me:3547: found $ac_dir/$ac_word" >&5
+ break
+ fi
+ done
+@@ -3551,10 +3555,10 @@
+ PKG_CONFIG=$ac_cv_path_PKG_CONFIG
+
+ if test -n "$PKG_CONFIG"; then
+- echo "$as_me:3554: result: $PKG_CONFIG" >&5
++ echo "$as_me:3558: result: $PKG_CONFIG" >&5
+ echo "${ECHO_T}$PKG_CONFIG" >&6
+ else
+- echo "$as_me:3557: result: no" >&5
++ echo "$as_me:3561: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+
+@@ -3563,7 +3567,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:3566: checking for $ac_word" >&5
++echo "$as_me:3570: 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
+@@ -3580,7 +3584,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:3583: found $ac_dir/$ac_word" >&5
++ echo "$as_me:3587: found $ac_dir/$ac_word" >&5
+ break
+ fi
+ done
+@@ -3592,10 +3596,10 @@
+ ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG
+
+ if test -n "$ac_pt_PKG_CONFIG"; then
+- echo "$as_me:3595: result: $ac_pt_PKG_CONFIG" >&5
++ echo "$as_me:3599: result: $ac_pt_PKG_CONFIG" >&5
+ echo "${ECHO_T}$ac_pt_PKG_CONFIG" >&6
+ else
+- echo "$as_me:3598: result: no" >&5
++ echo "$as_me:3602: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+
+@@ -3638,24 +3642,24 @@
+ PKG_CONFIG=`echo "$PKG_CONFIG" | sed -e s%NONE%$cf_path_syntax%`
+ ;;
+ (*)
+- { { echo "$as_me:3641: error: expected a pathname, not \"$PKG_CONFIG\"" >&5
++ { { echo "$as_me:3645: 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:3648: WARNING: pkg-config is not installed" >&5
++ { echo "$as_me:3652: 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:3654: checking for pkg-config library directory" >&5
++ echo "$as_me:3658: checking for pkg-config library directory" >&5
+ echo $ECHO_N "checking for pkg-config library directory... $ECHO_C" >&6
+ ;;
+ (*)
+- echo "$as_me:3658: checking for $PKG_CONFIG library directory" >&5
++ echo "$as_me:3662: checking for $PKG_CONFIG library directory" >&5
+ echo $ECHO_N "checking for $PKG_CONFIG library directory... $ECHO_C" >&6
+ ;;
+ esac
+@@ -3682,7 +3686,7 @@
+ case "x$cf_search_path" in
+ (xlibdir)
+ PKG_CONFIG_LIBDIR='${libdir}/pkgconfig'
+- echo "$as_me:3685: result: $PKG_CONFIG_LIBDIR" >&5
++ echo "$as_me:3689: result: $PKG_CONFIG_LIBDIR" >&5
+ echo "${ECHO_T}$PKG_CONFIG_LIBDIR" >&6
+ cf_search_path=
+ ;;
+@@ -3693,16 +3697,16 @@
+ ;;
+ (x/*)
+ PKG_CONFIG_LIBDIR="$cf_search_path"
+- echo "$as_me:3696: result: $PKG_CONFIG_LIBDIR" >&5
++ echo "$as_me:3700: result: $PKG_CONFIG_LIBDIR" >&5
+ echo "${ECHO_T}$PKG_CONFIG_LIBDIR" >&6
+ cf_search_path=
+ ;;
+ (xyes|xauto)
+- echo "$as_me:3701: result: auto" >&5
++ echo "$as_me:3705: 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:3705: checking for search-list" >&5
++ echo "$as_me:3709: checking for search-list" >&5
+ echo $ECHO_N "checking for search-list... $ECHO_C" >&6
+ if test "x$PKG_CONFIG" != xnone
+ then
+@@ -3729,11 +3733,11 @@
+ "`
+ fi
+
+- echo "$as_me:3732: result: $cf_search_path" >&5
++ echo "$as_me:3736: result: $cf_search_path" >&5
+ echo "${ECHO_T}$cf_search_path" >&6
+ ;;
+ (*)
+- { { echo "$as_me:3736: error: Unexpected option value: $cf_search_path" >&5
++ { { echo "$as_me:3740: error: Unexpected option value: $cf_search_path" >&5
+ echo "$as_me: error: Unexpected option value: $cf_search_path" >&2;}
+ { (exit 1); exit 1; }; }
+ ;;
+@@ -3741,7 +3745,7 @@
+
+ if test -n "$cf_search_path"
+ then
+- echo "$as_me:3744: checking for first directory" >&5
++ echo "$as_me:3748: 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
+@@ -3752,7 +3756,7 @@
+ break
+ fi
+ done
+- echo "$as_me:3755: result: $cf_pkg_config_path" >&5
++ echo "$as_me:3759: result: $cf_pkg_config_path" >&5
+ echo "${ECHO_T}$cf_pkg_config_path" >&6
+
+ if test "x$cf_pkg_config_path" != xnone ; then
+@@ -3762,7 +3766,7 @@
+
+ if test -z "$PKG_CONFIG_LIBDIR" && test -n "$cf_search_path"
+ then
+- echo "$as_me:3765: checking for workaround" >&5
++ echo "$as_me:3769: checking for workaround" >&5
+ echo $ECHO_N "checking for workaround... $ECHO_C" >&6
+ if test "$prefix" = "NONE" ; then
+ cf_prefix="$ac_default_prefix"
+@@ -3785,12 +3789,12 @@
+ esac
+ done
+ test -z "$PKG_CONFIG_LIBDIR" && PKG_CONFIG_LIBDIR=$cf_backup
+- echo "$as_me:3788: result: $PKG_CONFIG_LIBDIR" >&5
++ echo "$as_me:3792: result: $PKG_CONFIG_LIBDIR" >&5
+ echo "${ECHO_T}$PKG_CONFIG_LIBDIR" >&6
+ fi
+ fi
+
+-echo "$as_me:3793: checking if you want to build test-programs" >&5
++echo "$as_me:3797: 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.
+@@ -3800,10 +3804,10 @@
+ else
+ cf_with_tests=yes
+ fi;
+-echo "$as_me:3803: result: $cf_with_tests" >&5
++echo "$as_me:3807: result: $cf_with_tests" >&5
+ echo "${ECHO_T}$cf_with_tests" >&6
+
+-echo "$as_me:3806: checking if we should assume mixed-case filenames" >&5
++echo "$as_me:3810: 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.
+@@ -3813,11 +3817,11 @@
+ else
+ enable_mixedcase=auto
+ fi;
+-echo "$as_me:3816: result: $enable_mixedcase" >&5
++echo "$as_me:3820: result: $enable_mixedcase" >&5
+ echo "${ECHO_T}$enable_mixedcase" >&6
+ if test "$enable_mixedcase" = "auto" ; then
+
+-echo "$as_me:3820: checking if filesystem supports mixed-case filenames" >&5
++echo "$as_me:3824: 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
+@@ -3844,7 +3848,7 @@
+ fi
+
+ fi
+-echo "$as_me:3847: result: $cf_cv_mixedcase" >&5
++echo "$as_me:3851: result: $cf_cv_mixedcase" >&5
+ echo "${ECHO_T}$cf_cv_mixedcase" >&6
+ test "$cf_cv_mixedcase" = yes &&
+ cat >>confdefs.h <<\EOF
+@@ -3862,7 +3866,7 @@
+ fi
+
+ # do this after mixed-case option (tags/TAGS is not as important as tic).
+-echo "$as_me:3865: checking whether ${MAKE-make} sets \${MAKE}" >&5
++echo "$as_me:3869: 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
+@@ -3882,16 +3886,16 @@
+ rm -f conftest.make
+ fi
+ if eval "test \"`echo '$ac_cv_prog_make_'${ac_make}_set`\" = yes"; then
+- echo "$as_me:3885: result: yes" >&5
++ echo "$as_me:3889: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ SET_MAKE=
+ else
+- echo "$as_me:3889: result: no" >&5
++ echo "$as_me:3893: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ SET_MAKE="MAKE=${MAKE-make}"
+ fi
+
+-echo "$as_me:3894: checking for \".PHONY\" make-support" >&5
++echo "$as_me:3898: 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
+@@ -3946,7 +3950,7 @@
+ rm -rf conftest*
+
+ fi
+-echo "$as_me:3949: result: $cf_cv_make_PHONY" >&5
++echo "$as_me:3953: result: $cf_cv_make_PHONY" >&5
+ echo "${ECHO_T}$cf_cv_make_PHONY" >&6
+ MAKE_NO_PHONY="#"
+ MAKE_PHONY="#"
+@@ -3957,7 +3961,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:3960: checking for $ac_word" >&5
++echo "$as_me:3964: 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
+@@ -3972,7 +3976,7 @@
+ test -z "$ac_dir" && ac_dir=.
+ $as_executable_p "$ac_dir/$ac_word" || continue
+ ac_cv_prog_CTAGS="$ac_prog"
+-echo "$as_me:3975: found $ac_dir/$ac_word" >&5
++echo "$as_me:3979: found $ac_dir/$ac_word" >&5
+ break
+ done
+
+@@ -3980,10 +3984,10 @@
+ fi
+ CTAGS=$ac_cv_prog_CTAGS
+ if test -n "$CTAGS"; then
+- echo "$as_me:3983: result: $CTAGS" >&5
++ echo "$as_me:3987: result: $CTAGS" >&5
+ echo "${ECHO_T}$CTAGS" >&6
+ else
+- echo "$as_me:3986: result: no" >&5
++ echo "$as_me:3990: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+
+@@ -3994,7 +3998,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:3997: checking for $ac_word" >&5
++echo "$as_me:4001: 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
+@@ -4009,7 +4013,7 @@
+ test -z "$ac_dir" && ac_dir=.
+ $as_executable_p "$ac_dir/$ac_word" || continue
+ ac_cv_prog_ETAGS="$ac_prog"
+-echo "$as_me:4012: found $ac_dir/$ac_word" >&5
++echo "$as_me:4016: found $ac_dir/$ac_word" >&5
+ break
+ done
+
+@@ -4017,10 +4021,10 @@
+ fi
+ ETAGS=$ac_cv_prog_ETAGS
+ if test -n "$ETAGS"; then
+- echo "$as_me:4020: result: $ETAGS" >&5
++ echo "$as_me:4024: result: $ETAGS" >&5
+ echo "${ECHO_T}$ETAGS" >&6
+ else
+- echo "$as_me:4023: result: no" >&5
++ echo "$as_me:4027: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+
+@@ -4029,7 +4033,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:4032: checking for $ac_word" >&5
++echo "$as_me:4036: 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
+@@ -4044,7 +4048,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:4047: found $ac_dir/$ac_word" >&5
++echo "$as_me:4051: found $ac_dir/$ac_word" >&5
+ break
+ done
+
+@@ -4053,17 +4057,17 @@
+ fi
+ MAKE_LOWER_TAGS=$ac_cv_prog_MAKE_LOWER_TAGS
+ if test -n "$MAKE_LOWER_TAGS"; then
+- echo "$as_me:4056: result: $MAKE_LOWER_TAGS" >&5
++ echo "$as_me:4060: result: $MAKE_LOWER_TAGS" >&5
+ echo "${ECHO_T}$MAKE_LOWER_TAGS" >&6
+ else
+- echo "$as_me:4059: result: no" >&5
++ echo "$as_me:4063: 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:4066: checking for $ac_word" >&5
++echo "$as_me:4070: 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
+@@ -4078,7 +4082,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:4081: found $ac_dir/$ac_word" >&5
++echo "$as_me:4085: found $ac_dir/$ac_word" >&5
+ break
+ done
+
+@@ -4087,10 +4091,10 @@
+ fi
+ MAKE_UPPER_TAGS=$ac_cv_prog_MAKE_UPPER_TAGS
+ if test -n "$MAKE_UPPER_TAGS"; then
+- echo "$as_me:4090: result: $MAKE_UPPER_TAGS" >&5
++ echo "$as_me:4094: result: $MAKE_UPPER_TAGS" >&5
+ echo "${ECHO_T}$MAKE_UPPER_TAGS" >&6
+ else
+- echo "$as_me:4093: result: no" >&5
++ echo "$as_me:4097: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+
+@@ -4110,7 +4114,7 @@
+ MAKE_LOWER_TAGS="#"
+ fi
+
+-echo "$as_me:4113: checking for makeflags variable" >&5
++echo "$as_me:4117: 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
+@@ -4140,7 +4144,7 @@
+ ;;
+ (*)
+
+-echo "${as_me:-configure}:4143: testing given option \"$cf_option\",no match \"$cf_result\" ..." 1>&5
++echo "${as_me:-configure}:4147: testing given option \"$cf_option\",no match \"$cf_result\" ..." 1>&5
+
+ ;;
+ esac
+@@ -4148,13 +4152,13 @@
+ rm -f cf_makeflags.tmp
+
+ fi
+-echo "$as_me:4151: result: $cf_cv_makeflags" >&5
++echo "$as_me:4155: 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:4157: checking for $ac_word" >&5
++echo "$as_me:4161: 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
+@@ -4169,7 +4173,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:4172: found $ac_dir/$ac_word" >&5
++echo "$as_me:4176: found $ac_dir/$ac_word" >&5
+ break
+ done
+
+@@ -4177,10 +4181,10 @@
+ fi
+ RANLIB=$ac_cv_prog_RANLIB
+ if test -n "$RANLIB"; then
+- echo "$as_me:4180: result: $RANLIB" >&5
++ echo "$as_me:4184: result: $RANLIB" >&5
+ echo "${ECHO_T}$RANLIB" >&6
+ else
+- echo "$as_me:4183: result: no" >&5
++ echo "$as_me:4187: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+
+@@ -4189,7 +4193,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:4192: checking for $ac_word" >&5
++echo "$as_me:4196: 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
+@@ -4204,7 +4208,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:4207: found $ac_dir/$ac_word" >&5
++echo "$as_me:4211: found $ac_dir/$ac_word" >&5
+ break
+ done
+
+@@ -4213,10 +4217,10 @@
+ fi
+ ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB
+ if test -n "$ac_ct_RANLIB"; then
+- echo "$as_me:4216: result: $ac_ct_RANLIB" >&5
++ echo "$as_me:4220: result: $ac_ct_RANLIB" >&5
+ echo "${ECHO_T}$ac_ct_RANLIB" >&6
+ else
+- echo "$as_me:4219: result: no" >&5
++ echo "$as_me:4223: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+
+@@ -4228,7 +4232,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:4231: checking for $ac_word" >&5
++echo "$as_me:4235: 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
+@@ -4243,7 +4247,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:4246: found $ac_dir/$ac_word" >&5
++echo "$as_me:4250: found $ac_dir/$ac_word" >&5
+ break
+ done
+
+@@ -4251,10 +4255,10 @@
+ fi
+ LD=$ac_cv_prog_LD
+ if test -n "$LD"; then
+- echo "$as_me:4254: result: $LD" >&5
++ echo "$as_me:4258: result: $LD" >&5
+ echo "${ECHO_T}$LD" >&6
+ else
+- echo "$as_me:4257: result: no" >&5
++ echo "$as_me:4261: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+
+@@ -4263,7 +4267,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:4266: checking for $ac_word" >&5
++echo "$as_me:4270: 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
+@@ -4278,7 +4282,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:4281: found $ac_dir/$ac_word" >&5
++echo "$as_me:4285: found $ac_dir/$ac_word" >&5
+ break
+ done
+
+@@ -4287,10 +4291,10 @@
+ fi
+ ac_ct_LD=$ac_cv_prog_ac_ct_LD
+ if test -n "$ac_ct_LD"; then
+- echo "$as_me:4290: result: $ac_ct_LD" >&5
++ echo "$as_me:4294: result: $ac_ct_LD" >&5
+ echo "${ECHO_T}$ac_ct_LD" >&6
+ else
+- echo "$as_me:4293: result: no" >&5
++ echo "$as_me:4297: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+
+@@ -4302,7 +4306,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:4305: checking for $ac_word" >&5
++echo "$as_me:4309: 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
+@@ -4317,7 +4321,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:4320: found $ac_dir/$ac_word" >&5
++echo "$as_me:4324: found $ac_dir/$ac_word" >&5
+ break
+ done
+
+@@ -4325,10 +4329,10 @@
+ fi
+ AR=$ac_cv_prog_AR
+ if test -n "$AR"; then
+- echo "$as_me:4328: result: $AR" >&5
++ echo "$as_me:4332: result: $AR" >&5
+ echo "${ECHO_T}$AR" >&6
+ else
+- echo "$as_me:4331: result: no" >&5
++ echo "$as_me:4335: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+
+@@ -4337,7 +4341,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:4340: checking for $ac_word" >&5
++echo "$as_me:4344: 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
+@@ -4352,7 +4356,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:4355: found $ac_dir/$ac_word" >&5
++echo "$as_me:4359: found $ac_dir/$ac_word" >&5
+ break
+ done
+
+@@ -4361,10 +4365,10 @@
+ fi
+ ac_ct_AR=$ac_cv_prog_ac_ct_AR
+ if test -n "$ac_ct_AR"; then
+- echo "$as_me:4364: result: $ac_ct_AR" >&5
++ echo "$as_me:4368: result: $ac_ct_AR" >&5
+ echo "${ECHO_T}$ac_ct_AR" >&6
+ else
+- echo "$as_me:4367: result: no" >&5
++ echo "$as_me:4371: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+
+@@ -4376,7 +4380,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:4379: checking for $ac_word" >&5
++echo "$as_me:4383: 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
+@@ -4391,7 +4395,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:4394: found $ac_dir/$ac_word" >&5
++echo "$as_me:4398: found $ac_dir/$ac_word" >&5
+ break
+ done
+
+@@ -4399,10 +4403,10 @@
+ fi
+ AR=$ac_cv_prog_AR
+ if test -n "$AR"; then
+- echo "$as_me:4402: result: $AR" >&5
++ echo "$as_me:4406: result: $AR" >&5
+ echo "${ECHO_T}$AR" >&6
+ else
+- echo "$as_me:4405: result: no" >&5
++ echo "$as_me:4409: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+
+@@ -4411,7 +4415,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:4414: checking for $ac_word" >&5
++echo "$as_me:4418: 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
+@@ -4426,7 +4430,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:4429: found $ac_dir/$ac_word" >&5
++echo "$as_me:4433: found $ac_dir/$ac_word" >&5
+ break
+ done
+
+@@ -4435,10 +4439,10 @@
+ fi
+ ac_ct_AR=$ac_cv_prog_ac_ct_AR
+ if test -n "$ac_ct_AR"; then
+- echo "$as_me:4438: result: $ac_ct_AR" >&5
++ echo "$as_me:4442: result: $ac_ct_AR" >&5
+ echo "${ECHO_T}$ac_ct_AR" >&6
+ else
+- echo "$as_me:4441: result: no" >&5
++ echo "$as_me:4445: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+
+@@ -4447,7 +4451,7 @@
+ AR="$ac_cv_prog_AR"
+ fi
+
+-echo "$as_me:4450: checking for options to update archives" >&5
++echo "$as_me:4454: 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
+@@ -4484,13 +4488,13 @@
+ rm -f conftest.a
+
+ cat >"conftest.$ac_ext" <<EOF
+-#line 4487 "configure"
++#line 4491 "configure"
+ int testdata[3] = { 123, 456, 789 };
+ EOF
+- if { (eval echo "$as_me:4490: \"$ac_compile\"") >&5
++ if { (eval echo "$as_me:4494: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:4493: \$? = $ac_status" >&5
++ echo "$as_me:4497: \$? = $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
+@@ -4501,7 +4505,7 @@
+ else
+ test -n "$verbose" && echo " cannot compile test-program" 1>&6
+
+-echo "${as_me:-configure}:4504: testing cannot compile test-program ..." 1>&5
++echo "${as_me:-configure}:4508: testing cannot compile test-program ..." 1>&5
+
+ break
+ fi
+@@ -4511,7 +4515,7 @@
+ esac
+
+ fi
+-echo "$as_me:4514: result: $cf_cv_ar_flags" >&5
++echo "$as_me:4518: result: $cf_cv_ar_flags" >&5
+ echo "${ECHO_T}$cf_cv_ar_flags" >&6
+
+ if test -n "$ARFLAGS" ; then
+@@ -4522,17 +4526,17 @@
+ ARFLAGS=$cf_cv_ar_flags
+ fi
+
+- echo "$as_me:4525: checking for PATH separator" >&5
++ echo "$as_me:4529: 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:4532: result: $PATH_SEPARATOR" >&5
++ echo "$as_me:4536: result: $PATH_SEPARATOR" >&5
+ echo "${ECHO_T}$PATH_SEPARATOR" >&6
+
+-echo "$as_me:4535: checking if you have specified an install-prefix" >&5
++echo "$as_me:4539: checking if you have specified an install-prefix" >&5
+ echo $ECHO_N "checking if you have specified an install-prefix... $ECHO_C" >&6
+
+ # Check whether --with-install-prefix or --without-install-prefix was given.
+@@ -4545,7 +4549,7 @@
+ ;;
+ esac
+ fi;
+-echo "$as_me:4548: result: $DESTDIR" >&5
++echo "$as_me:4552: result: $DESTDIR" >&5
+ echo "${ECHO_T}$DESTDIR" >&6
+
+ ###############################################################################
+@@ -4573,7 +4577,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:4576: checking for $ac_word" >&5
++echo "$as_me:4580: 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
+@@ -4588,7 +4592,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:4591: found $ac_dir/$ac_word" >&5
++echo "$as_me:4595: found $ac_dir/$ac_word" >&5
+ break
+ done
+
+@@ -4596,10 +4600,10 @@
+ fi
+ BUILD_CC=$ac_cv_prog_BUILD_CC
+ if test -n "$BUILD_CC"; then
+- echo "$as_me:4599: result: $BUILD_CC" >&5
++ echo "$as_me:4603: result: $BUILD_CC" >&5
+ echo "${ECHO_T}$BUILD_CC" >&6
+ else
+- echo "$as_me:4602: result: no" >&5
++ echo "$as_me:4606: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+
+@@ -4608,12 +4612,12 @@
+ test -n "$BUILD_CC" || BUILD_CC="none"
+
+ fi;
+- echo "$as_me:4611: checking for native build C compiler" >&5
++ echo "$as_me:4615: checking for native build C compiler" >&5
+ echo $ECHO_N "checking for native build C compiler... $ECHO_C" >&6
+- echo "$as_me:4613: result: $BUILD_CC" >&5
++ echo "$as_me:4617: result: $BUILD_CC" >&5
+ echo "${ECHO_T}$BUILD_CC" >&6
+
+- echo "$as_me:4616: checking for native build C preprocessor" >&5
++ echo "$as_me:4620: 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.
+@@ -4623,10 +4627,10 @@
+ else
+ BUILD_CPP='${BUILD_CC} -E'
+ fi;
+- echo "$as_me:4626: result: $BUILD_CPP" >&5
++ echo "$as_me:4630: result: $BUILD_CPP" >&5
+ echo "${ECHO_T}$BUILD_CPP" >&6
+
+- echo "$as_me:4629: checking for native build C flags" >&5
++ echo "$as_me:4633: 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.
+@@ -4634,10 +4638,10 @@
+ withval="$with_build_cflags"
+ BUILD_CFLAGS="$withval"
+ fi;
+- echo "$as_me:4637: result: $BUILD_CFLAGS" >&5
++ echo "$as_me:4641: result: $BUILD_CFLAGS" >&5
+ echo "${ECHO_T}$BUILD_CFLAGS" >&6
+
+- echo "$as_me:4640: checking for native build C preprocessor-flags" >&5
++ echo "$as_me:4644: 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.
+@@ -4645,10 +4649,10 @@
+ withval="$with_build_cppflags"
+ BUILD_CPPFLAGS="$withval"
+ fi;
+- echo "$as_me:4648: result: $BUILD_CPPFLAGS" >&5
++ echo "$as_me:4652: result: $BUILD_CPPFLAGS" >&5
+ echo "${ECHO_T}$BUILD_CPPFLAGS" >&6
+
+- echo "$as_me:4651: checking for native build linker-flags" >&5
++ echo "$as_me:4655: 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.
+@@ -4656,10 +4660,10 @@
+ withval="$with_build_ldflags"
+ BUILD_LDFLAGS="$withval"
+ fi;
+- echo "$as_me:4659: result: $BUILD_LDFLAGS" >&5
++ echo "$as_me:4663: result: $BUILD_LDFLAGS" >&5
+ echo "${ECHO_T}$BUILD_LDFLAGS" >&6
+
+- echo "$as_me:4662: checking for native build linker-libraries" >&5
++ echo "$as_me:4666: 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.
+@@ -4667,7 +4671,7 @@
+ withval="$with_build_libs"
+ BUILD_LIBS="$withval"
+ fi;
+- echo "$as_me:4670: result: $BUILD_LIBS" >&5
++ echo "$as_me:4674: result: $BUILD_LIBS" >&5
+ echo "${ECHO_T}$BUILD_LIBS" >&6
+
+ # this assumes we're on Unix.
+@@ -4676,7 +4680,7 @@
+
+ : ${BUILD_CC:='${CC}'}
+
+- echo "$as_me:4679: checking if the build-compiler \"$BUILD_CC\" works" >&5
++ echo "$as_me:4683: 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
+@@ -4690,7 +4694,7 @@
+ cf_ok_build_cc=unknown
+ else
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 4693 "configure"
++#line 4697 "configure"
+ #include "confdefs.h"
+ #include <stdio.h>
+ int main(int argc, char *argv[])
+@@ -4700,15 +4704,15 @@
+
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:4703: \"$ac_link\"") >&5
++if { (eval echo "$as_me:4707: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:4706: \$? = $ac_status" >&5
++ echo "$as_me:4710: \$? = $ac_status" >&5
+ (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+- { (eval echo "$as_me:4708: \"$ac_try\"") >&5
++ { (eval echo "$as_me:4712: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:4711: \$? = $ac_status" >&5
++ echo "$as_me:4715: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_ok_build_cc=yes
+ else
+@@ -4723,12 +4727,12 @@
+ cross_compiling=$cf_save_crossed
+ ac_link=$cf_save_ac_link
+
+- echo "$as_me:4726: result: $cf_ok_build_cc" >&5
++ echo "$as_me:4730: 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:4731: error: Cross-build requires two compilers.
++ { { echo "$as_me:4735: 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;}
+@@ -4739,9 +4743,9 @@
+ : ${BUILD_CC:='${CC}'}
+ : ${BUILD_CPP:='${CPP}'}
+ : ${BUILD_CFLAGS:='${CFLAGS}'}
+- : ${BUILD_CPPFLAGS:=''${CPPFLAGS}''}
++ : ${BUILD_CPPFLAGS:='${CPPFLAGS}'}
+ : ${BUILD_LDFLAGS:='${LDFLAGS}'}
+- : ${BUILD_LIBS:=''${LIBS}''}
++ : ${BUILD_LIBS:='${LIBS}'}
+ : ${BUILD_EXEEXT:='$x'}
+ : ${BUILD_OBJEXT:='o'}
+ fi
+@@ -4753,7 +4757,7 @@
+ ### shared, for example.
+ cf_list_models=""
+
+-echo "$as_me:4756: checking if you want to build shared C-objects" >&5
++echo "$as_me:4760: 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.
+@@ -4763,27 +4767,27 @@
+ else
+ with_shared=no
+ fi;
+-echo "$as_me:4766: result: $with_shared" >&5
++echo "$as_me:4770: result: $with_shared" >&5
+ echo "${ECHO_T}$with_shared" >&6
+ test "$with_shared" = "yes" && cf_list_models="$cf_list_models shared"
+
+-echo "$as_me:4770: checking for specified models" >&5
++echo "$as_me:4774: 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:4773: result: $cf_list_models" >&5
++echo "$as_me:4777: 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:4778: checking for default model" >&5
++echo "$as_me:4782: 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:4781: result: $DFT_LWR_MODEL" >&5
++echo "$as_me:4785: 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:4786: checking for specific curses-directory" >&5
++echo "$as_me:4790: 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.
+@@ -4793,7 +4797,7 @@
+ else
+ cf_cv_curses_dir=no
+ fi;
+-echo "$as_me:4796: result: $cf_cv_curses_dir" >&5
++echo "$as_me:4800: 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"
+@@ -4824,7 +4828,7 @@
+ withval=`echo "$withval" | sed -e s%NONE%$cf_path_syntax%`
+ ;;
+ (*)
+- { { echo "$as_me:4827: error: expected a pathname, not \"$withval\"" >&5
++ { { echo "$as_me:4831: error: expected a pathname, not \"$withval\"" >&5
+ echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
+ { (exit 1); exit 1; }; }
+ ;;
+@@ -4860,7 +4864,7 @@
+ CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
+
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 4863 "configure"
++#line 4867 "configure"
+ #include "confdefs.h"
+ #include <stdio.h>
+ int
+@@ -4872,16 +4876,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:4875: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:4879: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:4878: \$? = $ac_status" >&5
++ echo "$as_me:4882: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:4881: \"$ac_try\"") >&5
++ { (eval echo "$as_me:4885: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:4884: \$? = $ac_status" >&5
++ echo "$as_me:4888: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ :
+ else
+@@ -4898,7 +4902,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}:4901: testing adding $cf_add_incdir to include-path ..." 1>&5
++echo "${as_me:-configure}:4905: testing adding $cf_add_incdir to include-path ..." 1>&5
+
+ CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
+
+@@ -4934,7 +4938,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}:4937: testing adding $cf_add_libdir to library-path ..." 1>&5
++echo "${as_me:-configure}:4941: testing adding $cf_add_libdir to library-path ..." 1>&5
+
+ LDFLAGS="-L$cf_add_libdir $LDFLAGS"
+ fi
+@@ -4949,13 +4953,13 @@
+ cf_have_ncuconfig=no
+
+ if test "x${PKG_CONFIG:=none}" != xnone; then
+- echo "$as_me:4952: checking pkg-config for $cf_ncuconfig_root" >&5
++ echo "$as_me:4956: 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:4955: result: yes" >&5
++ echo "$as_me:4959: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+
+- echo "$as_me:4958: checking if the $cf_ncuconfig_root package files work" >&5
++ echo "$as_me:4962: 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
+
+@@ -5088,7 +5092,7 @@
+ LIBS="$cf_add_libs"
+
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 5091 "configure"
++#line 5095 "configure"
+ #include "confdefs.h"
+ #include <${cf_cv_ncurses_header:-curses.h}>
+ int
+@@ -5100,37 +5104,37 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:5103: \"$ac_link\"") >&5
++if { (eval echo "$as_me:5107: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:5106: \$? = $ac_status" >&5
++ echo "$as_me:5110: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:5109: \"$ac_try\"") >&5
++ { (eval echo "$as_me:5113: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:5112: \$? = $ac_status" >&5
++ echo "$as_me:5116: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ if test "$cross_compiling" = yes; then
+ cf_test_ncuconfig=maybe
+ else
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 5118 "configure"
++#line 5122 "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:5125: \"$ac_link\"") >&5
++if { (eval echo "$as_me:5129: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:5128: \$? = $ac_status" >&5
++ echo "$as_me:5132: \$? = $ac_status" >&5
+ (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+- { (eval echo "$as_me:5130: \"$ac_try\"") >&5
++ { (eval echo "$as_me:5134: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:5133: \$? = $ac_status" >&5
++ echo "$as_me:5137: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_test_ncuconfig=yes
+ else
+@@ -5304,7 +5308,7 @@
+ LIBS="$cf_add_libs"
+
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 5307 "configure"
++#line 5311 "configure"
+ #include "confdefs.h"
+ #include <${cf_cv_ncurses_header:-curses.h}>
+ int
+@@ -5316,37 +5320,37 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:5319: \"$ac_link\"") >&5
++if { (eval echo "$as_me:5323: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:5322: \$? = $ac_status" >&5
++ echo "$as_me:5326: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:5325: \"$ac_try\"") >&5
++ { (eval echo "$as_me:5329: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:5328: \$? = $ac_status" >&5
++ echo "$as_me:5332: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ if test "$cross_compiling" = yes; then
+ cf_have_ncuconfig=maybe
+ else
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 5334 "configure"
++#line 5338 "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:5341: \"$ac_link\"") >&5
++if { (eval echo "$as_me:5345: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:5344: \$? = $ac_status" >&5
++ echo "$as_me:5348: \$? = $ac_status" >&5
+ (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+- { (eval echo "$as_me:5346: \"$ac_try\"") >&5
++ { (eval echo "$as_me:5350: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:5349: \$? = $ac_status" >&5
++ echo "$as_me:5353: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_have_ncuconfig=yes
+ else
+@@ -5363,7 +5367,7 @@
+ cf_have_ncuconfig=no
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+- echo "$as_me:5366: result: $cf_have_ncuconfig" >&5
++ echo "$as_me:5370: 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"
+@@ -5379,7 +5383,7 @@
+
+ NCURSES_CONFIG_PKG=$cf_ncuconfig_root
+
+-echo "$as_me:5382: checking for terminfo header" >&5
++echo "$as_me:5386: 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
+@@ -5397,7 +5401,7 @@
+ for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h"
+ do
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 5400 "configure"
++#line 5404 "configure"
+ #include "confdefs.h"
+ #include <stdio.h>
+ #include <${cf_cv_ncurses_header:-curses.h}>
+@@ -5412,16 +5416,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:5415: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:5419: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:5418: \$? = $ac_status" >&5
++ echo "$as_me:5422: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:5421: \"$ac_try\"") >&5
++ { (eval echo "$as_me:5425: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:5424: \$? = $ac_status" >&5
++ echo "$as_me:5428: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+
+ cf_cv_term_header="$cf_test"
+@@ -5437,7 +5441,7 @@
+ done
+
+ fi
+-echo "$as_me:5440: result: $cf_cv_term_header" >&5
++echo "$as_me:5444: result: $cf_cv_term_header" >&5
+ echo "${ECHO_T}$cf_cv_term_header" >&6
+
+ # Set definitions to allow ifdef'ing to accommodate subdirectories
+@@ -5472,7 +5476,7 @@
+ fi
+
+ else
+- echo "$as_me:5475: result: no" >&5
++ echo "$as_me:5479: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ NCURSES_CONFIG_PKG=none
+ fi
+@@ -5488,7 +5492,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:5491: checking for $ac_word" >&5
++echo "$as_me:5495: 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
+@@ -5503,7 +5507,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:5506: found $ac_dir/$ac_word" >&5
++echo "$as_me:5510: found $ac_dir/$ac_word" >&5
+ break
+ done
+
+@@ -5511,10 +5515,10 @@
+ fi
+ NCURSES_CONFIG=$ac_cv_prog_NCURSES_CONFIG
+ if test -n "$NCURSES_CONFIG"; then
+- echo "$as_me:5514: result: $NCURSES_CONFIG" >&5
++ echo "$as_me:5518: result: $NCURSES_CONFIG" >&5
+ echo "${ECHO_T}$NCURSES_CONFIG" >&6
+ else
+- echo "$as_me:5517: result: no" >&5
++ echo "$as_me:5521: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+
+@@ -5527,7 +5531,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:5530: checking for $ac_word" >&5
++echo "$as_me:5534: 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
+@@ -5542,7 +5546,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:5545: found $ac_dir/$ac_word" >&5
++echo "$as_me:5549: found $ac_dir/$ac_word" >&5
+ break
+ done
+
+@@ -5550,10 +5554,10 @@
+ fi
+ ac_ct_NCURSES_CONFIG=$ac_cv_prog_ac_ct_NCURSES_CONFIG
+ if test -n "$ac_ct_NCURSES_CONFIG"; then
+- echo "$as_me:5553: result: $ac_ct_NCURSES_CONFIG" >&5
++ echo "$as_me:5557: result: $ac_ct_NCURSES_CONFIG" >&5
+ echo "${ECHO_T}$ac_ct_NCURSES_CONFIG" >&6
+ else
+- echo "$as_me:5556: result: no" >&5
++ echo "$as_me:5560: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+
+@@ -5710,7 +5714,7 @@
+
+ # even with config script, some packages use no-override for curses.h
+
+-echo "$as_me:5713: checking if we have identified curses headers" >&5
++echo "$as_me:5717: 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
+@@ -5722,7 +5726,7 @@
+ curses.h ncurses/curses.h
+ do
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 5725 "configure"
++#line 5729 "configure"
+ #include "confdefs.h"
+ #include <${cf_header}>
+ int
+@@ -5734,16 +5738,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:5737: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:5741: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:5740: \$? = $ac_status" >&5
++ echo "$as_me:5744: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:5743: \"$ac_try\"") >&5
++ { (eval echo "$as_me:5747: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:5746: \$? = $ac_status" >&5
++ echo "$as_me:5750: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_ncurses_header=$cf_header; break
+ else
+@@ -5754,11 +5758,11 @@
+ done
+
+ fi
+-echo "$as_me:5757: result: $cf_cv_ncurses_header" >&5
++echo "$as_me:5761: 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:5761: error: No curses header-files found" >&5
++ { { echo "$as_me:5765: error: No curses header-files found" >&5
+ echo "$as_me: error: No curses header-files found" >&2;}
+ { (exit 1); exit 1; }; }
+ fi
+@@ -5768,23 +5772,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:5771: checking for $ac_header" >&5
++echo "$as_me:5775: 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 5777 "configure"
++#line 5781 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:5781: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:5785: \"$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:5787: \$? = $ac_status" >&5
++ echo "$as_me:5791: \$? = $ac_status" >&5
+ (exit "$ac_status"); } >/dev/null; then
+ if test -s conftest.err; then
+ ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -5803,7 +5807,7 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:5806: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
++echo "$as_me:5810: 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
+@@ -5859,7 +5863,7 @@
+ CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
+
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 5862 "configure"
++#line 5866 "configure"
+ #include "confdefs.h"
+ #include <stdio.h>
+ int
+@@ -5871,16 +5875,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:5874: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:5878: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:5877: \$? = $ac_status" >&5
++ echo "$as_me:5881: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:5880: \"$ac_try\"") >&5
++ { (eval echo "$as_me:5884: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:5883: \$? = $ac_status" >&5
++ echo "$as_me:5887: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ :
+ else
+@@ -5897,7 +5901,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}:5900: testing adding $cf_add_incdir to include-path ..." 1>&5
++echo "${as_me:-configure}:5904: testing adding $cf_add_incdir to include-path ..." 1>&5
+
+ CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
+
+@@ -5916,7 +5920,7 @@
+
+ }
+
+-echo "$as_me:5919: checking for $cf_ncuhdr_root header in include-path" >&5
++echo "$as_me:5923: 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
+@@ -5928,7 +5932,7 @@
+ do
+
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 5931 "configure"
++#line 5935 "configure"
+ #include "confdefs.h"
+
+ #include <$cf_header>
+@@ -5952,16 +5956,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:5955: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:5959: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:5958: \$? = $ac_status" >&5
++ echo "$as_me:5962: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:5961: \"$ac_try\"") >&5
++ { (eval echo "$as_me:5965: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:5964: \$? = $ac_status" >&5
++ echo "$as_me:5968: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_ncurses_h=$cf_header
+
+@@ -5976,14 +5980,14 @@
+ done
+
+ fi
+-echo "$as_me:5979: result: $cf_cv_ncurses_h" >&5
++echo "$as_me:5983: 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:5986: checking for $cf_ncuhdr_root include-path" >&5
++echo "$as_me:5990: 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
+@@ -6104,7 +6108,7 @@
+ CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
+
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 6107 "configure"
++#line 6111 "configure"
+ #include "confdefs.h"
+ #include <stdio.h>
+ int
+@@ -6116,16 +6120,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:6119: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:6123: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:6122: \$? = $ac_status" >&5
++ echo "$as_me:6126: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:6125: \"$ac_try\"") >&5
++ { (eval echo "$as_me:6129: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:6128: \$? = $ac_status" >&5
++ echo "$as_me:6132: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ :
+ else
+@@ -6142,7 +6146,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}:6145: testing adding $cf_add_incdir to include-path ..." 1>&5
++echo "${as_me:-configure}:6149: testing adding $cf_add_incdir to include-path ..." 1>&5
+
+ CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
+
+@@ -6165,7 +6169,7 @@
+ do
+
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 6168 "configure"
++#line 6172 "configure"
+ #include "confdefs.h"
+
+ #include <$cf_header>
+@@ -6189,16 +6193,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:6192: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:6196: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:6195: \$? = $ac_status" >&5
++ echo "$as_me:6199: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:6198: \"$ac_try\"") >&5
++ { (eval echo "$as_me:6202: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:6201: \$? = $ac_status" >&5
++ echo "$as_me:6205: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_ncurses_h2=$cf_header
+
+@@ -6219,12 +6223,12 @@
+ CPPFLAGS="$cf_save2_CPPFLAGS"
+ test "$cf_cv_ncurses_h2" != no && break
+ done
+- test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:6222: error: not found" >&5
++ test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:6226: error: not found" >&5
+ echo "$as_me: error: not found" >&2;}
+ { (exit 1); exit 1; }; }
+
+ fi
+-echo "$as_me:6227: result: $cf_cv_ncurses_h2" >&5
++echo "$as_me:6231: 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%/[^/]*$%%'`
+@@ -6260,7 +6264,7 @@
+ CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
+
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 6263 "configure"
++#line 6267 "configure"
+ #include "confdefs.h"
+ #include <stdio.h>
+ int
+@@ -6272,16 +6276,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:6275: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:6279: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:6278: \$? = $ac_status" >&5
++ echo "$as_me:6282: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:6281: \"$ac_try\"") >&5
++ { (eval echo "$as_me:6285: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:6284: \$? = $ac_status" >&5
++ echo "$as_me:6288: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ :
+ else
+@@ -6298,7 +6302,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}:6301: testing adding $cf_add_incdir to include-path ..." 1>&5
++echo "${as_me:-configure}:6305: testing adding $cf_add_incdir to include-path ..." 1>&5
+
+ CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
+
+@@ -6346,7 +6350,7 @@
+ ;;
+ esac
+
+-echo "$as_me:6349: checking for terminfo header" >&5
++echo "$as_me:6353: 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
+@@ -6364,7 +6368,7 @@
+ for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h"
+ do
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 6367 "configure"
++#line 6371 "configure"
+ #include "confdefs.h"
+ #include <stdio.h>
+ #include <${cf_cv_ncurses_header:-curses.h}>
+@@ -6379,16 +6383,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:6382: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:6386: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:6385: \$? = $ac_status" >&5
++ echo "$as_me:6389: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:6388: \"$ac_try\"") >&5
++ { (eval echo "$as_me:6392: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:6391: \$? = $ac_status" >&5
++ echo "$as_me:6395: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+
+ cf_cv_term_header="$cf_test"
+@@ -6404,7 +6408,7 @@
+ done
+
+ fi
+-echo "$as_me:6407: result: $cf_cv_term_header" >&5
++echo "$as_me:6411: result: $cf_cv_term_header" >&5
+ echo "${ECHO_T}$cf_cv_term_header" >&6
+
+ # Set definitions to allow ifdef'ing to accommodate subdirectories
+@@ -6442,7 +6446,7 @@
+ #define NCURSES 1
+ EOF
+
+-echo "$as_me:6445: checking for ncurses version" >&5
++echo "$as_me:6449: 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
+@@ -6468,10 +6472,10 @@
+ #endif
+ EOF
+ cf_try="$ac_cpp conftest.$ac_ext 2>&5 | grep '^Autoconf ' >conftest.out"
+- { (eval echo "$as_me:6471: \"$cf_try\"") >&5
++ { (eval echo "$as_me:6475: \"$cf_try\"") >&5
+ (eval $cf_try) 2>&5
+ ac_status=$?
+- echo "$as_me:6474: \$? = $ac_status" >&5
++ echo "$as_me:6478: \$? = $ac_status" >&5
+ (exit "$ac_status"); }
+ if test -f conftest.out ; then
+ cf_out=`sed -e 's%^Autoconf %%' -e 's%^[^"]*"%%' -e 's%".*%%' conftest.out`
+@@ -6481,7 +6485,7 @@
+
+ else
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 6484 "configure"
++#line 6488 "configure"
+ #include "confdefs.h"
+
+ $ac_includes_default
+@@ -6508,15 +6512,15 @@
+ }
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:6511: \"$ac_link\"") >&5
++if { (eval echo "$as_me:6515: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:6514: \$? = $ac_status" >&5
++ echo "$as_me:6518: \$? = $ac_status" >&5
+ (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+- { (eval echo "$as_me:6516: \"$ac_try\"") >&5
++ { (eval echo "$as_me:6520: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:6519: \$? = $ac_status" >&5
++ echo "$as_me:6523: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+
+ cf_cv_ncurses_version=`cat $cf_tempfile`
+@@ -6530,7 +6534,7 @@
+ rm -f "$cf_tempfile"
+
+ fi
+-echo "$as_me:6533: result: $cf_cv_ncurses_version" >&5
++echo "$as_me:6537: result: $cf_cv_ncurses_version" >&5
+ echo "${ECHO_T}$cf_cv_ncurses_version" >&6
+ test "$cf_cv_ncurses_version" = no ||
+ cat >>confdefs.h <<\EOF
+@@ -6543,7 +6547,7 @@
+ # to link gpm.
+ cf_ncurses_LIBS=""
+ cf_ncurses_SAVE="$LIBS"
+-echo "$as_me:6546: checking for Gpm_Open in -lgpm" >&5
++echo "$as_me:6550: 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
+@@ -6551,7 +6555,7 @@
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lgpm $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 6554 "configure"
++#line 6558 "configure"
+ #include "confdefs.h"
+
+ /* Override any gcc2 internal prototype to avoid an error. */
+@@ -6570,16 +6574,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:6573: \"$ac_link\"") >&5
++if { (eval echo "$as_me:6577: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:6576: \$? = $ac_status" >&5
++ echo "$as_me:6580: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:6579: \"$ac_try\"") >&5
++ { (eval echo "$as_me:6583: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:6582: \$? = $ac_status" >&5
++ echo "$as_me:6586: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_lib_gpm_Gpm_Open=yes
+ else
+@@ -6590,10 +6594,10 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:6593: result: $ac_cv_lib_gpm_Gpm_Open" >&5
++echo "$as_me:6597: 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:6596: checking for initscr in -lgpm" >&5
++ echo "$as_me:6600: 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
+@@ -6601,7 +6605,7 @@
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lgpm $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 6604 "configure"
++#line 6608 "configure"
+ #include "confdefs.h"
+
+ /* Override any gcc2 internal prototype to avoid an error. */
+@@ -6620,16 +6624,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:6623: \"$ac_link\"") >&5
++if { (eval echo "$as_me:6627: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:6626: \$? = $ac_status" >&5
++ echo "$as_me:6630: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:6629: \"$ac_try\"") >&5
++ { (eval echo "$as_me:6633: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:6632: \$? = $ac_status" >&5
++ echo "$as_me:6636: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_lib_gpm_initscr=yes
+ else
+@@ -6640,7 +6644,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:6643: result: $ac_cv_lib_gpm_initscr" >&5
++echo "$as_me:6647: 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"
+@@ -6655,7 +6659,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:6658: checking for tgoto in -lmytinfo" >&5
++ echo "$as_me:6662: 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
+@@ -6663,7 +6667,7 @@
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lmytinfo $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 6666 "configure"
++#line 6670 "configure"
+ #include "confdefs.h"
+
+ /* Override any gcc2 internal prototype to avoid an error. */
+@@ -6682,16 +6686,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:6685: \"$ac_link\"") >&5
++if { (eval echo "$as_me:6689: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:6688: \$? = $ac_status" >&5
++ echo "$as_me:6692: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:6691: \"$ac_try\"") >&5
++ { (eval echo "$as_me:6695: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:6694: \$? = $ac_status" >&5
++ echo "$as_me:6698: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_lib_mytinfo_tgoto=yes
+ else
+@@ -6702,7 +6706,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:6705: result: $ac_cv_lib_mytinfo_tgoto" >&5
++echo "$as_me:6709: 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"
+@@ -6751,13 +6755,13 @@
+
+ eval 'cf_cv_have_lib_'"$cf_nculib_root"'=no'
+ cf_libdir=""
+- echo "$as_me:6754: checking for initscr" >&5
++ echo "$as_me:6758: 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 6760 "configure"
++#line 6764 "configure"
+ #include "confdefs.h"
+ #define initscr autoconf_temporary
+ #include <limits.h> /* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -6788,16 +6792,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:6791: \"$ac_link\"") >&5
++if { (eval echo "$as_me:6795: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:6794: \$? = $ac_status" >&5
++ echo "$as_me:6798: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:6797: \"$ac_try\"") >&5
++ { (eval echo "$as_me:6801: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:6800: \$? = $ac_status" >&5
++ echo "$as_me:6804: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_func_initscr=yes
+ else
+@@ -6807,18 +6811,18 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:6810: result: $ac_cv_func_initscr" >&5
++echo "$as_me:6814: 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:6817: checking for initscr in -l$cf_nculib_root" >&5
++ echo "$as_me:6821: 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 6821 "configure"
++#line 6825 "configure"
+ #include "confdefs.h"
+ #include <${cf_cv_ncurses_header:-curses.h}>
+ int
+@@ -6830,25 +6834,25 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:6833: \"$ac_link\"") >&5
++if { (eval echo "$as_me:6837: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:6836: \$? = $ac_status" >&5
++ echo "$as_me:6840: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:6839: \"$ac_try\"") >&5
++ { (eval echo "$as_me:6843: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:6842: \$? = $ac_status" >&5
++ echo "$as_me:6846: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+- echo "$as_me:6844: result: yes" >&5
++ echo "$as_me:6848: 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:6851: result: no" >&5
++echo "$as_me:6855: result: no" >&5
+ echo "${ECHO_T}no" >&6
+
+ cf_search=
+@@ -6916,11 +6920,11 @@
+
+ for cf_libdir in $cf_search
+ do
+- echo "$as_me:6919: checking for -l$cf_nculib_root in $cf_libdir" >&5
++ echo "$as_me:6923: 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 6923 "configure"
++#line 6927 "configure"
+ #include "confdefs.h"
+ #include <${cf_cv_ncurses_header:-curses.h}>
+ int
+@@ -6932,25 +6936,25 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:6935: \"$ac_link\"") >&5
++if { (eval echo "$as_me:6939: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:6938: \$? = $ac_status" >&5
++ echo "$as_me:6942: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:6941: \"$ac_try\"") >&5
++ { (eval echo "$as_me:6945: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:6944: \$? = $ac_status" >&5
++ echo "$as_me:6948: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+- echo "$as_me:6946: result: yes" >&5
++ echo "$as_me:6950: 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:6953: result: no" >&5
++echo "$as_me:6957: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ LIBS="$cf_save_LIBS"
+ fi
+@@ -6965,7 +6969,7 @@
+ eval 'cf_found_library="$cf_cv_have_lib_'"$cf_nculib_root"\"
+
+ if test "$cf_found_library" = no ; then
+- { { echo "$as_me:6968: error: Cannot link $cf_nculib_root library" >&5
++ { { echo "$as_me:6972: error: Cannot link $cf_nculib_root library" >&5
+ echo "$as_me: error: Cannot link $cf_nculib_root library" >&2;}
+ { (exit 1); exit 1; }; }
+ fi
+@@ -6973,7 +6977,7 @@
+ fi
+
+ if test -n "$cf_ncurses_LIBS" ; then
+- echo "$as_me:6976: checking if we can link $cf_nculib_root without $cf_ncurses_LIBS" >&5
++ echo "$as_me:6980: 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
+@@ -6983,7 +6987,7 @@
+ fi
+ done
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 6986 "configure"
++#line 6990 "configure"
+ #include "confdefs.h"
+ #include <${cf_cv_ncurses_header:-curses.h}>
+ int
+@@ -6995,23 +6999,23 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:6998: \"$ac_link\"") >&5
++if { (eval echo "$as_me:7002: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:7001: \$? = $ac_status" >&5
++ echo "$as_me:7005: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:7004: \"$ac_try\"") >&5
++ { (eval echo "$as_me:7008: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:7007: \$? = $ac_status" >&5
++ echo "$as_me:7011: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+- echo "$as_me:7009: result: yes" >&5
++ echo "$as_me:7013: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ else
+ echo "$as_me: failed program was:" >&5
+ cat "conftest.$ac_ext" >&5
+-echo "$as_me:7014: result: no" >&5
++echo "$as_me:7018: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ LIBS="$cf_ncurses_SAVE"
+ fi
+@@ -7029,7 +7033,7 @@
+ NCURSES_CONFIG=none
+ fi
+
+-echo "$as_me:7032: checking for specified curses library type" >&5
++echo "$as_me:7036: 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.
+@@ -7049,23 +7053,23 @@
+ for ac_header in wchar.h
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-echo "$as_me:7052: checking for $ac_header" >&5
++echo "$as_me:7056: 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 7058 "configure"
++#line 7062 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:7062: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:7066: \"$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:7068: \$? = $ac_status" >&5
++ echo "$as_me:7072: \$? = $ac_status" >&5
+ (exit "$ac_status"); } >/dev/null; then
+ if test -s conftest.err; then
+ ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -7084,7 +7088,7 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:7087: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
++echo "$as_me:7091: 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
+@@ -7094,7 +7098,7 @@
+ fi
+ done
+
+-echo "$as_me:7097: checking for multibyte character support" >&5
++echo "$as_me:7101: 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
+@@ -7102,7 +7106,7 @@
+
+ cf_save_LIBS="$LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 7105 "configure"
++#line 7109 "configure"
+ #include "confdefs.h"
+
+ $ac_includes_default
+@@ -7119,16 +7123,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:7122: \"$ac_link\"") >&5
++if { (eval echo "$as_me:7126: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:7125: \$? = $ac_status" >&5
++ echo "$as_me:7129: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:7128: \"$ac_try\"") >&5
++ { (eval echo "$as_me:7132: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:7131: \$? = $ac_status" >&5
++ echo "$as_me:7135: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_utf8_lib=yes
+ else
+@@ -7140,12 +7144,12 @@
+ cf_cv_header_path_utf8=
+ cf_cv_library_path_utf8=
+
+-echo "${as_me:-configure}:7143: testing Starting FIND_LINKAGE(utf8,) ..." 1>&5
++echo "${as_me:-configure}:7147: testing Starting FIND_LINKAGE(utf8,) ..." 1>&5
+
+ cf_save_LIBS="$LIBS"
+
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 7148 "configure"
++#line 7152 "configure"
+ #include "confdefs.h"
+
+ #include <libutf8.h>
+@@ -7158,16 +7162,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:7161: \"$ac_link\"") >&5
++if { (eval echo "$as_me:7165: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:7164: \$? = $ac_status" >&5
++ echo "$as_me:7168: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:7167: \"$ac_try\"") >&5
++ { (eval echo "$as_me:7171: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:7170: \$? = $ac_status" >&5
++ echo "$as_me:7174: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+
+ cf_cv_find_linkage_utf8=yes
+@@ -7181,7 +7185,7 @@
+ LIBS="-lutf8 $cf_save_LIBS"
+
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 7184 "configure"
++#line 7188 "configure"
+ #include "confdefs.h"
+
+ #include <libutf8.h>
+@@ -7194,16 +7198,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:7197: \"$ac_link\"") >&5
++if { (eval echo "$as_me:7201: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:7200: \$? = $ac_status" >&5
++ echo "$as_me:7204: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:7203: \"$ac_try\"") >&5
++ { (eval echo "$as_me:7207: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:7206: \$? = $ac_status" >&5
++ echo "$as_me:7210: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+
+ cf_cv_find_linkage_utf8=yes
+@@ -7220,9 +7224,9 @@
+
+ test -n "$verbose" && echo " find linkage for utf8 library" 1>&6
+
+-echo "${as_me:-configure}:7223: testing find linkage for utf8 library ..." 1>&5
++echo "${as_me:-configure}:7227: testing find linkage for utf8 library ..." 1>&5
+
+-echo "${as_me:-configure}:7225: testing Searching for headers in FIND_LINKAGE(utf8,) ..." 1>&5
++echo "${as_me:-configure}:7229: testing Searching for headers in FIND_LINKAGE(utf8,) ..." 1>&5
+
+ cf_save_CPPFLAGS="$CPPFLAGS"
+ cf_test_CPPFLAGS="$CPPFLAGS"
+@@ -7313,7 +7317,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}:7316: testing ... testing $cf_cv_header_path_utf8 ..." 1>&5
++echo "${as_me:-configure}:7320: testing ... testing $cf_cv_header_path_utf8 ..." 1>&5
+
+ CPPFLAGS="$cf_save_CPPFLAGS"
+
+@@ -7321,7 +7325,7 @@
+ CPPFLAGS="${CPPFLAGS}-I$cf_cv_header_path_utf8"
+
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 7324 "configure"
++#line 7328 "configure"
+ #include "confdefs.h"
+
+ #include <libutf8.h>
+@@ -7334,21 +7338,21 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:7337: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:7341: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:7340: \$? = $ac_status" >&5
++ echo "$as_me:7344: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:7343: \"$ac_try\"") >&5
++ { (eval echo "$as_me:7347: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:7346: \$? = $ac_status" >&5
++ echo "$as_me:7350: \$? = $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}:7351: testing ... found utf8 headers in $cf_cv_header_path_utf8 ..." 1>&5
++echo "${as_me:-configure}:7355: testing ... found utf8 headers in $cf_cv_header_path_utf8 ..." 1>&5
+
+ cf_cv_find_linkage_utf8=maybe
+ cf_test_CPPFLAGS="$CPPFLAGS"
+@@ -7366,7 +7370,7 @@
+
+ if test "$cf_cv_find_linkage_utf8" = maybe ; then
+
+-echo "${as_me:-configure}:7369: testing Searching for utf8 library in FIND_LINKAGE(utf8,) ..." 1>&5
++echo "${as_me:-configure}:7373: testing Searching for utf8 library in FIND_LINKAGE(utf8,) ..." 1>&5
+
+ cf_save_LIBS="$LIBS"
+ cf_save_LDFLAGS="$LDFLAGS"
+@@ -7441,13 +7445,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}:7444: testing ... testing $cf_cv_library_path_utf8 ..." 1>&5
++echo "${as_me:-configure}:7448: 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 7450 "configure"
++#line 7454 "configure"
+ #include "confdefs.h"
+
+ #include <libutf8.h>
+@@ -7460,21 +7464,21 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:7463: \"$ac_link\"") >&5
++if { (eval echo "$as_me:7467: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:7466: \$? = $ac_status" >&5
++ echo "$as_me:7470: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:7469: \"$ac_try\"") >&5
++ { (eval echo "$as_me:7473: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:7472: \$? = $ac_status" >&5
++ echo "$as_me:7476: \$? = $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}:7477: testing ... found utf8 library in $cf_cv_library_path_utf8 ..." 1>&5
++echo "${as_me:-configure}:7481: testing ... found utf8 library in $cf_cv_library_path_utf8 ..." 1>&5
+
+ cf_cv_find_linkage_utf8=yes
+ cf_cv_library_file_utf8="-lutf8"
+@@ -7516,7 +7520,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:7519: result: $cf_cv_utf8_lib" >&5
++echo "$as_me:7523: 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
+@@ -7554,7 +7558,7 @@
+ CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
+
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 7557 "configure"
++#line 7561 "configure"
+ #include "confdefs.h"
+ #include <stdio.h>
+ int
+@@ -7566,16 +7570,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:7569: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:7573: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:7572: \$? = $ac_status" >&5
++ echo "$as_me:7576: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:7575: \"$ac_try\"") >&5
++ { (eval echo "$as_me:7579: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:7578: \$? = $ac_status" >&5
++ echo "$as_me:7582: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ :
+ else
+@@ -7592,7 +7596,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}:7595: testing adding $cf_add_incdir to include-path ..." 1>&5
++echo "${as_me:-configure}:7599: testing adding $cf_add_incdir to include-path ..." 1>&5
+
+ CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
+
+@@ -7628,7 +7632,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}:7631: testing adding $cf_add_libdir to library-path ..." 1>&5
++echo "${as_me:-configure}:7635: testing adding $cf_add_libdir to library-path ..." 1>&5
+
+ LDFLAGS="-L$cf_add_libdir $LDFLAGS"
+ fi
+@@ -7658,13 +7662,13 @@
+ cf_have_ncuconfig=no
+
+ if test "x${PKG_CONFIG:=none}" != xnone; then
+- echo "$as_me:7661: checking pkg-config for $cf_ncuconfig_root" >&5
++ echo "$as_me:7665: 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:7664: result: yes" >&5
++ echo "$as_me:7668: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+
+- echo "$as_me:7667: checking if the $cf_ncuconfig_root package files work" >&5
++ echo "$as_me:7671: 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
+
+@@ -7797,7 +7801,7 @@
+ LIBS="$cf_add_libs"
+
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 7800 "configure"
++#line 7804 "configure"
+ #include "confdefs.h"
+ #include <${cf_cv_ncurses_header:-curses.h}>
+ int
+@@ -7809,37 +7813,37 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:7812: \"$ac_link\"") >&5
++if { (eval echo "$as_me:7816: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:7815: \$? = $ac_status" >&5
++ echo "$as_me:7819: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:7818: \"$ac_try\"") >&5
++ { (eval echo "$as_me:7822: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:7821: \$? = $ac_status" >&5
++ echo "$as_me:7825: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ if test "$cross_compiling" = yes; then
+ cf_test_ncuconfig=maybe
+ else
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 7827 "configure"
++#line 7831 "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:7834: \"$ac_link\"") >&5
++if { (eval echo "$as_me:7838: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:7837: \$? = $ac_status" >&5
++ echo "$as_me:7841: \$? = $ac_status" >&5
+ (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+- { (eval echo "$as_me:7839: \"$ac_try\"") >&5
++ { (eval echo "$as_me:7843: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:7842: \$? = $ac_status" >&5
++ echo "$as_me:7846: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_test_ncuconfig=yes
+ else
+@@ -8013,7 +8017,7 @@
+ LIBS="$cf_add_libs"
+
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 8016 "configure"
++#line 8020 "configure"
+ #include "confdefs.h"
+ #include <${cf_cv_ncurses_header:-curses.h}>
+ int
+@@ -8025,37 +8029,37 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:8028: \"$ac_link\"") >&5
++if { (eval echo "$as_me:8032: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:8031: \$? = $ac_status" >&5
++ echo "$as_me:8035: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:8034: \"$ac_try\"") >&5
++ { (eval echo "$as_me:8038: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:8037: \$? = $ac_status" >&5
++ echo "$as_me:8041: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ if test "$cross_compiling" = yes; then
+ cf_have_ncuconfig=maybe
+ else
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 8043 "configure"
++#line 8047 "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:8050: \"$ac_link\"") >&5
++if { (eval echo "$as_me:8054: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:8053: \$? = $ac_status" >&5
++ echo "$as_me:8057: \$? = $ac_status" >&5
+ (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+- { (eval echo "$as_me:8055: \"$ac_try\"") >&5
++ { (eval echo "$as_me:8059: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:8058: \$? = $ac_status" >&5
++ echo "$as_me:8062: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_have_ncuconfig=yes
+ else
+@@ -8072,7 +8076,7 @@
+ cf_have_ncuconfig=no
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+- echo "$as_me:8075: result: $cf_have_ncuconfig" >&5
++ echo "$as_me:8079: 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"
+@@ -8088,7 +8092,7 @@
+
+ NCURSES_CONFIG_PKG=$cf_ncuconfig_root
+
+-echo "$as_me:8091: checking for terminfo header" >&5
++echo "$as_me:8095: 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
+@@ -8106,7 +8110,7 @@
+ for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h"
+ do
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 8109 "configure"
++#line 8113 "configure"
+ #include "confdefs.h"
+ #include <stdio.h>
+ #include <${cf_cv_ncurses_header:-curses.h}>
+@@ -8121,16 +8125,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:8124: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:8128: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:8127: \$? = $ac_status" >&5
++ echo "$as_me:8131: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:8130: \"$ac_try\"") >&5
++ { (eval echo "$as_me:8134: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:8133: \$? = $ac_status" >&5
++ echo "$as_me:8137: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+
+ cf_cv_term_header="$cf_test"
+@@ -8146,7 +8150,7 @@
+ done
+
+ fi
+-echo "$as_me:8149: result: $cf_cv_term_header" >&5
++echo "$as_me:8153: result: $cf_cv_term_header" >&5
+ echo "${ECHO_T}$cf_cv_term_header" >&6
+
+ # Set definitions to allow ifdef'ing to accommodate subdirectories
+@@ -8181,7 +8185,7 @@
+ fi
+
+ else
+- echo "$as_me:8184: result: no" >&5
++ echo "$as_me:8188: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ NCURSES_CONFIG_PKG=none
+ fi
+@@ -8197,7 +8201,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:8200: checking for $ac_word" >&5
++echo "$as_me:8204: 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
+@@ -8212,7 +8216,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:8215: found $ac_dir/$ac_word" >&5
++echo "$as_me:8219: found $ac_dir/$ac_word" >&5
+ break
+ done
+
+@@ -8220,10 +8224,10 @@
+ fi
+ NCURSES_CONFIG=$ac_cv_prog_NCURSES_CONFIG
+ if test -n "$NCURSES_CONFIG"; then
+- echo "$as_me:8223: result: $NCURSES_CONFIG" >&5
++ echo "$as_me:8227: result: $NCURSES_CONFIG" >&5
+ echo "${ECHO_T}$NCURSES_CONFIG" >&6
+ else
+- echo "$as_me:8226: result: no" >&5
++ echo "$as_me:8230: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+
+@@ -8236,7 +8240,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:8239: checking for $ac_word" >&5
++echo "$as_me:8243: 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
+@@ -8251,7 +8255,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:8254: found $ac_dir/$ac_word" >&5
++echo "$as_me:8258: found $ac_dir/$ac_word" >&5
+ break
+ done
+
+@@ -8259,10 +8263,10 @@
+ fi
+ ac_ct_NCURSES_CONFIG=$ac_cv_prog_ac_ct_NCURSES_CONFIG
+ if test -n "$ac_ct_NCURSES_CONFIG"; then
+- echo "$as_me:8262: result: $ac_ct_NCURSES_CONFIG" >&5
++ echo "$as_me:8266: result: $ac_ct_NCURSES_CONFIG" >&5
+ echo "${ECHO_T}$ac_ct_NCURSES_CONFIG" >&6
+ else
+- echo "$as_me:8265: result: no" >&5
++ echo "$as_me:8269: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+
+@@ -8419,7 +8423,7 @@
+
+ # even with config script, some packages use no-override for curses.h
+
+-echo "$as_me:8422: checking if we have identified curses headers" >&5
++echo "$as_me:8426: 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
+@@ -8431,7 +8435,7 @@
+ curses.h $cf_cv_screen/curses.h
+ do
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 8434 "configure"
++#line 8438 "configure"
+ #include "confdefs.h"
+ #include <${cf_header}>
+ int
+@@ -8443,16 +8447,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:8446: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:8450: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:8449: \$? = $ac_status" >&5
++ echo "$as_me:8453: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:8452: \"$ac_try\"") >&5
++ { (eval echo "$as_me:8456: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:8455: \$? = $ac_status" >&5
++ echo "$as_me:8459: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_ncurses_header=$cf_header; break
+ else
+@@ -8463,11 +8467,11 @@
+ done
+
+ fi
+-echo "$as_me:8466: result: $cf_cv_ncurses_header" >&5
++echo "$as_me:8470: 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:8470: error: No curses header-files found" >&5
++ { { echo "$as_me:8474: error: No curses header-files found" >&5
+ echo "$as_me: error: No curses header-files found" >&2;}
+ { (exit 1); exit 1; }; }
+ fi
+@@ -8477,23 +8481,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:8480: checking for $ac_header" >&5
++echo "$as_me:8484: 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 8486 "configure"
++#line 8490 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:8490: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:8494: \"$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:8496: \$? = $ac_status" >&5
++ echo "$as_me:8500: \$? = $ac_status" >&5
+ (exit "$ac_status"); } >/dev/null; then
+ if test -s conftest.err; then
+ ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -8512,7 +8516,7 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:8515: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
++echo "$as_me:8519: 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
+@@ -8568,7 +8572,7 @@
+ CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
+
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 8571 "configure"
++#line 8575 "configure"
+ #include "confdefs.h"
+ #include <stdio.h>
+ int
+@@ -8580,16 +8584,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:8583: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:8587: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:8586: \$? = $ac_status" >&5
++ echo "$as_me:8590: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:8589: \"$ac_try\"") >&5
++ { (eval echo "$as_me:8593: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:8592: \$? = $ac_status" >&5
++ echo "$as_me:8596: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ :
+ else
+@@ -8606,7 +8610,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}:8609: testing adding $cf_add_incdir to include-path ..." 1>&5
++echo "${as_me:-configure}:8613: testing adding $cf_add_incdir to include-path ..." 1>&5
+
+ CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
+
+@@ -8625,7 +8629,7 @@
+
+ }
+
+-echo "$as_me:8628: checking for $cf_ncuhdr_root header in include-path" >&5
++echo "$as_me:8632: 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
+@@ -8637,7 +8641,7 @@
+ do
+
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 8640 "configure"
++#line 8644 "configure"
+ #include "confdefs.h"
+
+ #include <$cf_header>
+@@ -8661,16 +8665,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:8664: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:8668: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:8667: \$? = $ac_status" >&5
++ echo "$as_me:8671: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:8670: \"$ac_try\"") >&5
++ { (eval echo "$as_me:8674: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:8673: \$? = $ac_status" >&5
++ echo "$as_me:8677: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_ncurses_h=$cf_header
+
+@@ -8685,14 +8689,14 @@
+ done
+
+ fi
+-echo "$as_me:8688: result: $cf_cv_ncurses_h" >&5
++echo "$as_me:8692: 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:8695: checking for $cf_ncuhdr_root include-path" >&5
++echo "$as_me:8699: 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
+@@ -8813,7 +8817,7 @@
+ CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
+
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 8816 "configure"
++#line 8820 "configure"
+ #include "confdefs.h"
+ #include <stdio.h>
+ int
+@@ -8825,16 +8829,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:8828: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:8832: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:8831: \$? = $ac_status" >&5
++ echo "$as_me:8835: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:8834: \"$ac_try\"") >&5
++ { (eval echo "$as_me:8838: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:8837: \$? = $ac_status" >&5
++ echo "$as_me:8841: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ :
+ else
+@@ -8851,7 +8855,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}:8854: testing adding $cf_add_incdir to include-path ..." 1>&5
++echo "${as_me:-configure}:8858: testing adding $cf_add_incdir to include-path ..." 1>&5
+
+ CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
+
+@@ -8874,7 +8878,7 @@
+ do
+
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 8877 "configure"
++#line 8881 "configure"
+ #include "confdefs.h"
+
+ #include <$cf_header>
+@@ -8898,16 +8902,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:8901: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:8905: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:8904: \$? = $ac_status" >&5
++ echo "$as_me:8908: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:8907: \"$ac_try\"") >&5
++ { (eval echo "$as_me:8911: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:8910: \$? = $ac_status" >&5
++ echo "$as_me:8914: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_ncurses_h2=$cf_header
+
+@@ -8928,12 +8932,12 @@
+ CPPFLAGS="$cf_save2_CPPFLAGS"
+ test "$cf_cv_ncurses_h2" != no && break
+ done
+- test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:8931: error: not found" >&5
++ test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:8935: error: not found" >&5
+ echo "$as_me: error: not found" >&2;}
+ { (exit 1); exit 1; }; }
+
+ fi
+-echo "$as_me:8936: result: $cf_cv_ncurses_h2" >&5
++echo "$as_me:8940: 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%/[^/]*$%%'`
+@@ -8969,7 +8973,7 @@
+ CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
+
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 8972 "configure"
++#line 8976 "configure"
+ #include "confdefs.h"
+ #include <stdio.h>
+ int
+@@ -8981,16 +8985,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:8984: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:8988: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:8987: \$? = $ac_status" >&5
++ echo "$as_me:8991: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:8990: \"$ac_try\"") >&5
++ { (eval echo "$as_me:8994: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:8993: \$? = $ac_status" >&5
++ echo "$as_me:8997: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ :
+ else
+@@ -9007,7 +9011,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}:9010: testing adding $cf_add_incdir to include-path ..." 1>&5
++echo "${as_me:-configure}:9014: testing adding $cf_add_incdir to include-path ..." 1>&5
+
+ CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
+
+@@ -9055,7 +9059,7 @@
+ ;;
+ esac
+
+-echo "$as_me:9058: checking for terminfo header" >&5
++echo "$as_me:9062: 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
+@@ -9073,7 +9077,7 @@
+ for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h"
+ do
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 9076 "configure"
++#line 9080 "configure"
+ #include "confdefs.h"
+ #include <stdio.h>
+ #include <${cf_cv_ncurses_header:-curses.h}>
+@@ -9088,16 +9092,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:9091: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:9095: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:9094: \$? = $ac_status" >&5
++ echo "$as_me:9098: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:9097: \"$ac_try\"") >&5
++ { (eval echo "$as_me:9101: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:9100: \$? = $ac_status" >&5
++ echo "$as_me:9104: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+
+ cf_cv_term_header="$cf_test"
+@@ -9113,7 +9117,7 @@
+ done
+
+ fi
+-echo "$as_me:9116: result: $cf_cv_term_header" >&5
++echo "$as_me:9120: result: $cf_cv_term_header" >&5
+ echo "${ECHO_T}$cf_cv_term_header" >&6
+
+ # Set definitions to allow ifdef'ing to accommodate subdirectories
+@@ -9151,7 +9155,7 @@
+ #define NCURSES 1
+ EOF
+
+-echo "$as_me:9154: checking for ncurses version" >&5
++echo "$as_me:9158: 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
+@@ -9177,10 +9181,10 @@
+ #endif
+ EOF
+ cf_try="$ac_cpp conftest.$ac_ext 2>&5 | grep '^Autoconf ' >conftest.out"
+- { (eval echo "$as_me:9180: \"$cf_try\"") >&5
++ { (eval echo "$as_me:9184: \"$cf_try\"") >&5
+ (eval $cf_try) 2>&5
+ ac_status=$?
+- echo "$as_me:9183: \$? = $ac_status" >&5
++ echo "$as_me:9187: \$? = $ac_status" >&5
+ (exit "$ac_status"); }
+ if test -f conftest.out ; then
+ cf_out=`sed -e 's%^Autoconf %%' -e 's%^[^"]*"%%' -e 's%".*%%' conftest.out`
+@@ -9190,7 +9194,7 @@
+
+ else
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 9193 "configure"
++#line 9197 "configure"
+ #include "confdefs.h"
+
+ $ac_includes_default
+@@ -9217,15 +9221,15 @@
+ }
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:9220: \"$ac_link\"") >&5
++if { (eval echo "$as_me:9224: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:9223: \$? = $ac_status" >&5
++ echo "$as_me:9227: \$? = $ac_status" >&5
+ (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+- { (eval echo "$as_me:9225: \"$ac_try\"") >&5
++ { (eval echo "$as_me:9229: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:9228: \$? = $ac_status" >&5
++ echo "$as_me:9232: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+
+ cf_cv_ncurses_version=`cat $cf_tempfile`
+@@ -9239,7 +9243,7 @@
+ rm -f "$cf_tempfile"
+
+ fi
+-echo "$as_me:9242: result: $cf_cv_ncurses_version" >&5
++echo "$as_me:9246: result: $cf_cv_ncurses_version" >&5
+ echo "${ECHO_T}$cf_cv_ncurses_version" >&6
+ test "$cf_cv_ncurses_version" = no ||
+ cat >>confdefs.h <<\EOF
+@@ -9252,7 +9256,7 @@
+ # to link gpm.
+ cf_ncurses_LIBS=""
+ cf_ncurses_SAVE="$LIBS"
+-echo "$as_me:9255: checking for Gpm_Open in -lgpm" >&5
++echo "$as_me:9259: 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
+@@ -9260,7 +9264,7 @@
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lgpm $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 9263 "configure"
++#line 9267 "configure"
+ #include "confdefs.h"
+
+ /* Override any gcc2 internal prototype to avoid an error. */
+@@ -9279,16 +9283,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:9282: \"$ac_link\"") >&5
++if { (eval echo "$as_me:9286: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:9285: \$? = $ac_status" >&5
++ echo "$as_me:9289: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:9288: \"$ac_try\"") >&5
++ { (eval echo "$as_me:9292: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:9291: \$? = $ac_status" >&5
++ echo "$as_me:9295: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_lib_gpm_Gpm_Open=yes
+ else
+@@ -9299,10 +9303,10 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:9302: result: $ac_cv_lib_gpm_Gpm_Open" >&5
++echo "$as_me:9306: 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:9305: checking for initscr in -lgpm" >&5
++ echo "$as_me:9309: 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
+@@ -9310,7 +9314,7 @@
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lgpm $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 9313 "configure"
++#line 9317 "configure"
+ #include "confdefs.h"
+
+ /* Override any gcc2 internal prototype to avoid an error. */
+@@ -9329,16 +9333,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:9332: \"$ac_link\"") >&5
++if { (eval echo "$as_me:9336: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:9335: \$? = $ac_status" >&5
++ echo "$as_me:9339: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:9338: \"$ac_try\"") >&5
++ { (eval echo "$as_me:9342: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:9341: \$? = $ac_status" >&5
++ echo "$as_me:9345: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_lib_gpm_initscr=yes
+ else
+@@ -9349,7 +9353,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:9352: result: $ac_cv_lib_gpm_initscr" >&5
++echo "$as_me:9356: 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"
+@@ -9364,7 +9368,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:9367: checking for tgoto in -lmytinfo" >&5
++ echo "$as_me:9371: 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
+@@ -9372,7 +9376,7 @@
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lmytinfo $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 9375 "configure"
++#line 9379 "configure"
+ #include "confdefs.h"
+
+ /* Override any gcc2 internal prototype to avoid an error. */
+@@ -9391,16 +9395,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:9394: \"$ac_link\"") >&5
++if { (eval echo "$as_me:9398: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:9397: \$? = $ac_status" >&5
++ echo "$as_me:9401: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:9400: \"$ac_try\"") >&5
++ { (eval echo "$as_me:9404: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:9403: \$? = $ac_status" >&5
++ echo "$as_me:9407: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_lib_mytinfo_tgoto=yes
+ else
+@@ -9411,7 +9415,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:9414: result: $ac_cv_lib_mytinfo_tgoto" >&5
++echo "$as_me:9418: 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"
+@@ -9460,13 +9464,13 @@
+
+ eval 'cf_cv_have_lib_'"$cf_nculib_root"'=no'
+ cf_libdir=""
+- echo "$as_me:9463: checking for initscr" >&5
++ echo "$as_me:9467: 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 9469 "configure"
++#line 9473 "configure"
+ #include "confdefs.h"
+ #define initscr autoconf_temporary
+ #include <limits.h> /* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -9497,16 +9501,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:9500: \"$ac_link\"") >&5
++if { (eval echo "$as_me:9504: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:9503: \$? = $ac_status" >&5
++ echo "$as_me:9507: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:9506: \"$ac_try\"") >&5
++ { (eval echo "$as_me:9510: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:9509: \$? = $ac_status" >&5
++ echo "$as_me:9513: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_func_initscr=yes
+ else
+@@ -9516,18 +9520,18 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:9519: result: $ac_cv_func_initscr" >&5
++echo "$as_me:9523: 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:9526: checking for initscr in -l$cf_nculib_root" >&5
++ echo "$as_me:9530: 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 9530 "configure"
++#line 9534 "configure"
+ #include "confdefs.h"
+ #include <${cf_cv_ncurses_header:-curses.h}>
+ int
+@@ -9539,25 +9543,25 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:9542: \"$ac_link\"") >&5
++if { (eval echo "$as_me:9546: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:9545: \$? = $ac_status" >&5
++ echo "$as_me:9549: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:9548: \"$ac_try\"") >&5
++ { (eval echo "$as_me:9552: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:9551: \$? = $ac_status" >&5
++ echo "$as_me:9555: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+- echo "$as_me:9553: result: yes" >&5
++ echo "$as_me:9557: 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:9560: result: no" >&5
++echo "$as_me:9564: result: no" >&5
+ echo "${ECHO_T}no" >&6
+
+ cf_search=
+@@ -9625,11 +9629,11 @@
+
+ for cf_libdir in $cf_search
+ do
+- echo "$as_me:9628: checking for -l$cf_nculib_root in $cf_libdir" >&5
++ echo "$as_me:9632: 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 9632 "configure"
++#line 9636 "configure"
+ #include "confdefs.h"
+ #include <${cf_cv_ncurses_header:-curses.h}>
+ int
+@@ -9641,25 +9645,25 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:9644: \"$ac_link\"") >&5
++if { (eval echo "$as_me:9648: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:9647: \$? = $ac_status" >&5
++ echo "$as_me:9651: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:9650: \"$ac_try\"") >&5
++ { (eval echo "$as_me:9654: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:9653: \$? = $ac_status" >&5
++ echo "$as_me:9657: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+- echo "$as_me:9655: result: yes" >&5
++ echo "$as_me:9659: 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:9662: result: no" >&5
++echo "$as_me:9666: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ LIBS="$cf_save_LIBS"
+ fi
+@@ -9674,7 +9678,7 @@
+ eval 'cf_found_library="$cf_cv_have_lib_'"$cf_nculib_root"\"
+
+ if test "$cf_found_library" = no ; then
+- { { echo "$as_me:9677: error: Cannot link $cf_nculib_root library" >&5
++ { { echo "$as_me:9681: error: Cannot link $cf_nculib_root library" >&5
+ echo "$as_me: error: Cannot link $cf_nculib_root library" >&2;}
+ { (exit 1); exit 1; }; }
+ fi
+@@ -9682,7 +9686,7 @@
+ fi
+
+ if test -n "$cf_ncurses_LIBS" ; then
+- echo "$as_me:9685: checking if we can link $cf_nculib_root without $cf_ncurses_LIBS" >&5
++ echo "$as_me:9689: 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
+@@ -9692,7 +9696,7 @@
+ fi
+ done
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 9695 "configure"
++#line 9699 "configure"
+ #include "confdefs.h"
+ #include <${cf_cv_ncurses_header:-curses.h}>
+ int
+@@ -9704,23 +9708,23 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:9707: \"$ac_link\"") >&5
++if { (eval echo "$as_me:9711: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:9710: \$? = $ac_status" >&5
++ echo "$as_me:9714: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:9713: \"$ac_try\"") >&5
++ { (eval echo "$as_me:9717: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:9716: \$? = $ac_status" >&5
++ echo "$as_me:9720: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+- echo "$as_me:9718: result: yes" >&5
++ echo "$as_me:9722: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ else
+ echo "$as_me: failed program was:" >&5
+ cat "conftest.$ac_ext" >&5
+-echo "$as_me:9723: result: no" >&5
++echo "$as_me:9727: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ LIBS="$cf_ncurses_SAVE"
+ fi
+@@ -9745,13 +9749,13 @@
+ cf_have_ncuconfig=no
+
+ if test "x${PKG_CONFIG:=none}" != xnone; then
+- echo "$as_me:9748: checking pkg-config for $cf_ncuconfig_root" >&5
++ echo "$as_me:9752: 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:9751: result: yes" >&5
++ echo "$as_me:9755: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+
+- echo "$as_me:9754: checking if the $cf_ncuconfig_root package files work" >&5
++ echo "$as_me:9758: 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
+
+@@ -9884,7 +9888,7 @@
+ LIBS="$cf_add_libs"
+
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 9887 "configure"
++#line 9891 "configure"
+ #include "confdefs.h"
+ #include <${cf_cv_ncurses_header:-curses.h}>
+ int
+@@ -9896,37 +9900,37 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:9899: \"$ac_link\"") >&5
++if { (eval echo "$as_me:9903: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:9902: \$? = $ac_status" >&5
++ echo "$as_me:9906: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:9905: \"$ac_try\"") >&5
++ { (eval echo "$as_me:9909: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:9908: \$? = $ac_status" >&5
++ echo "$as_me:9912: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ if test "$cross_compiling" = yes; then
+ cf_test_ncuconfig=maybe
+ else
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 9914 "configure"
++#line 9918 "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:9921: \"$ac_link\"") >&5
++if { (eval echo "$as_me:9925: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:9924: \$? = $ac_status" >&5
++ echo "$as_me:9928: \$? = $ac_status" >&5
+ (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+- { (eval echo "$as_me:9926: \"$ac_try\"") >&5
++ { (eval echo "$as_me:9930: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:9929: \$? = $ac_status" >&5
++ echo "$as_me:9933: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_test_ncuconfig=yes
+ else
+@@ -10100,7 +10104,7 @@
+ LIBS="$cf_add_libs"
+
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 10103 "configure"
++#line 10107 "configure"
+ #include "confdefs.h"
+ #include <${cf_cv_ncurses_header:-curses.h}>
+ int
+@@ -10112,37 +10116,37 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:10115: \"$ac_link\"") >&5
++if { (eval echo "$as_me:10119: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:10118: \$? = $ac_status" >&5
++ echo "$as_me:10122: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:10121: \"$ac_try\"") >&5
++ { (eval echo "$as_me:10125: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:10124: \$? = $ac_status" >&5
++ echo "$as_me:10128: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ if test "$cross_compiling" = yes; then
+ cf_have_ncuconfig=maybe
+ else
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 10130 "configure"
++#line 10134 "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:10137: \"$ac_link\"") >&5
++if { (eval echo "$as_me:10141: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:10140: \$? = $ac_status" >&5
++ echo "$as_me:10144: \$? = $ac_status" >&5
+ (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+- { (eval echo "$as_me:10142: \"$ac_try\"") >&5
++ { (eval echo "$as_me:10146: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:10145: \$? = $ac_status" >&5
++ echo "$as_me:10149: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_have_ncuconfig=yes
+ else
+@@ -10159,7 +10163,7 @@
+ cf_have_ncuconfig=no
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+- echo "$as_me:10162: result: $cf_have_ncuconfig" >&5
++ echo "$as_me:10166: 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"
+@@ -10175,7 +10179,7 @@
+
+ NCURSES_CONFIG_PKG=$cf_ncuconfig_root
+
+-echo "$as_me:10178: checking for terminfo header" >&5
++echo "$as_me:10182: 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
+@@ -10193,7 +10197,7 @@
+ for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h"
+ do
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 10196 "configure"
++#line 10200 "configure"
+ #include "confdefs.h"
+ #include <stdio.h>
+ #include <${cf_cv_ncurses_header:-curses.h}>
+@@ -10208,16 +10212,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:10211: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:10215: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:10214: \$? = $ac_status" >&5
++ echo "$as_me:10218: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:10217: \"$ac_try\"") >&5
++ { (eval echo "$as_me:10221: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:10220: \$? = $ac_status" >&5
++ echo "$as_me:10224: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+
+ cf_cv_term_header="$cf_test"
+@@ -10233,7 +10237,7 @@
+ done
+
+ fi
+-echo "$as_me:10236: result: $cf_cv_term_header" >&5
++echo "$as_me:10240: result: $cf_cv_term_header" >&5
+ echo "${ECHO_T}$cf_cv_term_header" >&6
+
+ # Set definitions to allow ifdef'ing to accommodate subdirectories
+@@ -10268,7 +10272,7 @@
+ fi
+
+ else
+- echo "$as_me:10271: result: no" >&5
++ echo "$as_me:10275: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ NCURSES_CONFIG_PKG=none
+ fi
+@@ -10284,7 +10288,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:10287: checking for $ac_word" >&5
++echo "$as_me:10291: 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
+@@ -10299,7 +10303,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:10302: found $ac_dir/$ac_word" >&5
++echo "$as_me:10306: found $ac_dir/$ac_word" >&5
+ break
+ done
+
+@@ -10307,10 +10311,10 @@
+ fi
+ NCURSES_CONFIG=$ac_cv_prog_NCURSES_CONFIG
+ if test -n "$NCURSES_CONFIG"; then
+- echo "$as_me:10310: result: $NCURSES_CONFIG" >&5
++ echo "$as_me:10314: result: $NCURSES_CONFIG" >&5
+ echo "${ECHO_T}$NCURSES_CONFIG" >&6
+ else
+- echo "$as_me:10313: result: no" >&5
++ echo "$as_me:10317: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+
+@@ -10323,7 +10327,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:10326: checking for $ac_word" >&5
++echo "$as_me:10330: 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
+@@ -10338,7 +10342,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:10341: found $ac_dir/$ac_word" >&5
++echo "$as_me:10345: found $ac_dir/$ac_word" >&5
+ break
+ done
+
+@@ -10346,10 +10350,10 @@
+ fi
+ ac_ct_NCURSES_CONFIG=$ac_cv_prog_ac_ct_NCURSES_CONFIG
+ if test -n "$ac_ct_NCURSES_CONFIG"; then
+- echo "$as_me:10349: result: $ac_ct_NCURSES_CONFIG" >&5
++ echo "$as_me:10353: result: $ac_ct_NCURSES_CONFIG" >&5
+ echo "${ECHO_T}$ac_ct_NCURSES_CONFIG" >&6
+ else
+- echo "$as_me:10352: result: no" >&5
++ echo "$as_me:10356: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+
+@@ -10506,7 +10510,7 @@
+
+ # even with config script, some packages use no-override for curses.h
+
+-echo "$as_me:10509: checking if we have identified curses headers" >&5
++echo "$as_me:10513: 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
+@@ -10518,7 +10522,7 @@
+ curses.h $cf_cv_screen/curses.h
+ do
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 10521 "configure"
++#line 10525 "configure"
+ #include "confdefs.h"
+ #include <${cf_header}>
+ int
+@@ -10530,16 +10534,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:10533: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:10537: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:10536: \$? = $ac_status" >&5
++ echo "$as_me:10540: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:10539: \"$ac_try\"") >&5
++ { (eval echo "$as_me:10543: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:10542: \$? = $ac_status" >&5
++ echo "$as_me:10546: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_ncurses_header=$cf_header; break
+ else
+@@ -10550,11 +10554,11 @@
+ done
+
+ fi
+-echo "$as_me:10553: result: $cf_cv_ncurses_header" >&5
++echo "$as_me:10557: 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:10557: error: No curses header-files found" >&5
++ { { echo "$as_me:10561: error: No curses header-files found" >&5
+ echo "$as_me: error: No curses header-files found" >&2;}
+ { (exit 1); exit 1; }; }
+ fi
+@@ -10564,23 +10568,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:10567: checking for $ac_header" >&5
++echo "$as_me:10571: 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 10573 "configure"
++#line 10577 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:10577: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:10581: \"$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:10583: \$? = $ac_status" >&5
++ echo "$as_me:10587: \$? = $ac_status" >&5
+ (exit "$ac_status"); } >/dev/null; then
+ if test -s conftest.err; then
+ ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -10599,7 +10603,7 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:10602: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
++echo "$as_me:10606: 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
+@@ -10655,7 +10659,7 @@
+ CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
+
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 10658 "configure"
++#line 10662 "configure"
+ #include "confdefs.h"
+ #include <stdio.h>
+ int
+@@ -10667,16 +10671,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:10670: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:10674: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:10673: \$? = $ac_status" >&5
++ echo "$as_me:10677: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:10676: \"$ac_try\"") >&5
++ { (eval echo "$as_me:10680: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:10679: \$? = $ac_status" >&5
++ echo "$as_me:10683: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ :
+ else
+@@ -10693,7 +10697,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}:10696: testing adding $cf_add_incdir to include-path ..." 1>&5
++echo "${as_me:-configure}:10700: testing adding $cf_add_incdir to include-path ..." 1>&5
+
+ CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
+
+@@ -10712,7 +10716,7 @@
+
+ }
+
+-echo "$as_me:10715: checking for $cf_ncuhdr_root header in include-path" >&5
++echo "$as_me:10719: 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
+@@ -10724,7 +10728,7 @@
+ do
+
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 10727 "configure"
++#line 10731 "configure"
+ #include "confdefs.h"
+
+ #include <$cf_header>
+@@ -10748,16 +10752,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:10751: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:10755: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:10754: \$? = $ac_status" >&5
++ echo "$as_me:10758: \$? = $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:10761: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:10760: \$? = $ac_status" >&5
++ echo "$as_me:10764: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_ncurses_h=$cf_header
+
+@@ -10772,14 +10776,14 @@
+ done
+
+ fi
+-echo "$as_me:10775: result: $cf_cv_ncurses_h" >&5
++echo "$as_me:10779: 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:10782: checking for $cf_ncuhdr_root include-path" >&5
++echo "$as_me:10786: 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
+@@ -10900,7 +10904,7 @@
+ CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
+
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 10903 "configure"
++#line 10907 "configure"
+ #include "confdefs.h"
+ #include <stdio.h>
+ int
+@@ -10912,16 +10916,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:10915: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:10919: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:10918: \$? = $ac_status" >&5
++ echo "$as_me:10922: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:10921: \"$ac_try\"") >&5
++ { (eval echo "$as_me:10925: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:10924: \$? = $ac_status" >&5
++ echo "$as_me:10928: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ :
+ else
+@@ -10938,7 +10942,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}:10941: testing adding $cf_add_incdir to include-path ..." 1>&5
++echo "${as_me:-configure}:10945: testing adding $cf_add_incdir to include-path ..." 1>&5
+
+ CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
+
+@@ -10961,7 +10965,7 @@
+ do
+
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 10964 "configure"
++#line 10968 "configure"
+ #include "confdefs.h"
+
+ #include <$cf_header>
+@@ -10985,16 +10989,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:10988: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:10992: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:10991: \$? = $ac_status" >&5
++ echo "$as_me:10995: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:10994: \"$ac_try\"") >&5
++ { (eval echo "$as_me:10998: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:10997: \$? = $ac_status" >&5
++ echo "$as_me:11001: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_ncurses_h2=$cf_header
+
+@@ -11015,12 +11019,12 @@
+ CPPFLAGS="$cf_save2_CPPFLAGS"
+ test "$cf_cv_ncurses_h2" != no && break
+ done
+- test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:11018: error: not found" >&5
++ test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:11022: error: not found" >&5
+ echo "$as_me: error: not found" >&2;}
+ { (exit 1); exit 1; }; }
+
+ fi
+-echo "$as_me:11023: result: $cf_cv_ncurses_h2" >&5
++echo "$as_me:11027: 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%/[^/]*$%%'`
+@@ -11056,7 +11060,7 @@
+ CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
+
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 11059 "configure"
++#line 11063 "configure"
+ #include "confdefs.h"
+ #include <stdio.h>
+ int
+@@ -11068,16 +11072,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:11071: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:11075: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:11074: \$? = $ac_status" >&5
++ echo "$as_me:11078: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:11077: \"$ac_try\"") >&5
++ { (eval echo "$as_me:11081: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:11080: \$? = $ac_status" >&5
++ echo "$as_me:11084: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ :
+ else
+@@ -11094,7 +11098,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}:11097: testing adding $cf_add_incdir to include-path ..." 1>&5
++echo "${as_me:-configure}:11101: testing adding $cf_add_incdir to include-path ..." 1>&5
+
+ CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
+
+@@ -11142,7 +11146,7 @@
+ ;;
+ esac
+
+-echo "$as_me:11145: checking for terminfo header" >&5
++echo "$as_me:11149: 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
+@@ -11160,7 +11164,7 @@
+ for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h"
+ do
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 11163 "configure"
++#line 11167 "configure"
+ #include "confdefs.h"
+ #include <stdio.h>
+ #include <${cf_cv_ncurses_header:-curses.h}>
+@@ -11175,16 +11179,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:11178: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:11182: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:11181: \$? = $ac_status" >&5
++ echo "$as_me:11185: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:11184: \"$ac_try\"") >&5
++ { (eval echo "$as_me:11188: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:11187: \$? = $ac_status" >&5
++ echo "$as_me:11191: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+
+ cf_cv_term_header="$cf_test"
+@@ -11200,7 +11204,7 @@
+ done
+
+ fi
+-echo "$as_me:11203: result: $cf_cv_term_header" >&5
++echo "$as_me:11207: result: $cf_cv_term_header" >&5
+ echo "${ECHO_T}$cf_cv_term_header" >&6
+
+ # Set definitions to allow ifdef'ing to accommodate subdirectories
+@@ -11238,7 +11242,7 @@
+ #define NCURSES 1
+ EOF
+
+-echo "$as_me:11241: checking for ncurses version" >&5
++echo "$as_me:11245: 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
+@@ -11264,10 +11268,10 @@
+ #endif
+ EOF
+ cf_try="$ac_cpp conftest.$ac_ext 2>&5 | grep '^Autoconf ' >conftest.out"
+- { (eval echo "$as_me:11267: \"$cf_try\"") >&5
++ { (eval echo "$as_me:11271: \"$cf_try\"") >&5
+ (eval $cf_try) 2>&5
+ ac_status=$?
+- echo "$as_me:11270: \$? = $ac_status" >&5
++ echo "$as_me:11274: \$? = $ac_status" >&5
+ (exit "$ac_status"); }
+ if test -f conftest.out ; then
+ cf_out=`sed -e 's%^Autoconf %%' -e 's%^[^"]*"%%' -e 's%".*%%' conftest.out`
+@@ -11277,7 +11281,7 @@
+
+ else
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 11280 "configure"
++#line 11284 "configure"
+ #include "confdefs.h"
+
+ $ac_includes_default
+@@ -11304,15 +11308,15 @@
+ }
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:11307: \"$ac_link\"") >&5
++if { (eval echo "$as_me:11311: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:11310: \$? = $ac_status" >&5
++ echo "$as_me:11314: \$? = $ac_status" >&5
+ (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+- { (eval echo "$as_me:11312: \"$ac_try\"") >&5
++ { (eval echo "$as_me:11316: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:11315: \$? = $ac_status" >&5
++ echo "$as_me:11319: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+
+ cf_cv_ncurses_version=`cat $cf_tempfile`
+@@ -11326,7 +11330,7 @@
+ rm -f "$cf_tempfile"
+
+ fi
+-echo "$as_me:11329: result: $cf_cv_ncurses_version" >&5
++echo "$as_me:11333: result: $cf_cv_ncurses_version" >&5
+ echo "${ECHO_T}$cf_cv_ncurses_version" >&6
+ test "$cf_cv_ncurses_version" = no ||
+ cat >>confdefs.h <<\EOF
+@@ -11339,7 +11343,7 @@
+ # to link gpm.
+ cf_ncurses_LIBS=""
+ cf_ncurses_SAVE="$LIBS"
+-echo "$as_me:11342: checking for Gpm_Open in -lgpm" >&5
++echo "$as_me:11346: 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
+@@ -11347,7 +11351,7 @@
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lgpm $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 11350 "configure"
++#line 11354 "configure"
+ #include "confdefs.h"
+
+ /* Override any gcc2 internal prototype to avoid an error. */
+@@ -11366,16 +11370,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:11369: \"$ac_link\"") >&5
++if { (eval echo "$as_me:11373: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:11372: \$? = $ac_status" >&5
++ echo "$as_me:11376: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:11375: \"$ac_try\"") >&5
++ { (eval echo "$as_me:11379: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:11378: \$? = $ac_status" >&5
++ echo "$as_me:11382: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_lib_gpm_Gpm_Open=yes
+ else
+@@ -11386,10 +11390,10 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:11389: result: $ac_cv_lib_gpm_Gpm_Open" >&5
++echo "$as_me:11393: 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:11392: checking for initscr in -lgpm" >&5
++ echo "$as_me:11396: 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
+@@ -11397,7 +11401,7 @@
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lgpm $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 11400 "configure"
++#line 11404 "configure"
+ #include "confdefs.h"
+
+ /* Override any gcc2 internal prototype to avoid an error. */
+@@ -11416,16 +11420,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:11419: \"$ac_link\"") >&5
++if { (eval echo "$as_me:11423: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:11422: \$? = $ac_status" >&5
++ echo "$as_me:11426: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:11425: \"$ac_try\"") >&5
++ { (eval echo "$as_me:11429: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:11428: \$? = $ac_status" >&5
++ echo "$as_me:11432: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_lib_gpm_initscr=yes
+ else
+@@ -11436,7 +11440,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:11439: result: $ac_cv_lib_gpm_initscr" >&5
++echo "$as_me:11443: 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"
+@@ -11451,7 +11455,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:11454: checking for tgoto in -lmytinfo" >&5
++ echo "$as_me:11458: 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
+@@ -11459,7 +11463,7 @@
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lmytinfo $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 11462 "configure"
++#line 11466 "configure"
+ #include "confdefs.h"
+
+ /* Override any gcc2 internal prototype to avoid an error. */
+@@ -11478,16 +11482,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:11481: \"$ac_link\"") >&5
++if { (eval echo "$as_me:11485: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:11484: \$? = $ac_status" >&5
++ echo "$as_me:11488: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:11487: \"$ac_try\"") >&5
++ { (eval echo "$as_me:11491: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:11490: \$? = $ac_status" >&5
++ echo "$as_me:11494: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_lib_mytinfo_tgoto=yes
+ else
+@@ -11498,7 +11502,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:11501: result: $ac_cv_lib_mytinfo_tgoto" >&5
++echo "$as_me:11505: 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"
+@@ -11547,13 +11551,13 @@
+
+ eval 'cf_cv_have_lib_'"$cf_nculib_root"'=no'
+ cf_libdir=""
+- echo "$as_me:11550: checking for initscr" >&5
++ echo "$as_me:11554: 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 11556 "configure"
++#line 11560 "configure"
+ #include "confdefs.h"
+ #define initscr autoconf_temporary
+ #include <limits.h> /* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -11584,16 +11588,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:11587: \"$ac_link\"") >&5
++if { (eval echo "$as_me:11591: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:11590: \$? = $ac_status" >&5
++ echo "$as_me:11594: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:11593: \"$ac_try\"") >&5
++ { (eval echo "$as_me:11597: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:11596: \$? = $ac_status" >&5
++ echo "$as_me:11600: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_func_initscr=yes
+ else
+@@ -11603,18 +11607,18 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:11606: result: $ac_cv_func_initscr" >&5
++echo "$as_me:11610: 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:11613: checking for initscr in -l$cf_nculib_root" >&5
++ echo "$as_me:11617: 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 11617 "configure"
++#line 11621 "configure"
+ #include "confdefs.h"
+ #include <${cf_cv_ncurses_header:-curses.h}>
+ int
+@@ -11626,25 +11630,25 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:11629: \"$ac_link\"") >&5
++if { (eval echo "$as_me:11633: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:11632: \$? = $ac_status" >&5
++ echo "$as_me:11636: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:11635: \"$ac_try\"") >&5
++ { (eval echo "$as_me:11639: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:11638: \$? = $ac_status" >&5
++ echo "$as_me:11642: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+- echo "$as_me:11640: result: yes" >&5
++ echo "$as_me:11644: 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:11647: result: no" >&5
++echo "$as_me:11651: result: no" >&5
+ echo "${ECHO_T}no" >&6
+
+ cf_search=
+@@ -11712,11 +11716,11 @@
+
+ for cf_libdir in $cf_search
+ do
+- echo "$as_me:11715: checking for -l$cf_nculib_root in $cf_libdir" >&5
++ echo "$as_me:11719: 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 11719 "configure"
++#line 11723 "configure"
+ #include "confdefs.h"
+ #include <${cf_cv_ncurses_header:-curses.h}>
+ int
+@@ -11728,25 +11732,25 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:11731: \"$ac_link\"") >&5
++if { (eval echo "$as_me:11735: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:11734: \$? = $ac_status" >&5
++ echo "$as_me:11738: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:11737: \"$ac_try\"") >&5
++ { (eval echo "$as_me:11741: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:11740: \$? = $ac_status" >&5
++ echo "$as_me:11744: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+- echo "$as_me:11742: result: yes" >&5
++ echo "$as_me:11746: 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:11749: result: no" >&5
++echo "$as_me:11753: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ LIBS="$cf_save_LIBS"
+ fi
+@@ -11761,7 +11765,7 @@
+ eval 'cf_found_library="$cf_cv_have_lib_'"$cf_nculib_root"\"
+
+ if test "$cf_found_library" = no ; then
+- { { echo "$as_me:11764: error: Cannot link $cf_nculib_root library" >&5
++ { { echo "$as_me:11768: error: Cannot link $cf_nculib_root library" >&5
+ echo "$as_me: error: Cannot link $cf_nculib_root library" >&2;}
+ { (exit 1); exit 1; }; }
+ fi
+@@ -11769,7 +11773,7 @@
+ fi
+
+ if test -n "$cf_ncurses_LIBS" ; then
+- echo "$as_me:11772: checking if we can link $cf_nculib_root without $cf_ncurses_LIBS" >&5
++ echo "$as_me:11776: 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
+@@ -11779,7 +11783,7 @@
+ fi
+ done
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 11782 "configure"
++#line 11786 "configure"
+ #include "confdefs.h"
+ #include <${cf_cv_ncurses_header:-curses.h}>
+ int
+@@ -11791,23 +11795,23 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:11794: \"$ac_link\"") >&5
++if { (eval echo "$as_me:11798: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:11797: \$? = $ac_status" >&5
++ echo "$as_me:11801: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:11800: \"$ac_try\"") >&5
++ { (eval echo "$as_me:11804: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:11803: \$? = $ac_status" >&5
++ echo "$as_me:11807: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+- echo "$as_me:11805: result: yes" >&5
++ echo "$as_me:11809: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ else
+ echo "$as_me: failed program was:" >&5
+ cat "conftest.$ac_ext" >&5
+-echo "$as_me:11810: result: no" >&5
++echo "$as_me:11814: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ LIBS="$cf_ncurses_SAVE"
+ fi
+@@ -11827,7 +11831,7 @@
+
+ ;;
+ (*)
+- { { echo "$as_me:11830: error: unexpected screen-value: $cf_cv_screen" >&5
++ { { echo "$as_me:11834: error: unexpected screen-value: $cf_cv_screen" >&5
+ echo "$as_me: error: unexpected screen-value: $cf_cv_screen" >&2;}
+ { (exit 1); exit 1; }; }
+ ;;
+@@ -11866,10 +11870,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:11869: \"$cf_try\"") >&5
++ { (eval echo "$as_me:11873: \"$cf_try\"") >&5
+ (eval $cf_try) 2>&5
+ ac_status=$?
+- echo "$as_me:11872: \$? = $ac_status" >&5
++ echo "$as_me:11876: \$? = $ac_status" >&5
+ (exit "$ac_status"); }
+ if test -f conftest.out ; then
+ cf_result=`sed -e "s/^.*AUTOCONF_${cf_name}[ ][ ]*//" conftest.out`
+@@ -11887,17 +11891,17 @@
+
+ cf_cv_timestamp=`date`
+
+-echo "$as_me:11890: result: Configuring NCURSES $cf_cv_rel_version ABI $cf_cv_abi_version ($cf_cv_timestamp)" >&5
++echo "$as_me:11894: 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:11893: checking if KEY_RESIZE is supported" >&5
++echo "$as_me:11897: 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 11900 "configure"
++#line 11904 "configure"
+ #include "confdefs.h"
+ #include <${cf_cv_ncurses_header:-curses.h}>
+ int
+@@ -11909,16 +11913,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:11912: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:11916: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:11915: \$? = $ac_status" >&5
++ echo "$as_me:11919: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:11918: \"$ac_try\"") >&5
++ { (eval echo "$as_me:11922: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:11921: \$? = $ac_status" >&5
++ echo "$as_me:11925: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_curses_resizes=yes
+ else
+@@ -11928,12 +11932,12 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:11931: result: $cf_cv_curses_resizes" >&5
++echo "$as_me:11935: 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:11936: checking if you want to have a library-prefix" >&5
++echo "$as_me:11940: 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.
+@@ -11943,7 +11947,7 @@
+ else
+ with_lib_prefix=auto
+ fi;
+-echo "$as_me:11946: result: $with_lib_prefix" >&5
++echo "$as_me:11950: result: $with_lib_prefix" >&5
+ echo "${ECHO_T}$with_lib_prefix" >&6
+
+ if test "$with_lib_prefix" = auto
+@@ -11981,7 +11985,7 @@
+ test -n "$GCC" && test "${ac_cv_prog_cc_g}" != yes && CC_G_OPT=''
+ fi
+
+-echo "$as_me:11984: checking for default loader flags" >&5
++echo "$as_me:11988: 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='' ;;
+@@ -11989,13 +11993,13 @@
+ (profile) LD_MODEL='-pg';;
+ (shared) LD_MODEL='' ;;
+ esac
+-echo "$as_me:11992: result: $LD_MODEL" >&5
++echo "$as_me:11996: 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:11998: checking for an rpath option" >&5
++ echo "$as_me:12002: checking for an rpath option" >&5
+ echo $ECHO_N "checking for an rpath option... $ECHO_C" >&6
+ case "$cf_cv_system_name" in
+ (irix*)
+@@ -12026,12 +12030,12 @@
+ (*)
+ ;;
+ esac
+- echo "$as_me:12029: result: $LD_RPATH_OPT" >&5
++ echo "$as_me:12033: result: $LD_RPATH_OPT" >&5
+ echo "${ECHO_T}$LD_RPATH_OPT" >&6
+
+ case "x$LD_RPATH_OPT" in
+ (x-R*)
+- echo "$as_me:12034: checking if we need a space after rpath option" >&5
++ echo "$as_me:12038: 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"
+
+@@ -12052,7 +12056,7 @@
+ LIBS="$cf_add_libs"
+
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 12055 "configure"
++#line 12059 "configure"
+ #include "confdefs.h"
+
+ int
+@@ -12064,16 +12068,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:12067: \"$ac_link\"") >&5
++if { (eval echo "$as_me:12071: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:12070: \$? = $ac_status" >&5
++ echo "$as_me:12074: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:12073: \"$ac_try\"") >&5
++ { (eval echo "$as_me:12077: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:12076: \$? = $ac_status" >&5
++ echo "$as_me:12080: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_rpath_space=no
+ else
+@@ -12083,7 +12087,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS="$cf_save_LIBS"
+- echo "$as_me:12086: result: $cf_rpath_space" >&5
++ echo "$as_me:12090: result: $cf_rpath_space" >&5
+ echo "${ECHO_T}$cf_rpath_space" >&6
+ test "$cf_rpath_space" = yes && LD_RPATH_OPT="$LD_RPATH_OPT "
+ ;;
+@@ -12105,7 +12109,7 @@
+ cf_ld_rpath_opt=
+ test "$cf_cv_enable_rpath" = yes && cf_ld_rpath_opt="$LD_RPATH_OPT"
+
+- echo "$as_me:12108: checking whether to use release or ABI version in shared library file names" >&5
++ echo "$as_me:12112: 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.
+@@ -12120,9 +12124,9 @@
+ cf_cv_shlib_version=$withval
+ ;;
+ (*)
+- echo "$as_me:12123: result: $withval" >&5
++ echo "$as_me:12127: result: $withval" >&5
+ echo "${ECHO_T}$withval" >&6
+- { { echo "$as_me:12125: error: option value must be one of: rel, abi, or auto" >&5
++ { { echo "$as_me:12129: 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; }; }
+ ;;
+@@ -12131,7 +12135,7 @@
+ else
+ cf_cv_shlib_version=auto
+ fi;
+- echo "$as_me:12134: result: $cf_cv_shlib_version" >&5
++ echo "$as_me:12138: result: $cf_cv_shlib_version" >&5
+ echo "${ECHO_T}$cf_cv_shlib_version" >&6
+
+ cf_cv_rm_so_locs=no
+@@ -12154,14 +12158,14 @@
+
+ if test "$cf_try_fPIC" = yes
+ then
+- echo "$as_me:12157: checking which $CC option to use" >&5
++ echo "$as_me:12161: 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 12164 "configure"
++#line 12168 "configure"
+ #include "confdefs.h"
+ #include <stdio.h>
+ int
+@@ -12173,16 +12177,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:12176: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:12180: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:12179: \$? = $ac_status" >&5
++ echo "$as_me:12183: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:12182: \"$ac_try\"") >&5
++ { (eval echo "$as_me:12186: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:12185: \$? = $ac_status" >&5
++ echo "$as_me:12189: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ break
+ else
+@@ -12191,7 +12195,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ done
+- echo "$as_me:12194: result: $CC_SHARED_OPTS" >&5
++ echo "$as_me:12198: result: $CC_SHARED_OPTS" >&5
+ echo "${ECHO_T}$CC_SHARED_OPTS" >&6
+ CFLAGS="$cf_save_CFLAGS"
+ fi
+@@ -12262,7 +12266,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:12265: checking if ld -search_paths_first works" >&5
++ echo "$as_me:12269: 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
+@@ -12271,7 +12275,7 @@
+ cf_save_LDFLAGS=$LDFLAGS
+ LDFLAGS="$LDFLAGS -Wl,-search_paths_first"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 12274 "configure"
++#line 12278 "configure"
+ #include "confdefs.h"
+
+ int
+@@ -12283,16 +12287,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:12286: \"$ac_link\"") >&5
++if { (eval echo "$as_me:12290: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:12289: \$? = $ac_status" >&5
++ echo "$as_me:12293: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:12292: \"$ac_try\"") >&5
++ { (eval echo "$as_me:12296: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:12295: \$? = $ac_status" >&5
++ echo "$as_me:12299: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_ldflags_search_paths_first=yes
+ else
+@@ -12303,7 +12307,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LDFLAGS=$cf_save_LDFLAGS
+ fi
+-echo "$as_me:12306: result: $cf_cv_ldflags_search_paths_first" >&5
++echo "$as_me:12310: 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"
+@@ -12653,7 +12657,7 @@
+ do
+ CFLAGS="$cf_shared_opts $cf_save_CFLAGS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 12656 "configure"
++#line 12660 "configure"
+ #include "confdefs.h"
+ #include <stdio.h>
+ int
+@@ -12665,16 +12669,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:12668: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:12672: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:12671: \$? = $ac_status" >&5
++ echo "$as_me:12675: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:12674: \"$ac_try\"") >&5
++ { (eval echo "$as_me:12678: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:12677: \$? = $ac_status" >&5
++ echo "$as_me:12681: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ break
+ else
+@@ -12711,7 +12715,7 @@
+ test "$cf_cv_do_symlinks" = no && cf_cv_do_symlinks=yes
+ ;;
+ (*)
+- { echo "$as_me:12714: WARNING: ignored --with-shlib-version" >&5
++ { echo "$as_me:12718: WARNING: ignored --with-shlib-version" >&5
+ echo "$as_me: WARNING: ignored --with-shlib-version" >&2;}
+ ;;
+ esac
+@@ -12721,7 +12725,7 @@
+ if test -n "$cf_try_cflags"
+ then
+ cat > conftest.$ac_ext <<EOF
+-#line 12724 "${as_me:-configure}"
++#line 12728 "${as_me:-configure}"
+ #include <stdio.h>
+ int main(int argc, char *argv[])
+ {
+@@ -12733,18 +12737,18 @@
+ for cf_opt in $cf_try_cflags
+ do
+ CFLAGS="$cf_save_CFLAGS -$cf_opt"
+- echo "$as_me:12736: checking if CFLAGS option -$cf_opt works" >&5
++ echo "$as_me:12740: 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:12738: \"$ac_compile\"") >&5
++ if { (eval echo "$as_me:12742: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:12741: \$? = $ac_status" >&5
++ echo "$as_me:12745: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; then
+- echo "$as_me:12743: result: yes" >&5
++ echo "$as_me:12747: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ cf_save_CFLAGS="$CFLAGS"
+ else
+- echo "$as_me:12747: result: no" >&5
++ echo "$as_me:12751: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ done
+@@ -12759,17 +12763,17 @@
+
+ test -n "$verbose" && echo " CC_SHARED_OPTS: $CC_SHARED_OPTS" 1>&6
+
+-echo "${as_me:-configure}:12762: testing CC_SHARED_OPTS: $CC_SHARED_OPTS ..." 1>&5
++echo "${as_me:-configure}:12766: 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}:12766: testing MK_SHARED_LIB: $MK_SHARED_LIB ..." 1>&5
++echo "${as_me:-configure}:12770: 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:12772: checking if you want to link sample programs with rpath option" >&5
++ echo "$as_me:12776: 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.
+@@ -12779,7 +12783,7 @@
+ else
+ with_rpath_link=yes
+ fi;
+- echo "$as_me:12782: result: $with_rpath_link" >&5
++ echo "$as_me:12786: result: $with_rpath_link" >&5
+ echo "${ECHO_T}$with_rpath_link" >&6
+ if test "$with_rpath_link" = no
+ then
+@@ -12792,7 +12796,7 @@
+
+ ### use option --enable-broken-linker to force on use of broken-linker support
+
+-echo "$as_me:12795: checking if you want broken-linker support code" >&5
++echo "$as_me:12799: 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.
+@@ -12802,7 +12806,7 @@
+ else
+ with_broken_linker=no
+ fi;
+-echo "$as_me:12805: result: $with_broken_linker" >&5
++echo "$as_me:12809: result: $with_broken_linker" >&5
+ echo "${ECHO_T}$with_broken_linker" >&6
+
+ : "${BROKEN_LINKER:=0}"
+@@ -12817,14 +12821,14 @@
+
+ # Check to define _XOPEN_SOURCE "automatically"
+
+-echo "$as_me:12820: checking if the POSIX test-macros are already defined" >&5
++echo "$as_me:12824: 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 12827 "configure"
++#line 12831 "configure"
+ #include "confdefs.h"
+ #include <stdio.h>
+ int
+@@ -12843,16 +12847,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:12846: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:12850: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:12849: \$? = $ac_status" >&5
++ echo "$as_me:12853: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:12852: \"$ac_try\"") >&5
++ { (eval echo "$as_me:12856: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:12855: \$? = $ac_status" >&5
++ echo "$as_me:12859: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_posix_visible=no
+ else
+@@ -12863,7 +12867,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+
+ fi
+-echo "$as_me:12866: result: $cf_cv_posix_visible" >&5
++echo "$as_me:12870: result: $cf_cv_posix_visible" >&5
+ echo "${ECHO_T}$cf_cv_posix_visible" >&6
+
+ if test "$cf_cv_posix_visible" = no; then
+@@ -12905,14 +12909,14 @@
+
+ cf_gnu_xopen_source=$cf_XOPEN_SOURCE
+
+-echo "$as_me:12908: checking if this is the GNU C library" >&5
++echo "$as_me:12912: 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 12915 "configure"
++#line 12919 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ int
+@@ -12931,16 +12935,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:12934: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:12938: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:12937: \$? = $ac_status" >&5
++ echo "$as_me:12941: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:12940: \"$ac_try\"") >&5
++ { (eval echo "$as_me:12944: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:12943: \$? = $ac_status" >&5
++ echo "$as_me:12947: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_gnu_library=yes
+ else
+@@ -12951,7 +12955,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+
+ fi
+-echo "$as_me:12954: result: $cf_cv_gnu_library" >&5
++echo "$as_me:12958: result: $cf_cv_gnu_library" >&5
+ echo "${ECHO_T}$cf_cv_gnu_library" >&6
+
+ if test x$cf_cv_gnu_library = xyes; then
+@@ -12959,7 +12963,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:12962: checking if _DEFAULT_SOURCE can be used as a basis" >&5
++ echo "$as_me:12966: 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
+@@ -12971,7 +12975,7 @@
+ CPPFLAGS="${CPPFLAGS}-D_DEFAULT_SOURCE"
+
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 12974 "configure"
++#line 12978 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ int
+@@ -12990,16 +12994,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:12993: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:12997: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:12996: \$? = $ac_status" >&5
++ echo "$as_me:13000: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:12999: \"$ac_try\"") >&5
++ { (eval echo "$as_me:13003: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:13002: \$? = $ac_status" >&5
++ echo "$as_me:13006: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_gnu_library_219=yes
+ else
+@@ -13011,12 +13015,12 @@
+ CPPFLAGS="$cf_save"
+
+ fi
+-echo "$as_me:13014: result: $cf_cv_gnu_library_219" >&5
++echo "$as_me:13018: 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:13019: checking if _XOPEN_SOURCE=$cf_gnu_xopen_source works with _DEFAULT_SOURCE" >&5
++ echo "$as_me:13023: 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
+@@ -13121,7 +13125,7 @@
+ fi
+
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 13124 "configure"
++#line 13128 "configure"
+ #include "confdefs.h"
+
+ #include <limits.h>
+@@ -13141,16 +13145,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:13144: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:13148: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:13147: \$? = $ac_status" >&5
++ echo "$as_me:13151: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:13150: \"$ac_try\"") >&5
++ { (eval echo "$as_me:13154: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:13153: \$? = $ac_status" >&5
++ echo "$as_me:13157: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_gnu_dftsrc_219=yes
+ else
+@@ -13161,7 +13165,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+
+ fi
+-echo "$as_me:13164: result: $cf_cv_gnu_dftsrc_219" >&5
++echo "$as_me:13168: 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
+@@ -13170,14 +13174,14 @@
+
+ if test "x$cf_cv_gnu_dftsrc_219" != xyes; then
+
+- echo "$as_me:13173: checking if we must define _GNU_SOURCE" >&5
++ echo "$as_me:13177: 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 13180 "configure"
++#line 13184 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ int
+@@ -13192,16 +13196,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:13195: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:13199: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:13198: \$? = $ac_status" >&5
++ echo "$as_me:13202: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:13201: \"$ac_try\"") >&5
++ { (eval echo "$as_me:13205: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:13204: \$? = $ac_status" >&5
++ echo "$as_me:13208: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_gnu_source=no
+ else
+@@ -13308,7 +13312,7 @@
+ fi
+
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 13311 "configure"
++#line 13315 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ int
+@@ -13323,16 +13327,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:13326: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:13330: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:13329: \$? = $ac_status" >&5
++ echo "$as_me:13333: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:13332: \"$ac_try\"") >&5
++ { (eval echo "$as_me:13336: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:13335: \$? = $ac_status" >&5
++ echo "$as_me:13339: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_gnu_source=no
+ else
+@@ -13347,12 +13351,12 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+
+ fi
+-echo "$as_me:13350: result: $cf_cv_gnu_source" >&5
++echo "$as_me:13354: 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:13355: checking if we should also define _DEFAULT_SOURCE" >&5
++ echo "$as_me:13359: 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
+@@ -13362,7 +13366,7 @@
+ CPPFLAGS="${CPPFLAGS}-D_GNU_SOURCE"
+
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 13365 "configure"
++#line 13369 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ int
+@@ -13377,16 +13381,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:13380: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:13384: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:13383: \$? = $ac_status" >&5
++ echo "$as_me:13387: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:13386: \"$ac_try\"") >&5
++ { (eval echo "$as_me:13390: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:13389: \$? = $ac_status" >&5
++ echo "$as_me:13393: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_default_source=no
+ else
+@@ -13397,7 +13401,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+
+ fi
+-echo "$as_me:13400: result: $cf_cv_default_source" >&5
++echo "$as_me:13404: result: $cf_cv_default_source" >&5
+ echo "${ECHO_T}$cf_cv_default_source" >&6
+ if test "$cf_cv_default_source" = yes
+ then
+@@ -13434,16 +13438,16 @@
+ sed -e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ ]*\)\?[ ]/ /g' \
+ -e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ ]*\)\?$//g'`
+
+-echo "$as_me:13437: checking if we should define _POSIX_C_SOURCE" >&5
++echo "$as_me:13441: 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}:13443: testing if the symbol is already defined go no further ..." 1>&5
++echo "${as_me:-configure}:13447: testing if the symbol is already defined go no further ..." 1>&5
+
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 13446 "configure"
++#line 13450 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ int
+@@ -13458,16 +13462,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:13461: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:13465: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:13464: \$? = $ac_status" >&5
++ echo "$as_me:13468: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:13467: \"$ac_try\"") >&5
++ { (eval echo "$as_me:13471: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:13470: \$? = $ac_status" >&5
++ echo "$as_me:13474: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_posix_c_source=no
+ else
+@@ -13488,7 +13492,7 @@
+ esac
+ if test "$cf_want_posix_source" = yes ; then
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 13491 "configure"
++#line 13495 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ int
+@@ -13503,16 +13507,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:13506: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:13510: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:13509: \$? = $ac_status" >&5
++ echo "$as_me:13513: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:13512: \"$ac_try\"") >&5
++ { (eval echo "$as_me:13516: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:13515: \$? = $ac_status" >&5
++ echo "$as_me:13519: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ :
+ else
+@@ -13523,7 +13527,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+
+-echo "${as_me:-configure}:13526: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
++echo "${as_me:-configure}:13530: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
+
+ CFLAGS="$cf_trim_CFLAGS"
+ CPPFLAGS="$cf_trim_CPPFLAGS"
+@@ -13531,10 +13535,10 @@
+ test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
+ CPPFLAGS="${CPPFLAGS}$cf_cv_posix_c_source"
+
+-echo "${as_me:-configure}:13534: testing if the second compile does not leave our definition intact error ..." 1>&5
++echo "${as_me:-configure}:13538: testing if the second compile does not leave our definition intact error ..." 1>&5
+
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 13537 "configure"
++#line 13541 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ int
+@@ -13549,16 +13553,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:13552: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:13556: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:13555: \$? = $ac_status" >&5
++ echo "$as_me:13559: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:13558: \"$ac_try\"") >&5
++ { (eval echo "$as_me:13562: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:13561: \$? = $ac_status" >&5
++ echo "$as_me:13565: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ :
+ else
+@@ -13574,7 +13578,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+
+ fi
+-echo "$as_me:13577: result: $cf_cv_posix_c_source" >&5
++echo "$as_me:13581: 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
+@@ -13691,7 +13695,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:13694: WARNING: this system does not provide usable locale support" >&5
++ { echo "$as_me:13698: 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
+@@ -13723,14 +13727,14 @@
+ ;;
+ (*)
+
+-echo "$as_me:13726: checking if we should define _XOPEN_SOURCE" >&5
++echo "$as_me:13730: 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 13733 "configure"
++#line 13737 "configure"
+ #include "confdefs.h"
+
+ $ac_includes_default
+@@ -13748,16 +13752,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:13751: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:13755: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:13754: \$? = $ac_status" >&5
++ echo "$as_me:13758: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:13757: \"$ac_try\"") >&5
++ { (eval echo "$as_me:13761: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:13760: \$? = $ac_status" >&5
++ echo "$as_me:13764: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_xopen_source=no
+ else
+@@ -13769,7 +13773,7 @@
+ CPPFLAGS="${CPPFLAGS}-D_XOPEN_SOURCE=$cf_XOPEN_SOURCE"
+
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 13772 "configure"
++#line 13776 "configure"
+ #include "confdefs.h"
+
+ $ac_includes_default
+@@ -13787,16 +13791,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:13790: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:13794: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:13793: \$? = $ac_status" >&5
++ echo "$as_me:13797: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:13796: \"$ac_try\"") >&5
++ { (eval echo "$as_me:13800: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:13799: \$? = $ac_status" >&5
++ echo "$as_me:13803: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_xopen_source=no
+ else
+@@ -13811,7 +13815,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+
+ fi
+-echo "$as_me:13814: result: $cf_cv_xopen_source" >&5
++echo "$as_me:13818: result: $cf_cv_xopen_source" >&5
+ echo "${ECHO_T}$cf_cv_xopen_source" >&6
+
+ if test "$cf_cv_xopen_source" != no ; then
+@@ -13971,16 +13975,16 @@
+ sed -e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ ]*\)\?[ ]/ /g' \
+ -e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ ]*\)\?$//g'`
+
+-echo "$as_me:13974: checking if we should define _POSIX_C_SOURCE" >&5
++echo "$as_me:13978: 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}:13980: testing if the symbol is already defined go no further ..." 1>&5
++echo "${as_me:-configure}:13984: testing if the symbol is already defined go no further ..." 1>&5
+
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 13983 "configure"
++#line 13987 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ int
+@@ -13995,16 +13999,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:13998: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:14002: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:14001: \$? = $ac_status" >&5
++ echo "$as_me:14005: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:14004: \"$ac_try\"") >&5
++ { (eval echo "$as_me:14008: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:14007: \$? = $ac_status" >&5
++ echo "$as_me:14011: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_posix_c_source=no
+ else
+@@ -14025,7 +14029,7 @@
+ esac
+ if test "$cf_want_posix_source" = yes ; then
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 14028 "configure"
++#line 14032 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ int
+@@ -14040,16 +14044,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:14043: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:14047: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:14046: \$? = $ac_status" >&5
++ echo "$as_me:14050: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:14049: \"$ac_try\"") >&5
++ { (eval echo "$as_me:14053: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:14052: \$? = $ac_status" >&5
++ echo "$as_me:14056: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ :
+ else
+@@ -14060,7 +14064,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+
+-echo "${as_me:-configure}:14063: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
++echo "${as_me:-configure}:14067: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
+
+ CFLAGS="$cf_trim_CFLAGS"
+ CPPFLAGS="$cf_trim_CPPFLAGS"
+@@ -14068,10 +14072,10 @@
+ test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
+ CPPFLAGS="${CPPFLAGS}$cf_cv_posix_c_source"
+
+-echo "${as_me:-configure}:14071: testing if the second compile does not leave our definition intact error ..." 1>&5
++echo "${as_me:-configure}:14075: testing if the second compile does not leave our definition intact error ..." 1>&5
+
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 14074 "configure"
++#line 14078 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ int
+@@ -14086,16 +14090,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:14089: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:14093: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:14092: \$? = $ac_status" >&5
++ echo "$as_me:14096: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:14095: \"$ac_try\"") >&5
++ { (eval echo "$as_me:14099: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:14098: \$? = $ac_status" >&5
++ echo "$as_me:14102: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ :
+ else
+@@ -14111,7 +14115,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+
+ fi
+-echo "$as_me:14114: result: $cf_cv_posix_c_source" >&5
++echo "$as_me:14118: 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
+@@ -14224,10 +14228,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}:14227: testing checking if _POSIX_C_SOURCE interferes with _XOPEN_SOURCE ..." 1>&5
++echo "${as_me:-configure}:14231: testing checking if _POSIX_C_SOURCE interferes with _XOPEN_SOURCE ..." 1>&5
+
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 14230 "configure"
++#line 14234 "configure"
+ #include "confdefs.h"
+
+ $ac_includes_default
+@@ -14245,23 +14249,23 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:14248: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:14252: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:14251: \$? = $ac_status" >&5
++ echo "$as_me:14255: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:14254: \"$ac_try\"") >&5
++ { (eval echo "$as_me:14258: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:14257: \$? = $ac_status" >&5
++ echo "$as_me:14261: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ :
+ else
+ echo "$as_me: failed program was:" >&5
+ cat "conftest.$ac_ext" >&5
+
+- { echo "$as_me:14264: WARNING: _POSIX_C_SOURCE definition is not usable" >&5
++ { echo "$as_me:14268: 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
+@@ -14284,7 +14288,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}:14287: testing removing old option $cf_add_cflags from CFLAGS ..." 1>&5
++echo "${as_me:-configure}:14291: testing removing old option $cf_add_cflags from CFLAGS ..." 1>&5
+
+ CFLAGS="$cf_old_cflag"
+ done
+@@ -14296,7 +14300,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}:14299: testing removing old option $cf_add_cflags from CPPFLAGS ..." 1>&5
++echo "${as_me:-configure}:14303: testing removing old option $cf_add_cflags from CPPFLAGS ..." 1>&5
+
+ CPPFLAGS="$cf_old_cflag"
+ done
+@@ -14384,7 +14388,7 @@
+ if test -n "$cf_new_cflags" ; then
+ test -n "$verbose" && echo " add to \$CFLAGS $cf_new_cflags" 1>&6
+
+-echo "${as_me:-configure}:14387: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
++echo "${as_me:-configure}:14391: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
+
+ test -n "$CFLAGS" && CFLAGS="$CFLAGS "
+ CFLAGS="${CFLAGS}$cf_new_cflags"
+@@ -14394,7 +14398,7 @@
+ if test -n "$cf_new_cppflags" ; then
+ test -n "$verbose" && echo " add to \$CPPFLAGS $cf_new_cppflags" 1>&6
+
+-echo "${as_me:-configure}:14397: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
++echo "${as_me:-configure}:14401: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
+
+ test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
+ CPPFLAGS="${CPPFLAGS}$cf_new_cppflags"
+@@ -14404,7 +14408,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}:14407: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5
++echo "${as_me:-configure}:14411: 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"
+@@ -14416,10 +14420,10 @@
+ fi
+
+ if test -n "$cf_XOPEN_SOURCE" && test -z "$cf_cv_xopen_source" ; then
+- echo "$as_me:14419: checking if _XOPEN_SOURCE really is set" >&5
++ echo "$as_me:14423: 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 14422 "configure"
++#line 14426 "configure"
+ #include "confdefs.h"
+ #include <stdlib.h>
+ int
+@@ -14434,16 +14438,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:14437: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:14441: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:14440: \$? = $ac_status" >&5
++ echo "$as_me:14444: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:14443: \"$ac_try\"") >&5
++ { (eval echo "$as_me:14447: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:14446: \$? = $ac_status" >&5
++ echo "$as_me:14450: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_XOPEN_SOURCE_set=yes
+ else
+@@ -14452,12 +14456,12 @@
+ cf_XOPEN_SOURCE_set=no
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+- echo "$as_me:14455: result: $cf_XOPEN_SOURCE_set" >&5
++ echo "$as_me:14459: 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 14460 "configure"
++#line 14464 "configure"
+ #include "confdefs.h"
+ #include <stdlib.h>
+ int
+@@ -14472,16 +14476,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:14475: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:14479: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:14478: \$? = $ac_status" >&5
++ echo "$as_me:14482: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:14481: \"$ac_try\"") >&5
++ { (eval echo "$as_me:14485: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:14484: \$? = $ac_status" >&5
++ echo "$as_me:14488: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_XOPEN_SOURCE_set_ok=yes
+ else
+@@ -14492,19 +14496,19 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ if test "$cf_XOPEN_SOURCE_set_ok" = no
+ then
+- { echo "$as_me:14495: WARNING: _XOPEN_SOURCE is lower than requested" >&5
++ { echo "$as_me:14499: WARNING: _XOPEN_SOURCE is lower than requested" >&5
+ echo "$as_me: WARNING: _XOPEN_SOURCE is lower than requested" >&2;}
+ fi
+ else
+
+-echo "$as_me:14500: checking if we should define _XOPEN_SOURCE" >&5
++echo "$as_me:14504: 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 14507 "configure"
++#line 14511 "configure"
+ #include "confdefs.h"
+
+ $ac_includes_default
+@@ -14522,16 +14526,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:14525: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:14529: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:14528: \$? = $ac_status" >&5
++ echo "$as_me:14532: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:14531: \"$ac_try\"") >&5
++ { (eval echo "$as_me:14535: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:14534: \$? = $ac_status" >&5
++ echo "$as_me:14538: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_xopen_source=no
+ else
+@@ -14543,7 +14547,7 @@
+ CPPFLAGS="${CPPFLAGS}-D_XOPEN_SOURCE=$cf_XOPEN_SOURCE"
+
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 14546 "configure"
++#line 14550 "configure"
+ #include "confdefs.h"
+
+ $ac_includes_default
+@@ -14561,16 +14565,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:14564: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:14568: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:14567: \$? = $ac_status" >&5
++ echo "$as_me:14571: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:14570: \"$ac_try\"") >&5
++ { (eval echo "$as_me:14574: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:14573: \$? = $ac_status" >&5
++ echo "$as_me:14577: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_xopen_source=no
+ else
+@@ -14585,7 +14589,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+
+ fi
+-echo "$as_me:14588: result: $cf_cv_xopen_source" >&5
++echo "$as_me:14592: result: $cf_cv_xopen_source" >&5
+ echo "${ECHO_T}$cf_cv_xopen_source" >&6
+
+ if test "$cf_cv_xopen_source" != no ; then
+@@ -14732,13 +14736,13 @@
+ fi
+ fi # cf_cv_posix_visible
+
+-echo "$as_me:14735: checking for ANSI C header files" >&5
++echo "$as_me:14739: 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 14741 "configure"
++#line 14745 "configure"
+ #include "confdefs.h"
+ #include <stdlib.h>
+ #include <stdarg.h>
+@@ -14746,13 +14750,13 @@
+ #include <float.h>
+
+ _ACEOF
+-if { (eval echo "$as_me:14749: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:14753: \"$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:14755: \$? = $ac_status" >&5
++ echo "$as_me:14759: \$? = $ac_status" >&5
+ (exit "$ac_status"); } >/dev/null; then
+ if test -s conftest.err; then
+ ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -14774,7 +14778,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 14777 "configure"
++#line 14781 "configure"
+ #include "confdefs.h"
+ #include <string.h>
+
+@@ -14792,7 +14796,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 14795 "configure"
++#line 14799 "configure"
+ #include "confdefs.h"
+ #include <stdlib.h>
+
+@@ -14813,7 +14817,7 @@
+ :
+ else
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 14816 "configure"
++#line 14820 "configure"
+ #include "confdefs.h"
+ #include <ctype.h>
+ #if ((' ' & 0x0FF) == 0x020)
+@@ -14839,15 +14843,15 @@
+ }
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:14842: \"$ac_link\"") >&5
++if { (eval echo "$as_me:14846: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:14845: \$? = $ac_status" >&5
++ echo "$as_me:14849: \$? = $ac_status" >&5
+ (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+- { (eval echo "$as_me:14847: \"$ac_try\"") >&5
++ { (eval echo "$as_me:14851: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:14850: \$? = $ac_status" >&5
++ echo "$as_me:14854: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ :
+ else
+@@ -14860,7 +14864,7 @@
+ fi
+ fi
+ fi
+-echo "$as_me:14863: result: $ac_cv_header_stdc" >&5
++echo "$as_me:14867: result: $ac_cv_header_stdc" >&5
+ echo "${ECHO_T}$ac_cv_header_stdc" >&6
+ if test $ac_cv_header_stdc = yes; then
+
+@@ -14876,28 +14880,28 @@
+ inttypes.h stdint.h unistd.h
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-echo "$as_me:14879: checking for $ac_header" >&5
++echo "$as_me:14883: 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 14885 "configure"
++#line 14889 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ #include <$ac_header>
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:14891: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:14895: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:14894: \$? = $ac_status" >&5
++ echo "$as_me:14898: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:14897: \"$ac_try\"") >&5
++ { (eval echo "$as_me:14901: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:14900: \$? = $ac_status" >&5
++ echo "$as_me:14904: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ eval "$as_ac_Header=yes"
+ else
+@@ -14907,7 +14911,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:14910: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
++echo "$as_me:14914: 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
+@@ -14917,13 +14921,13 @@
+ fi
+ done
+
+-echo "$as_me:14920: checking whether exit is declared" >&5
++echo "$as_me:14924: 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 14926 "configure"
++#line 14930 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -14938,16 +14942,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:14941: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:14945: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:14944: \$? = $ac_status" >&5
++ echo "$as_me:14948: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:14947: \"$ac_try\"") >&5
++ { (eval echo "$as_me:14951: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:14950: \$? = $ac_status" >&5
++ echo "$as_me:14954: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_have_decl_exit=yes
+ else
+@@ -14957,7 +14961,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:14960: result: $ac_cv_have_decl_exit" >&5
++echo "$as_me:14964: 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.
+@@ -14967,7 +14971,7 @@
+ fi;
+ if test "$enable_largefile" != no; then
+
+- echo "$as_me:14970: checking for special C compiler options needed for large files" >&5
++ echo "$as_me:14974: 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
+@@ -14979,7 +14983,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 14982 "configure"
++#line 14986 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ /* Check that off_t can represent 2**63 - 1 correctly.
+@@ -14999,16 +15003,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:15002: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:15006: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:15005: \$? = $ac_status" >&5
++ echo "$as_me:15009: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:15008: \"$ac_try\"") >&5
++ { (eval echo "$as_me:15012: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:15011: \$? = $ac_status" >&5
++ echo "$as_me:15015: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ break
+ else
+@@ -15018,16 +15022,16 @@
+ rm -f "conftest.$ac_objext"
+ CC="$CC -n32"
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:15021: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:15025: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:15024: \$? = $ac_status" >&5
++ echo "$as_me:15028: \$? = $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:15031: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:15030: \$? = $ac_status" >&5
++ echo "$as_me:15034: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_sys_largefile_CC=' -n32'; break
+ else
+@@ -15041,13 +15045,13 @@
+ rm -f "conftest.$ac_ext"
+ fi
+ fi
+-echo "$as_me:15044: result: $ac_cv_sys_largefile_CC" >&5
++echo "$as_me:15048: 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:15050: checking for _FILE_OFFSET_BITS value needed for large files" >&5
++ echo "$as_me:15054: 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
+@@ -15055,7 +15059,7 @@
+ while :; do
+ ac_cv_sys_file_offset_bits=no
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 15058 "configure"
++#line 15062 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ /* Check that off_t can represent 2**63 - 1 correctly.
+@@ -15075,16 +15079,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:15078: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:15082: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:15081: \$? = $ac_status" >&5
++ echo "$as_me:15085: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:15084: \"$ac_try\"") >&5
++ { (eval echo "$as_me:15088: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:15087: \$? = $ac_status" >&5
++ echo "$as_me:15091: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ break
+ else
+@@ -15093,7 +15097,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 15096 "configure"
++#line 15100 "configure"
+ #include "confdefs.h"
+ #define _FILE_OFFSET_BITS 64
+ #include <sys/types.h>
+@@ -15114,16 +15118,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:15117: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:15121: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:15120: \$? = $ac_status" >&5
++ echo "$as_me:15124: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:15123: \"$ac_try\"") >&5
++ { (eval echo "$as_me:15127: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:15126: \$? = $ac_status" >&5
++ echo "$as_me:15130: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_sys_file_offset_bits=64; break
+ else
+@@ -15134,7 +15138,7 @@
+ break
+ done
+ fi
+-echo "$as_me:15137: result: $ac_cv_sys_file_offset_bits" >&5
++echo "$as_me:15141: 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
+
+@@ -15144,7 +15148,7 @@
+
+ fi
+ rm -rf conftest*
+- echo "$as_me:15147: checking for _LARGE_FILES value needed for large files" >&5
++ echo "$as_me:15151: 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
+@@ -15152,7 +15156,7 @@
+ while :; do
+ ac_cv_sys_large_files=no
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 15155 "configure"
++#line 15159 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ /* Check that off_t can represent 2**63 - 1 correctly.
+@@ -15172,16 +15176,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:15175: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:15179: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:15178: \$? = $ac_status" >&5
++ echo "$as_me:15182: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:15181: \"$ac_try\"") >&5
++ { (eval echo "$as_me:15185: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:15184: \$? = $ac_status" >&5
++ echo "$as_me:15188: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ break
+ else
+@@ -15190,7 +15194,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 15193 "configure"
++#line 15197 "configure"
+ #include "confdefs.h"
+ #define _LARGE_FILES 1
+ #include <sys/types.h>
+@@ -15211,16 +15215,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:15214: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:15218: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:15217: \$? = $ac_status" >&5
++ echo "$as_me:15221: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:15220: \"$ac_try\"") >&5
++ { (eval echo "$as_me:15224: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:15223: \$? = $ac_status" >&5
++ echo "$as_me:15227: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_sys_large_files=1; break
+ else
+@@ -15231,7 +15235,7 @@
+ break
+ done
+ fi
+-echo "$as_me:15234: result: $ac_cv_sys_large_files" >&5
++echo "$as_me:15238: 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
+
+@@ -15244,7 +15248,7 @@
+ fi
+
+ if test "$enable_largefile" != no ; then
+- echo "$as_me:15247: checking for _LARGEFILE_SOURCE value needed for large files" >&5
++ echo "$as_me:15251: 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
+@@ -15252,7 +15256,7 @@
+ while :; do
+ ac_cv_sys_largefile_source=no
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 15255 "configure"
++#line 15259 "configure"
+ #include "confdefs.h"
+ #include <stdio.h>
+ #include <sys/types.h>
+@@ -15267,16 +15271,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:15270: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:15274: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:15273: \$? = $ac_status" >&5
++ echo "$as_me:15277: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:15276: \"$ac_try\"") >&5
++ { (eval echo "$as_me:15280: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:15279: \$? = $ac_status" >&5
++ echo "$as_me:15283: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ break
+ else
+@@ -15285,7 +15289,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 15288 "configure"
++#line 15292 "configure"
+ #include "confdefs.h"
+ #define _LARGEFILE_SOURCE 1
+ #include <stdio.h>
+@@ -15301,16 +15305,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:15304: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:15308: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:15307: \$? = $ac_status" >&5
++ echo "$as_me:15311: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:15310: \"$ac_try\"") >&5
++ { (eval echo "$as_me:15314: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:15313: \$? = $ac_status" >&5
++ echo "$as_me:15317: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_sys_largefile_source=1; break
+ else
+@@ -15321,7 +15325,7 @@
+ break
+ done
+ fi
+-echo "$as_me:15324: result: $ac_cv_sys_largefile_source" >&5
++echo "$as_me:15328: 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
+
+@@ -15335,13 +15339,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:15338: checking for fseeko" >&5
++echo "$as_me:15342: 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 15344 "configure"
++#line 15348 "configure"
+ #include "confdefs.h"
+ #include <stdio.h>
+ #include <sys/types.h>
+@@ -15355,16 +15359,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:15358: \"$ac_link\"") >&5
++if { (eval echo "$as_me:15362: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:15361: \$? = $ac_status" >&5
++ echo "$as_me:15365: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:15364: \"$ac_try\"") >&5
++ { (eval echo "$as_me:15368: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:15367: \$? = $ac_status" >&5
++ echo "$as_me:15371: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_func_fseeko=yes
+ else
+@@ -15374,7 +15378,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:15377: result: $ac_cv_func_fseeko" >&5
++echo "$as_me:15381: result: $ac_cv_func_fseeko" >&5
+ echo "${ECHO_T}$ac_cv_func_fseeko" >&6
+ if test $ac_cv_func_fseeko = yes; then
+
+@@ -15413,14 +15417,14 @@
+
+ fi
+
+- echo "$as_me:15416: checking whether to use struct dirent64" >&5
++ echo "$as_me:15420: 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 15423 "configure"
++#line 15427 "configure"
+ #include "confdefs.h"
+
+ #pragma GCC diagnostic error "-Wincompatible-pointer-types"
+@@ -15447,16 +15451,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:15450: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:15454: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:15453: \$? = $ac_status" >&5
++ echo "$as_me:15457: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:15456: \"$ac_try\"") >&5
++ { (eval echo "$as_me:15460: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:15459: \$? = $ac_status" >&5
++ echo "$as_me:15463: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_struct_dirent64=yes
+ else
+@@ -15467,7 +15471,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+
+ fi
+-echo "$as_me:15470: result: $cf_cv_struct_dirent64" >&5
++echo "$as_me:15474: result: $cf_cv_struct_dirent64" >&5
+ echo "${ECHO_T}$cf_cv_struct_dirent64" >&6
+ test "$cf_cv_struct_dirent64" = yes &&
+ cat >>confdefs.h <<\EOF
+@@ -15477,7 +15481,7 @@
+ fi
+
+ ### Enable compiling-in rcs id's
+-echo "$as_me:15480: checking if RCS identifiers should be compiled-in" >&5
++echo "$as_me:15484: 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.
+@@ -15487,7 +15491,7 @@
+ else
+ with_rcs_ids=no
+ fi;
+-echo "$as_me:15490: result: $with_rcs_ids" >&5
++echo "$as_me:15494: result: $with_rcs_ids" >&5
+ echo "${ECHO_T}$with_rcs_ids" >&6
+ test "$with_rcs_ids" = yes &&
+ cat >>confdefs.h <<\EOF
+@@ -15497,7 +15501,7 @@
+ ###############################################################################
+
+ ### Note that some functions (such as const) are normally disabled anyway.
+-echo "$as_me:15500: checking if you want to build with function extensions" >&5
++echo "$as_me:15504: 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.
+@@ -15507,7 +15511,7 @@
+ else
+ with_ext_funcs=yes
+ fi;
+-echo "$as_me:15510: result: $with_ext_funcs" >&5
++echo "$as_me:15514: result: $with_ext_funcs" >&5
+ echo "${ECHO_T}$with_ext_funcs" >&6
+ if test "$with_ext_funcs" = yes ; then
+ NCURSES_EXT_FUNCS=1
+@@ -15525,7 +15529,7 @@
+ fi
+
+ ### use option --enable-const to turn on use of const beyond that in XSI.
+-echo "$as_me:15528: checking for extended use of const keyword" >&5
++echo "$as_me:15532: 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.
+@@ -15535,7 +15539,7 @@
+ else
+ with_ext_const=no
+ fi;
+-echo "$as_me:15538: result: $with_ext_const" >&5
++echo "$as_me:15542: result: $with_ext_const" >&5
+ echo "${ECHO_T}$with_ext_const" >&6
+ NCURSES_CONST='/*nothing*/'
+ if test "$with_ext_const" = yes ; then
+@@ -15545,7 +15549,7 @@
+ ###############################################################################
+ # These options are relatively safe to experiment with.
+
+-echo "$as_me:15548: checking if you want all development code" >&5
++echo "$as_me:15552: 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.
+@@ -15555,7 +15559,7 @@
+ else
+ with_develop=no
+ fi;
+-echo "$as_me:15558: result: $with_develop" >&5
++echo "$as_me:15562: result: $with_develop" >&5
+ echo "${ECHO_T}$with_develop" >&6
+
+ ###############################################################################
+@@ -15564,7 +15568,7 @@
+ # This is still experimental (20080329), but should ultimately be moved to
+ # the script-block --with-normal, etc.
+
+-echo "$as_me:15567: checking if you want to link with the pthread library" >&5
++echo "$as_me:15571: 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.
+@@ -15574,27 +15578,27 @@
+ else
+ with_pthread=no
+ fi;
+-echo "$as_me:15577: result: $with_pthread" >&5
++echo "$as_me:15581: result: $with_pthread" >&5
+ echo "${ECHO_T}$with_pthread" >&6
+
+ if test "$with_pthread" != no ; then
+- echo "$as_me:15581: checking for pthread.h" >&5
++ echo "$as_me:15585: 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 15587 "configure"
++#line 15591 "configure"
+ #include "confdefs.h"
+ #include <pthread.h>
+ _ACEOF
+-if { (eval echo "$as_me:15591: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:15595: \"$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:15597: \$? = $ac_status" >&5
++ echo "$as_me:15601: \$? = $ac_status" >&5
+ (exit "$ac_status"); } >/dev/null; then
+ if test -s conftest.err; then
+ ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -15613,7 +15617,7 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:15616: result: $ac_cv_header_pthread_h" >&5
++echo "$as_me:15620: 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
+
+@@ -15623,7 +15627,7 @@
+
+ for cf_lib_pthread in pthread c_r
+ do
+- echo "$as_me:15626: checking if we can link with the $cf_lib_pthread library" >&5
++ echo "$as_me:15630: 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"
+
+@@ -15644,7 +15648,7 @@
+ LIBS="$cf_add_libs"
+
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 15647 "configure"
++#line 15651 "configure"
+ #include "confdefs.h"
+
+ #include <pthread.h>
+@@ -15661,16 +15665,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:15664: \"$ac_link\"") >&5
++if { (eval echo "$as_me:15668: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:15667: \$? = $ac_status" >&5
++ echo "$as_me:15671: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:15670: \"$ac_try\"") >&5
++ { (eval echo "$as_me:15674: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:15673: \$? = $ac_status" >&5
++ echo "$as_me:15677: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ with_pthread=yes
+ else
+@@ -15680,7 +15684,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS="$cf_save_LIBS"
+- echo "$as_me:15683: result: $with_pthread" >&5
++ echo "$as_me:15687: result: $with_pthread" >&5
+ echo "${ECHO_T}$with_pthread" >&6
+ test "$with_pthread" = yes && break
+ done
+@@ -15708,7 +15712,7 @@
+ EOF
+
+ else
+- { { echo "$as_me:15711: error: Cannot link with pthread library" >&5
++ { { echo "$as_me:15715: error: Cannot link with pthread library" >&5
+ echo "$as_me: error: Cannot link with pthread library" >&2;}
+ { (exit 1); exit 1; }; }
+ fi
+@@ -15717,7 +15721,7 @@
+
+ fi
+
+-echo "$as_me:15720: checking if you want to use weak-symbols for pthreads" >&5
++echo "$as_me:15724: 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.
+@@ -15727,18 +15731,18 @@
+ else
+ use_weak_symbols=no
+ fi;
+-echo "$as_me:15730: result: $use_weak_symbols" >&5
++echo "$as_me:15734: result: $use_weak_symbols" >&5
+ echo "${ECHO_T}$use_weak_symbols" >&6
+ if test "$use_weak_symbols" = yes ; then
+
+-echo "$as_me:15734: checking if $CC supports weak symbols" >&5
++echo "$as_me:15738: 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 15741 "configure"
++#line 15745 "configure"
+ #include "confdefs.h"
+
+ #include <stdio.h>
+@@ -15764,16 +15768,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:15767: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:15771: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:15770: \$? = $ac_status" >&5
++ echo "$as_me:15774: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:15773: \"$ac_try\"") >&5
++ { (eval echo "$as_me:15777: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:15776: \$? = $ac_status" >&5
++ echo "$as_me:15780: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_weak_symbols=yes
+ else
+@@ -15784,7 +15788,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+
+ fi
+-echo "$as_me:15787: result: $cf_cv_weak_symbols" >&5
++echo "$as_me:15791: result: $cf_cv_weak_symbols" >&5
+ echo "${ECHO_T}$cf_cv_weak_symbols" >&6
+
+ else
+@@ -15813,13 +15817,13 @@
+ fi
+
+ # OpenSUSE is installing ncurses6, using reentrant option.
+-echo "$as_me:15816: checking for _nc_TABSIZE" >&5
++echo "$as_me:15820: 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 15822 "configure"
++#line 15826 "configure"
+ #include "confdefs.h"
+ #define _nc_TABSIZE autoconf_temporary
+ #include <limits.h> /* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -15850,16 +15854,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:15853: \"$ac_link\"") >&5
++if { (eval echo "$as_me:15857: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:15856: \$? = $ac_status" >&5
++ echo "$as_me:15860: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:15859: \"$ac_try\"") >&5
++ { (eval echo "$as_me:15863: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:15862: \$? = $ac_status" >&5
++ echo "$as_me:15866: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_func__nc_TABSIZE=yes
+ else
+@@ -15869,7 +15873,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:15872: result: $ac_cv_func__nc_TABSIZE" >&5
++echo "$as_me:15876: 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
+@@ -15881,7 +15885,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:15884: checking if you want experimental reentrant code" >&5
++echo "$as_me:15888: 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.
+@@ -15891,7 +15895,7 @@
+ else
+ with_reentrant=$assume_reentrant
+ fi;
+-echo "$as_me:15894: result: $with_reentrant" >&5
++echo "$as_me:15898: result: $with_reentrant" >&5
+ echo "${ECHO_T}$with_reentrant" >&6
+ if test "$with_reentrant" = yes ; then
+ cf_cv_enable_reentrant=1
+@@ -15914,7 +15918,7 @@
+
+ ### Allow using a different wrap-prefix
+ if test "$cf_cv_enable_reentrant" != 0 || test "$BROKEN_LINKER" = 1 ; then
+- echo "$as_me:15917: checking for prefix used to wrap public variables" >&5
++ echo "$as_me:15921: 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.
+@@ -15924,7 +15928,7 @@
+ else
+ NCURSES_WRAP_PREFIX=_nc_
+ fi;
+- echo "$as_me:15927: result: $NCURSES_WRAP_PREFIX" >&5
++ echo "$as_me:15931: result: $NCURSES_WRAP_PREFIX" >&5
+ echo "${ECHO_T}$NCURSES_WRAP_PREFIX" >&6
+ else
+ NCURSES_WRAP_PREFIX=_nc_
+@@ -15938,7 +15942,7 @@
+
+ ### use option --disable-echo to suppress full display compiling commands
+
+-echo "$as_me:15941: checking if you want to see long compiling messages" >&5
++echo "$as_me:15945: 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.
+@@ -15972,10 +15976,10 @@
+ ECHO_CC=''
+
+ fi;
+-echo "$as_me:15975: result: $enableval" >&5
++echo "$as_me:15979: result: $enableval" >&5
+ echo "${ECHO_T}$enableval" >&6
+
+-echo "$as_me:15978: checking if you want to use C11 _Noreturn feature" >&5
++echo "$as_me:15982: 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.
+@@ -15992,17 +15996,17 @@
+ enable_stdnoreturn=no
+
+ fi;
+-echo "$as_me:15995: result: $enable_stdnoreturn" >&5
++echo "$as_me:15999: result: $enable_stdnoreturn" >&5
+ echo "${ECHO_T}$enable_stdnoreturn" >&6
+
+ if test $enable_stdnoreturn = yes; then
+-echo "$as_me:15999: checking for C11 _Noreturn feature" >&5
++echo "$as_me:16003: 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 16005 "configure"
++#line 16009 "configure"
+ #include "confdefs.h"
+
+ $ac_includes_default
+@@ -16018,16 +16022,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:16021: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:16025: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:16024: \$? = $ac_status" >&5
++ echo "$as_me:16028: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:16027: \"$ac_try\"") >&5
++ { (eval echo "$as_me:16031: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:16030: \$? = $ac_status" >&5
++ echo "$as_me:16034: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_c11_noreturn=yes
+ else
+@@ -16038,7 +16042,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+
+ fi
+-echo "$as_me:16041: result: $cf_cv_c11_noreturn" >&5
++echo "$as_me:16045: result: $cf_cv_c11_noreturn" >&5
+ echo "${ECHO_T}$cf_cv_c11_noreturn" >&6
+ else
+ cf_cv_c11_noreturn=no,
+@@ -16094,16 +16098,16 @@
+ then
+ test -n "$verbose" && echo " repairing CFLAGS: $CFLAGS" 1>&6
+
+-echo "${as_me:-configure}:16097: testing repairing CFLAGS: $CFLAGS ..." 1>&5
++echo "${as_me:-configure}:16101: testing repairing CFLAGS: $CFLAGS ..." 1>&5
+
+ CFLAGS="$cf_temp_flags"
+ test -n "$verbose" && echo " ... fixed $CFLAGS" 1>&6
+
+-echo "${as_me:-configure}:16102: testing ... fixed $CFLAGS ..." 1>&5
++echo "${as_me:-configure}:16106: testing ... fixed $CFLAGS ..." 1>&5
+
+ test -n "$verbose" && echo " ... extra $EXTRA_CFLAGS" 1>&6
+
+-echo "${as_me:-configure}:16106: testing ... extra $EXTRA_CFLAGS ..." 1>&5
++echo "${as_me:-configure}:16110: testing ... extra $EXTRA_CFLAGS ..." 1>&5
+
+ fi
+ ;;
+@@ -16142,16 +16146,16 @@
+ then
+ test -n "$verbose" && echo " repairing CPPFLAGS: $CPPFLAGS" 1>&6
+
+-echo "${as_me:-configure}:16145: testing repairing CPPFLAGS: $CPPFLAGS ..." 1>&5
++echo "${as_me:-configure}:16149: testing repairing CPPFLAGS: $CPPFLAGS ..." 1>&5
+
+ CPPFLAGS="$cf_temp_flags"
+ test -n "$verbose" && echo " ... fixed $CPPFLAGS" 1>&6
+
+-echo "${as_me:-configure}:16150: testing ... fixed $CPPFLAGS ..." 1>&5
++echo "${as_me:-configure}:16154: testing ... fixed $CPPFLAGS ..." 1>&5
+
+ test -n "$verbose" && echo " ... extra $EXTRA_CFLAGS" 1>&6
+
+-echo "${as_me:-configure}:16154: testing ... extra $EXTRA_CFLAGS ..." 1>&5
++echo "${as_me:-configure}:16158: testing ... extra $EXTRA_CFLAGS ..." 1>&5
+
+ fi
+ ;;
+@@ -16190,23 +16194,23 @@
+ then
+ test -n "$verbose" && echo " repairing LDFLAGS: $LDFLAGS" 1>&6
+
+-echo "${as_me:-configure}:16193: testing repairing LDFLAGS: $LDFLAGS ..." 1>&5
++echo "${as_me:-configure}:16197: testing repairing LDFLAGS: $LDFLAGS ..." 1>&5
+
+ LDFLAGS="$cf_temp_flags"
+ test -n "$verbose" && echo " ... fixed $LDFLAGS" 1>&6
+
+-echo "${as_me:-configure}:16198: testing ... fixed $LDFLAGS ..." 1>&5
++echo "${as_me:-configure}:16202: testing ... fixed $LDFLAGS ..." 1>&5
+
+ test -n "$verbose" && echo " ... extra $EXTRA_CFLAGS" 1>&6
+
+-echo "${as_me:-configure}:16202: testing ... extra $EXTRA_CFLAGS ..." 1>&5
++echo "${as_me:-configure}:16206: testing ... extra $EXTRA_CFLAGS ..." 1>&5
+
+ fi
+ ;;
+ esac
+ fi
+
+-echo "$as_me:16209: checking if you want to turn on gcc warnings" >&5
++echo "$as_me:16213: 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.
+@@ -16223,7 +16227,7 @@
+ enable_warnings=no
+
+ fi;
+-echo "$as_me:16226: result: $enable_warnings" >&5
++echo "$as_me:16230: result: $enable_warnings" >&5
+ echo "${ECHO_T}$enable_warnings" >&6
+ if test "$enable_warnings" = "yes"
+ then
+@@ -16247,7 +16251,7 @@
+ done
+
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 16250 "configure"
++#line 16254 "configure"
+ #include "confdefs.h"
+
+ #include <stdlib.h>
+@@ -16262,26 +16266,26 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:16265: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:16269: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:16268: \$? = $ac_status" >&5
++ echo "$as_me:16272: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:16271: \"$ac_try\"") >&5
++ { (eval echo "$as_me:16275: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:16274: \$? = $ac_status" >&5
++ echo "$as_me:16278: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+
+-echo "$as_me:16277: checking for X11/Xt const-feature" >&5
++echo "$as_me:16281: 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 16284 "configure"
++#line 16288 "configure"
+ #include "confdefs.h"
+
+ #undef _CONST_X_STRING
+@@ -16299,16 +16303,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:16302: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:16306: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:16305: \$? = $ac_status" >&5
++ echo "$as_me:16309: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:16308: \"$ac_try\"") >&5
++ { (eval echo "$as_me:16312: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:16311: \$? = $ac_status" >&5
++ echo "$as_me:16315: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+
+ cf_cv_const_x_string=no
+@@ -16323,7 +16327,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+
+ fi
+-echo "$as_me:16326: result: $cf_cv_const_x_string" >&5
++echo "$as_me:16330: result: $cf_cv_const_x_string" >&5
+ echo "${ECHO_T}$cf_cv_const_x_string" >&6
+
+ LIBS="$cf_save_LIBS_CF_CONST_X_STRING"
+@@ -16352,7 +16356,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+ cat > "conftest.$ac_ext" <<EOF
+-#line 16355 "${as_me:-configure}"
++#line 16359 "${as_me:-configure}"
+ int main(int argc, char *argv[]) { return (argv[argc-1] == 0) ; }
+ EOF
+ if test "$INTEL_COMPILER" = yes
+@@ -16368,7 +16372,7 @@
+ # remark #981: operands are evaluated in unspecified order
+ # warning #279: controlling expression is constant
+
+- { echo "$as_me:16371: checking for $CC warning options..." >&5
++ { echo "$as_me:16375: checking for $CC warning options..." >&5
+ echo "$as_me: checking for $CC warning options..." >&6;}
+ cf_save_CFLAGS="$CFLAGS"
+ EXTRA_CFLAGS="$EXTRA_CFLAGS -Wall"
+@@ -16384,12 +16388,12 @@
+ wd981
+ do
+ CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt"
+- if { (eval echo "$as_me:16387: \"$ac_compile\"") >&5
++ if { (eval echo "$as_me:16391: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:16390: \$? = $ac_status" >&5
++ echo "$as_me:16394: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; then
+- test -n "$verbose" && echo "$as_me:16392: result: ... -$cf_opt" >&5
++ test -n "$verbose" && echo "$as_me:16396: result: ... -$cf_opt" >&5
+ echo "${ECHO_T}... -$cf_opt" >&6
+ EXTRA_CFLAGS="$EXTRA_CFLAGS -$cf_opt"
+ fi
+@@ -16397,7 +16401,7 @@
+ CFLAGS="$cf_save_CFLAGS"
+ elif test "$GCC" = yes && test "$GCC_VERSION" != "unknown"
+ then
+- { echo "$as_me:16400: checking for $CC warning options..." >&5
++ { echo "$as_me:16404: checking for $CC warning options..." >&5
+ echo "$as_me: checking for $CC warning options..." >&6;}
+ cf_save_CFLAGS="$CFLAGS"
+ cf_warn_CONST=""
+@@ -16420,12 +16424,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:16423: \"$ac_compile\"") >&5
++ if { (eval echo "$as_me:16427: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:16426: \$? = $ac_status" >&5
++ echo "$as_me:16430: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; then
+- test -n "$verbose" && echo "$as_me:16428: result: ... -$cf_opt" >&5
++ test -n "$verbose" && echo "$as_me:16432: result: ... -$cf_opt" >&5
+ echo "${ECHO_T}... -$cf_opt" >&6
+ case "$cf_opt" in
+ (Winline)
+@@ -16433,7 +16437,7 @@
+ ([34].*)
+ test -n "$verbose" && echo " feature is broken in gcc $GCC_VERSION" 1>&6
+
+-echo "${as_me:-configure}:16436: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
++echo "${as_me:-configure}:16440: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
+
+ continue;;
+ esac
+@@ -16443,7 +16447,7 @@
+ ([12].*)
+ test -n "$verbose" && echo " feature is broken in gcc $GCC_VERSION" 1>&6
+
+-echo "${as_me:-configure}:16446: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
++echo "${as_me:-configure}:16450: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
+
+ continue;;
+ esac
+@@ -16476,10 +16480,10 @@
+ EOF
+ if test "$GCC" = yes
+ then
+- { echo "$as_me:16479: checking for $CC __attribute__ directives..." >&5
++ { echo "$as_me:16483: checking for $CC __attribute__ directives..." >&5
+ echo "$as_me: checking for $CC __attribute__ directives..." >&6;}
+ cat > "conftest.$ac_ext" <<EOF
+-#line 16482 "${as_me:-configure}"
++#line 16486 "${as_me:-configure}"
+ #include <stdio.h>
+ #include "confdefs.h"
+ #include "conftest.h"
+@@ -16529,12 +16533,12 @@
+ ;;
+ esac
+
+- if { (eval echo "$as_me:16532: \"$ac_compile\"") >&5
++ if { (eval echo "$as_me:16536: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:16535: \$? = $ac_status" >&5
++ echo "$as_me:16539: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; then
+- test -n "$verbose" && echo "$as_me:16537: result: ... $cf_attribute" >&5
++ test -n "$verbose" && echo "$as_me:16541: result: ... $cf_attribute" >&5
+ echo "${ECHO_T}... $cf_attribute" >&6
+ cat conftest.h >>confdefs.h
+ case "$cf_attribute" in
+@@ -16602,7 +16606,7 @@
+ fi
+
+ ### use option --enable-assertions to turn on generation of assertion code
+-echo "$as_me:16605: checking if you want to enable runtime assertions" >&5
++echo "$as_me:16609: 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.
+@@ -16612,7 +16616,7 @@
+ else
+ with_assertions=no
+ fi;
+-echo "$as_me:16615: result: $with_assertions" >&5
++echo "$as_me:16619: result: $with_assertions" >&5
+ echo "${ECHO_T}$with_assertions" >&6
+ if test -n "$GCC"
+ then
+@@ -16665,7 +16669,7 @@
+ ;;
+ esac
+
+-echo "$as_me:16668: checking whether to add trace feature to all models" >&5
++echo "$as_me:16672: 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.
+@@ -16675,7 +16679,7 @@
+ else
+ cf_with_trace=$cf_all_traces
+ fi;
+-echo "$as_me:16678: result: $cf_with_trace" >&5
++echo "$as_me:16682: result: $cf_with_trace" >&5
+ echo "${ECHO_T}$cf_with_trace" >&6
+
+ if test "$cf_with_trace" = yes ; then
+@@ -16689,7 +16693,7 @@
+ ADA_TRACE=FALSE
+ fi
+
+-echo "$as_me:16692: checking if we want to use GNAT projects" >&5
++echo "$as_me:16696: 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.
+@@ -16706,21 +16710,21 @@
+ enable_gnat_projects=yes
+
+ fi;
+-echo "$as_me:16709: result: $enable_gnat_projects" >&5
++echo "$as_me:16713: 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:16716: checking if ssp library is needed" >&5
++echo "$as_me:16720: 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 16723 "configure"
++#line 16727 "configure"
+ #include "confdefs.h"
+
+ #include <sys/types.h>
+@@ -16737,16 +16741,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:16740: \"$ac_link\"") >&5
++if { (eval echo "$as_me:16744: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:16743: \$? = $ac_status" >&5
++ echo "$as_me:16747: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:16746: \"$ac_try\"") >&5
++ { (eval echo "$as_me:16750: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:16749: \$? = $ac_status" >&5
++ echo "$as_me:16753: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_need_libssp=no
+ else
+@@ -16756,7 +16760,7 @@
+ cf_save_LIBS="$LIBS"
+ LIBS="$LIBS -lssp"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 16759 "configure"
++#line 16763 "configure"
+ #include "confdefs.h"
+
+ #include <sys/types.h>
+@@ -16773,16 +16777,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:16776: \"$ac_link\"") >&5
++if { (eval echo "$as_me:16780: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:16779: \$? = $ac_status" >&5
++ echo "$as_me:16783: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:16782: \"$ac_try\"") >&5
++ { (eval echo "$as_me:16786: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:16785: \$? = $ac_status" >&5
++ echo "$as_me:16789: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_need_libssp=yes
+ else
+@@ -16796,7 +16800,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:16799: result: $cf_cv_need_libssp" >&5
++echo "$as_me:16803: result: $cf_cv_need_libssp" >&5
+ echo "${ECHO_T}$cf_cv_need_libssp" >&6
+
+ if test "x$cf_cv_need_libssp" = xyes
+@@ -16824,13 +16828,13 @@
+ (*)
+
+ cf_save_libs="$LIBS"
+-echo "$as_me:16827: checking for clock_gettime" >&5
++echo "$as_me:16831: 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 16833 "configure"
++#line 16837 "configure"
+ #include "confdefs.h"
+ #define clock_gettime autoconf_temporary
+ #include <limits.h> /* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -16861,16 +16865,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:16864: \"$ac_link\"") >&5
++if { (eval echo "$as_me:16868: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:16867: \$? = $ac_status" >&5
++ echo "$as_me:16871: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:16870: \"$ac_try\"") >&5
++ { (eval echo "$as_me:16874: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:16873: \$? = $ac_status" >&5
++ echo "$as_me:16877: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_func_clock_gettime=yes
+ else
+@@ -16880,12 +16884,12 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:16883: result: $ac_cv_func_clock_gettime" >&5
++echo "$as_me:16887: 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:16888: checking for clock_gettime in -lrt" >&5
++ echo "$as_me:16892: 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
+@@ -16893,7 +16897,7 @@
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lrt $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 16896 "configure"
++#line 16900 "configure"
+ #include "confdefs.h"
+
+ /* Override any gcc2 internal prototype to avoid an error. */
+@@ -16912,16 +16916,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:16915: \"$ac_link\"") >&5
++if { (eval echo "$as_me:16919: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:16918: \$? = $ac_status" >&5
++ echo "$as_me:16922: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:16921: \"$ac_try\"") >&5
++ { (eval echo "$as_me:16925: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:16924: \$? = $ac_status" >&5
++ echo "$as_me:16928: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_lib_rt_clock_gettime=yes
+ else
+@@ -16932,7 +16936,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:16935: result: $ac_cv_lib_rt_clock_gettime" >&5
++echo "$as_me:16939: 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"
+@@ -16944,14 +16948,14 @@
+ fi
+
+ if test "$cf_cv_test_clock_gettime" = yes ; then
+-echo "$as_me:16947: checking if clock_gettime links" >&5
++echo "$as_me:16951: 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 16954 "configure"
++#line 16958 "configure"
+ #include "confdefs.h"
+
+ $ac_includes_default
+@@ -16969,16 +16973,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:16972: \"$ac_link\"") >&5
++if { (eval echo "$as_me:16976: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:16975: \$? = $ac_status" >&5
++ echo "$as_me:16979: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:16978: \"$ac_try\"") >&5
++ { (eval echo "$as_me:16982: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:16981: \$? = $ac_status" >&5
++ echo "$as_me:16985: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_func_clock_gettime=yes
+ else
+@@ -16989,7 +16993,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+
+ fi
+-echo "$as_me:16992: result: $cf_cv_func_clock_gettime" >&5
++echo "$as_me:16996: result: $cf_cv_func_clock_gettime" >&5
+ echo "${ECHO_T}$cf_cv_func_clock_gettime" >&6
+ else
+ cf_cv_func_clock_gettime=no
+@@ -17003,13 +17007,13 @@
+ EOF
+
+ else
+-echo "$as_me:17006: checking for gettimeofday" >&5
++echo "$as_me:17010: 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 17012 "configure"
++#line 17016 "configure"
+ #include "confdefs.h"
+ #define gettimeofday autoconf_temporary
+ #include <limits.h> /* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -17040,16 +17044,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:17043: \"$ac_link\"") >&5
++if { (eval echo "$as_me:17047: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:17046: \$? = $ac_status" >&5
++ echo "$as_me:17050: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:17049: \"$ac_try\"") >&5
++ { (eval echo "$as_me:17053: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:17052: \$? = $ac_status" >&5
++ echo "$as_me:17056: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_func_gettimeofday=yes
+ else
+@@ -17059,7 +17063,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:17062: result: $ac_cv_func_gettimeofday" >&5
++echo "$as_me:17066: result: $ac_cv_func_gettimeofday" >&5
+ echo "${ECHO_T}$ac_cv_func_gettimeofday" >&6
+ if test "$ac_cv_func_gettimeofday" = yes; then
+
+@@ -17069,7 +17073,7 @@
+
+ else
+
+-echo "$as_me:17072: checking for gettimeofday in -lbsd" >&5
++echo "$as_me:17076: 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
+@@ -17077,7 +17081,7 @@
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lbsd $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 17080 "configure"
++#line 17084 "configure"
+ #include "confdefs.h"
+
+ /* Override any gcc2 internal prototype to avoid an error. */
+@@ -17096,16 +17100,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:17099: \"$ac_link\"") >&5
++if { (eval echo "$as_me:17103: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:17102: \$? = $ac_status" >&5
++ echo "$as_me:17106: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:17105: \"$ac_try\"") >&5
++ { (eval echo "$as_me:17109: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:17108: \$? = $ac_status" >&5
++ echo "$as_me:17112: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_lib_bsd_gettimeofday=yes
+ else
+@@ -17116,7 +17120,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:17119: result: $ac_cv_lib_bsd_gettimeofday" >&5
++echo "$as_me:17123: 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
+
+@@ -17149,13 +17153,13 @@
+ esac
+
+ ### Checks for header files.
+-echo "$as_me:17152: checking for signed char" >&5
++echo "$as_me:17156: 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 17158 "configure"
++#line 17162 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -17170,16 +17174,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:17173: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:17177: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:17176: \$? = $ac_status" >&5
++ echo "$as_me:17180: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:17179: \"$ac_try\"") >&5
++ { (eval echo "$as_me:17183: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:17182: \$? = $ac_status" >&5
++ echo "$as_me:17186: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_type_signed_char=yes
+ else
+@@ -17189,10 +17193,10 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:17192: result: $ac_cv_type_signed_char" >&5
++echo "$as_me:17196: result: $ac_cv_type_signed_char" >&5
+ echo "${ECHO_T}$ac_cv_type_signed_char" >&6
+
+-echo "$as_me:17195: checking size of signed char" >&5
++echo "$as_me:17199: 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
+@@ -17201,7 +17205,7 @@
+ if test "$cross_compiling" = yes; then
+ # Depending upon the size, compute the lo and hi bounds.
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 17204 "configure"
++#line 17208 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -17213,21 +17217,21 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:17216: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:17220: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:17219: \$? = $ac_status" >&5
++ echo "$as_me:17223: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:17222: \"$ac_try\"") >&5
++ { (eval echo "$as_me:17226: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:17225: \$? = $ac_status" >&5
++ echo "$as_me:17229: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_lo=0 ac_mid=0
+ while :; do
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 17230 "configure"
++#line 17234 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -17239,16 +17243,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:17242: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:17246: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:17245: \$? = $ac_status" >&5
++ echo "$as_me:17249: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:17248: \"$ac_try\"") >&5
++ { (eval echo "$as_me:17252: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:17251: \$? = $ac_status" >&5
++ echo "$as_me:17255: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_hi=$ac_mid; break
+ else
+@@ -17264,7 +17268,7 @@
+ ac_hi=-1 ac_mid=-1
+ while :; do
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 17267 "configure"
++#line 17271 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -17276,16 +17280,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:17279: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:17283: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:17282: \$? = $ac_status" >&5
++ echo "$as_me:17286: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:17285: \"$ac_try\"") >&5
++ { (eval echo "$as_me:17289: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:17288: \$? = $ac_status" >&5
++ echo "$as_me:17292: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_lo=$ac_mid; break
+ else
+@@ -17301,7 +17305,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 17304 "configure"
++#line 17308 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -17313,16 +17317,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:17316: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:17320: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:17319: \$? = $ac_status" >&5
++ echo "$as_me:17323: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:17322: \"$ac_try\"") >&5
++ { (eval echo "$as_me:17326: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:17325: \$? = $ac_status" >&5
++ echo "$as_me:17329: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_hi=$ac_mid
+ else
+@@ -17335,12 +17339,12 @@
+ ac_cv_sizeof_signed_char=$ac_lo
+ else
+ if test "$cross_compiling" = yes; then
+- { { echo "$as_me:17338: error: cannot run test program while cross compiling" >&5
++ { { echo "$as_me:17342: 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 17343 "configure"
++#line 17347 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -17356,15 +17360,15 @@
+ }
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:17359: \"$ac_link\"") >&5
++if { (eval echo "$as_me:17363: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:17362: \$? = $ac_status" >&5
++ echo "$as_me:17366: \$? = $ac_status" >&5
+ (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+- { (eval echo "$as_me:17364: \"$ac_try\"") >&5
++ { (eval echo "$as_me:17368: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:17367: \$? = $ac_status" >&5
++ echo "$as_me:17371: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_sizeof_signed_char=`cat conftest.val`
+ else
+@@ -17380,7 +17384,7 @@
+ ac_cv_sizeof_signed_char=0
+ fi
+ fi
+-echo "$as_me:17383: result: $ac_cv_sizeof_signed_char" >&5
++echo "$as_me:17387: 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
+@@ -17389,13 +17393,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:17392: checking for $ac_hdr that defines DIR" >&5
++echo "$as_me:17396: 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 17398 "configure"
++#line 17402 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ #include <$ac_hdr>
+@@ -17410,16 +17414,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:17413: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:17417: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:17416: \$? = $ac_status" >&5
++ echo "$as_me:17420: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:17419: \"$ac_try\"") >&5
++ { (eval echo "$as_me:17423: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:17422: \$? = $ac_status" >&5
++ echo "$as_me:17426: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ eval "$as_ac_Header=yes"
+ else
+@@ -17429,7 +17433,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:17432: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
++echo "$as_me:17436: 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
+@@ -17442,7 +17446,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:17445: checking for opendir in -ldir" >&5
++ echo "$as_me:17449: 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
+@@ -17450,7 +17454,7 @@
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-ldir $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 17453 "configure"
++#line 17457 "configure"
+ #include "confdefs.h"
+
+ /* Override any gcc2 internal prototype to avoid an error. */
+@@ -17469,16 +17473,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:17472: \"$ac_link\"") >&5
++if { (eval echo "$as_me:17476: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:17475: \$? = $ac_status" >&5
++ echo "$as_me:17479: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:17478: \"$ac_try\"") >&5
++ { (eval echo "$as_me:17482: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:17481: \$? = $ac_status" >&5
++ echo "$as_me:17485: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_lib_dir_opendir=yes
+ else
+@@ -17489,14 +17493,14 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:17492: result: $ac_cv_lib_dir_opendir" >&5
++echo "$as_me:17496: 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:17499: checking for opendir in -lx" >&5
++ echo "$as_me:17503: 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
+@@ -17504,7 +17508,7 @@
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lx $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 17507 "configure"
++#line 17511 "configure"
+ #include "confdefs.h"
+
+ /* Override any gcc2 internal prototype to avoid an error. */
+@@ -17523,16 +17527,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:17526: \"$ac_link\"") >&5
++if { (eval echo "$as_me:17530: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:17529: \$? = $ac_status" >&5
++ echo "$as_me:17533: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:17532: \"$ac_try\"") >&5
++ { (eval echo "$as_me:17536: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:17535: \$? = $ac_status" >&5
++ echo "$as_me:17539: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_lib_x_opendir=yes
+ else
+@@ -17543,7 +17547,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:17546: result: $ac_cv_lib_x_opendir" >&5
++echo "$as_me:17550: 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"
+@@ -17551,13 +17555,13 @@
+
+ fi
+
+-echo "$as_me:17554: checking whether time.h and sys/time.h may both be included" >&5
++echo "$as_me:17558: 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 17560 "configure"
++#line 17564 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ #include <sys/time.h>
+@@ -17573,16 +17577,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:17576: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:17580: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:17579: \$? = $ac_status" >&5
++ echo "$as_me:17583: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:17582: \"$ac_try\"") >&5
++ { (eval echo "$as_me:17586: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:17585: \$? = $ac_status" >&5
++ echo "$as_me:17589: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_header_time=yes
+ else
+@@ -17592,7 +17596,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:17595: result: $ac_cv_header_time" >&5
++echo "$as_me:17599: result: $ac_cv_header_time" >&5
+ echo "${ECHO_T}$ac_cv_header_time" >&6
+ if test $ac_cv_header_time = yes; then
+
+@@ -17610,13 +17614,13 @@
+ ac_compiler_gnu=$ac_cv_c_compiler_gnu
+ ac_main_return="return"
+
+-echo "$as_me:17613: checking for an ANSI C-conforming const" >&5
++echo "$as_me:17617: 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 17619 "configure"
++#line 17623 "configure"
+ #include "confdefs.h"
+
+ int
+@@ -17678,16 +17682,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:17681: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:17685: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:17684: \$? = $ac_status" >&5
++ echo "$as_me:17688: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:17687: \"$ac_try\"") >&5
++ { (eval echo "$as_me:17691: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:17690: \$? = $ac_status" >&5
++ echo "$as_me:17694: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_c_const=yes
+ else
+@@ -17697,7 +17701,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:17700: result: $ac_cv_c_const" >&5
++echo "$as_me:17704: result: $ac_cv_c_const" >&5
+ echo "${ECHO_T}$ac_cv_c_const" >&6
+ if test $ac_cv_c_const = no; then
+
+@@ -17709,7 +17713,7 @@
+
+ ### Checks for external-data
+
+-echo "$as_me:17712: checking if data-only library module links" >&5
++echo "$as_me:17716: 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
+@@ -17717,20 +17721,20 @@
+
+ rm -f conftest.a
+ cat >conftest.$ac_ext <<EOF
+-#line 17720 "configure"
++#line 17724 "configure"
+ int testdata[3] = { 123, 456, 789 };
+ EOF
+- if { (eval echo "$as_me:17723: \"$ac_compile\"") >&5
++ if { (eval echo "$as_me:17727: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:17726: \$? = $ac_status" >&5
++ echo "$as_me:17730: \$? = $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 17733 "configure"
++#line 17737 "configure"
+ extern int testfunc(void);
+ #if defined(NeXT)
+ int testfunc(void)
+@@ -17747,10 +17751,10 @@
+ }
+ #endif
+ EOF
+- if { (eval echo "$as_me:17750: \"$ac_compile\"") >&5
++ if { (eval echo "$as_me:17754: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:17753: \$? = $ac_status" >&5
++ echo "$as_me:17757: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; then
+ mv conftest.o func.o && \
+ ( $AR $ARFLAGS conftest.a func.o ) 2>&5 1>/dev/null
+@@ -17763,7 +17767,7 @@
+ cf_cv_link_dataonly=unknown
+ else
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 17766 "configure"
++#line 17770 "configure"
+ #include "confdefs.h"
+
+ extern int testfunc(void);
+@@ -17774,15 +17778,15 @@
+
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:17777: \"$ac_link\"") >&5
++if { (eval echo "$as_me:17781: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:17780: \$? = $ac_status" >&5
++ echo "$as_me:17784: \$? = $ac_status" >&5
+ (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+- { (eval echo "$as_me:17782: \"$ac_try\"") >&5
++ { (eval echo "$as_me:17786: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:17785: \$? = $ac_status" >&5
++ echo "$as_me:17789: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_link_dataonly=yes
+ else
+@@ -17797,7 +17801,7 @@
+
+ fi
+
+-echo "$as_me:17800: result: $cf_cv_link_dataonly" >&5
++echo "$as_me:17804: result: $cf_cv_link_dataonly" >&5
+ echo "${ECHO_T}$cf_cv_link_dataonly" >&6
+
+ if test "$cf_cv_link_dataonly" = no ; then
+@@ -17816,23 +17820,23 @@
+
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-echo "$as_me:17819: checking for $ac_header" >&5
++echo "$as_me:17823: 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 17825 "configure"
++#line 17829 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:17829: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:17833: \"$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:17835: \$? = $ac_status" >&5
++ echo "$as_me:17839: \$? = $ac_status" >&5
+ (exit "$ac_status"); } >/dev/null; then
+ if test -s conftest.err; then
+ ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -17851,7 +17855,7 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:17854: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
++echo "$as_me:17858: 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
+@@ -17861,7 +17865,7 @@
+ fi
+ done
+
+-echo "$as_me:17864: checking for working mkstemp" >&5
++echo "$as_me:17868: 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
+@@ -17872,7 +17876,7 @@
+ cf_cv_func_mkstemp=maybe
+ else
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 17875 "configure"
++#line 17879 "configure"
+ #include "confdefs.h"
+
+ $ac_includes_default
+@@ -17907,15 +17911,15 @@
+
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:17910: \"$ac_link\"") >&5
++if { (eval echo "$as_me:17914: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:17913: \$? = $ac_status" >&5
++ echo "$as_me:17917: \$? = $ac_status" >&5
+ (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+- { (eval echo "$as_me:17915: \"$ac_try\"") >&5
++ { (eval echo "$as_me:17919: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:17918: \$? = $ac_status" >&5
++ echo "$as_me:17922: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_func_mkstemp=yes
+
+@@ -17930,16 +17934,16 @@
+ fi
+
+ fi
+-echo "$as_me:17933: result: $cf_cv_func_mkstemp" >&5
++echo "$as_me:17937: 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:17936: checking for mkstemp" >&5
++ echo "$as_me:17940: 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 17942 "configure"
++#line 17946 "configure"
+ #include "confdefs.h"
+ #define mkstemp autoconf_temporary
+ #include <limits.h> /* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -17970,16 +17974,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:17973: \"$ac_link\"") >&5
++if { (eval echo "$as_me:17977: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:17976: \$? = $ac_status" >&5
++ echo "$as_me:17980: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:17979: \"$ac_try\"") >&5
++ { (eval echo "$as_me:17983: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:17982: \$? = $ac_status" >&5
++ echo "$as_me:17986: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_func_mkstemp=yes
+ else
+@@ -17989,7 +17993,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:17992: result: $ac_cv_func_mkstemp" >&5
++echo "$as_me:17996: result: $ac_cv_func_mkstemp" >&5
+ echo "${ECHO_T}$ac_cv_func_mkstemp" >&6
+
+ fi
+@@ -18010,7 +18014,7 @@
+ if test "$cf_with_ada" != "no" ; then
+ if test "$cf_cv_prog_gnat_correct" = yes; then
+
+- echo "$as_me:18013: checking optimization options for ADAFLAGS" >&5
++ echo "$as_me:18017: checking optimization options for ADAFLAGS" >&5
+ echo $ECHO_N "checking optimization options for ADAFLAGS... $ECHO_C" >&6
+ case "$CFLAGS" in
+ (*-g*)
+@@ -18027,10 +18031,10 @@
+
+ ;;
+ esac
+- echo "$as_me:18030: result: $ADAFLAGS" >&5
++ echo "$as_me:18034: result: $ADAFLAGS" >&5
+ echo "${ECHO_T}$ADAFLAGS" >&6
+
+-echo "$as_me:18033: checking if GNATPREP supports -T option" >&5
++echo "$as_me:18037: 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
+@@ -18040,11 +18044,11 @@
+ gnatprep -T 2>/dev/null >/dev/null && cf_cv_gnatprep_opt_t=yes
+
+ fi
+-echo "$as_me:18043: result: $cf_cv_gnatprep_opt_t" >&5
++echo "$as_me:18047: 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:18047: checking if GNAT supports generics" >&5
++echo "$as_me:18051: 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])
+@@ -18054,7 +18058,7 @@
+ cf_gnat_generics=no
+ ;;
+ esac
+-echo "$as_me:18057: result: $cf_gnat_generics" >&5
++echo "$as_me:18061: result: $cf_gnat_generics" >&5
+ echo "${ECHO_T}$cf_gnat_generics" >&6
+
+ if test "$cf_gnat_generics" = yes
+@@ -18066,7 +18070,7 @@
+ cf_generic_objects=
+ fi
+
+-echo "$as_me:18069: checking if GNAT supports SIGINT" >&5
++echo "$as_me:18073: 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
+@@ -18114,7 +18118,7 @@
+ rm -rf ./conftest* ./*~conftest*
+
+ fi
+-echo "$as_me:18117: result: $cf_cv_gnat_sigint" >&5
++echo "$as_me:18121: result: $cf_cv_gnat_sigint" >&5
+ echo "${ECHO_T}$cf_cv_gnat_sigint" >&6
+
+ if test "$cf_cv_gnat_sigint" = yes ; then
+@@ -18127,7 +18131,7 @@
+ cf_gnat_projects=no
+
+ if test "$enable_gnat_projects" != no ; then
+-echo "$as_me:18130: checking if GNAT supports project files" >&5
++echo "$as_me:18134: 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]*)
+@@ -18190,15 +18194,15 @@
+ esac
+ ;;
+ esac
+-echo "$as_me:18193: result: $cf_gnat_projects" >&5
++echo "$as_me:18197: 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:18199: checking if GNAT supports libraries" >&5
++ echo "$as_me:18203: checking if GNAT supports libraries" >&5
+ echo $ECHO_N "checking if GNAT supports libraries... $ECHO_C" >&6
+- echo "$as_me:18201: result: $cf_gnat_libraries" >&5
++ echo "$as_me:18205: result: $cf_gnat_libraries" >&5
+ echo "${ECHO_T}$cf_gnat_libraries" >&6
+ fi
+
+@@ -18218,7 +18222,7 @@
+ then
+ USE_GNAT_MAKE_GPR=""
+ else
+- { echo "$as_me:18221: WARNING: use old makefile rules since tools are missing" >&5
++ { echo "$as_me:18225: 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
+@@ -18230,7 +18234,7 @@
+ USE_GNAT_LIBRARIES="#"
+ fi
+
+-echo "$as_me:18233: checking for Ada95 compiler" >&5
++echo "$as_me:18237: 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.
+@@ -18241,12 +18245,12 @@
+ cf_ada_compiler=gnatmake
+ fi;
+
+-echo "$as_me:18244: result: $cf_ada_compiler" >&5
++echo "$as_me:18248: result: $cf_ada_compiler" >&5
+ echo "${ECHO_T}$cf_ada_compiler" >&6
+
+ cf_ada_package=terminal_interface
+
+-echo "$as_me:18249: checking for Ada95 include directory" >&5
++echo "$as_me:18253: 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.
+@@ -18282,7 +18286,7 @@
+ withval=`echo "$withval" | sed -e s%NONE%$cf_path_syntax%`
+ ;;
+ (*)
+- { { echo "$as_me:18285: error: expected a pathname, not \"$withval\"" >&5
++ { { echo "$as_me:18289: error: expected a pathname, not \"$withval\"" >&5
+ echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
+ { (exit 1); exit 1; }; }
+ ;;
+@@ -18291,10 +18295,10 @@
+ fi
+ eval ADA_INCLUDE="$withval"
+
+-echo "$as_me:18294: result: $ADA_INCLUDE" >&5
++echo "$as_me:18298: result: $ADA_INCLUDE" >&5
+ echo "${ECHO_T}$ADA_INCLUDE" >&6
+
+-echo "$as_me:18297: checking for Ada95 object directory" >&5
++echo "$as_me:18301: 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.
+@@ -18330,7 +18334,7 @@
+ withval=`echo "$withval" | sed -e s%NONE%$cf_path_syntax%`
+ ;;
+ (*)
+- { { echo "$as_me:18333: error: expected a pathname, not \"$withval\"" >&5
++ { { echo "$as_me:18337: error: expected a pathname, not \"$withval\"" >&5
+ echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
+ { (exit 1); exit 1; }; }
+ ;;
+@@ -18339,10 +18343,10 @@
+ fi
+ eval ADA_OBJECTS="$withval"
+
+-echo "$as_me:18342: result: $ADA_OBJECTS" >&5
++echo "$as_me:18346: result: $ADA_OBJECTS" >&5
+ echo "${ECHO_T}$ADA_OBJECTS" >&6
+
+-echo "$as_me:18345: checking whether to build an Ada95 shared library" >&5
++echo "$as_me:18349: 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.
+@@ -18363,11 +18367,11 @@
+ fi
+ fi
+
+-echo "$as_me:18366: result: $with_ada_sharedlib" >&5
++echo "$as_me:18370: result: $with_ada_sharedlib" >&5
+ echo "${ECHO_T}$with_ada_sharedlib" >&6
+ if test "x$cf_ada_sharedlib_warn" != xno
+ then
+- { echo "$as_me:18370: WARNING: disabling Ada95 shared library since GNAT projects are not supported" >&5
++ { echo "$as_me:18374: 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
+
+@@ -18385,7 +18389,7 @@
+
+ # allow the Ada binding to be renamed
+
+-echo "$as_me:18388: checking for Ada95 curses library name" >&5
++echo "$as_me:18392: 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.
+@@ -18401,16 +18405,16 @@
+ ;;
+ esac
+
+-echo "$as_me:18404: result: $ADA_LIBNAME" >&5
++echo "$as_me:18408: result: $ADA_LIBNAME" >&5
+ echo "${ECHO_T}$ADA_LIBNAME" >&6
+
+ else
+- { { echo "$as_me:18408: error: No usable Ada compiler found" >&5
++ { { echo "$as_me:18412: 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:18413: error: The Ada compiler is needed for this package" >&5
++ { { echo "$as_me:18417: 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
+@@ -18450,7 +18454,7 @@
+ fi
+
+ ### Build up pieces for makefile rules
+-echo "$as_me:18453: checking default library suffix" >&5
++echo "$as_me:18457: checking default library suffix" >&5
+ echo $ECHO_N "checking default library suffix... $ECHO_C" >&6
+
+ case $DFT_LWR_MODEL in
+@@ -18461,10 +18465,10 @@
+ (shared) DFT_ARG_SUFFIX='' ;;
+ esac
+ test -n "$LIB_SUFFIX" && DFT_ARG_SUFFIX="${LIB_SUFFIX}${DFT_ARG_SUFFIX}"
+-echo "$as_me:18464: result: $DFT_ARG_SUFFIX" >&5
++echo "$as_me:18468: result: $DFT_ARG_SUFFIX" >&5
+ echo "${ECHO_T}$DFT_ARG_SUFFIX" >&6
+
+-echo "$as_me:18467: checking default library-dependency suffix" >&5
++echo "$as_me:18471: checking default library-dependency suffix" >&5
+ echo $ECHO_N "checking default library-dependency suffix... $ECHO_C" >&6
+
+ case X$DFT_LWR_MODEL in
+@@ -18547,10 +18551,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:18550: result: $DFT_DEP_SUFFIX" >&5
++echo "$as_me:18554: result: $DFT_DEP_SUFFIX" >&5
+ echo "${ECHO_T}$DFT_DEP_SUFFIX" >&6
+
+-echo "$as_me:18553: checking default object directory" >&5
++echo "$as_me:18557: checking default object directory" >&5
+ echo $ECHO_N "checking default object directory... $ECHO_C" >&6
+
+ case $DFT_LWR_MODEL in
+@@ -18566,7 +18570,7 @@
+ DFT_OBJ_SUBDIR='obj_s' ;;
+ esac
+ esac
+-echo "$as_me:18569: result: $DFT_OBJ_SUBDIR" >&5
++echo "$as_me:18573: result: $DFT_OBJ_SUBDIR" >&5
+ echo "${ECHO_T}$DFT_OBJ_SUBDIR" >&6
+
+ ### Set up low-level terminfo dependencies for makefiles.
+@@ -18708,7 +18712,7 @@
+ : "${CONFIG_STATUS=./config.status}"
+ ac_clean_files_save=$ac_clean_files
+ ac_clean_files="$ac_clean_files $CONFIG_STATUS"
+-{ echo "$as_me:18711: creating $CONFIG_STATUS" >&5
++{ echo "$as_me:18715: creating $CONFIG_STATUS" >&5
+ echo "$as_me: creating $CONFIG_STATUS" >&6;}
+ cat >"$CONFIG_STATUS" <<_ACEOF
+ #! $SHELL
+@@ -18844,7 +18848,7 @@
+ cat >>"$CONFIG_STATUS" <<EOF
+ ac_cs_version="\\
+ config.status
+-configured by $0, generated by GNU Autoconf 2.52.20231210,
++configured by $0, generated by GNU Autoconf 2.52.20240618,
+ with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
+
+ Copyright 2003-2022,2023 Thomas E. Dickey
+@@ -18889,7 +18893,7 @@
+ echo "$ac_cs_version"; exit 0 ;;
+ --he | --h)
+ # Conflict between --help and --header
+- { { echo "$as_me:18892: error: ambiguous option: $1
++ { { echo "$as_me:18896: 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;}
+@@ -18908,7 +18912,7 @@
+ ac_need_defaults=false;;
+
+ # This is an error.
+- -*) { { echo "$as_me:18911: error: unrecognized option: $1
++ -*) { { echo "$as_me:18915: 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;}
+@@ -18927,7 +18931,7 @@
+ ## Running config.status. ##
+ ## ----------------------- ##
+
+-This file was extended by $as_me 2.52.20231210, executed with
++This file was extended by $as_me 2.52.20240618, executed with
+ CONFIG_FILES = $CONFIG_FILES
+ CONFIG_HEADERS = $CONFIG_HEADERS
+ CONFIG_LINKS = $CONFIG_LINKS
+@@ -18983,7 +18987,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:18986: error: invalid argument: $ac_config_target" >&5
++ *) { { echo "$as_me:18990: error: invalid argument: $ac_config_target" >&5
+ echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
+ { (exit 1); exit 1; }; };;
+ esac
+@@ -19242,14 +19246,14 @@
+ # is no need to browse any of the substitutions).
+ # These are the two extra sed commands mentioned above.
+ (echo ':t
+- /@[a-zA-Z_][a-zA-Z_0-9]*@/!b' && cat "$tmp"/subs.frag) >"$tmp"/subs-$ac_sed_frag.sed
++ /@[a-zA-Z_][a-zA-Z_0-9]*@/!b' && sed -e 's/\\\\*$//g' -e 's/$/\\/' -e 's/;t t\\/;t t/' -e 't' -e '3,'$ac_max_sed_lines's/$/\\/' "$tmp"/subs.frag) >"$tmp"/subs-$ac_sed_frag.sed
+ # It is possible to make a multiline substitution using escaped newlines.
+ # Ensure that we do not split the substitution between script fragments.
+ ac_BEG=$ac_end
+ ac_END=`expr "$ac_end" + "$ac_max_sed_lines"`
+ sed "1,${ac_BEG}d; ${ac_END}p; q" "$tmp"/subs.sed >"$tmp"/subs.next
+ if test -s "$tmp"/subs.next; then
+- grep '^s,@[^@,][^@,]*@,.*\\$' "$tmp"/subs.next >"$tmp"/subs.edit
++ grep '^s,@[^@,][^@,]*@,.*$' "$tmp"/subs.next | grep -v '^s,@.*;t t$' >"$tmp"/subs.edit
+ if test ! -s "$tmp"/subs.edit; then
+ grep "^s,@[^@,][^@,]*@,.*,;t t$" "$tmp"/subs.next >"$tmp"/subs.edit
+ if test ! -s "$tmp"/subs.edit; then
+@@ -19347,7 +19351,7 @@
+ esac
+
+ if test x"$ac_file" != x-; then
+- { echo "$as_me:19350: creating $ac_file" >&5
++ { echo "$as_me:19354: creating $ac_file" >&5
+ echo "$as_me: creating $ac_file" >&6;}
+ rm -f "$ac_file"
+ fi
+@@ -19365,7 +19369,7 @@
+ -) echo "$tmp"/stdin ;;
+ [\\/$]*)
+ # Absolute (can't be DOS-style, as IFS=:)
+- test -f "$f" || { { echo "$as_me:19368: error: cannot find input file: $f" >&5
++ test -f "$f" || { { echo "$as_me:19372: error: cannot find input file: $f" >&5
+ echo "$as_me: error: cannot find input file: $f" >&2;}
+ { (exit 1); exit 1; }; }
+ echo "$f";;
+@@ -19378,7 +19382,7 @@
+ echo "$srcdir/$f"
+ else
+ # /dev/null tree
+- { { echo "$as_me:19381: error: cannot find input file: $f" >&5
++ { { echo "$as_me:19385: error: cannot find input file: $f" >&5
+ echo "$as_me: error: cannot find input file: $f" >&2;}
+ { (exit 1); exit 1; }; }
+ fi;;
+@@ -19394,7 +19398,7 @@
+ if test -n "$ac_seen"; then
+ ac_used=`grep '@datarootdir@' "$ac_item"`
+ if test -z "$ac_used"; then
+- { echo "$as_me:19397: WARNING: datarootdir was used implicitly but not set:
++ { echo "$as_me:19401: 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;}
+@@ -19403,7 +19407,7 @@
+ fi
+ ac_seen=`grep '${datarootdir}' "$ac_item"`
+ if test -n "$ac_seen"; then
+- { echo "$as_me:19406: WARNING: datarootdir was used explicitly but not set:
++ { echo "$as_me:19410: 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;}
+@@ -19448,7 +19452,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:19451: WARNING: Variable $ac_name is used but was not set:
++ { echo "$as_me:19455: 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;}
+@@ -19459,7 +19463,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:19462: WARNING: Some variables may not be substituted:
++ { echo "$as_me:19466: WARNING: Some variables may not be substituted:
+ $ac_seen" >&5
+ echo "$as_me: WARNING: Some variables may not be substituted:
+ $ac_seen" >&2;}
+@@ -19508,7 +19512,7 @@
+ * ) ac_file_in=$ac_file.in ;;
+ esac
+
+- test x"$ac_file" != x- && { echo "$as_me:19511: creating $ac_file" >&5
++ test x"$ac_file" != x- && { echo "$as_me:19515: creating $ac_file" >&5
+ echo "$as_me: creating $ac_file" >&6;}
+
+ # First look for the input files in the build tree, otherwise in the
+@@ -19519,7 +19523,7 @@
+ -) echo "$tmp"/stdin ;;
+ [\\/$]*)
+ # Absolute (can't be DOS-style, as IFS=:)
+- test -f "$f" || { { echo "$as_me:19522: error: cannot find input file: $f" >&5
++ test -f "$f" || { { echo "$as_me:19526: error: cannot find input file: $f" >&5
+ echo "$as_me: error: cannot find input file: $f" >&2;}
+ { (exit 1); exit 1; }; }
+ echo $f;;
+@@ -19532,7 +19536,7 @@
+ echo "$srcdir/$f"
+ else
+ # /dev/null tree
+- { { echo "$as_me:19535: error: cannot find input file: $f" >&5
++ { { echo "$as_me:19539: error: cannot find input file: $f" >&5
+ echo "$as_me: error: cannot find input file: $f" >&2;}
+ { (exit 1); exit 1; }; }
+ fi;;
+@@ -19590,7 +19594,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:19593: $ac_file is unchanged" >&5
++ { echo "$as_me:19597: $ac_file is unchanged" >&5
+ echo "$as_me: $ac_file is unchanged" >&6;}
+ else
+ ac_dir=`$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+Index: NEWS
+Prereq: 1.4145
+--- ncurses-6.5-20240629+/NEWS 2024-06-29 19:31:28.000000000 +0000
++++ ncurses-6.5-20240706/NEWS 2024-07-06 18:21:47.000000000 +0000
+@@ -26,7 +26,7 @@
+ -- sale, use or other dealings in this Software without prior written --
+ -- authorization. --
+ -------------------------------------------------------------------------------
+--- $Id: NEWS,v 1.4145 2024/06/29 19:31:28 tom Exp $
++-- $Id: NEWS,v 1.4147 2024/07/06 18:21:47 tom Exp $
+ -------------------------------------------------------------------------------
+
+ This is a log of changes that ncurses has gone through since Zeyd started
+@@ -46,6 +46,11 @@
+ Changes through 1.9.9e did not credit all contributions;
+ it is not possible to add this information.
+
++20240706
++ + update configure script to use macro changes from dialog.
++ + modify CF_NCURSES_PTHREADS to avoid equating package and library
++ names.
++
+ 20240629
+ + build-fix for ncurses-examples with newer PDCurses, which no longer
+ has stubs for unimplemented features.
+Index: VERSION
+--- ncurses-6.5-20240629+/VERSION 2024-06-29 10:00:32.000000000 +0000
++++ ncurses-6.5-20240706/VERSION 2024-07-06 09:41:29.000000000 +0000
+@@ -1 +1 @@
+-5:0:10 6.5 20240629
++5:0:10 6.5 20240706
+Index: aclocal.m4
+Prereq: 1.1073
+--- ncurses-6.5-20240629+/aclocal.m4 2024-06-22 19:57:54.000000000 +0000
++++ ncurses-6.5-20240706/aclocal.m4 2024-07-06 18:27:53.000000000 +0000
+@@ -29,7 +29,7 @@
+ dnl
+ dnl Author: Thomas E. Dickey 1995-on
+ dnl
+-dnl $Id: aclocal.m4,v 1.1073 2024/06/22 19:57:54 tom Exp $
++dnl $Id: aclocal.m4,v 1.1074 2024/07/06 18:27:53 tom Exp $
+ dnl Macros used in NCURSES auto-configuration script.
+ dnl
+ dnl These macros are maintained separately from NCURSES. The copyright on
+@@ -1411,7 +1411,7 @@
+ fi
+ ])dnl
+ dnl ---------------------------------------------------------------------------
+-dnl CF_CHECK_LIBTOOL_VERSION version: 2 updated: 2021/05/01 16:24:34
++dnl CF_CHECK_LIBTOOL_VERSION version: 3 updated: 2024/06/12 04:19:01
+ dnl ------------------------
+ dnl Show the version of libtool
+ dnl
+@@ -1427,6 +1427,7 @@
+ AC_MSG_CHECKING(version of $LIBTOOL)
+ CF_LIBTOOL_VERSION
+ AC_MSG_RESULT($cf_cv_libtool_version)
++ ifdef([LT_PACKAGE_VERSION],,[
+ if test -n "$cf_cv_libtool_version"
+ then
+ cf_check_libtool_version=`$LIBTOOL --version 2>&1 | sed -e '/^$/d' -e 's,[[()]],...,g' -e 's,[[ ]],-,g' -e '2,$d'`
+@@ -1440,6 +1441,7 @@
+ else
+ AC_MSG_ERROR(No version found for $LIBTOOL)
+ fi
++ ])
+ else
+ AC_MSG_ERROR(GNU libtool has not been found)
+ fi
+@@ -4584,9 +4586,12 @@
+ $1="$cf_library_path_list [$]$1"
+ ])dnl
+ dnl ---------------------------------------------------------------------------
+-dnl CF_LIBTOOL_VERSION version: 1 updated: 2013/04/06 18:03:09
++dnl CF_LIBTOOL_VERSION version: 2 updated: 2024/06/12 04:19:01
+ dnl ------------------
+ AC_DEFUN([CF_LIBTOOL_VERSION],[
++ifdef([LT_PACKAGE_VERSION],[
++ cf_cv_libtool_version=LT_PACKAGE_VERSION
++],[
+ if test -n "$LIBTOOL" && test "$LIBTOOL" != none
+ then
+ cf_cv_libtool_version=`$LIBTOOL --version 2>&1 | sed -e '/^$/d' |sed -e '2,$d' -e 's/([[^)]]*)//g' -e 's/^[[^1-9]]*//' -e 's/[[^0-9.]].*//'`
+@@ -4595,6 +4600,7 @@
+ fi
+ test -z "$cf_cv_libtool_version" && unset cf_cv_libtool_version
+ ])dnl
++])dnl
+ dnl ---------------------------------------------------------------------------
+ dnl CF_LIB_PREFIX version: 14 updated: 2021/01/01 13:31:04
+ dnl -------------
+@@ -8804,7 +8810,7 @@
+ CF_MSG_LOG([$1])
+ ])dnl
+ dnl ---------------------------------------------------------------------------
+-dnl CF_VERSION_INFO version: 8 updated: 2021/01/01 13:31:04
++dnl CF_VERSION_INFO version: 9 updated: 2024/06/12 04:04:13
+ dnl ---------------
+ dnl Define several useful symbols derived from the VERSION file. A separate
+ dnl file is preferred to embedding the version numbers in various scripts.
+@@ -8882,13 +8888,13 @@
+ dnl if a package name is given, define its corresponding version info. We
+ dnl need the package name to ensure that the defined symbols are unique.
+ ifelse($1,,,[
+- cf_PACKAGE=$1
+ PACKAGE=ifelse($2,,$1,$2)
+ AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE",[Define to the package-name])
+ AC_SUBST(PACKAGE)
+- CF_UPPER(cf_PACKAGE,$cf_PACKAGE)
+- AC_DEFINE_UNQUOTED(${cf_PACKAGE}_VERSION,"${VERSION_MAJOR}.${VERSION_MINOR}")
+- AC_DEFINE_UNQUOTED(${cf_PACKAGE}_PATCHDATE,${VERSION_PATCH})
++ AH_TEMPLATE([AS_TR_CPP($1[_VERSION])],[version of package])
++ AC_DEFINE_UNQUOTED(AS_TR_CPP($1[_VERSION]),"${VERSION_MAJOR}.${VERSION_MINOR}")
++ AH_TEMPLATE([AS_TR_CPP($1[_PATCHDATE])],[patchdate of package])
++ AC_DEFINE_UNQUOTED(AS_TR_CPP($1[_PATCHDATE]),${VERSION_PATCH})
+ ])
+ ])dnl
+ dnl ---------------------------------------------------------------------------
+Index: configure
+--- ncurses-6.5-20240629+/configure 2024-06-22 16:31:27.000000000 +0000
++++ ncurses-6.5-20240706/configure 2024-07-06 18:28:05.000000000 +0000
+@@ -1,7 +1,7 @@
+ #! /bin/sh
+ # From configure.in Revision: 1.782 .
+ # Guess values for system-dependent variables and create Makefiles.
+-# Generated by Autoconf 2.52.20231210.
++# Generated by Autoconf 2.52.20240618.
+ #
+ # Copyright 2003-2022,2023 Thomas E. Dickey
+ # Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001
+@@ -481,6 +481,10 @@
+ | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
+ x_libraries=$ac_optarg ;;
+
++ -*dir | -dvi* | -doc* | -html* | -local* | -pdf* | -ps* )
++ echo "$as_me: WARNING: unsupported option: $ac_option" >&2
++ ;;
++
+ -*) { echo "$as_me: error: unrecognized option: $ac_option
+ Try \`$0 --help' for more information." >&2
+ { (exit 1); exit 1; }; }
+@@ -949,7 +953,7 @@
+ running configure, to aid debugging if configure makes a mistake.
+
+ It was created by $as_me, which was
+-generated by GNU Autoconf 2.52.20231210. Invocation command line was
++generated by GNU Autoconf 2.52.20240618. Invocation command line was
+
+ $ $0 $@
+
+@@ -1073,7 +1077,7 @@
+ fi
+ for ac_site_file in $CONFIG_SITE; do
+ if test -r "$ac_site_file"; then
+- { echo "$as_me:1076: loading site script $ac_site_file" >&5
++ { echo "$as_me:1080: 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"
+@@ -1084,7 +1088,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:1087: loading cache $cache_file" >&5
++ { echo "$as_me:1091: loading cache $cache_file" >&5
+ echo "$as_me: loading cache $cache_file" >&6;}
+ case $cache_file in
+ [\\/]* | ?:[\\/]* ) . $cache_file;;
+@@ -1092,7 +1096,7 @@
+ esac
+ fi
+ else
+- { echo "$as_me:1095: creating cache $cache_file" >&5
++ { echo "$as_me:1099: creating cache $cache_file" >&5
+ echo "$as_me: creating cache $cache_file" >&6;}
+ >$cache_file
+ fi
+@@ -1108,21 +1112,21 @@
+ eval ac_new_val="\$ac_env_${ac_var}_value"
+ case "$ac_old_set,$ac_new_set" in
+ set,)
+- { echo "$as_me:1111: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
++ { echo "$as_me:1115: 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:1115: error: \`$ac_var' was not set in the previous run" >&5
++ { echo "$as_me:1119: 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:1121: error: \`$ac_var' has changed since the previous run:" >&5
++ { echo "$as_me:1125: 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:1123: former value: $ac_old_val" >&5
++ { echo "$as_me:1127: former value: $ac_old_val" >&5
+ echo "$as_me: former value: $ac_old_val" >&2;}
+- { echo "$as_me:1125: current value: $ac_new_val" >&5
++ { echo "$as_me:1129: current value: $ac_new_val" >&5
+ echo "$as_me: current value: $ac_new_val" >&2;}
+ ac_cache_corrupted=:
+ fi;;
+@@ -1141,9 +1145,9 @@
+ fi
+ done
+ if "$ac_cache_corrupted"; then
+- { echo "$as_me:1144: error: changes in the environment can compromise the build" >&5
++ { echo "$as_me:1148: 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:1146: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5
++ { { echo "$as_me:1150: 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
+@@ -1172,10 +1176,10 @@
+ echo "#! $SHELL" >conftest.sh
+ echo "exit 0" >>conftest.sh
+ chmod +x conftest.sh
+-if { (echo "$as_me:1175: PATH=\".;.\"; conftest.sh") >&5
++if { (echo "$as_me:1179: PATH=\".;.\"; conftest.sh") >&5
+ (PATH=".;."; conftest.sh) 2>&5
+ ac_status=$?
+- echo "$as_me:1178: \$? = $ac_status" >&5
++ echo "$as_me:1182: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; then
+ ac_path_separator=';'
+ else
+@@ -1192,7 +1196,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:1195: checking for $ac_word" >&5
++echo "$as_me:1199: 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
+@@ -1207,7 +1211,7 @@
+ test -z "$ac_dir" && ac_dir=.
+ $as_executable_p "$ac_dir/$ac_word" || continue
+ ac_cv_prog_GREP="$ac_prog"
+-echo "$as_me:1210: found $ac_dir/$ac_word" >&5
++echo "$as_me:1214: found $ac_dir/$ac_word" >&5
+ break
+ done
+
+@@ -1215,10 +1219,10 @@
+ fi
+ GREP=$ac_cv_prog_GREP
+ if test -n "$GREP"; then
+- echo "$as_me:1218: result: $GREP" >&5
++ echo "$as_me:1222: result: $GREP" >&5
+ echo "${ECHO_T}$GREP" >&6
+ else
+- echo "$as_me:1221: result: no" >&5
++ echo "$as_me:1225: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+
+@@ -1226,7 +1230,7 @@
+ done
+ test -n "$GREP" || GREP=": "
+
+-echo "$as_me:1229: checking for egrep" >&5
++echo "$as_me:1233: 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
+@@ -1238,7 +1242,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:1241: checking for $ac_word" >&5
++echo "$as_me:1245: 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
+@@ -1255,7 +1259,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:1258: found $ac_dir/$ac_word" >&5
++ echo "$as_me:1262: found $ac_dir/$ac_word" >&5
+ break
+ fi
+ done
+@@ -1266,10 +1270,10 @@
+ EGREP=$ac_cv_path_EGREP
+
+ if test -n "$EGREP"; then
+- echo "$as_me:1269: result: $EGREP" >&5
++ echo "$as_me:1273: result: $EGREP" >&5
+ echo "${ECHO_T}$EGREP" >&6
+ else
+- echo "$as_me:1272: result: no" >&5
++ echo "$as_me:1276: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+
+@@ -1277,12 +1281,12 @@
+ done
+ test -n "$EGREP" || EGREP=": "
+
+- test "x$ac_cv_path_EGREP" = "x:" && { { echo "$as_me:1280: error: cannot find workable egrep" >&5
++ test "x$ac_cv_path_EGREP" = "x:" && { { echo "$as_me:1284: error: cannot find workable egrep" >&5
+ echo "$as_me: error: cannot find workable egrep" >&2;}
+ { (exit 1); exit 1; }; }
+ fi
+ fi
+-echo "$as_me:1285: result: $ac_cv_path_EGREP" >&5
++echo "$as_me:1289: result: $ac_cv_path_EGREP" >&5
+ echo "${ECHO_T}$ac_cv_path_EGREP" >&6
+ EGREP="$ac_cv_path_EGREP"
+
+@@ -1293,11 +1297,11 @@
+ cf_cv_abi_default=${NCURSES_MAJOR}
+ cf_cv_rel_version=${NCURSES_MAJOR}.${NCURSES_MINOR}
+ cf_cv_timestamp=`date`
+-echo "$as_me:1296: result: Configuring NCURSES $cf_cv_rel_version ABI $cf_cv_abi_default ($cf_cv_timestamp)" >&5
++echo "$as_me:1300: 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:1300: checking for package version" >&5
++ echo "$as_me:1304: 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...
+@@ -1309,39 +1313,39 @@
+ VERSION="$cf_field1"
+
+ VERSION_MAJOR=`echo "$cf_field2" | sed -e 's/\..*//'`
+- test -z "$VERSION_MAJOR" && { { echo "$as_me:1312: error: missing major-version" >&5
++ test -z "$VERSION_MAJOR" && { { echo "$as_me:1316: 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:1317: error: missing minor-version" >&5
++ test -z "$VERSION_MINOR" && { { echo "$as_me:1321: error: missing minor-version" >&5
+ echo "$as_me: error: missing minor-version" >&2;}
+ { (exit 1); exit 1; }; }
+
+- echo "$as_me:1321: result: ${VERSION_MAJOR}.${VERSION_MINOR}" >&5
++ echo "$as_me:1325: result: ${VERSION_MAJOR}.${VERSION_MINOR}" >&5
+ echo "${ECHO_T}${VERSION_MAJOR}.${VERSION_MINOR}" >&6
+
+- echo "$as_me:1324: checking for package patch date" >&5
++ echo "$as_me:1328: 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:1329: error: missing patch-date $VERSION_PATCH" >&5
++ { { echo "$as_me:1333: 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:1336: error: illegal patch-date $VERSION_PATCH" >&5
++ { { echo "$as_me:1340: 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:1341: result: $VERSION_PATCH" >&5
++ echo "$as_me:1345: result: $VERSION_PATCH" >&5
+ echo "${ECHO_T}$VERSION_PATCH" >&6
+ else
+- { { echo "$as_me:1344: error: did not find $srcdir/VERSION" >&5
++ { { echo "$as_me:1348: error: did not find $srcdir/VERSION" >&5
+ echo "$as_me: error: did not find $srcdir/VERSION" >&2;}
+ { (exit 1); exit 1; }; }
+ fi
+@@ -1349,35 +1353,32 @@
+ # show the actual data that we have for versions:
+ test -n "$verbose" && echo " ABI VERSION $VERSION" 1>&6
+
+-echo "${as_me:-configure}:1352: testing ABI VERSION $VERSION ..." 1>&5
++echo "${as_me:-configure}:1356: testing ABI VERSION $VERSION ..." 1>&5
+
+ test -n "$verbose" && echo " VERSION_MAJOR $VERSION_MAJOR" 1>&6
+
+-echo "${as_me:-configure}:1356: testing VERSION_MAJOR $VERSION_MAJOR ..." 1>&5
++echo "${as_me:-configure}:1360: testing VERSION_MAJOR $VERSION_MAJOR ..." 1>&5
+
+ test -n "$verbose" && echo " VERSION_MINOR $VERSION_MINOR" 1>&6
+
+-echo "${as_me:-configure}:1360: testing VERSION_MINOR $VERSION_MINOR ..." 1>&5
++echo "${as_me:-configure}:1364: testing VERSION_MINOR $VERSION_MINOR ..." 1>&5
+
+ test -n "$verbose" && echo " VERSION_PATCH $VERSION_PATCH" 1>&6
+
+-echo "${as_me:-configure}:1364: testing VERSION_PATCH $VERSION_PATCH ..." 1>&5
++echo "${as_me:-configure}:1368: testing VERSION_PATCH $VERSION_PATCH ..." 1>&5
+
+- cf_PACKAGE=NCURSES
+ PACKAGE=ncurses
+
+ cat >>confdefs.h <<EOF
+ #define PACKAGE "$PACKAGE"
+ EOF
+
+-cf_PACKAGE=`echo "$cf_PACKAGE" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%`
+-
+ cat >>confdefs.h <<EOF
+-#define ${cf_PACKAGE}_VERSION "${VERSION_MAJOR}.${VERSION_MINOR}"
++#define NCURSES_VERSION "${VERSION_MAJOR}.${VERSION_MINOR}"
+ EOF
+
+ cat >>confdefs.h <<EOF
+-#define ${cf_PACKAGE}_PATCHDATE ${VERSION_PATCH}
++#define NCURSES_PATCHDATE ${VERSION_PATCH}
+ EOF
+
+ test -z "$cf_cv_rel_version" && cf_cv_rel_version=0.0
+@@ -1385,7 +1386,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:1388: WARNING: overriding release version $cf_cv_rel_version to $withval" >&5
++ { echo "$as_me:1389: 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;
+@@ -1399,13 +1400,13 @@
+ (0)
+ ;;
+ (*)
+- { { echo "$as_me:1402: error: Release major-version is not a number: $NCURSES_MAJOR" >&5
++ { { echo "$as_me:1403: 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:1408: error: Release major-version value is empty" >&5
++ { { echo "$as_me:1409: error: Release major-version value is empty" >&5
+ echo "$as_me: error: Release major-version value is empty" >&2;}
+ { (exit 1); exit 1; }; }
+ fi
+@@ -1415,13 +1416,13 @@
+ (0)
+ ;;
+ (*)
+- { { echo "$as_me:1418: error: Release minor-version is not a number: $NCURSES_MINOR" >&5
++ { { echo "$as_me:1419: 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:1424: error: Release minor-version value is empty" >&5
++ { { echo "$as_me:1425: error: Release minor-version value is empty" >&5
+ echo "$as_me: error: Release minor-version value is empty" >&2;}
+ { (exit 1); exit 1; }; }
+ fi
+@@ -1434,7 +1435,7 @@
+
+ if test "x$cf_cv_abi_version" != "x$withval"
+ then
+- { echo "$as_me:1437: WARNING: overriding ABI version $cf_cv_abi_version to $withval" >&5
++ { echo "$as_me:1438: 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.*)
+@@ -1453,13 +1454,13 @@
+ (0)
+ ;;
+ (*)
+- { { echo "$as_me:1456: error: ABI version is not a number: $cf_cv_abi_version" >&5
++ { { echo "$as_me:1457: 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:1462: error: ABI version value is empty" >&5
++ { { echo "$as_me:1463: error: ABI version value is empty" >&5
+ echo "$as_me: error: ABI version value is empty" >&2;}
+ { (exit 1); exit 1; }; }
+ fi
+@@ -1492,7 +1493,7 @@
+ fi
+ done
+ if test -z "$ac_aux_dir"; then
+- { { echo "$as_me:1495: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&5
++ { { echo "$as_me:1496: 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
+@@ -1502,11 +1503,11 @@
+
+ # Make sure we can run config.sub.
+ $ac_config_sub sun4 >/dev/null 2>&1 ||
+- { { echo "$as_me:1505: error: cannot run $ac_config_sub" >&5
++ { { echo "$as_me:1506: error: cannot run $ac_config_sub" >&5
+ echo "$as_me: error: cannot run $ac_config_sub" >&2;}
+ { (exit 1); exit 1; }; }
+
+-echo "$as_me:1509: checking build system type" >&5
++echo "$as_me:1510: 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
+@@ -1515,23 +1516,23 @@
+ test -z "$ac_cv_build_alias" &&
+ ac_cv_build_alias=`$ac_config_guess`
+ test -z "$ac_cv_build_alias" &&
+- { { echo "$as_me:1518: error: cannot guess build type; you must specify one" >&5
++ { { echo "$as_me:1519: 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:1522: error: $ac_config_sub $ac_cv_build_alias failed." >&5
++ { { echo "$as_me:1523: 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:1527: result: $ac_cv_build" >&5
++echo "$as_me:1528: 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:1534: checking host system type" >&5
++echo "$as_me:1535: 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
+@@ -1540,12 +1541,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:1543: error: $ac_config_sub $ac_cv_host_alias failed" >&5
++ { { echo "$as_me:1544: 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:1548: result: $ac_cv_host" >&5
++echo "$as_me:1549: 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/'`
+@@ -1553,7 +1554,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:1556: checking target system type" >&5
++ echo "$as_me:1557: 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
+@@ -1562,12 +1563,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:1565: error: $ac_config_sub $ac_cv_target_alias failed" >&5
++ { { echo "$as_me:1566: 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:1570: result: $ac_cv_target" >&5
++echo "$as_me:1571: 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/'`
+@@ -1599,13 +1600,13 @@
+ fi
+
+ test -z "$system_name" && system_name="$cf_cv_system_name"
+-test -n "$cf_cv_system_name" && echo "$as_me:1602: result: Configuring for $cf_cv_system_name" >&5
++test -n "$cf_cv_system_name" && echo "$as_me:1603: 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:1606: result: Cached system name ($system_name) does not agree with actual ($cf_cv_system_name)" >&5
++ echo "$as_me:1607: 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:1608: error: \"Please remove config.cache and try again.\"" >&5
++ { { echo "$as_me:1609: 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
+@@ -1613,7 +1614,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:1616: WARNING: overriding system type to $withval" >&5
++ { echo "$as_me:1617: 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
+@@ -1624,7 +1625,7 @@
+ cf_user_CFLAGS="$CFLAGS"
+
+ ### Default install-location
+-echo "$as_me:1627: checking for fgrep" >&5
++echo "$as_me:1628: 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
+@@ -1636,7 +1637,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:1639: checking for $ac_word" >&5
++echo "$as_me:1640: 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
+@@ -1653,7 +1654,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:1656: found $ac_dir/$ac_word" >&5
++ echo "$as_me:1657: found $ac_dir/$ac_word" >&5
+ break
+ fi
+ done
+@@ -1664,10 +1665,10 @@
+ FGREP=$ac_cv_path_FGREP
+
+ if test -n "$FGREP"; then
+- echo "$as_me:1667: result: $FGREP" >&5
++ echo "$as_me:1668: result: $FGREP" >&5
+ echo "${ECHO_T}$FGREP" >&6
+ else
+- echo "$as_me:1670: result: no" >&5
++ echo "$as_me:1671: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+
+@@ -1675,16 +1676,16 @@
+ done
+ test -n "$FGREP" || FGREP=": "
+
+- test "x$ac_cv_path_FGREP" = "x:" && { { echo "$as_me:1678: error: cannot find workable fgrep" >&5
++ test "x$ac_cv_path_FGREP" = "x:" && { { echo "$as_me:1679: error: cannot find workable fgrep" >&5
+ echo "$as_me: error: cannot find workable fgrep" >&2;}
+ { (exit 1); exit 1; }; }
+ fi
+ fi
+-echo "$as_me:1683: result: $ac_cv_path_FGREP" >&5
++echo "$as_me:1684: result: $ac_cv_path_FGREP" >&5
+ echo "${ECHO_T}$ac_cv_path_FGREP" >&6
+ FGREP="$ac_cv_path_FGREP"
+
+-echo "$as_me:1687: checking for prefix" >&5
++echo "$as_me:1688: 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
+@@ -1696,11 +1697,11 @@
+ ;;
+ esac
+ fi
+-echo "$as_me:1699: result: $prefix" >&5
++echo "$as_me:1700: result: $prefix" >&5
+ echo "${ECHO_T}$prefix" >&6
+
+ if test "x$prefix" = "xNONE" ; then
+-echo "$as_me:1703: checking for default include-directory" >&5
++echo "$as_me:1704: 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 \
+@@ -1723,7 +1724,7 @@
+ fi
+ test -n "$verbose" && echo " tested $cf_dir" 1>&6
+ done
+-echo "$as_me:1726: result: $includedir" >&5
++echo "$as_me:1727: result: $includedir" >&5
+ echo "${ECHO_T}$includedir" >&6
+ fi
+
+@@ -1788,20 +1789,20 @@
+ (0)
+ ;;
+ (*)
+- { { echo "$as_me:1791: error: ABI altered is not a number: $withval" >&5
++ { { echo "$as_me:1792: 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:1797: error: ABI altered value is empty" >&5
++ { { echo "$as_me:1798: 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:1804: WARNING: altering visible ABI from $cf_cv_abi_version to $withval" >&5
++ { echo "$as_me:1805: 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
+@@ -1831,7 +1832,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:1834: checking for $ac_word" >&5
++echo "$as_me:1835: 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
+@@ -1848,7 +1849,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:1851: found $ac_dir/$ac_word" >&5
++ echo "$as_me:1852: found $ac_dir/$ac_word" >&5
+ break
+ fi
+ done
+@@ -1860,10 +1861,10 @@
+ cf_TEMP_gnat=$ac_cv_path_cf_TEMP_gnat
+
+ if test -n "$cf_TEMP_gnat"; then
+- echo "$as_me:1863: result: $cf_TEMP_gnat" >&5
++ echo "$as_me:1864: result: $cf_TEMP_gnat" >&5
+ echo "${ECHO_T}$cf_TEMP_gnat" >&6
+ else
+- echo "$as_me:1866: result: no" >&5
++ echo "$as_me:1867: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+
+@@ -1873,7 +1874,7 @@
+ unset cf_cv_gnat_version
+ unset cf_TEMP_gnat
+
+-echo "$as_me:1876: checking for $cf_prog_gnat version" >&5
++echo "$as_me:1877: 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
+@@ -1884,7 +1885,7 @@
+ sed -e '2,$d' -e 's/[^0-9 \.]//g' -e 's/^[ ]*//' -e 's/ .*//'`
+
+ fi
+-echo "$as_me:1887: result: $cf_cv_gnat_version" >&5
++echo "$as_me:1888: 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
+@@ -1913,7 +1914,7 @@
+ cd conftest.src
+ for cf_gprconfig in Ada C
+ do
+- echo "$as_me:1916: checking for gprconfig name for $cf_gprconfig" >&5
++ echo "$as_me:1917: 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
+@@ -1932,10 +1933,10 @@
+ if test -n "$cf_gprconfig_value"
+ then
+ eval "cf_ada_config_$cf_gprconfig=$cf_gprconfig_value"
+- echo "$as_me:1935: result: $cf_gprconfig_value" >&5
++ echo "$as_me:1936: result: $cf_gprconfig_value" >&5
+ echo "${ECHO_T}$cf_gprconfig_value" >&6
+ else
+- echo "$as_me:1938: result: missing" >&5
++ echo "$as_me:1939: result: missing" >&5
+ echo "${ECHO_T}missing" >&6
+ cf_ada_config="#"
+ break
+@@ -1948,7 +1949,7 @@
+ if test "x$cf_ada_config" != "x#"
+ then
+
+-echo "$as_me:1951: checking for gnat version" >&5
++echo "$as_me:1952: 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
+@@ -1959,7 +1960,7 @@
+ sed -e '2,$d' -e 's/[^0-9 \.]//g' -e 's/^[ ]*//' -e 's/ .*//'`
+
+ fi
+-echo "$as_me:1962: result: $cf_cv_gnat_version" >&5
++echo "$as_me:1963: 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
+
+@@ -1968,7 +1969,7 @@
+ cf_cv_prog_gnat_correct=yes
+ ;;
+ (*)
+- { echo "$as_me:1971: WARNING: Unsupported GNAT version $cf_cv_gnat_version. We require 3.11 or better. Disabling Ada95 binding." >&5
++ { 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: WARNING: Unsupported GNAT version $cf_cv_gnat_version. We require 3.11 or better. Disabling Ada95 binding." >&2;}
+ cf_cv_prog_gnat_correct=no
+ ;;
+@@ -1976,7 +1977,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:1979: checking for $ac_word" >&5
++echo "$as_me:1980: 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
+@@ -1991,7 +1992,7 @@
+ test -z "$ac_dir" && ac_dir=.
+ $as_executable_p "$ac_dir/$ac_word" || continue
+ ac_cv_prog_M4_exists="yes"
+-echo "$as_me:1994: found $ac_dir/$ac_word" >&5
++echo "$as_me:1995: found $ac_dir/$ac_word" >&5
+ break
+ done
+
+@@ -2000,20 +2001,20 @@
+ fi
+ M4_exists=$ac_cv_prog_M4_exists
+ if test -n "$M4_exists"; then
+- echo "$as_me:2003: result: $M4_exists" >&5
++ echo "$as_me:2004: result: $M4_exists" >&5
+ echo "${ECHO_T}$M4_exists" >&6
+ else
+- echo "$as_me:2006: result: no" >&5
++ echo "$as_me:2007: 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:2012: WARNING: Ada95 binding required program m4 not found. Ada95 binding disabled" >&5
++ { echo "$as_me:2013: 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:2016: checking if GNAT works" >&5
++ echo "$as_me:2017: checking if GNAT works" >&5
+ echo $ECHO_N "checking if GNAT works... $ECHO_C" >&6
+
+ rm -rf ./conftest* ./*~conftest*
+@@ -2041,7 +2042,7 @@
+ fi
+ rm -rf ./conftest* ./*~conftest*
+
+- echo "$as_me:2044: result: $cf_cv_prog_gnat_correct" >&5
++ echo "$as_me:2045: result: $cf_cv_prog_gnat_correct" >&5
+ echo "${ECHO_T}$cf_cv_prog_gnat_correct" >&6
+ fi
+ else
+@@ -2057,7 +2058,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:2060: checking for $ac_word" >&5
++echo "$as_me:2061: 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
+@@ -2074,7 +2075,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:2077: found $ac_dir/$ac_word" >&5
++ echo "$as_me:2078: found $ac_dir/$ac_word" >&5
+ break
+ fi
+ done
+@@ -2086,16 +2087,16 @@
+ cf_cv_path_gnatgcc=$ac_cv_path_cf_cv_path_gnatgcc
+
+ if test -n "$cf_cv_path_gnatgcc"; then
+- echo "$as_me:2089: result: $cf_cv_path_gnatgcc" >&5
++ echo "$as_me:2090: result: $cf_cv_path_gnatgcc" >&5
+ echo "${ECHO_T}$cf_cv_path_gnatgcc" >&6
+ else
+- echo "$as_me:2092: result: no" >&5
++ echo "$as_me:2093: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+
+ if test "$cf_cv_path_gnatgcc" != no
+ then
+- echo "$as_me:2098: checking for improvement" >&5
++ echo "$as_me:2099: 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
+@@ -2106,7 +2107,7 @@
+ cf_cv_path_gnatgcc=no
+ ;;
+ esac
+- echo "$as_me:2109: result: $cf_cv_path_gnatgcc" >&5
++ echo "$as_me:2110: 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"
+@@ -2131,7 +2132,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:2134: checking for $ac_word" >&5
++echo "$as_me:2135: 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
+@@ -2146,7 +2147,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:2149: found $ac_dir/$ac_word" >&5
++echo "$as_me:2150: found $ac_dir/$ac_word" >&5
+ break
+ done
+
+@@ -2154,10 +2155,10 @@
+ fi
+ CC=$ac_cv_prog_CC
+ if test -n "$CC"; then
+- echo "$as_me:2157: result: $CC" >&5
++ echo "$as_me:2158: result: $CC" >&5
+ echo "${ECHO_T}$CC" >&6
+ else
+- echo "$as_me:2160: result: no" >&5
++ echo "$as_me:2161: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+
+@@ -2170,7 +2171,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:2173: checking for $ac_word" >&5
++echo "$as_me:2174: 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
+@@ -2185,7 +2186,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:2188: found $ac_dir/$ac_word" >&5
++echo "$as_me:2189: found $ac_dir/$ac_word" >&5
+ break
+ done
+
+@@ -2193,10 +2194,10 @@
+ fi
+ ac_ct_CC=$ac_cv_prog_ac_ct_CC
+ if test -n "$ac_ct_CC"; then
+- echo "$as_me:2196: result: $ac_ct_CC" >&5
++ echo "$as_me:2197: result: $ac_ct_CC" >&5
+ echo "${ECHO_T}$ac_ct_CC" >&6
+ else
+- echo "$as_me:2199: result: no" >&5
++ echo "$as_me:2200: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+
+@@ -2206,32 +2207,32 @@
+ CC=$ac_ct_CC
+ fi
+
+-test -z "$CC" && { { echo "$as_me:2209: error: no acceptable cc found in \$PATH" >&5
++test -z "$CC" && { { echo "$as_me:2210: 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:2214:" \
++echo "$as_me:2215:" \
+ "checking for C compiler version" >&5
+ ac_compiler=`set X $ac_compile; echo "$2"`
+-{ (eval echo "$as_me:2217: \"$ac_compiler --version </dev/null >&5\"") >&5
++{ (eval echo "$as_me:2218: \"$ac_compiler --version </dev/null >&5\"") >&5
+ (eval $ac_compiler --version </dev/null >&5) 2>&5
+ ac_status=$?
+- echo "$as_me:2220: \$? = $ac_status" >&5
++ echo "$as_me:2221: \$? = $ac_status" >&5
+ (exit "$ac_status"); }
+-{ (eval echo "$as_me:2222: \"$ac_compiler -v </dev/null >&5\"") >&5
++{ (eval echo "$as_me:2223: \"$ac_compiler -v </dev/null >&5\"") >&5
+ (eval $ac_compiler -v </dev/null >&5) 2>&5
+ ac_status=$?
+- echo "$as_me:2225: \$? = $ac_status" >&5
++ echo "$as_me:2226: \$? = $ac_status" >&5
+ (exit "$ac_status"); }
+-{ (eval echo "$as_me:2227: \"$ac_compiler -V </dev/null >&5\"") >&5
++{ (eval echo "$as_me:2228: \"$ac_compiler -V </dev/null >&5\"") >&5
+ (eval $ac_compiler -V </dev/null >&5) 2>&5
+ ac_status=$?
+- echo "$as_me:2230: \$? = $ac_status" >&5
++ echo "$as_me:2231: \$? = $ac_status" >&5
+ (exit "$ac_status"); }
+
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 2234 "configure"
++#line 2235 "configure"
+ #include "confdefs.h"
+
+ int
+@@ -2247,13 +2248,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:2250: checking for C compiler default output" >&5
++echo "$as_me:2251: 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:2253: \"$ac_link_default\"") >&5
++if { (eval echo "$as_me:2254: \"$ac_link_default\"") >&5
+ (eval $ac_link_default) 2>&5
+ ac_status=$?
+- echo "$as_me:2256: \$? = $ac_status" >&5
++ echo "$as_me:2257: \$? = $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
+@@ -2276,34 +2277,34 @@
+ else
+ echo "$as_me: failed program was:" >&5
+ cat "conftest.$ac_ext" >&5
+-{ { echo "$as_me:2279: error: C compiler cannot create executables" >&5
++{ { echo "$as_me:2280: 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:2285: result: $ac_file" >&5
++echo "$as_me:2286: 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:2290: checking whether the C compiler works" >&5
++echo "$as_me:2291: 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:2296: \"$ac_try\"") >&5
++ { (eval echo "$as_me:2297: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:2299: \$? = $ac_status" >&5
++ echo "$as_me:2300: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cross_compiling=no
+ else
+ if test "$cross_compiling" = maybe; then
+ cross_compiling=yes
+ else
+- { { echo "$as_me:2306: error: cannot run C compiled programs.
++ { { echo "$as_me:2307: 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;}
+@@ -2311,24 +2312,24 @@
+ fi
+ fi
+ fi
+-echo "$as_me:2314: result: yes" >&5
++echo "$as_me:2315: 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:2321: checking whether we are cross compiling" >&5
++echo "$as_me:2322: checking whether we are cross compiling" >&5
+ echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6
+-echo "$as_me:2323: result: $cross_compiling" >&5
++echo "$as_me:2324: result: $cross_compiling" >&5
+ echo "${ECHO_T}$cross_compiling" >&6
+
+-echo "$as_me:2326: checking for executable suffix" >&5
++echo "$as_me:2327: checking for executable suffix" >&5
+ echo $ECHO_N "checking for executable suffix... $ECHO_C" >&6
+-if { (eval echo "$as_me:2328: \"$ac_link\"") >&5
++if { (eval echo "$as_me:2329: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:2331: \$? = $ac_status" >&5
++ echo "$as_me:2332: \$? = $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
+@@ -2344,25 +2345,25 @@
+ esac
+ done
+ else
+- { { echo "$as_me:2347: error: cannot compute EXEEXT: cannot compile and link" >&5
++ { { echo "$as_me:2348: 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:2353: result: $ac_cv_exeext" >&5
++echo "$as_me:2354: 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:2359: checking for object suffix" >&5
++echo "$as_me:2360: 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 2365 "configure"
++#line 2366 "configure"
+ #include "confdefs.h"
+
+ int
+@@ -2374,10 +2375,10 @@
+ }
+ _ACEOF
+ rm -f conftest.o conftest.obj
+-if { (eval echo "$as_me:2377: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:2378: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:2380: \$? = $ac_status" >&5
++ echo "$as_me:2381: \$? = $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
+@@ -2389,24 +2390,24 @@
+ else
+ echo "$as_me: failed program was:" >&5
+ cat "conftest.$ac_ext" >&5
+-{ { echo "$as_me:2392: error: cannot compute OBJEXT: cannot compile" >&5
++{ { echo "$as_me:2393: 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:2399: result: $ac_cv_objext" >&5
++echo "$as_me:2400: result: $ac_cv_objext" >&5
+ echo "${ECHO_T}$ac_cv_objext" >&6
+ OBJEXT=$ac_cv_objext
+ ac_objext=$OBJEXT
+-echo "$as_me:2403: checking whether we are using the GNU C compiler" >&5
++echo "$as_me:2404: 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 2409 "configure"
++#line 2410 "configure"
+ #include "confdefs.h"
+
+ int
+@@ -2421,16 +2422,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:2424: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:2425: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:2427: \$? = $ac_status" >&5
++ echo "$as_me:2428: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:2430: \"$ac_try\"") >&5
++ { (eval echo "$as_me:2431: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:2433: \$? = $ac_status" >&5
++ echo "$as_me:2434: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_compiler_gnu=yes
+ else
+@@ -2442,19 +2443,19 @@
+ ac_cv_c_compiler_gnu=$ac_compiler_gnu
+
+ fi
+-echo "$as_me:2445: result: $ac_cv_c_compiler_gnu" >&5
++echo "$as_me:2446: 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:2451: checking whether $CC accepts -g" >&5
++echo "$as_me:2452: 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 2457 "configure"
++#line 2458 "configure"
+ #include "confdefs.h"
+
+ int
+@@ -2466,16 +2467,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:2469: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:2470: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:2472: \$? = $ac_status" >&5
++ echo "$as_me:2473: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:2475: \"$ac_try\"") >&5
++ { (eval echo "$as_me:2476: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:2478: \$? = $ac_status" >&5
++ echo "$as_me:2479: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_prog_cc_g=yes
+ else
+@@ -2485,7 +2486,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:2488: result: $ac_cv_prog_cc_g" >&5
++echo "$as_me:2489: 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
+@@ -2512,16 +2513,16 @@
+ #endif
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:2515: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:2516: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:2518: \$? = $ac_status" >&5
++ echo "$as_me:2519: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:2521: \"$ac_try\"") >&5
++ { (eval echo "$as_me:2522: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:2524: \$? = $ac_status" >&5
++ echo "$as_me:2525: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ for ac_declaration in \
+ ''\
+@@ -2533,7 +2534,7 @@
+ 'void exit (int);'
+ do
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 2536 "configure"
++#line 2537 "configure"
+ #include "confdefs.h"
+ #include <stdlib.h>
+ $ac_declaration
+@@ -2546,16 +2547,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:2549: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:2550: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:2552: \$? = $ac_status" >&5
++ echo "$as_me:2553: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:2555: \"$ac_try\"") >&5
++ { (eval echo "$as_me:2556: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:2558: \$? = $ac_status" >&5
++ echo "$as_me:2559: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ :
+ else
+@@ -2565,7 +2566,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 2568 "configure"
++#line 2569 "configure"
+ #include "confdefs.h"
+ $ac_declaration
+ int
+@@ -2577,16 +2578,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:2580: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:2581: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:2583: \$? = $ac_status" >&5
++ echo "$as_me:2584: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:2586: \"$ac_try\"") >&5
++ { (eval echo "$as_me:2587: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:2589: \$? = $ac_status" >&5
++ echo "$as_me:2590: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ break
+ else
+@@ -2616,11 +2617,11 @@
+
+ GCC_VERSION=none
+ if test "$GCC" = yes ; then
+- echo "$as_me:2619: checking version of $CC" >&5
++ echo "$as_me:2620: 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:2623: result: $GCC_VERSION" >&5
++ echo "$as_me:2624: result: $GCC_VERSION" >&5
+ echo "${ECHO_T}$GCC_VERSION" >&6
+ fi
+
+@@ -2629,12 +2630,12 @@
+ if test "$GCC" = yes ; then
+ case "$host_os" in
+ (linux*|gnu*)
+- echo "$as_me:2632: checking if this is really Intel C compiler" >&5
++ echo "$as_me:2633: 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 2637 "configure"
++#line 2638 "configure"
+ #include "confdefs.h"
+
+ int
+@@ -2651,16 +2652,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:2654: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:2655: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:2657: \$? = $ac_status" >&5
++ echo "$as_me:2658: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:2660: \"$ac_try\"") >&5
++ { (eval echo "$as_me:2661: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:2663: \$? = $ac_status" >&5
++ echo "$as_me:2664: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ INTEL_COMPILER=yes
+ cf_save_CFLAGS="$cf_save_CFLAGS -we147"
+@@ -2671,7 +2672,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ CFLAGS="$cf_save_CFLAGS"
+- echo "$as_me:2674: result: $INTEL_COMPILER" >&5
++ echo "$as_me:2675: result: $INTEL_COMPILER" >&5
+ echo "${ECHO_T}$INTEL_COMPILER" >&6
+ ;;
+ esac
+@@ -2680,11 +2681,11 @@
+ CLANG_COMPILER=no
+
+ if test "$GCC" = yes ; then
+- echo "$as_me:2683: checking if this is really Clang C compiler" >&5
++ echo "$as_me:2684: 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 2687 "configure"
++#line 2688 "configure"
+ #include "confdefs.h"
+
+ int
+@@ -2701,16 +2702,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:2704: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:2705: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:2707: \$? = $ac_status" >&5
++ echo "$as_me:2708: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:2710: \"$ac_try\"") >&5
++ { (eval echo "$as_me:2711: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:2713: \$? = $ac_status" >&5
++ echo "$as_me:2714: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ CLANG_COMPILER=yes
+
+@@ -2720,7 +2721,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ CFLAGS="$cf_save_CFLAGS"
+- echo "$as_me:2723: result: $CLANG_COMPILER" >&5
++ echo "$as_me:2724: result: $CLANG_COMPILER" >&5
+ echo "${ECHO_T}$CLANG_COMPILER" >&6
+ fi
+
+@@ -2729,30 +2730,30 @@
+ if test "x$CLANG_COMPILER" = "xyes" ; then
+ case "$CC" in
+ (c[1-9][0-9]|*/c[1-9][0-9])
+- { echo "$as_me:2732: WARNING: replacing broken compiler alias $CC" >&5
++ { echo "$as_me:2733: 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:2739: checking version of $CC" >&5
++ echo "$as_me:2740: 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:2743: result: $CLANG_VERSION" >&5
++ echo "$as_me:2744: 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:2750: checking if option $cf_clang_opt works" >&5
++ echo "$as_me:2751: 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 2755 "configure"
++#line 2756 "configure"
+ #include "confdefs.h"
+
+ #include <stdio.h>
+@@ -2766,16 +2767,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:2769: \"$ac_link\"") >&5
++if { (eval echo "$as_me:2770: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:2772: \$? = $ac_status" >&5
++ echo "$as_me:2773: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:2775: \"$ac_try\"") >&5
++ { (eval echo "$as_me:2776: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:2778: \$? = $ac_status" >&5
++ echo "$as_me:2779: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+
+ cf_clang_optok=yes
+@@ -2786,13 +2787,13 @@
+ cf_clang_optok=no
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+- echo "$as_me:2789: result: $cf_clang_optok" >&5
++ echo "$as_me:2790: 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}:2795: testing adding option $cf_clang_opt ..." 1>&5
++echo "${as_me:-configure}:2796: testing adding option $cf_clang_opt ..." 1>&5
+
+ test -n "$CFLAGS" && CFLAGS="$CFLAGS "
+ CFLAGS="${CFLAGS}$cf_clang_opt"
+@@ -2801,7 +2802,7 @@
+ done
+ fi
+
+-echo "$as_me:2804: checking for $CC option to accept ANSI C" >&5
++echo "$as_me:2805: 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
+@@ -2809,7 +2810,7 @@
+ ac_cv_prog_cc_stdc=no
+ ac_save_CC=$CC
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 2812 "configure"
++#line 2813 "configure"
+ #include "confdefs.h"
+ #include <stdarg.h>
+ #include <stdio.h>
+@@ -2856,16 +2857,16 @@
+ do
+ CC="$ac_save_CC $ac_arg"
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:2859: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:2860: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:2862: \$? = $ac_status" >&5
++ echo "$as_me:2863: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:2865: \"$ac_try\"") >&5
++ { (eval echo "$as_me:2866: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:2868: \$? = $ac_status" >&5
++ echo "$as_me:2869: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_prog_cc_stdc=$ac_arg
+ break
+@@ -2882,10 +2883,10 @@
+
+ case "x$ac_cv_prog_cc_stdc" in
+ x|xno)
+- echo "$as_me:2885: result: none needed" >&5
++ echo "$as_me:2886: result: none needed" >&5
+ echo "${ECHO_T}none needed" >&6 ;;
+ *)
+- echo "$as_me:2888: result: $ac_cv_prog_cc_stdc" >&5
++ echo "$as_me:2889: result: $ac_cv_prog_cc_stdc" >&5
+ echo "${ECHO_T}$ac_cv_prog_cc_stdc" >&6
+ CC="$CC $ac_cv_prog_cc_stdc" ;;
+ esac
+@@ -2893,13 +2894,13 @@
+ # This should have been defined by AC_PROG_CC
+ : "${CC:=cc}"
+
+-echo "$as_me:2896: checking \$CFLAGS variable" >&5
++echo "$as_me:2897: checking \$CFLAGS variable" >&5
+ echo $ECHO_N "checking \$CFLAGS variable... $ECHO_C" >&6
+ case "x$CFLAGS" in
+ (*-[IUD]*)
+- echo "$as_me:2900: result: broken" >&5
++ echo "$as_me:2901: result: broken" >&5
+ echo "${ECHO_T}broken" >&6
+- { echo "$as_me:2902: WARNING: your environment uses the CFLAGS variable to hold CPPFLAGS options" >&5
++ { echo "$as_me:2903: 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=
+@@ -3007,18 +3008,18 @@
+ done
+ ;;
+ (*)
+- echo "$as_me:3010: result: ok" >&5
++ echo "$as_me:3011: result: ok" >&5
+ echo "${ECHO_T}ok" >&6
+ ;;
+ esac
+
+-echo "$as_me:3015: checking \$CC variable" >&5
++echo "$as_me:3016: checking \$CC variable" >&5
+ echo $ECHO_N "checking \$CC variable... $ECHO_C" >&6
+ case "$CC" in
+ (*[\ \ ]-*)
+- echo "$as_me:3019: result: broken" >&5
++ echo "$as_me:3020: result: broken" >&5
+ echo "${ECHO_T}broken" >&6
+- { echo "$as_me:3021: WARNING: your environment uses the CC variable to hold CFLAGS/CPPFLAGS options" >&5
++ { echo "$as_me:3022: 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/[ ]*[ ]-[^ ].*//'`
+@@ -3135,19 +3136,19 @@
+ done
+ test -n "$verbose" && echo " resulting CC: '$CC'" 1>&6
+
+-echo "${as_me:-configure}:3138: testing resulting CC: '$CC' ..." 1>&5
++echo "${as_me:-configure}:3139: testing resulting CC: '$CC' ..." 1>&5
+
+ test -n "$verbose" && echo " resulting CFLAGS: '$CFLAGS'" 1>&6
+
+-echo "${as_me:-configure}:3142: testing resulting CFLAGS: '$CFLAGS' ..." 1>&5
++echo "${as_me:-configure}:3143: testing resulting CFLAGS: '$CFLAGS' ..." 1>&5
+
+ test -n "$verbose" && echo " resulting CPPFLAGS: '$CPPFLAGS'" 1>&6
+
+-echo "${as_me:-configure}:3146: testing resulting CPPFLAGS: '$CPPFLAGS' ..." 1>&5
++echo "${as_me:-configure}:3147: testing resulting CPPFLAGS: '$CPPFLAGS' ..." 1>&5
+
+ ;;
+ (*)
+- echo "$as_me:3150: result: ok" >&5
++ echo "$as_me:3151: result: ok" >&5
+ echo "${ECHO_T}ok" >&6
+ ;;
+ esac
+@@ -3161,7 +3162,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:3164: checking how to run the C preprocessor" >&5
++echo "$as_me:3165: 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
+@@ -3182,18 +3183,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 3185 "configure"
++#line 3186 "configure"
+ #include "confdefs.h"
+ #include <assert.h>
+ Syntax error
+ _ACEOF
+-if { (eval echo "$as_me:3190: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:3191: \"$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:3196: \$? = $ac_status" >&5
++ echo "$as_me:3197: \$? = $ac_status" >&5
+ (exit "$ac_status"); } >/dev/null; then
+ if test -s conftest.err; then
+ ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -3216,17 +3217,17 @@
+ # OK, works on sane cases. Now check whether non-existent headers
+ # can be detected and how.
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 3219 "configure"
++#line 3220 "configure"
+ #include "confdefs.h"
+ #include <ac_nonexistent.h>
+ _ACEOF
+-if { (eval echo "$as_me:3223: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:3224: \"$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:3229: \$? = $ac_status" >&5
++ echo "$as_me:3230: \$? = $ac_status" >&5
+ (exit "$ac_status"); } >/dev/null; then
+ if test -s conftest.err; then
+ ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -3263,7 +3264,7 @@
+ else
+ ac_cv_prog_CPP=$CPP
+ fi
+-echo "$as_me:3266: result: $CPP" >&5
++echo "$as_me:3267: result: $CPP" >&5
+ echo "${ECHO_T}$CPP" >&6
+ ac_preproc_ok=false
+ for ac_c_preproc_warn_flag in '' yes
+@@ -3273,18 +3274,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 3276 "configure"
++#line 3277 "configure"
+ #include "confdefs.h"
+ #include <assert.h>
+ Syntax error
+ _ACEOF
+-if { (eval echo "$as_me:3281: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:3282: \"$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:3287: \$? = $ac_status" >&5
++ echo "$as_me:3288: \$? = $ac_status" >&5
+ (exit "$ac_status"); } >/dev/null; then
+ if test -s conftest.err; then
+ ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -3307,17 +3308,17 @@
+ # OK, works on sane cases. Now check whether non-existent headers
+ # can be detected and how.
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 3310 "configure"
++#line 3311 "configure"
+ #include "confdefs.h"
+ #include <ac_nonexistent.h>
+ _ACEOF
+-if { (eval echo "$as_me:3314: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:3315: \"$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:3320: \$? = $ac_status" >&5
++ echo "$as_me:3321: \$? = $ac_status" >&5
+ (exit "$ac_status"); } >/dev/null; then
+ if test -s conftest.err; then
+ ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -3345,7 +3346,7 @@
+ if $ac_preproc_ok; then
+ :
+ else
+- { { echo "$as_me:3348: error: C preprocessor \"$CPP\" fails sanity check" >&5
++ { { echo "$as_me:3349: error: C preprocessor \"$CPP\" fails sanity check" >&5
+ echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check" >&2;}
+ { (exit 1); exit 1; }; }
+ fi
+@@ -3358,14 +3359,14 @@
+ ac_main_return="return"
+
+ if test $ac_cv_c_compiler_gnu = yes; then
+- echo "$as_me:3361: checking whether $CC needs -traditional" >&5
++ echo "$as_me:3362: 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 3368 "configure"
++#line 3369 "configure"
+ #include "confdefs.h"
+ #include <sgtty.h>
+ int Autoconf = TIOCGETP;
+@@ -3380,7 +3381,7 @@
+
+ if test $ac_cv_prog_gcc_traditional = no; then
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 3383 "configure"
++#line 3384 "configure"
+ #include "confdefs.h"
+ #include <termio.h>
+ int Autoconf = TCGETA;
+@@ -3393,14 +3394,14 @@
+
+ fi
+ fi
+-echo "$as_me:3396: result: $ac_cv_prog_gcc_traditional" >&5
++echo "$as_me:3397: 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:3403: checking whether $CC understands -c and -o together" >&5
++echo "$as_me:3404: 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
+@@ -3415,15 +3416,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:3418: \"$ac_try\"") >&5
++if { (eval echo "$as_me:3419: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:3421: \$? = $ac_status" >&5
++ echo "$as_me:3422: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+- test -f conftest2.$ac_objext && { (eval echo "$as_me:3423: \"$ac_try\"") >&5
++ test -f conftest2.$ac_objext && { (eval echo "$as_me:3424: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:3426: \$? = $ac_status" >&5
++ echo "$as_me:3427: \$? = $ac_status" >&5
+ (exit "$ac_status"); };
+ then
+ eval cf_cv_prog_CC_c_o=yes
+@@ -3434,10 +3435,10 @@
+
+ fi
+ if test "$cf_cv_prog_CC_c_o" = yes; then
+- echo "$as_me:3437: result: yes" >&5
++ echo "$as_me:3438: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ else
+- echo "$as_me:3440: result: no" >&5
++ echo "$as_me:3441: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+
+@@ -3451,7 +3452,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:3454: checking for $ac_word" >&5
++echo "$as_me:3455: 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
+@@ -3468,7 +3469,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:3471: found $ac_dir/$ac_word" >&5
++ echo "$as_me:3472: found $ac_dir/$ac_word" >&5
+ break
+ fi
+ done
+@@ -3479,10 +3480,10 @@
+ LDCONFIG=$ac_cv_path_LDCONFIG
+
+ if test -n "$LDCONFIG"; then
+- echo "$as_me:3482: result: $LDCONFIG" >&5
++ echo "$as_me:3483: result: $LDCONFIG" >&5
+ echo "${ECHO_T}$LDCONFIG" >&6
+ else
+- echo "$as_me:3485: result: no" >&5
++ echo "$as_me:3486: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+
+@@ -3490,7 +3491,7 @@
+ esac
+ fi
+
+-echo "$as_me:3493: checking if you want to ensure bool is consistent with C++" >&5
++echo "$as_me:3494: 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.
+@@ -3500,7 +3501,7 @@
+ else
+ cf_with_cxx=yes
+ fi;
+-echo "$as_me:3503: result: $cf_with_cxx" >&5
++echo "$as_me:3504: result: $cf_with_cxx" >&5
+ echo "${ECHO_T}$cf_with_cxx" >&6
+ if test "X$cf_with_cxx" = Xno ; then
+ CXX=""
+@@ -3518,7 +3519,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:3521: checking for $ac_word" >&5
++echo "$as_me:3522: 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
+@@ -3533,7 +3534,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:3536: found $ac_dir/$ac_word" >&5
++echo "$as_me:3537: found $ac_dir/$ac_word" >&5
+ break
+ done
+
+@@ -3541,10 +3542,10 @@
+ fi
+ CXX=$ac_cv_prog_CXX
+ if test -n "$CXX"; then
+- echo "$as_me:3544: result: $CXX" >&5
++ echo "$as_me:3545: result: $CXX" >&5
+ echo "${ECHO_T}$CXX" >&6
+ else
+- echo "$as_me:3547: result: no" >&5
++ echo "$as_me:3548: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+
+@@ -3557,7 +3558,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:3560: checking for $ac_word" >&5
++echo "$as_me:3561: 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
+@@ -3572,7 +3573,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:3575: found $ac_dir/$ac_word" >&5
++echo "$as_me:3576: found $ac_dir/$ac_word" >&5
+ break
+ done
+
+@@ -3580,10 +3581,10 @@
+ fi
+ ac_ct_CXX=$ac_cv_prog_ac_ct_CXX
+ if test -n "$ac_ct_CXX"; then
+- echo "$as_me:3583: result: $ac_ct_CXX" >&5
++ echo "$as_me:3584: result: $ac_ct_CXX" >&5
+ echo "${ECHO_T}$ac_ct_CXX" >&6
+ else
+- echo "$as_me:3586: result: no" >&5
++ echo "$as_me:3587: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+
+@@ -3595,32 +3596,32 @@
+ fi
+
+ # Provide some information about the compiler.
+-echo "$as_me:3598:" \
++echo "$as_me:3599:" \
+ "checking for C++ compiler version" >&5
+ ac_compiler=`set X $ac_compile; echo $2`
+-{ (eval echo "$as_me:3601: \"$ac_compiler --version </dev/null >&5\"") >&5
++{ (eval echo "$as_me:3602: \"$ac_compiler --version </dev/null >&5\"") >&5
+ (eval $ac_compiler --version </dev/null >&5) 2>&5
+ ac_status=$?
+- echo "$as_me:3604: \$? = $ac_status" >&5
++ echo "$as_me:3605: \$? = $ac_status" >&5
+ (exit "$ac_status"); }
+-{ (eval echo "$as_me:3606: \"$ac_compiler -v </dev/null >&5\"") >&5
++{ (eval echo "$as_me:3607: \"$ac_compiler -v </dev/null >&5\"") >&5
+ (eval $ac_compiler -v </dev/null >&5) 2>&5
+ ac_status=$?
+- echo "$as_me:3609: \$? = $ac_status" >&5
++ echo "$as_me:3610: \$? = $ac_status" >&5
+ (exit "$ac_status"); }
+-{ (eval echo "$as_me:3611: \"$ac_compiler -V </dev/null >&5\"") >&5
++{ (eval echo "$as_me:3612: \"$ac_compiler -V </dev/null >&5\"") >&5
+ (eval $ac_compiler -V </dev/null >&5) 2>&5
+ ac_status=$?
+- echo "$as_me:3614: \$? = $ac_status" >&5
++ echo "$as_me:3615: \$? = $ac_status" >&5
+ (exit "$ac_status"); }
+
+-echo "$as_me:3617: checking whether we are using the GNU C++ compiler" >&5
++echo "$as_me:3618: 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 3623 "configure"
++#line 3624 "configure"
+ #include "confdefs.h"
+
+ int
+@@ -3635,16 +3636,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:3638: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:3639: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:3641: \$? = $ac_status" >&5
++ echo "$as_me:3642: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:3644: \"$ac_try\"") >&5
++ { (eval echo "$as_me:3645: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:3647: \$? = $ac_status" >&5
++ echo "$as_me:3648: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_compiler_gnu=yes
+ else
+@@ -3656,19 +3657,19 @@
+ ac_cv_cxx_compiler_gnu=$ac_compiler_gnu
+
+ fi
+-echo "$as_me:3659: result: $ac_cv_cxx_compiler_gnu" >&5
++echo "$as_me:3660: 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:3665: checking whether $CXX accepts -g" >&5
++echo "$as_me:3666: 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 3671 "configure"
++#line 3672 "configure"
+ #include "confdefs.h"
+
+ int
+@@ -3680,16 +3681,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:3683: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:3684: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:3686: \$? = $ac_status" >&5
++ echo "$as_me:3687: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:3689: \"$ac_try\"") >&5
++ { (eval echo "$as_me:3690: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:3692: \$? = $ac_status" >&5
++ echo "$as_me:3693: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_prog_cxx_g=yes
+ else
+@@ -3699,7 +3700,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:3702: result: $ac_cv_prog_cxx_g" >&5
++echo "$as_me:3703: 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
+@@ -3726,7 +3727,7 @@
+ 'void exit (int);'
+ do
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 3729 "configure"
++#line 3730 "configure"
+ #include "confdefs.h"
+ #include <stdlib.h>
+ $ac_declaration
+@@ -3739,16 +3740,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:3742: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:3743: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:3745: \$? = $ac_status" >&5
++ echo "$as_me:3746: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:3748: \"$ac_try\"") >&5
++ { (eval echo "$as_me:3749: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:3751: \$? = $ac_status" >&5
++ echo "$as_me:3752: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ :
+ else
+@@ -3758,7 +3759,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 3761 "configure"
++#line 3762 "configure"
+ #include "confdefs.h"
+ $ac_declaration
+ int
+@@ -3770,16 +3771,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:3773: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:3774: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:3776: \$? = $ac_status" >&5
++ echo "$as_me:3777: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:3779: \"$ac_try\"") >&5
++ { (eval echo "$as_me:3780: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:3782: \$? = $ac_status" >&5
++ echo "$as_me:3783: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ break
+ else
+@@ -3813,7 +3814,7 @@
+ then
+ # Several of the C++ configurations do not work, particularly when
+ # cross-compiling (20140913 -TD)
+- echo "$as_me:3816: checking if $CXX works" >&5
++ echo "$as_me:3817: checking if $CXX works" >&5
+ echo $ECHO_N "checking if $CXX works... $ECHO_C" >&6
+
+ save_CPPFLAGS="$CPPFLAGS"
+@@ -3821,7 +3822,7 @@
+ CPPFLAGS="$CPPFLAGS -I${cf_includedir}"
+
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 3824 "configure"
++#line 3825 "configure"
+ #include "confdefs.h"
+
+ #include <stdlib.h>
+@@ -3838,16 +3839,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:3841: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:3842: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:3844: \$? = $ac_status" >&5
++ echo "$as_me:3845: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:3847: \"$ac_try\"") >&5
++ { (eval echo "$as_me:3848: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:3850: \$? = $ac_status" >&5
++ echo "$as_me:3851: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cxx_works=yes
+ else
+@@ -3858,11 +3859,11 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ CPPFLAGS="$save_CPPFLAGS"
+
+- echo "$as_me:3861: result: $cf_cxx_works" >&5
++ echo "$as_me:3862: result: $cf_cxx_works" >&5
+ echo "${ECHO_T}$cf_cxx_works" >&6
+ if test "x$cf_cxx_works" = xno
+ then
+- { echo "$as_me:3865: WARNING: Ignore $CXX, since it cannot compile hello-world." >&5
++ { echo "$as_me:3866: 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
+@@ -3878,7 +3879,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:3881: checking for $ac_word" >&5
++echo "$as_me:3882: 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
+@@ -3895,7 +3896,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:3898: found $ac_dir/$ac_word" >&5
++ echo "$as_me:3899: found $ac_dir/$ac_word" >&5
+ break
+ fi
+ done
+@@ -3906,17 +3907,17 @@
+ CXX=$ac_cv_path_CXX
+
+ if test -n "$CXX"; then
+- echo "$as_me:3909: result: $CXX" >&5
++ echo "$as_me:3910: result: $CXX" >&5
+ echo "${ECHO_T}$CXX" >&6
+ else
+- echo "$as_me:3912: result: no" >&5
++ echo "$as_me:3913: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+
+ fi
+ case "x$CXX" in
+ (x|xg++)
+- { echo "$as_me:3919: WARNING: You don't have any C++ compiler, too bad" >&5
++ { echo "$as_me:3920: 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="";
+ ;;
+@@ -3925,7 +3926,7 @@
+
+ GXX_VERSION=none
+ if test "$GXX" = yes; then
+- echo "$as_me:3928: checking version of ${CXX:-g++}" >&5
++ echo "$as_me:3929: 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"
+@@ -3933,7 +3934,7 @@
+ GXX_VERSION=unknown
+ GXX=no
+ fi
+- echo "$as_me:3936: result: $GXX_VERSION" >&5
++ echo "$as_me:3937: result: $GXX_VERSION" >&5
+ echo "${ECHO_T}$GXX_VERSION" >&6
+ fi
+
+@@ -3941,12 +3942,12 @@
+ ([1-9][0-9].*)
+ ;;
+ (1.*|2.[0-6]*)
+- { echo "$as_me:3944: WARNING: templates do not work" >&5
++ { echo "$as_me:3945: WARNING: templates do not work" >&5
+ echo "$as_me: WARNING: templates do not work" >&2;}
+ ;;
+ esac
+
+-echo "$as_me:3949: checking if you want to build C++ binding and demo" >&5
++echo "$as_me:3950: 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.
+@@ -3956,15 +3957,15 @@
+ else
+ cf_with_cxx_binding=$cf_with_cxx
+ fi;
+-echo "$as_me:3959: result: $cf_with_cxx_binding" >&5
++echo "$as_me:3960: result: $cf_with_cxx_binding" >&5
+ echo "${ECHO_T}$cf_with_cxx_binding" >&6
+
+-echo "$as_me:3962: checking if you want to build with Ada" >&5
++echo "$as_me:3963: 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:3964: result: $cf_with_ada" >&5
++echo "$as_me:3965: result: $cf_with_ada" >&5
+ echo "${ECHO_T}$cf_with_ada" >&6
+
+-echo "$as_me:3967: checking if you want to install terminal database" >&5
++echo "$as_me:3968: 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.
+@@ -3974,10 +3975,10 @@
+ else
+ cf_with_db_install=yes
+ fi;
+-echo "$as_me:3977: result: $cf_with_db_install" >&5
++echo "$as_me:3978: result: $cf_with_db_install" >&5
+ echo "${ECHO_T}$cf_with_db_install" >&6
+
+-echo "$as_me:3980: checking if you want to install manpages" >&5
++echo "$as_me:3981: 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.
+@@ -3987,10 +3988,10 @@
+ else
+ cf_with_manpages=yes
+ fi;
+-echo "$as_me:3990: result: $cf_with_manpages" >&5
++echo "$as_me:3991: result: $cf_with_manpages" >&5
+ echo "${ECHO_T}$cf_with_manpages" >&6
+
+-echo "$as_me:3993: checking if you want to build programs such as tic" >&5
++echo "$as_me:3994: 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.
+@@ -4000,10 +4001,10 @@
+ else
+ cf_with_progs=yes
+ fi;
+-echo "$as_me:4003: result: $cf_with_progs" >&5
++echo "$as_me:4004: result: $cf_with_progs" >&5
+ echo "${ECHO_T}$cf_with_progs" >&6
+
+-echo "$as_me:4006: checking if you want to build test-programs" >&5
++echo "$as_me:4007: 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.
+@@ -4013,10 +4014,10 @@
+ else
+ cf_with_tests=yes
+ fi;
+-echo "$as_me:4016: result: $cf_with_tests" >&5
++echo "$as_me:4017: result: $cf_with_tests" >&5
+ echo "${ECHO_T}$cf_with_tests" >&6
+
+-echo "$as_me:4019: checking if you wish to install curses.h" >&5
++echo "$as_me:4020: 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.
+@@ -4026,7 +4027,7 @@
+ else
+ with_curses_h=yes
+ fi;
+-echo "$as_me:4029: result: $with_curses_h" >&5
++echo "$as_me:4030: result: $with_curses_h" >&5
+ echo "${ECHO_T}$with_curses_h" >&6
+
+ modules_to_build="ncurses"
+@@ -4050,7 +4051,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: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_AWK+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_AWK="$ac_prog"
+-echo "$as_me:4068: found $ac_dir/$ac_word" >&5
++echo "$as_me:4069: found $ac_dir/$ac_word" >&5
+ break
+ done
+
+@@ -4073,17 +4074,17 @@
+ fi
+ AWK=$ac_cv_prog_AWK
+ if test -n "$AWK"; then
+- echo "$as_me:4076: result: $AWK" >&5
++ echo "$as_me:4077: result: $AWK" >&5
+ echo "${ECHO_T}$AWK" >&6
+ else
+- echo "$as_me:4079: result: no" >&5
++ echo "$as_me:4080: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+
+ test -n "$AWK" && break
+ done
+
+-test -z "$AWK" && { { echo "$as_me:4086: error: No awk program found" >&5
++test -z "$AWK" && { { echo "$as_me:4087: error: No awk program found" >&5
+ echo "$as_me: error: No awk program found" >&2;}
+ { (exit 1); exit 1; }; }
+
+@@ -4099,7 +4100,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:4102: checking for a BSD compatible install" >&5
++echo "$as_me:4103: 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
+@@ -4148,7 +4149,7 @@
+ INSTALL=$ac_install_sh
+ fi
+ fi
+-echo "$as_me:4151: result: $INSTALL" >&5
++echo "$as_me:4152: result: $INSTALL" >&5
+ echo "${ECHO_T}$INSTALL" >&6
+
+ # Use test -z because SunOS4 sh mishandles braces in ${var-val}.
+@@ -4173,7 +4174,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:4176: checking for $ac_word" >&5
++echo "$as_me:4177: 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
+@@ -4188,7 +4189,7 @@
+ test -z "$ac_dir" && ac_dir=.
+ $as_executable_p "$ac_dir/$ac_word" || continue
+ ac_cv_prog_LINT="$ac_prog"
+-echo "$as_me:4191: found $ac_dir/$ac_word" >&5
++echo "$as_me:4192: found $ac_dir/$ac_word" >&5
+ break
+ done
+
+@@ -4196,10 +4197,10 @@
+ fi
+ LINT=$ac_cv_prog_LINT
+ if test -n "$LINT"; then
+- echo "$as_me:4199: result: $LINT" >&5
++ echo "$as_me:4200: result: $LINT" >&5
+ echo "${ECHO_T}$LINT" >&6
+ else
+- echo "$as_me:4202: result: no" >&5
++ echo "$as_me:4203: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+
+@@ -4212,18 +4213,18 @@
+ ;;
+ esac
+
+-echo "$as_me:4215: checking whether ln -s works" >&5
++echo "$as_me:4216: 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:4219: result: yes" >&5
++ echo "$as_me:4220: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ else
+- echo "$as_me:4222: result: no, using $LN_S" >&5
++ echo "$as_me:4223: result: no, using $LN_S" >&5
+ echo "${ECHO_T}no, using $LN_S" >&6
+ fi
+
+-echo "$as_me:4226: checking if $LN_S -f options work" >&5
++echo "$as_me:4227: 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
+@@ -4235,12 +4236,12 @@
+ cf_prog_ln_sf=no
+ fi
+ rm -f conf$$.dst conf$$src
+-echo "$as_me:4238: result: $cf_prog_ln_sf" >&5
++echo "$as_me:4239: 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:4243: checking for long file names" >&5
++echo "$as_me:4244: 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
+@@ -4279,7 +4280,7 @@
+ rm -rf "$ac_xdir" 2>/dev/null
+ done
+ fi
+-echo "$as_me:4282: result: $ac_cv_sys_long_file_names" >&5
++echo "$as_me:4283: 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
+
+@@ -4298,7 +4299,7 @@
+ withval="$with_config_suffix"
+ case "x$withval" in
+ (xyes|xno)
+- { echo "$as_me:4301: WARNING: expected a value for config-suffix option" >&5
++ { echo "$as_me:4302: 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"
+@@ -4308,7 +4309,7 @@
+
+ # If we find pkg-config, check if we should install the ".pc" files.
+
+-echo "$as_me:4311: checking if you want to use pkg-config" >&5
++echo "$as_me:4312: 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.
+@@ -4318,7 +4319,7 @@
+ else
+ cf_pkg_config=yes
+ fi;
+-echo "$as_me:4321: result: $cf_pkg_config" >&5
++echo "$as_me:4322: result: $cf_pkg_config" >&5
+ echo "${ECHO_T}$cf_pkg_config" >&6
+
+ case "$cf_pkg_config" in
+@@ -4330,7 +4331,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:4333: checking for $ac_word" >&5
++echo "$as_me:4334: 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
+@@ -4347,7 +4348,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:4350: found $ac_dir/$ac_word" >&5
++ echo "$as_me:4351: found $ac_dir/$ac_word" >&5
+ break
+ fi
+ done
+@@ -4358,10 +4359,10 @@
+ PKG_CONFIG=$ac_cv_path_PKG_CONFIG
+
+ if test -n "$PKG_CONFIG"; then
+- echo "$as_me:4361: result: $PKG_CONFIG" >&5
++ echo "$as_me:4362: result: $PKG_CONFIG" >&5
+ echo "${ECHO_T}$PKG_CONFIG" >&6
+ else
+- echo "$as_me:4364: result: no" >&5
++ echo "$as_me:4365: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+
+@@ -4370,7 +4371,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:4373: checking for $ac_word" >&5
++echo "$as_me:4374: 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
+@@ -4387,7 +4388,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:4390: found $ac_dir/$ac_word" >&5
++ echo "$as_me:4391: found $ac_dir/$ac_word" >&5
+ break
+ fi
+ done
+@@ -4399,10 +4400,10 @@
+ ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG
+
+ if test -n "$ac_pt_PKG_CONFIG"; then
+- echo "$as_me:4402: result: $ac_pt_PKG_CONFIG" >&5
++ echo "$as_me:4403: result: $ac_pt_PKG_CONFIG" >&5
+ echo "${ECHO_T}$ac_pt_PKG_CONFIG" >&6
+ else
+- echo "$as_me:4405: result: no" >&5
++ echo "$as_me:4406: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+
+@@ -4445,24 +4446,24 @@
+ PKG_CONFIG=`echo "$PKG_CONFIG" | sed -e s%NONE%$cf_path_syntax%`
+ ;;
+ (*)
+- { { echo "$as_me:4448: error: expected a pathname, not \"$PKG_CONFIG\"" >&5
++ { { echo "$as_me:4449: 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:4455: WARNING: pkg-config is not installed" >&5
++ { echo "$as_me:4456: 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:4461: checking for pkg-config library directory" >&5
++ echo "$as_me:4462: checking for pkg-config library directory" >&5
+ echo $ECHO_N "checking for pkg-config library directory... $ECHO_C" >&6
+ ;;
+ (*)
+- echo "$as_me:4465: checking for $PKG_CONFIG library directory" >&5
++ echo "$as_me:4466: checking for $PKG_CONFIG library directory" >&5
+ echo $ECHO_N "checking for $PKG_CONFIG library directory... $ECHO_C" >&6
+ ;;
+ esac
+@@ -4489,7 +4490,7 @@
+ case "x$cf_search_path" in
+ (xlibdir)
+ PKG_CONFIG_LIBDIR='${libdir}/pkgconfig'
+- echo "$as_me:4492: result: $PKG_CONFIG_LIBDIR" >&5
++ echo "$as_me:4493: result: $PKG_CONFIG_LIBDIR" >&5
+ echo "${ECHO_T}$PKG_CONFIG_LIBDIR" >&6
+ cf_search_path=
+ ;;
+@@ -4500,16 +4501,16 @@
+ ;;
+ (x/*)
+ PKG_CONFIG_LIBDIR="$cf_search_path"
+- echo "$as_me:4503: result: $PKG_CONFIG_LIBDIR" >&5
++ echo "$as_me:4504: result: $PKG_CONFIG_LIBDIR" >&5
+ echo "${ECHO_T}$PKG_CONFIG_LIBDIR" >&6
+ cf_search_path=
+ ;;
+ (xyes|xauto)
+- echo "$as_me:4508: result: auto" >&5
++ echo "$as_me:4509: 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:4512: checking for search-list" >&5
++ echo "$as_me:4513: checking for search-list" >&5
+ echo $ECHO_N "checking for search-list... $ECHO_C" >&6
+ if test "x$PKG_CONFIG" != xnone
+ then
+@@ -4536,11 +4537,11 @@
+ "`
+ fi
+
+- echo "$as_me:4539: result: $cf_search_path" >&5
++ echo "$as_me:4540: result: $cf_search_path" >&5
+ echo "${ECHO_T}$cf_search_path" >&6
+ ;;
+ (*)
+- { { echo "$as_me:4543: error: Unexpected option value: $cf_search_path" >&5
++ { { echo "$as_me:4544: error: Unexpected option value: $cf_search_path" >&5
+ echo "$as_me: error: Unexpected option value: $cf_search_path" >&2;}
+ { (exit 1); exit 1; }; }
+ ;;
+@@ -4548,7 +4549,7 @@
+
+ if test -n "$cf_search_path"
+ then
+- echo "$as_me:4551: checking for first directory" >&5
++ echo "$as_me:4552: 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
+@@ -4559,7 +4560,7 @@
+ break
+ fi
+ done
+- echo "$as_me:4562: result: $cf_pkg_config_path" >&5
++ echo "$as_me:4563: result: $cf_pkg_config_path" >&5
+ echo "${ECHO_T}$cf_pkg_config_path" >&6
+
+ if test "x$cf_pkg_config_path" != xnone ; then
+@@ -4569,7 +4570,7 @@
+
+ if test -z "$PKG_CONFIG_LIBDIR" && test -n "$cf_search_path"
+ then
+- echo "$as_me:4572: checking for workaround" >&5
++ echo "$as_me:4573: checking for workaround" >&5
+ echo $ECHO_N "checking for workaround... $ECHO_C" >&6
+ if test "$prefix" = "NONE" ; then
+ cf_prefix="$ac_default_prefix"
+@@ -4592,17 +4593,17 @@
+ esac
+ done
+ test -z "$PKG_CONFIG_LIBDIR" && PKG_CONFIG_LIBDIR=$cf_backup
+- echo "$as_me:4595: result: $PKG_CONFIG_LIBDIR" >&5
++ echo "$as_me:4596: result: $PKG_CONFIG_LIBDIR" >&5
+ echo "${ECHO_T}$PKG_CONFIG_LIBDIR" >&6
+ fi
+ fi
+
+ if test "x$PKG_CONFIG" != xnone
+ then
+- echo "$as_me:4602: checking if we should install .pc files for $PKG_CONFIG" >&5
++ echo "$as_me:4603: 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:4605: checking if we should install .pc files" >&5
++ echo "$as_me:4606: checking if we should install .pc files" >&5
+ echo $ECHO_N "checking if we should install .pc files... $ECHO_C" >&6
+ fi
+
+@@ -4613,7 +4614,7 @@
+ else
+ enable_pc_files=no
+ fi;
+-echo "$as_me:4616: result: $enable_pc_files" >&5
++echo "$as_me:4617: result: $enable_pc_files" >&5
+ echo "${ECHO_T}$enable_pc_files" >&6
+
+ if test "x$enable_pc_files" != xno
+@@ -4621,7 +4622,7 @@
+ MAKE_PC_FILES=
+ case "x$PKG_CONFIG_LIBDIR" in
+ (xno|xnone|xyes|x)
+- { echo "$as_me:4624: WARNING: no PKG_CONFIG_LIBDIR was found" >&5
++ { echo "$as_me:4625: WARNING: no PKG_CONFIG_LIBDIR was found" >&5
+ echo "$as_me: WARNING: no PKG_CONFIG_LIBDIR was found" >&2;}
+ ;;
+ (*)
+@@ -4652,7 +4653,7 @@
+ cf_pkg_config_libdir=`echo "$cf_pkg_config_libdir" | sed -e s%NONE%$cf_path_syntax%`
+ ;;
+ (*)
+- { { echo "$as_me:4655: error: expected a pathname, not \"$cf_pkg_config_libdir\"" >&5
++ { { echo "$as_me:4656: 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; }; }
+ ;;
+@@ -4666,7 +4667,7 @@
+
+ if test -z "$MAKE_PC_FILES"
+ then
+- echo "$as_me:4669: checking for suffix to add to pkg-config files" >&5
++ echo "$as_me:4670: 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.
+@@ -4681,13 +4682,13 @@
+ esac
+ fi;
+ test -z "$PC_MODULE_SUFFIX" && PC_MODULE_SUFFIX=none
+- echo "$as_me:4684: result: $PC_MODULE_SUFFIX" >&5
++ echo "$as_me:4685: result: $PC_MODULE_SUFFIX" >&5
+ echo "${ECHO_T}$PC_MODULE_SUFFIX" >&6
+ test "$PC_MODULE_SUFFIX" = none && PC_MODULE_SUFFIX=
+
+ fi
+
+-echo "$as_me:4690: checking if we should assume mixed-case filenames" >&5
++echo "$as_me:4691: 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.
+@@ -4697,11 +4698,11 @@
+ else
+ enable_mixedcase=auto
+ fi;
+-echo "$as_me:4700: result: $enable_mixedcase" >&5
++echo "$as_me:4701: result: $enable_mixedcase" >&5
+ echo "${ECHO_T}$enable_mixedcase" >&6
+ if test "$enable_mixedcase" = "auto" ; then
+
+-echo "$as_me:4704: checking if filesystem supports mixed-case filenames" >&5
++echo "$as_me:4705: 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
+@@ -4728,7 +4729,7 @@
+ fi
+
+ fi
+-echo "$as_me:4731: result: $cf_cv_mixedcase" >&5
++echo "$as_me:4732: result: $cf_cv_mixedcase" >&5
+ echo "${ECHO_T}$cf_cv_mixedcase" >&6
+ test "$cf_cv_mixedcase" = yes &&
+ cat >>confdefs.h <<\EOF
+@@ -4747,7 +4748,7 @@
+ fi
+
+ # do this after mixed-case option (tags/TAGS is not as important as tic).
+-echo "$as_me:4750: checking whether ${MAKE-make} sets \${MAKE}" >&5
++echo "$as_me:4751: 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
+@@ -4767,16 +4768,16 @@
+ rm -f conftest.make
+ fi
+ if eval "test \"`echo '$ac_cv_prog_make_'${ac_make}_set`\" = yes"; then
+- echo "$as_me:4770: result: yes" >&5
++ echo "$as_me:4771: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ SET_MAKE=
+ else
+- echo "$as_me:4774: result: no" >&5
++ echo "$as_me:4775: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ SET_MAKE="MAKE=${MAKE-make}"
+ fi
+
+-echo "$as_me:4779: checking for \".PHONY\" make-support" >&5
++echo "$as_me:4780: 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
+@@ -4831,7 +4832,7 @@
+ rm -rf conftest*
+
+ fi
+-echo "$as_me:4834: result: $cf_cv_make_PHONY" >&5
++echo "$as_me:4835: result: $cf_cv_make_PHONY" >&5
+ echo "${ECHO_T}$cf_cv_make_PHONY" >&6
+ MAKE_NO_PHONY="#"
+ MAKE_PHONY="#"
+@@ -4842,7 +4843,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:4845: checking for $ac_word" >&5
++echo "$as_me:4846: 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
+@@ -4857,7 +4858,7 @@
+ test -z "$ac_dir" && ac_dir=.
+ $as_executable_p "$ac_dir/$ac_word" || continue
+ ac_cv_prog_CTAGS="$ac_prog"
+-echo "$as_me:4860: found $ac_dir/$ac_word" >&5
++echo "$as_me:4861: found $ac_dir/$ac_word" >&5
+ break
+ done
+
+@@ -4865,10 +4866,10 @@
+ fi
+ CTAGS=$ac_cv_prog_CTAGS
+ if test -n "$CTAGS"; then
+- echo "$as_me:4868: result: $CTAGS" >&5
++ echo "$as_me:4869: result: $CTAGS" >&5
+ echo "${ECHO_T}$CTAGS" >&6
+ else
+- echo "$as_me:4871: result: no" >&5
++ echo "$as_me:4872: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+
+@@ -4879,7 +4880,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:4882: checking for $ac_word" >&5
++echo "$as_me:4883: 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
+@@ -4894,7 +4895,7 @@
+ test -z "$ac_dir" && ac_dir=.
+ $as_executable_p "$ac_dir/$ac_word" || continue
+ ac_cv_prog_ETAGS="$ac_prog"
+-echo "$as_me:4897: found $ac_dir/$ac_word" >&5
++echo "$as_me:4898: found $ac_dir/$ac_word" >&5
+ break
+ done
+
+@@ -4902,10 +4903,10 @@
+ fi
+ ETAGS=$ac_cv_prog_ETAGS
+ if test -n "$ETAGS"; then
+- echo "$as_me:4905: result: $ETAGS" >&5
++ echo "$as_me:4906: result: $ETAGS" >&5
+ echo "${ECHO_T}$ETAGS" >&6
+ else
+- echo "$as_me:4908: result: no" >&5
++ echo "$as_me:4909: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+
+@@ -4914,7 +4915,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:4917: checking for $ac_word" >&5
++echo "$as_me:4918: 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
+@@ -4929,7 +4930,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:4932: found $ac_dir/$ac_word" >&5
++echo "$as_me:4933: found $ac_dir/$ac_word" >&5
+ break
+ done
+
+@@ -4938,17 +4939,17 @@
+ fi
+ MAKE_LOWER_TAGS=$ac_cv_prog_MAKE_LOWER_TAGS
+ if test -n "$MAKE_LOWER_TAGS"; then
+- echo "$as_me:4941: result: $MAKE_LOWER_TAGS" >&5
++ echo "$as_me:4942: result: $MAKE_LOWER_TAGS" >&5
+ echo "${ECHO_T}$MAKE_LOWER_TAGS" >&6
+ else
+- echo "$as_me:4944: result: no" >&5
++ echo "$as_me:4945: 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:4951: checking for $ac_word" >&5
++echo "$as_me:4952: 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
+@@ -4963,7 +4964,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:4966: found $ac_dir/$ac_word" >&5
++echo "$as_me:4967: found $ac_dir/$ac_word" >&5
+ break
+ done
+
+@@ -4972,10 +4973,10 @@
+ fi
+ MAKE_UPPER_TAGS=$ac_cv_prog_MAKE_UPPER_TAGS
+ if test -n "$MAKE_UPPER_TAGS"; then
+- echo "$as_me:4975: result: $MAKE_UPPER_TAGS" >&5
++ echo "$as_me:4976: result: $MAKE_UPPER_TAGS" >&5
+ echo "${ECHO_T}$MAKE_UPPER_TAGS" >&6
+ else
+- echo "$as_me:4978: result: no" >&5
++ echo "$as_me:4979: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+
+@@ -4995,7 +4996,7 @@
+ MAKE_LOWER_TAGS="#"
+ fi
+
+-echo "$as_me:4998: checking for makeflags variable" >&5
++echo "$as_me:4999: 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
+@@ -5025,7 +5026,7 @@
+ ;;
+ (*)
+
+-echo "${as_me:-configure}:5028: testing given option \"$cf_option\",no match \"$cf_result\" ..." 1>&5
++echo "${as_me:-configure}:5029: testing given option \"$cf_option\",no match \"$cf_result\" ..." 1>&5
+
+ ;;
+ esac
+@@ -5033,13 +5034,13 @@
+ rm -f cf_makeflags.tmp
+
+ fi
+-echo "$as_me:5036: result: $cf_cv_makeflags" >&5
++echo "$as_me:5037: 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:5042: checking for $ac_word" >&5
++echo "$as_me:5043: 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
+@@ -5054,7 +5055,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:5057: found $ac_dir/$ac_word" >&5
++echo "$as_me:5058: found $ac_dir/$ac_word" >&5
+ break
+ done
+
+@@ -5062,10 +5063,10 @@
+ fi
+ RANLIB=$ac_cv_prog_RANLIB
+ if test -n "$RANLIB"; then
+- echo "$as_me:5065: result: $RANLIB" >&5
++ echo "$as_me:5066: result: $RANLIB" >&5
+ echo "${ECHO_T}$RANLIB" >&6
+ else
+- echo "$as_me:5068: result: no" >&5
++ echo "$as_me:5069: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+
+@@ -5074,7 +5075,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:5077: checking for $ac_word" >&5
++echo "$as_me:5078: 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
+@@ -5089,7 +5090,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:5092: found $ac_dir/$ac_word" >&5
++echo "$as_me:5093: found $ac_dir/$ac_word" >&5
+ break
+ done
+
+@@ -5098,10 +5099,10 @@
+ fi
+ ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB
+ if test -n "$ac_ct_RANLIB"; then
+- echo "$as_me:5101: result: $ac_ct_RANLIB" >&5
++ echo "$as_me:5102: result: $ac_ct_RANLIB" >&5
+ echo "${ECHO_T}$ac_ct_RANLIB" >&6
+ else
+- echo "$as_me:5104: result: no" >&5
++ echo "$as_me:5105: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+
+@@ -5113,7 +5114,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:5116: checking for $ac_word" >&5
++echo "$as_me:5117: 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
+@@ -5128,7 +5129,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:5131: found $ac_dir/$ac_word" >&5
++echo "$as_me:5132: found $ac_dir/$ac_word" >&5
+ break
+ done
+
+@@ -5136,10 +5137,10 @@
+ fi
+ LD=$ac_cv_prog_LD
+ if test -n "$LD"; then
+- echo "$as_me:5139: result: $LD" >&5
++ echo "$as_me:5140: result: $LD" >&5
+ echo "${ECHO_T}$LD" >&6
+ else
+- echo "$as_me:5142: result: no" >&5
++ echo "$as_me:5143: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+
+@@ -5148,7 +5149,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:5151: checking for $ac_word" >&5
++echo "$as_me:5152: 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
+@@ -5163,7 +5164,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:5166: found $ac_dir/$ac_word" >&5
++echo "$as_me:5167: found $ac_dir/$ac_word" >&5
+ break
+ done
+
+@@ -5172,10 +5173,10 @@
+ fi
+ ac_ct_LD=$ac_cv_prog_ac_ct_LD
+ if test -n "$ac_ct_LD"; then
+- echo "$as_me:5175: result: $ac_ct_LD" >&5
++ echo "$as_me:5176: result: $ac_ct_LD" >&5
+ echo "${ECHO_T}$ac_ct_LD" >&6
+ else
+- echo "$as_me:5178: result: no" >&5
++ echo "$as_me:5179: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+
+@@ -5187,7 +5188,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:5190: checking for $ac_word" >&5
++echo "$as_me:5191: 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
+@@ -5202,7 +5203,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:5205: found $ac_dir/$ac_word" >&5
++echo "$as_me:5206: found $ac_dir/$ac_word" >&5
+ break
+ done
+
+@@ -5210,10 +5211,10 @@
+ fi
+ AR=$ac_cv_prog_AR
+ if test -n "$AR"; then
+- echo "$as_me:5213: result: $AR" >&5
++ echo "$as_me:5214: result: $AR" >&5
+ echo "${ECHO_T}$AR" >&6
+ else
+- echo "$as_me:5216: result: no" >&5
++ echo "$as_me:5217: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+
+@@ -5222,7 +5223,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:5225: checking for $ac_word" >&5
++echo "$as_me:5226: 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
+@@ -5237,7 +5238,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:5240: found $ac_dir/$ac_word" >&5
++echo "$as_me:5241: found $ac_dir/$ac_word" >&5
+ break
+ done
+
+@@ -5246,10 +5247,10 @@
+ fi
+ ac_ct_AR=$ac_cv_prog_ac_ct_AR
+ if test -n "$ac_ct_AR"; then
+- echo "$as_me:5249: result: $ac_ct_AR" >&5
++ echo "$as_me:5250: result: $ac_ct_AR" >&5
+ echo "${ECHO_T}$ac_ct_AR" >&6
+ else
+- echo "$as_me:5252: result: no" >&5
++ echo "$as_me:5253: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+
+@@ -5261,7 +5262,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:5264: checking for $ac_word" >&5
++echo "$as_me:5265: 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
+@@ -5276,7 +5277,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:5279: found $ac_dir/$ac_word" >&5
++echo "$as_me:5280: found $ac_dir/$ac_word" >&5
+ break
+ done
+
+@@ -5284,10 +5285,10 @@
+ fi
+ NM=$ac_cv_prog_NM
+ if test -n "$NM"; then
+- echo "$as_me:5287: result: $NM" >&5
++ echo "$as_me:5288: result: $NM" >&5
+ echo "${ECHO_T}$NM" >&6
+ else
+- echo "$as_me:5290: result: no" >&5
++ echo "$as_me:5291: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+
+@@ -5296,7 +5297,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:5299: checking for $ac_word" >&5
++echo "$as_me:5300: 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
+@@ -5311,7 +5312,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:5314: found $ac_dir/$ac_word" >&5
++echo "$as_me:5315: found $ac_dir/$ac_word" >&5
+ break
+ done
+
+@@ -5320,10 +5321,10 @@
+ fi
+ ac_ct_NM=$ac_cv_prog_ac_ct_NM
+ if test -n "$ac_ct_NM"; then
+- echo "$as_me:5323: result: $ac_ct_NM" >&5
++ echo "$as_me:5324: result: $ac_ct_NM" >&5
+ echo "${ECHO_T}$ac_ct_NM" >&6
+ else
+- echo "$as_me:5326: result: no" >&5
++ echo "$as_me:5327: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+
+@@ -5335,7 +5336,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:5338: checking for $ac_word" >&5
++echo "$as_me:5339: 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
+@@ -5350,7 +5351,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:5353: found $ac_dir/$ac_word" >&5
++echo "$as_me:5354: found $ac_dir/$ac_word" >&5
+ break
+ done
+
+@@ -5358,10 +5359,10 @@
+ fi
+ AR=$ac_cv_prog_AR
+ if test -n "$AR"; then
+- echo "$as_me:5361: result: $AR" >&5
++ echo "$as_me:5362: result: $AR" >&5
+ echo "${ECHO_T}$AR" >&6
+ else
+- echo "$as_me:5364: result: no" >&5
++ echo "$as_me:5365: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+
+@@ -5370,7 +5371,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:5373: checking for $ac_word" >&5
++echo "$as_me:5374: 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
+@@ -5385,7 +5386,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:5388: found $ac_dir/$ac_word" >&5
++echo "$as_me:5389: found $ac_dir/$ac_word" >&5
+ break
+ done
+
+@@ -5394,10 +5395,10 @@
+ fi
+ ac_ct_AR=$ac_cv_prog_ac_ct_AR
+ if test -n "$ac_ct_AR"; then
+- echo "$as_me:5397: result: $ac_ct_AR" >&5
++ echo "$as_me:5398: result: $ac_ct_AR" >&5
+ echo "${ECHO_T}$ac_ct_AR" >&6
+ else
+- echo "$as_me:5400: result: no" >&5
++ echo "$as_me:5401: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+
+@@ -5406,7 +5407,7 @@
+ AR="$ac_cv_prog_AR"
+ fi
+
+-echo "$as_me:5409: checking for options to update archives" >&5
++echo "$as_me:5410: 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
+@@ -5443,13 +5444,13 @@
+ rm -f conftest.a
+
+ cat >"conftest.$ac_ext" <<EOF
+-#line 5446 "configure"
++#line 5447 "configure"
+ int testdata[3] = { 123, 456, 789 };
+ EOF
+- if { (eval echo "$as_me:5449: \"$ac_compile\"") >&5
++ if { (eval echo "$as_me:5450: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:5452: \$? = $ac_status" >&5
++ echo "$as_me:5453: \$? = $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
+@@ -5460,7 +5461,7 @@
+ else
+ test -n "$verbose" && echo " cannot compile test-program" 1>&6
+
+-echo "${as_me:-configure}:5463: testing cannot compile test-program ..." 1>&5
++echo "${as_me:-configure}:5464: testing cannot compile test-program ..." 1>&5
+
+ break
+ fi
+@@ -5470,7 +5471,7 @@
+ esac
+
+ fi
+-echo "$as_me:5473: result: $cf_cv_ar_flags" >&5
++echo "$as_me:5474: result: $cf_cv_ar_flags" >&5
+ echo "${ECHO_T}$cf_cv_ar_flags" >&6
+
+ if test -n "$ARFLAGS" ; then
+@@ -5481,7 +5482,7 @@
+ ARFLAGS=$cf_cv_ar_flags
+ fi
+
+-echo "$as_me:5484: checking for an installation directory prefix" >&5
++echo "$as_me:5485: 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.
+@@ -5494,7 +5495,7 @@
+ ;;
+ esac
+ fi;
+-echo "$as_me:5497: result: ${DESTDIR:-(none)}" >&5
++echo "$as_me:5498: result: ${DESTDIR:-(none)}" >&5
+ echo "${ECHO_T}${DESTDIR:-(none)}" >&6
+
+ ###############################################################################
+@@ -5529,7 +5530,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:5532: checking for $ac_word" >&5
++echo "$as_me:5533: 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
+@@ -5544,7 +5545,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:5547: found $ac_dir/$ac_word" >&5
++echo "$as_me:5548: found $ac_dir/$ac_word" >&5
+ break
+ done
+
+@@ -5552,10 +5553,10 @@
+ fi
+ BUILD_CC=$ac_cv_prog_BUILD_CC
+ if test -n "$BUILD_CC"; then
+- echo "$as_me:5555: result: $BUILD_CC" >&5
++ echo "$as_me:5556: result: $BUILD_CC" >&5
+ echo "${ECHO_T}$BUILD_CC" >&6
+ else
+- echo "$as_me:5558: result: no" >&5
++ echo "$as_me:5559: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+
+@@ -5564,12 +5565,12 @@
+ test -n "$BUILD_CC" || BUILD_CC="none"
+
+ fi;
+- echo "$as_me:5567: checking for native build C compiler" >&5
++ echo "$as_me:5568: checking for native build C compiler" >&5
+ echo $ECHO_N "checking for native build C compiler... $ECHO_C" >&6
+- echo "$as_me:5569: result: $BUILD_CC" >&5
++ echo "$as_me:5570: result: $BUILD_CC" >&5
+ echo "${ECHO_T}$BUILD_CC" >&6
+
+- echo "$as_me:5572: checking for native build C preprocessor" >&5
++ echo "$as_me:5573: 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.
+@@ -5579,10 +5580,10 @@
+ else
+ BUILD_CPP='${BUILD_CC} -E'
+ fi;
+- echo "$as_me:5582: result: $BUILD_CPP" >&5
++ echo "$as_me:5583: result: $BUILD_CPP" >&5
+ echo "${ECHO_T}$BUILD_CPP" >&6
+
+- echo "$as_me:5585: checking for native build C flags" >&5
++ echo "$as_me:5586: 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.
+@@ -5590,10 +5591,10 @@
+ withval="$with_build_cflags"
+ BUILD_CFLAGS="$withval"
+ fi;
+- echo "$as_me:5593: result: $BUILD_CFLAGS" >&5
++ echo "$as_me:5594: result: $BUILD_CFLAGS" >&5
+ echo "${ECHO_T}$BUILD_CFLAGS" >&6
+
+- echo "$as_me:5596: checking for native build C preprocessor-flags" >&5
++ echo "$as_me:5597: 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.
+@@ -5601,10 +5602,10 @@
+ withval="$with_build_cppflags"
+ BUILD_CPPFLAGS="$withval"
+ fi;
+- echo "$as_me:5604: result: $BUILD_CPPFLAGS" >&5
++ echo "$as_me:5605: result: $BUILD_CPPFLAGS" >&5
+ echo "${ECHO_T}$BUILD_CPPFLAGS" >&6
+
+- echo "$as_me:5607: checking for native build linker-flags" >&5
++ echo "$as_me:5608: 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.
+@@ -5612,10 +5613,10 @@
+ withval="$with_build_ldflags"
+ BUILD_LDFLAGS="$withval"
+ fi;
+- echo "$as_me:5615: result: $BUILD_LDFLAGS" >&5
++ echo "$as_me:5616: result: $BUILD_LDFLAGS" >&5
+ echo "${ECHO_T}$BUILD_LDFLAGS" >&6
+
+- echo "$as_me:5618: checking for native build linker-libraries" >&5
++ echo "$as_me:5619: 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.
+@@ -5623,7 +5624,7 @@
+ withval="$with_build_libs"
+ BUILD_LIBS="$withval"
+ fi;
+- echo "$as_me:5626: result: $BUILD_LIBS" >&5
++ echo "$as_me:5627: result: $BUILD_LIBS" >&5
+ echo "${ECHO_T}$BUILD_LIBS" >&6
+
+ # this assumes we're on Unix.
+@@ -5632,7 +5633,7 @@
+
+ : ${BUILD_CC:='${CC}'}
+
+- echo "$as_me:5635: checking if the build-compiler \"$BUILD_CC\" works" >&5
++ echo "$as_me:5636: 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
+@@ -5646,7 +5647,7 @@
+ cf_ok_build_cc=unknown
+ else
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 5649 "configure"
++#line 5650 "configure"
+ #include "confdefs.h"
+ #include <stdio.h>
+ int main(int argc, char *argv[])
+@@ -5656,15 +5657,15 @@
+
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:5659: \"$ac_link\"") >&5
++if { (eval echo "$as_me:5660: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:5662: \$? = $ac_status" >&5
++ echo "$as_me:5663: \$? = $ac_status" >&5
+ (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+- { (eval echo "$as_me:5664: \"$ac_try\"") >&5
++ { (eval echo "$as_me:5665: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:5667: \$? = $ac_status" >&5
++ echo "$as_me:5668: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_ok_build_cc=yes
+ else
+@@ -5679,12 +5680,12 @@
+ cross_compiling=$cf_save_crossed
+ ac_link=$cf_save_ac_link
+
+- echo "$as_me:5682: result: $cf_ok_build_cc" >&5
++ echo "$as_me:5683: 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:5687: error: Cross-build requires two compilers.
++ { { echo "$as_me:5688: 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;}
+@@ -5709,7 +5710,7 @@
+ ### shared, for example.
+ cf_list_models=""
+
+-echo "$as_me:5712: checking if libtool -version-number should be used" >&5
++echo "$as_me:5713: 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.
+@@ -5726,7 +5727,7 @@
+ cf_libtool_version=yes
+
+ fi;
+-echo "$as_me:5729: result: $cf_libtool_version" >&5
++echo "$as_me:5730: result: $cf_libtool_version" >&5
+ echo "${ECHO_T}$cf_libtool_version" >&6
+
+ if test "$cf_libtool_version" = yes ; then
+@@ -5735,25 +5736,25 @@
+ LIBTOOL_VERSION="-version-info"
+ case "x$VERSION" in
+ (x)
+- { echo "$as_me:5738: WARNING: VERSION was not set" >&5
++ { echo "$as_me:5739: 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}:5745: testing ABI_VERSION: $ABI_VERSION ..." 1>&5
++echo "${as_me:-configure}:5746: 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}:5752: testing ABI_VERSION: $ABI_VERSION ..." 1>&5
++echo "${as_me:-configure}:5753: testing ABI_VERSION: $ABI_VERSION ..." 1>&5
+
+ ;;
+ (*)
+- { echo "$as_me:5756: WARNING: unexpected VERSION value: $VERSION" >&5
++ { echo "$as_me:5757: WARNING: unexpected VERSION value: $VERSION" >&5
+ echo "$as_me: WARNING: unexpected VERSION value: $VERSION" >&2;}
+ ;;
+ esac
+@@ -5775,7 +5776,7 @@
+ LIB_INSTALL=
+ LIB_UNINSTALL=
+
+-echo "$as_me:5778: checking if you want to build libraries with libtool" >&5
++echo "$as_me:5779: 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.
+@@ -5785,7 +5786,7 @@
+ else
+ with_libtool=no
+ fi;
+-echo "$as_me:5788: result: $with_libtool" >&5
++echo "$as_me:5789: result: $with_libtool" >&5
+ echo "${ECHO_T}$with_libtool" >&6
+ if test "$with_libtool" != "no"; then
+
+@@ -5816,7 +5817,7 @@
+ with_libtool=`echo "$with_libtool" | sed -e s%NONE%$cf_path_syntax%`
+ ;;
+ (*)
+- { { echo "$as_me:5819: error: expected a pathname, not \"$with_libtool\"" >&5
++ { { echo "$as_me:5820: error: expected a pathname, not \"$with_libtool\"" >&5
+ echo "$as_me: error: expected a pathname, not \"$with_libtool\"" >&2;}
+ { (exit 1); exit 1; }; }
+ ;;
+@@ -5829,7 +5830,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:5832: checking for $ac_word" >&5
++echo "$as_me:5833: 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
+@@ -5844,7 +5845,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:5847: found $ac_dir/$ac_word" >&5
++echo "$as_me:5848: found $ac_dir/$ac_word" >&5
+ break
+ done
+
+@@ -5852,10 +5853,10 @@
+ fi
+ LIBTOOL=$ac_cv_prog_LIBTOOL
+ if test -n "$LIBTOOL"; then
+- echo "$as_me:5855: result: $LIBTOOL" >&5
++ echo "$as_me:5856: result: $LIBTOOL" >&5
+ echo "${ECHO_T}$LIBTOOL" >&6
+ else
+- echo "$as_me:5858: result: no" >&5
++ echo "$as_me:5859: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+
+@@ -5868,7 +5869,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:5871: checking for $ac_word" >&5
++echo "$as_me:5872: 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
+@@ -5883,7 +5884,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:5886: found $ac_dir/$ac_word" >&5
++echo "$as_me:5887: found $ac_dir/$ac_word" >&5
+ break
+ done
+
+@@ -5891,10 +5892,10 @@
+ fi
+ ac_ct_LIBTOOL=$ac_cv_prog_ac_ct_LIBTOOL
+ if test -n "$ac_ct_LIBTOOL"; then
+- echo "$as_me:5894: result: $ac_ct_LIBTOOL" >&5
++ echo "$as_me:5895: result: $ac_ct_LIBTOOL" >&5
+ echo "${ECHO_T}$ac_ct_LIBTOOL" >&6
+ else
+- echo "$as_me:5897: result: no" >&5
++ echo "$as_me:5898: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+
+@@ -5925,7 +5926,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:5928: checking for $ac_word" >&5
++echo "$as_me:5929: 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
+@@ -5940,7 +5941,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:5943: found $ac_dir/$ac_word" >&5
++echo "$as_me:5944: found $ac_dir/$ac_word" >&5
+ break
+ done
+
+@@ -5948,10 +5949,10 @@
+ fi
+ LIBTOOL=$ac_cv_prog_LIBTOOL
+ if test -n "$LIBTOOL"; then
+- echo "$as_me:5951: result: $LIBTOOL" >&5
++ echo "$as_me:5952: result: $LIBTOOL" >&5
+ echo "${ECHO_T}$LIBTOOL" >&6
+ else
+- echo "$as_me:5954: result: no" >&5
++ echo "$as_me:5955: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+
+@@ -5964,7 +5965,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:5967: checking for $ac_word" >&5
++echo "$as_me:5968: 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
+@@ -5979,7 +5980,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:5982: found $ac_dir/$ac_word" >&5
++echo "$as_me:5983: found $ac_dir/$ac_word" >&5
+ break
+ done
+
+@@ -5987,10 +5988,10 @@
+ fi
+ ac_ct_LIBTOOL=$ac_cv_prog_ac_ct_LIBTOOL
+ if test -n "$ac_ct_LIBTOOL"; then
+- echo "$as_me:5990: result: $ac_ct_LIBTOOL" >&5
++ echo "$as_me:5991: result: $ac_ct_LIBTOOL" >&5
+ echo "${ECHO_T}$ac_ct_LIBTOOL" >&6
+ else
+- echo "$as_me:5993: result: no" >&5
++ echo "$as_me:5994: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+
+@@ -6012,7 +6013,7 @@
+ fi
+ fi
+ if test -z "$LIBTOOL" ; then
+- { { echo "$as_me:6015: error: Cannot find libtool" >&5
++ { { echo "$as_me:6016: error: Cannot find libtool" >&5
+ echo "$as_me: error: Cannot find libtool" >&2;}
+ { (exit 1); exit 1; }; }
+ fi
+@@ -6028,7 +6029,7 @@
+
+ if test -n "$LIBTOOL" && test "$LIBTOOL" != none
+ then
+- echo "$as_me:6031: checking version of $LIBTOOL" >&5
++ echo "$as_me:6032: checking version of $LIBTOOL" >&5
+ echo $ECHO_N "checking version of $LIBTOOL... $ECHO_C" >&6
+
+ if test -n "$LIBTOOL" && test "$LIBTOOL" != none
+@@ -6039,8 +6040,9 @@
+ fi
+ test -z "$cf_cv_libtool_version" && unset cf_cv_libtool_version
+
+- echo "$as_me:6042: result: $cf_cv_libtool_version" >&5
++ echo "$as_me:6043: result: $cf_cv_libtool_version" >&5
+ echo "${ECHO_T}$cf_cv_libtool_version" >&6
++
+ if test -n "$cf_cv_libtool_version"
+ then
+ cf_check_libtool_version=`$LIBTOOL --version 2>&1 | sed -e '/^$/d' -e 's,[()],...,g' -e 's,[ ],-,g' -e '2,$d'`
+@@ -6048,18 +6050,19 @@
+ (*...GNU-libtool...*)
+ ;;
+ (*)
+- { { echo "$as_me:6051: error: This is not GNU libtool" >&5
++ { { echo "$as_me:6053: 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:6057: error: No version found for $LIBTOOL" >&5
++ { { echo "$as_me:6059: 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:6062: error: GNU libtool has not been found" >&5
++ { { echo "$as_me:6065: error: GNU libtool has not been found" >&5
+ echo "$as_me: error: GNU libtool has not been found" >&2;}
+ { (exit 1); exit 1; }; }
+ fi
+@@ -6095,7 +6098,7 @@
+
+ else
+
+-echo "$as_me:6098: checking if you want to build shared libraries" >&5
++echo "$as_me:6101: 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.
+@@ -6105,11 +6108,11 @@
+ else
+ with_shared=no
+ fi;
+-echo "$as_me:6108: result: $with_shared" >&5
++echo "$as_me:6111: 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:6112: checking if you want to build static libraries" >&5
++echo "$as_me:6115: 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.
+@@ -6119,11 +6122,11 @@
+ else
+ with_normal=yes
+ fi;
+-echo "$as_me:6122: result: $with_normal" >&5
++echo "$as_me:6125: 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:6126: checking if you want to build debug libraries" >&5
++echo "$as_me:6129: 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.
+@@ -6133,11 +6136,11 @@
+ else
+ with_debug=yes
+ fi;
+-echo "$as_me:6136: result: $with_debug" >&5
++echo "$as_me:6139: 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:6140: checking if you want to build profiling libraries" >&5
++echo "$as_me:6143: 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.
+@@ -6147,7 +6150,7 @@
+ else
+ with_profile=no
+ fi;
+-echo "$as_me:6150: result: $with_profile" >&5
++echo "$as_me:6153: result: $with_profile" >&5
+ echo "${ECHO_T}$with_profile" >&6
+ test "x$with_profile" = "xyes" && cf_list_models="$cf_list_models profile"
+
+@@ -6155,7 +6158,7 @@
+
+ if test "X$cf_with_cxx_binding" != Xno; then
+ if test "x$with_shared" = "xyes"; then
+-echo "$as_me:6158: checking if you want to build C++ shared libraries" >&5
++echo "$as_me:6161: 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.
+@@ -6165,26 +6168,26 @@
+ else
+ with_shared_cxx=no
+ fi;
+-echo "$as_me:6168: result: $with_shared_cxx" >&5
++echo "$as_me:6171: result: $with_shared_cxx" >&5
+ echo "${ECHO_T}$with_shared_cxx" >&6
+ fi
+ fi
+
+ ###############################################################################
+
+-echo "$as_me:6175: checking for specified models" >&5
++echo "$as_me:6178: 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:6179: result: $cf_list_models" >&5
++echo "$as_me:6182: 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:6184: checking for default model" >&5
++echo "$as_me:6187: 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:6187: result: $DFT_LWR_MODEL" >&5
++echo "$as_me:6190: result: $DFT_LWR_MODEL" >&5
+ echo "${ECHO_T}$DFT_LWR_MODEL" >&6
+
+ DFT_UPR_MODEL=`echo "$DFT_LWR_MODEL" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%`
+@@ -6198,7 +6201,7 @@
+ LIB_DIR=../lib
+ LIB_2ND=../../lib
+
+-echo "$as_me:6201: checking if you want to have a library-prefix" >&5
++echo "$as_me:6204: 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.
+@@ -6208,7 +6211,7 @@
+ else
+ with_lib_prefix=auto
+ fi;
+-echo "$as_me:6211: result: $with_lib_prefix" >&5
++echo "$as_me:6214: result: $with_lib_prefix" >&5
+ echo "${ECHO_T}$with_lib_prefix" >&6
+
+ if test "$with_lib_prefix" = auto
+@@ -6239,24 +6242,24 @@
+
+ LIB_SUFFIX=
+
+- echo "$as_me:6242: checking for PATH separator" >&5
++ echo "$as_me:6245: 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:6249: result: $PATH_SEPARATOR" >&5
++ echo "$as_me:6252: result: $PATH_SEPARATOR" >&5
+ echo "${ECHO_T}$PATH_SEPARATOR" >&6
+
+ # headers needed for checks...
+-echo "$as_me:6253: checking for ANSI C header files" >&5
++echo "$as_me:6256: 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 6259 "configure"
++#line 6262 "configure"
+ #include "confdefs.h"
+ #include <stdlib.h>
+ #include <stdarg.h>
+@@ -6264,13 +6267,13 @@
+ #include <float.h>
+
+ _ACEOF
+-if { (eval echo "$as_me:6267: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:6270: \"$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:6273: \$? = $ac_status" >&5
++ echo "$as_me:6276: \$? = $ac_status" >&5
+ (exit "$ac_status"); } >/dev/null; then
+ if test -s conftest.err; then
+ ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -6292,7 +6295,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 6295 "configure"
++#line 6298 "configure"
+ #include "confdefs.h"
+ #include <string.h>
+
+@@ -6310,7 +6313,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 6313 "configure"
++#line 6316 "configure"
+ #include "confdefs.h"
+ #include <stdlib.h>
+
+@@ -6331,7 +6334,7 @@
+ :
+ else
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 6334 "configure"
++#line 6337 "configure"
+ #include "confdefs.h"
+ #include <ctype.h>
+ #if ((' ' & 0x0FF) == 0x020)
+@@ -6357,15 +6360,15 @@
+ }
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:6360: \"$ac_link\"") >&5
++if { (eval echo "$as_me:6363: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:6363: \$? = $ac_status" >&5
++ echo "$as_me:6366: \$? = $ac_status" >&5
+ (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+- { (eval echo "$as_me:6365: \"$ac_try\"") >&5
++ { (eval echo "$as_me:6368: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:6368: \$? = $ac_status" >&5
++ echo "$as_me:6371: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ :
+ else
+@@ -6378,7 +6381,7 @@
+ fi
+ fi
+ fi
+-echo "$as_me:6381: result: $ac_cv_header_stdc" >&5
++echo "$as_me:6384: result: $ac_cv_header_stdc" >&5
+ echo "${ECHO_T}$ac_cv_header_stdc" >&6
+ if test $ac_cv_header_stdc = yes; then
+
+@@ -6394,28 +6397,28 @@
+ inttypes.h stdint.h unistd.h
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-echo "$as_me:6397: checking for $ac_header" >&5
++echo "$as_me:6400: 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 6403 "configure"
++#line 6406 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ #include <$ac_header>
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:6409: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:6412: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:6412: \$? = $ac_status" >&5
++ echo "$as_me:6415: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:6415: \"$ac_try\"") >&5
++ { (eval echo "$as_me:6418: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:6418: \$? = $ac_status" >&5
++ echo "$as_me:6421: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ eval "$as_ac_Header=yes"
+ else
+@@ -6425,7 +6428,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:6428: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
++echo "$as_me:6431: 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
+@@ -6435,13 +6438,13 @@
+ fi
+ done
+
+-echo "$as_me:6438: checking whether exit is declared" >&5
++echo "$as_me:6441: 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 6444 "configure"
++#line 6447 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -6456,16 +6459,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:6459: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:6462: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:6462: \$? = $ac_status" >&5
++ echo "$as_me:6465: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:6465: \"$ac_try\"") >&5
++ { (eval echo "$as_me:6468: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:6468: \$? = $ac_status" >&5
++ echo "$as_me:6471: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_have_decl_exit=yes
+ else
+@@ -6475,19 +6478,19 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:6478: result: $ac_cv_have_decl_exit" >&5
++echo "$as_me:6481: 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:6484: checking for $ac_hdr that defines DIR" >&5
++echo "$as_me:6487: 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 6490 "configure"
++#line 6493 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ #include <$ac_hdr>
+@@ -6502,16 +6505,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:6505: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:6508: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:6508: \$? = $ac_status" >&5
++ echo "$as_me:6511: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:6511: \"$ac_try\"") >&5
++ { (eval echo "$as_me:6514: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:6514: \$? = $ac_status" >&5
++ echo "$as_me:6517: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ eval "$as_ac_Header=yes"
+ else
+@@ -6521,7 +6524,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:6524: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
++echo "$as_me:6527: 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
+@@ -6534,7 +6537,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:6537: checking for opendir in -ldir" >&5
++ echo "$as_me:6540: 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
+@@ -6542,7 +6545,7 @@
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-ldir $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 6545 "configure"
++#line 6548 "configure"
+ #include "confdefs.h"
+
+ /* Override any gcc2 internal prototype to avoid an error. */
+@@ -6561,16 +6564,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:6564: \"$ac_link\"") >&5
++if { (eval echo "$as_me:6567: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:6567: \$? = $ac_status" >&5
++ echo "$as_me:6570: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:6570: \"$ac_try\"") >&5
++ { (eval echo "$as_me:6573: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:6573: \$? = $ac_status" >&5
++ echo "$as_me:6576: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_lib_dir_opendir=yes
+ else
+@@ -6581,14 +6584,14 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:6584: result: $ac_cv_lib_dir_opendir" >&5
++echo "$as_me:6587: 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:6591: checking for opendir in -lx" >&5
++ echo "$as_me:6594: 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
+@@ -6596,7 +6599,7 @@
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lx $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 6599 "configure"
++#line 6602 "configure"
+ #include "confdefs.h"
+
+ /* Override any gcc2 internal prototype to avoid an error. */
+@@ -6615,16 +6618,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:6618: \"$ac_link\"") >&5
++if { (eval echo "$as_me:6621: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:6621: \$? = $ac_status" >&5
++ echo "$as_me:6624: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:6624: \"$ac_try\"") >&5
++ { (eval echo "$as_me:6627: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:6627: \$? = $ac_status" >&5
++ echo "$as_me:6630: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_lib_x_opendir=yes
+ else
+@@ -6635,7 +6638,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:6638: result: $ac_cv_lib_x_opendir" >&5
++echo "$as_me:6641: 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"
+@@ -6645,7 +6648,7 @@
+
+ ###############################################################################
+
+-echo "$as_me:6648: checking if you want to build a separate terminfo library" >&5
++echo "$as_me:6651: 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.
+@@ -6655,10 +6658,10 @@
+ else
+ with_termlib=no
+ fi;
+-echo "$as_me:6658: result: $with_termlib" >&5
++echo "$as_me:6661: result: $with_termlib" >&5
+ echo "${ECHO_T}$with_termlib" >&6
+
+-echo "$as_me:6661: checking if you want to build a separate tic library" >&5
++echo "$as_me:6664: 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.
+@@ -6668,7 +6671,7 @@
+ else
+ with_ticlib=no
+ fi;
+-echo "$as_me:6671: result: $with_ticlib" >&5
++echo "$as_me:6674: result: $with_ticlib" >&5
+ echo "${ECHO_T}$with_ticlib" >&6
+
+ if test X"$CC_G_OPT" = X"" ; then
+@@ -6681,7 +6684,7 @@
+ test -n "$GXX" && test "x${ac_cv_prog_cxx_g}" != xyes && CXX_G_OPT=''
+ fi
+
+-echo "$as_me:6684: checking for default loader flags" >&5
++echo "$as_me:6687: 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='' ;;
+@@ -6690,13 +6693,13 @@
+ (profile) LD_MODEL='-pg';;
+ (shared) LD_MODEL='' ;;
+ esac
+-echo "$as_me:6693: result: ${LD_MODEL:-(none)}" >&5
++echo "$as_me:6696: result: ${LD_MODEL:-(none)}" >&5
+ echo "${ECHO_T}${LD_MODEL:-(none)}" >&6
+
+ case "$DFT_LWR_MODEL" in
+ (shared)
+
+-echo "$as_me:6699: checking if rpath option should be used" >&5
++echo "$as_me:6702: 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.
+@@ -6706,10 +6709,10 @@
+ else
+ cf_cv_enable_rpath=no
+ fi;
+-echo "$as_me:6709: result: $cf_cv_enable_rpath" >&5
++echo "$as_me:6712: result: $cf_cv_enable_rpath" >&5
+ echo "${ECHO_T}$cf_cv_enable_rpath" >&6
+
+-echo "$as_me:6712: checking if shared libraries should be relinked during install" >&5
++echo "$as_me:6715: 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.
+@@ -6719,7 +6722,7 @@
+ else
+ cf_cv_do_relink=yes
+ fi;
+-echo "$as_me:6722: result: $cf_cv_do_relink" >&5
++echo "$as_me:6725: result: $cf_cv_do_relink" >&5
+ echo "${ECHO_T}$cf_cv_do_relink" >&6
+ ;;
+ esac
+@@ -6730,7 +6733,7 @@
+ LD_RPATH_OPT=
+ if test "x$cf_cv_enable_rpath" != xno
+ then
+- echo "$as_me:6733: checking for an rpath option" >&5
++ echo "$as_me:6736: checking for an rpath option" >&5
+ echo $ECHO_N "checking for an rpath option... $ECHO_C" >&6
+ case "$cf_cv_system_name" in
+ (irix*)
+@@ -6761,12 +6764,12 @@
+ (*)
+ ;;
+ esac
+- echo "$as_me:6764: result: $LD_RPATH_OPT" >&5
++ echo "$as_me:6767: result: $LD_RPATH_OPT" >&5
+ echo "${ECHO_T}$LD_RPATH_OPT" >&6
+
+ case "x$LD_RPATH_OPT" in
+ (x-R*)
+- echo "$as_me:6769: checking if we need a space after rpath option" >&5
++ echo "$as_me:6772: 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"
+
+@@ -6787,7 +6790,7 @@
+ LIBS="$cf_add_libs"
+
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 6790 "configure"
++#line 6793 "configure"
+ #include "confdefs.h"
+
+ int
+@@ -6799,16 +6802,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:6802: \"$ac_link\"") >&5
++if { (eval echo "$as_me:6805: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:6805: \$? = $ac_status" >&5
++ echo "$as_me:6808: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:6808: \"$ac_try\"") >&5
++ { (eval echo "$as_me:6811: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:6811: \$? = $ac_status" >&5
++ echo "$as_me:6814: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_rpath_space=no
+ else
+@@ -6818,7 +6821,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS="$cf_save_LIBS"
+- echo "$as_me:6821: result: $cf_rpath_space" >&5
++ echo "$as_me:6824: result: $cf_rpath_space" >&5
+ echo "${ECHO_T}$cf_rpath_space" >&6
+ test "$cf_rpath_space" = yes && LD_RPATH_OPT="$LD_RPATH_OPT "
+ ;;
+@@ -6840,7 +6843,7 @@
+ cf_ld_rpath_opt=
+ test "$cf_cv_enable_rpath" = yes && cf_ld_rpath_opt="$LD_RPATH_OPT"
+
+- echo "$as_me:6843: checking whether to use release or ABI version in shared library file names" >&5
++ echo "$as_me:6846: 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.
+@@ -6855,9 +6858,9 @@
+ cf_cv_shlib_version=$withval
+ ;;
+ (*)
+- echo "$as_me:6858: result: $withval" >&5
++ echo "$as_me:6861: result: $withval" >&5
+ echo "${ECHO_T}$withval" >&6
+- { { echo "$as_me:6860: error: option value must be one of: rel, abi, or auto" >&5
++ { { echo "$as_me:6863: 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; }; }
+ ;;
+@@ -6866,7 +6869,7 @@
+ else
+ cf_cv_shlib_version=auto
+ fi;
+- echo "$as_me:6869: result: $cf_cv_shlib_version" >&5
++ echo "$as_me:6872: result: $cf_cv_shlib_version" >&5
+ echo "${ECHO_T}$cf_cv_shlib_version" >&6
+
+ cf_cv_rm_so_locs=no
+@@ -6889,14 +6892,14 @@
+
+ if test "$cf_try_fPIC" = yes
+ then
+- echo "$as_me:6892: checking which $CC option to use" >&5
++ echo "$as_me:6895: 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 6899 "configure"
++#line 6902 "configure"
+ #include "confdefs.h"
+ #include <stdio.h>
+ int
+@@ -6908,16 +6911,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:6911: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:6914: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:6914: \$? = $ac_status" >&5
++ echo "$as_me:6917: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:6917: \"$ac_try\"") >&5
++ { (eval echo "$as_me:6920: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:6920: \$? = $ac_status" >&5
++ echo "$as_me:6923: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ break
+ else
+@@ -6926,7 +6929,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ done
+- echo "$as_me:6929: result: $CC_SHARED_OPTS" >&5
++ echo "$as_me:6932: result: $CC_SHARED_OPTS" >&5
+ echo "${ECHO_T}$CC_SHARED_OPTS" >&6
+ CFLAGS="$cf_save_CFLAGS"
+ fi
+@@ -6997,7 +7000,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:7000: checking if ld -search_paths_first works" >&5
++ echo "$as_me:7003: 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
+@@ -7006,7 +7009,7 @@
+ cf_save_LDFLAGS=$LDFLAGS
+ LDFLAGS="$LDFLAGS -Wl,-search_paths_first"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 7009 "configure"
++#line 7012 "configure"
+ #include "confdefs.h"
+
+ int
+@@ -7018,16 +7021,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:7021: \"$ac_link\"") >&5
++if { (eval echo "$as_me:7024: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:7024: \$? = $ac_status" >&5
++ echo "$as_me:7027: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:7027: \"$ac_try\"") >&5
++ { (eval echo "$as_me:7030: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:7030: \$? = $ac_status" >&5
++ echo "$as_me:7033: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_ldflags_search_paths_first=yes
+ else
+@@ -7038,7 +7041,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LDFLAGS=$cf_save_LDFLAGS
+ fi
+-echo "$as_me:7041: result: $cf_cv_ldflags_search_paths_first" >&5
++echo "$as_me:7044: 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"
+@@ -7388,7 +7391,7 @@
+ do
+ CFLAGS="$cf_shared_opts $cf_save_CFLAGS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 7391 "configure"
++#line 7394 "configure"
+ #include "confdefs.h"
+ #include <stdio.h>
+ int
+@@ -7400,16 +7403,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:7403: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:7406: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:7406: \$? = $ac_status" >&5
++ echo "$as_me:7409: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:7409: \"$ac_try\"") >&5
++ { (eval echo "$as_me:7412: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:7412: \$? = $ac_status" >&5
++ echo "$as_me:7415: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ break
+ else
+@@ -7446,7 +7449,7 @@
+ test "$cf_cv_do_symlinks" = no && cf_cv_do_symlinks=yes
+ ;;
+ (*)
+- { echo "$as_me:7449: WARNING: ignored --with-shlib-version" >&5
++ { echo "$as_me:7452: WARNING: ignored --with-shlib-version" >&5
+ echo "$as_me: WARNING: ignored --with-shlib-version" >&2;}
+ ;;
+ esac
+@@ -7456,7 +7459,7 @@
+ if test -n "$cf_try_cflags"
+ then
+ cat > conftest.$ac_ext <<EOF
+-#line 7459 "${as_me:-configure}"
++#line 7462 "${as_me:-configure}"
+ #include <stdio.h>
+ int main(int argc, char *argv[])
+ {
+@@ -7468,18 +7471,18 @@
+ for cf_opt in $cf_try_cflags
+ do
+ CFLAGS="$cf_save_CFLAGS -$cf_opt"
+- echo "$as_me:7471: checking if CFLAGS option -$cf_opt works" >&5
++ echo "$as_me:7474: 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:7473: \"$ac_compile\"") >&5
++ if { (eval echo "$as_me:7476: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:7476: \$? = $ac_status" >&5
++ echo "$as_me:7479: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; then
+- echo "$as_me:7478: result: yes" >&5
++ echo "$as_me:7481: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ cf_save_CFLAGS="$CFLAGS"
+ else
+- echo "$as_me:7482: result: no" >&5
++ echo "$as_me:7485: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ done
+@@ -7494,17 +7497,17 @@
+
+ test -n "$verbose" && echo " CC_SHARED_OPTS: $CC_SHARED_OPTS" 1>&6
+
+-echo "${as_me:-configure}:7497: testing CC_SHARED_OPTS: $CC_SHARED_OPTS ..." 1>&5
++echo "${as_me:-configure}:7500: 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}:7501: testing MK_SHARED_LIB: $MK_SHARED_LIB ..." 1>&5
++echo "${as_me:-configure}:7504: testing MK_SHARED_LIB: $MK_SHARED_LIB ..." 1>&5
+
+ for model in $cf_list_models ; do
+ case "$model" in
+ (libtool)
+
+-echo "$as_me:7507: checking for additional libtool options" >&5
++echo "$as_me:7510: 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.
+@@ -7514,7 +7517,7 @@
+ else
+ with_libtool_opts=no
+ fi;
+-echo "$as_me:7517: result: $with_libtool_opts" >&5
++echo "$as_me:7520: result: $with_libtool_opts" >&5
+ echo "${ECHO_T}$with_libtool_opts" >&6
+
+ case .$with_libtool_opts in
+@@ -7525,7 +7528,7 @@
+ ;;
+ esac
+
+-echo "$as_me:7528: checking if exported-symbols file should be used" >&5
++echo "$as_me:7531: 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.
+@@ -7540,7 +7543,7 @@
+ with_export_syms='${top_srcdir}/package/${PACKAGE}.sym'
+
+ fi
+-echo "$as_me:7543: result: $with_export_syms" >&5
++echo "$as_me:7546: result: $with_export_syms" >&5
+ echo "${ECHO_T}$with_export_syms" >&6
+ if test "x$with_export_syms" != xno
+ then
+@@ -7551,15 +7554,15 @@
+ ;;
+ (shared)
+ if test "$CC_SHARED_OPTS" = "unknown"; then
+- { { echo "$as_me:7554: error: Shared libraries are not supported in this version" >&5
++ { { echo "$as_me:7557: 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:7559: checking if current CFLAGS link properly" >&5
++ echo "$as_me:7562: 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 7562 "configure"
++#line 7565 "configure"
+ #include "confdefs.h"
+ #include <stdio.h>
+ int
+@@ -7571,16 +7574,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:7574: \"$ac_link\"") >&5
++if { (eval echo "$as_me:7577: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:7577: \$? = $ac_status" >&5
++ echo "$as_me:7580: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:7580: \"$ac_try\"") >&5
++ { (eval echo "$as_me:7583: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:7583: \$? = $ac_status" >&5
++ echo "$as_me:7586: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cflags_work=yes
+ else
+@@ -7589,18 +7592,18 @@
+ cf_cflags_work=no
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+- echo "$as_me:7592: result: $cf_cflags_work" >&5
++ echo "$as_me:7595: 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}:7598: testing try to work around by appending shared-options ..." 1>&5
++echo "${as_me:-configure}:7601: testing try to work around by appending shared-options ..." 1>&5
+
+ CFLAGS="$CFLAGS $CC_SHARED_OPTS"
+ fi
+
+-echo "$as_me:7603: checking if versioned-symbols file should be used" >&5
++echo "$as_me:7606: 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.
+@@ -7618,18 +7621,18 @@
+ (xno)
+ ;;
+ (x/*)
+- test -f "$with_versioned_syms" || { { echo "$as_me:7621: error: expected a filename: $with_versioned_syms" >&5
++ test -f "$with_versioned_syms" || { { echo "$as_me:7624: 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:7626: error: expected a filename: $with_versioned_syms" >&5
++ test -f "$with_versioned_syms" || { { echo "$as_me:7629: 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:7632: result: $with_versioned_syms" >&5
++echo "$as_me:7635: result: $with_versioned_syms" >&5
+ echo "${ECHO_T}$with_versioned_syms" >&6
+
+ RESULTING_SYMS=
+@@ -7645,7 +7648,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}:7648: testing MK_SHARED_LIB: $MK_SHARED_LIB ..." 1>&5
++echo "${as_me:-configure}:7651: testing MK_SHARED_LIB: $MK_SHARED_LIB ..." 1>&5
+
+ ;;
+ (*-dy\ *)
+@@ -7653,11 +7656,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}:7656: testing MK_SHARED_LIB: $MK_SHARED_LIB ..." 1>&5
++echo "${as_me:-configure}:7659: testing MK_SHARED_LIB: $MK_SHARED_LIB ..." 1>&5
+
+ ;;
+ (*)
+- { echo "$as_me:7660: WARNING: this system does not support versioned-symbols" >&5
++ { echo "$as_me:7663: WARNING: this system does not support versioned-symbols" >&5
+ echo "$as_me: WARNING: this system does not support versioned-symbols" >&2;}
+ ;;
+ esac
+@@ -7669,7 +7672,7 @@
+ # symbols.
+ if test "x$VERSIONED_SYMS" != "x"
+ then
+- echo "$as_me:7672: checking if wildcards can be used to selectively omit symbols" >&5
++ echo "$as_me:7675: 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
+
+@@ -7706,7 +7709,7 @@
+ } submodule_1.0;
+ EOF
+ cat >conftest.$ac_ext <<EOF
+-#line 7709 "configure"
++#line 7712 "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; }
+@@ -7737,7 +7740,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:7740: result: $WILDCARD_SYMS" >&5
++ echo "$as_me:7743: result: $WILDCARD_SYMS" >&5
+ echo "${ECHO_T}$WILDCARD_SYMS" >&6
+ rm -f conftest.*
+ fi
+@@ -7750,7 +7753,7 @@
+ ### Checks for special libraries, must be done up-front.
+ SHLIB_LIST=""
+
+-echo "$as_me:7753: checking if you want to link with the GPM mouse library" >&5
++echo "$as_me:7756: 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.
+@@ -7760,27 +7763,27 @@
+ else
+ with_gpm=maybe
+ fi;
+-echo "$as_me:7763: result: $with_gpm" >&5
++echo "$as_me:7766: result: $with_gpm" >&5
+ echo "${ECHO_T}$with_gpm" >&6
+
+ if test "$with_gpm" != no ; then
+- echo "$as_me:7767: checking for gpm.h" >&5
++ echo "$as_me:7770: 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 7773 "configure"
++#line 7776 "configure"
+ #include "confdefs.h"
+ #include <gpm.h>
+ _ACEOF
+-if { (eval echo "$as_me:7777: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:7780: \"$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:7783: \$? = $ac_status" >&5
++ echo "$as_me:7786: \$? = $ac_status" >&5
+ (exit "$ac_status"); } >/dev/null; then
+ if test -s conftest.err; then
+ ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -7799,7 +7802,7 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:7802: result: $ac_cv_header_gpm_h" >&5
++echo "$as_me:7805: 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
+
+@@ -7810,7 +7813,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}:7813: testing assuming we really have GPM library ..." 1>&5
++echo "${as_me:-configure}:7816: testing assuming we really have GPM library ..." 1>&5
+
+ cat >>confdefs.h <<\EOF
+ #define HAVE_LIBGPM 1
+@@ -7818,7 +7821,7 @@
+
+ with_gpm=yes
+ else
+- echo "$as_me:7821: checking for Gpm_Open in -lgpm" >&5
++ echo "$as_me:7824: 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
+@@ -7826,7 +7829,7 @@
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lgpm $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 7829 "configure"
++#line 7832 "configure"
+ #include "confdefs.h"
+
+ /* Override any gcc2 internal prototype to avoid an error. */
+@@ -7845,16 +7848,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:7848: \"$ac_link\"") >&5
++if { (eval echo "$as_me:7851: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:7851: \$? = $ac_status" >&5
++ echo "$as_me:7854: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:7854: \"$ac_try\"") >&5
++ { (eval echo "$as_me:7857: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:7857: \$? = $ac_status" >&5
++ echo "$as_me:7860: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_lib_gpm_Gpm_Open=yes
+ else
+@@ -7865,18 +7868,18 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:7868: result: $ac_cv_lib_gpm_Gpm_Open" >&5
++echo "$as_me:7871: 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:7875: WARNING: Cannot link with GPM library" >&5
++ { echo "$as_me:7878: WARNING: Cannot link with GPM library" >&5
+ echo "$as_me: WARNING: Cannot link with GPM library" >&2;}
+ with_gpm=no
+ else
+- { { echo "$as_me:7879: error: Cannot link with GPM library" >&5
++ { { echo "$as_me:7882: error: Cannot link with GPM library" >&5
+ echo "$as_me: error: Cannot link with GPM library" >&2;}
+ { (exit 1); exit 1; }; }
+ fi
+@@ -7887,7 +7890,7 @@
+
+ else
+
+- test "$with_gpm" != maybe && { echo "$as_me:7890: WARNING: Cannot find GPM header" >&5
++ test "$with_gpm" != maybe && { echo "$as_me:7893: WARNING: Cannot find GPM header" >&5
+ echo "$as_me: WARNING: Cannot find GPM header" >&2;}
+ with_gpm=no
+
+@@ -7896,7 +7899,7 @@
+ fi
+
+ if test "$with_gpm" != no ; then
+- echo "$as_me:7899: checking if you want to load GPM dynamically" >&5
++ echo "$as_me:7902: 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.
+@@ -7906,18 +7909,18 @@
+ else
+ with_dlsym=yes
+ fi;
+- echo "$as_me:7909: result: $with_dlsym" >&5
++ echo "$as_me:7912: result: $with_dlsym" >&5
+ echo "${ECHO_T}$with_dlsym" >&6
+ if test "x$with_dlsym" = xyes ; then
+
+ cf_have_dlsym=no
+-echo "$as_me:7914: checking for dlsym" >&5
++echo "$as_me:7917: 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 7920 "configure"
++#line 7923 "configure"
+ #include "confdefs.h"
+ #define dlsym autoconf_temporary
+ #include <limits.h> /* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -7948,16 +7951,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:7951: \"$ac_link\"") >&5
++if { (eval echo "$as_me:7954: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:7954: \$? = $ac_status" >&5
++ echo "$as_me:7957: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:7957: \"$ac_try\"") >&5
++ { (eval echo "$as_me:7960: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:7960: \$? = $ac_status" >&5
++ echo "$as_me:7963: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_func_dlsym=yes
+ else
+@@ -7967,14 +7970,14 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:7970: result: $ac_cv_func_dlsym" >&5
++echo "$as_me:7973: 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:7977: checking for dlsym in -ldl" >&5
++echo "$as_me:7980: 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
+@@ -7982,7 +7985,7 @@
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-ldl $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 7985 "configure"
++#line 7988 "configure"
+ #include "confdefs.h"
+
+ /* Override any gcc2 internal prototype to avoid an error. */
+@@ -8001,16 +8004,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:8004: \"$ac_link\"") >&5
++if { (eval echo "$as_me:8007: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:8007: \$? = $ac_status" >&5
++ echo "$as_me:8010: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:8010: \"$ac_try\"") >&5
++ { (eval echo "$as_me:8013: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:8013: \$? = $ac_status" >&5
++ echo "$as_me:8016: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_lib_dl_dlsym=yes
+ else
+@@ -8021,7 +8024,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:8024: result: $ac_cv_lib_dl_dlsym" >&5
++echo "$as_me:8027: 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
+
+@@ -8050,10 +8053,10 @@
+ LIBS="$cf_add_libs"
+ }
+
+- echo "$as_me:8053: checking whether able to link to dl*() functions" >&5
++ echo "$as_me:8056: 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 8056 "configure"
++#line 8059 "configure"
+ #include "confdefs.h"
+ #include <dlfcn.h>
+ int
+@@ -8071,16 +8074,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:8074: \"$ac_link\"") >&5
++if { (eval echo "$as_me:8077: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:8077: \$? = $ac_status" >&5
++ echo "$as_me:8080: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:8080: \"$ac_try\"") >&5
++ { (eval echo "$as_me:8083: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:8083: \$? = $ac_status" >&5
++ echo "$as_me:8086: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+
+ cat >>confdefs.h <<\EOF
+@@ -8091,15 +8094,15 @@
+ echo "$as_me: failed program was:" >&5
+ cat "conftest.$ac_ext" >&5
+
+- { { echo "$as_me:8094: error: Cannot link test program for libdl" >&5
++ { { echo "$as_me:8097: 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:8099: result: ok" >&5
++ echo "$as_me:8102: result: ok" >&5
+ echo "${ECHO_T}ok" >&6
+ else
+- { { echo "$as_me:8102: error: Cannot find dlsym function" >&5
++ { { echo "$as_me:8105: error: Cannot find dlsym function" >&5
+ echo "$as_me: error: Cannot find dlsym function" >&2;}
+ { (exit 1); exit 1; }; }
+ fi
+@@ -8107,12 +8110,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}:8110: testing assuming soname for gpm is $with_gpm ..." 1>&5
++echo "${as_me:-configure}:8113: testing assuming soname for gpm is $with_gpm ..." 1>&5
+
+ cf_cv_gpm_soname="$with_gpm"
+ else
+
+-echo "$as_me:8115: checking for soname of gpm library" >&5
++echo "$as_me:8118: 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
+@@ -8146,15 +8149,15 @@
+ done
+ LIBS="$cf_add_libs"
+
+- if { (eval echo "$as_me:8149: \"$ac_compile\"") >&5
++ if { (eval echo "$as_me:8152: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:8152: \$? = $ac_status" >&5
++ echo "$as_me:8155: \$? = $ac_status" >&5
+ (exit "$ac_status"); } ; then
+- if { (eval echo "$as_me:8154: \"$ac_link\"") >&5
++ if { (eval echo "$as_me:8157: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:8157: \$? = $ac_status" >&5
++ echo "$as_me:8160: \$? = $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
+@@ -8165,7 +8168,7 @@
+ fi
+
+ fi
+-echo "$as_me:8168: result: $cf_cv_gpm_soname" >&5
++echo "$as_me:8171: result: $cf_cv_gpm_soname" >&5
+ echo "${ECHO_T}$cf_cv_gpm_soname" >&6
+
+ fi
+@@ -8233,7 +8236,7 @@
+ #define HAVE_LIBGPM 1
+ EOF
+
+-echo "$as_me:8236: checking for Gpm_Wgetch in -lgpm" >&5
++echo "$as_me:8239: 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
+@@ -8241,7 +8244,7 @@
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lgpm $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 8244 "configure"
++#line 8247 "configure"
+ #include "confdefs.h"
+
+ /* Override any gcc2 internal prototype to avoid an error. */
+@@ -8260,16 +8263,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:8263: \"$ac_link\"") >&5
++if { (eval echo "$as_me:8266: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:8266: \$? = $ac_status" >&5
++ echo "$as_me:8269: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:8269: \"$ac_try\"") >&5
++ { (eval echo "$as_me:8272: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:8272: \$? = $ac_status" >&5
++ echo "$as_me:8275: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_lib_gpm_Gpm_Wgetch=yes
+ else
+@@ -8280,11 +8283,11 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:8283: result: $ac_cv_lib_gpm_Gpm_Wgetch" >&5
++echo "$as_me:8286: 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:8287: checking if GPM is weakly bound to curses library" >&5
++echo "$as_me:8290: 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
+@@ -8308,15 +8311,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:8311: \"$ac_compile\"") >&5
++ if { (eval echo "$as_me:8314: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:8314: \$? = $ac_status" >&5
++ echo "$as_me:8317: \$? = $ac_status" >&5
+ (exit "$ac_status"); } ; then
+- if { (eval echo "$as_me:8316: \"$ac_link\"") >&5
++ if { (eval echo "$as_me:8319: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:8319: \$? = $ac_status" >&5
++ echo "$as_me:8322: \$? = $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
+@@ -8328,11 +8331,11 @@
+ fi
+
+ fi
+-echo "$as_me:8331: result: $cf_cv_check_gpm_wgetch" >&5
++echo "$as_me:8334: 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:8335: WARNING: GPM library is already linked with curses - read the FAQ" >&5
++ { echo "$as_me:8338: 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
+
+@@ -8340,7 +8343,7 @@
+
+ fi
+
+-echo "$as_me:8343: checking if you want to use PCRE2 for regular-expressions" >&5
++echo "$as_me:8346: 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.
+@@ -8349,7 +8352,7 @@
+
+ fi;
+ test -z "$with_pcre2" && with_pcre2=no
+-echo "$as_me:8352: result: $with_pcre2" >&5
++echo "$as_me:8355: result: $with_pcre2" >&5
+ echo "${ECHO_T}$with_pcre2" >&6
+
+ if test "x$with_pcre2" != xno ; then
+@@ -8360,17 +8363,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}:8363: testing found package $cf_with_pcre2 ..." 1>&5
++echo "${as_me:-configure}:8366: 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}:8369: testing package $cf_with_pcre2 CFLAGS: $cf_pkgconfig_incs ..." 1>&5
++echo "${as_me:-configure}:8372: 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}:8373: testing package $cf_with_pcre2 LIBS: $cf_pkgconfig_libs ..." 1>&5
++echo "${as_me:-configure}:8376: testing package $cf_with_pcre2 LIBS: $cf_pkgconfig_libs ..." 1>&5
+
+ cf_fix_cppflags=no
+ cf_new_cflags=
+@@ -8494,7 +8497,7 @@
+ fi
+
+ done
+- cf_with_pcre2_ok=yes || { { echo "$as_me:8497: error: Cannot find PCRE2 library" >&5
++ cf_with_pcre2_ok=yes || { { echo "$as_me:8500: error: Cannot find PCRE2 library" >&5
+ echo "$as_me: error: Cannot find PCRE2 library" >&2;}
+ { (exit 1); exit 1; }; }
+
+@@ -8507,7 +8510,7 @@
+ (*pcre2-posix*|*pcreposix*)
+ ;;
+ (*)
+- echo "$as_me:8510: checking for regcomp in -lpcre2-posix" >&5
++ echo "$as_me:8513: 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
+@@ -8515,7 +8518,7 @@
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lpcre2-posix $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 8518 "configure"
++#line 8521 "configure"
+ #include "confdefs.h"
+
+ /* Override any gcc2 internal prototype to avoid an error. */
+@@ -8534,16 +8537,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:8537: \"$ac_link\"") >&5
++if { (eval echo "$as_me:8540: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:8540: \$? = $ac_status" >&5
++ echo "$as_me:8543: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:8543: \"$ac_try\"") >&5
++ { (eval echo "$as_me:8546: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:8546: \$? = $ac_status" >&5
++ echo "$as_me:8549: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_lib_pcre2_posix_regcomp=yes
+ else
+@@ -8554,7 +8557,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:8557: result: $ac_cv_lib_pcre2_posix_regcomp" >&5
++echo "$as_me:8560: 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
+
+@@ -8575,7 +8578,7 @@
+ LIBS="$cf_add_libs"
+
+ else
+- echo "$as_me:8578: checking for regcomp in -lpcreposix" >&5
++ echo "$as_me:8581: 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
+@@ -8583,7 +8586,7 @@
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lpcreposix $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 8586 "configure"
++#line 8589 "configure"
+ #include "confdefs.h"
+
+ /* Override any gcc2 internal prototype to avoid an error. */
+@@ -8602,16 +8605,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:8605: \"$ac_link\"") >&5
++if { (eval echo "$as_me:8608: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:8608: \$? = $ac_status" >&5
++ echo "$as_me:8611: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:8611: \"$ac_try\"") >&5
++ { (eval echo "$as_me:8614: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:8614: \$? = $ac_status" >&5
++ echo "$as_me:8617: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_lib_pcreposix_regcomp=yes
+ else
+@@ -8622,7 +8625,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:8625: result: $ac_cv_lib_pcreposix_regcomp" >&5
++echo "$as_me:8628: 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
+
+@@ -8643,7 +8646,7 @@
+ LIBS="$cf_add_libs"
+
+ else
+- { { echo "$as_me:8646: error: Cannot find PCRE2 POSIX library" >&5
++ { { echo "$as_me:8649: error: Cannot find PCRE2 POSIX library" >&5
+ echo "$as_me: error: Cannot find PCRE2 POSIX library" >&2;}
+ { (exit 1); exit 1; }; }
+ fi
+@@ -8658,23 +8661,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:8661: checking for $ac_header" >&5
++echo "$as_me:8664: 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 8667 "configure"
++#line 8670 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:8671: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:8674: \"$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:8677: \$? = $ac_status" >&5
++ echo "$as_me:8680: \$? = $ac_status" >&5
+ (exit "$ac_status"); } >/dev/null; then
+ if test -s conftest.err; then
+ ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -8693,7 +8696,7 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:8696: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
++echo "$as_me:8699: 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
+@@ -8706,13 +8709,13 @@
+ for ac_func in PCRE2regcomp
+ do
+ as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+-echo "$as_me:8709: checking for $ac_func" >&5
++echo "$as_me:8712: 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 8715 "configure"
++#line 8718 "configure"
+ #include "confdefs.h"
+ #define $ac_func autoconf_temporary
+ #include <limits.h> /* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -8743,16 +8746,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:8746: \"$ac_link\"") >&5
++if { (eval echo "$as_me:8749: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:8749: \$? = $ac_status" >&5
++ echo "$as_me:8752: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:8752: \"$ac_try\"") >&5
++ { (eval echo "$as_me:8755: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:8755: \$? = $ac_status" >&5
++ echo "$as_me:8758: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ eval "$as_ac_var=yes"
+ else
+@@ -8762,7 +8765,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:8765: result: `eval echo '${'"$as_ac_var"'}'`" >&5
++echo "$as_me:8768: 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
+@@ -8776,7 +8779,7 @@
+
+ # not everyone has "test -c"
+ if test -c /dev/sysmouse 2>/dev/null ; then
+-echo "$as_me:8779: checking if you want to use sysmouse" >&5
++echo "$as_me:8782: 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.
+@@ -8788,7 +8791,7 @@
+ fi;
+ if test "$cf_with_sysmouse" != no ; then
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 8791 "configure"
++#line 8794 "configure"
+ #include "confdefs.h"
+
+ #include <osreldate.h>
+@@ -8811,16 +8814,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:8814: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:8817: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:8817: \$? = $ac_status" >&5
++ echo "$as_me:8820: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:8820: \"$ac_try\"") >&5
++ { (eval echo "$as_me:8823: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:8823: \$? = $ac_status" >&5
++ echo "$as_me:8826: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_with_sysmouse=yes
+ else
+@@ -8830,7 +8833,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:8833: result: $cf_with_sysmouse" >&5
++echo "$as_me:8836: result: $cf_with_sysmouse" >&5
+ echo "${ECHO_T}$cf_with_sysmouse" >&6
+ test "$cf_with_sysmouse" = yes &&
+ cat >>confdefs.h <<\EOF
+@@ -8840,7 +8843,7 @@
+ fi
+
+ # pretend that ncurses==ncursesw==ncursest
+-echo "$as_me:8843: checking if you want to disable library suffixes" >&5
++echo "$as_me:8846: 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.
+@@ -8857,13 +8860,13 @@
+ disable_lib_suffixes=no
+
+ fi;
+-echo "$as_me:8860: result: $disable_lib_suffixes" >&5
++echo "$as_me:8863: 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:8866: checking if rpath-hack should be disabled" >&5
++echo "$as_me:8869: 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.
+@@ -8881,22 +8884,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:8884: result: $cf_disable_rpath_hack" >&5
++echo "$as_me:8887: result: $cf_disable_rpath_hack" >&5
+ echo "${ECHO_T}$cf_disable_rpath_hack" >&6
+
+ if test "$enable_rpath_hack" = yes ; then
+
+-echo "$as_me:8889: checking for updated LDFLAGS" >&5
++echo "$as_me:8892: 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:8892: result: maybe" >&5
++ echo "$as_me:8895: 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:8899: checking for $ac_word" >&5
++echo "$as_me:8902: 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
+@@ -8911,7 +8914,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:8914: found $ac_dir/$ac_word" >&5
++echo "$as_me:8917: found $ac_dir/$ac_word" >&5
+ break
+ done
+
+@@ -8919,10 +8922,10 @@
+ fi
+ cf_ldd_prog=$ac_cv_prog_cf_ldd_prog
+ if test -n "$cf_ldd_prog"; then
+- echo "$as_me:8922: result: $cf_ldd_prog" >&5
++ echo "$as_me:8925: result: $cf_ldd_prog" >&5
+ echo "${ECHO_T}$cf_ldd_prog" >&6
+ else
+- echo "$as_me:8925: result: no" >&5
++ echo "$as_me:8928: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+
+@@ -8936,7 +8939,7 @@
+ cf_rpath_oops=
+
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 8939 "configure"
++#line 8942 "configure"
+ #include "confdefs.h"
+ #include <stdio.h>
+ int
+@@ -8948,16 +8951,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:8951: \"$ac_link\"") >&5
++if { (eval echo "$as_me:8954: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:8954: \$? = $ac_status" >&5
++ echo "$as_me:8957: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:8957: \"$ac_try\"") >&5
++ { (eval echo "$as_me:8960: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:8960: \$? = $ac_status" >&5
++ echo "$as_me:8963: \$? = $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`
+@@ -8985,7 +8988,7 @@
+ then
+ test -n "$verbose" && echo " ...adding -L$cf_rpath_dir/lib to LDFLAGS for $cf_rpath_src" 1>&6
+
+-echo "${as_me:-configure}:8988: testing ...adding -L$cf_rpath_dir/lib to LDFLAGS for $cf_rpath_src ..." 1>&5
++echo "${as_me:-configure}:8991: testing ...adding -L$cf_rpath_dir/lib to LDFLAGS for $cf_rpath_src ..." 1>&5
+
+ LDFLAGS="$LDFLAGS -L$cf_rpath_dir/lib"
+ break
+@@ -8997,11 +9000,11 @@
+
+ test -n "$verbose" && echo " ...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS" 1>&6
+
+-echo "${as_me:-configure}:9000: testing ...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
++echo "${as_me:-configure}:9003: testing ...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
+
+ test -n "$verbose" && echo " ...checking LDFLAGS $LDFLAGS" 1>&6
+
+-echo "${as_me:-configure}:9004: testing ...checking LDFLAGS $LDFLAGS ..." 1>&5
++echo "${as_me:-configure}:9007: testing ...checking LDFLAGS $LDFLAGS ..." 1>&5
+
+ cf_rpath_dst=
+ for cf_rpath_src in $LDFLAGS
+@@ -9038,7 +9041,7 @@
+ then
+ test -n "$verbose" && echo " ...Filter $cf_rpath_src ->$cf_rpath_tmp" 1>&6
+
+-echo "${as_me:-configure}:9041: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
++echo "${as_me:-configure}:9044: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
+
+ EXTRA_LDFLAGS="$cf_rpath_tmp $EXTRA_LDFLAGS"
+ fi
+@@ -9051,11 +9054,11 @@
+
+ test -n "$verbose" && echo " ...checked LDFLAGS $LDFLAGS" 1>&6
+
+-echo "${as_me:-configure}:9054: testing ...checked LDFLAGS $LDFLAGS ..." 1>&5
++echo "${as_me:-configure}:9057: testing ...checked LDFLAGS $LDFLAGS ..." 1>&5
+
+ test -n "$verbose" && echo " ...checking LIBS $LIBS" 1>&6
+
+-echo "${as_me:-configure}:9058: testing ...checking LIBS $LIBS ..." 1>&5
++echo "${as_me:-configure}:9061: testing ...checking LIBS $LIBS ..." 1>&5
+
+ cf_rpath_dst=
+ for cf_rpath_src in $LIBS
+@@ -9092,7 +9095,7 @@
+ then
+ test -n "$verbose" && echo " ...Filter $cf_rpath_src ->$cf_rpath_tmp" 1>&6
+
+-echo "${as_me:-configure}:9095: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
++echo "${as_me:-configure}:9098: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
+
+ EXTRA_LDFLAGS="$cf_rpath_tmp $EXTRA_LDFLAGS"
+ fi
+@@ -9105,14 +9108,14 @@
+
+ test -n "$verbose" && echo " ...checked LIBS $LIBS" 1>&6
+
+-echo "${as_me:-configure}:9108: testing ...checked LIBS $LIBS ..." 1>&5
++echo "${as_me:-configure}:9111: testing ...checked LIBS $LIBS ..." 1>&5
+
+ test -n "$verbose" && echo " ...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS" 1>&6
+
+-echo "${as_me:-configure}:9112: testing ...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
++echo "${as_me:-configure}:9115: testing ...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
+
+ else
+- echo "$as_me:9115: result: no" >&5
++ echo "$as_me:9118: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+
+@@ -9126,7 +9129,7 @@
+ EXTRA_PKG_LDFLAGS="$LDFLAGS $EXTRA_LDFLAGS"
+ if test -n "$EXTRA_PKG_LDFLAGS"
+ then
+- echo "$as_me:9129: checking if you want to disable extra LDFLAGS for package-scripts" >&5
++ echo "$as_me:9132: 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.
+@@ -9143,7 +9146,7 @@
+ disable_pkg_ldflags=no
+
+ fi;
+- echo "$as_me:9146: result: $disable_pkg_ldflags" >&5
++ echo "$as_me:9149: result: $disable_pkg_ldflags" >&5
+ echo "${ECHO_T}$disable_pkg_ldflags" >&6
+ test "$disable_pkg_ldflags" = yes && EXTRA_PKG_LDFLAGS=
+ fi
+@@ -9151,7 +9154,7 @@
+ ###############################################################################
+
+ ### use option --with-extra-suffix to append suffix to headers and libraries
+-echo "$as_me:9154: checking for extra suffix to append to header/library paths" >&5
++echo "$as_me:9157: 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=
+
+@@ -9170,11 +9173,11 @@
+ esac
+
+ fi;
+-echo "$as_me:9173: result: ${EXTRA_SUFFIX:-(none)}" >&5
++echo "$as_me:9176: 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:9177: checking if you wish to install ncurses overwriting curses" >&5
++echo "$as_me:9180: 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.
+@@ -9184,10 +9187,10 @@
+ else
+ if test "$prefix" = "/usr" ; then with_overwrite=yes; else with_overwrite=no; fi
+ fi;
+-echo "$as_me:9187: result: $with_overwrite" >&5
++echo "$as_me:9190: result: $with_overwrite" >&5
+ echo "${ECHO_T}$with_overwrite" >&6
+
+-echo "$as_me:9190: checking if external terminfo-database is used" >&5
++echo "$as_me:9193: 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.
+@@ -9197,7 +9200,7 @@
+ else
+ use_database=yes
+ fi;
+-echo "$as_me:9200: result: $use_database" >&5
++echo "$as_me:9203: result: $use_database" >&5
+ echo "${ECHO_T}$use_database" >&6
+
+ case "$host_os" in
+@@ -9213,7 +9216,7 @@
+ if test "$use_database" != no ; then
+ NCURSES_USE_DATABASE=1
+
+- echo "$as_me:9216: checking which terminfo source-file will be installed" >&5
++ echo "$as_me:9219: 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.
+@@ -9221,10 +9224,10 @@
+ withval="$with_database"
+ TERMINFO_SRC=$withval
+ fi;
+- echo "$as_me:9224: result: $TERMINFO_SRC" >&5
++ echo "$as_me:9227: result: $TERMINFO_SRC" >&5
+ echo "${ECHO_T}$TERMINFO_SRC" >&6
+
+- echo "$as_me:9227: checking whether to use hashed database instead of directory/tree" >&5
++ echo "$as_me:9230: 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.
+@@ -9234,13 +9237,13 @@
+ else
+ with_hashed_db=no
+ fi;
+- echo "$as_me:9237: result: $with_hashed_db" >&5
++ echo "$as_me:9240: result: $with_hashed_db" >&5
+ echo "${ECHO_T}$with_hashed_db" >&6
+ else
+ with_hashed_db=no
+ fi
+
+-echo "$as_me:9243: checking for list of fallback terminal descriptions" >&5
++echo "$as_me:9246: 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.
+@@ -9250,7 +9253,7 @@
+ else
+ with_fallback=
+ fi;
+-echo "$as_me:9253: result: ${with_fallback:-(none)}" >&5
++echo "$as_me:9256: result: ${with_fallback:-(none)}" >&5
+ echo "${ECHO_T}${with_fallback:-(none)}" >&6
+
+ case ".$with_fallback" in
+@@ -9258,7 +9261,7 @@
+ FALLBACK_LIST=
+ ;;
+ (.yes)
+- { echo "$as_me:9261: WARNING: expected a list of terminal descriptions" >&5
++ { echo "$as_me:9264: WARNING: expected a list of terminal descriptions" >&5
+ echo "$as_me: WARNING: expected a list of terminal descriptions" >&2;}
+ ;;
+ (*)
+@@ -9274,7 +9277,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:9277: checking for $ac_word" >&5
++echo "$as_me:9280: 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
+@@ -9289,7 +9292,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:9292: found $ac_dir/$ac_word" >&5
++echo "$as_me:9295: found $ac_dir/$ac_word" >&5
+ break
+ done
+
+@@ -9297,10 +9300,10 @@
+ fi
+ TIC=$ac_cv_prog_TIC
+ if test -n "$TIC"; then
+- echo "$as_me:9300: result: $TIC" >&5
++ echo "$as_me:9303: result: $TIC" >&5
+ echo "${ECHO_T}$TIC" >&6
+ else
+- echo "$as_me:9303: result: no" >&5
++ echo "$as_me:9306: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+
+@@ -9309,7 +9312,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:9312: checking for $ac_word" >&5
++echo "$as_me:9315: 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
+@@ -9324,7 +9327,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:9327: found $ac_dir/$ac_word" >&5
++echo "$as_me:9330: found $ac_dir/$ac_word" >&5
+ break
+ done
+
+@@ -9332,10 +9335,10 @@
+ fi
+ ac_ct_TIC=$ac_cv_prog_ac_ct_TIC
+ if test -n "$ac_ct_TIC"; then
+- echo "$as_me:9335: result: $ac_ct_TIC" >&5
++ echo "$as_me:9338: result: $ac_ct_TIC" >&5
+ echo "${ECHO_T}$ac_ct_TIC" >&6
+ else
+- echo "$as_me:9338: result: no" >&5
++ echo "$as_me:9341: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+
+@@ -9347,7 +9350,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:9350: checking for $ac_word" >&5
++echo "$as_me:9353: 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
+@@ -9362,7 +9365,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:9365: found $ac_dir/$ac_word" >&5
++echo "$as_me:9368: found $ac_dir/$ac_word" >&5
+ break
+ done
+
+@@ -9370,10 +9373,10 @@
+ fi
+ INFOCMP=$ac_cv_prog_INFOCMP
+ if test -n "$INFOCMP"; then
+- echo "$as_me:9373: result: $INFOCMP" >&5
++ echo "$as_me:9376: result: $INFOCMP" >&5
+ echo "${ECHO_T}$INFOCMP" >&6
+ else
+- echo "$as_me:9376: result: no" >&5
++ echo "$as_me:9379: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+
+@@ -9382,7 +9385,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:9385: checking for $ac_word" >&5
++echo "$as_me:9388: 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
+@@ -9397,7 +9400,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:9400: found $ac_dir/$ac_word" >&5
++echo "$as_me:9403: found $ac_dir/$ac_word" >&5
+ break
+ done
+
+@@ -9405,10 +9408,10 @@
+ fi
+ ac_ct_INFOCMP=$ac_cv_prog_ac_ct_INFOCMP
+ if test -n "$ac_ct_INFOCMP"; then
+- echo "$as_me:9408: result: $ac_ct_INFOCMP" >&5
++ echo "$as_me:9411: result: $ac_ct_INFOCMP" >&5
+ echo "${ECHO_T}$ac_ct_INFOCMP" >&6
+ else
+- echo "$as_me:9411: result: no" >&5
++ echo "$as_me:9414: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+
+@@ -9423,10 +9426,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:9426: checking for tic program for fallbacks" >&5
++ echo "$as_me:9429: checking for tic program for fallbacks" >&5
+ echo $ECHO_N "checking for tic program for fallbacks... $ECHO_C" >&6
+ TIC=$withval
+- echo "$as_me:9429: result: $TIC" >&5
++ echo "$as_me:9432: result: $TIC" >&5
+ echo "${ECHO_T}$TIC" >&6
+
+ if test "x$prefix" != xNONE; then
+@@ -9454,7 +9457,7 @@
+ TIC=`echo "$TIC" | sed -e s%NONE%$cf_path_syntax%`
+ ;;
+ (*)
+- { { echo "$as_me:9457: error: expected a pathname, not \"$TIC\"" >&5
++ { { echo "$as_me:9460: error: expected a pathname, not \"$TIC\"" >&5
+ echo "$as_me: error: expected a pathname, not \"$TIC\"" >&2;}
+ { (exit 1); exit 1; }; }
+ ;;
+@@ -9467,7 +9470,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:9470: checking for $ac_word" >&5
++echo "$as_me:9473: 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
+@@ -9484,7 +9487,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:9487: found $ac_dir/$ac_word" >&5
++ echo "$as_me:9490: found $ac_dir/$ac_word" >&5
+ break
+ fi
+ done
+@@ -9495,10 +9498,10 @@
+ TIC=$ac_cv_path_TIC
+
+ if test -n "$TIC"; then
+- echo "$as_me:9498: result: $TIC" >&5
++ echo "$as_me:9501: result: $TIC" >&5
+ echo "${ECHO_T}$TIC" >&6
+ else
+- echo "$as_me:9501: result: no" >&5
++ echo "$as_me:9504: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+
+@@ -9557,7 +9560,7 @@
+
+ if test -n "$cf_path_prog" ; then
+
+-echo "${as_me:-configure}:9560: testing defining path for ${cf_path_prog} ..." 1>&5
++echo "${as_me:-configure}:9563: testing defining path for ${cf_path_prog} ..." 1>&5
+
+ cat >>confdefs.h <<EOF
+ #define TIC_PATH "$cf_path_prog"
+@@ -9572,7 +9575,7 @@
+
+ if test -z "$TIC"
+ then
+- { echo "$as_me:9575: WARNING: no tic program found for fallbacks" >&5
++ { echo "$as_me:9578: WARNING: no tic program found for fallbacks" >&5
+ echo "$as_me: WARNING: no tic program found for fallbacks" >&2;}
+ fi
+
+@@ -9581,10 +9584,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:9584: checking for infocmp program for fallbacks" >&5
++ echo "$as_me:9587: checking for infocmp program for fallbacks" >&5
+ echo $ECHO_N "checking for infocmp program for fallbacks... $ECHO_C" >&6
+ INFOCMP=$withval
+- echo "$as_me:9587: result: $INFOCMP" >&5
++ echo "$as_me:9590: result: $INFOCMP" >&5
+ echo "${ECHO_T}$INFOCMP" >&6
+
+ if test "x$prefix" != xNONE; then
+@@ -9612,7 +9615,7 @@
+ INFOCMP=`echo "$INFOCMP" | sed -e s%NONE%$cf_path_syntax%`
+ ;;
+ (*)
+- { { echo "$as_me:9615: error: expected a pathname, not \"$INFOCMP\"" >&5
++ { { echo "$as_me:9618: error: expected a pathname, not \"$INFOCMP\"" >&5
+ echo "$as_me: error: expected a pathname, not \"$INFOCMP\"" >&2;}
+ { (exit 1); exit 1; }; }
+ ;;
+@@ -9625,7 +9628,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:9628: checking for $ac_word" >&5
++echo "$as_me:9631: 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
+@@ -9642,7 +9645,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:9645: found $ac_dir/$ac_word" >&5
++ echo "$as_me:9648: found $ac_dir/$ac_word" >&5
+ break
+ fi
+ done
+@@ -9653,10 +9656,10 @@
+ INFOCMP=$ac_cv_path_INFOCMP
+
+ if test -n "$INFOCMP"; then
+- echo "$as_me:9656: result: $INFOCMP" >&5
++ echo "$as_me:9659: result: $INFOCMP" >&5
+ echo "${ECHO_T}$INFOCMP" >&6
+ else
+- echo "$as_me:9659: result: no" >&5
++ echo "$as_me:9662: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+
+@@ -9715,7 +9718,7 @@
+
+ if test -n "$cf_path_prog" ; then
+
+-echo "${as_me:-configure}:9718: testing defining path for ${cf_path_prog} ..." 1>&5
++echo "${as_me:-configure}:9721: testing defining path for ${cf_path_prog} ..." 1>&5
+
+ cat >>confdefs.h <<EOF
+ #define INFOCMP_PATH "$cf_path_prog"
+@@ -9730,7 +9733,7 @@
+
+ if test -z "$INFOCMP"
+ then
+- { echo "$as_me:9733: WARNING: no infocmp program found for fallbacks" >&5
++ { echo "$as_me:9736: WARNING: no infocmp program found for fallbacks" >&5
+ echo "$as_me: WARNING: no infocmp program found for fallbacks" >&2;}
+ fi
+
+@@ -9740,7 +9743,7 @@
+ test -z "$INFOCMP" && FALLBACK_LIST=
+ if test -z "$FALLBACK_LIST"
+ then
+- { echo "$as_me:9743: WARNING: ignoring fallback option because tic/infocmp are not available" >&5
++ { echo "$as_me:9746: 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
+@@ -9748,7 +9751,7 @@
+ USE_FALLBACKS=
+ test -z "$FALLBACK_LIST" && USE_FALLBACKS="#"
+
+-echo "$as_me:9751: checking if you want modern xterm or antique" >&5
++echo "$as_me:9754: 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.
+@@ -9762,7 +9765,7 @@
+ (no) with_xterm_new=xterm-old;;
+ (*) with_xterm_new=xterm-new;;
+ esac
+-echo "$as_me:9765: result: $with_xterm_new" >&5
++echo "$as_me:9768: result: $with_xterm_new" >&5
+ echo "${ECHO_T}$with_xterm_new" >&6
+ WHICH_XTERM=$with_xterm_new
+
+@@ -9775,7 +9778,7 @@
+ ;;
+ esac
+
+-echo "$as_me:9778: checking if xterm backspace sends BS or DEL" >&5
++echo "$as_me:9781: 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.
+@@ -9799,13 +9802,13 @@
+ with_xterm_kbs=$withval
+ ;;
+ esac
+-echo "$as_me:9802: result: $with_xterm_kbs" >&5
++echo "$as_me:9805: 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:9808: WARNING: expected --with-xterm-kbs=$want_xterm_kbs for $host_os, have $with_xterm_kbs" >&5
++ { echo "$as_me:9811: 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
+
+@@ -9815,7 +9818,7 @@
+ MAKE_TERMINFO="#"
+ else
+
+-echo "$as_me:9818: checking for list of terminfo directories" >&5
++echo "$as_me:9821: 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.
+@@ -9855,7 +9858,7 @@
+ cf_src_path=`echo "$cf_src_path" | sed -e s%NONE%$cf_path_syntax%`
+ ;;
+ (*)
+- { { echo "$as_me:9858: error: expected a pathname, not \"$cf_src_path\"" >&5
++ { { echo "$as_me:9861: 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; }; }
+ ;;
+@@ -9878,7 +9881,7 @@
+ ;;
+ esac
+
+-echo "$as_me:9881: result: $TERMINFO_DIRS" >&5
++echo "$as_me:9884: result: $TERMINFO_DIRS" >&5
+ echo "${ECHO_T}$TERMINFO_DIRS" >&6
+ test -n "$TERMINFO_DIRS" &&
+ cat >>confdefs.h <<EOF
+@@ -9887,13 +9890,13 @@
+
+ case "x$TERMINFO" in
+ x???:*)
+- { echo "$as_me:9890: WARNING: ignoring non-directory/file TERMINFO value" >&5
++ { echo "$as_me:9893: 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:9896: checking for default terminfo directory" >&5
++echo "$as_me:9899: 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.
+@@ -9929,7 +9932,7 @@
+ withval=`echo "$withval" | sed -e s%NONE%$cf_path_syntax%`
+ ;;
+ (*)
+- { { echo "$as_me:9932: error: expected a pathname, not \"$withval\"" >&5
++ { { echo "$as_me:9935: error: expected a pathname, not \"$withval\"" >&5
+ echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
+ { (exit 1); exit 1; }; }
+ ;;
+@@ -9938,7 +9941,7 @@
+ fi
+ eval TERMINFO="$withval"
+
+-echo "$as_me:9941: result: $TERMINFO" >&5
++echo "$as_me:9944: result: $TERMINFO" >&5
+ echo "${ECHO_T}$TERMINFO" >&6
+
+ cat >>confdefs.h <<EOF
+@@ -9949,7 +9952,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:9952: checking if big-core option selected" >&5
++echo "$as_me:9955: 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.
+@@ -9961,7 +9964,7 @@
+ with_big_core=no
+ else
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 9964 "configure"
++#line 9967 "configure"
+ #include "confdefs.h"
+
+ #include <stdlib.h>
+@@ -9975,15 +9978,15 @@
+ }
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:9978: \"$ac_link\"") >&5
++if { (eval echo "$as_me:9981: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:9981: \$? = $ac_status" >&5
++ echo "$as_me:9984: \$? = $ac_status" >&5
+ (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+- { (eval echo "$as_me:9983: \"$ac_try\"") >&5
++ { (eval echo "$as_me:9986: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:9986: \$? = $ac_status" >&5
++ echo "$as_me:9989: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ with_big_core=yes
+ else
+@@ -9995,7 +9998,7 @@
+ rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+ fi;
+-echo "$as_me:9998: result: $with_big_core" >&5
++echo "$as_me:10001: result: $with_big_core" >&5
+ echo "${ECHO_T}$with_big_core" >&6
+ test "x$with_big_core" = "xyes" &&
+ cat >>confdefs.h <<\EOF
+@@ -10005,7 +10008,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:10008: checking if big-strings option selected" >&5
++echo "$as_me:10011: 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.
+@@ -10029,14 +10032,14 @@
+ esac
+
+ fi;
+-echo "$as_me:10032: result: $with_big_strings" >&5
++echo "$as_me:10035: 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:10039: checking if you want termcap-fallback support" >&5
++echo "$as_me:10042: 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.
+@@ -10046,14 +10049,14 @@
+ else
+ with_termcap=no
+ fi;
+-echo "$as_me:10049: result: $with_termcap" >&5
++echo "$as_me:10052: 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:10056: error: You have disabled the database w/o specifying fallbacks" >&5
++ { { echo "$as_me:10059: 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
+@@ -10066,13 +10069,13 @@
+ else
+
+ if test "$with_ticlib" != no ; then
+- { { echo "$as_me:10069: error: Options --with-ticlib and --enable-termcap cannot be combined" >&5
++ { { echo "$as_me:10072: 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:10075: checking for list of termcap files" >&5
++ echo "$as_me:10078: 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.
+@@ -10112,7 +10115,7 @@
+ cf_src_path=`echo "$cf_src_path" | sed -e s%NONE%$cf_path_syntax%`
+ ;;
+ (*)
+- { { echo "$as_me:10115: error: expected a pathname, not \"$cf_src_path\"" >&5
++ { { echo "$as_me:10118: 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; }; }
+ ;;
+@@ -10135,7 +10138,7 @@
+ ;;
+ esac
+
+- echo "$as_me:10138: result: $TERMPATH" >&5
++ echo "$as_me:10141: result: $TERMPATH" >&5
+ echo "${ECHO_T}$TERMPATH" >&6
+ test -n "$TERMPATH" &&
+ cat >>confdefs.h <<EOF
+@@ -10143,7 +10146,7 @@
+ EOF
+
+ ### use option --enable-getcap to use a hacked getcap for reading termcaps
+- echo "$as_me:10146: checking if fast termcap-loader is needed" >&5
++ echo "$as_me:10149: 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.
+@@ -10153,14 +10156,14 @@
+ else
+ with_getcap=no
+ fi;
+- echo "$as_me:10156: result: $with_getcap" >&5
++ echo "$as_me:10159: 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:10163: checking if translated termcaps will be cached in ~/.terminfo" >&5
++ echo "$as_me:10166: 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.
+@@ -10170,7 +10173,7 @@
+ else
+ with_getcap_cache=no
+ fi;
+- echo "$as_me:10173: result: $with_getcap_cache" >&5
++ echo "$as_me:10176: result: $with_getcap_cache" >&5
+ echo "${ECHO_T}$with_getcap_cache" >&6
+ test "x$with_getcap_cache" = "xyes" &&
+ cat >>confdefs.h <<\EOF
+@@ -10180,7 +10183,7 @@
+ fi
+
+ ### Use option --disable-home-terminfo to completely remove ~/.terminfo
+-echo "$as_me:10183: checking if ~/.terminfo is wanted" >&5
++echo "$as_me:10186: 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.
+@@ -10190,14 +10193,14 @@
+ else
+ with_home_terminfo=yes
+ fi;
+-echo "$as_me:10193: result: $with_home_terminfo" >&5
++echo "$as_me:10196: 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:10200: checking if you want to permit root to use ncurses environment variables" >&5
++echo "$as_me:10203: 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.
+@@ -10207,14 +10210,14 @@
+ else
+ with_root_environ=yes
+ fi;
+-echo "$as_me:10210: result: $with_root_environ" >&5
++echo "$as_me:10213: 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:10217: checking if you want to permit setuid programs to access all files" >&5
++echo "$as_me:10220: 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.
+@@ -10224,14 +10227,14 @@
+ else
+ with_root_access=yes
+ fi;
+-echo "$as_me:10227: result: $with_root_access" >&5
++echo "$as_me:10230: 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:10234: checking if you want to permit setuid use of ncurses environment variables" >&5
++echo "$as_me:10237: 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.
+@@ -10241,7 +10244,7 @@
+ else
+ with_setuid_environ=$with_root_environ
+ fi;
+-echo "$as_me:10244: result: $with_setuid_environ" >&5
++echo "$as_me:10247: result: $with_setuid_environ" >&5
+ echo "${ECHO_T}$with_setuid_environ" >&6
+ test "x$with_setuid_environ" = xyes &&
+ cat >>confdefs.h <<\EOF
+@@ -10256,23 +10259,23 @@
+
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-echo "$as_me:10259: checking for $ac_header" >&5
++echo "$as_me:10262: 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 10265 "configure"
++#line 10268 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:10269: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:10272: \"$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:10275: \$? = $ac_status" >&5
++ echo "$as_me:10278: \$? = $ac_status" >&5
+ (exit "$ac_status"); } >/dev/null; then
+ if test -s conftest.err; then
+ ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -10291,7 +10294,7 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:10294: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
++echo "$as_me:10297: 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
+@@ -10306,13 +10309,13 @@
+ unlink
+ do
+ as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+-echo "$as_me:10309: checking for $ac_func" >&5
++echo "$as_me:10312: 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 10315 "configure"
++#line 10318 "configure"
+ #include "confdefs.h"
+ #define $ac_func autoconf_temporary
+ #include <limits.h> /* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -10343,16 +10346,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:10346: \"$ac_link\"") >&5
++if { (eval echo "$as_me:10349: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:10349: \$? = $ac_status" >&5
++ echo "$as_me:10352: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:10352: \"$ac_try\"") >&5
++ { (eval echo "$as_me:10355: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:10355: \$? = $ac_status" >&5
++ echo "$as_me:10358: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ eval "$as_ac_var=yes"
+ else
+@@ -10362,7 +10365,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:10365: result: `eval echo '${'"$as_ac_var"'}'`" >&5
++echo "$as_me:10368: 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
+@@ -10379,13 +10382,13 @@
+ symlink
+ do
+ as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+-echo "$as_me:10382: checking for $ac_func" >&5
++echo "$as_me:10385: 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 10388 "configure"
++#line 10391 "configure"
+ #include "confdefs.h"
+ #define $ac_func autoconf_temporary
+ #include <limits.h> /* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -10416,16 +10419,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:10419: \"$ac_link\"") >&5
++if { (eval echo "$as_me:10422: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:10422: \$? = $ac_status" >&5
++ echo "$as_me:10425: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:10425: \"$ac_try\"") >&5
++ { (eval echo "$as_me:10428: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:10428: \$? = $ac_status" >&5
++ echo "$as_me:10431: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ eval "$as_ac_var=yes"
+ else
+@@ -10435,7 +10438,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:10438: result: `eval echo '${'"$as_ac_var"'}'`" >&5
++echo "$as_me:10441: 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
+@@ -10446,7 +10449,7 @@
+ done
+
+ else
+- echo "$as_me:10449: checking if link/symlink functions work" >&5
++ echo "$as_me:10452: 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
+@@ -10459,7 +10462,7 @@
+ eval 'ac_cv_func_'$cf_func'=error'
+ else
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 10462 "configure"
++#line 10465 "configure"
+ #include "confdefs.h"
+
+ $ac_includes_default
+@@ -10493,15 +10496,15 @@
+
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:10496: \"$ac_link\"") >&5
++if { (eval echo "$as_me:10499: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:10499: \$? = $ac_status" >&5
++ echo "$as_me:10502: \$? = $ac_status" >&5
+ (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+- { (eval echo "$as_me:10501: \"$ac_try\"") >&5
++ { (eval echo "$as_me:10504: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:10504: \$? = $ac_status" >&5
++ echo "$as_me:10507: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+
+ cf_cv_link_funcs="$cf_cv_link_funcs $cf_func"
+@@ -10519,7 +10522,7 @@
+ test -z "$cf_cv_link_funcs" && cf_cv_link_funcs=no
+
+ fi
+-echo "$as_me:10522: result: $cf_cv_link_funcs" >&5
++echo "$as_me:10525: result: $cf_cv_link_funcs" >&5
+ echo "${ECHO_T}$cf_cv_link_funcs" >&6
+ test "$ac_cv_func_link" = yes &&
+ cat >>confdefs.h <<\EOF
+@@ -10539,7 +10542,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:10542: checking if tic should use symbolic links" >&5
++ echo "$as_me:10545: 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.
+@@ -10549,21 +10552,21 @@
+ else
+ with_symlinks=no
+ fi;
+- echo "$as_me:10552: result: $with_symlinks" >&5
++ echo "$as_me:10555: 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:10559: checking if tic should use hard links" >&5
++ echo "$as_me:10562: 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:10566: result: $with_links" >&5
++ echo "$as_me:10569: result: $with_links" >&5
+ echo "${ECHO_T}$with_links" >&6
+ fi
+
+@@ -10579,7 +10582,7 @@
+
+ ### use option --enable-broken-linker to force on use of broken-linker support
+
+-echo "$as_me:10582: checking if you want broken-linker support code" >&5
++echo "$as_me:10585: 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.
+@@ -10589,7 +10592,7 @@
+ else
+ with_broken_linker=no
+ fi;
+-echo "$as_me:10592: result: $with_broken_linker" >&5
++echo "$as_me:10595: result: $with_broken_linker" >&5
+ echo "${ECHO_T}$with_broken_linker" >&6
+
+ : "${BROKEN_LINKER:=0}"
+@@ -10603,7 +10606,7 @@
+ fi
+
+ ### use option --enable-bsdpad to have tputs process BSD-style prefix padding
+-echo "$as_me:10606: checking if tputs should process BSD-style prefix padding" >&5
++echo "$as_me:10609: 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.
+@@ -10613,7 +10616,7 @@
+ else
+ with_bsdpad=no
+ fi;
+-echo "$as_me:10616: result: $with_bsdpad" >&5
++echo "$as_me:10619: result: $with_bsdpad" >&5
+ echo "${ECHO_T}$with_bsdpad" >&6
+ test "x$with_bsdpad" = xyes &&
+ cat >>confdefs.h <<\EOF
+@@ -10632,14 +10635,14 @@
+ # Check to define _XOPEN_SOURCE "automatically"
+ CPPFLAGS_before_XOPEN="$CPPFLAGS"
+
+-echo "$as_me:10635: checking if the POSIX test-macros are already defined" >&5
++echo "$as_me:10638: 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 10642 "configure"
++#line 10645 "configure"
+ #include "confdefs.h"
+ #include <stdio.h>
+ int
+@@ -10658,16 +10661,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:10661: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:10664: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:10664: \$? = $ac_status" >&5
++ echo "$as_me:10667: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:10667: \"$ac_try\"") >&5
++ { (eval echo "$as_me:10670: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:10670: \$? = $ac_status" >&5
++ echo "$as_me:10673: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_posix_visible=no
+ else
+@@ -10678,7 +10681,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+
+ fi
+-echo "$as_me:10681: result: $cf_cv_posix_visible" >&5
++echo "$as_me:10684: result: $cf_cv_posix_visible" >&5
+ echo "${ECHO_T}$cf_cv_posix_visible" >&6
+
+ if test "$cf_cv_posix_visible" = no; then
+@@ -10720,14 +10723,14 @@
+
+ cf_gnu_xopen_source=$cf_XOPEN_SOURCE
+
+-echo "$as_me:10723: checking if this is the GNU C library" >&5
++echo "$as_me:10726: 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 10730 "configure"
++#line 10733 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ int
+@@ -10746,16 +10749,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:10749: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:10752: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:10752: \$? = $ac_status" >&5
++ echo "$as_me:10755: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:10755: \"$ac_try\"") >&5
++ { (eval echo "$as_me:10758: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:10758: \$? = $ac_status" >&5
++ echo "$as_me:10761: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_gnu_library=yes
+ else
+@@ -10766,7 +10769,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+
+ fi
+-echo "$as_me:10769: result: $cf_cv_gnu_library" >&5
++echo "$as_me:10772: result: $cf_cv_gnu_library" >&5
+ echo "${ECHO_T}$cf_cv_gnu_library" >&6
+
+ if test x$cf_cv_gnu_library = xyes; then
+@@ -10774,7 +10777,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:10777: checking if _DEFAULT_SOURCE can be used as a basis" >&5
++ echo "$as_me:10780: 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
+@@ -10786,7 +10789,7 @@
+ CPPFLAGS="${CPPFLAGS}-D_DEFAULT_SOURCE"
+
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 10789 "configure"
++#line 10792 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ int
+@@ -10805,16 +10808,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:10808: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:10811: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:10811: \$? = $ac_status" >&5
++ echo "$as_me:10814: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:10814: \"$ac_try\"") >&5
++ { (eval echo "$as_me:10817: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:10817: \$? = $ac_status" >&5
++ echo "$as_me:10820: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_gnu_library_219=yes
+ else
+@@ -10826,12 +10829,12 @@
+ CPPFLAGS="$cf_save"
+
+ fi
+-echo "$as_me:10829: result: $cf_cv_gnu_library_219" >&5
++echo "$as_me:10832: 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:10834: checking if _XOPEN_SOURCE=$cf_gnu_xopen_source works with _DEFAULT_SOURCE" >&5
++ echo "$as_me:10837: 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
+@@ -10936,7 +10939,7 @@
+ fi
+
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 10939 "configure"
++#line 10942 "configure"
+ #include "confdefs.h"
+
+ #include <limits.h>
+@@ -10956,16 +10959,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:10959: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:10962: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:10962: \$? = $ac_status" >&5
++ echo "$as_me:10965: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:10965: \"$ac_try\"") >&5
++ { (eval echo "$as_me:10968: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:10968: \$? = $ac_status" >&5
++ echo "$as_me:10971: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_gnu_dftsrc_219=yes
+ else
+@@ -10976,7 +10979,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+
+ fi
+-echo "$as_me:10979: result: $cf_cv_gnu_dftsrc_219" >&5
++echo "$as_me:10982: 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
+@@ -10985,14 +10988,14 @@
+
+ if test "x$cf_cv_gnu_dftsrc_219" != xyes; then
+
+- echo "$as_me:10988: checking if we must define _GNU_SOURCE" >&5
++ echo "$as_me:10991: 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 10995 "configure"
++#line 10998 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ int
+@@ -11007,16 +11010,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:11010: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:11013: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:11013: \$? = $ac_status" >&5
++ echo "$as_me:11016: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:11016: \"$ac_try\"") >&5
++ { (eval echo "$as_me:11019: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:11019: \$? = $ac_status" >&5
++ echo "$as_me:11022: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_gnu_source=no
+ else
+@@ -11123,7 +11126,7 @@
+ fi
+
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 11126 "configure"
++#line 11129 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ int
+@@ -11138,16 +11141,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:11141: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:11144: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:11144: \$? = $ac_status" >&5
++ echo "$as_me:11147: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:11147: \"$ac_try\"") >&5
++ { (eval echo "$as_me:11150: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:11150: \$? = $ac_status" >&5
++ echo "$as_me:11153: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_gnu_source=no
+ else
+@@ -11162,12 +11165,12 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+
+ fi
+-echo "$as_me:11165: result: $cf_cv_gnu_source" >&5
++echo "$as_me:11168: 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:11170: checking if we should also define _DEFAULT_SOURCE" >&5
++ echo "$as_me:11173: 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
+@@ -11177,7 +11180,7 @@
+ CPPFLAGS="${CPPFLAGS}-D_GNU_SOURCE"
+
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 11180 "configure"
++#line 11183 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ int
+@@ -11192,16 +11195,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:11195: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:11198: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:11198: \$? = $ac_status" >&5
++ echo "$as_me:11201: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:11201: \"$ac_try\"") >&5
++ { (eval echo "$as_me:11204: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:11204: \$? = $ac_status" >&5
++ echo "$as_me:11207: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_default_source=no
+ else
+@@ -11212,7 +11215,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+
+ fi
+-echo "$as_me:11215: result: $cf_cv_default_source" >&5
++echo "$as_me:11218: result: $cf_cv_default_source" >&5
+ echo "${ECHO_T}$cf_cv_default_source" >&6
+ if test "$cf_cv_default_source" = yes
+ then
+@@ -11249,16 +11252,16 @@
+ sed -e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ ]*\)\?[ ]/ /g' \
+ -e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ ]*\)\?$//g'`
+
+-echo "$as_me:11252: checking if we should define _POSIX_C_SOURCE" >&5
++echo "$as_me:11255: 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}:11258: testing if the symbol is already defined go no further ..." 1>&5
++echo "${as_me:-configure}:11261: testing if the symbol is already defined go no further ..." 1>&5
+
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 11261 "configure"
++#line 11264 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ int
+@@ -11273,16 +11276,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:11276: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:11279: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:11279: \$? = $ac_status" >&5
++ echo "$as_me:11282: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:11282: \"$ac_try\"") >&5
++ { (eval echo "$as_me:11285: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:11285: \$? = $ac_status" >&5
++ echo "$as_me:11288: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_posix_c_source=no
+ else
+@@ -11303,7 +11306,7 @@
+ esac
+ if test "$cf_want_posix_source" = yes ; then
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 11306 "configure"
++#line 11309 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ int
+@@ -11318,16 +11321,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:11321: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:11324: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:11324: \$? = $ac_status" >&5
++ echo "$as_me:11327: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:11327: \"$ac_try\"") >&5
++ { (eval echo "$as_me:11330: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:11330: \$? = $ac_status" >&5
++ echo "$as_me:11333: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ :
+ else
+@@ -11338,7 +11341,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+
+-echo "${as_me:-configure}:11341: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
++echo "${as_me:-configure}:11344: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
+
+ CFLAGS="$cf_trim_CFLAGS"
+ CPPFLAGS="$cf_trim_CPPFLAGS"
+@@ -11346,10 +11349,10 @@
+ test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
+ CPPFLAGS="${CPPFLAGS}$cf_cv_posix_c_source"
+
+-echo "${as_me:-configure}:11349: testing if the second compile does not leave our definition intact error ..." 1>&5
++echo "${as_me:-configure}:11352: testing if the second compile does not leave our definition intact error ..." 1>&5
+
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 11352 "configure"
++#line 11355 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ int
+@@ -11364,16 +11367,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:11367: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:11370: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:11370: \$? = $ac_status" >&5
++ echo "$as_me:11373: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:11373: \"$ac_try\"") >&5
++ { (eval echo "$as_me:11376: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:11376: \$? = $ac_status" >&5
++ echo "$as_me:11379: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ :
+ else
+@@ -11389,7 +11392,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+
+ fi
+-echo "$as_me:11392: result: $cf_cv_posix_c_source" >&5
++echo "$as_me:11395: 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
+@@ -11506,7 +11509,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:11509: WARNING: this system does not provide usable locale support" >&5
++ { echo "$as_me:11512: 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
+@@ -11538,14 +11541,14 @@
+ ;;
+ (*)
+
+-echo "$as_me:11541: checking if we should define _XOPEN_SOURCE" >&5
++echo "$as_me:11544: 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 11548 "configure"
++#line 11551 "configure"
+ #include "confdefs.h"
+
+ $ac_includes_default
+@@ -11563,16 +11566,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:11566: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:11569: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:11569: \$? = $ac_status" >&5
++ echo "$as_me:11572: \$? = $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:11575: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:11575: \$? = $ac_status" >&5
++ echo "$as_me:11578: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_xopen_source=no
+ else
+@@ -11584,7 +11587,7 @@
+ CPPFLAGS="${CPPFLAGS}-D_XOPEN_SOURCE=$cf_XOPEN_SOURCE"
+
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 11587 "configure"
++#line 11590 "configure"
+ #include "confdefs.h"
+
+ $ac_includes_default
+@@ -11602,16 +11605,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:11605: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:11608: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:11608: \$? = $ac_status" >&5
++ echo "$as_me:11611: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:11611: \"$ac_try\"") >&5
++ { (eval echo "$as_me:11614: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:11614: \$? = $ac_status" >&5
++ echo "$as_me:11617: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_xopen_source=no
+ else
+@@ -11626,7 +11629,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+
+ fi
+-echo "$as_me:11629: result: $cf_cv_xopen_source" >&5
++echo "$as_me:11632: result: $cf_cv_xopen_source" >&5
+ echo "${ECHO_T}$cf_cv_xopen_source" >&6
+
+ if test "$cf_cv_xopen_source" != no ; then
+@@ -11786,16 +11789,16 @@
+ sed -e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ ]*\)\?[ ]/ /g' \
+ -e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ ]*\)\?$//g'`
+
+-echo "$as_me:11789: checking if we should define _POSIX_C_SOURCE" >&5
++echo "$as_me:11792: 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}:11795: testing if the symbol is already defined go no further ..." 1>&5
++echo "${as_me:-configure}:11798: testing if the symbol is already defined go no further ..." 1>&5
+
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 11798 "configure"
++#line 11801 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ int
+@@ -11810,16 +11813,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:11813: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:11816: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:11816: \$? = $ac_status" >&5
++ echo "$as_me:11819: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:11819: \"$ac_try\"") >&5
++ { (eval echo "$as_me:11822: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:11822: \$? = $ac_status" >&5
++ echo "$as_me:11825: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_posix_c_source=no
+ else
+@@ -11840,7 +11843,7 @@
+ esac
+ if test "$cf_want_posix_source" = yes ; then
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 11843 "configure"
++#line 11846 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ int
+@@ -11855,16 +11858,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:11858: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:11861: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:11861: \$? = $ac_status" >&5
++ echo "$as_me:11864: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:11864: \"$ac_try\"") >&5
++ { (eval echo "$as_me:11867: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:11867: \$? = $ac_status" >&5
++ echo "$as_me:11870: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ :
+ else
+@@ -11875,7 +11878,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+
+-echo "${as_me:-configure}:11878: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
++echo "${as_me:-configure}:11881: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
+
+ CFLAGS="$cf_trim_CFLAGS"
+ CPPFLAGS="$cf_trim_CPPFLAGS"
+@@ -11883,10 +11886,10 @@
+ test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
+ CPPFLAGS="${CPPFLAGS}$cf_cv_posix_c_source"
+
+-echo "${as_me:-configure}:11886: testing if the second compile does not leave our definition intact error ..." 1>&5
++echo "${as_me:-configure}:11889: testing if the second compile does not leave our definition intact error ..." 1>&5
+
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 11889 "configure"
++#line 11892 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ int
+@@ -11901,16 +11904,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:11904: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:11907: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:11907: \$? = $ac_status" >&5
++ echo "$as_me:11910: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:11910: \"$ac_try\"") >&5
++ { (eval echo "$as_me:11913: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:11913: \$? = $ac_status" >&5
++ echo "$as_me:11916: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ :
+ else
+@@ -11926,7 +11929,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+
+ fi
+-echo "$as_me:11929: result: $cf_cv_posix_c_source" >&5
++echo "$as_me:11932: 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
+@@ -12039,10 +12042,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}:12042: testing checking if _POSIX_C_SOURCE interferes with _XOPEN_SOURCE ..." 1>&5
++echo "${as_me:-configure}:12045: testing checking if _POSIX_C_SOURCE interferes with _XOPEN_SOURCE ..." 1>&5
+
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 12045 "configure"
++#line 12048 "configure"
+ #include "confdefs.h"
+
+ $ac_includes_default
+@@ -12060,23 +12063,23 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:12063: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:12066: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:12066: \$? = $ac_status" >&5
++ echo "$as_me:12069: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:12069: \"$ac_try\"") >&5
++ { (eval echo "$as_me:12072: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:12072: \$? = $ac_status" >&5
++ echo "$as_me:12075: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ :
+ else
+ echo "$as_me: failed program was:" >&5
+ cat "conftest.$ac_ext" >&5
+
+- { echo "$as_me:12079: WARNING: _POSIX_C_SOURCE definition is not usable" >&5
++ { echo "$as_me:12082: 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
+@@ -12099,7 +12102,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}:12102: testing removing old option $cf_add_cflags from CFLAGS ..." 1>&5
++echo "${as_me:-configure}:12105: testing removing old option $cf_add_cflags from CFLAGS ..." 1>&5
+
+ CFLAGS="$cf_old_cflag"
+ done
+@@ -12111,7 +12114,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}:12114: testing removing old option $cf_add_cflags from CPPFLAGS ..." 1>&5
++echo "${as_me:-configure}:12117: testing removing old option $cf_add_cflags from CPPFLAGS ..." 1>&5
+
+ CPPFLAGS="$cf_old_cflag"
+ done
+@@ -12199,7 +12202,7 @@
+ if test -n "$cf_new_cflags" ; then
+ test -n "$verbose" && echo " add to \$CFLAGS $cf_new_cflags" 1>&6
+
+-echo "${as_me:-configure}:12202: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
++echo "${as_me:-configure}:12205: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
+
+ test -n "$CFLAGS" && CFLAGS="$CFLAGS "
+ CFLAGS="${CFLAGS}$cf_new_cflags"
+@@ -12209,7 +12212,7 @@
+ if test -n "$cf_new_cppflags" ; then
+ test -n "$verbose" && echo " add to \$CPPFLAGS $cf_new_cppflags" 1>&6
+
+-echo "${as_me:-configure}:12212: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
++echo "${as_me:-configure}:12215: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
+
+ test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
+ CPPFLAGS="${CPPFLAGS}$cf_new_cppflags"
+@@ -12219,7 +12222,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}:12222: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5
++echo "${as_me:-configure}:12225: 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"
+@@ -12231,10 +12234,10 @@
+ fi
+
+ if test -n "$cf_XOPEN_SOURCE" && test -z "$cf_cv_xopen_source" ; then
+- echo "$as_me:12234: checking if _XOPEN_SOURCE really is set" >&5
++ echo "$as_me:12237: 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 12237 "configure"
++#line 12240 "configure"
+ #include "confdefs.h"
+ #include <stdlib.h>
+ int
+@@ -12249,16 +12252,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:12252: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:12255: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:12255: \$? = $ac_status" >&5
++ echo "$as_me:12258: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:12258: \"$ac_try\"") >&5
++ { (eval echo "$as_me:12261: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:12261: \$? = $ac_status" >&5
++ echo "$as_me:12264: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_XOPEN_SOURCE_set=yes
+ else
+@@ -12267,12 +12270,12 @@
+ cf_XOPEN_SOURCE_set=no
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+- echo "$as_me:12270: result: $cf_XOPEN_SOURCE_set" >&5
++ echo "$as_me:12273: 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 12275 "configure"
++#line 12278 "configure"
+ #include "confdefs.h"
+ #include <stdlib.h>
+ int
+@@ -12287,16 +12290,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:12290: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:12293: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:12293: \$? = $ac_status" >&5
++ echo "$as_me:12296: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:12296: \"$ac_try\"") >&5
++ { (eval echo "$as_me:12299: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:12299: \$? = $ac_status" >&5
++ echo "$as_me:12302: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_XOPEN_SOURCE_set_ok=yes
+ else
+@@ -12307,19 +12310,19 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ if test "$cf_XOPEN_SOURCE_set_ok" = no
+ then
+- { echo "$as_me:12310: WARNING: _XOPEN_SOURCE is lower than requested" >&5
++ { echo "$as_me:12313: WARNING: _XOPEN_SOURCE is lower than requested" >&5
+ echo "$as_me: WARNING: _XOPEN_SOURCE is lower than requested" >&2;}
+ fi
+ else
+
+-echo "$as_me:12315: checking if we should define _XOPEN_SOURCE" >&5
++echo "$as_me:12318: 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 12322 "configure"
++#line 12325 "configure"
+ #include "confdefs.h"
+
+ $ac_includes_default
+@@ -12337,16 +12340,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:12340: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:12343: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:12343: \$? = $ac_status" >&5
++ echo "$as_me:12346: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:12346: \"$ac_try\"") >&5
++ { (eval echo "$as_me:12349: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:12349: \$? = $ac_status" >&5
++ echo "$as_me:12352: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_xopen_source=no
+ else
+@@ -12358,7 +12361,7 @@
+ CPPFLAGS="${CPPFLAGS}-D_XOPEN_SOURCE=$cf_XOPEN_SOURCE"
+
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 12361 "configure"
++#line 12364 "configure"
+ #include "confdefs.h"
+
+ $ac_includes_default
+@@ -12376,16 +12379,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:12379: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:12382: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:12382: \$? = $ac_status" >&5
++ echo "$as_me:12385: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:12385: \"$ac_try\"") >&5
++ { (eval echo "$as_me:12388: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:12388: \$? = $ac_status" >&5
++ echo "$as_me:12391: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_xopen_source=no
+ else
+@@ -12400,7 +12403,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+
+ fi
+-echo "$as_me:12403: result: $cf_cv_xopen_source" >&5
++echo "$as_me:12406: result: $cf_cv_xopen_source" >&5
+ echo "${ECHO_T}$cf_cv_xopen_source" >&6
+
+ if test "$cf_cv_xopen_source" != no ; then
+@@ -12551,14 +12554,14 @@
+
+ # Work around breakage on OS X
+
+-echo "$as_me:12554: checking if SIGWINCH is defined" >&5
++echo "$as_me:12557: 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 12561 "configure"
++#line 12564 "configure"
+ #include "confdefs.h"
+
+ #include <sys/types.h>
+@@ -12573,23 +12576,23 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:12576: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:12579: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:12579: \$? = $ac_status" >&5
++ echo "$as_me:12582: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:12582: \"$ac_try\"") >&5
++ { (eval echo "$as_me:12585: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:12585: \$? = $ac_status" >&5
++ echo "$as_me:12588: \$? = $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 12592 "configure"
++#line 12595 "configure"
+ #include "confdefs.h"
+
+ #undef _XOPEN_SOURCE
+@@ -12607,16 +12610,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:12610: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:12613: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:12613: \$? = $ac_status" >&5
++ echo "$as_me:12616: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:12616: \"$ac_try\"") >&5
++ { (eval echo "$as_me:12619: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:12619: \$? = $ac_status" >&5
++ echo "$as_me:12622: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_define_sigwinch=maybe
+ else
+@@ -12630,11 +12633,11 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+
+ fi
+-echo "$as_me:12633: result: $cf_cv_define_sigwinch" >&5
++echo "$as_me:12636: 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:12637: checking for actual SIGWINCH definition" >&5
++echo "$as_me:12640: 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
+@@ -12645,7 +12648,7 @@
+ while test "$cf_sigwinch" != 1
+ do
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 12648 "configure"
++#line 12651 "configure"
+ #include "confdefs.h"
+
+ #undef _XOPEN_SOURCE
+@@ -12667,16 +12670,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:12670: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:12673: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:12673: \$? = $ac_status" >&5
++ echo "$as_me:12676: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:12676: \"$ac_try\"") >&5
++ { (eval echo "$as_me:12679: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:12679: \$? = $ac_status" >&5
++ echo "$as_me:12682: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_fixup_sigwinch=$cf_sigwinch
+ break
+@@ -12690,7 +12693,7 @@
+ done
+
+ fi
+-echo "$as_me:12693: result: $cf_cv_fixup_sigwinch" >&5
++echo "$as_me:12696: result: $cf_cv_fixup_sigwinch" >&5
+ echo "${ECHO_T}$cf_cv_fixup_sigwinch" >&6
+
+ if test "$cf_cv_fixup_sigwinch" != unknown ; then
+@@ -12700,13 +12703,13 @@
+
+ # Checks for CODESET support.
+
+-echo "$as_me:12703: checking for nl_langinfo and CODESET" >&5
++echo "$as_me:12706: 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 12709 "configure"
++#line 12712 "configure"
+ #include "confdefs.h"
+
+ $ac_includes_default
+@@ -12720,16 +12723,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:12723: \"$ac_link\"") >&5
++if { (eval echo "$as_me:12726: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:12726: \$? = $ac_status" >&5
++ echo "$as_me:12729: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:12729: \"$ac_try\"") >&5
++ { (eval echo "$as_me:12732: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:12732: \$? = $ac_status" >&5
++ echo "$as_me:12735: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ am_cv_langinfo_codeset=yes
+ else
+@@ -12740,7 +12743,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+
+ fi
+-echo "$as_me:12743: result: $am_cv_langinfo_codeset" >&5
++echo "$as_me:12746: result: $am_cv_langinfo_codeset" >&5
+ echo "${ECHO_T}$am_cv_langinfo_codeset" >&6
+ if test "$am_cv_langinfo_codeset" = yes; then
+
+@@ -12754,7 +12757,7 @@
+ NCURSES_OK_WCHAR_T=
+ NCURSES_OK_WINT_T=
+
+-echo "$as_me:12757: checking if you want wide-character code" >&5
++echo "$as_me:12760: 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.
+@@ -12764,7 +12767,7 @@
+ else
+ with_widec=$cf_dft_widec
+ fi;
+-echo "$as_me:12767: result: $with_widec" >&5
++echo "$as_me:12770: result: $with_widec" >&5
+ echo "${ECHO_T}$with_widec" >&6
+
+ NCURSES_WCWIDTH_GRAPHICS=1
+@@ -12786,7 +12789,7 @@
+ (*_XOPEN_SOURCE=*)
+ ;;
+ (*)
+- { echo "$as_me:12789: WARNING: _XOPEN_SOURCE feature test macro appears to be predefined" >&5
++ { echo "$as_me:12792: 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"
+@@ -12799,23 +12802,23 @@
+
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-echo "$as_me:12802: checking for $ac_header" >&5
++echo "$as_me:12805: 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 12808 "configure"
++#line 12811 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:12812: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:12815: \"$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:12818: \$? = $ac_status" >&5
++ echo "$as_me:12821: \$? = $ac_status" >&5
+ (exit "$ac_status"); } >/dev/null; then
+ if test -s conftest.err; then
+ ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -12834,7 +12837,7 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:12837: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
++echo "$as_me:12840: 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
+@@ -12844,14 +12847,14 @@
+ fi
+ done
+
+-echo "$as_me:12847: checking if wchar.h can be used as is" >&5
++echo "$as_me:12850: 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 12854 "configure"
++#line 12857 "configure"
+ #include "confdefs.h"
+
+ $ac_includes_default
+@@ -12873,16 +12876,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:12876: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:12879: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:12879: \$? = $ac_status" >&5
++ echo "$as_me:12882: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:12882: \"$ac_try\"") >&5
++ { (eval echo "$as_me:12885: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:12885: \$? = $ac_status" >&5
++ echo "$as_me:12888: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_wchar_h_okay=yes
+ else
+@@ -12892,16 +12895,16 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:12895: result: $cf_cv_wchar_h_okay" >&5
++echo "$as_me:12898: 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:12901: checking if we must define _XOPEN_SOURCE_EXTENDED" >&5
++echo "$as_me:12904: 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 12904 "configure"
++#line 12907 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+
+@@ -12917,16 +12920,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:12920: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:12923: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:12923: \$? = $ac_status" >&5
++ echo "$as_me:12926: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:12926: \"$ac_try\"") >&5
++ { (eval echo "$as_me:12929: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:12929: \$? = $ac_status" >&5
++ echo "$as_me:12932: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_result=no
+ else
+@@ -12935,16 +12938,16 @@
+ cf_result=yes
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+-echo "$as_me:12938: result: $cf_result" >&5
++echo "$as_me:12941: 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:12944: checking checking for compatible value versus " >&5
++ echo "$as_me:12947: 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 12947 "configure"
++#line 12950 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+
+@@ -12960,16 +12963,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:12963: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:12966: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:12966: \$? = $ac_status" >&5
++ echo "$as_me:12969: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:12969: \"$ac_try\"") >&5
++ { (eval echo "$as_me:12972: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:12972: \$? = $ac_status" >&5
++ echo "$as_me:12975: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_result=yes
+ else
+@@ -12978,7 +12981,7 @@
+ cf_result=no
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+- echo "$as_me:12981: result: $cf_result" >&5
++ echo "$as_me:12984: result: $cf_result" >&5
+ echo "${ECHO_T}$cf_result" >&6
+ if test "$cf_result" = no ; then
+ # perhaps we can override it - try...
+@@ -12988,7 +12991,7 @@
+
+ fi
+
+-echo "$as_me:12991: checking if wcwidth agrees graphics are single-width" >&5
++echo "$as_me:12994: 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
+@@ -13059,7 +13062,7 @@
+ cf_cv_wcwidth_graphics=unknown
+ else
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 13062 "configure"
++#line 13065 "configure"
+ #include "confdefs.h"
+
+ $ac_includes_default
+@@ -13104,15 +13107,15 @@
+
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:13107: \"$ac_link\"") >&5
++if { (eval echo "$as_me:13110: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:13110: \$? = $ac_status" >&5
++ echo "$as_me:13113: \$? = $ac_status" >&5
+ (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+- { (eval echo "$as_me:13112: \"$ac_try\"") >&5
++ { (eval echo "$as_me:13115: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:13115: \$? = $ac_status" >&5
++ echo "$as_me:13118: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_wcwidth_graphics=yes
+ else
+@@ -13125,7 +13128,7 @@
+ fi
+
+ fi
+-echo "$as_me:13128: result: $cf_cv_wcwidth_graphics" >&5
++echo "$as_me:13131: result: $cf_cv_wcwidth_graphics" >&5
+ echo "${ECHO_T}$cf_cv_wcwidth_graphics" >&6
+
+ test "$cf_cv_wcwidth_graphics" = no && NCURSES_WCWIDTH_GRAPHICS=0
+@@ -13136,13 +13139,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:13139: checking for $ac_func" >&5
++echo "$as_me:13142: 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 13145 "configure"
++#line 13148 "configure"
+ #include "confdefs.h"
+ #define $ac_func autoconf_temporary
+ #include <limits.h> /* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -13173,16 +13176,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:13176: \"$ac_link\"") >&5
++if { (eval echo "$as_me:13179: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:13179: \$? = $ac_status" >&5
++ echo "$as_me:13182: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:13182: \"$ac_try\"") >&5
++ { (eval echo "$as_me:13185: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:13185: \$? = $ac_status" >&5
++ echo "$as_me:13188: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ eval "$as_ac_var=yes"
+ else
+@@ -13192,7 +13195,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:13195: result: `eval echo '${'"$as_ac_var"'}'`" >&5
++echo "$as_me:13198: 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
+@@ -13207,23 +13210,23 @@
+ for ac_header in wchar.h
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-echo "$as_me:13210: checking for $ac_header" >&5
++echo "$as_me:13213: 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 13216 "configure"
++#line 13219 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:13220: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:13223: \"$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:13226: \$? = $ac_status" >&5
++ echo "$as_me:13229: \$? = $ac_status" >&5
+ (exit "$ac_status"); } >/dev/null; then
+ if test -s conftest.err; then
+ ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -13242,7 +13245,7 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:13245: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
++echo "$as_me:13248: 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
+@@ -13252,7 +13255,7 @@
+ fi
+ done
+
+-echo "$as_me:13255: checking for multibyte character support" >&5
++echo "$as_me:13258: 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
+@@ -13260,7 +13263,7 @@
+
+ cf_save_LIBS="$LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 13263 "configure"
++#line 13266 "configure"
+ #include "confdefs.h"
+
+ $ac_includes_default
+@@ -13277,16 +13280,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:13280: \"$ac_link\"") >&5
++if { (eval echo "$as_me:13283: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:13283: \$? = $ac_status" >&5
++ echo "$as_me:13286: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:13286: \"$ac_try\"") >&5
++ { (eval echo "$as_me:13289: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:13289: \$? = $ac_status" >&5
++ echo "$as_me:13292: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_utf8_lib=yes
+ else
+@@ -13298,12 +13301,12 @@
+ cf_cv_header_path_utf8=
+ cf_cv_library_path_utf8=
+
+-echo "${as_me:-configure}:13301: testing Starting FIND_LINKAGE(utf8,) ..." 1>&5
++echo "${as_me:-configure}:13304: testing Starting FIND_LINKAGE(utf8,) ..." 1>&5
+
+ cf_save_LIBS="$LIBS"
+
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 13306 "configure"
++#line 13309 "configure"
+ #include "confdefs.h"
+
+ #include <libutf8.h>
+@@ -13316,16 +13319,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:13319: \"$ac_link\"") >&5
++if { (eval echo "$as_me:13322: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:13322: \$? = $ac_status" >&5
++ echo "$as_me:13325: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:13325: \"$ac_try\"") >&5
++ { (eval echo "$as_me:13328: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:13328: \$? = $ac_status" >&5
++ echo "$as_me:13331: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+
+ cf_cv_find_linkage_utf8=yes
+@@ -13339,7 +13342,7 @@
+ LIBS="-lutf8 $cf_save_LIBS"
+
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 13342 "configure"
++#line 13345 "configure"
+ #include "confdefs.h"
+
+ #include <libutf8.h>
+@@ -13352,16 +13355,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:13355: \"$ac_link\"") >&5
++if { (eval echo "$as_me:13358: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:13358: \$? = $ac_status" >&5
++ echo "$as_me:13361: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:13361: \"$ac_try\"") >&5
++ { (eval echo "$as_me:13364: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:13364: \$? = $ac_status" >&5
++ echo "$as_me:13367: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+
+ cf_cv_find_linkage_utf8=yes
+@@ -13378,9 +13381,9 @@
+
+ test -n "$verbose" && echo " find linkage for utf8 library" 1>&6
+
+-echo "${as_me:-configure}:13381: testing find linkage for utf8 library ..." 1>&5
++echo "${as_me:-configure}:13384: testing find linkage for utf8 library ..." 1>&5
+
+-echo "${as_me:-configure}:13383: testing Searching for headers in FIND_LINKAGE(utf8,) ..." 1>&5
++echo "${as_me:-configure}:13386: testing Searching for headers in FIND_LINKAGE(utf8,) ..." 1>&5
+
+ cf_save_CPPFLAGS="$CPPFLAGS"
+ cf_test_CPPFLAGS="$CPPFLAGS"
+@@ -13471,7 +13474,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}:13474: testing ... testing $cf_cv_header_path_utf8 ..." 1>&5
++echo "${as_me:-configure}:13477: testing ... testing $cf_cv_header_path_utf8 ..." 1>&5
+
+ CPPFLAGS="$cf_save_CPPFLAGS"
+
+@@ -13479,7 +13482,7 @@
+ CPPFLAGS="${CPPFLAGS}-I$cf_cv_header_path_utf8"
+
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 13482 "configure"
++#line 13485 "configure"
+ #include "confdefs.h"
+
+ #include <libutf8.h>
+@@ -13492,21 +13495,21 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:13495: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:13498: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:13498: \$? = $ac_status" >&5
++ echo "$as_me:13501: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:13501: \"$ac_try\"") >&5
++ { (eval echo "$as_me:13504: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:13504: \$? = $ac_status" >&5
++ echo "$as_me:13507: \$? = $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}:13509: testing ... found utf8 headers in $cf_cv_header_path_utf8 ..." 1>&5
++echo "${as_me:-configure}:13512: testing ... found utf8 headers in $cf_cv_header_path_utf8 ..." 1>&5
+
+ cf_cv_find_linkage_utf8=maybe
+ cf_test_CPPFLAGS="$CPPFLAGS"
+@@ -13524,7 +13527,7 @@
+
+ if test "$cf_cv_find_linkage_utf8" = maybe ; then
+
+-echo "${as_me:-configure}:13527: testing Searching for utf8 library in FIND_LINKAGE(utf8,) ..." 1>&5
++echo "${as_me:-configure}:13530: testing Searching for utf8 library in FIND_LINKAGE(utf8,) ..." 1>&5
+
+ cf_save_LIBS="$LIBS"
+ cf_save_LDFLAGS="$LDFLAGS"
+@@ -13599,13 +13602,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}:13602: testing ... testing $cf_cv_library_path_utf8 ..." 1>&5
++echo "${as_me:-configure}:13605: 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 13608 "configure"
++#line 13611 "configure"
+ #include "confdefs.h"
+
+ #include <libutf8.h>
+@@ -13618,21 +13621,21 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:13621: \"$ac_link\"") >&5
++if { (eval echo "$as_me:13624: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:13624: \$? = $ac_status" >&5
++ echo "$as_me:13627: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:13627: \"$ac_try\"") >&5
++ { (eval echo "$as_me:13630: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:13630: \$? = $ac_status" >&5
++ echo "$as_me:13633: \$? = $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}:13635: testing ... found utf8 library in $cf_cv_library_path_utf8 ..." 1>&5
++echo "${as_me:-configure}:13638: testing ... found utf8 library in $cf_cv_library_path_utf8 ..." 1>&5
+
+ cf_cv_find_linkage_utf8=yes
+ cf_cv_library_file_utf8="-lutf8"
+@@ -13674,7 +13677,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:13677: result: $cf_cv_utf8_lib" >&5
++echo "$as_me:13680: 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
+@@ -13712,7 +13715,7 @@
+ CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
+
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 13715 "configure"
++#line 13718 "configure"
+ #include "confdefs.h"
+ #include <stdio.h>
+ int
+@@ -13724,16 +13727,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:13727: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:13730: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:13730: \$? = $ac_status" >&5
++ echo "$as_me:13733: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:13733: \"$ac_try\"") >&5
++ { (eval echo "$as_me:13736: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:13736: \$? = $ac_status" >&5
++ echo "$as_me:13739: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ :
+ else
+@@ -13750,7 +13753,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}:13753: testing adding $cf_add_incdir to include-path ..." 1>&5
++echo "${as_me:-configure}:13756: testing adding $cf_add_incdir to include-path ..." 1>&5
+
+ CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
+
+@@ -13786,7 +13789,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}:13789: testing adding $cf_add_libdir to library-path ..." 1>&5
++echo "${as_me:-configure}:13792: testing adding $cf_add_libdir to library-path ..." 1>&5
+
+ LDFLAGS="-L$cf_add_libdir $LDFLAGS"
+ fi
+@@ -13818,14 +13821,14 @@
+ fi
+
+ # This is needed on Tru64 5.0 to declare mbstate_t
+-echo "$as_me:13821: checking if we must include wchar.h to declare mbstate_t" >&5
++echo "$as_me:13824: 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 13828 "configure"
++#line 13831 "configure"
+ #include "confdefs.h"
+
+ #include <stdlib.h>
+@@ -13843,23 +13846,23 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:13846: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:13849: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:13849: \$? = $ac_status" >&5
++ echo "$as_me:13852: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:13852: \"$ac_try\"") >&5
++ { (eval echo "$as_me:13855: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:13855: \$? = $ac_status" >&5
++ echo "$as_me:13858: \$? = $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 13862 "configure"
++#line 13865 "configure"
+ #include "confdefs.h"
+
+ #include <stdlib.h>
+@@ -13878,16 +13881,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:13881: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:13884: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:13884: \$? = $ac_status" >&5
++ echo "$as_me:13887: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:13887: \"$ac_try\"") >&5
++ { (eval echo "$as_me:13890: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:13890: \$? = $ac_status" >&5
++ echo "$as_me:13893: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_mbstate_t=yes
+ else
+@@ -13899,7 +13902,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:13902: result: $cf_cv_mbstate_t" >&5
++echo "$as_me:13905: result: $cf_cv_mbstate_t" >&5
+ echo "${ECHO_T}$cf_cv_mbstate_t" >&6
+
+ if test "$cf_cv_mbstate_t" = yes ; then
+@@ -13917,14 +13920,14 @@
+ fi
+
+ # This is needed on Tru64 5.0 to declare wchar_t
+-echo "$as_me:13920: checking if we must include wchar.h to declare wchar_t" >&5
++echo "$as_me:13923: 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 13927 "configure"
++#line 13930 "configure"
+ #include "confdefs.h"
+
+ #include <stdlib.h>
+@@ -13942,23 +13945,23 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:13945: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:13948: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:13948: \$? = $ac_status" >&5
++ echo "$as_me:13951: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:13951: \"$ac_try\"") >&5
++ { (eval echo "$as_me:13954: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:13954: \$? = $ac_status" >&5
++ echo "$as_me:13957: \$? = $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 13961 "configure"
++#line 13964 "configure"
+ #include "confdefs.h"
+
+ #include <stdlib.h>
+@@ -13977,16 +13980,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:13980: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:13983: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:13983: \$? = $ac_status" >&5
++ echo "$as_me:13986: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:13986: \"$ac_try\"") >&5
++ { (eval echo "$as_me:13989: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:13989: \$? = $ac_status" >&5
++ echo "$as_me:13992: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_wchar_t=yes
+ else
+@@ -13998,7 +14001,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:14001: result: $cf_cv_wchar_t" >&5
++echo "$as_me:14004: result: $cf_cv_wchar_t" >&5
+ echo "${ECHO_T}$cf_cv_wchar_t" >&6
+
+ if test "$cf_cv_wchar_t" = yes ; then
+@@ -14021,14 +14024,14 @@
+ fi
+
+ # This is needed on Tru64 5.0 to declare wint_t
+-echo "$as_me:14024: checking if we must include wchar.h to declare wint_t" >&5
++echo "$as_me:14027: 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 14031 "configure"
++#line 14034 "configure"
+ #include "confdefs.h"
+
+ #include <stdlib.h>
+@@ -14046,23 +14049,23 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:14049: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:14052: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:14052: \$? = $ac_status" >&5
++ echo "$as_me:14055: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:14055: \"$ac_try\"") >&5
++ { (eval echo "$as_me:14058: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:14058: \$? = $ac_status" >&5
++ echo "$as_me:14061: \$? = $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 14065 "configure"
++#line 14068 "configure"
+ #include "confdefs.h"
+
+ #include <stdlib.h>
+@@ -14081,16 +14084,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:14084: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:14087: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:14087: \$? = $ac_status" >&5
++ echo "$as_me:14090: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:14090: \"$ac_try\"") >&5
++ { (eval echo "$as_me:14093: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:14093: \$? = $ac_status" >&5
++ echo "$as_me:14096: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_wint_t=yes
+ else
+@@ -14102,7 +14105,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:14105: result: $cf_cv_wint_t" >&5
++echo "$as_me:14108: result: $cf_cv_wint_t" >&5
+ echo "${ECHO_T}$cf_cv_wint_t" >&6
+
+ if test "$cf_cv_wint_t" = yes ; then
+@@ -14134,7 +14137,7 @@
+ fi
+
+ ### use option --disable-lp64 to allow long chtype
+-echo "$as_me:14137: checking whether to enable _LP64 definition in curses.h" >&5
++echo "$as_me:14140: 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.
+@@ -14144,7 +14147,7 @@
+ else
+ with_lp64=$cf_dft_with_lp64
+ fi;
+-echo "$as_me:14147: result: $with_lp64" >&5
++echo "$as_me:14150: result: $with_lp64" >&5
+ echo "${ECHO_T}$with_lp64" >&6
+
+ if test "x$with_lp64" = xyes ; then
+@@ -14160,7 +14163,7 @@
+ fi;
+ if test "$enable_largefile" != no; then
+
+- echo "$as_me:14163: checking for special C compiler options needed for large files" >&5
++ echo "$as_me:14166: 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
+@@ -14172,7 +14175,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 14175 "configure"
++#line 14178 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ /* Check that off_t can represent 2**63 - 1 correctly.
+@@ -14192,16 +14195,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:14195: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:14198: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:14198: \$? = $ac_status" >&5
++ echo "$as_me:14201: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:14201: \"$ac_try\"") >&5
++ { (eval echo "$as_me:14204: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:14204: \$? = $ac_status" >&5
++ echo "$as_me:14207: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ break
+ else
+@@ -14211,16 +14214,16 @@
+ rm -f "conftest.$ac_objext"
+ CC="$CC -n32"
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:14214: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:14217: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:14217: \$? = $ac_status" >&5
++ echo "$as_me:14220: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:14220: \"$ac_try\"") >&5
++ { (eval echo "$as_me:14223: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:14223: \$? = $ac_status" >&5
++ echo "$as_me:14226: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_sys_largefile_CC=' -n32'; break
+ else
+@@ -14234,13 +14237,13 @@
+ rm -f "conftest.$ac_ext"
+ fi
+ fi
+-echo "$as_me:14237: result: $ac_cv_sys_largefile_CC" >&5
++echo "$as_me:14240: 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:14243: checking for _FILE_OFFSET_BITS value needed for large files" >&5
++ echo "$as_me:14246: 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
+@@ -14248,7 +14251,7 @@
+ while :; do
+ ac_cv_sys_file_offset_bits=no
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 14251 "configure"
++#line 14254 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ /* Check that off_t can represent 2**63 - 1 correctly.
+@@ -14268,16 +14271,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:14271: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:14274: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:14274: \$? = $ac_status" >&5
++ echo "$as_me:14277: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:14277: \"$ac_try\"") >&5
++ { (eval echo "$as_me:14280: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:14280: \$? = $ac_status" >&5
++ echo "$as_me:14283: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ break
+ else
+@@ -14286,7 +14289,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 14289 "configure"
++#line 14292 "configure"
+ #include "confdefs.h"
+ #define _FILE_OFFSET_BITS 64
+ #include <sys/types.h>
+@@ -14307,16 +14310,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:14310: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:14313: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:14313: \$? = $ac_status" >&5
++ echo "$as_me:14316: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:14316: \"$ac_try\"") >&5
++ { (eval echo "$as_me:14319: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:14319: \$? = $ac_status" >&5
++ echo "$as_me:14322: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_sys_file_offset_bits=64; break
+ else
+@@ -14327,7 +14330,7 @@
+ break
+ done
+ fi
+-echo "$as_me:14330: result: $ac_cv_sys_file_offset_bits" >&5
++echo "$as_me:14333: 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
+
+@@ -14337,7 +14340,7 @@
+
+ fi
+ rm -rf conftest*
+- echo "$as_me:14340: checking for _LARGE_FILES value needed for large files" >&5
++ echo "$as_me:14343: 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
+@@ -14345,7 +14348,7 @@
+ while :; do
+ ac_cv_sys_large_files=no
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 14348 "configure"
++#line 14351 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ /* Check that off_t can represent 2**63 - 1 correctly.
+@@ -14365,16 +14368,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:14368: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:14371: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:14371: \$? = $ac_status" >&5
++ echo "$as_me:14374: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:14374: \"$ac_try\"") >&5
++ { (eval echo "$as_me:14377: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:14377: \$? = $ac_status" >&5
++ echo "$as_me:14380: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ break
+ else
+@@ -14383,7 +14386,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 14386 "configure"
++#line 14389 "configure"
+ #include "confdefs.h"
+ #define _LARGE_FILES 1
+ #include <sys/types.h>
+@@ -14404,16 +14407,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:14407: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:14410: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:14410: \$? = $ac_status" >&5
++ echo "$as_me:14413: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:14413: \"$ac_try\"") >&5
++ { (eval echo "$as_me:14416: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:14416: \$? = $ac_status" >&5
++ echo "$as_me:14419: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_sys_large_files=1; break
+ else
+@@ -14424,7 +14427,7 @@
+ break
+ done
+ fi
+-echo "$as_me:14427: result: $ac_cv_sys_large_files" >&5
++echo "$as_me:14430: 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
+
+@@ -14437,7 +14440,7 @@
+ fi
+
+ if test "$enable_largefile" != no ; then
+- echo "$as_me:14440: checking for _LARGEFILE_SOURCE value needed for large files" >&5
++ echo "$as_me:14443: 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
+@@ -14445,7 +14448,7 @@
+ while :; do
+ ac_cv_sys_largefile_source=no
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 14448 "configure"
++#line 14451 "configure"
+ #include "confdefs.h"
+ #include <stdio.h>
+ #include <sys/types.h>
+@@ -14460,16 +14463,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:14463: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:14466: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:14466: \$? = $ac_status" >&5
++ echo "$as_me:14469: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:14469: \"$ac_try\"") >&5
++ { (eval echo "$as_me:14472: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:14472: \$? = $ac_status" >&5
++ echo "$as_me:14475: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ break
+ else
+@@ -14478,7 +14481,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 14481 "configure"
++#line 14484 "configure"
+ #include "confdefs.h"
+ #define _LARGEFILE_SOURCE 1
+ #include <stdio.h>
+@@ -14494,16 +14497,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:14497: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:14500: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:14500: \$? = $ac_status" >&5
++ echo "$as_me:14503: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:14503: \"$ac_try\"") >&5
++ { (eval echo "$as_me:14506: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:14506: \$? = $ac_status" >&5
++ echo "$as_me:14509: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_sys_largefile_source=1; break
+ else
+@@ -14514,7 +14517,7 @@
+ break
+ done
+ fi
+-echo "$as_me:14517: result: $ac_cv_sys_largefile_source" >&5
++echo "$as_me:14520: 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
+
+@@ -14528,13 +14531,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:14531: checking for fseeko" >&5
++echo "$as_me:14534: 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 14537 "configure"
++#line 14540 "configure"
+ #include "confdefs.h"
+ #include <stdio.h>
+ #include <sys/types.h>
+@@ -14548,16 +14551,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:14551: \"$ac_link\"") >&5
++if { (eval echo "$as_me:14554: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:14554: \$? = $ac_status" >&5
++ echo "$as_me:14557: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:14557: \"$ac_try\"") >&5
++ { (eval echo "$as_me:14560: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:14560: \$? = $ac_status" >&5
++ echo "$as_me:14563: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_func_fseeko=yes
+ else
+@@ -14567,7 +14570,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:14570: result: $ac_cv_func_fseeko" >&5
++echo "$as_me:14573: result: $ac_cv_func_fseeko" >&5
+ echo "${ECHO_T}$ac_cv_func_fseeko" >&6
+ if test $ac_cv_func_fseeko = yes; then
+
+@@ -14606,14 +14609,14 @@
+
+ fi
+
+- echo "$as_me:14609: checking whether to use struct dirent64" >&5
++ echo "$as_me:14612: 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 14616 "configure"
++#line 14619 "configure"
+ #include "confdefs.h"
+
+ #pragma GCC diagnostic error "-Wincompatible-pointer-types"
+@@ -14640,16 +14643,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:14643: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:14646: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:14646: \$? = $ac_status" >&5
++ echo "$as_me:14649: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:14649: \"$ac_try\"") >&5
++ { (eval echo "$as_me:14652: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:14652: \$? = $ac_status" >&5
++ echo "$as_me:14655: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_struct_dirent64=yes
+ else
+@@ -14660,7 +14663,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+
+ fi
+-echo "$as_me:14663: result: $cf_cv_struct_dirent64" >&5
++echo "$as_me:14666: result: $cf_cv_struct_dirent64" >&5
+ echo "${ECHO_T}$cf_cv_struct_dirent64" >&6
+ test "$cf_cv_struct_dirent64" = yes &&
+ cat >>confdefs.h <<\EOF
+@@ -14670,7 +14673,7 @@
+ fi
+
+ ### use option --disable-tparm-varargs to make tparm() conform to X/Open
+-echo "$as_me:14673: checking if you want tparm not to use X/Open fixed-parameter list" >&5
++echo "$as_me:14676: 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.
+@@ -14680,14 +14683,14 @@
+ else
+ with_tparm_varargs=yes
+ fi;
+-echo "$as_me:14683: result: $with_tparm_varargs" >&5
++echo "$as_me:14686: 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:14690: checking if you want tic library to use explicit dependency on ncurses$LIB_SUFFIX library" >&5
++echo "$as_me:14693: 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.
+@@ -14697,14 +14700,14 @@
+ else
+ with_tic_depends=yes
+ fi;
+-echo "$as_me:14700: result: $with_tic_depends" >&5
++echo "$as_me:14703: 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:14707: checking if you want to enable wattr* macros" >&5
++echo "$as_me:14710: 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.
+@@ -14716,15 +14719,15 @@
+ fi;
+ if [ "x$with_wattr_macros" != xyes ]; then
+ NCURSES_WATTR_MACROS=0
+- echo "$as_me:14719: result: no" >&5
++ echo "$as_me:14722: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ else
+ NCURSES_WATTR_MACROS=1
+- echo "$as_me:14723: result: yes" >&5
++ echo "$as_me:14726: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ fi
+
+-echo "$as_me:14727: checking for X11 rgb file" >&5
++echo "$as_me:14730: 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 +14791,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:14794: 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 +14799,7 @@
+
+ fi
+
+-echo "$as_me:14799: result: $RGB_PATH" >&5
++echo "$as_me:14802: result: $RGB_PATH" >&5
+ echo "${ECHO_T}$RGB_PATH" >&6
+
+ cat >>confdefs.h <<EOF
+@@ -14811,7 +14814,7 @@
+
+ ### use option --with-bool to override bool's type
+
+-echo "$as_me:14814: checking for type of bool" >&5
++echo "$as_me:14817: 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 +14824,17 @@
+ else
+ NCURSES_BOOL=auto
+ fi;
+-echo "$as_me:14824: result: $NCURSES_BOOL" >&5
++echo "$as_me:14827: 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:14831: 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:14837: 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 +14846,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:14849: 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:14853: 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:14858: 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 +14865,11 @@
+ else
+ NCURSES_CHTYPE=$cf_dft_chtype
+ fi;
+-echo "$as_me:14865: result: $NCURSES_CHTYPE" >&5
++echo "$as_me:14868: 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:14872: 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 +14877,7 @@
+
+ ### use option --with-ospeed to override ospeed's type
+
+-echo "$as_me:14877: checking for type of ospeed" >&5
++echo "$as_me:14880: 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 +14887,11 @@
+ else
+ NCURSES_OSPEED=short
+ fi;
+-echo "$as_me:14887: result: $NCURSES_OSPEED" >&5
++echo "$as_me:14890: 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:14894: 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 +14899,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:14902: 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 +14909,18 @@
+ else
+ NCURSES_MMASK_T=$cf_dft_mmask_t
+ fi;
+-echo "$as_me:14909: result: $NCURSES_MMASK_T" >&5
++echo "$as_me:14912: 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:14916: 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:14923: 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 +14930,16 @@
+ else
+ NCURSES_CCHARW_MAX=$cf_dft_ccharw_max
+ fi;
+-echo "$as_me:14930: result: $NCURSES_CCHARW_MAX" >&5
++echo "$as_me:14933: result: $NCURSES_CCHARW_MAX" >&5
+ echo "${ECHO_T}$NCURSES_CCHARW_MAX" >&6
+
+-echo "$as_me:14933: checking for signed char" >&5
++echo "$as_me:14936: 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 14942 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -14951,16 +14954,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:14954: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:14957: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:14957: \$? = $ac_status" >&5
++ echo "$as_me:14960: \$? = $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:14963: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:14963: \$? = $ac_status" >&5
++ echo "$as_me:14966: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_type_signed_char=yes
+ else
+@@ -14970,10 +14973,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:14976: 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:14979: 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 +14985,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 14988 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -14994,21 +14997,21 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:14997: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:15000: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:15000: \$? = $ac_status" >&5
++ echo "$as_me:15003: \$? = $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:15006: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:15006: \$? = $ac_status" >&5
++ echo "$as_me:15009: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_lo=0 ac_mid=0
+ while :; do
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 15011 "configure"
++#line 15014 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -15020,16 +15023,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:15023: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:15026: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:15026: \$? = $ac_status" >&5
++ echo "$as_me:15029: \$? = $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:15032: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:15032: \$? = $ac_status" >&5
++ echo "$as_me:15035: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_hi=$ac_mid; break
+ else
+@@ -15045,7 +15048,7 @@
+ ac_hi=-1 ac_mid=-1
+ while :; do
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 15048 "configure"
++#line 15051 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -15057,16 +15060,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:15060: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:15063: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:15063: \$? = $ac_status" >&5
++ echo "$as_me:15066: \$? = $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:15069: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:15069: \$? = $ac_status" >&5
++ echo "$as_me:15072: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_lo=$ac_mid; break
+ else
+@@ -15082,7 +15085,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 15088 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -15094,16 +15097,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:15097: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:15100: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:15100: \$? = $ac_status" >&5
++ echo "$as_me:15103: \$? = $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:15106: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:15106: \$? = $ac_status" >&5
++ echo "$as_me:15109: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_hi=$ac_mid
+ else
+@@ -15116,12 +15119,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:15122: 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 15127 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -15137,15 +15140,15 @@
+ }
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:15140: \"$ac_link\"") >&5
++if { (eval echo "$as_me:15143: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:15143: \$? = $ac_status" >&5
++ echo "$as_me:15146: \$? = $ac_status" >&5
+ (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+- { (eval echo "$as_me:15145: \"$ac_try\"") >&5
++ { (eval echo "$as_me:15148: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:15148: \$? = $ac_status" >&5
++ echo "$as_me:15151: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_sizeof_signed_char=`cat conftest.val`
+ else
+@@ -15161,7 +15164,7 @@
+ ac_cv_sizeof_signed_char=0
+ fi
+ fi
+-echo "$as_me:15164: result: $ac_cv_sizeof_signed_char" >&5
++echo "$as_me:15167: 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 +15175,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:15178: 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 +15185,13 @@
+ else
+ with_signed_char=$cf_dft_signed_char
+ fi;
+-echo "$as_me:15185: result: $with_signed_char" >&5
++echo "$as_me:15188: 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:15194: 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 +15201,18 @@
+ else
+ NCURSES_TPARM_ARG=$cf_dft_tparm_arg
+ fi;
+-echo "$as_me:15201: result: $NCURSES_TPARM_ARG" >&5
++echo "$as_me:15204: 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:15208: 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:15215: 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 +15222,7 @@
+ else
+ with_rcs_ids=no
+ fi;
+-echo "$as_me:15222: result: $with_rcs_ids" >&5
++echo "$as_me:15225: result: $with_rcs_ids" >&5
+ echo "${ECHO_T}$with_rcs_ids" >&6
+ test "x$with_rcs_ids" = xyes &&
+ cat >>confdefs.h <<\EOF
+@@ -15228,7 +15231,7 @@
+
+ ###############################################################################
+
+-echo "$as_me:15231: checking format of man-pages" >&5
++echo "$as_me:15234: 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 +15322,10 @@
+ ;;
+ esac
+
+-echo "$as_me:15322: result: $MANPAGE_FORMAT" >&5
++echo "$as_me:15325: 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:15328: WARNING: Unexpected manpage-format $cf_unknown" >&5
+ echo "$as_me: WARNING: Unexpected manpage-format $cf_unknown" >&2;}
+ fi
+
+@@ -15363,7 +15366,7 @@
+ esac
+ done
+
+-echo "$as_me:15366: checking for manpage renaming" >&5
++echo "$as_me:15369: 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 +15395,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:15398: 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:15403: 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:15406: 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 +15414,7 @@
+ MANPAGE_ALIASES=yes
+ fi;
+
+-echo "$as_me:15414: result: $MANPAGE_ALIASES" >&5
++echo "$as_me:15417: result: $MANPAGE_ALIASES" >&5
+ echo "${ECHO_T}$MANPAGE_ALIASES" >&6
+
+ case "x$LN_S" in
+@@ -15425,7 +15428,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:15431: 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 +15441,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:15444: 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:15450: result: $MANPAGE_SYMLINKS" >&5
+ echo "${ECHO_T}$MANPAGE_SYMLINKS" >&6
+ fi
+
+-echo "$as_me:15451: checking for manpage tbl" >&5
++echo "$as_me:15454: 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 +15462,7 @@
+ MANPAGE_TBL=no
+ fi;
+
+-echo "$as_me:15462: result: $MANPAGE_TBL" >&5
++echo "$as_me:15465: result: $MANPAGE_TBL" >&5
+ echo "${ECHO_T}$MANPAGE_TBL" >&6
+
+ if test "$prefix" = "NONE" ; then
+@@ -15777,7 +15780,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:15783: 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 +15790,7 @@
+ else
+ with_ext_funcs=yes
+ fi;
+-echo "$as_me:15790: result: $with_ext_funcs" >&5
++echo "$as_me:15793: 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 +15847,7 @@
+ GENERATED_EXT_FUNCS=
+ fi
+
+-echo "$as_me:15847: checking if you want to build with SCREEN extensions" >&5
++echo "$as_me:15850: 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 +15857,7 @@
+ else
+ with_sp_funcs=$cf_dft_ext_spfuncs
+ fi;
+-echo "$as_me:15857: result: $with_sp_funcs" >&5
++echo "$as_me:15860: 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 +15876,7 @@
+ GENERATED_SP_FUNCS=
+ fi
+
+-echo "$as_me:15876: checking if you want to build with terminal-driver" >&5
++echo "$as_me:15879: 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 +15886,7 @@
+ else
+ with_term_driver=no
+ fi;
+-echo "$as_me:15886: result: $with_term_driver" >&5
++echo "$as_me:15889: result: $with_term_driver" >&5
+ echo "${ECHO_T}$with_term_driver" >&6
+ if test "x$with_term_driver" = xyes ; then
+
+@@ -15892,19 +15895,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:15898: 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:15903: 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:15910: 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 +15917,7 @@
+ else
+ with_ext_const=$cf_dft_ext_const
+ fi;
+-echo "$as_me:15917: result: $with_ext_const" >&5
++echo "$as_me:15920: 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 +15925,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:15928: 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 +15935,12 @@
+ else
+ with_ext_colors=$cf_dft_ext_colors
+ fi;
+-echo "$as_me:15935: result: $with_ext_colors" >&5
++echo "$as_me:15938: 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:15943: 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 +15951,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:15954: 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 +15979,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:15982: 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 +15989,7 @@
+ else
+ with_ext_mouse=$cf_dft_ext_mouse
+ fi;
+-echo "$as_me:15989: result: $with_ext_mouse" >&5
++echo "$as_me:15992: result: $with_ext_mouse" >&5
+ echo "${ECHO_T}$with_ext_mouse" >&6
+ if test "x$with_ext_mouse" = xyes ; then
+
+@@ -15996,7 +15999,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:16002: 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 +16016,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:16019: 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 +16026,7 @@
+ else
+ with_ext_putwin=$cf_dft_ext_putwin
+ fi;
+-echo "$as_me:16026: result: $with_ext_putwin" >&5
++echo "$as_me:16029: result: $with_ext_putwin" >&5
+ echo "${ECHO_T}$with_ext_putwin" >&6
+ if test "x$with_ext_putwin" = xyes ; then
+
+@@ -16033,7 +16036,7 @@
+
+ fi
+
+-echo "$as_me:16036: checking if you want \$NCURSES_NO_PADDING code" >&5
++echo "$as_me:16039: 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 +16046,7 @@
+ else
+ with_no_padding=$with_ext_funcs
+ fi;
+-echo "$as_me:16046: result: $with_no_padding" >&5
++echo "$as_me:16049: result: $with_no_padding" >&5
+ echo "${ECHO_T}$with_no_padding" >&6
+ test "x$with_no_padding" = xyes &&
+ cat >>confdefs.h <<\EOF
+@@ -16051,7 +16054,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:16057: 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 +16064,7 @@
+ else
+ with_sigwinch=$with_ext_funcs
+ fi;
+-echo "$as_me:16064: result: $with_sigwinch" >&5
++echo "$as_me:16067: result: $with_sigwinch" >&5
+ echo "${ECHO_T}$with_sigwinch" >&6
+ if test "x$with_sigwinch" = xyes
+ then
+@@ -16076,7 +16079,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:16082: 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 +16089,7 @@
+ else
+ with_tcap_names=$with_ext_funcs
+ fi;
+-echo "$as_me:16089: result: $with_tcap_names" >&5
++echo "$as_me:16092: 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 +16103,7 @@
+
+ ##############################################################################
+
+-echo "$as_me:16103: checking if you want to link with the pthread library" >&5
++echo "$as_me:16106: 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 +16113,27 @@
+ else
+ with_pthread=no
+ fi;
+-echo "$as_me:16113: result: $with_pthread" >&5
++echo "$as_me:16116: 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:16120: 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 16126 "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:16130: \"$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:16136: \$? = $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 +16152,7 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:16152: result: $ac_cv_header_pthread_h" >&5
++echo "$as_me:16155: 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 +16162,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:16165: 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 +16183,7 @@
+ LIBS="$cf_add_libs"
+
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 16183 "configure"
++#line 16186 "configure"
+ #include "confdefs.h"
+
+ #include <pthread.h>
+@@ -16197,16 +16200,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:16200: \"$ac_link\"") >&5
++if { (eval echo "$as_me:16203: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:16203: \$? = $ac_status" >&5
++ echo "$as_me:16206: \$? = $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:16209: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:16209: \$? = $ac_status" >&5
++ echo "$as_me:16212: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ with_pthread=yes
+ else
+@@ -16216,7 +16219,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:16222: result: $with_pthread" >&5
+ echo "${ECHO_T}$with_pthread" >&6
+ test "$with_pthread" = yes && break
+ done
+@@ -16244,7 +16247,7 @@
+ EOF
+
+ else
+- { { echo "$as_me:16247: error: Cannot link with pthread library" >&5
++ { { echo "$as_me:16250: error: Cannot link with pthread library" >&5
+ echo "$as_me: error: Cannot link with pthread library" >&2;}
+ { (exit 1); exit 1; }; }
+ fi
+@@ -16254,13 +16257,13 @@
+ fi
+
+ if test "x$with_pthread" != xno; then
+- echo "$as_me:16257: checking for pthread_kill" >&5
++ echo "$as_me:16260: 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 16266 "configure"
+ #include "confdefs.h"
+ #define pthread_kill autoconf_temporary
+ #include <limits.h> /* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -16291,16 +16294,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:16294: \"$ac_link\"") >&5
++if { (eval echo "$as_me:16297: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:16297: \$? = $ac_status" >&5
++ echo "$as_me:16300: \$? = $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:16303: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:16303: \$? = $ac_status" >&5
++ echo "$as_me:16306: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_func_pthread_kill=yes
+ else
+@@ -16310,11 +16313,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:16316: 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:16320: 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 +16327,7 @@
+ else
+ use_pthreads_eintr=no
+ fi;
+- echo "$as_me:16327: result: $use_pthreads_eintr" >&5
++ echo "$as_me:16330: result: $use_pthreads_eintr" >&5
+ echo "${ECHO_T}$use_pthreads_eintr" >&6
+ if test "x$use_pthreads_eintr" = xyes ; then
+
+@@ -16335,7 +16338,7 @@
+ fi
+ fi
+
+- echo "$as_me:16338: checking if you want to use weak-symbols for pthreads" >&5
++ echo "$as_me:16341: 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 +16348,18 @@
+ else
+ use_weak_symbols=no
+ fi;
+- echo "$as_me:16348: result: $use_weak_symbols" >&5
++ echo "$as_me:16351: 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:16355: 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 16362 "configure"
+ #include "confdefs.h"
+
+ #include <stdio.h>
+@@ -16382,16 +16385,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:16385: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:16388: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:16388: \$? = $ac_status" >&5
++ echo "$as_me:16391: \$? = $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:16394: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:16394: \$? = $ac_status" >&5
++ echo "$as_me:16397: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_weak_symbols=yes
+ else
+@@ -16402,7 +16405,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+
+ fi
+-echo "$as_me:16405: result: $cf_cv_weak_symbols" >&5
++echo "$as_me:16408: result: $cf_cv_weak_symbols" >&5
+ echo "${ECHO_T}$cf_cv_weak_symbols" >&6
+
+ else
+@@ -16452,7 +16455,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:16458: 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 +16465,7 @@
+ else
+ with_reentrant=no
+ fi;
+-echo "$as_me:16465: result: $with_reentrant" >&5
++echo "$as_me:16468: result: $with_reentrant" >&5
+ echo "${ECHO_T}$with_reentrant" >&6
+ if test "x$with_reentrant" = xyes ; then
+ cf_cv_enable_reentrant=1
+@@ -16551,7 +16554,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:16557: 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 +16566,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:16569: 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 +16588,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:16591: 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:16596: 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:16600: 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 +16614,10 @@
+ enable_opaque_form=$cf_dft_opaque_curses
+
+ fi;
+-echo "$as_me:16614: result: $enable_opaque_form" >&5
++echo "$as_me:16617: 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:16620: 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 +16634,10 @@
+ enable_opaque_menu=$cf_dft_opaque_curses
+
+ fi;
+-echo "$as_me:16634: result: $enable_opaque_menu" >&5
++echo "$as_me:16637: 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:16640: 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 +16654,7 @@
+ enable_opaque_panel=$cf_dft_opaque_curses
+
+ fi;
+-echo "$as_me:16654: result: $enable_opaque_panel" >&5
++echo "$as_me:16657: 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 +16664,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:16667: 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 +16674,7 @@
+ else
+ NCURSES_WRAP_PREFIX=_nc_
+ fi;
+- echo "$as_me:16674: result: $NCURSES_WRAP_PREFIX" >&5
++ echo "$as_me:16677: result: $NCURSES_WRAP_PREFIX" >&5
+ echo "${ECHO_T}$NCURSES_WRAP_PREFIX" >&6
+ else
+ NCURSES_WRAP_PREFIX=_nc_
+@@ -16684,7 +16687,7 @@
+ ###############################################################################
+ # These options are relatively safe to experiment with.
+
+-echo "$as_me:16687: checking if you want all development code" >&5
++echo "$as_me:16690: 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 +16697,11 @@
+ else
+ with_develop=no
+ fi;
+-echo "$as_me:16697: result: $with_develop" >&5
++echo "$as_me:16700: 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:16704: 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 +16711,7 @@
+ else
+ enable_check_size=$with_develop
+ fi;
+-echo "$as_me:16711: result: $enable_check_size" >&5
++echo "$as_me:16714: result: $enable_check_size" >&5
+ echo "${ECHO_T}$enable_check_size" >&6
+ test "x$enable_check_size" = xyes &&
+ cat >>confdefs.h <<\EOF
+@@ -16716,7 +16719,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:16722: 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 +16729,7 @@
+ else
+ enable_hard_tabs=$with_develop
+ fi;
+-echo "$as_me:16729: result: $enable_hard_tabs" >&5
++echo "$as_me:16732: result: $enable_hard_tabs" >&5
+ echo "${ECHO_T}$enable_hard_tabs" >&6
+ test "x$enable_hard_tabs" = xyes &&
+ cat >>confdefs.h <<\EOF
+@@ -16734,7 +16737,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:16740: 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 +16747,7 @@
+ else
+ enable_xmc_glitch=$with_develop
+ fi;
+-echo "$as_me:16747: result: $enable_xmc_glitch" >&5
++echo "$as_me:16750: result: $enable_xmc_glitch" >&5
+ echo "${ECHO_T}$enable_xmc_glitch" >&6
+ test "x$enable_xmc_glitch" = xyes &&
+ cat >>confdefs.h <<\EOF
+@@ -16754,7 +16757,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:16760: 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 +16767,7 @@
+ else
+ with_assumed_color=yes
+ fi;
+-echo "$as_me:16767: result: $with_assumed_color" >&5
++echo "$as_me:16770: result: $with_assumed_color" >&5
+ echo "${ECHO_T}$with_assumed_color" >&6
+ test "x$with_assumed_color" = xyes &&
+ cat >>confdefs.h <<\EOF
+@@ -16772,7 +16775,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:16778: 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 +16785,7 @@
+ else
+ with_hashmap=yes
+ fi;
+-echo "$as_me:16785: result: $with_hashmap" >&5
++echo "$as_me:16788: result: $with_hashmap" >&5
+ echo "${ECHO_T}$with_hashmap" >&6
+ test "x$with_hashmap" = xyes &&
+ cat >>confdefs.h <<\EOF
+@@ -16790,7 +16793,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:16796: 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 +16803,7 @@
+ else
+ with_colorfgbg=no
+ fi;
+-echo "$as_me:16803: result: $with_colorfgbg" >&5
++echo "$as_me:16806: result: $with_colorfgbg" >&5
+ echo "${ECHO_T}$with_colorfgbg" >&6
+ test "x$with_colorfgbg" = xyes &&
+ cat >>confdefs.h <<\EOF
+@@ -16808,7 +16811,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:16814: 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 +16821,14 @@
+ else
+ cf_with_fvisibility=no
+ fi;
+-echo "$as_me:16821: result: $cf_with_fvisibility" >&5
++echo "$as_me:16824: 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:16831: 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 +16837,7 @@
+ cf_save_cflags="$CFLAGS"
+ CFLAGS="$CFLAGS -fvisibility=hidden"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 16837 "configure"
++#line 16840 "configure"
+ #include "confdefs.h"
+
+ __attribute__ ((visibility("default"))) int somefunc() {return 42;}
+@@ -16850,16 +16853,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:16853: \"$ac_link\"") >&5
++if { (eval echo "$as_me:16856: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:16856: \$? = $ac_status" >&5
++ echo "$as_me:16859: \$? = $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:16862: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:16862: \$? = $ac_status" >&5
++ echo "$as_me:16865: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_fvisibility_hidden=yes
+ else
+@@ -16871,7 +16874,7 @@
+ CFLAGS=$cf_save_cflags
+
+ fi
+-echo "$as_me:16874: result: $cf_cv_fvisibility_hidden" >&5
++echo "$as_me:16877: result: $cf_cv_fvisibility_hidden" >&5
+ echo "${ECHO_T}$cf_cv_fvisibility_hidden" >&6
+
+ if test "x$cf_cv_fvisibility_hidden" = xyes
+@@ -16986,7 +16989,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:16992: 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 +16998,7 @@
+ cf_save_cflags="$CXXFLAGS"
+ CXXFLAGS="$CXXFLAGS -fvisibility=hidden"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 16998 "configure"
++#line 17001 "configure"
+ #include "confdefs.h"
+
+ __attribute__ ((visibility("default"))) int somefunc() {return 42;}
+@@ -17011,16 +17014,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:17014: \"$ac_link\"") >&5
++if { (eval echo "$as_me:17017: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:17017: \$? = $ac_status" >&5
++ echo "$as_me:17020: \$? = $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:17023: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:17023: \$? = $ac_status" >&5
++ echo "$as_me:17026: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_fvisibility_hidden2=yes
+ else
+@@ -17032,7 +17035,7 @@
+ CXXFLAGS=$cf_save_cflags
+
+ fi
+-echo "$as_me:17035: result: $cf_cv_fvisibility_hidden2" >&5
++echo "$as_me:17038: result: $cf_cv_fvisibility_hidden2" >&5
+ echo "${ECHO_T}$cf_cv_fvisibility_hidden2" >&6
+
+ if test "x$cf_cv_fvisibility_hidden2" = xyes
+@@ -17155,7 +17158,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:17161: 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 +17168,13 @@
+ else
+ with_exp_interop=$cf_dft_interop
+ fi;
+-echo "$as_me:17168: result: $with_exp_interop" >&5
++echo "$as_me:17171: 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:17177: 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 +17184,13 @@
+ else
+ with_safe_sprintf=no
+ fi;
+-echo "$as_me:17184: result: $with_safe_sprintf" >&5
++echo "$as_me:17187: 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:17193: 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 +17200,7 @@
+ else
+ with_scroll_hints=yes
+ fi;
+-echo "$as_me:17200: result: $with_scroll_hints" >&5
++echo "$as_me:17203: result: $with_scroll_hints" >&5
+ echo "${ECHO_T}$with_scroll_hints" >&6
+ test "x$with_scroll_hints" = xyes &&
+ cat >>confdefs.h <<\EOF
+@@ -17206,7 +17209,7 @@
+
+ fi
+
+-echo "$as_me:17209: checking if you want wgetch-events code" >&5
++echo "$as_me:17212: 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 +17219,7 @@
+ else
+ with_wgetch_events=no
+ fi;
+-echo "$as_me:17219: result: $with_wgetch_events" >&5
++echo "$as_me:17222: result: $with_wgetch_events" >&5
+ echo "${ECHO_T}$with_wgetch_events" >&6
+ if test "x$with_wgetch_events" = xyes ; then
+
+@@ -17231,7 +17234,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:17237: 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 +17244,7 @@
+ else
+ with_exp_win32=no
+ fi;
+- echo "$as_me:17244: result: $with_exp_win32" >&5
++ echo "$as_me:17247: result: $with_exp_win32" >&5
+ echo "${ECHO_T}$with_exp_win32" >&6
+ if test "x$with_exp_win32" = xyes
+ then
+@@ -17267,7 +17270,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:17273: 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 +17304,7 @@
+ ECHO_CC=''
+
+ fi;
+-echo "$as_me:17304: result: $enableval" >&5
++echo "$as_me:17307: result: $enableval" >&5
+ echo "${ECHO_T}$enableval" >&6
+
+ if test "x$enable_echo" = xyes; then
+@@ -17314,7 +17317,7 @@
+
+ # --disable-stripping is used for debugging
+
+-echo "$as_me:17317: checking if you want to install stripped executables" >&5
++echo "$as_me:17320: 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 +17334,7 @@
+ enable_stripping=yes
+
+ fi;
+-echo "$as_me:17334: result: $enable_stripping" >&5
++echo "$as_me:17337: result: $enable_stripping" >&5
+ echo "${ECHO_T}$enable_stripping" >&6
+
+ if test "$enable_stripping" = yes
+@@ -17342,7 +17345,7 @@
+ fi
+
+ : "${INSTALL:=install}"
+-echo "$as_me:17345: checking if install accepts -p option" >&5
++echo "$as_me:17348: 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 +17376,10 @@
+ rm -rf ./conftest*
+
+ fi
+-echo "$as_me:17376: result: $cf_cv_install_p" >&5
++echo "$as_me:17379: 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:17382: 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 +17390,7 @@
+ ;;
+ esac
+
+-echo "$as_me:17390: result: $with_install_o" >&5
++echo "$as_me:17393: result: $with_install_o" >&5
+ echo "${ECHO_T}$with_install_o" >&6
+ if test "x$with_install_o" = xyes
+ then
+@@ -17398,7 +17401,7 @@
+
+ if test -n "$INSTALL_OPT_S"
+ then
+- echo "$as_me:17401: checking if you want to specify strip-program" >&5
++ echo "$as_me:17404: 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 +17411,11 @@
+ else
+ with_strip_program=no
+ fi;
+- echo "$as_me:17411: result: $with_strip_program" >&5
++ echo "$as_me:17414: 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:17418: 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 +17436,11 @@
+ done
+ fi
+ fi
+- echo "$as_me:17436: result: $check_install_strip" >&5
++ echo "$as_me:17439: 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:17443: 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 +17455,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}:17458: testing created $INSTALL ..." 1>&5
+
+ ;;
+ (option)
+@@ -17478,7 +17481,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:17484: 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 +17498,17 @@
+ enable_stdnoreturn=no
+
+ fi;
+-echo "$as_me:17498: result: $enable_stdnoreturn" >&5
++echo "$as_me:17501: 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:17505: 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 17511 "configure"
+ #include "confdefs.h"
+
+ $ac_includes_default
+@@ -17521,16 +17524,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:17524: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:17527: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:17527: \$? = $ac_status" >&5
++ echo "$as_me:17530: \$? = $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:17533: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:17533: \$? = $ac_status" >&5
++ echo "$as_me:17536: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_c11_noreturn=yes
+ else
+@@ -17541,7 +17544,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+
+ fi
+-echo "$as_me:17544: result: $cf_cv_c11_noreturn" >&5
++echo "$as_me:17547: result: $cf_cv_c11_noreturn" >&5
+ echo "${ECHO_T}$cf_cv_c11_noreturn" >&6
+ else
+ cf_cv_c11_noreturn=no,
+@@ -17597,16 +17600,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}:17603: 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}:17608: 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}:17612: testing ... extra $EXTRA_CFLAGS ..." 1>&5
+
+ fi
+ ;;
+@@ -17645,16 +17648,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}:17651: 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}:17656: 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}:17660: testing ... extra $EXTRA_CFLAGS ..." 1>&5
+
+ fi
+ ;;
+@@ -17693,23 +17696,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}:17699: 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}:17704: 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}:17708: 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:17715: 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 +17729,7 @@
+ enable_warnings=no
+
+ fi;
+-echo "$as_me:17729: result: $enable_warnings" >&5
++echo "$as_me:17732: result: $enable_warnings" >&5
+ echo "${ECHO_T}$enable_warnings" >&6
+ if test "$enable_warnings" = "yes"
+ then
+@@ -17750,7 +17753,7 @@
+ done
+
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 17753 "configure"
++#line 17756 "configure"
+ #include "confdefs.h"
+
+ #include <stdlib.h>
+@@ -17765,26 +17768,26 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:17768: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:17771: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:17771: \$? = $ac_status" >&5
++ echo "$as_me:17774: \$? = $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:17777: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:17777: \$? = $ac_status" >&5
++ echo "$as_me:17780: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+
+-echo "$as_me:17780: checking for X11/Xt const-feature" >&5
++echo "$as_me:17783: 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 17790 "configure"
+ #include "confdefs.h"
+
+ #undef _CONST_X_STRING
+@@ -17802,16 +17805,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:17805: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:17808: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:17808: \$? = $ac_status" >&5
++ echo "$as_me:17811: \$? = $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:17814: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:17814: \$? = $ac_status" >&5
++ echo "$as_me:17817: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+
+ cf_cv_const_x_string=no
+@@ -17826,7 +17829,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+
+ fi
+-echo "$as_me:17829: result: $cf_cv_const_x_string" >&5
++echo "$as_me:17832: 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 +17858,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+ cat > "conftest.$ac_ext" <<EOF
+-#line 17858 "${as_me:-configure}"
++#line 17861 "${as_me:-configure}"
+ int main(int argc, char *argv[]) { return (argv[argc-1] == 0) ; }
+ EOF
+ if test "$INTEL_COMPILER" = yes
+@@ -17871,7 +17874,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:17877: 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 +17890,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:17893: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:17893: \$? = $ac_status" >&5
++ echo "$as_me:17896: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; then
+- test -n "$verbose" && echo "$as_me:17895: result: ... -$cf_opt" >&5
++ test -n "$verbose" && echo "$as_me:17898: result: ... -$cf_opt" >&5
+ echo "${ECHO_T}... -$cf_opt" >&6
+ EXTRA_CFLAGS="$EXTRA_CFLAGS -$cf_opt"
+ fi
+@@ -17900,7 +17903,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:17906: checking for $CC warning options..." >&5
+ echo "$as_me: checking for $CC warning options..." >&6;}
+ cf_save_CFLAGS="$CFLAGS"
+ cf_warn_CONST=""
+@@ -17923,12 +17926,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:17929: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:17929: \$? = $ac_status" >&5
++ echo "$as_me:17932: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; then
+- test -n "$verbose" && echo "$as_me:17931: result: ... -$cf_opt" >&5
++ test -n "$verbose" && echo "$as_me:17934: result: ... -$cf_opt" >&5
+ echo "${ECHO_T}... -$cf_opt" >&6
+ case "$cf_opt" in
+ (Winline)
+@@ -17936,7 +17939,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}:17942: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
+
+ continue;;
+ esac
+@@ -17946,7 +17949,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}:17952: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
+
+ continue;;
+ esac
+@@ -17979,10 +17982,10 @@
+ EOF
+ if test "$GCC" = yes
+ then
+- { echo "$as_me:17982: checking for $CC __attribute__ directives..." >&5
++ { echo "$as_me:17985: 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 17988 "${as_me:-configure}"
+ #include <stdio.h>
+ #include "confdefs.h"
+ #include "conftest.h"
+@@ -18032,12 +18035,12 @@
+ ;;
+ esac
+
+- if { (eval echo "$as_me:18035: \"$ac_compile\"") >&5
++ if { (eval echo "$as_me:18038: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:18038: \$? = $ac_status" >&5
++ echo "$as_me:18041: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; then
+- test -n "$verbose" && echo "$as_me:18040: result: ... $cf_attribute" >&5
++ test -n "$verbose" && echo "$as_me:18043: result: ... $cf_attribute" >&5
+ echo "${ECHO_T}... $cf_attribute" >&6
+ cat conftest.h >>confdefs.h
+ case "$cf_attribute" in
+@@ -18109,12 +18112,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:18115: 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 18120 "configure"
+ #include "confdefs.h"
+
+ int
+@@ -18131,16 +18134,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:18134: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:18137: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:18137: \$? = $ac_status" >&5
++ echo "$as_me:18140: \$? = $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:18143: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:18143: \$? = $ac_status" >&5
++ echo "$as_me:18146: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ INTEL_CPLUSPLUS=yes
+ cf_save_CFLAGS="$cf_save_CFLAGS -we147"
+@@ -18151,7 +18154,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:18157: result: $INTEL_CPLUSPLUS" >&5
+ echo "${ECHO_T}$INTEL_CPLUSPLUS" >&6
+ ;;
+ esac
+@@ -18160,11 +18163,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:18166: 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 18170 "configure"
+ #include "confdefs.h"
+
+ int
+@@ -18181,16 +18184,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:18184: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:18187: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:18187: \$? = $ac_status" >&5
++ echo "$as_me:18190: \$? = $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:18193: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:18193: \$? = $ac_status" >&5
++ echo "$as_me:18196: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ CLANG_CPLUSPLUS=yes
+
+@@ -18200,7 +18203,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:18206: result: $CLANG_CPLUSPLUS" >&5
+ echo "${ECHO_T}$CLANG_CPLUSPLUS" >&6
+ fi
+
+@@ -18209,30 +18212,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:18215: 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:18222: 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:18226: 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:18233: 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 18238 "configure"
+ #include "confdefs.h"
+
+ #include <stdio.h>
+@@ -18246,16 +18249,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:18249: \"$ac_link\"") >&5
++if { (eval echo "$as_me:18252: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:18252: \$? = $ac_status" >&5
++ echo "$as_me:18255: \$? = $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:18258: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:18258: \$? = $ac_status" >&5
++ echo "$as_me:18261: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+
+ cf_clang_optok=yes
+@@ -18266,13 +18269,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:18272: 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}:18278: testing adding option $cf_clang_opt ..." 1>&5
+
+ test -n "$CFLAGS" && CFLAGS="$CFLAGS "
+ CFLAGS="${CFLAGS}$cf_clang_opt"
+@@ -18289,7 +18292,7 @@
+ ac_main_return="return"
+
+ cat > conftest.$ac_ext <<EOF
+-#line 18292 "configure"
++#line 18295 "configure"
+ int main(int argc, char *argv[]) { return (argv[argc-1] == 0) ; }
+ EOF
+
+@@ -18307,7 +18310,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:18313: checking for $CC warning options..." >&5
+ echo "$as_me: checking for $CC warning options..." >&6;}
+ cf_save_CXXFLAGS="$CXXFLAGS"
+ EXTRA_CXXFLAGS="-Wall"
+@@ -18324,12 +18327,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:18330: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:18330: \$? = $ac_status" >&5
++ echo "$as_me:18333: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; then
+- test -n "$verbose" && echo "$as_me:18332: result: ... -$cf_opt" >&5
++ test -n "$verbose" && echo "$as_me:18335: result: ... -$cf_opt" >&5
+ echo "${ECHO_T}... -$cf_opt" >&6
+ EXTRA_CXXFLAGS="$EXTRA_CXXFLAGS -$cf_opt"
+ fi
+@@ -18338,7 +18341,7 @@
+
+ elif test "$GXX" = yes
+ then
+- { echo "$as_me:18341: checking for $CXX warning options..." >&5
++ { echo "$as_me:18344: 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 +18371,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:18374: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:18374: \$? = $ac_status" >&5
++ echo "$as_me:18377: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; then
+- test -n "$verbose" && echo "$as_me:18376: result: ... -$cf_opt" >&5
++ test -n "$verbose" && echo "$as_me:18379: 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:18383: result: ... no -$cf_opt" >&5
+ echo "${ECHO_T}... no -$cf_opt" >&6
+ fi
+ done
+@@ -18395,7 +18398,7 @@
+ fi
+ fi
+
+-echo "$as_me:18398: checking if you want to work around bogus compiler/loader warnings" >&5
++echo "$as_me:18401: 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 +18408,7 @@
+ else
+ enable_string_hacks=no
+ fi;
+-echo "$as_me:18408: result: $enable_string_hacks" >&5
++echo "$as_me:18411: result: $enable_string_hacks" >&5
+ echo "${ECHO_T}$enable_string_hacks" >&6
+
+ if test "x$enable_string_hacks" = "xyes"; then
+@@ -18414,15 +18417,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:18420: 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:18422: 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 18428 "configure"
+ #include "confdefs.h"
+ #define strlcat autoconf_temporary
+ #include <limits.h> /* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -18453,16 +18456,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:18456: \"$ac_link\"") >&5
++if { (eval echo "$as_me:18459: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:18459: \$? = $ac_status" >&5
++ echo "$as_me:18462: \$? = $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:18465: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:18465: \$? = $ac_status" >&5
++ echo "$as_me:18468: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_func_strlcat=yes
+ else
+@@ -18472,7 +18475,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:18478: result: $ac_cv_func_strlcat" >&5
+ echo "${ECHO_T}$ac_cv_func_strlcat" >&6
+ if test "$ac_cv_func_strlcat" = yes; then
+
+@@ -18482,7 +18485,7 @@
+
+ else
+
+- echo "$as_me:18485: checking for strlcat in -lbsd" >&5
++ echo "$as_me:18488: 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 +18493,7 @@
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lbsd $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 18493 "configure"
++#line 18496 "configure"
+ #include "confdefs.h"
+
+ /* Override any gcc2 internal prototype to avoid an error. */
+@@ -18509,16 +18512,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:18512: \"$ac_link\"") >&5
++if { (eval echo "$as_me:18515: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:18515: \$? = $ac_status" >&5
++ echo "$as_me:18518: \$? = $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:18521: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:18521: \$? = $ac_status" >&5
++ echo "$as_me:18524: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_lib_bsd_strlcat=yes
+ else
+@@ -18529,7 +18532,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:18535: 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 +18555,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:18558: 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 18564 "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:18568: \"$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:18574: \$? = $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 +18590,7 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:18590: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
++echo "$as_me:18593: 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 +18611,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:18614: 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 18620 "configure"
+ #include "confdefs.h"
+ #define $ac_func autoconf_temporary
+ #include <limits.h> /* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -18645,16 +18648,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:18648: \"$ac_link\"") >&5
++if { (eval echo "$as_me:18651: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:18651: \$? = $ac_status" >&5
++ echo "$as_me:18654: \$? = $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:18657: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:18657: \$? = $ac_status" >&5
++ echo "$as_me:18660: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ eval "$as_ac_var=yes"
+ else
+@@ -18664,7 +18667,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:18670: 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 +18680,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:18683: 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 +18690,7 @@
+ else
+ with_assertions=no
+ fi;
+-echo "$as_me:18690: result: $with_assertions" >&5
++echo "$as_me:18693: result: $with_assertions" >&5
+ echo "${ECHO_T}$with_assertions" >&6
+ if test -n "$GCC"
+ then
+@@ -18703,7 +18706,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:18709: 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 +18728,7 @@
+ else
+ with_dmalloc=
+ fi;
+-echo "$as_me:18728: result: ${with_dmalloc:-no}" >&5
++echo "$as_me:18731: result: ${with_dmalloc:-no}" >&5
+ echo "${ECHO_T}${with_dmalloc:-no}" >&6
+
+ case ".$with_cflags" in
+@@ -18839,23 +18842,23 @@
+ esac
+
+ if test "$with_dmalloc" = yes ; then
+- echo "$as_me:18842: checking for dmalloc.h" >&5
++ echo "$as_me:18845: 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 18851 "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:18855: \"$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:18861: \$? = $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 +18877,11 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:18877: result: $ac_cv_header_dmalloc_h" >&5
++echo "$as_me:18880: 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:18884: 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 +18889,7 @@
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-ldmalloc $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 18889 "configure"
++#line 18892 "configure"
+ #include "confdefs.h"
+
+ /* Override any gcc2 internal prototype to avoid an error. */
+@@ -18905,16 +18908,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:18908: \"$ac_link\"") >&5
++if { (eval echo "$as_me:18911: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:18911: \$? = $ac_status" >&5
++ echo "$as_me:18914: \$? = $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:18917: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:18917: \$? = $ac_status" >&5
++ echo "$as_me:18920: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_lib_dmalloc_dmalloc_debug=yes
+ else
+@@ -18925,7 +18928,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:18931: 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 +18943,7 @@
+
+ fi
+
+-echo "$as_me:18943: checking if you want to use dbmalloc for testing" >&5
++echo "$as_me:18946: 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 +18965,7 @@
+ else
+ with_dbmalloc=
+ fi;
+-echo "$as_me:18965: result: ${with_dbmalloc:-no}" >&5
++echo "$as_me:18968: result: ${with_dbmalloc:-no}" >&5
+ echo "${ECHO_T}${with_dbmalloc:-no}" >&6
+
+ case ".$with_cflags" in
+@@ -19076,23 +19079,23 @@
+ esac
+
+ if test "$with_dbmalloc" = yes ; then
+- echo "$as_me:19079: checking for dbmalloc.h" >&5
++ echo "$as_me:19082: 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 19088 "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:19092: \"$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:19098: \$? = $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 +19114,11 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:19114: result: $ac_cv_header_dbmalloc_h" >&5
++echo "$as_me:19117: 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:19121: 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 +19126,7 @@
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-ldbmalloc $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 19126 "configure"
++#line 19129 "configure"
+ #include "confdefs.h"
+
+ /* Override any gcc2 internal prototype to avoid an error. */
+@@ -19142,16 +19145,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:19145: \"$ac_link\"") >&5
++if { (eval echo "$as_me:19148: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:19148: \$? = $ac_status" >&5
++ echo "$as_me:19151: \$? = $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:19154: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:19154: \$? = $ac_status" >&5
++ echo "$as_me:19157: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_lib_dbmalloc_debug_malloc=yes
+ else
+@@ -19162,7 +19165,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:19168: 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 +19180,7 @@
+
+ fi
+
+-echo "$as_me:19180: checking if you want to use valgrind for testing" >&5
++echo "$as_me:19183: 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 +19202,7 @@
+ else
+ with_valgrind=
+ fi;
+-echo "$as_me:19202: result: ${with_valgrind:-no}" >&5
++echo "$as_me:19205: result: ${with_valgrind:-no}" >&5
+ echo "${ECHO_T}${with_valgrind:-no}" >&6
+
+ case ".$with_cflags" in
+@@ -19312,7 +19315,7 @@
+ ;;
+ esac
+
+-echo "$as_me:19315: checking if you want to perform memory-leak testing" >&5
++echo "$as_me:19318: 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 +19326,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:19329: result: $with_no_leaks" >&5
+ echo "${ECHO_T}$with_no_leaks" >&6
+
+ if test "$enable_leaks" = no ; then
+@@ -19375,7 +19378,7 @@
+ ;;
+ esac
+
+-echo "$as_me:19378: checking whether to add trace feature to all models" >&5
++echo "$as_me:19381: 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 +19388,7 @@
+ else
+ cf_with_trace=$cf_all_traces
+ fi;
+-echo "$as_me:19388: result: $cf_with_trace" >&5
++echo "$as_me:19391: result: $cf_with_trace" >&5
+ echo "${ECHO_T}$cf_with_trace" >&6
+
+ if test "x$cf_with_trace" = xyes ; then
+@@ -19405,7 +19408,7 @@
+ ADA_TRACE=FALSE
+ fi
+
+-echo "$as_me:19408: checking if we want to use GNAT projects" >&5
++echo "$as_me:19411: 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 +19425,7 @@
+ enable_gnat_projects=yes
+
+ fi;
+-echo "$as_me:19425: result: $enable_gnat_projects" >&5
++echo "$as_me:19428: result: $enable_gnat_projects" >&5
+ echo "${ECHO_T}$enable_gnat_projects" >&6
+
+ ### Checks for libraries.
+@@ -19435,14 +19438,14 @@
+ CPPFLAGS="$CPPFLAGS -DWINVER=0x0501 -DWIN32_LEAN_AND_MEAN"
+ fi
+
+-echo "$as_me:19438: checking if ssp library is needed" >&5
++echo "$as_me:19441: 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 19448 "configure"
+ #include "confdefs.h"
+
+ #include <sys/types.h>
+@@ -19459,16 +19462,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:19462: \"$ac_link\"") >&5
++if { (eval echo "$as_me:19465: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:19465: \$? = $ac_status" >&5
++ echo "$as_me:19468: \$? = $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:19471: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:19471: \$? = $ac_status" >&5
++ echo "$as_me:19474: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_need_libssp=no
+ else
+@@ -19478,7 +19481,7 @@
+ cf_save_LIBS="$LIBS"
+ LIBS="$LIBS -lssp"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 19481 "configure"
++#line 19484 "configure"
+ #include "confdefs.h"
+
+ #include <sys/types.h>
+@@ -19495,16 +19498,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:19498: \"$ac_link\"") >&5
++if { (eval echo "$as_me:19501: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:19501: \$? = $ac_status" >&5
++ echo "$as_me:19504: \$? = $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:19507: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:19507: \$? = $ac_status" >&5
++ echo "$as_me:19510: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_need_libssp=yes
+ else
+@@ -19518,7 +19521,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:19524: result: $cf_cv_need_libssp" >&5
+ echo "${ECHO_T}$cf_cv_need_libssp" >&6
+
+ if test "x$cf_cv_need_libssp" = xyes
+@@ -19547,14 +19550,14 @@
+ ;;
+ esac
+
+-echo "$as_me:19550: checking if -lm needed for math functions" >&5
++echo "$as_me:19553: 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 19560 "configure"
+ #include "confdefs.h"
+
+ #include <stdio.h>
+@@ -19570,16 +19573,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:19573: \"$ac_link\"") >&5
++if { (eval echo "$as_me:19576: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:19576: \$? = $ac_status" >&5
++ echo "$as_me:19579: \$? = $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:19582: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:19582: \$? = $ac_status" >&5
++ echo "$as_me:19585: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_need_libm=no
+ else
+@@ -19589,7 +19592,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:19595: result: $cf_cv_need_libm" >&5
+ echo "${ECHO_T}$cf_cv_need_libm" >&6
+
+ if test "$cf_cv_need_libm" = yes
+@@ -19597,14 +19600,14 @@
+
+ cf_save_LIBS="$LIBS"
+ LIBS="$LIBS -lm"
+- echo "$as_me:19600: checking if -lm is available for math functions" >&5
++ echo "$as_me:19603: 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 19610 "configure"
+ #include "confdefs.h"
+
+ #include <stdio.h>
+@@ -19620,16 +19623,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:19623: \"$ac_link\"") >&5
++if { (eval echo "$as_me:19626: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:19626: \$? = $ac_status" >&5
++ echo "$as_me:19629: \$? = $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:19632: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:19632: \$? = $ac_status" >&5
++ echo "$as_me:19635: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_have_libm=yes
+ else
+@@ -19639,7 +19642,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:19645: result: $cf_cv_have_libm" >&5
+ echo "${ECHO_T}$cf_cv_have_libm" >&6
+ LIBS="$cf_save_LIBS"
+
+@@ -19661,13 +19664,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:19667: 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 19673 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ #include <sys/time.h>
+@@ -19683,16 +19686,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:19686: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:19689: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:19689: \$? = $ac_status" >&5
++ echo "$as_me:19692: \$? = $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:19695: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:19695: \$? = $ac_status" >&5
++ echo "$as_me:19698: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_header_time=yes
+ else
+@@ -19702,7 +19705,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:19705: result: $ac_cv_header_time" >&5
++echo "$as_me:19708: result: $ac_cv_header_time" >&5
+ echo "${ECHO_T}$ac_cv_header_time" >&6
+ if test $ac_cv_header_time = yes; then
+
+@@ -19717,7 +19720,7 @@
+ case "$host_os" in
+ (mingw*)
+ # -lsystre -ltre -lintl -liconv
+- echo "$as_me:19720: checking for regcomp in -lsystre" >&5
++ echo "$as_me:19723: 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 +19728,7 @@
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lsystre $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 19728 "configure"
++#line 19731 "configure"
+ #include "confdefs.h"
+
+ /* Override any gcc2 internal prototype to avoid an error. */
+@@ -19744,16 +19747,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:19747: \"$ac_link\"") >&5
++if { (eval echo "$as_me:19750: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:19750: \$? = $ac_status" >&5
++ echo "$as_me:19753: \$? = $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:19756: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:19756: \$? = $ac_status" >&5
++ echo "$as_me:19759: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_lib_systre_regcomp=yes
+ else
+@@ -19764,11 +19767,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:19770: 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:19774: 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 +19779,7 @@
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-liconv $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 19779 "configure"
++#line 19782 "configure"
+ #include "confdefs.h"
+
+ /* Override any gcc2 internal prototype to avoid an error. */
+@@ -19795,16 +19798,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:19798: \"$ac_link\"") >&5
++if { (eval echo "$as_me:19801: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:19801: \$? = $ac_status" >&5
++ echo "$as_me:19804: \$? = $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:19807: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:19807: \$? = $ac_status" >&5
++ echo "$as_me:19810: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_lib_iconv_libiconv_open=yes
+ else
+@@ -19815,7 +19818,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:19821: 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 +19840,7 @@
+
+ fi
+
+- echo "$as_me:19840: checking for libintl_gettext in -lintl" >&5
++ echo "$as_me:19843: 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 +19848,7 @@
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lintl $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 19848 "configure"
++#line 19851 "configure"
+ #include "confdefs.h"
+
+ /* Override any gcc2 internal prototype to avoid an error. */
+@@ -19864,16 +19867,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:19867: \"$ac_link\"") >&5
++if { (eval echo "$as_me:19870: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:19870: \$? = $ac_status" >&5
++ echo "$as_me:19873: \$? = $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:19876: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:19876: \$? = $ac_status" >&5
++ echo "$as_me:19879: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_lib_intl_libintl_gettext=yes
+ else
+@@ -19884,7 +19887,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:19890: 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 +19909,7 @@
+
+ fi
+
+- echo "$as_me:19909: checking for tre_regcomp in -ltre" >&5
++ echo "$as_me:19912: 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 +19917,7 @@
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-ltre $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 19917 "configure"
++#line 19920 "configure"
+ #include "confdefs.h"
+
+ /* Override any gcc2 internal prototype to avoid an error. */
+@@ -19933,16 +19936,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:19936: \"$ac_link\"") >&5
++if { (eval echo "$as_me:19939: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:19939: \$? = $ac_status" >&5
++ echo "$as_me:19942: \$? = $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:19945: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:19945: \$? = $ac_status" >&5
++ echo "$as_me:19948: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_lib_tre_tre_regcomp=yes
+ else
+@@ -19953,7 +19956,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:19959: 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 +19998,7 @@
+
+ else
+
+- echo "$as_me:19998: checking for regcomp in -lgnurx" >&5
++ echo "$as_me:20001: 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 +20006,7 @@
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lgnurx $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 20006 "configure"
++#line 20009 "configure"
+ #include "confdefs.h"
+
+ /* Override any gcc2 internal prototype to avoid an error. */
+@@ -20022,16 +20025,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:20025: \"$ac_link\"") >&5
++if { (eval echo "$as_me:20028: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:20028: \$? = $ac_status" >&5
++ echo "$as_me:20031: \$? = $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:20034: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:20034: \$? = $ac_status" >&5
++ echo "$as_me:20037: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_lib_gnurx_regcomp=yes
+ else
+@@ -20042,7 +20045,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:20048: 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 +20073,13 @@
+ ;;
+ (*)
+ cf_regex_libs="regex re"
+- echo "$as_me:20073: checking for regcomp" >&5
++ echo "$as_me:20076: 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 20082 "configure"
+ #include "confdefs.h"
+ #define regcomp autoconf_temporary
+ #include <limits.h> /* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -20107,16 +20110,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:20110: \"$ac_link\"") >&5
++if { (eval echo "$as_me:20113: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:20113: \$? = $ac_status" >&5
++ echo "$as_me:20116: \$? = $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:20119: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:20119: \$? = $ac_status" >&5
++ echo "$as_me:20122: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_func_regcomp=yes
+ else
+@@ -20126,7 +20129,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:20132: 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 +20138,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:20141: 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 +20146,7 @@
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-l$cf_regex_lib $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 20146 "configure"
++#line 20149 "configure"
+ #include "confdefs.h"
+
+ /* Override any gcc2 internal prototype to avoid an error. */
+@@ -20162,16 +20165,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:20165: \"$ac_link\"") >&5
++if { (eval echo "$as_me:20168: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:20168: \$? = $ac_status" >&5
++ echo "$as_me:20171: \$? = $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:20174: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:20174: \$? = $ac_status" >&5
++ echo "$as_me:20177: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ eval "$as_ac_Lib=yes"
+ else
+@@ -20182,7 +20185,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:20188: 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 +20217,13 @@
+ esac
+
+ if test "$cf_regex_func" = no ; then
+- echo "$as_me:20217: checking for compile" >&5
++ echo "$as_me:20220: 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 20226 "configure"
+ #include "confdefs.h"
+ #define compile autoconf_temporary
+ #include <limits.h> /* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -20251,16 +20254,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:20254: \"$ac_link\"") >&5
++if { (eval echo "$as_me:20257: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:20257: \$? = $ac_status" >&5
++ echo "$as_me:20260: \$? = $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:20263: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:20263: \$? = $ac_status" >&5
++ echo "$as_me:20266: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_func_compile=yes
+ else
+@@ -20270,13 +20273,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:20276: 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:20282: 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 +20287,7 @@
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lgen $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 20287 "configure"
++#line 20290 "configure"
+ #include "confdefs.h"
+
+ /* Override any gcc2 internal prototype to avoid an error. */
+@@ -20303,16 +20306,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:20306: \"$ac_link\"") >&5
++if { (eval echo "$as_me:20309: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:20309: \$? = $ac_status" >&5
++ echo "$as_me:20312: \$? = $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:20315: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:20315: \$? = $ac_status" >&5
++ echo "$as_me:20318: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_lib_gen_compile=yes
+ else
+@@ -20323,7 +20326,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:20329: 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 +20354,11 @@
+ fi
+
+ if test "$cf_regex_func" = no ; then
+- { echo "$as_me:20354: WARNING: cannot find regular expression library" >&5
++ { echo "$as_me:20357: 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:20361: 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 +20370,7 @@
+ for cf_regex_hdr in regexp.h regexpr.h
+ do
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 20370 "configure"
++#line 20373 "configure"
+ #include "confdefs.h"
+ #include <$cf_regex_hdr>
+ int
+@@ -20384,16 +20387,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:20387: \"$ac_link\"") >&5
++if { (eval echo "$as_me:20390: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:20390: \$? = $ac_status" >&5
++ echo "$as_me:20393: \$? = $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:20396: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:20396: \$? = $ac_status" >&5
++ echo "$as_me:20399: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+
+ cf_cv_regex_hdrs=$cf_regex_hdr
+@@ -20410,7 +20413,7 @@
+ for cf_regex_hdr in regex.h
+ do
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 20413 "configure"
++#line 20416 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ #include <$cf_regex_hdr>
+@@ -20430,16 +20433,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:20433: \"$ac_link\"") >&5
++if { (eval echo "$as_me:20436: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:20436: \$? = $ac_status" >&5
++ echo "$as_me:20439: \$? = $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:20442: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:20442: \$? = $ac_status" >&5
++ echo "$as_me:20445: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+
+ cf_cv_regex_hdrs=$cf_regex_hdr
+@@ -20455,11 +20458,11 @@
+ esac
+
+ fi
+-echo "$as_me:20458: result: $cf_cv_regex_hdrs" >&5
++echo "$as_me:20461: 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:20465: 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 +20500,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:20503: 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 20509 "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:20513: \"$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:20519: \$? = $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 +20535,7 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:20535: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
++echo "$as_me:20538: 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 +20548,23 @@
+ for ac_header in unistd.h getopt.h
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-echo "$as_me:20548: checking for $ac_header" >&5
++echo "$as_me:20551: 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 20557 "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:20561: \"$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:20567: \$? = $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 +20583,7 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:20583: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
++echo "$as_me:20586: 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 +20593,7 @@
+ fi
+ done
+
+-echo "$as_me:20593: checking for header declaring getopt variables" >&5
++echo "$as_me:20596: 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 +20603,7 @@
+ for cf_header in stdio.h stdlib.h unistd.h getopt.h
+ do
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 20603 "configure"
++#line 20606 "configure"
+ #include "confdefs.h"
+
+ #include <$cf_header>
+@@ -20613,16 +20616,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:20616: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:20619: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:20619: \$? = $ac_status" >&5
++ echo "$as_me:20622: \$? = $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:20625: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:20625: \$? = $ac_status" >&5
++ echo "$as_me:20628: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_getopt_header=$cf_header
+ break
+@@ -20634,7 +20637,7 @@
+ done
+
+ fi
+-echo "$as_me:20637: result: $cf_cv_getopt_header" >&5
++echo "$as_me:20640: result: $cf_cv_getopt_header" >&5
+ echo "${ECHO_T}$cf_cv_getopt_header" >&6
+ if test "$cf_cv_getopt_header" != none ; then
+
+@@ -20651,14 +20654,14 @@
+
+ fi
+
+-echo "$as_me:20654: checking if external environ is declared" >&5
++echo "$as_me:20657: 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 20664 "configure"
+ #include "confdefs.h"
+
+ $ac_includes_default
+@@ -20671,16 +20674,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:20674: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:20677: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:20677: \$? = $ac_status" >&5
++ echo "$as_me:20680: \$? = $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:20683: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:20683: \$? = $ac_status" >&5
++ echo "$as_me:20686: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_dcl_environ=yes
+ else
+@@ -20691,7 +20694,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+
+ fi
+-echo "$as_me:20694: result: $cf_cv_dcl_environ" >&5
++echo "$as_me:20697: result: $cf_cv_dcl_environ" >&5
+ echo "${ECHO_T}$cf_cv_dcl_environ" >&6
+
+ if test "$cf_cv_dcl_environ" = no ; then
+@@ -20706,14 +20709,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:20712: 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 20719 "configure"
+ #include "confdefs.h"
+
+ #undef environ
+@@ -20728,16 +20731,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:20731: \"$ac_link\"") >&5
++if { (eval echo "$as_me:20734: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:20734: \$? = $ac_status" >&5
++ echo "$as_me:20737: \$? = $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:20740: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:20740: \$? = $ac_status" >&5
++ echo "$as_me:20743: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_have_environ=yes
+ else
+@@ -20748,7 +20751,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:20754: result: $cf_cv_have_environ" >&5
+ echo "${ECHO_T}$cf_cv_have_environ" >&6
+
+ if test "$cf_cv_have_environ" = yes ; then
+@@ -20761,13 +20764,13 @@
+
+ fi
+
+-echo "$as_me:20764: checking for getenv" >&5
++echo "$as_me:20767: 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 20773 "configure"
+ #include "confdefs.h"
+ #define getenv autoconf_temporary
+ #include <limits.h> /* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -20798,16 +20801,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:20801: \"$ac_link\"") >&5
++if { (eval echo "$as_me:20804: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:20804: \$? = $ac_status" >&5
++ echo "$as_me:20807: \$? = $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:20810: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:20810: \$? = $ac_status" >&5
++ echo "$as_me:20813: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_func_getenv=yes
+ else
+@@ -20817,19 +20820,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:20823: 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:20829: 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 20835 "configure"
+ #include "confdefs.h"
+ #define $ac_func autoconf_temporary
+ #include <limits.h> /* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -20860,16 +20863,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:20863: \"$ac_link\"") >&5
++if { (eval echo "$as_me:20866: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:20866: \$? = $ac_status" >&5
++ echo "$as_me:20869: \$? = $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:20872: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:20872: \$? = $ac_status" >&5
++ echo "$as_me:20875: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ eval "$as_ac_var=yes"
+ else
+@@ -20879,7 +20882,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:20885: 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 +20892,7 @@
+ fi
+ done
+
+-echo "$as_me:20892: checking if getenv returns consistent values" >&5
++echo "$as_me:20895: 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 +20902,7 @@
+ cf_cv_consistent_getenv=unknown
+ else
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 20902 "configure"
++#line 20905 "configure"
+ #include "confdefs.h"
+
+ $ac_includes_default
+@@ -21004,15 +21007,15 @@
+
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:21007: \"$ac_link\"") >&5
++if { (eval echo "$as_me:21010: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:21010: \$? = $ac_status" >&5
++ echo "$as_me:21013: \$? = $ac_status" >&5
+ (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+- { (eval echo "$as_me:21012: \"$ac_try\"") >&5
++ { (eval echo "$as_me:21015: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:21015: \$? = $ac_status" >&5
++ echo "$as_me:21018: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_consistent_getenv=yes
+ else
+@@ -21025,7 +21028,7 @@
+ fi
+
+ fi
+-echo "$as_me:21028: result: $cf_cv_consistent_getenv" >&5
++echo "$as_me:21031: result: $cf_cv_consistent_getenv" >&5
+ echo "${ECHO_T}$cf_cv_consistent_getenv" >&6
+
+ if test "x$cf_cv_consistent_getenv" = xno
+@@ -21040,18 +21043,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:21046: 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:21050: 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 21057 "configure"
+ #include "confdefs.h"
+
+ #include <sys/types.h>
+@@ -21071,16 +21074,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:21074: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:21077: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:21077: \$? = $ac_status" >&5
++ echo "$as_me:21080: \$? = $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:21083: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:21083: \$? = $ac_status" >&5
++ echo "$as_me:21086: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_sys_time_select=yes
+ else
+@@ -21092,7 +21095,7 @@
+
+ fi
+
+-echo "$as_me:21095: result: $cf_cv_sys_time_select" >&5
++echo "$as_me:21098: 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 +21110,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:21113: 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 21119 "configure"
+ #include "confdefs.h"
+
+ int
+@@ -21175,16 +21178,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:21178: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:21181: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:21181: \$? = $ac_status" >&5
++ echo "$as_me:21184: \$? = $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:21187: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:21187: \$? = $ac_status" >&5
++ echo "$as_me:21190: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_c_const=yes
+ else
+@@ -21194,7 +21197,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:21197: result: $ac_cv_c_const" >&5
++echo "$as_me:21200: result: $ac_cv_c_const" >&5
+ echo "${ECHO_T}$ac_cv_c_const" >&6
+ if test $ac_cv_c_const = no; then
+
+@@ -21204,7 +21207,7 @@
+
+ fi
+
+-echo "$as_me:21207: checking for inline" >&5
++echo "$as_me:21210: 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 +21215,7 @@
+ ac_cv_c_inline=no
+ for ac_kw in inline __inline__ __inline; do
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 21215 "configure"
++#line 21218 "configure"
+ #include "confdefs.h"
+ #ifndef __cplusplus
+ static $ac_kw int static_foo (void) {return 0; }
+@@ -21221,16 +21224,16 @@
+
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:21224: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:21227: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:21227: \$? = $ac_status" >&5
++ echo "$as_me:21230: \$? = $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:21233: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:21233: \$? = $ac_status" >&5
++ echo "$as_me:21236: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_c_inline=$ac_kw; break
+ else
+@@ -21241,7 +21244,7 @@
+ done
+
+ fi
+-echo "$as_me:21244: result: $ac_cv_c_inline" >&5
++echo "$as_me:21247: result: $ac_cv_c_inline" >&5
+ echo "${ECHO_T}$ac_cv_c_inline" >&6
+ case $ac_cv_c_inline in
+ inline | yes) ;;
+@@ -21267,7 +21270,7 @@
+ :
+ elif test "$GCC" = yes
+ then
+- echo "$as_me:21270: checking if $CC supports options to tune inlining" >&5
++ echo "$as_me:21273: 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 +21279,7 @@
+ cf_save_CFLAGS=$CFLAGS
+ CFLAGS="$CFLAGS --param max-inline-insns-single=1200"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 21279 "configure"
++#line 21282 "configure"
+ #include "confdefs.h"
+ inline int foo(void) { return 1; }
+ int
+@@ -21288,16 +21291,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:21291: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:21294: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:21294: \$? = $ac_status" >&5
++ echo "$as_me:21297: \$? = $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:21300: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:21300: \$? = $ac_status" >&5
++ echo "$as_me:21303: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_gcc_inline=yes
+ else
+@@ -21309,7 +21312,7 @@
+ CFLAGS=$cf_save_CFLAGS
+
+ fi
+-echo "$as_me:21312: result: $cf_cv_gcc_inline" >&5
++echo "$as_me:21315: result: $cf_cv_gcc_inline" >&5
+ echo "${ECHO_T}$cf_cv_gcc_inline" >&6
+ if test "$cf_cv_gcc_inline" = yes ; then
+
+@@ -21415,7 +21418,7 @@
+ fi
+ fi
+
+-echo "$as_me:21418: checking for signal global datatype" >&5
++echo "$as_me:21421: 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 +21430,7 @@
+ "int"
+ do
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 21430 "configure"
++#line 21433 "configure"
+ #include "confdefs.h"
+
+ #include <sys/types.h>
+@@ -21451,16 +21454,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:21454: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:21457: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:21457: \$? = $ac_status" >&5
++ echo "$as_me:21460: \$? = $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:21463: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:21463: \$? = $ac_status" >&5
++ echo "$as_me:21466: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_sig_atomic_t=$cf_type
+ else
+@@ -21474,7 +21477,7 @@
+
+ fi
+
+-echo "$as_me:21477: result: $cf_cv_sig_atomic_t" >&5
++echo "$as_me:21480: 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 +21486,7 @@
+
+ if test "$NCURSES_CHTYPE" = auto ; then
+
+-echo "$as_me:21486: checking for type of chtype" >&5
++echo "$as_me:21489: 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 +21496,7 @@
+ cf_cv_typeof_chtype=long
+ else
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 21496 "configure"
++#line 21499 "configure"
+ #include "confdefs.h"
+
+ $ac_includes_default
+@@ -21528,15 +21531,15 @@
+
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:21531: \"$ac_link\"") >&5
++if { (eval echo "$as_me:21534: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:21534: \$? = $ac_status" >&5
++ echo "$as_me:21537: \$? = $ac_status" >&5
+ (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+- { (eval echo "$as_me:21536: \"$ac_try\"") >&5
++ { (eval echo "$as_me:21539: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:21539: \$? = $ac_status" >&5
++ echo "$as_me:21542: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_typeof_chtype=`cat cf_test.out`
+ else
+@@ -21551,7 +21554,7 @@
+
+ fi
+
+-echo "$as_me:21554: result: $cf_cv_typeof_chtype" >&5
++echo "$as_me:21557: result: $cf_cv_typeof_chtype" >&5
+ echo "${ECHO_T}$cf_cv_typeof_chtype" >&6
+
+ cat >>confdefs.h <<EOF
+@@ -21563,14 +21566,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:21569: 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 21576 "configure"
+ #include "confdefs.h"
+
+ int
+@@ -21582,16 +21585,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:21585: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:21588: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:21588: \$? = $ac_status" >&5
++ echo "$as_me:21591: \$? = $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:21594: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:21594: \$? = $ac_status" >&5
++ echo "$as_me:21597: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_unsigned_literals=yes
+ else
+@@ -21603,7 +21606,7 @@
+
+ fi
+
+-echo "$as_me:21606: result: $cf_cv_unsigned_literals" >&5
++echo "$as_me:21609: result: $cf_cv_unsigned_literals" >&5
+ echo "${ECHO_T}$cf_cv_unsigned_literals" >&6
+
+ cf_cv_1UL="1"
+@@ -21619,14 +21622,14 @@
+
+ ### Checks for external-data
+
+-echo "$as_me:21622: checking if external errno is declared" >&5
++echo "$as_me:21625: 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 21632 "configure"
+ #include "confdefs.h"
+
+ $ac_includes_default
+@@ -21640,16 +21643,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:21643: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:21646: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:21646: \$? = $ac_status" >&5
++ echo "$as_me:21649: \$? = $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:21652: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:21652: \$? = $ac_status" >&5
++ echo "$as_me:21655: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_dcl_errno=yes
+ else
+@@ -21660,7 +21663,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+
+ fi
+-echo "$as_me:21663: result: $cf_cv_dcl_errno" >&5
++echo "$as_me:21666: result: $cf_cv_dcl_errno" >&5
+ echo "${ECHO_T}$cf_cv_dcl_errno" >&6
+
+ if test "$cf_cv_dcl_errno" = no ; then
+@@ -21675,14 +21678,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:21681: 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 21688 "configure"
+ #include "confdefs.h"
+
+ #undef errno
+@@ -21697,16 +21700,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:21700: \"$ac_link\"") >&5
++if { (eval echo "$as_me:21703: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:21703: \$? = $ac_status" >&5
++ echo "$as_me:21706: \$? = $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:21709: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:21709: \$? = $ac_status" >&5
++ echo "$as_me:21712: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_have_errno=yes
+ else
+@@ -21717,7 +21720,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:21723: result: $cf_cv_have_errno" >&5
+ echo "${ECHO_T}$cf_cv_have_errno" >&6
+
+ if test "$cf_cv_have_errno" = yes ; then
+@@ -21730,7 +21733,7 @@
+
+ fi
+
+-echo "$as_me:21733: checking if data-only library module links" >&5
++echo "$as_me:21736: 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 +21741,20 @@
+
+ rm -f conftest.a
+ cat >conftest.$ac_ext <<EOF
+-#line 21741 "configure"
++#line 21744 "configure"
+ int testdata[3] = { 123, 456, 789 };
+ EOF
+- if { (eval echo "$as_me:21744: \"$ac_compile\"") >&5
++ if { (eval echo "$as_me:21747: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:21747: \$? = $ac_status" >&5
++ echo "$as_me:21750: \$? = $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 21757 "configure"
+ extern int testfunc(void);
+ #if defined(NeXT)
+ int testfunc(void)
+@@ -21768,10 +21771,10 @@
+ }
+ #endif
+ EOF
+- if { (eval echo "$as_me:21771: \"$ac_compile\"") >&5
++ if { (eval echo "$as_me:21774: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:21774: \$? = $ac_status" >&5
++ echo "$as_me:21777: \$? = $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 +21787,7 @@
+ cf_cv_link_dataonly=unknown
+ else
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 21787 "configure"
++#line 21790 "configure"
+ #include "confdefs.h"
+
+ extern int testfunc(void);
+@@ -21795,15 +21798,15 @@
+
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:21798: \"$ac_link\"") >&5
++if { (eval echo "$as_me:21801: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:21801: \$? = $ac_status" >&5
++ echo "$as_me:21804: \$? = $ac_status" >&5
+ (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+- { (eval echo "$as_me:21803: \"$ac_try\"") >&5
++ { (eval echo "$as_me:21806: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:21806: \$? = $ac_status" >&5
++ echo "$as_me:21809: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_link_dataonly=yes
+ else
+@@ -21818,7 +21821,7 @@
+
+ fi
+
+-echo "$as_me:21821: result: $cf_cv_link_dataonly" >&5
++echo "$as_me:21824: result: $cf_cv_link_dataonly" >&5
+ echo "${ECHO_T}$cf_cv_link_dataonly" >&6
+
+ if test "$cf_cv_link_dataonly" = no ; then
+@@ -21833,13 +21836,13 @@
+ ### Checks for library functions.
+
+ cf_save_libs="$LIBS"
+-echo "$as_me:21836: checking for clock_gettime" >&5
++echo "$as_me:21839: 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 21845 "configure"
+ #include "confdefs.h"
+ #define clock_gettime autoconf_temporary
+ #include <limits.h> /* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -21870,16 +21873,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:21873: \"$ac_link\"") >&5
++if { (eval echo "$as_me:21876: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:21876: \$? = $ac_status" >&5
++ echo "$as_me:21879: \$? = $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:21882: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:21882: \$? = $ac_status" >&5
++ echo "$as_me:21885: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_func_clock_gettime=yes
+ else
+@@ -21889,12 +21892,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:21895: 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:21900: 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 +21905,7 @@
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lrt $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 21905 "configure"
++#line 21908 "configure"
+ #include "confdefs.h"
+
+ /* Override any gcc2 internal prototype to avoid an error. */
+@@ -21921,16 +21924,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:21924: \"$ac_link\"") >&5
++if { (eval echo "$as_me:21927: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:21927: \$? = $ac_status" >&5
++ echo "$as_me:21930: \$? = $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:21933: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:21933: \$? = $ac_status" >&5
++ echo "$as_me:21936: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_lib_rt_clock_gettime=yes
+ else
+@@ -21941,7 +21944,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:21947: 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 +21956,14 @@
+ fi
+
+ if test "$cf_cv_test_clock_gettime" = yes ; then
+-echo "$as_me:21956: checking if clock_gettime links" >&5
++echo "$as_me:21959: 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 21966 "configure"
+ #include "confdefs.h"
+
+ $ac_includes_default
+@@ -21978,16 +21981,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:21981: \"$ac_link\"") >&5
++if { (eval echo "$as_me:21984: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:21984: \$? = $ac_status" >&5
++ echo "$as_me:21987: \$? = $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:21990: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:21990: \$? = $ac_status" >&5
++ echo "$as_me:21993: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_func_clock_gettime=yes
+ else
+@@ -21998,7 +22001,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:22004: 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 +22015,13 @@
+ EOF
+
+ else
+-echo "$as_me:22015: checking for gettimeofday" >&5
++echo "$as_me:22018: 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 22024 "configure"
+ #include "confdefs.h"
+ #define gettimeofday autoconf_temporary
+ #include <limits.h> /* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -22049,16 +22052,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:22052: \"$ac_link\"") >&5
++if { (eval echo "$as_me:22055: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:22055: \$? = $ac_status" >&5
++ echo "$as_me:22058: \$? = $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:22061: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:22061: \$? = $ac_status" >&5
++ echo "$as_me:22064: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_func_gettimeofday=yes
+ else
+@@ -22068,7 +22071,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:22074: result: $ac_cv_func_gettimeofday" >&5
+ echo "${ECHO_T}$ac_cv_func_gettimeofday" >&6
+ if test "$ac_cv_func_gettimeofday" = yes; then
+
+@@ -22078,7 +22081,7 @@
+
+ else
+
+-echo "$as_me:22081: checking for gettimeofday in -lbsd" >&5
++echo "$as_me:22084: 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 +22089,7 @@
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lbsd $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 22089 "configure"
++#line 22092 "configure"
+ #include "confdefs.h"
+
+ /* Override any gcc2 internal prototype to avoid an error. */
+@@ -22105,16 +22108,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:22108: \"$ac_link\"") >&5
++if { (eval echo "$as_me:22111: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:22111: \$? = $ac_status" >&5
++ echo "$as_me:22114: \$? = $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:22117: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:22117: \$? = $ac_status" >&5
++ echo "$as_me:22120: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_lib_bsd_gettimeofday=yes
+ else
+@@ -22125,7 +22128,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:22131: 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 +22187,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:22190: 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 22196 "configure"
+ #include "confdefs.h"
+ #define $ac_func autoconf_temporary
+ #include <limits.h> /* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -22221,16 +22224,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:22224: \"$ac_link\"") >&5
++if { (eval echo "$as_me:22227: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:22227: \$? = $ac_status" >&5
++ echo "$as_me:22230: \$? = $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:22233: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:22233: \$? = $ac_status" >&5
++ echo "$as_me:22236: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ eval "$as_ac_var=yes"
+ else
+@@ -22240,7 +22243,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:22246: 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 +22253,14 @@
+ fi
+ done
+
+-echo "$as_me:22253: checking if _PATH_TTYS is defined in ttyent.h" >&5
++echo "$as_me:22256: 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 22263 "configure"
+ #include "confdefs.h"
+
+ #include <stdio.h>
+@@ -22272,16 +22275,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:22275: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:22278: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:22278: \$? = $ac_status" >&5
++ echo "$as_me:22281: \$? = $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:22284: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:22284: \$? = $ac_status" >&5
++ echo "$as_me:22287: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_PATH_TTYS=yes
+ else
+@@ -22291,7 +22294,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:22294: result: $cf_cv_PATH_TTYS" >&5
++echo "$as_me:22297: result: $cf_cv_PATH_TTYS" >&5
+ echo "${ECHO_T}$cf_cv_PATH_TTYS" >&6
+
+ if test $cf_cv_PATH_TTYS = no
+@@ -22313,7 +22316,7 @@
+
+ if test $cf_cv_PATH_TTYS != no
+ then
+- echo "$as_me:22316: checking if _PATH_TTYS file exists" >&5
++ echo "$as_me:22319: 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 +22326,7 @@
+ cf_cv_have_PATH_TTYS=unknown
+ else
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 22326 "configure"
++#line 22329 "configure"
+ #include "confdefs.h"
+
+ $ac_includes_default
+@@ -22336,15 +22339,15 @@
+ }
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:22339: \"$ac_link\"") >&5
++if { (eval echo "$as_me:22342: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:22342: \$? = $ac_status" >&5
++ echo "$as_me:22345: \$? = $ac_status" >&5
+ (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+- { (eval echo "$as_me:22344: \"$ac_try\"") >&5
++ { (eval echo "$as_me:22347: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:22347: \$? = $ac_status" >&5
++ echo "$as_me:22350: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_have_PATH_TTYS=yes
+ else
+@@ -22356,7 +22359,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:22362: 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 +22371,14 @@
+ #define HAVE_PATH_TTYS 1
+ EOF
+
+- echo "$as_me:22371: checking for getttynam" >&5
++ echo "$as_me:22374: 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 22381 "configure"
+ #include "confdefs.h"
+ #include <ttyent.h>
+ int
+@@ -22387,16 +22390,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:22390: \"$ac_link\"") >&5
++if { (eval echo "$as_me:22393: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:22393: \$? = $ac_status" >&5
++ echo "$as_me:22396: \$? = $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:22399: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:22399: \$? = $ac_status" >&5
++ echo "$as_me:22402: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_func_getttynam=yes
+ else
+@@ -22406,7 +22409,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:22412: 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 +22419,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:22422: 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 +22428,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:22431: 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 +22441,14 @@
+
+ if test "x$with_getcap" = "xyes" ; then
+
+-echo "$as_me:22441: checking for terminal-capability database functions" >&5
++echo "$as_me:22444: 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 22451 "configure"
+ #include "confdefs.h"
+
+ $ac_includes_default
+@@ -22465,16 +22468,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:22468: \"$ac_link\"") >&5
++if { (eval echo "$as_me:22471: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:22471: \$? = $ac_status" >&5
++ echo "$as_me:22474: \$? = $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:22477: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:22477: \$? = $ac_status" >&5
++ echo "$as_me:22480: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_cgetent=yes
+ else
+@@ -22485,7 +22488,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:22491: result: $cf_cv_cgetent" >&5
+ echo "${ECHO_T}$cf_cv_cgetent" >&6
+
+ if test "$cf_cv_cgetent" = yes
+@@ -22495,14 +22498,14 @@
+ #define HAVE_BSD_CGETENT 1
+ EOF
+
+-echo "$as_me:22498: checking if cgetent uses const parameter" >&5
++echo "$as_me:22501: 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 22508 "configure"
+ #include "confdefs.h"
+
+ #pragma GCC diagnostic error "-Wincompatible-pointer-types-discards-qualifiers"
+@@ -22525,16 +22528,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:22528: \"$ac_link\"") >&5
++if { (eval echo "$as_me:22531: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:22531: \$? = $ac_status" >&5
++ echo "$as_me:22534: \$? = $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:22537: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:22537: \$? = $ac_status" >&5
++ echo "$as_me:22540: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_cgetent_const=yes
+ else
+@@ -22545,7 +22548,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:22551: result: $cf_cv_cgetent_const" >&5
+ echo "${ECHO_T}$cf_cv_cgetent_const" >&6
+ if test "$cf_cv_cgetent_const" = yes
+ then
+@@ -22559,14 +22562,14 @@
+
+ fi
+
+-echo "$as_me:22562: checking for isascii" >&5
++echo "$as_me:22565: 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 22572 "configure"
+ #include "confdefs.h"
+ #include <ctype.h>
+ int
+@@ -22578,16 +22581,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:22581: \"$ac_link\"") >&5
++if { (eval echo "$as_me:22584: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:22584: \$? = $ac_status" >&5
++ echo "$as_me:22587: \$? = $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:22590: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:22590: \$? = $ac_status" >&5
++ echo "$as_me:22593: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_have_isascii=yes
+ else
+@@ -22598,7 +22601,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:22604: 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 +22609,10 @@
+ EOF
+
+ if test "$ac_cv_func_sigaction" = yes; then
+-echo "$as_me:22609: checking whether sigaction needs _POSIX_SOURCE" >&5
++echo "$as_me:22612: 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 22615 "configure"
+ #include "confdefs.h"
+
+ #include <sys/types.h>
+@@ -22623,16 +22626,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:22626: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:22629: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:22629: \$? = $ac_status" >&5
++ echo "$as_me:22632: \$? = $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:22635: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:22635: \$? = $ac_status" >&5
++ echo "$as_me:22638: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ sigact_bad=no
+ else
+@@ -22640,7 +22643,7 @@
+ cat "conftest.$ac_ext" >&5
+
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 22643 "configure"
++#line 22646 "configure"
+ #include "confdefs.h"
+
+ #define _POSIX_SOURCE
+@@ -22655,16 +22658,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:22658: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:22661: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:22661: \$? = $ac_status" >&5
++ echo "$as_me:22664: \$? = $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:22667: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:22667: \$? = $ac_status" >&5
++ echo "$as_me:22670: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ sigact_bad=yes
+
+@@ -22680,11 +22683,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:22686: result: $sigact_bad" >&5
+ echo "${ECHO_T}$sigact_bad" >&6
+ fi
+
+-echo "$as_me:22687: checking if nanosleep really works" >&5
++echo "$as_me:22690: 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 +22697,7 @@
+ cf_cv_func_nanosleep=unknown
+ else
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 22697 "configure"
++#line 22700 "configure"
+ #include "confdefs.h"
+
+ $ac_includes_default
+@@ -22720,15 +22723,15 @@
+
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:22723: \"$ac_link\"") >&5
++if { (eval echo "$as_me:22726: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:22726: \$? = $ac_status" >&5
++ echo "$as_me:22729: \$? = $ac_status" >&5
+ (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+- { (eval echo "$as_me:22728: \"$ac_try\"") >&5
++ { (eval echo "$as_me:22731: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:22731: \$? = $ac_status" >&5
++ echo "$as_me:22734: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_func_nanosleep=yes
+ else
+@@ -22740,7 +22743,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:22746: result: $cf_cv_func_nanosleep" >&5
+ echo "${ECHO_T}$cf_cv_func_nanosleep" >&6
+
+ test "$cf_cv_func_nanosleep" = "yes" &&
+@@ -22757,23 +22760,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:22763: 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 22769 "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:22773: \"$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:22779: \$? = $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 +22795,7 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:22795: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
++echo "$as_me:22798: 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 +22812,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:22815: 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 22818 "configure"
+ #include "confdefs.h"
+ #include <termios.h>
+ int
+@@ -22824,16 +22827,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:22827: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:22830: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:22830: \$? = $ac_status" >&5
++ echo "$as_me:22833: \$? = $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:22836: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:22836: \$? = $ac_status" >&5
++ echo "$as_me:22839: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ termios_bad=no
+ else
+@@ -22841,7 +22844,7 @@
+ cat "conftest.$ac_ext" >&5
+
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 22844 "configure"
++#line 22847 "configure"
+ #include "confdefs.h"
+
+ #define _POSIX_SOURCE
+@@ -22855,16 +22858,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:22858: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:22861: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:22861: \$? = $ac_status" >&5
++ echo "$as_me:22864: \$? = $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:22867: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:22867: \$? = $ac_status" >&5
++ echo "$as_me:22870: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ termios_bad=unknown
+ else
+@@ -22880,19 +22883,19 @@
+
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+- echo "$as_me:22883: result: $termios_bad" >&5
++ echo "$as_me:22886: result: $termios_bad" >&5
+ echo "${ECHO_T}$termios_bad" >&6
+ fi
+ fi
+
+-echo "$as_me:22888: checking for tcgetattr" >&5
++echo "$as_me:22891: 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 22898 "configure"
+ #include "confdefs.h"
+
+ #include <sys/types.h>
+@@ -22920,16 +22923,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:22923: \"$ac_link\"") >&5
++if { (eval echo "$as_me:22926: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:22926: \$? = $ac_status" >&5
++ echo "$as_me:22929: \$? = $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:22932: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:22932: \$? = $ac_status" >&5
++ echo "$as_me:22935: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_have_tcgetattr=yes
+ else
+@@ -22939,21 +22942,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:22945: 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:22952: 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 22959 "configure"
+ #include "confdefs.h"
+
+ #include <stdarg.h>
+@@ -22979,16 +22982,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:22982: \"$ac_link\"") >&5
++if { (eval echo "$as_me:22985: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:22985: \$? = $ac_status" >&5
++ echo "$as_me:22988: \$? = $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:22991: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:22991: \$? = $ac_status" >&5
++ echo "$as_me:22994: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_func_vsscanf=vsscanf
+ else
+@@ -22996,7 +22999,7 @@
+ cat "conftest.$ac_ext" >&5
+
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 22999 "configure"
++#line 23002 "configure"
+ #include "confdefs.h"
+
+ #include <stdarg.h>
+@@ -23018,16 +23021,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:23021: \"$ac_link\"") >&5
++if { (eval echo "$as_me:23024: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:23024: \$? = $ac_status" >&5
++ echo "$as_me:23027: \$? = $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:23030: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:23030: \$? = $ac_status" >&5
++ echo "$as_me:23033: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_func_vsscanf=vfscanf
+ else
+@@ -23035,7 +23038,7 @@
+ cat "conftest.$ac_ext" >&5
+
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 23038 "configure"
++#line 23041 "configure"
+ #include "confdefs.h"
+
+ #include <stdarg.h>
+@@ -23057,16 +23060,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:23060: \"$ac_link\"") >&5
++if { (eval echo "$as_me:23063: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:23063: \$? = $ac_status" >&5
++ echo "$as_me:23066: \$? = $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:23069: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:23069: \$? = $ac_status" >&5
++ echo "$as_me:23072: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_func_vsscanf=_doscan
+ else
+@@ -23081,7 +23084,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:23087: result: $cf_cv_func_vsscanf" >&5
+ echo "${ECHO_T}$cf_cv_func_vsscanf" >&6
+
+ case "$cf_cv_func_vsscanf" in
+@@ -23107,23 +23110,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:23113: 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 23119 "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:23123: \"$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:23129: \$? = $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 +23145,7 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:23145: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
++echo "$as_me:23148: 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 +23155,7 @@
+ fi
+ done
+
+-echo "$as_me:23155: checking for working mkstemp" >&5
++echo "$as_me:23158: 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 +23166,7 @@
+ cf_cv_func_mkstemp=maybe
+ else
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 23166 "configure"
++#line 23169 "configure"
+ #include "confdefs.h"
+
+ $ac_includes_default
+@@ -23198,15 +23201,15 @@
+
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:23201: \"$ac_link\"") >&5
++if { (eval echo "$as_me:23204: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:23204: \$? = $ac_status" >&5
++ echo "$as_me:23207: \$? = $ac_status" >&5
+ (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+- { (eval echo "$as_me:23206: \"$ac_try\"") >&5
++ { (eval echo "$as_me:23209: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:23209: \$? = $ac_status" >&5
++ echo "$as_me:23212: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_func_mkstemp=yes
+
+@@ -23221,16 +23224,16 @@
+ fi
+
+ fi
+-echo "$as_me:23224: result: $cf_cv_func_mkstemp" >&5
++echo "$as_me:23227: 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:23230: 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 23236 "configure"
+ #include "confdefs.h"
+ #define mkstemp autoconf_temporary
+ #include <limits.h> /* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -23261,16 +23264,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:23264: \"$ac_link\"") >&5
++if { (eval echo "$as_me:23267: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:23267: \$? = $ac_status" >&5
++ echo "$as_me:23270: \$? = $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:23273: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:23273: \$? = $ac_status" >&5
++ echo "$as_me:23276: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_func_mkstemp=yes
+ else
+@@ -23280,7 +23283,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:23286: result: $ac_cv_func_mkstemp" >&5
+ echo "${ECHO_T}$ac_cv_func_mkstemp" >&6
+
+ fi
+@@ -23301,21 +23304,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:23307: 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:23310: 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:23316: 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 23321 "configure"
+ #include "confdefs.h"
+ #include <stdio.h>
+ /* If setvbuf has the reversed format, exit 0. */
+@@ -23332,15 +23335,15 @@
+ }
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:23335: \"$ac_link\"") >&5
++if { (eval echo "$as_me:23338: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:23338: \$? = $ac_status" >&5
++ echo "$as_me:23341: \$? = $ac_status" >&5
+ (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+- { (eval echo "$as_me:23340: \"$ac_try\"") >&5
++ { (eval echo "$as_me:23343: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:23343: \$? = $ac_status" >&5
++ echo "$as_me:23346: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_func_setvbuf_reversed=yes
+ else
+@@ -23353,7 +23356,7 @@
+ fi
+ rm -f core ./core.* ./*.core
+ fi
+-echo "$as_me:23356: result: $ac_cv_func_setvbuf_reversed" >&5
++echo "$as_me:23359: 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 +23367,13 @@
+ fi
+
+ fi
+-echo "$as_me:23367: checking for intptr_t" >&5
++echo "$as_me:23370: 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 23376 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -23385,16 +23388,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:23388: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:23391: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:23391: \$? = $ac_status" >&5
++ echo "$as_me:23394: \$? = $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:23397: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:23397: \$? = $ac_status" >&5
++ echo "$as_me:23400: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_type_intptr_t=yes
+ else
+@@ -23404,7 +23407,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:23410: 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 +23419,13 @@
+
+ fi
+
+-echo "$as_me:23419: checking for ssize_t" >&5
++echo "$as_me:23422: 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 23428 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -23437,16 +23440,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:23440: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:23443: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:23443: \$? = $ac_status" >&5
++ echo "$as_me:23446: \$? = $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:23449: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:23449: \$? = $ac_status" >&5
++ echo "$as_me:23452: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_type_ssize_t=yes
+ else
+@@ -23456,7 +23459,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:23462: 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 +23471,14 @@
+
+ fi
+
+-echo "$as_me:23471: checking for type sigaction_t" >&5
++echo "$as_me:23474: 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 23481 "configure"
+ #include "confdefs.h"
+
+ #include <signal.h>
+@@ -23488,16 +23491,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:23491: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:23494: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:23494: \$? = $ac_status" >&5
++ echo "$as_me:23497: \$? = $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:23500: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:23500: \$? = $ac_status" >&5
++ echo "$as_me:23503: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_type_sigaction=yes
+ else
+@@ -23508,14 +23511,14 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+
+-echo "$as_me:23511: result: $cf_cv_type_sigaction" >&5
++echo "$as_me:23514: 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:23521: 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 +23539,7 @@
+
+ fi
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 23539 "configure"
++#line 23542 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ #ifdef HAVE_TERMIOS_H
+@@ -23586,16 +23589,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:23589: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:23592: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:23592: \$? = $ac_status" >&5
++ echo "$as_me:23595: \$? = $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:23598: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:23598: \$? = $ac_status" >&5
++ echo "$as_me:23601: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_sizechange=yes
+ else
+@@ -23614,7 +23617,7 @@
+ done
+
+ fi
+-echo "$as_me:23617: result: $cf_cv_sizechange" >&5
++echo "$as_me:23620: result: $cf_cv_sizechange" >&5
+ echo "${ECHO_T}$cf_cv_sizechange" >&6
+ if test "$cf_cv_sizechange" != no ; then
+
+@@ -23632,13 +23635,13 @@
+ esac
+ fi
+
+-echo "$as_me:23635: checking for memmove" >&5
++echo "$as_me:23638: 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 23644 "configure"
+ #include "confdefs.h"
+ #define memmove autoconf_temporary
+ #include <limits.h> /* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -23669,16 +23672,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:23672: \"$ac_link\"") >&5
++if { (eval echo "$as_me:23675: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:23675: \$? = $ac_status" >&5
++ echo "$as_me:23678: \$? = $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:23681: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:23681: \$? = $ac_status" >&5
++ echo "$as_me:23684: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_func_memmove=yes
+ else
+@@ -23688,19 +23691,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:23694: 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:23700: 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 23706 "configure"
+ #include "confdefs.h"
+ #define bcopy autoconf_temporary
+ #include <limits.h> /* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -23731,16 +23734,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:23734: \"$ac_link\"") >&5
++if { (eval echo "$as_me:23737: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:23737: \$? = $ac_status" >&5
++ echo "$as_me:23740: \$? = $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:23743: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:23743: \$? = $ac_status" >&5
++ echo "$as_me:23746: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_func_bcopy=yes
+ else
+@@ -23750,11 +23753,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:23756: 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:23760: 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 +23767,7 @@
+ cf_cv_good_bcopy=unknown
+ else
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 23767 "configure"
++#line 23770 "configure"
+ #include "confdefs.h"
+
+ $ac_includes_default
+@@ -23780,15 +23783,15 @@
+
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:23783: \"$ac_link\"") >&5
++if { (eval echo "$as_me:23786: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:23786: \$? = $ac_status" >&5
++ echo "$as_me:23789: \$? = $ac_status" >&5
+ (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+- { (eval echo "$as_me:23788: \"$ac_try\"") >&5
++ { (eval echo "$as_me:23791: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:23791: \$? = $ac_status" >&5
++ echo "$as_me:23794: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_good_bcopy=yes
+ else
+@@ -23801,7 +23804,7 @@
+ fi
+
+ fi
+-echo "$as_me:23804: result: $cf_cv_good_bcopy" >&5
++echo "$as_me:23807: result: $cf_cv_good_bcopy" >&5
+ echo "${ECHO_T}$cf_cv_good_bcopy" >&6
+
+ else
+@@ -23828,13 +23831,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:23834: 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 23840 "configure"
+ #include "confdefs.h"
+ #define $ac_func autoconf_temporary
+ #include <limits.h> /* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -23865,16 +23868,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:23868: \"$ac_link\"") >&5
++if { (eval echo "$as_me:23871: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:23871: \$? = $ac_status" >&5
++ echo "$as_me:23874: \$? = $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:23877: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:23877: \$? = $ac_status" >&5
++ echo "$as_me:23880: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ eval "$as_ac_var=yes"
+ else
+@@ -23884,7 +23887,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:23890: 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 +23897,7 @@
+ fi
+ done
+ }
+-echo "$as_me:23897: checking if poll really works" >&5
++echo "$as_me:23900: 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 +23907,7 @@
+ cf_cv_working_poll=unknown
+ else
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 23907 "configure"
++#line 23910 "configure"
+ #include "confdefs.h"
+
+ $ac_includes_default
+@@ -23957,15 +23960,15 @@
+ }
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:23960: \"$ac_link\"") >&5
++if { (eval echo "$as_me:23963: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:23963: \$? = $ac_status" >&5
++ echo "$as_me:23966: \$? = $ac_status" >&5
+ (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+- { (eval echo "$as_me:23965: \"$ac_try\"") >&5
++ { (eval echo "$as_me:23968: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:23968: \$? = $ac_status" >&5
++ echo "$as_me:23971: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_working_poll=yes
+ else
+@@ -23977,21 +23980,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:23983: 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:23990: 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 23997 "configure"
+ #include "confdefs.h"
+
+ $ac_includes_default
+@@ -24011,16 +24014,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:24014: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:24017: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:24017: \$? = $ac_status" >&5
++ echo "$as_me:24020: \$? = $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:24023: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:24023: \$? = $ac_status" >&5
++ echo "$as_me:24026: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_mb_len_max=yes
+ else
+@@ -24030,7 +24033,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:24036: 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 +24043,18 @@
+ EOF
+
+ else
+- { echo "$as_me:24043: WARNING: MB_LEN_MAX is missing/inconsistent in system headers" >&5
++ { echo "$as_me:24046: 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:24050: 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 24057 "configure"
+ #include "confdefs.h"
+
+ #include <stdarg.h>
+@@ -24068,16 +24071,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:24071: \"$ac_link\"") >&5
++if { (eval echo "$as_me:24074: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:24074: \$? = $ac_status" >&5
++ echo "$as_me:24077: \$? = $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:24080: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:24080: \$? = $ac_status" >&5
++ echo "$as_me:24083: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_have_va_copy=yes
+ else
+@@ -24087,7 +24090,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:24093: 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 +24102,14 @@
+
+ else # !cf_cv_have_va_copy
+
+-echo "$as_me:24102: checking for __va_copy" >&5
++echo "$as_me:24105: 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 24112 "configure"
+ #include "confdefs.h"
+
+ #include <stdarg.h>
+@@ -24123,16 +24126,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:24126: \"$ac_link\"") >&5
++if { (eval echo "$as_me:24129: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:24129: \$? = $ac_status" >&5
++ echo "$as_me:24132: \$? = $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:24135: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:24135: \$? = $ac_status" >&5
++ echo "$as_me:24138: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_have___va_copy=yes
+ else
+@@ -24142,7 +24145,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:24148: 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 +24157,14 @@
+
+ else # !cf_cv_have___va_copy
+
+-echo "$as_me:24157: checking for __builtin_va_copy" >&5
++echo "$as_me:24160: 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 24167 "configure"
+ #include "confdefs.h"
+
+ #include <stdarg.h>
+@@ -24178,16 +24181,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:24181: \"$ac_link\"") >&5
++if { (eval echo "$as_me:24184: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:24184: \$? = $ac_status" >&5
++ echo "$as_me:24187: \$? = $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:24190: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:24190: \$? = $ac_status" >&5
++ echo "$as_me:24193: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_have___builtin_va_copy=yes
+ else
+@@ -24197,7 +24200,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:24203: 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 +24218,14 @@
+ ;;
+
+ (*)
+- echo "$as_me:24218: checking if we can simply copy va_list" >&5
++ echo "$as_me:24221: 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 24228 "configure"
+ #include "confdefs.h"
+
+ #include <stdarg.h>
+@@ -24239,16 +24242,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:24242: \"$ac_link\"") >&5
++if { (eval echo "$as_me:24245: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:24245: \$? = $ac_status" >&5
++ echo "$as_me:24248: \$? = $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:24251: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:24251: \$? = $ac_status" >&5
++ echo "$as_me:24254: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_pointer_va_list=yes
+ else
+@@ -24258,19 +24261,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:24264: 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:24269: 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 24276 "configure"
+ #include "confdefs.h"
+
+ #include <stdarg.h>
+@@ -24287,16 +24290,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:24290: \"$ac_link\"") >&5
++if { (eval echo "$as_me:24293: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:24293: \$? = $ac_status" >&5
++ echo "$as_me:24296: \$? = $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:24299: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:24299: \$? = $ac_status" >&5
++ echo "$as_me:24302: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_array_va_list=yes
+ else
+@@ -24306,7 +24309,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:24312: 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 +24320,13 @@
+ ;;
+ esac
+
+-echo "$as_me:24320: checking for pid_t" >&5
++echo "$as_me:24323: 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 24329 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -24338,16 +24341,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:24341: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:24344: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:24344: \$? = $ac_status" >&5
++ echo "$as_me:24347: \$? = $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:24350: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:24350: \$? = $ac_status" >&5
++ echo "$as_me:24353: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_type_pid_t=yes
+ else
+@@ -24357,7 +24360,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:24363: 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 +24375,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:24378: 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 24384 "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:24388: \"$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:24394: \$? = $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 +24410,7 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:24410: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
++echo "$as_me:24413: 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 +24423,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:24426: 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 24432 "configure"
+ #include "confdefs.h"
+ #define $ac_func autoconf_temporary
+ #include <limits.h> /* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -24457,16 +24460,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:24460: \"$ac_link\"") >&5
++if { (eval echo "$as_me:24463: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:24463: \$? = $ac_status" >&5
++ echo "$as_me:24466: \$? = $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:24469: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:24469: \$? = $ac_status" >&5
++ echo "$as_me:24472: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ eval "$as_ac_var=yes"
+ else
+@@ -24476,7 +24479,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:24482: 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 +24491,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:24494: 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 +24514,15 @@
+ }
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:24514: \"$ac_link\"") >&5
++if { (eval echo "$as_me:24517: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:24517: \$? = $ac_status" >&5
++ echo "$as_me:24520: \$? = $ac_status" >&5
+ (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+- { (eval echo "$as_me:24519: \"$ac_try\"") >&5
++ { (eval echo "$as_me:24522: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:24522: \$? = $ac_status" >&5
++ echo "$as_me:24525: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_func_fork_works=yes
+ else
+@@ -24531,7 +24534,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:24537: result: $ac_cv_func_fork_works" >&5
+ echo "${ECHO_T}$ac_cv_func_fork_works" >&6
+
+ fi
+@@ -24545,12 +24548,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:24551: 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:24556: 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 +24562,7 @@
+ ac_cv_func_vfork_works=cross
+ else
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 24562 "configure"
++#line 24565 "configure"
+ #include "confdefs.h"
+ /* Thanks to Paul Eggert for this test. */
+ #include <stdio.h>
+@@ -24652,15 +24655,15 @@
+ }
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:24655: \"$ac_link\"") >&5
++if { (eval echo "$as_me:24658: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:24658: \$? = $ac_status" >&5
++ echo "$as_me:24661: \$? = $ac_status" >&5
+ (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+- { (eval echo "$as_me:24660: \"$ac_try\"") >&5
++ { (eval echo "$as_me:24663: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:24663: \$? = $ac_status" >&5
++ echo "$as_me:24666: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_func_vfork_works=yes
+ else
+@@ -24672,13 +24675,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:24678: 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:24684: 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 +24706,7 @@
+
+ fi
+
+-echo "$as_me:24706: checking if fopen accepts explicit binary mode" >&5
++echo "$as_me:24709: 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 +24716,7 @@
+ cf_cv_fopen_bin_r=unknown
+ else
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 24716 "configure"
++#line 24719 "configure"
+ #include "confdefs.h"
+
+ $ac_includes_default
+@@ -24748,15 +24751,15 @@
+
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:24751: \"$ac_link\"") >&5
++if { (eval echo "$as_me:24754: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:24754: \$? = $ac_status" >&5
++ echo "$as_me:24757: \$? = $ac_status" >&5
+ (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+- { (eval echo "$as_me:24756: \"$ac_try\"") >&5
++ { (eval echo "$as_me:24759: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:24759: \$? = $ac_status" >&5
++ echo "$as_me:24762: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_fopen_bin_r=yes
+ else
+@@ -24769,7 +24772,7 @@
+ fi
+
+ fi
+-echo "$as_me:24772: result: $cf_cv_fopen_bin_r" >&5
++echo "$as_me:24775: 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 +24781,7 @@
+
+ # special check for test/ditto.c
+
+-echo "$as_me:24781: checking for openpty in -lutil" >&5
++echo "$as_me:24784: 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 +24789,7 @@
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lutil $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 24789 "configure"
++#line 24792 "configure"
+ #include "confdefs.h"
+
+ /* Override any gcc2 internal prototype to avoid an error. */
+@@ -24805,16 +24808,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:24808: \"$ac_link\"") >&5
++if { (eval echo "$as_me:24811: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:24811: \$? = $ac_status" >&5
++ echo "$as_me:24814: \$? = $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:24817: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:24817: \$? = $ac_status" >&5
++ echo "$as_me:24820: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_lib_util_openpty=yes
+ else
+@@ -24825,7 +24828,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:24831: 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 +24836,7 @@
+ cf_cv_lib_util=no
+ fi
+
+-echo "$as_me:24836: checking for openpty header" >&5
++echo "$as_me:24839: 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 +24863,7 @@
+ for cf_header in pty.h libutil.h util.h
+ do
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 24863 "configure"
++#line 24866 "configure"
+ #include "confdefs.h"
+
+ #include <$cf_header>
+@@ -24878,16 +24881,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:24881: \"$ac_link\"") >&5
++if { (eval echo "$as_me:24884: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:24884: \$? = $ac_status" >&5
++ echo "$as_me:24887: \$? = $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:24890: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:24890: \$? = $ac_status" >&5
++ echo "$as_me:24893: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+
+ cf_cv_func_openpty=$cf_header
+@@ -24905,7 +24908,7 @@
+ LIBS="$cf_save_LIBS"
+
+ fi
+-echo "$as_me:24908: result: $cf_cv_func_openpty" >&5
++echo "$as_me:24911: result: $cf_cv_func_openpty" >&5
+ echo "${ECHO_T}$cf_cv_func_openpty" >&6
+
+ if test "$cf_cv_func_openpty" != no ; then
+@@ -24978,7 +24981,7 @@
+ CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
+
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 24981 "configure"
++#line 24984 "configure"
+ #include "confdefs.h"
+ #include <stdio.h>
+ int
+@@ -24990,16 +24993,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:24993: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:24996: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:24996: \$? = $ac_status" >&5
++ echo "$as_me:24999: \$? = $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:25002: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:25002: \$? = $ac_status" >&5
++ echo "$as_me:25005: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ :
+ else
+@@ -25016,7 +25019,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}:25022: testing adding $cf_add_incdir to include-path ..." 1>&5
+
+ CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
+
+@@ -25052,7 +25055,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}:25058: testing adding $cf_add_libdir to library-path ..." 1>&5
+
+ LDFLAGS="-L$cf_add_libdir $LDFLAGS"
+ fi
+@@ -25063,7 +25066,7 @@
+ else
+ case "$with_hashed_db" in
+ (./*|../*|/*)
+- { echo "$as_me:25066: WARNING: no such directory $with_hashed_db" >&5
++ { echo "$as_me:25069: WARNING: no such directory $with_hashed_db" >&5
+ echo "$as_me: WARNING: no such directory $with_hashed_db" >&2;}
+ ;;
+ (*)
+@@ -25135,7 +25138,7 @@
+ CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
+
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 25138 "configure"
++#line 25141 "configure"
+ #include "confdefs.h"
+ #include <stdio.h>
+ int
+@@ -25147,16 +25150,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:25150: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:25153: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:25153: \$? = $ac_status" >&5
++ echo "$as_me:25156: \$? = $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:25159: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:25159: \$? = $ac_status" >&5
++ echo "$as_me:25162: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ :
+ else
+@@ -25173,7 +25176,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}:25179: testing adding $cf_add_incdir to include-path ..." 1>&5
+
+ CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
+
+@@ -25253,7 +25256,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}:25259: testing adding $cf_add_libdir to library-path ..." 1>&5
+
+ LDFLAGS="-L$cf_add_libdir $LDFLAGS"
+ fi
+@@ -25270,23 +25273,23 @@
+ fi
+ esac
+
+-echo "$as_me:25273: checking for db.h" >&5
++echo "$as_me:25276: 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 25282 "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:25286: \"$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:25292: \$? = $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 +25308,11 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:25308: result: $ac_cv_header_db_h" >&5
++echo "$as_me:25311: 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:25315: 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 +25323,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}:25326: testing checking for db version $cf_db_version ..." 1>&5
+
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 25326 "configure"
++#line 25329 "configure"
+ #include "confdefs.h"
+
+ $ac_includes_default
+@@ -25353,16 +25356,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:25356: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:25359: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:25359: \$? = $ac_status" >&5
++ echo "$as_me:25362: \$? = $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:25365: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:25365: \$? = $ac_status" >&5
++ echo "$as_me:25368: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+
+ cf_cv_hashed_db_version=$cf_db_version
+@@ -25376,16 +25379,16 @@
+ done
+
+ fi
+-echo "$as_me:25379: result: $cf_cv_hashed_db_version" >&5
++echo "$as_me:25382: 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:25386: 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:25391: 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 +25418,10 @@
+
+ fi
+
+-echo "${as_me:-configure}:25418: testing checking for library $cf_db_libs ..." 1>&5
++echo "${as_me:-configure}:25421: testing checking for library $cf_db_libs ..." 1>&5
+
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 25421 "configure"
++#line 25424 "configure"
+ #include "confdefs.h"
+
+ $ac_includes_default
+@@ -25473,16 +25476,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:25476: \"$ac_link\"") >&5
++if { (eval echo "$as_me:25479: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:25479: \$? = $ac_status" >&5
++ echo "$as_me:25482: \$? = $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:25485: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:25485: \$? = $ac_status" >&5
++ echo "$as_me:25488: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+
+ if test -n "$cf_db_libs" ; then
+@@ -25502,11 +25505,11 @@
+ done
+
+ fi
+-echo "$as_me:25505: result: $cf_cv_hashed_db_libs" >&5
++echo "$as_me:25508: 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:25512: 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 +25535,7 @@
+
+ else
+
+- { { echo "$as_me:25535: error: Cannot find db.h" >&5
++ { { echo "$as_me:25538: error: Cannot find db.h" >&5
+ echo "$as_me: error: Cannot find db.h" >&2;}
+ { (exit 1); exit 1; }; }
+
+@@ -25547,7 +25550,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:25553: 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 +25558,7 @@
+ else
+
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 25558 "configure"
++#line 25561 "configure"
+ #include "confdefs.h"
+
+ int
+@@ -25567,23 +25570,23 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:25570: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:25573: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:25573: \$? = $ac_status" >&5
++ echo "$as_me:25576: \$? = $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:25579: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:25579: \$? = $ac_status" >&5
++ echo "$as_me:25582: \$? = $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 25589 "configure"
+ #include "confdefs.h"
+
+ #ifndef __BEOS__
+@@ -25599,16 +25602,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:25602: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:25605: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:25605: \$? = $ac_status" >&5
++ echo "$as_me:25608: \$? = $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:25611: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:25611: \$? = $ac_status" >&5
++ echo "$as_me:25614: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_header_stdbool_h=1
+ else
+@@ -25622,13 +25625,13 @@
+ fi
+
+ if test "$cf_cv_header_stdbool_h" = 1
+-then echo "$as_me:25625: result: yes" >&5
++then echo "$as_me:25628: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+-else echo "$as_me:25627: result: no" >&5
++else echo "$as_me:25630: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+
+-echo "$as_me:25631: checking for builtin bool type" >&5
++echo "$as_me:25634: 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 +25639,7 @@
+ else
+
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 25639 "configure"
++#line 25642 "configure"
+ #include "confdefs.h"
+
+ #include <stdio.h>
+@@ -25651,16 +25654,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:25654: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:25657: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:25657: \$? = $ac_status" >&5
++ echo "$as_me:25660: \$? = $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:25663: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:25663: \$? = $ac_status" >&5
++ echo "$as_me:25666: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_cc_bool_type=1
+ else
+@@ -25673,9 +25676,9 @@
+ fi
+
+ if test "$cf_cv_cc_bool_type" = 1
+-then echo "$as_me:25676: result: yes" >&5
++then echo "$as_me:25679: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+-else echo "$as_me:25678: result: no" >&5
++else echo "$as_me:25681: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+
+@@ -25692,10 +25695,10 @@
+
+ cf_save="$LIBS"
+ LIBS="$LIBS $CXXLIBS"
+- echo "$as_me:25695: checking if we already have C++ library" >&5
++ echo "$as_me:25698: 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 25701 "configure"
+ #include "confdefs.h"
+
+ #include <iostream>
+@@ -25709,16 +25712,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:25712: \"$ac_link\"") >&5
++if { (eval echo "$as_me:25715: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:25715: \$? = $ac_status" >&5
++ echo "$as_me:25718: \$? = $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:25721: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:25721: \$? = $ac_status" >&5
++ echo "$as_me:25724: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_have_libstdcpp=yes
+ else
+@@ -25727,7 +25730,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:25733: result: $cf_have_libstdcpp" >&5
+ echo "${ECHO_T}$cf_have_libstdcpp" >&6
+ LIBS="$cf_save"
+
+@@ -25746,7 +25749,7 @@
+ ;;
+ esac
+
+- echo "$as_me:25749: checking for library $cf_stdcpp_libname" >&5
++ echo "$as_me:25752: 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 +25775,7 @@
+ LIBS="$cf_add_libs"
+
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 25775 "configure"
++#line 25778 "configure"
+ #include "confdefs.h"
+
+ #include <iostream>
+@@ -25786,16 +25789,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:25789: \"$ac_link\"") >&5
++if { (eval echo "$as_me:25792: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:25792: \$? = $ac_status" >&5
++ echo "$as_me:25795: \$? = $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:25798: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:25798: \$? = $ac_status" >&5
++ echo "$as_me:25801: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_libstdcpp=yes
+ else
+@@ -25807,7 +25810,7 @@
+ LIBS="$cf_save"
+
+ fi
+-echo "$as_me:25810: result: $cf_cv_libstdcpp" >&5
++echo "$as_me:25813: result: $cf_cv_libstdcpp" >&5
+ echo "${ECHO_T}$cf_cv_libstdcpp" >&6
+ test "$cf_cv_libstdcpp" = yes && {
+ cf_add_libs="$CXXLIBS"
+@@ -25829,7 +25832,7 @@
+ fi
+ fi
+
+- echo "$as_me:25832: checking whether $CXX understands -c and -o together" >&5
++ echo "$as_me:25835: 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 +25847,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:25850: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:25850: \$? = $ac_status" >&5
++ echo "$as_me:25853: \$? = $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:25855: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:25855: \$? = $ac_status" >&5
++ echo "$as_me:25858: \$? = $ac_status" >&5
+ (exit "$ac_status"); };
+ then
+ eval cf_cv_prog_CXX_c_o=yes
+@@ -25863,10 +25866,10 @@
+
+ fi
+ if test "$cf_cv_prog_CXX_c_o" = yes; then
+- echo "$as_me:25866: result: yes" >&5
++ echo "$as_me:25869: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ else
+- echo "$as_me:25869: result: no" >&5
++ echo "$as_me:25872: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+
+@@ -25886,7 +25889,7 @@
+ ;;
+ esac
+ if test "$GXX" = yes; then
+- echo "$as_me:25889: checking for lib$cf_gpp_libname" >&5
++ echo "$as_me:25892: checking for lib$cf_gpp_libname" >&5
+ echo $ECHO_N "checking for lib$cf_gpp_libname... $ECHO_C" >&6
+ cf_save="$LIBS"
+
+@@ -25907,7 +25910,7 @@
+ LIBS="$cf_add_libs"
+
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 25910 "configure"
++#line 25913 "configure"
+ #include "confdefs.h"
+
+ #include <$cf_gpp_libname/builtin.h>
+@@ -25921,16 +25924,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:25924: \"$ac_link\"") >&5
++if { (eval echo "$as_me:25927: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:25927: \$? = $ac_status" >&5
++ echo "$as_me:25930: \$? = $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:25933: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:25933: \$? = $ac_status" >&5
++ echo "$as_me:25936: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cxx_library=yes
+
+@@ -25967,7 +25970,7 @@
+ echo "$as_me: failed program was:" >&5
+ cat "conftest.$ac_ext" >&5
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 25970 "configure"
++#line 25973 "configure"
+ #include "confdefs.h"
+
+ #include <builtin.h>
+@@ -25981,16 +25984,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:25984: \"$ac_link\"") >&5
++if { (eval echo "$as_me:25987: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:25987: \$? = $ac_status" >&5
++ echo "$as_me:25990: \$? = $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:25993: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:25993: \$? = $ac_status" >&5
++ echo "$as_me:25996: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cxx_library=yes
+
+@@ -26023,7 +26026,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:26029: result: $cf_cxx_library" >&5
+ echo "${ECHO_T}$cf_cxx_library" >&6
+ fi
+
+@@ -26039,7 +26042,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:26045: 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 +26059,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 26062 "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:26067: \"$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:26073: \$? = $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 +26093,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 26096 "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:26100: \"$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:26106: \$? = $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 +26140,7 @@
+ else
+ ac_cv_prog_CXXCPP=$CXXCPP
+ fi
+-echo "$as_me:26140: result: $CXXCPP" >&5
++echo "$as_me:26143: result: $CXXCPP" >&5
+ echo "${ECHO_T}$CXXCPP" >&6
+ ac_preproc_ok=false
+ for ac_cxx_preproc_warn_flag in '' yes
+@@ -26147,18 +26150,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 26153 "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:26158: \"$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:26164: \$? = $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 +26184,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 26187 "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:26191: \"$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:26197: \$? = $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 +26222,7 @@
+ if $ac_preproc_ok; then
+ :
+ else
+- { { echo "$as_me:26222: error: C++ preprocessor \"$CXXCPP\" fails sanity check" >&5
++ { { echo "$as_me:26225: 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 +26237,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:26240: 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 26246 "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:26250: \"$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:26256: \$? = $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 +26272,7 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:26272: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
++echo "$as_me:26275: 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 +26285,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:26288: 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 26294 "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:26298: \"$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:26304: \$? = $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 +26320,7 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:26320: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
++echo "$as_me:26323: 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 +26331,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:26334: 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 26337 "configure"
+ #include "confdefs.h"
+
+ #include <iostream>
+@@ -26348,16 +26351,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:26351: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:26354: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:26354: \$? = $ac_status" >&5
++ echo "$as_me:26357: \$? = $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:26360: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:26360: \$? = $ac_status" >&5
++ echo "$as_me:26363: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_iostream_namespace=yes
+ else
+@@ -26366,7 +26369,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:26372: result: $cf_iostream_namespace" >&5
+ echo "${ECHO_T}$cf_iostream_namespace" >&6
+ if test "$cf_iostream_namespace" = yes ; then
+
+@@ -26377,7 +26380,7 @@
+ fi
+ fi
+
+-echo "$as_me:26380: checking if we should include stdbool.h" >&5
++echo "$as_me:26383: 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 +26388,7 @@
+ else
+
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 26388 "configure"
++#line 26391 "configure"
+ #include "confdefs.h"
+
+ int
+@@ -26397,23 +26400,23 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:26400: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:26403: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:26403: \$? = $ac_status" >&5
++ echo "$as_me:26406: \$? = $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:26409: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:26409: \$? = $ac_status" >&5
++ echo "$as_me:26412: \$? = $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 26419 "configure"
+ #include "confdefs.h"
+
+ #ifndef __BEOS__
+@@ -26429,16 +26432,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:26432: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:26435: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:26435: \$? = $ac_status" >&5
++ echo "$as_me:26438: \$? = $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:26441: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:26441: \$? = $ac_status" >&5
++ echo "$as_me:26444: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_header_stdbool_h=1
+ else
+@@ -26452,13 +26455,13 @@
+ fi
+
+ if test "$cf_cv_header_stdbool_h" = 1
+-then echo "$as_me:26455: result: yes" >&5
++then echo "$as_me:26458: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+-else echo "$as_me:26457: result: no" >&5
++else echo "$as_me:26460: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+
+-echo "$as_me:26461: checking for builtin bool type" >&5
++echo "$as_me:26464: 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 +26469,7 @@
+ else
+
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 26469 "configure"
++#line 26472 "configure"
+ #include "confdefs.h"
+
+ #include <stdio.h>
+@@ -26481,16 +26484,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:26484: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:26487: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:26487: \$? = $ac_status" >&5
++ echo "$as_me:26490: \$? = $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:26493: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:26493: \$? = $ac_status" >&5
++ echo "$as_me:26496: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_builtin_bool=1
+ else
+@@ -26503,19 +26506,19 @@
+ fi
+
+ if test "$cf_cv_builtin_bool" = 1
+-then echo "$as_me:26506: result: yes" >&5
++then echo "$as_me:26509: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+-else echo "$as_me:26508: result: no" >&5
++else echo "$as_me:26511: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+
+-echo "$as_me:26512: checking for bool" >&5
++echo "$as_me:26515: 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 26521 "configure"
+ #include "confdefs.h"
+
+ $ac_includes_default
+@@ -26550,16 +26553,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:26553: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:26556: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:26556: \$? = $ac_status" >&5
++ echo "$as_me:26559: \$? = $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:26562: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:26562: \$? = $ac_status" >&5
++ echo "$as_me:26565: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_type_bool=yes
+ else
+@@ -26569,10 +26572,10 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:26572: result: $ac_cv_type_bool" >&5
++echo "$as_me:26575: 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:26578: 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 +26584,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 26587 "configure"
+ #include "confdefs.h"
+
+ $ac_includes_default
+@@ -26613,21 +26616,21 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:26616: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:26619: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:26619: \$? = $ac_status" >&5
++ echo "$as_me:26622: \$? = $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:26625: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:26625: \$? = $ac_status" >&5
++ echo "$as_me:26628: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_lo=0 ac_mid=0
+ while :; do
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 26630 "configure"
++#line 26633 "configure"
+ #include "confdefs.h"
+
+ $ac_includes_default
+@@ -26659,16 +26662,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:26662: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:26665: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:26665: \$? = $ac_status" >&5
++ echo "$as_me:26668: \$? = $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:26671: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:26671: \$? = $ac_status" >&5
++ echo "$as_me:26674: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_hi=$ac_mid; break
+ else
+@@ -26684,7 +26687,7 @@
+ ac_hi=-1 ac_mid=-1
+ while :; do
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 26687 "configure"
++#line 26690 "configure"
+ #include "confdefs.h"
+
+ $ac_includes_default
+@@ -26716,16 +26719,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:26719: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:26722: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:26722: \$? = $ac_status" >&5
++ echo "$as_me:26725: \$? = $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:26728: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:26728: \$? = $ac_status" >&5
++ echo "$as_me:26731: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_lo=$ac_mid; break
+ else
+@@ -26741,7 +26744,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 26747 "configure"
+ #include "confdefs.h"
+
+ $ac_includes_default
+@@ -26773,16 +26776,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:26776: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:26779: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:26779: \$? = $ac_status" >&5
++ echo "$as_me:26782: \$? = $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:26785: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:26785: \$? = $ac_status" >&5
++ echo "$as_me:26788: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_hi=$ac_mid
+ else
+@@ -26795,12 +26798,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:26801: 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 26806 "configure"
+ #include "confdefs.h"
+
+ $ac_includes_default
+@@ -26836,15 +26839,15 @@
+ }
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:26839: \"$ac_link\"") >&5
++if { (eval echo "$as_me:26842: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:26842: \$? = $ac_status" >&5
++ echo "$as_me:26845: \$? = $ac_status" >&5
+ (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+- { (eval echo "$as_me:26844: \"$ac_try\"") >&5
++ { (eval echo "$as_me:26847: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:26847: \$? = $ac_status" >&5
++ echo "$as_me:26850: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_sizeof_bool=`cat conftest.val`
+ else
+@@ -26860,13 +26863,13 @@
+ ac_cv_sizeof_bool=0
+ fi
+ fi
+-echo "$as_me:26863: result: $ac_cv_sizeof_bool" >&5
++echo "$as_me:26866: 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:26872: 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 +26888,7 @@
+
+ else
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 26888 "configure"
++#line 26891 "configure"
+ #include "confdefs.h"
+
+ $ac_includes_default
+@@ -26926,15 +26929,15 @@
+
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:26929: \"$ac_link\"") >&5
++if { (eval echo "$as_me:26932: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:26932: \$? = $ac_status" >&5
++ echo "$as_me:26935: \$? = $ac_status" >&5
+ (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+- { (eval echo "$as_me:26934: \"$ac_try\"") >&5
++ { (eval echo "$as_me:26937: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:26937: \$? = $ac_status" >&5
++ echo "$as_me:26940: \$? = $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 +26954,19 @@
+ rm -f cf_test.out
+
+ fi
+-echo "$as_me:26954: result: $cf_cv_type_of_bool" >&5
++echo "$as_me:26957: 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:26964: 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:26969: 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 +26984,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 26987 "configure"
+ #include "confdefs.h"
+
+ #include <etip.h.in>
+@@ -26995,16 +26998,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:26998: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:27001: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:27001: \$? = $ac_status" >&5
++ echo "$as_me:27004: \$? = $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:27007: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:27007: \$? = $ac_status" >&5
++ echo "$as_me:27010: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+
+ test -n "$cf_math" && cat >>confdefs.h <<EOF
+@@ -27025,12 +27028,12 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ done
+ done
+-echo "$as_me:27028: result: ${cf_result:-(none)}" >&5
++echo "$as_me:27031: 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:27036: 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 +27050,7 @@
+ cf_cv_cpp_override=unknown
+ else
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 27050 "configure"
++#line 27053 "configure"
+ #include "confdefs.h"
+
+ class base
+@@ -27066,15 +27069,15 @@
+
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:27069: \"$ac_link\"") >&5
++if { (eval echo "$as_me:27072: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:27072: \$? = $ac_status" >&5
++ echo "$as_me:27075: \$? = $ac_status" >&5
+ (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+- { (eval echo "$as_me:27074: \"$ac_try\"") >&5
++ { (eval echo "$as_me:27077: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:27077: \$? = $ac_status" >&5
++ echo "$as_me:27080: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_cpp_override=yes
+ else
+@@ -27093,7 +27096,7 @@
+ ac_main_return="return"
+
+ fi
+-echo "$as_me:27096: result: $cf_cv_cpp_override" >&5
++echo "$as_me:27099: result: $cf_cv_cpp_override" >&5
+ echo "${ECHO_T}$cf_cv_cpp_override" >&6
+ fi
+ test "$cf_cv_cpp_override" = yes &&
+@@ -27102,7 +27105,7 @@
+ EOF
+
+ if test -n "$CXX"; then
+-echo "$as_me:27105: checking if $CXX accepts parameter initialization" >&5
++echo "$as_me:27108: 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 +27122,7 @@
+ cf_cv_cpp_param_init=unknown
+ else
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 27122 "configure"
++#line 27125 "configure"
+ #include "confdefs.h"
+
+ class TEST {
+@@ -27138,15 +27141,15 @@
+
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:27141: \"$ac_link\"") >&5
++if { (eval echo "$as_me:27144: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:27144: \$? = $ac_status" >&5
++ echo "$as_me:27147: \$? = $ac_status" >&5
+ (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+- { (eval echo "$as_me:27146: \"$ac_try\"") >&5
++ { (eval echo "$as_me:27149: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:27149: \$? = $ac_status" >&5
++ echo "$as_me:27152: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_cpp_param_init=yes
+ else
+@@ -27165,7 +27168,7 @@
+ ac_main_return="return"
+
+ fi
+-echo "$as_me:27168: result: $cf_cv_cpp_param_init" >&5
++echo "$as_me:27171: 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 +27178,7 @@
+
+ if test -n "$CXX"; then
+
+-echo "$as_me:27178: checking if $CXX accepts static_cast" >&5
++echo "$as_me:27181: 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 +27192,7 @@
+ ac_main_return="return"
+
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 27192 "configure"
++#line 27195 "configure"
+ #include "confdefs.h"
+
+ class NCursesPanel
+@@ -27233,16 +27236,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:27236: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:27239: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:27239: \$? = $ac_status" >&5
++ echo "$as_me:27242: \$? = $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:27245: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:27245: \$? = $ac_status" >&5
++ echo "$as_me:27248: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_cpp_static_cast=yes
+ else
+@@ -27260,7 +27263,7 @@
+ ac_main_return="return"
+
+ fi
+-echo "$as_me:27263: result: $cf_cv_cpp_static_cast" >&5
++echo "$as_me:27266: result: $cf_cv_cpp_static_cast" >&5
+ echo "${ECHO_T}$cf_cv_cpp_static_cast" >&6
+
+ fi
+@@ -27309,13 +27312,13 @@
+ else
+ if test "$cf_cv_header_stdbool_h" = 1 ; then
+
+-echo "$as_me:27312: checking for bool" >&5
++echo "$as_me:27315: 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 27321 "configure"
+ #include "confdefs.h"
+
+ $ac_includes_default
+@@ -27350,16 +27353,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:27353: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:27356: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:27356: \$? = $ac_status" >&5
++ echo "$as_me:27359: \$? = $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:27362: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:27362: \$? = $ac_status" >&5
++ echo "$as_me:27365: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_type_bool=yes
+ else
+@@ -27369,10 +27372,10 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:27372: result: $ac_cv_type_bool" >&5
++echo "$as_me:27375: 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:27378: 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 +27384,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 27387 "configure"
+ #include "confdefs.h"
+
+ $ac_includes_default
+@@ -27413,21 +27416,21 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:27416: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:27419: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:27419: \$? = $ac_status" >&5
++ echo "$as_me:27422: \$? = $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:27425: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:27425: \$? = $ac_status" >&5
++ echo "$as_me:27428: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_lo=0 ac_mid=0
+ while :; do
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 27430 "configure"
++#line 27433 "configure"
+ #include "confdefs.h"
+
+ $ac_includes_default
+@@ -27459,16 +27462,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:27462: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:27465: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:27465: \$? = $ac_status" >&5
++ echo "$as_me:27468: \$? = $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:27471: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:27471: \$? = $ac_status" >&5
++ echo "$as_me:27474: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_hi=$ac_mid; break
+ else
+@@ -27484,7 +27487,7 @@
+ ac_hi=-1 ac_mid=-1
+ while :; do
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 27487 "configure"
++#line 27490 "configure"
+ #include "confdefs.h"
+
+ $ac_includes_default
+@@ -27516,16 +27519,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:27519: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:27522: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:27522: \$? = $ac_status" >&5
++ echo "$as_me:27525: \$? = $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:27528: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:27528: \$? = $ac_status" >&5
++ echo "$as_me:27531: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_lo=$ac_mid; break
+ else
+@@ -27541,7 +27544,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 27547 "configure"
+ #include "confdefs.h"
+
+ $ac_includes_default
+@@ -27573,16 +27576,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:27576: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:27579: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:27579: \$? = $ac_status" >&5
++ echo "$as_me:27582: \$? = $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:27585: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:27585: \$? = $ac_status" >&5
++ echo "$as_me:27588: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_hi=$ac_mid
+ else
+@@ -27595,12 +27598,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:27601: 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 27606 "configure"
+ #include "confdefs.h"
+
+ $ac_includes_default
+@@ -27636,15 +27639,15 @@
+ }
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:27639: \"$ac_link\"") >&5
++if { (eval echo "$as_me:27642: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:27642: \$? = $ac_status" >&5
++ echo "$as_me:27645: \$? = $ac_status" >&5
+ (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+- { (eval echo "$as_me:27644: \"$ac_try\"") >&5
++ { (eval echo "$as_me:27647: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:27647: \$? = $ac_status" >&5
++ echo "$as_me:27650: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_sizeof_bool=`cat conftest.val`
+ else
+@@ -27660,13 +27663,13 @@
+ ac_cv_sizeof_bool=0
+ fi
+ fi
+-echo "$as_me:27663: result: $ac_cv_sizeof_bool" >&5
++echo "$as_me:27666: 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:27672: 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 +27688,7 @@
+
+ else
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 27688 "configure"
++#line 27691 "configure"
+ #include "confdefs.h"
+
+ $ac_includes_default
+@@ -27726,15 +27729,15 @@
+
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:27729: \"$ac_link\"") >&5
++if { (eval echo "$as_me:27732: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:27732: \$? = $ac_status" >&5
++ echo "$as_me:27735: \$? = $ac_status" >&5
+ (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+- { (eval echo "$as_me:27734: \"$ac_try\"") >&5
++ { (eval echo "$as_me:27737: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:27737: \$? = $ac_status" >&5
++ echo "$as_me:27740: \$? = $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 +27754,26 @@
+ rm -f cf_test.out
+
+ fi
+-echo "$as_me:27754: result: $cf_cv_type_of_bool" >&5
++echo "$as_me:27757: 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:27764: 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:27770: 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:27776: result: $cf_cv_type_of_bool" >&5
+ echo "${ECHO_T}$cf_cv_type_of_bool" >&6
+ fi
+ fi
+@@ -27799,7 +27802,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:27805: 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 +27813,7 @@
+
+ ADAFLAGS="$ADAFLAGS -gnatpn"
+
+- echo "$as_me:27813: checking optimization options for ADAFLAGS" >&5
++ echo "$as_me:27816: checking optimization options for ADAFLAGS" >&5
+ echo $ECHO_N "checking optimization options for ADAFLAGS... $ECHO_C" >&6
+ case "$CFLAGS" in
+ (*-g*)
+@@ -27827,10 +27830,10 @@
+
+ ;;
+ esac
+- echo "$as_me:27830: result: $ADAFLAGS" >&5
++ echo "$as_me:27833: result: $ADAFLAGS" >&5
+ echo "${ECHO_T}$ADAFLAGS" >&6
+
+-echo "$as_me:27833: checking if GNATPREP supports -T option" >&5
++echo "$as_me:27836: 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 +27843,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:27846: 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:27850: 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 +27857,7 @@
+ cf_gnat_generics=no
+ ;;
+ esac
+-echo "$as_me:27857: result: $cf_gnat_generics" >&5
++echo "$as_me:27860: result: $cf_gnat_generics" >&5
+ echo "${ECHO_T}$cf_gnat_generics" >&6
+
+ if test "$cf_gnat_generics" = yes
+@@ -27866,7 +27869,7 @@
+ cf_generic_objects=
+ fi
+
+-echo "$as_me:27869: checking if GNAT supports SIGINT" >&5
++echo "$as_me:27872: 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 +27917,7 @@
+ rm -rf ./conftest* ./*~conftest*
+
+ fi
+-echo "$as_me:27917: result: $cf_cv_gnat_sigint" >&5
++echo "$as_me:27920: result: $cf_cv_gnat_sigint" >&5
+ echo "${ECHO_T}$cf_cv_gnat_sigint" >&6
+
+ if test "$cf_cv_gnat_sigint" = yes ; then
+@@ -27927,7 +27930,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:27933: 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 +27993,15 @@
+ esac
+ ;;
+ esac
+-echo "$as_me:27993: result: $cf_gnat_projects" >&5
++echo "$as_me:27996: 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:28002: 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:28004: result: $cf_gnat_libraries" >&5
+ echo "${ECHO_T}$cf_gnat_libraries" >&6
+ fi
+
+@@ -28018,7 +28021,7 @@
+ then
+ USE_GNAT_MAKE_GPR=""
+ else
+- { echo "$as_me:28021: WARNING: use old makefile rules since tools are missing" >&5
++ { echo "$as_me:28024: 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 +28033,7 @@
+ USE_GNAT_LIBRARIES="#"
+ fi
+
+-echo "$as_me:28033: checking for Ada95 compiler" >&5
++echo "$as_me:28036: 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 +28044,12 @@
+ cf_ada_compiler=gnatmake
+ fi;
+
+-echo "$as_me:28044: result: $cf_ada_compiler" >&5
++echo "$as_me:28047: 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:28052: 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.
+@@ -28082,7 +28085,7 @@
+ withval=`echo "$withval" | sed -e s%NONE%$cf_path_syntax%`
+ ;;
+ (*)
+- { { echo "$as_me:28085: error: expected a pathname, not \"$withval\"" >&5
++ { { echo "$as_me:28088: error: expected a pathname, not \"$withval\"" >&5
+ echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
+ { (exit 1); exit 1; }; }
+ ;;
+@@ -28091,10 +28094,10 @@
+ fi
+ eval ADA_INCLUDE="$withval"
+
+-echo "$as_me:28094: result: $ADA_INCLUDE" >&5
++echo "$as_me:28097: result: $ADA_INCLUDE" >&5
+ echo "${ECHO_T}$ADA_INCLUDE" >&6
+
+-echo "$as_me:28097: checking for Ada95 object directory" >&5
++echo "$as_me:28100: 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.
+@@ -28130,7 +28133,7 @@
+ withval=`echo "$withval" | sed -e s%NONE%$cf_path_syntax%`
+ ;;
+ (*)
+- { { echo "$as_me:28133: error: expected a pathname, not \"$withval\"" >&5
++ { { echo "$as_me:28136: error: expected a pathname, not \"$withval\"" >&5
+ echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
+ { (exit 1); exit 1; }; }
+ ;;
+@@ -28139,10 +28142,10 @@
+ fi
+ eval ADA_OBJECTS="$withval"
+
+-echo "$as_me:28142: result: $ADA_OBJECTS" >&5
++echo "$as_me:28145: result: $ADA_OBJECTS" >&5
+ echo "${ECHO_T}$ADA_OBJECTS" >&6
+
+-echo "$as_me:28145: checking whether to build an Ada95 shared library" >&5
++echo "$as_me:28148: 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.
+@@ -28163,11 +28166,11 @@
+ fi
+ fi
+
+-echo "$as_me:28166: result: $with_ada_sharedlib" >&5
++echo "$as_me:28169: result: $with_ada_sharedlib" >&5
+ echo "${ECHO_T}$with_ada_sharedlib" >&6
+ if test "x$cf_ada_sharedlib_warn" != xno
+ then
+- { echo "$as_me:28170: WARNING: disabling Ada95 shared library since GNAT projects are not supported" >&5
++ { echo "$as_me:28173: 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
+
+@@ -28185,7 +28188,7 @@
+
+ # allow the Ada binding to be renamed
+
+-echo "$as_me:28188: checking for Ada95 curses library name" >&5
++echo "$as_me:28191: 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.
+@@ -28201,7 +28204,7 @@
+ ;;
+ esac
+
+-echo "$as_me:28204: result: $ADA_LIBNAME" >&5
++echo "$as_me:28207: result: $ADA_LIBNAME" >&5
+ echo "${ECHO_T}$ADA_LIBNAME" >&6
+
+ fi
+@@ -28212,13 +28215,13 @@
+
+ # do this "late" to avoid conflict with header-checks
+ if test "x$with_widec" = xyes ; then
+- echo "$as_me:28215: checking for wchar_t" >&5
++ echo "$as_me:28218: 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 28221 "configure"
++#line 28224 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -28233,16 +28236,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:28236: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:28239: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:28239: \$? = $ac_status" >&5
++ echo "$as_me:28242: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:28242: \"$ac_try\"") >&5
++ { (eval echo "$as_me:28245: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:28245: \$? = $ac_status" >&5
++ echo "$as_me:28248: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_type_wchar_t=yes
+ else
+@@ -28252,10 +28255,10 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:28255: result: $ac_cv_type_wchar_t" >&5
++echo "$as_me:28258: result: $ac_cv_type_wchar_t" >&5
+ echo "${ECHO_T}$ac_cv_type_wchar_t" >&6
+
+-echo "$as_me:28258: checking size of wchar_t" >&5
++echo "$as_me:28261: 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
+@@ -28264,7 +28267,7 @@
+ if test "$cross_compiling" = yes; then
+ # Depending upon the size, compute the lo and hi bounds.
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 28267 "configure"
++#line 28270 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -28276,21 +28279,21 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:28279: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:28282: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:28282: \$? = $ac_status" >&5
++ echo "$as_me:28285: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:28285: \"$ac_try\"") >&5
++ { (eval echo "$as_me:28288: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:28288: \$? = $ac_status" >&5
++ echo "$as_me:28291: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_lo=0 ac_mid=0
+ while :; do
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 28293 "configure"
++#line 28296 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -28302,16 +28305,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:28305: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:28308: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:28308: \$? = $ac_status" >&5
++ echo "$as_me:28311: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:28311: \"$ac_try\"") >&5
++ { (eval echo "$as_me:28314: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:28314: \$? = $ac_status" >&5
++ echo "$as_me:28317: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_hi=$ac_mid; break
+ else
+@@ -28327,7 +28330,7 @@
+ ac_hi=-1 ac_mid=-1
+ while :; do
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 28330 "configure"
++#line 28333 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -28339,16 +28342,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:28342: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:28345: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:28345: \$? = $ac_status" >&5
++ echo "$as_me:28348: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:28348: \"$ac_try\"") >&5
++ { (eval echo "$as_me:28351: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:28351: \$? = $ac_status" >&5
++ echo "$as_me:28354: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_lo=$ac_mid; break
+ else
+@@ -28364,7 +28367,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 28367 "configure"
++#line 28370 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -28376,16 +28379,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:28379: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:28382: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:28382: \$? = $ac_status" >&5
++ echo "$as_me:28385: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:28385: \"$ac_try\"") >&5
++ { (eval echo "$as_me:28388: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:28388: \$? = $ac_status" >&5
++ echo "$as_me:28391: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_hi=$ac_mid
+ else
+@@ -28398,12 +28401,12 @@
+ ac_cv_sizeof_wchar_t=$ac_lo
+ else
+ if test "$cross_compiling" = yes; then
+- { { echo "$as_me:28401: error: cannot run test program while cross compiling" >&5
++ { { echo "$as_me:28404: 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 28406 "configure"
++#line 28409 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -28419,15 +28422,15 @@
+ }
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:28422: \"$ac_link\"") >&5
++if { (eval echo "$as_me:28425: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:28425: \$? = $ac_status" >&5
++ echo "$as_me:28428: \$? = $ac_status" >&5
+ (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+- { (eval echo "$as_me:28427: \"$ac_try\"") >&5
++ { (eval echo "$as_me:28430: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:28430: \$? = $ac_status" >&5
++ echo "$as_me:28433: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_sizeof_wchar_t=`cat conftest.val`
+ else
+@@ -28443,7 +28446,7 @@
+ ac_cv_sizeof_wchar_t=0
+ fi
+ fi
+-echo "$as_me:28446: result: $ac_cv_sizeof_wchar_t" >&5
++echo "$as_me:28449: 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
+@@ -28456,7 +28459,7 @@
+ then
+ test -n "$verbose" && echo " test failed (assume 2)" 1>&6
+
+-echo "${as_me:-configure}:28459: testing test failed (assume 2) ..." 1>&5
++echo "${as_me:-configure}:28462: testing test failed (assume 2) ..." 1>&5
+
+ sed /SIZEOF_WCHAR_T/d confdefs.h >confdefs.tmp
+ mv confdefs.tmp confdefs.h
+@@ -28474,7 +28477,7 @@
+ ### chooses to split module lists into libraries.
+ ###
+ ### (see CF_LIB_RULES).
+-echo "$as_me:28477: checking for library subsets" >&5
++echo "$as_me:28480: checking for library subsets" >&5
+ echo $ECHO_N "checking for library subsets... $ECHO_C" >&6
+ LIB_SUBSETS=
+
+@@ -28528,7 +28531,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:28531: result: $LIB_SUBSETS" >&5
++echo "$as_me:28534: result: $LIB_SUBSETS" >&5
+ echo "${ECHO_T}$LIB_SUBSETS" >&6
+
+ ### Construct the list of include-directories to be generated
+@@ -28559,7 +28562,7 @@
+ fi
+
+ ### Build up pieces for makefile rules
+-echo "$as_me:28562: checking default library suffix" >&5
++echo "$as_me:28565: checking default library suffix" >&5
+ echo $ECHO_N "checking default library suffix... $ECHO_C" >&6
+
+ case $DFT_LWR_MODEL in
+@@ -28570,10 +28573,10 @@
+ (shared) DFT_ARG_SUFFIX='' ;;
+ esac
+ test -n "$LIB_SUFFIX" && DFT_ARG_SUFFIX="${LIB_SUFFIX}${DFT_ARG_SUFFIX}"
+-echo "$as_me:28573: result: $DFT_ARG_SUFFIX" >&5
++echo "$as_me:28576: result: $DFT_ARG_SUFFIX" >&5
+ echo "${ECHO_T}$DFT_ARG_SUFFIX" >&6
+
+-echo "$as_me:28576: checking default library-dependency suffix" >&5
++echo "$as_me:28579: checking default library-dependency suffix" >&5
+ echo $ECHO_N "checking default library-dependency suffix... $ECHO_C" >&6
+
+ case X$DFT_LWR_MODEL in
+@@ -28656,10 +28659,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:28659: result: $DFT_DEP_SUFFIX" >&5
++echo "$as_me:28662: result: $DFT_DEP_SUFFIX" >&5
+ echo "${ECHO_T}$DFT_DEP_SUFFIX" >&6
+
+-echo "$as_me:28662: checking default object directory" >&5
++echo "$as_me:28665: checking default object directory" >&5
+ echo $ECHO_N "checking default object directory... $ECHO_C" >&6
+
+ case $DFT_LWR_MODEL in
+@@ -28675,11 +28678,11 @@
+ DFT_OBJ_SUBDIR='obj_s' ;;
+ esac
+ esac
+-echo "$as_me:28678: result: $DFT_OBJ_SUBDIR" >&5
++echo "$as_me:28681: result: $DFT_OBJ_SUBDIR" >&5
+ echo "${ECHO_T}$DFT_OBJ_SUBDIR" >&6
+
+ if test "x$cf_with_cxx" = xyes ; then
+-echo "$as_me:28682: checking c++ library-dependency suffix" >&5
++echo "$as_me:28685: 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++)
+@@ -28772,7 +28775,7 @@
+ fi
+
+ fi
+-echo "$as_me:28775: result: $CXX_LIB_SUFFIX" >&5
++echo "$as_me:28778: result: $CXX_LIB_SUFFIX" >&5
+ echo "${ECHO_T}$CXX_LIB_SUFFIX" >&6
+
+ fi
+@@ -28948,19 +28951,19 @@
+
+ if test -n "$LDFLAGS_STATIC" && test -n "$LDFLAGS_SHARED"
+ then
+- echo "$as_me:28951: checking if linker supports switching between static/dynamic" >&5
++ echo "$as_me:28954: 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 28956 "configure"
++#line 28959 "configure"
+ #include <stdio.h>
+ int cf_ldflags_static(FILE *fp) { return fflush(fp); }
+ EOF
+- if { (eval echo "$as_me:28960: \"$ac_compile\"") >&5
++ if { (eval echo "$as_me:28963: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:28963: \$? = $ac_status" >&5
++ echo "$as_me:28966: \$? = $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
+@@ -28971,10 +28974,10 @@
+
+ LIBS="$LDFLAGS_STATIC -L`pwd` -lconftest $LDFLAGS_DYNAMIC $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 28974 "configure"
++#line 28977 "configure"
+ #include "confdefs.h"
+
+-#line 28977 "configure"
++#line 28980 "configure"
+ #include <stdio.h>
+ int cf_ldflags_static(FILE *fp);
+
+@@ -28989,16 +28992,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:28992: \"$ac_link\"") >&5
++if { (eval echo "$as_me:28995: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:28995: \$? = $ac_status" >&5
++ echo "$as_me:28998: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:28998: \"$ac_try\"") >&5
++ { (eval echo "$as_me:29001: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:29001: \$? = $ac_status" >&5
++ echo "$as_me:29004: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+
+ # some linkers simply ignore the -dynamic
+@@ -29021,7 +29024,7 @@
+ rm -f libconftest.*
+ LIBS="$cf_save_LIBS"
+
+- echo "$as_me:29024: result: $cf_ldflags_static" >&5
++ echo "$as_me:29027: result: $cf_ldflags_static" >&5
+ echo "${ECHO_T}$cf_ldflags_static" >&6
+
+ if test "$cf_ldflags_static" != yes
+@@ -29037,7 +29040,7 @@
+ ;;
+ esac
+
+-echo "$as_me:29040: checking where we will install curses.h" >&5
++echo "$as_me:29043: checking where we will install curses.h" >&5
+ echo $ECHO_N "checking where we will install curses.h... $ECHO_C" >&6
+
+ includesubdir=
+@@ -29047,7 +29050,7 @@
+ then
+ includesubdir="/ncurses${USE_LIB_SUFFIX}"
+ fi
+-echo "$as_me:29050: result: ${includedir}${includesubdir}" >&5
++echo "$as_me:29053: result: ${includedir}${includesubdir}" >&5
+ echo "${ECHO_T}${includedir}${includesubdir}" >&6
+
+ ### Resolve a conflict between normal and wide-curses by forcing applications
+@@ -29055,7 +29058,7 @@
+ if test "$with_overwrite" != no ; then
+ if test "$NCURSES_LIBUTF8" = 1 ; then
+ NCURSES_LIBUTF8='defined(HAVE_LIBUTF8_H)'
+- { echo "$as_me:29058: WARNING: Wide-character applications must define HAVE_LIBUTF8_H to include curses.h" >&5
++ { echo "$as_me:29061: 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
+@@ -29080,7 +29083,7 @@
+
+ # pkgsrc uses these
+
+-echo "$as_me:29083: checking for desired basename for form library" >&5
++echo "$as_me:29086: 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.
+@@ -29100,10 +29103,10 @@
+ ;;
+ esac
+
+-echo "$as_me:29103: result: $FORM_NAME" >&5
++echo "$as_me:29106: result: $FORM_NAME" >&5
+ echo "${ECHO_T}$FORM_NAME" >&6
+
+-echo "$as_me:29106: checking for desired basename for menu library" >&5
++echo "$as_me:29109: 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.
+@@ -29123,10 +29126,10 @@
+ ;;
+ esac
+
+-echo "$as_me:29126: result: $MENU_NAME" >&5
++echo "$as_me:29129: result: $MENU_NAME" >&5
+ echo "${ECHO_T}$MENU_NAME" >&6
+
+-echo "$as_me:29129: checking for desired basename for panel library" >&5
++echo "$as_me:29132: 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.
+@@ -29146,10 +29149,10 @@
+ ;;
+ esac
+
+-echo "$as_me:29149: result: $PANEL_NAME" >&5
++echo "$as_me:29152: result: $PANEL_NAME" >&5
+ echo "${ECHO_T}$PANEL_NAME" >&6
+
+-echo "$as_me:29152: checking for desired basename for cxx library" >&5
++echo "$as_me:29155: 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.
+@@ -29169,13 +29172,13 @@
+ ;;
+ esac
+
+-echo "$as_me:29172: result: $CXX_NAME" >&5
++echo "$as_me:29175: 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:29178: checking for src modules" >&5
++echo "$as_me:29181: checking for src modules" >&5
+ echo $ECHO_N "checking for src modules... $ECHO_C" >&6
+
+ # dependencies and linker-arguments for test-programs
+@@ -29234,7 +29237,7 @@
+ fi
+ fi
+ done
+-echo "$as_me:29237: result: $cf_cv_src_modules" >&5
++echo "$as_me:29240: result: $cf_cv_src_modules" >&5
+ echo "${ECHO_T}$cf_cv_src_modules" >&6
+
+ TEST_ARGS="-L${LIB_DIR} $TEST_ARGS"
+@@ -29395,7 +29398,7 @@
+ (*-D_XOPEN_SOURCE_EXTENDED*)
+ test -n "$verbose" && echo " moving _XOPEN_SOURCE_EXTENDED to work around g++ problem" 1>&6
+
+-echo "${as_me:-configure}:29398: testing moving _XOPEN_SOURCE_EXTENDED to work around g++ problem ..." 1>&5
++echo "${as_me:-configure}:29401: 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//'`
+@@ -29406,7 +29409,7 @@
+
+ # Help to automatically enable the extended curses features when using either
+ # the *-config or the ".pc" files by adding defines.
+-echo "$as_me:29409: checking for defines to add to ncurses${USE_CFG_SUFFIX}${cf_config_suffix}-config script" >&5
++echo "$as_me:29412: 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
+@@ -29422,7 +29425,7 @@
+ done
+ test "$cf_found" = no && PKG_CFLAGS="$PKG_CFLAGS $cf_loop1"
+ done
+-echo "$as_me:29425: result: $PKG_CFLAGS" >&5
++echo "$as_me:29428: result: $PKG_CFLAGS" >&5
+ echo "${ECHO_T}$PKG_CFLAGS" >&6
+
+ # AC_CHECK_SIZEOF demands a literal parameter, no variables. So we do this.
+@@ -29483,7 +29486,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}:29486: testing will map symbols to ABI=$cf_cv_abi_default ..." 1>&5
++echo "${as_me:-configure}:29489: testing will map symbols to ABI=$cf_cv_abi_default ..." 1>&5
+
+ fi
+
+@@ -29510,7 +29513,7 @@
+
+ # This is used for the *-config script and *.pc data files.
+
+-echo "$as_me:29513: checking for linker search path" >&5
++echo "$as_me:29516: 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
+@@ -29558,7 +29561,7 @@
+ cf_pathlist="$cf_pathlist /lib /usr/lib"
+ ;;
+ (*)
+- { echo "$as_me:29561: WARNING: problem with Solaris architecture" >&5
++ { echo "$as_me:29564: WARNING: problem with Solaris architecture" >&5
+ echo "$as_me: WARNING: problem with Solaris architecture" >&2;}
+ ;;
+ esac
+@@ -29599,7 +29602,7 @@
+ test -z "$cf_cv_ld_searchpath" && cf_cv_ld_searchpath=/usr/lib
+
+ fi
+-echo "$as_me:29602: result: $cf_cv_ld_searchpath" >&5
++echo "$as_me:29605: 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'`
+@@ -29685,7 +29688,7 @@
+ : "${CONFIG_STATUS=./config.status}"
+ ac_clean_files_save=$ac_clean_files
+ ac_clean_files="$ac_clean_files $CONFIG_STATUS"
+-{ echo "$as_me:29688: creating $CONFIG_STATUS" >&5
++{ echo "$as_me:29691: creating $CONFIG_STATUS" >&5
+ echo "$as_me: creating $CONFIG_STATUS" >&6;}
+ cat >"$CONFIG_STATUS" <<_ACEOF
+ #! $SHELL
+@@ -29821,7 +29824,7 @@
+ cat >>"$CONFIG_STATUS" <<EOF
+ ac_cs_version="\\
+ config.status
+-configured by $0, generated by GNU Autoconf 2.52.20231210,
++configured by $0, generated by GNU Autoconf 2.52.20240618,
+ with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
+
+ Copyright 2003-2022,2023 Thomas E. Dickey
+@@ -29866,7 +29869,7 @@
+ echo "$ac_cs_version"; exit 0 ;;
+ --he | --h)
+ # Conflict between --help and --header
+- { { echo "$as_me:29869: error: ambiguous option: $1
++ { { echo "$as_me:29872: 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;}
+@@ -29885,7 +29888,7 @@
+ ac_need_defaults=false;;
+
+ # This is an error.
+- -*) { { echo "$as_me:29888: error: unrecognized option: $1
++ -*) { { echo "$as_me:29891: 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;}
+@@ -29904,7 +29907,7 @@
+ ## Running config.status. ##
+ ## ----------------------- ##
+
+-This file was extended by $as_me 2.52.20231210, executed with
++This file was extended by $as_me 2.52.20240618, executed with
+ CONFIG_FILES = $CONFIG_FILES
+ CONFIG_HEADERS = $CONFIG_HEADERS
+ CONFIG_LINKS = $CONFIG_LINKS
+@@ -30015,7 +30018,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:30018: error: invalid argument: $ac_config_target" >&5
++ *) { { echo "$as_me:30021: error: invalid argument: $ac_config_target" >&5
+ echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
+ { (exit 1); exit 1; }; };;
+ esac
+@@ -30432,14 +30435,14 @@
+ # is no need to browse any of the substitutions).
+ # These are the two extra sed commands mentioned above.
+ (echo ':t
+- /@[a-zA-Z_][a-zA-Z_0-9]*@/!b' && cat "$tmp"/subs.frag) >"$tmp"/subs-$ac_sed_frag.sed
++ /@[a-zA-Z_][a-zA-Z_0-9]*@/!b' && sed -e 's/\\\\*$//g' -e 's/$/\\/' -e 's/;t t\\/;t t/' -e 't' -e '3,'$ac_max_sed_lines's/$/\\/' "$tmp"/subs.frag) >"$tmp"/subs-$ac_sed_frag.sed
+ # It is possible to make a multiline substitution using escaped newlines.
+ # Ensure that we do not split the substitution between script fragments.
+ ac_BEG=$ac_end
+ ac_END=`expr "$ac_end" + "$ac_max_sed_lines"`
+ sed "1,${ac_BEG}d; ${ac_END}p; q" "$tmp"/subs.sed >"$tmp"/subs.next
+ if test -s "$tmp"/subs.next; then
+- grep '^s,@[^@,][^@,]*@,.*\\$' "$tmp"/subs.next >"$tmp"/subs.edit
++ grep '^s,@[^@,][^@,]*@,.*$' "$tmp"/subs.next | grep -v '^s,@.*;t t$' >"$tmp"/subs.edit
+ if test ! -s "$tmp"/subs.edit; then
+ grep "^s,@[^@,][^@,]*@,.*,;t t$" "$tmp"/subs.next >"$tmp"/subs.edit
+ if test ! -s "$tmp"/subs.edit; then
+@@ -30537,7 +30540,7 @@
+ esac
+
+ if test x"$ac_file" != x-; then
+- { echo "$as_me:30540: creating $ac_file" >&5
++ { echo "$as_me:30543: creating $ac_file" >&5
+ echo "$as_me: creating $ac_file" >&6;}
+ rm -f "$ac_file"
+ fi
+@@ -30555,7 +30558,7 @@
+ -) echo "$tmp"/stdin ;;
+ [\\/$]*)
+ # Absolute (can't be DOS-style, as IFS=:)
+- test -f "$f" || { { echo "$as_me:30558: error: cannot find input file: $f" >&5
++ test -f "$f" || { { echo "$as_me:30561: error: cannot find input file: $f" >&5
+ echo "$as_me: error: cannot find input file: $f" >&2;}
+ { (exit 1); exit 1; }; }
+ echo "$f";;
+@@ -30568,7 +30571,7 @@
+ echo "$srcdir/$f"
+ else
+ # /dev/null tree
+- { { echo "$as_me:30571: error: cannot find input file: $f" >&5
++ { { echo "$as_me:30574: error: cannot find input file: $f" >&5
+ echo "$as_me: error: cannot find input file: $f" >&2;}
+ { (exit 1); exit 1; }; }
+ fi;;
+@@ -30584,7 +30587,7 @@
+ if test -n "$ac_seen"; then
+ ac_used=`grep '@datarootdir@' "$ac_item"`
+ if test -z "$ac_used"; then
+- { echo "$as_me:30587: WARNING: datarootdir was used implicitly but not set:
++ { echo "$as_me:30590: 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;}
+@@ -30593,7 +30596,7 @@
+ fi
+ ac_seen=`grep '${datarootdir}' "$ac_item"`
+ if test -n "$ac_seen"; then
+- { echo "$as_me:30596: WARNING: datarootdir was used explicitly but not set:
++ { echo "$as_me:30599: 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;}
+@@ -30638,7 +30641,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:30641: WARNING: Variable $ac_name is used but was not set:
++ { echo "$as_me:30644: 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;}
+@@ -30649,7 +30652,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:30652: WARNING: Some variables may not be substituted:
++ { echo "$as_me:30655: WARNING: Some variables may not be substituted:
+ $ac_seen" >&5
+ echo "$as_me: WARNING: Some variables may not be substituted:
+ $ac_seen" >&2;}
+@@ -30698,7 +30701,7 @@
+ * ) ac_file_in=$ac_file.in ;;
+ esac
+
+- test x"$ac_file" != x- && { echo "$as_me:30701: creating $ac_file" >&5
++ test x"$ac_file" != x- && { echo "$as_me:30704: creating $ac_file" >&5
+ echo "$as_me: creating $ac_file" >&6;}
+
+ # First look for the input files in the build tree, otherwise in the
+@@ -30709,7 +30712,7 @@
+ -) echo "$tmp"/stdin ;;
+ [\\/$]*)
+ # Absolute (can't be DOS-style, as IFS=:)
+- test -f "$f" || { { echo "$as_me:30712: error: cannot find input file: $f" >&5
++ test -f "$f" || { { echo "$as_me:30715: error: cannot find input file: $f" >&5
+ echo "$as_me: error: cannot find input file: $f" >&2;}
+ { (exit 1); exit 1; }; }
+ echo $f;;
+@@ -30722,7 +30725,7 @@
+ echo "$srcdir/$f"
+ else
+ # /dev/null tree
+- { { echo "$as_me:30725: error: cannot find input file: $f" >&5
++ { { echo "$as_me:30728: error: cannot find input file: $f" >&5
+ echo "$as_me: error: cannot find input file: $f" >&2;}
+ { (exit 1); exit 1; }; }
+ fi;;
+@@ -30780,7 +30783,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:30783: $ac_file is unchanged" >&5
++ { echo "$as_me:30786: $ac_file is unchanged" >&5
+ echo "$as_me: $ac_file is unchanged" >&6;}
+ else
+ ac_dir=`$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+@@ -31167,7 +31170,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}:31170: testing overriding CXX_MODEL to SHARED ..." 1>&5
++echo "${as_me:-configure}:31173: testing overriding CXX_MODEL to SHARED ..." 1>&5
+
+ with_shared_cxx=yes
+ ;;
+Index: dist.mk
+Prereq: 1.1620
+--- ncurses-6.5-20240629+/dist.mk 2024-06-29 10:00:32.000000000 +0000
++++ ncurses-6.5-20240706/dist.mk 2024-07-06 09:41:29.000000000 +0000
+@@ -26,7 +26,7 @@
+ # use or other dealings in this Software without prior written #
+ # authorization. #
+ ##############################################################################
+-# $Id: dist.mk,v 1.1620 2024/06/29 10:00:32 tom Exp $
++# $Id: dist.mk,v 1.1621 2024/07/06 09:41:29 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 = 20240629
++NCURSES_PATCH = 20240706
+
+ # We don't append the patch to the version, since this only applies to releases
+ VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR)
+Index: package/debian-mingw/changelog
+--- ncurses-6.5-20240629+/package/debian-mingw/changelog 2024-06-29 10:00:32.000000000 +0000
++++ ncurses-6.5-20240706/package/debian-mingw/changelog 2024-07-06 09:41:29.000000000 +0000
+@@ -1,8 +1,8 @@
+-ncurses6td (6.5+20240629) unstable; urgency=low
++ncurses6td (6.5+20240706) unstable; urgency=low
+
+ * latest weekly patch
+
+- -- Thomas E. Dickey <dickey@invisible-island.net> Sat, 29 Jun 2024 06:00:32 -0400
++ -- Thomas E. Dickey <dickey@invisible-island.net> Sat, 06 Jul 2024 05:41:29 -0400
+
+ ncurses6 (5.9+20131005) unstable; urgency=low
+
+Index: package/debian-mingw64/changelog
+--- ncurses-6.5-20240629+/package/debian-mingw64/changelog 2024-06-29 10:00:32.000000000 +0000
++++ ncurses-6.5-20240706/package/debian-mingw64/changelog 2024-07-06 09:41:29.000000000 +0000
+@@ -1,8 +1,8 @@
+-ncurses6td (6.5+20240629) unstable; urgency=low
++ncurses6td (6.5+20240706) unstable; urgency=low
+
+ * latest weekly patch
+
+- -- Thomas E. Dickey <dickey@invisible-island.net> Sat, 29 Jun 2024 06:00:32 -0400
++ -- Thomas E. Dickey <dickey@invisible-island.net> Sat, 06 Jul 2024 05:41:29 -0400
+
+ ncurses6 (5.9+20131005) unstable; urgency=low
+
+Index: package/debian/changelog
+--- ncurses-6.5-20240629+/package/debian/changelog 2024-06-29 10:00:32.000000000 +0000
++++ ncurses-6.5-20240706/package/debian/changelog 2024-07-06 09:41:29.000000000 +0000
+@@ -1,8 +1,8 @@
+-ncurses6td (6.5+20240629) unstable; urgency=low
++ncurses6td (6.5+20240706) unstable; urgency=low
+
+ * latest weekly patch
+
+- -- Thomas E. Dickey <dickey@invisible-island.net> Sat, 29 Jun 2024 06:00:32 -0400
++ -- Thomas E. Dickey <dickey@invisible-island.net> Sat, 06 Jul 2024 05:41:29 -0400
+
+ ncurses6 (5.9+20120608) unstable; urgency=low
+
+Index: package/mingw-ncurses.nsi
+Prereq: 1.655
+--- ncurses-6.5-20240629+/package/mingw-ncurses.nsi 2024-06-29 10:00:32.000000000 +0000
++++ ncurses-6.5-20240706/package/mingw-ncurses.nsi 2024-07-06 09:41:29.000000000 +0000
+@@ -1,4 +1,4 @@
+-; $Id: mingw-ncurses.nsi,v 1.655 2024/06/29 10:00:32 tom Exp $
++; $Id: mingw-ncurses.nsi,v 1.656 2024/07/06 09:41:29 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 "0629"
++!define VERSION_MMDD "0706"
+ !define VERSION_PATCH ${VERSION_YYYY}${VERSION_MMDD}
+
+ !define MY_ABI "5"
+Index: package/mingw-ncurses.spec
+--- ncurses-6.5-20240629+/package/mingw-ncurses.spec 2024-06-29 10:00:32.000000000 +0000
++++ ncurses-6.5-20240706/package/mingw-ncurses.spec 2024-07-06 09:41:29.000000000 +0000
+@@ -3,7 +3,7 @@
+ Summary: shared libraries for terminal handling
+ Name: mingw32-ncurses6
+ Version: 6.5
+-Release: 20240629
++Release: 20240706
+ License: X11
+ Group: Development/Libraries
+ URL: https://invisible-island.net/ncurses/
+Index: package/ncurses.spec
+--- ncurses-6.5-20240629+/package/ncurses.spec 2024-06-29 10:00:32.000000000 +0000
++++ ncurses-6.5-20240706/package/ncurses.spec 2024-07-06 09:41:29.000000000 +0000
+@@ -1,7 +1,7 @@
+ Summary: shared libraries for terminal handling
+ Name: ncurses6
+ Version: 6.5
+-Release: 20240629
++Release: 20240706
+ License: X11
+ Group: Development/Libraries
+ URL: https://invisible-island.net/ncurses/
+Index: package/ncursest.spec
+--- ncurses-6.5-20240629+/package/ncursest.spec 2024-06-29 10:00:32.000000000 +0000
++++ ncurses-6.5-20240706/package/ncursest.spec 2024-07-06 09:41:29.000000000 +0000
+@@ -1,7 +1,7 @@
+ Summary: Curses library with POSIX thread support.
+ Name: ncursest6
+ Version: 6.5
+-Release: 20240629
++Release: 20240706
+ License: X11
+ Group: Development/Libraries
+ Source: ncurses-%{version}-%{release}.tgz
+Index: test/aclocal.m4
+Prereq: 1.222
+--- ncurses-6.5-20240629+/test/aclocal.m4 2024-05-18 18:08:04.000000000 +0000
++++ ncurses-6.5-20240706/test/aclocal.m4 2024-07-06 18:05:00.000000000 +0000
+@@ -27,7 +27,7 @@
+ dnl authorization. *
+ dnl***************************************************************************
+ dnl
+-dnl $Id: aclocal.m4,v 1.222 2024/05/18 18:08:04 tom Exp $
++dnl $Id: aclocal.m4,v 1.223 2024/07/06 18:05:00 tom Exp $
+ dnl
+ dnl Author: Thomas E. Dickey
+ dnl
+@@ -901,15 +901,22 @@
+ CF_TERM_HEADER
+ ])dnl
+ dnl ---------------------------------------------------------------------------
+-dnl CF_CURSES_FUNCS version: 20 updated: 2020/12/31 20:19:42
++dnl CF_CURSES_FUNCS version: 21 updated: 2024/06/11 20:24:35
+ dnl ---------------
+ dnl Curses-functions are a little complicated, since a lot of them are macros.
++dnl
++dnl $1 is a list of functions to test
+ AC_DEFUN([CF_CURSES_FUNCS],
+ [
+ AC_REQUIRE([CF_CURSES_CPPFLAGS])dnl
+ AC_REQUIRE([CF_XOPEN_CURSES])
+ AC_REQUIRE([CF_CURSES_TERM_H])
+ AC_REQUIRE([CF_CURSES_UNCTRL_H])
++
++AC_FOREACH([AC_Func], [$1],
++ [AH_TEMPLATE(AS_TR_CPP(HAVE_[]AC_Func),
++ [Define if you have the `]AC_Func[' function.])])dnl
++
+ for cf_func in $1
+ do
+ CF_UPPER(cf_tr_func,$cf_func)
+@@ -3076,13 +3083,12 @@
+ AC_DEFINE_UNQUOTED($cf_nculib_ROOT)
+ ])dnl
+ dnl ---------------------------------------------------------------------------
+-dnl CF_NCURSES_PTHREADS version: 2 updated: 2016/04/22 05:07:41
++dnl CF_NCURSES_PTHREADS version: 3 updated: 2024/07/06 13:57:42
+ dnl -------------------
+-dnl Use this followup check to ensure that we link with pthreads if ncurses
+-dnl uses it.
++dnl Use this followup check, e.g., in CF_WITH_NCURSES_ETC, to ensure that we
++dnl link with pthreads if ncurses uses it.
+ AC_DEFUN([CF_NCURSES_PTHREADS],[
+-: ${cf_nculib_root:=ifelse($1,,ncurses,$1)}
+-AC_CHECK_LIB($cf_nculib_root,_nc_init_pthreads,
++AC_CHECK_FUNC(_nc_init_pthreads,
+ cf_cv_ncurses_pthreads=yes,
+ cf_cv_ncurses_pthreads=no)
+ if test "$cf_cv_ncurses_pthreads" = yes
+Index: test/configure
+--- ncurses-6.5-20240629+/test/configure 2024-05-18 18:08:31.000000000 +0000
++++ ncurses-6.5-20240706/test/configure 2024-07-06 18:05:23.000000000 +0000
+@@ -1,6 +1,6 @@
+ #! /bin/sh
+ # Guess values for system-dependent variables and create Makefiles.
+-# Generated by Autoconf 2.52.20231210.
++# Generated by Autoconf 2.52.20240618.
+ #
+ # Copyright 2003-2022,2023 Thomas E. Dickey
+ # Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001
+@@ -480,6 +480,10 @@
+ | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
+ x_libraries=$ac_optarg ;;
+
++ -*dir | -dvi* | -doc* | -html* | -local* | -pdf* | -ps* )
++ echo "$as_me: WARNING: unsupported option: $ac_option" >&2
++ ;;
++
+ -*) { echo "$as_me: error: unrecognized option: $ac_option
+ Try \`$0 --help' for more information." >&2
+ { (exit 1); exit 1; }; }
+@@ -809,7 +813,7 @@
+ running configure, to aid debugging if configure makes a mistake.
+
+ It was created by $as_me, which was
+-generated by GNU Autoconf 2.52.20231210. Invocation command line was
++generated by GNU Autoconf 2.52.20240618. Invocation command line was
+
+ $ $0 $@
+
+@@ -933,7 +937,7 @@
+ fi
+ for ac_site_file in $CONFIG_SITE; do
+ if test -r "$ac_site_file"; then
+- { echo "$as_me:936: loading site script $ac_site_file" >&5
++ { echo "$as_me:940: 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"
+@@ -944,7 +948,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:947: loading cache $cache_file" >&5
++ { echo "$as_me:951: loading cache $cache_file" >&5
+ echo "$as_me: loading cache $cache_file" >&6;}
+ case $cache_file in
+ [\\/]* | ?:[\\/]* ) . $cache_file;;
+@@ -952,7 +956,7 @@
+ esac
+ fi
+ else
+- { echo "$as_me:955: creating cache $cache_file" >&5
++ { echo "$as_me:959: creating cache $cache_file" >&5
+ echo "$as_me: creating cache $cache_file" >&6;}
+ >$cache_file
+ fi
+@@ -968,21 +972,21 @@
+ eval ac_new_val="\$ac_env_${ac_var}_value"
+ case "$ac_old_set,$ac_new_set" in
+ set,)
+- { echo "$as_me:971: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
++ { echo "$as_me:975: 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:975: error: \`$ac_var' was not set in the previous run" >&5
++ { echo "$as_me:979: 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:981: error: \`$ac_var' has changed since the previous run:" >&5
++ { echo "$as_me:985: 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:983: former value: $ac_old_val" >&5
++ { echo "$as_me:987: former value: $ac_old_val" >&5
+ echo "$as_me: former value: $ac_old_val" >&2;}
+- { echo "$as_me:985: current value: $ac_new_val" >&5
++ { echo "$as_me:989: current value: $ac_new_val" >&5
+ echo "$as_me: current value: $ac_new_val" >&2;}
+ ac_cache_corrupted=:
+ fi;;
+@@ -1001,9 +1005,9 @@
+ fi
+ done
+ if "$ac_cache_corrupted"; then
+- { echo "$as_me:1004: error: changes in the environment can compromise the build" >&5
++ { echo "$as_me:1008: 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:1006: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5
++ { { echo "$as_me:1010: 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
+@@ -1032,10 +1036,10 @@
+ echo "#! $SHELL" >conftest.sh
+ echo "exit 0" >>conftest.sh
+ chmod +x conftest.sh
+-if { (echo "$as_me:1035: PATH=\".;.\"; conftest.sh") >&5
++if { (echo "$as_me:1039: PATH=\".;.\"; conftest.sh") >&5
+ (PATH=".;."; conftest.sh) 2>&5
+ ac_status=$?
+- echo "$as_me:1038: \$? = $ac_status" >&5
++ echo "$as_me:1042: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; then
+ ac_path_separator=';'
+ else
+@@ -1067,7 +1071,7 @@
+ fi
+ done
+ if test -z "$ac_aux_dir"; then
+- { { echo "$as_me:1070: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&5
++ { { echo "$as_me:1074: 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
+@@ -1077,11 +1081,11 @@
+
+ # Make sure we can run config.sub.
+ $ac_config_sub sun4 >/dev/null 2>&1 ||
+- { { echo "$as_me:1080: error: cannot run $ac_config_sub" >&5
++ { { echo "$as_me:1084: error: cannot run $ac_config_sub" >&5
+ echo "$as_me: error: cannot run $ac_config_sub" >&2;}
+ { (exit 1); exit 1; }; }
+
+-echo "$as_me:1084: checking build system type" >&5
++echo "$as_me:1088: 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
+@@ -1090,16 +1094,16 @@
+ test -z "$ac_cv_build_alias" &&
+ ac_cv_build_alias=`$ac_config_guess`
+ test -z "$ac_cv_build_alias" &&
+- { { echo "$as_me:1093: error: cannot guess build type; you must specify one" >&5
++ { { echo "$as_me:1097: 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:1097: error: $ac_config_sub $ac_cv_build_alias failed." >&5
++ { { echo "$as_me:1101: 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:1102: result: $ac_cv_build" >&5
++echo "$as_me:1106: 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/'`
+@@ -1107,7 +1111,7 @@
+ build_os=`echo "$ac_cv_build" | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
+
+ if test -f "$srcdir/config.guess" || test -f "$ac_aux_dir/config.guess" ; then
+- echo "$as_me:1110: checking host system type" >&5
++ echo "$as_me:1114: 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 +1120,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:1123: 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:1128: 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,13 +1151,13 @@
+ fi
+
+ test -z "$system_name" && system_name="$cf_cv_system_name"
+-test -n "$cf_cv_system_name" && echo "$as_me:1150: result: Configuring for $cf_cv_system_name" >&5
++test -n "$cf_cv_system_name" && echo "$as_me:1154: 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:1154: result: Cached system name ($system_name) does not agree with actual ($cf_cv_system_name)" >&5
++ echo "$as_me:1158: 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:1156: error: \"Please remove config.cache and try again.\"" >&5
++ { { echo "$as_me:1160: 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
+@@ -1171,7 +1175,7 @@
+ program_transform_name=`echo $program_transform_name | sed -f conftest.sed`
+ rm conftest.sed
+
+-echo "$as_me:1174: checking whether ${MAKE-make} sets \${MAKE}" >&5
++echo "$as_me:1178: 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
+@@ -1191,11 +1195,11 @@
+ rm -f conftest.make
+ fi
+ if eval "test \"`echo '$ac_cv_prog_make_'${ac_make}_set`\" = yes"; then
+- echo "$as_me:1194: result: yes" >&5
++ echo "$as_me:1198: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ SET_MAKE=
+ else
+- echo "$as_me:1198: result: no" >&5
++ echo "$as_me:1202: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ SET_MAKE="MAKE=${MAKE-make}"
+ fi
+@@ -1209,7 +1213,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:1212: checking for $ac_word" >&5
++echo "$as_me:1216: 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
+@@ -1224,7 +1228,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:1227: found $ac_dir/$ac_word" >&5
++echo "$as_me:1231: found $ac_dir/$ac_word" >&5
+ break
+ done
+
+@@ -1232,10 +1236,10 @@
+ fi
+ CC=$ac_cv_prog_CC
+ if test -n "$CC"; then
+- echo "$as_me:1235: result: $CC" >&5
++ echo "$as_me:1239: result: $CC" >&5
+ echo "${ECHO_T}$CC" >&6
+ else
+- echo "$as_me:1238: result: no" >&5
++ echo "$as_me:1242: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+
+@@ -1244,7 +1248,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:1247: checking for $ac_word" >&5
++echo "$as_me:1251: 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
+@@ -1259,7 +1263,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:1262: found $ac_dir/$ac_word" >&5
++echo "$as_me:1266: found $ac_dir/$ac_word" >&5
+ break
+ done
+
+@@ -1267,10 +1271,10 @@
+ fi
+ ac_ct_CC=$ac_cv_prog_ac_ct_CC
+ if test -n "$ac_ct_CC"; then
+- echo "$as_me:1270: result: $ac_ct_CC" >&5
++ echo "$as_me:1274: result: $ac_ct_CC" >&5
+ echo "${ECHO_T}$ac_ct_CC" >&6
+ else
+- echo "$as_me:1273: result: no" >&5
++ echo "$as_me:1277: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+
+@@ -1283,7 +1287,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:1286: checking for $ac_word" >&5
++echo "$as_me:1290: 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
+@@ -1298,7 +1302,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:1301: found $ac_dir/$ac_word" >&5
++echo "$as_me:1305: found $ac_dir/$ac_word" >&5
+ break
+ done
+
+@@ -1306,10 +1310,10 @@
+ fi
+ CC=$ac_cv_prog_CC
+ if test -n "$CC"; then
+- echo "$as_me:1309: result: $CC" >&5
++ echo "$as_me:1313: result: $CC" >&5
+ echo "${ECHO_T}$CC" >&6
+ else
+- echo "$as_me:1312: result: no" >&5
++ echo "$as_me:1316: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+
+@@ -1318,7 +1322,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:1321: checking for $ac_word" >&5
++echo "$as_me:1325: 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
+@@ -1333,7 +1337,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:1336: found $ac_dir/$ac_word" >&5
++echo "$as_me:1340: found $ac_dir/$ac_word" >&5
+ break
+ done
+
+@@ -1341,10 +1345,10 @@
+ fi
+ ac_ct_CC=$ac_cv_prog_ac_ct_CC
+ if test -n "$ac_ct_CC"; then
+- echo "$as_me:1344: result: $ac_ct_CC" >&5
++ echo "$as_me:1348: result: $ac_ct_CC" >&5
+ echo "${ECHO_T}$ac_ct_CC" >&6
+ else
+- echo "$as_me:1347: result: no" >&5
++ echo "$as_me:1351: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+
+@@ -1357,7 +1361,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:1360: checking for $ac_word" >&5
++echo "$as_me:1364: 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
+@@ -1377,7 +1381,7 @@
+ continue
+ fi
+ ac_cv_prog_CC="cc"
+-echo "$as_me:1380: found $ac_dir/$ac_word" >&5
++echo "$as_me:1384: found $ac_dir/$ac_word" >&5
+ break
+ done
+
+@@ -1399,10 +1403,10 @@
+ fi
+ CC=$ac_cv_prog_CC
+ if test -n "$CC"; then
+- echo "$as_me:1402: result: $CC" >&5
++ echo "$as_me:1406: result: $CC" >&5
+ echo "${ECHO_T}$CC" >&6
+ else
+- echo "$as_me:1405: result: no" >&5
++ echo "$as_me:1409: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+
+@@ -1413,7 +1417,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:1416: checking for $ac_word" >&5
++echo "$as_me:1420: 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
+@@ -1428,7 +1432,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:1431: found $ac_dir/$ac_word" >&5
++echo "$as_me:1435: found $ac_dir/$ac_word" >&5
+ break
+ done
+
+@@ -1436,10 +1440,10 @@
+ fi
+ CC=$ac_cv_prog_CC
+ if test -n "$CC"; then
+- echo "$as_me:1439: result: $CC" >&5
++ echo "$as_me:1443: result: $CC" >&5
+ echo "${ECHO_T}$CC" >&6
+ else
+- echo "$as_me:1442: result: no" >&5
++ echo "$as_me:1446: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+
+@@ -1452,7 +1456,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:1455: checking for $ac_word" >&5
++echo "$as_me:1459: 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
+@@ -1467,7 +1471,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:1470: found $ac_dir/$ac_word" >&5
++echo "$as_me:1474: found $ac_dir/$ac_word" >&5
+ break
+ done
+
+@@ -1475,10 +1479,10 @@
+ fi
+ ac_ct_CC=$ac_cv_prog_ac_ct_CC
+ if test -n "$ac_ct_CC"; then
+- echo "$as_me:1478: result: $ac_ct_CC" >&5
++ echo "$as_me:1482: result: $ac_ct_CC" >&5
+ echo "${ECHO_T}$ac_ct_CC" >&6
+ else
+- echo "$as_me:1481: result: no" >&5
++ echo "$as_me:1485: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+
+@@ -1490,32 +1494,32 @@
+
+ fi
+
+-test -z "$CC" && { { echo "$as_me:1493: error: no acceptable cc found in \$PATH" >&5
++test -z "$CC" && { { echo "$as_me:1497: 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:1498:" \
++echo "$as_me:1502:" \
+ "checking for C compiler version" >&5
+ ac_compiler=`set X $ac_compile; echo "$2"`
+-{ (eval echo "$as_me:1501: \"$ac_compiler --version </dev/null >&5\"") >&5
++{ (eval echo "$as_me:1505: \"$ac_compiler --version </dev/null >&5\"") >&5
+ (eval $ac_compiler --version </dev/null >&5) 2>&5
+ ac_status=$?
+- echo "$as_me:1504: \$? = $ac_status" >&5
++ echo "$as_me:1508: \$? = $ac_status" >&5
+ (exit "$ac_status"); }
+-{ (eval echo "$as_me:1506: \"$ac_compiler -v </dev/null >&5\"") >&5
++{ (eval echo "$as_me:1510: \"$ac_compiler -v </dev/null >&5\"") >&5
+ (eval $ac_compiler -v </dev/null >&5) 2>&5
+ ac_status=$?
+- echo "$as_me:1509: \$? = $ac_status" >&5
++ echo "$as_me:1513: \$? = $ac_status" >&5
+ (exit "$ac_status"); }
+-{ (eval echo "$as_me:1511: \"$ac_compiler -V </dev/null >&5\"") >&5
++{ (eval echo "$as_me:1515: \"$ac_compiler -V </dev/null >&5\"") >&5
+ (eval $ac_compiler -V </dev/null >&5) 2>&5
+ ac_status=$?
+- echo "$as_me:1514: \$? = $ac_status" >&5
++ echo "$as_me:1518: \$? = $ac_status" >&5
+ (exit "$ac_status"); }
+
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 1518 "configure"
++#line 1522 "configure"
+ #include "confdefs.h"
+
+ int
+@@ -1531,13 +1535,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:1534: checking for C compiler default output" >&5
++echo "$as_me:1538: 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:1537: \"$ac_link_default\"") >&5
++if { (eval echo "$as_me:1541: \"$ac_link_default\"") >&5
+ (eval $ac_link_default) 2>&5
+ ac_status=$?
+- echo "$as_me:1540: \$? = $ac_status" >&5
++ echo "$as_me:1544: \$? = $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
+@@ -1560,34 +1564,34 @@
+ else
+ echo "$as_me: failed program was:" >&5
+ cat "conftest.$ac_ext" >&5
+-{ { echo "$as_me:1563: error: C compiler cannot create executables" >&5
++{ { echo "$as_me:1567: 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:1569: result: $ac_file" >&5
++echo "$as_me:1573: 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:1574: checking whether the C compiler works" >&5
++echo "$as_me:1578: 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:1580: \"$ac_try\"") >&5
++ { (eval echo "$as_me:1584: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:1583: \$? = $ac_status" >&5
++ echo "$as_me:1587: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cross_compiling=no
+ else
+ if test "$cross_compiling" = maybe; then
+ cross_compiling=yes
+ else
+- { { echo "$as_me:1590: error: cannot run C compiled programs.
++ { { echo "$as_me:1594: 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;}
+@@ -1595,24 +1599,24 @@
+ fi
+ fi
+ fi
+-echo "$as_me:1598: result: yes" >&5
++echo "$as_me:1602: 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:1605: checking whether we are cross compiling" >&5
++echo "$as_me:1609: checking whether we are cross compiling" >&5
+ echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6
+-echo "$as_me:1607: result: $cross_compiling" >&5
++echo "$as_me:1611: result: $cross_compiling" >&5
+ echo "${ECHO_T}$cross_compiling" >&6
+
+-echo "$as_me:1610: checking for executable suffix" >&5
++echo "$as_me:1614: checking for executable suffix" >&5
+ echo $ECHO_N "checking for executable suffix... $ECHO_C" >&6
+-if { (eval echo "$as_me:1612: \"$ac_link\"") >&5
++if { (eval echo "$as_me:1616: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:1615: \$? = $ac_status" >&5
++ echo "$as_me:1619: \$? = $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
+@@ -1628,25 +1632,25 @@
+ esac
+ done
+ else
+- { { echo "$as_me:1631: error: cannot compute EXEEXT: cannot compile and link" >&5
++ { { echo "$as_me:1635: 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:1637: result: $ac_cv_exeext" >&5
++echo "$as_me:1641: 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:1643: checking for object suffix" >&5
++echo "$as_me:1647: 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 1649 "configure"
++#line 1653 "configure"
+ #include "confdefs.h"
+
+ int
+@@ -1658,10 +1662,10 @@
+ }
+ _ACEOF
+ rm -f conftest.o conftest.obj
+-if { (eval echo "$as_me:1661: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:1665: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:1664: \$? = $ac_status" >&5
++ echo "$as_me:1668: \$? = $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
+@@ -1673,24 +1677,24 @@
+ else
+ echo "$as_me: failed program was:" >&5
+ cat "conftest.$ac_ext" >&5
+-{ { echo "$as_me:1676: error: cannot compute OBJEXT: cannot compile" >&5
++{ { echo "$as_me:1680: 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:1683: result: $ac_cv_objext" >&5
++echo "$as_me:1687: result: $ac_cv_objext" >&5
+ echo "${ECHO_T}$ac_cv_objext" >&6
+ OBJEXT=$ac_cv_objext
+ ac_objext=$OBJEXT
+-echo "$as_me:1687: checking whether we are using the GNU C compiler" >&5
++echo "$as_me:1691: 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 1693 "configure"
++#line 1697 "configure"
+ #include "confdefs.h"
+
+ int
+@@ -1705,16 +1709,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:1708: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:1712: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:1711: \$? = $ac_status" >&5
++ echo "$as_me:1715: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:1714: \"$ac_try\"") >&5
++ { (eval echo "$as_me:1718: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:1717: \$? = $ac_status" >&5
++ echo "$as_me:1721: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_compiler_gnu=yes
+ else
+@@ -1726,19 +1730,19 @@
+ ac_cv_c_compiler_gnu=$ac_compiler_gnu
+
+ fi
+-echo "$as_me:1729: result: $ac_cv_c_compiler_gnu" >&5
++echo "$as_me:1733: 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:1735: checking whether $CC accepts -g" >&5
++echo "$as_me:1739: 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 1741 "configure"
++#line 1745 "configure"
+ #include "confdefs.h"
+
+ int
+@@ -1750,16 +1754,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:1753: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:1757: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:1756: \$? = $ac_status" >&5
++ echo "$as_me:1760: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:1759: \"$ac_try\"") >&5
++ { (eval echo "$as_me:1763: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:1762: \$? = $ac_status" >&5
++ echo "$as_me:1766: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_prog_cc_g=yes
+ else
+@@ -1769,7 +1773,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:1772: result: $ac_cv_prog_cc_g" >&5
++echo "$as_me:1776: 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
+@@ -1796,16 +1800,16 @@
+ #endif
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:1799: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:1803: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:1802: \$? = $ac_status" >&5
++ echo "$as_me:1806: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:1805: \"$ac_try\"") >&5
++ { (eval echo "$as_me:1809: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:1808: \$? = $ac_status" >&5
++ echo "$as_me:1812: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ for ac_declaration in \
+ ''\
+@@ -1817,7 +1821,7 @@
+ 'void exit (int);'
+ do
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 1820 "configure"
++#line 1824 "configure"
+ #include "confdefs.h"
+ #include <stdlib.h>
+ $ac_declaration
+@@ -1830,16 +1834,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:1833: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:1837: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:1836: \$? = $ac_status" >&5
++ echo "$as_me:1840: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:1839: \"$ac_try\"") >&5
++ { (eval echo "$as_me:1843: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:1842: \$? = $ac_status" >&5
++ echo "$as_me:1846: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ :
+ else
+@@ -1849,7 +1853,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 1852 "configure"
++#line 1856 "configure"
+ #include "confdefs.h"
+ $ac_declaration
+ int
+@@ -1861,16 +1865,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:1864: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:1868: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:1867: \$? = $ac_status" >&5
++ echo "$as_me:1871: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:1870: \"$ac_try\"") >&5
++ { (eval echo "$as_me:1874: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:1873: \$? = $ac_status" >&5
++ echo "$as_me:1877: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ break
+ else
+@@ -1900,11 +1904,11 @@
+
+ GCC_VERSION=none
+ if test "$GCC" = yes ; then
+- echo "$as_me:1903: checking version of $CC" >&5
++ echo "$as_me:1907: 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:1907: result: $GCC_VERSION" >&5
++ echo "$as_me:1911: result: $GCC_VERSION" >&5
+ echo "${ECHO_T}$GCC_VERSION" >&6
+ fi
+
+@@ -1913,12 +1917,12 @@
+ if test "$GCC" = yes ; then
+ case "$host_os" in
+ (linux*|gnu*)
+- echo "$as_me:1916: checking if this is really Intel C compiler" >&5
++ echo "$as_me:1920: 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 1921 "configure"
++#line 1925 "configure"
+ #include "confdefs.h"
+
+ int
+@@ -1935,16 +1939,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:1938: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:1942: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:1941: \$? = $ac_status" >&5
++ echo "$as_me:1945: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:1944: \"$ac_try\"") >&5
++ { (eval echo "$as_me:1948: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:1947: \$? = $ac_status" >&5
++ echo "$as_me:1951: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ INTEL_COMPILER=yes
+ cf_save_CFLAGS="$cf_save_CFLAGS -we147"
+@@ -1955,7 +1959,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ CFLAGS="$cf_save_CFLAGS"
+- echo "$as_me:1958: result: $INTEL_COMPILER" >&5
++ echo "$as_me:1962: result: $INTEL_COMPILER" >&5
+ echo "${ECHO_T}$INTEL_COMPILER" >&6
+ ;;
+ esac
+@@ -1964,11 +1968,11 @@
+ CLANG_COMPILER=no
+
+ if test "$GCC" = yes ; then
+- echo "$as_me:1967: checking if this is really Clang C compiler" >&5
++ echo "$as_me:1971: 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 1971 "configure"
++#line 1975 "configure"
+ #include "confdefs.h"
+
+ int
+@@ -1985,16 +1989,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:1988: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:1992: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:1991: \$? = $ac_status" >&5
++ echo "$as_me:1995: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:1994: \"$ac_try\"") >&5
++ { (eval echo "$as_me:1998: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:1997: \$? = $ac_status" >&5
++ echo "$as_me:2001: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ CLANG_COMPILER=yes
+
+@@ -2004,7 +2008,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ CFLAGS="$cf_save_CFLAGS"
+- echo "$as_me:2007: result: $CLANG_COMPILER" >&5
++ echo "$as_me:2011: result: $CLANG_COMPILER" >&5
+ echo "${ECHO_T}$CLANG_COMPILER" >&6
+ fi
+
+@@ -2013,30 +2017,30 @@
+ if test "x$CLANG_COMPILER" = "xyes" ; then
+ case "$CC" in
+ (c[1-9][0-9]|*/c[1-9][0-9])
+- { echo "$as_me:2016: WARNING: replacing broken compiler alias $CC" >&5
++ { echo "$as_me:2020: 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:2023: checking version of $CC" >&5
++ echo "$as_me:2027: 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:2027: result: $CLANG_VERSION" >&5
++ echo "$as_me:2031: 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:2034: checking if option $cf_clang_opt works" >&5
++ echo "$as_me:2038: 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 2039 "configure"
++#line 2043 "configure"
+ #include "confdefs.h"
+
+ #include <stdio.h>
+@@ -2050,16 +2054,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:2053: \"$ac_link\"") >&5
++if { (eval echo "$as_me:2057: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:2056: \$? = $ac_status" >&5
++ echo "$as_me:2060: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:2059: \"$ac_try\"") >&5
++ { (eval echo "$as_me:2063: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:2062: \$? = $ac_status" >&5
++ echo "$as_me:2066: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+
+ cf_clang_optok=yes
+@@ -2070,13 +2074,13 @@
+ cf_clang_optok=no
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+- echo "$as_me:2073: result: $cf_clang_optok" >&5
++ echo "$as_me:2077: 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}:2079: testing adding option $cf_clang_opt ..." 1>&5
++echo "${as_me:-configure}:2083: testing adding option $cf_clang_opt ..." 1>&5
+
+ test -n "$CFLAGS" && CFLAGS="$CFLAGS "
+ CFLAGS="${CFLAGS}$cf_clang_opt"
+@@ -2085,7 +2089,7 @@
+ done
+ fi
+
+-echo "$as_me:2088: checking for $CC option to accept ANSI C" >&5
++echo "$as_me:2092: 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
+@@ -2093,7 +2097,7 @@
+ ac_cv_prog_cc_stdc=no
+ ac_save_CC=$CC
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 2096 "configure"
++#line 2100 "configure"
+ #include "confdefs.h"
+ #include <stdarg.h>
+ #include <stdio.h>
+@@ -2140,16 +2144,16 @@
+ do
+ CC="$ac_save_CC $ac_arg"
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:2143: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:2147: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:2146: \$? = $ac_status" >&5
++ echo "$as_me:2150: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:2149: \"$ac_try\"") >&5
++ { (eval echo "$as_me:2153: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:2152: \$? = $ac_status" >&5
++ echo "$as_me:2156: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_prog_cc_stdc=$ac_arg
+ break
+@@ -2166,10 +2170,10 @@
+
+ case "x$ac_cv_prog_cc_stdc" in
+ x|xno)
+- echo "$as_me:2169: result: none needed" >&5
++ echo "$as_me:2173: result: none needed" >&5
+ echo "${ECHO_T}none needed" >&6 ;;
+ *)
+- echo "$as_me:2172: result: $ac_cv_prog_cc_stdc" >&5
++ echo "$as_me:2176: result: $ac_cv_prog_cc_stdc" >&5
+ echo "${ECHO_T}$ac_cv_prog_cc_stdc" >&6
+ CC="$CC $ac_cv_prog_cc_stdc" ;;
+ esac
+@@ -2177,13 +2181,13 @@
+ # This should have been defined by AC_PROG_CC
+ : "${CC:=cc}"
+
+-echo "$as_me:2180: checking \$CFLAGS variable" >&5
++echo "$as_me:2184: checking \$CFLAGS variable" >&5
+ echo $ECHO_N "checking \$CFLAGS variable... $ECHO_C" >&6
+ case "x$CFLAGS" in
+ (*-[IUD]*)
+- echo "$as_me:2184: result: broken" >&5
++ echo "$as_me:2188: result: broken" >&5
+ echo "${ECHO_T}broken" >&6
+- { echo "$as_me:2186: WARNING: your environment uses the CFLAGS variable to hold CPPFLAGS options" >&5
++ { echo "$as_me:2190: 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=
+@@ -2291,18 +2295,18 @@
+ done
+ ;;
+ (*)
+- echo "$as_me:2294: result: ok" >&5
++ echo "$as_me:2298: result: ok" >&5
+ echo "${ECHO_T}ok" >&6
+ ;;
+ esac
+
+-echo "$as_me:2299: checking \$CC variable" >&5
++echo "$as_me:2303: checking \$CC variable" >&5
+ echo $ECHO_N "checking \$CC variable... $ECHO_C" >&6
+ case "$CC" in
+ (*[\ \ ]-*)
+- echo "$as_me:2303: result: broken" >&5
++ echo "$as_me:2307: result: broken" >&5
+ echo "${ECHO_T}broken" >&6
+- { echo "$as_me:2305: WARNING: your environment uses the CC variable to hold CFLAGS/CPPFLAGS options" >&5
++ { echo "$as_me:2309: 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/[ ]*[ ]-[^ ].*//'`
+@@ -2419,24 +2423,24 @@
+ done
+ test -n "$verbose" && echo " resulting CC: '$CC'" 1>&6
+
+-echo "${as_me:-configure}:2422: testing resulting CC: '$CC' ..." 1>&5
++echo "${as_me:-configure}:2426: testing resulting CC: '$CC' ..." 1>&5
+
+ test -n "$verbose" && echo " resulting CFLAGS: '$CFLAGS'" 1>&6
+
+-echo "${as_me:-configure}:2426: testing resulting CFLAGS: '$CFLAGS' ..." 1>&5
++echo "${as_me:-configure}:2430: testing resulting CFLAGS: '$CFLAGS' ..." 1>&5
+
+ test -n "$verbose" && echo " resulting CPPFLAGS: '$CPPFLAGS'" 1>&6
+
+-echo "${as_me:-configure}:2430: testing resulting CPPFLAGS: '$CPPFLAGS' ..." 1>&5
++echo "${as_me:-configure}:2434: testing resulting CPPFLAGS: '$CPPFLAGS' ..." 1>&5
+
+ ;;
+ (*)
+- echo "$as_me:2434: result: ok" >&5
++ echo "$as_me:2438: result: ok" >&5
+ echo "${ECHO_T}ok" >&6
+ ;;
+ esac
+
+-echo "$as_me:2439: checking for inline" >&5
++echo "$as_me:2443: 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
+@@ -2444,7 +2448,7 @@
+ ac_cv_c_inline=no
+ for ac_kw in inline __inline__ __inline; do
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 2447 "configure"
++#line 2451 "configure"
+ #include "confdefs.h"
+ #ifndef __cplusplus
+ static $ac_kw int static_foo (void) {return 0; }
+@@ -2453,16 +2457,16 @@
+
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:2456: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:2460: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:2459: \$? = $ac_status" >&5
++ echo "$as_me:2463: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:2462: \"$ac_try\"") >&5
++ { (eval echo "$as_me:2466: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:2465: \$? = $ac_status" >&5
++ echo "$as_me:2469: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_c_inline=$ac_kw; break
+ else
+@@ -2473,7 +2477,7 @@
+ done
+
+ fi
+-echo "$as_me:2476: result: $ac_cv_c_inline" >&5
++echo "$as_me:2480: result: $ac_cv_c_inline" >&5
+ echo "${ECHO_T}$ac_cv_c_inline" >&6
+ case $ac_cv_c_inline in
+ inline | yes) ;;
+@@ -2492,7 +2496,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:2495: checking for $ac_word" >&5
++echo "$as_me:2499: 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
+@@ -2507,7 +2511,7 @@
+ test -z "$ac_dir" && ac_dir=.
+ $as_executable_p "$ac_dir/$ac_word" || continue
+ ac_cv_prog_GREP="$ac_prog"
+-echo "$as_me:2510: found $ac_dir/$ac_word" >&5
++echo "$as_me:2514: found $ac_dir/$ac_word" >&5
+ break
+ done
+
+@@ -2515,10 +2519,10 @@
+ fi
+ GREP=$ac_cv_prog_GREP
+ if test -n "$GREP"; then
+- echo "$as_me:2518: result: $GREP" >&5
++ echo "$as_me:2522: result: $GREP" >&5
+ echo "${ECHO_T}$GREP" >&6
+ else
+- echo "$as_me:2521: result: no" >&5
++ echo "$as_me:2525: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+
+@@ -2526,7 +2530,7 @@
+ done
+ test -n "$GREP" || GREP=": "
+
+-echo "$as_me:2529: checking for egrep" >&5
++echo "$as_me:2533: 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
+@@ -2538,7 +2542,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:2541: checking for $ac_word" >&5
++echo "$as_me:2545: 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
+@@ -2555,7 +2559,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:2558: found $ac_dir/$ac_word" >&5
++ echo "$as_me:2562: found $ac_dir/$ac_word" >&5
+ break
+ fi
+ done
+@@ -2566,10 +2570,10 @@
+ EGREP=$ac_cv_path_EGREP
+
+ if test -n "$EGREP"; then
+- echo "$as_me:2569: result: $EGREP" >&5
++ echo "$as_me:2573: result: $EGREP" >&5
+ echo "${ECHO_T}$EGREP" >&6
+ else
+- echo "$as_me:2572: result: no" >&5
++ echo "$as_me:2576: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+
+@@ -2577,12 +2581,12 @@
+ done
+ test -n "$EGREP" || EGREP=": "
+
+- test "x$ac_cv_path_EGREP" = "x:" && { { echo "$as_me:2580: error: cannot find workable egrep" >&5
++ test "x$ac_cv_path_EGREP" = "x:" && { { echo "$as_me:2584: error: cannot find workable egrep" >&5
+ echo "$as_me: error: cannot find workable egrep" >&2;}
+ { (exit 1); exit 1; }; }
+ fi
+ fi
+-echo "$as_me:2585: result: $ac_cv_path_EGREP" >&5
++echo "$as_me:2589: result: $ac_cv_path_EGREP" >&5
+ echo "${ECHO_T}$ac_cv_path_EGREP" >&6
+ EGREP="$ac_cv_path_EGREP"
+
+@@ -2592,7 +2596,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:2595: checking how to run the C preprocessor" >&5
++echo "$as_me:2599: 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
+@@ -2613,18 +2617,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 2616 "configure"
++#line 2620 "configure"
+ #include "confdefs.h"
+ #include <assert.h>
+ Syntax error
+ _ACEOF
+-if { (eval echo "$as_me:2621: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:2625: \"$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:2627: \$? = $ac_status" >&5
++ echo "$as_me:2631: \$? = $ac_status" >&5
+ (exit "$ac_status"); } >/dev/null; then
+ if test -s conftest.err; then
+ ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -2647,17 +2651,17 @@
+ # OK, works on sane cases. Now check whether non-existent headers
+ # can be detected and how.
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 2650 "configure"
++#line 2654 "configure"
+ #include "confdefs.h"
+ #include <ac_nonexistent.h>
+ _ACEOF
+-if { (eval echo "$as_me:2654: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:2658: \"$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:2660: \$? = $ac_status" >&5
++ echo "$as_me:2664: \$? = $ac_status" >&5
+ (exit "$ac_status"); } >/dev/null; then
+ if test -s conftest.err; then
+ ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -2694,7 +2698,7 @@
+ else
+ ac_cv_prog_CPP=$CPP
+ fi
+-echo "$as_me:2697: result: $CPP" >&5
++echo "$as_me:2701: result: $CPP" >&5
+ echo "${ECHO_T}$CPP" >&6
+ ac_preproc_ok=false
+ for ac_c_preproc_warn_flag in '' yes
+@@ -2704,18 +2708,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 2707 "configure"
++#line 2711 "configure"
+ #include "confdefs.h"
+ #include <assert.h>
+ Syntax error
+ _ACEOF
+-if { (eval echo "$as_me:2712: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:2716: \"$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:2718: \$? = $ac_status" >&5
++ echo "$as_me:2722: \$? = $ac_status" >&5
+ (exit "$ac_status"); } >/dev/null; then
+ if test -s conftest.err; then
+ ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -2738,17 +2742,17 @@
+ # OK, works on sane cases. Now check whether non-existent headers
+ # can be detected and how.
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 2741 "configure"
++#line 2745 "configure"
+ #include "confdefs.h"
+ #include <ac_nonexistent.h>
+ _ACEOF
+-if { (eval echo "$as_me:2745: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:2749: \"$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:2751: \$? = $ac_status" >&5
++ echo "$as_me:2755: \$? = $ac_status" >&5
+ (exit "$ac_status"); } >/dev/null; then
+ if test -s conftest.err; then
+ ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -2776,7 +2780,7 @@
+ if $ac_preproc_ok; then
+ :
+ else
+- { { echo "$as_me:2779: error: C preprocessor \"$CPP\" fails sanity check" >&5
++ { { echo "$as_me:2783: error: C preprocessor \"$CPP\" fails sanity check" >&5
+ echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check" >&2;}
+ { (exit 1); exit 1; }; }
+ fi
+@@ -2792,7 +2796,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:2795: checking for $ac_word" >&5
++echo "$as_me:2799: 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
+@@ -2807,7 +2811,7 @@
+ test -z "$ac_dir" && ac_dir=.
+ $as_executable_p "$ac_dir/$ac_word" || continue
+ ac_cv_prog_AWK="$ac_prog"
+-echo "$as_me:2810: found $ac_dir/$ac_word" >&5
++echo "$as_me:2814: found $ac_dir/$ac_word" >&5
+ break
+ done
+
+@@ -2815,10 +2819,10 @@
+ fi
+ AWK=$ac_cv_prog_AWK
+ if test -n "$AWK"; then
+- echo "$as_me:2818: result: $AWK" >&5
++ echo "$as_me:2822: result: $AWK" >&5
+ echo "${ECHO_T}$AWK" >&6
+ else
+- echo "$as_me:2821: result: no" >&5
++ echo "$as_me:2825: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+
+@@ -2837,7 +2841,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:2840: checking for a BSD compatible install" >&5
++echo "$as_me:2844: 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
+@@ -2886,7 +2890,7 @@
+ INSTALL=$ac_install_sh
+ fi
+ fi
+-echo "$as_me:2889: result: $INSTALL" >&5
++echo "$as_me:2893: result: $INSTALL" >&5
+ echo "${ECHO_T}$INSTALL" >&6
+
+ # Use test -z because SunOS4 sh mishandles braces in ${var-val}.
+@@ -2907,7 +2911,7 @@
+ ;;
+ esac
+
+-echo "$as_me:2910: checking if you want to install stripped executables" >&5
++echo "$as_me:2914: 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.
+@@ -2924,7 +2928,7 @@
+ enable_stripping=yes
+
+ fi;
+-echo "$as_me:2927: result: $enable_stripping" >&5
++echo "$as_me:2931: result: $enable_stripping" >&5
+ echo "${ECHO_T}$enable_stripping" >&6
+
+ if test "$enable_stripping" = yes
+@@ -2935,7 +2939,7 @@
+ fi
+
+ : "${INSTALL:=install}"
+-echo "$as_me:2938: checking if install accepts -p option" >&5
++echo "$as_me:2942: 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
+@@ -2966,10 +2970,10 @@
+ rm -rf ./conftest*
+
+ fi
+-echo "$as_me:2969: result: $cf_cv_install_p" >&5
++echo "$as_me:2973: result: $cf_cv_install_p" >&5
+ echo "${ECHO_T}$cf_cv_install_p" >&6
+
+-echo "$as_me:2972: checking if install needs to be told about ownership" >&5
++echo "$as_me:2976: 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)
+@@ -2980,7 +2984,7 @@
+ ;;
+ esac
+
+-echo "$as_me:2983: result: $with_install_o" >&5
++echo "$as_me:2987: result: $with_install_o" >&5
+ echo "${ECHO_T}$with_install_o" >&6
+ if test "x$with_install_o" = xyes
+ then
+@@ -2991,7 +2995,7 @@
+
+ if test -n "$INSTALL_OPT_S"
+ then
+- echo "$as_me:2994: checking if you want to specify strip-program" >&5
++ echo "$as_me:2998: 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.
+@@ -3001,11 +3005,11 @@
+ else
+ with_strip_program=no
+ fi;
+- echo "$as_me:3004: result: $with_strip_program" >&5
++ echo "$as_me:3008: result: $with_strip_program" >&5
+ echo "${ECHO_T}$with_strip_program" >&6
+ if test "$with_strip_program" != no
+ then
+- echo "$as_me:3008: checking if strip-program is supported with this installer" >&5
++ echo "$as_me:3012: 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
+@@ -3026,11 +3030,11 @@
+ done
+ fi
+ fi
+- echo "$as_me:3029: result: $check_install_strip" >&5
++ echo "$as_me:3033: result: $check_install_strip" >&5
+ echo "${ECHO_T}$check_install_strip" >&6
+ case "$check_install_strip" in
+ (no)
+- { echo "$as_me:3033: WARNING: $cf_install_program does not support strip program option" >&5
++ { echo "$as_me:3037: 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
+ ;;
+@@ -3045,7 +3049,7 @@
+ chmod +x "$INSTALL"
+ test -n "$verbose" && echo " created $INSTALL" 1>&6
+
+-echo "${as_me:-configure}:3048: testing created $INSTALL ..." 1>&5
++echo "${as_me:-configure}:3052: testing created $INSTALL ..." 1>&5
+
+ ;;
+ (option)
+@@ -3059,7 +3063,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:3062: checking for $ac_word" >&5
++echo "$as_me:3066: 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
+@@ -3074,7 +3078,7 @@
+ test -z "$ac_dir" && ac_dir=.
+ $as_executable_p "$ac_dir/$ac_word" || continue
+ ac_cv_prog_LINT="$ac_prog"
+-echo "$as_me:3077: found $ac_dir/$ac_word" >&5
++echo "$as_me:3081: found $ac_dir/$ac_word" >&5
+ break
+ done
+
+@@ -3082,10 +3086,10 @@
+ fi
+ LINT=$ac_cv_prog_LINT
+ if test -n "$LINT"; then
+- echo "$as_me:3085: result: $LINT" >&5
++ echo "$as_me:3089: result: $LINT" >&5
+ echo "${ECHO_T}$LINT" >&6
+ else
+- echo "$as_me:3088: result: no" >&5
++ echo "$as_me:3092: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+
+@@ -3098,7 +3102,7 @@
+ ;;
+ esac
+
+-echo "$as_me:3101: checking for \".PHONY\" make-support" >&5
++echo "$as_me:3105: 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
+@@ -3153,14 +3157,14 @@
+ rm -rf conftest*
+
+ fi
+-echo "$as_me:3156: result: $cf_cv_make_PHONY" >&5
++echo "$as_me:3160: 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:3163: checking if filesystem supports mixed-case filenames" >&5
++echo "$as_me:3167: 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
+@@ -3187,7 +3191,7 @@
+ fi
+
+ fi
+-echo "$as_me:3190: result: $cf_cv_mixedcase" >&5
++echo "$as_me:3194: result: $cf_cv_mixedcase" >&5
+ echo "${ECHO_T}$cf_cv_mixedcase" >&6
+ test "$cf_cv_mixedcase" = yes &&
+ cat >>confdefs.h <<\EOF
+@@ -3198,7 +3202,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:3201: checking for $ac_word" >&5
++echo "$as_me:3205: 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
+@@ -3213,7 +3217,7 @@
+ test -z "$ac_dir" && ac_dir=.
+ $as_executable_p "$ac_dir/$ac_word" || continue
+ ac_cv_prog_CTAGS="$ac_prog"
+-echo "$as_me:3216: found $ac_dir/$ac_word" >&5
++echo "$as_me:3220: found $ac_dir/$ac_word" >&5
+ break
+ done
+
+@@ -3221,10 +3225,10 @@
+ fi
+ CTAGS=$ac_cv_prog_CTAGS
+ if test -n "$CTAGS"; then
+- echo "$as_me:3224: result: $CTAGS" >&5
++ echo "$as_me:3228: result: $CTAGS" >&5
+ echo "${ECHO_T}$CTAGS" >&6
+ else
+- echo "$as_me:3227: result: no" >&5
++ echo "$as_me:3231: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+
+@@ -3235,7 +3239,7 @@
+ do
+ # Extract the first word of "$ac_prog", so it can be a program name with args.
+ set dummy $ac_prog; ac_word=$2
+-echo "$as_me:3238: checking for $ac_word" >&5
++echo "$as_me:3242: checking for $ac_word" >&5
+ echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+ if test "${ac_cv_prog_ETAGS+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -3250,7 +3254,7 @@
+ test -z "$ac_dir" && ac_dir=.
+ $as_executable_p "$ac_dir/$ac_word" || continue
+ ac_cv_prog_ETAGS="$ac_prog"
+-echo "$as_me:3253: found $ac_dir/$ac_word" >&5
++echo "$as_me:3257: found $ac_dir/$ac_word" >&5
+ break
+ done
+
+@@ -3258,10 +3262,10 @@
+ fi
+ ETAGS=$ac_cv_prog_ETAGS
+ if test -n "$ETAGS"; then
+- echo "$as_me:3261: result: $ETAGS" >&5
++ echo "$as_me:3265: result: $ETAGS" >&5
+ echo "${ECHO_T}$ETAGS" >&6
+ else
+- echo "$as_me:3264: result: no" >&5
++ echo "$as_me:3268: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+
+@@ -3270,7 +3274,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:3273: checking for $ac_word" >&5
++echo "$as_me:3277: 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
+@@ -3285,7 +3289,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:3288: found $ac_dir/$ac_word" >&5
++echo "$as_me:3292: found $ac_dir/$ac_word" >&5
+ break
+ done
+
+@@ -3294,17 +3298,17 @@
+ fi
+ MAKE_LOWER_TAGS=$ac_cv_prog_MAKE_LOWER_TAGS
+ if test -n "$MAKE_LOWER_TAGS"; then
+- echo "$as_me:3297: result: $MAKE_LOWER_TAGS" >&5
++ echo "$as_me:3301: result: $MAKE_LOWER_TAGS" >&5
+ echo "${ECHO_T}$MAKE_LOWER_TAGS" >&6
+ else
+- echo "$as_me:3300: result: no" >&5
++ echo "$as_me:3304: 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:3307: 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_UPPER_TAGS+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -3319,7 +3323,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:3322: found $ac_dir/$ac_word" >&5
++echo "$as_me:3326: found $ac_dir/$ac_word" >&5
+ break
+ done
+
+@@ -3328,10 +3332,10 @@
+ fi
+ MAKE_UPPER_TAGS=$ac_cv_prog_MAKE_UPPER_TAGS
+ if test -n "$MAKE_UPPER_TAGS"; then
+- echo "$as_me:3331: result: $MAKE_UPPER_TAGS" >&5
++ echo "$as_me:3335: result: $MAKE_UPPER_TAGS" >&5
+ echo "${ECHO_T}$MAKE_UPPER_TAGS" >&6
+ else
+- echo "$as_me:3334: result: no" >&5
++ echo "$as_me:3338: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+
+@@ -3351,14 +3355,14 @@
+ MAKE_LOWER_TAGS="#"
+ fi
+
+-echo "$as_me:3354: checking if -lm needed for math functions" >&5
++echo "$as_me:3358: 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 3361 "configure"
++#line 3365 "configure"
+ #include "confdefs.h"
+
+ #include <stdio.h>
+@@ -3374,16 +3378,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:3377: \"$ac_link\"") >&5
++if { (eval echo "$as_me:3381: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:3380: \$? = $ac_status" >&5
++ echo "$as_me:3384: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:3383: \"$ac_try\"") >&5
++ { (eval echo "$as_me:3387: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:3386: \$? = $ac_status" >&5
++ echo "$as_me:3390: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_need_libm=no
+ else
+@@ -3393,7 +3397,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:3396: result: $cf_cv_need_libm" >&5
++echo "$as_me:3400: result: $cf_cv_need_libm" >&5
+ echo "${ECHO_T}$cf_cv_need_libm" >&6
+
+ if test "$cf_cv_need_libm" = yes
+@@ -3401,14 +3405,14 @@
+
+ cf_save_LIBS="$LIBS"
+ LIBS="$LIBS -lm"
+- echo "$as_me:3404: checking if -lm is available for math functions" >&5
++ echo "$as_me:3408: 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 3411 "configure"
++#line 3415 "configure"
+ #include "confdefs.h"
+
+ #include <stdio.h>
+@@ -3424,16 +3428,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:3427: \"$ac_link\"") >&5
++if { (eval echo "$as_me:3431: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:3430: \$? = $ac_status" >&5
++ echo "$as_me:3434: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:3433: \"$ac_try\"") >&5
++ { (eval echo "$as_me:3437: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:3436: \$? = $ac_status" >&5
++ echo "$as_me:3440: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_have_libm=yes
+ else
+@@ -3443,7 +3447,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:3446: result: $cf_cv_have_libm" >&5
++echo "$as_me:3450: result: $cf_cv_have_libm" >&5
+ echo "${ECHO_T}$cf_cv_have_libm" >&6
+ LIBS="$cf_save_LIBS"
+
+@@ -3498,7 +3502,7 @@
+ cf_cv_screen=curses
+ cf_cv_libtype=
+
+-echo "$as_me:3501: checking for fgrep" >&5
++echo "$as_me:3505: 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
+@@ -3510,7 +3514,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:3513: checking for $ac_word" >&5
++echo "$as_me:3517: 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
+@@ -3527,7 +3531,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:3530: found $ac_dir/$ac_word" >&5
++ echo "$as_me:3534: found $ac_dir/$ac_word" >&5
+ break
+ fi
+ done
+@@ -3538,10 +3542,10 @@
+ FGREP=$ac_cv_path_FGREP
+
+ if test -n "$FGREP"; then
+- echo "$as_me:3541: result: $FGREP" >&5
++ echo "$as_me:3545: result: $FGREP" >&5
+ echo "${ECHO_T}$FGREP" >&6
+ else
+- echo "$as_me:3544: result: no" >&5
++ echo "$as_me:3548: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+
+@@ -3549,16 +3553,16 @@
+ done
+ test -n "$FGREP" || FGREP=": "
+
+- test "x$ac_cv_path_FGREP" = "x:" && { { echo "$as_me:3552: error: cannot find workable fgrep" >&5
++ test "x$ac_cv_path_FGREP" = "x:" && { { echo "$as_me:3556: error: cannot find workable fgrep" >&5
+ echo "$as_me: error: cannot find workable fgrep" >&2;}
+ { (exit 1); exit 1; }; }
+ fi
+ fi
+-echo "$as_me:3557: result: $ac_cv_path_FGREP" >&5
++echo "$as_me:3561: result: $ac_cv_path_FGREP" >&5
+ echo "${ECHO_T}$ac_cv_path_FGREP" >&6
+ FGREP="$ac_cv_path_FGREP"
+
+-echo "$as_me:3561: checking if you want to use C11 _Noreturn feature" >&5
++echo "$as_me:3565: 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.
+@@ -3575,17 +3579,17 @@
+ enable_stdnoreturn=no
+
+ fi;
+-echo "$as_me:3578: result: $enable_stdnoreturn" >&5
++echo "$as_me:3582: result: $enable_stdnoreturn" >&5
+ echo "${ECHO_T}$enable_stdnoreturn" >&6
+
+ if test $enable_stdnoreturn = yes; then
+-echo "$as_me:3582: checking for C11 _Noreturn feature" >&5
++echo "$as_me:3586: 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 3588 "configure"
++#line 3592 "configure"
+ #include "confdefs.h"
+
+ $ac_includes_default
+@@ -3601,16 +3605,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:3604: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:3608: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:3607: \$? = $ac_status" >&5
++ echo "$as_me:3611: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:3610: \"$ac_try\"") >&5
++ { (eval echo "$as_me:3614: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:3613: \$? = $ac_status" >&5
++ echo "$as_me:3617: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_c11_noreturn=yes
+ else
+@@ -3621,7 +3625,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+
+ fi
+-echo "$as_me:3624: result: $cf_cv_c11_noreturn" >&5
++echo "$as_me:3628: result: $cf_cv_c11_noreturn" >&5
+ echo "${ECHO_T}$cf_cv_c11_noreturn" >&6
+ else
+ cf_cv_c11_noreturn=no,
+@@ -3660,10 +3664,10 @@
+ EOF
+ if test "$GCC" = yes
+ then
+- { echo "$as_me:3663: checking for $CC __attribute__ directives..." >&5
++ { echo "$as_me:3667: checking for $CC __attribute__ directives..." >&5
+ echo "$as_me: checking for $CC __attribute__ directives..." >&6;}
+ cat > "conftest.$ac_ext" <<EOF
+-#line 3666 "${as_me:-configure}"
++#line 3670 "${as_me:-configure}"
+ #include <stdio.h>
+ #include "confdefs.h"
+ #include "conftest.h"
+@@ -3713,12 +3717,12 @@
+ ;;
+ esac
+
+- if { (eval echo "$as_me:3716: \"$ac_compile\"") >&5
++ if { (eval echo "$as_me:3720: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:3719: \$? = $ac_status" >&5
++ echo "$as_me:3723: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; then
+- test -n "$verbose" && echo "$as_me:3721: result: ... $cf_attribute" >&5
++ test -n "$verbose" && echo "$as_me:3725: result: ... $cf_attribute" >&5
+ echo "${ECHO_T}... $cf_attribute" >&6
+ cat conftest.h >>confdefs.h
+ case "$cf_attribute" in
+@@ -3777,7 +3781,7 @@
+ rm -rf ./conftest*
+ fi
+
+-echo "$as_me:3780: checking if you want to work around bogus compiler/loader warnings" >&5
++echo "$as_me:3784: 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.
+@@ -3787,7 +3791,7 @@
+ else
+ enable_string_hacks=no
+ fi;
+-echo "$as_me:3790: result: $enable_string_hacks" >&5
++echo "$as_me:3794: result: $enable_string_hacks" >&5
+ echo "${ECHO_T}$enable_string_hacks" >&6
+
+ if test "x$enable_string_hacks" = "xyes"; then
+@@ -3796,15 +3800,15 @@
+ #define USE_STRING_HACKS 1
+ EOF
+
+- { echo "$as_me:3799: WARNING: enabling string-hacks to work around bogus compiler/loader warnings" >&5
++ { echo "$as_me:3803: 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:3801: checking for strlcat" >&5
++ echo "$as_me:3805: 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 3807 "configure"
++#line 3811 "configure"
+ #include "confdefs.h"
+ #define strlcat autoconf_temporary
+ #include <limits.h> /* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -3835,16 +3839,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:3838: \"$ac_link\"") >&5
++if { (eval echo "$as_me:3842: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:3841: \$? = $ac_status" >&5
++ echo "$as_me:3845: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:3844: \"$ac_try\"") >&5
++ { (eval echo "$as_me:3848: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:3847: \$? = $ac_status" >&5
++ echo "$as_me:3851: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_func_strlcat=yes
+ else
+@@ -3854,7 +3858,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:3857: result: $ac_cv_func_strlcat" >&5
++echo "$as_me:3861: result: $ac_cv_func_strlcat" >&5
+ echo "${ECHO_T}$ac_cv_func_strlcat" >&6
+ if test "$ac_cv_func_strlcat" = yes; then
+
+@@ -3864,7 +3868,7 @@
+
+ else
+
+- echo "$as_me:3867: checking for strlcat in -lbsd" >&5
++ echo "$as_me:3871: 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
+@@ -3872,7 +3876,7 @@
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lbsd $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 3875 "configure"
++#line 3879 "configure"
+ #include "confdefs.h"
+
+ /* Override any gcc2 internal prototype to avoid an error. */
+@@ -3891,16 +3895,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:3894: \"$ac_link\"") >&5
++if { (eval echo "$as_me:3898: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:3897: \$? = $ac_status" >&5
++ echo "$as_me:3901: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:3900: \"$ac_try\"") >&5
++ { (eval echo "$as_me:3904: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:3903: \$? = $ac_status" >&5
++ echo "$as_me:3907: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_lib_bsd_strlcat=yes
+ else
+@@ -3911,7 +3915,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:3914: result: $ac_cv_lib_bsd_strlcat" >&5
++echo "$as_me:3918: 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
+
+@@ -3934,23 +3938,23 @@
+ for ac_header in bsd/string.h
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-echo "$as_me:3937: checking for $ac_header" >&5
++echo "$as_me:3941: 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 3943 "configure"
++#line 3947 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:3947: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:3951: \"$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:3953: \$? = $ac_status" >&5
++ echo "$as_me:3957: \$? = $ac_status" >&5
+ (exit "$ac_status"); } >/dev/null; then
+ if test -s conftest.err; then
+ ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -3969,7 +3973,7 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:3972: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
++echo "$as_me:3976: 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
+@@ -3990,13 +3994,13 @@
+ for ac_func in strlcpy snprintf
+ do
+ as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+-echo "$as_me:3993: checking for $ac_func" >&5
++echo "$as_me:3997: 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 3999 "configure"
++#line 4003 "configure"
+ #include "confdefs.h"
+ #define $ac_func autoconf_temporary
+ #include <limits.h> /* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -4027,16 +4031,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:4030: \"$ac_link\"") >&5
++if { (eval echo "$as_me:4034: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:4033: \$? = $ac_status" >&5
++ echo "$as_me:4037: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:4036: \"$ac_try\"") >&5
++ { (eval echo "$as_me:4040: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:4039: \$? = $ac_status" >&5
++ echo "$as_me:4043: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ eval "$as_ac_var=yes"
+ else
+@@ -4046,7 +4050,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:4049: result: `eval echo '${'"$as_ac_var"'}'`" >&5
++echo "$as_me:4053: 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
+@@ -4058,14 +4062,14 @@
+
+ fi
+
+-echo "$as_me:4061: checking if the POSIX test-macros are already defined" >&5
++echo "$as_me:4065: 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 4068 "configure"
++#line 4072 "configure"
+ #include "confdefs.h"
+ #include <stdio.h>
+ int
+@@ -4084,16 +4088,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:4087: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:4091: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:4090: \$? = $ac_status" >&5
++ echo "$as_me:4094: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:4093: \"$ac_try\"") >&5
++ { (eval echo "$as_me:4097: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:4096: \$? = $ac_status" >&5
++ echo "$as_me:4100: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_posix_visible=no
+ else
+@@ -4104,7 +4108,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+
+ fi
+-echo "$as_me:4107: result: $cf_cv_posix_visible" >&5
++echo "$as_me:4111: result: $cf_cv_posix_visible" >&5
+ echo "${ECHO_T}$cf_cv_posix_visible" >&6
+
+ if test "$cf_cv_posix_visible" = no; then
+@@ -4146,14 +4150,14 @@
+
+ cf_gnu_xopen_source=$cf_XOPEN_SOURCE
+
+-echo "$as_me:4149: checking if this is the GNU C library" >&5
++echo "$as_me:4153: 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 4156 "configure"
++#line 4160 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ int
+@@ -4172,16 +4176,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:4175: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:4179: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:4178: \$? = $ac_status" >&5
++ echo "$as_me:4182: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:4181: \"$ac_try\"") >&5
++ { (eval echo "$as_me:4185: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:4184: \$? = $ac_status" >&5
++ echo "$as_me:4188: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_gnu_library=yes
+ else
+@@ -4192,7 +4196,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+
+ fi
+-echo "$as_me:4195: result: $cf_cv_gnu_library" >&5
++echo "$as_me:4199: result: $cf_cv_gnu_library" >&5
+ echo "${ECHO_T}$cf_cv_gnu_library" >&6
+
+ if test x$cf_cv_gnu_library = xyes; then
+@@ -4200,7 +4204,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:4203: checking if _DEFAULT_SOURCE can be used as a basis" >&5
++ echo "$as_me:4207: 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
+@@ -4212,7 +4216,7 @@
+ CPPFLAGS="${CPPFLAGS}-D_DEFAULT_SOURCE"
+
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 4215 "configure"
++#line 4219 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ int
+@@ -4231,16 +4235,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:4234: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:4238: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:4237: \$? = $ac_status" >&5
++ echo "$as_me:4241: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:4240: \"$ac_try\"") >&5
++ { (eval echo "$as_me:4244: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:4243: \$? = $ac_status" >&5
++ echo "$as_me:4247: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_gnu_library_219=yes
+ else
+@@ -4252,12 +4256,12 @@
+ CPPFLAGS="$cf_save"
+
+ fi
+-echo "$as_me:4255: result: $cf_cv_gnu_library_219" >&5
++echo "$as_me:4259: 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:4260: checking if _XOPEN_SOURCE=$cf_gnu_xopen_source works with _DEFAULT_SOURCE" >&5
++ echo "$as_me:4264: 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
+@@ -4362,7 +4366,7 @@
+ fi
+
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 4365 "configure"
++#line 4369 "configure"
+ #include "confdefs.h"
+
+ #include <limits.h>
+@@ -4382,16 +4386,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:4385: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:4389: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:4388: \$? = $ac_status" >&5
++ echo "$as_me:4392: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:4391: \"$ac_try\"") >&5
++ { (eval echo "$as_me:4395: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:4394: \$? = $ac_status" >&5
++ echo "$as_me:4398: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_gnu_dftsrc_219=yes
+ else
+@@ -4402,7 +4406,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+
+ fi
+-echo "$as_me:4405: result: $cf_cv_gnu_dftsrc_219" >&5
++echo "$as_me:4409: 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
+@@ -4411,14 +4415,14 @@
+
+ if test "x$cf_cv_gnu_dftsrc_219" != xyes; then
+
+- echo "$as_me:4414: checking if we must define _GNU_SOURCE" >&5
++ echo "$as_me:4418: 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 4421 "configure"
++#line 4425 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ int
+@@ -4433,16 +4437,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:4436: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:4440: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:4439: \$? = $ac_status" >&5
++ echo "$as_me:4443: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:4442: \"$ac_try\"") >&5
++ { (eval echo "$as_me:4446: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:4445: \$? = $ac_status" >&5
++ echo "$as_me:4449: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_gnu_source=no
+ else
+@@ -4549,7 +4553,7 @@
+ fi
+
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 4552 "configure"
++#line 4556 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ int
+@@ -4564,16 +4568,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:4567: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:4571: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:4570: \$? = $ac_status" >&5
++ echo "$as_me:4574: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:4573: \"$ac_try\"") >&5
++ { (eval echo "$as_me:4577: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:4576: \$? = $ac_status" >&5
++ echo "$as_me:4580: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_gnu_source=no
+ else
+@@ -4588,12 +4592,12 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+
+ fi
+-echo "$as_me:4591: result: $cf_cv_gnu_source" >&5
++echo "$as_me:4595: 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:4596: checking if we should also define _DEFAULT_SOURCE" >&5
++ echo "$as_me:4600: 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
+@@ -4603,7 +4607,7 @@
+ CPPFLAGS="${CPPFLAGS}-D_GNU_SOURCE"
+
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 4606 "configure"
++#line 4610 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ int
+@@ -4618,16 +4622,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:4621: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:4625: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:4624: \$? = $ac_status" >&5
++ echo "$as_me:4628: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:4627: \"$ac_try\"") >&5
++ { (eval echo "$as_me:4631: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:4630: \$? = $ac_status" >&5
++ echo "$as_me:4634: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_default_source=no
+ else
+@@ -4638,7 +4642,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+
+ fi
+-echo "$as_me:4641: result: $cf_cv_default_source" >&5
++echo "$as_me:4645: result: $cf_cv_default_source" >&5
+ echo "${ECHO_T}$cf_cv_default_source" >&6
+ if test "$cf_cv_default_source" = yes
+ then
+@@ -4675,16 +4679,16 @@
+ sed -e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ ]*\)\?[ ]/ /g' \
+ -e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ ]*\)\?$//g'`
+
+-echo "$as_me:4678: checking if we should define _POSIX_C_SOURCE" >&5
++echo "$as_me:4682: 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}:4684: testing if the symbol is already defined go no further ..." 1>&5
++echo "${as_me:-configure}:4688: testing if the symbol is already defined go no further ..." 1>&5
+
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 4687 "configure"
++#line 4691 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ int
+@@ -4699,16 +4703,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:4702: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:4706: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:4705: \$? = $ac_status" >&5
++ echo "$as_me:4709: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:4708: \"$ac_try\"") >&5
++ { (eval echo "$as_me:4712: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:4711: \$? = $ac_status" >&5
++ echo "$as_me:4715: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_posix_c_source=no
+ else
+@@ -4729,7 +4733,7 @@
+ esac
+ if test "$cf_want_posix_source" = yes ; then
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 4732 "configure"
++#line 4736 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ int
+@@ -4744,16 +4748,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:4747: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:4751: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:4750: \$? = $ac_status" >&5
++ echo "$as_me:4754: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:4753: \"$ac_try\"") >&5
++ { (eval echo "$as_me:4757: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:4756: \$? = $ac_status" >&5
++ echo "$as_me:4760: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ :
+ else
+@@ -4764,7 +4768,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+
+-echo "${as_me:-configure}:4767: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
++echo "${as_me:-configure}:4771: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
+
+ CFLAGS="$cf_trim_CFLAGS"
+ CPPFLAGS="$cf_trim_CPPFLAGS"
+@@ -4772,10 +4776,10 @@
+ test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
+ CPPFLAGS="${CPPFLAGS}$cf_cv_posix_c_source"
+
+-echo "${as_me:-configure}:4775: testing if the second compile does not leave our definition intact error ..." 1>&5
++echo "${as_me:-configure}:4779: testing if the second compile does not leave our definition intact error ..." 1>&5
+
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 4778 "configure"
++#line 4782 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ int
+@@ -4790,16 +4794,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:4793: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:4797: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:4796: \$? = $ac_status" >&5
++ echo "$as_me:4800: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:4799: \"$ac_try\"") >&5
++ { (eval echo "$as_me:4803: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:4802: \$? = $ac_status" >&5
++ echo "$as_me:4806: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ :
+ else
+@@ -4815,7 +4819,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+
+ fi
+-echo "$as_me:4818: result: $cf_cv_posix_c_source" >&5
++echo "$as_me:4822: 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
+@@ -4932,7 +4936,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:4935: WARNING: this system does not provide usable locale support" >&5
++ { echo "$as_me:4939: 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
+@@ -4964,14 +4968,14 @@
+ ;;
+ (*)
+
+-echo "$as_me:4967: checking if we should define _XOPEN_SOURCE" >&5
++echo "$as_me:4971: 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 4974 "configure"
++#line 4978 "configure"
+ #include "confdefs.h"
+
+ $ac_includes_default
+@@ -4989,16 +4993,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:4992: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:4996: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:4995: \$? = $ac_status" >&5
++ echo "$as_me:4999: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:4998: \"$ac_try\"") >&5
++ { (eval echo "$as_me:5002: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:5001: \$? = $ac_status" >&5
++ echo "$as_me:5005: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_xopen_source=no
+ else
+@@ -5010,7 +5014,7 @@
+ CPPFLAGS="${CPPFLAGS}-D_XOPEN_SOURCE=$cf_XOPEN_SOURCE"
+
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 5013 "configure"
++#line 5017 "configure"
+ #include "confdefs.h"
+
+ $ac_includes_default
+@@ -5028,16 +5032,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:5031: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:5035: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:5034: \$? = $ac_status" >&5
++ echo "$as_me:5038: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:5037: \"$ac_try\"") >&5
++ { (eval echo "$as_me:5041: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:5040: \$? = $ac_status" >&5
++ echo "$as_me:5044: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_xopen_source=no
+ else
+@@ -5052,7 +5056,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+
+ fi
+-echo "$as_me:5055: result: $cf_cv_xopen_source" >&5
++echo "$as_me:5059: result: $cf_cv_xopen_source" >&5
+ echo "${ECHO_T}$cf_cv_xopen_source" >&6
+
+ if test "$cf_cv_xopen_source" != no ; then
+@@ -5212,16 +5216,16 @@
+ sed -e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ ]*\)\?[ ]/ /g' \
+ -e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ ]*\)\?$//g'`
+
+-echo "$as_me:5215: checking if we should define _POSIX_C_SOURCE" >&5
++echo "$as_me:5219: 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}:5221: testing if the symbol is already defined go no further ..." 1>&5
++echo "${as_me:-configure}:5225: testing if the symbol is already defined go no further ..." 1>&5
+
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 5224 "configure"
++#line 5228 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ int
+@@ -5236,16 +5240,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:5239: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:5243: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:5242: \$? = $ac_status" >&5
++ echo "$as_me:5246: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:5245: \"$ac_try\"") >&5
++ { (eval echo "$as_me:5249: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:5248: \$? = $ac_status" >&5
++ echo "$as_me:5252: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_posix_c_source=no
+ else
+@@ -5266,7 +5270,7 @@
+ esac
+ if test "$cf_want_posix_source" = yes ; then
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 5269 "configure"
++#line 5273 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ int
+@@ -5281,16 +5285,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:5284: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:5288: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:5287: \$? = $ac_status" >&5
++ echo "$as_me:5291: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:5290: \"$ac_try\"") >&5
++ { (eval echo "$as_me:5294: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:5293: \$? = $ac_status" >&5
++ echo "$as_me:5297: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ :
+ else
+@@ -5301,7 +5305,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+
+-echo "${as_me:-configure}:5304: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
++echo "${as_me:-configure}:5308: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
+
+ CFLAGS="$cf_trim_CFLAGS"
+ CPPFLAGS="$cf_trim_CPPFLAGS"
+@@ -5309,10 +5313,10 @@
+ test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
+ CPPFLAGS="${CPPFLAGS}$cf_cv_posix_c_source"
+
+-echo "${as_me:-configure}:5312: testing if the second compile does not leave our definition intact error ..." 1>&5
++echo "${as_me:-configure}:5316: testing if the second compile does not leave our definition intact error ..." 1>&5
+
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 5315 "configure"
++#line 5319 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ int
+@@ -5327,16 +5331,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:5330: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:5334: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:5333: \$? = $ac_status" >&5
++ echo "$as_me:5337: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:5336: \"$ac_try\"") >&5
++ { (eval echo "$as_me:5340: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:5339: \$? = $ac_status" >&5
++ echo "$as_me:5343: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ :
+ else
+@@ -5352,7 +5356,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+
+ fi
+-echo "$as_me:5355: result: $cf_cv_posix_c_source" >&5
++echo "$as_me:5359: 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
+@@ -5465,10 +5469,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}:5468: testing checking if _POSIX_C_SOURCE interferes with _XOPEN_SOURCE ..." 1>&5
++echo "${as_me:-configure}:5472: testing checking if _POSIX_C_SOURCE interferes with _XOPEN_SOURCE ..." 1>&5
+
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 5471 "configure"
++#line 5475 "configure"
+ #include "confdefs.h"
+
+ $ac_includes_default
+@@ -5486,23 +5490,23 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:5489: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:5493: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:5492: \$? = $ac_status" >&5
++ echo "$as_me:5496: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:5495: \"$ac_try\"") >&5
++ { (eval echo "$as_me:5499: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:5498: \$? = $ac_status" >&5
++ echo "$as_me:5502: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ :
+ else
+ echo "$as_me: failed program was:" >&5
+ cat "conftest.$ac_ext" >&5
+
+- { echo "$as_me:5505: WARNING: _POSIX_C_SOURCE definition is not usable" >&5
++ { echo "$as_me:5509: 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
+@@ -5525,7 +5529,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}:5528: testing removing old option $cf_add_cflags from CFLAGS ..." 1>&5
++echo "${as_me:-configure}:5532: testing removing old option $cf_add_cflags from CFLAGS ..." 1>&5
+
+ CFLAGS="$cf_old_cflag"
+ done
+@@ -5537,7 +5541,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}:5540: testing removing old option $cf_add_cflags from CPPFLAGS ..." 1>&5
++echo "${as_me:-configure}:5544: testing removing old option $cf_add_cflags from CPPFLAGS ..." 1>&5
+
+ CPPFLAGS="$cf_old_cflag"
+ done
+@@ -5625,7 +5629,7 @@
+ if test -n "$cf_new_cflags" ; then
+ test -n "$verbose" && echo " add to \$CFLAGS $cf_new_cflags" 1>&6
+
+-echo "${as_me:-configure}:5628: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
++echo "${as_me:-configure}:5632: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
+
+ test -n "$CFLAGS" && CFLAGS="$CFLAGS "
+ CFLAGS="${CFLAGS}$cf_new_cflags"
+@@ -5635,7 +5639,7 @@
+ if test -n "$cf_new_cppflags" ; then
+ test -n "$verbose" && echo " add to \$CPPFLAGS $cf_new_cppflags" 1>&6
+
+-echo "${as_me:-configure}:5638: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
++echo "${as_me:-configure}:5642: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
+
+ test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
+ CPPFLAGS="${CPPFLAGS}$cf_new_cppflags"
+@@ -5645,7 +5649,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}:5648: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5
++echo "${as_me:-configure}:5652: 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"
+@@ -5657,10 +5661,10 @@
+ fi
+
+ if test -n "$cf_XOPEN_SOURCE" && test -z "$cf_cv_xopen_source" ; then
+- echo "$as_me:5660: checking if _XOPEN_SOURCE really is set" >&5
++ echo "$as_me:5664: 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 5663 "configure"
++#line 5667 "configure"
+ #include "confdefs.h"
+ #include <stdlib.h>
+ int
+@@ -5675,16 +5679,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:5678: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:5682: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:5681: \$? = $ac_status" >&5
++ echo "$as_me:5685: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:5684: \"$ac_try\"") >&5
++ { (eval echo "$as_me:5688: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:5687: \$? = $ac_status" >&5
++ echo "$as_me:5691: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_XOPEN_SOURCE_set=yes
+ else
+@@ -5693,12 +5697,12 @@
+ cf_XOPEN_SOURCE_set=no
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+- echo "$as_me:5696: result: $cf_XOPEN_SOURCE_set" >&5
++ echo "$as_me:5700: 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 5701 "configure"
++#line 5705 "configure"
+ #include "confdefs.h"
+ #include <stdlib.h>
+ int
+@@ -5713,16 +5717,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:5716: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:5720: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:5719: \$? = $ac_status" >&5
++ echo "$as_me:5723: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:5722: \"$ac_try\"") >&5
++ { (eval echo "$as_me:5726: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:5725: \$? = $ac_status" >&5
++ echo "$as_me:5729: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_XOPEN_SOURCE_set_ok=yes
+ else
+@@ -5733,19 +5737,19 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ if test "$cf_XOPEN_SOURCE_set_ok" = no
+ then
+- { echo "$as_me:5736: WARNING: _XOPEN_SOURCE is lower than requested" >&5
++ { echo "$as_me:5740: WARNING: _XOPEN_SOURCE is lower than requested" >&5
+ echo "$as_me: WARNING: _XOPEN_SOURCE is lower than requested" >&2;}
+ fi
+ else
+
+-echo "$as_me:5741: checking if we should define _XOPEN_SOURCE" >&5
++echo "$as_me:5745: 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 5748 "configure"
++#line 5752 "configure"
+ #include "confdefs.h"
+
+ $ac_includes_default
+@@ -5763,16 +5767,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:5766: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:5770: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:5769: \$? = $ac_status" >&5
++ echo "$as_me:5773: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:5772: \"$ac_try\"") >&5
++ { (eval echo "$as_me:5776: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:5775: \$? = $ac_status" >&5
++ echo "$as_me:5779: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_xopen_source=no
+ else
+@@ -5784,7 +5788,7 @@
+ CPPFLAGS="${CPPFLAGS}-D_XOPEN_SOURCE=$cf_XOPEN_SOURCE"
+
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 5787 "configure"
++#line 5791 "configure"
+ #include "confdefs.h"
+
+ $ac_includes_default
+@@ -5802,16 +5806,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:5805: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:5809: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:5808: \$? = $ac_status" >&5
++ echo "$as_me:5812: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:5811: \"$ac_try\"") >&5
++ { (eval echo "$as_me:5815: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:5814: \$? = $ac_status" >&5
++ echo "$as_me:5818: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_xopen_source=no
+ else
+@@ -5826,7 +5830,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+
+ fi
+-echo "$as_me:5829: result: $cf_cv_xopen_source" >&5
++echo "$as_me:5833: result: $cf_cv_xopen_source" >&5
+ echo "${ECHO_T}$cf_cv_xopen_source" >&6
+
+ if test "$cf_cv_xopen_source" != no ; then
+@@ -5973,13 +5977,13 @@
+ fi
+ fi # cf_cv_posix_visible
+
+-echo "$as_me:5976: checking for ANSI C header files" >&5
++echo "$as_me:5980: 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 5982 "configure"
++#line 5986 "configure"
+ #include "confdefs.h"
+ #include <stdlib.h>
+ #include <stdarg.h>
+@@ -5987,13 +5991,13 @@
+ #include <float.h>
+
+ _ACEOF
+-if { (eval echo "$as_me:5990: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:5994: \"$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:5996: \$? = $ac_status" >&5
++ echo "$as_me:6000: \$? = $ac_status" >&5
+ (exit "$ac_status"); } >/dev/null; then
+ if test -s conftest.err; then
+ ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -6015,7 +6019,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 6018 "configure"
++#line 6022 "configure"
+ #include "confdefs.h"
+ #include <string.h>
+
+@@ -6033,7 +6037,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 6036 "configure"
++#line 6040 "configure"
+ #include "confdefs.h"
+ #include <stdlib.h>
+
+@@ -6054,7 +6058,7 @@
+ :
+ else
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 6057 "configure"
++#line 6061 "configure"
+ #include "confdefs.h"
+ #include <ctype.h>
+ #if ((' ' & 0x0FF) == 0x020)
+@@ -6080,15 +6084,15 @@
+ }
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:6083: \"$ac_link\"") >&5
++if { (eval echo "$as_me:6087: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:6086: \$? = $ac_status" >&5
++ echo "$as_me:6090: \$? = $ac_status" >&5
+ (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+- { (eval echo "$as_me:6088: \"$ac_try\"") >&5
++ { (eval echo "$as_me:6092: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:6091: \$? = $ac_status" >&5
++ echo "$as_me:6095: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ :
+ else
+@@ -6101,7 +6105,7 @@
+ fi
+ fi
+ fi
+-echo "$as_me:6104: result: $ac_cv_header_stdc" >&5
++echo "$as_me:6108: result: $ac_cv_header_stdc" >&5
+ echo "${ECHO_T}$ac_cv_header_stdc" >&6
+ if test $ac_cv_header_stdc = yes; then
+
+@@ -6117,28 +6121,28 @@
+ inttypes.h stdint.h unistd.h
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-echo "$as_me:6120: checking for $ac_header" >&5
++echo "$as_me:6124: 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 6126 "configure"
++#line 6130 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ #include <$ac_header>
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:6132: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:6136: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:6135: \$? = $ac_status" >&5
++ echo "$as_me:6139: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:6138: \"$ac_try\"") >&5
++ { (eval echo "$as_me:6142: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:6141: \$? = $ac_status" >&5
++ echo "$as_me:6145: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ eval "$as_ac_Header=yes"
+ else
+@@ -6148,7 +6152,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:6151: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
++echo "$as_me:6155: 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
+@@ -6158,13 +6162,13 @@
+ fi
+ done
+
+-echo "$as_me:6161: checking whether exit is declared" >&5
++echo "$as_me:6165: 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 6167 "configure"
++#line 6171 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -6179,16 +6183,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:6182: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:6186: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:6185: \$? = $ac_status" >&5
++ echo "$as_me:6189: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:6188: \"$ac_try\"") >&5
++ { (eval echo "$as_me:6192: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:6191: \$? = $ac_status" >&5
++ echo "$as_me:6195: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_have_decl_exit=yes
+ else
+@@ -6198,10 +6202,10 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:6201: result: $ac_cv_have_decl_exit" >&5
++echo "$as_me:6205: result: $ac_cv_have_decl_exit" >&5
+ echo "${ECHO_T}$ac_cv_have_decl_exit" >&6
+
+-echo "$as_me:6204: checking for signal global datatype" >&5
++echo "$as_me:6208: 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
+@@ -6213,7 +6217,7 @@
+ "int"
+ do
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 6216 "configure"
++#line 6220 "configure"
+ #include "confdefs.h"
+
+ #include <sys/types.h>
+@@ -6237,16 +6241,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:6240: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:6244: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:6243: \$? = $ac_status" >&5
++ echo "$as_me:6247: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:6246: \"$ac_try\"") >&5
++ { (eval echo "$as_me:6250: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:6249: \$? = $ac_status" >&5
++ echo "$as_me:6253: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_sig_atomic_t=$cf_type
+ else
+@@ -6260,7 +6264,7 @@
+
+ fi
+
+-echo "$as_me:6263: result: $cf_cv_sig_atomic_t" >&5
++echo "$as_me:6267: 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
+@@ -6269,14 +6273,14 @@
+
+ # Work around breakage on OS X
+
+-echo "$as_me:6272: checking if SIGWINCH is defined" >&5
++echo "$as_me:6276: 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 6279 "configure"
++#line 6283 "configure"
+ #include "confdefs.h"
+
+ #include <sys/types.h>
+@@ -6291,23 +6295,23 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:6294: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:6298: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:6297: \$? = $ac_status" >&5
++ echo "$as_me:6301: \$? = $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:6304: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:6303: \$? = $ac_status" >&5
++ echo "$as_me:6307: \$? = $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 6310 "configure"
++#line 6314 "configure"
+ #include "confdefs.h"
+
+ #undef _XOPEN_SOURCE
+@@ -6325,16 +6329,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:6328: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:6332: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:6331: \$? = $ac_status" >&5
++ echo "$as_me:6335: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:6334: \"$ac_try\"") >&5
++ { (eval echo "$as_me:6338: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:6337: \$? = $ac_status" >&5
++ echo "$as_me:6341: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_define_sigwinch=maybe
+ else
+@@ -6348,11 +6352,11 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+
+ fi
+-echo "$as_me:6351: result: $cf_cv_define_sigwinch" >&5
++echo "$as_me:6355: 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:6355: checking for actual SIGWINCH definition" >&5
++echo "$as_me:6359: 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
+@@ -6363,7 +6367,7 @@
+ while test "$cf_sigwinch" != 1
+ do
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 6366 "configure"
++#line 6370 "configure"
+ #include "confdefs.h"
+
+ #undef _XOPEN_SOURCE
+@@ -6385,16 +6389,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:6388: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:6392: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:6391: \$? = $ac_status" >&5
++ echo "$as_me:6395: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:6394: \"$ac_try\"") >&5
++ { (eval echo "$as_me:6398: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:6397: \$? = $ac_status" >&5
++ echo "$as_me:6401: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_fixup_sigwinch=$cf_sigwinch
+ break
+@@ -6408,7 +6412,7 @@
+ done
+
+ fi
+-echo "$as_me:6411: result: $cf_cv_fixup_sigwinch" >&5
++echo "$as_me:6415: result: $cf_cv_fixup_sigwinch" >&5
+ echo "${ECHO_T}$cf_cv_fixup_sigwinch" >&6
+
+ if test "$cf_cv_fixup_sigwinch" != unknown ; then
+@@ -6418,13 +6422,13 @@
+
+ # Checks for CODESET support.
+
+-echo "$as_me:6421: checking for nl_langinfo and CODESET" >&5
++echo "$as_me:6425: 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 6427 "configure"
++#line 6431 "configure"
+ #include "confdefs.h"
+
+ $ac_includes_default
+@@ -6438,16 +6442,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:6441: \"$ac_link\"") >&5
++if { (eval echo "$as_me:6445: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:6444: \$? = $ac_status" >&5
++ echo "$as_me:6448: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:6447: \"$ac_try\"") >&5
++ { (eval echo "$as_me:6451: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:6450: \$? = $ac_status" >&5
++ echo "$as_me:6454: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ am_cv_langinfo_codeset=yes
+ else
+@@ -6458,7 +6462,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+
+ fi
+-echo "$as_me:6461: result: $am_cv_langinfo_codeset" >&5
++echo "$as_me:6465: result: $am_cv_langinfo_codeset" >&5
+ echo "${ECHO_T}$am_cv_langinfo_codeset" >&6
+ if test "$am_cv_langinfo_codeset" = yes; then
+
+@@ -6468,7 +6472,7 @@
+
+ fi
+
+-echo "$as_me:6471: checking if you want to use pkg-config" >&5
++echo "$as_me:6475: 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.
+@@ -6478,7 +6482,7 @@
+ else
+ cf_pkg_config=yes
+ fi;
+-echo "$as_me:6481: result: $cf_pkg_config" >&5
++echo "$as_me:6485: result: $cf_pkg_config" >&5
+ echo "${ECHO_T}$cf_pkg_config" >&6
+
+ case "$cf_pkg_config" in
+@@ -6490,7 +6494,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:6493: checking for $ac_word" >&5
++echo "$as_me:6497: 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
+@@ -6507,7 +6511,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:6510: found $ac_dir/$ac_word" >&5
++ echo "$as_me:6514: found $ac_dir/$ac_word" >&5
+ break
+ fi
+ done
+@@ -6518,10 +6522,10 @@
+ PKG_CONFIG=$ac_cv_path_PKG_CONFIG
+
+ if test -n "$PKG_CONFIG"; then
+- echo "$as_me:6521: result: $PKG_CONFIG" >&5
++ echo "$as_me:6525: result: $PKG_CONFIG" >&5
+ echo "${ECHO_T}$PKG_CONFIG" >&6
+ else
+- echo "$as_me:6524: result: no" >&5
++ echo "$as_me:6528: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+
+@@ -6530,7 +6534,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:6533: checking for $ac_word" >&5
++echo "$as_me:6537: checking for $ac_word" >&5
+ echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+ if test "${ac_cv_path_ac_pt_PKG_CONFIG+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -6547,7 +6551,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:6550: found $ac_dir/$ac_word" >&5
++ echo "$as_me:6554: found $ac_dir/$ac_word" >&5
+ break
+ fi
+ done
+@@ -6559,10 +6563,10 @@
+ ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG
+
+ if test -n "$ac_pt_PKG_CONFIG"; then
+- echo "$as_me:6562: result: $ac_pt_PKG_CONFIG" >&5
++ echo "$as_me:6566: result: $ac_pt_PKG_CONFIG" >&5
+ echo "${ECHO_T}$ac_pt_PKG_CONFIG" >&6
+ else
+- echo "$as_me:6565: result: no" >&5
++ echo "$as_me:6569: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+
+@@ -6605,18 +6609,18 @@
+ PKG_CONFIG=`echo "$PKG_CONFIG" | sed -e s%NONE%$cf_path_syntax%`
+ ;;
+ (*)
+- { { echo "$as_me:6608: error: expected a pathname, not \"$PKG_CONFIG\"" >&5
++ { { echo "$as_me:6612: 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:6615: WARNING: pkg-config is not installed" >&5
++ { echo "$as_me:6619: WARNING: pkg-config is not installed" >&5
+ echo "$as_me: WARNING: pkg-config is not installed" >&2;}
+ fi
+
+-echo "$as_me:6619: checking if you want to see long compiling messages" >&5
++echo "$as_me:6623: 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.
+@@ -6650,10 +6654,10 @@
+ ECHO_CC=''
+
+ fi;
+-echo "$as_me:6653: result: $enableval" >&5
++echo "$as_me:6657: result: $enableval" >&5
+ echo "${ECHO_T}$enableval" >&6
+
+-echo "$as_me:6656: checking for ncurses wrap-prefix" >&5
++echo "$as_me:6660: 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.
+@@ -6663,10 +6667,10 @@
+ else
+ NCURSES_WRAP_PREFIX=_nc_
+ fi;
+-echo "$as_me:6666: result: $NCURSES_WRAP_PREFIX" >&5
++echo "$as_me:6670: result: $NCURSES_WRAP_PREFIX" >&5
+ echo "${ECHO_T}$NCURSES_WRAP_PREFIX" >&6
+
+-echo "$as_me:6669: checking if you want to check for wide-character functions" >&5
++echo "$as_me:6673: 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.
+@@ -6683,10 +6687,10 @@
+ cf_enable_widec=yes
+
+ fi;
+-echo "$as_me:6686: result: $cf_enable_widec" >&5
++echo "$as_me:6690: result: $cf_enable_widec" >&5
+ echo "${ECHO_T}$cf_enable_widec" >&6
+
+-echo "$as_me:6689: checking for specific curses-directory" >&5
++echo "$as_me:6693: 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.
+@@ -6696,7 +6700,7 @@
+ else
+ cf_cv_curses_dir=no
+ fi;
+-echo "$as_me:6699: result: $cf_cv_curses_dir" >&5
++echo "$as_me:6703: 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"
+@@ -6727,7 +6731,7 @@
+ withval=`echo "$withval" | sed -e s%NONE%$cf_path_syntax%`
+ ;;
+ (*)
+- { { echo "$as_me:6730: error: expected a pathname, not \"$withval\"" >&5
++ { { echo "$as_me:6734: error: expected a pathname, not \"$withval\"" >&5
+ echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
+ { (exit 1); exit 1; }; }
+ ;;
+@@ -6763,7 +6767,7 @@
+ CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
+
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 6766 "configure"
++#line 6770 "configure"
+ #include "confdefs.h"
+ #include <stdio.h>
+ int
+@@ -6775,16 +6779,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:6778: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:6782: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:6781: \$? = $ac_status" >&5
++ echo "$as_me:6785: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:6784: \"$ac_try\"") >&5
++ { (eval echo "$as_me:6788: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:6787: \$? = $ac_status" >&5
++ echo "$as_me:6791: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ :
+ else
+@@ -6801,7 +6805,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}:6804: testing adding $cf_add_incdir to include-path ..." 1>&5
++echo "${as_me:-configure}:6808: testing adding $cf_add_incdir to include-path ..." 1>&5
+
+ CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
+
+@@ -6837,7 +6841,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}:6840: testing adding $cf_add_libdir to library-path ..." 1>&5
++echo "${as_me:-configure}:6844: testing adding $cf_add_libdir to library-path ..." 1>&5
+
+ LDFLAGS="-L$cf_add_libdir $LDFLAGS"
+ fi
+@@ -6850,7 +6854,7 @@
+
+ cf_cv_screen=curses
+
+-echo "$as_me:6853: checking for specified curses library type" >&5
++echo "$as_me:6857: 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.
+@@ -6894,13 +6898,13 @@
+ fi;
+ fi;
+
+-echo "$as_me:6897: result: $cf_cv_screen" >&5
++echo "$as_me:6901: result: $cf_cv_screen" >&5
+ echo "${ECHO_T}$cf_cv_screen" >&6
+
+ case $cf_cv_screen in
+ (curses|curses_*)
+
+-echo "$as_me:6903: checking for extra include directories" >&5
++echo "$as_me:6907: 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
+@@ -6926,7 +6930,7 @@
+ esac
+
+ fi
+-echo "$as_me:6929: result: $cf_cv_curses_incdir" >&5
++echo "$as_me:6933: result: $cf_cv_curses_incdir" >&5
+ echo "${ECHO_T}$cf_cv_curses_incdir" >&6
+ if test "$cf_cv_curses_incdir" != no
+ then
+@@ -6936,7 +6940,7 @@
+
+ fi
+
+-echo "$as_me:6939: checking if we have identified curses headers" >&5
++echo "$as_me:6943: 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
+@@ -6948,7 +6952,7 @@
+ curses.h ncurses/ncurses.h ncurses/curses.h
+ do
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 6951 "configure"
++#line 6955 "configure"
+ #include "confdefs.h"
+ #include <${cf_header}>
+ int
+@@ -6960,16 +6964,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:6963: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:6967: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:6966: \$? = $ac_status" >&5
++ echo "$as_me:6970: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:6969: \"$ac_try\"") >&5
++ { (eval echo "$as_me:6973: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:6972: \$? = $ac_status" >&5
++ echo "$as_me:6976: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_ncurses_header=$cf_header; break
+ else
+@@ -6980,11 +6984,11 @@
+ done
+
+ fi
+-echo "$as_me:6983: result: $cf_cv_ncurses_header" >&5
++echo "$as_me:6987: 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:6987: error: No curses header-files found" >&5
++ { { echo "$as_me:6991: error: No curses header-files found" >&5
+ echo "$as_me: error: No curses header-files found" >&2;}
+ { (exit 1); exit 1; }; }
+ fi
+@@ -6994,23 +6998,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:6997: checking for $ac_header" >&5
++echo "$as_me:7001: 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 7003 "configure"
++#line 7007 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:7007: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:7011: \"$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:7013: \$? = $ac_status" >&5
++ echo "$as_me:7017: \$? = $ac_status" >&5
+ (exit "$ac_status"); } >/dev/null; then
+ if test -s conftest.err; then
+ ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -7029,7 +7033,7 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:7032: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
++echo "$as_me:7036: 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
+@@ -7039,7 +7043,7 @@
+ fi
+ done
+
+-echo "$as_me:7042: checking for terminfo header" >&5
++echo "$as_me:7046: 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
+@@ -7057,7 +7061,7 @@
+ for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h"
+ do
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 7060 "configure"
++#line 7064 "configure"
+ #include "confdefs.h"
+ #include <stdio.h>
+ #include <${cf_cv_ncurses_header:-curses.h}>
+@@ -7072,16 +7076,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:7075: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:7079: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:7078: \$? = $ac_status" >&5
++ echo "$as_me:7082: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:7081: \"$ac_try\"") >&5
++ { (eval echo "$as_me:7085: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:7084: \$? = $ac_status" >&5
++ echo "$as_me:7088: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+
+ cf_cv_term_header="$cf_test"
+@@ -7097,7 +7101,7 @@
+ done
+
+ fi
+-echo "$as_me:7100: result: $cf_cv_term_header" >&5
++echo "$as_me:7104: result: $cf_cv_term_header" >&5
+ echo "${ECHO_T}$cf_cv_term_header" >&6
+
+ # Set definitions to allow ifdef'ing to accommodate subdirectories
+@@ -7129,7 +7133,7 @@
+ ;;
+ esac
+
+-echo "$as_me:7132: checking for ncurses version" >&5
++echo "$as_me:7136: 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
+@@ -7155,10 +7159,10 @@
+ #endif
+ EOF
+ cf_try="$ac_cpp conftest.$ac_ext 2>&5 | grep '^Autoconf ' >conftest.out"
+- { (eval echo "$as_me:7158: \"$cf_try\"") >&5
++ { (eval echo "$as_me:7162: \"$cf_try\"") >&5
+ (eval $cf_try) 2>&5
+ ac_status=$?
+- echo "$as_me:7161: \$? = $ac_status" >&5
++ echo "$as_me:7165: \$? = $ac_status" >&5
+ (exit "$ac_status"); }
+ if test -f conftest.out ; then
+ cf_out=`sed -e 's%^Autoconf %%' -e 's%^[^"]*"%%' -e 's%".*%%' conftest.out`
+@@ -7168,7 +7172,7 @@
+
+ else
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 7171 "configure"
++#line 7175 "configure"
+ #include "confdefs.h"
+
+ $ac_includes_default
+@@ -7195,15 +7199,15 @@
+ }
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:7198: \"$ac_link\"") >&5
++if { (eval echo "$as_me:7202: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:7201: \$? = $ac_status" >&5
++ echo "$as_me:7205: \$? = $ac_status" >&5
+ (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+- { (eval echo "$as_me:7203: \"$ac_try\"") >&5
++ { (eval echo "$as_me:7207: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:7206: \$? = $ac_status" >&5
++ echo "$as_me:7210: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+
+ cf_cv_ncurses_version=`cat $cf_tempfile`
+@@ -7217,17 +7221,17 @@
+ rm -f "$cf_tempfile"
+
+ fi
+-echo "$as_me:7220: result: $cf_cv_ncurses_version" >&5
++echo "$as_me:7224: 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:7227: checking if we have identified curses libraries" >&5
++echo "$as_me:7231: 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 7230 "configure"
++#line 7234 "configure"
+ #include "confdefs.h"
+ #include <${cf_cv_ncurses_header:-curses.h}>
+ int
+@@ -7239,16 +7243,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:7242: \"$ac_link\"") >&5
++if { (eval echo "$as_me:7246: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:7245: \$? = $ac_status" >&5
++ echo "$as_me:7249: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:7248: \"$ac_try\"") >&5
++ { (eval echo "$as_me:7252: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:7251: \$? = $ac_status" >&5
++ echo "$as_me:7255: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_result=yes
+ else
+@@ -7257,13 +7261,13 @@
+ cf_result=no
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+-echo "$as_me:7260: result: $cf_result" >&5
++echo "$as_me:7264: result: $cf_result" >&5
+ echo "${ECHO_T}$cf_result" >&6
+
+ if test "$cf_result" = no ; then
+ case "$host_os" in
+ (freebsd*)
+- echo "$as_me:7266: checking for tgoto in -lmytinfo" >&5
++ echo "$as_me:7270: 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
+@@ -7271,7 +7275,7 @@
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lmytinfo $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 7274 "configure"
++#line 7278 "configure"
+ #include "confdefs.h"
+
+ /* Override any gcc2 internal prototype to avoid an error. */
+@@ -7290,16 +7294,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:7293: \"$ac_link\"") >&5
++if { (eval echo "$as_me:7297: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:7296: \$? = $ac_status" >&5
++ echo "$as_me:7300: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:7299: \"$ac_try\"") >&5
++ { (eval echo "$as_me:7303: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:7302: \$? = $ac_status" >&5
++ echo "$as_me:7306: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_lib_mytinfo_tgoto=yes
+ else
+@@ -7310,7 +7314,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:7313: result: $ac_cv_lib_mytinfo_tgoto" >&5
++echo "$as_me:7317: 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
+
+@@ -7340,7 +7344,7 @@
+ # term.h) for cur_colr
+ if test "x$cf_cv_screen" = "xcurses_colr"
+ then
+- echo "$as_me:7343: checking for initscr in -lcur_colr" >&5
++ echo "$as_me:7347: 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
+@@ -7348,7 +7352,7 @@
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lcur_colr $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 7351 "configure"
++#line 7355 "configure"
+ #include "confdefs.h"
+
+ /* Override any gcc2 internal prototype to avoid an error. */
+@@ -7367,16 +7371,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:7370: \"$ac_link\"") >&5
++if { (eval echo "$as_me:7374: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:7373: \$? = $ac_status" >&5
++ echo "$as_me:7377: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:7376: \"$ac_try\"") >&5
++ { (eval echo "$as_me:7380: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:7379: \$? = $ac_status" >&5
++ echo "$as_me:7383: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_lib_cur_colr_initscr=yes
+ else
+@@ -7387,7 +7391,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:7390: result: $ac_cv_lib_cur_colr_initscr" >&5
++echo "$as_me:7394: 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
+
+@@ -7411,7 +7415,7 @@
+
+ else
+
+- echo "$as_me:7414: checking for initscr in -lHcurses" >&5
++ echo "$as_me:7418: 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
+@@ -7419,7 +7423,7 @@
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lHcurses $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 7422 "configure"
++#line 7426 "configure"
+ #include "confdefs.h"
+
+ /* Override any gcc2 internal prototype to avoid an error. */
+@@ -7438,16 +7442,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:7441: \"$ac_link\"") >&5
++if { (eval echo "$as_me:7445: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:7444: \$? = $ac_status" >&5
++ echo "$as_me:7448: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:7447: \"$ac_try\"") >&5
++ { (eval echo "$as_me:7451: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:7450: \$? = $ac_status" >&5
++ echo "$as_me:7454: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_lib_Hcurses_initscr=yes
+ else
+@@ -7458,7 +7462,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:7461: result: $ac_cv_lib_Hcurses_initscr" >&5
++echo "$as_me:7465: 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
+
+@@ -7516,7 +7520,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}:7519: testing adding $cf_add_libdir to library-path ..." 1>&5
++echo "${as_me:-configure}:7523: testing adding $cf_add_libdir to library-path ..." 1>&5
+
+ LDFLAGS="-L$cf_add_libdir $LDFLAGS"
+ fi
+@@ -7545,7 +7549,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}:7548: testing adding $cf_add_libdir to library-path ..." 1>&5
++echo "${as_me:-configure}:7552: testing adding $cf_add_libdir to library-path ..." 1>&5
+
+ LDFLAGS="-L$cf_add_libdir $LDFLAGS"
+ fi
+@@ -7576,7 +7580,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}:7579: testing adding $cf_add_libdir to library-path ..." 1>&5
++echo "${as_me:-configure}:7583: testing adding $cf_add_libdir to library-path ..." 1>&5
+
+ LDFLAGS="-L$cf_add_libdir $LDFLAGS"
+ fi
+@@ -7611,7 +7615,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}:7614: testing adding $cf_add_libdir to library-path ..." 1>&5
++echo "${as_me:-configure}:7618: testing adding $cf_add_libdir to library-path ..." 1>&5
+
+ LDFLAGS="-L$cf_add_libdir $LDFLAGS"
+ fi
+@@ -7655,13 +7659,13 @@
+ # because it may be needed to link the test-case for initscr.
+ if test "x$cf_term_lib" = x
+ then
+- echo "$as_me:7658: checking for tgoto" >&5
++ echo "$as_me:7662: 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 7664 "configure"
++#line 7668 "configure"
+ #include "confdefs.h"
+ #define tgoto autoconf_temporary
+ #include <limits.h> /* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -7692,16 +7696,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:7695: \"$ac_link\"") >&5
++if { (eval echo "$as_me:7699: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:7698: \$? = $ac_status" >&5
++ echo "$as_me:7702: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:7701: \"$ac_try\"") >&5
++ { (eval echo "$as_me:7705: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:7704: \$? = $ac_status" >&5
++ echo "$as_me:7708: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_func_tgoto=yes
+ else
+@@ -7711,7 +7715,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:7714: result: $ac_cv_func_tgoto" >&5
++echo "$as_me:7718: 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
+@@ -7720,7 +7724,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:7723: checking for tgoto in -l$cf_term_lib" >&5
++echo "$as_me:7727: 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
+@@ -7728,7 +7732,7 @@
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-l$cf_term_lib $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 7731 "configure"
++#line 7735 "configure"
+ #include "confdefs.h"
+
+ /* Override any gcc2 internal prototype to avoid an error. */
+@@ -7747,16 +7751,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:7750: \"$ac_link\"") >&5
++if { (eval echo "$as_me:7754: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:7753: \$? = $ac_status" >&5
++ echo "$as_me:7757: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:7756: \"$ac_try\"") >&5
++ { (eval echo "$as_me:7760: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:7759: \$? = $ac_status" >&5
++ echo "$as_me:7763: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ eval "$as_ac_Lib=yes"
+ else
+@@ -7767,7 +7771,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:7770: result: `eval echo '${'"$as_ac_Lib"'}'`" >&5
++echo "$as_me:7774: 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
+
+@@ -7790,10 +7794,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:7793: checking if we can link with $cf_curs_lib library" >&5
++ echo "$as_me:7797: 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 7796 "configure"
++#line 7800 "configure"
+ #include "confdefs.h"
+ #include <${cf_cv_ncurses_header:-curses.h}>
+ int
+@@ -7805,16 +7809,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:7808: \"$ac_link\"") >&5
++if { (eval echo "$as_me:7812: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:7811: \$? = $ac_status" >&5
++ echo "$as_me:7815: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:7814: \"$ac_try\"") >&5
++ { (eval echo "$as_me:7818: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:7817: \$? = $ac_status" >&5
++ echo "$as_me:7821: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_result=yes
+ else
+@@ -7823,16 +7827,16 @@
+ cf_result=no
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+- echo "$as_me:7826: result: $cf_result" >&5
++ echo "$as_me:7830: 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:7832: checking if we need both $cf_curs_lib and $cf_term_lib libraries" >&5
++ echo "$as_me:7836: 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 7835 "configure"
++#line 7839 "configure"
+ #include "confdefs.h"
+ #include <${cf_cv_ncurses_header:-curses.h}>
+ int
+@@ -7844,16 +7848,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:7847: \"$ac_link\"") >&5
++if { (eval echo "$as_me:7851: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:7850: \$? = $ac_status" >&5
++ echo "$as_me:7854: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:7853: \"$ac_try\"") >&5
++ { (eval echo "$as_me:7857: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:7856: \$? = $ac_status" >&5
++ echo "$as_me:7860: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_result=no
+ else
+@@ -7862,7 +7866,7 @@
+
+ LIBS="-l$cf_curs_lib -l$cf_term_lib $cf_save_LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 7865 "configure"
++#line 7869 "configure"
+ #include "confdefs.h"
+ #include <${cf_cv_ncurses_header:-curses.h}>
+ int
+@@ -7874,16 +7878,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:7877: \"$ac_link\"") >&5
++if { (eval echo "$as_me:7881: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:7880: \$? = $ac_status" >&5
++ echo "$as_me:7884: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:7883: \"$ac_try\"") >&5
++ { (eval echo "$as_me:7887: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:7886: \$? = $ac_status" >&5
++ echo "$as_me:7890: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_result=yes
+ else
+@@ -7895,13 +7899,13 @@
+
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+- echo "$as_me:7898: result: $cf_result" >&5
++ echo "$as_me:7902: 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:7904: error: no curses library found" >&5
++ test "$cf_curs_lib" = unknown && { { echo "$as_me:7908: error: no curses library found" >&5
+ echo "$as_me: error: no curses library found" >&2;}
+ { (exit 1); exit 1; }; }
+ fi
+@@ -7913,23 +7917,23 @@
+ for ac_header in wchar.h
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-echo "$as_me:7916: checking for $ac_header" >&5
++echo "$as_me:7920: 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 7922 "configure"
++#line 7926 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:7926: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:7930: \"$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:7932: \$? = $ac_status" >&5
++ echo "$as_me:7936: \$? = $ac_status" >&5
+ (exit "$ac_status"); } >/dev/null; then
+ if test -s conftest.err; then
+ ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -7948,7 +7952,7 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:7951: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
++echo "$as_me:7955: 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
+@@ -7958,7 +7962,7 @@
+ fi
+ done
+
+-echo "$as_me:7961: checking for multibyte character support" >&5
++echo "$as_me:7965: 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
+@@ -7966,7 +7970,7 @@
+
+ cf_save_LIBS="$LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 7969 "configure"
++#line 7973 "configure"
+ #include "confdefs.h"
+
+ $ac_includes_default
+@@ -7983,16 +7987,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:7986: \"$ac_link\"") >&5
++if { (eval echo "$as_me:7990: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:7989: \$? = $ac_status" >&5
++ echo "$as_me:7993: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:7992: \"$ac_try\"") >&5
++ { (eval echo "$as_me:7996: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:7995: \$? = $ac_status" >&5
++ echo "$as_me:7999: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_utf8_lib=yes
+ else
+@@ -8004,12 +8008,12 @@
+ cf_cv_header_path_utf8=
+ cf_cv_library_path_utf8=
+
+-echo "${as_me:-configure}:8007: testing Starting FIND_LINKAGE(utf8,) ..." 1>&5
++echo "${as_me:-configure}:8011: testing Starting FIND_LINKAGE(utf8,) ..." 1>&5
+
+ cf_save_LIBS="$LIBS"
+
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 8012 "configure"
++#line 8016 "configure"
+ #include "confdefs.h"
+
+ #include <libutf8.h>
+@@ -8022,16 +8026,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:8025: \"$ac_link\"") >&5
++if { (eval echo "$as_me:8029: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:8028: \$? = $ac_status" >&5
++ echo "$as_me:8032: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:8031: \"$ac_try\"") >&5
++ { (eval echo "$as_me:8035: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:8034: \$? = $ac_status" >&5
++ echo "$as_me:8038: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+
+ cf_cv_find_linkage_utf8=yes
+@@ -8045,7 +8049,7 @@
+ LIBS="-lutf8 $cf_save_LIBS"
+
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 8048 "configure"
++#line 8052 "configure"
+ #include "confdefs.h"
+
+ #include <libutf8.h>
+@@ -8058,16 +8062,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:8061: \"$ac_link\"") >&5
++if { (eval echo "$as_me:8065: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:8064: \$? = $ac_status" >&5
++ echo "$as_me:8068: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:8067: \"$ac_try\"") >&5
++ { (eval echo "$as_me:8071: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:8070: \$? = $ac_status" >&5
++ echo "$as_me:8074: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+
+ cf_cv_find_linkage_utf8=yes
+@@ -8084,9 +8088,9 @@
+
+ test -n "$verbose" && echo " find linkage for utf8 library" 1>&6
+
+-echo "${as_me:-configure}:8087: testing find linkage for utf8 library ..." 1>&5
++echo "${as_me:-configure}:8091: testing find linkage for utf8 library ..." 1>&5
+
+-echo "${as_me:-configure}:8089: testing Searching for headers in FIND_LINKAGE(utf8,) ..." 1>&5
++echo "${as_me:-configure}:8093: testing Searching for headers in FIND_LINKAGE(utf8,) ..." 1>&5
+
+ cf_save_CPPFLAGS="$CPPFLAGS"
+ cf_test_CPPFLAGS="$CPPFLAGS"
+@@ -8177,7 +8181,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}:8180: testing ... testing $cf_cv_header_path_utf8 ..." 1>&5
++echo "${as_me:-configure}:8184: testing ... testing $cf_cv_header_path_utf8 ..." 1>&5
+
+ CPPFLAGS="$cf_save_CPPFLAGS"
+
+@@ -8185,7 +8189,7 @@
+ CPPFLAGS="${CPPFLAGS}-I$cf_cv_header_path_utf8"
+
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 8188 "configure"
++#line 8192 "configure"
+ #include "confdefs.h"
+
+ #include <libutf8.h>
+@@ -8198,21 +8202,21 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:8201: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:8205: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:8204: \$? = $ac_status" >&5
++ echo "$as_me:8208: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:8207: \"$ac_try\"") >&5
++ { (eval echo "$as_me:8211: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:8210: \$? = $ac_status" >&5
++ echo "$as_me:8214: \$? = $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}:8215: testing ... found utf8 headers in $cf_cv_header_path_utf8 ..." 1>&5
++echo "${as_me:-configure}:8219: testing ... found utf8 headers in $cf_cv_header_path_utf8 ..." 1>&5
+
+ cf_cv_find_linkage_utf8=maybe
+ cf_test_CPPFLAGS="$CPPFLAGS"
+@@ -8230,7 +8234,7 @@
+
+ if test "$cf_cv_find_linkage_utf8" = maybe ; then
+
+-echo "${as_me:-configure}:8233: testing Searching for utf8 library in FIND_LINKAGE(utf8,) ..." 1>&5
++echo "${as_me:-configure}:8237: testing Searching for utf8 library in FIND_LINKAGE(utf8,) ..." 1>&5
+
+ cf_save_LIBS="$LIBS"
+ cf_save_LDFLAGS="$LDFLAGS"
+@@ -8305,13 +8309,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}:8308: testing ... testing $cf_cv_library_path_utf8 ..." 1>&5
++echo "${as_me:-configure}:8312: 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 8314 "configure"
++#line 8318 "configure"
+ #include "confdefs.h"
+
+ #include <libutf8.h>
+@@ -8324,21 +8328,21 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:8327: \"$ac_link\"") >&5
++if { (eval echo "$as_me:8331: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:8330: \$? = $ac_status" >&5
++ echo "$as_me:8334: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:8333: \"$ac_try\"") >&5
++ { (eval echo "$as_me:8337: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:8336: \$? = $ac_status" >&5
++ echo "$as_me:8340: \$? = $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}:8341: testing ... found utf8 library in $cf_cv_library_path_utf8 ..." 1>&5
++echo "${as_me:-configure}:8345: testing ... found utf8 library in $cf_cv_library_path_utf8 ..." 1>&5
+
+ cf_cv_find_linkage_utf8=yes
+ cf_cv_library_file_utf8="-lutf8"
+@@ -8380,7 +8384,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:8383: result: $cf_cv_utf8_lib" >&5
++echo "$as_me:8387: 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
+@@ -8418,7 +8422,7 @@
+ CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
+
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 8421 "configure"
++#line 8425 "configure"
+ #include "confdefs.h"
+ #include <stdio.h>
+ int
+@@ -8430,16 +8434,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:8433: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:8437: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:8436: \$? = $ac_status" >&5
++ echo "$as_me:8440: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:8439: \"$ac_try\"") >&5
++ { (eval echo "$as_me:8443: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:8442: \$? = $ac_status" >&5
++ echo "$as_me:8446: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ :
+ else
+@@ -8456,7 +8460,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}:8459: testing adding $cf_add_incdir to include-path ..." 1>&5
++echo "${as_me:-configure}:8463: testing adding $cf_add_incdir to include-path ..." 1>&5
+
+ CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
+
+@@ -8492,7 +8496,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}:8495: testing adding $cf_add_libdir to library-path ..." 1>&5
++echo "${as_me:-configure}:8499: testing adding $cf_add_libdir to library-path ..." 1>&5
+
+ LDFLAGS="-L$cf_add_libdir $LDFLAGS"
+ fi
+@@ -8522,13 +8526,13 @@
+ cf_have_ncuconfig=no
+
+ if test "x${PKG_CONFIG:=none}" != xnone; then
+- echo "$as_me:8525: checking pkg-config for $cf_ncuconfig_root" >&5
++ echo "$as_me:8529: 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:8528: result: yes" >&5
++ echo "$as_me:8532: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+
+- echo "$as_me:8531: checking if the $cf_ncuconfig_root package files work" >&5
++ echo "$as_me:8535: 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
+
+@@ -8661,7 +8665,7 @@
+ LIBS="$cf_add_libs"
+
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 8664 "configure"
++#line 8668 "configure"
+ #include "confdefs.h"
+ #include <${cf_cv_ncurses_header:-curses.h}>
+ int
+@@ -8673,37 +8677,37 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:8676: \"$ac_link\"") >&5
++if { (eval echo "$as_me:8680: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:8679: \$? = $ac_status" >&5
++ echo "$as_me:8683: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:8682: \"$ac_try\"") >&5
++ { (eval echo "$as_me:8686: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:8685: \$? = $ac_status" >&5
++ echo "$as_me:8689: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ if test "$cross_compiling" = yes; then
+ cf_test_ncuconfig=maybe
+ else
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 8691 "configure"
++#line 8695 "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:8698: \"$ac_link\"") >&5
++if { (eval echo "$as_me:8702: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:8701: \$? = $ac_status" >&5
++ echo "$as_me:8705: \$? = $ac_status" >&5
+ (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+- { (eval echo "$as_me:8703: \"$ac_try\"") >&5
++ { (eval echo "$as_me:8707: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:8706: \$? = $ac_status" >&5
++ echo "$as_me:8710: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_test_ncuconfig=yes
+ else
+@@ -8877,7 +8881,7 @@
+ LIBS="$cf_add_libs"
+
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 8880 "configure"
++#line 8884 "configure"
+ #include "confdefs.h"
+ #include <${cf_cv_ncurses_header:-curses.h}>
+ int
+@@ -8889,37 +8893,37 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:8892: \"$ac_link\"") >&5
++if { (eval echo "$as_me:8896: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:8895: \$? = $ac_status" >&5
++ echo "$as_me:8899: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:8898: \"$ac_try\"") >&5
++ { (eval echo "$as_me:8902: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:8901: \$? = $ac_status" >&5
++ echo "$as_me:8905: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ if test "$cross_compiling" = yes; then
+ cf_have_ncuconfig=maybe
+ else
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 8907 "configure"
++#line 8911 "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:8914: \"$ac_link\"") >&5
++if { (eval echo "$as_me:8918: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:8917: \$? = $ac_status" >&5
++ echo "$as_me:8921: \$? = $ac_status" >&5
+ (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+- { (eval echo "$as_me:8919: \"$ac_try\"") >&5
++ { (eval echo "$as_me:8923: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:8922: \$? = $ac_status" >&5
++ echo "$as_me:8926: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_have_ncuconfig=yes
+ else
+@@ -8936,7 +8940,7 @@
+ cf_have_ncuconfig=no
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+- echo "$as_me:8939: result: $cf_have_ncuconfig" >&5
++ echo "$as_me:8943: 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"
+@@ -8952,7 +8956,7 @@
+
+ NCURSES_CONFIG_PKG=$cf_ncuconfig_root
+
+-echo "$as_me:8955: checking for terminfo header" >&5
++echo "$as_me:8959: 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
+@@ -8970,7 +8974,7 @@
+ for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h"
+ do
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 8973 "configure"
++#line 8977 "configure"
+ #include "confdefs.h"
+ #include <stdio.h>
+ #include <${cf_cv_ncurses_header:-curses.h}>
+@@ -8985,16 +8989,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:8988: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:8992: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:8991: \$? = $ac_status" >&5
++ echo "$as_me:8995: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:8994: \"$ac_try\"") >&5
++ { (eval echo "$as_me:8998: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:8997: \$? = $ac_status" >&5
++ echo "$as_me:9001: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+
+ cf_cv_term_header="$cf_test"
+@@ -9010,7 +9014,7 @@
+ done
+
+ fi
+-echo "$as_me:9013: result: $cf_cv_term_header" >&5
++echo "$as_me:9017: result: $cf_cv_term_header" >&5
+ echo "${ECHO_T}$cf_cv_term_header" >&6
+
+ # Set definitions to allow ifdef'ing to accommodate subdirectories
+@@ -9045,7 +9049,7 @@
+ fi
+
+ else
+- echo "$as_me:9048: result: no" >&5
++ echo "$as_me:9052: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ NCURSES_CONFIG_PKG=none
+ fi
+@@ -9061,7 +9065,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:9064: checking for $ac_word" >&5
++echo "$as_me:9068: 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
+@@ -9076,7 +9080,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:9079: found $ac_dir/$ac_word" >&5
++echo "$as_me:9083: found $ac_dir/$ac_word" >&5
+ break
+ done
+
+@@ -9084,10 +9088,10 @@
+ fi
+ NCURSES_CONFIG=$ac_cv_prog_NCURSES_CONFIG
+ if test -n "$NCURSES_CONFIG"; then
+- echo "$as_me:9087: result: $NCURSES_CONFIG" >&5
++ echo "$as_me:9091: result: $NCURSES_CONFIG" >&5
+ echo "${ECHO_T}$NCURSES_CONFIG" >&6
+ else
+- echo "$as_me:9090: result: no" >&5
++ echo "$as_me:9094: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+
+@@ -9100,7 +9104,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:9103: checking for $ac_word" >&5
++echo "$as_me:9107: 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
+@@ -9115,7 +9119,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:9118: found $ac_dir/$ac_word" >&5
++echo "$as_me:9122: found $ac_dir/$ac_word" >&5
+ break
+ done
+
+@@ -9123,10 +9127,10 @@
+ fi
+ ac_ct_NCURSES_CONFIG=$ac_cv_prog_ac_ct_NCURSES_CONFIG
+ if test -n "$ac_ct_NCURSES_CONFIG"; then
+- echo "$as_me:9126: result: $ac_ct_NCURSES_CONFIG" >&5
++ echo "$as_me:9130: result: $ac_ct_NCURSES_CONFIG" >&5
+ echo "${ECHO_T}$ac_ct_NCURSES_CONFIG" >&6
+ else
+- echo "$as_me:9129: result: no" >&5
++ echo "$as_me:9133: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+
+@@ -9283,7 +9287,7 @@
+
+ # even with config script, some packages use no-override for curses.h
+
+-echo "$as_me:9286: checking if we have identified curses headers" >&5
++echo "$as_me:9290: 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
+@@ -9295,7 +9299,7 @@
+ curses.h $cf_cv_screen/curses.h
+ do
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 9298 "configure"
++#line 9302 "configure"
+ #include "confdefs.h"
+ #include <${cf_header}>
+ int
+@@ -9307,16 +9311,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:9310: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:9314: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:9313: \$? = $ac_status" >&5
++ echo "$as_me:9317: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:9316: \"$ac_try\"") >&5
++ { (eval echo "$as_me:9320: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:9319: \$? = $ac_status" >&5
++ echo "$as_me:9323: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_ncurses_header=$cf_header; break
+ else
+@@ -9327,11 +9331,11 @@
+ done
+
+ fi
+-echo "$as_me:9330: result: $cf_cv_ncurses_header" >&5
++echo "$as_me:9334: 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:9334: error: No curses header-files found" >&5
++ { { echo "$as_me:9338: error: No curses header-files found" >&5
+ echo "$as_me: error: No curses header-files found" >&2;}
+ { (exit 1); exit 1; }; }
+ fi
+@@ -9341,23 +9345,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:9344: checking for $ac_header" >&5
++echo "$as_me:9348: 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 9350 "configure"
++#line 9354 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:9354: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:9358: \"$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:9360: \$? = $ac_status" >&5
++ echo "$as_me:9364: \$? = $ac_status" >&5
+ (exit "$ac_status"); } >/dev/null; then
+ if test -s conftest.err; then
+ ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -9376,7 +9380,7 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:9379: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
++echo "$as_me:9383: 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
+@@ -9432,7 +9436,7 @@
+ CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
+
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 9435 "configure"
++#line 9439 "configure"
+ #include "confdefs.h"
+ #include <stdio.h>
+ int
+@@ -9444,16 +9448,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:9447: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:9451: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:9450: \$? = $ac_status" >&5
++ echo "$as_me:9454: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:9453: \"$ac_try\"") >&5
++ { (eval echo "$as_me:9457: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:9456: \$? = $ac_status" >&5
++ echo "$as_me:9460: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ :
+ else
+@@ -9470,7 +9474,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}:9473: testing adding $cf_add_incdir to include-path ..." 1>&5
++echo "${as_me:-configure}:9477: testing adding $cf_add_incdir to include-path ..." 1>&5
+
+ CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
+
+@@ -9489,7 +9493,7 @@
+
+ }
+
+-echo "$as_me:9492: checking for $cf_ncuhdr_root header in include-path" >&5
++echo "$as_me:9496: 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
+@@ -9501,7 +9505,7 @@
+ do
+
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 9504 "configure"
++#line 9508 "configure"
+ #include "confdefs.h"
+
+ #include <$cf_header>
+@@ -9525,16 +9529,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:9528: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:9532: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:9531: \$? = $ac_status" >&5
++ echo "$as_me:9535: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:9534: \"$ac_try\"") >&5
++ { (eval echo "$as_me:9538: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:9537: \$? = $ac_status" >&5
++ echo "$as_me:9541: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_ncurses_h=$cf_header
+
+@@ -9549,14 +9553,14 @@
+ done
+
+ fi
+-echo "$as_me:9552: result: $cf_cv_ncurses_h" >&5
++echo "$as_me:9556: 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:9559: checking for $cf_ncuhdr_root include-path" >&5
++echo "$as_me:9563: 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
+@@ -9677,7 +9681,7 @@
+ CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
+
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 9680 "configure"
++#line 9684 "configure"
+ #include "confdefs.h"
+ #include <stdio.h>
+ int
+@@ -9689,16 +9693,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:9692: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:9696: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:9695: \$? = $ac_status" >&5
++ echo "$as_me:9699: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:9698: \"$ac_try\"") >&5
++ { (eval echo "$as_me:9702: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:9701: \$? = $ac_status" >&5
++ echo "$as_me:9705: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ :
+ else
+@@ -9715,7 +9719,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}:9718: testing adding $cf_add_incdir to include-path ..." 1>&5
++echo "${as_me:-configure}:9722: testing adding $cf_add_incdir to include-path ..." 1>&5
+
+ CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
+
+@@ -9738,7 +9742,7 @@
+ do
+
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 9741 "configure"
++#line 9745 "configure"
+ #include "confdefs.h"
+
+ #include <$cf_header>
+@@ -9762,16 +9766,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:9765: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:9769: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:9768: \$? = $ac_status" >&5
++ echo "$as_me:9772: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:9771: \"$ac_try\"") >&5
++ { (eval echo "$as_me:9775: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:9774: \$? = $ac_status" >&5
++ echo "$as_me:9778: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_ncurses_h2=$cf_header
+
+@@ -9792,12 +9796,12 @@
+ CPPFLAGS="$cf_save2_CPPFLAGS"
+ test "$cf_cv_ncurses_h2" != no && break
+ done
+- test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:9795: error: not found" >&5
++ test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:9799: error: not found" >&5
+ echo "$as_me: error: not found" >&2;}
+ { (exit 1); exit 1; }; }
+
+ fi
+-echo "$as_me:9800: result: $cf_cv_ncurses_h2" >&5
++echo "$as_me:9804: 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%/[^/]*$%%'`
+@@ -9833,7 +9837,7 @@
+ CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
+
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 9836 "configure"
++#line 9840 "configure"
+ #include "confdefs.h"
+ #include <stdio.h>
+ int
+@@ -9845,16 +9849,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:9848: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:9852: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:9851: \$? = $ac_status" >&5
++ echo "$as_me:9855: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:9854: \"$ac_try\"") >&5
++ { (eval echo "$as_me:9858: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:9857: \$? = $ac_status" >&5
++ echo "$as_me:9861: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ :
+ else
+@@ -9871,7 +9875,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}:9874: testing adding $cf_add_incdir to include-path ..." 1>&5
++echo "${as_me:-configure}:9878: testing adding $cf_add_incdir to include-path ..." 1>&5
+
+ CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
+
+@@ -9919,7 +9923,7 @@
+ ;;
+ esac
+
+-echo "$as_me:9922: checking for terminfo header" >&5
++echo "$as_me:9926: 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
+@@ -9937,7 +9941,7 @@
+ for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h"
+ do
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 9940 "configure"
++#line 9944 "configure"
+ #include "confdefs.h"
+ #include <stdio.h>
+ #include <${cf_cv_ncurses_header:-curses.h}>
+@@ -9952,16 +9956,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:9955: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:9959: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:9958: \$? = $ac_status" >&5
++ echo "$as_me:9962: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:9961: \"$ac_try\"") >&5
++ { (eval echo "$as_me:9965: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:9964: \$? = $ac_status" >&5
++ echo "$as_me:9968: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+
+ cf_cv_term_header="$cf_test"
+@@ -9977,7 +9981,7 @@
+ done
+
+ fi
+-echo "$as_me:9980: result: $cf_cv_term_header" >&5
++echo "$as_me:9984: result: $cf_cv_term_header" >&5
+ echo "${ECHO_T}$cf_cv_term_header" >&6
+
+ # Set definitions to allow ifdef'ing to accommodate subdirectories
+@@ -10015,7 +10019,7 @@
+ #define NCURSES 1
+ EOF
+
+-echo "$as_me:10018: checking for ncurses version" >&5
++echo "$as_me:10022: 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
+@@ -10041,10 +10045,10 @@
+ #endif
+ EOF
+ cf_try="$ac_cpp conftest.$ac_ext 2>&5 | grep '^Autoconf ' >conftest.out"
+- { (eval echo "$as_me:10044: \"$cf_try\"") >&5
++ { (eval echo "$as_me:10048: \"$cf_try\"") >&5
+ (eval $cf_try) 2>&5
+ ac_status=$?
+- echo "$as_me:10047: \$? = $ac_status" >&5
++ echo "$as_me:10051: \$? = $ac_status" >&5
+ (exit "$ac_status"); }
+ if test -f conftest.out ; then
+ cf_out=`sed -e 's%^Autoconf %%' -e 's%^[^"]*"%%' -e 's%".*%%' conftest.out`
+@@ -10054,7 +10058,7 @@
+
+ else
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 10057 "configure"
++#line 10061 "configure"
+ #include "confdefs.h"
+
+ $ac_includes_default
+@@ -10081,15 +10085,15 @@
+ }
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:10084: \"$ac_link\"") >&5
++if { (eval echo "$as_me:10088: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:10087: \$? = $ac_status" >&5
++ echo "$as_me:10091: \$? = $ac_status" >&5
+ (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+- { (eval echo "$as_me:10089: \"$ac_try\"") >&5
++ { (eval echo "$as_me:10093: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:10092: \$? = $ac_status" >&5
++ echo "$as_me:10096: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+
+ cf_cv_ncurses_version=`cat $cf_tempfile`
+@@ -10103,7 +10107,7 @@
+ rm -f "$cf_tempfile"
+
+ fi
+-echo "$as_me:10106: result: $cf_cv_ncurses_version" >&5
++echo "$as_me:10110: result: $cf_cv_ncurses_version" >&5
+ echo "${ECHO_T}$cf_cv_ncurses_version" >&6
+ test "$cf_cv_ncurses_version" = no ||
+ cat >>confdefs.h <<\EOF
+@@ -10116,7 +10120,7 @@
+ # to link gpm.
+ cf_ncurses_LIBS=""
+ cf_ncurses_SAVE="$LIBS"
+-echo "$as_me:10119: checking for Gpm_Open in -lgpm" >&5
++echo "$as_me:10123: 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
+@@ -10124,7 +10128,7 @@
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lgpm $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 10127 "configure"
++#line 10131 "configure"
+ #include "confdefs.h"
+
+ /* Override any gcc2 internal prototype to avoid an error. */
+@@ -10143,16 +10147,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:10146: \"$ac_link\"") >&5
++if { (eval echo "$as_me:10150: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:10149: \$? = $ac_status" >&5
++ echo "$as_me:10153: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:10152: \"$ac_try\"") >&5
++ { (eval echo "$as_me:10156: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:10155: \$? = $ac_status" >&5
++ echo "$as_me:10159: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_lib_gpm_Gpm_Open=yes
+ else
+@@ -10163,10 +10167,10 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:10166: result: $ac_cv_lib_gpm_Gpm_Open" >&5
++echo "$as_me:10170: 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:10169: checking for initscr in -lgpm" >&5
++ echo "$as_me:10173: 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
+@@ -10174,7 +10178,7 @@
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lgpm $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 10177 "configure"
++#line 10181 "configure"
+ #include "confdefs.h"
+
+ /* Override any gcc2 internal prototype to avoid an error. */
+@@ -10193,16 +10197,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:10196: \"$ac_link\"") >&5
++if { (eval echo "$as_me:10200: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:10199: \$? = $ac_status" >&5
++ echo "$as_me:10203: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:10202: \"$ac_try\"") >&5
++ { (eval echo "$as_me:10206: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:10205: \$? = $ac_status" >&5
++ echo "$as_me:10209: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_lib_gpm_initscr=yes
+ else
+@@ -10213,7 +10217,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:10216: result: $ac_cv_lib_gpm_initscr" >&5
++echo "$as_me:10220: 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"
+@@ -10228,7 +10232,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:10231: checking for tgoto in -lmytinfo" >&5
++ echo "$as_me:10235: 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
+@@ -10236,7 +10240,7 @@
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lmytinfo $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 10239 "configure"
++#line 10243 "configure"
+ #include "confdefs.h"
+
+ /* Override any gcc2 internal prototype to avoid an error. */
+@@ -10255,16 +10259,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:10258: \"$ac_link\"") >&5
++if { (eval echo "$as_me:10262: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:10261: \$? = $ac_status" >&5
++ echo "$as_me:10265: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:10264: \"$ac_try\"") >&5
++ { (eval echo "$as_me:10268: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:10267: \$? = $ac_status" >&5
++ echo "$as_me:10271: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_lib_mytinfo_tgoto=yes
+ else
+@@ -10275,7 +10279,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:10278: result: $ac_cv_lib_mytinfo_tgoto" >&5
++echo "$as_me:10282: 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"
+@@ -10324,13 +10328,13 @@
+
+ eval 'cf_cv_have_lib_'"$cf_nculib_root"'=no'
+ cf_libdir=""
+- echo "$as_me:10327: checking for initscr" >&5
++ echo "$as_me:10331: 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 10333 "configure"
++#line 10337 "configure"
+ #include "confdefs.h"
+ #define initscr autoconf_temporary
+ #include <limits.h> /* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -10361,16 +10365,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:10364: \"$ac_link\"") >&5
++if { (eval echo "$as_me:10368: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:10367: \$? = $ac_status" >&5
++ echo "$as_me:10371: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:10370: \"$ac_try\"") >&5
++ { (eval echo "$as_me:10374: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:10373: \$? = $ac_status" >&5
++ echo "$as_me:10377: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_func_initscr=yes
+ else
+@@ -10380,18 +10384,18 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:10383: result: $ac_cv_func_initscr" >&5
++echo "$as_me:10387: 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:10390: checking for initscr in -l$cf_nculib_root" >&5
++ echo "$as_me:10394: 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 10394 "configure"
++#line 10398 "configure"
+ #include "confdefs.h"
+ #include <${cf_cv_ncurses_header:-curses.h}>
+ int
+@@ -10403,25 +10407,25 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:10406: \"$ac_link\"") >&5
++if { (eval echo "$as_me:10410: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:10409: \$? = $ac_status" >&5
++ echo "$as_me:10413: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:10412: \"$ac_try\"") >&5
++ { (eval echo "$as_me:10416: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:10415: \$? = $ac_status" >&5
++ echo "$as_me:10419: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+- echo "$as_me:10417: result: yes" >&5
++ echo "$as_me:10421: 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:10424: result: no" >&5
++echo "$as_me:10428: result: no" >&5
+ echo "${ECHO_T}no" >&6
+
+ cf_search=
+@@ -10489,11 +10493,11 @@
+
+ for cf_libdir in $cf_search
+ do
+- echo "$as_me:10492: checking for -l$cf_nculib_root in $cf_libdir" >&5
++ echo "$as_me:10496: 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 10496 "configure"
++#line 10500 "configure"
+ #include "confdefs.h"
+ #include <${cf_cv_ncurses_header:-curses.h}>
+ int
+@@ -10505,25 +10509,25 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:10508: \"$ac_link\"") >&5
++if { (eval echo "$as_me:10512: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:10511: \$? = $ac_status" >&5
++ echo "$as_me:10515: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:10514: \"$ac_try\"") >&5
++ { (eval echo "$as_me:10518: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:10517: \$? = $ac_status" >&5
++ echo "$as_me:10521: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+- echo "$as_me:10519: result: yes" >&5
++ echo "$as_me:10523: 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:10526: result: no" >&5
++echo "$as_me:10530: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ LIBS="$cf_save_LIBS"
+ fi
+@@ -10538,7 +10542,7 @@
+ eval 'cf_found_library="$cf_cv_have_lib_'"$cf_nculib_root"\"
+
+ if test "$cf_found_library" = no ; then
+- { { echo "$as_me:10541: error: Cannot link $cf_nculib_root library" >&5
++ { { echo "$as_me:10545: error: Cannot link $cf_nculib_root library" >&5
+ echo "$as_me: error: Cannot link $cf_nculib_root library" >&2;}
+ { (exit 1); exit 1; }; }
+ fi
+@@ -10546,7 +10550,7 @@
+ fi
+
+ if test -n "$cf_ncurses_LIBS" ; then
+- echo "$as_me:10549: checking if we can link $cf_nculib_root without $cf_ncurses_LIBS" >&5
++ echo "$as_me:10553: 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
+@@ -10556,7 +10560,7 @@
+ fi
+ done
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 10559 "configure"
++#line 10563 "configure"
+ #include "confdefs.h"
+ #include <${cf_cv_ncurses_header:-curses.h}>
+ int
+@@ -10568,23 +10572,23 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:10571: \"$ac_link\"") >&5
++if { (eval echo "$as_me:10575: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:10574: \$? = $ac_status" >&5
++ echo "$as_me:10578: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:10577: \"$ac_try\"") >&5
++ { (eval echo "$as_me:10581: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:10580: \$? = $ac_status" >&5
++ echo "$as_me:10584: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+- echo "$as_me:10582: result: yes" >&5
++ echo "$as_me:10586: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ else
+ echo "$as_me: failed program was:" >&5
+ cat "conftest.$ac_ext" >&5
+-echo "$as_me:10587: result: no" >&5
++echo "$as_me:10591: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ LIBS="$cf_ncurses_SAVE"
+ fi
+@@ -10609,13 +10613,13 @@
+ cf_have_ncuconfig=no
+
+ if test "x${PKG_CONFIG:=none}" != xnone; then
+- echo "$as_me:10612: checking pkg-config for $cf_ncuconfig_root" >&5
++ echo "$as_me:10616: 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:10615: result: yes" >&5
++ echo "$as_me:10619: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+
+- echo "$as_me:10618: checking if the $cf_ncuconfig_root package files work" >&5
++ echo "$as_me:10622: 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
+
+@@ -10748,7 +10752,7 @@
+ LIBS="$cf_add_libs"
+
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 10751 "configure"
++#line 10755 "configure"
+ #include "confdefs.h"
+ #include <${cf_cv_ncurses_header:-curses.h}>
+ int
+@@ -10760,37 +10764,37 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:10763: \"$ac_link\"") >&5
++if { (eval echo "$as_me:10767: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:10766: \$? = $ac_status" >&5
++ echo "$as_me:10770: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:10769: \"$ac_try\"") >&5
++ { (eval echo "$as_me:10773: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:10772: \$? = $ac_status" >&5
++ echo "$as_me:10776: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ if test "$cross_compiling" = yes; then
+ cf_test_ncuconfig=maybe
+ else
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 10778 "configure"
++#line 10782 "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:10785: \"$ac_link\"") >&5
++if { (eval echo "$as_me:10789: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:10788: \$? = $ac_status" >&5
++ echo "$as_me:10792: \$? = $ac_status" >&5
+ (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+- { (eval echo "$as_me:10790: \"$ac_try\"") >&5
++ { (eval echo "$as_me:10794: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:10793: \$? = $ac_status" >&5
++ echo "$as_me:10797: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_test_ncuconfig=yes
+ else
+@@ -10964,7 +10968,7 @@
+ LIBS="$cf_add_libs"
+
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 10967 "configure"
++#line 10971 "configure"
+ #include "confdefs.h"
+ #include <${cf_cv_ncurses_header:-curses.h}>
+ int
+@@ -10976,37 +10980,37 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:10979: \"$ac_link\"") >&5
++if { (eval echo "$as_me:10983: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:10982: \$? = $ac_status" >&5
++ echo "$as_me:10986: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:10985: \"$ac_try\"") >&5
++ { (eval echo "$as_me:10989: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:10988: \$? = $ac_status" >&5
++ echo "$as_me:10992: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ if test "$cross_compiling" = yes; then
+ cf_have_ncuconfig=maybe
+ else
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 10994 "configure"
++#line 10998 "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:11001: \"$ac_link\"") >&5
++if { (eval echo "$as_me:11005: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:11004: \$? = $ac_status" >&5
++ echo "$as_me:11008: \$? = $ac_status" >&5
+ (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+- { (eval echo "$as_me:11006: \"$ac_try\"") >&5
++ { (eval echo "$as_me:11010: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:11009: \$? = $ac_status" >&5
++ echo "$as_me:11013: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_have_ncuconfig=yes
+ else
+@@ -11023,7 +11027,7 @@
+ cf_have_ncuconfig=no
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+- echo "$as_me:11026: result: $cf_have_ncuconfig" >&5
++ echo "$as_me:11030: 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"
+@@ -11039,7 +11043,7 @@
+
+ NCURSES_CONFIG_PKG=$cf_ncuconfig_root
+
+-echo "$as_me:11042: checking for terminfo header" >&5
++echo "$as_me:11046: 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
+@@ -11057,7 +11061,7 @@
+ for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h"
+ do
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 11060 "configure"
++#line 11064 "configure"
+ #include "confdefs.h"
+ #include <stdio.h>
+ #include <${cf_cv_ncurses_header:-curses.h}>
+@@ -11072,16 +11076,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:11075: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:11079: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:11078: \$? = $ac_status" >&5
++ echo "$as_me:11082: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:11081: \"$ac_try\"") >&5
++ { (eval echo "$as_me:11085: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:11084: \$? = $ac_status" >&5
++ echo "$as_me:11088: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+
+ cf_cv_term_header="$cf_test"
+@@ -11097,7 +11101,7 @@
+ done
+
+ fi
+-echo "$as_me:11100: result: $cf_cv_term_header" >&5
++echo "$as_me:11104: result: $cf_cv_term_header" >&5
+ echo "${ECHO_T}$cf_cv_term_header" >&6
+
+ # Set definitions to allow ifdef'ing to accommodate subdirectories
+@@ -11132,7 +11136,7 @@
+ fi
+
+ else
+- echo "$as_me:11135: result: no" >&5
++ echo "$as_me:11139: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ NCURSES_CONFIG_PKG=none
+ fi
+@@ -11148,7 +11152,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:11151: checking for $ac_word" >&5
++echo "$as_me:11155: 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
+@@ -11163,7 +11167,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:11166: found $ac_dir/$ac_word" >&5
++echo "$as_me:11170: found $ac_dir/$ac_word" >&5
+ break
+ done
+
+@@ -11171,10 +11175,10 @@
+ fi
+ NCURSES_CONFIG=$ac_cv_prog_NCURSES_CONFIG
+ if test -n "$NCURSES_CONFIG"; then
+- echo "$as_me:11174: result: $NCURSES_CONFIG" >&5
++ echo "$as_me:11178: result: $NCURSES_CONFIG" >&5
+ echo "${ECHO_T}$NCURSES_CONFIG" >&6
+ else
+- echo "$as_me:11177: result: no" >&5
++ echo "$as_me:11181: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+
+@@ -11187,7 +11191,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:11190: checking for $ac_word" >&5
++echo "$as_me:11194: 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
+@@ -11202,7 +11206,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:11205: found $ac_dir/$ac_word" >&5
++echo "$as_me:11209: found $ac_dir/$ac_word" >&5
+ break
+ done
+
+@@ -11210,10 +11214,10 @@
+ fi
+ ac_ct_NCURSES_CONFIG=$ac_cv_prog_ac_ct_NCURSES_CONFIG
+ if test -n "$ac_ct_NCURSES_CONFIG"; then
+- echo "$as_me:11213: result: $ac_ct_NCURSES_CONFIG" >&5
++ echo "$as_me:11217: result: $ac_ct_NCURSES_CONFIG" >&5
+ echo "${ECHO_T}$ac_ct_NCURSES_CONFIG" >&6
+ else
+- echo "$as_me:11216: result: no" >&5
++ echo "$as_me:11220: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+
+@@ -11370,7 +11374,7 @@
+
+ # even with config script, some packages use no-override for curses.h
+
+-echo "$as_me:11373: checking if we have identified curses headers" >&5
++echo "$as_me:11377: 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
+@@ -11382,7 +11386,7 @@
+ curses.h $cf_cv_screen/curses.h
+ do
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 11385 "configure"
++#line 11389 "configure"
+ #include "confdefs.h"
+ #include <${cf_header}>
+ int
+@@ -11394,16 +11398,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:11397: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:11401: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:11400: \$? = $ac_status" >&5
++ echo "$as_me:11404: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:11403: \"$ac_try\"") >&5
++ { (eval echo "$as_me:11407: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:11406: \$? = $ac_status" >&5
++ echo "$as_me:11410: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_ncurses_header=$cf_header; break
+ else
+@@ -11414,11 +11418,11 @@
+ done
+
+ fi
+-echo "$as_me:11417: result: $cf_cv_ncurses_header" >&5
++echo "$as_me:11421: 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:11421: error: No curses header-files found" >&5
++ { { echo "$as_me:11425: error: No curses header-files found" >&5
+ echo "$as_me: error: No curses header-files found" >&2;}
+ { (exit 1); exit 1; }; }
+ fi
+@@ -11428,23 +11432,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:11431: checking for $ac_header" >&5
++echo "$as_me:11435: 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 11437 "configure"
++#line 11441 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:11441: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:11445: \"$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:11447: \$? = $ac_status" >&5
++ echo "$as_me:11451: \$? = $ac_status" >&5
+ (exit "$ac_status"); } >/dev/null; then
+ if test -s conftest.err; then
+ ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -11463,7 +11467,7 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:11466: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
++echo "$as_me:11470: 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
+@@ -11519,7 +11523,7 @@
+ CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
+
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 11522 "configure"
++#line 11526 "configure"
+ #include "confdefs.h"
+ #include <stdio.h>
+ int
+@@ -11531,16 +11535,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:11534: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:11538: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:11537: \$? = $ac_status" >&5
++ echo "$as_me:11541: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:11540: \"$ac_try\"") >&5
++ { (eval echo "$as_me:11544: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:11543: \$? = $ac_status" >&5
++ echo "$as_me:11547: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ :
+ else
+@@ -11557,7 +11561,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}:11560: testing adding $cf_add_incdir to include-path ..." 1>&5
++echo "${as_me:-configure}:11564: testing adding $cf_add_incdir to include-path ..." 1>&5
+
+ CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
+
+@@ -11576,7 +11580,7 @@
+
+ }
+
+-echo "$as_me:11579: checking for $cf_ncuhdr_root header in include-path" >&5
++echo "$as_me:11583: 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
+@@ -11588,7 +11592,7 @@
+ do
+
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 11591 "configure"
++#line 11595 "configure"
+ #include "confdefs.h"
+
+ #include <$cf_header>
+@@ -11612,16 +11616,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:11615: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:11619: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:11618: \$? = $ac_status" >&5
++ echo "$as_me:11622: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:11621: \"$ac_try\"") >&5
++ { (eval echo "$as_me:11625: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:11624: \$? = $ac_status" >&5
++ echo "$as_me:11628: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_ncurses_h=$cf_header
+
+@@ -11636,14 +11640,14 @@
+ done
+
+ fi
+-echo "$as_me:11639: result: $cf_cv_ncurses_h" >&5
++echo "$as_me:11643: 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:11646: checking for $cf_ncuhdr_root include-path" >&5
++echo "$as_me:11650: 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
+@@ -11764,7 +11768,7 @@
+ CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
+
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 11767 "configure"
++#line 11771 "configure"
+ #include "confdefs.h"
+ #include <stdio.h>
+ int
+@@ -11776,16 +11780,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:11779: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:11783: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:11782: \$? = $ac_status" >&5
++ echo "$as_me:11786: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:11785: \"$ac_try\"") >&5
++ { (eval echo "$as_me:11789: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:11788: \$? = $ac_status" >&5
++ echo "$as_me:11792: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ :
+ else
+@@ -11802,7 +11806,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}:11805: testing adding $cf_add_incdir to include-path ..." 1>&5
++echo "${as_me:-configure}:11809: testing adding $cf_add_incdir to include-path ..." 1>&5
+
+ CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
+
+@@ -11825,7 +11829,7 @@
+ do
+
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 11828 "configure"
++#line 11832 "configure"
+ #include "confdefs.h"
+
+ #include <$cf_header>
+@@ -11849,16 +11853,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:11852: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:11856: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:11855: \$? = $ac_status" >&5
++ echo "$as_me:11859: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:11858: \"$ac_try\"") >&5
++ { (eval echo "$as_me:11862: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:11861: \$? = $ac_status" >&5
++ echo "$as_me:11865: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_ncurses_h2=$cf_header
+
+@@ -11879,12 +11883,12 @@
+ CPPFLAGS="$cf_save2_CPPFLAGS"
+ test "$cf_cv_ncurses_h2" != no && break
+ done
+- test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:11882: error: not found" >&5
++ test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:11886: error: not found" >&5
+ echo "$as_me: error: not found" >&2;}
+ { (exit 1); exit 1; }; }
+
+ fi
+-echo "$as_me:11887: result: $cf_cv_ncurses_h2" >&5
++echo "$as_me:11891: 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%/[^/]*$%%'`
+@@ -11920,7 +11924,7 @@
+ CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
+
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 11923 "configure"
++#line 11927 "configure"
+ #include "confdefs.h"
+ #include <stdio.h>
+ int
+@@ -11932,16 +11936,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:11935: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:11939: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:11938: \$? = $ac_status" >&5
++ echo "$as_me:11942: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:11941: \"$ac_try\"") >&5
++ { (eval echo "$as_me:11945: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:11944: \$? = $ac_status" >&5
++ echo "$as_me:11948: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ :
+ else
+@@ -11958,7 +11962,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}:11961: testing adding $cf_add_incdir to include-path ..." 1>&5
++echo "${as_me:-configure}:11965: testing adding $cf_add_incdir to include-path ..." 1>&5
+
+ CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
+
+@@ -12006,7 +12010,7 @@
+ ;;
+ esac
+
+-echo "$as_me:12009: checking for terminfo header" >&5
++echo "$as_me:12013: 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
+@@ -12024,7 +12028,7 @@
+ for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h"
+ do
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 12027 "configure"
++#line 12031 "configure"
+ #include "confdefs.h"
+ #include <stdio.h>
+ #include <${cf_cv_ncurses_header:-curses.h}>
+@@ -12039,16 +12043,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:12042: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:12046: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:12045: \$? = $ac_status" >&5
++ echo "$as_me:12049: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:12048: \"$ac_try\"") >&5
++ { (eval echo "$as_me:12052: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:12051: \$? = $ac_status" >&5
++ echo "$as_me:12055: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+
+ cf_cv_term_header="$cf_test"
+@@ -12064,7 +12068,7 @@
+ done
+
+ fi
+-echo "$as_me:12067: result: $cf_cv_term_header" >&5
++echo "$as_me:12071: result: $cf_cv_term_header" >&5
+ echo "${ECHO_T}$cf_cv_term_header" >&6
+
+ # Set definitions to allow ifdef'ing to accommodate subdirectories
+@@ -12102,7 +12106,7 @@
+ #define NCURSES 1
+ EOF
+
+-echo "$as_me:12105: checking for ncurses version" >&5
++echo "$as_me:12109: 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
+@@ -12128,10 +12132,10 @@
+ #endif
+ EOF
+ cf_try="$ac_cpp conftest.$ac_ext 2>&5 | grep '^Autoconf ' >conftest.out"
+- { (eval echo "$as_me:12131: \"$cf_try\"") >&5
++ { (eval echo "$as_me:12135: \"$cf_try\"") >&5
+ (eval $cf_try) 2>&5
+ ac_status=$?
+- echo "$as_me:12134: \$? = $ac_status" >&5
++ echo "$as_me:12138: \$? = $ac_status" >&5
+ (exit "$ac_status"); }
+ if test -f conftest.out ; then
+ cf_out=`sed -e 's%^Autoconf %%' -e 's%^[^"]*"%%' -e 's%".*%%' conftest.out`
+@@ -12141,7 +12145,7 @@
+
+ else
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 12144 "configure"
++#line 12148 "configure"
+ #include "confdefs.h"
+
+ $ac_includes_default
+@@ -12168,15 +12172,15 @@
+ }
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:12171: \"$ac_link\"") >&5
++if { (eval echo "$as_me:12175: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:12174: \$? = $ac_status" >&5
++ echo "$as_me:12178: \$? = $ac_status" >&5
+ (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+- { (eval echo "$as_me:12176: \"$ac_try\"") >&5
++ { (eval echo "$as_me:12180: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:12179: \$? = $ac_status" >&5
++ echo "$as_me:12183: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+
+ cf_cv_ncurses_version=`cat $cf_tempfile`
+@@ -12190,7 +12194,7 @@
+ rm -f "$cf_tempfile"
+
+ fi
+-echo "$as_me:12193: result: $cf_cv_ncurses_version" >&5
++echo "$as_me:12197: result: $cf_cv_ncurses_version" >&5
+ echo "${ECHO_T}$cf_cv_ncurses_version" >&6
+ test "$cf_cv_ncurses_version" = no ||
+ cat >>confdefs.h <<\EOF
+@@ -12203,7 +12207,7 @@
+ # to link gpm.
+ cf_ncurses_LIBS=""
+ cf_ncurses_SAVE="$LIBS"
+-echo "$as_me:12206: checking for Gpm_Open in -lgpm" >&5
++echo "$as_me:12210: 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
+@@ -12211,7 +12215,7 @@
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lgpm $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 12214 "configure"
++#line 12218 "configure"
+ #include "confdefs.h"
+
+ /* Override any gcc2 internal prototype to avoid an error. */
+@@ -12230,16 +12234,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:12233: \"$ac_link\"") >&5
++if { (eval echo "$as_me:12237: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:12236: \$? = $ac_status" >&5
++ echo "$as_me:12240: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:12239: \"$ac_try\"") >&5
++ { (eval echo "$as_me:12243: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:12242: \$? = $ac_status" >&5
++ echo "$as_me:12246: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_lib_gpm_Gpm_Open=yes
+ else
+@@ -12250,10 +12254,10 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:12253: result: $ac_cv_lib_gpm_Gpm_Open" >&5
++echo "$as_me:12257: 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:12256: checking for initscr in -lgpm" >&5
++ echo "$as_me:12260: 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
+@@ -12261,7 +12265,7 @@
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lgpm $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 12264 "configure"
++#line 12268 "configure"
+ #include "confdefs.h"
+
+ /* Override any gcc2 internal prototype to avoid an error. */
+@@ -12280,16 +12284,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:12283: \"$ac_link\"") >&5
++if { (eval echo "$as_me:12287: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:12286: \$? = $ac_status" >&5
++ echo "$as_me:12290: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:12289: \"$ac_try\"") >&5
++ { (eval echo "$as_me:12293: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:12292: \$? = $ac_status" >&5
++ echo "$as_me:12296: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_lib_gpm_initscr=yes
+ else
+@@ -12300,7 +12304,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:12303: result: $ac_cv_lib_gpm_initscr" >&5
++echo "$as_me:12307: 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"
+@@ -12315,7 +12319,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:12318: checking for tgoto in -lmytinfo" >&5
++ echo "$as_me:12322: 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
+@@ -12323,7 +12327,7 @@
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lmytinfo $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 12326 "configure"
++#line 12330 "configure"
+ #include "confdefs.h"
+
+ /* Override any gcc2 internal prototype to avoid an error. */
+@@ -12342,16 +12346,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:12345: \"$ac_link\"") >&5
++if { (eval echo "$as_me:12349: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:12348: \$? = $ac_status" >&5
++ echo "$as_me:12352: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:12351: \"$ac_try\"") >&5
++ { (eval echo "$as_me:12355: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:12354: \$? = $ac_status" >&5
++ echo "$as_me:12358: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_lib_mytinfo_tgoto=yes
+ else
+@@ -12362,7 +12366,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:12365: result: $ac_cv_lib_mytinfo_tgoto" >&5
++echo "$as_me:12369: 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"
+@@ -12411,13 +12415,13 @@
+
+ eval 'cf_cv_have_lib_'"$cf_nculib_root"'=no'
+ cf_libdir=""
+- echo "$as_me:12414: checking for initscr" >&5
++ echo "$as_me:12418: 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 12420 "configure"
++#line 12424 "configure"
+ #include "confdefs.h"
+ #define initscr autoconf_temporary
+ #include <limits.h> /* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -12448,16 +12452,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:12451: \"$ac_link\"") >&5
++if { (eval echo "$as_me:12455: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:12454: \$? = $ac_status" >&5
++ echo "$as_me:12458: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:12457: \"$ac_try\"") >&5
++ { (eval echo "$as_me:12461: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:12460: \$? = $ac_status" >&5
++ echo "$as_me:12464: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_func_initscr=yes
+ else
+@@ -12467,18 +12471,18 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:12470: result: $ac_cv_func_initscr" >&5
++echo "$as_me:12474: 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:12477: checking for initscr in -l$cf_nculib_root" >&5
++ echo "$as_me:12481: 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 12481 "configure"
++#line 12485 "configure"
+ #include "confdefs.h"
+ #include <${cf_cv_ncurses_header:-curses.h}>
+ int
+@@ -12490,25 +12494,25 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:12493: \"$ac_link\"") >&5
++if { (eval echo "$as_me:12497: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:12496: \$? = $ac_status" >&5
++ echo "$as_me:12500: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:12499: \"$ac_try\"") >&5
++ { (eval echo "$as_me:12503: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:12502: \$? = $ac_status" >&5
++ echo "$as_me:12506: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+- echo "$as_me:12504: result: yes" >&5
++ echo "$as_me:12508: 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:12511: result: no" >&5
++echo "$as_me:12515: result: no" >&5
+ echo "${ECHO_T}no" >&6
+
+ cf_search=
+@@ -12576,11 +12580,11 @@
+
+ for cf_libdir in $cf_search
+ do
+- echo "$as_me:12579: checking for -l$cf_nculib_root in $cf_libdir" >&5
++ echo "$as_me:12583: 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 12583 "configure"
++#line 12587 "configure"
+ #include "confdefs.h"
+ #include <${cf_cv_ncurses_header:-curses.h}>
+ int
+@@ -12592,25 +12596,25 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:12595: \"$ac_link\"") >&5
++if { (eval echo "$as_me:12599: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:12598: \$? = $ac_status" >&5
++ echo "$as_me:12602: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:12601: \"$ac_try\"") >&5
++ { (eval echo "$as_me:12605: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:12604: \$? = $ac_status" >&5
++ echo "$as_me:12608: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+- echo "$as_me:12606: result: yes" >&5
++ echo "$as_me:12610: 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:12613: result: no" >&5
++echo "$as_me:12617: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ LIBS="$cf_save_LIBS"
+ fi
+@@ -12625,7 +12629,7 @@
+ eval 'cf_found_library="$cf_cv_have_lib_'"$cf_nculib_root"\"
+
+ if test "$cf_found_library" = no ; then
+- { { echo "$as_me:12628: error: Cannot link $cf_nculib_root library" >&5
++ { { echo "$as_me:12632: error: Cannot link $cf_nculib_root library" >&5
+ echo "$as_me: error: Cannot link $cf_nculib_root library" >&2;}
+ { (exit 1); exit 1; }; }
+ fi
+@@ -12633,7 +12637,7 @@
+ fi
+
+ if test -n "$cf_ncurses_LIBS" ; then
+- echo "$as_me:12636: checking if we can link $cf_nculib_root without $cf_ncurses_LIBS" >&5
++ echo "$as_me:12640: 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
+@@ -12643,7 +12647,7 @@
+ fi
+ done
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 12646 "configure"
++#line 12650 "configure"
+ #include "confdefs.h"
+ #include <${cf_cv_ncurses_header:-curses.h}>
+ int
+@@ -12655,23 +12659,23 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:12658: \"$ac_link\"") >&5
++if { (eval echo "$as_me:12662: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:12661: \$? = $ac_status" >&5
++ echo "$as_me:12665: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:12664: \"$ac_try\"") >&5
++ { (eval echo "$as_me:12668: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:12667: \$? = $ac_status" >&5
++ echo "$as_me:12671: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+- echo "$as_me:12669: result: yes" >&5
++ echo "$as_me:12673: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ else
+ echo "$as_me: failed program was:" >&5
+ cat "conftest.$ac_ext" >&5
+-echo "$as_me:12674: result: no" >&5
++echo "$as_me:12678: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ LIBS="$cf_ncurses_SAVE"
+ fi
+@@ -12691,7 +12695,7 @@
+
+ ;;
+ (pdcurses)
+- echo "$as_me:12694: checking for X" >&5
++ echo "$as_me:12698: checking for X" >&5
+ echo $ECHO_N "checking for X... $ECHO_C" >&6
+
+ # Check whether --with-x or --without-x was given.
+@@ -12795,17 +12799,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 12798 "configure"
++#line 12802 "configure"
+ #include "confdefs.h"
+ #include <X11/Intrinsic.h>
+ _ACEOF
+-if { (eval echo "$as_me:12802: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:12806: \"$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:12808: \$? = $ac_status" >&5
++ echo "$as_me:12812: \$? = $ac_status" >&5
+ (exit "$ac_status"); } >/dev/null; then
+ if test -s conftest.err; then
+ ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -12838,7 +12842,7 @@
+ ac_save_LIBS=$LIBS
+ LIBS="-lXt $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 12841 "configure"
++#line 12845 "configure"
+ #include "confdefs.h"
+ #include <X11/Intrinsic.h>
+ int
+@@ -12850,16 +12854,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:12853: \"$ac_link\"") >&5
++if { (eval echo "$as_me:12857: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:12856: \$? = $ac_status" >&5
++ echo "$as_me:12860: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:12859: \"$ac_try\"") >&5
++ { (eval echo "$as_me:12863: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:12862: \$? = $ac_status" >&5
++ echo "$as_me:12866: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ LIBS=$ac_save_LIBS
+ # We can link X programs with no special library path.
+@@ -12897,7 +12901,7 @@
+ fi # $with_x != no
+
+ if test "$have_x" != yes; then
+- echo "$as_me:12900: result: $have_x" >&5
++ echo "$as_me:12904: result: $have_x" >&5
+ echo "${ECHO_T}$have_x" >&6
+ no_x=yes
+ else
+@@ -12907,7 +12911,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:12910: result: libraries $x_libraries, headers $x_includes" >&5
++ echo "$as_me:12914: result: libraries $x_libraries, headers $x_includes" >&5
+ echo "${ECHO_T}libraries $x_libraries, headers $x_includes" >&6
+ fi
+
+@@ -12934,11 +12938,11 @@
+ # others require no space. Words are not sufficient . . . .
+ case `(uname -sr) 2>/dev/null` in
+ "SunOS 5"*)
+- echo "$as_me:12937: checking whether -R must be followed by a space" >&5
++ echo "$as_me:12941: 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 12941 "configure"
++#line 12945 "configure"
+ #include "confdefs.h"
+
+ int
+@@ -12950,16 +12954,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:12953: \"$ac_link\"") >&5
++if { (eval echo "$as_me:12957: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:12956: \$? = $ac_status" >&5
++ echo "$as_me:12960: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:12959: \"$ac_try\"") >&5
++ { (eval echo "$as_me:12963: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:12962: \$? = $ac_status" >&5
++ echo "$as_me:12966: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_R_nospace=yes
+ else
+@@ -12969,13 +12973,13 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ if test $ac_R_nospace = yes; then
+- echo "$as_me:12972: result: no" >&5
++ echo "$as_me:12976: 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 12978 "configure"
++#line 12982 "configure"
+ #include "confdefs.h"
+
+ int
+@@ -12987,16 +12991,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:12990: \"$ac_link\"") >&5
++if { (eval echo "$as_me:12994: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:12993: \$? = $ac_status" >&5
++ echo "$as_me:12997: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:12996: \"$ac_try\"") >&5
++ { (eval echo "$as_me:13000: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:12999: \$? = $ac_status" >&5
++ echo "$as_me:13003: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_R_space=yes
+ else
+@@ -13006,11 +13010,11 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ if test $ac_R_space = yes; then
+- echo "$as_me:13009: result: yes" >&5
++ echo "$as_me:13013: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ X_LIBS="$X_LIBS -R $x_libraries"
+ else
+- echo "$as_me:13013: result: neither works" >&5
++ echo "$as_me:13017: result: neither works" >&5
+ echo "${ECHO_T}neither works" >&6
+ fi
+ fi
+@@ -13030,7 +13034,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 13033 "configure"
++#line 13037 "configure"
+ #include "confdefs.h"
+
+ /* Override any gcc2 internal prototype to avoid an error. */
+@@ -13049,22 +13053,22 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:13052: \"$ac_link\"") >&5
++if { (eval echo "$as_me:13056: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:13055: \$? = $ac_status" >&5
++ echo "$as_me:13059: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:13058: \"$ac_try\"") >&5
++ { (eval echo "$as_me:13062: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:13061: \$? = $ac_status" >&5
++ echo "$as_me:13065: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ :
+ else
+ echo "$as_me: failed program was:" >&5
+ cat "conftest.$ac_ext" >&5
+-echo "$as_me:13067: checking for dnet_ntoa in -ldnet" >&5
++echo "$as_me:13071: 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
+@@ -13072,7 +13076,7 @@
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-ldnet $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 13075 "configure"
++#line 13079 "configure"
+ #include "confdefs.h"
+
+ /* Override any gcc2 internal prototype to avoid an error. */
+@@ -13091,16 +13095,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:13094: \"$ac_link\"") >&5
++if { (eval echo "$as_me:13098: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:13097: \$? = $ac_status" >&5
++ echo "$as_me:13101: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:13100: \"$ac_try\"") >&5
++ { (eval echo "$as_me:13104: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:13103: \$? = $ac_status" >&5
++ echo "$as_me:13107: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_lib_dnet_dnet_ntoa=yes
+ else
+@@ -13111,14 +13115,14 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:13114: result: $ac_cv_lib_dnet_dnet_ntoa" >&5
++echo "$as_me:13118: 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:13121: checking for dnet_ntoa in -ldnet_stub" >&5
++ echo "$as_me:13125: 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
+@@ -13126,7 +13130,7 @@
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-ldnet_stub $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 13129 "configure"
++#line 13133 "configure"
+ #include "confdefs.h"
+
+ /* Override any gcc2 internal prototype to avoid an error. */
+@@ -13145,16 +13149,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:13148: \"$ac_link\"") >&5
++if { (eval echo "$as_me:13152: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:13151: \$? = $ac_status" >&5
++ echo "$as_me:13155: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:13154: \"$ac_try\"") >&5
++ { (eval echo "$as_me:13158: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:13157: \$? = $ac_status" >&5
++ echo "$as_me:13161: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_lib_dnet_stub_dnet_ntoa=yes
+ else
+@@ -13165,7 +13169,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:13168: result: $ac_cv_lib_dnet_stub_dnet_ntoa" >&5
++echo "$as_me:13172: 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"
+@@ -13184,13 +13188,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:13187: checking for gethostbyname" >&5
++ echo "$as_me:13191: 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 13193 "configure"
++#line 13197 "configure"
+ #include "confdefs.h"
+ #define gethostbyname autoconf_temporary
+ #include <limits.h> /* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -13221,16 +13225,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:13224: \"$ac_link\"") >&5
++if { (eval echo "$as_me:13228: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:13227: \$? = $ac_status" >&5
++ echo "$as_me:13231: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:13230: \"$ac_try\"") >&5
++ { (eval echo "$as_me:13234: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:13233: \$? = $ac_status" >&5
++ echo "$as_me:13237: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_func_gethostbyname=yes
+ else
+@@ -13240,11 +13244,11 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:13243: result: $ac_cv_func_gethostbyname" >&5
++echo "$as_me:13247: 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:13247: checking for gethostbyname in -lnsl" >&5
++ echo "$as_me:13251: 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
+@@ -13252,7 +13256,7 @@
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lnsl $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 13255 "configure"
++#line 13259 "configure"
+ #include "confdefs.h"
+
+ /* Override any gcc2 internal prototype to avoid an error. */
+@@ -13271,16 +13275,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:13274: \"$ac_link\"") >&5
++if { (eval echo "$as_me:13278: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:13277: \$? = $ac_status" >&5
++ echo "$as_me:13281: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:13280: \"$ac_try\"") >&5
++ { (eval echo "$as_me:13284: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:13283: \$? = $ac_status" >&5
++ echo "$as_me:13287: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_lib_nsl_gethostbyname=yes
+ else
+@@ -13291,14 +13295,14 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:13294: result: $ac_cv_lib_nsl_gethostbyname" >&5
++echo "$as_me:13298: 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:13301: checking for gethostbyname in -lbsd" >&5
++ echo "$as_me:13305: 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
+@@ -13306,7 +13310,7 @@
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lbsd $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 13309 "configure"
++#line 13313 "configure"
+ #include "confdefs.h"
+
+ /* Override any gcc2 internal prototype to avoid an error. */
+@@ -13325,16 +13329,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:13328: \"$ac_link\"") >&5
++if { (eval echo "$as_me:13332: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:13331: \$? = $ac_status" >&5
++ echo "$as_me:13335: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:13334: \"$ac_try\"") >&5
++ { (eval echo "$as_me:13338: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:13337: \$? = $ac_status" >&5
++ echo "$as_me:13341: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_lib_bsd_gethostbyname=yes
+ else
+@@ -13345,7 +13349,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:13348: result: $ac_cv_lib_bsd_gethostbyname" >&5
++echo "$as_me:13352: 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"
+@@ -13361,13 +13365,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:13364: checking for connect" >&5
++ echo "$as_me:13368: 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 13370 "configure"
++#line 13374 "configure"
+ #include "confdefs.h"
+ #define connect autoconf_temporary
+ #include <limits.h> /* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -13398,16 +13402,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:13401: \"$ac_link\"") >&5
++if { (eval echo "$as_me:13405: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:13404: \$? = $ac_status" >&5
++ echo "$as_me:13408: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:13407: \"$ac_try\"") >&5
++ { (eval echo "$as_me:13411: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:13410: \$? = $ac_status" >&5
++ echo "$as_me:13414: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_func_connect=yes
+ else
+@@ -13417,11 +13421,11 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:13420: result: $ac_cv_func_connect" >&5
++echo "$as_me:13424: 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:13424: checking for connect in -lsocket" >&5
++ echo "$as_me:13428: 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
+@@ -13429,7 +13433,7 @@
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lsocket $X_EXTRA_LIBS $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 13432 "configure"
++#line 13436 "configure"
+ #include "confdefs.h"
+
+ /* Override any gcc2 internal prototype to avoid an error. */
+@@ -13448,16 +13452,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:13451: \"$ac_link\"") >&5
++if { (eval echo "$as_me:13455: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:13454: \$? = $ac_status" >&5
++ echo "$as_me:13458: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:13457: \"$ac_try\"") >&5
++ { (eval echo "$as_me:13461: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:13460: \$? = $ac_status" >&5
++ echo "$as_me:13464: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_lib_socket_connect=yes
+ else
+@@ -13468,7 +13472,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:13471: result: $ac_cv_lib_socket_connect" >&5
++echo "$as_me:13475: 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"
+@@ -13477,13 +13481,13 @@
+ fi
+
+ # Guillermo Gomez says -lposix is necessary on A/UX.
+- echo "$as_me:13480: checking for remove" >&5
++ echo "$as_me:13484: 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 13486 "configure"
++#line 13490 "configure"
+ #include "confdefs.h"
+ #define remove autoconf_temporary
+ #include <limits.h> /* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -13514,16 +13518,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:13517: \"$ac_link\"") >&5
++if { (eval echo "$as_me:13521: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:13520: \$? = $ac_status" >&5
++ echo "$as_me:13524: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:13523: \"$ac_try\"") >&5
++ { (eval echo "$as_me:13527: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:13526: \$? = $ac_status" >&5
++ echo "$as_me:13530: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_func_remove=yes
+ else
+@@ -13533,11 +13537,11 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:13536: result: $ac_cv_func_remove" >&5
++echo "$as_me:13540: 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:13540: checking for remove in -lposix" >&5
++ echo "$as_me:13544: 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
+@@ -13545,7 +13549,7 @@
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lposix $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 13548 "configure"
++#line 13552 "configure"
+ #include "confdefs.h"
+
+ /* Override any gcc2 internal prototype to avoid an error. */
+@@ -13564,16 +13568,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:13567: \"$ac_link\"") >&5
++if { (eval echo "$as_me:13571: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:13570: \$? = $ac_status" >&5
++ echo "$as_me:13574: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:13573: \"$ac_try\"") >&5
++ { (eval echo "$as_me:13577: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:13576: \$? = $ac_status" >&5
++ echo "$as_me:13580: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_lib_posix_remove=yes
+ else
+@@ -13584,7 +13588,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:13587: result: $ac_cv_lib_posix_remove" >&5
++echo "$as_me:13591: 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"
+@@ -13593,13 +13597,13 @@
+ fi
+
+ # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay.
+- echo "$as_me:13596: checking for shmat" >&5
++ echo "$as_me:13600: 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 13602 "configure"
++#line 13606 "configure"
+ #include "confdefs.h"
+ #define shmat autoconf_temporary
+ #include <limits.h> /* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -13630,16 +13634,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:13633: \"$ac_link\"") >&5
++if { (eval echo "$as_me:13637: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:13636: \$? = $ac_status" >&5
++ echo "$as_me:13640: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:13639: \"$ac_try\"") >&5
++ { (eval echo "$as_me:13643: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:13642: \$? = $ac_status" >&5
++ echo "$as_me:13646: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_func_shmat=yes
+ else
+@@ -13649,11 +13653,11 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:13652: result: $ac_cv_func_shmat" >&5
++echo "$as_me:13656: 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:13656: checking for shmat in -lipc" >&5
++ echo "$as_me:13660: 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
+@@ -13661,7 +13665,7 @@
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lipc $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 13664 "configure"
++#line 13668 "configure"
+ #include "confdefs.h"
+
+ /* Override any gcc2 internal prototype to avoid an error. */
+@@ -13680,16 +13684,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:13683: \"$ac_link\"") >&5
++if { (eval echo "$as_me:13687: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:13686: \$? = $ac_status" >&5
++ echo "$as_me:13690: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:13689: \"$ac_try\"") >&5
++ { (eval echo "$as_me:13693: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:13692: \$? = $ac_status" >&5
++ echo "$as_me:13696: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_lib_ipc_shmat=yes
+ else
+@@ -13700,7 +13704,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:13703: result: $ac_cv_lib_ipc_shmat" >&5
++echo "$as_me:13707: 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"
+@@ -13718,7 +13722,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:13721: checking for IceConnectionNumber in -lICE" >&5
++ echo "$as_me:13725: 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
+@@ -13726,7 +13730,7 @@
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lICE $X_EXTRA_LIBS $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 13729 "configure"
++#line 13733 "configure"
+ #include "confdefs.h"
+
+ /* Override any gcc2 internal prototype to avoid an error. */
+@@ -13745,16 +13749,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:13748: \"$ac_link\"") >&5
++if { (eval echo "$as_me:13752: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:13751: \$? = $ac_status" >&5
++ echo "$as_me:13755: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:13754: \"$ac_try\"") >&5
++ { (eval echo "$as_me:13758: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:13757: \$? = $ac_status" >&5
++ echo "$as_me:13761: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_lib_ICE_IceConnectionNumber=yes
+ else
+@@ -13765,7 +13769,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:13768: result: $ac_cv_lib_ICE_IceConnectionNumber" >&5
++echo "$as_me:13772: 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"
+@@ -13777,7 +13781,7 @@
+
+ cf_x_athena=${cf_x_athena:-Xaw}
+
+-echo "$as_me:13780: checking if you want to link with Xaw 3d library" >&5
++echo "$as_me:13784: 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=
+
+@@ -13788,14 +13792,14 @@
+ fi;
+ if test "$withval" = yes ; then
+ cf_x_athena=Xaw3d
+- echo "$as_me:13791: result: yes" >&5
++ echo "$as_me:13795: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ else
+- echo "$as_me:13794: result: no" >&5
++ echo "$as_me:13798: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+
+-echo "$as_me:13798: checking if you want to link with Xaw 3d xft library" >&5
++echo "$as_me:13802: 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=
+
+@@ -13806,14 +13810,14 @@
+ fi;
+ if test "$withval" = yes ; then
+ cf_x_athena=Xaw3dxft
+- echo "$as_me:13809: result: yes" >&5
++ echo "$as_me:13813: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ else
+- echo "$as_me:13812: result: no" >&5
++ echo "$as_me:13816: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+
+-echo "$as_me:13816: checking if you want to link with neXT Athena library" >&5
++echo "$as_me:13820: 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=
+
+@@ -13824,14 +13828,14 @@
+ fi;
+ if test "$withval" = yes ; then
+ cf_x_athena=neXtaw
+- echo "$as_me:13827: result: yes" >&5
++ echo "$as_me:13831: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ else
+- echo "$as_me:13830: result: no" >&5
++ echo "$as_me:13834: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+
+-echo "$as_me:13834: checking if you want to link with Athena-Plus library" >&5
++echo "$as_me:13838: 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=
+
+@@ -13842,10 +13846,10 @@
+ fi;
+ if test "$withval" = yes ; then
+ cf_x_athena=XawPlus
+- echo "$as_me:13845: result: yes" >&5
++ echo "$as_me:13849: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ else
+- echo "$as_me:13848: result: no" >&5
++ echo "$as_me:13852: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+
+@@ -13865,17 +13869,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}:13868: testing found package $cf_athena_pkg ..." 1>&5
++echo "${as_me:-configure}:13872: 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}:13874: testing package $cf_athena_pkg CFLAGS: $cf_pkgconfig_incs ..." 1>&5
++echo "${as_me:-configure}:13878: 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}:13878: testing package $cf_athena_pkg LIBS: $cf_pkgconfig_libs ..." 1>&5
++echo "${as_me:-configure}:13882: testing package $cf_athena_pkg LIBS: $cf_pkgconfig_libs ..." 1>&5
+
+ cf_fix_cppflags=no
+ cf_new_cflags=
+@@ -14006,20 +14010,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}:14009: testing ..trimmed $LIBS ..." 1>&5
++echo "${as_me:-configure}:14013: testing ..trimmed $LIBS ..." 1>&5
+
+ ;;
+ esac
+ done
+
+-echo "$as_me:14015: checking for usable $cf_x_athena/Xmu package" >&5
++echo "$as_me:14019: 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 14022 "configure"
++#line 14026 "configure"
+ #include "confdefs.h"
+
+ $ac_includes_default
+@@ -14037,16 +14041,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:14040: \"$ac_link\"") >&5
++if { (eval echo "$as_me:14044: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:14043: \$? = $ac_status" >&5
++ echo "$as_me:14047: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:14046: \"$ac_try\"") >&5
++ { (eval echo "$as_me:14050: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:14049: \$? = $ac_status" >&5
++ echo "$as_me:14053: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_xaw_compat=yes
+ else
+@@ -14056,7 +14060,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:14059: result: $cf_cv_xaw_compat" >&5
++echo "$as_me:14063: result: $cf_cv_xaw_compat" >&5
+ echo "${ECHO_T}$cf_cv_xaw_compat" >&6
+
+ if test "$cf_cv_xaw_compat" = no
+@@ -14068,7 +14072,7 @@
+ (*)
+ test -n "$verbose" && echo " work around broken package" 1>&6
+
+-echo "${as_me:-configure}:14071: testing work around broken package ..." 1>&5
++echo "${as_me:-configure}:14075: testing work around broken package ..." 1>&5
+
+ cf_save_xmu="$LIBS"
+ cf_first_lib=`echo "$cf_save_xmu" | sed -e 's/^ *//' -e 's/ .*//'`
+@@ -14076,17 +14080,17 @@
+ if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists "xmu"; then
+ test -n "$verbose" && echo " found package xmu" 1>&6
+
+-echo "${as_me:-configure}:14079: testing found package xmu ..." 1>&5
++echo "${as_me:-configure}:14083: 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}:14085: testing package xmu CFLAGS: $cf_pkgconfig_incs ..." 1>&5
++echo "${as_me:-configure}:14089: 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}:14089: testing package xmu LIBS: $cf_pkgconfig_libs ..." 1>&5
++echo "${as_me:-configure}:14093: testing package xmu LIBS: $cf_pkgconfig_libs ..." 1>&5
+
+ cf_fix_cppflags=no
+ cf_new_cflags=
+@@ -14206,12 +14210,12 @@
+
+ test -n "$verbose" && echo " ...before $LIBS" 1>&6
+
+-echo "${as_me:-configure}:14209: testing ...before $LIBS ..." 1>&5
++echo "${as_me:-configure}:14213: 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}:14214: testing ...after $LIBS ..." 1>&5
++echo "${as_me:-configure}:14218: testing ...after $LIBS ..." 1>&5
+
+ else
+ cf_pkgconfig_incs=
+@@ -14219,12 +14223,12 @@
+
+ test -n "$verbose" && echo " ...before $LIBS" 1>&6
+
+-echo "${as_me:-configure}:14222: testing ...before $LIBS ..." 1>&5
++echo "${as_me:-configure}:14226: 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}:14227: testing ...after $LIBS ..." 1>&5
++echo "${as_me:-configure}:14231: testing ...after $LIBS ..." 1>&5
+
+ fi
+
+@@ -14235,7 +14239,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}:14238: testing ..trimmed $LIBS ..." 1>&5
++echo "${as_me:-configure}:14242: testing ..trimmed $LIBS ..." 1>&5
+
+ ;;
+ esac
+@@ -14260,17 +14264,17 @@
+ if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists "Xext"; then
+ test -n "$verbose" && echo " found package Xext" 1>&6
+
+-echo "${as_me:-configure}:14263: testing found package Xext ..." 1>&5
++echo "${as_me:-configure}:14267: 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}:14269: testing package Xext CFLAGS: $cf_pkgconfig_incs ..." 1>&5
++echo "${as_me:-configure}:14273: 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}:14273: testing package Xext LIBS: $cf_pkgconfig_libs ..." 1>&5
++echo "${as_me:-configure}:14277: testing package Xext LIBS: $cf_pkgconfig_libs ..." 1>&5
+
+ cf_fix_cppflags=no
+ cf_new_cflags=
+@@ -14391,7 +14395,7 @@
+ cf_pkgconfig_incs=
+ cf_pkgconfig_libs=
+
+- echo "$as_me:14394: checking for XextCreateExtension in -lXext" >&5
++ echo "$as_me:14398: 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
+@@ -14399,7 +14403,7 @@
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lXext $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 14402 "configure"
++#line 14406 "configure"
+ #include "confdefs.h"
+
+ /* Override any gcc2 internal prototype to avoid an error. */
+@@ -14418,16 +14422,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:14421: \"$ac_link\"") >&5
++if { (eval echo "$as_me:14425: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:14424: \$? = $ac_status" >&5
++ echo "$as_me:14428: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:14427: \"$ac_try\"") >&5
++ { (eval echo "$as_me:14431: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:14430: \$? = $ac_status" >&5
++ echo "$as_me:14434: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_lib_Xext_XextCreateExtension=yes
+ else
+@@ -14438,7 +14442,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:14441: result: $ac_cv_lib_Xext_XextCreateExtension" >&5
++echo "$as_me:14445: 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
+
+@@ -14474,17 +14478,17 @@
+ if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists "x11"; then
+ test -n "$verbose" && echo " found package x11" 1>&6
+
+-echo "${as_me:-configure}:14477: testing found package x11 ..." 1>&5
++echo "${as_me:-configure}:14481: 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}:14483: testing package x11 CFLAGS: $cf_pkgconfig_incs ..." 1>&5
++echo "${as_me:-configure}:14487: 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}:14487: testing package x11 LIBS: $cf_pkgconfig_libs ..." 1>&5
++echo "${as_me:-configure}:14491: testing package x11 LIBS: $cf_pkgconfig_libs ..." 1>&5
+
+ cf_fix_cppflags=no
+ cf_new_cflags=
+@@ -14604,24 +14608,24 @@
+ else
+ cf_pkgconfig_incs=
+ cf_pkgconfig_libs=
+- { echo "$as_me:14607: WARNING: unable to find X11 library" >&5
++ { echo "$as_me:14611: 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}:14614: testing found package ice ..." 1>&5
++echo "${as_me:-configure}:14618: 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}:14620: testing package ice CFLAGS: $cf_pkgconfig_incs ..." 1>&5
++echo "${as_me:-configure}:14624: 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}:14624: testing package ice LIBS: $cf_pkgconfig_libs ..." 1>&5
++echo "${as_me:-configure}:14628: testing package ice LIBS: $cf_pkgconfig_libs ..." 1>&5
+
+ cf_fix_cppflags=no
+ cf_new_cflags=
+@@ -14741,24 +14745,24 @@
+ else
+ cf_pkgconfig_incs=
+ cf_pkgconfig_libs=
+- { echo "$as_me:14744: WARNING: unable to find ICE library" >&5
++ { echo "$as_me:14748: 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}:14751: testing found package sm ..." 1>&5
++echo "${as_me:-configure}:14755: 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}:14757: testing package sm CFLAGS: $cf_pkgconfig_incs ..." 1>&5
++echo "${as_me:-configure}:14761: 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}:14761: testing package sm LIBS: $cf_pkgconfig_libs ..." 1>&5
++echo "${as_me:-configure}:14765: testing package sm LIBS: $cf_pkgconfig_libs ..." 1>&5
+
+ cf_fix_cppflags=no
+ cf_new_cflags=
+@@ -14878,24 +14882,24 @@
+ else
+ cf_pkgconfig_incs=
+ cf_pkgconfig_libs=
+- { echo "$as_me:14881: WARNING: unable to find SM library" >&5
++ { echo "$as_me:14885: 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}:14888: testing found package xt ..." 1>&5
++echo "${as_me:-configure}:14892: 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}:14894: testing package xt CFLAGS: $cf_pkgconfig_incs ..." 1>&5
++echo "${as_me:-configure}:14898: 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}:14898: testing package xt LIBS: $cf_pkgconfig_libs ..." 1>&5
++echo "${as_me:-configure}:14902: testing package xt LIBS: $cf_pkgconfig_libs ..." 1>&5
+
+ cf_fix_cppflags=no
+ cf_new_cflags=
+@@ -15015,7 +15019,7 @@
+ else
+ cf_pkgconfig_incs=
+ cf_pkgconfig_libs=
+- { echo "$as_me:15018: WARNING: unable to find Xt library" >&5
++ { echo "$as_me:15022: WARNING: unable to find Xt library" >&5
+ echo "$as_me: WARNING: unable to find Xt library" >&2;}
+ fi
+
+@@ -15028,17 +15032,17 @@
+ if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists "xt"; then
+ test -n "$verbose" && echo " found package xt" 1>&6
+
+-echo "${as_me:-configure}:15031: testing found package xt ..." 1>&5
++echo "${as_me:-configure}:15035: 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}:15037: testing package xt CFLAGS: $cf_pkgconfig_incs ..." 1>&5
++echo "${as_me:-configure}:15041: 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}:15041: testing package xt LIBS: $cf_pkgconfig_libs ..." 1>&5
++echo "${as_me:-configure}:15045: testing package xt LIBS: $cf_pkgconfig_libs ..." 1>&5
+
+ cf_fix_cppflags=no
+ cf_new_cflags=
+@@ -15159,14 +15163,14 @@
+ ;;
+ (*)
+ # we have an "xt" package, but it may omit Xt's dependency on X11
+-echo "$as_me:15162: checking for usable X dependency" >&5
++echo "$as_me:15166: 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 15169 "configure"
++#line 15173 "configure"
+ #include "confdefs.h"
+
+ $ac_includes_default
+@@ -15186,16 +15190,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:15189: \"$ac_link\"") >&5
++if { (eval echo "$as_me:15193: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:15192: \$? = $ac_status" >&5
++ echo "$as_me:15196: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:15195: \"$ac_try\"") >&5
++ { (eval echo "$as_me:15199: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:15198: \$? = $ac_status" >&5
++ echo "$as_me:15202: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_xt_x11_compat=yes
+ else
+@@ -15205,30 +15209,30 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:15208: result: $cf_cv_xt_x11_compat" >&5
++echo "$as_me:15212: 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}:15214: testing work around broken X11 dependency ..." 1>&5
++echo "${as_me:-configure}:15218: 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}:15221: testing found package x11 ..." 1>&5
++echo "${as_me:-configure}:15225: 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}:15227: testing package x11 CFLAGS: $cf_pkgconfig_incs ..." 1>&5
++echo "${as_me:-configure}:15231: 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}:15231: testing package x11 LIBS: $cf_pkgconfig_libs ..." 1>&5
++echo "${as_me:-configure}:15235: testing package x11 LIBS: $cf_pkgconfig_libs ..." 1>&5
+
+ cf_fix_cppflags=no
+ cf_new_cflags=
+@@ -15351,12 +15355,12 @@
+
+ test -n "$verbose" && echo " ...before $LIBS" 1>&6
+
+-echo "${as_me:-configure}:15354: testing ...before $LIBS ..." 1>&5
++echo "${as_me:-configure}:15358: 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}:15359: testing ...after $LIBS ..." 1>&5
++echo "${as_me:-configure}:15363: testing ...after $LIBS ..." 1>&5
+
+ fi
+
+@@ -15364,14 +15368,14 @@
+ ;;
+ esac
+
+-echo "$as_me:15367: checking for usable X Toolkit package" >&5
++echo "$as_me:15371: 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 15374 "configure"
++#line 15378 "configure"
+ #include "confdefs.h"
+
+ $ac_includes_default
+@@ -15387,16 +15391,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:15390: \"$ac_link\"") >&5
++if { (eval echo "$as_me:15394: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:15393: \$? = $ac_status" >&5
++ echo "$as_me:15397: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:15396: \"$ac_try\"") >&5
++ { (eval echo "$as_me:15400: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:15399: \$? = $ac_status" >&5
++ echo "$as_me:15403: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_xt_ice_compat=yes
+ else
+@@ -15406,7 +15410,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:15409: result: $cf_cv_xt_ice_compat" >&5
++echo "$as_me:15413: result: $cf_cv_xt_ice_compat" >&5
+ echo "${ECHO_T}$cf_cv_xt_ice_compat" >&6
+
+ if test "$cf_cv_xt_ice_compat" = no
+@@ -15420,22 +15424,22 @@
+ (*)
+ test -n "$verbose" && echo " work around broken ICE dependency" 1>&6
+
+-echo "${as_me:-configure}:15423: testing work around broken ICE dependency ..." 1>&5
++echo "${as_me:-configure}:15427: 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}:15428: testing found package ice ..." 1>&5
++echo "${as_me:-configure}:15432: 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}:15434: testing package ice CFLAGS: $cf_pkgconfig_incs ..." 1>&5
++echo "${as_me:-configure}:15438: 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}:15438: testing package ice LIBS: $cf_pkgconfig_libs ..." 1>&5
++echo "${as_me:-configure}:15442: testing package ice LIBS: $cf_pkgconfig_libs ..." 1>&5
+
+ cf_fix_cppflags=no
+ cf_new_cflags=
+@@ -15554,17 +15558,17 @@
+ if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists "sm"; then
+ test -n "$verbose" && echo " found package sm" 1>&6
+
+-echo "${as_me:-configure}:15557: testing found package sm ..." 1>&5
++echo "${as_me:-configure}:15561: 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}:15563: testing package sm CFLAGS: $cf_pkgconfig_incs ..." 1>&5
++echo "${as_me:-configure}:15567: 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}:15567: testing package sm LIBS: $cf_pkgconfig_libs ..." 1>&5
++echo "${as_me:-configure}:15571: testing package sm LIBS: $cf_pkgconfig_libs ..." 1>&5
+
+ cf_fix_cppflags=no
+ cf_new_cflags=
+@@ -15693,12 +15697,12 @@
+
+ test -n "$verbose" && echo " ...before $LIBS" 1>&6
+
+-echo "${as_me:-configure}:15696: testing ...before $LIBS ..." 1>&5
++echo "${as_me:-configure}:15700: 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}:15701: testing ...after $LIBS ..." 1>&5
++echo "${as_me:-configure}:15705: testing ...after $LIBS ..." 1>&5
+
+ fi
+
+@@ -15718,7 +15722,7 @@
+
+ test -n "$verbose" && echo " checking additions to CFLAGS" 1>&6
+
+-echo "${as_me:-configure}:15721: testing checking additions to CFLAGS ..." 1>&5
++echo "${as_me:-configure}:15725: testing checking additions to CFLAGS ..." 1>&5
+
+ cf_check_cflags="$CFLAGS"
+ cf_check_cppflags="$CPPFLAGS"
+@@ -15803,7 +15807,7 @@
+ if test -n "$cf_new_cflags" ; then
+ test -n "$verbose" && echo " add to \$CFLAGS $cf_new_cflags" 1>&6
+
+-echo "${as_me:-configure}:15806: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
++echo "${as_me:-configure}:15810: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
+
+ test -n "$CFLAGS" && CFLAGS="$CFLAGS "
+ CFLAGS="${CFLAGS}$cf_new_cflags"
+@@ -15813,7 +15817,7 @@
+ if test -n "$cf_new_cppflags" ; then
+ test -n "$verbose" && echo " add to \$CPPFLAGS $cf_new_cppflags" 1>&6
+
+-echo "${as_me:-configure}:15816: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
++echo "${as_me:-configure}:15820: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
+
+ test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
+ CPPFLAGS="${CPPFLAGS}$cf_new_cppflags"
+@@ -15823,7 +15827,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}:15826: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5
++echo "${as_me:-configure}:15830: 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"
+@@ -15832,7 +15836,7 @@
+
+ if test "x$cf_check_cflags" != "x$CFLAGS" ; then
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 15835 "configure"
++#line 15839 "configure"
+ #include "confdefs.h"
+ #include <stdio.h>
+ int
+@@ -15844,16 +15848,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:15847: \"$ac_link\"") >&5
++if { (eval echo "$as_me:15851: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:15850: \$? = $ac_status" >&5
++ echo "$as_me:15854: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:15853: \"$ac_try\"") >&5
++ { (eval echo "$as_me:15857: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:15856: \$? = $ac_status" >&5
++ echo "$as_me:15860: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ :
+ else
+@@ -15861,12 +15865,12 @@
+ cat "conftest.$ac_ext" >&5
+ test -n "$verbose" && echo " test-compile failed. Undoing change to \$CFLAGS" 1>&6
+
+-echo "${as_me:-configure}:15864: testing test-compile failed. Undoing change to \$CFLAGS ..." 1>&5
++echo "${as_me:-configure}:15868: 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}:15869: testing but keeping change to \$CPPFLAGS ..." 1>&5
++echo "${as_me:-configure}:15873: testing but keeping change to \$CPPFLAGS ..." 1>&5
+
+ fi
+ CFLAGS="$cf_check_cflags"
+@@ -15874,13 +15878,13 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+
+- echo "$as_me:15877: checking for XOpenDisplay" >&5
++ echo "$as_me:15881: 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 15883 "configure"
++#line 15887 "configure"
+ #include "confdefs.h"
+ #define XOpenDisplay autoconf_temporary
+ #include <limits.h> /* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -15911,16 +15915,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:15914: \"$ac_link\"") >&5
++if { (eval echo "$as_me:15918: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:15917: \$? = $ac_status" >&5
++ echo "$as_me:15921: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:15920: \"$ac_try\"") >&5
++ { (eval echo "$as_me:15924: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:15923: \$? = $ac_status" >&5
++ echo "$as_me:15927: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_func_XOpenDisplay=yes
+ else
+@@ -15930,13 +15934,13 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:15933: result: $ac_cv_func_XOpenDisplay" >&5
++echo "$as_me:15937: 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:15939: checking for XOpenDisplay in -lX11" >&5
++ echo "$as_me:15943: 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
+@@ -15944,7 +15948,7 @@
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lX11 $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 15947 "configure"
++#line 15951 "configure"
+ #include "confdefs.h"
+
+ /* Override any gcc2 internal prototype to avoid an error. */
+@@ -15963,16 +15967,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:15966: \"$ac_link\"") >&5
++if { (eval echo "$as_me:15970: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:15969: \$? = $ac_status" >&5
++ echo "$as_me:15973: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:15972: \"$ac_try\"") >&5
++ { (eval echo "$as_me:15976: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:15975: \$? = $ac_status" >&5
++ echo "$as_me:15979: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_lib_X11_XOpenDisplay=yes
+ else
+@@ -15983,7 +15987,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:15986: result: $ac_cv_lib_X11_XOpenDisplay" >&5
++echo "$as_me:15990: 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
+
+@@ -16007,13 +16011,13 @@
+
+ fi
+
+- echo "$as_me:16010: checking for XtAppInitialize" >&5
++ echo "$as_me:16014: 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 16016 "configure"
++#line 16020 "configure"
+ #include "confdefs.h"
+ #define XtAppInitialize autoconf_temporary
+ #include <limits.h> /* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -16044,16 +16048,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:16047: \"$ac_link\"") >&5
++if { (eval echo "$as_me:16051: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:16050: \$? = $ac_status" >&5
++ echo "$as_me:16054: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:16053: \"$ac_try\"") >&5
++ { (eval echo "$as_me:16057: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:16056: \$? = $ac_status" >&5
++ echo "$as_me:16060: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_func_XtAppInitialize=yes
+ else
+@@ -16063,13 +16067,13 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:16066: result: $ac_cv_func_XtAppInitialize" >&5
++echo "$as_me:16070: 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:16072: checking for XtAppInitialize in -lXt" >&5
++ echo "$as_me:16076: 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
+@@ -16077,7 +16081,7 @@
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lXt $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 16080 "configure"
++#line 16084 "configure"
+ #include "confdefs.h"
+
+ /* Override any gcc2 internal prototype to avoid an error. */
+@@ -16096,16 +16100,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:16099: \"$ac_link\"") >&5
++if { (eval echo "$as_me:16103: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:16102: \$? = $ac_status" >&5
++ echo "$as_me:16106: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:16105: \"$ac_try\"") >&5
++ { (eval echo "$as_me:16109: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:16108: \$? = $ac_status" >&5
++ echo "$as_me:16112: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_lib_Xt_XtAppInitialize=yes
+ else
+@@ -16116,7 +16120,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:16119: result: $ac_cv_lib_Xt_XtAppInitialize" >&5
++echo "$as_me:16123: 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
+
+@@ -16133,7 +16137,7 @@
+ fi
+
+ if test "$cf_have_X_LIBS" = no ; then
+- { echo "$as_me:16136: WARNING: Unable to successfully link X Toolkit library (-lXt) with
++ { echo "$as_me:16140: 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
+@@ -16174,14 +16178,14 @@
+ test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
+ CPPFLAGS="${CPPFLAGS}-I$cf_path/include"
+
+- echo "$as_me:16177: checking for $cf_test in $cf_path" >&5
++ echo "$as_me:16181: 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:16180: checking for $cf_test" >&5
++ echo "$as_me:16184: checking for $cf_test" >&5
+ echo $ECHO_N "checking for $cf_test... $ECHO_C" >&6
+ fi
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 16184 "configure"
++#line 16188 "configure"
+ #include "confdefs.h"
+
+ #include <X11/Intrinsic.h>
+@@ -16195,16 +16199,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:16198: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:16202: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:16201: \$? = $ac_status" >&5
++ echo "$as_me:16205: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:16204: \"$ac_try\"") >&5
++ { (eval echo "$as_me:16208: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:16207: \$? = $ac_status" >&5
++ echo "$as_me:16211: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_result=yes
+ else
+@@ -16213,7 +16217,7 @@
+ cf_result=no
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+- echo "$as_me:16216: result: $cf_result" >&5
++ echo "$as_me:16220: result: $cf_result" >&5
+ echo "${ECHO_T}$cf_result" >&6
+
+ LIBS="$cf_save_LIBS_CF_X_ATHENA_CPPFLAGS"
+@@ -16229,7 +16233,7 @@
+ done
+
+ if test -z "$cf_x_athena_inc" ; then
+- { echo "$as_me:16232: WARNING: Unable to find Athena header files" >&5
++ { echo "$as_me:16236: 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
+
+@@ -16294,10 +16298,10 @@
+ done
+ LIBS="$cf_add_libs"
+
+- echo "$as_me:16297: checking for $cf_test in $cf_libs" >&5
++ echo "$as_me:16301: 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 16300 "configure"
++#line 16304 "configure"
+ #include "confdefs.h"
+
+ $ac_includes_default
+@@ -16314,16 +16318,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:16317: \"$ac_link\"") >&5
++if { (eval echo "$as_me:16321: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:16320: \$? = $ac_status" >&5
++ echo "$as_me:16324: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:16323: \"$ac_try\"") >&5
++ { (eval echo "$as_me:16327: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:16326: \$? = $ac_status" >&5
++ echo "$as_me:16330: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_result=yes
+ else
+@@ -16332,7 +16336,7 @@
+ cf_result=no
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+- echo "$as_me:16335: result: $cf_result" >&5
++ echo "$as_me:16339: result: $cf_result" >&5
+ echo "${ECHO_T}$cf_result" >&6
+
+ LIBS="$cf_save_LIBS_CF_X_ATHENA_LIBS"
+@@ -16349,7 +16353,7 @@
+ done
+
+ if test -z "$cf_x_athena_lib" ; then
+- { { echo "$as_me:16352: error: Unable to successfully link Athena library (-l$cf_x_athena_root) with test program" >&5
++ { { echo "$as_me:16356: 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
+@@ -16383,7 +16387,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:16386: checking for $ac_word" >&5
++echo "$as_me:16390: 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
+@@ -16398,7 +16402,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:16401: found $ac_dir/$ac_word" >&5
++echo "$as_me:16405: found $ac_dir/$ac_word" >&5
+ break
+ done
+
+@@ -16406,10 +16410,10 @@
+ fi
+ XCURSES_CONFIG=$ac_cv_prog_XCURSES_CONFIG
+ if test -n "$XCURSES_CONFIG"; then
+- echo "$as_me:16409: result: $XCURSES_CONFIG" >&5
++ echo "$as_me:16413: result: $XCURSES_CONFIG" >&5
+ echo "${ECHO_T}$XCURSES_CONFIG" >&6
+ else
+- echo "$as_me:16412: result: no" >&5
++ echo "$as_me:16416: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+
+@@ -16422,7 +16426,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:16425: checking for $ac_word" >&5
++echo "$as_me:16429: 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
+@@ -16437,7 +16441,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:16440: found $ac_dir/$ac_word" >&5
++echo "$as_me:16444: found $ac_dir/$ac_word" >&5
+ break
+ done
+
+@@ -16445,10 +16449,10 @@
+ fi
+ ac_ct_XCURSES_CONFIG=$ac_cv_prog_ac_ct_XCURSES_CONFIG
+ if test -n "$ac_ct_XCURSES_CONFIG"; then
+- echo "$as_me:16448: result: $ac_ct_XCURSES_CONFIG" >&5
++ echo "$as_me:16452: result: $ac_ct_XCURSES_CONFIG" >&5
+ echo "${ECHO_T}$ac_ct_XCURSES_CONFIG" >&6
+ else
+- echo "$as_me:16451: result: no" >&5
++ echo "$as_me:16455: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+
+@@ -16583,7 +16587,7 @@
+
+ test -n "$verbose" && echo " checking additions to CFLAGS" 1>&6
+
+-echo "${as_me:-configure}:16586: testing checking additions to CFLAGS ..." 1>&5
++echo "${as_me:-configure}:16590: testing checking additions to CFLAGS ..." 1>&5
+
+ cf_check_cflags="$CFLAGS"
+ cf_check_cppflags="$CPPFLAGS"
+@@ -16668,7 +16672,7 @@
+ if test -n "$cf_new_cflags" ; then
+ test -n "$verbose" && echo " add to \$CFLAGS $cf_new_cflags" 1>&6
+
+-echo "${as_me:-configure}:16671: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
++echo "${as_me:-configure}:16675: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
+
+ test -n "$CFLAGS" && CFLAGS="$CFLAGS "
+ CFLAGS="${CFLAGS}$cf_new_cflags"
+@@ -16678,7 +16682,7 @@
+ if test -n "$cf_new_cppflags" ; then
+ test -n "$verbose" && echo " add to \$CPPFLAGS $cf_new_cppflags" 1>&6
+
+-echo "${as_me:-configure}:16681: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
++echo "${as_me:-configure}:16685: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
+
+ test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
+ CPPFLAGS="${CPPFLAGS}$cf_new_cppflags"
+@@ -16688,7 +16692,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}:16691: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5
++echo "${as_me:-configure}:16695: 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"
+@@ -16697,7 +16701,7 @@
+
+ if test "x$cf_check_cflags" != "x$CFLAGS" ; then
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 16700 "configure"
++#line 16704 "configure"
+ #include "confdefs.h"
+ #include <stdio.h>
+ int
+@@ -16709,16 +16713,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:16712: \"$ac_link\"") >&5
++if { (eval echo "$as_me:16716: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:16715: \$? = $ac_status" >&5
++ echo "$as_me:16719: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:16718: \"$ac_try\"") >&5
++ { (eval echo "$as_me:16722: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:16721: \$? = $ac_status" >&5
++ echo "$as_me:16725: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ :
+ else
+@@ -16726,12 +16730,12 @@
+ cat "conftest.$ac_ext" >&5
+ test -n "$verbose" && echo " test-compile failed. Undoing change to \$CFLAGS" 1>&6
+
+-echo "${as_me:-configure}:16729: testing test-compile failed. Undoing change to \$CFLAGS ..." 1>&5
++echo "${as_me:-configure}:16733: 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}:16734: testing but keeping change to \$CPPFLAGS ..." 1>&5
++echo "${as_me:-configure}:16738: testing but keeping change to \$CPPFLAGS ..." 1>&5
+
+ fi
+ CFLAGS="$cf_check_cflags"
+@@ -16739,7 +16743,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+
+-echo "$as_me:16742: checking for XOpenDisplay in -lX11" >&5
++echo "$as_me:16746: 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
+@@ -16747,7 +16751,7 @@
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lX11 $X_PRE_LIBS $LIBS $X_EXTRA_LIBS $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 16750 "configure"
++#line 16754 "configure"
+ #include "confdefs.h"
+
+ /* Override any gcc2 internal prototype to avoid an error. */
+@@ -16766,16 +16770,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:16769: \"$ac_link\"") >&5
++if { (eval echo "$as_me:16773: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:16772: \$? = $ac_status" >&5
++ echo "$as_me:16776: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:16775: \"$ac_try\"") >&5
++ { (eval echo "$as_me:16779: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:16778: \$? = $ac_status" >&5
++ echo "$as_me:16782: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_lib_X11_XOpenDisplay=yes
+ else
+@@ -16786,7 +16790,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:16789: result: $ac_cv_lib_X11_XOpenDisplay" >&5
++echo "$as_me:16793: 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
+
+@@ -16808,7 +16812,7 @@
+
+ fi
+
+-echo "$as_me:16811: checking for XCurses library" >&5
++echo "$as_me:16815: 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
+@@ -16831,7 +16835,7 @@
+ LIBS="$cf_add_libs"
+
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 16834 "configure"
++#line 16838 "configure"
+ #include "confdefs.h"
+
+ #include <xcurses.h>
+@@ -16846,16 +16850,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:16849: \"$ac_link\"") >&5
++if { (eval echo "$as_me:16853: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:16852: \$? = $ac_status" >&5
++ echo "$as_me:16856: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:16855: \"$ac_try\"") >&5
++ { (eval echo "$as_me:16859: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:16858: \$? = $ac_status" >&5
++ echo "$as_me:16862: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_lib_XCurses=yes
+ else
+@@ -16866,7 +16870,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+
+ fi
+-echo "$as_me:16869: result: $cf_cv_lib_XCurses" >&5
++echo "$as_me:16873: result: $cf_cv_lib_XCurses" >&5
+ echo "${ECHO_T}$cf_cv_lib_XCurses" >&6
+
+ fi
+@@ -16881,23 +16885,23 @@
+ #define XCURSES 1
+ EOF
+
+- echo "$as_me:16884: checking for xcurses.h" >&5
++ echo "$as_me:16888: 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 16890 "configure"
++#line 16894 "configure"
+ #include "confdefs.h"
+ #include <xcurses.h>
+ _ACEOF
+-if { (eval echo "$as_me:16894: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:16898: \"$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:16900: \$? = $ac_status" >&5
++ echo "$as_me:16904: \$? = $ac_status" >&5
+ (exit "$ac_status"); } >/dev/null; then
+ if test -s conftest.err; then
+ ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -16916,7 +16920,7 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:16919: result: $ac_cv_header_xcurses_h" >&5
++echo "$as_me:16923: 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
+
+@@ -16927,71 +16931,78 @@
+ fi
+
+ else
+- { { echo "$as_me:16930: error: Cannot link with XCurses" >&5
++ { { echo "$as_me:16934: error: Cannot link with XCurses" >&5
+ echo "$as_me: error: Cannot link with XCurses" >&2;}
+ { (exit 1); exit 1; }; }
+ fi
+
+ ;;
+ (*)
+- { { echo "$as_me:16937: error: unexpected screen-value: $cf_cv_screen" >&5
++ { { echo "$as_me:16941: error: unexpected screen-value: $cf_cv_screen" >&5
+ echo "$as_me: error: unexpected screen-value: $cf_cv_screen" >&2;}
+ { (exit 1); exit 1; }; }
+ ;;
+ esac
+
+-: ${cf_nculib_root:=$cf_cv_screen}
+-as_ac_Lib=`echo "ac_cv_lib_$cf_nculib_root''__nc_init_pthreads" | $as_tr_sh`
+-echo "$as_me:16945: checking for _nc_init_pthreads in -l$cf_nculib_root" >&5
+-echo $ECHO_N "checking for _nc_init_pthreads in -l$cf_nculib_root... $ECHO_C" >&6
+-if eval "test \"\${$as_ac_Lib+set}\" = set"; then
++echo "$as_me:16947: 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
+- ac_check_lib_save_LIBS=$LIBS
+-LIBS="-l$cf_nculib_root $LIBS"
+-cat >"conftest.$ac_ext" <<_ACEOF
++ cat >"conftest.$ac_ext" <<_ACEOF
+ #line 16953 "configure"
+ #include "confdefs.h"
++#define _nc_init_pthreads autoconf_temporary
++#include <limits.h> /* least-intrusive standard header which defines gcc2 __stub macros */
++#undef _nc_init_pthreads
+
+-/* Override any gcc2 internal prototype to avoid an error. */
+ #ifdef __cplusplus
+ extern "C"
+ #endif
++
+ /* We use char because int might match the return type of a gcc2
+ builtin and then its argument prototype would still apply. */
+ char _nc_init_pthreads (void);
++
+ int
+ main (void)
+ {
+-_nc_init_pthreads ();
++
++/* The GNU C library defines stubs for functions which it implements
++ to always fail with ENOSYS. Some functions are actually named
++ something starting with __ and the normal name is an alias. */
++#if defined (__stub__nc_init_pthreads) || defined (__stub____nc_init_pthreads)
++#error found stub for _nc_init_pthreads
++#endif
++
++ return _nc_init_pthreads ();
+ ;
+ return 0;
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:16972: \"$ac_link\"") >&5
++if { (eval echo "$as_me:16984: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:16975: \$? = $ac_status" >&5
++ echo "$as_me:16987: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:16978: \"$ac_try\"") >&5
++ { (eval echo "$as_me:16990: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:16981: \$? = $ac_status" >&5
++ echo "$as_me:16993: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+- eval "$as_ac_Lib=yes"
++ ac_cv_func__nc_init_pthreads=yes
+ else
+ echo "$as_me: failed program was:" >&5
+ cat "conftest.$ac_ext" >&5
+-eval "$as_ac_Lib=no"
++ac_cv_func__nc_init_pthreads=no
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+-LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:16992: 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
++echo "$as_me:17003: 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
+ else
+ cf_cv_ncurses_pthreads=no
+@@ -17024,7 +17035,7 @@
+ ;;
+ esac
+
+-echo "$as_me:17027: checking for X11 rgb file" >&5
++echo "$as_me:17038: 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.
+@@ -17088,7 +17099,7 @@
+ cf_path=`echo "$cf_path" | sed -e s%NONE%$cf_path_syntax%`
+ ;;
+ (*)
+- { { echo "$as_me:17091: error: expected a pathname, not \"$cf_path\"" >&5
++ { { echo "$as_me:17102: error: expected a pathname, not \"$cf_path\"" >&5
+ echo "$as_me: error: expected a pathname, not \"$cf_path\"" >&2;}
+ { (exit 1); exit 1; }; }
+ ;;
+@@ -17096,7 +17107,7 @@
+
+ fi
+
+-echo "$as_me:17099: result: $RGB_PATH" >&5
++echo "$as_me:17110: result: $RGB_PATH" >&5
+ echo "${ECHO_T}$RGB_PATH" >&6
+
+ cat >>confdefs.h <<EOF
+@@ -17137,7 +17148,7 @@
+ ;;
+ esac
+
+-echo "$as_me:17140: checking for desired basename for form library" >&5
++echo "$as_me:17151: 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.
+@@ -17157,10 +17168,10 @@
+ ;;
+ esac
+
+-echo "$as_me:17160: result: $FORM_NAME" >&5
++echo "$as_me:17171: result: $FORM_NAME" >&5
+ echo "${ECHO_T}$FORM_NAME" >&6
+
+-echo "$as_me:17163: checking for desired basename for menu library" >&5
++echo "$as_me:17174: 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.
+@@ -17180,10 +17191,10 @@
+ ;;
+ esac
+
+-echo "$as_me:17183: result: $MENU_NAME" >&5
++echo "$as_me:17194: result: $MENU_NAME" >&5
+ echo "${ECHO_T}$MENU_NAME" >&6
+
+-echo "$as_me:17186: checking for desired basename for panel library" >&5
++echo "$as_me:17197: 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.
+@@ -17203,10 +17214,10 @@
+ ;;
+ esac
+
+-echo "$as_me:17206: result: $PANEL_NAME" >&5
++echo "$as_me:17217: result: $PANEL_NAME" >&5
+ echo "${ECHO_T}$PANEL_NAME" >&6
+
+-echo "$as_me:17209: checking if you want to check for panel functions" >&5
++echo "$as_me:17220: 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.
+@@ -17223,7 +17234,7 @@
+ cf_enable_panel=$cf_default_panel
+
+ fi;
+-echo "$as_me:17226: result: $cf_enable_panel" >&5
++echo "$as_me:17237: result: $cf_enable_panel" >&5
+ echo "${ECHO_T}$cf_enable_panel" >&6
+ if test $cf_enable_panel = yes
+ then
+@@ -17234,13 +17245,13 @@
+ if test "x${NCURSES_CONFIG_PKG}" = xnone; then
+ :
+ elif test "x${PKG_CONFIG:=none}" != xnone; then
+- echo "$as_me:17237: checking pkg-config for $PANEL_NAME$cf_cv_libtype" >&5
++ echo "$as_me:17248: 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:17240: result: yes" >&5
++ echo "$as_me:17251: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+
+- echo "$as_me:17243: checking if the $PANEL_NAME$cf_cv_libtype package files work" >&5
++ echo "$as_me:17254: 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"
+@@ -17390,7 +17401,7 @@
+ LIBS="$cf_add_libs"
+
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 17393 "configure"
++#line 17404 "configure"
+ #include "confdefs.h"
+ #include <$PANEL_NAME.h>
+ int
+@@ -17402,37 +17413,37 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:17405: \"$ac_link\"") >&5
++if { (eval echo "$as_me:17416: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:17408: \$? = $ac_status" >&5
++ echo "$as_me:17419: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:17411: \"$ac_try\"") >&5
++ { (eval echo "$as_me:17422: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:17414: \$? = $ac_status" >&5
++ echo "$as_me:17425: \$? = $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 17420 "configure"
++#line 17431 "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:17427: \"$ac_link\"") >&5
++if { (eval echo "$as_me:17438: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:17430: \$? = $ac_status" >&5
++ echo "$as_me:17441: \$? = $ac_status" >&5
+ (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+- { (eval echo "$as_me:17432: \"$ac_try\"") >&5
++ { (eval echo "$as_me:17443: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:17435: \$? = $ac_status" >&5
++ echo "$as_me:17446: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_have_curses_lib=yes
+ else
+@@ -17449,7 +17460,7 @@
+ cf_have_curses_lib=no
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+- echo "$as_me:17452: result: $cf_have_curses_lib" >&5
++ echo "$as_me:17463: 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"
+@@ -17470,7 +17481,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:17473: checking for new_panel in -l$PANEL_NAME$cf_cv_libtype" >&5
++echo "$as_me:17484: 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
+@@ -17478,7 +17489,7 @@
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-l$PANEL_NAME$cf_cv_libtype $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 17481 "configure"
++#line 17492 "configure"
+ #include "confdefs.h"
+
+ /* Override any gcc2 internal prototype to avoid an error. */
+@@ -17497,16 +17508,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:17500: \"$ac_link\"") >&5
++if { (eval echo "$as_me:17511: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:17503: \$? = $ac_status" >&5
++ echo "$as_me:17514: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:17506: \"$ac_try\"") >&5
++ { (eval echo "$as_me:17517: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:17509: \$? = $ac_status" >&5
++ echo "$as_me:17520: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ eval "$as_ac_Lib=yes"
+ else
+@@ -17517,7 +17528,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:17520: result: `eval echo '${'"$as_ac_Lib"'}'`" >&5
++echo "$as_me:17531: 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
+
+@@ -17550,7 +17561,7 @@
+ cf_curses_headers="$cf_curses_headers panel.h"
+ fi
+
+-echo "$as_me:17553: checking if you want to check for menu functions" >&5
++echo "$as_me:17564: 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.
+@@ -17567,7 +17578,7 @@
+ cf_enable_menu=$cf_default_menu
+
+ fi;
+-echo "$as_me:17570: result: $cf_enable_menu" >&5
++echo "$as_me:17581: result: $cf_enable_menu" >&5
+ echo "${ECHO_T}$cf_enable_menu" >&6
+ if test $cf_enable_menu = yes
+ then
+@@ -17576,14 +17587,14 @@
+ ;;
+ (curses*)
+
+-echo "$as_me:17579: checking for NetBSD menu.h" >&5
++echo "$as_me:17590: 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 17586 "configure"
++#line 17597 "configure"
+ #include "confdefs.h"
+
+ #include <${cf_cv_ncurses_header:-curses.h}>
+@@ -17601,16 +17612,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:17604: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:17615: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:17607: \$? = $ac_status" >&5
++ echo "$as_me:17618: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:17610: \"$ac_try\"") >&5
++ { (eval echo "$as_me:17621: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:17613: \$? = $ac_status" >&5
++ echo "$as_me:17624: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_netbsd_menu_h=yes
+
+@@ -17622,7 +17633,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+
+ fi
+-echo "$as_me:17625: result: $cf_cv_netbsd_menu_h" >&5
++echo "$as_me:17636: result: $cf_cv_netbsd_menu_h" >&5
+ echo "${ECHO_T}$cf_cv_netbsd_menu_h" >&6
+
+ test "$cf_cv_netbsd_menu_h" = yes &&
+@@ -17639,13 +17650,13 @@
+ if test "x${NCURSES_CONFIG_PKG}" = xnone; then
+ :
+ elif test "x${PKG_CONFIG:=none}" != xnone; then
+- echo "$as_me:17642: checking pkg-config for $MENU_NAME$cf_cv_libtype" >&5
++ echo "$as_me:17653: 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:17645: result: yes" >&5
++ echo "$as_me:17656: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+
+- echo "$as_me:17648: checking if the $MENU_NAME$cf_cv_libtype package files work" >&5
++ echo "$as_me:17659: 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"
+@@ -17795,7 +17806,7 @@
+ LIBS="$cf_add_libs"
+
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 17798 "configure"
++#line 17809 "configure"
+ #include "confdefs.h"
+ #include <$MENU_NAME.h>
+ int
+@@ -17807,37 +17818,37 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:17810: \"$ac_link\"") >&5
++if { (eval echo "$as_me:17821: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:17813: \$? = $ac_status" >&5
++ echo "$as_me:17824: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:17816: \"$ac_try\"") >&5
++ { (eval echo "$as_me:17827: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:17819: \$? = $ac_status" >&5
++ echo "$as_me:17830: \$? = $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 17825 "configure"
++#line 17836 "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:17832: \"$ac_link\"") >&5
++if { (eval echo "$as_me:17843: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:17835: \$? = $ac_status" >&5
++ echo "$as_me:17846: \$? = $ac_status" >&5
+ (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+- { (eval echo "$as_me:17837: \"$ac_try\"") >&5
++ { (eval echo "$as_me:17848: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:17840: \$? = $ac_status" >&5
++ echo "$as_me:17851: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_have_curses_lib=yes
+ else
+@@ -17854,7 +17865,7 @@
+ cf_have_curses_lib=no
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+- echo "$as_me:17857: result: $cf_have_curses_lib" >&5
++ echo "$as_me:17868: 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"
+@@ -17875,7 +17886,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:17878: checking for menu_driver in -l$MENU_NAME$cf_cv_libtype" >&5
++echo "$as_me:17889: 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
+@@ -17883,7 +17894,7 @@
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-l$MENU_NAME$cf_cv_libtype $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 17886 "configure"
++#line 17897 "configure"
+ #include "confdefs.h"
+
+ /* Override any gcc2 internal prototype to avoid an error. */
+@@ -17902,16 +17913,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:17905: \"$ac_link\"") >&5
++if { (eval echo "$as_me:17916: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:17908: \$? = $ac_status" >&5
++ echo "$as_me:17919: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:17911: \"$ac_try\"") >&5
++ { (eval echo "$as_me:17922: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:17914: \$? = $ac_status" >&5
++ echo "$as_me:17925: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ eval "$as_ac_Lib=yes"
+ else
+@@ -17922,7 +17933,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:17925: result: `eval echo '${'"$as_ac_Lib"'}'`" >&5
++echo "$as_me:17936: 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
+
+@@ -17955,7 +17966,7 @@
+ cf_curses_headers="$cf_curses_headers menu.h"
+ fi
+
+-echo "$as_me:17958: checking if you want to check for form functions" >&5
++echo "$as_me:17969: 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.
+@@ -17972,7 +17983,7 @@
+ cf_enable_form=$cf_default_form
+
+ fi;
+-echo "$as_me:17975: result: $cf_enable_form" >&5
++echo "$as_me:17986: result: $cf_enable_form" >&5
+ echo "${ECHO_T}$cf_enable_form" >&6
+ if test $cf_enable_form = yes
+ then
+@@ -17981,14 +17992,14 @@
+ ;;
+ (curses*)
+
+-echo "$as_me:17984: checking for NetBSD form.h" >&5
++echo "$as_me:17995: 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 17991 "configure"
++#line 18002 "configure"
+ #include "confdefs.h"
+
+ #include <${cf_cv_ncurses_header:-curses.h}>
+@@ -18007,16 +18018,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:18010: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:18021: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:18013: \$? = $ac_status" >&5
++ echo "$as_me:18024: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:18016: \"$ac_try\"") >&5
++ { (eval echo "$as_me:18027: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:18019: \$? = $ac_status" >&5
++ echo "$as_me:18030: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_netbsd_form_h=yes
+
+@@ -18028,7 +18039,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+
+ fi
+-echo "$as_me:18031: result: $cf_cv_netbsd_form_h" >&5
++echo "$as_me:18042: result: $cf_cv_netbsd_form_h" >&5
+ echo "${ECHO_T}$cf_cv_netbsd_form_h" >&6
+
+ test "$cf_cv_netbsd_form_h" = yes &&
+@@ -18045,13 +18056,13 @@
+ if test "x${NCURSES_CONFIG_PKG}" = xnone; then
+ :
+ elif test "x${PKG_CONFIG:=none}" != xnone; then
+- echo "$as_me:18048: checking pkg-config for $FORM_NAME$cf_cv_libtype" >&5
++ echo "$as_me:18059: 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:18051: result: yes" >&5
++ echo "$as_me:18062: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+
+- echo "$as_me:18054: checking if the $FORM_NAME$cf_cv_libtype package files work" >&5
++ echo "$as_me:18065: 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"
+@@ -18201,7 +18212,7 @@
+ LIBS="$cf_add_libs"
+
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 18204 "configure"
++#line 18215 "configure"
+ #include "confdefs.h"
+ #include <$FORM_NAME.h>
+ int
+@@ -18213,37 +18224,37 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:18216: \"$ac_link\"") >&5
++if { (eval echo "$as_me:18227: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:18219: \$? = $ac_status" >&5
++ echo "$as_me:18230: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:18222: \"$ac_try\"") >&5
++ { (eval echo "$as_me:18233: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:18225: \$? = $ac_status" >&5
++ echo "$as_me:18236: \$? = $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 18231 "configure"
++#line 18242 "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:18238: \"$ac_link\"") >&5
++if { (eval echo "$as_me:18249: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:18241: \$? = $ac_status" >&5
++ echo "$as_me:18252: \$? = $ac_status" >&5
+ (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+- { (eval echo "$as_me:18243: \"$ac_try\"") >&5
++ { (eval echo "$as_me:18254: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:18246: \$? = $ac_status" >&5
++ echo "$as_me:18257: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_have_curses_lib=yes
+ else
+@@ -18260,7 +18271,7 @@
+ cf_have_curses_lib=no
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+- echo "$as_me:18263: result: $cf_have_curses_lib" >&5
++ echo "$as_me:18274: 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"
+@@ -18281,7 +18292,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:18284: checking for form_driver in -l$FORM_NAME$cf_cv_libtype" >&5
++echo "$as_me:18295: 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
+@@ -18289,7 +18300,7 @@
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-l$FORM_NAME$cf_cv_libtype $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 18292 "configure"
++#line 18303 "configure"
+ #include "confdefs.h"
+
+ /* Override any gcc2 internal prototype to avoid an error. */
+@@ -18308,16 +18319,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:18311: \"$ac_link\"") >&5
++if { (eval echo "$as_me:18322: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:18314: \$? = $ac_status" >&5
++ echo "$as_me:18325: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:18317: \"$ac_try\"") >&5
++ { (eval echo "$as_me:18328: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:18320: \$? = $ac_status" >&5
++ echo "$as_me:18331: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ eval "$as_ac_Lib=yes"
+ else
+@@ -18328,7 +18339,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:18331: result: `eval echo '${'"$as_ac_Lib"'}'`" >&5
++echo "$as_me:18342: 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
+
+@@ -18366,23 +18377,23 @@
+ for ac_header in $cf_curses_headers
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-echo "$as_me:18369: checking for $ac_header" >&5
++echo "$as_me:18380: 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 18375 "configure"
++#line 18386 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:18379: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:18390: \"$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:18385: \$? = $ac_status" >&5
++ echo "$as_me:18396: \$? = $ac_status" >&5
+ (exit "$ac_status"); } >/dev/null; then
+ if test -s conftest.err; then
+ ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -18401,7 +18412,7 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:18404: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
++echo "$as_me:18415: 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
+@@ -18411,13 +18422,13 @@
+ fi
+ done
+
+-echo "$as_me:18414: checking whether time.h and sys/time.h may both be included" >&5
++echo "$as_me:18425: 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 18420 "configure"
++#line 18431 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ #include <sys/time.h>
+@@ -18433,16 +18444,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:18436: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:18447: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:18439: \$? = $ac_status" >&5
++ echo "$as_me:18450: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:18442: \"$ac_try\"") >&5
++ { (eval echo "$as_me:18453: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:18445: \$? = $ac_status" >&5
++ echo "$as_me:18456: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_header_time=yes
+ else
+@@ -18452,7 +18463,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:18455: result: $ac_cv_header_time" >&5
++echo "$as_me:18466: result: $ac_cv_header_time" >&5
+ echo "${ECHO_T}$ac_cv_header_time" >&6
+ if test $ac_cv_header_time = yes; then
+
+@@ -18475,23 +18486,23 @@
+
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-echo "$as_me:18478: checking for $ac_header" >&5
++echo "$as_me:18489: 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 18484 "configure"
++#line 18495 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:18488: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:18499: \"$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:18494: \$? = $ac_status" >&5
++ echo "$as_me:18505: \$? = $ac_status" >&5
+ (exit "$ac_status"); } >/dev/null; then
+ if test -s conftest.err; then
+ ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -18510,7 +18521,7 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:18513: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
++echo "$as_me:18524: 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
+@@ -18523,23 +18534,23 @@
+ for ac_header in unistd.h getopt.h
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-echo "$as_me:18526: checking for $ac_header" >&5
++echo "$as_me:18537: 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 18532 "configure"
++#line 18543 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:18536: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:18547: \"$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:18542: \$? = $ac_status" >&5
++ echo "$as_me:18553: \$? = $ac_status" >&5
+ (exit "$ac_status"); } >/dev/null; then
+ if test -s conftest.err; then
+ ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -18558,7 +18569,7 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:18561: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
++echo "$as_me:18572: 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
+@@ -18568,7 +18579,7 @@
+ fi
+ done
+
+-echo "$as_me:18571: checking for header declaring getopt variables" >&5
++echo "$as_me:18582: 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
+@@ -18578,7 +18589,7 @@
+ for cf_header in stdio.h stdlib.h unistd.h getopt.h
+ do
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 18581 "configure"
++#line 18592 "configure"
+ #include "confdefs.h"
+
+ #include <$cf_header>
+@@ -18591,16 +18602,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:18594: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:18605: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:18597: \$? = $ac_status" >&5
++ echo "$as_me:18608: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:18600: \"$ac_try\"") >&5
++ { (eval echo "$as_me:18611: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:18603: \$? = $ac_status" >&5
++ echo "$as_me:18614: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_getopt_header=$cf_header
+ break
+@@ -18612,7 +18623,7 @@
+ done
+
+ fi
+-echo "$as_me:18615: result: $cf_cv_getopt_header" >&5
++echo "$as_me:18626: result: $cf_cv_getopt_header" >&5
+ echo "${ECHO_T}$cf_cv_getopt_header" >&6
+ if test "$cf_cv_getopt_header" != none ; then
+
+@@ -18630,13 +18641,13 @@
+ fi
+
+ cf_save_libs="$LIBS"
+-echo "$as_me:18633: checking for clock_gettime" >&5
++echo "$as_me:18644: 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 18639 "configure"
++#line 18650 "configure"
+ #include "confdefs.h"
+ #define clock_gettime autoconf_temporary
+ #include <limits.h> /* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -18667,16 +18678,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:18670: \"$ac_link\"") >&5
++if { (eval echo "$as_me:18681: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:18673: \$? = $ac_status" >&5
++ echo "$as_me:18684: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:18676: \"$ac_try\"") >&5
++ { (eval echo "$as_me:18687: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:18679: \$? = $ac_status" >&5
++ echo "$as_me:18690: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_func_clock_gettime=yes
+ else
+@@ -18686,12 +18697,12 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:18689: result: $ac_cv_func_clock_gettime" >&5
++echo "$as_me:18700: 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:18694: checking for clock_gettime in -lrt" >&5
++ echo "$as_me:18705: 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
+@@ -18699,7 +18710,7 @@
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lrt $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 18702 "configure"
++#line 18713 "configure"
+ #include "confdefs.h"
+
+ /* Override any gcc2 internal prototype to avoid an error. */
+@@ -18718,16 +18729,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:18721: \"$ac_link\"") >&5
++if { (eval echo "$as_me:18732: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:18724: \$? = $ac_status" >&5
++ echo "$as_me:18735: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:18727: \"$ac_try\"") >&5
++ { (eval echo "$as_me:18738: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:18730: \$? = $ac_status" >&5
++ echo "$as_me:18741: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_lib_rt_clock_gettime=yes
+ else
+@@ -18738,7 +18749,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:18741: result: $ac_cv_lib_rt_clock_gettime" >&5
++echo "$as_me:18752: 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"
+@@ -18750,14 +18761,14 @@
+ fi
+
+ if test "$cf_cv_test_clock_gettime" = yes ; then
+-echo "$as_me:18753: checking if clock_gettime links" >&5
++echo "$as_me:18764: 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 18760 "configure"
++#line 18771 "configure"
+ #include "confdefs.h"
+
+ $ac_includes_default
+@@ -18775,16 +18786,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:18778: \"$ac_link\"") >&5
++if { (eval echo "$as_me:18789: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:18781: \$? = $ac_status" >&5
++ echo "$as_me:18792: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:18784: \"$ac_try\"") >&5
++ { (eval echo "$as_me:18795: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:18787: \$? = $ac_status" >&5
++ echo "$as_me:18798: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_func_clock_gettime=yes
+ else
+@@ -18795,7 +18806,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+
+ fi
+-echo "$as_me:18798: result: $cf_cv_func_clock_gettime" >&5
++echo "$as_me:18809: result: $cf_cv_func_clock_gettime" >&5
+ echo "${ECHO_T}$cf_cv_func_clock_gettime" >&6
+ else
+ cf_cv_func_clock_gettime=no
+@@ -18809,13 +18820,13 @@
+ EOF
+
+ else
+-echo "$as_me:18812: checking for gettimeofday" >&5
++echo "$as_me:18823: 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 18818 "configure"
++#line 18829 "configure"
+ #include "confdefs.h"
+ #define gettimeofday autoconf_temporary
+ #include <limits.h> /* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -18846,16 +18857,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:18849: \"$ac_link\"") >&5
++if { (eval echo "$as_me:18860: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:18852: \$? = $ac_status" >&5
++ echo "$as_me:18863: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:18855: \"$ac_try\"") >&5
++ { (eval echo "$as_me:18866: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:18858: \$? = $ac_status" >&5
++ echo "$as_me:18869: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_func_gettimeofday=yes
+ else
+@@ -18865,7 +18876,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:18868: result: $ac_cv_func_gettimeofday" >&5
++echo "$as_me:18879: result: $ac_cv_func_gettimeofday" >&5
+ echo "${ECHO_T}$ac_cv_func_gettimeofday" >&6
+ if test "$ac_cv_func_gettimeofday" = yes; then
+
+@@ -18875,7 +18886,7 @@
+
+ else
+
+-echo "$as_me:18878: checking for gettimeofday in -lbsd" >&5
++echo "$as_me:18889: 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
+@@ -18883,7 +18894,7 @@
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lbsd $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 18886 "configure"
++#line 18897 "configure"
+ #include "confdefs.h"
+
+ /* Override any gcc2 internal prototype to avoid an error. */
+@@ -18902,16 +18913,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:18905: \"$ac_link\"") >&5
++if { (eval echo "$as_me:18916: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:18908: \$? = $ac_status" >&5
++ echo "$as_me:18919: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:18911: \"$ac_try\"") >&5
++ { (eval echo "$as_me:18922: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:18914: \$? = $ac_status" >&5
++ echo "$as_me:18925: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_lib_bsd_gettimeofday=yes
+ else
+@@ -18922,7 +18933,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:18925: result: $ac_cv_lib_bsd_gettimeofday" >&5
++echo "$as_me:18936: 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
+
+@@ -18960,13 +18971,13 @@
+
+ do
+ as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+-echo "$as_me:18963: checking for $ac_func" >&5
++echo "$as_me:18974: 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 18969 "configure"
++#line 18980 "configure"
+ #include "confdefs.h"
+ #define $ac_func autoconf_temporary
+ #include <limits.h> /* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -18997,16 +19008,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:19000: \"$ac_link\"") >&5
++if { (eval echo "$as_me:19011: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:19003: \$? = $ac_status" >&5
++ echo "$as_me:19014: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:19006: \"$ac_try\"") >&5
++ { (eval echo "$as_me:19017: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:19009: \$? = $ac_status" >&5
++ echo "$as_me:19020: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ eval "$as_ac_var=yes"
+ else
+@@ -19016,7 +19027,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:19019: result: `eval echo '${'"$as_ac_var"'}'`" >&5
++echo "$as_me:19030: 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
+@@ -19027,14 +19038,14 @@
+ done
+
+ # use a compile-check to work with ncurses*-config and subdirectory includes
+-echo "$as_me:19030: checking if we can use termcap.h" >&5
++echo "$as_me:19041: 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 19037 "configure"
++#line 19048 "configure"
+ #include "confdefs.h"
+
+ #include <curses.h>
+@@ -19055,16 +19066,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:19058: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:19069: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:19061: \$? = $ac_status" >&5
++ echo "$as_me:19072: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:19064: \"$ac_try\"") >&5
++ { (eval echo "$as_me:19075: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:19067: \$? = $ac_status" >&5
++ echo "$as_me:19078: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_have_termcap_h=yes
+ else
+@@ -19074,7 +19085,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:19077: result: $cf_cv_have_termcap_h" >&5
++echo "$as_me:19088: 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
+@@ -19084,14 +19095,14 @@
+ EOF
+
+ else
+-echo "$as_me:19087: checking if we can use ncurses/termcap.h" >&5
++echo "$as_me:19098: 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 19094 "configure"
++#line 19105 "configure"
+ #include "confdefs.h"
+
+ #include <ncurses/curses.h>
+@@ -19112,16 +19123,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:19115: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:19126: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:19118: \$? = $ac_status" >&5
++ echo "$as_me:19129: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:19121: \"$ac_try\"") >&5
++ { (eval echo "$as_me:19132: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:19124: \$? = $ac_status" >&5
++ echo "$as_me:19135: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_have_ncurses_termcap_h=yes
+ else
+@@ -19131,7 +19142,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:19134: result: $cf_cv_have_ncurses_termcap_h" >&5
++echo "$as_me:19145: 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
+@@ -19141,7 +19152,7 @@
+ fi
+
+ if test "x$ac_cv_func_getopt" = xno; then
+- { { echo "$as_me:19144: error: getopt is required for building programs" >&5
++ { { echo "$as_me:19155: error: getopt is required for building programs" >&5
+ echo "$as_me: error: getopt is required for building programs" >&2;}
+ { (exit 1); exit 1; }; }
+ fi
+@@ -19160,13 +19171,13 @@
+
+ do
+ as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+-echo "$as_me:19163: checking for $ac_func" >&5
++echo "$as_me:19174: 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 19169 "configure"
++#line 19180 "configure"
+ #include "confdefs.h"
+ #define $ac_func autoconf_temporary
+ #include <limits.h> /* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -19197,16 +19208,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:19200: \"$ac_link\"") >&5
++if { (eval echo "$as_me:19211: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:19203: \$? = $ac_status" >&5
++ echo "$as_me:19214: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:19206: \"$ac_try\"") >&5
++ { (eval echo "$as_me:19217: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:19209: \$? = $ac_status" >&5
++ echo "$as_me:19220: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ eval "$as_ac_var=yes"
+ else
+@@ -19216,7 +19227,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:19219: result: `eval echo '${'"$as_ac_var"'}'`" >&5
++echo "$as_me:19230: 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
+@@ -19228,7 +19239,7 @@
+
+ fi
+
+-echo "$as_me:19231: checking definition to turn on extended curses functions" >&5
++echo "$as_me:19242: 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
+@@ -19236,7 +19247,7 @@
+
+ cf_cv_need_xopen_extension=unknown
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 19239 "configure"
++#line 19250 "configure"
+ #include "confdefs.h"
+
+ $ac_includes_default
+@@ -19269,16 +19280,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:19272: \"$ac_link\"") >&5
++if { (eval echo "$as_me:19283: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:19275: \$? = $ac_status" >&5
++ echo "$as_me:19286: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:19278: \"$ac_try\"") >&5
++ { (eval echo "$as_me:19289: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:19281: \$? = $ac_status" >&5
++ echo "$as_me:19292: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_need_xopen_extension=none
+ else
+@@ -19288,7 +19299,7 @@
+ for cf_try_xopen_extension in _XOPEN_SOURCE_EXTENDED NCURSES_WIDECHAR
+ do
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 19291 "configure"
++#line 19302 "configure"
+ #include "confdefs.h"
+
+ #define $cf_try_xopen_extension 1
+@@ -19314,16 +19325,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:19317: \"$ac_link\"") >&5
++if { (eval echo "$as_me:19328: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:19320: \$? = $ac_status" >&5
++ echo "$as_me:19331: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:19323: \"$ac_try\"") >&5
++ { (eval echo "$as_me:19334: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:19326: \$? = $ac_status" >&5
++ echo "$as_me:19337: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_need_xopen_extension=$cf_try_xopen_extension; break
+ else
+@@ -19337,7 +19348,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+
+ fi
+-echo "$as_me:19340: result: $cf_cv_need_xopen_extension" >&5
++echo "$as_me:19351: result: $cf_cv_need_xopen_extension" >&5
+ echo "${ECHO_T}$cf_cv_need_xopen_extension" >&6
+
+ case "$cf_cv_need_xopen_extension" in
+@@ -19349,7 +19360,7 @@
+ ;;
+ esac
+
+-echo "$as_me:19352: checking for term.h" >&5
++echo "$as_me:19363: 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
+@@ -19370,7 +19381,7 @@
+ for cf_header in $cf_header_list
+ do
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 19373 "configure"
++#line 19384 "configure"
+ #include "confdefs.h"
+
+ #include <${cf_cv_ncurses_header:-curses.h}>
+@@ -19384,16 +19395,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:19387: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:19398: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:19390: \$? = $ac_status" >&5
++ echo "$as_me:19401: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:19393: \"$ac_try\"") >&5
++ { (eval echo "$as_me:19404: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:19396: \$? = $ac_status" >&5
++ echo "$as_me:19407: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_term_header=$cf_header
+ break
+@@ -19412,7 +19423,7 @@
+ for cf_header in ncurses/term.h ncursesw/term.h
+ do
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 19415 "configure"
++#line 19426 "configure"
+ #include "confdefs.h"
+
+ #include <${cf_cv_ncurses_header:-curses.h}>
+@@ -19430,16 +19441,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:19433: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:19444: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:19436: \$? = $ac_status" >&5
++ echo "$as_me:19447: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:19439: \"$ac_try\"") >&5
++ { (eval echo "$as_me:19450: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:19442: \$? = $ac_status" >&5
++ echo "$as_me:19453: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_term_header=$cf_header
+ break
+@@ -19454,7 +19465,7 @@
+ esac
+
+ fi
+-echo "$as_me:19457: result: $cf_cv_term_header" >&5
++echo "$as_me:19468: result: $cf_cv_term_header" >&5
+ echo "${ECHO_T}$cf_cv_term_header" >&6
+
+ case "$cf_cv_term_header" in
+@@ -19481,7 +19492,7 @@
+ ;;
+ esac
+
+-echo "$as_me:19484: checking for unctrl.h" >&5
++echo "$as_me:19495: 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
+@@ -19502,7 +19513,7 @@
+ for cf_header in $cf_header_list
+ do
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 19505 "configure"
++#line 19516 "configure"
+ #include "confdefs.h"
+
+ #include <${cf_cv_ncurses_header:-curses.h}>
+@@ -19516,16 +19527,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:19519: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:19530: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:19522: \$? = $ac_status" >&5
++ echo "$as_me:19533: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:19525: \"$ac_try\"") >&5
++ { (eval echo "$as_me:19536: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:19528: \$? = $ac_status" >&5
++ echo "$as_me:19539: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_unctrl_header=$cf_header
+ break
+@@ -19538,12 +19549,12 @@
+ done
+
+ fi
+-echo "$as_me:19541: result: $cf_cv_unctrl_header" >&5
++echo "$as_me:19552: result: $cf_cv_unctrl_header" >&5
+ echo "${ECHO_T}$cf_cv_unctrl_header" >&6
+
+ case "$cf_cv_unctrl_header" in
+ (no)
+- { echo "$as_me:19546: WARNING: unctrl.h header not found" >&5
++ { echo "$as_me:19557: WARNING: unctrl.h header not found" >&5
+ echo "$as_me: WARNING: unctrl.h header not found" >&2;}
+ ;;
+ esac
+@@ -19641,10 +19652,10 @@
+
+ cf_tr_func=`echo "$cf_func" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%`
+
+- echo "$as_me:19644: checking for ${cf_func}" >&5
++ echo "$as_me:19655: checking for ${cf_func}" >&5
+ echo $ECHO_N "checking for ${cf_func}... $ECHO_C" >&6
+
+-echo "${as_me:-configure}:19647: testing ${cf_func} ..." 1>&5
++echo "${as_me:-configure}:19658: testing ${cf_func} ..." 1>&5
+
+ if eval "test \"\${cf_cv_func_$cf_func+set}\" = set"; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -19653,7 +19664,7 @@
+ eval cf_result='$ac_cv_func_'$cf_func
+ if test ".$cf_result" != ".no"; then
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 19656 "configure"
++#line 19667 "configure"
+ #include "confdefs.h"
+
+ #ifdef HAVE_XCURSES
+@@ -19686,16 +19697,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:19689: \"$ac_link\"") >&5
++if { (eval echo "$as_me:19700: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:19692: \$? = $ac_status" >&5
++ echo "$as_me:19703: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:19695: \"$ac_try\"") >&5
++ { (eval echo "$as_me:19706: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:19698: \$? = $ac_status" >&5
++ echo "$as_me:19709: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_result=yes
+ else
+@@ -19711,7 +19722,7 @@
+
+ # use the computed/retrieved cache-value:
+ eval 'cf_result=$cf_cv_func_'$cf_func
+- echo "$as_me:19714: result: $cf_result" >&5
++ echo "$as_me:19725: result: $cf_result" >&5
+ echo "${ECHO_T}$cf_result" >&6
+ if test "$cf_result" != no; then
+ cat >>confdefs.h <<EOF
+@@ -19726,10 +19737,10 @@
+
+ cf_tr_func=`echo "$cf_func" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%`
+
+- echo "$as_me:19729: checking for ${cf_func}" >&5
++ echo "$as_me:19740: checking for ${cf_func}" >&5
+ echo $ECHO_N "checking for ${cf_func}... $ECHO_C" >&6
+
+-echo "${as_me:-configure}:19732: testing ${cf_func} ..." 1>&5
++echo "${as_me:-configure}:19743: testing ${cf_func} ..." 1>&5
+
+ if eval "test \"\${cf_cv_func_$cf_func+set}\" = set"; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -19738,7 +19749,7 @@
+ eval cf_result='$ac_cv_func_'$cf_func
+ if test ".$cf_result" != ".no"; then
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 19741 "configure"
++#line 19752 "configure"
+ #include "confdefs.h"
+
+ #ifdef HAVE_XCURSES
+@@ -19771,16 +19782,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:19774: \"$ac_link\"") >&5
++if { (eval echo "$as_me:19785: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:19777: \$? = $ac_status" >&5
++ echo "$as_me:19788: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:19780: \"$ac_try\"") >&5
++ { (eval echo "$as_me:19791: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:19783: \$? = $ac_status" >&5
++ echo "$as_me:19794: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_result=yes
+ else
+@@ -19796,7 +19807,7 @@
+
+ # use the computed/retrieved cache-value:
+ eval 'cf_result=$cf_cv_func_'$cf_func
+- echo "$as_me:19799: result: $cf_result" >&5
++ echo "$as_me:19810: result: $cf_result" >&5
+ echo "${ECHO_T}$cf_result" >&6
+ if test "$cf_result" != no; then
+ cat >>confdefs.h <<EOF
+@@ -19820,7 +19831,7 @@
+ cf_return="return value"
+ fi
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 19823 "configure"
++#line 19834 "configure"
+ #include "confdefs.h"
+
+ #include <${cf_cv_ncurses_header:-curses.h}>
+@@ -19840,21 +19851,21 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:19843: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:19854: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:19846: \$? = $ac_status" >&5
++ echo "$as_me:19857: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:19849: \"$ac_try\"") >&5
++ { (eval echo "$as_me:19860: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:19852: \$? = $ac_status" >&5
++ echo "$as_me:19863: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+
+ test -n "$verbose" && echo " prototype $cf_ret func($cf_arg value)" 1>&6
+
+-echo "${as_me:-configure}:19857: testing prototype $cf_ret func($cf_arg value) ..." 1>&5
++echo "${as_me:-configure}:19868: testing prototype $cf_ret func($cf_arg value) ..." 1>&5
+
+ cat >>confdefs.h <<EOF
+ #define TPUTS_ARG $cf_arg
+@@ -19874,14 +19885,14 @@
+ done
+ fi
+
+-echo "$as_me:19877: checking for ncurses extended functions" >&5
++echo "$as_me:19888: 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 19884 "configure"
++#line 19895 "configure"
+ #include "confdefs.h"
+
+ #include <${cf_cv_ncurses_header:-curses.h}>
+@@ -19896,16 +19907,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:19899: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:19910: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:19902: \$? = $ac_status" >&5
++ echo "$as_me:19913: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:19905: \"$ac_try\"") >&5
++ { (eval echo "$as_me:19916: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:19908: \$? = $ac_status" >&5
++ echo "$as_me:19919: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_ncurses_ext_funcs=defined
+ else
+@@ -19913,7 +19924,7 @@
+ cat "conftest.$ac_ext" >&5
+
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 19916 "configure"
++#line 19927 "configure"
+ #include "confdefs.h"
+
+ #include <${cf_cv_ncurses_header:-curses.h}>
+@@ -19938,16 +19949,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:19941: \"$ac_link\"") >&5
++if { (eval echo "$as_me:19952: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:19944: \$? = $ac_status" >&5
++ echo "$as_me:19955: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:19947: \"$ac_try\"") >&5
++ { (eval echo "$as_me:19958: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:19950: \$? = $ac_status" >&5
++ echo "$as_me:19961: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_ncurses_ext_funcs=yes
+ else
+@@ -19961,7 +19972,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+
+ fi
+-echo "$as_me:19964: result: $cf_cv_ncurses_ext_funcs" >&5
++echo "$as_me:19975: 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
+@@ -19975,11 +19986,11 @@
+ if test -n "$cf_cv_ncurses_version" && test "x$cf_cv_ncurses_version" != xno
+ then
+ cf_define_xpg5=no
+- echo "$as_me:19978: checking if _XPG5 should be defined to enable wide-characters" >&5
++ echo "$as_me:19989: 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 19982 "configure"
++#line 19993 "configure"
+ #include "confdefs.h"
+
+ #include <${cf_cv_ncurses_header:-curses.h}>
+@@ -19992,16 +20003,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:19995: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:20006: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:19998: \$? = $ac_status" >&5
++ echo "$as_me:20009: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:20001: \"$ac_try\"") >&5
++ { (eval echo "$as_me:20012: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:20004: \$? = $ac_status" >&5
++ echo "$as_me:20015: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ :
+ else
+@@ -20010,7 +20021,7 @@
+ cf_save_cppflags="$CPPFLAGS"
+ CPPFLAGS="$CPPFLAGS -D_XPG5"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 20013 "configure"
++#line 20024 "configure"
+ #include "confdefs.h"
+
+ #include <${cf_cv_ncurses_header:-curses.h}>
+@@ -20023,16 +20034,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:20026: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:20037: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:20029: \$? = $ac_status" >&5
++ echo "$as_me:20040: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:20032: \"$ac_try\"") >&5
++ { (eval echo "$as_me:20043: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:20035: \$? = $ac_status" >&5
++ echo "$as_me:20046: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_define_xpg5=yes
+ else
+@@ -20043,7 +20054,7 @@
+ CPPFLAGS="$cf_save_cppflags"
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+- echo "$as_me:20046: result: $cf_define_xpg5" >&5
++ echo "$as_me:20057: result: $cf_define_xpg5" >&5
+ echo "${ECHO_T}$cf_define_xpg5" >&6
+
+ if test "$cf_define_xpg5" = yes
+@@ -20052,14 +20063,14 @@
+ fi
+ fi
+
+- echo "$as_me:20055: checking for wide-character functions" >&5
++ echo "$as_me:20066: 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 20062 "configure"
++#line 20073 "configure"
+ #include "confdefs.h"
+
+ #include <${cf_cv_ncurses_header:-curses.h}>
+@@ -20076,16 +20087,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:20079: \"$ac_link\"") >&5
++if { (eval echo "$as_me:20090: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:20082: \$? = $ac_status" >&5
++ echo "$as_me:20093: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:20085: \"$ac_try\"") >&5
++ { (eval echo "$as_me:20096: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:20088: \$? = $ac_status" >&5
++ echo "$as_me:20099: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_widechar_funcs=yes
+ else
+@@ -20096,7 +20107,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+
+ fi
+-echo "$as_me:20099: result: $cf_cv_widechar_funcs" >&5
++echo "$as_me:20110: result: $cf_cv_widechar_funcs" >&5
+ echo "${ECHO_T}$cf_cv_widechar_funcs" >&6
+ if test "$cf_cv_widechar_funcs" != no ; then
+
+@@ -20117,14 +20128,14 @@
+
+ fi
+
+-echo "$as_me:20120: checking if $cf_cv_screen library uses pthreads" >&5
++echo "$as_me:20131: 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 20127 "configure"
++#line 20138 "configure"
+ #include "confdefs.h"
+
+ #include <${cf_cv_ncurses_header:-curses.h}>
+@@ -20142,16 +20153,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:20145: \"$ac_link\"") >&5
++if { (eval echo "$as_me:20156: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:20148: \$? = $ac_status" >&5
++ echo "$as_me:20159: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:20151: \"$ac_try\"") >&5
++ { (eval echo "$as_me:20162: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:20154: \$? = $ac_status" >&5
++ echo "$as_me:20165: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_use_pthreads=yes
+ else
+@@ -20162,21 +20173,21 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+
+ fi
+-echo "$as_me:20165: result: $cf_cv_use_pthreads" >&5
++echo "$as_me:20176: 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:20172: checking if sys/time.h works with sys/select.h" >&5
++echo "$as_me:20183: 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 20179 "configure"
++#line 20190 "configure"
+ #include "confdefs.h"
+
+ #include <sys/types.h>
+@@ -20196,16 +20207,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:20199: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:20210: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:20202: \$? = $ac_status" >&5
++ echo "$as_me:20213: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:20205: \"$ac_try\"") >&5
++ { (eval echo "$as_me:20216: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:20208: \$? = $ac_status" >&5
++ echo "$as_me:20219: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_sys_time_select=yes
+ else
+@@ -20217,7 +20228,7 @@
+
+ fi
+
+-echo "$as_me:20220: result: $cf_cv_sys_time_select" >&5
++echo "$as_me:20231: 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
+@@ -20226,7 +20237,7 @@
+
+ # special check for test/ditto.c
+
+-echo "$as_me:20229: checking for openpty in -lutil" >&5
++echo "$as_me:20240: 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
+@@ -20234,7 +20245,7 @@
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lutil $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 20237 "configure"
++#line 20248 "configure"
+ #include "confdefs.h"
+
+ /* Override any gcc2 internal prototype to avoid an error. */
+@@ -20253,16 +20264,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:20256: \"$ac_link\"") >&5
++if { (eval echo "$as_me:20267: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:20259: \$? = $ac_status" >&5
++ echo "$as_me:20270: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:20262: \"$ac_try\"") >&5
++ { (eval echo "$as_me:20273: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:20265: \$? = $ac_status" >&5
++ echo "$as_me:20276: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_lib_util_openpty=yes
+ else
+@@ -20273,7 +20284,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:20276: result: $ac_cv_lib_util_openpty" >&5
++echo "$as_me:20287: 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
+@@ -20281,7 +20292,7 @@
+ cf_cv_lib_util=no
+ fi
+
+-echo "$as_me:20284: checking for openpty header" >&5
++echo "$as_me:20295: 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
+@@ -20308,7 +20319,7 @@
+ for cf_header in pty.h libutil.h util.h
+ do
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 20311 "configure"
++#line 20322 "configure"
+ #include "confdefs.h"
+
+ #include <$cf_header>
+@@ -20326,16 +20337,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:20329: \"$ac_link\"") >&5
++if { (eval echo "$as_me:20340: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:20332: \$? = $ac_status" >&5
++ echo "$as_me:20343: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:20335: \"$ac_try\"") >&5
++ { (eval echo "$as_me:20346: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:20338: \$? = $ac_status" >&5
++ echo "$as_me:20349: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+
+ cf_cv_func_openpty=$cf_header
+@@ -20353,7 +20364,7 @@
+ LIBS="$cf_save_LIBS"
+
+ fi
+-echo "$as_me:20356: result: $cf_cv_func_openpty" >&5
++echo "$as_me:20367: result: $cf_cv_func_openpty" >&5
+ echo "${ECHO_T}$cf_cv_func_openpty" >&6
+
+ if test "$cf_cv_func_openpty" != no ; then
+@@ -20387,7 +20398,7 @@
+ fi
+ fi
+
+-echo "$as_me:20390: checking for function curses_version" >&5
++echo "$as_me:20401: 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
+@@ -20397,7 +20408,7 @@
+ cf_cv_func_curses_version=unknown
+ else
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 20400 "configure"
++#line 20411 "configure"
+ #include "confdefs.h"
+
+ $ac_includes_default
+@@ -20413,15 +20424,15 @@
+
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:20416: \"$ac_link\"") >&5
++if { (eval echo "$as_me:20427: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:20419: \$? = $ac_status" >&5
++ echo "$as_me:20430: \$? = $ac_status" >&5
+ (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+- { (eval echo "$as_me:20421: \"$ac_try\"") >&5
++ { (eval echo "$as_me:20432: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:20424: \$? = $ac_status" >&5
++ echo "$as_me:20435: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_func_curses_version=yes
+
+@@ -20436,14 +20447,14 @@
+ fi
+ rm -f core
+ fi
+-echo "$as_me:20439: result: $cf_cv_func_curses_version" >&5
++echo "$as_me:20450: 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:20446: checking for alternate character set array" >&5
++echo "$as_me:20457: 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
+@@ -20453,7 +20464,7 @@
+ for name in acs_map _acs_map __acs_map ${NCURSES_WRAP_PREFIX}acs_map
+ do
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 20456 "configure"
++#line 20467 "configure"
+ #include "confdefs.h"
+
+ #include <${cf_cv_ncurses_header:-curses.h}>
+@@ -20469,16 +20480,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:20472: \"$ac_link\"") >&5
++if { (eval echo "$as_me:20483: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:20475: \$? = $ac_status" >&5
++ echo "$as_me:20486: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:20478: \"$ac_try\"") >&5
++ { (eval echo "$as_me:20489: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:20481: \$? = $ac_status" >&5
++ echo "$as_me:20492: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_curses_acs_map=$name; break
+ else
+@@ -20489,7 +20500,7 @@
+ done
+
+ fi
+-echo "$as_me:20492: result: $cf_cv_curses_acs_map" >&5
++echo "$as_me:20503: result: $cf_cv_curses_acs_map" >&5
+ echo "${ECHO_T}$cf_cv_curses_acs_map" >&6
+
+ test "$cf_cv_curses_acs_map" != unknown &&
+@@ -20499,7 +20510,7 @@
+
+ if test "$cf_enable_widec" = yes; then
+
+-echo "$as_me:20502: checking for wide alternate character set array" >&5
++echo "$as_me:20513: 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
+@@ -20509,7 +20520,7 @@
+ for name in wacs_map _wacs_map __wacs_map _nc_wacs _wacs_char
+ do
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 20512 "configure"
++#line 20523 "configure"
+ #include "confdefs.h"
+
+ #ifndef _XOPEN_SOURCE_EXTENDED
+@@ -20525,16 +20536,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:20528: \"$ac_link\"") >&5
++if { (eval echo "$as_me:20539: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:20531: \$? = $ac_status" >&5
++ echo "$as_me:20542: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:20534: \"$ac_try\"") >&5
++ { (eval echo "$as_me:20545: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:20537: \$? = $ac_status" >&5
++ echo "$as_me:20548: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_curses_wacs_map=$name
+ break
+@@ -20545,7 +20556,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ done
+ fi
+-echo "$as_me:20548: result: $cf_cv_curses_wacs_map" >&5
++echo "$as_me:20559: result: $cf_cv_curses_wacs_map" >&5
+ echo "${ECHO_T}$cf_cv_curses_wacs_map" >&6
+
+ test "$cf_cv_curses_wacs_map" != unknown &&
+@@ -20553,7 +20564,7 @@
+ #define CURSES_WACS_ARRAY $cf_cv_curses_wacs_map
+ EOF
+
+-echo "$as_me:20556: checking for wide alternate character constants" >&5
++echo "$as_me:20567: 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
+@@ -20563,7 +20574,7 @@
+ if test "$cf_cv_curses_wacs_map" != unknown
+ then
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 20566 "configure"
++#line 20577 "configure"
+ #include "confdefs.h"
+
+ #ifndef _XOPEN_SOURCE_EXTENDED
+@@ -20580,16 +20591,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:20583: \"$ac_link\"") >&5
++if { (eval echo "$as_me:20594: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:20586: \$? = $ac_status" >&5
++ echo "$as_me:20597: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:20589: \"$ac_try\"") >&5
++ { (eval echo "$as_me:20600: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:20592: \$? = $ac_status" >&5
++ echo "$as_me:20603: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_curses_wacs_symbols=yes
+ else
+@@ -20599,7 +20610,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ else
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 20602 "configure"
++#line 20613 "configure"
+ #include "confdefs.h"
+
+ #ifndef _XOPEN_SOURCE_EXTENDED
+@@ -20615,16 +20626,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:20618: \"$ac_link\"") >&5
++if { (eval echo "$as_me:20629: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:20621: \$? = $ac_status" >&5
++ echo "$as_me:20632: \$? = $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:20635: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:20627: \$? = $ac_status" >&5
++ echo "$as_me:20638: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_curses_wacs_symbols=yes
+ else
+@@ -20635,7 +20646,7 @@
+ fi
+
+ fi
+-echo "$as_me:20638: result: $cf_cv_curses_wacs_symbols" >&5
++echo "$as_me:20649: result: $cf_cv_curses_wacs_symbols" >&5
+ echo "${ECHO_T}$cf_cv_curses_wacs_symbols" >&6
+
+ test "$cf_cv_curses_wacs_symbols" != no &&
+@@ -20645,10 +20656,10 @@
+
+ fi
+
+-echo "$as_me:20648: checking for type attr_t in ${cf_cv_ncurses_header:-curses.h}" >&5
++echo "$as_me:20659: 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 20651 "configure"
++#line 20662 "configure"
+ #include "confdefs.h"
+
+ #ifndef _XOPEN_SOURCE_EXTENDED
+@@ -20666,16 +20677,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:20669: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:20680: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:20672: \$? = $ac_status" >&5
++ echo "$as_me:20683: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:20675: \"$ac_try\"") >&5
++ { (eval echo "$as_me:20686: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:20678: \$? = $ac_status" >&5
++ echo "$as_me:20689: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_result=yes
+ else
+@@ -20684,7 +20695,7 @@
+ cf_result=no
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+-echo "$as_me:20687: result: $cf_result" >&5
++echo "$as_me:20698: result: $cf_result" >&5
+ echo "${ECHO_T}$cf_result" >&6
+ if test "$cf_result" = yes ; then
+
+@@ -20705,14 +20716,14 @@
+ if test "$cf_enable_widec" = yes; then
+
+ # This is needed on Tru64 5.0 to declare mbstate_t
+-echo "$as_me:20708: checking if we must include wchar.h to declare mbstate_t" >&5
++echo "$as_me:20719: 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 20715 "configure"
++#line 20726 "configure"
+ #include "confdefs.h"
+
+ #include <stdlib.h>
+@@ -20730,23 +20741,23 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:20733: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:20744: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:20736: \$? = $ac_status" >&5
++ echo "$as_me:20747: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:20739: \"$ac_try\"") >&5
++ { (eval echo "$as_me:20750: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:20742: \$? = $ac_status" >&5
++ echo "$as_me:20753: \$? = $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 20749 "configure"
++#line 20760 "configure"
+ #include "confdefs.h"
+
+ #include <stdlib.h>
+@@ -20765,16 +20776,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:20768: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:20779: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:20771: \$? = $ac_status" >&5
++ echo "$as_me:20782: \$? = $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:20785: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:20777: \$? = $ac_status" >&5
++ echo "$as_me:20788: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_mbstate_t=yes
+ else
+@@ -20786,7 +20797,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:20789: result: $cf_cv_mbstate_t" >&5
++echo "$as_me:20800: result: $cf_cv_mbstate_t" >&5
+ echo "${ECHO_T}$cf_cv_mbstate_t" >&6
+
+ if test "$cf_cv_mbstate_t" = yes ; then
+@@ -20809,14 +20820,14 @@
+ fi
+
+ # This is needed on Tru64 5.0 to declare wchar_t
+-echo "$as_me:20812: checking if we must include wchar.h to declare wchar_t" >&5
++echo "$as_me:20823: 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 20819 "configure"
++#line 20830 "configure"
+ #include "confdefs.h"
+
+ #include <stdlib.h>
+@@ -20834,23 +20845,23 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:20837: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:20848: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:20840: \$? = $ac_status" >&5
++ echo "$as_me:20851: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:20843: \"$ac_try\"") >&5
++ { (eval echo "$as_me:20854: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:20846: \$? = $ac_status" >&5
++ echo "$as_me:20857: \$? = $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 20853 "configure"
++#line 20864 "configure"
+ #include "confdefs.h"
+
+ #include <stdlib.h>
+@@ -20869,16 +20880,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:20872: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:20883: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:20875: \$? = $ac_status" >&5
++ echo "$as_me:20886: \$? = $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:20889: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:20881: \$? = $ac_status" >&5
++ echo "$as_me:20892: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_wchar_t=yes
+ else
+@@ -20890,7 +20901,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:20893: result: $cf_cv_wchar_t" >&5
++echo "$as_me:20904: result: $cf_cv_wchar_t" >&5
+ echo "${ECHO_T}$cf_cv_wchar_t" >&6
+
+ if test "$cf_cv_wchar_t" = yes ; then
+@@ -20913,14 +20924,14 @@
+ fi
+
+ # This is needed on Tru64 5.0 to declare wint_t
+-echo "$as_me:20916: checking if we must include wchar.h to declare wint_t" >&5
++echo "$as_me:20927: 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 20923 "configure"
++#line 20934 "configure"
+ #include "confdefs.h"
+
+ #include <stdlib.h>
+@@ -20938,23 +20949,23 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:20941: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:20952: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:20944: \$? = $ac_status" >&5
++ echo "$as_me:20955: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:20947: \"$ac_try\"") >&5
++ { (eval echo "$as_me:20958: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:20950: \$? = $ac_status" >&5
++ echo "$as_me:20961: \$? = $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 20957 "configure"
++#line 20968 "configure"
+ #include "confdefs.h"
+
+ #include <stdlib.h>
+@@ -20973,16 +20984,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:20976: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:20987: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:20979: \$? = $ac_status" >&5
++ echo "$as_me:20990: \$? = $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:20993: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:20985: \$? = $ac_status" >&5
++ echo "$as_me:20996: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_cv_wint_t=yes
+ else
+@@ -20994,7 +21005,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:20997: result: $cf_cv_wint_t" >&5
++echo "$as_me:21008: result: $cf_cv_wint_t" >&5
+ echo "${ECHO_T}$cf_cv_wint_t" >&6
+
+ if test "$cf_cv_wint_t" = yes ; then
+@@ -21018,10 +21029,10 @@
+
+ if test "$NCURSES_OK_MBSTATE_T" = 0 ; then
+
+-echo "$as_me:21021: checking for type mbstate_t in ${cf_cv_ncurses_header:-curses.h}" >&5
++echo "$as_me:21032: 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 21024 "configure"
++#line 21035 "configure"
+ #include "confdefs.h"
+
+ #ifndef _XOPEN_SOURCE_EXTENDED
+@@ -21039,16 +21050,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:21042: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:21053: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:21045: \$? = $ac_status" >&5
++ echo "$as_me:21056: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:21048: \"$ac_try\"") >&5
++ { (eval echo "$as_me:21059: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:21051: \$? = $ac_status" >&5
++ echo "$as_me:21062: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_result=yes
+ else
+@@ -21057,7 +21068,7 @@
+ cf_result=no
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+-echo "$as_me:21060: result: $cf_result" >&5
++echo "$as_me:21071: result: $cf_result" >&5
+ echo "${ECHO_T}$cf_result" >&6
+ if test "$cf_result" = yes ; then
+
+@@ -21079,10 +21090,10 @@
+
+ if test "$NCURSES_OK_WCHAR_T" = 0 ; then
+
+-echo "$as_me:21082: checking for type wchar_t in ${cf_cv_ncurses_header:-curses.h}" >&5
++echo "$as_me:21093: 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 21085 "configure"
++#line 21096 "configure"
+ #include "confdefs.h"
+
+ #ifndef _XOPEN_SOURCE_EXTENDED
+@@ -21100,16 +21111,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:21103: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:21114: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:21106: \$? = $ac_status" >&5
++ echo "$as_me:21117: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:21109: \"$ac_try\"") >&5
++ { (eval echo "$as_me:21120: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:21112: \$? = $ac_status" >&5
++ echo "$as_me:21123: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_result=yes
+ else
+@@ -21118,7 +21129,7 @@
+ cf_result=no
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+-echo "$as_me:21121: result: $cf_result" >&5
++echo "$as_me:21132: result: $cf_result" >&5
+ echo "${ECHO_T}$cf_result" >&6
+ if test "$cf_result" = yes ; then
+
+@@ -21140,10 +21151,10 @@
+
+ if test "$NCURSES_OK_WINT_T" = 0 ; then
+
+-echo "$as_me:21143: checking for type wint_t in ${cf_cv_ncurses_header:-curses.h}" >&5
++echo "$as_me:21154: 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 21146 "configure"
++#line 21157 "configure"
+ #include "confdefs.h"
+
+ #ifndef _XOPEN_SOURCE_EXTENDED
+@@ -21161,16 +21172,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:21164: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:21175: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:21167: \$? = $ac_status" >&5
++ echo "$as_me:21178: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:21170: \"$ac_try\"") >&5
++ { (eval echo "$as_me:21181: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:21173: \$? = $ac_status" >&5
++ echo "$as_me:21184: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_result=yes
+ else
+@@ -21179,7 +21190,7 @@
+ cf_result=no
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+-echo "$as_me:21182: result: $cf_result" >&5
++echo "$as_me:21193: result: $cf_result" >&5
+ echo "${ECHO_T}$cf_result" >&6
+ if test "$cf_result" = yes ; then
+
+@@ -21208,11 +21219,11 @@
+ boolfnames \
+ ttytype
+ do
+-echo "$as_me:21211: checking for data $cf_data declaration in ${cf_cv_ncurses_header:-curses.h}" >&5
++echo "$as_me:21222: 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 21215 "configure"
++#line 21226 "configure"
+ #include "confdefs.h"
+
+ #ifdef HAVE_XCURSES
+@@ -21245,16 +21256,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:21248: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:21259: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:21251: \$? = $ac_status" >&5
++ echo "$as_me:21262: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:21254: \"$ac_try\"") >&5
++ { (eval echo "$as_me:21265: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:21257: \$? = $ac_status" >&5
++ echo "$as_me:21268: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_result=yes
+
+@@ -21264,7 +21275,7 @@
+ cf_result=no
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+-echo "$as_me:21267: result: $cf_result" >&5
++echo "$as_me:21278: result: $cf_result" >&5
+ echo "${ECHO_T}$cf_result" >&6
+
+ if test "$cf_result" = yes ; then
+@@ -21276,14 +21287,14 @@
+ EOF
+
+ else
+- echo "$as_me:21279: checking for data $cf_data in library" >&5
++ echo "$as_me:21290: 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 21286 "configure"
++#line 21297 "configure"
+ #include "confdefs.h"
+
+ #ifdef HAVE_XCURSES
+@@ -21322,16 +21333,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:21325: \"$ac_link\"") >&5
++if { (eval echo "$as_me:21336: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:21328: \$? = $ac_status" >&5
++ echo "$as_me:21339: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:21331: \"$ac_try\"") >&5
++ { (eval echo "$as_me:21342: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:21334: \$? = $ac_status" >&5
++ echo "$as_me:21345: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_result=yes
+ else
+@@ -21343,7 +21354,7 @@
+
+ else
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 21346 "configure"
++#line 21357 "configure"
+ #include "confdefs.h"
+
+ #ifdef HAVE_XCURSES
+@@ -21375,15 +21386,15 @@
+ }
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:21378: \"$ac_link\"") >&5
++if { (eval echo "$as_me:21389: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:21381: \$? = $ac_status" >&5
++ echo "$as_me:21392: \$? = $ac_status" >&5
+ (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+- { (eval echo "$as_me:21383: \"$ac_try\"") >&5
++ { (eval echo "$as_me:21394: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:21386: \$? = $ac_status" >&5
++ echo "$as_me:21397: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_result=yes
+
+@@ -21395,7 +21406,7 @@
+ fi
+ rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+- echo "$as_me:21398: result: $cf_result" >&5
++ echo "$as_me:21409: result: $cf_result" >&5
+ echo "${ECHO_T}$cf_result" >&6
+ if test "$cf_result" = yes ; then
+
+@@ -21412,7 +21423,7 @@
+
+ if test -n "$with_screen" && test "x$with_screen" = "xpdcurses"
+ then
+- echo "$as_me:21415: checking for X" >&5
++ echo "$as_me:21426: checking for X" >&5
+ echo $ECHO_N "checking for X... $ECHO_C" >&6
+
+ # Check whether --with-x or --without-x was given.
+@@ -21516,17 +21527,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 21519 "configure"
++#line 21530 "configure"
+ #include "confdefs.h"
+ #include <X11/Intrinsic.h>
+ _ACEOF
+-if { (eval echo "$as_me:21523: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:21534: \"$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:21529: \$? = $ac_status" >&5
++ echo "$as_me:21540: \$? = $ac_status" >&5
+ (exit "$ac_status"); } >/dev/null; then
+ if test -s conftest.err; then
+ ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -21559,7 +21570,7 @@
+ ac_save_LIBS=$LIBS
+ LIBS="-lXt $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 21562 "configure"
++#line 21573 "configure"
+ #include "confdefs.h"
+ #include <X11/Intrinsic.h>
+ int
+@@ -21571,16 +21582,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:21574: \"$ac_link\"") >&5
++if { (eval echo "$as_me:21585: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:21577: \$? = $ac_status" >&5
++ echo "$as_me:21588: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:21580: \"$ac_try\"") >&5
++ { (eval echo "$as_me:21591: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:21583: \$? = $ac_status" >&5
++ echo "$as_me:21594: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ LIBS=$ac_save_LIBS
+ # We can link X programs with no special library path.
+@@ -21618,7 +21629,7 @@
+ fi # $with_x != no
+
+ if test "$have_x" != yes; then
+- echo "$as_me:21621: result: $have_x" >&5
++ echo "$as_me:21632: result: $have_x" >&5
+ echo "${ECHO_T}$have_x" >&6
+ no_x=yes
+ else
+@@ -21628,7 +21639,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:21631: result: libraries $x_libraries, headers $x_includes" >&5
++ echo "$as_me:21642: result: libraries $x_libraries, headers $x_includes" >&5
+ echo "${ECHO_T}libraries $x_libraries, headers $x_includes" >&6
+ fi
+
+@@ -21655,11 +21666,11 @@
+ # others require no space. Words are not sufficient . . . .
+ case `(uname -sr) 2>/dev/null` in
+ "SunOS 5"*)
+- echo "$as_me:21658: checking whether -R must be followed by a space" >&5
++ echo "$as_me:21669: 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 21662 "configure"
++#line 21673 "configure"
+ #include "confdefs.h"
+
+ int
+@@ -21671,16 +21682,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:21674: \"$ac_link\"") >&5
++if { (eval echo "$as_me:21685: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:21677: \$? = $ac_status" >&5
++ echo "$as_me:21688: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:21680: \"$ac_try\"") >&5
++ { (eval echo "$as_me:21691: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:21683: \$? = $ac_status" >&5
++ echo "$as_me:21694: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_R_nospace=yes
+ else
+@@ -21690,13 +21701,13 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ if test $ac_R_nospace = yes; then
+- echo "$as_me:21693: result: no" >&5
++ echo "$as_me:21704: 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 21699 "configure"
++#line 21710 "configure"
+ #include "confdefs.h"
+
+ int
+@@ -21708,16 +21719,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:21711: \"$ac_link\"") >&5
++if { (eval echo "$as_me:21722: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:21714: \$? = $ac_status" >&5
++ echo "$as_me:21725: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:21717: \"$ac_try\"") >&5
++ { (eval echo "$as_me:21728: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:21720: \$? = $ac_status" >&5
++ echo "$as_me:21731: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_R_space=yes
+ else
+@@ -21727,11 +21738,11 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ if test $ac_R_space = yes; then
+- echo "$as_me:21730: result: yes" >&5
++ echo "$as_me:21741: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ X_LIBS="$X_LIBS -R $x_libraries"
+ else
+- echo "$as_me:21734: result: neither works" >&5
++ echo "$as_me:21745: result: neither works" >&5
+ echo "${ECHO_T}neither works" >&6
+ fi
+ fi
+@@ -21751,7 +21762,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 21754 "configure"
++#line 21765 "configure"
+ #include "confdefs.h"
+
+ /* Override any gcc2 internal prototype to avoid an error. */
+@@ -21770,22 +21781,22 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:21773: \"$ac_link\"") >&5
++if { (eval echo "$as_me:21784: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:21776: \$? = $ac_status" >&5
++ echo "$as_me:21787: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:21779: \"$ac_try\"") >&5
++ { (eval echo "$as_me:21790: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:21782: \$? = $ac_status" >&5
++ echo "$as_me:21793: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ :
+ else
+ echo "$as_me: failed program was:" >&5
+ cat "conftest.$ac_ext" >&5
+-echo "$as_me:21788: checking for dnet_ntoa in -ldnet" >&5
++echo "$as_me:21799: 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
+@@ -21793,7 +21804,7 @@
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-ldnet $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 21796 "configure"
++#line 21807 "configure"
+ #include "confdefs.h"
+
+ /* Override any gcc2 internal prototype to avoid an error. */
+@@ -21812,16 +21823,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:21815: \"$ac_link\"") >&5
++if { (eval echo "$as_me:21826: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:21818: \$? = $ac_status" >&5
++ echo "$as_me:21829: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:21821: \"$ac_try\"") >&5
++ { (eval echo "$as_me:21832: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:21824: \$? = $ac_status" >&5
++ echo "$as_me:21835: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_lib_dnet_dnet_ntoa=yes
+ else
+@@ -21832,14 +21843,14 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:21835: result: $ac_cv_lib_dnet_dnet_ntoa" >&5
++echo "$as_me:21846: 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:21842: checking for dnet_ntoa in -ldnet_stub" >&5
++ echo "$as_me:21853: 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
+@@ -21847,7 +21858,7 @@
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-ldnet_stub $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 21850 "configure"
++#line 21861 "configure"
+ #include "confdefs.h"
+
+ /* Override any gcc2 internal prototype to avoid an error. */
+@@ -21866,16 +21877,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:21869: \"$ac_link\"") >&5
++if { (eval echo "$as_me:21880: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:21872: \$? = $ac_status" >&5
++ echo "$as_me:21883: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:21875: \"$ac_try\"") >&5
++ { (eval echo "$as_me:21886: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:21878: \$? = $ac_status" >&5
++ echo "$as_me:21889: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_lib_dnet_stub_dnet_ntoa=yes
+ else
+@@ -21886,7 +21897,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:21889: result: $ac_cv_lib_dnet_stub_dnet_ntoa" >&5
++echo "$as_me:21900: 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"
+@@ -21905,13 +21916,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:21908: checking for gethostbyname" >&5
++ echo "$as_me:21919: 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 21914 "configure"
++#line 21925 "configure"
+ #include "confdefs.h"
+ #define gethostbyname autoconf_temporary
+ #include <limits.h> /* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -21942,16 +21953,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:21945: \"$ac_link\"") >&5
++if { (eval echo "$as_me:21956: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:21948: \$? = $ac_status" >&5
++ echo "$as_me:21959: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:21951: \"$ac_try\"") >&5
++ { (eval echo "$as_me:21962: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:21954: \$? = $ac_status" >&5
++ echo "$as_me:21965: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_func_gethostbyname=yes
+ else
+@@ -21961,11 +21972,11 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:21964: result: $ac_cv_func_gethostbyname" >&5
++echo "$as_me:21975: 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:21968: checking for gethostbyname in -lnsl" >&5
++ echo "$as_me:21979: 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
+@@ -21973,7 +21984,7 @@
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lnsl $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 21976 "configure"
++#line 21987 "configure"
+ #include "confdefs.h"
+
+ /* Override any gcc2 internal prototype to avoid an error. */
+@@ -21992,16 +22003,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:21995: \"$ac_link\"") >&5
++if { (eval echo "$as_me:22006: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:21998: \$? = $ac_status" >&5
++ echo "$as_me:22009: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:22001: \"$ac_try\"") >&5
++ { (eval echo "$as_me:22012: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:22004: \$? = $ac_status" >&5
++ echo "$as_me:22015: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_lib_nsl_gethostbyname=yes
+ else
+@@ -22012,14 +22023,14 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:22015: result: $ac_cv_lib_nsl_gethostbyname" >&5
++echo "$as_me:22026: 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:22022: checking for gethostbyname in -lbsd" >&5
++ echo "$as_me:22033: 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
+@@ -22027,7 +22038,7 @@
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lbsd $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 22030 "configure"
++#line 22041 "configure"
+ #include "confdefs.h"
+
+ /* Override any gcc2 internal prototype to avoid an error. */
+@@ -22046,16 +22057,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:22049: \"$ac_link\"") >&5
++if { (eval echo "$as_me:22060: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:22052: \$? = $ac_status" >&5
++ echo "$as_me:22063: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:22055: \"$ac_try\"") >&5
++ { (eval echo "$as_me:22066: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:22058: \$? = $ac_status" >&5
++ echo "$as_me:22069: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_lib_bsd_gethostbyname=yes
+ else
+@@ -22066,7 +22077,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:22069: result: $ac_cv_lib_bsd_gethostbyname" >&5
++echo "$as_me:22080: 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"
+@@ -22082,13 +22093,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:22085: checking for connect" >&5
++ echo "$as_me:22096: 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 22091 "configure"
++#line 22102 "configure"
+ #include "confdefs.h"
+ #define connect autoconf_temporary
+ #include <limits.h> /* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -22119,16 +22130,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:22122: \"$ac_link\"") >&5
++if { (eval echo "$as_me:22133: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:22125: \$? = $ac_status" >&5
++ echo "$as_me:22136: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:22128: \"$ac_try\"") >&5
++ { (eval echo "$as_me:22139: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:22131: \$? = $ac_status" >&5
++ echo "$as_me:22142: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_func_connect=yes
+ else
+@@ -22138,11 +22149,11 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:22141: result: $ac_cv_func_connect" >&5
++echo "$as_me:22152: 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:22145: checking for connect in -lsocket" >&5
++ echo "$as_me:22156: 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
+@@ -22150,7 +22161,7 @@
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lsocket $X_EXTRA_LIBS $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 22153 "configure"
++#line 22164 "configure"
+ #include "confdefs.h"
+
+ /* Override any gcc2 internal prototype to avoid an error. */
+@@ -22169,16 +22180,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:22172: \"$ac_link\"") >&5
++if { (eval echo "$as_me:22183: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:22175: \$? = $ac_status" >&5
++ echo "$as_me:22186: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:22178: \"$ac_try\"") >&5
++ { (eval echo "$as_me:22189: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:22181: \$? = $ac_status" >&5
++ echo "$as_me:22192: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_lib_socket_connect=yes
+ else
+@@ -22189,7 +22200,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:22192: result: $ac_cv_lib_socket_connect" >&5
++echo "$as_me:22203: 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"
+@@ -22198,13 +22209,13 @@
+ fi
+
+ # Guillermo Gomez says -lposix is necessary on A/UX.
+- echo "$as_me:22201: checking for remove" >&5
++ echo "$as_me:22212: 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 22207 "configure"
++#line 22218 "configure"
+ #include "confdefs.h"
+ #define remove autoconf_temporary
+ #include <limits.h> /* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -22235,16 +22246,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:22238: \"$ac_link\"") >&5
++if { (eval echo "$as_me:22249: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:22241: \$? = $ac_status" >&5
++ echo "$as_me:22252: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:22244: \"$ac_try\"") >&5
++ { (eval echo "$as_me:22255: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:22247: \$? = $ac_status" >&5
++ echo "$as_me:22258: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_func_remove=yes
+ else
+@@ -22254,11 +22265,11 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:22257: result: $ac_cv_func_remove" >&5
++echo "$as_me:22268: 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:22261: checking for remove in -lposix" >&5
++ echo "$as_me:22272: 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
+@@ -22266,7 +22277,7 @@
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lposix $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 22269 "configure"
++#line 22280 "configure"
+ #include "confdefs.h"
+
+ /* Override any gcc2 internal prototype to avoid an error. */
+@@ -22285,16 +22296,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:22288: \"$ac_link\"") >&5
++if { (eval echo "$as_me:22299: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:22291: \$? = $ac_status" >&5
++ echo "$as_me:22302: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:22294: \"$ac_try\"") >&5
++ { (eval echo "$as_me:22305: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:22297: \$? = $ac_status" >&5
++ echo "$as_me:22308: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_lib_posix_remove=yes
+ else
+@@ -22305,7 +22316,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:22308: result: $ac_cv_lib_posix_remove" >&5
++echo "$as_me:22319: 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"
+@@ -22314,13 +22325,13 @@
+ fi
+
+ # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay.
+- echo "$as_me:22317: checking for shmat" >&5
++ echo "$as_me:22328: 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 22323 "configure"
++#line 22334 "configure"
+ #include "confdefs.h"
+ #define shmat autoconf_temporary
+ #include <limits.h> /* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -22351,16 +22362,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:22354: \"$ac_link\"") >&5
++if { (eval echo "$as_me:22365: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:22357: \$? = $ac_status" >&5
++ echo "$as_me:22368: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:22360: \"$ac_try\"") >&5
++ { (eval echo "$as_me:22371: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:22363: \$? = $ac_status" >&5
++ echo "$as_me:22374: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_func_shmat=yes
+ else
+@@ -22370,11 +22381,11 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:22373: result: $ac_cv_func_shmat" >&5
++echo "$as_me:22384: 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:22377: checking for shmat in -lipc" >&5
++ echo "$as_me:22388: 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
+@@ -22382,7 +22393,7 @@
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lipc $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 22385 "configure"
++#line 22396 "configure"
+ #include "confdefs.h"
+
+ /* Override any gcc2 internal prototype to avoid an error. */
+@@ -22401,16 +22412,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:22404: \"$ac_link\"") >&5
++if { (eval echo "$as_me:22415: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:22407: \$? = $ac_status" >&5
++ echo "$as_me:22418: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:22410: \"$ac_try\"") >&5
++ { (eval echo "$as_me:22421: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:22413: \$? = $ac_status" >&5
++ echo "$as_me:22424: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_lib_ipc_shmat=yes
+ else
+@@ -22421,7 +22432,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:22424: result: $ac_cv_lib_ipc_shmat" >&5
++echo "$as_me:22435: 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"
+@@ -22439,7 +22450,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:22442: checking for IceConnectionNumber in -lICE" >&5
++ echo "$as_me:22453: 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
+@@ -22447,7 +22458,7 @@
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lICE $X_EXTRA_LIBS $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 22450 "configure"
++#line 22461 "configure"
+ #include "confdefs.h"
+
+ /* Override any gcc2 internal prototype to avoid an error. */
+@@ -22466,16 +22477,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:22469: \"$ac_link\"") >&5
++if { (eval echo "$as_me:22480: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:22472: \$? = $ac_status" >&5
++ echo "$as_me:22483: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:22475: \"$ac_try\"") >&5
++ { (eval echo "$as_me:22486: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:22478: \$? = $ac_status" >&5
++ echo "$as_me:22489: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_lib_ICE_IceConnectionNumber=yes
+ else
+@@ -22486,7 +22497,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:22489: result: $ac_cv_lib_ICE_IceConnectionNumber" >&5
++echo "$as_me:22500: 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"
+@@ -22533,16 +22544,16 @@
+ then
+ test -n "$verbose" && echo " repairing CFLAGS: $CFLAGS" 1>&6
+
+-echo "${as_me:-configure}:22536: testing repairing CFLAGS: $CFLAGS ..." 1>&5
++echo "${as_me:-configure}:22547: testing repairing CFLAGS: $CFLAGS ..." 1>&5
+
+ CFLAGS="$cf_temp_flags"
+ test -n "$verbose" && echo " ... fixed $CFLAGS" 1>&6
+
+-echo "${as_me:-configure}:22541: testing ... fixed $CFLAGS ..." 1>&5
++echo "${as_me:-configure}:22552: testing ... fixed $CFLAGS ..." 1>&5
+
+ test -n "$verbose" && echo " ... extra $EXTRA_CFLAGS" 1>&6
+
+-echo "${as_me:-configure}:22545: testing ... extra $EXTRA_CFLAGS ..." 1>&5
++echo "${as_me:-configure}:22556: testing ... extra $EXTRA_CFLAGS ..." 1>&5
+
+ fi
+ ;;
+@@ -22581,16 +22592,16 @@
+ then
+ test -n "$verbose" && echo " repairing CPPFLAGS: $CPPFLAGS" 1>&6
+
+-echo "${as_me:-configure}:22584: testing repairing CPPFLAGS: $CPPFLAGS ..." 1>&5
++echo "${as_me:-configure}:22595: testing repairing CPPFLAGS: $CPPFLAGS ..." 1>&5
+
+ CPPFLAGS="$cf_temp_flags"
+ test -n "$verbose" && echo " ... fixed $CPPFLAGS" 1>&6
+
+-echo "${as_me:-configure}:22589: testing ... fixed $CPPFLAGS ..." 1>&5
++echo "${as_me:-configure}:22600: testing ... fixed $CPPFLAGS ..." 1>&5
+
+ test -n "$verbose" && echo " ... extra $EXTRA_CFLAGS" 1>&6
+
+-echo "${as_me:-configure}:22593: testing ... extra $EXTRA_CFLAGS ..." 1>&5
++echo "${as_me:-configure}:22604: testing ... extra $EXTRA_CFLAGS ..." 1>&5
+
+ fi
+ ;;
+@@ -22629,23 +22640,23 @@
+ then
+ test -n "$verbose" && echo " repairing LDFLAGS: $LDFLAGS" 1>&6
+
+-echo "${as_me:-configure}:22632: testing repairing LDFLAGS: $LDFLAGS ..." 1>&5
++echo "${as_me:-configure}:22643: testing repairing LDFLAGS: $LDFLAGS ..." 1>&5
+
+ LDFLAGS="$cf_temp_flags"
+ test -n "$verbose" && echo " ... fixed $LDFLAGS" 1>&6
+
+-echo "${as_me:-configure}:22637: testing ... fixed $LDFLAGS ..." 1>&5
++echo "${as_me:-configure}:22648: testing ... fixed $LDFLAGS ..." 1>&5
+
+ test -n "$verbose" && echo " ... extra $EXTRA_CFLAGS" 1>&6
+
+-echo "${as_me:-configure}:22641: testing ... extra $EXTRA_CFLAGS ..." 1>&5
++echo "${as_me:-configure}:22652: testing ... extra $EXTRA_CFLAGS ..." 1>&5
+
+ fi
+ ;;
+ esac
+ fi
+
+-echo "$as_me:22648: checking if you want to turn on gcc warnings" >&5
++echo "$as_me:22659: 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.
+@@ -22662,7 +22673,7 @@
+ enable_warnings=no
+
+ fi;
+-echo "$as_me:22665: result: $enable_warnings" >&5
++echo "$as_me:22676: result: $enable_warnings" >&5
+ echo "${ECHO_T}$enable_warnings" >&6
+ if test "$enable_warnings" = "yes"
+ then
+@@ -22685,10 +22696,10 @@
+ EOF
+ if test "$GCC" = yes
+ then
+- { echo "$as_me:22688: checking for $CC __attribute__ directives..." >&5
++ { echo "$as_me:22699: checking for $CC __attribute__ directives..." >&5
+ echo "$as_me: checking for $CC __attribute__ directives..." >&6;}
+ cat > "conftest.$ac_ext" <<EOF
+-#line 22691 "${as_me:-configure}"
++#line 22702 "${as_me:-configure}"
+ #include <stdio.h>
+ #include "confdefs.h"
+ #include "conftest.h"
+@@ -22738,12 +22749,12 @@
+ ;;
+ esac
+
+- if { (eval echo "$as_me:22741: \"$ac_compile\"") >&5
++ if { (eval echo "$as_me:22752: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:22744: \$? = $ac_status" >&5
++ echo "$as_me:22755: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; then
+- test -n "$verbose" && echo "$as_me:22746: result: ... $cf_attribute" >&5
++ test -n "$verbose" && echo "$as_me:22757: result: ... $cf_attribute" >&5
+ echo "${ECHO_T}... $cf_attribute" >&6
+ cat conftest.h >>confdefs.h
+ case "$cf_attribute" in
+@@ -22821,7 +22832,7 @@
+ done
+
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 22824 "configure"
++#line 22835 "configure"
+ #include "confdefs.h"
+
+ #include <stdlib.h>
+@@ -22836,26 +22847,26 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:22839: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:22850: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:22842: \$? = $ac_status" >&5
++ echo "$as_me:22853: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:22845: \"$ac_try\"") >&5
++ { (eval echo "$as_me:22856: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:22848: \$? = $ac_status" >&5
++ echo "$as_me:22859: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+
+-echo "$as_me:22851: checking for X11/Xt const-feature" >&5
++echo "$as_me:22862: 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 22858 "configure"
++#line 22869 "configure"
+ #include "confdefs.h"
+
+ #undef _CONST_X_STRING
+@@ -22873,16 +22884,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:22876: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:22887: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:22879: \$? = $ac_status" >&5
++ echo "$as_me:22890: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest.$ac_objext"'
+- { (eval echo "$as_me:22882: \"$ac_try\"") >&5
++ { (eval echo "$as_me:22893: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:22885: \$? = $ac_status" >&5
++ echo "$as_me:22896: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+
+ cf_cv_const_x_string=no
+@@ -22897,7 +22908,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+
+ fi
+-echo "$as_me:22900: result: $cf_cv_const_x_string" >&5
++echo "$as_me:22911: result: $cf_cv_const_x_string" >&5
+ echo "${ECHO_T}$cf_cv_const_x_string" >&6
+
+ LIBS="$cf_save_LIBS_CF_CONST_X_STRING"
+@@ -22926,7 +22937,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+ cat > "conftest.$ac_ext" <<EOF
+-#line 22929 "${as_me:-configure}"
++#line 22940 "${as_me:-configure}"
+ int main(int argc, char *argv[]) { return (argv[argc-1] == 0) ; }
+ EOF
+ if test "$INTEL_COMPILER" = yes
+@@ -22942,7 +22953,7 @@
+ # remark #981: operands are evaluated in unspecified order
+ # warning #279: controlling expression is constant
+
+- { echo "$as_me:22945: checking for $CC warning options..." >&5
++ { echo "$as_me:22956: checking for $CC warning options..." >&5
+ echo "$as_me: checking for $CC warning options..." >&6;}
+ cf_save_CFLAGS="$CFLAGS"
+ EXTRA_CFLAGS="$EXTRA_CFLAGS -Wall"
+@@ -22958,12 +22969,12 @@
+ wd981
+ do
+ CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt"
+- if { (eval echo "$as_me:22961: \"$ac_compile\"") >&5
++ if { (eval echo "$as_me:22972: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:22964: \$? = $ac_status" >&5
++ echo "$as_me:22975: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; then
+- test -n "$verbose" && echo "$as_me:22966: result: ... -$cf_opt" >&5
++ test -n "$verbose" && echo "$as_me:22977: result: ... -$cf_opt" >&5
+ echo "${ECHO_T}... -$cf_opt" >&6
+ EXTRA_CFLAGS="$EXTRA_CFLAGS -$cf_opt"
+ fi
+@@ -22971,7 +22982,7 @@
+ CFLAGS="$cf_save_CFLAGS"
+ elif test "$GCC" = yes && test "$GCC_VERSION" != "unknown"
+ then
+- { echo "$as_me:22974: checking for $CC warning options..." >&5
++ { echo "$as_me:22985: checking for $CC warning options..." >&5
+ echo "$as_me: checking for $CC warning options..." >&6;}
+ cf_save_CFLAGS="$CFLAGS"
+ cf_warn_CONST=""
+@@ -22994,12 +23005,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:22997: \"$ac_compile\"") >&5
++ if { (eval echo "$as_me:23008: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:23000: \$? = $ac_status" >&5
++ echo "$as_me:23011: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; then
+- test -n "$verbose" && echo "$as_me:23002: result: ... -$cf_opt" >&5
++ test -n "$verbose" && echo "$as_me:23013: result: ... -$cf_opt" >&5
+ echo "${ECHO_T}... -$cf_opt" >&6
+ case "$cf_opt" in
+ (Winline)
+@@ -23007,7 +23018,7 @@
+ ([34].*)
+ test -n "$verbose" && echo " feature is broken in gcc $GCC_VERSION" 1>&6
+
+-echo "${as_me:-configure}:23010: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
++echo "${as_me:-configure}:23021: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
+
+ continue;;
+ esac
+@@ -23017,7 +23028,7 @@
+ ([12].*)
+ test -n "$verbose" && echo " feature is broken in gcc $GCC_VERSION" 1>&6
+
+-echo "${as_me:-configure}:23020: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
++echo "${as_me:-configure}:23031: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
+
+ continue;;
+ esac
+@@ -23034,7 +23045,7 @@
+
+ fi
+
+-echo "$as_me:23037: checking if you want to use dmalloc for testing" >&5
++echo "$as_me:23048: 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.
+@@ -23056,7 +23067,7 @@
+ else
+ with_dmalloc=
+ fi;
+-echo "$as_me:23059: result: ${with_dmalloc:-no}" >&5
++echo "$as_me:23070: result: ${with_dmalloc:-no}" >&5
+ echo "${ECHO_T}${with_dmalloc:-no}" >&6
+
+ case ".$with_cflags" in
+@@ -23170,23 +23181,23 @@
+ esac
+
+ if test "$with_dmalloc" = yes ; then
+- echo "$as_me:23173: checking for dmalloc.h" >&5
++ echo "$as_me:23184: 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 23179 "configure"
++#line 23190 "configure"
+ #include "confdefs.h"
+ #include <dmalloc.h>
+ _ACEOF
+-if { (eval echo "$as_me:23183: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:23194: \"$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:23189: \$? = $ac_status" >&5
++ echo "$as_me:23200: \$? = $ac_status" >&5
+ (exit "$ac_status"); } >/dev/null; then
+ if test -s conftest.err; then
+ ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -23205,11 +23216,11 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:23208: result: $ac_cv_header_dmalloc_h" >&5
++echo "$as_me:23219: 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:23212: checking for dmalloc_debug in -ldmalloc" >&5
++echo "$as_me:23223: 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
+@@ -23217,7 +23228,7 @@
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-ldmalloc $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 23220 "configure"
++#line 23231 "configure"
+ #include "confdefs.h"
+
+ /* Override any gcc2 internal prototype to avoid an error. */
+@@ -23236,16 +23247,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:23239: \"$ac_link\"") >&5
++if { (eval echo "$as_me:23250: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:23242: \$? = $ac_status" >&5
++ echo "$as_me:23253: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:23245: \"$ac_try\"") >&5
++ { (eval echo "$as_me:23256: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:23248: \$? = $ac_status" >&5
++ echo "$as_me:23259: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_lib_dmalloc_dmalloc_debug=yes
+ else
+@@ -23256,7 +23267,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:23259: result: $ac_cv_lib_dmalloc_dmalloc_debug" >&5
++echo "$as_me:23270: 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
+@@ -23271,7 +23282,7 @@
+
+ fi
+
+-echo "$as_me:23274: checking if you want to use dbmalloc for testing" >&5
++echo "$as_me:23285: 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.
+@@ -23293,7 +23304,7 @@
+ else
+ with_dbmalloc=
+ fi;
+-echo "$as_me:23296: result: ${with_dbmalloc:-no}" >&5
++echo "$as_me:23307: result: ${with_dbmalloc:-no}" >&5
+ echo "${ECHO_T}${with_dbmalloc:-no}" >&6
+
+ case ".$with_cflags" in
+@@ -23407,23 +23418,23 @@
+ esac
+
+ if test "$with_dbmalloc" = yes ; then
+- echo "$as_me:23410: checking for dbmalloc.h" >&5
++ echo "$as_me:23421: 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 23416 "configure"
++#line 23427 "configure"
+ #include "confdefs.h"
+ #include <dbmalloc.h>
+ _ACEOF
+-if { (eval echo "$as_me:23420: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:23431: \"$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:23426: \$? = $ac_status" >&5
++ echo "$as_me:23437: \$? = $ac_status" >&5
+ (exit "$ac_status"); } >/dev/null; then
+ if test -s conftest.err; then
+ ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -23442,11 +23453,11 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:23445: result: $ac_cv_header_dbmalloc_h" >&5
++echo "$as_me:23456: 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:23449: checking for debug_malloc in -ldbmalloc" >&5
++echo "$as_me:23460: 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
+@@ -23454,7 +23465,7 @@
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-ldbmalloc $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 23457 "configure"
++#line 23468 "configure"
+ #include "confdefs.h"
+
+ /* Override any gcc2 internal prototype to avoid an error. */
+@@ -23473,16 +23484,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:23476: \"$ac_link\"") >&5
++if { (eval echo "$as_me:23487: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:23479: \$? = $ac_status" >&5
++ echo "$as_me:23490: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:23482: \"$ac_try\"") >&5
++ { (eval echo "$as_me:23493: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:23485: \$? = $ac_status" >&5
++ echo "$as_me:23496: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ ac_cv_lib_dbmalloc_debug_malloc=yes
+ else
+@@ -23493,7 +23504,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:23496: result: $ac_cv_lib_dbmalloc_debug_malloc" >&5
++echo "$as_me:23507: 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
+@@ -23508,7 +23519,7 @@
+
+ fi
+
+-echo "$as_me:23511: checking if you want to use valgrind for testing" >&5
++echo "$as_me:23522: 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.
+@@ -23530,7 +23541,7 @@
+ else
+ with_valgrind=
+ fi;
+-echo "$as_me:23533: result: ${with_valgrind:-no}" >&5
++echo "$as_me:23544: result: ${with_valgrind:-no}" >&5
+ echo "${ECHO_T}${with_valgrind:-no}" >&6
+
+ case ".$with_cflags" in
+@@ -23643,7 +23654,7 @@
+ ;;
+ esac
+
+-echo "$as_me:23646: checking if you want to perform memory-leak testing" >&5
++echo "$as_me:23657: 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.
+@@ -23654,7 +23665,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:23657: result: $with_no_leaks" >&5
++echo "$as_me:23668: result: $with_no_leaks" >&5
+ echo "${ECHO_T}$with_no_leaks" >&6
+
+ if test "$enable_leaks" = no ; then
+@@ -23672,7 +23683,7 @@
+ LD_RPATH_OPT=
+ if test "x$cf_cv_enable_rpath" != xno
+ then
+- echo "$as_me:23675: checking for an rpath option" >&5
++ echo "$as_me:23686: checking for an rpath option" >&5
+ echo $ECHO_N "checking for an rpath option... $ECHO_C" >&6
+ case "$cf_cv_system_name" in
+ (irix*)
+@@ -23703,12 +23714,12 @@
+ (*)
+ ;;
+ esac
+- echo "$as_me:23706: result: $LD_RPATH_OPT" >&5
++ echo "$as_me:23717: result: $LD_RPATH_OPT" >&5
+ echo "${ECHO_T}$LD_RPATH_OPT" >&6
+
+ case "x$LD_RPATH_OPT" in
+ (x-R*)
+- echo "$as_me:23711: checking if we need a space after rpath option" >&5
++ echo "$as_me:23722: 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"
+
+@@ -23729,7 +23740,7 @@
+ LIBS="$cf_add_libs"
+
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 23732 "configure"
++#line 23743 "configure"
+ #include "confdefs.h"
+
+ int
+@@ -23741,16 +23752,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:23744: \"$ac_link\"") >&5
++if { (eval echo "$as_me:23755: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:23747: \$? = $ac_status" >&5
++ echo "$as_me:23758: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:23750: \"$ac_try\"") >&5
++ { (eval echo "$as_me:23761: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:23753: \$? = $ac_status" >&5
++ echo "$as_me:23764: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; }; then
+ cf_rpath_space=no
+ else
+@@ -23760,14 +23771,14 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS="$cf_save_LIBS"
+- echo "$as_me:23763: result: $cf_rpath_space" >&5
++ echo "$as_me:23774: 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:23770: checking if rpath-hack should be disabled" >&5
++echo "$as_me:23781: 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.
+@@ -23785,22 +23796,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:23788: result: $cf_disable_rpath_hack" >&5
++echo "$as_me:23799: result: $cf_disable_rpath_hack" >&5
+ echo "${ECHO_T}$cf_disable_rpath_hack" >&6
+
+ if test "$enable_rpath_hack" = yes ; then
+
+-echo "$as_me:23793: checking for updated LDFLAGS" >&5
++echo "$as_me:23804: 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:23796: result: maybe" >&5
++ echo "$as_me:23807: 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:23803: checking for $ac_word" >&5
++echo "$as_me:23814: 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
+@@ -23815,7 +23826,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:23818: found $ac_dir/$ac_word" >&5
++echo "$as_me:23829: found $ac_dir/$ac_word" >&5
+ break
+ done
+
+@@ -23823,10 +23834,10 @@
+ fi
+ cf_ldd_prog=$ac_cv_prog_cf_ldd_prog
+ if test -n "$cf_ldd_prog"; then
+- echo "$as_me:23826: result: $cf_ldd_prog" >&5
++ echo "$as_me:23837: result: $cf_ldd_prog" >&5
+ echo "${ECHO_T}$cf_ldd_prog" >&6
+ else
+- echo "$as_me:23829: result: no" >&5
++ echo "$as_me:23840: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+
+@@ -23840,7 +23851,7 @@
+ cf_rpath_oops=
+
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 23843 "configure"
++#line 23854 "configure"
+ #include "confdefs.h"
+ #include <stdio.h>
+ int
+@@ -23852,16 +23863,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:23855: \"$ac_link\"") >&5
++if { (eval echo "$as_me:23866: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:23858: \$? = $ac_status" >&5
++ echo "$as_me:23869: \$? = $ac_status" >&5
+ (exit "$ac_status"); } &&
+ { ac_try='test -s "conftest$ac_exeext"'
+- { (eval echo "$as_me:23861: \"$ac_try\"") >&5
++ { (eval echo "$as_me:23872: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:23864: \$? = $ac_status" >&5
++ echo "$as_me:23875: \$? = $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`
+@@ -23889,7 +23900,7 @@
+ then
+ test -n "$verbose" && echo " ...adding -L$cf_rpath_dir/lib to LDFLAGS for $cf_rpath_src" 1>&6
+
+-echo "${as_me:-configure}:23892: testing ...adding -L$cf_rpath_dir/lib to LDFLAGS for $cf_rpath_src ..." 1>&5
++echo "${as_me:-configure}:23903: testing ...adding -L$cf_rpath_dir/lib to LDFLAGS for $cf_rpath_src ..." 1>&5
+
+ LDFLAGS="$LDFLAGS -L$cf_rpath_dir/lib"
+ break
+@@ -23901,11 +23912,11 @@
+
+ test -n "$verbose" && echo " ...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS" 1>&6
+
+-echo "${as_me:-configure}:23904: testing ...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
++echo "${as_me:-configure}:23915: testing ...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
+
+ test -n "$verbose" && echo " ...checking LDFLAGS $LDFLAGS" 1>&6
+
+-echo "${as_me:-configure}:23908: testing ...checking LDFLAGS $LDFLAGS ..." 1>&5
++echo "${as_me:-configure}:23919: testing ...checking LDFLAGS $LDFLAGS ..." 1>&5
+
+ cf_rpath_dst=
+ for cf_rpath_src in $LDFLAGS
+@@ -23942,7 +23953,7 @@
+ then
+ test -n "$verbose" && echo " ...Filter $cf_rpath_src ->$cf_rpath_tmp" 1>&6
+
+-echo "${as_me:-configure}:23945: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
++echo "${as_me:-configure}:23956: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
+
+ EXTRA_LDFLAGS="$cf_rpath_tmp $EXTRA_LDFLAGS"
+ fi
+@@ -23955,11 +23966,11 @@
+
+ test -n "$verbose" && echo " ...checked LDFLAGS $LDFLAGS" 1>&6
+
+-echo "${as_me:-configure}:23958: testing ...checked LDFLAGS $LDFLAGS ..." 1>&5
++echo "${as_me:-configure}:23969: testing ...checked LDFLAGS $LDFLAGS ..." 1>&5
+
+ test -n "$verbose" && echo " ...checking LIBS $LIBS" 1>&6
+
+-echo "${as_me:-configure}:23962: testing ...checking LIBS $LIBS ..." 1>&5
++echo "${as_me:-configure}:23973: testing ...checking LIBS $LIBS ..." 1>&5
+
+ cf_rpath_dst=
+ for cf_rpath_src in $LIBS
+@@ -23996,7 +24007,7 @@
+ then
+ test -n "$verbose" && echo " ...Filter $cf_rpath_src ->$cf_rpath_tmp" 1>&6
+
+-echo "${as_me:-configure}:23999: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
++echo "${as_me:-configure}:24010: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
+
+ EXTRA_LDFLAGS="$cf_rpath_tmp $EXTRA_LDFLAGS"
+ fi
+@@ -24009,14 +24020,14 @@
+
+ test -n "$verbose" && echo " ...checked LIBS $LIBS" 1>&6
+
+-echo "${as_me:-configure}:24012: testing ...checked LIBS $LIBS ..." 1>&5
++echo "${as_me:-configure}:24023: testing ...checked LIBS $LIBS ..." 1>&5
+
+ test -n "$verbose" && echo " ...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS" 1>&6
+
+-echo "${as_me:-configure}:24016: testing ...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
++echo "${as_me:-configure}:24027: testing ...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
+
+ else
+- echo "$as_me:24019: result: no" >&5
++ echo "$as_me:24030: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+
+@@ -24106,7 +24117,7 @@
+ : "${CONFIG_STATUS=./config.status}"
+ ac_clean_files_save=$ac_clean_files
+ ac_clean_files="$ac_clean_files $CONFIG_STATUS"
+-{ echo "$as_me:24109: creating $CONFIG_STATUS" >&5
++{ echo "$as_me:24120: creating $CONFIG_STATUS" >&5
+ echo "$as_me: creating $CONFIG_STATUS" >&6;}
+ cat >"$CONFIG_STATUS" <<_ACEOF
+ #! $SHELL
+@@ -24242,7 +24253,7 @@
+ cat >>"$CONFIG_STATUS" <<EOF
+ ac_cs_version="\\
+ config.status
+-configured by $0, generated by GNU Autoconf 2.52.20231210,
++configured by $0, generated by GNU Autoconf 2.52.20240618,
+ with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
+
+ Copyright 2003-2022,2023 Thomas E. Dickey
+@@ -24287,7 +24298,7 @@
+ echo "$ac_cs_version"; exit 0 ;;
+ --he | --h)
+ # Conflict between --help and --header
+- { { echo "$as_me:24290: error: ambiguous option: $1
++ { { echo "$as_me:24301: 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;}
+@@ -24306,7 +24317,7 @@
+ ac_need_defaults=false;;
+
+ # This is an error.
+- -*) { { echo "$as_me:24309: error: unrecognized option: $1
++ -*) { { echo "$as_me:24320: 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;}
+@@ -24325,7 +24336,7 @@
+ ## Running config.status. ##
+ ## ----------------------- ##
+
+-This file was extended by $as_me 2.52.20231210, executed with
++This file was extended by $as_me 2.52.20240618, executed with
+ CONFIG_FILES = $CONFIG_FILES
+ CONFIG_HEADERS = $CONFIG_HEADERS
+ CONFIG_LINKS = $CONFIG_LINKS
+@@ -24356,7 +24367,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:24359: error: invalid argument: $ac_config_target" >&5
++ *) { { echo "$as_me:24370: error: invalid argument: $ac_config_target" >&5
+ echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
+ { (exit 1); exit 1; }; };;
+ esac
+@@ -24559,14 +24570,14 @@
+ # is no need to browse any of the substitutions).
+ # These are the two extra sed commands mentioned above.
+ (echo ':t
+- /@[a-zA-Z_][a-zA-Z_0-9]*@/!b' && cat "$tmp"/subs.frag) >"$tmp"/subs-$ac_sed_frag.sed
++ /@[a-zA-Z_][a-zA-Z_0-9]*@/!b' && sed -e 's/\\\\*$//g' -e 's/$/\\/' -e 's/;t t\\/;t t/' -e 't' -e '3,'$ac_max_sed_lines's/$/\\/' "$tmp"/subs.frag) >"$tmp"/subs-$ac_sed_frag.sed
+ # It is possible to make a multiline substitution using escaped newlines.
+ # Ensure that we do not split the substitution between script fragments.
+ ac_BEG=$ac_end
+ ac_END=`expr "$ac_end" + "$ac_max_sed_lines"`
+ sed "1,${ac_BEG}d; ${ac_END}p; q" "$tmp"/subs.sed >"$tmp"/subs.next
+ if test -s "$tmp"/subs.next; then
+- grep '^s,@[^@,][^@,]*@,.*\\$' "$tmp"/subs.next >"$tmp"/subs.edit
++ grep '^s,@[^@,][^@,]*@,.*$' "$tmp"/subs.next | grep -v '^s,@.*;t t$' >"$tmp"/subs.edit
+ if test ! -s "$tmp"/subs.edit; then
+ grep "^s,@[^@,][^@,]*@,.*,;t t$" "$tmp"/subs.next >"$tmp"/subs.edit
+ if test ! -s "$tmp"/subs.edit; then
+@@ -24664,7 +24675,7 @@
+ esac
+
+ if test x"$ac_file" != x-; then
+- { echo "$as_me:24667: creating $ac_file" >&5
++ { echo "$as_me:24678: creating $ac_file" >&5
+ echo "$as_me: creating $ac_file" >&6;}
+ rm -f "$ac_file"
+ fi
+@@ -24682,7 +24693,7 @@
+ -) echo "$tmp"/stdin ;;
+ [\\/$]*)
+ # Absolute (can't be DOS-style, as IFS=:)
+- test -f "$f" || { { echo "$as_me:24685: error: cannot find input file: $f" >&5
++ test -f "$f" || { { echo "$as_me:24696: error: cannot find input file: $f" >&5
+ echo "$as_me: error: cannot find input file: $f" >&2;}
+ { (exit 1); exit 1; }; }
+ echo "$f";;
+@@ -24695,7 +24706,7 @@
+ echo "$srcdir/$f"
+ else
+ # /dev/null tree
+- { { echo "$as_me:24698: error: cannot find input file: $f" >&5
++ { { echo "$as_me:24709: error: cannot find input file: $f" >&5
+ echo "$as_me: error: cannot find input file: $f" >&2;}
+ { (exit 1); exit 1; }; }
+ fi;;
+@@ -24711,7 +24722,7 @@
+ if test -n "$ac_seen"; then
+ ac_used=`grep '@datarootdir@' "$ac_item"`
+ if test -z "$ac_used"; then
+- { echo "$as_me:24714: WARNING: datarootdir was used implicitly but not set:
++ { echo "$as_me:24725: 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;}
+@@ -24720,7 +24731,7 @@
+ fi
+ ac_seen=`grep '${datarootdir}' "$ac_item"`
+ if test -n "$ac_seen"; then
+- { echo "$as_me:24723: WARNING: datarootdir was used explicitly but not set:
++ { echo "$as_me:24734: 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;}
+@@ -24765,7 +24776,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:24768: WARNING: Variable $ac_name is used but was not set:
++ { echo "$as_me:24779: 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;}
+@@ -24776,7 +24787,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:24779: WARNING: Some variables may not be substituted:
++ { echo "$as_me:24790: WARNING: Some variables may not be substituted:
+ $ac_seen" >&5
+ echo "$as_me: WARNING: Some variables may not be substituted:
+ $ac_seen" >&2;}
+@@ -24825,7 +24836,7 @@
+ * ) ac_file_in=$ac_file.in ;;
+ esac
+
+- test x"$ac_file" != x- && { echo "$as_me:24828: creating $ac_file" >&5
++ test x"$ac_file" != x- && { echo "$as_me:24839: creating $ac_file" >&5
+ echo "$as_me: creating $ac_file" >&6;}
+
+ # First look for the input files in the build tree, otherwise in the
+@@ -24836,7 +24847,7 @@
+ -) echo "$tmp"/stdin ;;
+ [\\/$]*)
+ # Absolute (can't be DOS-style, as IFS=:)
+- test -f "$f" || { { echo "$as_me:24839: error: cannot find input file: $f" >&5
++ test -f "$f" || { { echo "$as_me:24850: error: cannot find input file: $f" >&5
+ echo "$as_me: error: cannot find input file: $f" >&2;}
+ { (exit 1); exit 1; }; }
+ echo $f;;
+@@ -24849,7 +24860,7 @@
+ echo "$srcdir/$f"
+ else
+ # /dev/null tree
+- { { echo "$as_me:24852: error: cannot find input file: $f" >&5
++ { { echo "$as_me:24863: error: cannot find input file: $f" >&5
+ echo "$as_me: error: cannot find input file: $f" >&2;}
+ { (exit 1); exit 1; }; }
+ fi;;
+@@ -24907,7 +24918,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:24910: $ac_file is unchanged" >&5
++ { echo "$as_me:24921: $ac_file is unchanged" >&5
+ echo "$as_me: $ac_file is unchanged" >&6;}
+ else
+ ac_dir=`$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \