system/ncurses: bump { 20220129 --> 20220416 }. add maintenance script. fixes #531.

1 files changed, 20217 insertions, 0 deletions

diff --git a/system/ncurses/ncurses-6.3-20220122.patch b/system/ncurses/ncurses-6.3-20220122.patch
new file mode 100644
index 000000000..b793cf9c2
--- /dev/null
+++ b/system/ncurses/ncurses-6.3-20220122.patch
@@ -0,0 +1,20217 @@
+# ncurses 6.3 - patch 20220122 - Thomas E. Dickey
+#
+# ------------------------------------------------------------------------------
+#
+# Ncurses 6.3 is at
+# 	ftp://ftp.invisible-island.net/ncurses/
+#	https://invisible-mirror.net/archives/ncurses/
+#	https://ftp.gnu.org/gnu/ncurses/
+#
+# Patches for ncurses 6.3 can be found at
+# 	ftp://ftp.invisible-island.net/ncurses/6.3
+#	https://invisible-mirror.net/archives/ncurses/6.3
+#
+# ------------------------------------------------------------------------------
+# ftp://ftp.invisible-island.net/ncurses/6.3/ncurses-6.3-20220122.patch.gz
+# patch by Thomas E. Dickey <dickey@invisible-island.net>
+# created  Sun Jan 23 01:58:35 UTC 2022
+# ------------------------------------------------------------------------------
+# Ada95/aclocal.m4                 |   20 
+# Ada95/configure                  |  607 ++--
+# NEWS                             |   11 
+# VERSION                          |    2 
+# aclocal.m4                       |   68 
+# configure                        | 4953 ++++++++++++++++++-------------------
+# configure.in                     |   35 
+# 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 
+# progs/dump_entry.c               |    5 
+# test/aclocal.m4                  |   20 
+# test/configure                   |  299 +-
+# 18 files changed, 3109 insertions(+), 2937 deletions(-)
+# ------------------------------------------------------------------------------
+Index: Ada95/aclocal.m4
+Prereq:  1.191 
+--- ncurses-6.3-20220115+/Ada95/aclocal.m4	2021-11-20 19:58:23.000000000 +0000
++++ ncurses-6.3-20220122/Ada95/aclocal.m4	2022-01-23 00:21:27.000000000 +0000
+@@ -1,5 +1,5 @@
+ dnl***************************************************************************
+-dnl Copyright 2018-2020,2021 Thomas E. Dickey                                *
++dnl Copyright 2018-2021,2022 Thomas E. Dickey                                *
+ dnl Copyright 2010-2017,2018 Free Software Foundation, Inc.                  *
+ dnl                                                                          *
+ dnl Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -29,7 +29,7 @@
+ dnl
+ dnl Author: Thomas E. Dickey
+ dnl
+-dnl $Id: aclocal.m4,v 1.191 2021/11/20 19:58:23 tom Exp $
++dnl $Id: aclocal.m4,v 1.192 2022/01/23 00:21:27 tom Exp $
+ dnl Macros used in NCURSES Ada95 auto-configuration script.
+ dnl
+ dnl These macros are maintained separately from NCURSES.  The copyright on
+@@ -1329,7 +1329,7 @@
+ 	AC_MSG_RESULT($ADAFLAGS)
+ ])dnl
+ dnl ---------------------------------------------------------------------------
+-dnl CF_FIX_WARNINGS version: 3 updated: 2020/12/31 18:40:20
++dnl CF_FIX_WARNINGS version: 4 updated: 2021/12/16 18:22:31
+ dnl ---------------
+ dnl Warning flags do not belong in CFLAGS, CPPFLAGS, etc.  Any of gcc's
+ dnl "-Werror" flags can interfere with configure-checks.  Those go into
+@@ -1341,11 +1341,13 @@
+ then
+ 	case [$]$1 in
+ 	(*-Werror=*)
+-		CF_VERBOSE(repairing $1: [$]$1)
+ 		cf_temp_flags=
+ 		for cf_temp_scan in [$]$1
+ 		do
+ 			case "x$cf_temp_scan" in
++			(x-Werror=format*)
++				CF_APPEND_TEXT(cf_temp_flags,$cf_temp_scan)
++				;;
+ 			(x-Werror=*)
+ 				CF_APPEND_TEXT(EXTRA_CFLAGS,$cf_temp_scan)
+ 				;;
+@@ -1354,9 +1356,13 @@
+ 				;;
+ 			esac
+ 		done
+-		$1="$cf_temp_flags"
+-		CF_VERBOSE(... fixed [$]$1)
+-		CF_VERBOSE(... extra $EXTRA_CFLAGS)
++		if test "x[$]$1" != "x$cf_temp_flags"
++		then
++			CF_VERBOSE(repairing $1: [$]$1)
++			$1="$cf_temp_flags"
++			CF_VERBOSE(... fixed [$]$1)
++			CF_VERBOSE(... extra $EXTRA_CFLAGS)
++		fi
+ 		;;
+ 	esac
+ fi
+Index: Ada95/configure
+--- ncurses-6.3-20220115+/Ada95/configure	2021-11-20 19:58:46.000000000 +0000
++++ ncurses-6.3-20220122/Ada95/configure	2022-01-23 00:21:51.000000000 +0000
+@@ -15294,14 +15294,16 @@
+ then
+ 	case $CFLAGS in
+ 	(*-Werror=*)
+-		test -n "$verbose" && echo "	repairing CFLAGS: $CFLAGS" 1>&6
+-
+-echo "${as_me:-configure}:15299: testing repairing CFLAGS: $CFLAGS ..." 1>&5
+-
+ 		cf_temp_flags=
+ 		for cf_temp_scan in $CFLAGS
+ 		do
+ 			case "x$cf_temp_scan" in
++			(x-Werror=format*)
++
++	test -n "$cf_temp_flags" && cf_temp_flags="$cf_temp_flags "
++	cf_temp_flags="${cf_temp_flags}$cf_temp_scan"
++
++				;;
+ 			(x-Werror=*)
+ 
+ 	test -n "$EXTRA_CFLAGS" && EXTRA_CFLAGS="$EXTRA_CFLAGS "
+@@ -15316,15 +15318,22 @@
+ 				;;
+ 			esac
+ 		done
+-		CFLAGS="$cf_temp_flags"
+-		test -n "$verbose" && echo "	... fixed $CFLAGS" 1>&6
++		if test "x$CFLAGS" != "x$cf_temp_flags"
++		then
++			test -n "$verbose" && echo "	repairing CFLAGS: $CFLAGS" 1>&6
++
++echo "${as_me:-configure}:15325: testing repairing CFLAGS: $CFLAGS ..." 1>&5
+ 
+-echo "${as_me:-configure}:15322: testing ... fixed $CFLAGS ..." 1>&5
++			CFLAGS="$cf_temp_flags"
++			test -n "$verbose" && echo "	... fixed $CFLAGS" 1>&6
+ 
+-		test -n "$verbose" && echo "	... extra $EXTRA_CFLAGS" 1>&6
++echo "${as_me:-configure}:15330: testing ... fixed $CFLAGS ..." 1>&5
+ 
+-echo "${as_me:-configure}:15326: testing ... extra $EXTRA_CFLAGS ..." 1>&5
++			test -n "$verbose" && echo "	... extra $EXTRA_CFLAGS" 1>&6
+ 
++echo "${as_me:-configure}:15334: testing ... extra $EXTRA_CFLAGS ..." 1>&5
++
++		fi
+ 		;;
+ 	esac
+ fi
+@@ -15333,14 +15342,16 @@
+ then
+ 	case $CPPFLAGS in
+ 	(*-Werror=*)
+-		test -n "$verbose" && echo "	repairing CPPFLAGS: $CPPFLAGS" 1>&6
+-
+-echo "${as_me:-configure}:15338: testing repairing CPPFLAGS: $CPPFLAGS ..." 1>&5
+-
+ 		cf_temp_flags=
+ 		for cf_temp_scan in $CPPFLAGS
+ 		do
+ 			case "x$cf_temp_scan" in
++			(x-Werror=format*)
++
++	test -n "$cf_temp_flags" && cf_temp_flags="$cf_temp_flags "
++	cf_temp_flags="${cf_temp_flags}$cf_temp_scan"
++
++				;;
+ 			(x-Werror=*)
+ 
+ 	test -n "$EXTRA_CFLAGS" && EXTRA_CFLAGS="$EXTRA_CFLAGS "
+@@ -15355,15 +15366,22 @@
+ 				;;
+ 			esac
+ 		done
+-		CPPFLAGS="$cf_temp_flags"
+-		test -n "$verbose" && echo "	... fixed $CPPFLAGS" 1>&6
++		if test "x$CPPFLAGS" != "x$cf_temp_flags"
++		then
++			test -n "$verbose" && echo "	repairing CPPFLAGS: $CPPFLAGS" 1>&6
++
++echo "${as_me:-configure}:15373: testing repairing CPPFLAGS: $CPPFLAGS ..." 1>&5
++
++			CPPFLAGS="$cf_temp_flags"
++			test -n "$verbose" && echo "	... fixed $CPPFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:15361: testing ... fixed $CPPFLAGS ..." 1>&5
++echo "${as_me:-configure}:15378: testing ... fixed $CPPFLAGS ..." 1>&5
+ 
+-		test -n "$verbose" && echo "	... extra $EXTRA_CFLAGS" 1>&6
++			test -n "$verbose" && echo "	... extra $EXTRA_CFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:15365: testing ... extra $EXTRA_CFLAGS ..." 1>&5
++echo "${as_me:-configure}:15382: testing ... extra $EXTRA_CFLAGS ..." 1>&5
+ 
++		fi
+ 		;;
+ 	esac
+ fi
+@@ -15372,14 +15390,16 @@
+ then
+ 	case $LDFLAGS in
+ 	(*-Werror=*)
+-		test -n "$verbose" && echo "	repairing LDFLAGS: $LDFLAGS" 1>&6
+-
+-echo "${as_me:-configure}:15377: testing repairing LDFLAGS: $LDFLAGS ..." 1>&5
+-
+ 		cf_temp_flags=
+ 		for cf_temp_scan in $LDFLAGS
+ 		do
+ 			case "x$cf_temp_scan" in
++			(x-Werror=format*)
++
++	test -n "$cf_temp_flags" && cf_temp_flags="$cf_temp_flags "
++	cf_temp_flags="${cf_temp_flags}$cf_temp_scan"
++
++				;;
+ 			(x-Werror=*)
+ 
+ 	test -n "$EXTRA_CFLAGS" && EXTRA_CFLAGS="$EXTRA_CFLAGS "
+@@ -15394,20 +15414,27 @@
+ 				;;
+ 			esac
+ 		done
+-		LDFLAGS="$cf_temp_flags"
+-		test -n "$verbose" && echo "	... fixed $LDFLAGS" 1>&6
++		if test "x$LDFLAGS" != "x$cf_temp_flags"
++		then
++			test -n "$verbose" && echo "	repairing LDFLAGS: $LDFLAGS" 1>&6
++
++echo "${as_me:-configure}:15421: testing repairing LDFLAGS: $LDFLAGS ..." 1>&5
+ 
+-echo "${as_me:-configure}:15400: testing ... fixed $LDFLAGS ..." 1>&5
++			LDFLAGS="$cf_temp_flags"
++			test -n "$verbose" && echo "	... fixed $LDFLAGS" 1>&6
+ 
+-		test -n "$verbose" && echo "	... extra $EXTRA_CFLAGS" 1>&6
++echo "${as_me:-configure}:15426: testing ... fixed $LDFLAGS ..." 1>&5
+ 
+-echo "${as_me:-configure}:15404: testing ... extra $EXTRA_CFLAGS ..." 1>&5
++			test -n "$verbose" && echo "	... extra $EXTRA_CFLAGS" 1>&6
+ 
++echo "${as_me:-configure}:15430: testing ... extra $EXTRA_CFLAGS ..." 1>&5
++
++		fi
+ 		;;
+ 	esac
+ fi
+ 
+-echo "$as_me:15410: checking if you want to turn on gcc warnings" >&5
++echo "$as_me:15437: 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.
+@@ -15424,7 +15451,7 @@
+ 	enable_warnings=no
+ 
+ fi;
+-echo "$as_me:15427: result: $enable_warnings" >&5
++echo "$as_me:15454: result: $enable_warnings" >&5
+ echo "${ECHO_T}$enable_warnings" >&6
+ if test "$enable_warnings" = "yes"
+ then
+@@ -15448,7 +15475,7 @@
+ done
+ 
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 15451 "configure"
++#line 15478 "configure"
+ #include "confdefs.h"
+ 
+ #include <stdlib.h>
+@@ -15463,26 +15490,26 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:15466: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:15493: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:15469: \$? = $ac_status" >&5
++  echo "$as_me:15496: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:15472: \"$ac_try\"") >&5
++  { (eval echo "$as_me:15499: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:15475: \$? = $ac_status" >&5
++  echo "$as_me:15502: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+ 
+-echo "$as_me:15478: checking for X11/Xt const-feature" >&5
++echo "$as_me:15505: 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 15485 "configure"
++#line 15512 "configure"
+ #include "confdefs.h"
+ 
+ #define _CONST_X_STRING	/* X11R7.8 (perhaps) */
+@@ -15499,16 +15526,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:15502: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:15529: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:15505: \$? = $ac_status" >&5
++  echo "$as_me:15532: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:15508: \"$ac_try\"") >&5
++  { (eval echo "$as_me:15535: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:15511: \$? = $ac_status" >&5
++  echo "$as_me:15538: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+ 
+ 			cf_cv_const_x_string=no
+@@ -15523,7 +15550,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:15526: result: $cf_cv_const_x_string" >&5
++echo "$as_me:15553: result: $cf_cv_const_x_string" >&5
+ echo "${ECHO_T}$cf_cv_const_x_string" >&6
+ 
+ LIBS="$cf_save_LIBS_CF_CONST_X_STRING"
+@@ -15552,7 +15579,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+  fi
+ cat > "conftest.$ac_ext" <<EOF
+-#line 15555 "${as_me:-configure}"
++#line 15582 "${as_me:-configure}"
+ int main(int argc, char *argv[]) { return (argv[argc-1] == 0) ; }
+ EOF
+ if test "$INTEL_COMPILER" = yes
+@@ -15568,7 +15595,7 @@
+ # remark #981: operands are evaluated in unspecified order
+ # warning #279: controlling expression is constant
+ 
+-	{ echo "$as_me:15571: checking for $CC warning options..." >&5
++	{ echo "$as_me:15598: checking for $CC warning options..." >&5
+ echo "$as_me: checking for $CC warning options..." >&6;}
+ 	cf_save_CFLAGS="$CFLAGS"
+ 	EXTRA_CFLAGS="$EXTRA_CFLAGS -Wall"
+@@ -15584,12 +15611,12 @@
+ 		wd981
+ 	do
+ 		CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt"
+-		if { (eval echo "$as_me:15587: \"$ac_compile\"") >&5
++		if { (eval echo "$as_me:15614: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:15590: \$? = $ac_status" >&5
++  echo "$as_me:15617: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; then
+-			test -n "$verbose" && echo "$as_me:15592: result: ... -$cf_opt" >&5
++			test -n "$verbose" && echo "$as_me:15619: result: ... -$cf_opt" >&5
+ echo "${ECHO_T}... -$cf_opt" >&6
+ 			EXTRA_CFLAGS="$EXTRA_CFLAGS -$cf_opt"
+ 		fi
+@@ -15597,7 +15624,7 @@
+ 	CFLAGS="$cf_save_CFLAGS"
+ elif test "$GCC" = yes && test "$GCC_VERSION" != "unknown"
+ then
+-	{ echo "$as_me:15600: checking for $CC warning options..." >&5
++	{ echo "$as_me:15627: checking for $CC warning options..." >&5
+ echo "$as_me: checking for $CC warning options..." >&6;}
+ 	cf_save_CFLAGS="$CFLAGS"
+ 	cf_warn_CONST=""
+@@ -15620,12 +15647,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:15623: \"$ac_compile\"") >&5
++		if { (eval echo "$as_me:15650: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:15626: \$? = $ac_status" >&5
++  echo "$as_me:15653: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; then
+-			test -n "$verbose" && echo "$as_me:15628: result: ... -$cf_opt" >&5
++			test -n "$verbose" && echo "$as_me:15655: result: ... -$cf_opt" >&5
+ echo "${ECHO_T}... -$cf_opt" >&6
+ 			case "$cf_opt" in
+ 			(Winline)
+@@ -15633,7 +15660,7 @@
+ 				([34].*)
+ 					test -n "$verbose" && echo "	feature is broken in gcc $GCC_VERSION" 1>&6
+ 
+-echo "${as_me:-configure}:15636: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
++echo "${as_me:-configure}:15663: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
+ 
+ 					continue;;
+ 				esac
+@@ -15643,7 +15670,7 @@
+ 				([12].*)
+ 					test -n "$verbose" && echo "	feature is broken in gcc $GCC_VERSION" 1>&6
+ 
+-echo "${as_me:-configure}:15646: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
++echo "${as_me:-configure}:15673: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
+ 
+ 					continue;;
+ 				esac
+@@ -15676,10 +15703,10 @@
+ EOF
+ if test "$GCC" = yes
+ then
+-	{ echo "$as_me:15679: checking for $CC __attribute__ directives..." >&5
++	{ echo "$as_me:15706: checking for $CC __attribute__ directives..." >&5
+ echo "$as_me: checking for $CC __attribute__ directives..." >&6;}
+ cat > "conftest.$ac_ext" <<EOF
+-#line 15682 "${as_me:-configure}"
++#line 15709 "${as_me:-configure}"
+ #include "confdefs.h"
+ #include "conftest.h"
+ #include "conftest.i"
+@@ -15728,12 +15755,12 @@
+ 			;;
+ 		esac
+ 
+-		if { (eval echo "$as_me:15731: \"$ac_compile\"") >&5
++		if { (eval echo "$as_me:15758: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:15734: \$? = $ac_status" >&5
++  echo "$as_me:15761: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; then
+-			test -n "$verbose" && echo "$as_me:15736: result: ... $cf_attribute" >&5
++			test -n "$verbose" && echo "$as_me:15763: result: ... $cf_attribute" >&5
+ echo "${ECHO_T}... $cf_attribute" >&6
+ 			cat conftest.h >>confdefs.h
+ 			case "$cf_attribute" in
+@@ -15801,7 +15828,7 @@
+ fi
+ 
+ ###	use option --enable-assertions to turn on generation of assertion code
+-echo "$as_me:15804: checking if you want to enable runtime assertions" >&5
++echo "$as_me:15831: 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.
+@@ -15811,7 +15838,7 @@
+ else
+   with_assertions=no
+ fi;
+-echo "$as_me:15814: result: $with_assertions" >&5
++echo "$as_me:15841: result: $with_assertions" >&5
+ echo "${ECHO_T}$with_assertions" >&6
+ if test -n "$GCC"
+ then
+@@ -15864,7 +15891,7 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:15867: checking whether to add trace feature to all models" >&5
++echo "$as_me:15894: 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.
+@@ -15874,7 +15901,7 @@
+ else
+   cf_with_trace=$cf_all_traces
+ fi;
+-echo "$as_me:15877: result: $cf_with_trace" >&5
++echo "$as_me:15904: result: $cf_with_trace" >&5
+ echo "${ECHO_T}$cf_with_trace" >&6
+ 
+ if test "$cf_with_trace" = yes ; then
+@@ -15982,7 +16009,7 @@
+ 	ADA_TRACE=FALSE
+ fi
+ 
+-echo "$as_me:15985: checking if we want to use GNAT projects" >&5
++echo "$as_me:16012: 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.
+@@ -15999,21 +16026,21 @@
+ 	enable_gnat_projects=yes
+ 
+ fi;
+-echo "$as_me:16002: result: $enable_gnat_projects" >&5
++echo "$as_me:16029: 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:16009: checking if ssp library is needed" >&5
++echo "$as_me:16036: 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 16016 "configure"
++#line 16043 "configure"
+ #include "confdefs.h"
+ 
+ #include <sys/types.h>
+@@ -16030,16 +16057,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:16033: \"$ac_link\"") >&5
++if { (eval echo "$as_me:16060: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:16036: \$? = $ac_status" >&5
++  echo "$as_me:16063: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:16039: \"$ac_try\"") >&5
++  { (eval echo "$as_me:16066: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:16042: \$? = $ac_status" >&5
++  echo "$as_me:16069: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_need_libssp=no
+ else
+@@ -16049,7 +16076,7 @@
+ 	cf_save_LIBS="$LIBS"
+ 	LIBS="$LIBS -lssp"
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 16052 "configure"
++#line 16079 "configure"
+ #include "confdefs.h"
+ 
+ #include <sys/types.h>
+@@ -16066,16 +16093,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:16069: \"$ac_link\"") >&5
++if { (eval echo "$as_me:16096: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:16072: \$? = $ac_status" >&5
++  echo "$as_me:16099: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:16075: \"$ac_try\"") >&5
++  { (eval echo "$as_me:16102: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:16078: \$? = $ac_status" >&5
++  echo "$as_me:16105: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_need_libssp=yes
+ else
+@@ -16089,7 +16116,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:16092: result: $cf_cv_need_libssp" >&5
++echo "$as_me:16119: result: $cf_cv_need_libssp" >&5
+ echo "${ECHO_T}$cf_cv_need_libssp" >&6
+ 
+ if test "x$cf_cv_need_libssp" = xyes
+@@ -16115,13 +16142,13 @@
+ 
+ 	;;
+ (*)
+-echo "$as_me:16118: checking for gettimeofday" >&5
++echo "$as_me:16145: 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 16124 "configure"
++#line 16151 "configure"
+ #include "confdefs.h"
+ #define gettimeofday autoconf_temporary
+ #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -16152,16 +16179,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:16155: \"$ac_link\"") >&5
++if { (eval echo "$as_me:16182: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:16158: \$? = $ac_status" >&5
++  echo "$as_me:16185: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:16161: \"$ac_try\"") >&5
++  { (eval echo "$as_me:16188: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:16164: \$? = $ac_status" >&5
++  echo "$as_me:16191: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_func_gettimeofday=yes
+ else
+@@ -16171,7 +16198,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:16174: result: $ac_cv_func_gettimeofday" >&5
++echo "$as_me:16201: result: $ac_cv_func_gettimeofday" >&5
+ echo "${ECHO_T}$ac_cv_func_gettimeofday" >&6
+ if test "$ac_cv_func_gettimeofday" = yes; then
+   cat >>confdefs.h <<\EOF
+@@ -16180,7 +16207,7 @@
+ 
+ else
+ 
+-echo "$as_me:16183: checking for gettimeofday in -lbsd" >&5
++echo "$as_me:16210: 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
+@@ -16188,7 +16215,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lbsd  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 16191 "configure"
++#line 16218 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -16207,16 +16234,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:16210: \"$ac_link\"") >&5
++if { (eval echo "$as_me:16237: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:16213: \$? = $ac_status" >&5
++  echo "$as_me:16240: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:16216: \"$ac_try\"") >&5
++  { (eval echo "$as_me:16243: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:16219: \$? = $ac_status" >&5
++  echo "$as_me:16246: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_bsd_gettimeofday=yes
+ else
+@@ -16227,7 +16254,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:16230: result: $ac_cv_lib_bsd_gettimeofday" >&5
++echo "$as_me:16257: 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
+ 
+@@ -16243,13 +16270,13 @@
+ esac
+ 
+ ###	Checks for header files.
+-echo "$as_me:16246: checking for ANSI C header files" >&5
++echo "$as_me:16273: 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 16252 "configure"
++#line 16279 "configure"
+ #include "confdefs.h"
+ #include <stdlib.h>
+ #include <stdarg.h>
+@@ -16257,13 +16284,13 @@
+ #include <float.h>
+ 
+ _ACEOF
+-if { (eval echo "$as_me:16260: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:16287: \"$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:16266: \$? = $ac_status" >&5
++  echo "$as_me:16293: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -16285,7 +16312,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 16288 "configure"
++#line 16315 "configure"
+ #include "confdefs.h"
+ #include <string.h>
+ 
+@@ -16303,7 +16330,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 16306 "configure"
++#line 16333 "configure"
+ #include "confdefs.h"
+ #include <stdlib.h>
+ 
+@@ -16324,7 +16351,7 @@
+   :
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 16327 "configure"
++#line 16354 "configure"
+ #include "confdefs.h"
+ #include <ctype.h>
+ #if ((' ' & 0x0FF) == 0x020)
+@@ -16350,15 +16377,15 @@
+ }
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:16353: \"$ac_link\"") >&5
++if { (eval echo "$as_me:16380: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:16356: \$? = $ac_status" >&5
++  echo "$as_me:16383: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:16358: \"$ac_try\"") >&5
++  { (eval echo "$as_me:16385: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:16361: \$? = $ac_status" >&5
++  echo "$as_me:16388: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   :
+ else
+@@ -16371,7 +16398,7 @@
+ fi
+ fi
+ fi
+-echo "$as_me:16374: result: $ac_cv_header_stdc" >&5
++echo "$as_me:16401: result: $ac_cv_header_stdc" >&5
+ echo "${ECHO_T}$ac_cv_header_stdc" >&6
+ if test $ac_cv_header_stdc = yes; then
+ 
+@@ -16387,28 +16414,28 @@
+                   inttypes.h stdint.h unistd.h
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-echo "$as_me:16390: checking for $ac_header" >&5
++echo "$as_me:16417: 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 16396 "configure"
++#line 16423 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ #include <$ac_header>
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:16402: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:16429: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:16405: \$? = $ac_status" >&5
++  echo "$as_me:16432: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:16408: \"$ac_try\"") >&5
++  { (eval echo "$as_me:16435: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:16411: \$? = $ac_status" >&5
++  echo "$as_me:16438: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   eval "$as_ac_Header=yes"
+ else
+@@ -16418,7 +16445,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:16421: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
++echo "$as_me:16448: 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
+@@ -16428,13 +16455,13 @@
+ fi
+ done
+ 
+-echo "$as_me:16431: checking for signed char" >&5
++echo "$as_me:16458: 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 16437 "configure"
++#line 16464 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -16449,16 +16476,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:16452: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:16479: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:16455: \$? = $ac_status" >&5
++  echo "$as_me:16482: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:16458: \"$ac_try\"") >&5
++  { (eval echo "$as_me:16485: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:16461: \$? = $ac_status" >&5
++  echo "$as_me:16488: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_type_signed_char=yes
+ else
+@@ -16468,10 +16495,10 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:16471: result: $ac_cv_type_signed_char" >&5
++echo "$as_me:16498: result: $ac_cv_type_signed_char" >&5
+ echo "${ECHO_T}$ac_cv_type_signed_char" >&6
+ 
+-echo "$as_me:16474: checking size of signed char" >&5
++echo "$as_me:16501: 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
+@@ -16480,7 +16507,7 @@
+   if test "$cross_compiling" = yes; then
+   # Depending upon the size, compute the lo and hi bounds.
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 16483 "configure"
++#line 16510 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -16492,21 +16519,21 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:16495: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:16522: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:16498: \$? = $ac_status" >&5
++  echo "$as_me:16525: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:16501: \"$ac_try\"") >&5
++  { (eval echo "$as_me:16528: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:16504: \$? = $ac_status" >&5
++  echo "$as_me:16531: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_lo=0 ac_mid=0
+   while :; do
+     cat >"conftest.$ac_ext" <<_ACEOF
+-#line 16509 "configure"
++#line 16536 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -16518,16 +16545,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:16521: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:16548: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:16524: \$? = $ac_status" >&5
++  echo "$as_me:16551: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:16527: \"$ac_try\"") >&5
++  { (eval echo "$as_me:16554: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:16530: \$? = $ac_status" >&5
++  echo "$as_me:16557: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_hi=$ac_mid; break
+ else
+@@ -16543,7 +16570,7 @@
+ ac_hi=-1 ac_mid=-1
+   while :; do
+     cat >"conftest.$ac_ext" <<_ACEOF
+-#line 16546 "configure"
++#line 16573 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -16555,16 +16582,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:16558: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:16585: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:16561: \$? = $ac_status" >&5
++  echo "$as_me:16588: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:16564: \"$ac_try\"") >&5
++  { (eval echo "$as_me:16591: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:16567: \$? = $ac_status" >&5
++  echo "$as_me:16594: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_lo=$ac_mid; break
+ else
+@@ -16580,7 +16607,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 16583 "configure"
++#line 16610 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -16592,16 +16619,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:16595: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:16622: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:16598: \$? = $ac_status" >&5
++  echo "$as_me:16625: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:16601: \"$ac_try\"") >&5
++  { (eval echo "$as_me:16628: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:16604: \$? = $ac_status" >&5
++  echo "$as_me:16631: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_hi=$ac_mid
+ else
+@@ -16614,12 +16641,12 @@
+ ac_cv_sizeof_signed_char=$ac_lo
+ else
+   if test "$cross_compiling" = yes; then
+-  { { echo "$as_me:16617: error: cannot run test program while cross compiling" >&5
++  { { echo "$as_me:16644: 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 16622 "configure"
++#line 16649 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -16635,15 +16662,15 @@
+ }
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:16638: \"$ac_link\"") >&5
++if { (eval echo "$as_me:16665: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:16641: \$? = $ac_status" >&5
++  echo "$as_me:16668: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:16643: \"$ac_try\"") >&5
++  { (eval echo "$as_me:16670: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:16646: \$? = $ac_status" >&5
++  echo "$as_me:16673: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_sizeof_signed_char=`cat conftest.val`
+ else
+@@ -16659,19 +16686,19 @@
+   ac_cv_sizeof_signed_char=0
+ fi
+ fi
+-echo "$as_me:16662: result: $ac_cv_sizeof_signed_char" >&5
++echo "$as_me:16689: 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
+ EOF
+ 
+-echo "$as_me:16668: checking for ANSI C header files" >&5
++echo "$as_me:16695: 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 16674 "configure"
++#line 16701 "configure"
+ #include "confdefs.h"
+ #include <stdlib.h>
+ #include <stdarg.h>
+@@ -16679,13 +16706,13 @@
+ #include <float.h>
+ 
+ _ACEOF
+-if { (eval echo "$as_me:16682: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:16709: \"$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:16688: \$? = $ac_status" >&5
++  echo "$as_me:16715: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -16707,7 +16734,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 16710 "configure"
++#line 16737 "configure"
+ #include "confdefs.h"
+ #include <string.h>
+ 
+@@ -16725,7 +16752,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 16728 "configure"
++#line 16755 "configure"
+ #include "confdefs.h"
+ #include <stdlib.h>
+ 
+@@ -16746,7 +16773,7 @@
+   :
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 16749 "configure"
++#line 16776 "configure"
+ #include "confdefs.h"
+ #include <ctype.h>
+ #if ((' ' & 0x0FF) == 0x020)
+@@ -16772,15 +16799,15 @@
+ }
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:16775: \"$ac_link\"") >&5
++if { (eval echo "$as_me:16802: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:16778: \$? = $ac_status" >&5
++  echo "$as_me:16805: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:16780: \"$ac_try\"") >&5
++  { (eval echo "$as_me:16807: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:16783: \$? = $ac_status" >&5
++  echo "$as_me:16810: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   :
+ else
+@@ -16793,7 +16820,7 @@
+ fi
+ fi
+ fi
+-echo "$as_me:16796: result: $ac_cv_header_stdc" >&5
++echo "$as_me:16823: result: $ac_cv_header_stdc" >&5
+ echo "${ECHO_T}$ac_cv_header_stdc" >&6
+ if test $ac_cv_header_stdc = yes; then
+ 
+@@ -16806,13 +16833,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:16809: checking for $ac_hdr that defines DIR" >&5
++echo "$as_me:16836: 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 16815 "configure"
++#line 16842 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ #include <$ac_hdr>
+@@ -16827,16 +16854,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:16830: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:16857: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:16833: \$? = $ac_status" >&5
++  echo "$as_me:16860: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:16836: \"$ac_try\"") >&5
++  { (eval echo "$as_me:16863: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:16839: \$? = $ac_status" >&5
++  echo "$as_me:16866: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   eval "$as_ac_Header=yes"
+ else
+@@ -16846,7 +16873,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:16849: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
++echo "$as_me:16876: 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
+@@ -16859,7 +16886,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:16862: checking for opendir in -ldir" >&5
++  echo "$as_me:16889: 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
+@@ -16867,7 +16894,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-ldir  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 16870 "configure"
++#line 16897 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -16886,16 +16913,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:16889: \"$ac_link\"") >&5
++if { (eval echo "$as_me:16916: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:16892: \$? = $ac_status" >&5
++  echo "$as_me:16919: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:16895: \"$ac_try\"") >&5
++  { (eval echo "$as_me:16922: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:16898: \$? = $ac_status" >&5
++  echo "$as_me:16925: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_dir_opendir=yes
+ else
+@@ -16906,14 +16933,14 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:16909: result: $ac_cv_lib_dir_opendir" >&5
++echo "$as_me:16936: 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:16916: checking for opendir in -lx" >&5
++  echo "$as_me:16943: 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
+@@ -16921,7 +16948,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lx  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 16924 "configure"
++#line 16951 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -16940,16 +16967,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:16943: \"$ac_link\"") >&5
++if { (eval echo "$as_me:16970: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:16946: \$? = $ac_status" >&5
++  echo "$as_me:16973: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:16949: \"$ac_try\"") >&5
++  { (eval echo "$as_me:16976: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:16952: \$? = $ac_status" >&5
++  echo "$as_me:16979: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_x_opendir=yes
+ else
+@@ -16960,7 +16987,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:16963: result: $ac_cv_lib_x_opendir" >&5
++echo "$as_me:16990: 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"
+@@ -16968,13 +16995,13 @@
+ 
+ fi
+ 
+-echo "$as_me:16971: checking whether time.h and sys/time.h may both be included" >&5
++echo "$as_me:16998: 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 16977 "configure"
++#line 17004 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ #include <sys/time.h>
+@@ -16990,16 +17017,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:16993: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:17020: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:16996: \$? = $ac_status" >&5
++  echo "$as_me:17023: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:16999: \"$ac_try\"") >&5
++  { (eval echo "$as_me:17026: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:17002: \$? = $ac_status" >&5
++  echo "$as_me:17029: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_header_time=yes
+ else
+@@ -17009,7 +17036,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:17012: result: $ac_cv_header_time" >&5
++echo "$as_me:17039: result: $ac_cv_header_time" >&5
+ echo "${ECHO_T}$ac_cv_header_time" >&6
+ if test $ac_cv_header_time = yes; then
+ 
+@@ -17027,13 +17054,13 @@
+ ac_compiler_gnu=$ac_cv_c_compiler_gnu
+ ac_main_return="return"
+ 
+-echo "$as_me:17030: checking for an ANSI C-conforming const" >&5
++echo "$as_me:17057: 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 17036 "configure"
++#line 17063 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -17091,16 +17118,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:17094: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:17121: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:17097: \$? = $ac_status" >&5
++  echo "$as_me:17124: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:17100: \"$ac_try\"") >&5
++  { (eval echo "$as_me:17127: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:17103: \$? = $ac_status" >&5
++  echo "$as_me:17130: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_c_const=yes
+ else
+@@ -17110,7 +17137,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:17113: result: $ac_cv_c_const" >&5
++echo "$as_me:17140: result: $ac_cv_c_const" >&5
+ echo "${ECHO_T}$ac_cv_c_const" >&6
+ if test $ac_cv_c_const = no; then
+ 
+@@ -17122,7 +17149,7 @@
+ 
+ ###	Checks for external-data
+ 
+-echo "$as_me:17125: checking if data-only library module links" >&5
++echo "$as_me:17152: 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
+@@ -17130,20 +17157,20 @@
+ 
+ 	rm -f conftest.a
+ 	cat >conftest.$ac_ext <<EOF
+-#line 17133 "configure"
++#line 17160 "configure"
+ int	testdata[3] = { 123, 456, 789 };
+ EOF
+-	if { (eval echo "$as_me:17136: \"$ac_compile\"") >&5
++	if { (eval echo "$as_me:17163: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:17139: \$? = $ac_status" >&5
++  echo "$as_me:17166: \$? = $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 17146 "configure"
++#line 17173 "configure"
+ int	testfunc(void)
+ {
+ #if defined(NeXT)
+@@ -17156,10 +17183,10 @@
+ #endif
+ }
+ EOF
+-	if { (eval echo "$as_me:17159: \"$ac_compile\"") >&5
++	if { (eval echo "$as_me:17186: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:17162: \$? = $ac_status" >&5
++  echo "$as_me:17189: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; then
+ 		mv conftest.o func.o && \
+ 		( $AR $ARFLAGS conftest.a func.o ) 2>&5 1>/dev/null
+@@ -17172,7 +17199,7 @@
+   cf_cv_link_dataonly=unknown
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 17175 "configure"
++#line 17202 "configure"
+ #include "confdefs.h"
+ 
+ 	int main(void)
+@@ -17183,15 +17210,15 @@
+ 
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:17186: \"$ac_link\"") >&5
++if { (eval echo "$as_me:17213: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:17189: \$? = $ac_status" >&5
++  echo "$as_me:17216: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:17191: \"$ac_try\"") >&5
++  { (eval echo "$as_me:17218: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:17194: \$? = $ac_status" >&5
++  echo "$as_me:17221: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_link_dataonly=yes
+ else
+@@ -17206,7 +17233,7 @@
+ 
+ fi
+ 
+-echo "$as_me:17209: result: $cf_cv_link_dataonly" >&5
++echo "$as_me:17236: result: $cf_cv_link_dataonly" >&5
+ echo "${ECHO_T}$cf_cv_link_dataonly" >&6
+ 
+ if test "$cf_cv_link_dataonly" = no ; then
+@@ -17225,23 +17252,23 @@
+ 
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-echo "$as_me:17228: checking for $ac_header" >&5
++echo "$as_me:17255: 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 17234 "configure"
++#line 17261 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:17238: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:17265: \"$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:17244: \$? = $ac_status" >&5
++  echo "$as_me:17271: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -17260,7 +17287,7 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:17263: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
++echo "$as_me:17290: 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
+@@ -17270,7 +17297,7 @@
+ fi
+ done
+ 
+-echo "$as_me:17273: checking for working mkstemp" >&5
++echo "$as_me:17300: 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
+@@ -17281,7 +17308,7 @@
+   cf_cv_func_mkstemp=maybe
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 17284 "configure"
++#line 17311 "configure"
+ #include "confdefs.h"
+ 
+ #include <sys/types.h>
+@@ -17322,15 +17349,15 @@
+ 
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:17325: \"$ac_link\"") >&5
++if { (eval echo "$as_me:17352: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:17328: \$? = $ac_status" >&5
++  echo "$as_me:17355: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:17330: \"$ac_try\"") >&5
++  { (eval echo "$as_me:17357: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:17333: \$? = $ac_status" >&5
++  echo "$as_me:17360: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_func_mkstemp=yes
+ 
+@@ -17345,16 +17372,16 @@
+ fi
+ 
+ fi
+-echo "$as_me:17348: result: $cf_cv_func_mkstemp" >&5
++echo "$as_me:17375: 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:17351: checking for mkstemp" >&5
++	echo "$as_me:17378: 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 17357 "configure"
++#line 17384 "configure"
+ #include "confdefs.h"
+ #define mkstemp autoconf_temporary
+ #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -17385,16 +17412,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:17388: \"$ac_link\"") >&5
++if { (eval echo "$as_me:17415: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:17391: \$? = $ac_status" >&5
++  echo "$as_me:17418: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:17394: \"$ac_try\"") >&5
++  { (eval echo "$as_me:17421: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:17397: \$? = $ac_status" >&5
++  echo "$as_me:17424: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_func_mkstemp=yes
+ else
+@@ -17404,7 +17431,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:17407: result: $ac_cv_func_mkstemp" >&5
++echo "$as_me:17434: result: $ac_cv_func_mkstemp" >&5
+ echo "${ECHO_T}$ac_cv_func_mkstemp" >&6
+ 
+ fi
+@@ -17433,7 +17460,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:17436: checking for $ac_word" >&5
++echo "$as_me:17463: 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
+@@ -17450,7 +17477,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:17453: found $ac_dir/$ac_word" >&5
++   echo "$as_me:17480: found $ac_dir/$ac_word" >&5
+    break
+ fi
+ done
+@@ -17462,10 +17489,10 @@
+ cf_TEMP_gnat=$ac_cv_path_cf_TEMP_gnat
+ 
+ if test -n "$cf_TEMP_gnat"; then
+-  echo "$as_me:17465: result: $cf_TEMP_gnat" >&5
++  echo "$as_me:17492: result: $cf_TEMP_gnat" >&5
+ echo "${ECHO_T}$cf_TEMP_gnat" >&6
+ else
+-  echo "$as_me:17468: result: no" >&5
++  echo "$as_me:17495: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -17475,7 +17502,7 @@
+ 		unset cf_cv_gnat_version
+ 		unset cf_TEMP_gnat
+ 
+-echo "$as_me:17478: checking for $cf_prog_gnat version" >&5
++echo "$as_me:17505: 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
+@@ -17486,7 +17513,7 @@
+ 	sed -e '2,$d' -e 's/[^0-9 \.]//g' -e 's/^[ ]*//' -e 's/ .*//'`
+ 
+ fi
+-echo "$as_me:17489: result: $cf_cv_gnat_version" >&5
++echo "$as_me:17516: 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
+@@ -17515,7 +17542,7 @@
+ 			cd conftest.src
+ 			for cf_gprconfig in Ada C
+ 			do
+-				echo "$as_me:17518: checking for gprconfig name for $cf_gprconfig" >&5
++				echo "$as_me:17545: 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
+@@ -17534,10 +17561,10 @@
+ 				if test -n "$cf_gprconfig_value"
+ 				then
+ 					eval "cf_ada_config_$cf_gprconfig=$cf_gprconfig_value"
+-					echo "$as_me:17537: result: $cf_gprconfig_value" >&5
++					echo "$as_me:17564: result: $cf_gprconfig_value" >&5
+ echo "${ECHO_T}$cf_gprconfig_value" >&6
+ 				else
+-					echo "$as_me:17540: result: missing" >&5
++					echo "$as_me:17567: result: missing" >&5
+ echo "${ECHO_T}missing" >&6
+ 					cf_ada_config="#"
+ 					break
+@@ -17550,7 +17577,7 @@
+ 	if test "x$cf_ada_config" != "x#"
+ 	then
+ 
+-echo "$as_me:17553: checking for gnat version" >&5
++echo "$as_me:17580: 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
+@@ -17561,7 +17588,7 @@
+ 	sed -e '2,$d' -e 's/[^0-9 \.]//g' -e 's/^[ ]*//' -e 's/ .*//'`
+ 
+ fi
+-echo "$as_me:17564: result: $cf_cv_gnat_version" >&5
++echo "$as_me:17591: 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
+ 
+@@ -17570,7 +17597,7 @@
+ 	cf_cv_prog_gnat_correct=yes
+ 	;;
+ (*)
+-	{ echo "$as_me:17573: WARNING: Unsupported GNAT version $cf_cv_gnat_version. We require 3.11 or better. Disabling Ada95 binding." >&5
++	{ echo "$as_me:17600: 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
+ 	;;
+@@ -17578,7 +17605,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:17581: checking for $ac_word" >&5
++echo "$as_me:17608: 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
+@@ -17593,7 +17620,7 @@
+   test -z "$ac_dir" && ac_dir=.
+   $as_executable_p "$ac_dir/$ac_word" || continue
+ ac_cv_prog_M4_exists="yes"
+-echo "$as_me:17596: found $ac_dir/$ac_word" >&5
++echo "$as_me:17623: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -17602,20 +17629,20 @@
+ fi
+ M4_exists=$ac_cv_prog_M4_exists
+ if test -n "$M4_exists"; then
+-  echo "$as_me:17605: result: $M4_exists" >&5
++  echo "$as_me:17632: result: $M4_exists" >&5
+ echo "${ECHO_T}$M4_exists" >&6
+ else
+-  echo "$as_me:17608: result: no" >&5
++  echo "$as_me:17635: 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:17614: WARNING: Ada95 binding required program m4 not found. Ada95 binding disabled" >&5
++			{ echo "$as_me:17641: 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:17618: checking if GNAT works" >&5
++			echo "$as_me:17645: checking if GNAT works" >&5
+ echo $ECHO_N "checking if GNAT works... $ECHO_C" >&6
+ 
+ rm -rf ./conftest* ./*~conftest*
+@@ -17643,7 +17670,7 @@
+ fi
+ rm -rf ./conftest* ./*~conftest*
+ 
+-			echo "$as_me:17646: result: $cf_cv_prog_gnat_correct" >&5
++			echo "$as_me:17673: result: $cf_cv_prog_gnat_correct" >&5
+ echo "${ECHO_T}$cf_cv_prog_gnat_correct" >&6
+ 		fi
+ 	else
+@@ -17653,7 +17680,7 @@
+ 
+ 	if test	"$cf_cv_prog_gnat_correct" = yes; then
+ 
+-	echo "$as_me:17656: checking optimization options for ADAFLAGS" >&5
++	echo "$as_me:17683: checking optimization options for ADAFLAGS" >&5
+ echo $ECHO_N "checking optimization options for ADAFLAGS... $ECHO_C" >&6
+ 	case "$CFLAGS" in
+ 	(*-g*)
+@@ -17670,10 +17697,10 @@
+ 
+ 		;;
+ 	esac
+-	echo "$as_me:17673: result: $ADAFLAGS" >&5
++	echo "$as_me:17700: result: $ADAFLAGS" >&5
+ echo "${ECHO_T}$ADAFLAGS" >&6
+ 
+-echo "$as_me:17676: checking if GNATPREP supports -T option" >&5
++echo "$as_me:17703: 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
+@@ -17683,11 +17710,11 @@
+ gnatprep -T 2>/dev/null >/dev/null && cf_cv_gnatprep_opt_t=yes
+ 
+ fi
+-echo "$as_me:17686: result: $cf_cv_gnatprep_opt_t" >&5
++echo "$as_me:17713: 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:17690: checking if GNAT supports generics" >&5
++echo "$as_me:17717: 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])
+@@ -17697,7 +17724,7 @@
+ 	cf_gnat_generics=no
+ 	;;
+ esac
+-echo "$as_me:17700: result: $cf_gnat_generics" >&5
++echo "$as_me:17727: result: $cf_gnat_generics" >&5
+ echo "${ECHO_T}$cf_gnat_generics" >&6
+ 
+ if test "$cf_gnat_generics" = yes
+@@ -17709,7 +17736,7 @@
+ 	cf_generic_objects=
+ fi
+ 
+-echo "$as_me:17712: checking if GNAT supports SIGINT" >&5
++echo "$as_me:17739: 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
+@@ -17757,7 +17784,7 @@
+ rm -rf ./conftest* ./*~conftest*
+ 
+ fi
+-echo "$as_me:17760: result: $cf_cv_gnat_sigint" >&5
++echo "$as_me:17787: result: $cf_cv_gnat_sigint" >&5
+ echo "${ECHO_T}$cf_cv_gnat_sigint" >&6
+ 
+ if test "$cf_cv_gnat_sigint" = yes ; then
+@@ -17770,7 +17797,7 @@
+ cf_gnat_projects=no
+ 
+ if test "$enable_gnat_projects" != no ; then
+-echo "$as_me:17773: checking if GNAT supports project files" >&5
++echo "$as_me:17800: 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]*)
+@@ -17833,15 +17860,15 @@
+ 	esac
+ 	;;
+ esac
+-echo "$as_me:17836: result: $cf_gnat_projects" >&5
++echo "$as_me:17863: 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:17842: checking if GNAT supports libraries" >&5
++	echo "$as_me:17869: checking if GNAT supports libraries" >&5
+ echo $ECHO_N "checking if GNAT supports libraries... $ECHO_C" >&6
+-	echo "$as_me:17844: result: $cf_gnat_libraries" >&5
++	echo "$as_me:17871: result: $cf_gnat_libraries" >&5
+ echo "${ECHO_T}$cf_gnat_libraries" >&6
+ fi
+ 
+@@ -17861,7 +17888,7 @@
+ 	then
+ 		USE_GNAT_MAKE_GPR=""
+ 	else
+-		{ echo "$as_me:17864: WARNING: use old makefile rules since tools are missing" >&5
++		{ echo "$as_me:17891: 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
+@@ -17873,7 +17900,7 @@
+ 	USE_GNAT_LIBRARIES="#"
+ fi
+ 
+-echo "$as_me:17876: checking for ada-compiler" >&5
++echo "$as_me:17903: checking for ada-compiler" >&5
+ echo $ECHO_N "checking for ada-compiler... $ECHO_C" >&6
+ 
+ # Check whether --with-ada-compiler or --without-ada-compiler was given.
+@@ -17884,12 +17911,12 @@
+   cf_ada_compiler=gnatmake
+ fi;
+ 
+-echo "$as_me:17887: result: $cf_ada_compiler" >&5
++echo "$as_me:17914: result: $cf_ada_compiler" >&5
+ echo "${ECHO_T}$cf_ada_compiler" >&6
+ 
+ 		cf_ada_package=terminal_interface
+ 
+-echo "$as_me:17892: checking for ada-include" >&5
++echo "$as_me:17919: checking for ada-include" >&5
+ echo $ECHO_N "checking for ada-include... $ECHO_C" >&6
+ 
+ # Check whether --with-ada-include or --without-ada-include was given.
+@@ -17925,7 +17952,7 @@
+ 	withval=`echo "$withval" | sed -e s%NONE%$cf_path_syntax%`
+ 	;;
+ (*)
+-	{ { echo "$as_me:17928: error: expected a pathname, not \"$withval\"" >&5
++	{ { echo "$as_me:17955: error: expected a pathname, not \"$withval\"" >&5
+ echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
+    { (exit 1); exit 1; }; }
+ 	;;
+@@ -17934,10 +17961,10 @@
+ fi
+ eval ADA_INCLUDE="$withval"
+ 
+-echo "$as_me:17937: result: $ADA_INCLUDE" >&5
++echo "$as_me:17964: result: $ADA_INCLUDE" >&5
+ echo "${ECHO_T}$ADA_INCLUDE" >&6
+ 
+-echo "$as_me:17940: checking for ada-objects" >&5
++echo "$as_me:17967: checking for ada-objects" >&5
+ echo $ECHO_N "checking for ada-objects... $ECHO_C" >&6
+ 
+ # Check whether --with-ada-objects or --without-ada-objects was given.
+@@ -17973,7 +18000,7 @@
+ 	withval=`echo "$withval" | sed -e s%NONE%$cf_path_syntax%`
+ 	;;
+ (*)
+-	{ { echo "$as_me:17976: error: expected a pathname, not \"$withval\"" >&5
++	{ { echo "$as_me:18003: error: expected a pathname, not \"$withval\"" >&5
+ echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
+    { (exit 1); exit 1; }; }
+ 	;;
+@@ -17982,10 +18009,10 @@
+ fi
+ eval ADA_OBJECTS="$withval"
+ 
+-echo "$as_me:17985: result: $ADA_OBJECTS" >&5
++echo "$as_me:18012: result: $ADA_OBJECTS" >&5
+ echo "${ECHO_T}$ADA_OBJECTS" >&6
+ 
+-echo "$as_me:17988: checking if an Ada95 shared-library should be built" >&5
++echo "$as_me:18015: checking if an Ada95 shared-library should be built" >&5
+ echo $ECHO_N "checking if an Ada95 shared-library should be built... $ECHO_C" >&6
+ 
+ # Check whether --with-ada-sharedlib or --without-ada-sharedlib was given.
+@@ -17995,14 +18022,14 @@
+ else
+   with_ada_sharedlib=no
+ fi;
+-echo "$as_me:17998: result: $with_ada_sharedlib" >&5
++echo "$as_me:18025: result: $with_ada_sharedlib" >&5
+ echo "${ECHO_T}$with_ada_sharedlib" >&6
+ 
+ if test "x$with_ada_sharedlib" != xno
+ then
+ 	if test "x$cf_gnat_projects" != xyes
+ 	then
+-		{ echo "$as_me:18005: WARNING: disabling shared-library since GNAT projects are not supported" >&5
++		{ echo "$as_me:18032: WARNING: disabling shared-library since GNAT projects are not supported" >&5
+ echo "$as_me: WARNING: disabling shared-library since GNAT projects are not supported" >&2;}
+ 		with_ada_sharedlib=no
+ 	fi
+@@ -18022,7 +18049,7 @@
+ 
+ 		# allow the Ada binding to be renamed
+ 
+-echo "$as_me:18025: checking for ada-libname" >&5
++echo "$as_me:18052: checking for ada-libname" >&5
+ echo $ECHO_N "checking for ada-libname... $ECHO_C" >&6
+ 
+ # Check whether --with-ada-libname or --without-ada-libname was given.
+@@ -18038,16 +18065,16 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:18041: result: $ADA_LIBNAME" >&5
++echo "$as_me:18068: result: $ADA_LIBNAME" >&5
+ echo "${ECHO_T}$ADA_LIBNAME" >&6
+ 
+ 	else
+-		{ { echo "$as_me:18045: error: No usable Ada compiler found" >&5
++		{ { echo "$as_me:18072: 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:18050: error: The Ada compiler is needed for this package" >&5
++	{ { echo "$as_me:18077: 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
+@@ -18087,7 +18114,7 @@
+ fi
+ 
+ ### Build up pieces for makefile rules
+-echo "$as_me:18090: checking default library suffix" >&5
++echo "$as_me:18117: checking default library suffix" >&5
+ echo $ECHO_N "checking default library suffix... $ECHO_C" >&6
+ 
+ 	case $DFT_LWR_MODEL in
+@@ -18098,10 +18125,10 @@
+ 	(shared)  DFT_ARG_SUFFIX=''   ;;
+ 	esac
+ 	test -n "$LIB_SUFFIX" && DFT_ARG_SUFFIX="${LIB_SUFFIX}${DFT_ARG_SUFFIX}"
+-echo "$as_me:18101: result: $DFT_ARG_SUFFIX" >&5
++echo "$as_me:18128: result: $DFT_ARG_SUFFIX" >&5
+ echo "${ECHO_T}$DFT_ARG_SUFFIX" >&6
+ 
+-echo "$as_me:18104: checking default library-dependency suffix" >&5
++echo "$as_me:18131: checking default library-dependency suffix" >&5
+ echo $ECHO_N "checking default library-dependency suffix... $ECHO_C" >&6
+ 
+ 	case X$DFT_LWR_MODEL in
+@@ -18184,10 +18211,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:18187: result: $DFT_DEP_SUFFIX" >&5
++echo "$as_me:18214: result: $DFT_DEP_SUFFIX" >&5
+ echo "${ECHO_T}$DFT_DEP_SUFFIX" >&6
+ 
+-echo "$as_me:18190: checking default object directory" >&5
++echo "$as_me:18217: checking default object directory" >&5
+ echo $ECHO_N "checking default object directory... $ECHO_C" >&6
+ 
+ 	case $DFT_LWR_MODEL in
+@@ -18203,7 +18230,7 @@
+ 			DFT_OBJ_SUBDIR='obj_s' ;;
+ 		esac
+ 	esac
+-echo "$as_me:18206: result: $DFT_OBJ_SUBDIR" >&5
++echo "$as_me:18233: result: $DFT_OBJ_SUBDIR" >&5
+ echo "${ECHO_T}$DFT_OBJ_SUBDIR" >&6
+ 
+ ### Set up low-level terminfo dependencies for makefiles.
+@@ -18345,7 +18372,7 @@
+ : "${CONFIG_STATUS=./config.status}"
+ ac_clean_files_save=$ac_clean_files
+ ac_clean_files="$ac_clean_files $CONFIG_STATUS"
+-{ echo "$as_me:18348: creating $CONFIG_STATUS" >&5
++{ echo "$as_me:18375: creating $CONFIG_STATUS" >&5
+ echo "$as_me: creating $CONFIG_STATUS" >&6;}
+ cat >"$CONFIG_STATUS" <<_ACEOF
+ #! $SHELL
+@@ -18524,7 +18551,7 @@
+     echo "$ac_cs_version"; exit 0 ;;
+   --he | --h)
+     # Conflict between --help and --header
+-    { { echo "$as_me:18527: error: ambiguous option: $1
++    { { echo "$as_me:18554: 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;}
+@@ -18543,7 +18570,7 @@
+     ac_need_defaults=false;;
+ 
+   # This is an error.
+-  -*) { { echo "$as_me:18546: error: unrecognized option: $1
++  -*) { { echo "$as_me:18573: 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;}
+@@ -18617,7 +18644,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:18620: error: invalid argument: $ac_config_target" >&5
++  *) { { echo "$as_me:18647: error: invalid argument: $ac_config_target" >&5
+ echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
+    { (exit 1); exit 1; }; };;
+   esac
+@@ -18977,7 +19004,7 @@
+   esac
+ 
+   if test x"$ac_file" != x-; then
+-    { echo "$as_me:18980: creating $ac_file" >&5
++    { echo "$as_me:19007: creating $ac_file" >&5
+ echo "$as_me: creating $ac_file" >&6;}
+     rm -f "$ac_file"
+   fi
+@@ -18995,7 +19022,7 @@
+       -) echo $tmp/stdin ;;
+       [\\/$]*)
+          # Absolute (can't be DOS-style, as IFS=:)
+-         test -f "$f" || { { echo "$as_me:18998: error: cannot find input file: $f" >&5
++         test -f "$f" || { { echo "$as_me:19025: error: cannot find input file: $f" >&5
+ echo "$as_me: error: cannot find input file: $f" >&2;}
+    { (exit 1); exit 1; }; }
+          echo $f;;
+@@ -19008,7 +19035,7 @@
+            echo "$srcdir/$f"
+          else
+            # /dev/null tree
+-           { { echo "$as_me:19011: error: cannot find input file: $f" >&5
++           { { echo "$as_me:19038: error: cannot find input file: $f" >&5
+ echo "$as_me: error: cannot find input file: $f" >&2;}
+    { (exit 1); exit 1; }; }
+          fi;;
+@@ -19024,7 +19051,7 @@
+       if test -n "$ac_seen"; then
+         ac_used=`grep '@datarootdir@' "$ac_item"`
+         if test -z "$ac_used"; then
+-          { echo "$as_me:19027: WARNING: datarootdir was used implicitly but not set:
++          { echo "$as_me:19054: 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;}
+@@ -19033,7 +19060,7 @@
+       fi
+       ac_seen=`grep '${datarootdir}' "$ac_item"`
+       if test -n "$ac_seen"; then
+-        { echo "$as_me:19036: WARNING: datarootdir was used explicitly but not set:
++        { echo "$as_me:19063: 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;}
+@@ -19070,7 +19097,7 @@
+             ac_init=`${EGREP-egrep} '[ 	]*'$ac_name'[ 	]*=' "$ac_file"`
+             if test -z "$ac_init"; then
+               ac_seen=`echo "$ac_seen" |sed -e 's,^,'$ac_file':,'`
+-              { echo "$as_me:19073: WARNING: Variable $ac_name is used but was not set:
++              { echo "$as_me:19100: 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;}
+@@ -19081,7 +19108,7 @@
+     ${EGREP-egrep} -n '@[A-Z_][A-Z_0-9]+@' "$ac_file" >>$tmp/out
+     if test -s $tmp/out; then
+       ac_seen=`sed -e 's,^,'$ac_file':,' < $tmp/out`
+-      { echo "$as_me:19084: WARNING: Some variables may not be substituted:
++      { echo "$as_me:19111: WARNING: Some variables may not be substituted:
+ $ac_seen" >&5
+ echo "$as_me: WARNING: Some variables may not be substituted:
+ $ac_seen" >&2;}
+@@ -19130,7 +19157,7 @@
+   * )   ac_file_in=$ac_file.in ;;
+   esac
+ 
+-  test x"$ac_file" != x- && { echo "$as_me:19133: creating $ac_file" >&5
++  test x"$ac_file" != x- && { echo "$as_me:19160: creating $ac_file" >&5
+ echo "$as_me: creating $ac_file" >&6;}
+ 
+   # First look for the input files in the build tree, otherwise in the
+@@ -19141,7 +19168,7 @@
+       -) echo $tmp/stdin ;;
+       [\\/$]*)
+          # Absolute (can't be DOS-style, as IFS=:)
+-         test -f "$f" || { { echo "$as_me:19144: error: cannot find input file: $f" >&5
++         test -f "$f" || { { echo "$as_me:19171: error: cannot find input file: $f" >&5
+ echo "$as_me: error: cannot find input file: $f" >&2;}
+    { (exit 1); exit 1; }; }
+          echo $f;;
+@@ -19154,7 +19181,7 @@
+            echo "$srcdir/$f"
+          else
+            # /dev/null tree
+-           { { echo "$as_me:19157: error: cannot find input file: $f" >&5
++           { { echo "$as_me:19184: error: cannot find input file: $f" >&5
+ echo "$as_me: error: cannot find input file: $f" >&2;}
+    { (exit 1); exit 1; }; }
+          fi;;
+@@ -19212,7 +19239,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:19215: $ac_file is unchanged" >&5
++      { echo "$as_me:19242: $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.3768 
+--- ncurses-6.3-20220115+/NEWS	2022-01-16 01:26:12.000000000 +0000
++++ ncurses-6.3-20220122/NEWS	2022-01-23 00:20:39.000000000 +0000
+@@ -26,7 +26,7 @@
+ -- sale, use or other dealings in this Software without prior written        --
+ -- authorization.                                                            --
+ -------------------------------------------------------------------------------
+--- $Id: NEWS,v 1.3768 2022/01/16 01:26:12 tom Exp $
++-- $Id: NEWS,v 1.3771 2022/01/23 00:20:39 tom Exp $
+ -------------------------------------------------------------------------------
+ 
+ This is a log of changes that ncurses has gone through since Zeyd started
+@@ -46,6 +46,15 @@
+ Changes through 1.9.9e did not credit all contributions;
+ it is not possible to add this information.
+ 
++20220122
++	+ add ABI 7 defaults to configure script.
++	+ add warning in configure script if file specified for "--with-caps"
++	  does not exist.
++	+ use fix for CF_FIX_WARNINGS from cdk-perl, ignoring error-exit on
++	  format-warnings.
++	+ improve readability of long parameterized expressions with the
++	  infocmp "-f" option by allowing split before a "%p" marker.
++
+ 20220115
+ 	+ improve checks for valid mouse events when an intermediate mouse
+ 	  state is not part of the mousemask specified by the caller (report by
+Index: VERSION
+--- ncurses-6.3-20220115+/VERSION	2022-01-15 14:00:23.000000000 +0000
++++ ncurses-6.3-20220122/VERSION	2022-01-22 15:48:54.000000000 +0000
+@@ -1 +1 @@
+-5:0:10	6.3	20220115
++5:0:10	6.3	20220122
+Index: aclocal.m4
+Prereq:  1.999 
+--- ncurses-6.3-20220115+/aclocal.m4	2021-12-04 23:30:56.000000000 +0000
++++ ncurses-6.3-20220122/aclocal.m4	2022-01-23 00:15:35.000000000 +0000
+@@ -1,5 +1,5 @@
+ dnl***************************************************************************
+-dnl Copyright 2018-2020,2021 Thomas E. Dickey                                *
++dnl Copyright 2018-2021,2022 Thomas E. Dickey                                *
+ dnl Copyright 1998-2017,2018 Free Software Foundation, Inc.                  *
+ dnl                                                                          *
+ dnl Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -29,7 +29,7 @@
+ dnl
+ dnl Author: Thomas E. Dickey 1995-on
+ dnl
+-dnl $Id: aclocal.m4,v 1.999 2021/12/04 23:30:56 tom Exp $
++dnl $Id: aclocal.m4,v 1.1001 2022/01/23 00:15:35 tom Exp $
+ dnl Macros used in NCURSES auto-configuration script.
+ dnl
+ dnl These macros are maintained separately from NCURSES.  The copyright on
+@@ -65,37 +65,55 @@
+ 	fi
+ ])dnl
+ dnl ---------------------------------------------------------------------------
+-dnl CF_ABI_DEFAULTS version: 2 updated: 2015/06/06 13:49:58
++dnl CF_ABI_DEFAULTS version: 3 updated: 2022/01/22 19:13:38
+ dnl ---------------
+ dnl Provide configure-script defaults for different ncurses ABIs.
+ AC_DEFUN([CF_ABI_DEFAULTS],[
+ AC_REQUIRE([CF_NCURSES_WITH_ABI_VERSION])
++
++# ABI 5 defaults:
++cf_dft_ccharw_max=5
++cf_dft_chtype=auto
++cf_dft_ext_colors=no
++cf_dft_ext_const=no
++cf_dft_ext_mouse=no
++cf_dft_ext_putwin=no
++cf_dft_ext_spfuncs=no
++cf_dft_filter_syms=no
++cf_dft_interop=no
++cf_dft_mmask_t=auto
++cf_dft_opaque_curses=no
++cf_dft_ordinate_type=short
++cf_dft_signed_char=no
++cf_dft_tparm_arg=long
++cf_dft_with_lp64=no
++
++# ABI 6 defaults:
+ case x$cf_cv_abi_version in
+ (x[[6789]])
++	cf_dft_chtype=uint32_t
+ 	cf_dft_ext_colors=yes
+ 	cf_dft_ext_const=yes
+ 	cf_dft_ext_mouse=yes
+ 	cf_dft_ext_putwin=yes
+ 	cf_dft_ext_spfuncs=yes
+ 	cf_dft_filter_syms=yes
+-	cf_dft_chtype=uint32_t
+-	cf_dft_mmask_t=uint32_t
+ 	cf_dft_interop=yes
++	cf_dft_mmask_t=uint32_t
+ 	cf_dft_tparm_arg=intptr_t
+ 	cf_dft_with_lp64=yes
+ 	;;
+-(*)
+-	cf_dft_ext_colors=no
+-	cf_dft_ext_const=no
+-	cf_dft_ext_mouse=no
+-	cf_dft_ext_putwin=no
+-	cf_dft_ext_spfuncs=no
+-	cf_dft_filter_syms=no
+-	cf_dft_chtype=auto
+-	cf_dft_mmask_t=auto
+-	cf_dft_interop=no
+-	cf_dft_tparm_arg=long
+-	cf_dft_with_lp64=no
++esac
++
++# ABI 7 defaults:
++case x$cf_cv_abi_version in
++(x[[789]])
++	cf_dft_ccharw_max=6
++	cf_dft_mmask_t=uint64_t
++	cf_dft_opaque_curses=yes
++	cf_dft_ordinate_type=int
++	cf_dft_signed_char=yes
++	# also: remove the wgetch-events feature in ABI 7
+ 	;;
+ esac
+ ])dnl
+@@ -2423,7 +2441,7 @@
+ 	AC_MSG_RESULT($ADAFLAGS)
+ ])dnl
+ dnl ---------------------------------------------------------------------------
+-dnl CF_FIX_WARNINGS version: 3 updated: 2020/12/31 18:40:20
++dnl CF_FIX_WARNINGS version: 4 updated: 2021/12/16 18:22:31
+ dnl ---------------
+ dnl Warning flags do not belong in CFLAGS, CPPFLAGS, etc.  Any of gcc's
+ dnl "-Werror" flags can interfere with configure-checks.  Those go into
+@@ -2435,11 +2453,13 @@
+ then
+ 	case [$]$1 in
+ 	(*-Werror=*)
+-		CF_VERBOSE(repairing $1: [$]$1)
+ 		cf_temp_flags=
+ 		for cf_temp_scan in [$]$1
+ 		do
+ 			case "x$cf_temp_scan" in
++			(x-Werror=format*)
++				CF_APPEND_TEXT(cf_temp_flags,$cf_temp_scan)
++				;;
+ 			(x-Werror=*)
+ 				CF_APPEND_TEXT(EXTRA_CFLAGS,$cf_temp_scan)
+ 				;;
+@@ -2448,9 +2468,13 @@
+ 				;;
+ 			esac
+ 		done
+-		$1="$cf_temp_flags"
+-		CF_VERBOSE(... fixed [$]$1)
+-		CF_VERBOSE(... extra $EXTRA_CFLAGS)
++		if test "x[$]$1" != "x$cf_temp_flags"
++		then
++			CF_VERBOSE(repairing $1: [$]$1)
++			$1="$cf_temp_flags"
++			CF_VERBOSE(... fixed [$]$1)
++			CF_VERBOSE(... extra $EXTRA_CFLAGS)
++		fi
+ 		;;
+ 	esac
+ fi
+Index: configure
+--- ncurses-6.3-20220115+/configure	2021-12-04 23:19:34.000000000 +0000
++++ ncurses-6.3-20220122/configure	2022-01-23 00:15:55.000000000 +0000
+@@ -1,5 +1,5 @@
+ #! /bin/sh
+-# From configure.in Revision: 1.737 .
++# From configure.in Revision: 1.741 .
+ # Guess values for system-dependent variables and create Makefiles.
+ # Generated by Autoconf 2.52.20210509.
+ #
+@@ -1720,32 +1720,49 @@
+ 
+ ### Defaults for ncurses ABI
+ 
++# ABI 5 defaults:
++cf_dft_ccharw_max=5
++cf_dft_chtype=auto
++cf_dft_ext_colors=no
++cf_dft_ext_const=no
++cf_dft_ext_mouse=no
++cf_dft_ext_putwin=no
++cf_dft_ext_spfuncs=no
++cf_dft_filter_syms=no
++cf_dft_interop=no
++cf_dft_mmask_t=auto
++cf_dft_opaque_curses=no
++cf_dft_ordinate_type=short
++cf_dft_signed_char=no
++cf_dft_tparm_arg=long
++cf_dft_with_lp64=no
++
++# ABI 6 defaults:
+ case x$cf_cv_abi_version in
+ (x[6789])
++	cf_dft_chtype=uint32_t
+ 	cf_dft_ext_colors=yes
+ 	cf_dft_ext_const=yes
+ 	cf_dft_ext_mouse=yes
+ 	cf_dft_ext_putwin=yes
+ 	cf_dft_ext_spfuncs=yes
+ 	cf_dft_filter_syms=yes
+-	cf_dft_chtype=uint32_t
+-	cf_dft_mmask_t=uint32_t
+ 	cf_dft_interop=yes
++	cf_dft_mmask_t=uint32_t
+ 	cf_dft_tparm_arg=intptr_t
+ 	cf_dft_with_lp64=yes
+ 	;;
+-(*)
+-	cf_dft_ext_colors=no
+-	cf_dft_ext_const=no
+-	cf_dft_ext_mouse=no
+-	cf_dft_ext_putwin=no
+-	cf_dft_ext_spfuncs=no
+-	cf_dft_filter_syms=no
+-	cf_dft_chtype=auto
+-	cf_dft_mmask_t=auto
+-	cf_dft_interop=no
+-	cf_dft_tparm_arg=long
+-	cf_dft_with_lp64=no
++esac
++
++# ABI 7 defaults:
++case x$cf_cv_abi_version in
++(x[789])
++	cf_dft_ccharw_max=6
++	cf_dft_mmask_t=uint64_t
++	cf_dft_opaque_curses=yes
++	cf_dft_ordinate_type=int
++	cf_dft_signed_char=yes
++	# also: remove the wgetch-events feature in ABI 7
+ 	;;
+ esac
+ 
+@@ -1777,7 +1794,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:1780: checking for $ac_word" >&5
++echo "$as_me:1797: 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
+@@ -1792,7 +1809,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:1795: found $ac_dir/$ac_word" >&5
++echo "$as_me:1812: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -1800,10 +1817,10 @@
+ fi
+ CC=$ac_cv_prog_CC
+ if test -n "$CC"; then
+-  echo "$as_me:1803: result: $CC" >&5
++  echo "$as_me:1820: result: $CC" >&5
+ echo "${ECHO_T}$CC" >&6
+ else
+-  echo "$as_me:1806: result: no" >&5
++  echo "$as_me:1823: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -1816,7 +1833,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:1819: checking for $ac_word" >&5
++echo "$as_me:1836: checking for $ac_word" >&5
+ echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+ if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -1831,7 +1848,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:1834: found $ac_dir/$ac_word" >&5
++echo "$as_me:1851: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -1839,10 +1856,10 @@
+ fi
+ ac_ct_CC=$ac_cv_prog_ac_ct_CC
+ if test -n "$ac_ct_CC"; then
+-  echo "$as_me:1842: result: $ac_ct_CC" >&5
++  echo "$as_me:1859: result: $ac_ct_CC" >&5
+ echo "${ECHO_T}$ac_ct_CC" >&6
+ else
+-  echo "$as_me:1845: result: no" >&5
++  echo "$as_me:1862: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -1852,32 +1869,32 @@
+   CC=$ac_ct_CC
+ fi
+ 
+-test -z "$CC" && { { echo "$as_me:1855: error: no acceptable cc found in \$PATH" >&5
++test -z "$CC" && { { echo "$as_me:1872: 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:1860:" \
++echo "$as_me:1877:" \
+      "checking for C compiler version" >&5
+ ac_compiler=`set X $ac_compile; echo "$2"`
+-{ (eval echo "$as_me:1863: \"$ac_compiler --version </dev/null >&5\"") >&5
++{ (eval echo "$as_me:1880: \"$ac_compiler --version </dev/null >&5\"") >&5
+   (eval $ac_compiler --version </dev/null >&5) 2>&5
+   ac_status=$?
+-  echo "$as_me:1866: \$? = $ac_status" >&5
++  echo "$as_me:1883: \$? = $ac_status" >&5
+   (exit "$ac_status"); }
+-{ (eval echo "$as_me:1868: \"$ac_compiler -v </dev/null >&5\"") >&5
++{ (eval echo "$as_me:1885: \"$ac_compiler -v </dev/null >&5\"") >&5
+   (eval $ac_compiler -v </dev/null >&5) 2>&5
+   ac_status=$?
+-  echo "$as_me:1871: \$? = $ac_status" >&5
++  echo "$as_me:1888: \$? = $ac_status" >&5
+   (exit "$ac_status"); }
+-{ (eval echo "$as_me:1873: \"$ac_compiler -V </dev/null >&5\"") >&5
++{ (eval echo "$as_me:1890: \"$ac_compiler -V </dev/null >&5\"") >&5
+   (eval $ac_compiler -V </dev/null >&5) 2>&5
+   ac_status=$?
+-  echo "$as_me:1876: \$? = $ac_status" >&5
++  echo "$as_me:1893: \$? = $ac_status" >&5
+   (exit "$ac_status"); }
+ 
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 1880 "configure"
++#line 1897 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -1893,13 +1910,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:1896: checking for C compiler default output" >&5
++echo "$as_me:1913: 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:1899: \"$ac_link_default\"") >&5
++if { (eval echo "$as_me:1916: \"$ac_link_default\"") >&5
+   (eval $ac_link_default) 2>&5
+   ac_status=$?
+-  echo "$as_me:1902: \$? = $ac_status" >&5
++  echo "$as_me:1919: \$? = $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
+@@ -1922,34 +1939,34 @@
+ else
+   echo "$as_me: failed program was:" >&5
+ cat "conftest.$ac_ext" >&5
+-{ { echo "$as_me:1925: error: C compiler cannot create executables" >&5
++{ { echo "$as_me:1942: 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:1931: result: $ac_file" >&5
++echo "$as_me:1948: 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:1936: checking whether the C compiler works" >&5
++echo "$as_me:1953: 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:1942: \"$ac_try\"") >&5
++  { (eval echo "$as_me:1959: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:1945: \$? = $ac_status" >&5
++  echo "$as_me:1962: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+     cross_compiling=no
+   else
+     if test "$cross_compiling" = maybe; then
+ 	cross_compiling=yes
+     else
+-	{ { echo "$as_me:1952: error: cannot run C compiled programs.
++	{ { echo "$as_me:1969: 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;}
+@@ -1957,24 +1974,24 @@
+     fi
+   fi
+ fi
+-echo "$as_me:1960: result: yes" >&5
++echo "$as_me:1977: 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:1967: checking whether we are cross compiling" >&5
++echo "$as_me:1984: checking whether we are cross compiling" >&5
+ echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6
+-echo "$as_me:1969: result: $cross_compiling" >&5
++echo "$as_me:1986: result: $cross_compiling" >&5
+ echo "${ECHO_T}$cross_compiling" >&6
+ 
+-echo "$as_me:1972: checking for executable suffix" >&5
++echo "$as_me:1989: checking for executable suffix" >&5
+ echo $ECHO_N "checking for executable suffix... $ECHO_C" >&6
+-if { (eval echo "$as_me:1974: \"$ac_link\"") >&5
++if { (eval echo "$as_me:1991: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:1977: \$? = $ac_status" >&5
++  echo "$as_me:1994: \$? = $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
+@@ -1990,25 +2007,25 @@
+   esac
+ done
+ else
+-  { { echo "$as_me:1993: error: cannot compute EXEEXT: cannot compile and link" >&5
++  { { echo "$as_me:2010: 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:1999: result: $ac_cv_exeext" >&5
++echo "$as_me:2016: 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:2005: checking for object suffix" >&5
++echo "$as_me:2022: 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 2011 "configure"
++#line 2028 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -2020,10 +2037,10 @@
+ }
+ _ACEOF
+ rm -f conftest.o conftest.obj
+-if { (eval echo "$as_me:2023: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:2040: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:2026: \$? = $ac_status" >&5
++  echo "$as_me:2043: \$? = $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
+@@ -2035,24 +2052,24 @@
+ else
+   echo "$as_me: failed program was:" >&5
+ cat "conftest.$ac_ext" >&5
+-{ { echo "$as_me:2038: error: cannot compute OBJEXT: cannot compile" >&5
++{ { echo "$as_me:2055: 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:2045: result: $ac_cv_objext" >&5
++echo "$as_me:2062: result: $ac_cv_objext" >&5
+ echo "${ECHO_T}$ac_cv_objext" >&6
+ OBJEXT=$ac_cv_objext
+ ac_objext=$OBJEXT
+-echo "$as_me:2049: checking whether we are using the GNU C compiler" >&5
++echo "$as_me:2066: 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 2055 "configure"
++#line 2072 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -2067,16 +2084,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:2070: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:2087: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:2073: \$? = $ac_status" >&5
++  echo "$as_me:2090: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:2076: \"$ac_try\"") >&5
++  { (eval echo "$as_me:2093: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:2079: \$? = $ac_status" >&5
++  echo "$as_me:2096: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_compiler_gnu=yes
+ else
+@@ -2088,19 +2105,19 @@
+ ac_cv_c_compiler_gnu=$ac_compiler_gnu
+ 
+ fi
+-echo "$as_me:2091: result: $ac_cv_c_compiler_gnu" >&5
++echo "$as_me:2108: 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:2097: checking whether $CC accepts -g" >&5
++echo "$as_me:2114: 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 2103 "configure"
++#line 2120 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -2112,16 +2129,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:2115: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:2132: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:2118: \$? = $ac_status" >&5
++  echo "$as_me:2135: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:2121: \"$ac_try\"") >&5
++  { (eval echo "$as_me:2138: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:2124: \$? = $ac_status" >&5
++  echo "$as_me:2141: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_prog_cc_g=yes
+ else
+@@ -2131,7 +2148,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:2134: result: $ac_cv_prog_cc_g" >&5
++echo "$as_me:2151: 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
+@@ -2158,16 +2175,16 @@
+ #endif
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:2161: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:2178: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:2164: \$? = $ac_status" >&5
++  echo "$as_me:2181: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:2167: \"$ac_try\"") >&5
++  { (eval echo "$as_me:2184: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:2170: \$? = $ac_status" >&5
++  echo "$as_me:2187: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   for ac_declaration in \
+    ''\
+@@ -2179,7 +2196,7 @@
+    'void exit (int);'
+ do
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 2182 "configure"
++#line 2199 "configure"
+ #include "confdefs.h"
+ #include <stdlib.h>
+ $ac_declaration
+@@ -2192,16 +2209,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:2195: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:2212: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:2198: \$? = $ac_status" >&5
++  echo "$as_me:2215: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:2201: \"$ac_try\"") >&5
++  { (eval echo "$as_me:2218: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:2204: \$? = $ac_status" >&5
++  echo "$as_me:2221: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   :
+ else
+@@ -2211,7 +2228,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 2214 "configure"
++#line 2231 "configure"
+ #include "confdefs.h"
+ $ac_declaration
+ int
+@@ -2223,16 +2240,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:2226: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:2243: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:2229: \$? = $ac_status" >&5
++  echo "$as_me:2246: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:2232: \"$ac_try\"") >&5
++  { (eval echo "$as_me:2249: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:2235: \$? = $ac_status" >&5
++  echo "$as_me:2252: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   break
+ else
+@@ -2262,11 +2279,11 @@
+ 
+ GCC_VERSION=none
+ if test "$GCC" = yes ; then
+-	echo "$as_me:2265: checking version of $CC" >&5
++	echo "$as_me:2282: 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/^.*(GCC[^)]*) //' -e 's/^.*(Debian[^)]*) //' -e 's/^[^0-9.]*//' -e 's/[^0-9.].*//'`"
+ 	test -z "$GCC_VERSION" && GCC_VERSION=unknown
+-	echo "$as_me:2269: result: $GCC_VERSION" >&5
++	echo "$as_me:2286: result: $GCC_VERSION" >&5
+ echo "${ECHO_T}$GCC_VERSION" >&6
+ fi
+ 
+@@ -2275,12 +2292,12 @@
+ if test "$GCC" = yes ; then
+ 	case "$host_os" in
+ 	(linux*|gnu*)
+-		echo "$as_me:2278: checking if this is really Intel C compiler" >&5
++		echo "$as_me:2295: 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 2283 "configure"
++#line 2300 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -2297,16 +2314,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:2300: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:2317: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:2303: \$? = $ac_status" >&5
++  echo "$as_me:2320: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:2306: \"$ac_try\"") >&5
++  { (eval echo "$as_me:2323: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:2309: \$? = $ac_status" >&5
++  echo "$as_me:2326: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   INTEL_COMPILER=yes
+ cf_save_CFLAGS="$cf_save_CFLAGS -we147"
+@@ -2317,7 +2334,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 		CFLAGS="$cf_save_CFLAGS"
+-		echo "$as_me:2320: result: $INTEL_COMPILER" >&5
++		echo "$as_me:2337: result: $INTEL_COMPILER" >&5
+ echo "${ECHO_T}$INTEL_COMPILER" >&6
+ 		;;
+ 	esac
+@@ -2326,11 +2343,11 @@
+ CLANG_COMPILER=no
+ 
+ if test "$GCC" = yes ; then
+-	echo "$as_me:2329: checking if this is really Clang C compiler" >&5
++	echo "$as_me:2346: 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 2333 "configure"
++#line 2350 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -2347,16 +2364,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:2350: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:2367: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:2353: \$? = $ac_status" >&5
++  echo "$as_me:2370: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:2356: \"$ac_try\"") >&5
++  { (eval echo "$as_me:2373: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:2359: \$? = $ac_status" >&5
++  echo "$as_me:2376: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   CLANG_COMPILER=yes
+ 
+@@ -2366,7 +2383,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 	CFLAGS="$cf_save_CFLAGS"
+-	echo "$as_me:2369: result: $CLANG_COMPILER" >&5
++	echo "$as_me:2386: result: $CLANG_COMPILER" >&5
+ echo "${ECHO_T}$CLANG_COMPILER" >&6
+ fi
+ 
+@@ -2375,30 +2392,30 @@
+ if test "x$CLANG_COMPILER" = "xyes" ; then
+ 	case "$CC" in
+ 	(c[1-9][0-9]|*/c[1-9][0-9])
+-		{ echo "$as_me:2378: WARNING: replacing broken compiler alias $CC" >&5
++		{ echo "$as_me:2395: 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:2385: checking version of $CC" >&5
++	echo "$as_me:2402: 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:2389: result: $CLANG_VERSION" >&5
++	echo "$as_me:2406: 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:2396: checking if option $cf_clang_opt works" >&5
++		echo "$as_me:2413: 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 2401 "configure"
++#line 2418 "configure"
+ #include "confdefs.h"
+ 
+ 			#include <stdio.h>
+@@ -2412,16 +2429,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:2415: \"$ac_link\"") >&5
++if { (eval echo "$as_me:2432: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:2418: \$? = $ac_status" >&5
++  echo "$as_me:2435: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:2421: \"$ac_try\"") >&5
++  { (eval echo "$as_me:2438: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:2424: \$? = $ac_status" >&5
++  echo "$as_me:2441: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+ 
+ 			cf_clang_optok=yes
+@@ -2432,13 +2449,13 @@
+ 			cf_clang_optok=no
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+-		echo "$as_me:2435: result: $cf_clang_optok" >&5
++		echo "$as_me:2452: 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}:2441: testing adding option $cf_clang_opt ..." 1>&5
++echo "${as_me:-configure}:2458: testing adding option $cf_clang_opt ..." 1>&5
+ 
+ 	test -n "$CFLAGS" && CFLAGS="$CFLAGS "
+ 	CFLAGS="${CFLAGS}$cf_clang_opt"
+@@ -2447,7 +2464,7 @@
+ 	done
+ fi
+ 
+-echo "$as_me:2450: checking for $CC option to accept ANSI C" >&5
++echo "$as_me:2467: 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
+@@ -2455,7 +2472,7 @@
+   ac_cv_prog_cc_stdc=no
+ ac_save_CC=$CC
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 2458 "configure"
++#line 2475 "configure"
+ #include "confdefs.h"
+ #include <stdarg.h>
+ #include <stdio.h>
+@@ -2504,16 +2521,16 @@
+ do
+   CC="$ac_save_CC $ac_arg"
+   rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:2507: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:2524: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:2510: \$? = $ac_status" >&5
++  echo "$as_me:2527: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:2513: \"$ac_try\"") >&5
++  { (eval echo "$as_me:2530: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:2516: \$? = $ac_status" >&5
++  echo "$as_me:2533: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_prog_cc_stdc=$ac_arg
+ break
+@@ -2530,10 +2547,10 @@
+ 
+ case "x$ac_cv_prog_cc_stdc" in
+   x|xno)
+-    echo "$as_me:2533: result: none needed" >&5
++    echo "$as_me:2550: result: none needed" >&5
+ echo "${ECHO_T}none needed" >&6 ;;
+   *)
+-    echo "$as_me:2536: result: $ac_cv_prog_cc_stdc" >&5
++    echo "$as_me:2553: result: $ac_cv_prog_cc_stdc" >&5
+ echo "${ECHO_T}$ac_cv_prog_cc_stdc" >&6
+     CC="$CC $ac_cv_prog_cc_stdc" ;;
+ esac
+@@ -2541,13 +2558,13 @@
+ # This should have been defined by AC_PROG_CC
+ : "${CC:=cc}"
+ 
+-echo "$as_me:2544: checking \$CFLAGS variable" >&5
++echo "$as_me:2561: checking \$CFLAGS variable" >&5
+ echo $ECHO_N "checking \$CFLAGS variable... $ECHO_C" >&6
+ case "x$CFLAGS" in
+ (*-[IUD]*)
+-	echo "$as_me:2548: result: broken" >&5
++	echo "$as_me:2565: result: broken" >&5
+ echo "${ECHO_T}broken" >&6
+-	{ echo "$as_me:2550: WARNING: your environment uses the CFLAGS variable to hold CPPFLAGS options" >&5
++	{ echo "$as_me:2567: 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=
+@@ -2655,18 +2672,18 @@
+ 	done
+ 	;;
+ (*)
+-	echo "$as_me:2658: result: ok" >&5
++	echo "$as_me:2675: result: ok" >&5
+ echo "${ECHO_T}ok" >&6
+ 	;;
+ esac
+ 
+-echo "$as_me:2663: checking \$CC variable" >&5
++echo "$as_me:2680: checking \$CC variable" >&5
+ echo $ECHO_N "checking \$CC variable... $ECHO_C" >&6
+ case "$CC" in
+ (*[\ \	]-*)
+-	echo "$as_me:2667: result: broken" >&5
++	echo "$as_me:2684: result: broken" >&5
+ echo "${ECHO_T}broken" >&6
+-	{ echo "$as_me:2669: WARNING: your environment uses the CC variable to hold CFLAGS/CPPFLAGS options" >&5
++	{ echo "$as_me:2686: 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/[ ]*[ ]-[^ ].*//'`
+@@ -2783,19 +2800,19 @@
+ 	done
+ 	test -n "$verbose" && echo "	resulting CC: '$CC'" 1>&6
+ 
+-echo "${as_me:-configure}:2786: testing resulting CC: '$CC' ..." 1>&5
++echo "${as_me:-configure}:2803: testing resulting CC: '$CC' ..." 1>&5
+ 
+ 	test -n "$verbose" && echo "	resulting CFLAGS: '$CFLAGS'" 1>&6
+ 
+-echo "${as_me:-configure}:2790: testing resulting CFLAGS: '$CFLAGS' ..." 1>&5
++echo "${as_me:-configure}:2807: testing resulting CFLAGS: '$CFLAGS' ..." 1>&5
+ 
+ 	test -n "$verbose" && echo "	resulting CPPFLAGS: '$CPPFLAGS'" 1>&6
+ 
+-echo "${as_me:-configure}:2794: testing resulting CPPFLAGS: '$CPPFLAGS' ..." 1>&5
++echo "${as_me:-configure}:2811: testing resulting CPPFLAGS: '$CPPFLAGS' ..." 1>&5
+ 
+ 	;;
+ (*)
+-	echo "$as_me:2798: result: ok" >&5
++	echo "$as_me:2815: result: ok" >&5
+ echo "${ECHO_T}ok" >&6
+ 	;;
+ esac
+@@ -2806,7 +2823,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:2809: checking how to run the C preprocessor" >&5
++echo "$as_me:2826: 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
+@@ -2827,18 +2844,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 2830 "configure"
++#line 2847 "configure"
+ #include "confdefs.h"
+ #include <assert.h>
+                      Syntax error
+ _ACEOF
+-if { (eval echo "$as_me:2835: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:2852: \"$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:2841: \$? = $ac_status" >&5
++  echo "$as_me:2858: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -2861,17 +2878,17 @@
+   # OK, works on sane cases.  Now check whether non-existent headers
+   # can be detected and how.
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 2864 "configure"
++#line 2881 "configure"
+ #include "confdefs.h"
+ #include <ac_nonexistent.h>
+ _ACEOF
+-if { (eval echo "$as_me:2868: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:2885: \"$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:2874: \$? = $ac_status" >&5
++  echo "$as_me:2891: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -2908,7 +2925,7 @@
+ else
+   ac_cv_prog_CPP=$CPP
+ fi
+-echo "$as_me:2911: result: $CPP" >&5
++echo "$as_me:2928: result: $CPP" >&5
+ echo "${ECHO_T}$CPP" >&6
+ ac_preproc_ok=false
+ for ac_c_preproc_warn_flag in '' yes
+@@ -2918,18 +2935,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 2921 "configure"
++#line 2938 "configure"
+ #include "confdefs.h"
+ #include <assert.h>
+                      Syntax error
+ _ACEOF
+-if { (eval echo "$as_me:2926: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:2943: \"$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:2932: \$? = $ac_status" >&5
++  echo "$as_me:2949: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -2952,17 +2969,17 @@
+   # OK, works on sane cases.  Now check whether non-existent headers
+   # can be detected and how.
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 2955 "configure"
++#line 2972 "configure"
+ #include "confdefs.h"
+ #include <ac_nonexistent.h>
+ _ACEOF
+-if { (eval echo "$as_me:2959: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:2976: \"$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:2965: \$? = $ac_status" >&5
++  echo "$as_me:2982: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -2990,7 +3007,7 @@
+ if $ac_preproc_ok; then
+   :
+ else
+-  { { echo "$as_me:2993: error: C preprocessor \"$CPP\" fails sanity check" >&5
++  { { echo "$as_me:3010: error: C preprocessor \"$CPP\" fails sanity check" >&5
+ echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check" >&2;}
+    { (exit 1); exit 1; }; }
+ fi
+@@ -3003,14 +3020,14 @@
+ ac_main_return="return"
+ 
+ if test $ac_cv_c_compiler_gnu = yes; then
+-    echo "$as_me:3006: checking whether $CC needs -traditional" >&5
++    echo "$as_me:3023: 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 3013 "configure"
++#line 3030 "configure"
+ #include "confdefs.h"
+ #include <sgtty.h>
+ int Autoconf = TIOCGETP;
+@@ -3025,7 +3042,7 @@
+ 
+   if test $ac_cv_prog_gcc_traditional = no; then
+     cat >"conftest.$ac_ext" <<_ACEOF
+-#line 3028 "configure"
++#line 3045 "configure"
+ #include "confdefs.h"
+ #include <termio.h>
+ int Autoconf = TCGETA;
+@@ -3038,14 +3055,14 @@
+ 
+   fi
+ fi
+-echo "$as_me:3041: result: $ac_cv_prog_gcc_traditional" >&5
++echo "$as_me:3058: 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:3048: checking whether $CC understands -c and -o together" >&5
++echo "$as_me:3065: 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
+@@ -3060,15 +3077,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:3063: \"$ac_try\"") >&5
++if { (eval echo "$as_me:3080: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:3066: \$? = $ac_status" >&5
++  echo "$as_me:3083: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+-  test -f conftest2.$ac_objext && { (eval echo "$as_me:3068: \"$ac_try\"") >&5
++  test -f conftest2.$ac_objext && { (eval echo "$as_me:3085: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:3071: \$? = $ac_status" >&5
++  echo "$as_me:3088: \$? = $ac_status" >&5
+   (exit "$ac_status"); };
+ then
+   eval cf_cv_prog_CC_c_o=yes
+@@ -3079,10 +3096,10 @@
+ 
+ fi
+ if test "$cf_cv_prog_CC_c_o" = yes; then
+-  echo "$as_me:3082: result: yes" >&5
++  echo "$as_me:3099: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ else
+-  echo "$as_me:3085: result: no" >&5
++  echo "$as_me:3102: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -3096,7 +3113,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:3099: checking for $ac_word" >&5
++echo "$as_me:3116: 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
+@@ -3113,7 +3130,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:3116: found $ac_dir/$ac_word" >&5
++   echo "$as_me:3133: found $ac_dir/$ac_word" >&5
+    break
+ fi
+ done
+@@ -3124,10 +3141,10 @@
+ LDCONFIG=$ac_cv_path_LDCONFIG
+ 
+ if test -n "$LDCONFIG"; then
+-  echo "$as_me:3127: result: $LDCONFIG" >&5
++  echo "$as_me:3144: result: $LDCONFIG" >&5
+ echo "${ECHO_T}$LDCONFIG" >&6
+ else
+-  echo "$as_me:3130: result: no" >&5
++  echo "$as_me:3147: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -3135,7 +3152,7 @@
+ 	esac
+ fi
+ 
+-echo "$as_me:3138: checking if you want to ensure bool is consistent with C++" >&5
++echo "$as_me:3155: 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.
+@@ -3145,7 +3162,7 @@
+ else
+   cf_with_cxx=yes
+ fi;
+-echo "$as_me:3148: result: $cf_with_cxx" >&5
++echo "$as_me:3165: result: $cf_with_cxx" >&5
+ echo "${ECHO_T}$cf_with_cxx" >&6
+ if test "X$cf_with_cxx" = Xno ; then
+ 	CXX=""
+@@ -3163,7 +3180,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:3166: checking for $ac_word" >&5
++echo "$as_me:3183: 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
+@@ -3178,7 +3195,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:3181: found $ac_dir/$ac_word" >&5
++echo "$as_me:3198: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -3186,10 +3203,10 @@
+ fi
+ CXX=$ac_cv_prog_CXX
+ if test -n "$CXX"; then
+-  echo "$as_me:3189: result: $CXX" >&5
++  echo "$as_me:3206: result: $CXX" >&5
+ echo "${ECHO_T}$CXX" >&6
+ else
+-  echo "$as_me:3192: result: no" >&5
++  echo "$as_me:3209: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -3202,7 +3219,7 @@
+ do
+   # Extract the first word of "$ac_prog", so it can be a program name with args.
+ set dummy $ac_prog; ac_word=$2
+-echo "$as_me:3205: checking for $ac_word" >&5
++echo "$as_me:3222: 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
+@@ -3217,7 +3234,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:3220: found $ac_dir/$ac_word" >&5
++echo "$as_me:3237: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -3225,10 +3242,10 @@
+ fi
+ ac_ct_CXX=$ac_cv_prog_ac_ct_CXX
+ if test -n "$ac_ct_CXX"; then
+-  echo "$as_me:3228: result: $ac_ct_CXX" >&5
++  echo "$as_me:3245: result: $ac_ct_CXX" >&5
+ echo "${ECHO_T}$ac_ct_CXX" >&6
+ else
+-  echo "$as_me:3231: result: no" >&5
++  echo "$as_me:3248: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -3240,32 +3257,32 @@
+ fi
+ 
+ # Provide some information about the compiler.
+-echo "$as_me:3243:" \
++echo "$as_me:3260:" \
+      "checking for C++ compiler version" >&5
+ ac_compiler=`set X $ac_compile; echo $2`
+-{ (eval echo "$as_me:3246: \"$ac_compiler --version </dev/null >&5\"") >&5
++{ (eval echo "$as_me:3263: \"$ac_compiler --version </dev/null >&5\"") >&5
+   (eval $ac_compiler --version </dev/null >&5) 2>&5
+   ac_status=$?
+-  echo "$as_me:3249: \$? = $ac_status" >&5
++  echo "$as_me:3266: \$? = $ac_status" >&5
+   (exit "$ac_status"); }
+-{ (eval echo "$as_me:3251: \"$ac_compiler -v </dev/null >&5\"") >&5
++{ (eval echo "$as_me:3268: \"$ac_compiler -v </dev/null >&5\"") >&5
+   (eval $ac_compiler -v </dev/null >&5) 2>&5
+   ac_status=$?
+-  echo "$as_me:3254: \$? = $ac_status" >&5
++  echo "$as_me:3271: \$? = $ac_status" >&5
+   (exit "$ac_status"); }
+-{ (eval echo "$as_me:3256: \"$ac_compiler -V </dev/null >&5\"") >&5
++{ (eval echo "$as_me:3273: \"$ac_compiler -V </dev/null >&5\"") >&5
+   (eval $ac_compiler -V </dev/null >&5) 2>&5
+   ac_status=$?
+-  echo "$as_me:3259: \$? = $ac_status" >&5
++  echo "$as_me:3276: \$? = $ac_status" >&5
+   (exit "$ac_status"); }
+ 
+-echo "$as_me:3262: checking whether we are using the GNU C++ compiler" >&5
++echo "$as_me:3279: 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 3268 "configure"
++#line 3285 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -3280,16 +3297,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:3283: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:3300: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:3286: \$? = $ac_status" >&5
++  echo "$as_me:3303: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:3289: \"$ac_try\"") >&5
++  { (eval echo "$as_me:3306: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:3292: \$? = $ac_status" >&5
++  echo "$as_me:3309: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_compiler_gnu=yes
+ else
+@@ -3301,19 +3318,19 @@
+ ac_cv_cxx_compiler_gnu=$ac_compiler_gnu
+ 
+ fi
+-echo "$as_me:3304: result: $ac_cv_cxx_compiler_gnu" >&5
++echo "$as_me:3321: 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:3310: checking whether $CXX accepts -g" >&5
++echo "$as_me:3327: 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 3316 "configure"
++#line 3333 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -3325,16 +3342,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:3328: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:3345: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:3331: \$? = $ac_status" >&5
++  echo "$as_me:3348: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:3334: \"$ac_try\"") >&5
++  { (eval echo "$as_me:3351: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:3337: \$? = $ac_status" >&5
++  echo "$as_me:3354: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_prog_cxx_g=yes
+ else
+@@ -3344,7 +3361,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:3347: result: $ac_cv_prog_cxx_g" >&5
++echo "$as_me:3364: 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
+@@ -3371,7 +3388,7 @@
+    'void exit (int);'
+ do
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 3374 "configure"
++#line 3391 "configure"
+ #include "confdefs.h"
+ #include <stdlib.h>
+ $ac_declaration
+@@ -3384,16 +3401,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:3387: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:3404: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:3390: \$? = $ac_status" >&5
++  echo "$as_me:3407: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:3393: \"$ac_try\"") >&5
++  { (eval echo "$as_me:3410: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:3396: \$? = $ac_status" >&5
++  echo "$as_me:3413: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   :
+ else
+@@ -3403,7 +3420,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 3406 "configure"
++#line 3423 "configure"
+ #include "confdefs.h"
+ $ac_declaration
+ int
+@@ -3415,16 +3432,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:3418: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:3435: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:3421: \$? = $ac_status" >&5
++  echo "$as_me:3438: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:3424: \"$ac_try\"") >&5
++  { (eval echo "$as_me:3441: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:3427: \$? = $ac_status" >&5
++  echo "$as_me:3444: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   break
+ else
+@@ -3458,7 +3475,7 @@
+ 	then
+ 		# Several of the C++ configurations do not work, particularly when
+ 		# cross-compiling (20140913 -TD)
+-		echo "$as_me:3461: checking if $CXX works" >&5
++		echo "$as_me:3478: checking if $CXX works" >&5
+ echo $ECHO_N "checking if $CXX works... $ECHO_C" >&6
+ 
+ 		save_CPPFLAGS="$CPPFLAGS"
+@@ -3466,7 +3483,7 @@
+ 		CPPFLAGS="$CPPFLAGS -I${cf_includedir}"
+ 
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 3469 "configure"
++#line 3486 "configure"
+ #include "confdefs.h"
+ 
+ #include <stdlib.h>
+@@ -3483,16 +3500,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:3486: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:3503: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:3489: \$? = $ac_status" >&5
++  echo "$as_me:3506: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:3492: \"$ac_try\"") >&5
++  { (eval echo "$as_me:3509: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:3495: \$? = $ac_status" >&5
++  echo "$as_me:3512: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cxx_works=yes
+ else
+@@ -3503,11 +3520,11 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 		CPPFLAGS="$save_CPPFLAGS"
+ 
+-		echo "$as_me:3506: result: $cf_cxx_works" >&5
++		echo "$as_me:3523: result: $cf_cxx_works" >&5
+ echo "${ECHO_T}$cf_cxx_works" >&6
+ 		if test "x$cf_cxx_works" = xno
+ 		then
+-			{ echo "$as_me:3510: WARNING: Ignore $CXX, since it cannot compile hello-world." >&5
++			{ echo "$as_me:3527: 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
+@@ -3523,7 +3540,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:3526: checking for $ac_word" >&5
++echo "$as_me:3543: 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
+@@ -3540,7 +3557,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:3543: found $ac_dir/$ac_word" >&5
++   echo "$as_me:3560: found $ac_dir/$ac_word" >&5
+    break
+ fi
+ done
+@@ -3551,17 +3568,17 @@
+ CXX=$ac_cv_path_CXX
+ 
+ if test -n "$CXX"; then
+-  echo "$as_me:3554: result: $CXX" >&5
++  echo "$as_me:3571: result: $CXX" >&5
+ echo "${ECHO_T}$CXX" >&6
+ else
+-  echo "$as_me:3557: result: no" >&5
++  echo "$as_me:3574: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+ 	fi
+ 	case "x$CXX" in
+ 	(x|xg++)
+-		{ echo "$as_me:3564: WARNING: You don't have any C++ compiler, too bad" >&5
++		{ echo "$as_me:3581: 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="";
+ 		;;
+@@ -3570,7 +3587,7 @@
+ 
+ GXX_VERSION=none
+ if test "$GXX" = yes; then
+-	echo "$as_me:3573: checking version of ${CXX:-g++}" >&5
++	echo "$as_me:3590: checking version of ${CXX:-g++}" >&5
+ echo $ECHO_N "checking version of ${CXX:-g++}... $ECHO_C" >&6
+ 	GXX_VERSION="`${CXX:-g++} --version| sed -e '2,$d' -e 's/^.*(GCC) //' -e 's/^[^0-9.]*//' -e 's/[^0-9.].*//'`"
+ 	if test -z "$GXX_VERSION"
+@@ -3578,7 +3595,7 @@
+ 		GXX_VERSION=unknown
+ 		GXX=no
+ 	fi
+-	echo "$as_me:3581: result: $GXX_VERSION" >&5
++	echo "$as_me:3598: result: $GXX_VERSION" >&5
+ echo "${ECHO_T}$GXX_VERSION" >&6
+ fi
+ 
+@@ -3586,12 +3603,12 @@
+ ([1-9][0-9].*)
+ 	;;
+ (1.*|2.[0-6]*)
+-	{ echo "$as_me:3589: WARNING: templates do not work" >&5
++	{ echo "$as_me:3606: WARNING: templates do not work" >&5
+ echo "$as_me: WARNING: templates do not work" >&2;}
+ 	;;
+ esac
+ 
+-echo "$as_me:3594: checking if you want to build C++ binding and demo" >&5
++echo "$as_me:3611: 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.
+@@ -3601,15 +3618,15 @@
+ else
+   cf_with_cxx_binding=$cf_with_cxx
+ fi;
+-echo "$as_me:3604: result: $cf_with_cxx_binding" >&5
++echo "$as_me:3621: result: $cf_with_cxx_binding" >&5
+ echo "${ECHO_T}$cf_with_cxx_binding" >&6
+ 
+-echo "$as_me:3607: checking if you want to build with Ada" >&5
++echo "$as_me:3624: 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:3609: result: $cf_with_ada" >&5
++echo "$as_me:3626: result: $cf_with_ada" >&5
+ echo "${ECHO_T}$cf_with_ada" >&6
+ 
+-echo "$as_me:3612: checking if you want to install terminal database" >&5
++echo "$as_me:3629: 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.
+@@ -3619,10 +3636,10 @@
+ else
+   cf_with_db_install=yes
+ fi;
+-echo "$as_me:3622: result: $cf_with_db_install" >&5
++echo "$as_me:3639: result: $cf_with_db_install" >&5
+ echo "${ECHO_T}$cf_with_db_install" >&6
+ 
+-echo "$as_me:3625: checking if you want to install manpages" >&5
++echo "$as_me:3642: 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.
+@@ -3632,10 +3649,10 @@
+ else
+   cf_with_manpages=yes
+ fi;
+-echo "$as_me:3635: result: $cf_with_manpages" >&5
++echo "$as_me:3652: result: $cf_with_manpages" >&5
+ echo "${ECHO_T}$cf_with_manpages" >&6
+ 
+-echo "$as_me:3638: checking if you want to build programs such as tic" >&5
++echo "$as_me:3655: 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.
+@@ -3645,18 +3662,18 @@
+ else
+   cf_with_progs=yes
+ fi;
+-echo "$as_me:3648: result: $cf_with_progs" >&5
++echo "$as_me:3665: result: $cf_with_progs" >&5
+ echo "${ECHO_T}$cf_with_progs" >&6
+ 
+ if test -f "$srcdir/tack/tack.h" ; then
+ 	if test "x$cross_compiling" = xyes ; then
+ 		test -n "$verbose" && echo "	ignoring tack because we are cross-compiling" 1>&6
+ 
+-echo "${as_me:-configure}:3655: testing ignoring tack because we are cross-compiling ..." 1>&5
++echo "${as_me:-configure}:3672: testing ignoring tack because we are cross-compiling ..." 1>&5
+ 
+ 		cf_with_tack=no
+ 	else
+-		echo "$as_me:3659: checking if you want to build the tack program" >&5
++		echo "$as_me:3676: checking if you want to build the tack program" >&5
+ echo $ECHO_N "checking if you want to build the tack program... $ECHO_C" >&6
+ 
+ # Check whether --with-tack or --without-tack was given.
+@@ -3666,14 +3683,14 @@
+ else
+   cf_with_tack=$cf_with_progs
+ fi;
+-		echo "$as_me:3669: result: $cf_with_tack" >&5
++		echo "$as_me:3686: result: $cf_with_tack" >&5
+ echo "${ECHO_T}$cf_with_tack" >&6
+ 	fi
+ else
+ 	cf_with_tack=no
+ fi
+ 
+-echo "$as_me:3676: checking if you want to build test-programs" >&5
++echo "$as_me:3693: 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.
+@@ -3683,10 +3700,10 @@
+ else
+   cf_with_tests=yes
+ fi;
+-echo "$as_me:3686: result: $cf_with_tests" >&5
++echo "$as_me:3703: result: $cf_with_tests" >&5
+ echo "${ECHO_T}$cf_with_tests" >&6
+ 
+-echo "$as_me:3689: checking if you wish to install curses.h" >&5
++echo "$as_me:3706: 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.
+@@ -3696,7 +3713,7 @@
+ else
+   with_curses_h=yes
+ fi;
+-echo "$as_me:3699: result: $with_curses_h" >&5
++echo "$as_me:3716: result: $with_curses_h" >&5
+ echo "${ECHO_T}$with_curses_h" >&6
+ 
+ modules_to_build="ncurses"
+@@ -3721,7 +3738,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:3724: checking for $ac_word" >&5
++echo "$as_me:3741: 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
+@@ -3736,7 +3753,7 @@
+   test -z "$ac_dir" && ac_dir=.
+   $as_executable_p "$ac_dir/$ac_word" || continue
+ ac_cv_prog_AWK="$ac_prog"
+-echo "$as_me:3739: found $ac_dir/$ac_word" >&5
++echo "$as_me:3756: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -3744,17 +3761,17 @@
+ fi
+ AWK=$ac_cv_prog_AWK
+ if test -n "$AWK"; then
+-  echo "$as_me:3747: result: $AWK" >&5
++  echo "$as_me:3764: result: $AWK" >&5
+ echo "${ECHO_T}$AWK" >&6
+ else
+-  echo "$as_me:3750: result: no" >&5
++  echo "$as_me:3767: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+   test -n "$AWK" && break
+ done
+ 
+-test -z "$AWK" && { { echo "$as_me:3757: error: No awk program found" >&5
++test -z "$AWK" && { { echo "$as_me:3774: error: No awk program found" >&5
+ echo "$as_me: error: No awk program found" >&2;}
+    { (exit 1); exit 1; }; }
+ 
+@@ -3770,7 +3787,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:3773: checking for a BSD compatible install" >&5
++echo "$as_me:3790: 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
+@@ -3819,7 +3836,7 @@
+     INSTALL=$ac_install_sh
+   fi
+ fi
+-echo "$as_me:3822: result: $INSTALL" >&5
++echo "$as_me:3839: result: $INSTALL" >&5
+ echo "${ECHO_T}$INSTALL" >&6
+ 
+ # Use test -z because SunOS4 sh mishandles braces in ${var-val}.
+@@ -3844,7 +3861,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:3847: checking for $ac_word" >&5
++echo "$as_me:3864: 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
+@@ -3859,7 +3876,7 @@
+   test -z "$ac_dir" && ac_dir=.
+   $as_executable_p "$ac_dir/$ac_word" || continue
+ ac_cv_prog_LINT="$ac_prog"
+-echo "$as_me:3862: found $ac_dir/$ac_word" >&5
++echo "$as_me:3879: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -3867,10 +3884,10 @@
+ fi
+ LINT=$ac_cv_prog_LINT
+ if test -n "$LINT"; then
+-  echo "$as_me:3870: result: $LINT" >&5
++  echo "$as_me:3887: result: $LINT" >&5
+ echo "${ECHO_T}$LINT" >&6
+ else
+-  echo "$as_me:3873: result: no" >&5
++  echo "$as_me:3890: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -3883,18 +3900,18 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:3886: checking whether ln -s works" >&5
++echo "$as_me:3903: 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:3890: result: yes" >&5
++  echo "$as_me:3907: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ else
+-  echo "$as_me:3893: result: no, using $LN_S" >&5
++  echo "$as_me:3910: result: no, using $LN_S" >&5
+ echo "${ECHO_T}no, using $LN_S" >&6
+ fi
+ 
+-echo "$as_me:3897: checking if $LN_S -f options work" >&5
++echo "$as_me:3914: 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
+@@ -3906,12 +3923,12 @@
+ 	cf_prog_ln_sf=no
+ fi
+ rm -f conf$$.dst conf$$src
+-echo "$as_me:3909: result: $cf_prog_ln_sf" >&5
++echo "$as_me:3926: 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:3914: checking for long file names" >&5
++echo "$as_me:3931: 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
+@@ -3950,7 +3967,7 @@
+   rm -rf "$ac_xdir" 2>/dev/null
+ done
+ fi
+-echo "$as_me:3953: result: $ac_cv_sys_long_file_names" >&5
++echo "$as_me:3970: 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
+ 
+@@ -3969,7 +3986,7 @@
+   withval="$with_config_suffix"
+   case "x$withval" in
+ 	(xyes|xno)
+-		{ echo "$as_me:3972: WARNING: expected a value for config-suffix option" >&5
++		{ echo "$as_me:3989: 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"
+@@ -3979,7 +3996,7 @@
+ 
+ # If we find pkg-config, check if we should install the ".pc" files.
+ 
+-echo "$as_me:3982: checking if you want to use pkg-config" >&5
++echo "$as_me:3999: 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.
+@@ -3989,7 +4006,7 @@
+ else
+   cf_pkg_config=yes
+ fi;
+-echo "$as_me:3992: result: $cf_pkg_config" >&5
++echo "$as_me:4009: result: $cf_pkg_config" >&5
+ echo "${ECHO_T}$cf_pkg_config" >&6
+ 
+ case "$cf_pkg_config" in
+@@ -4001,7 +4018,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:4004: checking for $ac_word" >&5
++echo "$as_me:4021: 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
+@@ -4018,7 +4035,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:4021: found $ac_dir/$ac_word" >&5
++   echo "$as_me:4038: found $ac_dir/$ac_word" >&5
+    break
+ fi
+ done
+@@ -4029,10 +4046,10 @@
+ PKG_CONFIG=$ac_cv_path_PKG_CONFIG
+ 
+ if test -n "$PKG_CONFIG"; then
+-  echo "$as_me:4032: result: $PKG_CONFIG" >&5
++  echo "$as_me:4049: result: $PKG_CONFIG" >&5
+ echo "${ECHO_T}$PKG_CONFIG" >&6
+ else
+-  echo "$as_me:4035: result: no" >&5
++  echo "$as_me:4052: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -4041,7 +4058,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:4044: checking for $ac_word" >&5
++echo "$as_me:4061: 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
+@@ -4058,7 +4075,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:4061: found $ac_dir/$ac_word" >&5
++   echo "$as_me:4078: found $ac_dir/$ac_word" >&5
+    break
+ fi
+ done
+@@ -4070,10 +4087,10 @@
+ ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG
+ 
+ if test -n "$ac_pt_PKG_CONFIG"; then
+-  echo "$as_me:4073: result: $ac_pt_PKG_CONFIG" >&5
++  echo "$as_me:4090: result: $ac_pt_PKG_CONFIG" >&5
+ echo "${ECHO_T}$ac_pt_PKG_CONFIG" >&6
+ else
+-  echo "$as_me:4076: result: no" >&5
++  echo "$as_me:4093: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -4116,24 +4133,24 @@
+ 	PKG_CONFIG=`echo "$PKG_CONFIG" | sed -e s%NONE%$cf_path_syntax%`
+ 	;;
+ (*)
+-	{ { echo "$as_me:4119: error: expected a pathname, not \"$PKG_CONFIG\"" >&5
++	{ { echo "$as_me:4136: 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:4126: WARNING: pkg-config is not installed" >&5
++	{ echo "$as_me:4143: 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:4132: checking for pkg-config library directory" >&5
++	echo "$as_me:4149: checking for pkg-config library directory" >&5
+ echo $ECHO_N "checking for pkg-config library directory... $ECHO_C" >&6
+ 	;;
+ (*)
+-	echo "$as_me:4136: checking for $PKG_CONFIG library directory" >&5
++	echo "$as_me:4153: checking for $PKG_CONFIG library directory" >&5
+ echo $ECHO_N "checking for $PKG_CONFIG library directory... $ECHO_C" >&6
+ 	;;
+ esac
+@@ -4154,7 +4171,7 @@
+ case x$cf_search_path in
+ (xlibdir)
+ 	PKG_CONFIG_LIBDIR='${libdir}/pkgconfig'
+-	echo "$as_me:4157: result: $PKG_CONFIG_LIBDIR" >&5
++	echo "$as_me:4174: result: $PKG_CONFIG_LIBDIR" >&5
+ echo "${ECHO_T}$PKG_CONFIG_LIBDIR" >&6
+ 	cf_search_path=
+ 	;;
+@@ -4162,16 +4179,16 @@
+ 	;;
+ (x/*)
+ 	PKG_CONFIG_LIBDIR="$cf_search_path"
+-	echo "$as_me:4165: result: $PKG_CONFIG_LIBDIR" >&5
++	echo "$as_me:4182: result: $PKG_CONFIG_LIBDIR" >&5
+ echo "${ECHO_T}$PKG_CONFIG_LIBDIR" >&6
+ 	cf_search_path=
+ 	;;
+ (xyes|xauto)
+-	echo "$as_me:4170: result: auto" >&5
++	echo "$as_me:4187: 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:4174: checking for search-list" >&5
++	echo "$as_me:4191: checking for search-list" >&5
+ echo $ECHO_N "checking for search-list... $ECHO_C" >&6
+ 	if test "x$PKG_CONFIG" != xnone
+ 	then
+@@ -4198,11 +4215,11 @@
+ "`
+ 	fi
+ 
+-	echo "$as_me:4201: result: $cf_search_path" >&5
++	echo "$as_me:4218: result: $cf_search_path" >&5
+ echo "${ECHO_T}$cf_search_path" >&6
+ 	;;
+ (*)
+-	{ { echo "$as_me:4205: error: Unexpected option value: $cf_search_path" >&5
++	{ { echo "$as_me:4222: error: Unexpected option value: $cf_search_path" >&5
+ echo "$as_me: error: Unexpected option value: $cf_search_path" >&2;}
+    { (exit 1); exit 1; }; }
+ 	;;
+@@ -4210,7 +4227,7 @@
+ 
+ if test -n "$cf_search_path"
+ then
+-	echo "$as_me:4213: checking for first directory" >&5
++	echo "$as_me:4230: 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
+@@ -4221,7 +4238,7 @@
+ 			break
+ 		fi
+ 	done
+-	echo "$as_me:4224: result: $cf_pkg_config_path" >&5
++	echo "$as_me:4241: result: $cf_pkg_config_path" >&5
+ echo "${ECHO_T}$cf_pkg_config_path" >&6
+ 
+ 	if test "x$cf_pkg_config_path" != xnone ; then
+@@ -4231,7 +4248,7 @@
+ 
+ 	if test -z "$PKG_CONFIG_LIBDIR" && test -n "$cf_search_path"
+ 	then
+-		echo "$as_me:4234: checking for workaround" >&5
++		echo "$as_me:4251: checking for workaround" >&5
+ echo $ECHO_N "checking for workaround... $ECHO_C" >&6
+ 		if test "$prefix" = "NONE" ; then
+ 			cf_prefix="$ac_default_prefix"
+@@ -4254,17 +4271,17 @@
+ 			esac
+ 		done
+ 		test -z "$PKG_CONFIG_LIBDIR" && PKG_CONFIG_LIBDIR=$cf_backup
+-		echo "$as_me:4257: result: $PKG_CONFIG_LIBDIR" >&5
++		echo "$as_me:4274: result: $PKG_CONFIG_LIBDIR" >&5
+ echo "${ECHO_T}$PKG_CONFIG_LIBDIR" >&6
+ 	fi
+ fi
+ 
+ if test "x$PKG_CONFIG" != xnone
+ then
+-	echo "$as_me:4264: checking if we should install .pc files for $PKG_CONFIG" >&5
++	echo "$as_me:4281: 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:4267: checking if we should install .pc files" >&5
++	echo "$as_me:4284: checking if we should install .pc files" >&5
+ echo $ECHO_N "checking if we should install .pc files... $ECHO_C" >&6
+ fi
+ 
+@@ -4275,7 +4292,7 @@
+ else
+   enable_pc_files=no
+ fi;
+-echo "$as_me:4278: result: $enable_pc_files" >&5
++echo "$as_me:4295: result: $enable_pc_files" >&5
+ echo "${ECHO_T}$enable_pc_files" >&6
+ 
+ if test "x$enable_pc_files" != xno
+@@ -4283,7 +4300,7 @@
+ 	MAKE_PC_FILES=
+ 	case "x$PKG_CONFIG_LIBDIR" in
+ 	(xno|xnone|xyes|x)
+-		{ echo "$as_me:4286: WARNING: no PKG_CONFIG_LIBDIR was found" >&5
++		{ echo "$as_me:4303: WARNING: no PKG_CONFIG_LIBDIR was found" >&5
+ echo "$as_me: WARNING: no PKG_CONFIG_LIBDIR was found" >&2;}
+ 		;;
+ 	(*)
+@@ -4314,7 +4331,7 @@
+ 	cf_pkg_config_libdir=`echo "$cf_pkg_config_libdir" | sed -e s%NONE%$cf_path_syntax%`
+ 	;;
+ (*)
+-	{ { echo "$as_me:4317: error: expected a pathname, not \"$cf_pkg_config_libdir\"" >&5
++	{ { echo "$as_me:4334: 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; }; }
+ 	;;
+@@ -4328,7 +4345,7 @@
+ 
+ if test -z "$MAKE_PC_FILES"
+ then
+-	echo "$as_me:4331: checking for suffix to add to pc-files" >&5
++	echo "$as_me:4348: checking for suffix to add to pc-files" >&5
+ echo $ECHO_N "checking for suffix to add to pc-files... $ECHO_C" >&6
+ 
+ # Check whether --with-pc-suffix or --without-pc-suffix was given.
+@@ -4343,13 +4360,13 @@
+ 	esac
+ fi;
+ 	test -z "$PC_MODULE_SUFFIX" && PC_MODULE_SUFFIX=none
+-	echo "$as_me:4346: result: $PC_MODULE_SUFFIX" >&5
++	echo "$as_me:4363: result: $PC_MODULE_SUFFIX" >&5
+ echo "${ECHO_T}$PC_MODULE_SUFFIX" >&6
+ 	test "$PC_MODULE_SUFFIX" = none && PC_MODULE_SUFFIX=
+ 
+ fi
+ 
+-echo "$as_me:4352: checking if we should assume mixed-case filenames" >&5
++echo "$as_me:4369: 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.
+@@ -4359,11 +4376,11 @@
+ else
+   enable_mixedcase=auto
+ fi;
+-echo "$as_me:4362: result: $enable_mixedcase" >&5
++echo "$as_me:4379: result: $enable_mixedcase" >&5
+ echo "${ECHO_T}$enable_mixedcase" >&6
+ if test "$enable_mixedcase" = "auto" ; then
+ 
+-echo "$as_me:4366: checking if filesystem supports mixed-case filenames" >&5
++echo "$as_me:4383: 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
+@@ -4390,7 +4407,7 @@
+ fi
+ 
+ fi
+-echo "$as_me:4393: result: $cf_cv_mixedcase" >&5
++echo "$as_me:4410: result: $cf_cv_mixedcase" >&5
+ echo "${ECHO_T}$cf_cv_mixedcase" >&6
+ test "$cf_cv_mixedcase" = yes &&
+ cat >>confdefs.h <<\EOF
+@@ -4409,7 +4426,7 @@
+ fi
+ 
+ # do this after mixed-case option (tags/TAGS is not as important as tic).
+-echo "$as_me:4412: checking whether ${MAKE-make} sets \${MAKE}" >&5
++echo "$as_me:4429: 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
+@@ -4429,16 +4446,16 @@
+ rm -f conftest.make
+ fi
+ if eval "test \"`echo '$ac_cv_prog_make_'${ac_make}_set`\" = yes"; then
+-  echo "$as_me:4432: result: yes" >&5
++  echo "$as_me:4449: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+   SET_MAKE=
+ else
+-  echo "$as_me:4436: result: no" >&5
++  echo "$as_me:4453: result: no" >&5
+ echo "${ECHO_T}no" >&6
+   SET_MAKE="MAKE=${MAKE-make}"
+ fi
+ 
+-echo "$as_me:4441: checking for \".PHONY\" make-support" >&5
++echo "$as_me:4458: 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
+@@ -4493,7 +4510,7 @@
+ 	rm -rf conftest*
+ 
+ fi
+-echo "$as_me:4496: result: $cf_cv_make_PHONY" >&5
++echo "$as_me:4513: result: $cf_cv_make_PHONY" >&5
+ echo "${ECHO_T}$cf_cv_make_PHONY" >&6
+ MAKE_NO_PHONY="#"
+ MAKE_PHONY="#"
+@@ -4504,7 +4521,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:4507: checking for $ac_word" >&5
++echo "$as_me:4524: 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
+@@ -4519,7 +4536,7 @@
+   test -z "$ac_dir" && ac_dir=.
+   $as_executable_p "$ac_dir/$ac_word" || continue
+ ac_cv_prog_CTAGS="$ac_prog"
+-echo "$as_me:4522: found $ac_dir/$ac_word" >&5
++echo "$as_me:4539: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -4527,10 +4544,10 @@
+ fi
+ CTAGS=$ac_cv_prog_CTAGS
+ if test -n "$CTAGS"; then
+-  echo "$as_me:4530: result: $CTAGS" >&5
++  echo "$as_me:4547: result: $CTAGS" >&5
+ echo "${ECHO_T}$CTAGS" >&6
+ else
+-  echo "$as_me:4533: result: no" >&5
++  echo "$as_me:4550: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -4541,7 +4558,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:4544: checking for $ac_word" >&5
++echo "$as_me:4561: 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
+@@ -4556,7 +4573,7 @@
+   test -z "$ac_dir" && ac_dir=.
+   $as_executable_p "$ac_dir/$ac_word" || continue
+ ac_cv_prog_ETAGS="$ac_prog"
+-echo "$as_me:4559: found $ac_dir/$ac_word" >&5
++echo "$as_me:4576: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -4564,10 +4581,10 @@
+ fi
+ ETAGS=$ac_cv_prog_ETAGS
+ if test -n "$ETAGS"; then
+-  echo "$as_me:4567: result: $ETAGS" >&5
++  echo "$as_me:4584: result: $ETAGS" >&5
+ echo "${ECHO_T}$ETAGS" >&6
+ else
+-  echo "$as_me:4570: result: no" >&5
++  echo "$as_me:4587: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -4576,7 +4593,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:4579: checking for $ac_word" >&5
++echo "$as_me:4596: 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
+@@ -4591,7 +4608,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:4594: found $ac_dir/$ac_word" >&5
++echo "$as_me:4611: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -4600,17 +4617,17 @@
+ fi
+ MAKE_LOWER_TAGS=$ac_cv_prog_MAKE_LOWER_TAGS
+ if test -n "$MAKE_LOWER_TAGS"; then
+-  echo "$as_me:4603: result: $MAKE_LOWER_TAGS" >&5
++  echo "$as_me:4620: result: $MAKE_LOWER_TAGS" >&5
+ echo "${ECHO_T}$MAKE_LOWER_TAGS" >&6
+ else
+-  echo "$as_me:4606: result: no" >&5
++  echo "$as_me:4623: 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:4613: checking for $ac_word" >&5
++echo "$as_me:4630: 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
+@@ -4625,7 +4642,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:4628: found $ac_dir/$ac_word" >&5
++echo "$as_me:4645: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -4634,10 +4651,10 @@
+ fi
+ MAKE_UPPER_TAGS=$ac_cv_prog_MAKE_UPPER_TAGS
+ if test -n "$MAKE_UPPER_TAGS"; then
+-  echo "$as_me:4637: result: $MAKE_UPPER_TAGS" >&5
++  echo "$as_me:4654: result: $MAKE_UPPER_TAGS" >&5
+ echo "${ECHO_T}$MAKE_UPPER_TAGS" >&6
+ else
+-  echo "$as_me:4640: result: no" >&5
++  echo "$as_me:4657: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -4657,7 +4674,7 @@
+ 	MAKE_LOWER_TAGS="#"
+ fi
+ 
+-echo "$as_me:4660: checking for makeflags variable" >&5
++echo "$as_me:4677: 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
+@@ -4687,7 +4704,7 @@
+ 			;;
+ 		(*)
+ 
+-echo "${as_me:-configure}:4690: testing given option \"$cf_option\",no match \"$cf_result\" ..." 1>&5
++echo "${as_me:-configure}:4707: testing given option \"$cf_option\",no match \"$cf_result\" ..." 1>&5
+ 
+ 			;;
+ 		esac
+@@ -4695,13 +4712,13 @@
+ 	rm -f cf_makeflags.tmp
+ 
+ fi
+-echo "$as_me:4698: result: $cf_cv_makeflags" >&5
++echo "$as_me:4715: 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:4704: checking for $ac_word" >&5
++echo "$as_me:4721: 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
+@@ -4716,7 +4733,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:4719: found $ac_dir/$ac_word" >&5
++echo "$as_me:4736: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -4724,10 +4741,10 @@
+ fi
+ RANLIB=$ac_cv_prog_RANLIB
+ if test -n "$RANLIB"; then
+-  echo "$as_me:4727: result: $RANLIB" >&5
++  echo "$as_me:4744: result: $RANLIB" >&5
+ echo "${ECHO_T}$RANLIB" >&6
+ else
+-  echo "$as_me:4730: result: no" >&5
++  echo "$as_me:4747: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -4736,7 +4753,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:4739: checking for $ac_word" >&5
++echo "$as_me:4756: 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
+@@ -4751,7 +4768,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:4754: found $ac_dir/$ac_word" >&5
++echo "$as_me:4771: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -4760,10 +4777,10 @@
+ fi
+ ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB
+ if test -n "$ac_ct_RANLIB"; then
+-  echo "$as_me:4763: result: $ac_ct_RANLIB" >&5
++  echo "$as_me:4780: result: $ac_ct_RANLIB" >&5
+ echo "${ECHO_T}$ac_ct_RANLIB" >&6
+ else
+-  echo "$as_me:4766: result: no" >&5
++  echo "$as_me:4783: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -4775,7 +4792,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:4778: checking for $ac_word" >&5
++echo "$as_me:4795: 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
+@@ -4790,7 +4807,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:4793: found $ac_dir/$ac_word" >&5
++echo "$as_me:4810: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -4798,10 +4815,10 @@
+ fi
+ LD=$ac_cv_prog_LD
+ if test -n "$LD"; then
+-  echo "$as_me:4801: result: $LD" >&5
++  echo "$as_me:4818: result: $LD" >&5
+ echo "${ECHO_T}$LD" >&6
+ else
+-  echo "$as_me:4804: result: no" >&5
++  echo "$as_me:4821: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -4810,7 +4827,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:4813: checking for $ac_word" >&5
++echo "$as_me:4830: 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
+@@ -4825,7 +4842,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:4828: found $ac_dir/$ac_word" >&5
++echo "$as_me:4845: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -4834,10 +4851,10 @@
+ fi
+ ac_ct_LD=$ac_cv_prog_ac_ct_LD
+ if test -n "$ac_ct_LD"; then
+-  echo "$as_me:4837: result: $ac_ct_LD" >&5
++  echo "$as_me:4854: result: $ac_ct_LD" >&5
+ echo "${ECHO_T}$ac_ct_LD" >&6
+ else
+-  echo "$as_me:4840: result: no" >&5
++  echo "$as_me:4857: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -4849,7 +4866,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:4852: checking for $ac_word" >&5
++echo "$as_me:4869: 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
+@@ -4864,7 +4881,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:4867: found $ac_dir/$ac_word" >&5
++echo "$as_me:4884: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -4872,10 +4889,10 @@
+ fi
+ AR=$ac_cv_prog_AR
+ if test -n "$AR"; then
+-  echo "$as_me:4875: result: $AR" >&5
++  echo "$as_me:4892: result: $AR" >&5
+ echo "${ECHO_T}$AR" >&6
+ else
+-  echo "$as_me:4878: result: no" >&5
++  echo "$as_me:4895: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -4884,7 +4901,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:4887: checking for $ac_word" >&5
++echo "$as_me:4904: 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
+@@ -4899,7 +4916,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:4902: found $ac_dir/$ac_word" >&5
++echo "$as_me:4919: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -4908,10 +4925,10 @@
+ fi
+ ac_ct_AR=$ac_cv_prog_ac_ct_AR
+ if test -n "$ac_ct_AR"; then
+-  echo "$as_me:4911: result: $ac_ct_AR" >&5
++  echo "$as_me:4928: result: $ac_ct_AR" >&5
+ echo "${ECHO_T}$ac_ct_AR" >&6
+ else
+-  echo "$as_me:4914: result: no" >&5
++  echo "$as_me:4931: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -4923,7 +4940,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:4926: checking for $ac_word" >&5
++echo "$as_me:4943: 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
+@@ -4938,7 +4955,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:4941: found $ac_dir/$ac_word" >&5
++echo "$as_me:4958: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -4946,10 +4963,10 @@
+ fi
+ NM=$ac_cv_prog_NM
+ if test -n "$NM"; then
+-  echo "$as_me:4949: result: $NM" >&5
++  echo "$as_me:4966: result: $NM" >&5
+ echo "${ECHO_T}$NM" >&6
+ else
+-  echo "$as_me:4952: result: no" >&5
++  echo "$as_me:4969: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -4958,7 +4975,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:4961: checking for $ac_word" >&5
++echo "$as_me:4978: 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
+@@ -4973,7 +4990,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:4976: found $ac_dir/$ac_word" >&5
++echo "$as_me:4993: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -4982,10 +4999,10 @@
+ fi
+ ac_ct_NM=$ac_cv_prog_ac_ct_NM
+ if test -n "$ac_ct_NM"; then
+-  echo "$as_me:4985: result: $ac_ct_NM" >&5
++  echo "$as_me:5002: result: $ac_ct_NM" >&5
+ echo "${ECHO_T}$ac_ct_NM" >&6
+ else
+-  echo "$as_me:4988: result: no" >&5
++  echo "$as_me:5005: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -4997,7 +5014,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:5000: checking for $ac_word" >&5
++echo "$as_me:5017: 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
+@@ -5012,7 +5029,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:5015: found $ac_dir/$ac_word" >&5
++echo "$as_me:5032: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -5020,10 +5037,10 @@
+ fi
+ AR=$ac_cv_prog_AR
+ if test -n "$AR"; then
+-  echo "$as_me:5023: result: $AR" >&5
++  echo "$as_me:5040: result: $AR" >&5
+ echo "${ECHO_T}$AR" >&6
+ else
+-  echo "$as_me:5026: result: no" >&5
++  echo "$as_me:5043: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -5032,7 +5049,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:5035: checking for $ac_word" >&5
++echo "$as_me:5052: 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
+@@ -5047,7 +5064,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:5050: found $ac_dir/$ac_word" >&5
++echo "$as_me:5067: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -5056,10 +5073,10 @@
+ fi
+ ac_ct_AR=$ac_cv_prog_ac_ct_AR
+ if test -n "$ac_ct_AR"; then
+-  echo "$as_me:5059: result: $ac_ct_AR" >&5
++  echo "$as_me:5076: result: $ac_ct_AR" >&5
+ echo "${ECHO_T}$ac_ct_AR" >&6
+ else
+-  echo "$as_me:5062: result: no" >&5
++  echo "$as_me:5079: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -5068,7 +5085,7 @@
+   AR="$ac_cv_prog_AR"
+ fi
+ 
+-echo "$as_me:5071: checking for options to update archives" >&5
++echo "$as_me:5088: 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
+@@ -5105,13 +5122,13 @@
+ 			rm -f conftest.a
+ 
+ 			cat >"conftest.$ac_ext" <<EOF
+-#line 5108 "configure"
++#line 5125 "configure"
+ int	testdata[3] = { 123, 456, 789 };
+ EOF
+-			if { (eval echo "$as_me:5111: \"$ac_compile\"") >&5
++			if { (eval echo "$as_me:5128: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:5114: \$? = $ac_status" >&5
++  echo "$as_me:5131: \$? = $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
+@@ -5122,7 +5139,7 @@
+ 			else
+ 				test -n "$verbose" && echo "	cannot compile test-program" 1>&6
+ 
+-echo "${as_me:-configure}:5125: testing cannot compile test-program ..." 1>&5
++echo "${as_me:-configure}:5142: testing cannot compile test-program ..." 1>&5
+ 
+ 				break
+ 			fi
+@@ -5132,7 +5149,7 @@
+ 	esac
+ 
+ fi
+-echo "$as_me:5135: result: $cf_cv_ar_flags" >&5
++echo "$as_me:5152: result: $cf_cv_ar_flags" >&5
+ echo "${ECHO_T}$cf_cv_ar_flags" >&6
+ 
+ if test -n "$ARFLAGS" ; then
+@@ -5143,7 +5160,7 @@
+ 	ARFLAGS=$cf_cv_ar_flags
+ fi
+ 
+-echo "$as_me:5146: checking if you have specified an install-prefix" >&5
++echo "$as_me:5163: 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.
+@@ -5156,7 +5173,7 @@
+ 		;;
+ 	esac
+ fi;
+-echo "$as_me:5159: result: $DESTDIR" >&5
++echo "$as_me:5176: result: $DESTDIR" >&5
+ echo "${ECHO_T}$DESTDIR" >&6
+ 
+ ###############################################################################
+@@ -5191,7 +5208,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:5194: checking for $ac_word" >&5
++echo "$as_me:5211: 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
+@@ -5206,7 +5223,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:5209: found $ac_dir/$ac_word" >&5
++echo "$as_me:5226: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -5214,10 +5231,10 @@
+ fi
+ BUILD_CC=$ac_cv_prog_BUILD_CC
+ if test -n "$BUILD_CC"; then
+-  echo "$as_me:5217: result: $BUILD_CC" >&5
++  echo "$as_me:5234: result: $BUILD_CC" >&5
+ echo "${ECHO_T}$BUILD_CC" >&6
+ else
+-  echo "$as_me:5220: result: no" >&5
++  echo "$as_me:5237: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -5226,12 +5243,12 @@
+ test -n "$BUILD_CC" || BUILD_CC="none"
+ 
+ fi;
+-	echo "$as_me:5229: checking for native build C compiler" >&5
++	echo "$as_me:5246: checking for native build C compiler" >&5
+ echo $ECHO_N "checking for native build C compiler... $ECHO_C" >&6
+-	echo "$as_me:5231: result: $BUILD_CC" >&5
++	echo "$as_me:5248: result: $BUILD_CC" >&5
+ echo "${ECHO_T}$BUILD_CC" >&6
+ 
+-	echo "$as_me:5234: checking for native build C preprocessor" >&5
++	echo "$as_me:5251: 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.
+@@ -5241,10 +5258,10 @@
+ else
+   BUILD_CPP='${BUILD_CC} -E'
+ fi;
+-	echo "$as_me:5244: result: $BUILD_CPP" >&5
++	echo "$as_me:5261: result: $BUILD_CPP" >&5
+ echo "${ECHO_T}$BUILD_CPP" >&6
+ 
+-	echo "$as_me:5247: checking for native build C flags" >&5
++	echo "$as_me:5264: 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.
+@@ -5252,10 +5269,10 @@
+   withval="$with_build_cflags"
+   BUILD_CFLAGS="$withval"
+ fi;
+-	echo "$as_me:5255: result: $BUILD_CFLAGS" >&5
++	echo "$as_me:5272: result: $BUILD_CFLAGS" >&5
+ echo "${ECHO_T}$BUILD_CFLAGS" >&6
+ 
+-	echo "$as_me:5258: checking for native build C preprocessor-flags" >&5
++	echo "$as_me:5275: 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.
+@@ -5263,10 +5280,10 @@
+   withval="$with_build_cppflags"
+   BUILD_CPPFLAGS="$withval"
+ fi;
+-	echo "$as_me:5266: result: $BUILD_CPPFLAGS" >&5
++	echo "$as_me:5283: result: $BUILD_CPPFLAGS" >&5
+ echo "${ECHO_T}$BUILD_CPPFLAGS" >&6
+ 
+-	echo "$as_me:5269: checking for native build linker-flags" >&5
++	echo "$as_me:5286: 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.
+@@ -5274,10 +5291,10 @@
+   withval="$with_build_ldflags"
+   BUILD_LDFLAGS="$withval"
+ fi;
+-	echo "$as_me:5277: result: $BUILD_LDFLAGS" >&5
++	echo "$as_me:5294: result: $BUILD_LDFLAGS" >&5
+ echo "${ECHO_T}$BUILD_LDFLAGS" >&6
+ 
+-	echo "$as_me:5280: checking for native build linker-libraries" >&5
++	echo "$as_me:5297: 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.
+@@ -5285,7 +5302,7 @@
+   withval="$with_build_libs"
+   BUILD_LIBS="$withval"
+ fi;
+-	echo "$as_me:5288: result: $BUILD_LIBS" >&5
++	echo "$as_me:5305: result: $BUILD_LIBS" >&5
+ echo "${ECHO_T}$BUILD_LIBS" >&6
+ 
+ 	# this assumes we're on Unix.
+@@ -5295,7 +5312,7 @@
+ 	: ${BUILD_CC:='${CC}'}
+ 
+ 	if { test "$BUILD_CC" = "$CC" || test "$BUILD_CC" = '${CC}'; } ; then
+-		{ { echo "$as_me:5298: error: Cross-build requires two compilers.
++		{ { echo "$as_me:5315: 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;}
+@@ -5320,7 +5337,7 @@
+ ### shared, for example.
+ cf_list_models=""
+ 
+-echo "$as_me:5323: checking if libtool -version-number should be used" >&5
++echo "$as_me:5340: 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.
+@@ -5337,7 +5354,7 @@
+ 	cf_libtool_version=yes
+ 
+ fi;
+-echo "$as_me:5340: result: $cf_libtool_version" >&5
++echo "$as_me:5357: result: $cf_libtool_version" >&5
+ echo "${ECHO_T}$cf_libtool_version" >&6
+ 
+ if test "$cf_libtool_version" = yes ; then
+@@ -5346,25 +5363,25 @@
+ 	LIBTOOL_VERSION="-version-info"
+ 	case "x$VERSION" in
+ 	(x)
+-		{ echo "$as_me:5349: WARNING: VERSION was not set" >&5
++		{ echo "$as_me:5366: 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}:5356: testing ABI_VERSION: $ABI_VERSION ..." 1>&5
++echo "${as_me:-configure}:5373: 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}:5363: testing ABI_VERSION: $ABI_VERSION ..." 1>&5
++echo "${as_me:-configure}:5380: testing ABI_VERSION: $ABI_VERSION ..." 1>&5
+ 
+ 		;;
+ 	(*)
+-		{ echo "$as_me:5367: WARNING: unexpected VERSION value: $VERSION" >&5
++		{ echo "$as_me:5384: WARNING: unexpected VERSION value: $VERSION" >&5
+ echo "$as_me: WARNING: unexpected VERSION value: $VERSION" >&2;}
+ 		;;
+ 	esac
+@@ -5386,7 +5403,7 @@
+ LIB_INSTALL=
+ LIB_UNINSTALL=
+ 
+-echo "$as_me:5389: checking if you want to build libraries with libtool" >&5
++echo "$as_me:5406: 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.
+@@ -5396,7 +5413,7 @@
+ else
+   with_libtool=no
+ fi;
+-echo "$as_me:5399: result: $with_libtool" >&5
++echo "$as_me:5416: result: $with_libtool" >&5
+ echo "${ECHO_T}$with_libtool" >&6
+ if test "$with_libtool" != "no"; then
+ 
+@@ -5427,7 +5444,7 @@
+ 	with_libtool=`echo "$with_libtool" | sed -e s%NONE%$cf_path_syntax%`
+ 	;;
+ (*)
+-	{ { echo "$as_me:5430: error: expected a pathname, not \"$with_libtool\"" >&5
++	{ { echo "$as_me:5447: error: expected a pathname, not \"$with_libtool\"" >&5
+ echo "$as_me: error: expected a pathname, not \"$with_libtool\"" >&2;}
+    { (exit 1); exit 1; }; }
+ 	;;
+@@ -5440,7 +5457,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:5443: checking for $ac_word" >&5
++echo "$as_me:5460: 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
+@@ -5455,7 +5472,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:5458: found $ac_dir/$ac_word" >&5
++echo "$as_me:5475: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -5463,10 +5480,10 @@
+ fi
+ LIBTOOL=$ac_cv_prog_LIBTOOL
+ if test -n "$LIBTOOL"; then
+-  echo "$as_me:5466: result: $LIBTOOL" >&5
++  echo "$as_me:5483: result: $LIBTOOL" >&5
+ echo "${ECHO_T}$LIBTOOL" >&6
+ else
+-  echo "$as_me:5469: result: no" >&5
++  echo "$as_me:5486: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -5479,7 +5496,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:5482: checking for $ac_word" >&5
++echo "$as_me:5499: 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
+@@ -5494,7 +5511,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:5497: found $ac_dir/$ac_word" >&5
++echo "$as_me:5514: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -5502,10 +5519,10 @@
+ fi
+ ac_ct_LIBTOOL=$ac_cv_prog_ac_ct_LIBTOOL
+ if test -n "$ac_ct_LIBTOOL"; then
+-  echo "$as_me:5505: result: $ac_ct_LIBTOOL" >&5
++  echo "$as_me:5522: result: $ac_ct_LIBTOOL" >&5
+ echo "${ECHO_T}$ac_ct_LIBTOOL" >&6
+ else
+-  echo "$as_me:5508: result: no" >&5
++  echo "$as_me:5525: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -5536,7 +5553,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:5539: checking for $ac_word" >&5
++echo "$as_me:5556: 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
+@@ -5551,7 +5568,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:5554: found $ac_dir/$ac_word" >&5
++echo "$as_me:5571: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -5559,10 +5576,10 @@
+ fi
+ LIBTOOL=$ac_cv_prog_LIBTOOL
+ if test -n "$LIBTOOL"; then
+-  echo "$as_me:5562: result: $LIBTOOL" >&5
++  echo "$as_me:5579: result: $LIBTOOL" >&5
+ echo "${ECHO_T}$LIBTOOL" >&6
+ else
+-  echo "$as_me:5565: result: no" >&5
++  echo "$as_me:5582: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -5575,7 +5592,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:5578: checking for $ac_word" >&5
++echo "$as_me:5595: 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
+@@ -5590,7 +5607,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:5593: found $ac_dir/$ac_word" >&5
++echo "$as_me:5610: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -5598,10 +5615,10 @@
+ fi
+ ac_ct_LIBTOOL=$ac_cv_prog_ac_ct_LIBTOOL
+ if test -n "$ac_ct_LIBTOOL"; then
+-  echo "$as_me:5601: result: $ac_ct_LIBTOOL" >&5
++  echo "$as_me:5618: result: $ac_ct_LIBTOOL" >&5
+ echo "${ECHO_T}$ac_ct_LIBTOOL" >&6
+ else
+-  echo "$as_me:5604: result: no" >&5
++  echo "$as_me:5621: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -5623,7 +5640,7 @@
+ 		fi
+ 	fi
+ 	if test -z "$LIBTOOL" ; then
+-		{ { echo "$as_me:5626: error: Cannot find libtool" >&5
++		{ { echo "$as_me:5643: error: Cannot find libtool" >&5
+ echo "$as_me: error: Cannot find libtool" >&2;}
+    { (exit 1); exit 1; }; }
+ 	fi
+@@ -5639,7 +5656,7 @@
+ 
+ if test -n "$LIBTOOL" && test "$LIBTOOL" != none
+ then
+-	echo "$as_me:5642: checking version of $LIBTOOL" >&5
++	echo "$as_me:5659: checking version of $LIBTOOL" >&5
+ echo $ECHO_N "checking version of $LIBTOOL... $ECHO_C" >&6
+ 
+ if test -n "$LIBTOOL" && test "$LIBTOOL" != none
+@@ -5650,7 +5667,7 @@
+ fi
+ test -z "$cf_cv_libtool_version" && unset cf_cv_libtool_version
+ 
+-	echo "$as_me:5653: result: $cf_cv_libtool_version" >&5
++	echo "$as_me:5670: result: $cf_cv_libtool_version" >&5
+ echo "${ECHO_T}$cf_cv_libtool_version" >&6
+ 	if test -n "$cf_cv_libtool_version"
+ 	then
+@@ -5659,18 +5676,18 @@
+ 		(*...GNU-libtool...*)
+ 			;;
+ 		(*)
+-			{ { echo "$as_me:5662: error: This is not GNU libtool" >&5
++			{ { echo "$as_me:5679: 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:5668: error: No version found for $LIBTOOL" >&5
++		{ { echo "$as_me:5685: 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:5673: error: GNU libtool has not been found" >&5
++	{ { echo "$as_me:5690: error: GNU libtool has not been found" >&5
+ echo "$as_me: error: GNU libtool has not been found" >&2;}
+    { (exit 1); exit 1; }; }
+ fi
+@@ -5706,7 +5723,7 @@
+ 
+ else
+ 
+-echo "$as_me:5709: checking if you want to build shared libraries" >&5
++echo "$as_me:5726: 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.
+@@ -5716,11 +5733,11 @@
+ else
+   with_shared=no
+ fi;
+-echo "$as_me:5719: result: $with_shared" >&5
++echo "$as_me:5736: 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:5723: checking if you want to build static libraries" >&5
++echo "$as_me:5740: 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.
+@@ -5730,11 +5747,11 @@
+ else
+   with_normal=yes
+ fi;
+-echo "$as_me:5733: result: $with_normal" >&5
++echo "$as_me:5750: 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:5737: checking if you want to build debug libraries" >&5
++echo "$as_me:5754: 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.
+@@ -5744,11 +5761,11 @@
+ else
+   with_debug=yes
+ fi;
+-echo "$as_me:5747: result: $with_debug" >&5
++echo "$as_me:5764: 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:5751: checking if you want to build profiling libraries" >&5
++echo "$as_me:5768: 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.
+@@ -5758,7 +5775,7 @@
+ else
+   with_profile=no
+ fi;
+-echo "$as_me:5761: result: $with_profile" >&5
++echo "$as_me:5778: result: $with_profile" >&5
+ echo "${ECHO_T}$with_profile" >&6
+ test "x$with_profile" = "xyes" && cf_list_models="$cf_list_models profile"
+ 
+@@ -5766,7 +5783,7 @@
+ 
+ if test "X$cf_with_cxx_binding" != Xno; then
+ if test "x$with_shared" = "xyes"; then
+-echo "$as_me:5769: checking if you want to build C++ shared libraries" >&5
++echo "$as_me:5786: 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.
+@@ -5776,26 +5793,26 @@
+ else
+   with_shared_cxx=no
+ fi;
+-echo "$as_me:5779: result: $with_shared_cxx" >&5
++echo "$as_me:5796: result: $with_shared_cxx" >&5
+ echo "${ECHO_T}$with_shared_cxx" >&6
+ fi
+ fi
+ 
+ ###############################################################################
+ 
+-echo "$as_me:5786: checking for specified models" >&5
++echo "$as_me:5803: 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:5790: result: $cf_list_models" >&5
++echo "$as_me:5807: 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:5795: checking for default model" >&5
++echo "$as_me:5812: 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:5798: result: $DFT_LWR_MODEL" >&5
++echo "$as_me:5815: result: $DFT_LWR_MODEL" >&5
+ echo "${ECHO_T}$DFT_LWR_MODEL" >&6
+ 
+ DFT_UPR_MODEL=`echo "$DFT_LWR_MODEL" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%`
+@@ -5809,7 +5826,7 @@
+ LIB_DIR=../lib
+ LIB_2ND=../../lib
+ 
+-echo "$as_me:5812: checking if you want to have a library-prefix" >&5
++echo "$as_me:5829: 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.
+@@ -5819,7 +5836,7 @@
+ else
+   with_lib_prefix=auto
+ fi;
+-echo "$as_me:5822: result: $with_lib_prefix" >&5
++echo "$as_me:5839: result: $with_lib_prefix" >&5
+ echo "${ECHO_T}$with_lib_prefix" >&6
+ 
+ if test "$with_lib_prefix" = auto
+@@ -5850,19 +5867,19 @@
+ 
+ LIB_SUFFIX=
+ 
+-	echo "$as_me:5853: checking for PATH separator" >&5
++	echo "$as_me:5870: 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:5860: result: $PATH_SEPARATOR" >&5
++	echo "$as_me:5877: result: $PATH_SEPARATOR" >&5
+ echo "${ECHO_T}$PATH_SEPARATOR" >&6
+ 
+ ###############################################################################
+ 
+-echo "$as_me:5865: checking if you want to build a separate terminfo library" >&5
++echo "$as_me:5882: 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.
+@@ -5872,10 +5889,10 @@
+ else
+   with_termlib=no
+ fi;
+-echo "$as_me:5875: result: $with_termlib" >&5
++echo "$as_me:5892: result: $with_termlib" >&5
+ echo "${ECHO_T}$with_termlib" >&6
+ 
+-echo "$as_me:5878: checking if you want to build a separate tic library" >&5
++echo "$as_me:5895: 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.
+@@ -5885,7 +5902,7 @@
+ else
+   with_ticlib=no
+ fi;
+-echo "$as_me:5888: result: $with_ticlib" >&5
++echo "$as_me:5905: result: $with_ticlib" >&5
+ echo "${ECHO_T}$with_ticlib" >&6
+ 
+ if test X"$CC_G_OPT" = X"" ; then
+@@ -5898,7 +5915,7 @@
+ 	test -n "$GXX" && test "x${ac_cv_prog_cxx_g}" != xyes && CXX_G_OPT=''
+ fi
+ 
+-echo "$as_me:5901: checking for default loader flags" >&5
++echo "$as_me:5918: 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=''   ;;
+@@ -5907,13 +5924,13 @@
+ (profile) LD_MODEL='-pg';;
+ (shared)  LD_MODEL=''   ;;
+ esac
+-echo "$as_me:5910: result: $LD_MODEL" >&5
++echo "$as_me:5927: result: $LD_MODEL" >&5
+ echo "${ECHO_T}$LD_MODEL" >&6
+ 
+ case "$DFT_LWR_MODEL" in
+ (shared)
+ 
+-echo "$as_me:5916: checking if rpath option should be used" >&5
++echo "$as_me:5933: 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.
+@@ -5923,10 +5940,10 @@
+ else
+   cf_cv_enable_rpath=no
+ fi;
+-echo "$as_me:5926: result: $cf_cv_enable_rpath" >&5
++echo "$as_me:5943: result: $cf_cv_enable_rpath" >&5
+ echo "${ECHO_T}$cf_cv_enable_rpath" >&6
+ 
+-echo "$as_me:5929: checking if shared libraries should be relinked during install" >&5
++echo "$as_me:5946: 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.
+@@ -5936,7 +5953,7 @@
+ else
+   cf_cv_do_relink=yes
+ fi;
+-echo "$as_me:5939: result: $cf_cv_do_relink" >&5
++echo "$as_me:5956: result: $cf_cv_do_relink" >&5
+ echo "${ECHO_T}$cf_cv_do_relink" >&6
+ 	;;
+ esac
+@@ -5947,7 +5964,7 @@
+ LD_RPATH_OPT=
+ if test "x$cf_cv_enable_rpath" != xno
+ then
+-	echo "$as_me:5950: checking for an rpath option" >&5
++	echo "$as_me:5967: checking for an rpath option" >&5
+ echo $ECHO_N "checking for an rpath option... $ECHO_C" >&6
+ 	case "$cf_cv_system_name" in
+ 	(irix*)
+@@ -5978,12 +5995,12 @@
+ 	(*)
+ 		;;
+ 	esac
+-	echo "$as_me:5981: result: $LD_RPATH_OPT" >&5
++	echo "$as_me:5998: result: $LD_RPATH_OPT" >&5
+ echo "${ECHO_T}$LD_RPATH_OPT" >&6
+ 
+ 	case "x$LD_RPATH_OPT" in
+ 	(x-R*)
+-		echo "$as_me:5986: checking if we need a space after rpath option" >&5
++		echo "$as_me:6003: 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"
+ 
+@@ -6004,7 +6021,7 @@
+ LIBS="$cf_add_libs"
+ 
+ 		cat >"conftest.$ac_ext" <<_ACEOF
+-#line 6007 "configure"
++#line 6024 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -6016,16 +6033,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:6019: \"$ac_link\"") >&5
++if { (eval echo "$as_me:6036: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:6022: \$? = $ac_status" >&5
++  echo "$as_me:6039: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:6025: \"$ac_try\"") >&5
++  { (eval echo "$as_me:6042: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:6028: \$? = $ac_status" >&5
++  echo "$as_me:6045: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_rpath_space=no
+ else
+@@ -6035,7 +6052,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ 		LIBS="$cf_save_LIBS"
+-		echo "$as_me:6038: result: $cf_rpath_space" >&5
++		echo "$as_me:6055: result: $cf_rpath_space" >&5
+ echo "${ECHO_T}$cf_rpath_space" >&6
+ 		test "$cf_rpath_space" = yes && LD_RPATH_OPT="$LD_RPATH_OPT "
+ 		;;
+@@ -6057,7 +6074,7 @@
+ 	cf_ld_rpath_opt=
+ 	test "$cf_cv_enable_rpath" = yes && cf_ld_rpath_opt="$LD_RPATH_OPT"
+ 
+-	echo "$as_me:6060: checking if release/abi version should be used for shared libs" >&5
++	echo "$as_me:6077: checking if release/abi version should be used for shared libs" >&5
+ echo $ECHO_N "checking if release/abi version should be used for shared libs... $ECHO_C" >&6
+ 
+ # Check whether --with-shlib-version or --without-shlib-version was given.
+@@ -6072,9 +6089,9 @@
+ 		cf_cv_shlib_version=$withval
+ 		;;
+ 	(*)
+-		echo "$as_me:6075: result: $withval" >&5
++		echo "$as_me:6092: result: $withval" >&5
+ echo "${ECHO_T}$withval" >&6
+-		{ { echo "$as_me:6077: error: option value must be one of: rel, abi, or auto" >&5
++		{ { echo "$as_me:6094: 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; }; }
+ 		;;
+@@ -6083,7 +6100,7 @@
+ else
+   cf_cv_shlib_version=auto
+ fi;
+-	echo "$as_me:6086: result: $cf_cv_shlib_version" >&5
++	echo "$as_me:6103: result: $cf_cv_shlib_version" >&5
+ echo "${ECHO_T}$cf_cv_shlib_version" >&6
+ 
+ 	cf_cv_rm_so_locs=no
+@@ -6106,14 +6123,14 @@
+ 
+ 	if test "$cf_try_fPIC" = yes
+ 	then
+-		echo "$as_me:6109: checking which $CC option to use" >&5
++		echo "$as_me:6126: 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 6116 "configure"
++#line 6133 "configure"
+ #include "confdefs.h"
+ #include <stdio.h>
+ int
+@@ -6125,16 +6142,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:6128: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:6145: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:6131: \$? = $ac_status" >&5
++  echo "$as_me:6148: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:6134: \"$ac_try\"") >&5
++  { (eval echo "$as_me:6151: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:6137: \$? = $ac_status" >&5
++  echo "$as_me:6154: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   break
+ else
+@@ -6143,7 +6160,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 		done
+-		echo "$as_me:6146: result: $CC_SHARED_OPTS" >&5
++		echo "$as_me:6163: result: $CC_SHARED_OPTS" >&5
+ echo "${ECHO_T}$CC_SHARED_OPTS" >&6
+ 		CFLAGS="$cf_save_CFLAGS"
+ 	fi
+@@ -6214,7 +6231,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:6217: checking if ld -search_paths_first works" >&5
++		echo "$as_me:6234: 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
+@@ -6223,7 +6240,7 @@
+ 			cf_save_LDFLAGS=$LDFLAGS
+ 			LDFLAGS="$LDFLAGS -Wl,-search_paths_first"
+ 			cat >"conftest.$ac_ext" <<_ACEOF
+-#line 6226 "configure"
++#line 6243 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -6235,16 +6252,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:6238: \"$ac_link\"") >&5
++if { (eval echo "$as_me:6255: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:6241: \$? = $ac_status" >&5
++  echo "$as_me:6258: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:6244: \"$ac_try\"") >&5
++  { (eval echo "$as_me:6261: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:6247: \$? = $ac_status" >&5
++  echo "$as_me:6264: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_ldflags_search_paths_first=yes
+ else
+@@ -6255,7 +6272,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ 				LDFLAGS=$cf_save_LDFLAGS
+ fi
+-echo "$as_me:6258: result: $cf_cv_ldflags_search_paths_first" >&5
++echo "$as_me:6275: 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"
+@@ -6605,7 +6622,7 @@
+ 			do
+ 				CFLAGS="$cf_shared_opts $cf_save_CFLAGS"
+ 				cat >"conftest.$ac_ext" <<_ACEOF
+-#line 6608 "configure"
++#line 6625 "configure"
+ #include "confdefs.h"
+ #include <stdio.h>
+ int
+@@ -6617,16 +6634,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:6620: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:6637: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:6623: \$? = $ac_status" >&5
++  echo "$as_me:6640: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:6626: \"$ac_try\"") >&5
++  { (eval echo "$as_me:6643: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:6629: \$? = $ac_status" >&5
++  echo "$as_me:6646: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   break
+ else
+@@ -6663,7 +6680,7 @@
+ 			test "$cf_cv_do_symlinks" = no && cf_cv_do_symlinks=yes
+ 			;;
+ 		(*)
+-			{ echo "$as_me:6666: WARNING: ignored --with-shlib-version" >&5
++			{ echo "$as_me:6683: WARNING: ignored --with-shlib-version" >&5
+ echo "$as_me: WARNING: ignored --with-shlib-version" >&2;}
+ 			;;
+ 		esac
+@@ -6673,7 +6690,7 @@
+ 	if test -n "$cf_try_cflags"
+ 	then
+ cat > conftest.$ac_ext <<EOF
+-#line 6676 "${as_me:-configure}"
++#line 6693 "${as_me:-configure}"
+ #include <stdio.h>
+ int main(int argc, char *argv[])
+ {
+@@ -6685,18 +6702,18 @@
+ 		for cf_opt in $cf_try_cflags
+ 		do
+ 			CFLAGS="$cf_save_CFLAGS -$cf_opt"
+-			echo "$as_me:6688: checking if CFLAGS option -$cf_opt works" >&5
++			echo "$as_me:6705: 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:6690: \"$ac_compile\"") >&5
++			if { (eval echo "$as_me:6707: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:6693: \$? = $ac_status" >&5
++  echo "$as_me:6710: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; then
+-				echo "$as_me:6695: result: yes" >&5
++				echo "$as_me:6712: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ 				cf_save_CFLAGS="$CFLAGS"
+ 			else
+-				echo "$as_me:6699: result: no" >&5
++				echo "$as_me:6716: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ 			fi
+ 		done
+@@ -6711,17 +6728,17 @@
+ 
+ 	test -n "$verbose" && echo "	CC_SHARED_OPTS: $CC_SHARED_OPTS" 1>&6
+ 
+-echo "${as_me:-configure}:6714: testing CC_SHARED_OPTS: $CC_SHARED_OPTS ..." 1>&5
++echo "${as_me:-configure}:6731: 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}:6718: testing MK_SHARED_LIB:  $MK_SHARED_LIB ..." 1>&5
++echo "${as_me:-configure}:6735: testing MK_SHARED_LIB:  $MK_SHARED_LIB ..." 1>&5
+ 
+ for model in $cf_list_models ; do
+ 	case "$model" in
+ 	(libtool)
+ 
+-echo "$as_me:6724: checking for additional libtool options" >&5
++echo "$as_me:6741: 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.
+@@ -6731,7 +6748,7 @@
+ else
+   with_libtool_opts=no
+ fi;
+-echo "$as_me:6734: result: $with_libtool_opts" >&5
++echo "$as_me:6751: result: $with_libtool_opts" >&5
+ echo "${ECHO_T}$with_libtool_opts" >&6
+ 
+ case .$with_libtool_opts in
+@@ -6742,7 +6759,7 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:6745: checking if exported-symbols file should be used" >&5
++echo "$as_me:6762: 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.
+@@ -6757,7 +6774,7 @@
+ 	with_export_syms='${top_srcdir}/package/${PACKAGE}.sym'
+ 
+ fi
+-echo "$as_me:6760: result: $with_export_syms" >&5
++echo "$as_me:6777: result: $with_export_syms" >&5
+ echo "${ECHO_T}$with_export_syms" >&6
+ if test "x$with_export_syms" != xno
+ then
+@@ -6768,15 +6785,15 @@
+ 		;;
+ 	(shared)
+ 		if test "$CC_SHARED_OPTS" = "unknown"; then
+-			{ { echo "$as_me:6771: error: Shared libraries are not supported in this version" >&5
++			{ { echo "$as_me:6788: 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:6776: checking if current CFLAGS link properly" >&5
++		echo "$as_me:6793: 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 6779 "configure"
++#line 6796 "configure"
+ #include "confdefs.h"
+ #include <stdio.h>
+ int
+@@ -6788,16 +6805,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:6791: \"$ac_link\"") >&5
++if { (eval echo "$as_me:6808: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:6794: \$? = $ac_status" >&5
++  echo "$as_me:6811: \$? = $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:6814: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:6800: \$? = $ac_status" >&5
++  echo "$as_me:6817: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cflags_work=yes
+ else
+@@ -6806,18 +6823,18 @@
+ cf_cflags_work=no
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+-		echo "$as_me:6809: result: $cf_cflags_work" >&5
++		echo "$as_me:6826: 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}:6815: testing try to work around by appending shared-options ..." 1>&5
++echo "${as_me:-configure}:6832: testing try to work around by appending shared-options ..." 1>&5
+ 
+ 			CFLAGS="$CFLAGS $CC_SHARED_OPTS"
+ 		fi
+ 
+-echo "$as_me:6820: checking if versioned-symbols file should be used" >&5
++echo "$as_me:6837: 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.
+@@ -6835,18 +6852,18 @@
+ (xno)
+ 	;;
+ (x/*)
+-	test -f "$with_versioned_syms" || { { echo "$as_me:6838: error: expected a filename: $with_versioned_syms" >&5
++	test -f "$with_versioned_syms" || { { echo "$as_me:6855: 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:6843: error: expected a filename: $with_versioned_syms" >&5
++	test -f "$with_versioned_syms" || { { echo "$as_me:6860: 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:6849: result: $with_versioned_syms" >&5
++echo "$as_me:6866: result: $with_versioned_syms" >&5
+ echo "${ECHO_T}$with_versioned_syms" >&6
+ 
+ RESULTING_SYMS=
+@@ -6862,7 +6879,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}:6865: testing MK_SHARED_LIB:  $MK_SHARED_LIB ..." 1>&5
++echo "${as_me:-configure}:6882: testing MK_SHARED_LIB:  $MK_SHARED_LIB ..." 1>&5
+ 
+ 		;;
+ 	(*-dy\ *)
+@@ -6870,11 +6887,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}:6873: testing MK_SHARED_LIB:  $MK_SHARED_LIB ..." 1>&5
++echo "${as_me:-configure}:6890: testing MK_SHARED_LIB:  $MK_SHARED_LIB ..." 1>&5
+ 
+ 		;;
+ 	(*)
+-		{ echo "$as_me:6877: WARNING: this system does not support versioned-symbols" >&5
++		{ echo "$as_me:6894: WARNING: this system does not support versioned-symbols" >&5
+ echo "$as_me: WARNING: this system does not support versioned-symbols" >&2;}
+ 		;;
+ 	esac
+@@ -6886,7 +6903,7 @@
+ 	# symbols.
+ 	if test "x$VERSIONED_SYMS" != "x"
+ 	then
+-		echo "$as_me:6889: checking if wildcards can be used to selectively omit symbols" >&5
++		echo "$as_me:6906: 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
+ 
+@@ -6923,7 +6940,7 @@
+ } submodule_1.0;
+ EOF
+ 		cat >conftest.$ac_ext <<EOF
+-#line 6926 "configure"
++#line 6943 "configure"
+ int	_ismissing(void) { return 1; }
+ int	_localf1(void) { return 1; }
+ int	_localf2(void) { return 2; }
+@@ -6954,7 +6971,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:6957: result: $WILDCARD_SYMS" >&5
++		echo "$as_me:6974: result: $WILDCARD_SYMS" >&5
+ echo "${ECHO_T}$WILDCARD_SYMS" >&6
+ 		rm -f conftest.*
+ 	fi
+@@ -6967,7 +6984,7 @@
+ ### Checks for special libraries, must be done up-front.
+ SHLIB_LIST=""
+ 
+-echo "$as_me:6970: checking if you want to link with the GPM mouse library" >&5
++echo "$as_me:6987: 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.
+@@ -6977,27 +6994,27 @@
+ else
+   with_gpm=maybe
+ fi;
+-echo "$as_me:6980: result: $with_gpm" >&5
++echo "$as_me:6997: result: $with_gpm" >&5
+ echo "${ECHO_T}$with_gpm" >&6
+ 
+ if test "$with_gpm" != no ; then
+-	echo "$as_me:6984: checking for gpm.h" >&5
++	echo "$as_me:7001: 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 6990 "configure"
++#line 7007 "configure"
+ #include "confdefs.h"
+ #include <gpm.h>
+ _ACEOF
+-if { (eval echo "$as_me:6994: \"$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:7000: \$? = $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
+@@ -7016,7 +7033,7 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:7019: result: $ac_cv_header_gpm_h" >&5
++echo "$as_me:7036: 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
+ 
+@@ -7027,7 +7044,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}:7030: testing assuming we really have GPM library ..." 1>&5
++echo "${as_me:-configure}:7047: testing assuming we really have GPM library ..." 1>&5
+ 
+ cat >>confdefs.h <<\EOF
+ #define HAVE_LIBGPM 1
+@@ -7035,7 +7052,7 @@
+ 
+ 			with_gpm=yes
+ 		else
+-			echo "$as_me:7038: checking for Gpm_Open in -lgpm" >&5
++			echo "$as_me:7055: 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
+@@ -7043,7 +7060,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lgpm  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 7046 "configure"
++#line 7063 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -7062,16 +7079,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:7065: \"$ac_link\"") >&5
++if { (eval echo "$as_me:7082: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:7068: \$? = $ac_status" >&5
++  echo "$as_me:7085: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:7071: \"$ac_try\"") >&5
++  { (eval echo "$as_me:7088: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:7074: \$? = $ac_status" >&5
++  echo "$as_me:7091: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_gpm_Gpm_Open=yes
+ else
+@@ -7082,18 +7099,18 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:7085: result: $ac_cv_lib_gpm_Gpm_Open" >&5
++echo "$as_me:7102: 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:7092: WARNING: Cannot link with GPM library" >&5
++					{ echo "$as_me:7109: WARNING: Cannot link with GPM library" >&5
+ echo "$as_me: WARNING: Cannot link with GPM library" >&2;}
+ 					with_gpm=no
+ 				else
+-					{ { echo "$as_me:7096: error: Cannot link with GPM library" >&5
++					{ { echo "$as_me:7113: error: Cannot link with GPM library" >&5
+ echo "$as_me: error: Cannot link with GPM library" >&2;}
+    { (exit 1); exit 1; }; }
+ 				fi
+@@ -7104,7 +7121,7 @@
+ 
+ else
+ 
+-		test "$with_gpm" != maybe && { echo "$as_me:7107: WARNING: Cannot find GPM header" >&5
++		test "$with_gpm" != maybe && { echo "$as_me:7124: WARNING: Cannot find GPM header" >&5
+ echo "$as_me: WARNING: Cannot find GPM header" >&2;}
+ 		with_gpm=no
+ 
+@@ -7113,7 +7130,7 @@
+ fi
+ 
+ if test "$with_gpm" != no ; then
+-	echo "$as_me:7116: checking if you want to load GPM dynamically" >&5
++	echo "$as_me:7133: 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.
+@@ -7123,18 +7140,18 @@
+ else
+   with_dlsym=yes
+ fi;
+-	echo "$as_me:7126: result: $with_dlsym" >&5
++	echo "$as_me:7143: result: $with_dlsym" >&5
+ echo "${ECHO_T}$with_dlsym" >&6
+ 	if test "x$with_dlsym" = xyes ; then
+ 
+ cf_have_dlsym=no
+-echo "$as_me:7131: checking for dlsym" >&5
++echo "$as_me:7148: 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 7137 "configure"
++#line 7154 "configure"
+ #include "confdefs.h"
+ #define dlsym autoconf_temporary
+ #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -7165,16 +7182,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:7168: \"$ac_link\"") >&5
++if { (eval echo "$as_me:7185: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:7171: \$? = $ac_status" >&5
++  echo "$as_me:7188: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:7174: \"$ac_try\"") >&5
++  { (eval echo "$as_me:7191: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:7177: \$? = $ac_status" >&5
++  echo "$as_me:7194: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_func_dlsym=yes
+ else
+@@ -7184,14 +7201,14 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:7187: result: $ac_cv_func_dlsym" >&5
++echo "$as_me:7204: 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:7194: checking for dlsym in -ldl" >&5
++echo "$as_me:7211: 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
+@@ -7199,7 +7216,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-ldl  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 7202 "configure"
++#line 7219 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -7218,16 +7235,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:7221: \"$ac_link\"") >&5
++if { (eval echo "$as_me:7238: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:7224: \$? = $ac_status" >&5
++  echo "$as_me:7241: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:7227: \"$ac_try\"") >&5
++  { (eval echo "$as_me:7244: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:7230: \$? = $ac_status" >&5
++  echo "$as_me:7247: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_dl_dlsym=yes
+ else
+@@ -7238,7 +7255,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:7241: result: $ac_cv_lib_dl_dlsym" >&5
++echo "$as_me:7258: 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
+ 
+@@ -7267,10 +7284,10 @@
+ LIBS="$cf_add_libs"
+  }
+ 
+-	echo "$as_me:7270: checking whether able to link to dl*() functions" >&5
++	echo "$as_me:7287: 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 7273 "configure"
++#line 7290 "configure"
+ #include "confdefs.h"
+ #include <dlfcn.h>
+ int
+@@ -7288,16 +7305,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:7291: \"$ac_link\"") >&5
++if { (eval echo "$as_me:7308: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:7294: \$? = $ac_status" >&5
++  echo "$as_me:7311: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:7297: \"$ac_try\"") >&5
++  { (eval echo "$as_me:7314: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:7300: \$? = $ac_status" >&5
++  echo "$as_me:7317: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+ 
+ cat >>confdefs.h <<\EOF
+@@ -7308,15 +7325,15 @@
+   echo "$as_me: failed program was:" >&5
+ cat "conftest.$ac_ext" >&5
+ 
+-		{ { echo "$as_me:7311: error: Cannot link test program for libdl" >&5
++		{ { echo "$as_me:7328: 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:7316: result: ok" >&5
++	echo "$as_me:7333: result: ok" >&5
+ echo "${ECHO_T}ok" >&6
+ else
+-	{ { echo "$as_me:7319: error: Cannot find dlsym function" >&5
++	{ { echo "$as_me:7336: error: Cannot find dlsym function" >&5
+ echo "$as_me: error: Cannot find dlsym function" >&2;}
+    { (exit 1); exit 1; }; }
+ fi
+@@ -7324,12 +7341,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}:7327: testing assuming soname for gpm is $with_gpm ..." 1>&5
++echo "${as_me:-configure}:7344: testing assuming soname for gpm is $with_gpm ..." 1>&5
+ 
+ 			cf_cv_gpm_soname="$with_gpm"
+ 		else
+ 
+-echo "$as_me:7332: checking for soname of gpm library" >&5
++echo "$as_me:7349: 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
+@@ -7363,15 +7380,15 @@
+ done
+ LIBS="$cf_add_libs"
+ 
+-	if { (eval echo "$as_me:7366: \"$ac_compile\"") >&5
++	if { (eval echo "$as_me:7383: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:7369: \$? = $ac_status" >&5
++  echo "$as_me:7386: \$? = $ac_status" >&5
+   (exit "$ac_status"); } ; then
+-		if { (eval echo "$as_me:7371: \"$ac_link\"") >&5
++		if { (eval echo "$as_me:7388: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:7374: \$? = $ac_status" >&5
++  echo "$as_me:7391: \$? = $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
+@@ -7382,7 +7399,7 @@
+ fi
+ 
+ fi
+-echo "$as_me:7385: result: $cf_cv_gpm_soname" >&5
++echo "$as_me:7402: result: $cf_cv_gpm_soname" >&5
+ echo "${ECHO_T}$cf_cv_gpm_soname" >&6
+ 
+ 		fi
+@@ -7450,7 +7467,7 @@
+ #define HAVE_LIBGPM 1
+ EOF
+ 
+-echo "$as_me:7453: checking for Gpm_Wgetch in -lgpm" >&5
++echo "$as_me:7470: 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
+@@ -7458,7 +7475,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lgpm  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 7461 "configure"
++#line 7478 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -7477,16 +7494,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:7480: \"$ac_link\"") >&5
++if { (eval echo "$as_me:7497: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:7483: \$? = $ac_status" >&5
++  echo "$as_me:7500: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:7486: \"$ac_try\"") >&5
++  { (eval echo "$as_me:7503: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:7489: \$? = $ac_status" >&5
++  echo "$as_me:7506: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_gpm_Gpm_Wgetch=yes
+ else
+@@ -7497,11 +7514,11 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:7500: result: $ac_cv_lib_gpm_Gpm_Wgetch" >&5
++echo "$as_me:7517: 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:7504: checking if GPM is weakly bound to curses library" >&5
++echo "$as_me:7521: 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
+@@ -7525,15 +7542,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:7528: \"$ac_compile\"") >&5
++	if { (eval echo "$as_me:7545: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:7531: \$? = $ac_status" >&5
++  echo "$as_me:7548: \$? = $ac_status" >&5
+   (exit "$ac_status"); } ; then
+-		if { (eval echo "$as_me:7533: \"$ac_link\"") >&5
++		if { (eval echo "$as_me:7550: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:7536: \$? = $ac_status" >&5
++  echo "$as_me:7553: \$? = $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
+@@ -7545,11 +7562,11 @@
+ fi
+ 
+ fi
+-echo "$as_me:7548: result: $cf_cv_check_gpm_wgetch" >&5
++echo "$as_me:7565: 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:7552: WARNING: GPM library is already linked with curses - read the FAQ" >&5
++	{ echo "$as_me:7569: 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
+ 
+@@ -7557,7 +7574,7 @@
+ 
+ fi
+ 
+-echo "$as_me:7560: checking if you want to use PCRE2 for regular-expressions" >&5
++echo "$as_me:7577: 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.
+@@ -7566,7 +7583,7 @@
+ 
+ fi;
+ test -z "$with_pcre2" && with_pcre2=no
+-echo "$as_me:7569: result: $with_pcre2" >&5
++echo "$as_me:7586: result: $with_pcre2" >&5
+ echo "${ECHO_T}$with_pcre2" >&6
+ 
+ if test "x$with_pcre2" != xno ; then
+@@ -7577,17 +7594,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}:7580: testing found package $cf_with_pcre2 ..." 1>&5
++echo "${as_me:-configure}:7597: 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}:7586: testing package $cf_with_pcre2 CFLAGS: $cf_pkgconfig_incs ..." 1>&5
++echo "${as_me:-configure}:7603: 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}:7590: testing package $cf_with_pcre2 LIBS: $cf_pkgconfig_libs ..." 1>&5
++echo "${as_me:-configure}:7607: testing package $cf_with_pcre2 LIBS: $cf_pkgconfig_libs ..." 1>&5
+ 
+ cf_fix_cppflags=no
+ cf_new_cflags=
+@@ -7711,7 +7728,7 @@
+ fi
+ 
+ 	done
+-	cf_with_pcre2_ok=yes || { { echo "$as_me:7714: error: Cannot find PCRE2 library" >&5
++	cf_with_pcre2_ok=yes || { { echo "$as_me:7731: error: Cannot find PCRE2 library" >&5
+ echo "$as_me: error: Cannot find PCRE2 library" >&2;}
+    { (exit 1); exit 1; }; }
+ 
+@@ -7724,7 +7741,7 @@
+ 	(*pcre2-posix*|*pcreposix*)
+ 		;;
+ 	(*)
+-		echo "$as_me:7727: checking for regcomp in -lpcre2-posix" >&5
++		echo "$as_me:7744: 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
+@@ -7732,7 +7749,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lpcre2-posix  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 7735 "configure"
++#line 7752 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -7751,16 +7768,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:7754: \"$ac_link\"") >&5
++if { (eval echo "$as_me:7771: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:7757: \$? = $ac_status" >&5
++  echo "$as_me:7774: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:7760: \"$ac_try\"") >&5
++  { (eval echo "$as_me:7777: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:7763: \$? = $ac_status" >&5
++  echo "$as_me:7780: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_pcre2_posix_regcomp=yes
+ else
+@@ -7771,7 +7788,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:7774: result: $ac_cv_lib_pcre2_posix_regcomp" >&5
++echo "$as_me:7791: 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
+ 
+@@ -7792,7 +7809,7 @@
+ LIBS="$cf_add_libs"
+ 
+ else
+-  echo "$as_me:7795: checking for regcomp in -lpcreposix" >&5
++  echo "$as_me:7812: 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
+@@ -7800,7 +7817,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lpcreposix  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 7803 "configure"
++#line 7820 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -7819,16 +7836,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:7822: \"$ac_link\"") >&5
++if { (eval echo "$as_me:7839: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:7825: \$? = $ac_status" >&5
++  echo "$as_me:7842: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:7828: \"$ac_try\"") >&5
++  { (eval echo "$as_me:7845: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:7831: \$? = $ac_status" >&5
++  echo "$as_me:7848: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_pcreposix_regcomp=yes
+ else
+@@ -7839,7 +7856,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:7842: result: $ac_cv_lib_pcreposix_regcomp" >&5
++echo "$as_me:7859: 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
+ 
+@@ -7860,7 +7877,7 @@
+ LIBS="$cf_add_libs"
+ 
+ else
+-  { { echo "$as_me:7863: error: Cannot find PCRE2 POSIX library" >&5
++  { { echo "$as_me:7880: error: Cannot find PCRE2 POSIX library" >&5
+ echo "$as_me: error: Cannot find PCRE2 POSIX library" >&2;}
+    { (exit 1); exit 1; }; }
+ fi
+@@ -7875,23 +7892,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:7878: checking for $ac_header" >&5
++echo "$as_me:7895: 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 7884 "configure"
++#line 7901 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:7888: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:7905: \"$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:7894: \$? = $ac_status" >&5
++  echo "$as_me:7911: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -7910,7 +7927,7 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:7913: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
++echo "$as_me:7930: 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
+@@ -7923,13 +7940,13 @@
+ for ac_func in PCRE2regcomp
+ do
+ as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+-echo "$as_me:7926: checking for $ac_func" >&5
++echo "$as_me:7943: 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 7932 "configure"
++#line 7949 "configure"
+ #include "confdefs.h"
+ #define $ac_func autoconf_temporary
+ #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -7960,16 +7977,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:7963: \"$ac_link\"") >&5
++if { (eval echo "$as_me:7980: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:7966: \$? = $ac_status" >&5
++  echo "$as_me:7983: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:7969: \"$ac_try\"") >&5
++  { (eval echo "$as_me:7986: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:7972: \$? = $ac_status" >&5
++  echo "$as_me:7989: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   eval "$as_ac_var=yes"
+ else
+@@ -7979,7 +7996,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:7982: result: `eval echo '${'"$as_ac_var"'}'`" >&5
++echo "$as_me:7999: 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
+@@ -7993,7 +8010,7 @@
+ 
+ # not everyone has "test -c"
+ if test -c /dev/sysmouse 2>/dev/null ; then
+-echo "$as_me:7996: checking if you want to use sysmouse" >&5
++echo "$as_me:8013: 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.
+@@ -8005,7 +8022,7 @@
+ fi;
+ 	if test "$cf_with_sysmouse" != no ; then
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 8008 "configure"
++#line 8025 "configure"
+ #include "confdefs.h"
+ 
+ #include <osreldate.h>
+@@ -8028,16 +8045,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:8031: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:8048: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:8034: \$? = $ac_status" >&5
++  echo "$as_me:8051: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:8037: \"$ac_try\"") >&5
++  { (eval echo "$as_me:8054: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:8040: \$? = $ac_status" >&5
++  echo "$as_me:8057: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_with_sysmouse=yes
+ else
+@@ -8047,7 +8064,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 	fi
+-echo "$as_me:8050: result: $cf_with_sysmouse" >&5
++echo "$as_me:8067: result: $cf_with_sysmouse" >&5
+ echo "${ECHO_T}$cf_with_sysmouse" >&6
+ test "$cf_with_sysmouse" = yes &&
+ cat >>confdefs.h <<\EOF
+@@ -8057,7 +8074,7 @@
+ fi
+ 
+ # pretend that ncurses==ncursesw==ncursest
+-echo "$as_me:8060: checking if you want to disable library suffixes" >&5
++echo "$as_me:8077: 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.
+@@ -8074,13 +8091,13 @@
+ 	disable_lib_suffixes=no
+ 
+ fi;
+-echo "$as_me:8077: result: $disable_lib_suffixes" >&5
++echo "$as_me:8094: 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:8083: checking if rpath-hack should be disabled" >&5
++echo "$as_me:8100: 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.
+@@ -8098,22 +8115,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:8101: result: $cf_disable_rpath_hack" >&5
++echo "$as_me:8118: result: $cf_disable_rpath_hack" >&5
+ echo "${ECHO_T}$cf_disable_rpath_hack" >&6
+ 
+ if test "$enable_rpath_hack" = yes ; then
+ 
+-echo "$as_me:8106: checking for updated LDFLAGS" >&5
++echo "$as_me:8123: 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:8109: result: maybe" >&5
++	echo "$as_me:8126: 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:8116: checking for $ac_word" >&5
++echo "$as_me:8133: 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
+@@ -8128,7 +8145,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:8131: found $ac_dir/$ac_word" >&5
++echo "$as_me:8148: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -8136,10 +8153,10 @@
+ fi
+ cf_ldd_prog=$ac_cv_prog_cf_ldd_prog
+ if test -n "$cf_ldd_prog"; then
+-  echo "$as_me:8139: result: $cf_ldd_prog" >&5
++  echo "$as_me:8156: result: $cf_ldd_prog" >&5
+ echo "${ECHO_T}$cf_ldd_prog" >&6
+ else
+-  echo "$as_me:8142: result: no" >&5
++  echo "$as_me:8159: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -8153,7 +8170,7 @@
+ 		cf_rpath_oops=
+ 
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 8156 "configure"
++#line 8173 "configure"
+ #include "confdefs.h"
+ #include <stdio.h>
+ int
+@@ -8165,16 +8182,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:8168: \"$ac_link\"") >&5
++if { (eval echo "$as_me:8185: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:8171: \$? = $ac_status" >&5
++  echo "$as_me:8188: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:8174: \"$ac_try\"") >&5
++  { (eval echo "$as_me:8191: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:8177: \$? = $ac_status" >&5
++  echo "$as_me:8194: \$? = $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`
+@@ -8202,7 +8219,7 @@
+ 					then
+ 						test -n "$verbose" && echo "	...adding -L$cf_rpath_dir/lib to LDFLAGS for $cf_rpath_src" 1>&6
+ 
+-echo "${as_me:-configure}:8205: testing ...adding -L$cf_rpath_dir/lib to LDFLAGS for $cf_rpath_src ..." 1>&5
++echo "${as_me:-configure}:8222: testing ...adding -L$cf_rpath_dir/lib to LDFLAGS for $cf_rpath_src ..." 1>&5
+ 
+ 						LDFLAGS="$LDFLAGS -L$cf_rpath_dir/lib"
+ 						break
+@@ -8214,11 +8231,11 @@
+ 
+ 	test -n "$verbose" && echo "	...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:8217: testing ...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
++echo "${as_me:-configure}:8234: testing ...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
+ 
+ test -n "$verbose" && echo "	...checking LDFLAGS $LDFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:8221: testing ...checking LDFLAGS $LDFLAGS ..." 1>&5
++echo "${as_me:-configure}:8238: testing ...checking LDFLAGS $LDFLAGS ..." 1>&5
+ 
+ cf_rpath_dst=
+ for cf_rpath_src in $LDFLAGS
+@@ -8255,7 +8272,7 @@
+ 			then
+ 				test -n "$verbose" && echo "	...Filter $cf_rpath_src ->$cf_rpath_tmp" 1>&6
+ 
+-echo "${as_me:-configure}:8258: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
++echo "${as_me:-configure}:8275: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
+ 
+ 				EXTRA_LDFLAGS="$cf_rpath_tmp $EXTRA_LDFLAGS"
+ 			fi
+@@ -8268,11 +8285,11 @@
+ 
+ test -n "$verbose" && echo "	...checked LDFLAGS $LDFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:8271: testing ...checked LDFLAGS $LDFLAGS ..." 1>&5
++echo "${as_me:-configure}:8288: testing ...checked LDFLAGS $LDFLAGS ..." 1>&5
+ 
+ test -n "$verbose" && echo "	...checking LIBS $LIBS" 1>&6
+ 
+-echo "${as_me:-configure}:8275: testing ...checking LIBS $LIBS ..." 1>&5
++echo "${as_me:-configure}:8292: testing ...checking LIBS $LIBS ..." 1>&5
+ 
+ cf_rpath_dst=
+ for cf_rpath_src in $LIBS
+@@ -8309,7 +8326,7 @@
+ 			then
+ 				test -n "$verbose" && echo "	...Filter $cf_rpath_src ->$cf_rpath_tmp" 1>&6
+ 
+-echo "${as_me:-configure}:8312: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
++echo "${as_me:-configure}:8329: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
+ 
+ 				EXTRA_LDFLAGS="$cf_rpath_tmp $EXTRA_LDFLAGS"
+ 			fi
+@@ -8322,14 +8339,14 @@
+ 
+ test -n "$verbose" && echo "	...checked LIBS $LIBS" 1>&6
+ 
+-echo "${as_me:-configure}:8325: testing ...checked LIBS $LIBS ..." 1>&5
++echo "${as_me:-configure}:8342: testing ...checked LIBS $LIBS ..." 1>&5
+ 
+ 	test -n "$verbose" && echo "	...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:8329: testing ...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
++echo "${as_me:-configure}:8346: testing ...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
+ 
+ else
+-	echo "$as_me:8332: result: no" >&5
++	echo "$as_me:8349: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -8343,7 +8360,7 @@
+ EXTRA_PKG_LDFLAGS="$LDFLAGS $EXTRA_LDFLAGS"
+ if test -n "$EXTRA_PKG_LDFLAGS"
+ then
+-	echo "$as_me:8346: checking if you want to disable extra LDFLAGS for package-scripts" >&5
++	echo "$as_me:8363: 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.
+@@ -8360,7 +8377,7 @@
+ 	disable_pkg_ldflags=no
+ 
+ fi;
+-	echo "$as_me:8363: result: $disable_pkg_ldflags" >&5
++	echo "$as_me:8380: result: $disable_pkg_ldflags" >&5
+ echo "${ECHO_T}$disable_pkg_ldflags" >&6
+ 	test "$disable_pkg_ldflags" = yes && EXTRA_PKG_LDFLAGS=
+ fi
+@@ -8368,7 +8385,7 @@
+ ###############################################################################
+ 
+ ###	use option --with-extra-suffix to append suffix to headers and libraries
+-echo "$as_me:8371: checking if you wish to append extra suffix to header/library paths" >&5
++echo "$as_me:8388: checking if you wish to append extra suffix to header/library paths" >&5
+ echo $ECHO_N "checking if you wish to append extra suffix to header/library paths... $ECHO_C" >&6
+ EXTRA_SUFFIX=
+ 
+@@ -8387,11 +8404,11 @@
+ 	esac
+ 
+ fi;
+-echo "$as_me:8390: result: $EXTRA_SUFFIX" >&5
++echo "$as_me:8407: result: $EXTRA_SUFFIX" >&5
+ echo "${ECHO_T}$EXTRA_SUFFIX" >&6
+ 
+ ###	use option --disable-overwrite to leave out the link to -lcurses
+-echo "$as_me:8394: checking if you wish to install ncurses overwriting curses" >&5
++echo "$as_me:8411: 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.
+@@ -8401,10 +8418,10 @@
+ else
+   if test "$prefix" = "/usr" ; then with_overwrite=yes; else with_overwrite=no; fi
+ fi;
+-echo "$as_me:8404: result: $with_overwrite" >&5
++echo "$as_me:8421: result: $with_overwrite" >&5
+ echo "${ECHO_T}$with_overwrite" >&6
+ 
+-echo "$as_me:8407: checking if external terminfo-database is used" >&5
++echo "$as_me:8424: 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.
+@@ -8414,7 +8431,7 @@
+ else
+   use_database=yes
+ fi;
+-echo "$as_me:8417: result: $use_database" >&5
++echo "$as_me:8434: result: $use_database" >&5
+ echo "${ECHO_T}$use_database" >&6
+ 
+ case "$host_os" in
+@@ -8430,7 +8447,7 @@
+ if test "$use_database" != no ; then
+ 	NCURSES_USE_DATABASE=1
+ 
+-	echo "$as_me:8433: checking which terminfo source-file will be installed" >&5
++	echo "$as_me:8450: 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.
+@@ -8438,10 +8455,10 @@
+   withval="$with_database"
+   TERMINFO_SRC=$withval
+ fi;
+-	echo "$as_me:8441: result: $TERMINFO_SRC" >&5
++	echo "$as_me:8458: result: $TERMINFO_SRC" >&5
+ echo "${ECHO_T}$TERMINFO_SRC" >&6
+ 
+-	echo "$as_me:8444: checking whether to use hashed database instead of directory/tree" >&5
++	echo "$as_me:8461: 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.
+@@ -8451,13 +8468,13 @@
+ else
+   with_hashed_db=no
+ fi;
+-	echo "$as_me:8454: result: $with_hashed_db" >&5
++	echo "$as_me:8471: result: $with_hashed_db" >&5
+ echo "${ECHO_T}$with_hashed_db" >&6
+ else
+ 	with_hashed_db=no
+ fi
+ 
+-echo "$as_me:8460: checking for list of fallback descriptions" >&5
++echo "$as_me:8477: checking for list of fallback descriptions" >&5
+ echo $ECHO_N "checking for list of fallback descriptions... $ECHO_C" >&6
+ 
+ # Check whether --with-fallbacks or --without-fallbacks was given.
+@@ -8467,7 +8484,7 @@
+ else
+   with_fallback=
+ fi;
+-echo "$as_me:8470: result: $with_fallback" >&5
++echo "$as_me:8487: result: $with_fallback" >&5
+ echo "${ECHO_T}$with_fallback" >&6
+ 
+ case ".$with_fallback" in
+@@ -8475,7 +8492,7 @@
+ 	FALLBACK_LIST=
+ 	;;
+ (.yes)
+-	{ echo "$as_me:8478: WARNING: expected a list of terminal descriptions" >&5
++	{ echo "$as_me:8495: WARNING: expected a list of terminal descriptions" >&5
+ echo "$as_me: WARNING: expected a list of terminal descriptions" >&2;}
+ 	;;
+ (*)
+@@ -8491,7 +8508,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:8494: checking for $ac_word" >&5
++echo "$as_me:8511: 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
+@@ -8506,7 +8523,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:8509: found $ac_dir/$ac_word" >&5
++echo "$as_me:8526: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -8514,10 +8531,10 @@
+ fi
+ TIC=$ac_cv_prog_TIC
+ if test -n "$TIC"; then
+-  echo "$as_me:8517: result: $TIC" >&5
++  echo "$as_me:8534: result: $TIC" >&5
+ echo "${ECHO_T}$TIC" >&6
+ else
+-  echo "$as_me:8520: result: no" >&5
++  echo "$as_me:8537: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -8526,7 +8543,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:8529: checking for $ac_word" >&5
++echo "$as_me:8546: 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
+@@ -8541,7 +8558,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:8544: found $ac_dir/$ac_word" >&5
++echo "$as_me:8561: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -8549,10 +8566,10 @@
+ fi
+ ac_ct_TIC=$ac_cv_prog_ac_ct_TIC
+ if test -n "$ac_ct_TIC"; then
+-  echo "$as_me:8552: result: $ac_ct_TIC" >&5
++  echo "$as_me:8569: result: $ac_ct_TIC" >&5
+ echo "${ECHO_T}$ac_ct_TIC" >&6
+ else
+-  echo "$as_me:8555: result: no" >&5
++  echo "$as_me:8572: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -8564,7 +8581,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:8567: checking for $ac_word" >&5
++echo "$as_me:8584: 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
+@@ -8579,7 +8596,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:8582: found $ac_dir/$ac_word" >&5
++echo "$as_me:8599: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -8587,10 +8604,10 @@
+ fi
+ INFOCMP=$ac_cv_prog_INFOCMP
+ if test -n "$INFOCMP"; then
+-  echo "$as_me:8590: result: $INFOCMP" >&5
++  echo "$as_me:8607: result: $INFOCMP" >&5
+ echo "${ECHO_T}$INFOCMP" >&6
+ else
+-  echo "$as_me:8593: result: no" >&5
++  echo "$as_me:8610: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -8599,7 +8616,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:8602: checking for $ac_word" >&5
++echo "$as_me:8619: 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
+@@ -8614,7 +8631,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:8617: found $ac_dir/$ac_word" >&5
++echo "$as_me:8634: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -8622,10 +8639,10 @@
+ fi
+ ac_ct_INFOCMP=$ac_cv_prog_ac_ct_INFOCMP
+ if test -n "$ac_ct_INFOCMP"; then
+-  echo "$as_me:8625: result: $ac_ct_INFOCMP" >&5
++  echo "$as_me:8642: result: $ac_ct_INFOCMP" >&5
+ echo "${ECHO_T}$ac_ct_INFOCMP" >&6
+ else
+-  echo "$as_me:8628: result: no" >&5
++  echo "$as_me:8645: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -8640,10 +8657,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:8643: checking for tic program for fallbacks" >&5
++  echo "$as_me:8660: checking for tic program for fallbacks" >&5
+ echo $ECHO_N "checking for tic program for fallbacks... $ECHO_C" >&6
+ 		TIC=$withval
+-		echo "$as_me:8646: result: $TIC" >&5
++		echo "$as_me:8663: result: $TIC" >&5
+ echo "${ECHO_T}$TIC" >&6
+ 
+ if test "x$prefix" != xNONE; then
+@@ -8671,7 +8688,7 @@
+ 	TIC=`echo "$TIC" | sed -e s%NONE%$cf_path_syntax%`
+ 	;;
+ (*)
+-	{ { echo "$as_me:8674: error: expected a pathname, not \"$TIC\"" >&5
++	{ { echo "$as_me:8691: error: expected a pathname, not \"$TIC\"" >&5
+ echo "$as_me: error: expected a pathname, not \"$TIC\"" >&2;}
+    { (exit 1); exit 1; }; }
+ 	;;
+@@ -8684,7 +8701,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:8687: checking for $ac_word" >&5
++echo "$as_me:8704: 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
+@@ -8701,7 +8718,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:8704: found $ac_dir/$ac_word" >&5
++   echo "$as_me:8721: found $ac_dir/$ac_word" >&5
+    break
+ fi
+ done
+@@ -8712,10 +8729,10 @@
+ TIC=$ac_cv_path_TIC
+ 
+ if test -n "$TIC"; then
+-  echo "$as_me:8715: result: $TIC" >&5
++  echo "$as_me:8732: result: $TIC" >&5
+ echo "${ECHO_T}$TIC" >&6
+ else
+-  echo "$as_me:8718: result: no" >&5
++  echo "$as_me:8735: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -8774,7 +8791,7 @@
+ 
+ if test -n "$cf_path_prog" ; then
+ 
+-echo "${as_me:-configure}:8777: testing defining path for ${cf_path_prog} ..." 1>&5
++echo "${as_me:-configure}:8794: testing defining path for ${cf_path_prog} ..." 1>&5
+ 
+ cat >>confdefs.h <<EOF
+ #define TIC_PATH "$cf_path_prog"
+@@ -8789,7 +8806,7 @@
+ 
+ 		if test -z "$TIC"
+ 		then
+-			{ echo "$as_me:8792: WARNING: no tic program found for fallbacks" >&5
++			{ echo "$as_me:8809: WARNING: no tic program found for fallbacks" >&5
+ echo "$as_me: WARNING: no tic program found for fallbacks" >&2;}
+ 		fi
+ 
+@@ -8798,10 +8815,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:8801: checking for infocmp program for fallbacks" >&5
++  echo "$as_me:8818: checking for infocmp program for fallbacks" >&5
+ echo $ECHO_N "checking for infocmp program for fallbacks... $ECHO_C" >&6
+ 		INFOCMP=$withval
+-		echo "$as_me:8804: result: $INFOCMP" >&5
++		echo "$as_me:8821: result: $INFOCMP" >&5
+ echo "${ECHO_T}$INFOCMP" >&6
+ 
+ if test "x$prefix" != xNONE; then
+@@ -8829,7 +8846,7 @@
+ 	INFOCMP=`echo "$INFOCMP" | sed -e s%NONE%$cf_path_syntax%`
+ 	;;
+ (*)
+-	{ { echo "$as_me:8832: error: expected a pathname, not \"$INFOCMP\"" >&5
++	{ { echo "$as_me:8849: error: expected a pathname, not \"$INFOCMP\"" >&5
+ echo "$as_me: error: expected a pathname, not \"$INFOCMP\"" >&2;}
+    { (exit 1); exit 1; }; }
+ 	;;
+@@ -8842,7 +8859,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:8845: checking for $ac_word" >&5
++echo "$as_me:8862: 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
+@@ -8859,7 +8876,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:8862: found $ac_dir/$ac_word" >&5
++   echo "$as_me:8879: found $ac_dir/$ac_word" >&5
+    break
+ fi
+ done
+@@ -8870,10 +8887,10 @@
+ INFOCMP=$ac_cv_path_INFOCMP
+ 
+ if test -n "$INFOCMP"; then
+-  echo "$as_me:8873: result: $INFOCMP" >&5
++  echo "$as_me:8890: result: $INFOCMP" >&5
+ echo "${ECHO_T}$INFOCMP" >&6
+ else
+-  echo "$as_me:8876: result: no" >&5
++  echo "$as_me:8893: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -8932,7 +8949,7 @@
+ 
+ if test -n "$cf_path_prog" ; then
+ 
+-echo "${as_me:-configure}:8935: testing defining path for ${cf_path_prog} ..." 1>&5
++echo "${as_me:-configure}:8952: testing defining path for ${cf_path_prog} ..." 1>&5
+ 
+ cat >>confdefs.h <<EOF
+ #define INFOCMP_PATH "$cf_path_prog"
+@@ -8947,7 +8964,7 @@
+ 
+ 		if test -z "$INFOCMP"
+ 		then
+-			{ echo "$as_me:8950: WARNING: no infocmp program found for fallbacks" >&5
++			{ echo "$as_me:8967: WARNING: no infocmp program found for fallbacks" >&5
+ echo "$as_me: WARNING: no infocmp program found for fallbacks" >&2;}
+ 		fi
+ 
+@@ -8957,7 +8974,7 @@
+ 	test -z "$INFOCMP" && FALLBACK_LIST=
+ 	if test -z "$FALLBACK_LIST"
+ 	then
+-		{ echo "$as_me:8960: WARNING: ignoring fallback option because tic/infocmp are not available" >&5
++		{ echo "$as_me:8977: 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
+@@ -8965,7 +8982,7 @@
+ USE_FALLBACKS=
+ test -z "$FALLBACK_LIST" && USE_FALLBACKS="#"
+ 
+-echo "$as_me:8968: checking if you want modern xterm or antique" >&5
++echo "$as_me:8985: 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.
+@@ -8979,11 +8996,11 @@
+ (no) with_xterm_new=xterm-old;;
+ (*)	 with_xterm_new=xterm-new;;
+ esac
+-echo "$as_me:8982: result: $with_xterm_new" >&5
++echo "$as_me:8999: result: $with_xterm_new" >&5
+ echo "${ECHO_T}$with_xterm_new" >&6
+ WHICH_XTERM=$with_xterm_new
+ 
+-echo "$as_me:8986: checking if xterm backspace sends BS or DEL" >&5
++echo "$as_me:9003: 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.
+@@ -9004,7 +9021,7 @@
+ 	with_xterm_kbs=$withval
+ 	;;
+ esac
+-echo "$as_me:9007: result: $with_xterm_kbs" >&5
++echo "$as_me:9024: result: $with_xterm_kbs" >&5
+ echo "${ECHO_T}$with_xterm_kbs" >&6
+ XTERM_KBS=$with_xterm_kbs
+ 
+@@ -9014,7 +9031,7 @@
+ 	MAKE_TERMINFO="#"
+ else
+ 
+-echo "$as_me:9017: checking for list of terminfo directories" >&5
++echo "$as_me:9034: 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.
+@@ -9054,7 +9071,7 @@
+ 	cf_src_path=`echo "$cf_src_path" | sed -e s%NONE%$cf_path_syntax%`
+ 	;;
+ (*)
+-	{ { echo "$as_me:9057: error: expected a pathname, not \"$cf_src_path\"" >&5
++	{ { echo "$as_me:9074: 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; }; }
+ 	;;
+@@ -9077,7 +9094,7 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:9080: result: $TERMINFO_DIRS" >&5
++echo "$as_me:9097: result: $TERMINFO_DIRS" >&5
+ echo "${ECHO_T}$TERMINFO_DIRS" >&6
+ test -n "$TERMINFO_DIRS" &&
+ cat >>confdefs.h <<EOF
+@@ -9086,13 +9103,13 @@
+ 
+ case "x$TERMINFO" in
+ x???:*)
+-	{ echo "$as_me:9089: WARNING: ignoring non-directory/file TERMINFO value" >&5
++	{ echo "$as_me:9106: 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:9095: checking for default terminfo directory" >&5
++echo "$as_me:9112: 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.
+@@ -9128,7 +9145,7 @@
+ 	withval=`echo "$withval" | sed -e s%NONE%$cf_path_syntax%`
+ 	;;
+ (*)
+-	{ { echo "$as_me:9131: error: expected a pathname, not \"$withval\"" >&5
++	{ { echo "$as_me:9148: error: expected a pathname, not \"$withval\"" >&5
+ echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
+    { (exit 1); exit 1; }; }
+ 	;;
+@@ -9137,7 +9154,7 @@
+ fi
+ eval TERMINFO="$withval"
+ 
+-echo "$as_me:9140: result: $TERMINFO" >&5
++echo "$as_me:9157: result: $TERMINFO" >&5
+ echo "${ECHO_T}$TERMINFO" >&6
+ 
+ cat >>confdefs.h <<EOF
+@@ -9148,7 +9165,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:9151: checking if big-core option selected" >&5
++echo "$as_me:9168: 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.
+@@ -9160,7 +9177,7 @@
+   with_big_core=no
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 9163 "configure"
++#line 9180 "configure"
+ #include "confdefs.h"
+ 
+ #include <stdlib.h>
+@@ -9174,15 +9191,15 @@
+ }
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:9177: \"$ac_link\"") >&5
++if { (eval echo "$as_me:9194: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:9180: \$? = $ac_status" >&5
++  echo "$as_me:9197: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:9182: \"$ac_try\"") >&5
++  { (eval echo "$as_me:9199: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:9185: \$? = $ac_status" >&5
++  echo "$as_me:9202: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   with_big_core=yes
+ else
+@@ -9194,7 +9211,7 @@
+ rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+ fi;
+-echo "$as_me:9197: result: $with_big_core" >&5
++echo "$as_me:9214: result: $with_big_core" >&5
+ echo "${ECHO_T}$with_big_core" >&6
+ test "x$with_big_core" = "xyes" &&
+ cat >>confdefs.h <<\EOF
+@@ -9204,7 +9221,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:9207: checking if big-strings option selected" >&5
++echo "$as_me:9224: 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.
+@@ -9228,14 +9245,14 @@
+ 	esac
+ 
+ fi;
+-echo "$as_me:9231: result: $with_big_strings" >&5
++echo "$as_me:9248: 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:9238: checking if you want termcap-fallback support" >&5
++echo "$as_me:9255: 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.
+@@ -9245,14 +9262,14 @@
+ else
+   with_termcap=no
+ fi;
+-echo "$as_me:9248: result: $with_termcap" >&5
++echo "$as_me:9265: 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:9255: error: You have disabled the database w/o specifying fallbacks" >&5
++			{ { echo "$as_me:9272: 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
+@@ -9265,13 +9282,13 @@
+ else
+ 
+ 	if test "$with_ticlib" != no ; then
+-		{ { echo "$as_me:9268: error: Options --with-ticlib and --enable-termcap cannot be combined" >&5
++		{ { echo "$as_me:9285: 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:9274: checking for list of termcap files" >&5
++	echo "$as_me:9291: 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.
+@@ -9311,7 +9328,7 @@
+ 	cf_src_path=`echo "$cf_src_path" | sed -e s%NONE%$cf_path_syntax%`
+ 	;;
+ (*)
+-	{ { echo "$as_me:9314: error: expected a pathname, not \"$cf_src_path\"" >&5
++	{ { echo "$as_me:9331: 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; }; }
+ 	;;
+@@ -9334,7 +9351,7 @@
+ 	;;
+ esac
+ 
+-	echo "$as_me:9337: result: $TERMPATH" >&5
++	echo "$as_me:9354: result: $TERMPATH" >&5
+ echo "${ECHO_T}$TERMPATH" >&6
+ 	test -n "$TERMPATH" &&
+ cat >>confdefs.h <<EOF
+@@ -9342,7 +9359,7 @@
+ EOF
+ 
+ 	###	use option --enable-getcap to use a hacked getcap for reading termcaps
+-	echo "$as_me:9345: checking if fast termcap-loader is needed" >&5
++	echo "$as_me:9362: 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.
+@@ -9352,14 +9369,14 @@
+ else
+   with_getcap=no
+ fi;
+-	echo "$as_me:9355: result: $with_getcap" >&5
++	echo "$as_me:9372: 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:9362: checking if translated termcaps will be cached in ~/.terminfo" >&5
++	echo "$as_me:9379: 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.
+@@ -9369,7 +9386,7 @@
+ else
+   with_getcap_cache=no
+ fi;
+-	echo "$as_me:9372: result: $with_getcap_cache" >&5
++	echo "$as_me:9389: result: $with_getcap_cache" >&5
+ echo "${ECHO_T}$with_getcap_cache" >&6
+ 	test "x$with_getcap_cache" = "xyes" &&
+ cat >>confdefs.h <<\EOF
+@@ -9379,7 +9396,7 @@
+ fi
+ 
+ ###   Use option --disable-home-terminfo to completely remove ~/.terminfo
+-echo "$as_me:9382: checking if ~/.terminfo is wanted" >&5
++echo "$as_me:9399: 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.
+@@ -9389,14 +9406,14 @@
+ else
+   with_home_terminfo=yes
+ fi;
+-echo "$as_me:9392: result: $with_home_terminfo" >&5
++echo "$as_me:9409: 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:9399: checking if you want to permit root to use ncurses environment variables" >&5
++echo "$as_me:9416: 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.
+@@ -9406,14 +9423,14 @@
+ else
+   with_root_environ=yes
+ fi;
+-echo "$as_me:9409: result: $with_root_environ" >&5
++echo "$as_me:9426: 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:9416: checking if you want to permit setuid programs to access all files" >&5
++echo "$as_me:9433: checking if you want to permit setuid programs to access all files" >&5
+ echo $ECHO_N "checking if you want to permit setuid programs to access all files... $ECHO_C" >&6
+ 
+ # Check whether --enable-root-environ or --disable-root-environ was given.
+@@ -9423,7 +9440,7 @@
+ else
+   with_root_access=yes
+ fi;
+-echo "$as_me:9426: result: $with_root_access" >&5
++echo "$as_me:9443: result: $with_root_access" >&5
+ echo "${ECHO_T}$with_root_access" >&6
+ test "x$with_root_access" = xyes &&
+ cat >>confdefs.h <<\EOF
+@@ -9438,23 +9455,23 @@
+ 
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-echo "$as_me:9441: checking for $ac_header" >&5
++echo "$as_me:9458: 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 9447 "configure"
++#line 9464 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:9451: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:9468: \"$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:9457: \$? = $ac_status" >&5
++  echo "$as_me:9474: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -9473,7 +9490,7 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:9476: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
++echo "$as_me:9493: 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
+@@ -9488,13 +9505,13 @@
+ 	unlink
+ do
+ as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+-echo "$as_me:9491: checking for $ac_func" >&5
++echo "$as_me:9508: 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 9497 "configure"
++#line 9514 "configure"
+ #include "confdefs.h"
+ #define $ac_func autoconf_temporary
+ #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -9525,16 +9542,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:9528: \"$ac_link\"") >&5
++if { (eval echo "$as_me:9545: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:9531: \$? = $ac_status" >&5
++  echo "$as_me:9548: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:9534: \"$ac_try\"") >&5
++  { (eval echo "$as_me:9551: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:9537: \$? = $ac_status" >&5
++  echo "$as_me:9554: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   eval "$as_ac_var=yes"
+ else
+@@ -9544,7 +9561,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:9547: result: `eval echo '${'"$as_ac_var"'}'`" >&5
++echo "$as_me:9564: 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
+@@ -9561,13 +9578,13 @@
+ 		symlink
+ do
+ as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+-echo "$as_me:9564: checking for $ac_func" >&5
++echo "$as_me:9581: 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 9570 "configure"
++#line 9587 "configure"
+ #include "confdefs.h"
+ #define $ac_func autoconf_temporary
+ #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -9598,16 +9615,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:9601: \"$ac_link\"") >&5
++if { (eval echo "$as_me:9618: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:9604: \$? = $ac_status" >&5
++  echo "$as_me:9621: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:9607: \"$ac_try\"") >&5
++  { (eval echo "$as_me:9624: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:9610: \$? = $ac_status" >&5
++  echo "$as_me:9627: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   eval "$as_ac_var=yes"
+ else
+@@ -9617,7 +9634,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:9620: result: `eval echo '${'"$as_ac_var"'}'`" >&5
++echo "$as_me:9637: 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
+@@ -9628,7 +9645,7 @@
+ done
+ 
+ else
+-	echo "$as_me:9631: checking if link/symlink functions work" >&5
++	echo "$as_me:9648: 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
+@@ -9641,7 +9658,7 @@
+ 			eval 'ac_cv_func_'$cf_func'=error'
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 9644 "configure"
++#line 9661 "configure"
+ #include "confdefs.h"
+ 
+ #include <stdio.h>
+@@ -9679,15 +9696,15 @@
+ 
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:9682: \"$ac_link\"") >&5
++if { (eval echo "$as_me:9699: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:9685: \$? = $ac_status" >&5
++  echo "$as_me:9702: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:9687: \"$ac_try\"") >&5
++  { (eval echo "$as_me:9704: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:9690: \$? = $ac_status" >&5
++  echo "$as_me:9707: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+ 
+ 			cf_cv_link_funcs="$cf_cv_link_funcs $cf_func"
+@@ -9705,7 +9722,7 @@
+ 		test -z "$cf_cv_link_funcs" && cf_cv_link_funcs=no
+ 
+ fi
+-echo "$as_me:9708: result: $cf_cv_link_funcs" >&5
++echo "$as_me:9725: result: $cf_cv_link_funcs" >&5
+ echo "${ECHO_T}$cf_cv_link_funcs" >&6
+ 	test "$ac_cv_func_link"    = yes &&
+ cat >>confdefs.h <<\EOF
+@@ -9725,7 +9742,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:9728: checking if tic should use symbolic links" >&5
++	echo "$as_me:9745: 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.
+@@ -9735,21 +9752,21 @@
+ else
+   with_symlinks=no
+ fi;
+-	echo "$as_me:9738: result: $with_symlinks" >&5
++	echo "$as_me:9755: 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:9745: checking if tic should use hard links" >&5
++	echo "$as_me:9762: 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:9752: result: $with_links" >&5
++	echo "$as_me:9769: result: $with_links" >&5
+ echo "${ECHO_T}$with_links" >&6
+ fi
+ 
+@@ -9765,7 +9782,7 @@
+ 
+ ###   use option --enable-broken-linker to force on use of broken-linker support
+ 
+-echo "$as_me:9768: checking if you want broken-linker support code" >&5
++echo "$as_me:9785: 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.
+@@ -9775,7 +9792,7 @@
+ else
+   with_broken_linker=no
+ fi;
+-echo "$as_me:9778: result: $with_broken_linker" >&5
++echo "$as_me:9795: result: $with_broken_linker" >&5
+ echo "${ECHO_T}$with_broken_linker" >&6
+ 
+ : "${BROKEN_LINKER:=0}"
+@@ -9789,7 +9806,7 @@
+ fi
+ 
+ ###   use option --enable-bsdpad to have tputs process BSD-style prefix padding
+-echo "$as_me:9792: checking if tputs should process BSD-style prefix padding" >&5
++echo "$as_me:9809: 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.
+@@ -9799,7 +9816,7 @@
+ else
+   with_bsdpad=no
+ fi;
+-echo "$as_me:9802: result: $with_bsdpad" >&5
++echo "$as_me:9819: result: $with_bsdpad" >&5
+ echo "${ECHO_T}$with_bsdpad" >&6
+ test "x$with_bsdpad" = xyes &&
+ cat >>confdefs.h <<\EOF
+@@ -9818,14 +9835,14 @@
+ # Check to define _XOPEN_SOURCE "automatically"
+ CPPFLAGS_before_XOPEN="$CPPFLAGS"
+ 
+-echo "$as_me:9821: checking if the POSIX test-macros are already defined" >&5
++echo "$as_me:9838: 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 9828 "configure"
++#line 9845 "configure"
+ #include "confdefs.h"
+ #include <stdio.h>
+ int
+@@ -9844,16 +9861,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:9847: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:9864: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:9850: \$? = $ac_status" >&5
++  echo "$as_me:9867: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:9853: \"$ac_try\"") >&5
++  { (eval echo "$as_me:9870: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:9856: \$? = $ac_status" >&5
++  echo "$as_me:9873: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_posix_visible=no
+ else
+@@ -9864,7 +9881,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:9867: result: $cf_cv_posix_visible" >&5
++echo "$as_me:9884: result: $cf_cv_posix_visible" >&5
+ echo "${ECHO_T}$cf_cv_posix_visible" >&6
+ 
+ if test "$cf_cv_posix_visible" = no; then
+@@ -9909,14 +9926,14 @@
+ 
+ cf_gnu_xopen_source=$cf_XOPEN_SOURCE
+ 
+-echo "$as_me:9912: checking if this is the GNU C library" >&5
++echo "$as_me:9929: 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 9919 "configure"
++#line 9936 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ int
+@@ -9935,16 +9952,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:9938: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:9955: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:9941: \$? = $ac_status" >&5
++  echo "$as_me:9958: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:9944: \"$ac_try\"") >&5
++  { (eval echo "$as_me:9961: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:9947: \$? = $ac_status" >&5
++  echo "$as_me:9964: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_gnu_library=yes
+ else
+@@ -9955,7 +9972,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:9958: result: $cf_cv_gnu_library" >&5
++echo "$as_me:9975: result: $cf_cv_gnu_library" >&5
+ echo "${ECHO_T}$cf_cv_gnu_library" >&6
+ 
+ if test x$cf_cv_gnu_library = xyes; then
+@@ -9963,7 +9980,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:9966: checking if _DEFAULT_SOURCE can be used as a basis" >&5
++	echo "$as_me:9983: 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
+@@ -9975,7 +9992,7 @@
+ 	CPPFLAGS="${CPPFLAGS}-D_DEFAULT_SOURCE"
+ 
+ 		cat >"conftest.$ac_ext" <<_ACEOF
+-#line 9978 "configure"
++#line 9995 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ int
+@@ -9994,16 +10011,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:9997: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:10014: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:10000: \$? = $ac_status" >&5
++  echo "$as_me:10017: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:10003: \"$ac_try\"") >&5
++  { (eval echo "$as_me:10020: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:10006: \$? = $ac_status" >&5
++  echo "$as_me:10023: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_gnu_library_219=yes
+ else
+@@ -10015,12 +10032,12 @@
+ 		CPPFLAGS="$cf_save"
+ 
+ fi
+-echo "$as_me:10018: result: $cf_cv_gnu_library_219" >&5
++echo "$as_me:10035: 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:10023: checking if _XOPEN_SOURCE=$cf_gnu_xopen_source works with _DEFAULT_SOURCE" >&5
++		echo "$as_me:10040: 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
+@@ -10125,7 +10142,7 @@
+ fi
+ 
+ 			cat >"conftest.$ac_ext" <<_ACEOF
+-#line 10128 "configure"
++#line 10145 "configure"
+ #include "confdefs.h"
+ 
+ 				#include <limits.h>
+@@ -10145,16 +10162,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:10148: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:10165: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:10151: \$? = $ac_status" >&5
++  echo "$as_me:10168: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:10154: \"$ac_try\"") >&5
++  { (eval echo "$as_me:10171: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:10157: \$? = $ac_status" >&5
++  echo "$as_me:10174: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_gnu_dftsrc_219=yes
+ else
+@@ -10165,7 +10182,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:10168: result: $cf_cv_gnu_dftsrc_219" >&5
++echo "$as_me:10185: 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
+@@ -10174,14 +10191,14 @@
+ 
+ 	if test "x$cf_cv_gnu_dftsrc_219" != xyes; then
+ 
+-		echo "$as_me:10177: checking if we must define _GNU_SOURCE" >&5
++		echo "$as_me:10194: 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 10184 "configure"
++#line 10201 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ int
+@@ -10196,16 +10213,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:10199: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:10216: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:10202: \$? = $ac_status" >&5
++  echo "$as_me:10219: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:10205: \"$ac_try\"") >&5
++  { (eval echo "$as_me:10222: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:10208: \$? = $ac_status" >&5
++  echo "$as_me:10225: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_gnu_source=no
+ else
+@@ -10312,7 +10329,7 @@
+ fi
+ 
+ 			 cat >"conftest.$ac_ext" <<_ACEOF
+-#line 10315 "configure"
++#line 10332 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ int
+@@ -10327,16 +10344,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:10330: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:10347: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:10333: \$? = $ac_status" >&5
++  echo "$as_me:10350: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:10336: \"$ac_try\"") >&5
++  { (eval echo "$as_me:10353: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:10339: \$? = $ac_status" >&5
++  echo "$as_me:10356: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_gnu_source=no
+ else
+@@ -10351,12 +10368,12 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:10354: result: $cf_cv_gnu_source" >&5
++echo "$as_me:10371: 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:10359: checking if we should also define _DEFAULT_SOURCE" >&5
++		echo "$as_me:10376: 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
+@@ -10366,7 +10383,7 @@
+ 	CPPFLAGS="${CPPFLAGS}-D_GNU_SOURCE"
+ 
+ 			cat >"conftest.$ac_ext" <<_ACEOF
+-#line 10369 "configure"
++#line 10386 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ int
+@@ -10381,16 +10398,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:10384: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:10401: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:10387: \$? = $ac_status" >&5
++  echo "$as_me:10404: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:10390: \"$ac_try\"") >&5
++  { (eval echo "$as_me:10407: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:10393: \$? = $ac_status" >&5
++  echo "$as_me:10410: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_default_source=no
+ else
+@@ -10401,7 +10418,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:10404: result: $cf_cv_default_source" >&5
++echo "$as_me:10421: result: $cf_cv_default_source" >&5
+ echo "${ECHO_T}$cf_cv_default_source" >&6
+ 			if test "$cf_cv_default_source" = yes
+ 			then
+@@ -10438,16 +10455,16 @@
+ 	sed	-e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ 	]*\)\?[ 	]/ /g' \
+ 		-e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ 	]*\)\?$//g'`
+ 
+-echo "$as_me:10441: checking if we should define _POSIX_C_SOURCE" >&5
++echo "$as_me:10458: 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}:10447: testing if the symbol is already defined go no further ..." 1>&5
++echo "${as_me:-configure}:10464: testing if the symbol is already defined go no further ..." 1>&5
+ 
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 10450 "configure"
++#line 10467 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ int
+@@ -10462,16 +10479,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:10465: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:10482: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:10468: \$? = $ac_status" >&5
++  echo "$as_me:10485: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:10471: \"$ac_try\"") >&5
++  { (eval echo "$as_me:10488: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:10474: \$? = $ac_status" >&5
++  echo "$as_me:10491: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_posix_c_source=no
+ else
+@@ -10492,7 +10509,7 @@
+ 	 esac
+ 	 if test "$cf_want_posix_source" = yes ; then
+ 		cat >"conftest.$ac_ext" <<_ACEOF
+-#line 10495 "configure"
++#line 10512 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ int
+@@ -10507,16 +10524,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:10510: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:10527: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:10513: \$? = $ac_status" >&5
++  echo "$as_me:10530: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:10516: \"$ac_try\"") >&5
++  { (eval echo "$as_me:10533: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:10519: \$? = $ac_status" >&5
++  echo "$as_me:10536: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   :
+ else
+@@ -10527,7 +10544,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 	 fi
+ 
+-echo "${as_me:-configure}:10530: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
++echo "${as_me:-configure}:10547: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
+ 
+ 	 CFLAGS="$cf_trim_CFLAGS"
+ 	 CPPFLAGS="$cf_trim_CPPFLAGS"
+@@ -10535,10 +10552,10 @@
+ 	test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
+ 	CPPFLAGS="${CPPFLAGS}$cf_cv_posix_c_source"
+ 
+-echo "${as_me:-configure}:10538: testing if the second compile does not leave our definition intact error ..." 1>&5
++echo "${as_me:-configure}:10555: testing if the second compile does not leave our definition intact error ..." 1>&5
+ 
+ 	 cat >"conftest.$ac_ext" <<_ACEOF
+-#line 10541 "configure"
++#line 10558 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ int
+@@ -10553,16 +10570,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:10556: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:10573: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:10559: \$? = $ac_status" >&5
++  echo "$as_me:10576: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:10562: \"$ac_try\"") >&5
++  { (eval echo "$as_me:10579: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:10565: \$? = $ac_status" >&5
++  echo "$as_me:10582: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   :
+ else
+@@ -10578,7 +10595,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:10581: result: $cf_cv_posix_c_source" >&5
++echo "$as_me:10598: 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
+@@ -10695,7 +10712,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:10698: WARNING: this system does not provide usable locale support" >&5
++	{ echo "$as_me:10715: 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
+@@ -10727,14 +10744,14 @@
+ 	;;
+ (*)
+ 
+-echo "$as_me:10730: checking if we should define _XOPEN_SOURCE" >&5
++echo "$as_me:10747: 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 10737 "configure"
++#line 10754 "configure"
+ #include "confdefs.h"
+ 
+ #include <stdlib.h>
+@@ -10753,16 +10770,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:10756: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:10773: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:10759: \$? = $ac_status" >&5
++  echo "$as_me:10776: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:10762: \"$ac_try\"") >&5
++  { (eval echo "$as_me:10779: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:10765: \$? = $ac_status" >&5
++  echo "$as_me:10782: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_xopen_source=no
+ else
+@@ -10774,7 +10791,7 @@
+ 	CPPFLAGS="${CPPFLAGS}-D_XOPEN_SOURCE=$cf_XOPEN_SOURCE"
+ 
+ 	 cat >"conftest.$ac_ext" <<_ACEOF
+-#line 10777 "configure"
++#line 10794 "configure"
+ #include "confdefs.h"
+ 
+ #include <stdlib.h>
+@@ -10793,16 +10810,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:10796: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:10813: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:10799: \$? = $ac_status" >&5
++  echo "$as_me:10816: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:10802: \"$ac_try\"") >&5
++  { (eval echo "$as_me:10819: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:10805: \$? = $ac_status" >&5
++  echo "$as_me:10822: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_xopen_source=no
+ else
+@@ -10817,7 +10834,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:10820: result: $cf_cv_xopen_source" >&5
++echo "$as_me:10837: result: $cf_cv_xopen_source" >&5
+ echo "${ECHO_T}$cf_cv_xopen_source" >&6
+ 
+ if test "$cf_cv_xopen_source" != no ; then
+@@ -10975,16 +10992,16 @@
+ 	sed	-e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ 	]*\)\?[ 	]/ /g' \
+ 		-e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ 	]*\)\?$//g'`
+ 
+-echo "$as_me:10978: checking if we should define _POSIX_C_SOURCE" >&5
++echo "$as_me:10995: 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}:10984: testing if the symbol is already defined go no further ..." 1>&5
++echo "${as_me:-configure}:11001: testing if the symbol is already defined go no further ..." 1>&5
+ 
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 10987 "configure"
++#line 11004 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ int
+@@ -10999,16 +11016,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:11002: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:11019: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:11005: \$? = $ac_status" >&5
++  echo "$as_me:11022: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:11008: \"$ac_try\"") >&5
++  { (eval echo "$as_me:11025: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:11011: \$? = $ac_status" >&5
++  echo "$as_me:11028: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_posix_c_source=no
+ else
+@@ -11029,7 +11046,7 @@
+ 	 esac
+ 	 if test "$cf_want_posix_source" = yes ; then
+ 		cat >"conftest.$ac_ext" <<_ACEOF
+-#line 11032 "configure"
++#line 11049 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ int
+@@ -11044,16 +11061,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:11047: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:11064: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:11050: \$? = $ac_status" >&5
++  echo "$as_me:11067: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:11053: \"$ac_try\"") >&5
++  { (eval echo "$as_me:11070: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:11056: \$? = $ac_status" >&5
++  echo "$as_me:11073: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   :
+ else
+@@ -11064,7 +11081,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 	 fi
+ 
+-echo "${as_me:-configure}:11067: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
++echo "${as_me:-configure}:11084: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
+ 
+ 	 CFLAGS="$cf_trim_CFLAGS"
+ 	 CPPFLAGS="$cf_trim_CPPFLAGS"
+@@ -11072,10 +11089,10 @@
+ 	test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
+ 	CPPFLAGS="${CPPFLAGS}$cf_cv_posix_c_source"
+ 
+-echo "${as_me:-configure}:11075: testing if the second compile does not leave our definition intact error ..." 1>&5
++echo "${as_me:-configure}:11092: testing if the second compile does not leave our definition intact error ..." 1>&5
+ 
+ 	 cat >"conftest.$ac_ext" <<_ACEOF
+-#line 11078 "configure"
++#line 11095 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ int
+@@ -11090,16 +11107,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:11093: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:11110: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:11096: \$? = $ac_status" >&5
++  echo "$as_me:11113: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:11099: \"$ac_try\"") >&5
++  { (eval echo "$as_me:11116: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:11102: \$? = $ac_status" >&5
++  echo "$as_me:11119: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   :
+ else
+@@ -11115,7 +11132,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:11118: result: $cf_cv_posix_c_source" >&5
++echo "$as_me:11135: 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
+@@ -11241,7 +11258,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}:11244: testing removing old option $cf_add_cflags from CFLAGS ..." 1>&5
++echo "${as_me:-configure}:11261: testing removing old option $cf_add_cflags from CFLAGS ..." 1>&5
+ 
+ 	CFLAGS="$cf_old_cflag"
+ done
+@@ -11253,7 +11270,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}:11256: testing removing old option $cf_add_cflags from CPPFLAGS ..." 1>&5
++echo "${as_me:-configure}:11273: testing removing old option $cf_add_cflags from CPPFLAGS ..." 1>&5
+ 
+ 	CPPFLAGS="$cf_old_cflag"
+ done
+@@ -11341,7 +11358,7 @@
+ if test -n "$cf_new_cflags" ; then
+ 	test -n "$verbose" && echo "	add to \$CFLAGS $cf_new_cflags" 1>&6
+ 
+-echo "${as_me:-configure}:11344: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
++echo "${as_me:-configure}:11361: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
+ 
+ 	test -n "$CFLAGS" && CFLAGS="$CFLAGS "
+ 	CFLAGS="${CFLAGS}$cf_new_cflags"
+@@ -11351,7 +11368,7 @@
+ if test -n "$cf_new_cppflags" ; then
+ 	test -n "$verbose" && echo "	add to \$CPPFLAGS $cf_new_cppflags" 1>&6
+ 
+-echo "${as_me:-configure}:11354: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
++echo "${as_me:-configure}:11371: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
+ 
+ 	test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
+ 	CPPFLAGS="${CPPFLAGS}$cf_new_cppflags"
+@@ -11361,7 +11378,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}:11364: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5
++echo "${as_me:-configure}:11381: 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"
+@@ -11373,10 +11390,10 @@
+ fi
+ 
+ if test -n "$cf_XOPEN_SOURCE" && test -z "$cf_cv_xopen_source" ; then
+-	echo "$as_me:11376: checking if _XOPEN_SOURCE really is set" >&5
++	echo "$as_me:11393: 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 11379 "configure"
++#line 11396 "configure"
+ #include "confdefs.h"
+ #include <stdlib.h>
+ int
+@@ -11391,16 +11408,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:11394: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:11411: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:11397: \$? = $ac_status" >&5
++  echo "$as_me:11414: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:11400: \"$ac_try\"") >&5
++  { (eval echo "$as_me:11417: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:11403: \$? = $ac_status" >&5
++  echo "$as_me:11420: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_XOPEN_SOURCE_set=yes
+ else
+@@ -11409,12 +11426,12 @@
+ cf_XOPEN_SOURCE_set=no
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+-	echo "$as_me:11412: result: $cf_XOPEN_SOURCE_set" >&5
++	echo "$as_me:11429: 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 11417 "configure"
++#line 11434 "configure"
+ #include "confdefs.h"
+ #include <stdlib.h>
+ int
+@@ -11429,16 +11446,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:11432: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:11449: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:11435: \$? = $ac_status" >&5
++  echo "$as_me:11452: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:11438: \"$ac_try\"") >&5
++  { (eval echo "$as_me:11455: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:11441: \$? = $ac_status" >&5
++  echo "$as_me:11458: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_XOPEN_SOURCE_set_ok=yes
+ else
+@@ -11449,19 +11466,19 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 		if test "$cf_XOPEN_SOURCE_set_ok" = no
+ 		then
+-			{ echo "$as_me:11452: WARNING: _XOPEN_SOURCE is lower than requested" >&5
++			{ echo "$as_me:11469: WARNING: _XOPEN_SOURCE is lower than requested" >&5
+ echo "$as_me: WARNING: _XOPEN_SOURCE is lower than requested" >&2;}
+ 		fi
+ 	else
+ 
+-echo "$as_me:11457: checking if we should define _XOPEN_SOURCE" >&5
++echo "$as_me:11474: 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 11464 "configure"
++#line 11481 "configure"
+ #include "confdefs.h"
+ 
+ #include <stdlib.h>
+@@ -11480,16 +11497,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:11483: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:11500: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:11486: \$? = $ac_status" >&5
++  echo "$as_me:11503: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:11489: \"$ac_try\"") >&5
++  { (eval echo "$as_me:11506: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:11492: \$? = $ac_status" >&5
++  echo "$as_me:11509: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_xopen_source=no
+ else
+@@ -11501,7 +11518,7 @@
+ 	CPPFLAGS="${CPPFLAGS}-D_XOPEN_SOURCE=$cf_XOPEN_SOURCE"
+ 
+ 	 cat >"conftest.$ac_ext" <<_ACEOF
+-#line 11504 "configure"
++#line 11521 "configure"
+ #include "confdefs.h"
+ 
+ #include <stdlib.h>
+@@ -11520,16 +11537,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:11523: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:11540: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:11526: \$? = $ac_status" >&5
++  echo "$as_me:11543: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:11529: \"$ac_try\"") >&5
++  { (eval echo "$as_me:11546: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:11532: \$? = $ac_status" >&5
++  echo "$as_me:11549: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_xopen_source=no
+ else
+@@ -11544,7 +11561,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:11547: result: $cf_cv_xopen_source" >&5
++echo "$as_me:11564: result: $cf_cv_xopen_source" >&5
+ echo "${ECHO_T}$cf_cv_xopen_source" >&6
+ 
+ if test "$cf_cv_xopen_source" != no ; then
+@@ -11695,14 +11712,14 @@
+ 
+ # Work around breakage on OS X
+ 
+-echo "$as_me:11698: checking if SIGWINCH is defined" >&5
++echo "$as_me:11715: 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 11705 "configure"
++#line 11722 "configure"
+ #include "confdefs.h"
+ 
+ #include <sys/types.h>
+@@ -11717,23 +11734,23 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:11720: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:11737: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:11723: \$? = $ac_status" >&5
++  echo "$as_me:11740: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:11726: \"$ac_try\"") >&5
++  { (eval echo "$as_me:11743: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:11729: \$? = $ac_status" >&5
++  echo "$as_me:11746: \$? = $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 11736 "configure"
++#line 11753 "configure"
+ #include "confdefs.h"
+ 
+ #undef _XOPEN_SOURCE
+@@ -11751,16 +11768,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:11754: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:11771: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:11757: \$? = $ac_status" >&5
++  echo "$as_me:11774: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:11760: \"$ac_try\"") >&5
++  { (eval echo "$as_me:11777: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:11763: \$? = $ac_status" >&5
++  echo "$as_me:11780: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_define_sigwinch=maybe
+ else
+@@ -11774,11 +11791,11 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:11777: result: $cf_cv_define_sigwinch" >&5
++echo "$as_me:11794: 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:11781: checking for actual SIGWINCH definition" >&5
++echo "$as_me:11798: 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
+@@ -11789,7 +11806,7 @@
+ while test "$cf_sigwinch" != 1
+ do
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 11792 "configure"
++#line 11809 "configure"
+ #include "confdefs.h"
+ 
+ #undef _XOPEN_SOURCE
+@@ -11811,16 +11828,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:11814: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:11831: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:11817: \$? = $ac_status" >&5
++  echo "$as_me:11834: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:11820: \"$ac_try\"") >&5
++  { (eval echo "$as_me:11837: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:11823: \$? = $ac_status" >&5
++  echo "$as_me:11840: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_fixup_sigwinch=$cf_sigwinch
+ 	 break
+@@ -11834,7 +11851,7 @@
+ done
+ 
+ fi
+-echo "$as_me:11837: result: $cf_cv_fixup_sigwinch" >&5
++echo "$as_me:11854: result: $cf_cv_fixup_sigwinch" >&5
+ echo "${ECHO_T}$cf_cv_fixup_sigwinch" >&6
+ 
+ 	if test "$cf_cv_fixup_sigwinch" != unknown ; then
+@@ -11844,13 +11861,13 @@
+ 
+ # Checks for CODESET support.
+ 
+-echo "$as_me:11847: checking for nl_langinfo and CODESET" >&5
++echo "$as_me:11864: 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 11853 "configure"
++#line 11870 "configure"
+ #include "confdefs.h"
+ #include <langinfo.h>
+ int
+@@ -11862,16 +11879,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:11865: \"$ac_link\"") >&5
++if { (eval echo "$as_me:11882: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:11868: \$? = $ac_status" >&5
++  echo "$as_me:11885: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:11871: \"$ac_try\"") >&5
++  { (eval echo "$as_me:11888: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:11874: \$? = $ac_status" >&5
++  echo "$as_me:11891: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   am_cv_langinfo_codeset=yes
+ else
+@@ -11882,7 +11899,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:11885: result: $am_cv_langinfo_codeset" >&5
++echo "$as_me:11902: result: $am_cv_langinfo_codeset" >&5
+ echo "${ECHO_T}$am_cv_langinfo_codeset" >&6
+ 	if test "$am_cv_langinfo_codeset" = yes; then
+ 
+@@ -11896,7 +11913,7 @@
+ NCURSES_OK_WCHAR_T=
+ NCURSES_OK_WINT_T=
+ 
+-echo "$as_me:11899: checking if you want wide-character code" >&5
++echo "$as_me:11916: 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.
+@@ -11906,7 +11923,7 @@
+ else
+   with_widec=no
+ fi;
+-echo "$as_me:11909: result: $with_widec" >&5
++echo "$as_me:11926: result: $with_widec" >&5
+ echo "${ECHO_T}$with_widec" >&6
+ 
+ NCURSES_WCWIDTH_GRAPHICS=1
+@@ -11930,23 +11947,23 @@
+ 
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-echo "$as_me:11933: checking for $ac_header" >&5
++echo "$as_me:11950: 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 11939 "configure"
++#line 11956 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:11943: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:11960: \"$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:11949: \$? = $ac_status" >&5
++  echo "$as_me:11966: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -11965,7 +11982,7 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:11968: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
++echo "$as_me:11985: 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
+@@ -11975,14 +11992,14 @@
+ fi
+ done
+ 
+-echo "$as_me:11978: checking if wchar.h can be used as is" >&5
++echo "$as_me:11995: 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 11985 "configure"
++#line 12002 "configure"
+ #include "confdefs.h"
+ 
+ #include <stdlib.h>
+@@ -12004,16 +12021,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:12007: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:12024: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:12010: \$? = $ac_status" >&5
++  echo "$as_me:12027: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:12013: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12030: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:12016: \$? = $ac_status" >&5
++  echo "$as_me:12033: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_wchar_h_okay=yes
+ else
+@@ -12023,16 +12040,16 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:12026: result: $cf_cv_wchar_h_okay" >&5
++echo "$as_me:12043: 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:12032: checking if we must define _XOPEN_SOURCE_EXTENDED" >&5
++echo "$as_me:12049: 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 12035 "configure"
++#line 12052 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ 
+@@ -12048,16 +12065,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:12051: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:12068: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:12054: \$? = $ac_status" >&5
++  echo "$as_me:12071: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:12057: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12074: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:12060: \$? = $ac_status" >&5
++  echo "$as_me:12077: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_result=no
+ else
+@@ -12066,16 +12083,16 @@
+ cf_result=yes
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+-echo "$as_me:12069: result: $cf_result" >&5
++echo "$as_me:12086: 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:12075: checking checking for compatible value versus " >&5
++	echo "$as_me:12092: 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 12078 "configure"
++#line 12095 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ 
+@@ -12091,16 +12108,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:12094: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:12111: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:12097: \$? = $ac_status" >&5
++  echo "$as_me:12114: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:12100: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12117: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:12103: \$? = $ac_status" >&5
++  echo "$as_me:12120: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_result=yes
+ else
+@@ -12109,7 +12126,7 @@
+ cf_result=no
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+-	echo "$as_me:12112: result: $cf_result" >&5
++	echo "$as_me:12129: result: $cf_result" >&5
+ echo "${ECHO_T}$cf_result" >&6
+ 	if test "$cf_result" = no ; then
+ 		# perhaps we can override it - try...
+@@ -12119,7 +12136,7 @@
+ 
+ fi
+ 
+-echo "$as_me:12122: checking if wcwidth agrees graphics are single-width" >&5
++echo "$as_me:12139: 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
+@@ -12190,7 +12207,7 @@
+   cf_cv_wcwidth_graphics=unknown
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 12193 "configure"
++#line 12210 "configure"
+ #include "confdefs.h"
+ 
+ #include <locale.h>
+@@ -12234,15 +12251,15 @@
+ 
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:12237: \"$ac_link\"") >&5
++if { (eval echo "$as_me:12254: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:12240: \$? = $ac_status" >&5
++  echo "$as_me:12257: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:12242: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12259: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:12245: \$? = $ac_status" >&5
++  echo "$as_me:12262: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_wcwidth_graphics=yes
+ else
+@@ -12255,7 +12272,7 @@
+ fi
+ 
+ fi
+-echo "$as_me:12258: result: $cf_cv_wcwidth_graphics" >&5
++echo "$as_me:12275: result: $cf_cv_wcwidth_graphics" >&5
+ echo "${ECHO_T}$cf_cv_wcwidth_graphics" >&6
+ 
+ 	test "$cf_cv_wcwidth_graphics" = no && NCURSES_WCWIDTH_GRAPHICS=0
+@@ -12266,13 +12283,13 @@
+ for ac_func in putwc btowc wctob mbtowc wctomb mblen mbrlen mbrtowc wcsrtombs mbsrtowcs wcstombs mbstowcs
+ do
+ as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+-echo "$as_me:12269: checking for $ac_func" >&5
++echo "$as_me:12286: 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 12275 "configure"
++#line 12292 "configure"
+ #include "confdefs.h"
+ #define $ac_func autoconf_temporary
+ #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -12303,16 +12320,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:12306: \"$ac_link\"") >&5
++if { (eval echo "$as_me:12323: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:12309: \$? = $ac_status" >&5
++  echo "$as_me:12326: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:12312: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12329: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:12315: \$? = $ac_status" >&5
++  echo "$as_me:12332: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   eval "$as_ac_var=yes"
+ else
+@@ -12322,7 +12339,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:12325: result: `eval echo '${'"$as_ac_var"'}'`" >&5
++echo "$as_me:12342: 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
+@@ -12337,23 +12354,23 @@
+ for ac_header in wchar.h
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-echo "$as_me:12340: checking for $ac_header" >&5
++echo "$as_me:12357: 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 12346 "configure"
++#line 12363 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:12350: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:12367: \"$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:12356: \$? = $ac_status" >&5
++  echo "$as_me:12373: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -12372,7 +12389,7 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:12375: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
++echo "$as_me:12392: 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
+@@ -12382,7 +12399,7 @@
+ fi
+ done
+ 
+-echo "$as_me:12385: checking for multibyte character support" >&5
++echo "$as_me:12402: 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
+@@ -12390,7 +12407,7 @@
+ 
+ 	cf_save_LIBS="$LIBS"
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 12393 "configure"
++#line 12410 "configure"
+ #include "confdefs.h"
+ 
+ #include <stdlib.h>
+@@ -12408,16 +12425,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:12411: \"$ac_link\"") >&5
++if { (eval echo "$as_me:12428: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:12414: \$? = $ac_status" >&5
++  echo "$as_me:12431: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:12417: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12434: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:12420: \$? = $ac_status" >&5
++  echo "$as_me:12437: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_utf8_lib=yes
+ else
+@@ -12429,12 +12446,12 @@
+ cf_cv_header_path_utf8=
+ cf_cv_library_path_utf8=
+ 
+-echo "${as_me:-configure}:12432: testing Starting FIND_LINKAGE(utf8,) ..." 1>&5
++echo "${as_me:-configure}:12449: testing Starting FIND_LINKAGE(utf8,) ..." 1>&5
+ 
+ cf_save_LIBS="$LIBS"
+ 
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 12437 "configure"
++#line 12454 "configure"
+ #include "confdefs.h"
+ 
+ #include <libutf8.h>
+@@ -12447,16 +12464,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:12450: \"$ac_link\"") >&5
++if { (eval echo "$as_me:12467: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:12453: \$? = $ac_status" >&5
++  echo "$as_me:12470: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:12456: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12473: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:12459: \$? = $ac_status" >&5
++  echo "$as_me:12476: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+ 
+ 	cf_cv_find_linkage_utf8=yes
+@@ -12470,7 +12487,7 @@
+ LIBS="-lutf8  $cf_save_LIBS"
+ 
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 12473 "configure"
++#line 12490 "configure"
+ #include "confdefs.h"
+ 
+ #include <libutf8.h>
+@@ -12483,16 +12500,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:12486: \"$ac_link\"") >&5
++if { (eval echo "$as_me:12503: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:12489: \$? = $ac_status" >&5
++  echo "$as_me:12506: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:12492: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12509: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:12495: \$? = $ac_status" >&5
++  echo "$as_me:12512: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+ 
+ 	cf_cv_find_linkage_utf8=yes
+@@ -12509,9 +12526,9 @@
+ 
+ 	test -n "$verbose" && echo "	find linkage for utf8 library" 1>&6
+ 
+-echo "${as_me:-configure}:12512: testing find linkage for utf8 library ..." 1>&5
++echo "${as_me:-configure}:12529: testing find linkage for utf8 library ..." 1>&5
+ 
+-echo "${as_me:-configure}:12514: testing Searching for headers in FIND_LINKAGE(utf8,) ..." 1>&5
++echo "${as_me:-configure}:12531: testing Searching for headers in FIND_LINKAGE(utf8,) ..." 1>&5
+ 
+ 	cf_save_CPPFLAGS="$CPPFLAGS"
+ 	cf_test_CPPFLAGS="$CPPFLAGS"
+@@ -12602,7 +12619,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}:12605: testing ... testing $cf_cv_header_path_utf8 ..." 1>&5
++echo "${as_me:-configure}:12622: testing ... testing $cf_cv_header_path_utf8 ..." 1>&5
+ 
+ 			CPPFLAGS="$cf_save_CPPFLAGS"
+ 
+@@ -12610,7 +12627,7 @@
+ 	CPPFLAGS="${CPPFLAGS}-I$cf_cv_header_path_utf8"
+ 
+ 			cat >"conftest.$ac_ext" <<_ACEOF
+-#line 12613 "configure"
++#line 12630 "configure"
+ #include "confdefs.h"
+ 
+ #include <libutf8.h>
+@@ -12623,21 +12640,21 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:12626: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:12643: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:12629: \$? = $ac_status" >&5
++  echo "$as_me:12646: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:12632: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12649: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:12635: \$? = $ac_status" >&5
++  echo "$as_me:12652: \$? = $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}:12640: testing ... found utf8 headers in $cf_cv_header_path_utf8 ..." 1>&5
++echo "${as_me:-configure}:12657: testing ... found utf8 headers in $cf_cv_header_path_utf8 ..." 1>&5
+ 
+ 				cf_cv_find_linkage_utf8=maybe
+ 				cf_test_CPPFLAGS="$CPPFLAGS"
+@@ -12655,7 +12672,7 @@
+ 
+ 	if test "$cf_cv_find_linkage_utf8" = maybe ; then
+ 
+-echo "${as_me:-configure}:12658: testing Searching for utf8 library in FIND_LINKAGE(utf8,) ..." 1>&5
++echo "${as_me:-configure}:12675: testing Searching for utf8 library in FIND_LINKAGE(utf8,) ..." 1>&5
+ 
+ 		cf_save_LIBS="$LIBS"
+ 		cf_save_LDFLAGS="$LDFLAGS"
+@@ -12730,13 +12747,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}:12733: testing ... testing $cf_cv_library_path_utf8 ..." 1>&5
++echo "${as_me:-configure}:12750: 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 12739 "configure"
++#line 12756 "configure"
+ #include "confdefs.h"
+ 
+ #include <libutf8.h>
+@@ -12749,21 +12766,21 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:12752: \"$ac_link\"") >&5
++if { (eval echo "$as_me:12769: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:12755: \$? = $ac_status" >&5
++  echo "$as_me:12772: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:12758: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12775: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:12761: \$? = $ac_status" >&5
++  echo "$as_me:12778: \$? = $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}:12766: testing ... found utf8 library in $cf_cv_library_path_utf8 ..." 1>&5
++echo "${as_me:-configure}:12783: testing ... found utf8 library in $cf_cv_library_path_utf8 ..." 1>&5
+ 
+ 					cf_cv_find_linkage_utf8=yes
+ 					cf_cv_library_file_utf8="-lutf8"
+@@ -12805,7 +12822,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:12808: result: $cf_cv_utf8_lib" >&5
++echo "$as_me:12825: 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
+@@ -12843,7 +12860,7 @@
+ 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
+ 
+ 			  cat >"conftest.$ac_ext" <<_ACEOF
+-#line 12846 "configure"
++#line 12863 "configure"
+ #include "confdefs.h"
+ #include <stdio.h>
+ int
+@@ -12855,16 +12872,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:12858: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:12875: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:12861: \$? = $ac_status" >&5
++  echo "$as_me:12878: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:12864: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12881: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:12867: \$? = $ac_status" >&5
++  echo "$as_me:12884: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   :
+ else
+@@ -12881,7 +12898,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}:12884: testing adding $cf_add_incdir to include-path ..." 1>&5
++echo "${as_me:-configure}:12901: testing adding $cf_add_incdir to include-path ..." 1>&5
+ 
+ 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
+ 
+@@ -12917,7 +12934,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}:12920: testing adding $cf_add_libdir to library-path ..." 1>&5
++echo "${as_me:-configure}:12937: testing adding $cf_add_libdir to library-path ..." 1>&5
+ 
+ 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
+ 			fi
+@@ -12949,14 +12966,14 @@
+ 	fi
+ 
+ # This is needed on Tru64 5.0 to declare mbstate_t
+-echo "$as_me:12952: checking if we must include wchar.h to declare mbstate_t" >&5
++echo "$as_me:12969: 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 12959 "configure"
++#line 12976 "configure"
+ #include "confdefs.h"
+ 
+ #include <stdlib.h>
+@@ -12974,23 +12991,23 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:12977: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:12994: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:12980: \$? = $ac_status" >&5
++  echo "$as_me:12997: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:12983: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13000: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:12986: \$? = $ac_status" >&5
++  echo "$as_me:13003: \$? = $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 12993 "configure"
++#line 13010 "configure"
+ #include "confdefs.h"
+ 
+ #include <stdlib.h>
+@@ -13009,16 +13026,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:13012: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:13029: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:13015: \$? = $ac_status" >&5
++  echo "$as_me:13032: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:13018: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13035: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:13021: \$? = $ac_status" >&5
++  echo "$as_me:13038: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_mbstate_t=yes
+ else
+@@ -13030,7 +13047,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:13033: result: $cf_cv_mbstate_t" >&5
++echo "$as_me:13050: result: $cf_cv_mbstate_t" >&5
+ echo "${ECHO_T}$cf_cv_mbstate_t" >&6
+ 
+ if test "$cf_cv_mbstate_t" = yes ; then
+@@ -13048,14 +13065,14 @@
+ fi
+ 
+ # This is needed on Tru64 5.0 to declare wchar_t
+-echo "$as_me:13051: checking if we must include wchar.h to declare wchar_t" >&5
++echo "$as_me:13068: 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 13058 "configure"
++#line 13075 "configure"
+ #include "confdefs.h"
+ 
+ #include <stdlib.h>
+@@ -13073,23 +13090,23 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:13076: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:13093: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:13079: \$? = $ac_status" >&5
++  echo "$as_me:13096: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:13082: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13099: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:13085: \$? = $ac_status" >&5
++  echo "$as_me:13102: \$? = $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 13092 "configure"
++#line 13109 "configure"
+ #include "confdefs.h"
+ 
+ #include <stdlib.h>
+@@ -13108,16 +13125,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:13111: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:13128: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:13114: \$? = $ac_status" >&5
++  echo "$as_me:13131: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:13117: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13134: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:13120: \$? = $ac_status" >&5
++  echo "$as_me:13137: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_wchar_t=yes
+ else
+@@ -13129,7 +13146,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:13132: result: $cf_cv_wchar_t" >&5
++echo "$as_me:13149: result: $cf_cv_wchar_t" >&5
+ echo "${ECHO_T}$cf_cv_wchar_t" >&6
+ 
+ if test "$cf_cv_wchar_t" = yes ; then
+@@ -13152,14 +13169,14 @@
+ fi
+ 
+ # This is needed on Tru64 5.0 to declare wint_t
+-echo "$as_me:13155: checking if we must include wchar.h to declare wint_t" >&5
++echo "$as_me:13172: 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 13162 "configure"
++#line 13179 "configure"
+ #include "confdefs.h"
+ 
+ #include <stdlib.h>
+@@ -13177,23 +13194,23 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:13180: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:13197: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:13183: \$? = $ac_status" >&5
++  echo "$as_me:13200: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:13186: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13203: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:13189: \$? = $ac_status" >&5
++  echo "$as_me:13206: \$? = $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 13196 "configure"
++#line 13213 "configure"
+ #include "confdefs.h"
+ 
+ #include <stdlib.h>
+@@ -13212,16 +13229,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:13215: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:13232: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:13218: \$? = $ac_status" >&5
++  echo "$as_me:13235: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:13221: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13238: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:13224: \$? = $ac_status" >&5
++  echo "$as_me:13241: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_wint_t=yes
+ else
+@@ -13233,7 +13250,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:13236: result: $cf_cv_wint_t" >&5
++echo "$as_me:13253: result: $cf_cv_wint_t" >&5
+ echo "${ECHO_T}$cf_cv_wint_t" >&6
+ 
+ if test "$cf_cv_wint_t" = yes ; then
+@@ -13265,7 +13282,7 @@
+ fi
+ 
+ ###   use option --disable-lp64 to allow long chtype
+-echo "$as_me:13268: checking whether to enable _LP64 definition in curses.h" >&5
++echo "$as_me:13285: 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.
+@@ -13275,7 +13292,7 @@
+ else
+   with_lp64=$cf_dft_with_lp64
+ fi;
+-echo "$as_me:13278: result: $with_lp64" >&5
++echo "$as_me:13295: result: $with_lp64" >&5
+ echo "${ECHO_T}$with_lp64" >&6
+ 
+ if test "x$with_lp64" = xyes ; then
+@@ -13291,7 +13308,7 @@
+ fi;
+ if test "$enable_largefile" != no; then
+ 
+-  echo "$as_me:13294: checking for special C compiler options needed for large files" >&5
++  echo "$as_me:13311: 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
+@@ -13303,7 +13320,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 13306 "configure"
++#line 13323 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+  /* Check that off_t can represent 2**63 - 1 correctly.
+@@ -13323,16 +13340,16 @@
+ }
+ _ACEOF
+      	 rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:13326: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:13343: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:13329: \$? = $ac_status" >&5
++  echo "$as_me:13346: \$? = $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:13349: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:13335: \$? = $ac_status" >&5
++  echo "$as_me:13352: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   break
+ else
+@@ -13342,16 +13359,16 @@
+ rm -f "conftest.$ac_objext"
+      	 CC="$CC -n32"
+      	 rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:13345: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:13362: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:13348: \$? = $ac_status" >&5
++  echo "$as_me:13365: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:13351: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13368: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:13354: \$? = $ac_status" >&5
++  echo "$as_me:13371: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_sys_largefile_CC=' -n32'; break
+ else
+@@ -13365,13 +13382,13 @@
+        rm -f "conftest.$ac_ext"
+     fi
+ fi
+-echo "$as_me:13368: result: $ac_cv_sys_largefile_CC" >&5
++echo "$as_me:13385: 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:13374: checking for _FILE_OFFSET_BITS value needed for large files" >&5
++  echo "$as_me:13391: 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
+@@ -13379,7 +13396,7 @@
+   while :; do
+   ac_cv_sys_file_offset_bits=no
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 13382 "configure"
++#line 13399 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+  /* Check that off_t can represent 2**63 - 1 correctly.
+@@ -13399,16 +13416,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:13402: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:13419: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:13405: \$? = $ac_status" >&5
++  echo "$as_me:13422: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:13408: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13425: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:13411: \$? = $ac_status" >&5
++  echo "$as_me:13428: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   break
+ else
+@@ -13417,7 +13434,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 13420 "configure"
++#line 13437 "configure"
+ #include "confdefs.h"
+ #define _FILE_OFFSET_BITS 64
+ #include <sys/types.h>
+@@ -13438,16 +13455,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:13441: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:13458: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:13444: \$? = $ac_status" >&5
++  echo "$as_me:13461: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:13447: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13464: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:13450: \$? = $ac_status" >&5
++  echo "$as_me:13467: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_sys_file_offset_bits=64; break
+ else
+@@ -13458,7 +13475,7 @@
+   break
+ done
+ fi
+-echo "$as_me:13461: result: $ac_cv_sys_file_offset_bits" >&5
++echo "$as_me:13478: 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
+ 
+@@ -13468,7 +13485,7 @@
+ 
+ fi
+ rm -rf conftest*
+-  echo "$as_me:13471: checking for _LARGE_FILES value needed for large files" >&5
++  echo "$as_me:13488: 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
+@@ -13476,7 +13493,7 @@
+   while :; do
+   ac_cv_sys_large_files=no
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 13479 "configure"
++#line 13496 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+  /* Check that off_t can represent 2**63 - 1 correctly.
+@@ -13496,16 +13513,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:13499: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:13516: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:13502: \$? = $ac_status" >&5
++  echo "$as_me:13519: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:13505: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13522: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:13508: \$? = $ac_status" >&5
++  echo "$as_me:13525: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   break
+ else
+@@ -13514,7 +13531,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 13517 "configure"
++#line 13534 "configure"
+ #include "confdefs.h"
+ #define _LARGE_FILES 1
+ #include <sys/types.h>
+@@ -13535,16 +13552,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:13538: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:13555: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:13541: \$? = $ac_status" >&5
++  echo "$as_me:13558: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:13544: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13561: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:13547: \$? = $ac_status" >&5
++  echo "$as_me:13564: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_sys_large_files=1; break
+ else
+@@ -13555,7 +13572,7 @@
+   break
+ done
+ fi
+-echo "$as_me:13558: result: $ac_cv_sys_large_files" >&5
++echo "$as_me:13575: 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
+ 
+@@ -13568,7 +13585,7 @@
+ fi
+ 
+ 	if test "$enable_largefile" != no ; then
+-	echo "$as_me:13571: checking for _LARGEFILE_SOURCE value needed for large files" >&5
++	echo "$as_me:13588: 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
+@@ -13576,7 +13593,7 @@
+   while :; do
+   ac_cv_sys_largefile_source=no
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 13579 "configure"
++#line 13596 "configure"
+ #include "confdefs.h"
+ #include <stdio.h>
+ int
+@@ -13588,16 +13605,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:13591: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:13608: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:13594: \$? = $ac_status" >&5
++  echo "$as_me:13611: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:13597: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13614: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:13600: \$? = $ac_status" >&5
++  echo "$as_me:13617: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   break
+ else
+@@ -13606,7 +13623,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 13609 "configure"
++#line 13626 "configure"
+ #include "confdefs.h"
+ #define _LARGEFILE_SOURCE 1
+ #include <stdio.h>
+@@ -13619,16 +13636,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:13622: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:13639: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:13625: \$? = $ac_status" >&5
++  echo "$as_me:13642: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:13628: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13645: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:13631: \$? = $ac_status" >&5
++  echo "$as_me:13648: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_sys_largefile_source=1; break
+ else
+@@ -13639,7 +13656,7 @@
+   break
+ done
+ fi
+-echo "$as_me:13642: result: $ac_cv_sys_largefile_source" >&5
++echo "$as_me:13659: 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
+ 
+@@ -13653,13 +13670,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:13656: checking for fseeko" >&5
++echo "$as_me:13673: 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 13662 "configure"
++#line 13679 "configure"
+ #include "confdefs.h"
+ #include <stdio.h>
+ int
+@@ -13671,16 +13688,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:13674: \"$ac_link\"") >&5
++if { (eval echo "$as_me:13691: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:13677: \$? = $ac_status" >&5
++  echo "$as_me:13694: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:13680: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13697: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:13683: \$? = $ac_status" >&5
++  echo "$as_me:13700: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_func_fseeko=yes
+ else
+@@ -13690,7 +13707,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:13693: result: $ac_cv_func_fseeko" >&5
++echo "$as_me:13710: result: $ac_cv_func_fseeko" >&5
+ echo "${ECHO_T}$ac_cv_func_fseeko" >&6
+ if test $ac_cv_func_fseeko = yes; then
+ 
+@@ -13729,14 +13746,14 @@
+ 
+ 	fi
+ 
+-	echo "$as_me:13732: checking whether to use struct dirent64" >&5
++	echo "$as_me:13749: 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 13739 "configure"
++#line 13756 "configure"
+ #include "confdefs.h"
+ 
+ #pragma GCC diagnostic error "-Wincompatible-pointer-types"
+@@ -13759,16 +13776,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:13762: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:13779: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:13765: \$? = $ac_status" >&5
++  echo "$as_me:13782: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:13768: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13785: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:13771: \$? = $ac_status" >&5
++  echo "$as_me:13788: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_struct_dirent64=yes
+ else
+@@ -13779,7 +13796,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:13782: result: $cf_cv_struct_dirent64" >&5
++echo "$as_me:13799: result: $cf_cv_struct_dirent64" >&5
+ echo "${ECHO_T}$cf_cv_struct_dirent64" >&6
+ 	test "$cf_cv_struct_dirent64" = yes &&
+ cat >>confdefs.h <<\EOF
+@@ -13789,7 +13806,7 @@
+ 	fi
+ 
+ ###   use option --disable-tparm-varargs to make tparm() conform to X/Open
+-echo "$as_me:13792: checking if you want tparm not to use X/Open fixed-parameter list" >&5
++echo "$as_me:13809: 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.
+@@ -13799,14 +13816,14 @@
+ else
+   with_tparm_varargs=yes
+ fi;
+-echo "$as_me:13802: result: $with_tparm_varargs" >&5
++echo "$as_me:13819: 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:13809: checking if you want tic library to use explicit dependency on ncurses$LIB_SUFFIX library" >&5
++echo "$as_me:13826: 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.
+@@ -13816,14 +13833,14 @@
+ else
+   with_tic_depends=yes
+ fi;
+-echo "$as_me:13819: result: $with_tic_depends" >&5
++echo "$as_me:13836: 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:13826: checking if you want to enable wattr* macros" >&5
++echo "$as_me:13843: 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.
+@@ -13835,15 +13852,15 @@
+ fi;
+ if [ "x$with_wattr_macros" != xyes ]; then
+ 	NCURSES_WATTR_MACROS=0
+-	echo "$as_me:13838: result: no" >&5
++	echo "$as_me:13855: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ else
+ 	NCURSES_WATTR_MACROS=1
+-	echo "$as_me:13842: result: yes" >&5
++	echo "$as_me:13859: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ fi
+ 
+-echo "$as_me:13846: checking for X11 rgb file" >&5
++echo "$as_me:13863: 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.
+@@ -13907,7 +13924,7 @@
+ 	cf_path=`echo "$cf_path" | sed -e s%NONE%$cf_path_syntax%`
+ 	;;
+ (*)
+-	{ { echo "$as_me:13910: error: expected a pathname, not \"$cf_path\"" >&5
++	{ { echo "$as_me:13927: error: expected a pathname, not \"$cf_path\"" >&5
+ echo "$as_me: error: expected a pathname, not \"$cf_path\"" >&2;}
+    { (exit 1); exit 1; }; }
+ 	;;
+@@ -13915,7 +13932,7 @@
+ 
+ fi
+ 
+-echo "$as_me:13918: result: $RGB_PATH" >&5
++echo "$as_me:13935: result: $RGB_PATH" >&5
+ echo "${ECHO_T}$RGB_PATH" >&6
+ 
+ cat >>confdefs.h <<EOF
+@@ -13929,7 +13946,7 @@
+ fi
+ 
+ ###   use option --with-bool to override bool's type
+-echo "$as_me:13932: checking for type of bool" >&5
++echo "$as_me:13949: 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.
+@@ -13939,10 +13956,10 @@
+ else
+   NCURSES_BOOL=auto
+ fi;
+-echo "$as_me:13942: result: $NCURSES_BOOL" >&5
++echo "$as_me:13959: result: $NCURSES_BOOL" >&5
+ echo "${ECHO_T}$NCURSES_BOOL" >&6
+ 
+-echo "$as_me:13945: checking for alternate terminal capabilities file" >&5
++echo "$as_me:13962: 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.
+@@ -13952,12 +13969,17 @@
+ else
+   TERMINFO_CAPS=Caps
+ fi;
+-test -f "${srcdir}/include/${TERMINFO_CAPS}" || TERMINFO_CAPS=Caps
+-echo "$as_me:13956: result: $TERMINFO_CAPS" >&5
++if test ! -f "${srcdir}/include/${TERMINFO_CAPS}"
++then
++	{ echo "$as_me:13974: 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:13978: result: $TERMINFO_CAPS" >&5
+ echo "${ECHO_T}$TERMINFO_CAPS" >&6
+ 
+ ###   use option --with-chtype to override chtype's type
+-echo "$as_me:13960: checking for type of chtype" >&5
++echo "$as_me:13982: 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.
+@@ -13967,11 +13989,11 @@
+ else
+   NCURSES_CHTYPE=$cf_dft_chtype
+ fi;
+-echo "$as_me:13970: result: $NCURSES_CHTYPE" >&5
++echo "$as_me:13992: result: $NCURSES_CHTYPE" >&5
+ echo "${ECHO_T}$NCURSES_CHTYPE" >&6
+ 
+ ###   use option --with-ospeed to override ospeed's type
+-echo "$as_me:13974: checking for type of ospeed" >&5
++echo "$as_me:13996: 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.
+@@ -13981,11 +14003,11 @@
+ else
+   NCURSES_OSPEED=short
+ fi;
+-echo "$as_me:13984: result: $NCURSES_OSPEED" >&5
++echo "$as_me:14006: result: $NCURSES_OSPEED" >&5
+ echo "${ECHO_T}$NCURSES_OSPEED" >&6
+ 
+ ###   use option --with-mmask-t to override mmask_t's type
+-echo "$as_me:13988: checking for type of mmask_t" >&5
++echo "$as_me:14010: 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.
+@@ -13995,11 +14017,11 @@
+ else
+   NCURSES_MMASK_T=$cf_dft_mmask_t
+ fi;
+-echo "$as_me:13998: result: $NCURSES_MMASK_T" >&5
++echo "$as_me:14020: result: $NCURSES_MMASK_T" >&5
+ echo "${ECHO_T}$NCURSES_MMASK_T" >&6
+ 
+ ###   use option --with-ccharw-max to override CCHARW_MAX size
+-echo "$as_me:14002: checking for size CCHARW_MAX" >&5
++echo "$as_me:14024: 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.
+@@ -14007,18 +14029,18 @@
+   withval="$with_ccharw_max"
+   NCURSES_CCHARW_MAX="$withval"
+ else
+-  NCURSES_CCHARW_MAX=5
++  NCURSES_CCHARW_MAX=$cf_dft_ccharw_max
+ fi;
+-echo "$as_me:14012: result: $NCURSES_CCHARW_MAX" >&5
++echo "$as_me:14034: result: $NCURSES_CCHARW_MAX" >&5
+ echo "${ECHO_T}$NCURSES_CCHARW_MAX" >&6
+ 
+-echo "$as_me:14015: checking for ANSI C header files" >&5
++echo "$as_me:14037: 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 14021 "configure"
++#line 14043 "configure"
+ #include "confdefs.h"
+ #include <stdlib.h>
+ #include <stdarg.h>
+@@ -14026,13 +14048,13 @@
+ #include <float.h>
+ 
+ _ACEOF
+-if { (eval echo "$as_me:14029: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:14051: \"$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:14035: \$? = $ac_status" >&5
++  echo "$as_me:14057: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -14054,7 +14076,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 14057 "configure"
++#line 14079 "configure"
+ #include "confdefs.h"
+ #include <string.h>
+ 
+@@ -14072,7 +14094,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 14075 "configure"
++#line 14097 "configure"
+ #include "confdefs.h"
+ #include <stdlib.h>
+ 
+@@ -14093,7 +14115,7 @@
+   :
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 14096 "configure"
++#line 14118 "configure"
+ #include "confdefs.h"
+ #include <ctype.h>
+ #if ((' ' & 0x0FF) == 0x020)
+@@ -14119,15 +14141,15 @@
+ }
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:14122: \"$ac_link\"") >&5
++if { (eval echo "$as_me:14144: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:14125: \$? = $ac_status" >&5
++  echo "$as_me:14147: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:14127: \"$ac_try\"") >&5
++  { (eval echo "$as_me:14149: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:14130: \$? = $ac_status" >&5
++  echo "$as_me:14152: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   :
+ else
+@@ -14140,7 +14162,7 @@
+ fi
+ fi
+ fi
+-echo "$as_me:14143: result: $ac_cv_header_stdc" >&5
++echo "$as_me:14165: result: $ac_cv_header_stdc" >&5
+ echo "${ECHO_T}$ac_cv_header_stdc" >&6
+ if test $ac_cv_header_stdc = yes; then
+ 
+@@ -14156,28 +14178,28 @@
+                   inttypes.h stdint.h unistd.h
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-echo "$as_me:14159: checking for $ac_header" >&5
++echo "$as_me:14181: 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 14165 "configure"
++#line 14187 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ #include <$ac_header>
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:14171: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:14193: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:14174: \$? = $ac_status" >&5
++  echo "$as_me:14196: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:14177: \"$ac_try\"") >&5
++  { (eval echo "$as_me:14199: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:14180: \$? = $ac_status" >&5
++  echo "$as_me:14202: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   eval "$as_ac_Header=yes"
+ else
+@@ -14187,7 +14209,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:14190: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
++echo "$as_me:14212: 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
+@@ -14197,13 +14219,13 @@
+ fi
+ done
+ 
+-echo "$as_me:14200: checking for signed char" >&5
++echo "$as_me:14222: 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 14206 "configure"
++#line 14228 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -14218,16 +14240,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:14221: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:14243: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:14224: \$? = $ac_status" >&5
++  echo "$as_me:14246: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:14227: \"$ac_try\"") >&5
++  { (eval echo "$as_me:14249: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:14230: \$? = $ac_status" >&5
++  echo "$as_me:14252: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_type_signed_char=yes
+ else
+@@ -14237,10 +14259,10 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:14240: result: $ac_cv_type_signed_char" >&5
++echo "$as_me:14262: result: $ac_cv_type_signed_char" >&5
+ echo "${ECHO_T}$ac_cv_type_signed_char" >&6
+ 
+-echo "$as_me:14243: checking size of signed char" >&5
++echo "$as_me:14265: 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
+@@ -14249,7 +14271,7 @@
+   if test "$cross_compiling" = yes; then
+   # Depending upon the size, compute the lo and hi bounds.
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 14252 "configure"
++#line 14274 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -14261,21 +14283,21 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:14264: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:14286: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:14267: \$? = $ac_status" >&5
++  echo "$as_me:14289: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:14270: \"$ac_try\"") >&5
++  { (eval echo "$as_me:14292: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:14273: \$? = $ac_status" >&5
++  echo "$as_me:14295: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_lo=0 ac_mid=0
+   while :; do
+     cat >"conftest.$ac_ext" <<_ACEOF
+-#line 14278 "configure"
++#line 14300 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -14287,16 +14309,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:14290: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:14312: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:14293: \$? = $ac_status" >&5
++  echo "$as_me:14315: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:14296: \"$ac_try\"") >&5
++  { (eval echo "$as_me:14318: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:14299: \$? = $ac_status" >&5
++  echo "$as_me:14321: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_hi=$ac_mid; break
+ else
+@@ -14312,7 +14334,7 @@
+ ac_hi=-1 ac_mid=-1
+   while :; do
+     cat >"conftest.$ac_ext" <<_ACEOF
+-#line 14315 "configure"
++#line 14337 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -14324,16 +14346,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:14327: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:14349: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:14330: \$? = $ac_status" >&5
++  echo "$as_me:14352: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:14333: \"$ac_try\"") >&5
++  { (eval echo "$as_me:14355: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:14336: \$? = $ac_status" >&5
++  echo "$as_me:14358: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_lo=$ac_mid; break
+ else
+@@ -14349,7 +14371,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 14352 "configure"
++#line 14374 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -14361,16 +14383,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:14364: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:14386: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:14367: \$? = $ac_status" >&5
++  echo "$as_me:14389: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:14370: \"$ac_try\"") >&5
++  { (eval echo "$as_me:14392: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:14373: \$? = $ac_status" >&5
++  echo "$as_me:14395: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_hi=$ac_mid
+ else
+@@ -14383,12 +14405,12 @@
+ ac_cv_sizeof_signed_char=$ac_lo
+ else
+   if test "$cross_compiling" = yes; then
+-  { { echo "$as_me:14386: error: cannot run test program while cross compiling" >&5
++  { { echo "$as_me:14408: 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 14391 "configure"
++#line 14413 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -14404,15 +14426,15 @@
+ }
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:14407: \"$ac_link\"") >&5
++if { (eval echo "$as_me:14429: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:14410: \$? = $ac_status" >&5
++  echo "$as_me:14432: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:14412: \"$ac_try\"") >&5
++  { (eval echo "$as_me:14434: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:14415: \$? = $ac_status" >&5
++  echo "$as_me:14437: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_sizeof_signed_char=`cat conftest.val`
+ else
+@@ -14428,7 +14450,7 @@
+   ac_cv_sizeof_signed_char=0
+ fi
+ fi
+-echo "$as_me:14431: result: $ac_cv_sizeof_signed_char" >&5
++echo "$as_me:14453: 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
+@@ -14439,7 +14461,7 @@
+ else
+ 	NCURSES_SBOOL="char"
+ fi
+-echo "$as_me:14442: checking if you want to use signed Boolean array in term.h" >&5
++echo "$as_me:14464: checking if you want to use signed Boolean array in term.h" >&5
+ echo $ECHO_N "checking if you want to use signed Boolean array in term.h... $ECHO_C" >&6
+ 
+ # Check whether --enable-signed-char or --disable-signed-char was given.
+@@ -14447,14 +14469,14 @@
+   enableval="$enable_signed_char"
+   with_signed_char=$enableval
+ else
+-  with_signed_char=no
++  with_signed_char=$cf_dft_signed_char
+ fi;
+-echo "$as_me:14452: result: $with_signed_char" >&5
++echo "$as_me:14474: 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:14457: checking for type of tparm args" >&5
++echo "$as_me:14479: checking for type of tparm args" >&5
+ echo $ECHO_N "checking for type of tparm args... $ECHO_C" >&6
+ 
+ # Check whether --with-tparm-arg or --without-tparm-arg was given.
+@@ -14464,11 +14486,11 @@
+ else
+   NCURSES_TPARM_ARG=$cf_dft_tparm_arg
+ fi;
+-echo "$as_me:14467: result: $NCURSES_TPARM_ARG" >&5
++echo "$as_me:14489: result: $NCURSES_TPARM_ARG" >&5
+ echo "${ECHO_T}$NCURSES_TPARM_ARG" >&6
+ 
+ ### Enable compiling-in rcs id's
+-echo "$as_me:14471: checking if RCS identifiers should be compiled-in" >&5
++echo "$as_me:14493: 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.
+@@ -14478,7 +14500,7 @@
+ else
+   with_rcs_ids=no
+ fi;
+-echo "$as_me:14481: result: $with_rcs_ids" >&5
++echo "$as_me:14503: result: $with_rcs_ids" >&5
+ echo "${ECHO_T}$with_rcs_ids" >&6
+ test "x$with_rcs_ids" = xyes &&
+ cat >>confdefs.h <<\EOF
+@@ -14487,7 +14509,7 @@
+ 
+ ###############################################################################
+ 
+-echo "$as_me:14490: checking format of man-pages" >&5
++echo "$as_me:14512: 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.
+@@ -14576,14 +14598,14 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:14579: result: $MANPAGE_FORMAT" >&5
++echo "$as_me:14601: result: $MANPAGE_FORMAT" >&5
+ echo "${ECHO_T}$MANPAGE_FORMAT" >&6
+ if test -n "$cf_unknown" ; then
+-	{ echo "$as_me:14582: WARNING: Unexpected manpage-format $cf_unknown" >&5
++	{ echo "$as_me:14604: WARNING: Unexpected manpage-format $cf_unknown" >&5
+ echo "$as_me: WARNING: Unexpected manpage-format $cf_unknown" >&2;}
+ fi
+ 
+-echo "$as_me:14586: checking for manpage renaming" >&5
++echo "$as_me:14608: 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.
+@@ -14611,7 +14633,7 @@
+ 	if test -f "$srcdir/man/$MANPAGE_RENAMES" ; then
+ 		MANPAGE_RENAMES=`cd "$srcdir/man" && pwd`/$MANPAGE_RENAMES
+ 	elif test ! -f "$MANPAGE_RENAMES" ; then
+-		{ { echo "$as_me:14614: error: not a filename: $MANPAGE_RENAMES" >&5
++		{ { echo "$as_me:14636: error: not a filename: $MANPAGE_RENAMES" >&5
+ echo "$as_me: error: not a filename: $MANPAGE_RENAMES" >&2;}
+    { (exit 1); exit 1; }; }
+ 	fi
+@@ -14625,10 +14647,10 @@
+ 	fi
+ fi
+ 
+-echo "$as_me:14628: result: $MANPAGE_RENAMES" >&5
++echo "$as_me:14650: result: $MANPAGE_RENAMES" >&5
+ echo "${ECHO_T}$MANPAGE_RENAMES" >&6
+ 
+-echo "$as_me:14631: checking if manpage aliases will be installed" >&5
++echo "$as_me:14653: 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.
+@@ -14639,7 +14661,7 @@
+   MANPAGE_ALIASES=yes
+ fi;
+ 
+-echo "$as_me:14642: result: $MANPAGE_ALIASES" >&5
++echo "$as_me:14664: result: $MANPAGE_ALIASES" >&5
+ echo "${ECHO_T}$MANPAGE_ALIASES" >&6
+ 
+ case "x$LN_S" in
+@@ -14653,7 +14675,7 @@
+ 
+ MANPAGE_SYMLINKS=no
+ if test "$MANPAGE_ALIASES" = yes ; then
+-echo "$as_me:14656: checking if manpage symlinks should be used" >&5
++echo "$as_me:14678: 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.
+@@ -14666,17 +14688,17 @@
+ 
+ if test "$$cf_use_symlinks" = no; then
+ if test "$MANPAGE_SYMLINKS" = yes ; then
+-	{ echo "$as_me:14669: WARNING: cannot make symlinks" >&5
++	{ echo "$as_me:14691: WARNING: cannot make symlinks" >&5
+ echo "$as_me: WARNING: cannot make symlinks" >&2;}
+ 	MANPAGE_SYMLINKS=no
+ fi
+ fi
+ 
+-echo "$as_me:14675: result: $MANPAGE_SYMLINKS" >&5
++echo "$as_me:14697: result: $MANPAGE_SYMLINKS" >&5
+ echo "${ECHO_T}$MANPAGE_SYMLINKS" >&6
+ fi
+ 
+-echo "$as_me:14679: checking for manpage tbl" >&5
++echo "$as_me:14701: 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.
+@@ -14687,7 +14709,7 @@
+   MANPAGE_TBL=no
+ fi;
+ 
+-echo "$as_me:14690: result: $MANPAGE_TBL" >&5
++echo "$as_me:14712: result: $MANPAGE_TBL" >&5
+ echo "${ECHO_T}$MANPAGE_TBL" >&6
+ 
+ if test "$prefix" = "NONE" ; then
+@@ -15020,7 +15042,7 @@
+ ###############################################################################
+ 
+ ### Note that some functions (such as const) are normally disabled anyway.
+-echo "$as_me:15023: checking if you want to build with function extensions" >&5
++echo "$as_me:15045: 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.
+@@ -15030,7 +15052,7 @@
+ else
+   with_ext_funcs=yes
+ fi;
+-echo "$as_me:15033: result: $with_ext_funcs" >&5
++echo "$as_me:15055: result: $with_ext_funcs" >&5
+ echo "${ECHO_T}$with_ext_funcs" >&6
+ if test "x$with_ext_funcs" = xyes ; then
+ 	NCURSES_EXT_FUNCS=1
+@@ -15090,7 +15112,7 @@
+ 	GENERATED_EXT_FUNCS=
+ fi
+ 
+-echo "$as_me:15093: checking if you want to build with SCREEN extensions" >&5
++echo "$as_me:15115: 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.
+@@ -15100,7 +15122,7 @@
+ else
+   with_sp_funcs=$cf_dft_ext_spfuncs
+ fi;
+-echo "$as_me:15103: result: $with_sp_funcs" >&5
++echo "$as_me:15125: result: $with_sp_funcs" >&5
+ echo "${ECHO_T}$with_sp_funcs" >&6
+ if test "x$with_sp_funcs" = xyes ; then
+ 	NCURSES_SP_FUNCS=1
+@@ -15119,7 +15141,7 @@
+ 	GENERATED_SP_FUNCS=
+ fi
+ 
+-echo "$as_me:15122: checking if you want to build with terminal-driver" >&5
++echo "$as_me:15144: 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.
+@@ -15129,7 +15151,7 @@
+ else
+   with_term_driver=no
+ fi;
+-echo "$as_me:15132: result: $with_term_driver" >&5
++echo "$as_me:15154: result: $with_term_driver" >&5
+ echo "${ECHO_T}$with_term_driver" >&6
+ if test "x$with_term_driver" = xyes ; then
+ 
+@@ -15138,19 +15160,19 @@
+ EOF
+ 
+ 	if test "x$with_termlib" != xno ; then
+-		{ { echo "$as_me:15141: error: The term-driver option conflicts with the termlib option" >&5
++		{ { echo "$as_me:15163: 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:15146: error: The term-driver option relies upon sp-funcs" >&5
++		{ { echo "$as_me:15168: 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:15153: checking for extended use of const keyword" >&5
++echo "$as_me:15175: 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.
+@@ -15160,7 +15182,7 @@
+ else
+   with_ext_const=$cf_dft_ext_const
+ fi;
+-echo "$as_me:15163: result: $with_ext_const" >&5
++echo "$as_me:15185: result: $with_ext_const" >&5
+ echo "${ECHO_T}$with_ext_const" >&6
+ NCURSES_CONST='/*nothing*/'
+ if test "x$with_ext_const" = xyes ; then
+@@ -15168,7 +15190,7 @@
+ fi
+ 
+ ###   use option --enable-ext-colors to turn on use of colors beyond 16.
+-echo "$as_me:15171: checking if you want to use extended colors" >&5
++echo "$as_me:15193: 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.
+@@ -15178,12 +15200,12 @@
+ else
+   with_ext_colors=$cf_dft_ext_colors
+ fi;
+-echo "$as_me:15181: result: $with_ext_colors" >&5
++echo "$as_me:15203: 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:15186: WARNING: This option applies only to wide-character library" >&5
++		{ echo "$as_me:15208: 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)
+@@ -15193,7 +15215,7 @@
+ 	(5.*)
+ 		cf_cv_rel_version=6.0
+ 		cf_cv_abi_version=6
+-		{ echo "$as_me:15196: WARNING: overriding ABI version to $cf_cv_abi_version" >&5
++		{ echo "$as_me:15218: WARNING: overriding ABI version to $cf_cv_abi_version" >&5
+ echo "$as_me: WARNING: overriding ABI version to $cf_cv_abi_version" >&2;}
+ 		;;
+ 	esac
+@@ -15221,7 +15243,7 @@
+ fi
+ 
+ ###   use option --enable-ext-mouse to modify coding to support 5-button mice
+-echo "$as_me:15224: checking if you want to use extended mouse encoding" >&5
++echo "$as_me:15246: 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.
+@@ -15231,18 +15253,16 @@
+ else
+   with_ext_mouse=$cf_dft_ext_mouse
+ fi;
+-echo "$as_me:15234: result: $with_ext_mouse" >&5
++echo "$as_me:15256: result: $with_ext_mouse" >&5
+ echo "${ECHO_T}$with_ext_mouse" >&6
+-NCURSES_MOUSE_VERSION=1
+ if test "x$with_ext_mouse" = xyes ; then
+-	NCURSES_MOUSE_VERSION=2
+ 
+ if test "${with_abi_version+set}" != set; then
+ 	case "$cf_cv_rel_version" in
+ 	(5.*)
+ 		cf_cv_rel_version=6.0
+ 		cf_cv_abi_version=6
+-		{ echo "$as_me:15245: WARNING: overriding ABI version to $cf_cv_abi_version" >&5
++		{ echo "$as_me:15265: WARNING: overriding ABI version to $cf_cv_abi_version" >&5
+ echo "$as_me: WARNING: overriding ABI version to $cf_cv_abi_version" >&2;}
+ 		;;
+ 	esac
+@@ -15250,8 +15270,20 @@
+ 
+ fi
+ 
++case $cf_cv_abi_version in
++(5)
++	NCURSES_MOUSE_VERSION=1
++	;;
++(6)
++	NCURSES_MOUSE_VERSION=2
++	;;
++(789)
++	NCURSES_MOUSE_VERSION=3
++	;;
++esac
++
+ ###   use option --enable-ext-putwin to turn on extended screendumps
+-echo "$as_me:15254: checking if you want to use extended putwin/screendump" >&5
++echo "$as_me:15286: 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.
+@@ -15261,7 +15293,7 @@
+ else
+   with_ext_putwin=$cf_dft_ext_putwin
+ fi;
+-echo "$as_me:15264: result: $with_ext_putwin" >&5
++echo "$as_me:15296: result: $with_ext_putwin" >&5
+ echo "${ECHO_T}$with_ext_putwin" >&6
+ if test "x$with_ext_putwin" = xyes ; then
+ 
+@@ -15271,7 +15303,7 @@
+ 
+ fi
+ 
+-echo "$as_me:15274: checking if you want \$NCURSES_NO_PADDING code" >&5
++echo "$as_me:15306: 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.
+@@ -15281,7 +15313,7 @@
+ else
+   with_no_padding=$with_ext_funcs
+ fi;
+-echo "$as_me:15284: result: $with_no_padding" >&5
++echo "$as_me:15316: result: $with_no_padding" >&5
+ echo "${ECHO_T}$with_no_padding" >&6
+ test "x$with_no_padding" = xyes &&
+ cat >>confdefs.h <<\EOF
+@@ -15289,7 +15321,7 @@
+ EOF
+ 
+ ###   use option --enable-sigwinch to turn on use of SIGWINCH logic
+-echo "$as_me:15292: checking if you want SIGWINCH handler" >&5
++echo "$as_me:15324: 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.
+@@ -15299,7 +15331,7 @@
+ else
+   with_sigwinch=$with_ext_funcs
+ fi;
+-echo "$as_me:15302: result: $with_sigwinch" >&5
++echo "$as_me:15334: result: $with_sigwinch" >&5
+ echo "${ECHO_T}$with_sigwinch" >&6
+ test "x$with_sigwinch" = xyes &&
+ cat >>confdefs.h <<\EOF
+@@ -15307,7 +15339,7 @@
+ EOF
+ 
+ ###   use option --enable-tcap-names to allow user to define new capabilities
+-echo "$as_me:15310: checking if you want user-definable terminal capabilities like termcap" >&5
++echo "$as_me:15342: 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.
+@@ -15317,14 +15349,14 @@
+ else
+   with_tcap_names=$with_ext_funcs
+ fi;
+-echo "$as_me:15320: result: $with_tcap_names" >&5
++echo "$as_me:15352: result: $with_tcap_names" >&5
+ echo "${ECHO_T}$with_tcap_names" >&6
+ NCURSES_XNAMES=0
+ test "x$with_tcap_names" = xyes && NCURSES_XNAMES=1
+ 
+ ##############################################################################
+ 
+-echo "$as_me:15327: checking if you want to link with the pthread library" >&5
++echo "$as_me:15359: 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.
+@@ -15334,27 +15366,27 @@
+ else
+   with_pthread=no
+ fi;
+-echo "$as_me:15337: result: $with_pthread" >&5
++echo "$as_me:15369: result: $with_pthread" >&5
+ echo "${ECHO_T}$with_pthread" >&6
+ 
+ if test "$with_pthread" != no ; then
+-	echo "$as_me:15341: checking for pthread.h" >&5
++	echo "$as_me:15373: 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 15347 "configure"
++#line 15379 "configure"
+ #include "confdefs.h"
+ #include <pthread.h>
+ _ACEOF
+-if { (eval echo "$as_me:15351: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:15383: \"$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:15357: \$? = $ac_status" >&5
++  echo "$as_me:15389: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -15373,7 +15405,7 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:15376: result: $ac_cv_header_pthread_h" >&5
++echo "$as_me:15408: 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
+ 
+@@ -15383,7 +15415,7 @@
+ 
+ 	for cf_lib_pthread in pthread c_r
+ 	do
+-	    echo "$as_me:15386: checking if we can link with the $cf_lib_pthread library" >&5
++	    echo "$as_me:15418: 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"
+ 
+@@ -15404,7 +15436,7 @@
+ LIBS="$cf_add_libs"
+ 
+ 	    cat >"conftest.$ac_ext" <<_ACEOF
+-#line 15407 "configure"
++#line 15439 "configure"
+ #include "confdefs.h"
+ 
+ #include <pthread.h>
+@@ -15421,16 +15453,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:15424: \"$ac_link\"") >&5
++if { (eval echo "$as_me:15456: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:15427: \$? = $ac_status" >&5
++  echo "$as_me:15459: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:15430: \"$ac_try\"") >&5
++  { (eval echo "$as_me:15462: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:15433: \$? = $ac_status" >&5
++  echo "$as_me:15465: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   with_pthread=yes
+ else
+@@ -15440,7 +15472,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ 	    LIBS="$cf_save_LIBS"
+-	    echo "$as_me:15443: result: $with_pthread" >&5
++	    echo "$as_me:15475: result: $with_pthread" >&5
+ echo "${ECHO_T}$with_pthread" >&6
+ 	    test "$with_pthread" = yes && break
+ 	done
+@@ -15468,7 +15500,7 @@
+ EOF
+ 
+ 	else
+-	    { { echo "$as_me:15471: error: Cannot link with pthread library" >&5
++	    { { echo "$as_me:15503: error: Cannot link with pthread library" >&5
+ echo "$as_me: error: Cannot link with pthread library" >&2;}
+    { (exit 1); exit 1; }; }
+ 	fi
+@@ -15478,13 +15510,13 @@
+ fi
+ 
+ if test "x$with_pthread" != xno; then
+-	echo "$as_me:15481: checking for pthread_kill" >&5
++	echo "$as_me:15513: 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 15487 "configure"
++#line 15519 "configure"
+ #include "confdefs.h"
+ #define pthread_kill autoconf_temporary
+ #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -15515,16 +15547,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:15518: \"$ac_link\"") >&5
++if { (eval echo "$as_me:15550: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:15521: \$? = $ac_status" >&5
++  echo "$as_me:15553: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:15524: \"$ac_try\"") >&5
++  { (eval echo "$as_me:15556: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:15527: \$? = $ac_status" >&5
++  echo "$as_me:15559: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_func_pthread_kill=yes
+ else
+@@ -15534,11 +15566,11 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:15537: result: $ac_cv_func_pthread_kill" >&5
++echo "$as_me:15569: 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:15541: checking if you want to allow EINTR in wgetch with pthreads" >&5
++		echo "$as_me:15573: 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.
+@@ -15548,7 +15580,7 @@
+ else
+   use_pthreads_eintr=no
+ fi;
+-		echo "$as_me:15551: result: $use_pthreads_eintr" >&5
++		echo "$as_me:15583: result: $use_pthreads_eintr" >&5
+ echo "${ECHO_T}$use_pthreads_eintr" >&6
+ 		if test "x$use_pthreads_eintr" = xyes ; then
+ 
+@@ -15559,7 +15591,7 @@
+ 		fi
+ fi
+ 
+-	echo "$as_me:15562: checking if you want to use weak-symbols for pthreads" >&5
++	echo "$as_me:15594: 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.
+@@ -15569,18 +15601,18 @@
+ else
+   use_weak_symbols=no
+ fi;
+-	echo "$as_me:15572: result: $use_weak_symbols" >&5
++	echo "$as_me:15604: result: $use_weak_symbols" >&5
+ echo "${ECHO_T}$use_weak_symbols" >&6
+ 	if test "x$use_weak_symbols" = xyes ; then
+ 
+-echo "$as_me:15576: checking if $CC supports weak symbols" >&5
++echo "$as_me:15608: 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 15583 "configure"
++#line 15615 "configure"
+ #include "confdefs.h"
+ 
+ #include <stdio.h>
+@@ -15606,16 +15638,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:15609: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:15641: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:15612: \$? = $ac_status" >&5
++  echo "$as_me:15644: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:15615: \"$ac_try\"") >&5
++  { (eval echo "$as_me:15647: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:15618: \$? = $ac_status" >&5
++  echo "$as_me:15650: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_weak_symbols=yes
+ else
+@@ -15626,7 +15658,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:15629: result: $cf_cv_weak_symbols" >&5
++echo "$as_me:15661: result: $cf_cv_weak_symbols" >&5
+ echo "${ECHO_T}$cf_cv_weak_symbols" >&6
+ 
+ 	else
+@@ -15676,7 +15708,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:15679: checking if you want reentrant code" >&5
++echo "$as_me:15711: 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.
+@@ -15686,7 +15718,7 @@
+ else
+   with_reentrant=no
+ fi;
+-echo "$as_me:15689: result: $with_reentrant" >&5
++echo "$as_me:15721: result: $with_reentrant" >&5
+ echo "${ECHO_T}$with_reentrant" >&6
+ if test "x$with_reentrant" = xyes ; then
+ 	cf_cv_enable_reentrant=1
+@@ -15774,7 +15806,7 @@
+ 	(5.*)
+ 		cf_cv_rel_version=6.0
+ 		cf_cv_abi_version=6
+-		{ echo "$as_me:15777: WARNING: overriding ABI version to $cf_cv_abi_version" >&5
++		{ echo "$as_me:15809: WARNING: overriding ABI version to $cf_cv_abi_version" >&5
+ echo "$as_me: WARNING: overriding ABI version to $cf_cv_abi_version" >&2;}
+ 		;;
+ 	esac
+@@ -15783,10 +15815,10 @@
+ else
+ 	cf_cv_enable_reentrant=0
+ 	cf_cv_enable_opaque="NCURSES_OPAQUE"
+-	NCURSES_SIZE_T=short
++	NCURSES_SIZE_T=$cf_dft_ordinate_type
+ fi
+ 
+-echo "$as_me:15789: checking if you want opaque curses-library structures" >&5
++echo "$as_me:15821: checking if you want opaque curses-library structures" >&5
+ echo $ECHO_N "checking if you want opaque curses-library structures... $ECHO_C" >&6
+ 
+ # Check whether --enable-opaque-curses or --disable-opaque-curses was given.
+@@ -15798,26 +15830,26 @@
+ 	else
+ 
+ 	 test "$cf_cv_enable_reentrant" = 1 && enable_opaque_curses=yes
+-	 test "$cf_cv_enable_reentrant" = 1 || enable_opaque_curses=no
++	 test "$cf_cv_enable_reentrant" = 1 || enable_opaque_curses=$cf_dft_opaque_curses
+ 
+ 	fi
+ else
+   enableval=no
+ 
+ 	 test "$cf_cv_enable_reentrant" = 1 && enable_opaque_curses=yes
+-	 test "$cf_cv_enable_reentrant" = 1 || enable_opaque_curses=no
++	 test "$cf_cv_enable_reentrant" = 1 || enable_opaque_curses=$cf_dft_opaque_curses
+ 
+ fi;
+-echo "$as_me:15811: result: $enable_opaque_curses" >&5
++echo "$as_me:15843: 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:15816: error: reentrant configuration requires opaque library" >&5
++{ { echo "$as_me:15848: error: reentrant configuration requires opaque library" >&5
+ echo "$as_me: error: reentrant configuration requires opaque library" >&2;}
+    { (exit 1); exit 1; }; }
+ 
+-echo "$as_me:15820: checking if you want opaque form-library structures" >&5
++echo "$as_me:15852: checking if you want opaque form-library structures" >&5
+ echo $ECHO_N "checking if you want opaque form-library structures... $ECHO_C" >&6
+ 
+ # Check whether --enable-opaque-form or --disable-opaque-form was given.
+@@ -15827,10 +15859,10 @@
+ else
+   enable_opaque_form=no
+ fi;
+-echo "$as_me:15830: result: $enable_opaque_form" >&5
++echo "$as_me:15862: result: $enable_opaque_form" >&5
+ echo "${ECHO_T}$enable_opaque_form" >&6
+ 
+-echo "$as_me:15833: checking if you want opaque menu-library structures" >&5
++echo "$as_me:15865: checking if you want opaque menu-library structures" >&5
+ echo $ECHO_N "checking if you want opaque menu-library structures... $ECHO_C" >&6
+ 
+ # Check whether --enable-opaque-menu or --disable-opaque-menu was given.
+@@ -15840,10 +15872,10 @@
+ else
+   enable_opaque_menu=no
+ fi;
+-echo "$as_me:15843: result: $enable_opaque_menu" >&5
++echo "$as_me:15875: result: $enable_opaque_menu" >&5
+ echo "${ECHO_T}$enable_opaque_menu" >&6
+ 
+-echo "$as_me:15846: checking if you want opaque panel-library structures" >&5
++echo "$as_me:15878: checking if you want opaque panel-library structures" >&5
+ echo $ECHO_N "checking if you want opaque panel-library structures... $ECHO_C" >&6
+ 
+ # Check whether --enable-opaque-panel or --disable-opaque-panel was given.
+@@ -15853,7 +15885,7 @@
+ else
+   enable_opaque_panel=no
+ fi;
+-echo "$as_me:15856: result: $enable_opaque_panel" >&5
++echo "$as_me:15888: result: $enable_opaque_panel" >&5
+ echo "${ECHO_T}$enable_opaque_panel" >&6
+ 
+ NCURSES_OPAQUE=0;		test "$enable_opaque_curses" = yes && NCURSES_OPAQUE=1
+@@ -15863,7 +15895,7 @@
+ 
+ ### Allow using a different wrap-prefix
+ if test "$cf_cv_enable_reentrant" != 0 || test "$BROKEN_LINKER" = 1 ; then
+-	echo "$as_me:15866: checking for prefix used to wrap public variables" >&5
++	echo "$as_me:15898: 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.
+@@ -15873,7 +15905,7 @@
+ else
+   NCURSES_WRAP_PREFIX=_nc_
+ fi;
+-	echo "$as_me:15876: result: $NCURSES_WRAP_PREFIX" >&5
++	echo "$as_me:15908: result: $NCURSES_WRAP_PREFIX" >&5
+ echo "${ECHO_T}$NCURSES_WRAP_PREFIX" >&6
+ else
+ 	NCURSES_WRAP_PREFIX=_nc_
+@@ -15886,7 +15918,7 @@
+ ###############################################################################
+ # These options are relatively safe to experiment with.
+ 
+-echo "$as_me:15889: checking if you want all development code" >&5
++echo "$as_me:15921: 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.
+@@ -15896,11 +15928,11 @@
+ else
+   with_develop=no
+ fi;
+-echo "$as_me:15899: result: $with_develop" >&5
++echo "$as_me:15931: result: $with_develop" >&5
+ echo "${ECHO_T}$with_develop" >&6
+ 
+ ###   use option --enable-hard-tabs to turn on use of hard-tabs optimize
+-echo "$as_me:15903: checking if you want hard-tabs code" >&5
++echo "$as_me:15935: 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.
+@@ -15910,7 +15942,7 @@
+ else
+   enable_hard_tabs=$with_develop
+ fi;
+-echo "$as_me:15913: result: $enable_hard_tabs" >&5
++echo "$as_me:15945: result: $enable_hard_tabs" >&5
+ echo "${ECHO_T}$enable_hard_tabs" >&6
+ test "x$enable_hard_tabs" = xyes &&
+ cat >>confdefs.h <<\EOF
+@@ -15918,7 +15950,7 @@
+ EOF
+ 
+ ###   use option --enable-xmc-glitch to turn on use of magic-cookie optimize
+-echo "$as_me:15921: checking if you want limited support for xmc" >&5
++echo "$as_me:15953: 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.
+@@ -15928,7 +15960,7 @@
+ else
+   enable_xmc_glitch=$with_develop
+ fi;
+-echo "$as_me:15931: result: $enable_xmc_glitch" >&5
++echo "$as_me:15963: result: $enable_xmc_glitch" >&5
+ echo "${ECHO_T}$enable_xmc_glitch" >&6
+ test "x$enable_xmc_glitch" = xyes &&
+ cat >>confdefs.h <<\EOF
+@@ -15938,7 +15970,7 @@
+ ###############################################################################
+ # These are just experimental, probably should not be in a package:
+ 
+-echo "$as_me:15941: checking if you do not want to assume colors are white-on-black" >&5
++echo "$as_me:15973: 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.
+@@ -15948,7 +15980,7 @@
+ else
+   with_assumed_color=yes
+ fi;
+-echo "$as_me:15951: result: $with_assumed_color" >&5
++echo "$as_me:15983: result: $with_assumed_color" >&5
+ echo "${ECHO_T}$with_assumed_color" >&6
+ test "x$with_assumed_color" = xyes &&
+ cat >>confdefs.h <<\EOF
+@@ -15956,7 +15988,7 @@
+ EOF
+ 
+ ###   use option --enable-hashmap to turn on use of hashmap scrolling logic
+-echo "$as_me:15959: checking if you want hashmap scrolling-optimization code" >&5
++echo "$as_me:15991: 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.
+@@ -15966,7 +15998,7 @@
+ else
+   with_hashmap=yes
+ fi;
+-echo "$as_me:15969: result: $with_hashmap" >&5
++echo "$as_me:16001: result: $with_hashmap" >&5
+ echo "${ECHO_T}$with_hashmap" >&6
+ test "x$with_hashmap" = xyes &&
+ cat >>confdefs.h <<\EOF
+@@ -15974,7 +16006,7 @@
+ EOF
+ 
+ ###   use option --enable-colorfgbg to turn on use of $COLORFGBG environment
+-echo "$as_me:15977: checking if you want colorfgbg code" >&5
++echo "$as_me:16009: 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.
+@@ -15984,7 +16016,7 @@
+ else
+   with_colorfgbg=no
+ fi;
+-echo "$as_me:15987: result: $with_colorfgbg" >&5
++echo "$as_me:16019: result: $with_colorfgbg" >&5
+ echo "${ECHO_T}$with_colorfgbg" >&6
+ test "x$with_colorfgbg" = xyes &&
+ cat >>confdefs.h <<\EOF
+@@ -15992,7 +16024,7 @@
+ EOF
+ 
+ ###   use option --enable-fvisibility to turn on use of gcc-specific feature
+-echo "$as_me:15995: checking if you want to use gcc -fvisibility option" >&5
++echo "$as_me:16027: 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.
+@@ -16002,14 +16034,14 @@
+ else
+   cf_with_fvisibility=no
+ fi;
+-echo "$as_me:16005: result: $cf_with_fvisibility" >&5
++echo "$as_me:16037: 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:16012: checking if $CC -fvisibility=hidden option works" >&5
++echo "$as_me:16044: 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
+@@ -16018,7 +16050,7 @@
+     cf_save_cflags="$CFLAGS"
+     CFLAGS="$CFLAGS -fvisibility=hidden"
+     cat >"conftest.$ac_ext" <<_ACEOF
+-#line 16021 "configure"
++#line 16053 "configure"
+ #include "confdefs.h"
+ 
+ __attribute__ ((visibility("default"))) int somefunc() {return 42;}
+@@ -16034,16 +16066,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:16037: \"$ac_link\"") >&5
++if { (eval echo "$as_me:16069: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:16040: \$? = $ac_status" >&5
++  echo "$as_me:16072: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:16043: \"$ac_try\"") >&5
++  { (eval echo "$as_me:16075: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:16046: \$? = $ac_status" >&5
++  echo "$as_me:16078: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_fvisibility_hidden=yes
+ else
+@@ -16055,7 +16087,7 @@
+     CFLAGS=$cf_save_cflags
+ 
+ fi
+-echo "$as_me:16058: result: $cf_cv_fvisibility_hidden" >&5
++echo "$as_me:16090: result: $cf_cv_fvisibility_hidden" >&5
+ echo "${ECHO_T}$cf_cv_fvisibility_hidden" >&6
+ 
+ 	if test "x$cf_cv_fvisibility_hidden" = xyes
+@@ -16170,7 +16202,7 @@
+ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
+ ac_main_return="return"
+ 
+-echo "$as_me:16173: checking if $CXX -fvisibility=hidden option works" >&5
++echo "$as_me:16205: 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
+@@ -16179,7 +16211,7 @@
+     cf_save_cflags="$CXXFLAGS"
+     CXXFLAGS="$CXXFLAGS -fvisibility=hidden"
+     cat >"conftest.$ac_ext" <<_ACEOF
+-#line 16182 "configure"
++#line 16214 "configure"
+ #include "confdefs.h"
+ 
+ __attribute__ ((visibility("default"))) int somefunc() {return 42;}
+@@ -16195,16 +16227,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:16198: \"$ac_link\"") >&5
++if { (eval echo "$as_me:16230: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:16201: \$? = $ac_status" >&5
++  echo "$as_me:16233: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:16204: \"$ac_try\"") >&5
++  { (eval echo "$as_me:16236: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:16207: \$? = $ac_status" >&5
++  echo "$as_me:16239: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_fvisibility_hidden2=yes
+ else
+@@ -16216,7 +16248,7 @@
+     CXXFLAGS=$cf_save_cflags
+ 
+ fi
+-echo "$as_me:16219: result: $cf_cv_fvisibility_hidden2" >&5
++echo "$as_me:16251: result: $cf_cv_fvisibility_hidden2" >&5
+ echo "${ECHO_T}$cf_cv_fvisibility_hidden2" >&6
+ 
+ 		if test "x$cf_cv_fvisibility_hidden2" = xyes
+@@ -16339,7 +16371,7 @@
+ fi
+ 
+ ###   use option --enable-interop to turn on use of bindings used for interop
+-echo "$as_me:16342: checking if you want interop bindings" >&5
++echo "$as_me:16374: 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.
+@@ -16349,13 +16381,13 @@
+ else
+   with_exp_interop=$cf_dft_interop
+ fi;
+-echo "$as_me:16352: result: $with_exp_interop" >&5
++echo "$as_me:16384: 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:16358: checking if you want experimental safe-sprintf code" >&5
++echo "$as_me:16390: 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.
+@@ -16365,13 +16397,13 @@
+ else
+   with_safe_sprintf=no
+ fi;
+-echo "$as_me:16368: result: $with_safe_sprintf" >&5
++echo "$as_me:16400: 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:16374: checking if you want to experiment without scrolling-hints code" >&5
++echo "$as_me:16406: 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.
+@@ -16381,7 +16413,7 @@
+ else
+   with_scroll_hints=yes
+ fi;
+-echo "$as_me:16384: result: $with_scroll_hints" >&5
++echo "$as_me:16416: result: $with_scroll_hints" >&5
+ echo "${ECHO_T}$with_scroll_hints" >&6
+ test "x$with_scroll_hints" = xyes &&
+ cat >>confdefs.h <<\EOF
+@@ -16390,7 +16422,7 @@
+ 
+ fi
+ 
+-echo "$as_me:16393: checking if you want wgetch-events code" >&5
++echo "$as_me:16425: 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.
+@@ -16400,7 +16432,7 @@
+ else
+   with_wgetch_events=no
+ fi;
+-echo "$as_me:16403: result: $with_wgetch_events" >&5
++echo "$as_me:16435: result: $with_wgetch_events" >&5
+ echo "${ECHO_T}$with_wgetch_events" >&6
+ if test "x$with_wgetch_events" = xyes ; then
+ 
+@@ -16415,7 +16447,7 @@
+ 
+ case "$cf_cv_system_name" in
+ (*mingw32*|*mingw64*|*-msvc*)
+-	echo "$as_me:16418: checking if you want experimental-Windows driver" >&5
++	echo "$as_me:16450: 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.
+@@ -16425,7 +16457,7 @@
+ else
+   with_exp_win32=no
+ fi;
+-	echo "$as_me:16428: result: $with_exp_win32" >&5
++	echo "$as_me:16460: result: $with_exp_win32" >&5
+ echo "${ECHO_T}$with_exp_win32" >&6
+ 	if test "x$with_exp_win32" = xyes
+ 	then
+@@ -16451,7 +16483,7 @@
+ 
+ ###	use option --disable-echo to suppress full display compiling commands
+ 
+-echo "$as_me:16454: checking if you want to see long compiling messages" >&5
++echo "$as_me:16486: 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.
+@@ -16485,7 +16517,7 @@
+ 	ECHO_CC=''
+ 
+ fi;
+-echo "$as_me:16488: result: $enableval" >&5
++echo "$as_me:16520: result: $enableval" >&5
+ echo "${ECHO_T}$enableval" >&6
+ 
+ if test "x$enable_echo" = xyes; then
+@@ -16498,7 +16530,7 @@
+ 
+ # --disable-stripping is used for debugging
+ 
+-echo "$as_me:16501: checking if you want to install stripped executables" >&5
++echo "$as_me:16533: 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.
+@@ -16515,7 +16547,7 @@
+ 	enable_stripping=yes
+ 
+ fi;
+-echo "$as_me:16518: result: $enable_stripping" >&5
++echo "$as_me:16550: result: $enable_stripping" >&5
+ echo "${ECHO_T}$enable_stripping" >&6
+ 
+ if test "$enable_stripping" = yes
+@@ -16526,7 +16558,7 @@
+ fi
+ 
+ : "${INSTALL:=install}"
+-echo "$as_me:16529: checking if install accepts -p option" >&5
++echo "$as_me:16561: 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
+@@ -16557,10 +16589,10 @@
+ 	rm -rf ./conftest*
+ 
+ fi
+-echo "$as_me:16560: result: $cf_cv_install_p" >&5
++echo "$as_me:16592: result: $cf_cv_install_p" >&5
+ echo "${ECHO_T}$cf_cv_install_p" >&6
+ 
+-echo "$as_me:16563: checking if install needs to be told about ownership" >&5
++echo "$as_me:16595: 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)
+@@ -16571,7 +16603,7 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:16574: result: $with_install_o" >&5
++echo "$as_me:16606: result: $with_install_o" >&5
+ echo "${ECHO_T}$with_install_o" >&6
+ if test "x$with_install_o" = xyes
+ then
+@@ -16596,7 +16628,7 @@
+ 
+ ###	use option --enable-warnings to turn on all gcc warnings
+ 
+-echo "$as_me:16599: checking if you want to use C11 _Noreturn feature" >&5
++echo "$as_me:16631: 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.
+@@ -16613,17 +16645,17 @@
+ 	enable_stdnoreturn=no
+ 
+ fi;
+-echo "$as_me:16616: result: $enable_stdnoreturn" >&5
++echo "$as_me:16648: result: $enable_stdnoreturn" >&5
+ echo "${ECHO_T}$enable_stdnoreturn" >&6
+ 
+ if test $enable_stdnoreturn = yes; then
+-echo "$as_me:16620: checking for C11 _Noreturn feature" >&5
++echo "$as_me:16652: 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 16626 "configure"
++#line 16658 "configure"
+ #include "confdefs.h"
+ 
+ #include <stdio.h>
+@@ -16640,16 +16672,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:16643: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:16675: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:16646: \$? = $ac_status" >&5
++  echo "$as_me:16678: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:16649: \"$ac_try\"") >&5
++  { (eval echo "$as_me:16681: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:16652: \$? = $ac_status" >&5
++  echo "$as_me:16684: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_c11_noreturn=yes
+ else
+@@ -16660,7 +16692,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:16663: result: $cf_cv_c11_noreturn" >&5
++echo "$as_me:16695: result: $cf_cv_c11_noreturn" >&5
+ echo "${ECHO_T}$cf_cv_c11_noreturn" >&6
+ else
+ 	cf_cv_c11_noreturn=no,
+@@ -16688,14 +16720,16 @@
+ then
+ 	case $CFLAGS in
+ 	(*-Werror=*)
+-		test -n "$verbose" && echo "	repairing CFLAGS: $CFLAGS" 1>&6
+-
+-echo "${as_me:-configure}:16693: testing repairing CFLAGS: $CFLAGS ..." 1>&5
+-
+ 		cf_temp_flags=
+ 		for cf_temp_scan in $CFLAGS
+ 		do
+ 			case "x$cf_temp_scan" in
++			(x-Werror=format*)
++
++	test -n "$cf_temp_flags" && cf_temp_flags="$cf_temp_flags "
++	cf_temp_flags="${cf_temp_flags}$cf_temp_scan"
++
++				;;
+ 			(x-Werror=*)
+ 
+ 	test -n "$EXTRA_CFLAGS" && EXTRA_CFLAGS="$EXTRA_CFLAGS "
+@@ -16710,15 +16744,22 @@
+ 				;;
+ 			esac
+ 		done
+-		CFLAGS="$cf_temp_flags"
+-		test -n "$verbose" && echo "	... fixed $CFLAGS" 1>&6
++		if test "x$CFLAGS" != "x$cf_temp_flags"
++		then
++			test -n "$verbose" && echo "	repairing CFLAGS: $CFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:16716: testing ... fixed $CFLAGS ..." 1>&5
++echo "${as_me:-configure}:16751: testing repairing CFLAGS: $CFLAGS ..." 1>&5
+ 
+-		test -n "$verbose" && echo "	... extra $EXTRA_CFLAGS" 1>&6
++			CFLAGS="$cf_temp_flags"
++			test -n "$verbose" && echo "	... fixed $CFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:16720: testing ... extra $EXTRA_CFLAGS ..." 1>&5
++echo "${as_me:-configure}:16756: testing ... fixed $CFLAGS ..." 1>&5
+ 
++			test -n "$verbose" && echo "	... extra $EXTRA_CFLAGS" 1>&6
++
++echo "${as_me:-configure}:16760: testing ... extra $EXTRA_CFLAGS ..." 1>&5
++
++		fi
+ 		;;
+ 	esac
+ fi
+@@ -16727,14 +16768,16 @@
+ then
+ 	case $CPPFLAGS in
+ 	(*-Werror=*)
+-		test -n "$verbose" && echo "	repairing CPPFLAGS: $CPPFLAGS" 1>&6
+-
+-echo "${as_me:-configure}:16732: testing repairing CPPFLAGS: $CPPFLAGS ..." 1>&5
+-
+ 		cf_temp_flags=
+ 		for cf_temp_scan in $CPPFLAGS
+ 		do
+ 			case "x$cf_temp_scan" in
++			(x-Werror=format*)
++
++	test -n "$cf_temp_flags" && cf_temp_flags="$cf_temp_flags "
++	cf_temp_flags="${cf_temp_flags}$cf_temp_scan"
++
++				;;
+ 			(x-Werror=*)
+ 
+ 	test -n "$EXTRA_CFLAGS" && EXTRA_CFLAGS="$EXTRA_CFLAGS "
+@@ -16749,15 +16792,22 @@
+ 				;;
+ 			esac
+ 		done
+-		CPPFLAGS="$cf_temp_flags"
+-		test -n "$verbose" && echo "	... fixed $CPPFLAGS" 1>&6
++		if test "x$CPPFLAGS" != "x$cf_temp_flags"
++		then
++			test -n "$verbose" && echo "	repairing CPPFLAGS: $CPPFLAGS" 1>&6
++
++echo "${as_me:-configure}:16799: testing repairing CPPFLAGS: $CPPFLAGS ..." 1>&5
++
++			CPPFLAGS="$cf_temp_flags"
++			test -n "$verbose" && echo "	... fixed $CPPFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:16755: testing ... fixed $CPPFLAGS ..." 1>&5
++echo "${as_me:-configure}:16804: testing ... fixed $CPPFLAGS ..." 1>&5
+ 
+-		test -n "$verbose" && echo "	... extra $EXTRA_CFLAGS" 1>&6
++			test -n "$verbose" && echo "	... extra $EXTRA_CFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:16759: testing ... extra $EXTRA_CFLAGS ..." 1>&5
++echo "${as_me:-configure}:16808: testing ... extra $EXTRA_CFLAGS ..." 1>&5
+ 
++		fi
+ 		;;
+ 	esac
+ fi
+@@ -16766,14 +16816,16 @@
+ then
+ 	case $LDFLAGS in
+ 	(*-Werror=*)
+-		test -n "$verbose" && echo "	repairing LDFLAGS: $LDFLAGS" 1>&6
+-
+-echo "${as_me:-configure}:16771: testing repairing LDFLAGS: $LDFLAGS ..." 1>&5
+-
+ 		cf_temp_flags=
+ 		for cf_temp_scan in $LDFLAGS
+ 		do
+ 			case "x$cf_temp_scan" in
++			(x-Werror=format*)
++
++	test -n "$cf_temp_flags" && cf_temp_flags="$cf_temp_flags "
++	cf_temp_flags="${cf_temp_flags}$cf_temp_scan"
++
++				;;
+ 			(x-Werror=*)
+ 
+ 	test -n "$EXTRA_CFLAGS" && EXTRA_CFLAGS="$EXTRA_CFLAGS "
+@@ -16788,20 +16840,27 @@
+ 				;;
+ 			esac
+ 		done
+-		LDFLAGS="$cf_temp_flags"
+-		test -n "$verbose" && echo "	... fixed $LDFLAGS" 1>&6
++		if test "x$LDFLAGS" != "x$cf_temp_flags"
++		then
++			test -n "$verbose" && echo "	repairing LDFLAGS: $LDFLAGS" 1>&6
++
++echo "${as_me:-configure}:16847: testing repairing LDFLAGS: $LDFLAGS ..." 1>&5
+ 
+-echo "${as_me:-configure}:16794: testing ... fixed $LDFLAGS ..." 1>&5
++			LDFLAGS="$cf_temp_flags"
++			test -n "$verbose" && echo "	... fixed $LDFLAGS" 1>&6
+ 
+-		test -n "$verbose" && echo "	... extra $EXTRA_CFLAGS" 1>&6
++echo "${as_me:-configure}:16852: testing ... fixed $LDFLAGS ..." 1>&5
+ 
+-echo "${as_me:-configure}:16798: testing ... extra $EXTRA_CFLAGS ..." 1>&5
++			test -n "$verbose" && echo "	... extra $EXTRA_CFLAGS" 1>&6
+ 
++echo "${as_me:-configure}:16856: testing ... extra $EXTRA_CFLAGS ..." 1>&5
++
++		fi
+ 		;;
+ 	esac
+ fi
+ 
+-echo "$as_me:16804: checking if you want to turn on gcc warnings" >&5
++echo "$as_me:16863: 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.
+@@ -16818,7 +16877,7 @@
+ 	enable_warnings=no
+ 
+ fi;
+-echo "$as_me:16821: result: $enable_warnings" >&5
++echo "$as_me:16880: result: $enable_warnings" >&5
+ echo "${ECHO_T}$enable_warnings" >&6
+ if test "$enable_warnings" = "yes"
+ then
+@@ -16842,7 +16901,7 @@
+ done
+ 
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 16845 "configure"
++#line 16904 "configure"
+ #include "confdefs.h"
+ 
+ #include <stdlib.h>
+@@ -16857,26 +16916,26 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:16860: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:16919: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:16863: \$? = $ac_status" >&5
++  echo "$as_me:16922: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:16866: \"$ac_try\"") >&5
++  { (eval echo "$as_me:16925: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:16869: \$? = $ac_status" >&5
++  echo "$as_me:16928: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+ 
+-echo "$as_me:16872: checking for X11/Xt const-feature" >&5
++echo "$as_me:16931: 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 16879 "configure"
++#line 16938 "configure"
+ #include "confdefs.h"
+ 
+ #define _CONST_X_STRING	/* X11R7.8 (perhaps) */
+@@ -16893,16 +16952,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:16896: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:16955: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:16899: \$? = $ac_status" >&5
++  echo "$as_me:16958: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:16902: \"$ac_try\"") >&5
++  { (eval echo "$as_me:16961: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:16905: \$? = $ac_status" >&5
++  echo "$as_me:16964: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+ 
+ 			cf_cv_const_x_string=no
+@@ -16917,7 +16976,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:16920: result: $cf_cv_const_x_string" >&5
++echo "$as_me:16979: result: $cf_cv_const_x_string" >&5
+ echo "${ECHO_T}$cf_cv_const_x_string" >&6
+ 
+ LIBS="$cf_save_LIBS_CF_CONST_X_STRING"
+@@ -16946,7 +17005,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+  fi
+ cat > "conftest.$ac_ext" <<EOF
+-#line 16949 "${as_me:-configure}"
++#line 17008 "${as_me:-configure}"
+ int main(int argc, char *argv[]) { return (argv[argc-1] == 0) ; }
+ EOF
+ if test "$INTEL_COMPILER" = yes
+@@ -16962,7 +17021,7 @@
+ # remark #981: operands are evaluated in unspecified order
+ # warning #279: controlling expression is constant
+ 
+-	{ echo "$as_me:16965: checking for $CC warning options..." >&5
++	{ echo "$as_me:17024: checking for $CC warning options..." >&5
+ echo "$as_me: checking for $CC warning options..." >&6;}
+ 	cf_save_CFLAGS="$CFLAGS"
+ 	EXTRA_CFLAGS="$EXTRA_CFLAGS -Wall"
+@@ -16978,12 +17037,12 @@
+ 		wd981
+ 	do
+ 		CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt"
+-		if { (eval echo "$as_me:16981: \"$ac_compile\"") >&5
++		if { (eval echo "$as_me:17040: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:16984: \$? = $ac_status" >&5
++  echo "$as_me:17043: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; then
+-			test -n "$verbose" && echo "$as_me:16986: result: ... -$cf_opt" >&5
++			test -n "$verbose" && echo "$as_me:17045: result: ... -$cf_opt" >&5
+ echo "${ECHO_T}... -$cf_opt" >&6
+ 			EXTRA_CFLAGS="$EXTRA_CFLAGS -$cf_opt"
+ 		fi
+@@ -16991,7 +17050,7 @@
+ 	CFLAGS="$cf_save_CFLAGS"
+ elif test "$GCC" = yes && test "$GCC_VERSION" != "unknown"
+ then
+-	{ echo "$as_me:16994: checking for $CC warning options..." >&5
++	{ echo "$as_me:17053: checking for $CC warning options..." >&5
+ echo "$as_me: checking for $CC warning options..." >&6;}
+ 	cf_save_CFLAGS="$CFLAGS"
+ 	cf_warn_CONST=""
+@@ -17014,12 +17073,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:17017: \"$ac_compile\"") >&5
++		if { (eval echo "$as_me:17076: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:17020: \$? = $ac_status" >&5
++  echo "$as_me:17079: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; then
+-			test -n "$verbose" && echo "$as_me:17022: result: ... -$cf_opt" >&5
++			test -n "$verbose" && echo "$as_me:17081: result: ... -$cf_opt" >&5
+ echo "${ECHO_T}... -$cf_opt" >&6
+ 			case "$cf_opt" in
+ 			(Winline)
+@@ -17027,7 +17086,7 @@
+ 				([34].*)
+ 					test -n "$verbose" && echo "	feature is broken in gcc $GCC_VERSION" 1>&6
+ 
+-echo "${as_me:-configure}:17030: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
++echo "${as_me:-configure}:17089: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
+ 
+ 					continue;;
+ 				esac
+@@ -17037,7 +17096,7 @@
+ 				([12].*)
+ 					test -n "$verbose" && echo "	feature is broken in gcc $GCC_VERSION" 1>&6
+ 
+-echo "${as_me:-configure}:17040: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
++echo "${as_me:-configure}:17099: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
+ 
+ 					continue;;
+ 				esac
+@@ -17070,10 +17129,10 @@
+ EOF
+ if test "$GCC" = yes
+ then
+-	{ echo "$as_me:17073: checking for $CC __attribute__ directives..." >&5
++	{ echo "$as_me:17132: checking for $CC __attribute__ directives..." >&5
+ echo "$as_me: checking for $CC __attribute__ directives..." >&6;}
+ cat > "conftest.$ac_ext" <<EOF
+-#line 17076 "${as_me:-configure}"
++#line 17135 "${as_me:-configure}"
+ #include "confdefs.h"
+ #include "conftest.h"
+ #include "conftest.i"
+@@ -17122,12 +17181,12 @@
+ 			;;
+ 		esac
+ 
+-		if { (eval echo "$as_me:17125: \"$ac_compile\"") >&5
++		if { (eval echo "$as_me:17184: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:17128: \$? = $ac_status" >&5
++  echo "$as_me:17187: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; then
+-			test -n "$verbose" && echo "$as_me:17130: result: ... $cf_attribute" >&5
++			test -n "$verbose" && echo "$as_me:17189: result: ... $cf_attribute" >&5
+ echo "${ECHO_T}... $cf_attribute" >&6
+ 			cat conftest.h >>confdefs.h
+ 			case "$cf_attribute" in
+@@ -17199,12 +17258,12 @@
+ if test "$GCC" = yes ; then
+ 	case "$host_os" in
+ 	(linux*|gnu*)
+-		echo "$as_me:17202: checking if this is really Intel C++ compiler" >&5
++		echo "$as_me:17261: 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 17207 "configure"
++#line 17266 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -17221,16 +17280,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:17224: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:17283: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:17227: \$? = $ac_status" >&5
++  echo "$as_me:17286: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:17230: \"$ac_try\"") >&5
++  { (eval echo "$as_me:17289: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:17233: \$? = $ac_status" >&5
++  echo "$as_me:17292: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   INTEL_CPLUSPLUS=yes
+ cf_save_CFLAGS="$cf_save_CFLAGS -we147"
+@@ -17241,7 +17300,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 		CXXFLAGS="$cf_save_CFLAGS"
+-		echo "$as_me:17244: result: $INTEL_CPLUSPLUS" >&5
++		echo "$as_me:17303: result: $INTEL_CPLUSPLUS" >&5
+ echo "${ECHO_T}$INTEL_CPLUSPLUS" >&6
+ 		;;
+ 	esac
+@@ -17250,11 +17309,11 @@
+ CLANG_CPLUSPLUS=no
+ 
+ if test "$GCC" = yes ; then
+-	echo "$as_me:17253: checking if this is really Clang C++ compiler" >&5
++	echo "$as_me:17312: 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 17257 "configure"
++#line 17316 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -17271,16 +17330,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:17274: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:17333: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:17277: \$? = $ac_status" >&5
++  echo "$as_me:17336: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:17280: \"$ac_try\"") >&5
++  { (eval echo "$as_me:17339: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:17283: \$? = $ac_status" >&5
++  echo "$as_me:17342: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   CLANG_CPLUSPLUS=yes
+ 
+@@ -17290,7 +17349,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 	CXXFLAGS="$cf_save_CFLAGS"
+-	echo "$as_me:17293: result: $CLANG_CPLUSPLUS" >&5
++	echo "$as_me:17352: result: $CLANG_CPLUSPLUS" >&5
+ echo "${ECHO_T}$CLANG_CPLUSPLUS" >&6
+ fi
+ 
+@@ -17299,30 +17358,30 @@
+ if test "x$CLANG_CPLUSPLUS" = "xyes" ; then
+ 	case "$CC" in
+ 	(c[1-9][0-9]|*/c[1-9][0-9])
+-		{ echo "$as_me:17302: WARNING: replacing broken compiler alias $CC" >&5
++		{ echo "$as_me:17361: 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:17309: checking version of $CC" >&5
++	echo "$as_me:17368: 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:17313: result: $CLANG_VERSION" >&5
++	echo "$as_me:17372: 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:17320: checking if option $cf_clang_opt works" >&5
++		echo "$as_me:17379: 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 17325 "configure"
++#line 17384 "configure"
+ #include "confdefs.h"
+ 
+ 			#include <stdio.h>
+@@ -17336,16 +17395,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:17339: \"$ac_link\"") >&5
++if { (eval echo "$as_me:17398: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:17342: \$? = $ac_status" >&5
++  echo "$as_me:17401: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:17345: \"$ac_try\"") >&5
++  { (eval echo "$as_me:17404: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:17348: \$? = $ac_status" >&5
++  echo "$as_me:17407: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+ 
+ 			cf_clang_optok=yes
+@@ -17356,13 +17415,13 @@
+ 			cf_clang_optok=no
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+-		echo "$as_me:17359: result: $cf_clang_optok" >&5
++		echo "$as_me:17418: 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}:17365: testing adding option $cf_clang_opt ..." 1>&5
++echo "${as_me:-configure}:17424: testing adding option $cf_clang_opt ..." 1>&5
+ 
+ 	test -n "$CFLAGS" && CFLAGS="$CFLAGS "
+ 	CFLAGS="${CFLAGS}$cf_clang_opt"
+@@ -17379,7 +17438,7 @@
+ ac_main_return="return"
+ 
+ cat > conftest.$ac_ext <<EOF
+-#line 17382 "configure"
++#line 17441 "configure"
+ int main(int argc, char *argv[]) { return (argv[argc-1] == 0) ; }
+ EOF
+ 
+@@ -17397,7 +17456,7 @@
+ # remark #981: operands are evaluated in unspecified order
+ # warning #269: invalid format string conversion
+ 
+-	{ echo "$as_me:17400: checking for $CC warning options..." >&5
++	{ echo "$as_me:17459: checking for $CC warning options..." >&5
+ echo "$as_me: checking for $CC warning options..." >&6;}
+ 	cf_save_CXXFLAGS="$CXXFLAGS"
+ 	EXTRA_CXXFLAGS="-Wall"
+@@ -17414,12 +17473,12 @@
+ 		wd981
+ 	do
+ 		CXXFLAGS="$cf_save_CXXFLAGS $EXTRA_CXXFLAGS -$cf_opt"
+-		if { (eval echo "$as_me:17417: \"$ac_compile\"") >&5
++		if { (eval echo "$as_me:17476: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:17420: \$? = $ac_status" >&5
++  echo "$as_me:17479: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; then
+-			test -n "$verbose" && echo "$as_me:17422: result: ... -$cf_opt" >&5
++			test -n "$verbose" && echo "$as_me:17481: result: ... -$cf_opt" >&5
+ echo "${ECHO_T}... -$cf_opt" >&6
+ 			EXTRA_CXXFLAGS="$EXTRA_CXXFLAGS -$cf_opt"
+ 		fi
+@@ -17428,7 +17487,7 @@
+ 
+ elif test "$GXX" = yes
+ then
+-	{ echo "$as_me:17431: checking for $CXX warning options..." >&5
++	{ echo "$as_me:17490: checking for $CXX warning options..." >&5
+ echo "$as_me: checking for $CXX warning options..." >&6;}
+ 	cf_save_CXXFLAGS="$CXXFLAGS"
+ 	EXTRA_CXXFLAGS="-W -Wall"
+@@ -17458,16 +17517,16 @@
+ 		Wundef $cf_gxx_extra_warnings Wno-unused
+ 	do
+ 		CXXFLAGS="$cf_save_CXXFLAGS $EXTRA_CXXFLAGS -Werror -$cf_opt"
+-		if { (eval echo "$as_me:17461: \"$ac_compile\"") >&5
++		if { (eval echo "$as_me:17520: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:17464: \$? = $ac_status" >&5
++  echo "$as_me:17523: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; then
+-			test -n "$verbose" && echo "$as_me:17466: result: ... -$cf_opt" >&5
++			test -n "$verbose" && echo "$as_me:17525: result: ... -$cf_opt" >&5
+ echo "${ECHO_T}... -$cf_opt" >&6
+ 			EXTRA_CXXFLAGS="$EXTRA_CXXFLAGS -$cf_opt"
+ 		else
+-			test -n "$verbose" && echo "$as_me:17470: result: ... no -$cf_opt" >&5
++			test -n "$verbose" && echo "$as_me:17529: result: ... no -$cf_opt" >&5
+ echo "${ECHO_T}... no -$cf_opt" >&6
+ 		fi
+ 	done
+@@ -17485,7 +17544,7 @@
+ 	fi
+ fi
+ 
+-echo "$as_me:17488: checking if you want to work around bogus compiler/loader warnings" >&5
++echo "$as_me:17547: 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.
+@@ -17495,7 +17554,7 @@
+ else
+   enable_string_hacks=no
+ fi;
+-echo "$as_me:17498: result: $enable_string_hacks" >&5
++echo "$as_me:17557: result: $enable_string_hacks" >&5
+ echo "${ECHO_T}$enable_string_hacks" >&6
+ 
+ if test "x$enable_string_hacks" = "xyes"; then
+@@ -17504,15 +17563,15 @@
+ #define USE_STRING_HACKS 1
+ EOF
+ 
+-	{ echo "$as_me:17507: WARNING: enabling string-hacks to work around bogus compiler/loader warnings" >&5
++	{ echo "$as_me:17566: 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:17509: checking for strlcat" >&5
++	echo "$as_me:17568: 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 17515 "configure"
++#line 17574 "configure"
+ #include "confdefs.h"
+ #define strlcat autoconf_temporary
+ #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -17543,16 +17602,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:17546: \"$ac_link\"") >&5
++if { (eval echo "$as_me:17605: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:17549: \$? = $ac_status" >&5
++  echo "$as_me:17608: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:17552: \"$ac_try\"") >&5
++  { (eval echo "$as_me:17611: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:17555: \$? = $ac_status" >&5
++  echo "$as_me:17614: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_func_strlcat=yes
+ else
+@@ -17562,7 +17621,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:17565: result: $ac_cv_func_strlcat" >&5
++echo "$as_me:17624: result: $ac_cv_func_strlcat" >&5
+ echo "${ECHO_T}$ac_cv_func_strlcat" >&6
+ if test "$ac_cv_func_strlcat" = yes; then
+ 
+@@ -17572,7 +17631,7 @@
+ 
+ else
+ 
+-		echo "$as_me:17575: checking for strlcat in -lbsd" >&5
++		echo "$as_me:17634: 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
+@@ -17580,7 +17639,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lbsd  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 17583 "configure"
++#line 17642 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -17599,16 +17658,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:17602: \"$ac_link\"") >&5
++if { (eval echo "$as_me:17661: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:17605: \$? = $ac_status" >&5
++  echo "$as_me:17664: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:17608: \"$ac_try\"") >&5
++  { (eval echo "$as_me:17667: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:17611: \$? = $ac_status" >&5
++  echo "$as_me:17670: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_bsd_strlcat=yes
+ else
+@@ -17619,7 +17678,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:17622: result: $ac_cv_lib_bsd_strlcat" >&5
++echo "$as_me:17681: 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
+ 
+@@ -17642,23 +17701,23 @@
+ for ac_header in bsd/string.h
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-echo "$as_me:17645: checking for $ac_header" >&5
++echo "$as_me:17704: 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 17651 "configure"
++#line 17710 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:17655: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:17714: \"$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:17661: \$? = $ac_status" >&5
++  echo "$as_me:17720: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -17677,7 +17736,7 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:17680: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
++echo "$as_me:17739: 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
+@@ -17698,13 +17757,13 @@
+ for ac_func in strlcpy snprintf
+ do
+ as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+-echo "$as_me:17701: checking for $ac_func" >&5
++echo "$as_me:17760: 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 17707 "configure"
++#line 17766 "configure"
+ #include "confdefs.h"
+ #define $ac_func autoconf_temporary
+ #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -17735,16 +17794,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:17738: \"$ac_link\"") >&5
++if { (eval echo "$as_me:17797: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:17741: \$? = $ac_status" >&5
++  echo "$as_me:17800: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:17744: \"$ac_try\"") >&5
++  { (eval echo "$as_me:17803: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:17747: \$? = $ac_status" >&5
++  echo "$as_me:17806: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   eval "$as_ac_var=yes"
+ else
+@@ -17754,7 +17813,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:17757: result: `eval echo '${'"$as_ac_var"'}'`" >&5
++echo "$as_me:17816: 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
+@@ -17767,7 +17826,7 @@
+ fi
+ 
+ ###	use option --enable-assertions to turn on generation of assertion code
+-echo "$as_me:17770: checking if you want to enable runtime assertions" >&5
++echo "$as_me:17829: 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.
+@@ -17777,7 +17836,7 @@
+ else
+   with_assertions=no
+ fi;
+-echo "$as_me:17780: result: $with_assertions" >&5
++echo "$as_me:17839: result: $with_assertions" >&5
+ echo "${ECHO_T}$with_assertions" >&6
+ if test -n "$GCC"
+ then
+@@ -17793,7 +17852,7 @@
+ 
+ ###	use option --disable-leaks to suppress "permanent" leaks, for testing
+ 
+-echo "$as_me:17796: checking if you want to use dmalloc for testing" >&5
++echo "$as_me:17855: 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.
+@@ -17815,7 +17874,7 @@
+ else
+   with_dmalloc=
+ fi;
+-echo "$as_me:17818: result: ${with_dmalloc:-no}" >&5
++echo "$as_me:17877: result: ${with_dmalloc:-no}" >&5
+ echo "${ECHO_T}${with_dmalloc:-no}" >&6
+ 
+ case ".$with_cflags" in
+@@ -17929,23 +17988,23 @@
+ esac
+ 
+ if test "$with_dmalloc" = yes ; then
+-	echo "$as_me:17932: checking for dmalloc.h" >&5
++	echo "$as_me:17991: 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 17938 "configure"
++#line 17997 "configure"
+ #include "confdefs.h"
+ #include <dmalloc.h>
+ _ACEOF
+-if { (eval echo "$as_me:17942: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:18001: \"$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:17948: \$? = $ac_status" >&5
++  echo "$as_me:18007: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -17964,11 +18023,11 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:17967: result: $ac_cv_header_dmalloc_h" >&5
++echo "$as_me:18026: 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:17971: checking for dmalloc_debug in -ldmalloc" >&5
++echo "$as_me:18030: 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
+@@ -17976,7 +18035,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-ldmalloc  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 17979 "configure"
++#line 18038 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -17995,16 +18054,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:17998: \"$ac_link\"") >&5
++if { (eval echo "$as_me:18057: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:18001: \$? = $ac_status" >&5
++  echo "$as_me:18060: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:18004: \"$ac_try\"") >&5
++  { (eval echo "$as_me:18063: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:18007: \$? = $ac_status" >&5
++  echo "$as_me:18066: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_dmalloc_dmalloc_debug=yes
+ else
+@@ -18015,7 +18074,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:18018: result: $ac_cv_lib_dmalloc_dmalloc_debug" >&5
++echo "$as_me:18077: 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
+@@ -18030,7 +18089,7 @@
+ 
+ fi
+ 
+-echo "$as_me:18033: checking if you want to use dbmalloc for testing" >&5
++echo "$as_me:18092: 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.
+@@ -18052,7 +18111,7 @@
+ else
+   with_dbmalloc=
+ fi;
+-echo "$as_me:18055: result: ${with_dbmalloc:-no}" >&5
++echo "$as_me:18114: result: ${with_dbmalloc:-no}" >&5
+ echo "${ECHO_T}${with_dbmalloc:-no}" >&6
+ 
+ case ".$with_cflags" in
+@@ -18166,23 +18225,23 @@
+ esac
+ 
+ if test "$with_dbmalloc" = yes ; then
+-	echo "$as_me:18169: checking for dbmalloc.h" >&5
++	echo "$as_me:18228: 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 18175 "configure"
++#line 18234 "configure"
+ #include "confdefs.h"
+ #include <dbmalloc.h>
+ _ACEOF
+-if { (eval echo "$as_me:18179: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:18238: \"$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:18185: \$? = $ac_status" >&5
++  echo "$as_me:18244: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -18201,11 +18260,11 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:18204: result: $ac_cv_header_dbmalloc_h" >&5
++echo "$as_me:18263: 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:18208: checking for debug_malloc in -ldbmalloc" >&5
++echo "$as_me:18267: 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
+@@ -18213,7 +18272,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-ldbmalloc  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 18216 "configure"
++#line 18275 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -18232,16 +18291,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:18235: \"$ac_link\"") >&5
++if { (eval echo "$as_me:18294: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:18238: \$? = $ac_status" >&5
++  echo "$as_me:18297: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:18241: \"$ac_try\"") >&5
++  { (eval echo "$as_me:18300: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:18244: \$? = $ac_status" >&5
++  echo "$as_me:18303: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_dbmalloc_debug_malloc=yes
+ else
+@@ -18252,7 +18311,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:18255: result: $ac_cv_lib_dbmalloc_debug_malloc" >&5
++echo "$as_me:18314: 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
+@@ -18267,7 +18326,7 @@
+ 
+ fi
+ 
+-echo "$as_me:18270: checking if you want to use valgrind for testing" >&5
++echo "$as_me:18329: 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.
+@@ -18289,7 +18348,7 @@
+ else
+   with_valgrind=
+ fi;
+-echo "$as_me:18292: result: ${with_valgrind:-no}" >&5
++echo "$as_me:18351: result: ${with_valgrind:-no}" >&5
+ echo "${ECHO_T}${with_valgrind:-no}" >&6
+ 
+ case ".$with_cflags" in
+@@ -18402,7 +18461,7 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:18405: checking if you want to perform memory-leak testing" >&5
++echo "$as_me:18464: 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.
+@@ -18413,7 +18472,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:18416: result: $with_no_leaks" >&5
++echo "$as_me:18475: result: $with_no_leaks" >&5
+ echo "${ECHO_T}$with_no_leaks" >&6
+ 
+ if test "$enable_leaks" = no ; then
+@@ -18465,7 +18524,7 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:18468: checking whether to add trace feature to all models" >&5
++echo "$as_me:18527: 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.
+@@ -18475,7 +18534,7 @@
+ else
+   cf_with_trace=$cf_all_traces
+ fi;
+-echo "$as_me:18478: result: $cf_with_trace" >&5
++echo "$as_me:18537: result: $cf_with_trace" >&5
+ echo "${ECHO_T}$cf_with_trace" >&6
+ 
+ if test "x$cf_with_trace" = xyes ; then
+@@ -18589,7 +18648,7 @@
+ 	ADA_TRACE=FALSE
+ fi
+ 
+-echo "$as_me:18592: checking if we want to use GNAT projects" >&5
++echo "$as_me:18651: 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.
+@@ -18606,7 +18665,7 @@
+ 	enable_gnat_projects=yes
+ 
+ fi;
+-echo "$as_me:18609: result: $enable_gnat_projects" >&5
++echo "$as_me:18668: result: $enable_gnat_projects" >&5
+ echo "${ECHO_T}$enable_gnat_projects" >&6
+ 
+ ###	Checks for libraries.
+@@ -18619,14 +18678,14 @@
+ 		CPPFLAGS="$CPPFLAGS -DWINVER=0x0501 -DWIN32_LEAN_AND_MEAN"
+ 	fi
+ 
+-echo "$as_me:18622: checking if ssp library is needed" >&5
++echo "$as_me:18681: 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 18629 "configure"
++#line 18688 "configure"
+ #include "confdefs.h"
+ 
+ #include <sys/types.h>
+@@ -18643,16 +18702,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:18646: \"$ac_link\"") >&5
++if { (eval echo "$as_me:18705: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:18649: \$? = $ac_status" >&5
++  echo "$as_me:18708: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:18652: \"$ac_try\"") >&5
++  { (eval echo "$as_me:18711: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:18655: \$? = $ac_status" >&5
++  echo "$as_me:18714: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_need_libssp=no
+ else
+@@ -18662,7 +18721,7 @@
+ 	cf_save_LIBS="$LIBS"
+ 	LIBS="$LIBS -lssp"
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 18665 "configure"
++#line 18724 "configure"
+ #include "confdefs.h"
+ 
+ #include <sys/types.h>
+@@ -18679,16 +18738,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:18682: \"$ac_link\"") >&5
++if { (eval echo "$as_me:18741: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:18685: \$? = $ac_status" >&5
++  echo "$as_me:18744: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:18688: \"$ac_try\"") >&5
++  { (eval echo "$as_me:18747: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:18691: \$? = $ac_status" >&5
++  echo "$as_me:18750: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_need_libssp=yes
+ else
+@@ -18702,7 +18761,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:18705: result: $cf_cv_need_libssp" >&5
++echo "$as_me:18764: result: $cf_cv_need_libssp" >&5
+ echo "${ECHO_T}$cf_cv_need_libssp" >&6
+ 
+ if test "x$cf_cv_need_libssp" = xyes
+@@ -18728,13 +18787,13 @@
+ 
+ 	;;
+ (*)
+-echo "$as_me:18731: checking for gettimeofday" >&5
++echo "$as_me:18790: 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 18737 "configure"
++#line 18796 "configure"
+ #include "confdefs.h"
+ #define gettimeofday autoconf_temporary
+ #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -18765,16 +18824,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:18768: \"$ac_link\"") >&5
++if { (eval echo "$as_me:18827: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:18771: \$? = $ac_status" >&5
++  echo "$as_me:18830: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:18774: \"$ac_try\"") >&5
++  { (eval echo "$as_me:18833: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:18777: \$? = $ac_status" >&5
++  echo "$as_me:18836: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_func_gettimeofday=yes
+ else
+@@ -18784,7 +18843,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:18787: result: $ac_cv_func_gettimeofday" >&5
++echo "$as_me:18846: result: $ac_cv_func_gettimeofday" >&5
+ echo "${ECHO_T}$ac_cv_func_gettimeofday" >&6
+ if test "$ac_cv_func_gettimeofday" = yes; then
+ 
+@@ -18794,7 +18853,7 @@
+ 
+ else
+ 
+-echo "$as_me:18797: checking for gettimeofday in -lbsd" >&5
++echo "$as_me:18856: 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
+@@ -18802,7 +18861,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lbsd  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 18805 "configure"
++#line 18864 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -18821,16 +18880,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:18824: \"$ac_link\"") >&5
++if { (eval echo "$as_me:18883: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:18827: \$? = $ac_status" >&5
++  echo "$as_me:18886: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:18830: \"$ac_try\"") >&5
++  { (eval echo "$as_me:18889: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:18833: \$? = $ac_status" >&5
++  echo "$as_me:18892: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_bsd_gettimeofday=yes
+ else
+@@ -18841,7 +18900,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:18844: result: $ac_cv_lib_bsd_gettimeofday" >&5
++echo "$as_me:18903: 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
+ 
+@@ -18871,14 +18930,14 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:18874: checking if -lm needed for math functions" >&5
++echo "$as_me:18933: 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 18881 "configure"
++#line 18940 "configure"
+ #include "confdefs.h"
+ 
+ 	#include <stdio.h>
+@@ -18894,16 +18953,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:18897: \"$ac_link\"") >&5
++if { (eval echo "$as_me:18956: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:18900: \$? = $ac_status" >&5
++  echo "$as_me:18959: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:18903: \"$ac_try\"") >&5
++  { (eval echo "$as_me:18962: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:18906: \$? = $ac_status" >&5
++  echo "$as_me:18965: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_need_libm=no
+ else
+@@ -18913,7 +18972,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:18916: result: $cf_cv_need_libm" >&5
++echo "$as_me:18975: result: $cf_cv_need_libm" >&5
+ echo "${ECHO_T}$cf_cv_need_libm" >&6
+ if test "$cf_cv_need_libm" = yes
+ then
+@@ -18921,13 +18980,13 @@
+ fi
+ 
+ ###	Checks for header files.
+-echo "$as_me:18924: checking for ANSI C header files" >&5
++echo "$as_me:18983: 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 18930 "configure"
++#line 18989 "configure"
+ #include "confdefs.h"
+ #include <stdlib.h>
+ #include <stdarg.h>
+@@ -18935,13 +18994,13 @@
+ #include <float.h>
+ 
+ _ACEOF
+-if { (eval echo "$as_me:18938: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:18997: \"$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:18944: \$? = $ac_status" >&5
++  echo "$as_me:19003: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -18963,7 +19022,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 18966 "configure"
++#line 19025 "configure"
+ #include "confdefs.h"
+ #include <string.h>
+ 
+@@ -18981,7 +19040,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 18984 "configure"
++#line 19043 "configure"
+ #include "confdefs.h"
+ #include <stdlib.h>
+ 
+@@ -19002,7 +19061,7 @@
+   :
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 19005 "configure"
++#line 19064 "configure"
+ #include "confdefs.h"
+ #include <ctype.h>
+ #if ((' ' & 0x0FF) == 0x020)
+@@ -19028,15 +19087,15 @@
+ }
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:19031: \"$ac_link\"") >&5
++if { (eval echo "$as_me:19090: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:19034: \$? = $ac_status" >&5
++  echo "$as_me:19093: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:19036: \"$ac_try\"") >&5
++  { (eval echo "$as_me:19095: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:19039: \$? = $ac_status" >&5
++  echo "$as_me:19098: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   :
+ else
+@@ -19049,7 +19108,7 @@
+ fi
+ fi
+ fi
+-echo "$as_me:19052: result: $ac_cv_header_stdc" >&5
++echo "$as_me:19111: result: $ac_cv_header_stdc" >&5
+ echo "${ECHO_T}$ac_cv_header_stdc" >&6
+ if test $ac_cv_header_stdc = yes; then
+ 
+@@ -19062,13 +19121,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:19065: checking for $ac_hdr that defines DIR" >&5
++echo "$as_me:19124: 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 19071 "configure"
++#line 19130 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ #include <$ac_hdr>
+@@ -19083,16 +19142,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:19086: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:19145: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:19089: \$? = $ac_status" >&5
++  echo "$as_me:19148: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:19092: \"$ac_try\"") >&5
++  { (eval echo "$as_me:19151: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:19095: \$? = $ac_status" >&5
++  echo "$as_me:19154: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   eval "$as_ac_Header=yes"
+ else
+@@ -19102,7 +19161,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:19105: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
++echo "$as_me:19164: 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
+@@ -19115,7 +19174,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:19118: checking for opendir in -ldir" >&5
++  echo "$as_me:19177: 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
+@@ -19123,7 +19182,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-ldir  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 19126 "configure"
++#line 19185 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -19142,16 +19201,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:19145: \"$ac_link\"") >&5
++if { (eval echo "$as_me:19204: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:19148: \$? = $ac_status" >&5
++  echo "$as_me:19207: \$? = $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:19210: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:19154: \$? = $ac_status" >&5
++  echo "$as_me:19213: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_dir_opendir=yes
+ else
+@@ -19162,14 +19221,14 @@
+ 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_dir_opendir" >&5
++echo "$as_me:19224: 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:19172: checking for opendir in -lx" >&5
++  echo "$as_me:19231: 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
+@@ -19177,7 +19236,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lx  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 19180 "configure"
++#line 19239 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -19196,16 +19255,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:19199: \"$ac_link\"") >&5
++if { (eval echo "$as_me:19258: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:19202: \$? = $ac_status" >&5
++  echo "$as_me:19261: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:19205: \"$ac_try\"") >&5
++  { (eval echo "$as_me:19264: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:19208: \$? = $ac_status" >&5
++  echo "$as_me:19267: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_x_opendir=yes
+ else
+@@ -19216,7 +19275,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:19219: result: $ac_cv_lib_x_opendir" >&5
++echo "$as_me:19278: 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"
+@@ -19224,13 +19283,13 @@
+ 
+ fi
+ 
+-echo "$as_me:19227: checking whether time.h and sys/time.h may both be included" >&5
++echo "$as_me:19286: 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 19233 "configure"
++#line 19292 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ #include <sys/time.h>
+@@ -19246,16 +19305,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:19249: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:19308: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:19252: \$? = $ac_status" >&5
++  echo "$as_me:19311: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:19255: \"$ac_try\"") >&5
++  { (eval echo "$as_me:19314: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:19258: \$? = $ac_status" >&5
++  echo "$as_me:19317: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_header_time=yes
+ else
+@@ -19265,7 +19324,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:19268: result: $ac_cv_header_time" >&5
++echo "$as_me:19327: result: $ac_cv_header_time" >&5
+ echo "${ECHO_T}$ac_cv_header_time" >&6
+ if test $ac_cv_header_time = yes; then
+ 
+@@ -19280,7 +19339,7 @@
+ case "$host_os" in
+ (mingw*)
+ 	# -lsystre -ltre -lintl -liconv
+-	echo "$as_me:19283: checking for regcomp in -lsystre" >&5
++	echo "$as_me:19342: 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
+@@ -19288,7 +19347,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lsystre  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 19291 "configure"
++#line 19350 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -19307,16 +19366,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:19310: \"$ac_link\"") >&5
++if { (eval echo "$as_me:19369: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:19313: \$? = $ac_status" >&5
++  echo "$as_me:19372: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:19316: \"$ac_try\"") >&5
++  { (eval echo "$as_me:19375: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:19319: \$? = $ac_status" >&5
++  echo "$as_me:19378: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_systre_regcomp=yes
+ else
+@@ -19327,11 +19386,11 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:19330: result: $ac_cv_lib_systre_regcomp" >&5
++echo "$as_me:19389: 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:19334: checking for libiconv_open in -liconv" >&5
++		echo "$as_me:19393: 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
+@@ -19339,7 +19398,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-liconv  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 19342 "configure"
++#line 19401 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -19358,16 +19417,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:19361: \"$ac_link\"") >&5
++if { (eval echo "$as_me:19420: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:19364: \$? = $ac_status" >&5
++  echo "$as_me:19423: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:19367: \"$ac_try\"") >&5
++  { (eval echo "$as_me:19426: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:19370: \$? = $ac_status" >&5
++  echo "$as_me:19429: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_iconv_libiconv_open=yes
+ else
+@@ -19378,7 +19437,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:19381: result: $ac_cv_lib_iconv_libiconv_open" >&5
++echo "$as_me:19440: 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
+ 
+@@ -19400,7 +19459,7 @@
+ 
+ fi
+ 
+-		echo "$as_me:19403: checking for libintl_gettext in -lintl" >&5
++		echo "$as_me:19462: 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
+@@ -19408,7 +19467,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lintl  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 19411 "configure"
++#line 19470 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -19427,16 +19486,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:19430: \"$ac_link\"") >&5
++if { (eval echo "$as_me:19489: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:19433: \$? = $ac_status" >&5
++  echo "$as_me:19492: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:19436: \"$ac_try\"") >&5
++  { (eval echo "$as_me:19495: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:19439: \$? = $ac_status" >&5
++  echo "$as_me:19498: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_intl_libintl_gettext=yes
+ else
+@@ -19447,7 +19506,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:19450: result: $ac_cv_lib_intl_libintl_gettext" >&5
++echo "$as_me:19509: 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
+ 
+@@ -19469,7 +19528,7 @@
+ 
+ fi
+ 
+-		echo "$as_me:19472: checking for tre_regcomp in -ltre" >&5
++		echo "$as_me:19531: 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
+@@ -19477,7 +19536,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-ltre  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 19480 "configure"
++#line 19539 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -19496,16 +19555,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:19499: \"$ac_link\"") >&5
++if { (eval echo "$as_me:19558: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:19502: \$? = $ac_status" >&5
++  echo "$as_me:19561: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:19505: \"$ac_try\"") >&5
++  { (eval echo "$as_me:19564: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:19508: \$? = $ac_status" >&5
++  echo "$as_me:19567: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_tre_tre_regcomp=yes
+ else
+@@ -19516,7 +19575,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:19519: result: $ac_cv_lib_tre_tre_regcomp" >&5
++echo "$as_me:19578: 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
+ 
+@@ -19558,7 +19617,7 @@
+ 
+ else
+ 
+-		echo "$as_me:19561: checking for regcomp in -lgnurx" >&5
++		echo "$as_me:19620: 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
+@@ -19566,7 +19625,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lgnurx  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 19569 "configure"
++#line 19628 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -19585,16 +19644,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:19588: \"$ac_link\"") >&5
++if { (eval echo "$as_me:19647: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:19591: \$? = $ac_status" >&5
++  echo "$as_me:19650: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:19594: \"$ac_try\"") >&5
++  { (eval echo "$as_me:19653: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:19597: \$? = $ac_status" >&5
++  echo "$as_me:19656: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_gnurx_regcomp=yes
+ else
+@@ -19605,7 +19664,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:19608: result: $ac_cv_lib_gnurx_regcomp" >&5
++echo "$as_me:19667: 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
+ 
+@@ -19633,13 +19692,13 @@
+ 	;;
+ (*)
+ 	cf_regex_libs="regex re"
+-	echo "$as_me:19636: checking for regcomp" >&5
++	echo "$as_me:19695: 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 19642 "configure"
++#line 19701 "configure"
+ #include "confdefs.h"
+ #define regcomp autoconf_temporary
+ #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -19670,16 +19729,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:19673: \"$ac_link\"") >&5
++if { (eval echo "$as_me:19732: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:19676: \$? = $ac_status" >&5
++  echo "$as_me:19735: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:19679: \"$ac_try\"") >&5
++  { (eval echo "$as_me:19738: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:19682: \$? = $ac_status" >&5
++  echo "$as_me:19741: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_func_regcomp=yes
+ else
+@@ -19689,7 +19748,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:19692: result: $ac_cv_func_regcomp" >&5
++echo "$as_me:19751: 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
+@@ -19698,7 +19757,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:19701: checking for regcomp in -l$cf_regex_lib" >&5
++echo "$as_me:19760: 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
+@@ -19706,7 +19765,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-l$cf_regex_lib  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 19709 "configure"
++#line 19768 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -19725,16 +19784,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:19728: \"$ac_link\"") >&5
++if { (eval echo "$as_me:19787: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:19731: \$? = $ac_status" >&5
++  echo "$as_me:19790: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:19734: \"$ac_try\"") >&5
++  { (eval echo "$as_me:19793: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:19737: \$? = $ac_status" >&5
++  echo "$as_me:19796: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   eval "$as_ac_Lib=yes"
+ else
+@@ -19745,7 +19804,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:19748: result: `eval echo '${'"$as_ac_Lib"'}'`" >&5
++echo "$as_me:19807: 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
+ 
+@@ -19777,13 +19836,13 @@
+ esac
+ 
+ if test "$cf_regex_func" = no ; then
+-	echo "$as_me:19780: checking for compile" >&5
++	echo "$as_me:19839: 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 19786 "configure"
++#line 19845 "configure"
+ #include "confdefs.h"
+ #define compile autoconf_temporary
+ #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -19814,16 +19873,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:19817: \"$ac_link\"") >&5
++if { (eval echo "$as_me:19876: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:19820: \$? = $ac_status" >&5
++  echo "$as_me:19879: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:19823: \"$ac_try\"") >&5
++  { (eval echo "$as_me:19882: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:19826: \$? = $ac_status" >&5
++  echo "$as_me:19885: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_func_compile=yes
+ else
+@@ -19833,13 +19892,13 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:19836: result: $ac_cv_func_compile" >&5
++echo "$as_me:19895: 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:19842: checking for compile in -lgen" >&5
++		echo "$as_me:19901: 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
+@@ -19847,7 +19906,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lgen  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 19850 "configure"
++#line 19909 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -19866,16 +19925,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:19869: \"$ac_link\"") >&5
++if { (eval echo "$as_me:19928: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:19872: \$? = $ac_status" >&5
++  echo "$as_me:19931: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:19875: \"$ac_try\"") >&5
++  { (eval echo "$as_me:19934: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:19878: \$? = $ac_status" >&5
++  echo "$as_me:19937: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_gen_compile=yes
+ else
+@@ -19886,7 +19945,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:19889: result: $ac_cv_lib_gen_compile" >&5
++echo "$as_me:19948: 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
+ 
+@@ -19914,11 +19973,11 @@
+ fi
+ 
+ if test "$cf_regex_func" = no ; then
+-	{ echo "$as_me:19917: WARNING: cannot find regular expression library" >&5
++	{ echo "$as_me:19976: WARNING: cannot find regular expression library" >&5
+ echo "$as_me: WARNING: cannot find regular expression library" >&2;}
+ fi
+ 
+-echo "$as_me:19921: checking for regular-expression headers" >&5
++echo "$as_me:19980: 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
+@@ -19930,7 +19989,7 @@
+ 	for cf_regex_hdr in regexp.h regexpr.h
+ 	do
+ 		cat >"conftest.$ac_ext" <<_ACEOF
+-#line 19933 "configure"
++#line 19992 "configure"
+ #include "confdefs.h"
+ #include <$cf_regex_hdr>
+ int
+@@ -19947,16 +20006,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:19950: \"$ac_link\"") >&5
++if { (eval echo "$as_me:20009: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:19953: \$? = $ac_status" >&5
++  echo "$as_me:20012: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:19956: \"$ac_try\"") >&5
++  { (eval echo "$as_me:20015: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:19959: \$? = $ac_status" >&5
++  echo "$as_me:20018: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+ 
+ 			cf_cv_regex_hdrs=$cf_regex_hdr
+@@ -19973,7 +20032,7 @@
+ 	for cf_regex_hdr in regex.h
+ 	do
+ 		cat >"conftest.$ac_ext" <<_ACEOF
+-#line 19976 "configure"
++#line 20035 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ #include <$cf_regex_hdr>
+@@ -19993,16 +20052,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:19996: \"$ac_link\"") >&5
++if { (eval echo "$as_me:20055: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:19999: \$? = $ac_status" >&5
++  echo "$as_me:20058: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:20002: \"$ac_try\"") >&5
++  { (eval echo "$as_me:20061: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:20005: \$? = $ac_status" >&5
++  echo "$as_me:20064: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+ 
+ 			cf_cv_regex_hdrs=$cf_regex_hdr
+@@ -20018,11 +20077,11 @@
+ esac
+ 
+ fi
+-echo "$as_me:20021: result: $cf_cv_regex_hdrs" >&5
++echo "$as_me:20080: result: $cf_cv_regex_hdrs" >&5
+ echo "${ECHO_T}$cf_cv_regex_hdrs" >&6
+ 
+ case "$cf_cv_regex_hdrs" in
+-	(no)		{ echo "$as_me:20025: WARNING: no regular expression header found" >&5
++	(no)		{ echo "$as_me:20084: WARNING: no regular expression header found" >&5
+ echo "$as_me: WARNING: no regular expression header found" >&2;} ;;
+ 	(regex.h)
+ cat >>confdefs.h <<\EOF
+@@ -20059,23 +20118,23 @@
+ 
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-echo "$as_me:20062: checking for $ac_header" >&5
++echo "$as_me:20121: 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 20068 "configure"
++#line 20127 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:20072: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:20131: \"$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:20078: \$? = $ac_status" >&5
++  echo "$as_me:20137: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -20094,7 +20153,7 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:20097: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
++echo "$as_me:20156: 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
+@@ -20107,23 +20166,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:20110: checking for $ac_header" >&5
++echo "$as_me:20169: 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 20116 "configure"
++#line 20175 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:20120: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:20179: \"$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:20126: \$? = $ac_status" >&5
++  echo "$as_me:20185: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -20142,7 +20201,7 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:20145: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
++echo "$as_me:20204: 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
+@@ -20152,7 +20211,7 @@
+ fi
+ done
+ 
+-echo "$as_me:20155: checking for header declaring getopt variables" >&5
++echo "$as_me:20214: 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
+@@ -20162,7 +20221,7 @@
+ for cf_header in stdio.h stdlib.h unistd.h getopt.h
+ do
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 20165 "configure"
++#line 20224 "configure"
+ #include "confdefs.h"
+ 
+ #include <$cf_header>
+@@ -20175,16 +20234,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:20178: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:20237: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:20181: \$? = $ac_status" >&5
++  echo "$as_me:20240: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:20184: \"$ac_try\"") >&5
++  { (eval echo "$as_me:20243: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:20187: \$? = $ac_status" >&5
++  echo "$as_me:20246: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_getopt_header=$cf_header
+  break
+@@ -20196,7 +20255,7 @@
+ done
+ 
+ fi
+-echo "$as_me:20199: result: $cf_cv_getopt_header" >&5
++echo "$as_me:20258: result: $cf_cv_getopt_header" >&5
+ echo "${ECHO_T}$cf_cv_getopt_header" >&6
+ if test "$cf_cv_getopt_header" != none ; then
+ 
+@@ -20213,14 +20272,14 @@
+ 
+ fi
+ 
+-echo "$as_me:20216: checking if external environ is declared" >&5
++echo "$as_me:20275: 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 20223 "configure"
++#line 20282 "configure"
+ #include "confdefs.h"
+ 
+ #ifdef HAVE_STDLIB_H
+@@ -20236,16 +20295,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:20239: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:20298: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:20242: \$? = $ac_status" >&5
++  echo "$as_me:20301: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:20245: \"$ac_try\"") >&5
++  { (eval echo "$as_me:20304: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:20248: \$? = $ac_status" >&5
++  echo "$as_me:20307: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_dcl_environ=yes
+ else
+@@ -20256,7 +20315,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:20259: result: $cf_cv_dcl_environ" >&5
++echo "$as_me:20318: result: $cf_cv_dcl_environ" >&5
+ echo "${ECHO_T}$cf_cv_dcl_environ" >&6
+ 
+ if test "$cf_cv_dcl_environ" = no ; then
+@@ -20271,14 +20330,14 @@
+ 
+ # It's possible (for near-UNIX clones) that the data doesn't exist
+ 
+-echo "$as_me:20274: checking if external environ exists" >&5
++echo "$as_me:20333: 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 20281 "configure"
++#line 20340 "configure"
+ #include "confdefs.h"
+ 
+ #undef environ
+@@ -20293,16 +20352,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:20296: \"$ac_link\"") >&5
++if { (eval echo "$as_me:20355: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:20299: \$? = $ac_status" >&5
++  echo "$as_me:20358: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:20302: \"$ac_try\"") >&5
++  { (eval echo "$as_me:20361: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:20305: \$? = $ac_status" >&5
++  echo "$as_me:20364: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_have_environ=yes
+ else
+@@ -20313,7 +20372,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:20316: result: $cf_cv_have_environ" >&5
++echo "$as_me:20375: result: $cf_cv_have_environ" >&5
+ echo "${ECHO_T}$cf_cv_have_environ" >&6
+ 
+ if test "$cf_cv_have_environ" = yes ; then
+@@ -20326,13 +20385,13 @@
+ 
+ fi
+ 
+-echo "$as_me:20329: checking for getenv" >&5
++echo "$as_me:20388: 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 20335 "configure"
++#line 20394 "configure"
+ #include "confdefs.h"
+ #define getenv autoconf_temporary
+ #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -20363,16 +20422,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:20366: \"$ac_link\"") >&5
++if { (eval echo "$as_me:20425: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:20369: \$? = $ac_status" >&5
++  echo "$as_me:20428: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:20372: \"$ac_try\"") >&5
++  { (eval echo "$as_me:20431: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:20375: \$? = $ac_status" >&5
++  echo "$as_me:20434: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_func_getenv=yes
+ else
+@@ -20382,19 +20441,19 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:20385: result: $ac_cv_func_getenv" >&5
++echo "$as_me:20444: 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:20391: checking for $ac_func" >&5
++echo "$as_me:20450: 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 20397 "configure"
++#line 20456 "configure"
+ #include "confdefs.h"
+ #define $ac_func autoconf_temporary
+ #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -20425,16 +20484,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:20428: \"$ac_link\"") >&5
++if { (eval echo "$as_me:20487: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:20431: \$? = $ac_status" >&5
++  echo "$as_me:20490: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:20434: \"$ac_try\"") >&5
++  { (eval echo "$as_me:20493: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:20437: \$? = $ac_status" >&5
++  echo "$as_me:20496: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   eval "$as_ac_var=yes"
+ else
+@@ -20444,7 +20503,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:20447: result: `eval echo '${'"$as_ac_var"'}'`" >&5
++echo "$as_me:20506: 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
+@@ -20454,7 +20513,7 @@
+ fi
+ done
+ 
+-echo "$as_me:20457: checking if getenv returns consistent values" >&5
++echo "$as_me:20516: 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
+@@ -20464,7 +20523,7 @@
+   cf_cv_consistent_getenv=unknown
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 20467 "configure"
++#line 20526 "configure"
+ #include "confdefs.h"
+ 
+ #include <stdlib.h>
+@@ -20573,15 +20632,15 @@
+ 
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:20576: \"$ac_link\"") >&5
++if { (eval echo "$as_me:20635: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:20579: \$? = $ac_status" >&5
++  echo "$as_me:20638: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:20581: \"$ac_try\"") >&5
++  { (eval echo "$as_me:20640: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:20584: \$? = $ac_status" >&5
++  echo "$as_me:20643: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_consistent_getenv=yes
+ else
+@@ -20594,7 +20653,7 @@
+ fi
+ 
+ fi
+-echo "$as_me:20597: result: $cf_cv_consistent_getenv" >&5
++echo "$as_me:20656: result: $cf_cv_consistent_getenv" >&5
+ echo "${ECHO_T}$cf_cv_consistent_getenv" >&6
+ 
+ if test "x$cf_cv_consistent_getenv" = xno
+@@ -20609,18 +20668,18 @@
+ if test "x$cf_cv_consistent_getenv" = xno && \
+ 	test "x$cf_with_trace" = xyes
+ then
+-	{ echo "$as_me:20612: WARNING: The NCURSES_TRACE environment variable is not supported with this configuration" >&5
++	{ echo "$as_me:20671: 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:20616: checking if sys/time.h works with sys/select.h" >&5
++echo "$as_me:20675: 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 20623 "configure"
++#line 20682 "configure"
+ #include "confdefs.h"
+ 
+ #include <sys/types.h>
+@@ -20640,16 +20699,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:20643: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:20702: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:20646: \$? = $ac_status" >&5
++  echo "$as_me:20705: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:20649: \"$ac_try\"") >&5
++  { (eval echo "$as_me:20708: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:20652: \$? = $ac_status" >&5
++  echo "$as_me:20711: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_sys_time_select=yes
+ else
+@@ -20661,7 +20720,7 @@
+ 
+ fi
+ 
+-echo "$as_me:20664: result: $cf_cv_sys_time_select" >&5
++echo "$as_me:20723: 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
+@@ -20676,13 +20735,13 @@
+ ac_compiler_gnu=$ac_cv_c_compiler_gnu
+ ac_main_return="return"
+ 
+-echo "$as_me:20679: checking for an ANSI C-conforming const" >&5
++echo "$as_me:20738: 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 20685 "configure"
++#line 20744 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -20740,16 +20799,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:20743: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:20802: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:20746: \$? = $ac_status" >&5
++  echo "$as_me:20805: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:20749: \"$ac_try\"") >&5
++  { (eval echo "$as_me:20808: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:20752: \$? = $ac_status" >&5
++  echo "$as_me:20811: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_c_const=yes
+ else
+@@ -20759,7 +20818,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:20762: result: $ac_cv_c_const" >&5
++echo "$as_me:20821: result: $ac_cv_c_const" >&5
+ echo "${ECHO_T}$ac_cv_c_const" >&6
+ if test $ac_cv_c_const = no; then
+ 
+@@ -20769,7 +20828,7 @@
+ 
+ fi
+ 
+-echo "$as_me:20772: checking for inline" >&5
++echo "$as_me:20831: 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
+@@ -20777,7 +20836,7 @@
+   ac_cv_c_inline=no
+ for ac_kw in inline __inline__ __inline; do
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 20780 "configure"
++#line 20839 "configure"
+ #include "confdefs.h"
+ #ifndef __cplusplus
+ static $ac_kw int static_foo () {return 0; }
+@@ -20786,16 +20845,16 @@
+ 
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:20789: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:20848: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:20792: \$? = $ac_status" >&5
++  echo "$as_me:20851: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:20795: \"$ac_try\"") >&5
++  { (eval echo "$as_me:20854: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:20798: \$? = $ac_status" >&5
++  echo "$as_me:20857: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_c_inline=$ac_kw; break
+ else
+@@ -20806,7 +20865,7 @@
+ done
+ 
+ fi
+-echo "$as_me:20809: result: $ac_cv_c_inline" >&5
++echo "$as_me:20868: result: $ac_cv_c_inline" >&5
+ echo "${ECHO_T}$ac_cv_c_inline" >&6
+ case $ac_cv_c_inline in
+   inline | yes) ;;
+@@ -20832,7 +20891,7 @@
+ 		:
+ 	elif test "$GCC" = yes
+ 	then
+-		echo "$as_me:20835: checking if $CC supports options to tune inlining" >&5
++		echo "$as_me:20894: 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
+@@ -20841,7 +20900,7 @@
+ 		cf_save_CFLAGS=$CFLAGS
+ 		CFLAGS="$CFLAGS --param max-inline-insns-single=1200"
+ 		cat >"conftest.$ac_ext" <<_ACEOF
+-#line 20844 "configure"
++#line 20903 "configure"
+ #include "confdefs.h"
+ inline int foo(void) { return 1; }
+ int
+@@ -20853,16 +20912,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:20856: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:20915: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:20859: \$? = $ac_status" >&5
++  echo "$as_me:20918: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:20862: \"$ac_try\"") >&5
++  { (eval echo "$as_me:20921: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:20865: \$? = $ac_status" >&5
++  echo "$as_me:20924: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_gcc_inline=yes
+ else
+@@ -20874,7 +20933,7 @@
+ 		CFLAGS=$cf_save_CFLAGS
+ 
+ fi
+-echo "$as_me:20877: result: $cf_cv_gcc_inline" >&5
++echo "$as_me:20936: result: $cf_cv_gcc_inline" >&5
+ echo "${ECHO_T}$cf_cv_gcc_inline" >&6
+ 		if test "$cf_cv_gcc_inline" = yes ; then
+ 
+@@ -20980,7 +21039,7 @@
+ 	fi
+ fi
+ 
+-echo "$as_me:20983: checking for signal global datatype" >&5
++echo "$as_me:21042: 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
+@@ -20992,7 +21051,7 @@
+ 		"int"
+ 	do
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 20995 "configure"
++#line 21054 "configure"
+ #include "confdefs.h"
+ 
+ #include <sys/types.h>
+@@ -21016,16 +21075,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:21019: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:21078: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:21022: \$? = $ac_status" >&5
++  echo "$as_me:21081: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:21025: \"$ac_try\"") >&5
++  { (eval echo "$as_me:21084: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:21028: \$? = $ac_status" >&5
++  echo "$as_me:21087: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_sig_atomic_t=$cf_type
+ else
+@@ -21039,7 +21098,7 @@
+ 
+ fi
+ 
+-echo "$as_me:21042: result: $cf_cv_sig_atomic_t" >&5
++echo "$as_me:21101: 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
+@@ -21048,7 +21107,7 @@
+ 
+ if test "$NCURSES_CHTYPE" = auto ; then
+ 
+-echo "$as_me:21051: checking for type of chtype" >&5
++echo "$as_me:21110: 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
+@@ -21058,7 +21117,7 @@
+   cf_cv_typeof_chtype=long
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 21061 "configure"
++#line 21120 "configure"
+ #include "confdefs.h"
+ 
+ #define WANT_BITS 31
+@@ -21093,15 +21152,15 @@
+ 
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:21096: \"$ac_link\"") >&5
++if { (eval echo "$as_me:21155: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:21099: \$? = $ac_status" >&5
++  echo "$as_me:21158: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:21101: \"$ac_try\"") >&5
++  { (eval echo "$as_me:21160: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:21104: \$? = $ac_status" >&5
++  echo "$as_me:21163: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_typeof_chtype=`cat cf_test.out`
+ else
+@@ -21116,7 +21175,7 @@
+ 
+ fi
+ 
+-echo "$as_me:21119: result: $cf_cv_typeof_chtype" >&5
++echo "$as_me:21178: result: $cf_cv_typeof_chtype" >&5
+ echo "${ECHO_T}$cf_cv_typeof_chtype" >&6
+ 
+ cat >>confdefs.h <<EOF
+@@ -21128,14 +21187,14 @@
+ fi
+ test "$cf_cv_typeof_chtype" = unsigned && cf_cv_typeof_chtype=""
+ 
+-echo "$as_me:21131: checking if unsigned literals are legal" >&5
++echo "$as_me:21190: 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 21138 "configure"
++#line 21197 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -21147,16 +21206,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:21150: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:21209: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:21153: \$? = $ac_status" >&5
++  echo "$as_me:21212: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:21156: \"$ac_try\"") >&5
++  { (eval echo "$as_me:21215: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:21159: \$? = $ac_status" >&5
++  echo "$as_me:21218: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_unsigned_literals=yes
+ else
+@@ -21168,7 +21227,7 @@
+ 
+ fi
+ 
+-echo "$as_me:21171: result: $cf_cv_unsigned_literals" >&5
++echo "$as_me:21230: result: $cf_cv_unsigned_literals" >&5
+ echo "${ECHO_T}$cf_cv_unsigned_literals" >&6
+ 
+ cf_cv_1UL="1"
+@@ -21184,14 +21243,14 @@
+ 
+ ###	Checks for external-data
+ 
+-echo "$as_me:21187: checking if external errno is declared" >&5
++echo "$as_me:21246: 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 21194 "configure"
++#line 21253 "configure"
+ #include "confdefs.h"
+ 
+ #ifdef HAVE_STDLIB_H
+@@ -21209,16 +21268,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:21212: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:21271: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:21215: \$? = $ac_status" >&5
++  echo "$as_me:21274: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:21218: \"$ac_try\"") >&5
++  { (eval echo "$as_me:21277: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:21221: \$? = $ac_status" >&5
++  echo "$as_me:21280: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_dcl_errno=yes
+ else
+@@ -21229,7 +21288,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:21232: result: $cf_cv_dcl_errno" >&5
++echo "$as_me:21291: result: $cf_cv_dcl_errno" >&5
+ echo "${ECHO_T}$cf_cv_dcl_errno" >&6
+ 
+ if test "$cf_cv_dcl_errno" = no ; then
+@@ -21244,14 +21303,14 @@
+ 
+ # It's possible (for near-UNIX clones) that the data doesn't exist
+ 
+-echo "$as_me:21247: checking if external errno exists" >&5
++echo "$as_me:21306: 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 21254 "configure"
++#line 21313 "configure"
+ #include "confdefs.h"
+ 
+ #undef errno
+@@ -21266,16 +21325,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:21269: \"$ac_link\"") >&5
++if { (eval echo "$as_me:21328: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:21272: \$? = $ac_status" >&5
++  echo "$as_me:21331: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:21275: \"$ac_try\"") >&5
++  { (eval echo "$as_me:21334: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:21278: \$? = $ac_status" >&5
++  echo "$as_me:21337: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_have_errno=yes
+ else
+@@ -21286,7 +21345,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:21289: result: $cf_cv_have_errno" >&5
++echo "$as_me:21348: result: $cf_cv_have_errno" >&5
+ echo "${ECHO_T}$cf_cv_have_errno" >&6
+ 
+ if test "$cf_cv_have_errno" = yes ; then
+@@ -21299,7 +21358,7 @@
+ 
+ fi
+ 
+-echo "$as_me:21302: checking if data-only library module links" >&5
++echo "$as_me:21361: 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
+@@ -21307,20 +21366,20 @@
+ 
+ 	rm -f conftest.a
+ 	cat >conftest.$ac_ext <<EOF
+-#line 21310 "configure"
++#line 21369 "configure"
+ int	testdata[3] = { 123, 456, 789 };
+ EOF
+-	if { (eval echo "$as_me:21313: \"$ac_compile\"") >&5
++	if { (eval echo "$as_me:21372: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:21316: \$? = $ac_status" >&5
++  echo "$as_me:21375: \$? = $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 21323 "configure"
++#line 21382 "configure"
+ int	testfunc(void)
+ {
+ #if defined(NeXT)
+@@ -21333,10 +21392,10 @@
+ #endif
+ }
+ EOF
+-	if { (eval echo "$as_me:21336: \"$ac_compile\"") >&5
++	if { (eval echo "$as_me:21395: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:21339: \$? = $ac_status" >&5
++  echo "$as_me:21398: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; then
+ 		mv conftest.o func.o && \
+ 		( $AR $ARFLAGS conftest.a func.o ) 2>&5 1>/dev/null
+@@ -21349,7 +21408,7 @@
+   cf_cv_link_dataonly=unknown
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 21352 "configure"
++#line 21411 "configure"
+ #include "confdefs.h"
+ 
+ 	int main(void)
+@@ -21360,15 +21419,15 @@
+ 
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:21363: \"$ac_link\"") >&5
++if { (eval echo "$as_me:21422: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:21366: \$? = $ac_status" >&5
++  echo "$as_me:21425: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:21368: \"$ac_try\"") >&5
++  { (eval echo "$as_me:21427: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:21371: \$? = $ac_status" >&5
++  echo "$as_me:21430: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_link_dataonly=yes
+ else
+@@ -21383,7 +21442,7 @@
+ 
+ fi
+ 
+-echo "$as_me:21386: result: $cf_cv_link_dataonly" >&5
++echo "$as_me:21445: result: $cf_cv_link_dataonly" >&5
+ echo "${ECHO_T}$cf_cv_link_dataonly" >&6
+ 
+ if test "$cf_cv_link_dataonly" = no ; then
+@@ -21426,13 +21485,13 @@
+ 
+ do
+ as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+-echo "$as_me:21429: checking for $ac_func" >&5
++echo "$as_me:21488: 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 21435 "configure"
++#line 21494 "configure"
+ #include "confdefs.h"
+ #define $ac_func autoconf_temporary
+ #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -21463,16 +21522,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:21466: \"$ac_link\"") >&5
++if { (eval echo "$as_me:21525: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:21469: \$? = $ac_status" >&5
++  echo "$as_me:21528: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:21472: \"$ac_try\"") >&5
++  { (eval echo "$as_me:21531: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:21475: \$? = $ac_status" >&5
++  echo "$as_me:21534: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   eval "$as_ac_var=yes"
+ else
+@@ -21482,7 +21541,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:21485: result: `eval echo '${'"$as_ac_var"'}'`" >&5
++echo "$as_me:21544: 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
+@@ -21492,14 +21551,14 @@
+ fi
+ done
+ 
+-echo "$as_me:21495: checking if _PATH_TTYS is defined in ttyent.h" >&5
++echo "$as_me:21554: 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 21502 "configure"
++#line 21561 "configure"
+ #include "confdefs.h"
+ 
+ #include <stdio.h>
+@@ -21514,16 +21573,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:21517: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:21576: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:21520: \$? = $ac_status" >&5
++  echo "$as_me:21579: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:21523: \"$ac_try\"") >&5
++  { (eval echo "$as_me:21582: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:21526: \$? = $ac_status" >&5
++  echo "$as_me:21585: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_PATH_TTYS=yes
+ else
+@@ -21533,7 +21592,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:21536: result: $cf_cv_PATH_TTYS" >&5
++echo "$as_me:21595: result: $cf_cv_PATH_TTYS" >&5
+ echo "${ECHO_T}$cf_cv_PATH_TTYS" >&6
+ 
+ if test $cf_cv_PATH_TTYS = no
+@@ -21555,7 +21614,7 @@
+ 
+ if test $cf_cv_PATH_TTYS != no
+ then
+-	echo "$as_me:21558: checking if _PATH_TTYS file exists" >&5
++	echo "$as_me:21617: 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
+@@ -21565,7 +21624,7 @@
+   cf_cv_have_PATH_TTYS=unknown
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 21568 "configure"
++#line 21627 "configure"
+ #include "confdefs.h"
+ 
+ #include <stdio.h>
+@@ -21576,15 +21635,15 @@
+ }
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:21579: \"$ac_link\"") >&5
++if { (eval echo "$as_me:21638: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:21582: \$? = $ac_status" >&5
++  echo "$as_me:21641: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:21584: \"$ac_try\"") >&5
++  { (eval echo "$as_me:21643: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:21587: \$? = $ac_status" >&5
++  echo "$as_me:21646: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_have_PATH_TTYS=yes
+ else
+@@ -21596,7 +21655,7 @@
+ rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+ fi
+-echo "$as_me:21599: result: $cf_cv_have_PATH_TTYS" >&5
++echo "$as_me:21658: 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
+@@ -21608,14 +21667,14 @@
+ #define HAVE_PATH_TTYS 1
+ EOF
+ 
+-	echo "$as_me:21611: checking for getttynam" >&5
++	echo "$as_me:21670: 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 21618 "configure"
++#line 21677 "configure"
+ #include "confdefs.h"
+ #include <ttyent.h>
+ int
+@@ -21627,16 +21686,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:21630: \"$ac_link\"") >&5
++if { (eval echo "$as_me:21689: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:21633: \$? = $ac_status" >&5
++  echo "$as_me:21692: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:21636: \"$ac_try\"") >&5
++  { (eval echo "$as_me:21695: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:21639: \$? = $ac_status" >&5
++  echo "$as_me:21698: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_func_getttynam=yes
+ else
+@@ -21646,7 +21705,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:21649: result: $cf_cv_func_getttynam" >&5
++echo "$as_me:21708: 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
+@@ -21656,7 +21715,7 @@
+ 
+ if test "x$ac_cv_func_getopt" = xno && \
+    test "x$cf_with_progs$cf_with_tests" != xnono; then
+-	{ { echo "$as_me:21659: error: getopt is required for building programs" >&5
++	{ { echo "$as_me:21718: error: getopt is required for building programs" >&5
+ echo "$as_me: error: getopt is required for building programs" >&2;}
+    { (exit 1); exit 1; }; }
+ fi
+@@ -21665,7 +21724,7 @@
+ then
+ 	if test "x$ac_cv_func_vsnprintf" = xyes
+ 	then
+-		{ echo "$as_me:21668: WARNING: will use vsnprintf instead of safe-sprintf option" >&5
++		{ echo "$as_me:21727: WARNING: will use vsnprintf instead of safe-sprintf option" >&5
+ echo "$as_me: WARNING: will use vsnprintf instead of safe-sprintf option" >&2;}
+ 	else
+ 
+@@ -21678,14 +21737,14 @@
+ 
+ if test "x$with_getcap" = "xyes" ; then
+ 
+-echo "$as_me:21681: checking for terminal-capability database functions" >&5
++echo "$as_me:21740: 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 21688 "configure"
++#line 21747 "configure"
+ #include "confdefs.h"
+ 
+ #include <stdlib.h>
+@@ -21705,16 +21764,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:21708: \"$ac_link\"") >&5
++if { (eval echo "$as_me:21767: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:21711: \$? = $ac_status" >&5
++  echo "$as_me:21770: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:21714: \"$ac_try\"") >&5
++  { (eval echo "$as_me:21773: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:21717: \$? = $ac_status" >&5
++  echo "$as_me:21776: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_cgetent=yes
+ else
+@@ -21725,7 +21784,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:21728: result: $cf_cv_cgetent" >&5
++echo "$as_me:21787: result: $cf_cv_cgetent" >&5
+ echo "${ECHO_T}$cf_cv_cgetent" >&6
+ 
+ if test "$cf_cv_cgetent" = yes
+@@ -21735,14 +21794,14 @@
+ #define HAVE_BSD_CGETENT 1
+ EOF
+ 
+-echo "$as_me:21738: checking if cgetent uses const parameter" >&5
++echo "$as_me:21797: 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 21745 "configure"
++#line 21804 "configure"
+ #include "confdefs.h"
+ 
+ #pragma GCC diagnostic error "-Wincompatible-pointer-types-discards-qualifiers"
+@@ -21765,16 +21824,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:21768: \"$ac_link\"") >&5
++if { (eval echo "$as_me:21827: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:21771: \$? = $ac_status" >&5
++  echo "$as_me:21830: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:21774: \"$ac_try\"") >&5
++  { (eval echo "$as_me:21833: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:21777: \$? = $ac_status" >&5
++  echo "$as_me:21836: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_cgetent_const=yes
+ else
+@@ -21785,7 +21844,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:21788: result: $cf_cv_cgetent_const" >&5
++echo "$as_me:21847: result: $cf_cv_cgetent_const" >&5
+ echo "${ECHO_T}$cf_cv_cgetent_const" >&6
+ 	if test "$cf_cv_cgetent_const" = yes
+ 	then
+@@ -21799,14 +21858,14 @@
+ 
+ fi
+ 
+-echo "$as_me:21802: checking for isascii" >&5
++echo "$as_me:21861: 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 21809 "configure"
++#line 21868 "configure"
+ #include "confdefs.h"
+ #include <ctype.h>
+ int
+@@ -21818,16 +21877,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:21821: \"$ac_link\"") >&5
++if { (eval echo "$as_me:21880: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:21824: \$? = $ac_status" >&5
++  echo "$as_me:21883: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:21827: \"$ac_try\"") >&5
++  { (eval echo "$as_me:21886: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:21830: \$? = $ac_status" >&5
++  echo "$as_me:21889: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_have_isascii=yes
+ else
+@@ -21838,7 +21897,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:21841: result: $cf_cv_have_isascii" >&5
++echo "$as_me:21900: result: $cf_cv_have_isascii" >&5
+ echo "${ECHO_T}$cf_cv_have_isascii" >&6
+ test "$cf_cv_have_isascii" = yes &&
+ cat >>confdefs.h <<\EOF
+@@ -21846,10 +21905,10 @@
+ EOF
+ 
+ if test "$ac_cv_func_sigaction" = yes; then
+-echo "$as_me:21849: checking whether sigaction needs _POSIX_SOURCE" >&5
++echo "$as_me:21908: 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 21852 "configure"
++#line 21911 "configure"
+ #include "confdefs.h"
+ 
+ #include <sys/types.h>
+@@ -21863,16 +21922,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:21866: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:21925: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:21869: \$? = $ac_status" >&5
++  echo "$as_me:21928: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:21872: \"$ac_try\"") >&5
++  { (eval echo "$as_me:21931: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:21875: \$? = $ac_status" >&5
++  echo "$as_me:21934: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   sigact_bad=no
+ else
+@@ -21880,7 +21939,7 @@
+ cat "conftest.$ac_ext" >&5
+ 
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 21883 "configure"
++#line 21942 "configure"
+ #include "confdefs.h"
+ 
+ #define _POSIX_SOURCE
+@@ -21895,16 +21954,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:21898: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:21957: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:21901: \$? = $ac_status" >&5
++  echo "$as_me:21960: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:21904: \"$ac_try\"") >&5
++  { (eval echo "$as_me:21963: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:21907: \$? = $ac_status" >&5
++  echo "$as_me:21966: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   sigact_bad=yes
+ 
+@@ -21920,11 +21979,11 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+-echo "$as_me:21923: result: $sigact_bad" >&5
++echo "$as_me:21982: result: $sigact_bad" >&5
+ echo "${ECHO_T}$sigact_bad" >&6
+ fi
+ 
+-echo "$as_me:21927: checking if nanosleep really works" >&5
++echo "$as_me:21986: 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
+@@ -21934,7 +21993,7 @@
+   cf_cv_func_nanosleep=unknown
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 21937 "configure"
++#line 21996 "configure"
+ #include "confdefs.h"
+ 
+ #include <stdio.h>
+@@ -21959,15 +22018,15 @@
+ 
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:21962: \"$ac_link\"") >&5
++if { (eval echo "$as_me:22021: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:21965: \$? = $ac_status" >&5
++  echo "$as_me:22024: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:21967: \"$ac_try\"") >&5
++  { (eval echo "$as_me:22026: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:21970: \$? = $ac_status" >&5
++  echo "$as_me:22029: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_func_nanosleep=yes
+ else
+@@ -21979,7 +22038,7 @@
+ rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+ fi
+-echo "$as_me:21982: result: $cf_cv_func_nanosleep" >&5
++echo "$as_me:22041: result: $cf_cv_func_nanosleep" >&5
+ echo "${ECHO_T}$cf_cv_func_nanosleep" >&6
+ 
+ test "$cf_cv_func_nanosleep" = "yes" &&
+@@ -21996,23 +22055,23 @@
+ 
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-echo "$as_me:21999: checking for $ac_header" >&5
++echo "$as_me:22058: 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 22005 "configure"
++#line 22064 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:22009: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:22068: \"$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:22015: \$? = $ac_status" >&5
++  echo "$as_me:22074: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -22031,7 +22090,7 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:22034: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
++echo "$as_me:22093: 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
+@@ -22048,10 +22107,10 @@
+ 	(*)	termios_bad=maybe ;;
+ 	esac
+ 	if test "$termios_bad" = maybe ; then
+-	echo "$as_me:22051: checking whether termios.h needs _POSIX_SOURCE" >&5
++	echo "$as_me:22110: 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 22054 "configure"
++#line 22113 "configure"
+ #include "confdefs.h"
+ #include <termios.h>
+ int
+@@ -22063,16 +22122,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:22066: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:22125: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:22069: \$? = $ac_status" >&5
++  echo "$as_me:22128: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:22072: \"$ac_try\"") >&5
++  { (eval echo "$as_me:22131: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:22075: \$? = $ac_status" >&5
++  echo "$as_me:22134: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   termios_bad=no
+ else
+@@ -22080,7 +22139,7 @@
+ cat "conftest.$ac_ext" >&5
+ 
+ 		cat >"conftest.$ac_ext" <<_ACEOF
+-#line 22083 "configure"
++#line 22142 "configure"
+ #include "confdefs.h"
+ 
+ #define _POSIX_SOURCE
+@@ -22094,16 +22153,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:22097: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:22156: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:22100: \$? = $ac_status" >&5
++  echo "$as_me:22159: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:22103: \"$ac_try\"") >&5
++  { (eval echo "$as_me:22162: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:22106: \$? = $ac_status" >&5
++  echo "$as_me:22165: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   termios_bad=unknown
+ else
+@@ -22119,19 +22178,19 @@
+ 
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+-	echo "$as_me:22122: result: $termios_bad" >&5
++	echo "$as_me:22181: result: $termios_bad" >&5
+ echo "${ECHO_T}$termios_bad" >&6
+ 	fi
+ fi
+ 
+-echo "$as_me:22127: checking for tcgetattr" >&5
++echo "$as_me:22186: 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 22134 "configure"
++#line 22193 "configure"
+ #include "confdefs.h"
+ 
+ #include <sys/types.h>
+@@ -22159,16 +22218,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:22162: \"$ac_link\"") >&5
++if { (eval echo "$as_me:22221: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:22165: \$? = $ac_status" >&5
++  echo "$as_me:22224: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:22168: \"$ac_try\"") >&5
++  { (eval echo "$as_me:22227: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:22171: \$? = $ac_status" >&5
++  echo "$as_me:22230: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_have_tcgetattr=yes
+ else
+@@ -22178,21 +22237,21 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:22181: result: $cf_cv_have_tcgetattr" >&5
++echo "$as_me:22240: 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:22188: checking for vsscanf function or workaround" >&5
++echo "$as_me:22247: 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 22195 "configure"
++#line 22254 "configure"
+ #include "confdefs.h"
+ 
+ #include <stdarg.h>
+@@ -22208,16 +22267,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:22211: \"$ac_link\"") >&5
++if { (eval echo "$as_me:22270: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:22214: \$? = $ac_status" >&5
++  echo "$as_me:22273: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:22217: \"$ac_try\"") >&5
++  { (eval echo "$as_me:22276: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:22220: \$? = $ac_status" >&5
++  echo "$as_me:22279: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_func_vsscanf=vsscanf
+ else
+@@ -22225,7 +22284,7 @@
+ cat "conftest.$ac_ext" >&5
+ 
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 22228 "configure"
++#line 22287 "configure"
+ #include "confdefs.h"
+ 
+ #include <stdarg.h>
+@@ -22247,16 +22306,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:22250: \"$ac_link\"") >&5
++if { (eval echo "$as_me:22309: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:22253: \$? = $ac_status" >&5
++  echo "$as_me:22312: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:22256: \"$ac_try\"") >&5
++  { (eval echo "$as_me:22315: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:22259: \$? = $ac_status" >&5
++  echo "$as_me:22318: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_func_vsscanf=vfscanf
+ else
+@@ -22264,7 +22323,7 @@
+ cat "conftest.$ac_ext" >&5
+ 
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 22267 "configure"
++#line 22326 "configure"
+ #include "confdefs.h"
+ 
+ #include <stdarg.h>
+@@ -22286,16 +22345,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:22289: \"$ac_link\"") >&5
++if { (eval echo "$as_me:22348: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:22292: \$? = $ac_status" >&5
++  echo "$as_me:22351: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:22295: \"$ac_try\"") >&5
++  { (eval echo "$as_me:22354: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:22298: \$? = $ac_status" >&5
++  echo "$as_me:22357: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_func_vsscanf=_doscan
+ else
+@@ -22310,7 +22369,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:22313: result: $cf_cv_func_vsscanf" >&5
++echo "$as_me:22372: result: $cf_cv_func_vsscanf" >&5
+ echo "${ECHO_T}$cf_cv_func_vsscanf" >&6
+ 
+ case "$cf_cv_func_vsscanf" in
+@@ -22336,23 +22395,23 @@
+ 
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-echo "$as_me:22339: checking for $ac_header" >&5
++echo "$as_me:22398: 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 22345 "configure"
++#line 22404 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:22349: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:22408: \"$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:22355: \$? = $ac_status" >&5
++  echo "$as_me:22414: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -22371,7 +22430,7 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:22374: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
++echo "$as_me:22433: 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
+@@ -22381,7 +22440,7 @@
+ fi
+ done
+ 
+-echo "$as_me:22384: checking for working mkstemp" >&5
++echo "$as_me:22443: 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
+@@ -22392,7 +22451,7 @@
+   cf_cv_func_mkstemp=maybe
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 22395 "configure"
++#line 22454 "configure"
+ #include "confdefs.h"
+ 
+ #include <sys/types.h>
+@@ -22433,15 +22492,15 @@
+ 
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:22436: \"$ac_link\"") >&5
++if { (eval echo "$as_me:22495: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:22439: \$? = $ac_status" >&5
++  echo "$as_me:22498: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:22441: \"$ac_try\"") >&5
++  { (eval echo "$as_me:22500: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:22444: \$? = $ac_status" >&5
++  echo "$as_me:22503: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_func_mkstemp=yes
+ 
+@@ -22456,16 +22515,16 @@
+ fi
+ 
+ fi
+-echo "$as_me:22459: result: $cf_cv_func_mkstemp" >&5
++echo "$as_me:22518: 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:22462: checking for mkstemp" >&5
++	echo "$as_me:22521: 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 22468 "configure"
++#line 22527 "configure"
+ #include "confdefs.h"
+ #define mkstemp autoconf_temporary
+ #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -22496,16 +22555,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:22499: \"$ac_link\"") >&5
++if { (eval echo "$as_me:22558: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:22502: \$? = $ac_status" >&5
++  echo "$as_me:22561: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:22505: \"$ac_try\"") >&5
++  { (eval echo "$as_me:22564: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:22508: \$? = $ac_status" >&5
++  echo "$as_me:22567: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_func_mkstemp=yes
+ else
+@@ -22515,7 +22574,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:22518: result: $ac_cv_func_mkstemp" >&5
++echo "$as_me:22577: result: $ac_cv_func_mkstemp" >&5
+ echo "${ECHO_T}$ac_cv_func_mkstemp" >&6
+ 
+ fi
+@@ -22536,21 +22595,21 @@
+ fi
+ 
+ if test "x$cross_compiling" = xyes ; then
+-	{ echo "$as_me:22539: WARNING: cross compiling: assume setvbuf params not reversed" >&5
++	{ echo "$as_me:22598: 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:22542: checking whether setvbuf arguments are reversed" >&5
++	echo "$as_me:22601: 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:22548: error: cannot run test program while cross compiling" >&5
++  { { echo "$as_me:22607: 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 22553 "configure"
++#line 22612 "configure"
+ #include "confdefs.h"
+ #include <stdio.h>
+ /* If setvbuf has the reversed format, exit 0. */
+@@ -22567,15 +22626,15 @@
+ }
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:22570: \"$ac_link\"") >&5
++if { (eval echo "$as_me:22629: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:22573: \$? = $ac_status" >&5
++  echo "$as_me:22632: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:22575: \"$ac_try\"") >&5
++  { (eval echo "$as_me:22634: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:22578: \$? = $ac_status" >&5
++  echo "$as_me:22637: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_func_setvbuf_reversed=yes
+ else
+@@ -22588,7 +22647,7 @@
+ fi
+ rm -f core ./core.* ./*.core
+ fi
+-echo "$as_me:22591: result: $ac_cv_func_setvbuf_reversed" >&5
++echo "$as_me:22650: 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
+ 
+@@ -22599,13 +22658,13 @@
+ fi
+ 
+ fi
+-echo "$as_me:22602: checking for intptr_t" >&5
++echo "$as_me:22661: 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 22608 "configure"
++#line 22667 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -22620,16 +22679,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:22623: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:22682: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:22626: \$? = $ac_status" >&5
++  echo "$as_me:22685: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:22629: \"$ac_try\"") >&5
++  { (eval echo "$as_me:22688: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:22632: \$? = $ac_status" >&5
++  echo "$as_me:22691: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_type_intptr_t=yes
+ else
+@@ -22639,7 +22698,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:22642: result: $ac_cv_type_intptr_t" >&5
++echo "$as_me:22701: 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
+   :
+@@ -22651,13 +22710,13 @@
+ 
+ fi
+ 
+-echo "$as_me:22654: checking for ssize_t" >&5
++echo "$as_me:22713: 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 22660 "configure"
++#line 22719 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -22672,16 +22731,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:22675: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:22734: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:22678: \$? = $ac_status" >&5
++  echo "$as_me:22737: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:22681: \"$ac_try\"") >&5
++  { (eval echo "$as_me:22740: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:22684: \$? = $ac_status" >&5
++  echo "$as_me:22743: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_type_ssize_t=yes
+ else
+@@ -22691,7 +22750,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:22694: result: $ac_cv_type_ssize_t" >&5
++echo "$as_me:22753: 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
+   :
+@@ -22703,14 +22762,14 @@
+ 
+ fi
+ 
+-echo "$as_me:22706: checking for type sigaction_t" >&5
++echo "$as_me:22765: 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 22713 "configure"
++#line 22772 "configure"
+ #include "confdefs.h"
+ 
+ #include <signal.h>
+@@ -22723,16 +22782,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:22726: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:22785: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:22729: \$? = $ac_status" >&5
++  echo "$as_me:22788: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:22732: \"$ac_try\"") >&5
++  { (eval echo "$as_me:22791: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:22735: \$? = $ac_status" >&5
++  echo "$as_me:22794: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_type_sigaction=yes
+ else
+@@ -22743,14 +22802,14 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+ 
+-echo "$as_me:22746: result: $cf_cv_type_sigaction" >&5
++echo "$as_me:22805: 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:22753: checking declaration of size-change" >&5
++echo "$as_me:22812: 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
+@@ -22771,7 +22830,7 @@
+ 
+ 	fi
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 22774 "configure"
++#line 22833 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ #ifdef HAVE_TERMIOS_H
+@@ -22821,16 +22880,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:22824: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:22883: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:22827: \$? = $ac_status" >&5
++  echo "$as_me:22886: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:22830: \"$ac_try\"") >&5
++  { (eval echo "$as_me:22889: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:22833: \$? = $ac_status" >&5
++  echo "$as_me:22892: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_sizechange=yes
+ else
+@@ -22849,7 +22908,7 @@
+ done
+ 
+ fi
+-echo "$as_me:22852: result: $cf_cv_sizechange" >&5
++echo "$as_me:22911: result: $cf_cv_sizechange" >&5
+ echo "${ECHO_T}$cf_cv_sizechange" >&6
+ if test "$cf_cv_sizechange" != no ; then
+ 
+@@ -22867,13 +22926,13 @@
+ 	esac
+ fi
+ 
+-echo "$as_me:22870: checking for memmove" >&5
++echo "$as_me:22929: 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 22876 "configure"
++#line 22935 "configure"
+ #include "confdefs.h"
+ #define memmove autoconf_temporary
+ #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -22904,16 +22963,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:22907: \"$ac_link\"") >&5
++if { (eval echo "$as_me:22966: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:22910: \$? = $ac_status" >&5
++  echo "$as_me:22969: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:22913: \"$ac_try\"") >&5
++  { (eval echo "$as_me:22972: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:22916: \$? = $ac_status" >&5
++  echo "$as_me:22975: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_func_memmove=yes
+ else
+@@ -22923,19 +22982,19 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:22926: result: $ac_cv_func_memmove" >&5
++echo "$as_me:22985: 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:22932: checking for bcopy" >&5
++echo "$as_me:22991: 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 22938 "configure"
++#line 22997 "configure"
+ #include "confdefs.h"
+ #define bcopy autoconf_temporary
+ #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -22966,16 +23025,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:22969: \"$ac_link\"") >&5
++if { (eval echo "$as_me:23028: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:22972: \$? = $ac_status" >&5
++  echo "$as_me:23031: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:22975: \"$ac_try\"") >&5
++  { (eval echo "$as_me:23034: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:22978: \$? = $ac_status" >&5
++  echo "$as_me:23037: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_func_bcopy=yes
+ else
+@@ -22985,11 +23044,11 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:22988: result: $ac_cv_func_bcopy" >&5
++echo "$as_me:23047: 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:22992: checking if bcopy does overlapping moves" >&5
++	echo "$as_me:23051: 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
+@@ -22999,7 +23058,7 @@
+   cf_cv_good_bcopy=unknown
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 23002 "configure"
++#line 23061 "configure"
+ #include "confdefs.h"
+ 
+ int main(void) {
+@@ -23013,15 +23072,15 @@
+ 
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:23016: \"$ac_link\"") >&5
++if { (eval echo "$as_me:23075: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:23019: \$? = $ac_status" >&5
++  echo "$as_me:23078: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:23021: \"$ac_try\"") >&5
++  { (eval echo "$as_me:23080: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:23024: \$? = $ac_status" >&5
++  echo "$as_me:23083: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_good_bcopy=yes
+ else
+@@ -23034,7 +23093,7 @@
+ fi
+ 
+ fi
+-echo "$as_me:23037: result: $cf_cv_good_bcopy" >&5
++echo "$as_me:23096: result: $cf_cv_good_bcopy" >&5
+ echo "${ECHO_T}$cf_cv_good_bcopy" >&6
+ 
+ else
+@@ -23061,13 +23120,13 @@
+ for ac_func in posix_openpt
+ do
+ as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+-echo "$as_me:23064: checking for $ac_func" >&5
++echo "$as_me:23123: 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 23070 "configure"
++#line 23129 "configure"
+ #include "confdefs.h"
+ #define $ac_func autoconf_temporary
+ #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -23098,16 +23157,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:23101: \"$ac_link\"") >&5
++if { (eval echo "$as_me:23160: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:23104: \$? = $ac_status" >&5
++  echo "$as_me:23163: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:23107: \"$ac_try\"") >&5
++  { (eval echo "$as_me:23166: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:23110: \$? = $ac_status" >&5
++  echo "$as_me:23169: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   eval "$as_ac_var=yes"
+ else
+@@ -23117,7 +23176,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:23120: result: `eval echo '${'"$as_ac_var"'}'`" >&5
++echo "$as_me:23179: 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
+@@ -23127,7 +23186,7 @@
+ fi
+ done
+  }
+-echo "$as_me:23130: checking if poll really works" >&5
++echo "$as_me:23189: 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
+@@ -23137,7 +23196,7 @@
+   cf_cv_working_poll=unknown
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 23140 "configure"
++#line 23199 "configure"
+ #include "confdefs.h"
+ 
+ #include <stdlib.h>
+@@ -23189,15 +23248,15 @@
+ }
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:23192: \"$ac_link\"") >&5
++if { (eval echo "$as_me:23251: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:23195: \$? = $ac_status" >&5
++  echo "$as_me:23254: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:23197: \"$ac_try\"") >&5
++  { (eval echo "$as_me:23256: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:23200: \$? = $ac_status" >&5
++  echo "$as_me:23259: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_working_poll=yes
+ else
+@@ -23209,21 +23268,21 @@
+ rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+ fi
+-echo "$as_me:23212: result: $cf_cv_working_poll" >&5
++echo "$as_me:23271: 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:23219: checking for va_copy" >&5
++echo "$as_me:23278: 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 23226 "configure"
++#line 23285 "configure"
+ #include "confdefs.h"
+ 
+ #include <stdarg.h>
+@@ -23240,16 +23299,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:23243: \"$ac_link\"") >&5
++if { (eval echo "$as_me:23302: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:23246: \$? = $ac_status" >&5
++  echo "$as_me:23305: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:23249: \"$ac_try\"") >&5
++  { (eval echo "$as_me:23308: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:23252: \$? = $ac_status" >&5
++  echo "$as_me:23311: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_have_va_copy=yes
+ else
+@@ -23259,7 +23318,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:23262: result: $cf_cv_have_va_copy" >&5
++echo "$as_me:23321: result: $cf_cv_have_va_copy" >&5
+ echo "${ECHO_T}$cf_cv_have_va_copy" >&6
+ 
+ if test "$cf_cv_have_va_copy" = yes;
+@@ -23271,14 +23330,14 @@
+ 
+ else # !cf_cv_have_va_copy
+ 
+-echo "$as_me:23274: checking for __va_copy" >&5
++echo "$as_me:23333: 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 23281 "configure"
++#line 23340 "configure"
+ #include "confdefs.h"
+ 
+ #include <stdarg.h>
+@@ -23295,16 +23354,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:23298: \"$ac_link\"") >&5
++if { (eval echo "$as_me:23357: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:23301: \$? = $ac_status" >&5
++  echo "$as_me:23360: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:23304: \"$ac_try\"") >&5
++  { (eval echo "$as_me:23363: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:23307: \$? = $ac_status" >&5
++  echo "$as_me:23366: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_have___va_copy=yes
+ else
+@@ -23314,7 +23373,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:23317: result: $cf_cv_have___va_copy" >&5
++echo "$as_me:23376: result: $cf_cv_have___va_copy" >&5
+ echo "${ECHO_T}$cf_cv_have___va_copy" >&6
+ 
+ if test "$cf_cv_have___va_copy" = yes
+@@ -23326,14 +23385,14 @@
+ 
+ else # !cf_cv_have___va_copy
+ 
+-echo "$as_me:23329: checking for __builtin_va_copy" >&5
++echo "$as_me:23388: 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 23336 "configure"
++#line 23395 "configure"
+ #include "confdefs.h"
+ 
+ #include <stdarg.h>
+@@ -23350,16 +23409,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:23353: \"$ac_link\"") >&5
++if { (eval echo "$as_me:23412: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:23356: \$? = $ac_status" >&5
++  echo "$as_me:23415: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:23359: \"$ac_try\"") >&5
++  { (eval echo "$as_me:23418: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:23362: \$? = $ac_status" >&5
++  echo "$as_me:23421: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_have___builtin_va_copy=yes
+ else
+@@ -23369,7 +23428,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:23372: result: $cf_cv_have___builtin_va_copy" >&5
++echo "$as_me:23431: 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 &&
+@@ -23387,14 +23446,14 @@
+ 	;;
+ 
+ (*)
+-	echo "$as_me:23390: checking if we can simply copy va_list" >&5
++	echo "$as_me:23449: 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 23397 "configure"
++#line 23456 "configure"
+ #include "confdefs.h"
+ 
+ #include <stdarg.h>
+@@ -23411,16 +23470,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:23414: \"$ac_link\"") >&5
++if { (eval echo "$as_me:23473: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:23417: \$? = $ac_status" >&5
++  echo "$as_me:23476: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:23420: \"$ac_try\"") >&5
++  { (eval echo "$as_me:23479: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:23423: \$? = $ac_status" >&5
++  echo "$as_me:23482: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_pointer_va_list=yes
+ else
+@@ -23430,19 +23489,19 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:23433: result: $cf_cv_pointer_va_list" >&5
++echo "$as_me:23492: 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:23438: checking if we can copy va_list indirectly" >&5
++		echo "$as_me:23497: 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 23445 "configure"
++#line 23504 "configure"
+ #include "confdefs.h"
+ 
+ #include <stdarg.h>
+@@ -23459,16 +23518,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:23462: \"$ac_link\"") >&5
++if { (eval echo "$as_me:23521: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:23465: \$? = $ac_status" >&5
++  echo "$as_me:23524: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:23468: \"$ac_try\"") >&5
++  { (eval echo "$as_me:23527: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:23471: \$? = $ac_status" >&5
++  echo "$as_me:23530: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_array_va_list=yes
+ else
+@@ -23478,7 +23537,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:23481: result: $cf_cv_array_va_list" >&5
++echo "$as_me:23540: 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
+@@ -23489,13 +23548,13 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:23492: checking for pid_t" >&5
++echo "$as_me:23551: 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 23498 "configure"
++#line 23557 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -23510,16 +23569,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:23513: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:23572: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:23516: \$? = $ac_status" >&5
++  echo "$as_me:23575: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:23519: \"$ac_try\"") >&5
++  { (eval echo "$as_me:23578: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:23522: \$? = $ac_status" >&5
++  echo "$as_me:23581: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_type_pid_t=yes
+ else
+@@ -23529,7 +23588,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:23532: result: $ac_cv_type_pid_t" >&5
++echo "$as_me:23591: 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
+   :
+@@ -23544,23 +23603,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:23547: checking for $ac_header" >&5
++echo "$as_me:23606: 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 23553 "configure"
++#line 23612 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:23557: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:23616: \"$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:23563: \$? = $ac_status" >&5
++  echo "$as_me:23622: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -23579,7 +23638,7 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:23582: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
++echo "$as_me:23641: 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
+@@ -23592,13 +23651,13 @@
+ for ac_func in fork vfork
+ do
+ as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+-echo "$as_me:23595: checking for $ac_func" >&5
++echo "$as_me:23654: 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 23601 "configure"
++#line 23660 "configure"
+ #include "confdefs.h"
+ #define $ac_func autoconf_temporary
+ #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -23629,16 +23688,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:23632: \"$ac_link\"") >&5
++if { (eval echo "$as_me:23691: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:23635: \$? = $ac_status" >&5
++  echo "$as_me:23694: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:23638: \"$ac_try\"") >&5
++  { (eval echo "$as_me:23697: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:23641: \$? = $ac_status" >&5
++  echo "$as_me:23700: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   eval "$as_ac_var=yes"
+ else
+@@ -23648,7 +23707,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:23651: result: `eval echo '${'"$as_ac_var"'}'`" >&5
++echo "$as_me:23710: 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
+@@ -23660,7 +23719,7 @@
+ 
+ ac_cv_func_fork_works=$ac_cv_func_fork
+ if test "x$ac_cv_func_fork" = xyes; then
+-  echo "$as_me:23663: checking for working fork" >&5
++  echo "$as_me:23722: 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
+@@ -23683,15 +23742,15 @@
+       }
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:23686: \"$ac_link\"") >&5
++if { (eval echo "$as_me:23745: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:23689: \$? = $ac_status" >&5
++  echo "$as_me:23748: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:23691: \"$ac_try\"") >&5
++  { (eval echo "$as_me:23750: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:23694: \$? = $ac_status" >&5
++  echo "$as_me:23753: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_func_fork_works=yes
+ else
+@@ -23703,7 +23762,7 @@
+ rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+ fi
+-echo "$as_me:23706: result: $ac_cv_func_fork_works" >&5
++echo "$as_me:23765: result: $ac_cv_func_fork_works" >&5
+ echo "${ECHO_T}$ac_cv_func_fork_works" >&6
+ 
+ fi
+@@ -23717,12 +23776,12 @@
+       ac_cv_func_fork_works=yes
+       ;;
+   esac
+-  { echo "$as_me:23720: WARNING: CROSS: Result $ac_cv_func_fork_works guessed due to cross-compiling." >&5
++  { echo "$as_me:23779: 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:23725: checking for working vfork" >&5
++  echo "$as_me:23784: 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
+@@ -23731,7 +23790,7 @@
+   ac_cv_func_vfork_works=cross
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 23734 "configure"
++#line 23793 "configure"
+ #include "confdefs.h"
+ /* Thanks to Paul Eggert for this test.  */
+ #include <stdio.h>
+@@ -23828,15 +23887,15 @@
+ }
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:23831: \"$ac_link\"") >&5
++if { (eval echo "$as_me:23890: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:23834: \$? = $ac_status" >&5
++  echo "$as_me:23893: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:23836: \"$ac_try\"") >&5
++  { (eval echo "$as_me:23895: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:23839: \$? = $ac_status" >&5
++  echo "$as_me:23898: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_func_vfork_works=yes
+ else
+@@ -23848,13 +23907,13 @@
+ rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+ fi
+-echo "$as_me:23851: result: $ac_cv_func_vfork_works" >&5
++echo "$as_me:23910: 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:23857: WARNING: CROSS: Result $ac_cv_func_vfork_works guessed due to cross-compiling." >&5
++  { echo "$as_me:23916: 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
+ 
+@@ -23879,7 +23938,7 @@
+ 
+ fi
+ 
+-echo "$as_me:23882: checking if fopen accepts explicit binary mode" >&5
++echo "$as_me:23941: 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
+@@ -23889,7 +23948,7 @@
+   cf_cv_fopen_bin_r=unknown
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 23892 "configure"
++#line 23951 "configure"
+ #include "confdefs.h"
+ 
+ #include <stdio.h>
+@@ -23922,15 +23981,15 @@
+ 
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:23925: \"$ac_link\"") >&5
++if { (eval echo "$as_me:23984: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:23928: \$? = $ac_status" >&5
++  echo "$as_me:23987: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:23930: \"$ac_try\"") >&5
++  { (eval echo "$as_me:23989: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:23933: \$? = $ac_status" >&5
++  echo "$as_me:23992: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_fopen_bin_r=yes
+ else
+@@ -23943,7 +24002,7 @@
+ fi
+ 
+ fi
+-echo "$as_me:23946: result: $cf_cv_fopen_bin_r" >&5
++echo "$as_me:24005: 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
+@@ -23952,7 +24011,7 @@
+ 
+ # special check for test/ditto.c
+ 
+-echo "$as_me:23955: checking for openpty in -lutil" >&5
++echo "$as_me:24014: 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
+@@ -23960,7 +24019,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lutil  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 23963 "configure"
++#line 24022 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -23979,16 +24038,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:23982: \"$ac_link\"") >&5
++if { (eval echo "$as_me:24041: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:23985: \$? = $ac_status" >&5
++  echo "$as_me:24044: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:23988: \"$ac_try\"") >&5
++  { (eval echo "$as_me:24047: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:23991: \$? = $ac_status" >&5
++  echo "$as_me:24050: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_util_openpty=yes
+ else
+@@ -23999,7 +24058,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:24002: result: $ac_cv_lib_util_openpty" >&5
++echo "$as_me:24061: 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
+@@ -24007,7 +24066,7 @@
+   cf_cv_lib_util=no
+ fi
+ 
+-echo "$as_me:24010: checking for openpty header" >&5
++echo "$as_me:24069: 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
+@@ -24034,7 +24093,7 @@
+ 	for cf_header in pty.h libutil.h util.h
+ 	do
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 24037 "configure"
++#line 24096 "configure"
+ #include "confdefs.h"
+ 
+ #include <$cf_header>
+@@ -24051,16 +24110,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:24054: \"$ac_link\"") >&5
++if { (eval echo "$as_me:24113: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:24057: \$? = $ac_status" >&5
++  echo "$as_me:24116: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:24060: \"$ac_try\"") >&5
++  { (eval echo "$as_me:24119: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:24063: \$? = $ac_status" >&5
++  echo "$as_me:24122: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+ 
+ 		cf_cv_func_openpty=$cf_header
+@@ -24078,7 +24137,7 @@
+ 	LIBS="$cf_save_LIBS"
+ 
+ fi
+-echo "$as_me:24081: result: $cf_cv_func_openpty" >&5
++echo "$as_me:24140: result: $cf_cv_func_openpty" >&5
+ echo "${ECHO_T}$cf_cv_func_openpty" >&6
+ 
+ if test "$cf_cv_func_openpty" != no ; then
+@@ -24151,7 +24210,7 @@
+ 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
+ 
+ 			  cat >"conftest.$ac_ext" <<_ACEOF
+-#line 24154 "configure"
++#line 24213 "configure"
+ #include "confdefs.h"
+ #include <stdio.h>
+ int
+@@ -24163,16 +24222,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:24166: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:24225: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:24169: \$? = $ac_status" >&5
++  echo "$as_me:24228: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:24172: \"$ac_try\"") >&5
++  { (eval echo "$as_me:24231: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:24175: \$? = $ac_status" >&5
++  echo "$as_me:24234: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   :
+ else
+@@ -24189,7 +24248,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}:24192: testing adding $cf_add_incdir to include-path ..." 1>&5
++echo "${as_me:-configure}:24251: testing adding $cf_add_incdir to include-path ..." 1>&5
+ 
+ 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
+ 
+@@ -24225,7 +24284,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}:24228: testing adding $cf_add_libdir to library-path ..." 1>&5
++echo "${as_me:-configure}:24287: testing adding $cf_add_libdir to library-path ..." 1>&5
+ 
+ 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
+ 			fi
+@@ -24236,7 +24295,7 @@
+ 	else
+ 		case "$with_hashed_db" in
+ 		(./*|../*|/*)
+-			{ echo "$as_me:24239: WARNING: no such directory $with_hashed_db" >&5
++			{ echo "$as_me:24298: WARNING: no such directory $with_hashed_db" >&5
+ echo "$as_me: WARNING: no such directory $with_hashed_db" >&2;}
+ 			;;
+ 		(*)
+@@ -24308,7 +24367,7 @@
+ 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
+ 
+ 			  cat >"conftest.$ac_ext" <<_ACEOF
+-#line 24311 "configure"
++#line 24370 "configure"
+ #include "confdefs.h"
+ #include <stdio.h>
+ int
+@@ -24320,16 +24379,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:24323: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:24382: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:24326: \$? = $ac_status" >&5
++  echo "$as_me:24385: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:24329: \"$ac_try\"") >&5
++  { (eval echo "$as_me:24388: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:24332: \$? = $ac_status" >&5
++  echo "$as_me:24391: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   :
+ else
+@@ -24346,7 +24405,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}:24349: testing adding $cf_add_incdir to include-path ..." 1>&5
++echo "${as_me:-configure}:24408: testing adding $cf_add_incdir to include-path ..." 1>&5
+ 
+ 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
+ 
+@@ -24426,7 +24485,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}:24429: testing adding $cf_add_libdir to library-path ..." 1>&5
++echo "${as_me:-configure}:24488: testing adding $cf_add_libdir to library-path ..." 1>&5
+ 
+ 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
+ 			fi
+@@ -24443,23 +24502,23 @@
+ 	fi
+ esac
+ 
+-echo "$as_me:24446: checking for db.h" >&5
++echo "$as_me:24505: 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 24452 "configure"
++#line 24511 "configure"
+ #include "confdefs.h"
+ #include <db.h>
+ _ACEOF
+-if { (eval echo "$as_me:24456: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:24515: \"$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:24462: \$? = $ac_status" >&5
++  echo "$as_me:24521: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -24478,11 +24537,11 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:24481: result: $ac_cv_header_db_h" >&5
++echo "$as_me:24540: 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:24485: checking for version of db" >&5
++echo "$as_me:24544: 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
+@@ -24493,10 +24552,10 @@
+ for cf_db_version in 1 2 3 4 5 6
+ do
+ 
+-echo "${as_me:-configure}:24496: testing checking for db version $cf_db_version ..." 1>&5
++echo "${as_me:-configure}:24555: testing checking for db version $cf_db_version ..." 1>&5
+ 
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 24499 "configure"
++#line 24558 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -24526,16 +24585,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:24529: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:24588: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:24532: \$? = $ac_status" >&5
++  echo "$as_me:24591: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:24535: \"$ac_try\"") >&5
++  { (eval echo "$as_me:24594: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:24538: \$? = $ac_status" >&5
++  echo "$as_me:24597: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+ 
+ 	cf_cv_hashed_db_version=$cf_db_version
+@@ -24549,16 +24608,16 @@
+ done
+ 
+ fi
+-echo "$as_me:24552: result: $cf_cv_hashed_db_version" >&5
++echo "$as_me:24611: 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:24556: error: Cannot determine version of db" >&5
++	{ { echo "$as_me:24615: 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:24561: checking for db libraries" >&5
++echo "$as_me:24620: 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
+@@ -24588,10 +24647,10 @@
+ 
+ 	fi
+ 
+-echo "${as_me:-configure}:24591: testing checking for library $cf_db_libs ..." 1>&5
++echo "${as_me:-configure}:24650: testing checking for library $cf_db_libs ..." 1>&5
+ 
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 24594 "configure"
++#line 24653 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -24646,16 +24705,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:24649: \"$ac_link\"") >&5
++if { (eval echo "$as_me:24708: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:24652: \$? = $ac_status" >&5
++  echo "$as_me:24711: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:24655: \"$ac_try\"") >&5
++  { (eval echo "$as_me:24714: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:24658: \$? = $ac_status" >&5
++  echo "$as_me:24717: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+ 
+ 	if test -n "$cf_db_libs" ; then
+@@ -24675,11 +24734,11 @@
+ done
+ 
+ fi
+-echo "$as_me:24678: result: $cf_cv_hashed_db_libs" >&5
++echo "$as_me:24737: 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:24682: error: Cannot determine library for db" >&5
++		{ { echo "$as_me:24741: 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
+@@ -24705,7 +24764,7 @@
+ 
+ else
+ 
+-	{ { echo "$as_me:24708: error: Cannot find db.h" >&5
++	{ { echo "$as_me:24767: error: Cannot find db.h" >&5
+ echo "$as_me: error: Cannot find db.h" >&2;}
+    { (exit 1); exit 1; }; }
+ 
+@@ -24720,7 +24779,7 @@
+ 
+ # Just in case, check if the C compiler has a bool type.
+ 
+-echo "$as_me:24723: checking if we should include stdbool.h" >&5
++echo "$as_me:24782: 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
+@@ -24728,7 +24787,7 @@
+ else
+ 
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 24731 "configure"
++#line 24790 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -24740,23 +24799,23 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:24743: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:24802: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:24746: \$? = $ac_status" >&5
++  echo "$as_me:24805: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:24749: \"$ac_try\"") >&5
++  { (eval echo "$as_me:24808: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:24752: \$? = $ac_status" >&5
++  echo "$as_me:24811: \$? = $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 24759 "configure"
++#line 24818 "configure"
+ #include "confdefs.h"
+ 
+ #ifndef __BEOS__
+@@ -24772,16 +24831,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:24775: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:24834: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:24778: \$? = $ac_status" >&5
++  echo "$as_me:24837: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:24781: \"$ac_try\"") >&5
++  { (eval echo "$as_me:24840: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:24784: \$? = $ac_status" >&5
++  echo "$as_me:24843: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_header_stdbool_h=1
+ else
+@@ -24795,13 +24854,13 @@
+ fi
+ 
+ if test "$cf_cv_header_stdbool_h" = 1
+-then	echo "$as_me:24798: result: yes" >&5
++then	echo "$as_me:24857: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+-else	echo "$as_me:24800: result: no" >&5
++else	echo "$as_me:24859: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+-echo "$as_me:24804: checking for builtin bool type" >&5
++echo "$as_me:24863: 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
+@@ -24809,7 +24868,7 @@
+ else
+ 
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 24812 "configure"
++#line 24871 "configure"
+ #include "confdefs.h"
+ 
+ #include <stdio.h>
+@@ -24824,16 +24883,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:24827: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:24886: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:24830: \$? = $ac_status" >&5
++  echo "$as_me:24889: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:24833: \"$ac_try\"") >&5
++  { (eval echo "$as_me:24892: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:24836: \$? = $ac_status" >&5
++  echo "$as_me:24895: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_cc_bool_type=1
+ else
+@@ -24846,9 +24905,9 @@
+ fi
+ 
+ if test "$cf_cv_cc_bool_type" = 1
+-then	echo "$as_me:24849: result: yes" >&5
++then	echo "$as_me:24908: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+-else	echo "$as_me:24851: result: no" >&5
++else	echo "$as_me:24910: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -24865,10 +24924,10 @@
+ 
+ 	cf_save="$LIBS"
+ 	LIBS="$LIBS $CXXLIBS"
+-	echo "$as_me:24868: checking if we already have C++ library" >&5
++	echo "$as_me:24927: 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 24871 "configure"
++#line 24930 "configure"
+ #include "confdefs.h"
+ 
+ 			#include <iostream>
+@@ -24882,16 +24941,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:24885: \"$ac_link\"") >&5
++if { (eval echo "$as_me:24944: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:24888: \$? = $ac_status" >&5
++  echo "$as_me:24947: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:24891: \"$ac_try\"") >&5
++  { (eval echo "$as_me:24950: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:24894: \$? = $ac_status" >&5
++  echo "$as_me:24953: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_have_libstdcpp=yes
+ else
+@@ -24900,7 +24959,7 @@
+ cf_have_libstdcpp=no
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+-	echo "$as_me:24903: result: $cf_have_libstdcpp" >&5
++	echo "$as_me:24962: result: $cf_have_libstdcpp" >&5
+ echo "${ECHO_T}$cf_have_libstdcpp" >&6
+ 	LIBS="$cf_save"
+ 
+@@ -24919,7 +24978,7 @@
+ 			;;
+ 		esac
+ 
+-		echo "$as_me:24922: checking for library $cf_stdcpp_libname" >&5
++		echo "$as_me:24981: 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
+@@ -24945,7 +25004,7 @@
+ LIBS="$cf_add_libs"
+ 
+ 		cat >"conftest.$ac_ext" <<_ACEOF
+-#line 24948 "configure"
++#line 25007 "configure"
+ #include "confdefs.h"
+ 
+ 				#include <iostream>
+@@ -24959,16 +25018,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:24962: \"$ac_link\"") >&5
++if { (eval echo "$as_me:25021: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:24965: \$? = $ac_status" >&5
++  echo "$as_me:25024: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:24968: \"$ac_try\"") >&5
++  { (eval echo "$as_me:25027: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:24971: \$? = $ac_status" >&5
++  echo "$as_me:25030: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_libstdcpp=yes
+ else
+@@ -24980,7 +25039,7 @@
+ 			LIBS="$cf_save"
+ 
+ fi
+-echo "$as_me:24983: result: $cf_cv_libstdcpp" >&5
++echo "$as_me:25042: result: $cf_cv_libstdcpp" >&5
+ echo "${ECHO_T}$cf_cv_libstdcpp" >&6
+ 		test "$cf_cv_libstdcpp" = yes && {
+ cf_add_libs="$CXXLIBS"
+@@ -25002,7 +25061,7 @@
+ 	fi
+ fi
+ 
+-	echo "$as_me:25005: checking whether $CXX understands -c and -o together" >&5
++	echo "$as_me:25064: 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
+@@ -25017,15 +25076,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:25020: \"$ac_try\"") >&5
++if { (eval echo "$as_me:25079: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:25023: \$? = $ac_status" >&5
++  echo "$as_me:25082: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+-  test -f conftest2.$ac_objext && { (eval echo "$as_me:25025: \"$ac_try\"") >&5
++  test -f conftest2.$ac_objext && { (eval echo "$as_me:25084: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:25028: \$? = $ac_status" >&5
++  echo "$as_me:25087: \$? = $ac_status" >&5
+   (exit "$ac_status"); };
+ then
+   eval cf_cv_prog_CXX_c_o=yes
+@@ -25036,10 +25095,10 @@
+ 
+ fi
+ if test "$cf_cv_prog_CXX_c_o" = yes; then
+-  echo "$as_me:25039: result: yes" >&5
++  echo "$as_me:25098: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ else
+-  echo "$as_me:25042: result: no" >&5
++  echo "$as_me:25101: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -25059,7 +25118,7 @@
+ 	;;
+ esac
+ if test "$GXX" = yes; then
+-	echo "$as_me:25062: checking for lib$cf_gpp_libname" >&5
++	echo "$as_me:25121: checking for lib$cf_gpp_libname" >&5
+ echo $ECHO_N "checking for lib$cf_gpp_libname... $ECHO_C" >&6
+ 	cf_save="$LIBS"
+ 
+@@ -25080,7 +25139,7 @@
+ LIBS="$cf_add_libs"
+ 
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 25083 "configure"
++#line 25142 "configure"
+ #include "confdefs.h"
+ 
+ #include <$cf_gpp_libname/builtin.h>
+@@ -25094,16 +25153,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:25097: \"$ac_link\"") >&5
++if { (eval echo "$as_me:25156: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:25100: \$? = $ac_status" >&5
++  echo "$as_me:25159: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:25103: \"$ac_try\"") >&5
++  { (eval echo "$as_me:25162: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:25106: \$? = $ac_status" >&5
++  echo "$as_me:25165: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cxx_library=yes
+ 
+@@ -25140,7 +25199,7 @@
+   echo "$as_me: failed program was:" >&5
+ cat "conftest.$ac_ext" >&5
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 25143 "configure"
++#line 25202 "configure"
+ #include "confdefs.h"
+ 
+ #include <builtin.h>
+@@ -25154,16 +25213,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:25157: \"$ac_link\"") >&5
++if { (eval echo "$as_me:25216: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:25160: \$? = $ac_status" >&5
++  echo "$as_me:25219: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:25163: \"$ac_try\"") >&5
++  { (eval echo "$as_me:25222: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:25166: \$? = $ac_status" >&5
++  echo "$as_me:25225: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cxx_library=yes
+ 
+@@ -25196,7 +25255,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ 	LIBS="$cf_save"
+-	echo "$as_me:25199: result: $cf_cxx_library" >&5
++	echo "$as_me:25258: result: $cf_cxx_library" >&5
+ echo "${ECHO_T}$cf_cxx_library" >&6
+ fi
+ 
+@@ -25212,7 +25271,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:25215: checking how to run the C++ preprocessor" >&5
++echo "$as_me:25274: 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
+@@ -25229,18 +25288,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 25232 "configure"
++#line 25291 "configure"
+ #include "confdefs.h"
+ #include <assert.h>
+                      Syntax error
+ _ACEOF
+-if { (eval echo "$as_me:25237: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:25296: \"$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:25243: \$? = $ac_status" >&5
++  echo "$as_me:25302: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_cxx_preproc_warn_flag
+@@ -25263,17 +25322,17 @@
+   # OK, works on sane cases.  Now check whether non-existent headers
+   # can be detected and how.
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 25266 "configure"
++#line 25325 "configure"
+ #include "confdefs.h"
+ #include <ac_nonexistent.h>
+ _ACEOF
+-if { (eval echo "$as_me:25270: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:25329: \"$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:25276: \$? = $ac_status" >&5
++  echo "$as_me:25335: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_cxx_preproc_warn_flag
+@@ -25310,7 +25369,7 @@
+ else
+   ac_cv_prog_CXXCPP=$CXXCPP
+ fi
+-echo "$as_me:25313: result: $CXXCPP" >&5
++echo "$as_me:25372: result: $CXXCPP" >&5
+ echo "${ECHO_T}$CXXCPP" >&6
+ ac_preproc_ok=false
+ for ac_cxx_preproc_warn_flag in '' yes
+@@ -25320,18 +25379,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 25323 "configure"
++#line 25382 "configure"
+ #include "confdefs.h"
+ #include <assert.h>
+                      Syntax error
+ _ACEOF
+-if { (eval echo "$as_me:25328: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:25387: \"$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:25334: \$? = $ac_status" >&5
++  echo "$as_me:25393: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_cxx_preproc_warn_flag
+@@ -25354,17 +25413,17 @@
+   # OK, works on sane cases.  Now check whether non-existent headers
+   # can be detected and how.
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 25357 "configure"
++#line 25416 "configure"
+ #include "confdefs.h"
+ #include <ac_nonexistent.h>
+ _ACEOF
+-if { (eval echo "$as_me:25361: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:25420: \"$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:25367: \$? = $ac_status" >&5
++  echo "$as_me:25426: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_cxx_preproc_warn_flag
+@@ -25392,7 +25451,7 @@
+ if $ac_preproc_ok; then
+   :
+ else
+-  { { echo "$as_me:25395: error: C++ preprocessor \"$CXXCPP\" fails sanity check" >&5
++  { { echo "$as_me:25454: error: C++ preprocessor \"$CXXCPP\" fails sanity check" >&5
+ echo "$as_me: error: C++ preprocessor \"$CXXCPP\" fails sanity check" >&2;}
+    { (exit 1); exit 1; }; }
+ fi
+@@ -25407,23 +25466,23 @@
+ for ac_header in typeinfo
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-echo "$as_me:25410: checking for $ac_header" >&5
++echo "$as_me:25469: 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 25416 "configure"
++#line 25475 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:25420: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:25479: \"$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:25426: \$? = $ac_status" >&5
++  echo "$as_me:25485: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_cxx_preproc_warn_flag
+@@ -25442,7 +25501,7 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:25445: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
++echo "$as_me:25504: 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
+@@ -25455,23 +25514,23 @@
+ for ac_header in iostream
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-echo "$as_me:25458: checking for $ac_header" >&5
++echo "$as_me:25517: 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 25464 "configure"
++#line 25523 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:25468: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:25527: \"$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:25474: \$? = $ac_status" >&5
++  echo "$as_me:25533: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_cxx_preproc_warn_flag
+@@ -25490,7 +25549,7 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:25493: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
++echo "$as_me:25552: 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
+@@ -25501,10 +25560,10 @@
+ done
+ 
+ if test x"$ac_cv_header_iostream" = xyes ; then
+-	echo "$as_me:25504: checking if iostream uses std-namespace" >&5
++	echo "$as_me:25563: 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 25507 "configure"
++#line 25566 "configure"
+ #include "confdefs.h"
+ 
+ #include <iostream>
+@@ -25521,16 +25580,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:25524: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:25583: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:25527: \$? = $ac_status" >&5
++  echo "$as_me:25586: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:25530: \"$ac_try\"") >&5
++  { (eval echo "$as_me:25589: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:25533: \$? = $ac_status" >&5
++  echo "$as_me:25592: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_iostream_namespace=yes
+ else
+@@ -25539,7 +25598,7 @@
+ cf_iostream_namespace=no
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+-	echo "$as_me:25542: result: $cf_iostream_namespace" >&5
++	echo "$as_me:25601: result: $cf_iostream_namespace" >&5
+ echo "${ECHO_T}$cf_iostream_namespace" >&6
+ 	if test "$cf_iostream_namespace" = yes ; then
+ 
+@@ -25550,7 +25609,7 @@
+ 	fi
+ fi
+ 
+-echo "$as_me:25553: checking if we should include stdbool.h" >&5
++echo "$as_me:25612: checking if we should include stdbool.h" >&5
+ echo $ECHO_N "checking if we should include stdbool.h... $ECHO_C" >&6
+ 
+ if test "${cf_cv_header_stdbool_h+set}" = set; then
+@@ -25558,7 +25617,7 @@
+ else
+ 
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 25561 "configure"
++#line 25620 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -25570,23 +25629,23 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:25573: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:25632: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:25576: \$? = $ac_status" >&5
++  echo "$as_me:25635: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:25579: \"$ac_try\"") >&5
++  { (eval echo "$as_me:25638: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:25582: \$? = $ac_status" >&5
++  echo "$as_me:25641: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_header_stdbool_h=0
+ else
+   echo "$as_me: failed program was:" >&5
+ cat "conftest.$ac_ext" >&5
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 25589 "configure"
++#line 25648 "configure"
+ #include "confdefs.h"
+ 
+ #ifndef __BEOS__
+@@ -25602,16 +25661,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:25605: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:25664: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:25608: \$? = $ac_status" >&5
++  echo "$as_me:25667: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:25611: \"$ac_try\"") >&5
++  { (eval echo "$as_me:25670: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:25614: \$? = $ac_status" >&5
++  echo "$as_me:25673: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_header_stdbool_h=1
+ else
+@@ -25625,13 +25684,13 @@
+ fi
+ 
+ if test "$cf_cv_header_stdbool_h" = 1
+-then	echo "$as_me:25628: result: yes" >&5
++then	echo "$as_me:25687: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+-else	echo "$as_me:25630: result: no" >&5
++else	echo "$as_me:25689: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+-echo "$as_me:25634: checking for builtin bool type" >&5
++echo "$as_me:25693: 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
+@@ -25639,7 +25698,7 @@
+ else
+ 
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 25642 "configure"
++#line 25701 "configure"
+ #include "confdefs.h"
+ 
+ #include <stdio.h>
+@@ -25654,16 +25713,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:25657: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:25716: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:25660: \$? = $ac_status" >&5
++  echo "$as_me:25719: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:25663: \"$ac_try\"") >&5
++  { (eval echo "$as_me:25722: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:25666: \$? = $ac_status" >&5
++  echo "$as_me:25725: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_builtin_bool=1
+ else
+@@ -25676,19 +25735,19 @@
+ fi
+ 
+ if test "$cf_cv_builtin_bool" = 1
+-then	echo "$as_me:25679: result: yes" >&5
++then	echo "$as_me:25738: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+-else	echo "$as_me:25681: result: no" >&5
++else	echo "$as_me:25740: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+-echo "$as_me:25685: checking for bool" >&5
++echo "$as_me:25744: 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 25691 "configure"
++#line 25750 "configure"
+ #include "confdefs.h"
+ 
+ #include <stdlib.h>
+@@ -25724,16 +25783,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:25727: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:25786: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:25730: \$? = $ac_status" >&5
++  echo "$as_me:25789: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:25733: \"$ac_try\"") >&5
++  { (eval echo "$as_me:25792: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:25736: \$? = $ac_status" >&5
++  echo "$as_me:25795: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_type_bool=yes
+ else
+@@ -25743,10 +25802,10 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:25746: result: $ac_cv_type_bool" >&5
++echo "$as_me:25805: result: $ac_cv_type_bool" >&5
+ echo "${ECHO_T}$ac_cv_type_bool" >&6
+ 
+-echo "$as_me:25749: checking size of bool" >&5
++echo "$as_me:25808: 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
+@@ -25755,7 +25814,7 @@
+   if test "$cross_compiling" = yes; then
+   # Depending upon the size, compute the lo and hi bounds.
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 25758 "configure"
++#line 25817 "configure"
+ #include "confdefs.h"
+ 
+ #include <stdlib.h>
+@@ -25788,21 +25847,21 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:25791: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:25850: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:25794: \$? = $ac_status" >&5
++  echo "$as_me:25853: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:25797: \"$ac_try\"") >&5
++  { (eval echo "$as_me:25856: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:25800: \$? = $ac_status" >&5
++  echo "$as_me:25859: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_lo=0 ac_mid=0
+   while :; do
+     cat >"conftest.$ac_ext" <<_ACEOF
+-#line 25805 "configure"
++#line 25864 "configure"
+ #include "confdefs.h"
+ 
+ #include <stdlib.h>
+@@ -25835,16 +25894,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:25838: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:25897: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:25841: \$? = $ac_status" >&5
++  echo "$as_me:25900: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:25844: \"$ac_try\"") >&5
++  { (eval echo "$as_me:25903: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:25847: \$? = $ac_status" >&5
++  echo "$as_me:25906: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_hi=$ac_mid; break
+ else
+@@ -25860,7 +25919,7 @@
+ ac_hi=-1 ac_mid=-1
+   while :; do
+     cat >"conftest.$ac_ext" <<_ACEOF
+-#line 25863 "configure"
++#line 25922 "configure"
+ #include "confdefs.h"
+ 
+ #include <stdlib.h>
+@@ -25893,16 +25952,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:25896: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:25955: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:25899: \$? = $ac_status" >&5
++  echo "$as_me:25958: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:25902: \"$ac_try\"") >&5
++  { (eval echo "$as_me:25961: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:25905: \$? = $ac_status" >&5
++  echo "$as_me:25964: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_lo=$ac_mid; break
+ else
+@@ -25918,7 +25977,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 25921 "configure"
++#line 25980 "configure"
+ #include "confdefs.h"
+ 
+ #include <stdlib.h>
+@@ -25951,16 +26010,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:25954: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:26013: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:25957: \$? = $ac_status" >&5
++  echo "$as_me:26016: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:25960: \"$ac_try\"") >&5
++  { (eval echo "$as_me:26019: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:25963: \$? = $ac_status" >&5
++  echo "$as_me:26022: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_hi=$ac_mid
+ else
+@@ -25973,12 +26032,12 @@
+ ac_cv_sizeof_bool=$ac_lo
+ else
+   if test "$cross_compiling" = yes; then
+-  { { echo "$as_me:25976: error: cannot run test program while cross compiling" >&5
++  { { echo "$as_me:26035: 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 25981 "configure"
++#line 26040 "configure"
+ #include "confdefs.h"
+ 
+ #include <stdlib.h>
+@@ -26015,15 +26074,15 @@
+ }
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:26018: \"$ac_link\"") >&5
++if { (eval echo "$as_me:26077: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:26021: \$? = $ac_status" >&5
++  echo "$as_me:26080: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:26023: \"$ac_try\"") >&5
++  { (eval echo "$as_me:26082: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:26026: \$? = $ac_status" >&5
++  echo "$as_me:26085: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_sizeof_bool=`cat conftest.val`
+ else
+@@ -26039,13 +26098,13 @@
+   ac_cv_sizeof_bool=0
+ fi
+ fi
+-echo "$as_me:26042: result: $ac_cv_sizeof_bool" >&5
++echo "$as_me:26101: 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:26048: checking for type of bool" >&5
++echo "$as_me:26107: 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
+@@ -26064,7 +26123,7 @@
+ 
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 26067 "configure"
++#line 26126 "configure"
+ #include "confdefs.h"
+ 
+ #include <stdlib.h>
+@@ -26106,15 +26165,15 @@
+ 
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:26109: \"$ac_link\"") >&5
++if { (eval echo "$as_me:26168: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:26112: \$? = $ac_status" >&5
++  echo "$as_me:26171: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:26114: \"$ac_try\"") >&5
++  { (eval echo "$as_me:26173: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:26117: \$? = $ac_status" >&5
++  echo "$as_me:26176: \$? = $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
+@@ -26131,19 +26190,19 @@
+ 	rm -f cf_test.out
+ 
+ fi
+-echo "$as_me:26134: result: $cf_cv_type_of_bool" >&5
++echo "$as_me:26193: 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:26141: WARNING: Assuming $NCURSES_BOOL for type of bool" >&5
++	{ echo "$as_me:26200: 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:26146: checking for special defines needed for etip.h" >&5
++echo "$as_me:26205: 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"
+@@ -26161,7 +26220,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 26164 "configure"
++#line 26223 "configure"
+ #include "confdefs.h"
+ 
+ #include <etip.h.in>
+@@ -26175,16 +26234,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:26178: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:26237: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:26181: \$? = $ac_status" >&5
++  echo "$as_me:26240: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:26184: \"$ac_try\"") >&5
++  { (eval echo "$as_me:26243: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:26187: \$? = $ac_status" >&5
++  echo "$as_me:26246: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+ 
+ 	test -n "$cf_math" && cat >>confdefs.h <<EOF
+@@ -26205,12 +26264,12 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ done
+ done
+-echo "$as_me:26208: result: $cf_result" >&5
++echo "$as_me:26267: result: $cf_result" >&5
+ echo "${ECHO_T}$cf_result" >&6
+ CXXFLAGS="$cf_save_CXXFLAGS"
+ 
+ if test -n "$CXX"; then
+-echo "$as_me:26213: checking if $CXX accepts parameter initialization" >&5
++echo "$as_me:26272: 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
+@@ -26227,7 +26286,7 @@
+   cf_cv_cpp_param_init=unknown
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 26230 "configure"
++#line 26289 "configure"
+ #include "confdefs.h"
+ 
+ class TEST {
+@@ -26246,15 +26305,15 @@
+ 
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:26249: \"$ac_link\"") >&5
++if { (eval echo "$as_me:26308: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:26252: \$? = $ac_status" >&5
++  echo "$as_me:26311: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:26254: \"$ac_try\"") >&5
++  { (eval echo "$as_me:26313: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:26257: \$? = $ac_status" >&5
++  echo "$as_me:26316: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_cpp_param_init=yes
+ else
+@@ -26273,7 +26332,7 @@
+ ac_main_return="return"
+ 
+ fi
+-echo "$as_me:26276: result: $cf_cv_cpp_param_init" >&5
++echo "$as_me:26335: result: $cf_cv_cpp_param_init" >&5
+ echo "${ECHO_T}$cf_cv_cpp_param_init" >&6
+ fi
+ test "$cf_cv_cpp_param_init" = yes &&
+@@ -26283,7 +26342,7 @@
+ 
+ if test -n "$CXX"; then
+ 
+-echo "$as_me:26286: checking if $CXX accepts static_cast" >&5
++echo "$as_me:26345: 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
+@@ -26297,7 +26356,7 @@
+ ac_main_return="return"
+ 
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 26300 "configure"
++#line 26359 "configure"
+ #include "confdefs.h"
+ 
+ class NCursesPanel
+@@ -26341,16 +26400,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:26344: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:26403: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:26347: \$? = $ac_status" >&5
++  echo "$as_me:26406: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:26350: \"$ac_try\"") >&5
++  { (eval echo "$as_me:26409: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:26353: \$? = $ac_status" >&5
++  echo "$as_me:26412: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_cpp_static_cast=yes
+ else
+@@ -26368,7 +26427,7 @@
+ ac_main_return="return"
+ 
+ fi
+-echo "$as_me:26371: result: $cf_cv_cpp_static_cast" >&5
++echo "$as_me:26430: result: $cf_cv_cpp_static_cast" >&5
+ echo "${ECHO_T}$cf_cv_cpp_static_cast" >&6
+ 
+ fi
+@@ -26417,13 +26476,13 @@
+ 	else
+ 		if test "$cf_cv_header_stdbool_h" = 1 ; then
+ 
+-echo "$as_me:26420: checking for bool" >&5
++echo "$as_me:26479: 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 26426 "configure"
++#line 26485 "configure"
+ #include "confdefs.h"
+ 
+ #include <stdlib.h>
+@@ -26459,16 +26518,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:26462: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:26521: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:26465: \$? = $ac_status" >&5
++  echo "$as_me:26524: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:26468: \"$ac_try\"") >&5
++  { (eval echo "$as_me:26527: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:26471: \$? = $ac_status" >&5
++  echo "$as_me:26530: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_type_bool=yes
+ else
+@@ -26478,10 +26537,10 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:26481: result: $ac_cv_type_bool" >&5
++echo "$as_me:26540: result: $ac_cv_type_bool" >&5
+ echo "${ECHO_T}$ac_cv_type_bool" >&6
+ 
+-echo "$as_me:26484: checking size of bool" >&5
++echo "$as_me:26543: 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
+@@ -26490,7 +26549,7 @@
+   if test "$cross_compiling" = yes; then
+   # Depending upon the size, compute the lo and hi bounds.
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 26493 "configure"
++#line 26552 "configure"
+ #include "confdefs.h"
+ 
+ #include <stdlib.h>
+@@ -26523,21 +26582,21 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:26526: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:26585: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:26529: \$? = $ac_status" >&5
++  echo "$as_me:26588: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:26532: \"$ac_try\"") >&5
++  { (eval echo "$as_me:26591: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:26535: \$? = $ac_status" >&5
++  echo "$as_me:26594: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_lo=0 ac_mid=0
+   while :; do
+     cat >"conftest.$ac_ext" <<_ACEOF
+-#line 26540 "configure"
++#line 26599 "configure"
+ #include "confdefs.h"
+ 
+ #include <stdlib.h>
+@@ -26570,16 +26629,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:26573: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:26632: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:26576: \$? = $ac_status" >&5
++  echo "$as_me:26635: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:26579: \"$ac_try\"") >&5
++  { (eval echo "$as_me:26638: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:26582: \$? = $ac_status" >&5
++  echo "$as_me:26641: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_hi=$ac_mid; break
+ else
+@@ -26595,7 +26654,7 @@
+ ac_hi=-1 ac_mid=-1
+   while :; do
+     cat >"conftest.$ac_ext" <<_ACEOF
+-#line 26598 "configure"
++#line 26657 "configure"
+ #include "confdefs.h"
+ 
+ #include <stdlib.h>
+@@ -26628,16 +26687,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:26631: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:26690: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:26634: \$? = $ac_status" >&5
++  echo "$as_me:26693: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:26637: \"$ac_try\"") >&5
++  { (eval echo "$as_me:26696: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:26640: \$? = $ac_status" >&5
++  echo "$as_me:26699: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_lo=$ac_mid; break
+ else
+@@ -26653,7 +26712,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 26656 "configure"
++#line 26715 "configure"
+ #include "confdefs.h"
+ 
+ #include <stdlib.h>
+@@ -26686,16 +26745,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:26689: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:26748: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:26692: \$? = $ac_status" >&5
++  echo "$as_me:26751: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:26695: \"$ac_try\"") >&5
++  { (eval echo "$as_me:26754: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:26698: \$? = $ac_status" >&5
++  echo "$as_me:26757: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_hi=$ac_mid
+ else
+@@ -26708,12 +26767,12 @@
+ ac_cv_sizeof_bool=$ac_lo
+ else
+   if test "$cross_compiling" = yes; then
+-  { { echo "$as_me:26711: error: cannot run test program while cross compiling" >&5
++  { { echo "$as_me:26770: 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 26716 "configure"
++#line 26775 "configure"
+ #include "confdefs.h"
+ 
+ #include <stdlib.h>
+@@ -26750,15 +26809,15 @@
+ }
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:26753: \"$ac_link\"") >&5
++if { (eval echo "$as_me:26812: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:26756: \$? = $ac_status" >&5
++  echo "$as_me:26815: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:26758: \"$ac_try\"") >&5
++  { (eval echo "$as_me:26817: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:26761: \$? = $ac_status" >&5
++  echo "$as_me:26820: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_sizeof_bool=`cat conftest.val`
+ else
+@@ -26774,13 +26833,13 @@
+   ac_cv_sizeof_bool=0
+ fi
+ fi
+-echo "$as_me:26777: result: $ac_cv_sizeof_bool" >&5
++echo "$as_me:26836: 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:26783: checking for type of bool" >&5
++echo "$as_me:26842: 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
+@@ -26799,7 +26858,7 @@
+ 
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 26802 "configure"
++#line 26861 "configure"
+ #include "confdefs.h"
+ 
+ #include <stdlib.h>
+@@ -26841,15 +26900,15 @@
+ 
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:26844: \"$ac_link\"") >&5
++if { (eval echo "$as_me:26903: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:26847: \$? = $ac_status" >&5
++  echo "$as_me:26906: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:26849: \"$ac_try\"") >&5
++  { (eval echo "$as_me:26908: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:26852: \$? = $ac_status" >&5
++  echo "$as_me:26911: \$? = $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
+@@ -26866,26 +26925,26 @@
+ 	rm -f cf_test.out
+ 
+ fi
+-echo "$as_me:26869: result: $cf_cv_type_of_bool" >&5
++echo "$as_me:26928: 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:26876: WARNING: Assuming $NCURSES_BOOL for type of bool" >&5
++	{ echo "$as_me:26935: 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:26882: checking for fallback type of bool" >&5
++			echo "$as_me:26941: 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:26888: result: $cf_cv_type_of_bool" >&5
++			echo "$as_me:26947: result: $cf_cv_type_of_bool" >&5
+ echo "${ECHO_T}$cf_cv_type_of_bool" >&6
+ 		fi
+ 	fi
+@@ -26914,7 +26973,7 @@
+ 
+ 	if test "$cf_with_ada" != "no" ; then
+ 		if test "$with_libtool" != "no"; then
+-			{ echo "$as_me:26917: WARNING: libtool does not support Ada - disabling feature" >&5
++			{ echo "$as_me:26976: 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
+@@ -26931,7 +26990,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:26934: checking for $ac_word" >&5
++echo "$as_me:26993: 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
+@@ -26948,7 +27007,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:26951: found $ac_dir/$ac_word" >&5
++   echo "$as_me:27010: found $ac_dir/$ac_word" >&5
+    break
+ fi
+ done
+@@ -26960,10 +27019,10 @@
+ cf_TEMP_gnat=$ac_cv_path_cf_TEMP_gnat
+ 
+ if test -n "$cf_TEMP_gnat"; then
+-  echo "$as_me:26963: result: $cf_TEMP_gnat" >&5
++  echo "$as_me:27022: result: $cf_TEMP_gnat" >&5
+ echo "${ECHO_T}$cf_TEMP_gnat" >&6
+ else
+-  echo "$as_me:26966: result: no" >&5
++  echo "$as_me:27025: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -26973,7 +27032,7 @@
+ 		unset cf_cv_gnat_version
+ 		unset cf_TEMP_gnat
+ 
+-echo "$as_me:26976: checking for $cf_prog_gnat version" >&5
++echo "$as_me:27035: 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
+@@ -26984,7 +27043,7 @@
+ 	sed -e '2,$d' -e 's/[^0-9 \.]//g' -e 's/^[ ]*//' -e 's/ .*//'`
+ 
+ fi
+-echo "$as_me:26987: result: $cf_cv_gnat_version" >&5
++echo "$as_me:27046: 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
+@@ -27013,7 +27072,7 @@
+ 			cd conftest.src
+ 			for cf_gprconfig in Ada C
+ 			do
+-				echo "$as_me:27016: checking for gprconfig name for $cf_gprconfig" >&5
++				echo "$as_me:27075: 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
+@@ -27032,10 +27091,10 @@
+ 				if test -n "$cf_gprconfig_value"
+ 				then
+ 					eval "cf_ada_config_$cf_gprconfig=$cf_gprconfig_value"
+-					echo "$as_me:27035: result: $cf_gprconfig_value" >&5
++					echo "$as_me:27094: result: $cf_gprconfig_value" >&5
+ echo "${ECHO_T}$cf_gprconfig_value" >&6
+ 				else
+-					echo "$as_me:27038: result: missing" >&5
++					echo "$as_me:27097: result: missing" >&5
+ echo "${ECHO_T}missing" >&6
+ 					cf_ada_config="#"
+ 					break
+@@ -27048,7 +27107,7 @@
+ 	if test "x$cf_ada_config" != "x#"
+ 	then
+ 
+-echo "$as_me:27051: checking for gnat version" >&5
++echo "$as_me:27110: 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
+@@ -27059,7 +27118,7 @@
+ 	sed -e '2,$d' -e 's/[^0-9 \.]//g' -e 's/^[ ]*//' -e 's/ .*//'`
+ 
+ fi
+-echo "$as_me:27062: result: $cf_cv_gnat_version" >&5
++echo "$as_me:27121: 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
+ 
+@@ -27068,7 +27127,7 @@
+ 	cf_cv_prog_gnat_correct=yes
+ 	;;
+ (*)
+-	{ echo "$as_me:27071: WARNING: Unsupported GNAT version $cf_cv_gnat_version. We require 3.11 or better. Disabling Ada95 binding." >&5
++	{ echo "$as_me:27130: 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
+ 	;;
+@@ -27076,7 +27135,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:27079: checking for $ac_word" >&5
++echo "$as_me:27138: 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
+@@ -27091,7 +27150,7 @@
+   test -z "$ac_dir" && ac_dir=.
+   $as_executable_p "$ac_dir/$ac_word" || continue
+ ac_cv_prog_M4_exists="yes"
+-echo "$as_me:27094: found $ac_dir/$ac_word" >&5
++echo "$as_me:27153: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -27100,20 +27159,20 @@
+ fi
+ M4_exists=$ac_cv_prog_M4_exists
+ if test -n "$M4_exists"; then
+-  echo "$as_me:27103: result: $M4_exists" >&5
++  echo "$as_me:27162: result: $M4_exists" >&5
+ echo "${ECHO_T}$M4_exists" >&6
+ else
+-  echo "$as_me:27106: result: no" >&5
++  echo "$as_me:27165: 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:27112: WARNING: Ada95 binding required program m4 not found. Ada95 binding disabled" >&5
++			{ echo "$as_me:27171: 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:27116: checking if GNAT works" >&5
++			echo "$as_me:27175: checking if GNAT works" >&5
+ echo $ECHO_N "checking if GNAT works... $ECHO_C" >&6
+ 
+ rm -rf ./conftest* ./*~conftest*
+@@ -27141,7 +27200,7 @@
+ fi
+ rm -rf ./conftest* ./*~conftest*
+ 
+-			echo "$as_me:27144: result: $cf_cv_prog_gnat_correct" >&5
++			echo "$as_me:27203: result: $cf_cv_prog_gnat_correct" >&5
+ echo "${ECHO_T}$cf_cv_prog_gnat_correct" >&6
+ 		fi
+ 	else
+@@ -27153,7 +27212,7 @@
+ 
+  	ADAFLAGS="$ADAFLAGS -gnatpn"
+ 
+-	echo "$as_me:27156: checking optimization options for ADAFLAGS" >&5
++	echo "$as_me:27215: checking optimization options for ADAFLAGS" >&5
+ echo $ECHO_N "checking optimization options for ADAFLAGS... $ECHO_C" >&6
+ 	case "$CFLAGS" in
+ 	(*-g*)
+@@ -27170,10 +27229,10 @@
+ 
+ 		;;
+ 	esac
+-	echo "$as_me:27173: result: $ADAFLAGS" >&5
++	echo "$as_me:27232: result: $ADAFLAGS" >&5
+ echo "${ECHO_T}$ADAFLAGS" >&6
+ 
+-echo "$as_me:27176: checking if GNATPREP supports -T option" >&5
++echo "$as_me:27235: 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
+@@ -27183,11 +27242,11 @@
+ gnatprep -T 2>/dev/null >/dev/null && cf_cv_gnatprep_opt_t=yes
+ 
+ fi
+-echo "$as_me:27186: result: $cf_cv_gnatprep_opt_t" >&5
++echo "$as_me:27245: 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:27190: checking if GNAT supports generics" >&5
++echo "$as_me:27249: 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])
+@@ -27197,7 +27256,7 @@
+ 	cf_gnat_generics=no
+ 	;;
+ esac
+-echo "$as_me:27200: result: $cf_gnat_generics" >&5
++echo "$as_me:27259: result: $cf_gnat_generics" >&5
+ echo "${ECHO_T}$cf_gnat_generics" >&6
+ 
+ if test "$cf_gnat_generics" = yes
+@@ -27209,7 +27268,7 @@
+ 	cf_generic_objects=
+ fi
+ 
+-echo "$as_me:27212: checking if GNAT supports SIGINT" >&5
++echo "$as_me:27271: 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
+@@ -27257,7 +27316,7 @@
+ rm -rf ./conftest* ./*~conftest*
+ 
+ fi
+-echo "$as_me:27260: result: $cf_cv_gnat_sigint" >&5
++echo "$as_me:27319: result: $cf_cv_gnat_sigint" >&5
+ echo "${ECHO_T}$cf_cv_gnat_sigint" >&6
+ 
+ if test "$cf_cv_gnat_sigint" = yes ; then
+@@ -27270,7 +27329,7 @@
+ cf_gnat_projects=no
+ 
+ if test "$enable_gnat_projects" != no ; then
+-echo "$as_me:27273: checking if GNAT supports project files" >&5
++echo "$as_me:27332: 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]*)
+@@ -27333,15 +27392,15 @@
+ 	esac
+ 	;;
+ esac
+-echo "$as_me:27336: result: $cf_gnat_projects" >&5
++echo "$as_me:27395: 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:27342: checking if GNAT supports libraries" >&5
++	echo "$as_me:27401: checking if GNAT supports libraries" >&5
+ echo $ECHO_N "checking if GNAT supports libraries... $ECHO_C" >&6
+-	echo "$as_me:27344: result: $cf_gnat_libraries" >&5
++	echo "$as_me:27403: result: $cf_gnat_libraries" >&5
+ echo "${ECHO_T}$cf_gnat_libraries" >&6
+ fi
+ 
+@@ -27361,7 +27420,7 @@
+ 	then
+ 		USE_GNAT_MAKE_GPR=""
+ 	else
+-		{ echo "$as_me:27364: WARNING: use old makefile rules since tools are missing" >&5
++		{ echo "$as_me:27423: 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
+@@ -27373,7 +27432,7 @@
+ 	USE_GNAT_LIBRARIES="#"
+ fi
+ 
+-echo "$as_me:27376: checking for ada-compiler" >&5
++echo "$as_me:27435: checking for ada-compiler" >&5
+ echo $ECHO_N "checking for ada-compiler... $ECHO_C" >&6
+ 
+ # Check whether --with-ada-compiler or --without-ada-compiler was given.
+@@ -27384,12 +27443,12 @@
+   cf_ada_compiler=gnatmake
+ fi;
+ 
+-echo "$as_me:27387: result: $cf_ada_compiler" >&5
++echo "$as_me:27446: result: $cf_ada_compiler" >&5
+ echo "${ECHO_T}$cf_ada_compiler" >&6
+ 
+ 			cf_ada_package=terminal_interface
+ 
+-echo "$as_me:27392: checking for ada-include" >&5
++echo "$as_me:27451: checking for ada-include" >&5
+ echo $ECHO_N "checking for ada-include... $ECHO_C" >&6
+ 
+ # Check whether --with-ada-include or --without-ada-include was given.
+@@ -27425,7 +27484,7 @@
+ 	withval=`echo "$withval" | sed -e s%NONE%$cf_path_syntax%`
+ 	;;
+ (*)
+-	{ { echo "$as_me:27428: error: expected a pathname, not \"$withval\"" >&5
++	{ { echo "$as_me:27487: error: expected a pathname, not \"$withval\"" >&5
+ echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
+    { (exit 1); exit 1; }; }
+ 	;;
+@@ -27434,10 +27493,10 @@
+ fi
+ eval ADA_INCLUDE="$withval"
+ 
+-echo "$as_me:27437: result: $ADA_INCLUDE" >&5
++echo "$as_me:27496: result: $ADA_INCLUDE" >&5
+ echo "${ECHO_T}$ADA_INCLUDE" >&6
+ 
+-echo "$as_me:27440: checking for ada-objects" >&5
++echo "$as_me:27499: checking for ada-objects" >&5
+ echo $ECHO_N "checking for ada-objects... $ECHO_C" >&6
+ 
+ # Check whether --with-ada-objects or --without-ada-objects was given.
+@@ -27473,7 +27532,7 @@
+ 	withval=`echo "$withval" | sed -e s%NONE%$cf_path_syntax%`
+ 	;;
+ (*)
+-	{ { echo "$as_me:27476: error: expected a pathname, not \"$withval\"" >&5
++	{ { echo "$as_me:27535: error: expected a pathname, not \"$withval\"" >&5
+ echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
+    { (exit 1); exit 1; }; }
+ 	;;
+@@ -27482,10 +27541,10 @@
+ fi
+ eval ADA_OBJECTS="$withval"
+ 
+-echo "$as_me:27485: result: $ADA_OBJECTS" >&5
++echo "$as_me:27544: result: $ADA_OBJECTS" >&5
+ echo "${ECHO_T}$ADA_OBJECTS" >&6
+ 
+-echo "$as_me:27488: checking if an Ada95 shared-library should be built" >&5
++echo "$as_me:27547: checking if an Ada95 shared-library should be built" >&5
+ echo $ECHO_N "checking if an Ada95 shared-library should be built... $ECHO_C" >&6
+ 
+ # Check whether --with-ada-sharedlib or --without-ada-sharedlib was given.
+@@ -27495,14 +27554,14 @@
+ else
+   with_ada_sharedlib=no
+ fi;
+-echo "$as_me:27498: result: $with_ada_sharedlib" >&5
++echo "$as_me:27557: result: $with_ada_sharedlib" >&5
+ echo "${ECHO_T}$with_ada_sharedlib" >&6
+ 
+ if test "x$with_ada_sharedlib" != xno
+ then
+ 	if test "x$cf_gnat_projects" != xyes
+ 	then
+-		{ echo "$as_me:27505: WARNING: disabling shared-library since GNAT projects are not supported" >&5
++		{ echo "$as_me:27564: WARNING: disabling shared-library since GNAT projects are not supported" >&5
+ echo "$as_me: WARNING: disabling shared-library since GNAT projects are not supported" >&2;}
+ 		with_ada_sharedlib=no
+ 	fi
+@@ -27522,7 +27581,7 @@
+ 
+ 			# allow the Ada binding to be renamed
+ 
+-echo "$as_me:27525: checking for ada-libname" >&5
++echo "$as_me:27584: checking for ada-libname" >&5
+ echo $ECHO_N "checking for ada-libname... $ECHO_C" >&6
+ 
+ # Check whether --with-ada-libname or --without-ada-libname was given.
+@@ -27538,7 +27597,7 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:27541: result: $ADA_LIBNAME" >&5
++echo "$as_me:27600: result: $ADA_LIBNAME" >&5
+ echo "${ECHO_T}$ADA_LIBNAME" >&6
+ 
+ 		fi
+@@ -27549,13 +27608,13 @@
+ 
+ # do this "late" to avoid conflict with header-checks
+ if test "x$with_widec" = xyes ; then
+-	echo "$as_me:27552: checking for wchar_t" >&5
++	echo "$as_me:27611: 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 27558 "configure"
++#line 27617 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -27570,16 +27629,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:27573: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:27632: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:27576: \$? = $ac_status" >&5
++  echo "$as_me:27635: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:27579: \"$ac_try\"") >&5
++  { (eval echo "$as_me:27638: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:27582: \$? = $ac_status" >&5
++  echo "$as_me:27641: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_type_wchar_t=yes
+ else
+@@ -27589,10 +27648,10 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:27592: result: $ac_cv_type_wchar_t" >&5
++echo "$as_me:27651: result: $ac_cv_type_wchar_t" >&5
+ echo "${ECHO_T}$ac_cv_type_wchar_t" >&6
+ 
+-echo "$as_me:27595: checking size of wchar_t" >&5
++echo "$as_me:27654: 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
+@@ -27601,7 +27660,7 @@
+   if test "$cross_compiling" = yes; then
+   # Depending upon the size, compute the lo and hi bounds.
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 27604 "configure"
++#line 27663 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -27613,21 +27672,21 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:27616: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:27675: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:27619: \$? = $ac_status" >&5
++  echo "$as_me:27678: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:27622: \"$ac_try\"") >&5
++  { (eval echo "$as_me:27681: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:27625: \$? = $ac_status" >&5
++  echo "$as_me:27684: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_lo=0 ac_mid=0
+   while :; do
+     cat >"conftest.$ac_ext" <<_ACEOF
+-#line 27630 "configure"
++#line 27689 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -27639,16 +27698,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:27642: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:27701: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:27645: \$? = $ac_status" >&5
++  echo "$as_me:27704: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:27648: \"$ac_try\"") >&5
++  { (eval echo "$as_me:27707: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:27651: \$? = $ac_status" >&5
++  echo "$as_me:27710: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_hi=$ac_mid; break
+ else
+@@ -27664,7 +27723,7 @@
+ ac_hi=-1 ac_mid=-1
+   while :; do
+     cat >"conftest.$ac_ext" <<_ACEOF
+-#line 27667 "configure"
++#line 27726 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -27676,16 +27735,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:27679: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:27738: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:27682: \$? = $ac_status" >&5
++  echo "$as_me:27741: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:27685: \"$ac_try\"") >&5
++  { (eval echo "$as_me:27744: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:27688: \$? = $ac_status" >&5
++  echo "$as_me:27747: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_lo=$ac_mid; break
+ else
+@@ -27701,7 +27760,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 27704 "configure"
++#line 27763 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -27713,16 +27772,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:27716: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:27775: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:27719: \$? = $ac_status" >&5
++  echo "$as_me:27778: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:27722: \"$ac_try\"") >&5
++  { (eval echo "$as_me:27781: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:27725: \$? = $ac_status" >&5
++  echo "$as_me:27784: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_hi=$ac_mid
+ else
+@@ -27735,12 +27794,12 @@
+ ac_cv_sizeof_wchar_t=$ac_lo
+ else
+   if test "$cross_compiling" = yes; then
+-  { { echo "$as_me:27738: error: cannot run test program while cross compiling" >&5
++  { { echo "$as_me:27797: 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 27743 "configure"
++#line 27802 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -27756,15 +27815,15 @@
+ }
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:27759: \"$ac_link\"") >&5
++if { (eval echo "$as_me:27818: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:27762: \$? = $ac_status" >&5
++  echo "$as_me:27821: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:27764: \"$ac_try\"") >&5
++  { (eval echo "$as_me:27823: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:27767: \$? = $ac_status" >&5
++  echo "$as_me:27826: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_sizeof_wchar_t=`cat conftest.val`
+ else
+@@ -27780,7 +27839,7 @@
+   ac_cv_sizeof_wchar_t=0
+ fi
+ fi
+-echo "$as_me:27783: result: $ac_cv_sizeof_wchar_t" >&5
++echo "$as_me:27842: 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
+@@ -27793,7 +27852,7 @@
+ 	then
+ 		test -n "$verbose" && echo "	test failed (assume 2)" 1>&6
+ 
+-echo "${as_me:-configure}:27796: testing test failed (assume 2) ..." 1>&5
++echo "${as_me:-configure}:27855: testing test failed (assume 2) ..." 1>&5
+ 
+ 		sed /SIZEOF_WCHAR_T/d confdefs.h >confdefs.tmp
+ 		mv confdefs.tmp confdefs.h
+@@ -27811,7 +27870,7 @@
+ ### chooses to split module lists into libraries.
+ ###
+ ### (see CF_LIB_RULES).
+-echo "$as_me:27814: checking for library subsets" >&5
++echo "$as_me:27873: checking for library subsets" >&5
+ echo $ECHO_N "checking for library subsets... $ECHO_C" >&6
+ LIB_SUBSETS=
+ 
+@@ -27865,7 +27924,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:27868: result: $LIB_SUBSETS" >&5
++echo "$as_me:27927: result: $LIB_SUBSETS" >&5
+ echo "${ECHO_T}$LIB_SUBSETS" >&6
+ 
+ ### Construct the list of include-directories to be generated
+@@ -27896,7 +27955,7 @@
+ fi
+ 
+ ### Build up pieces for makefile rules
+-echo "$as_me:27899: checking default library suffix" >&5
++echo "$as_me:27958: checking default library suffix" >&5
+ echo $ECHO_N "checking default library suffix... $ECHO_C" >&6
+ 
+ 	case $DFT_LWR_MODEL in
+@@ -27907,10 +27966,10 @@
+ 	(shared)  DFT_ARG_SUFFIX=''   ;;
+ 	esac
+ 	test -n "$LIB_SUFFIX" && DFT_ARG_SUFFIX="${LIB_SUFFIX}${DFT_ARG_SUFFIX}"
+-echo "$as_me:27910: result: $DFT_ARG_SUFFIX" >&5
++echo "$as_me:27969: result: $DFT_ARG_SUFFIX" >&5
+ echo "${ECHO_T}$DFT_ARG_SUFFIX" >&6
+ 
+-echo "$as_me:27913: checking default library-dependency suffix" >&5
++echo "$as_me:27972: checking default library-dependency suffix" >&5
+ echo $ECHO_N "checking default library-dependency suffix... $ECHO_C" >&6
+ 
+ 	case X$DFT_LWR_MODEL in
+@@ -27993,10 +28052,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:27996: result: $DFT_DEP_SUFFIX" >&5
++echo "$as_me:28055: result: $DFT_DEP_SUFFIX" >&5
+ echo "${ECHO_T}$DFT_DEP_SUFFIX" >&6
+ 
+-echo "$as_me:27999: checking default object directory" >&5
++echo "$as_me:28058: checking default object directory" >&5
+ echo $ECHO_N "checking default object directory... $ECHO_C" >&6
+ 
+ 	case $DFT_LWR_MODEL in
+@@ -28012,11 +28071,11 @@
+ 			DFT_OBJ_SUBDIR='obj_s' ;;
+ 		esac
+ 	esac
+-echo "$as_me:28015: result: $DFT_OBJ_SUBDIR" >&5
++echo "$as_me:28074: result: $DFT_OBJ_SUBDIR" >&5
+ echo "${ECHO_T}$DFT_OBJ_SUBDIR" >&6
+ 
+ if test "x$cf_with_cxx" = xyes ; then
+-echo "$as_me:28019: checking c++ library-dependency suffix" >&5
++echo "$as_me:28078: 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++)
+@@ -28109,7 +28168,7 @@
+ 	fi
+ 
+ fi
+-echo "$as_me:28112: result: $CXX_LIB_SUFFIX" >&5
++echo "$as_me:28171: result: $CXX_LIB_SUFFIX" >&5
+ echo "${ECHO_T}$CXX_LIB_SUFFIX" >&6
+ 
+ fi
+@@ -28285,19 +28344,19 @@
+ 
+ if test -n "$LDFLAGS_STATIC" && test -n "$LDFLAGS_SHARED"
+ then
+-	echo "$as_me:28288: checking if linker supports switching between static/dynamic" >&5
++	echo "$as_me:28347: 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 28293 "configure"
++#line 28352 "configure"
+ #include <stdio.h>
+ int cf_ldflags_static(FILE *fp) { return fflush(fp); }
+ EOF
+-	if { (eval echo "$as_me:28297: \"$ac_compile\"") >&5
++	if { (eval echo "$as_me:28356: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:28300: \$? = $ac_status" >&5
++  echo "$as_me:28359: \$? = $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
+@@ -28308,10 +28367,10 @@
+ 
+ 	LIBS="$LDFLAGS_STATIC -L`pwd` -lconftest $LDFLAGS_DYNAMIC $LIBS"
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 28311 "configure"
++#line 28370 "configure"
+ #include "confdefs.h"
+ 
+-#line 28314 "configure"
++#line 28373 "configure"
+ #include <stdio.h>
+ int cf_ldflags_static(FILE *fp);
+ 
+@@ -28326,16 +28385,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:28329: \"$ac_link\"") >&5
++if { (eval echo "$as_me:28388: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:28332: \$? = $ac_status" >&5
++  echo "$as_me:28391: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:28335: \"$ac_try\"") >&5
++  { (eval echo "$as_me:28394: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:28338: \$? = $ac_status" >&5
++  echo "$as_me:28397: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+ 
+ 	# some linkers simply ignore the -dynamic
+@@ -28358,7 +28417,7 @@
+ 	rm -f libconftest.*
+ 	LIBS="$cf_save_LIBS"
+ 
+-	echo "$as_me:28361: result: $cf_ldflags_static" >&5
++	echo "$as_me:28420: result: $cf_ldflags_static" >&5
+ echo "${ECHO_T}$cf_ldflags_static" >&6
+ 
+ 	if test "$cf_ldflags_static" != yes
+@@ -28374,7 +28433,7 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:28377: checking where we will install curses.h" >&5
++echo "$as_me:28436: checking where we will install curses.h" >&5
+ echo $ECHO_N "checking where we will install curses.h... $ECHO_C" >&6
+ 
+ includesubdir=
+@@ -28384,7 +28443,7 @@
+ then
+ 	includesubdir="/ncurses${USE_LIB_SUFFIX}"
+ fi
+-echo "$as_me:28387: result: ${includedir}${includesubdir}" >&5
++echo "$as_me:28446: result: ${includedir}${includesubdir}" >&5
+ echo "${ECHO_T}${includedir}${includesubdir}" >&6
+ 
+ ### Resolve a conflict between normal and wide-curses by forcing applications
+@@ -28392,7 +28451,7 @@
+ if test "$with_overwrite" != no ; then
+ if test "$NCURSES_LIBUTF8" = 1 ; then
+ 	NCURSES_LIBUTF8='defined(HAVE_LIBUTF8_H)'
+-	{ echo "$as_me:28395: WARNING: Wide-character applications must define HAVE_LIBUTF8_H to include curses.h" >&5
++	{ echo "$as_me:28454: 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
+@@ -28420,7 +28479,7 @@
+ 
+ # pkgsrc uses these
+ 
+-echo "$as_me:28423: checking for desired basename for form library" >&5
++echo "$as_me:28482: 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.
+@@ -28440,10 +28499,10 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:28443: result: $FORM_NAME" >&5
++echo "$as_me:28502: result: $FORM_NAME" >&5
+ echo "${ECHO_T}$FORM_NAME" >&6
+ 
+-echo "$as_me:28446: checking for desired basename for menu library" >&5
++echo "$as_me:28505: 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.
+@@ -28463,10 +28522,10 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:28466: result: $MENU_NAME" >&5
++echo "$as_me:28525: result: $MENU_NAME" >&5
+ echo "${ECHO_T}$MENU_NAME" >&6
+ 
+-echo "$as_me:28469: checking for desired basename for panel library" >&5
++echo "$as_me:28528: 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.
+@@ -28486,10 +28545,10 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:28489: result: $PANEL_NAME" >&5
++echo "$as_me:28548: result: $PANEL_NAME" >&5
+ echo "${ECHO_T}$PANEL_NAME" >&6
+ 
+-echo "$as_me:28492: checking for desired basename for cxx library" >&5
++echo "$as_me:28551: 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.
+@@ -28509,13 +28568,13 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:28512: result: $CXX_NAME" >&5
++echo "$as_me:28571: 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:28518: checking for src modules" >&5
++echo "$as_me:28577: checking for src modules" >&5
+ echo $ECHO_N "checking for src modules... $ECHO_C" >&6
+ 
+ # dependencies and linker-arguments for test-programs
+@@ -28584,7 +28643,7 @@
+ 		fi
+ 	fi
+ done
+-echo "$as_me:28587: result: $cf_cv_src_modules" >&5
++echo "$as_me:28646: result: $cf_cv_src_modules" >&5
+ echo "${ECHO_T}$cf_cv_src_modules" >&6
+ 
+ TEST_ARGS="-L${LIB_DIR} $TEST_ARGS"
+@@ -28745,7 +28804,7 @@
+ 	(*-D_XOPEN_SOURCE_EXTENDED*)
+ 		test -n "$verbose" && echo "	moving _XOPEN_SOURCE_EXTENDED to work around g++ problem" 1>&6
+ 
+-echo "${as_me:-configure}:28748: testing moving _XOPEN_SOURCE_EXTENDED to work around g++ problem ..." 1>&5
++echo "${as_me:-configure}:28807: 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//'`
+@@ -28756,7 +28815,7 @@
+ 
+ # Help to automatically enable the extended curses features when using either
+ # the *-config or the ".pc" files by adding defines.
+-echo "$as_me:28759: checking for defines to add to ncurses${USE_CFG_SUFFIX}-config script" >&5
++echo "$as_me:28818: checking for defines to add to ncurses${USE_CFG_SUFFIX}-config script" >&5
+ echo $ECHO_N "checking for defines to add to ncurses${USE_CFG_SUFFIX}-config script... $ECHO_C" >&6
+ PKG_CFLAGS=
+ for cf_loop1 in $CPPFLAGS_after_XOPEN
+@@ -28772,7 +28831,7 @@
+ 	done
+ 	test "$cf_found" = no && PKG_CFLAGS="$PKG_CFLAGS $cf_loop1"
+ done
+-echo "$as_me:28775: result: $PKG_CFLAGS" >&5
++echo "$as_me:28834: result: $PKG_CFLAGS" >&5
+ echo "${ECHO_T}$PKG_CFLAGS" >&6
+ 
+ # AC_CHECK_SIZEOF demands a literal parameter, no variables.  So we do this.
+@@ -28833,7 +28892,7 @@
+ 	cf_filter_syms=$cf_dft_filter_syms
+ 	test -n "$verbose" && echo "	will map symbols to ABI=$cf_cv_abi_version" 1>&6
+ 
+-echo "${as_me:-configure}:28836: testing will map symbols to ABI=$cf_cv_abi_version ..." 1>&5
++echo "${as_me:-configure}:28895: testing will map symbols to ABI=$cf_cv_abi_version ..." 1>&5
+ 
+ fi
+ 
+@@ -28860,7 +28919,7 @@
+ 
+ # This is used for the *-config script and *.pc data files.
+ 
+-echo "$as_me:28863: checking for linker search path" >&5
++echo "$as_me:28922: 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
+@@ -28908,7 +28967,7 @@
+ 			cf_pathlist="$cf_pathlist /lib /usr/lib"
+ 			;;
+ 		(*)
+-			{ echo "$as_me:28911: WARNING: problem with Solaris architecture" >&5
++			{ echo "$as_me:28970: WARNING: problem with Solaris architecture" >&5
+ echo "$as_me: WARNING: problem with Solaris architecture" >&2;}
+ 			;;
+ 		esac
+@@ -28949,7 +29008,7 @@
+ test -z "$cf_cv_ld_searchpath" && cf_cv_ld_searchpath=/usr/lib
+ 
+ fi
+-echo "$as_me:28952: result: $cf_cv_ld_searchpath" >&5
++echo "$as_me:29011: 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'`
+@@ -29039,7 +29098,7 @@
+ : "${CONFIG_STATUS=./config.status}"
+ ac_clean_files_save=$ac_clean_files
+ ac_clean_files="$ac_clean_files $CONFIG_STATUS"
+-{ echo "$as_me:29042: creating $CONFIG_STATUS" >&5
++{ echo "$as_me:29101: creating $CONFIG_STATUS" >&5
+ echo "$as_me: creating $CONFIG_STATUS" >&6;}
+ cat >"$CONFIG_STATUS" <<_ACEOF
+ #! $SHELL
+@@ -29218,7 +29277,7 @@
+     echo "$ac_cs_version"; exit 0 ;;
+   --he | --h)
+     # Conflict between --help and --header
+-    { { echo "$as_me:29221: error: ambiguous option: $1
++    { { echo "$as_me:29280: 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;}
+@@ -29237,7 +29296,7 @@
+     ac_need_defaults=false;;
+ 
+   # This is an error.
+-  -*) { { echo "$as_me:29240: error: unrecognized option: $1
++  -*) { { echo "$as_me:29299: 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;}
+@@ -29363,7 +29422,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:29366: error: invalid argument: $ac_config_target" >&5
++  *) { { echo "$as_me:29425: error: invalid argument: $ac_config_target" >&5
+ echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
+    { (exit 1); exit 1; }; };;
+   esac
+@@ -29875,7 +29934,7 @@
+   esac
+ 
+   if test x"$ac_file" != x-; then
+-    { echo "$as_me:29878: creating $ac_file" >&5
++    { echo "$as_me:29937: creating $ac_file" >&5
+ echo "$as_me: creating $ac_file" >&6;}
+     rm -f "$ac_file"
+   fi
+@@ -29893,7 +29952,7 @@
+       -) echo $tmp/stdin ;;
+       [\\/$]*)
+          # Absolute (can't be DOS-style, as IFS=:)
+-         test -f "$f" || { { echo "$as_me:29896: error: cannot find input file: $f" >&5
++         test -f "$f" || { { echo "$as_me:29955: error: cannot find input file: $f" >&5
+ echo "$as_me: error: cannot find input file: $f" >&2;}
+    { (exit 1); exit 1; }; }
+          echo $f;;
+@@ -29906,7 +29965,7 @@
+            echo "$srcdir/$f"
+          else
+            # /dev/null tree
+-           { { echo "$as_me:29909: error: cannot find input file: $f" >&5
++           { { echo "$as_me:29968: error: cannot find input file: $f" >&5
+ echo "$as_me: error: cannot find input file: $f" >&2;}
+    { (exit 1); exit 1; }; }
+          fi;;
+@@ -29922,7 +29981,7 @@
+       if test -n "$ac_seen"; then
+         ac_used=`grep '@datarootdir@' "$ac_item"`
+         if test -z "$ac_used"; then
+-          { echo "$as_me:29925: WARNING: datarootdir was used implicitly but not set:
++          { echo "$as_me:29984: 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;}
+@@ -29931,7 +29990,7 @@
+       fi
+       ac_seen=`grep '${datarootdir}' "$ac_item"`
+       if test -n "$ac_seen"; then
+-        { echo "$as_me:29934: WARNING: datarootdir was used explicitly but not set:
++        { echo "$as_me:29993: 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;}
+@@ -29968,7 +30027,7 @@
+             ac_init=`${EGREP-egrep} '[ 	]*'$ac_name'[ 	]*=' "$ac_file"`
+             if test -z "$ac_init"; then
+               ac_seen=`echo "$ac_seen" |sed -e 's,^,'$ac_file':,'`
+-              { echo "$as_me:29971: WARNING: Variable $ac_name is used but was not set:
++              { echo "$as_me:30030: 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;}
+@@ -29979,7 +30038,7 @@
+     ${EGREP-egrep} -n '@[A-Z_][A-Z_0-9]+@' "$ac_file" >>$tmp/out
+     if test -s $tmp/out; then
+       ac_seen=`sed -e 's,^,'$ac_file':,' < $tmp/out`
+-      { echo "$as_me:29982: WARNING: Some variables may not be substituted:
++      { echo "$as_me:30041: WARNING: Some variables may not be substituted:
+ $ac_seen" >&5
+ echo "$as_me: WARNING: Some variables may not be substituted:
+ $ac_seen" >&2;}
+@@ -30028,7 +30087,7 @@
+   * )   ac_file_in=$ac_file.in ;;
+   esac
+ 
+-  test x"$ac_file" != x- && { echo "$as_me:30031: creating $ac_file" >&5
++  test x"$ac_file" != x- && { echo "$as_me:30090: creating $ac_file" >&5
+ echo "$as_me: creating $ac_file" >&6;}
+ 
+   # First look for the input files in the build tree, otherwise in the
+@@ -30039,7 +30098,7 @@
+       -) echo $tmp/stdin ;;
+       [\\/$]*)
+          # Absolute (can't be DOS-style, as IFS=:)
+-         test -f "$f" || { { echo "$as_me:30042: error: cannot find input file: $f" >&5
++         test -f "$f" || { { echo "$as_me:30101: error: cannot find input file: $f" >&5
+ echo "$as_me: error: cannot find input file: $f" >&2;}
+    { (exit 1); exit 1; }; }
+          echo $f;;
+@@ -30052,7 +30111,7 @@
+            echo "$srcdir/$f"
+          else
+            # /dev/null tree
+-           { { echo "$as_me:30055: error: cannot find input file: $f" >&5
++           { { echo "$as_me:30114: error: cannot find input file: $f" >&5
+ echo "$as_me: error: cannot find input file: $f" >&2;}
+    { (exit 1); exit 1; }; }
+          fi;;
+@@ -30110,7 +30169,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:30113: $ac_file is unchanged" >&5
++      { echo "$as_me:30172: $ac_file is unchanged" >&5
+ echo "$as_me: $ac_file is unchanged" >&6;}
+     else
+       ac_dir=`$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+@@ -30497,7 +30556,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}:30500: testing overriding CXX_MODEL to SHARED ..." 1>&5
++echo "${as_me:-configure}:30559: testing overriding CXX_MODEL to SHARED ..." 1>&5
+ 
+ 					with_shared_cxx=yes
+ 					;;
+Index: configure.in
+Prereq:  1.738 
+--- ncurses-6.3-20220115+/configure.in	2021-12-04 23:10:01.000000000 +0000
++++ ncurses-6.3-20220122/configure.in	2022-01-23 00:11:08.000000000 +0000
+@@ -1,5 +1,5 @@
+ dnl***************************************************************************
+-dnl Copyright 2018-2020,2021 Thomas E. Dickey                                *
++dnl Copyright 2018-2021,2022 Thomas E. Dickey                                *
+ dnl Copyright 1998-2017,2018 Free Software Foundation, Inc.                  *
+ dnl                                                                          *
+ dnl Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -29,7 +29,7 @@
+ dnl
+ dnl Author: Thomas E. Dickey 1995-on
+ dnl
+-dnl $Id: configure.in,v 1.738 2021/12/04 23:10:01 tom Exp $
++dnl $Id: configure.in,v 1.741 2022/01/23 00:11:08 tom Exp $
+ dnl Process this file with autoconf to produce a configure script.
+ dnl
+ dnl For additional information, see
+@@ -38,7 +38,7 @@
+ dnl
+ dnl ---------------------------------------------------------------------------
+ AC_PREREQ(2.52.20210101)
+-AC_REVISION($Revision: 1.738 $)
++AC_REVISION($Revision: 1.741 $)
+ AC_INIT(ncurses/base/lib_initscr.c)
+ AC_CONFIG_HEADER(include/ncurses_cfg.h:include/ncurses_cfg.hin)
+ 
+@@ -1050,7 +1050,11 @@
+ 	[  --with-caps=alt         compile with alternate Caps file],
+ 	[TERMINFO_CAPS=Caps.$withval],
+ 	[TERMINFO_CAPS=Caps])
+-test -f "${srcdir}/include/${TERMINFO_CAPS}" || TERMINFO_CAPS=Caps
++if test ! -f "${srcdir}/include/${TERMINFO_CAPS}"
++then
++	AC_MSG_WARN(file not found: "${srcdir}/include/${TERMINFO_CAPS}")
++	TERMINFO_CAPS=Caps
++fi
+ AC_MSG_RESULT($TERMINFO_CAPS)
+ AC_SUBST(TERMINFO_CAPS)
+ 
+@@ -1084,7 +1088,7 @@
+ AC_ARG_WITH(ccharw-max,
+ 	[  --with-ccharw-max=XXX   override size CCHARW_MAX],
+ 	[NCURSES_CCHARW_MAX="$withval"],
+-	[NCURSES_CCHARW_MAX=5])
++	[NCURSES_CCHARW_MAX=$cf_dft_ccharw_max])
+ AC_MSG_RESULT($NCURSES_CCHARW_MAX)
+ AC_SUBST(NCURSES_CCHARW_MAX)
+ 
+@@ -1098,7 +1102,7 @@
+ AC_ARG_ENABLE(signed-char,
+ 	[  --enable-signed-char    compile using signed Boolean's in term.h],
+ 	[with_signed_char=$enableval],
+-	[with_signed_char=no])
++	[with_signed_char=$cf_dft_signed_char])
+ AC_MSG_RESULT($with_signed_char)
+ test "x$with_signed_char" != xyes && NCURSES_SBOOL="char"
+ AC_SUBST(NCURSES_SBOOL)
+@@ -1234,11 +1238,22 @@
+ 	[with_ext_mouse=$enableval],
+ 	[with_ext_mouse=$cf_dft_ext_mouse])
+ AC_MSG_RESULT($with_ext_mouse)
+-NCURSES_MOUSE_VERSION=1
+ if test "x$with_ext_mouse" = xyes ; then
+-	NCURSES_MOUSE_VERSION=2
+ 	CF_NCURSES_ABI_6
+ fi
++
++case $cf_cv_abi_version in
++(5)
++	NCURSES_MOUSE_VERSION=1
++	;;
++(6)
++	NCURSES_MOUSE_VERSION=2
++	;;
++([789])
++	NCURSES_MOUSE_VERSION=3
++	;;
++esac
++
+ AC_SUBST(NCURSES_MOUSE_VERSION)
+ 
+ ###   use option --enable-ext-putwin to turn on extended screendumps
+@@ -1367,7 +1382,7 @@
+ else
+ 	cf_cv_enable_reentrant=0
+ 	cf_cv_enable_opaque="NCURSES_OPAQUE"
+-	NCURSES_SIZE_T=short
++	NCURSES_SIZE_T=$cf_dft_ordinate_type
+ fi
+ AC_SUBST(cf_cv_enable_reentrant)
+ AC_SUBST(cf_cv_enable_opaque)
+@@ -1379,7 +1394,7 @@
+ 	[  --enable-opaque-curses  make curses WINDOW, etc., "opaque"],
+ 	[enable_opaque_curses=yes],[
+ 	 test "$cf_cv_enable_reentrant" = 1 && enable_opaque_curses=yes
+-	 test "$cf_cv_enable_reentrant" = 1 || enable_opaque_curses=no
++	 test "$cf_cv_enable_reentrant" = 1 || enable_opaque_curses=$cf_dft_opaque_curses
+ 	])
+ AC_MSG_RESULT($enable_opaque_curses)
+ 
+Index: dist.mk
+Prereq:  1.1462 
+--- ncurses-6.3-20220115+/dist.mk	2022-01-15 14:00:23.000000000 +0000
++++ ncurses-6.3-20220122/dist.mk	2022-01-22 15:48:54.000000000 +0000
+@@ -26,7 +26,7 @@
+ # use or other dealings in this Software without prior written               #
+ # authorization.                                                             #
+ ##############################################################################
+-# $Id: dist.mk,v 1.1462 2022/01/15 14:00:23 tom Exp $
++# $Id: dist.mk,v 1.1463 2022/01/22 15:48:54 tom Exp $
+ # Makefile for creating ncurses distributions.
+ #
+ # This only needs to be used directly as a makefile by developers, but
+@@ -38,7 +38,7 @@
+ # These define the major/minor/patch versions of ncurses.
+ NCURSES_MAJOR = 6
+ NCURSES_MINOR = 3
+-NCURSES_PATCH = 20220115
++NCURSES_PATCH = 20220122
+ 
+ # 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.3-20220115+/package/debian-mingw/changelog	2022-01-15 14:00:23.000000000 +0000
++++ ncurses-6.3-20220122/package/debian-mingw/changelog	2022-01-22 15:48:54.000000000 +0000
+@@ -1,8 +1,8 @@
+-ncurses6 (6.3+20220115) unstable; urgency=low
++ncurses6 (6.3+20220122) unstable; urgency=low
+ 
+   * latest weekly patch
+ 
+- -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 15 Jan 2022 09:00:23 -0500
++ -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 22 Jan 2022 10:48:54 -0500
+ 
+ ncurses6 (5.9-20131005) unstable; urgency=low
+ 
+Index: package/debian-mingw64/changelog
+--- ncurses-6.3-20220115+/package/debian-mingw64/changelog	2022-01-15 14:00:23.000000000 +0000
++++ ncurses-6.3-20220122/package/debian-mingw64/changelog	2022-01-22 15:48:54.000000000 +0000
+@@ -1,8 +1,8 @@
+-ncurses6 (6.3+20220115) unstable; urgency=low
++ncurses6 (6.3+20220122) unstable; urgency=low
+ 
+   * latest weekly patch
+ 
+- -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 15 Jan 2022 09:00:23 -0500
++ -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 22 Jan 2022 10:48:54 -0500
+ 
+ ncurses6 (5.9-20131005) unstable; urgency=low
+ 
+Index: package/debian/changelog
+--- ncurses-6.3-20220115+/package/debian/changelog	2022-01-15 14:00:23.000000000 +0000
++++ ncurses-6.3-20220122/package/debian/changelog	2022-01-22 15:48:54.000000000 +0000
+@@ -1,8 +1,8 @@
+-ncurses6 (6.3+20220115) unstable; urgency=low
++ncurses6 (6.3+20220122) unstable; urgency=low
+ 
+   * latest weekly patch
+ 
+- -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 15 Jan 2022 09:00:23 -0500
++ -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 22 Jan 2022 10:48:54 -0500
+ 
+ ncurses6 (5.9-20120608) unstable; urgency=low
+ 
+Index: package/mingw-ncurses.nsi
+Prereq:  1.502 
+--- ncurses-6.3-20220115+/package/mingw-ncurses.nsi	2022-01-15 14:00:23.000000000 +0000
++++ ncurses-6.3-20220122/package/mingw-ncurses.nsi	2022-01-22 15:48:54.000000000 +0000
+@@ -1,4 +1,4 @@
+-; $Id: mingw-ncurses.nsi,v 1.502 2022/01/15 14:00:23 tom Exp $

++; $Id: mingw-ncurses.nsi,v 1.503 2022/01/22 15:48:54 tom Exp $

+ 

+ ; TODO add examples

+ ; TODO bump ABI to 6

+@@ -10,7 +10,7 @@
+ !define VERSION_MAJOR "6"

+ !define VERSION_MINOR "3"

+ !define VERSION_YYYY  "2022"

+-!define VERSION_MMDD  "0115"

++!define VERSION_MMDD  "0122"

+ !define VERSION_PATCH ${VERSION_YYYY}${VERSION_MMDD}

+ 

+ !define MY_ABI   "5"

+Index: package/mingw-ncurses.spec
+--- ncurses-6.3-20220115+/package/mingw-ncurses.spec	2022-01-15 14:00:23.000000000 +0000
++++ ncurses-6.3-20220122/package/mingw-ncurses.spec	2022-01-22 15:48:54.000000000 +0000
+@@ -3,7 +3,7 @@
+ Summary: shared libraries for terminal handling
+ Name: mingw32-ncurses6
+ Version: 6.3
+-Release: 20220115
++Release: 20220122
+ License: X11
+ Group: Development/Libraries
+ Source: ncurses-%{version}-%{release}.tgz
+Index: package/ncurses.spec
+--- ncurses-6.3-20220115+/package/ncurses.spec	2022-01-15 14:00:23.000000000 +0000
++++ ncurses-6.3-20220122/package/ncurses.spec	2022-01-22 15:48:54.000000000 +0000
+@@ -1,7 +1,7 @@
+ Summary: shared libraries for terminal handling
+ Name: ncurses6
+ Version: 6.3
+-Release: 20220115
++Release: 20220122
+ License: X11
+ Group: Development/Libraries
+ Source: ncurses-%{version}-%{release}.tgz
+Index: package/ncursest.spec
+--- ncurses-6.3-20220115+/package/ncursest.spec	2022-01-15 14:00:23.000000000 +0000
++++ ncurses-6.3-20220122/package/ncursest.spec	2022-01-22 15:48:54.000000000 +0000
+@@ -1,7 +1,7 @@
+ Summary: Curses library with POSIX thread support.
+ Name: ncursest6
+ Version: 6.3
+-Release: 20220115
++Release: 20220122
+ License: X11
+ Group: Development/Libraries
+ Source: ncurses-%{version}-%{release}.tgz
+Index: progs/dump_entry.c
+Prereq:  1.189 
+--- ncurses-6.3-20220115+/progs/dump_entry.c	2021-09-04 10:29:59.000000000 +0000
++++ ncurses-6.3-20220122/progs/dump_entry.c	2022-01-22 21:23:58.000000000 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright 2018-2020,2021 Thomas E. Dickey                                *
++ * Copyright 2018-2021,2022 Thomas E. Dickey                                *
+  * Copyright 1998-2016,2017 Free Software Foundation, Inc.                  *
+  *                                                                          *
+  * Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -40,7 +40,7 @@
+ #include <termsort.h>		/* this C file is generated */
+ #include <parametrized.h>	/* so is this */
+ 
+-MODULE_ID("$Id: dump_entry.c,v 1.189 2021/09/04 10:29:59 tom Exp $")
++MODULE_ID("$Id: dump_entry.c,v 1.190 2022/01/22 21:23:58 tom Exp $")
+ 
+ #define DISCARD(string) string = ABSENT_STRING
+ #define PRINTF (void) printf
+@@ -859,7 +859,6 @@
+ 		indent_DYN(&tmpbuf, level + 1);
+ 		strncpy_DYN(&tmpbuf, "%", (size_t) 1);
+ 	    }
+-	    params = FALSE;
+ 	    percent = FALSE;
+ 	    break;
+ 	case ' ':
+Index: test/aclocal.m4
+Prereq:  1.202 
+--- ncurses-6.3-20220115+/test/aclocal.m4	2021-10-11 00:18:09.000000000 +0000
++++ ncurses-6.3-20220122/test/aclocal.m4	2022-01-23 00:22:31.000000000 +0000
+@@ -1,5 +1,5 @@
+ dnl***************************************************************************
+-dnl Copyright 2018-2020,2021 Thomas E. Dickey                                *
++dnl Copyright 2018-2021,2022 Thomas E. Dickey                                *
+ dnl Copyright 2003-2017,2018 Free Software Foundation, Inc.                  *
+ dnl                                                                          *
+ dnl Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -27,7 +27,7 @@
+ dnl authorization.                                                           *
+ dnl***************************************************************************
+ dnl
+-dnl $Id: aclocal.m4,v 1.202 2021/10/11 00:18:09 tom Exp $
++dnl $Id: aclocal.m4,v 1.203 2022/01/23 00:22:31 tom Exp $
+ dnl
+ dnl Author: Thomas E. Dickey
+ dnl
+@@ -1618,7 +1618,7 @@
+ fi
+ ])dnl
+ dnl ---------------------------------------------------------------------------
+-dnl CF_FIX_WARNINGS version: 3 updated: 2020/12/31 18:40:20
++dnl CF_FIX_WARNINGS version: 4 updated: 2021/12/16 18:22:31
+ dnl ---------------
+ dnl Warning flags do not belong in CFLAGS, CPPFLAGS, etc.  Any of gcc's
+ dnl "-Werror" flags can interfere with configure-checks.  Those go into
+@@ -1630,11 +1630,13 @@
+ then
+ 	case [$]$1 in
+ 	(*-Werror=*)
+-		CF_VERBOSE(repairing $1: [$]$1)
+ 		cf_temp_flags=
+ 		for cf_temp_scan in [$]$1
+ 		do
+ 			case "x$cf_temp_scan" in
++			(x-Werror=format*)
++				CF_APPEND_TEXT(cf_temp_flags,$cf_temp_scan)
++				;;
+ 			(x-Werror=*)
+ 				CF_APPEND_TEXT(EXTRA_CFLAGS,$cf_temp_scan)
+ 				;;
+@@ -1643,9 +1645,13 @@
+ 				;;
+ 			esac
+ 		done
+-		$1="$cf_temp_flags"
+-		CF_VERBOSE(... fixed [$]$1)
+-		CF_VERBOSE(... extra $EXTRA_CFLAGS)
++		if test "x[$]$1" != "x$cf_temp_flags"
++		then
++			CF_VERBOSE(repairing $1: [$]$1)
++			$1="$cf_temp_flags"
++			CF_VERBOSE(... fixed [$]$1)
++			CF_VERBOSE(... extra $EXTRA_CFLAGS)
++		fi
+ 		;;
+ 	esac
+ fi
+Index: test/configure
+--- ncurses-6.3-20220115+/test/configure	2021-09-05 21:30:18.000000000 +0000
++++ ncurses-6.3-20220122/test/configure	2022-01-23 00:22:56.000000000 +0000
+@@ -21865,14 +21865,16 @@
+ then
+ 	case $CFLAGS in
+ 	(*-Werror=*)
+-		test -n "$verbose" && echo "	repairing CFLAGS: $CFLAGS" 1>&6
+-
+-echo "${as_me:-configure}:21870: testing repairing CFLAGS: $CFLAGS ..." 1>&5
+-
+ 		cf_temp_flags=
+ 		for cf_temp_scan in $CFLAGS
+ 		do
+ 			case "x$cf_temp_scan" in
++			(x-Werror=format*)
++
++	test -n "$cf_temp_flags" && cf_temp_flags="$cf_temp_flags "
++	cf_temp_flags="${cf_temp_flags}$cf_temp_scan"
++
++				;;
+ 			(x-Werror=*)
+ 
+ 	test -n "$EXTRA_CFLAGS" && EXTRA_CFLAGS="$EXTRA_CFLAGS "
+@@ -21887,15 +21889,22 @@
+ 				;;
+ 			esac
+ 		done
+-		CFLAGS="$cf_temp_flags"
+-		test -n "$verbose" && echo "	... fixed $CFLAGS" 1>&6
++		if test "x$CFLAGS" != "x$cf_temp_flags"
++		then
++			test -n "$verbose" && echo "	repairing CFLAGS: $CFLAGS" 1>&6
++
++echo "${as_me:-configure}:21896: testing repairing CFLAGS: $CFLAGS ..." 1>&5
+ 
+-echo "${as_me:-configure}:21893: testing ... fixed $CFLAGS ..." 1>&5
++			CFLAGS="$cf_temp_flags"
++			test -n "$verbose" && echo "	... fixed $CFLAGS" 1>&6
+ 
+-		test -n "$verbose" && echo "	... extra $EXTRA_CFLAGS" 1>&6
++echo "${as_me:-configure}:21901: testing ... fixed $CFLAGS ..." 1>&5
+ 
+-echo "${as_me:-configure}:21897: testing ... extra $EXTRA_CFLAGS ..." 1>&5
++			test -n "$verbose" && echo "	... extra $EXTRA_CFLAGS" 1>&6
+ 
++echo "${as_me:-configure}:21905: testing ... extra $EXTRA_CFLAGS ..." 1>&5
++
++		fi
+ 		;;
+ 	esac
+ fi
+@@ -21904,14 +21913,16 @@
+ then
+ 	case $CPPFLAGS in
+ 	(*-Werror=*)
+-		test -n "$verbose" && echo "	repairing CPPFLAGS: $CPPFLAGS" 1>&6
+-
+-echo "${as_me:-configure}:21909: testing repairing CPPFLAGS: $CPPFLAGS ..." 1>&5
+-
+ 		cf_temp_flags=
+ 		for cf_temp_scan in $CPPFLAGS
+ 		do
+ 			case "x$cf_temp_scan" in
++			(x-Werror=format*)
++
++	test -n "$cf_temp_flags" && cf_temp_flags="$cf_temp_flags "
++	cf_temp_flags="${cf_temp_flags}$cf_temp_scan"
++
++				;;
+ 			(x-Werror=*)
+ 
+ 	test -n "$EXTRA_CFLAGS" && EXTRA_CFLAGS="$EXTRA_CFLAGS "
+@@ -21926,15 +21937,22 @@
+ 				;;
+ 			esac
+ 		done
+-		CPPFLAGS="$cf_temp_flags"
+-		test -n "$verbose" && echo "	... fixed $CPPFLAGS" 1>&6
++		if test "x$CPPFLAGS" != "x$cf_temp_flags"
++		then
++			test -n "$verbose" && echo "	repairing CPPFLAGS: $CPPFLAGS" 1>&6
++
++echo "${as_me:-configure}:21944: testing repairing CPPFLAGS: $CPPFLAGS ..." 1>&5
++
++			CPPFLAGS="$cf_temp_flags"
++			test -n "$verbose" && echo "	... fixed $CPPFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:21932: testing ... fixed $CPPFLAGS ..." 1>&5
++echo "${as_me:-configure}:21949: testing ... fixed $CPPFLAGS ..." 1>&5
+ 
+-		test -n "$verbose" && echo "	... extra $EXTRA_CFLAGS" 1>&6
++			test -n "$verbose" && echo "	... extra $EXTRA_CFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:21936: testing ... extra $EXTRA_CFLAGS ..." 1>&5
++echo "${as_me:-configure}:21953: testing ... extra $EXTRA_CFLAGS ..." 1>&5
+ 
++		fi
+ 		;;
+ 	esac
+ fi
+@@ -21943,14 +21961,16 @@
+ then
+ 	case $LDFLAGS in
+ 	(*-Werror=*)
+-		test -n "$verbose" && echo "	repairing LDFLAGS: $LDFLAGS" 1>&6
+-
+-echo "${as_me:-configure}:21948: testing repairing LDFLAGS: $LDFLAGS ..." 1>&5
+-
+ 		cf_temp_flags=
+ 		for cf_temp_scan in $LDFLAGS
+ 		do
+ 			case "x$cf_temp_scan" in
++			(x-Werror=format*)
++
++	test -n "$cf_temp_flags" && cf_temp_flags="$cf_temp_flags "
++	cf_temp_flags="${cf_temp_flags}$cf_temp_scan"
++
++				;;
+ 			(x-Werror=*)
+ 
+ 	test -n "$EXTRA_CFLAGS" && EXTRA_CFLAGS="$EXTRA_CFLAGS "
+@@ -21965,20 +21985,27 @@
+ 				;;
+ 			esac
+ 		done
+-		LDFLAGS="$cf_temp_flags"
+-		test -n "$verbose" && echo "	... fixed $LDFLAGS" 1>&6
++		if test "x$LDFLAGS" != "x$cf_temp_flags"
++		then
++			test -n "$verbose" && echo "	repairing LDFLAGS: $LDFLAGS" 1>&6
++
++echo "${as_me:-configure}:21992: testing repairing LDFLAGS: $LDFLAGS ..." 1>&5
+ 
+-echo "${as_me:-configure}:21971: testing ... fixed $LDFLAGS ..." 1>&5
++			LDFLAGS="$cf_temp_flags"
++			test -n "$verbose" && echo "	... fixed $LDFLAGS" 1>&6
+ 
+-		test -n "$verbose" && echo "	... extra $EXTRA_CFLAGS" 1>&6
++echo "${as_me:-configure}:21997: testing ... fixed $LDFLAGS ..." 1>&5
+ 
+-echo "${as_me:-configure}:21975: testing ... extra $EXTRA_CFLAGS ..." 1>&5
++			test -n "$verbose" && echo "	... extra $EXTRA_CFLAGS" 1>&6
+ 
++echo "${as_me:-configure}:22001: testing ... extra $EXTRA_CFLAGS ..." 1>&5
++
++		fi
+ 		;;
+ 	esac
+ fi
+ 
+-echo "$as_me:21981: checking if you want to turn on gcc warnings" >&5
++echo "$as_me:22008: 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.
+@@ -21995,7 +22022,7 @@
+ 	enable_warnings=no
+ 
+ fi;
+-echo "$as_me:21998: result: $enable_warnings" >&5
++echo "$as_me:22025: result: $enable_warnings" >&5
+ echo "${ECHO_T}$enable_warnings" >&6
+ if test "$enable_warnings" = "yes"
+ then
+@@ -22018,10 +22045,10 @@
+ EOF
+ if test "$GCC" = yes
+ then
+-	{ echo "$as_me:22021: checking for $CC __attribute__ directives..." >&5
++	{ echo "$as_me:22048: checking for $CC __attribute__ directives..." >&5
+ echo "$as_me: checking for $CC __attribute__ directives..." >&6;}
+ cat > "conftest.$ac_ext" <<EOF
+-#line 22024 "${as_me:-configure}"
++#line 22051 "${as_me:-configure}"
+ #include "confdefs.h"
+ #include "conftest.h"
+ #include "conftest.i"
+@@ -22070,12 +22097,12 @@
+ 			;;
+ 		esac
+ 
+-		if { (eval echo "$as_me:22073: \"$ac_compile\"") >&5
++		if { (eval echo "$as_me:22100: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:22076: \$? = $ac_status" >&5
++  echo "$as_me:22103: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; then
+-			test -n "$verbose" && echo "$as_me:22078: result: ... $cf_attribute" >&5
++			test -n "$verbose" && echo "$as_me:22105: result: ... $cf_attribute" >&5
+ echo "${ECHO_T}... $cf_attribute" >&6
+ 			cat conftest.h >>confdefs.h
+ 			case "$cf_attribute" in
+@@ -22153,7 +22180,7 @@
+ done
+ 
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 22156 "configure"
++#line 22183 "configure"
+ #include "confdefs.h"
+ 
+ #include <stdlib.h>
+@@ -22168,26 +22195,26 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:22171: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:22198: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:22174: \$? = $ac_status" >&5
++  echo "$as_me:22201: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:22177: \"$ac_try\"") >&5
++  { (eval echo "$as_me:22204: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:22180: \$? = $ac_status" >&5
++  echo "$as_me:22207: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+ 
+-echo "$as_me:22183: checking for X11/Xt const-feature" >&5
++echo "$as_me:22210: 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 22190 "configure"
++#line 22217 "configure"
+ #include "confdefs.h"
+ 
+ #define _CONST_X_STRING	/* X11R7.8 (perhaps) */
+@@ -22204,16 +22231,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:22207: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:22234: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:22210: \$? = $ac_status" >&5
++  echo "$as_me:22237: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:22213: \"$ac_try\"") >&5
++  { (eval echo "$as_me:22240: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:22216: \$? = $ac_status" >&5
++  echo "$as_me:22243: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+ 
+ 			cf_cv_const_x_string=no
+@@ -22228,7 +22255,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:22231: result: $cf_cv_const_x_string" >&5
++echo "$as_me:22258: result: $cf_cv_const_x_string" >&5
+ echo "${ECHO_T}$cf_cv_const_x_string" >&6
+ 
+ LIBS="$cf_save_LIBS_CF_CONST_X_STRING"
+@@ -22257,7 +22284,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+  fi
+ cat > "conftest.$ac_ext" <<EOF
+-#line 22260 "${as_me:-configure}"
++#line 22287 "${as_me:-configure}"
+ int main(int argc, char *argv[]) { return (argv[argc-1] == 0) ; }
+ EOF
+ if test "$INTEL_COMPILER" = yes
+@@ -22273,7 +22300,7 @@
+ # remark #981: operands are evaluated in unspecified order
+ # warning #279: controlling expression is constant
+ 
+-	{ echo "$as_me:22276: checking for $CC warning options..." >&5
++	{ echo "$as_me:22303: checking for $CC warning options..." >&5
+ echo "$as_me: checking for $CC warning options..." >&6;}
+ 	cf_save_CFLAGS="$CFLAGS"
+ 	EXTRA_CFLAGS="$EXTRA_CFLAGS -Wall"
+@@ -22289,12 +22316,12 @@
+ 		wd981
+ 	do
+ 		CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt"
+-		if { (eval echo "$as_me:22292: \"$ac_compile\"") >&5
++		if { (eval echo "$as_me:22319: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:22295: \$? = $ac_status" >&5
++  echo "$as_me:22322: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; then
+-			test -n "$verbose" && echo "$as_me:22297: result: ... -$cf_opt" >&5
++			test -n "$verbose" && echo "$as_me:22324: result: ... -$cf_opt" >&5
+ echo "${ECHO_T}... -$cf_opt" >&6
+ 			EXTRA_CFLAGS="$EXTRA_CFLAGS -$cf_opt"
+ 		fi
+@@ -22302,7 +22329,7 @@
+ 	CFLAGS="$cf_save_CFLAGS"
+ elif test "$GCC" = yes && test "$GCC_VERSION" != "unknown"
+ then
+-	{ echo "$as_me:22305: checking for $CC warning options..." >&5
++	{ echo "$as_me:22332: checking for $CC warning options..." >&5
+ echo "$as_me: checking for $CC warning options..." >&6;}
+ 	cf_save_CFLAGS="$CFLAGS"
+ 	cf_warn_CONST=""
+@@ -22325,12 +22352,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:22328: \"$ac_compile\"") >&5
++		if { (eval echo "$as_me:22355: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:22331: \$? = $ac_status" >&5
++  echo "$as_me:22358: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; then
+-			test -n "$verbose" && echo "$as_me:22333: result: ... -$cf_opt" >&5
++			test -n "$verbose" && echo "$as_me:22360: result: ... -$cf_opt" >&5
+ echo "${ECHO_T}... -$cf_opt" >&6
+ 			case "$cf_opt" in
+ 			(Winline)
+@@ -22338,7 +22365,7 @@
+ 				([34].*)
+ 					test -n "$verbose" && echo "	feature is broken in gcc $GCC_VERSION" 1>&6
+ 
+-echo "${as_me:-configure}:22341: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
++echo "${as_me:-configure}:22368: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
+ 
+ 					continue;;
+ 				esac
+@@ -22348,7 +22375,7 @@
+ 				([12].*)
+ 					test -n "$verbose" && echo "	feature is broken in gcc $GCC_VERSION" 1>&6
+ 
+-echo "${as_me:-configure}:22351: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
++echo "${as_me:-configure}:22378: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
+ 
+ 					continue;;
+ 				esac
+@@ -22365,7 +22392,7 @@
+ 
+ fi
+ 
+-echo "$as_me:22368: checking if you want to use dmalloc for testing" >&5
++echo "$as_me:22395: 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.
+@@ -22387,7 +22414,7 @@
+ else
+   with_dmalloc=
+ fi;
+-echo "$as_me:22390: result: ${with_dmalloc:-no}" >&5
++echo "$as_me:22417: result: ${with_dmalloc:-no}" >&5
+ echo "${ECHO_T}${with_dmalloc:-no}" >&6
+ 
+ case ".$with_cflags" in
+@@ -22501,23 +22528,23 @@
+ esac
+ 
+ if test "$with_dmalloc" = yes ; then
+-	echo "$as_me:22504: checking for dmalloc.h" >&5
++	echo "$as_me:22531: 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 22510 "configure"
++#line 22537 "configure"
+ #include "confdefs.h"
+ #include <dmalloc.h>
+ _ACEOF
+-if { (eval echo "$as_me:22514: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:22541: \"$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:22520: \$? = $ac_status" >&5
++  echo "$as_me:22547: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -22536,11 +22563,11 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:22539: result: $ac_cv_header_dmalloc_h" >&5
++echo "$as_me:22566: 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:22543: checking for dmalloc_debug in -ldmalloc" >&5
++echo "$as_me:22570: 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
+@@ -22548,7 +22575,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-ldmalloc  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 22551 "configure"
++#line 22578 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -22567,16 +22594,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:22570: \"$ac_link\"") >&5
++if { (eval echo "$as_me:22597: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:22573: \$? = $ac_status" >&5
++  echo "$as_me:22600: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:22576: \"$ac_try\"") >&5
++  { (eval echo "$as_me:22603: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:22579: \$? = $ac_status" >&5
++  echo "$as_me:22606: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_dmalloc_dmalloc_debug=yes
+ else
+@@ -22587,7 +22614,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:22590: result: $ac_cv_lib_dmalloc_dmalloc_debug" >&5
++echo "$as_me:22617: 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
+@@ -22602,7 +22629,7 @@
+ 
+ fi
+ 
+-echo "$as_me:22605: checking if you want to use dbmalloc for testing" >&5
++echo "$as_me:22632: 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.
+@@ -22624,7 +22651,7 @@
+ else
+   with_dbmalloc=
+ fi;
+-echo "$as_me:22627: result: ${with_dbmalloc:-no}" >&5
++echo "$as_me:22654: result: ${with_dbmalloc:-no}" >&5
+ echo "${ECHO_T}${with_dbmalloc:-no}" >&6
+ 
+ case ".$with_cflags" in
+@@ -22738,23 +22765,23 @@
+ esac
+ 
+ if test "$with_dbmalloc" = yes ; then
+-	echo "$as_me:22741: checking for dbmalloc.h" >&5
++	echo "$as_me:22768: 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 22747 "configure"
++#line 22774 "configure"
+ #include "confdefs.h"
+ #include <dbmalloc.h>
+ _ACEOF
+-if { (eval echo "$as_me:22751: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:22778: \"$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:22757: \$? = $ac_status" >&5
++  echo "$as_me:22784: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -22773,11 +22800,11 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:22776: result: $ac_cv_header_dbmalloc_h" >&5
++echo "$as_me:22803: 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:22780: checking for debug_malloc in -ldbmalloc" >&5
++echo "$as_me:22807: 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
+@@ -22785,7 +22812,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-ldbmalloc  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 22788 "configure"
++#line 22815 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -22804,16 +22831,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:22807: \"$ac_link\"") >&5
++if { (eval echo "$as_me:22834: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:22810: \$? = $ac_status" >&5
++  echo "$as_me:22837: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:22813: \"$ac_try\"") >&5
++  { (eval echo "$as_me:22840: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:22816: \$? = $ac_status" >&5
++  echo "$as_me:22843: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_dbmalloc_debug_malloc=yes
+ else
+@@ -22824,7 +22851,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:22827: result: $ac_cv_lib_dbmalloc_debug_malloc" >&5
++echo "$as_me:22854: 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
+@@ -22839,7 +22866,7 @@
+ 
+ fi
+ 
+-echo "$as_me:22842: checking if you want to use valgrind for testing" >&5
++echo "$as_me:22869: 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.
+@@ -22861,7 +22888,7 @@
+ else
+   with_valgrind=
+ fi;
+-echo "$as_me:22864: result: ${with_valgrind:-no}" >&5
++echo "$as_me:22891: result: ${with_valgrind:-no}" >&5
+ echo "${ECHO_T}${with_valgrind:-no}" >&6
+ 
+ case ".$with_cflags" in
+@@ -22974,7 +23001,7 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:22977: checking if you want to perform memory-leak testing" >&5
++echo "$as_me:23004: 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.
+@@ -22985,7 +23012,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:22988: result: $with_no_leaks" >&5
++echo "$as_me:23015: result: $with_no_leaks" >&5
+ echo "${ECHO_T}$with_no_leaks" >&6
+ 
+ if test "$enable_leaks" = no ; then
+@@ -23003,7 +23030,7 @@
+ LD_RPATH_OPT=
+ if test "x$cf_cv_enable_rpath" != xno
+ then
+-	echo "$as_me:23006: checking for an rpath option" >&5
++	echo "$as_me:23033: checking for an rpath option" >&5
+ echo $ECHO_N "checking for an rpath option... $ECHO_C" >&6
+ 	case "$cf_cv_system_name" in
+ 	(irix*)
+@@ -23034,12 +23061,12 @@
+ 	(*)
+ 		;;
+ 	esac
+-	echo "$as_me:23037: result: $LD_RPATH_OPT" >&5
++	echo "$as_me:23064: result: $LD_RPATH_OPT" >&5
+ echo "${ECHO_T}$LD_RPATH_OPT" >&6
+ 
+ 	case "x$LD_RPATH_OPT" in
+ 	(x-R*)
+-		echo "$as_me:23042: checking if we need a space after rpath option" >&5
++		echo "$as_me:23069: 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"
+ 
+@@ -23060,7 +23087,7 @@
+ LIBS="$cf_add_libs"
+ 
+ 		cat >"conftest.$ac_ext" <<_ACEOF
+-#line 23063 "configure"
++#line 23090 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -23072,16 +23099,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:23075: \"$ac_link\"") >&5
++if { (eval echo "$as_me:23102: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:23078: \$? = $ac_status" >&5
++  echo "$as_me:23105: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:23081: \"$ac_try\"") >&5
++  { (eval echo "$as_me:23108: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:23084: \$? = $ac_status" >&5
++  echo "$as_me:23111: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_rpath_space=no
+ else
+@@ -23091,14 +23118,14 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ 		LIBS="$cf_save_LIBS"
+-		echo "$as_me:23094: result: $cf_rpath_space" >&5
++		echo "$as_me:23121: 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:23101: checking if rpath-hack should be disabled" >&5
++echo "$as_me:23128: 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.
+@@ -23116,22 +23143,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:23119: result: $cf_disable_rpath_hack" >&5
++echo "$as_me:23146: result: $cf_disable_rpath_hack" >&5
+ echo "${ECHO_T}$cf_disable_rpath_hack" >&6
+ 
+ if test "$enable_rpath_hack" = yes ; then
+ 
+-echo "$as_me:23124: checking for updated LDFLAGS" >&5
++echo "$as_me:23151: 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:23127: result: maybe" >&5
++	echo "$as_me:23154: 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:23134: checking for $ac_word" >&5
++echo "$as_me:23161: 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
+@@ -23146,7 +23173,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:23149: found $ac_dir/$ac_word" >&5
++echo "$as_me:23176: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -23154,10 +23181,10 @@
+ fi
+ cf_ldd_prog=$ac_cv_prog_cf_ldd_prog
+ if test -n "$cf_ldd_prog"; then
+-  echo "$as_me:23157: result: $cf_ldd_prog" >&5
++  echo "$as_me:23184: result: $cf_ldd_prog" >&5
+ echo "${ECHO_T}$cf_ldd_prog" >&6
+ else
+-  echo "$as_me:23160: result: no" >&5
++  echo "$as_me:23187: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -23171,7 +23198,7 @@
+ 		cf_rpath_oops=
+ 
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 23174 "configure"
++#line 23201 "configure"
+ #include "confdefs.h"
+ #include <stdio.h>
+ int
+@@ -23183,16 +23210,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:23186: \"$ac_link\"") >&5
++if { (eval echo "$as_me:23213: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:23189: \$? = $ac_status" >&5
++  echo "$as_me:23216: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:23192: \"$ac_try\"") >&5
++  { (eval echo "$as_me:23219: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:23195: \$? = $ac_status" >&5
++  echo "$as_me:23222: \$? = $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`
+@@ -23220,7 +23247,7 @@
+ 					then
+ 						test -n "$verbose" && echo "	...adding -L$cf_rpath_dir/lib to LDFLAGS for $cf_rpath_src" 1>&6
+ 
+-echo "${as_me:-configure}:23223: testing ...adding -L$cf_rpath_dir/lib to LDFLAGS for $cf_rpath_src ..." 1>&5
++echo "${as_me:-configure}:23250: testing ...adding -L$cf_rpath_dir/lib to LDFLAGS for $cf_rpath_src ..." 1>&5
+ 
+ 						LDFLAGS="$LDFLAGS -L$cf_rpath_dir/lib"
+ 						break
+@@ -23232,11 +23259,11 @@
+ 
+ 	test -n "$verbose" && echo "	...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:23235: testing ...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
++echo "${as_me:-configure}:23262: testing ...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
+ 
+ test -n "$verbose" && echo "	...checking LDFLAGS $LDFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:23239: testing ...checking LDFLAGS $LDFLAGS ..." 1>&5
++echo "${as_me:-configure}:23266: testing ...checking LDFLAGS $LDFLAGS ..." 1>&5
+ 
+ cf_rpath_dst=
+ for cf_rpath_src in $LDFLAGS
+@@ -23273,7 +23300,7 @@
+ 			then
+ 				test -n "$verbose" && echo "	...Filter $cf_rpath_src ->$cf_rpath_tmp" 1>&6
+ 
+-echo "${as_me:-configure}:23276: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
++echo "${as_me:-configure}:23303: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
+ 
+ 				EXTRA_LDFLAGS="$cf_rpath_tmp $EXTRA_LDFLAGS"
+ 			fi
+@@ -23286,11 +23313,11 @@
+ 
+ test -n "$verbose" && echo "	...checked LDFLAGS $LDFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:23289: testing ...checked LDFLAGS $LDFLAGS ..." 1>&5
++echo "${as_me:-configure}:23316: testing ...checked LDFLAGS $LDFLAGS ..." 1>&5
+ 
+ test -n "$verbose" && echo "	...checking LIBS $LIBS" 1>&6
+ 
+-echo "${as_me:-configure}:23293: testing ...checking LIBS $LIBS ..." 1>&5
++echo "${as_me:-configure}:23320: testing ...checking LIBS $LIBS ..." 1>&5
+ 
+ cf_rpath_dst=
+ for cf_rpath_src in $LIBS
+@@ -23327,7 +23354,7 @@
+ 			then
+ 				test -n "$verbose" && echo "	...Filter $cf_rpath_src ->$cf_rpath_tmp" 1>&6
+ 
+-echo "${as_me:-configure}:23330: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
++echo "${as_me:-configure}:23357: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
+ 
+ 				EXTRA_LDFLAGS="$cf_rpath_tmp $EXTRA_LDFLAGS"
+ 			fi
+@@ -23340,14 +23367,14 @@
+ 
+ test -n "$verbose" && echo "	...checked LIBS $LIBS" 1>&6
+ 
+-echo "${as_me:-configure}:23343: testing ...checked LIBS $LIBS ..." 1>&5
++echo "${as_me:-configure}:23370: testing ...checked LIBS $LIBS ..." 1>&5
+ 
+ 	test -n "$verbose" && echo "	...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:23347: testing ...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
++echo "${as_me:-configure}:23374: testing ...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
+ 
+ else
+-	echo "$as_me:23350: result: no" >&5
++	echo "$as_me:23377: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -23437,7 +23464,7 @@
+ : "${CONFIG_STATUS=./config.status}"
+ ac_clean_files_save=$ac_clean_files
+ ac_clean_files="$ac_clean_files $CONFIG_STATUS"
+-{ echo "$as_me:23440: creating $CONFIG_STATUS" >&5
++{ echo "$as_me:23467: creating $CONFIG_STATUS" >&5
+ echo "$as_me: creating $CONFIG_STATUS" >&6;}
+ cat >"$CONFIG_STATUS" <<_ACEOF
+ #! $SHELL
+@@ -23616,7 +23643,7 @@
+     echo "$ac_cs_version"; exit 0 ;;
+   --he | --h)
+     # Conflict between --help and --header
+-    { { echo "$as_me:23619: error: ambiguous option: $1
++    { { echo "$as_me:23646: 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;}
+@@ -23635,7 +23662,7 @@
+     ac_need_defaults=false;;
+ 
+   # This is an error.
+-  -*) { { echo "$as_me:23638: error: unrecognized option: $1
++  -*) { { echo "$as_me:23665: 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;}
+@@ -23685,7 +23712,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:23688: error: invalid argument: $ac_config_target" >&5
++  *) { { echo "$as_me:23715: error: invalid argument: $ac_config_target" >&5
+ echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
+    { (exit 1); exit 1; }; };;
+   esac
+@@ -23991,7 +24018,7 @@
+   esac
+ 
+   if test x"$ac_file" != x-; then
+-    { echo "$as_me:23994: creating $ac_file" >&5
++    { echo "$as_me:24021: creating $ac_file" >&5
+ echo "$as_me: creating $ac_file" >&6;}
+     rm -f "$ac_file"
+   fi
+@@ -24009,7 +24036,7 @@
+       -) echo $tmp/stdin ;;
+       [\\/$]*)
+          # Absolute (can't be DOS-style, as IFS=:)
+-         test -f "$f" || { { echo "$as_me:24012: error: cannot find input file: $f" >&5
++         test -f "$f" || { { echo "$as_me:24039: error: cannot find input file: $f" >&5
+ echo "$as_me: error: cannot find input file: $f" >&2;}
+    { (exit 1); exit 1; }; }
+          echo $f;;
+@@ -24022,7 +24049,7 @@
+            echo "$srcdir/$f"
+          else
+            # /dev/null tree
+-           { { echo "$as_me:24025: error: cannot find input file: $f" >&5
++           { { echo "$as_me:24052: error: cannot find input file: $f" >&5
+ echo "$as_me: error: cannot find input file: $f" >&2;}
+    { (exit 1); exit 1; }; }
+          fi;;
+@@ -24038,7 +24065,7 @@
+       if test -n "$ac_seen"; then
+         ac_used=`grep '@datarootdir@' "$ac_item"`
+         if test -z "$ac_used"; then
+-          { echo "$as_me:24041: WARNING: datarootdir was used implicitly but not set:
++          { echo "$as_me:24068: 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;}
+@@ -24047,7 +24074,7 @@
+       fi
+       ac_seen=`grep '${datarootdir}' "$ac_item"`
+       if test -n "$ac_seen"; then
+-        { echo "$as_me:24050: WARNING: datarootdir was used explicitly but not set:
++        { echo "$as_me:24077: 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;}
+@@ -24084,7 +24111,7 @@
+             ac_init=`${EGREP-egrep} '[ 	]*'$ac_name'[ 	]*=' "$ac_file"`
+             if test -z "$ac_init"; then
+               ac_seen=`echo "$ac_seen" |sed -e 's,^,'$ac_file':,'`
+-              { echo "$as_me:24087: WARNING: Variable $ac_name is used but was not set:
++              { echo "$as_me:24114: 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;}
+@@ -24095,7 +24122,7 @@
+     ${EGREP-egrep} -n '@[A-Z_][A-Z_0-9]+@' "$ac_file" >>$tmp/out
+     if test -s $tmp/out; then
+       ac_seen=`sed -e 's,^,'$ac_file':,' < $tmp/out`
+-      { echo "$as_me:24098: WARNING: Some variables may not be substituted:
++      { echo "$as_me:24125: WARNING: Some variables may not be substituted:
+ $ac_seen" >&5
+ echo "$as_me: WARNING: Some variables may not be substituted:
+ $ac_seen" >&2;}
+@@ -24144,7 +24171,7 @@
+   * )   ac_file_in=$ac_file.in ;;
+   esac
+ 
+-  test x"$ac_file" != x- && { echo "$as_me:24147: creating $ac_file" >&5
++  test x"$ac_file" != x- && { echo "$as_me:24174: creating $ac_file" >&5
+ echo "$as_me: creating $ac_file" >&6;}
+ 
+   # First look for the input files in the build tree, otherwise in the
+@@ -24155,7 +24182,7 @@
+       -) echo $tmp/stdin ;;
+       [\\/$]*)
+          # Absolute (can't be DOS-style, as IFS=:)
+-         test -f "$f" || { { echo "$as_me:24158: error: cannot find input file: $f" >&5
++         test -f "$f" || { { echo "$as_me:24185: error: cannot find input file: $f" >&5
+ echo "$as_me: error: cannot find input file: $f" >&2;}
+    { (exit 1); exit 1; }; }
+          echo $f;;
+@@ -24168,7 +24195,7 @@
+            echo "$srcdir/$f"
+          else
+            # /dev/null tree
+-           { { echo "$as_me:24171: error: cannot find input file: $f" >&5
++           { { echo "$as_me:24198: error: cannot find input file: $f" >&5
+ echo "$as_me: error: cannot find input file: $f" >&2;}
+    { (exit 1); exit 1; }; }
+          fi;;
+@@ -24226,7 +24253,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:24229: $ac_file is unchanged" >&5
++      { echo "$as_me:24256: $ac_file is unchanged" >&5
+ echo "$as_me: $ac_file is unchanged" >&6;}
+     else
+       ac_dir=`$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \