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

1 files changed, 23405 insertions, 0 deletions

diff --git a/system/ncurses/ncurses-6.3-20220129.patch b/system/ncurses/ncurses-6.3-20220129.patch
new file mode 100644
index 000000000..c60e4b4f3
--- /dev/null
+++ b/system/ncurses/ncurses-6.3-20220129.patch
@@ -0,0 +1,23405 @@
+# ncurses 6.3 - patch 20220129 - 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-20220129.patch.gz
+# patch by Thomas E. Dickey <dickey@invisible-island.net>
+# created  Sun Jan 30 01:46:17 UTC 2022
+# ------------------------------------------------------------------------------
+# Ada95/aclocal.m4                           |    9 
+# Ada95/configure                            | 2399 +++++++--------
+# NEWS                                       |   10 
+# VERSION                                    |    2 
+# aclocal.m4                                 |    9 
+# configure                                  | 4315 +++++++++++++--------------
+# dist.mk                                    |    4 
+# misc/terminfo.src                          |   69 
+# package/debian-mingw/changelog             |    4 
+# package/debian-mingw64/changelog           |    4 
+# package/debian/changelog                   |    4 
+# package/debian/ncurses6.lintian-overrides  |   10 
+# package/debian/ncursest6.lintian-overrides |   10 
+# package/debian/rules                       |    9 
+# package/mingw-ncurses.nsi                  |    4 
+# package/mingw-ncurses.spec                 |    2 
+# package/ncurses.spec                       |    2 
+# package/ncursest.spec                      |    2 
+# 18 files changed, 3461 insertions(+), 3407 deletions(-)
+# ------------------------------------------------------------------------------
+Index: Ada95/aclocal.m4
+Prereq:  1.192 
+--- ncurses-6.3-20220122+/Ada95/aclocal.m4	2022-01-23 00:21:27.000000000 +0000
++++ ncurses-6.3-20220129/Ada95/aclocal.m4	2022-01-29 22:06:07.000000000 +0000
+@@ -29,7 +29,7 @@
+ dnl
+ dnl Author: Thomas E. Dickey
+ dnl
+-dnl $Id: aclocal.m4,v 1.192 2022/01/23 00:21:27 tom Exp $
++dnl $Id: aclocal.m4,v 1.193 2022/01/29 22:06:07 tom Exp $
+ dnl Macros used in NCURSES Ada95 auto-configuration script.
+ dnl
+ dnl These macros are maintained separately from NCURSES.  The copyright on
+@@ -4808,7 +4808,7 @@
+ AC_SUBST($3)dnl
+ ])dnl
+ dnl ---------------------------------------------------------------------------
+-dnl CF_WITH_PKG_CONFIG_LIBDIR version: 19 updated: 2021/11/20 14:57:36
++dnl CF_WITH_PKG_CONFIG_LIBDIR version: 20 updated: 2022/01/29 17:03:42
+ dnl -------------------------
+ dnl Allow the choice of the pkg-config library directory to be overridden.
+ dnl
+@@ -4840,7 +4840,7 @@
+ 	[cf_search_path=$withval],
+ 	[test "x$PKG_CONFIG" != xnone && test -z "$cf_search_path" && cf_search_path=libdir])
+ 
+-case x$cf_search_path in
++case "x$cf_search_path" in
+ (xlibdir)
+ 	PKG_CONFIG_LIBDIR='${libdir}/pkgconfig'
+ 	AC_MSG_RESULT($PKG_CONFIG_LIBDIR)
+@@ -4848,6 +4848,9 @@
+ 	;;
+ (x)
+ 	;;
++(x/*\ *)
++	PKG_CONFIG_LIBDIR=
++	;;
+ (x/*)
+ 	PKG_CONFIG_LIBDIR="$cf_search_path"
+ 	AC_MSG_RESULT($PKG_CONFIG_LIBDIR)
+Index: Ada95/configure
+--- ncurses-6.3-20220122+/Ada95/configure	2022-01-23 00:21:51.000000000 +0000
++++ ncurses-6.3-20220129/Ada95/configure	2022-01-29 22:07:15.000000000 +0000
+@@ -3292,7 +3292,7 @@
+   test "x$PKG_CONFIG" != xnone && test -z "$cf_search_path" && cf_search_path=libdir
+ fi;
+ 
+-case x$cf_search_path in
++case "x$cf_search_path" in
+ (xlibdir)
+ 	PKG_CONFIG_LIBDIR='${libdir}/pkgconfig'
+ 	echo "$as_me:3298: result: $PKG_CONFIG_LIBDIR" >&5
+@@ -3301,18 +3301,21 @@
+ 	;;
+ (x)
+ 	;;
++(x/*\ *)
++	PKG_CONFIG_LIBDIR=
++	;;
+ (x/*)
+ 	PKG_CONFIG_LIBDIR="$cf_search_path"
+-	echo "$as_me:3306: result: $PKG_CONFIG_LIBDIR" >&5
++	echo "$as_me:3309: result: $PKG_CONFIG_LIBDIR" >&5
+ echo "${ECHO_T}$PKG_CONFIG_LIBDIR" >&6
+ 	cf_search_path=
+ 	;;
+ (xyes|xauto)
+-	echo "$as_me:3311: result: auto" >&5
++	echo "$as_me:3314: 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:3315: checking for search-list" >&5
++	echo "$as_me:3318: checking for search-list" >&5
+ echo $ECHO_N "checking for search-list... $ECHO_C" >&6
+ 	if test "x$PKG_CONFIG" != xnone
+ 	then
+@@ -3339,11 +3342,11 @@
+ "`
+ 	fi
+ 
+-	echo "$as_me:3342: result: $cf_search_path" >&5
++	echo "$as_me:3345: result: $cf_search_path" >&5
+ echo "${ECHO_T}$cf_search_path" >&6
+ 	;;
+ (*)
+-	{ { echo "$as_me:3346: error: Unexpected option value: $cf_search_path" >&5
++	{ { echo "$as_me:3349: error: Unexpected option value: $cf_search_path" >&5
+ echo "$as_me: error: Unexpected option value: $cf_search_path" >&2;}
+    { (exit 1); exit 1; }; }
+ 	;;
+@@ -3351,7 +3354,7 @@
+ 
+ if test -n "$cf_search_path"
+ then
+-	echo "$as_me:3354: checking for first directory" >&5
++	echo "$as_me:3357: 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
+@@ -3362,7 +3365,7 @@
+ 			break
+ 		fi
+ 	done
+-	echo "$as_me:3365: result: $cf_pkg_config_path" >&5
++	echo "$as_me:3368: result: $cf_pkg_config_path" >&5
+ echo "${ECHO_T}$cf_pkg_config_path" >&6
+ 
+ 	if test "x$cf_pkg_config_path" != xnone ; then
+@@ -3372,7 +3375,7 @@
+ 
+ 	if test -z "$PKG_CONFIG_LIBDIR" && test -n "$cf_search_path"
+ 	then
+-		echo "$as_me:3375: checking for workaround" >&5
++		echo "$as_me:3378: checking for workaround" >&5
+ echo $ECHO_N "checking for workaround... $ECHO_C" >&6
+ 		if test "$prefix" = "NONE" ; then
+ 			cf_prefix="$ac_default_prefix"
+@@ -3395,12 +3398,12 @@
+ 			esac
+ 		done
+ 		test -z "$PKG_CONFIG_LIBDIR" && PKG_CONFIG_LIBDIR=$cf_backup
+-		echo "$as_me:3398: result: $PKG_CONFIG_LIBDIR" >&5
++		echo "$as_me:3401: result: $PKG_CONFIG_LIBDIR" >&5
+ echo "${ECHO_T}$PKG_CONFIG_LIBDIR" >&6
+ 	fi
+ fi
+ 
+-echo "$as_me:3403: checking if you want to build test-programs" >&5
++echo "$as_me:3406: 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.
+@@ -3410,10 +3413,10 @@
+ else
+   cf_with_tests=yes
+ fi;
+-echo "$as_me:3413: result: $cf_with_tests" >&5
++echo "$as_me:3416: result: $cf_with_tests" >&5
+ echo "${ECHO_T}$cf_with_tests" >&6
+ 
+-echo "$as_me:3416: checking if we should assume mixed-case filenames" >&5
++echo "$as_me:3419: 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.
+@@ -3423,11 +3426,11 @@
+ else
+   enable_mixedcase=auto
+ fi;
+-echo "$as_me:3426: result: $enable_mixedcase" >&5
++echo "$as_me:3429: result: $enable_mixedcase" >&5
+ echo "${ECHO_T}$enable_mixedcase" >&6
+ if test "$enable_mixedcase" = "auto" ; then
+ 
+-echo "$as_me:3430: checking if filesystem supports mixed-case filenames" >&5
++echo "$as_me:3433: 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
+@@ -3454,7 +3457,7 @@
+ fi
+ 
+ fi
+-echo "$as_me:3457: result: $cf_cv_mixedcase" >&5
++echo "$as_me:3460: result: $cf_cv_mixedcase" >&5
+ echo "${ECHO_T}$cf_cv_mixedcase" >&6
+ test "$cf_cv_mixedcase" = yes &&
+ cat >>confdefs.h <<\EOF
+@@ -3472,7 +3475,7 @@
+ fi
+ 
+ # do this after mixed-case option (tags/TAGS is not as important as tic).
+-echo "$as_me:3475: checking whether ${MAKE-make} sets \${MAKE}" >&5
++echo "$as_me:3478: 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
+@@ -3492,16 +3495,16 @@
+ rm -f conftest.make
+ fi
+ if eval "test \"`echo '$ac_cv_prog_make_'${ac_make}_set`\" = yes"; then
+-  echo "$as_me:3495: result: yes" >&5
++  echo "$as_me:3498: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+   SET_MAKE=
+ else
+-  echo "$as_me:3499: result: no" >&5
++  echo "$as_me:3502: result: no" >&5
+ echo "${ECHO_T}no" >&6
+   SET_MAKE="MAKE=${MAKE-make}"
+ fi
+ 
+-echo "$as_me:3504: checking for \".PHONY\" make-support" >&5
++echo "$as_me:3507: 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
+@@ -3556,7 +3559,7 @@
+ 	rm -rf conftest*
+ 
+ fi
+-echo "$as_me:3559: result: $cf_cv_make_PHONY" >&5
++echo "$as_me:3562: result: $cf_cv_make_PHONY" >&5
+ echo "${ECHO_T}$cf_cv_make_PHONY" >&6
+ MAKE_NO_PHONY="#"
+ MAKE_PHONY="#"
+@@ -3567,7 +3570,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:3570: checking for $ac_word" >&5
++echo "$as_me:3573: 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
+@@ -3582,7 +3585,7 @@
+   test -z "$ac_dir" && ac_dir=.
+   $as_executable_p "$ac_dir/$ac_word" || continue
+ ac_cv_prog_CTAGS="$ac_prog"
+-echo "$as_me:3585: found $ac_dir/$ac_word" >&5
++echo "$as_me:3588: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -3590,10 +3593,10 @@
+ fi
+ CTAGS=$ac_cv_prog_CTAGS
+ if test -n "$CTAGS"; then
+-  echo "$as_me:3593: result: $CTAGS" >&5
++  echo "$as_me:3596: result: $CTAGS" >&5
+ echo "${ECHO_T}$CTAGS" >&6
+ else
+-  echo "$as_me:3596: result: no" >&5
++  echo "$as_me:3599: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -3604,7 +3607,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:3607: checking for $ac_word" >&5
++echo "$as_me:3610: 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
+@@ -3619,7 +3622,7 @@
+   test -z "$ac_dir" && ac_dir=.
+   $as_executable_p "$ac_dir/$ac_word" || continue
+ ac_cv_prog_ETAGS="$ac_prog"
+-echo "$as_me:3622: found $ac_dir/$ac_word" >&5
++echo "$as_me:3625: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -3627,10 +3630,10 @@
+ fi
+ ETAGS=$ac_cv_prog_ETAGS
+ if test -n "$ETAGS"; then
+-  echo "$as_me:3630: result: $ETAGS" >&5
++  echo "$as_me:3633: result: $ETAGS" >&5
+ echo "${ECHO_T}$ETAGS" >&6
+ else
+-  echo "$as_me:3633: result: no" >&5
++  echo "$as_me:3636: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -3639,7 +3642,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:3642: checking for $ac_word" >&5
++echo "$as_me:3645: 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
+@@ -3654,7 +3657,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:3657: found $ac_dir/$ac_word" >&5
++echo "$as_me:3660: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -3663,17 +3666,17 @@
+ fi
+ MAKE_LOWER_TAGS=$ac_cv_prog_MAKE_LOWER_TAGS
+ if test -n "$MAKE_LOWER_TAGS"; then
+-  echo "$as_me:3666: result: $MAKE_LOWER_TAGS" >&5
++  echo "$as_me:3669: result: $MAKE_LOWER_TAGS" >&5
+ echo "${ECHO_T}$MAKE_LOWER_TAGS" >&6
+ else
+-  echo "$as_me:3669: result: no" >&5
++  echo "$as_me:3672: 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:3676: checking for $ac_word" >&5
++echo "$as_me:3679: 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
+@@ -3688,7 +3691,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:3691: found $ac_dir/$ac_word" >&5
++echo "$as_me:3694: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -3697,10 +3700,10 @@
+ fi
+ MAKE_UPPER_TAGS=$ac_cv_prog_MAKE_UPPER_TAGS
+ if test -n "$MAKE_UPPER_TAGS"; then
+-  echo "$as_me:3700: result: $MAKE_UPPER_TAGS" >&5
++  echo "$as_me:3703: result: $MAKE_UPPER_TAGS" >&5
+ echo "${ECHO_T}$MAKE_UPPER_TAGS" >&6
+ else
+-  echo "$as_me:3703: result: no" >&5
++  echo "$as_me:3706: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -3720,7 +3723,7 @@
+ 	MAKE_LOWER_TAGS="#"
+ fi
+ 
+-echo "$as_me:3723: checking for makeflags variable" >&5
++echo "$as_me:3726: 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
+@@ -3750,7 +3753,7 @@
+ 			;;
+ 		(*)
+ 
+-echo "${as_me:-configure}:3753: testing given option \"$cf_option\",no match \"$cf_result\" ..." 1>&5
++echo "${as_me:-configure}:3756: testing given option \"$cf_option\",no match \"$cf_result\" ..." 1>&5
+ 
+ 			;;
+ 		esac
+@@ -3758,13 +3761,13 @@
+ 	rm -f cf_makeflags.tmp
+ 
+ fi
+-echo "$as_me:3761: result: $cf_cv_makeflags" >&5
++echo "$as_me:3764: 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:3767: checking for $ac_word" >&5
++echo "$as_me:3770: 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
+@@ -3779,7 +3782,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:3782: found $ac_dir/$ac_word" >&5
++echo "$as_me:3785: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -3787,10 +3790,10 @@
+ fi
+ RANLIB=$ac_cv_prog_RANLIB
+ if test -n "$RANLIB"; then
+-  echo "$as_me:3790: result: $RANLIB" >&5
++  echo "$as_me:3793: result: $RANLIB" >&5
+ echo "${ECHO_T}$RANLIB" >&6
+ else
+-  echo "$as_me:3793: result: no" >&5
++  echo "$as_me:3796: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -3799,7 +3802,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:3802: checking for $ac_word" >&5
++echo "$as_me:3805: 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
+@@ -3814,7 +3817,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:3817: found $ac_dir/$ac_word" >&5
++echo "$as_me:3820: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -3823,10 +3826,10 @@
+ fi
+ ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB
+ if test -n "$ac_ct_RANLIB"; then
+-  echo "$as_me:3826: result: $ac_ct_RANLIB" >&5
++  echo "$as_me:3829: result: $ac_ct_RANLIB" >&5
+ echo "${ECHO_T}$ac_ct_RANLIB" >&6
+ else
+-  echo "$as_me:3829: result: no" >&5
++  echo "$as_me:3832: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -3838,7 +3841,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:3841: checking for $ac_word" >&5
++echo "$as_me:3844: 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
+@@ -3853,7 +3856,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:3856: found $ac_dir/$ac_word" >&5
++echo "$as_me:3859: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -3861,10 +3864,10 @@
+ fi
+ LD=$ac_cv_prog_LD
+ if test -n "$LD"; then
+-  echo "$as_me:3864: result: $LD" >&5
++  echo "$as_me:3867: result: $LD" >&5
+ echo "${ECHO_T}$LD" >&6
+ else
+-  echo "$as_me:3867: result: no" >&5
++  echo "$as_me:3870: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -3873,7 +3876,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:3876: checking for $ac_word" >&5
++echo "$as_me:3879: 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
+@@ -3888,7 +3891,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:3891: found $ac_dir/$ac_word" >&5
++echo "$as_me:3894: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -3897,10 +3900,10 @@
+ fi
+ ac_ct_LD=$ac_cv_prog_ac_ct_LD
+ if test -n "$ac_ct_LD"; then
+-  echo "$as_me:3900: result: $ac_ct_LD" >&5
++  echo "$as_me:3903: result: $ac_ct_LD" >&5
+ echo "${ECHO_T}$ac_ct_LD" >&6
+ else
+-  echo "$as_me:3903: result: no" >&5
++  echo "$as_me:3906: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -3912,7 +3915,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:3915: checking for $ac_word" >&5
++echo "$as_me:3918: 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
+@@ -3927,7 +3930,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:3930: found $ac_dir/$ac_word" >&5
++echo "$as_me:3933: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -3935,10 +3938,10 @@
+ fi
+ AR=$ac_cv_prog_AR
+ if test -n "$AR"; then
+-  echo "$as_me:3938: result: $AR" >&5
++  echo "$as_me:3941: result: $AR" >&5
+ echo "${ECHO_T}$AR" >&6
+ else
+-  echo "$as_me:3941: result: no" >&5
++  echo "$as_me:3944: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -3947,7 +3950,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:3950: checking for $ac_word" >&5
++echo "$as_me:3953: 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
+@@ -3962,7 +3965,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:3965: found $ac_dir/$ac_word" >&5
++echo "$as_me:3968: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -3971,10 +3974,10 @@
+ fi
+ ac_ct_AR=$ac_cv_prog_ac_ct_AR
+ if test -n "$ac_ct_AR"; then
+-  echo "$as_me:3974: result: $ac_ct_AR" >&5
++  echo "$as_me:3977: result: $ac_ct_AR" >&5
+ echo "${ECHO_T}$ac_ct_AR" >&6
+ else
+-  echo "$as_me:3977: result: no" >&5
++  echo "$as_me:3980: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -3986,7 +3989,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:3989: checking for $ac_word" >&5
++echo "$as_me:3992: 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
+@@ -4001,7 +4004,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:4004: found $ac_dir/$ac_word" >&5
++echo "$as_me:4007: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -4009,10 +4012,10 @@
+ fi
+ AR=$ac_cv_prog_AR
+ if test -n "$AR"; then
+-  echo "$as_me:4012: result: $AR" >&5
++  echo "$as_me:4015: result: $AR" >&5
+ echo "${ECHO_T}$AR" >&6
+ else
+-  echo "$as_me:4015: result: no" >&5
++  echo "$as_me:4018: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -4021,7 +4024,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:4024: checking for $ac_word" >&5
++echo "$as_me:4027: 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
+@@ -4036,7 +4039,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:4039: found $ac_dir/$ac_word" >&5
++echo "$as_me:4042: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -4045,10 +4048,10 @@
+ fi
+ ac_ct_AR=$ac_cv_prog_ac_ct_AR
+ if test -n "$ac_ct_AR"; then
+-  echo "$as_me:4048: result: $ac_ct_AR" >&5
++  echo "$as_me:4051: result: $ac_ct_AR" >&5
+ echo "${ECHO_T}$ac_ct_AR" >&6
+ else
+-  echo "$as_me:4051: result: no" >&5
++  echo "$as_me:4054: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -4057,7 +4060,7 @@
+   AR="$ac_cv_prog_AR"
+ fi
+ 
+-echo "$as_me:4060: checking for options to update archives" >&5
++echo "$as_me:4063: 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
+@@ -4094,13 +4097,13 @@
+ 			rm -f conftest.a
+ 
+ 			cat >"conftest.$ac_ext" <<EOF
+-#line 4097 "configure"
++#line 4100 "configure"
+ int	testdata[3] = { 123, 456, 789 };
+ EOF
+-			if { (eval echo "$as_me:4100: \"$ac_compile\"") >&5
++			if { (eval echo "$as_me:4103: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:4103: \$? = $ac_status" >&5
++  echo "$as_me:4106: \$? = $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
+@@ -4111,7 +4114,7 @@
+ 			else
+ 				test -n "$verbose" && echo "	cannot compile test-program" 1>&6
+ 
+-echo "${as_me:-configure}:4114: testing cannot compile test-program ..." 1>&5
++echo "${as_me:-configure}:4117: testing cannot compile test-program ..." 1>&5
+ 
+ 				break
+ 			fi
+@@ -4121,7 +4124,7 @@
+ 	esac
+ 
+ fi
+-echo "$as_me:4124: result: $cf_cv_ar_flags" >&5
++echo "$as_me:4127: result: $cf_cv_ar_flags" >&5
+ echo "${ECHO_T}$cf_cv_ar_flags" >&6
+ 
+ if test -n "$ARFLAGS" ; then
+@@ -4132,17 +4135,17 @@
+ 	ARFLAGS=$cf_cv_ar_flags
+ fi
+ 
+-	echo "$as_me:4135: checking for PATH separator" >&5
++	echo "$as_me:4138: 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:4142: result: $PATH_SEPARATOR" >&5
++	echo "$as_me:4145: result: $PATH_SEPARATOR" >&5
+ echo "${ECHO_T}$PATH_SEPARATOR" >&6
+ 
+-echo "$as_me:4145: checking if you have specified an install-prefix" >&5
++echo "$as_me:4148: 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.
+@@ -4155,7 +4158,7 @@
+ 		;;
+ 	esac
+ fi;
+-echo "$as_me:4158: result: $DESTDIR" >&5
++echo "$as_me:4161: result: $DESTDIR" >&5
+ echo "${ECHO_T}$DESTDIR" >&6
+ 
+ ###############################################################################
+@@ -4183,7 +4186,7 @@
+ do
+   # Extract the first word of "$ac_prog", so it can be a program name with args.
+ set dummy $ac_prog; ac_word=$2
+-echo "$as_me:4186: checking for $ac_word" >&5
++echo "$as_me:4189: checking for $ac_word" >&5
+ echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+ if test "${ac_cv_prog_BUILD_CC+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -4198,7 +4201,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:4201: found $ac_dir/$ac_word" >&5
++echo "$as_me:4204: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -4206,10 +4209,10 @@
+ fi
+ BUILD_CC=$ac_cv_prog_BUILD_CC
+ if test -n "$BUILD_CC"; then
+-  echo "$as_me:4209: result: $BUILD_CC" >&5
++  echo "$as_me:4212: result: $BUILD_CC" >&5
+ echo "${ECHO_T}$BUILD_CC" >&6
+ else
+-  echo "$as_me:4212: result: no" >&5
++  echo "$as_me:4215: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -4218,12 +4221,12 @@
+ test -n "$BUILD_CC" || BUILD_CC="none"
+ 
+ fi;
+-	echo "$as_me:4221: checking for native build C compiler" >&5
++	echo "$as_me:4224: checking for native build C compiler" >&5
+ echo $ECHO_N "checking for native build C compiler... $ECHO_C" >&6
+-	echo "$as_me:4223: result: $BUILD_CC" >&5
++	echo "$as_me:4226: result: $BUILD_CC" >&5
+ echo "${ECHO_T}$BUILD_CC" >&6
+ 
+-	echo "$as_me:4226: checking for native build C preprocessor" >&5
++	echo "$as_me:4229: 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.
+@@ -4233,10 +4236,10 @@
+ else
+   BUILD_CPP='${BUILD_CC} -E'
+ fi;
+-	echo "$as_me:4236: result: $BUILD_CPP" >&5
++	echo "$as_me:4239: result: $BUILD_CPP" >&5
+ echo "${ECHO_T}$BUILD_CPP" >&6
+ 
+-	echo "$as_me:4239: checking for native build C flags" >&5
++	echo "$as_me:4242: 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.
+@@ -4244,10 +4247,10 @@
+   withval="$with_build_cflags"
+   BUILD_CFLAGS="$withval"
+ fi;
+-	echo "$as_me:4247: result: $BUILD_CFLAGS" >&5
++	echo "$as_me:4250: result: $BUILD_CFLAGS" >&5
+ echo "${ECHO_T}$BUILD_CFLAGS" >&6
+ 
+-	echo "$as_me:4250: checking for native build C preprocessor-flags" >&5
++	echo "$as_me:4253: 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.
+@@ -4255,10 +4258,10 @@
+   withval="$with_build_cppflags"
+   BUILD_CPPFLAGS="$withval"
+ fi;
+-	echo "$as_me:4258: result: $BUILD_CPPFLAGS" >&5
++	echo "$as_me:4261: result: $BUILD_CPPFLAGS" >&5
+ echo "${ECHO_T}$BUILD_CPPFLAGS" >&6
+ 
+-	echo "$as_me:4261: checking for native build linker-flags" >&5
++	echo "$as_me:4264: 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.
+@@ -4266,10 +4269,10 @@
+   withval="$with_build_ldflags"
+   BUILD_LDFLAGS="$withval"
+ fi;
+-	echo "$as_me:4269: result: $BUILD_LDFLAGS" >&5
++	echo "$as_me:4272: result: $BUILD_LDFLAGS" >&5
+ echo "${ECHO_T}$BUILD_LDFLAGS" >&6
+ 
+-	echo "$as_me:4272: checking for native build linker-libraries" >&5
++	echo "$as_me:4275: 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.
+@@ -4277,7 +4280,7 @@
+   withval="$with_build_libs"
+   BUILD_LIBS="$withval"
+ fi;
+-	echo "$as_me:4280: result: $BUILD_LIBS" >&5
++	echo "$as_me:4283: result: $BUILD_LIBS" >&5
+ echo "${ECHO_T}$BUILD_LIBS" >&6
+ 
+ 	# this assumes we're on Unix.
+@@ -4287,7 +4290,7 @@
+ 	: ${BUILD_CC:='${CC}'}
+ 
+ 	if { test "$BUILD_CC" = "$CC" || test "$BUILD_CC" = '${CC}'; } ; then
+-		{ { echo "$as_me:4290: error: Cross-build requires two compilers.
++		{ { echo "$as_me:4293: 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;}
+@@ -4312,7 +4315,7 @@
+ ### shared, for example.
+ cf_list_models=""
+ 
+-echo "$as_me:4315: checking if you want to build shared C-objects" >&5
++echo "$as_me:4318: checking if you want to build shared C-objects" >&5
+ echo $ECHO_N "checking if you want to build shared C-objects... $ECHO_C" >&6
+ 
+ # Check whether --with-shared or --without-shared was given.
+@@ -4322,27 +4325,27 @@
+ else
+   with_shared=no
+ fi;
+-echo "$as_me:4325: result: $with_shared" >&5
++echo "$as_me:4328: result: $with_shared" >&5
+ echo "${ECHO_T}$with_shared" >&6
+ test "$with_shared" = "yes" && cf_list_models="$cf_list_models shared"
+ 
+-echo "$as_me:4329: checking for specified models" >&5
++echo "$as_me:4332: checking for specified models" >&5
+ echo $ECHO_N "checking for specified models... $ECHO_C" >&6
+ test -z "$cf_list_models" && cf_list_models=normal
+-echo "$as_me:4332: result: $cf_list_models" >&5
++echo "$as_me:4335: 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:4337: checking for default model" >&5
++echo "$as_me:4340: 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:4340: result: $DFT_LWR_MODEL" >&5
++echo "$as_me:4343: result: $DFT_LWR_MODEL" >&5
+ echo "${ECHO_T}$DFT_LWR_MODEL" >&6
+ 
+ DFT_UPR_MODEL=`echo "$DFT_LWR_MODEL" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%`
+ 
+-echo "$as_me:4345: checking for specific curses-directory" >&5
++echo "$as_me:4348: checking for specific curses-directory" >&5
+ echo $ECHO_N "checking for specific curses-directory... $ECHO_C" >&6
+ 
+ # Check whether --with-curses-dir or --without-curses-dir was given.
+@@ -4352,7 +4355,7 @@
+ else
+   cf_cv_curses_dir=no
+ fi;
+-echo "$as_me:4355: result: $cf_cv_curses_dir" >&5
++echo "$as_me:4358: result: $cf_cv_curses_dir" >&5
+ echo "${ECHO_T}$cf_cv_curses_dir" >&6
+ 
+ if test -n "$cf_cv_curses_dir" && test "$cf_cv_curses_dir" != "no"
+@@ -4383,7 +4386,7 @@
+ 	withval=`echo "$withval" | sed -e s%NONE%$cf_path_syntax%`
+ 	;;
+ (*)
+-	{ { echo "$as_me:4386: error: expected a pathname, not \"$withval\"" >&5
++	{ { echo "$as_me:4389: error: expected a pathname, not \"$withval\"" >&5
+ echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
+    { (exit 1); exit 1; }; }
+ 	;;
+@@ -4419,7 +4422,7 @@
+ 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
+ 
+ 			  cat >"conftest.$ac_ext" <<_ACEOF
+-#line 4422 "configure"
++#line 4425 "configure"
+ #include "confdefs.h"
+ #include <stdio.h>
+ int
+@@ -4431,16 +4434,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:4434: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:4437: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:4437: \$? = $ac_status" >&5
++  echo "$as_me:4440: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:4440: \"$ac_try\"") >&5
++  { (eval echo "$as_me:4443: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:4443: \$? = $ac_status" >&5
++  echo "$as_me:4446: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   :
+ else
+@@ -4457,7 +4460,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}:4460: testing adding $cf_add_incdir to include-path ..." 1>&5
++echo "${as_me:-configure}:4463: testing adding $cf_add_incdir to include-path ..." 1>&5
+ 
+ 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
+ 
+@@ -4493,7 +4496,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}:4496: testing adding $cf_add_libdir to library-path ..." 1>&5
++echo "${as_me:-configure}:4499: testing adding $cf_add_libdir to library-path ..." 1>&5
+ 
+ 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
+ 			fi
+@@ -4508,13 +4511,13 @@
+ cf_have_ncuconfig=no
+ 
+ if test "x${PKG_CONFIG:=none}" != xnone; then
+-	echo "$as_me:4511: checking pkg-config for $cf_ncuconfig_root" >&5
++	echo "$as_me:4514: checking pkg-config for $cf_ncuconfig_root" >&5
+ echo $ECHO_N "checking pkg-config for $cf_ncuconfig_root... $ECHO_C" >&6
+ 	if "$PKG_CONFIG" --exists $cf_ncuconfig_root ; then
+-		echo "$as_me:4514: result: yes" >&5
++		echo "$as_me:4517: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ 
+-		echo "$as_me:4517: checking if the $cf_ncuconfig_root package files work" >&5
++		echo "$as_me:4520: checking if the $cf_ncuconfig_root package files work" >&5
+ echo $ECHO_N "checking if the $cf_ncuconfig_root package files work... $ECHO_C" >&6
+ 		cf_have_ncuconfig=unknown
+ 
+@@ -4647,7 +4650,7 @@
+ LIBS="$cf_add_libs"
+ 
+ 			cat >"conftest.$ac_ext" <<_ACEOF
+-#line 4650 "configure"
++#line 4653 "configure"
+ #include "confdefs.h"
+ #include <${cf_cv_ncurses_header:-curses.h}>
+ int
+@@ -4659,37 +4662,37 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:4662: \"$ac_link\"") >&5
++if { (eval echo "$as_me:4665: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:4665: \$? = $ac_status" >&5
++  echo "$as_me:4668: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:4668: \"$ac_try\"") >&5
++  { (eval echo "$as_me:4671: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:4671: \$? = $ac_status" >&5
++  echo "$as_me:4674: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   if test "$cross_compiling" = yes; then
+   cf_test_ncuconfig=maybe
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 4677 "configure"
++#line 4680 "configure"
+ #include "confdefs.h"
+ #include <${cf_cv_ncurses_header:-curses.h}>
+ 					int main(void)
+ 					{ const char *xx = curses_version(); return (xx == 0); }
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:4684: \"$ac_link\"") >&5
++if { (eval echo "$as_me:4687: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:4687: \$? = $ac_status" >&5
++  echo "$as_me:4690: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:4689: \"$ac_try\"") >&5
++  { (eval echo "$as_me:4692: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:4692: \$? = $ac_status" >&5
++  echo "$as_me:4695: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_test_ncuconfig=yes
+ else
+@@ -4863,7 +4866,7 @@
+ LIBS="$cf_add_libs"
+ 
+ 		cat >"conftest.$ac_ext" <<_ACEOF
+-#line 4866 "configure"
++#line 4869 "configure"
+ #include "confdefs.h"
+ #include <${cf_cv_ncurses_header:-curses.h}>
+ int
+@@ -4875,37 +4878,37 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:4878: \"$ac_link\"") >&5
++if { (eval echo "$as_me:4881: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:4881: \$? = $ac_status" >&5
++  echo "$as_me:4884: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:4884: \"$ac_try\"") >&5
++  { (eval echo "$as_me:4887: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:4887: \$? = $ac_status" >&5
++  echo "$as_me:4890: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   if test "$cross_compiling" = yes; then
+   cf_have_ncuconfig=maybe
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 4893 "configure"
++#line 4896 "configure"
+ #include "confdefs.h"
+ #include <${cf_cv_ncurses_header:-curses.h}>
+ 				int main(void)
+ 				{ const char *xx = curses_version(); return (xx == 0); }
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:4900: \"$ac_link\"") >&5
++if { (eval echo "$as_me:4903: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:4903: \$? = $ac_status" >&5
++  echo "$as_me:4906: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:4905: \"$ac_try\"") >&5
++  { (eval echo "$as_me:4908: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:4908: \$? = $ac_status" >&5
++  echo "$as_me:4911: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_have_ncuconfig=yes
+ else
+@@ -4922,7 +4925,7 @@
+ cf_have_ncuconfig=no
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+-		echo "$as_me:4925: result: $cf_have_ncuconfig" >&5
++		echo "$as_me:4928: result: $cf_have_ncuconfig" >&5
+ echo "${ECHO_T}$cf_have_ncuconfig" >&6
+ 		test "$cf_have_ncuconfig" = maybe && cf_have_ncuconfig=yes
+ 		if test "$cf_have_ncuconfig" != "yes"
+@@ -4938,7 +4941,7 @@
+ 
+ 			NCURSES_CONFIG_PKG=$cf_ncuconfig_root
+ 
+-echo "$as_me:4941: checking for terminfo header" >&5
++echo "$as_me:4944: checking for terminfo header" >&5
+ echo $ECHO_N "checking for terminfo header... $ECHO_C" >&6
+ if test "${cf_cv_term_header+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -4956,7 +4959,7 @@
+ for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h"
+ do
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 4959 "configure"
++#line 4962 "configure"
+ #include "confdefs.h"
+ #include <stdio.h>
+ #include <${cf_cv_ncurses_header:-curses.h}>
+@@ -4971,16 +4974,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:4974: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:4977: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:4977: \$? = $ac_status" >&5
++  echo "$as_me:4980: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:4980: \"$ac_try\"") >&5
++  { (eval echo "$as_me:4983: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:4983: \$? = $ac_status" >&5
++  echo "$as_me:4986: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+ 
+ 	cf_cv_term_header="$cf_test"
+@@ -4996,7 +4999,7 @@
+ done
+ 
+ fi
+-echo "$as_me:4999: result: $cf_cv_term_header" >&5
++echo "$as_me:5002: result: $cf_cv_term_header" >&5
+ echo "${ECHO_T}$cf_cv_term_header" >&6
+ 
+ # Set definitions to allow ifdef'ing to accommodate subdirectories
+@@ -5031,7 +5034,7 @@
+ 		fi
+ 
+ 	else
+-		echo "$as_me:5034: result: no" >&5
++		echo "$as_me:5037: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ 		NCURSES_CONFIG_PKG=none
+ 	fi
+@@ -5047,7 +5050,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:5050: checking for $ac_word" >&5
++echo "$as_me:5053: checking for $ac_word" >&5
+ echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+ if test "${ac_cv_prog_NCURSES_CONFIG+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -5062,7 +5065,7 @@
+   test -z "$ac_dir" && ac_dir=.
+   $as_executable_p "$ac_dir/$ac_word" || continue
+ ac_cv_prog_NCURSES_CONFIG="$ac_tool_prefix$ac_prog"
+-echo "$as_me:5065: found $ac_dir/$ac_word" >&5
++echo "$as_me:5068: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -5070,10 +5073,10 @@
+ fi
+ NCURSES_CONFIG=$ac_cv_prog_NCURSES_CONFIG
+ if test -n "$NCURSES_CONFIG"; then
+-  echo "$as_me:5073: result: $NCURSES_CONFIG" >&5
++  echo "$as_me:5076: result: $NCURSES_CONFIG" >&5
+ echo "${ECHO_T}$NCURSES_CONFIG" >&6
+ else
+-  echo "$as_me:5076: result: no" >&5
++  echo "$as_me:5079: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -5086,7 +5089,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:5089: checking for $ac_word" >&5
++echo "$as_me:5092: checking for $ac_word" >&5
+ echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+ if test "${ac_cv_prog_ac_ct_NCURSES_CONFIG+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -5101,7 +5104,7 @@
+   test -z "$ac_dir" && ac_dir=.
+   $as_executable_p "$ac_dir/$ac_word" || continue
+ ac_cv_prog_ac_ct_NCURSES_CONFIG="$ac_prog"
+-echo "$as_me:5104: found $ac_dir/$ac_word" >&5
++echo "$as_me:5107: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -5109,10 +5112,10 @@
+ fi
+ ac_ct_NCURSES_CONFIG=$ac_cv_prog_ac_ct_NCURSES_CONFIG
+ if test -n "$ac_ct_NCURSES_CONFIG"; then
+-  echo "$as_me:5112: result: $ac_ct_NCURSES_CONFIG" >&5
++  echo "$as_me:5115: result: $ac_ct_NCURSES_CONFIG" >&5
+ echo "${ECHO_T}$ac_ct_NCURSES_CONFIG" >&6
+ else
+-  echo "$as_me:5115: result: no" >&5
++  echo "$as_me:5118: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -5269,7 +5272,7 @@
+ 
+ 		# even with config script, some packages use no-override for curses.h
+ 
+-echo "$as_me:5272: checking if we have identified curses headers" >&5
++echo "$as_me:5275: checking if we have identified curses headers" >&5
+ echo $ECHO_N "checking if we have identified curses headers... $ECHO_C" >&6
+ if test "${cf_cv_ncurses_header+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -5281,7 +5284,7 @@
+ 	curses.h ncurses/curses.h
+ do
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 5284 "configure"
++#line 5287 "configure"
+ #include "confdefs.h"
+ #include <${cf_header}>
+ int
+@@ -5293,16 +5296,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:5296: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:5299: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:5299: \$? = $ac_status" >&5
++  echo "$as_me:5302: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:5302: \"$ac_try\"") >&5
++  { (eval echo "$as_me:5305: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:5305: \$? = $ac_status" >&5
++  echo "$as_me:5308: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_ncurses_header=$cf_header; break
+ else
+@@ -5313,11 +5316,11 @@
+ done
+ 
+ fi
+-echo "$as_me:5316: result: $cf_cv_ncurses_header" >&5
++echo "$as_me:5319: result: $cf_cv_ncurses_header" >&5
+ echo "${ECHO_T}$cf_cv_ncurses_header" >&6
+ 
+ if test "$cf_cv_ncurses_header" = none ; then
+-	{ { echo "$as_me:5320: error: No curses header-files found" >&5
++	{ { echo "$as_me:5323: error: No curses header-files found" >&5
+ echo "$as_me: error: No curses header-files found" >&2;}
+    { (exit 1); exit 1; }; }
+ fi
+@@ -5327,23 +5330,23 @@
+ for ac_header in $cf_cv_ncurses_header
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-echo "$as_me:5330: checking for $ac_header" >&5
++echo "$as_me:5333: 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 5336 "configure"
++#line 5339 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:5340: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:5343: \"$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:5346: \$? = $ac_status" >&5
++  echo "$as_me:5349: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -5362,7 +5365,7 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:5365: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
++echo "$as_me:5368: 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
+@@ -5418,7 +5421,7 @@
+ 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
+ 
+ 			  cat >"conftest.$ac_ext" <<_ACEOF
+-#line 5421 "configure"
++#line 5424 "configure"
+ #include "confdefs.h"
+ #include <stdio.h>
+ int
+@@ -5430,16 +5433,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:5433: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:5436: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:5436: \$? = $ac_status" >&5
++  echo "$as_me:5439: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:5439: \"$ac_try\"") >&5
++  { (eval echo "$as_me:5442: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:5442: \$? = $ac_status" >&5
++  echo "$as_me:5445: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   :
+ else
+@@ -5456,7 +5459,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}:5459: testing adding $cf_add_incdir to include-path ..." 1>&5
++echo "${as_me:-configure}:5462: testing adding $cf_add_incdir to include-path ..." 1>&5
+ 
+ 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
+ 
+@@ -5475,7 +5478,7 @@
+ 
+ }
+ 
+-echo "$as_me:5478: checking for $cf_ncuhdr_root header in include-path" >&5
++echo "$as_me:5481: checking for $cf_ncuhdr_root header in include-path" >&5
+ echo $ECHO_N "checking for $cf_ncuhdr_root header in include-path... $ECHO_C" >&6
+ if test "${cf_cv_ncurses_h+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -5487,7 +5490,7 @@
+ 	do
+ 
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 5490 "configure"
++#line 5493 "configure"
+ #include "confdefs.h"
+ 
+ #include <$cf_header>
+@@ -5511,16 +5514,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:5514: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:5517: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:5517: \$? = $ac_status" >&5
++  echo "$as_me:5520: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:5520: \"$ac_try\"") >&5
++  { (eval echo "$as_me:5523: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:5523: \$? = $ac_status" >&5
++  echo "$as_me:5526: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_ncurses_h=$cf_header
+ 
+@@ -5535,14 +5538,14 @@
+ 	done
+ 
+ fi
+-echo "$as_me:5538: result: $cf_cv_ncurses_h" >&5
++echo "$as_me:5541: result: $cf_cv_ncurses_h" >&5
+ echo "${ECHO_T}$cf_cv_ncurses_h" >&6
+ 
+ if test "$cf_cv_ncurses_h" != no ; then
+ 	cf_cv_ncurses_header=$cf_cv_ncurses_h
+ else
+ 
+-echo "$as_me:5545: checking for $cf_ncuhdr_root include-path" >&5
++echo "$as_me:5548: checking for $cf_ncuhdr_root include-path" >&5
+ echo $ECHO_N "checking for $cf_ncuhdr_root include-path... $ECHO_C" >&6
+ if test "${cf_cv_ncurses_h2+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -5663,7 +5666,7 @@
+ 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
+ 
+ 			  cat >"conftest.$ac_ext" <<_ACEOF
+-#line 5666 "configure"
++#line 5669 "configure"
+ #include "confdefs.h"
+ #include <stdio.h>
+ int
+@@ -5675,16 +5678,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:5678: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:5681: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:5681: \$? = $ac_status" >&5
++  echo "$as_me:5684: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:5684: \"$ac_try\"") >&5
++  { (eval echo "$as_me:5687: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:5687: \$? = $ac_status" >&5
++  echo "$as_me:5690: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   :
+ else
+@@ -5701,7 +5704,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}:5704: testing adding $cf_add_incdir to include-path ..." 1>&5
++echo "${as_me:-configure}:5707: testing adding $cf_add_incdir to include-path ..." 1>&5
+ 
+ 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
+ 
+@@ -5724,7 +5727,7 @@
+ 		do
+ 
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 5727 "configure"
++#line 5730 "configure"
+ #include "confdefs.h"
+ 
+ #include <$cf_header>
+@@ -5748,16 +5751,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:5751: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:5754: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:5754: \$? = $ac_status" >&5
++  echo "$as_me:5757: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:5757: \"$ac_try\"") >&5
++  { (eval echo "$as_me:5760: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:5760: \$? = $ac_status" >&5
++  echo "$as_me:5763: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_ncurses_h2=$cf_header
+ 
+@@ -5778,12 +5781,12 @@
+ 		CPPFLAGS="$cf_save2_CPPFLAGS"
+ 		test "$cf_cv_ncurses_h2" != no && break
+ 	done
+-	test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:5781: error: not found" >&5
++	test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:5784: error: not found" >&5
+ echo "$as_me: error: not found" >&2;}
+    { (exit 1); exit 1; }; }
+ 
+ fi
+-echo "$as_me:5786: result: $cf_cv_ncurses_h2" >&5
++echo "$as_me:5789: result: $cf_cv_ncurses_h2" >&5
+ echo "${ECHO_T}$cf_cv_ncurses_h2" >&6
+ 
+ 	cf_1st_incdir=`echo "$cf_cv_ncurses_h2" | sed -e 's%/[^/]*$%%'`
+@@ -5819,7 +5822,7 @@
+ 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
+ 
+ 			  cat >"conftest.$ac_ext" <<_ACEOF
+-#line 5822 "configure"
++#line 5825 "configure"
+ #include "confdefs.h"
+ #include <stdio.h>
+ int
+@@ -5831,16 +5834,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:5834: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:5837: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:5837: \$? = $ac_status" >&5
++  echo "$as_me:5840: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:5840: \"$ac_try\"") >&5
++  { (eval echo "$as_me:5843: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:5843: \$? = $ac_status" >&5
++  echo "$as_me:5846: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   :
+ else
+@@ -5857,7 +5860,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}:5860: testing adding $cf_add_incdir to include-path ..." 1>&5
++echo "${as_me:-configure}:5863: testing adding $cf_add_incdir to include-path ..." 1>&5
+ 
+ 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
+ 
+@@ -5905,7 +5908,7 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:5908: checking for terminfo header" >&5
++echo "$as_me:5911: checking for terminfo header" >&5
+ echo $ECHO_N "checking for terminfo header... $ECHO_C" >&6
+ if test "${cf_cv_term_header+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -5923,7 +5926,7 @@
+ for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h"
+ do
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 5926 "configure"
++#line 5929 "configure"
+ #include "confdefs.h"
+ #include <stdio.h>
+ #include <${cf_cv_ncurses_header:-curses.h}>
+@@ -5938,16 +5941,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:5941: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:5944: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:5944: \$? = $ac_status" >&5
++  echo "$as_me:5947: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:5947: \"$ac_try\"") >&5
++  { (eval echo "$as_me:5950: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:5950: \$? = $ac_status" >&5
++  echo "$as_me:5953: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+ 
+ 	cf_cv_term_header="$cf_test"
+@@ -5963,7 +5966,7 @@
+ done
+ 
+ fi
+-echo "$as_me:5966: result: $cf_cv_term_header" >&5
++echo "$as_me:5969: result: $cf_cv_term_header" >&5
+ echo "${ECHO_T}$cf_cv_term_header" >&6
+ 
+ # Set definitions to allow ifdef'ing to accommodate subdirectories
+@@ -6001,7 +6004,7 @@
+ #define NCURSES 1
+ EOF
+ 
+-echo "$as_me:6004: checking for ncurses version" >&5
++echo "$as_me:6007: checking for ncurses version" >&5
+ echo $ECHO_N "checking for ncurses version... $ECHO_C" >&6
+ if test "${cf_cv_ncurses_version+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -6027,10 +6030,10 @@
+ #endif
+ EOF
+ 	cf_try="$ac_cpp conftest.$ac_ext 2>&5 | grep '^Autoconf ' >conftest.out"
+-	{ (eval echo "$as_me:6030: \"$cf_try\"") >&5
++	{ (eval echo "$as_me:6033: \"$cf_try\"") >&5
+   (eval $cf_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:6033: \$? = $ac_status" >&5
++  echo "$as_me:6036: \$? = $ac_status" >&5
+   (exit "$ac_status"); }
+ 	if test -f conftest.out ; then
+ 		cf_out=`sed -e 's%^Autoconf %%' -e 's%^[^"]*"%%' -e 's%".*%%' conftest.out`
+@@ -6040,7 +6043,7 @@
+ 
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 6043 "configure"
++#line 6046 "configure"
+ #include "confdefs.h"
+ 
+ #include <${cf_cv_ncurses_header:-curses.h}>
+@@ -6065,15 +6068,15 @@
+ }
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:6068: \"$ac_link\"") >&5
++if { (eval echo "$as_me:6071: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:6071: \$? = $ac_status" >&5
++  echo "$as_me:6074: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:6073: \"$ac_try\"") >&5
++  { (eval echo "$as_me:6076: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:6076: \$? = $ac_status" >&5
++  echo "$as_me:6079: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+ 
+ 	cf_cv_ncurses_version=`cat $cf_tempfile`
+@@ -6087,7 +6090,7 @@
+ 	rm -f "$cf_tempfile"
+ 
+ fi
+-echo "$as_me:6090: result: $cf_cv_ncurses_version" >&5
++echo "$as_me:6093: result: $cf_cv_ncurses_version" >&5
+ echo "${ECHO_T}$cf_cv_ncurses_version" >&6
+ test "$cf_cv_ncurses_version" = no ||
+ cat >>confdefs.h <<\EOF
+@@ -6100,7 +6103,7 @@
+ 	# to link gpm.
+ cf_ncurses_LIBS=""
+ cf_ncurses_SAVE="$LIBS"
+-echo "$as_me:6103: checking for Gpm_Open in -lgpm" >&5
++echo "$as_me:6106: 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
+@@ -6108,7 +6111,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lgpm  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 6111 "configure"
++#line 6114 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -6127,16 +6130,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:6130: \"$ac_link\"") >&5
++if { (eval echo "$as_me:6133: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:6133: \$? = $ac_status" >&5
++  echo "$as_me:6136: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:6136: \"$ac_try\"") >&5
++  { (eval echo "$as_me:6139: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:6139: \$? = $ac_status" >&5
++  echo "$as_me:6142: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_gpm_Gpm_Open=yes
+ else
+@@ -6147,10 +6150,10 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:6150: result: $ac_cv_lib_gpm_Gpm_Open" >&5
++echo "$as_me:6153: result: $ac_cv_lib_gpm_Gpm_Open" >&5
+ echo "${ECHO_T}$ac_cv_lib_gpm_Gpm_Open" >&6
+ if test "$ac_cv_lib_gpm_Gpm_Open" = yes; then
+-  echo "$as_me:6153: checking for initscr in -lgpm" >&5
++  echo "$as_me:6156: checking for initscr in -lgpm" >&5
+ echo $ECHO_N "checking for initscr in -lgpm... $ECHO_C" >&6
+ if test "${ac_cv_lib_gpm_initscr+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -6158,7 +6161,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lgpm  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 6161 "configure"
++#line 6164 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -6177,16 +6180,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:6180: \"$ac_link\"") >&5
++if { (eval echo "$as_me:6183: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:6183: \$? = $ac_status" >&5
++  echo "$as_me:6186: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:6186: \"$ac_try\"") >&5
++  { (eval echo "$as_me:6189: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:6189: \$? = $ac_status" >&5
++  echo "$as_me:6192: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_gpm_initscr=yes
+ else
+@@ -6197,7 +6200,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:6200: result: $ac_cv_lib_gpm_initscr" >&5
++echo "$as_me:6203: result: $ac_cv_lib_gpm_initscr" >&5
+ echo "${ECHO_T}$ac_cv_lib_gpm_initscr" >&6
+ if test "$ac_cv_lib_gpm_initscr" = yes; then
+   LIBS="$cf_ncurses_SAVE"
+@@ -6212,7 +6215,7 @@
+ 	# This is only necessary if you are linking against an obsolete
+ 	# version of ncurses (but it should do no harm, since it is static).
+ 	if test "$cf_nculib_root" = ncurses ; then
+-		echo "$as_me:6215: checking for tgoto in -lmytinfo" >&5
++		echo "$as_me:6218: checking for tgoto in -lmytinfo" >&5
+ echo $ECHO_N "checking for tgoto in -lmytinfo... $ECHO_C" >&6
+ if test "${ac_cv_lib_mytinfo_tgoto+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -6220,7 +6223,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lmytinfo  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 6223 "configure"
++#line 6226 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -6239,16 +6242,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:6242: \"$ac_link\"") >&5
++if { (eval echo "$as_me:6245: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:6245: \$? = $ac_status" >&5
++  echo "$as_me:6248: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:6248: \"$ac_try\"") >&5
++  { (eval echo "$as_me:6251: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:6251: \$? = $ac_status" >&5
++  echo "$as_me:6254: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_mytinfo_tgoto=yes
+ else
+@@ -6259,7 +6262,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:6262: result: $ac_cv_lib_mytinfo_tgoto" >&5
++echo "$as_me:6265: result: $ac_cv_lib_mytinfo_tgoto" >&5
+ echo "${ECHO_T}$ac_cv_lib_mytinfo_tgoto" >&6
+ if test "$ac_cv_lib_mytinfo_tgoto" = yes; then
+   cf_ncurses_LIBS="-lmytinfo $cf_ncurses_LIBS"
+@@ -6308,13 +6311,13 @@
+ 
+ 	eval 'cf_cv_have_lib_'"$cf_nculib_root"'=no'
+ 	cf_libdir=""
+-	echo "$as_me:6311: checking for initscr" >&5
++	echo "$as_me:6314: checking for initscr" >&5
+ echo $ECHO_N "checking for initscr... $ECHO_C" >&6
+ if test "${ac_cv_func_initscr+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 6317 "configure"
++#line 6320 "configure"
+ #include "confdefs.h"
+ #define initscr autoconf_temporary
+ #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -6345,16 +6348,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:6348: \"$ac_link\"") >&5
++if { (eval echo "$as_me:6351: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:6351: \$? = $ac_status" >&5
++  echo "$as_me:6354: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:6354: \"$ac_try\"") >&5
++  { (eval echo "$as_me:6357: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:6357: \$? = $ac_status" >&5
++  echo "$as_me:6360: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_func_initscr=yes
+ else
+@@ -6364,18 +6367,18 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:6367: result: $ac_cv_func_initscr" >&5
++echo "$as_me:6370: result: $ac_cv_func_initscr" >&5
+ echo "${ECHO_T}$ac_cv_func_initscr" >&6
+ if test "$ac_cv_func_initscr" = yes; then
+   eval 'cf_cv_have_lib_'"$cf_nculib_root"'=yes'
+ else
+ 
+ 		cf_save_LIBS="$LIBS"
+-		echo "$as_me:6374: checking for initscr in -l$cf_nculib_root" >&5
++		echo "$as_me:6377: checking for initscr in -l$cf_nculib_root" >&5
+ echo $ECHO_N "checking for initscr in -l$cf_nculib_root... $ECHO_C" >&6
+ 		LIBS="-l$cf_nculib_root $LIBS"
+ 		cat >"conftest.$ac_ext" <<_ACEOF
+-#line 6378 "configure"
++#line 6381 "configure"
+ #include "confdefs.h"
+ #include <${cf_cv_ncurses_header:-curses.h}>
+ int
+@@ -6387,25 +6390,25 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:6390: \"$ac_link\"") >&5
++if { (eval echo "$as_me:6393: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:6393: \$? = $ac_status" >&5
++  echo "$as_me:6396: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:6396: \"$ac_try\"") >&5
++  { (eval echo "$as_me:6399: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:6399: \$? = $ac_status" >&5
++  echo "$as_me:6402: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+-  echo "$as_me:6401: result: yes" >&5
++  echo "$as_me:6404: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ 			 eval 'cf_cv_have_lib_'"$cf_nculib_root"'=yes'
+ 
+ else
+   echo "$as_me: failed program was:" >&5
+ cat "conftest.$ac_ext" >&5
+-echo "$as_me:6408: result: no" >&5
++echo "$as_me:6411: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ 
+ cf_search=
+@@ -6473,11 +6476,11 @@
+ 
+ 			for cf_libdir in $cf_search
+ 			do
+-				echo "$as_me:6476: checking for -l$cf_nculib_root in $cf_libdir" >&5
++				echo "$as_me:6479: checking for -l$cf_nculib_root in $cf_libdir" >&5
+ echo $ECHO_N "checking for -l$cf_nculib_root in $cf_libdir... $ECHO_C" >&6
+ 				LIBS="-L$cf_libdir -l$cf_nculib_root $cf_save_LIBS"
+ 				cat >"conftest.$ac_ext" <<_ACEOF
+-#line 6480 "configure"
++#line 6483 "configure"
+ #include "confdefs.h"
+ #include <${cf_cv_ncurses_header:-curses.h}>
+ int
+@@ -6489,25 +6492,25 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:6492: \"$ac_link\"") >&5
++if { (eval echo "$as_me:6495: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:6495: \$? = $ac_status" >&5
++  echo "$as_me:6498: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:6498: \"$ac_try\"") >&5
++  { (eval echo "$as_me:6501: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:6501: \$? = $ac_status" >&5
++  echo "$as_me:6504: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+-  echo "$as_me:6503: result: yes" >&5
++  echo "$as_me:6506: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ 			 		 eval 'cf_cv_have_lib_'"$cf_nculib_root"'=yes'
+ 					 break
+ else
+   echo "$as_me: failed program was:" >&5
+ cat "conftest.$ac_ext" >&5
+-echo "$as_me:6510: result: no" >&5
++echo "$as_me:6513: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ 					 LIBS="$cf_save_LIBS"
+ fi
+@@ -6522,7 +6525,7 @@
+ eval 'cf_found_library="$cf_cv_have_lib_'"$cf_nculib_root"\"
+ 
+ if test "$cf_found_library" = no ; then
+-	{ { echo "$as_me:6525: error: Cannot link $cf_nculib_root library" >&5
++	{ { echo "$as_me:6528: error: Cannot link $cf_nculib_root library" >&5
+ echo "$as_me: error: Cannot link $cf_nculib_root library" >&2;}
+    { (exit 1); exit 1; }; }
+ fi
+@@ -6530,7 +6533,7 @@
+ fi
+ 
+ if test -n "$cf_ncurses_LIBS" ; then
+-	echo "$as_me:6533: checking if we can link $cf_nculib_root without $cf_ncurses_LIBS" >&5
++	echo "$as_me:6536: checking if we can link $cf_nculib_root without $cf_ncurses_LIBS" >&5
+ echo $ECHO_N "checking if we can link $cf_nculib_root without $cf_ncurses_LIBS... $ECHO_C" >&6
+ 	cf_ncurses_SAVE="$LIBS"
+ 	for p in $cf_ncurses_LIBS ; do
+@@ -6540,7 +6543,7 @@
+ 		fi
+ 	done
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 6543 "configure"
++#line 6546 "configure"
+ #include "confdefs.h"
+ #include <${cf_cv_ncurses_header:-curses.h}>
+ int
+@@ -6552,23 +6555,23 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:6555: \"$ac_link\"") >&5
++if { (eval echo "$as_me:6558: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:6558: \$? = $ac_status" >&5
++  echo "$as_me:6561: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:6561: \"$ac_try\"") >&5
++  { (eval echo "$as_me:6564: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:6564: \$? = $ac_status" >&5
++  echo "$as_me:6567: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+-  echo "$as_me:6566: result: yes" >&5
++  echo "$as_me:6569: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ else
+   echo "$as_me: failed program was:" >&5
+ cat "conftest.$ac_ext" >&5
+-echo "$as_me:6571: result: no" >&5
++echo "$as_me:6574: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ 		 LIBS="$cf_ncurses_SAVE"
+ fi
+@@ -6586,7 +6589,7 @@
+ 	NCURSES_CONFIG=none
+ fi
+ 
+-echo "$as_me:6589: checking if you want wide-character code" >&5
++echo "$as_me:6592: 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.
+@@ -6596,30 +6599,30 @@
+ else
+   with_widec=no
+ fi;
+-echo "$as_me:6599: result: $with_widec" >&5
++echo "$as_me:6602: result: $with_widec" >&5
+ echo "${ECHO_T}$with_widec" >&6
+ if test "$with_widec" = yes ; then
+ 
+ for ac_header in wchar.h
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-echo "$as_me:6606: checking for $ac_header" >&5
++echo "$as_me:6609: 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 6612 "configure"
++#line 6615 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:6616: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:6619: \"$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:6622: \$? = $ac_status" >&5
++  echo "$as_me:6625: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -6638,7 +6641,7 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:6641: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
++echo "$as_me:6644: 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
+@@ -6648,7 +6651,7 @@
+ fi
+ done
+ 
+-echo "$as_me:6651: checking for multibyte character support" >&5
++echo "$as_me:6654: 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
+@@ -6656,7 +6659,7 @@
+ 
+ 	cf_save_LIBS="$LIBS"
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 6659 "configure"
++#line 6662 "configure"
+ #include "confdefs.h"
+ 
+ #include <stdlib.h>
+@@ -6674,16 +6677,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:6677: \"$ac_link\"") >&5
++if { (eval echo "$as_me:6680: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:6680: \$? = $ac_status" >&5
++  echo "$as_me:6683: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:6683: \"$ac_try\"") >&5
++  { (eval echo "$as_me:6686: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:6686: \$? = $ac_status" >&5
++  echo "$as_me:6689: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_utf8_lib=yes
+ else
+@@ -6695,12 +6698,12 @@
+ cf_cv_header_path_utf8=
+ cf_cv_library_path_utf8=
+ 
+-echo "${as_me:-configure}:6698: testing Starting FIND_LINKAGE(utf8,) ..." 1>&5
++echo "${as_me:-configure}:6701: testing Starting FIND_LINKAGE(utf8,) ..." 1>&5
+ 
+ cf_save_LIBS="$LIBS"
+ 
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 6703 "configure"
++#line 6706 "configure"
+ #include "confdefs.h"
+ 
+ #include <libutf8.h>
+@@ -6713,16 +6716,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:6716: \"$ac_link\"") >&5
++if { (eval echo "$as_me:6719: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:6719: \$? = $ac_status" >&5
++  echo "$as_me:6722: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:6722: \"$ac_try\"") >&5
++  { (eval echo "$as_me:6725: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:6725: \$? = $ac_status" >&5
++  echo "$as_me:6728: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+ 
+ 	cf_cv_find_linkage_utf8=yes
+@@ -6736,7 +6739,7 @@
+ LIBS="-lutf8  $cf_save_LIBS"
+ 
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 6739 "configure"
++#line 6742 "configure"
+ #include "confdefs.h"
+ 
+ #include <libutf8.h>
+@@ -6749,16 +6752,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:6752: \"$ac_link\"") >&5
++if { (eval echo "$as_me:6755: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:6755: \$? = $ac_status" >&5
++  echo "$as_me:6758: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:6758: \"$ac_try\"") >&5
++  { (eval echo "$as_me:6761: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:6761: \$? = $ac_status" >&5
++  echo "$as_me:6764: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+ 
+ 	cf_cv_find_linkage_utf8=yes
+@@ -6775,9 +6778,9 @@
+ 
+ 	test -n "$verbose" && echo "	find linkage for utf8 library" 1>&6
+ 
+-echo "${as_me:-configure}:6778: testing find linkage for utf8 library ..." 1>&5
++echo "${as_me:-configure}:6781: testing find linkage for utf8 library ..." 1>&5
+ 
+-echo "${as_me:-configure}:6780: testing Searching for headers in FIND_LINKAGE(utf8,) ..." 1>&5
++echo "${as_me:-configure}:6783: testing Searching for headers in FIND_LINKAGE(utf8,) ..." 1>&5
+ 
+ 	cf_save_CPPFLAGS="$CPPFLAGS"
+ 	cf_test_CPPFLAGS="$CPPFLAGS"
+@@ -6868,7 +6871,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}:6871: testing ... testing $cf_cv_header_path_utf8 ..." 1>&5
++echo "${as_me:-configure}:6874: testing ... testing $cf_cv_header_path_utf8 ..." 1>&5
+ 
+ 			CPPFLAGS="$cf_save_CPPFLAGS"
+ 
+@@ -6876,7 +6879,7 @@
+ 	CPPFLAGS="${CPPFLAGS}-I$cf_cv_header_path_utf8"
+ 
+ 			cat >"conftest.$ac_ext" <<_ACEOF
+-#line 6879 "configure"
++#line 6882 "configure"
+ #include "confdefs.h"
+ 
+ #include <libutf8.h>
+@@ -6889,21 +6892,21 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:6892: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:6895: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:6895: \$? = $ac_status" >&5
++  echo "$as_me:6898: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:6898: \"$ac_try\"") >&5
++  { (eval echo "$as_me:6901: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:6901: \$? = $ac_status" >&5
++  echo "$as_me:6904: \$? = $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}:6906: testing ... found utf8 headers in $cf_cv_header_path_utf8 ..." 1>&5
++echo "${as_me:-configure}:6909: testing ... found utf8 headers in $cf_cv_header_path_utf8 ..." 1>&5
+ 
+ 				cf_cv_find_linkage_utf8=maybe
+ 				cf_test_CPPFLAGS="$CPPFLAGS"
+@@ -6921,7 +6924,7 @@
+ 
+ 	if test "$cf_cv_find_linkage_utf8" = maybe ; then
+ 
+-echo "${as_me:-configure}:6924: testing Searching for utf8 library in FIND_LINKAGE(utf8,) ..." 1>&5
++echo "${as_me:-configure}:6927: testing Searching for utf8 library in FIND_LINKAGE(utf8,) ..." 1>&5
+ 
+ 		cf_save_LIBS="$LIBS"
+ 		cf_save_LDFLAGS="$LDFLAGS"
+@@ -6996,13 +6999,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}:6999: testing ... testing $cf_cv_library_path_utf8 ..." 1>&5
++echo "${as_me:-configure}:7002: 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 7005 "configure"
++#line 7008 "configure"
+ #include "confdefs.h"
+ 
+ #include <libutf8.h>
+@@ -7015,21 +7018,21 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:7018: \"$ac_link\"") >&5
++if { (eval echo "$as_me:7021: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:7021: \$? = $ac_status" >&5
++  echo "$as_me:7024: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:7024: \"$ac_try\"") >&5
++  { (eval echo "$as_me:7027: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:7027: \$? = $ac_status" >&5
++  echo "$as_me:7030: \$? = $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}:7032: testing ... found utf8 library in $cf_cv_library_path_utf8 ..." 1>&5
++echo "${as_me:-configure}:7035: testing ... found utf8 library in $cf_cv_library_path_utf8 ..." 1>&5
+ 
+ 					cf_cv_find_linkage_utf8=yes
+ 					cf_cv_library_file_utf8="-lutf8"
+@@ -7071,7 +7074,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:7074: result: $cf_cv_utf8_lib" >&5
++echo "$as_me:7077: 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
+@@ -7109,7 +7112,7 @@
+ 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
+ 
+ 			  cat >"conftest.$ac_ext" <<_ACEOF
+-#line 7112 "configure"
++#line 7115 "configure"
+ #include "confdefs.h"
+ #include <stdio.h>
+ int
+@@ -7121,16 +7124,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:7124: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:7127: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:7127: \$? = $ac_status" >&5
++  echo "$as_me:7130: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:7130: \"$ac_try\"") >&5
++  { (eval echo "$as_me:7133: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:7133: \$? = $ac_status" >&5
++  echo "$as_me:7136: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   :
+ else
+@@ -7147,7 +7150,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}:7150: testing adding $cf_add_incdir to include-path ..." 1>&5
++echo "${as_me:-configure}:7153: testing adding $cf_add_incdir to include-path ..." 1>&5
+ 
+ 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
+ 
+@@ -7183,7 +7186,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}:7186: testing adding $cf_add_libdir to library-path ..." 1>&5
++echo "${as_me:-configure}:7189: testing adding $cf_add_libdir to library-path ..." 1>&5
+ 
+ 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
+ 			fi
+@@ -7213,13 +7216,13 @@
+ cf_have_ncuconfig=no
+ 
+ if test "x${PKG_CONFIG:=none}" != xnone; then
+-	echo "$as_me:7216: checking pkg-config for $cf_ncuconfig_root" >&5
++	echo "$as_me:7219: checking pkg-config for $cf_ncuconfig_root" >&5
+ echo $ECHO_N "checking pkg-config for $cf_ncuconfig_root... $ECHO_C" >&6
+ 	if "$PKG_CONFIG" --exists $cf_ncuconfig_root ; then
+-		echo "$as_me:7219: result: yes" >&5
++		echo "$as_me:7222: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ 
+-		echo "$as_me:7222: checking if the $cf_ncuconfig_root package files work" >&5
++		echo "$as_me:7225: checking if the $cf_ncuconfig_root package files work" >&5
+ echo $ECHO_N "checking if the $cf_ncuconfig_root package files work... $ECHO_C" >&6
+ 		cf_have_ncuconfig=unknown
+ 
+@@ -7352,7 +7355,7 @@
+ LIBS="$cf_add_libs"
+ 
+ 			cat >"conftest.$ac_ext" <<_ACEOF
+-#line 7355 "configure"
++#line 7358 "configure"
+ #include "confdefs.h"
+ #include <${cf_cv_ncurses_header:-curses.h}>
+ int
+@@ -7364,37 +7367,37 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:7367: \"$ac_link\"") >&5
++if { (eval echo "$as_me:7370: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:7370: \$? = $ac_status" >&5
++  echo "$as_me:7373: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:7373: \"$ac_try\"") >&5
++  { (eval echo "$as_me:7376: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:7376: \$? = $ac_status" >&5
++  echo "$as_me:7379: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   if test "$cross_compiling" = yes; then
+   cf_test_ncuconfig=maybe
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 7382 "configure"
++#line 7385 "configure"
+ #include "confdefs.h"
+ #include <${cf_cv_ncurses_header:-curses.h}>
+ 					int main(void)
+ 					{ const char *xx = curses_version(); return (xx == 0); }
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:7389: \"$ac_link\"") >&5
++if { (eval echo "$as_me:7392: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:7392: \$? = $ac_status" >&5
++  echo "$as_me:7395: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:7394: \"$ac_try\"") >&5
++  { (eval echo "$as_me:7397: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:7397: \$? = $ac_status" >&5
++  echo "$as_me:7400: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_test_ncuconfig=yes
+ else
+@@ -7568,7 +7571,7 @@
+ LIBS="$cf_add_libs"
+ 
+ 		cat >"conftest.$ac_ext" <<_ACEOF
+-#line 7571 "configure"
++#line 7574 "configure"
+ #include "confdefs.h"
+ #include <${cf_cv_ncurses_header:-curses.h}>
+ int
+@@ -7580,37 +7583,37 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:7583: \"$ac_link\"") >&5
++if { (eval echo "$as_me:7586: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:7586: \$? = $ac_status" >&5
++  echo "$as_me:7589: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:7589: \"$ac_try\"") >&5
++  { (eval echo "$as_me:7592: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:7592: \$? = $ac_status" >&5
++  echo "$as_me:7595: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   if test "$cross_compiling" = yes; then
+   cf_have_ncuconfig=maybe
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 7598 "configure"
++#line 7601 "configure"
+ #include "confdefs.h"
+ #include <${cf_cv_ncurses_header:-curses.h}>
+ 				int main(void)
+ 				{ const char *xx = curses_version(); return (xx == 0); }
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:7605: \"$ac_link\"") >&5
++if { (eval echo "$as_me:7608: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:7608: \$? = $ac_status" >&5
++  echo "$as_me:7611: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:7610: \"$ac_try\"") >&5
++  { (eval echo "$as_me:7613: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:7613: \$? = $ac_status" >&5
++  echo "$as_me:7616: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_have_ncuconfig=yes
+ else
+@@ -7627,7 +7630,7 @@
+ cf_have_ncuconfig=no
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+-		echo "$as_me:7630: result: $cf_have_ncuconfig" >&5
++		echo "$as_me:7633: result: $cf_have_ncuconfig" >&5
+ echo "${ECHO_T}$cf_have_ncuconfig" >&6
+ 		test "$cf_have_ncuconfig" = maybe && cf_have_ncuconfig=yes
+ 		if test "$cf_have_ncuconfig" != "yes"
+@@ -7643,7 +7646,7 @@
+ 
+ 			NCURSES_CONFIG_PKG=$cf_ncuconfig_root
+ 
+-echo "$as_me:7646: checking for terminfo header" >&5
++echo "$as_me:7649: checking for terminfo header" >&5
+ echo $ECHO_N "checking for terminfo header... $ECHO_C" >&6
+ if test "${cf_cv_term_header+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -7661,7 +7664,7 @@
+ for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h"
+ do
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 7664 "configure"
++#line 7667 "configure"
+ #include "confdefs.h"
+ #include <stdio.h>
+ #include <${cf_cv_ncurses_header:-curses.h}>
+@@ -7676,16 +7679,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:7679: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:7682: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:7682: \$? = $ac_status" >&5
++  echo "$as_me:7685: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:7685: \"$ac_try\"") >&5
++  { (eval echo "$as_me:7688: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:7688: \$? = $ac_status" >&5
++  echo "$as_me:7691: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+ 
+ 	cf_cv_term_header="$cf_test"
+@@ -7701,7 +7704,7 @@
+ done
+ 
+ fi
+-echo "$as_me:7704: result: $cf_cv_term_header" >&5
++echo "$as_me:7707: result: $cf_cv_term_header" >&5
+ echo "${ECHO_T}$cf_cv_term_header" >&6
+ 
+ # Set definitions to allow ifdef'ing to accommodate subdirectories
+@@ -7736,7 +7739,7 @@
+ 		fi
+ 
+ 	else
+-		echo "$as_me:7739: result: no" >&5
++		echo "$as_me:7742: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ 		NCURSES_CONFIG_PKG=none
+ 	fi
+@@ -7752,7 +7755,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:7755: checking for $ac_word" >&5
++echo "$as_me:7758: checking for $ac_word" >&5
+ echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+ if test "${ac_cv_prog_NCURSES_CONFIG+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -7767,7 +7770,7 @@
+   test -z "$ac_dir" && ac_dir=.
+   $as_executable_p "$ac_dir/$ac_word" || continue
+ ac_cv_prog_NCURSES_CONFIG="$ac_tool_prefix$ac_prog"
+-echo "$as_me:7770: found $ac_dir/$ac_word" >&5
++echo "$as_me:7773: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -7775,10 +7778,10 @@
+ fi
+ NCURSES_CONFIG=$ac_cv_prog_NCURSES_CONFIG
+ if test -n "$NCURSES_CONFIG"; then
+-  echo "$as_me:7778: result: $NCURSES_CONFIG" >&5
++  echo "$as_me:7781: result: $NCURSES_CONFIG" >&5
+ echo "${ECHO_T}$NCURSES_CONFIG" >&6
+ else
+-  echo "$as_me:7781: result: no" >&5
++  echo "$as_me:7784: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -7791,7 +7794,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:7794: checking for $ac_word" >&5
++echo "$as_me:7797: checking for $ac_word" >&5
+ echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+ if test "${ac_cv_prog_ac_ct_NCURSES_CONFIG+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -7806,7 +7809,7 @@
+   test -z "$ac_dir" && ac_dir=.
+   $as_executable_p "$ac_dir/$ac_word" || continue
+ ac_cv_prog_ac_ct_NCURSES_CONFIG="$ac_prog"
+-echo "$as_me:7809: found $ac_dir/$ac_word" >&5
++echo "$as_me:7812: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -7814,10 +7817,10 @@
+ fi
+ ac_ct_NCURSES_CONFIG=$ac_cv_prog_ac_ct_NCURSES_CONFIG
+ if test -n "$ac_ct_NCURSES_CONFIG"; then
+-  echo "$as_me:7817: result: $ac_ct_NCURSES_CONFIG" >&5
++  echo "$as_me:7820: result: $ac_ct_NCURSES_CONFIG" >&5
+ echo "${ECHO_T}$ac_ct_NCURSES_CONFIG" >&6
+ else
+-  echo "$as_me:7820: result: no" >&5
++  echo "$as_me:7823: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -7974,7 +7977,7 @@
+ 
+ 		# even with config script, some packages use no-override for curses.h
+ 
+-echo "$as_me:7977: checking if we have identified curses headers" >&5
++echo "$as_me:7980: checking if we have identified curses headers" >&5
+ echo $ECHO_N "checking if we have identified curses headers... $ECHO_C" >&6
+ if test "${cf_cv_ncurses_header+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -7986,7 +7989,7 @@
+ 	curses.h ncursesw/curses.h
+ do
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 7989 "configure"
++#line 7992 "configure"
+ #include "confdefs.h"
+ #include <${cf_header}>
+ int
+@@ -7998,16 +8001,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:8001: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:8004: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:8004: \$? = $ac_status" >&5
++  echo "$as_me:8007: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:8007: \"$ac_try\"") >&5
++  { (eval echo "$as_me:8010: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:8010: \$? = $ac_status" >&5
++  echo "$as_me:8013: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_ncurses_header=$cf_header; break
+ else
+@@ -8018,11 +8021,11 @@
+ done
+ 
+ fi
+-echo "$as_me:8021: result: $cf_cv_ncurses_header" >&5
++echo "$as_me:8024: result: $cf_cv_ncurses_header" >&5
+ echo "${ECHO_T}$cf_cv_ncurses_header" >&6
+ 
+ if test "$cf_cv_ncurses_header" = none ; then
+-	{ { echo "$as_me:8025: error: No curses header-files found" >&5
++	{ { echo "$as_me:8028: error: No curses header-files found" >&5
+ echo "$as_me: error: No curses header-files found" >&2;}
+    { (exit 1); exit 1; }; }
+ fi
+@@ -8032,23 +8035,23 @@
+ for ac_header in $cf_cv_ncurses_header
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-echo "$as_me:8035: checking for $ac_header" >&5
++echo "$as_me:8038: 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 8041 "configure"
++#line 8044 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:8045: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:8048: \"$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:8051: \$? = $ac_status" >&5
++  echo "$as_me:8054: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -8067,7 +8070,7 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:8070: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
++echo "$as_me:8073: 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
+@@ -8123,7 +8126,7 @@
+ 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
+ 
+ 			  cat >"conftest.$ac_ext" <<_ACEOF
+-#line 8126 "configure"
++#line 8129 "configure"
+ #include "confdefs.h"
+ #include <stdio.h>
+ int
+@@ -8135,16 +8138,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:8138: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:8141: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:8141: \$? = $ac_status" >&5
++  echo "$as_me:8144: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:8144: \"$ac_try\"") >&5
++  { (eval echo "$as_me:8147: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:8147: \$? = $ac_status" >&5
++  echo "$as_me:8150: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   :
+ else
+@@ -8161,7 +8164,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}:8164: testing adding $cf_add_incdir to include-path ..." 1>&5
++echo "${as_me:-configure}:8167: testing adding $cf_add_incdir to include-path ..." 1>&5
+ 
+ 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
+ 
+@@ -8180,7 +8183,7 @@
+ 
+ }
+ 
+-echo "$as_me:8183: checking for $cf_ncuhdr_root header in include-path" >&5
++echo "$as_me:8186: checking for $cf_ncuhdr_root header in include-path" >&5
+ echo $ECHO_N "checking for $cf_ncuhdr_root header in include-path... $ECHO_C" >&6
+ if test "${cf_cv_ncurses_h+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -8192,7 +8195,7 @@
+ 	do
+ 
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 8195 "configure"
++#line 8198 "configure"
+ #include "confdefs.h"
+ 
+ #define _XOPEN_SOURCE_EXTENDED
+@@ -8224,16 +8227,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:8227: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:8230: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:8230: \$? = $ac_status" >&5
++  echo "$as_me:8233: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:8233: \"$ac_try\"") >&5
++  { (eval echo "$as_me:8236: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:8236: \$? = $ac_status" >&5
++  echo "$as_me:8239: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_ncurses_h=$cf_header
+ 
+@@ -8248,14 +8251,14 @@
+ 	done
+ 
+ fi
+-echo "$as_me:8251: result: $cf_cv_ncurses_h" >&5
++echo "$as_me:8254: result: $cf_cv_ncurses_h" >&5
+ echo "${ECHO_T}$cf_cv_ncurses_h" >&6
+ 
+ if test "$cf_cv_ncurses_h" != no ; then
+ 	cf_cv_ncurses_header=$cf_cv_ncurses_h
+ else
+ 
+-echo "$as_me:8258: checking for $cf_ncuhdr_root include-path" >&5
++echo "$as_me:8261: checking for $cf_ncuhdr_root include-path" >&5
+ echo $ECHO_N "checking for $cf_ncuhdr_root include-path... $ECHO_C" >&6
+ if test "${cf_cv_ncurses_h2+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -8376,7 +8379,7 @@
+ 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
+ 
+ 			  cat >"conftest.$ac_ext" <<_ACEOF
+-#line 8379 "configure"
++#line 8382 "configure"
+ #include "confdefs.h"
+ #include <stdio.h>
+ int
+@@ -8388,16 +8391,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:8391: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:8394: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:8394: \$? = $ac_status" >&5
++  echo "$as_me:8397: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:8397: \"$ac_try\"") >&5
++  { (eval echo "$as_me:8400: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:8400: \$? = $ac_status" >&5
++  echo "$as_me:8403: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   :
+ else
+@@ -8414,7 +8417,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}:8417: testing adding $cf_add_incdir to include-path ..." 1>&5
++echo "${as_me:-configure}:8420: testing adding $cf_add_incdir to include-path ..." 1>&5
+ 
+ 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
+ 
+@@ -8437,7 +8440,7 @@
+ 		do
+ 
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 8440 "configure"
++#line 8443 "configure"
+ #include "confdefs.h"
+ 
+ #include <$cf_header>
+@@ -8461,16 +8464,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:8464: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:8467: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:8467: \$? = $ac_status" >&5
++  echo "$as_me:8470: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:8470: \"$ac_try\"") >&5
++  { (eval echo "$as_me:8473: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:8473: \$? = $ac_status" >&5
++  echo "$as_me:8476: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_ncurses_h2=$cf_header
+ 
+@@ -8491,12 +8494,12 @@
+ 		CPPFLAGS="$cf_save2_CPPFLAGS"
+ 		test "$cf_cv_ncurses_h2" != no && break
+ 	done
+-	test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:8494: error: not found" >&5
++	test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:8497: error: not found" >&5
+ echo "$as_me: error: not found" >&2;}
+    { (exit 1); exit 1; }; }
+ 
+ fi
+-echo "$as_me:8499: result: $cf_cv_ncurses_h2" >&5
++echo "$as_me:8502: result: $cf_cv_ncurses_h2" >&5
+ echo "${ECHO_T}$cf_cv_ncurses_h2" >&6
+ 
+ 	cf_1st_incdir=`echo "$cf_cv_ncurses_h2" | sed -e 's%/[^/]*$%%'`
+@@ -8532,7 +8535,7 @@
+ 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
+ 
+ 			  cat >"conftest.$ac_ext" <<_ACEOF
+-#line 8535 "configure"
++#line 8538 "configure"
+ #include "confdefs.h"
+ #include <stdio.h>
+ int
+@@ -8544,16 +8547,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:8547: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:8550: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:8550: \$? = $ac_status" >&5
++  echo "$as_me:8553: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:8553: \"$ac_try\"") >&5
++  { (eval echo "$as_me:8556: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:8556: \$? = $ac_status" >&5
++  echo "$as_me:8559: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   :
+ else
+@@ -8570,7 +8573,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}:8573: testing adding $cf_add_incdir to include-path ..." 1>&5
++echo "${as_me:-configure}:8576: testing adding $cf_add_incdir to include-path ..." 1>&5
+ 
+ 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
+ 
+@@ -8618,7 +8621,7 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:8621: checking for terminfo header" >&5
++echo "$as_me:8624: checking for terminfo header" >&5
+ echo $ECHO_N "checking for terminfo header... $ECHO_C" >&6
+ if test "${cf_cv_term_header+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -8636,7 +8639,7 @@
+ for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h"
+ do
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 8639 "configure"
++#line 8642 "configure"
+ #include "confdefs.h"
+ #include <stdio.h>
+ #include <${cf_cv_ncurses_header:-curses.h}>
+@@ -8651,16 +8654,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:8654: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:8657: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:8657: \$? = $ac_status" >&5
++  echo "$as_me:8660: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:8660: \"$ac_try\"") >&5
++  { (eval echo "$as_me:8663: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:8663: \$? = $ac_status" >&5
++  echo "$as_me:8666: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+ 
+ 	cf_cv_term_header="$cf_test"
+@@ -8676,7 +8679,7 @@
+ done
+ 
+ fi
+-echo "$as_me:8679: result: $cf_cv_term_header" >&5
++echo "$as_me:8682: result: $cf_cv_term_header" >&5
+ echo "${ECHO_T}$cf_cv_term_header" >&6
+ 
+ # Set definitions to allow ifdef'ing to accommodate subdirectories
+@@ -8714,7 +8717,7 @@
+ #define NCURSES 1
+ EOF
+ 
+-echo "$as_me:8717: checking for ncurses version" >&5
++echo "$as_me:8720: checking for ncurses version" >&5
+ echo $ECHO_N "checking for ncurses version... $ECHO_C" >&6
+ if test "${cf_cv_ncurses_version+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -8740,10 +8743,10 @@
+ #endif
+ EOF
+ 	cf_try="$ac_cpp conftest.$ac_ext 2>&5 | grep '^Autoconf ' >conftest.out"
+-	{ (eval echo "$as_me:8743: \"$cf_try\"") >&5
++	{ (eval echo "$as_me:8746: \"$cf_try\"") >&5
+   (eval $cf_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:8746: \$? = $ac_status" >&5
++  echo "$as_me:8749: \$? = $ac_status" >&5
+   (exit "$ac_status"); }
+ 	if test -f conftest.out ; then
+ 		cf_out=`sed -e 's%^Autoconf %%' -e 's%^[^"]*"%%' -e 's%".*%%' conftest.out`
+@@ -8753,7 +8756,7 @@
+ 
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 8756 "configure"
++#line 8759 "configure"
+ #include "confdefs.h"
+ 
+ #include <${cf_cv_ncurses_header:-curses.h}>
+@@ -8778,15 +8781,15 @@
+ }
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:8781: \"$ac_link\"") >&5
++if { (eval echo "$as_me:8784: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:8784: \$? = $ac_status" >&5
++  echo "$as_me:8787: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:8786: \"$ac_try\"") >&5
++  { (eval echo "$as_me:8789: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:8789: \$? = $ac_status" >&5
++  echo "$as_me:8792: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+ 
+ 	cf_cv_ncurses_version=`cat $cf_tempfile`
+@@ -8800,7 +8803,7 @@
+ 	rm -f "$cf_tempfile"
+ 
+ fi
+-echo "$as_me:8803: result: $cf_cv_ncurses_version" >&5
++echo "$as_me:8806: result: $cf_cv_ncurses_version" >&5
+ echo "${ECHO_T}$cf_cv_ncurses_version" >&6
+ test "$cf_cv_ncurses_version" = no ||
+ cat >>confdefs.h <<\EOF
+@@ -8813,7 +8816,7 @@
+ 	# to link gpm.
+ cf_ncurses_LIBS=""
+ cf_ncurses_SAVE="$LIBS"
+-echo "$as_me:8816: checking for Gpm_Open in -lgpm" >&5
++echo "$as_me:8819: 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
+@@ -8821,7 +8824,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lgpm  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 8824 "configure"
++#line 8827 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -8840,16 +8843,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:8843: \"$ac_link\"") >&5
++if { (eval echo "$as_me:8846: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:8846: \$? = $ac_status" >&5
++  echo "$as_me:8849: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:8849: \"$ac_try\"") >&5
++  { (eval echo "$as_me:8852: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:8852: \$? = $ac_status" >&5
++  echo "$as_me:8855: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_gpm_Gpm_Open=yes
+ else
+@@ -8860,10 +8863,10 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:8863: result: $ac_cv_lib_gpm_Gpm_Open" >&5
++echo "$as_me:8866: result: $ac_cv_lib_gpm_Gpm_Open" >&5
+ echo "${ECHO_T}$ac_cv_lib_gpm_Gpm_Open" >&6
+ if test "$ac_cv_lib_gpm_Gpm_Open" = yes; then
+-  echo "$as_me:8866: checking for initscr in -lgpm" >&5
++  echo "$as_me:8869: checking for initscr in -lgpm" >&5
+ echo $ECHO_N "checking for initscr in -lgpm... $ECHO_C" >&6
+ if test "${ac_cv_lib_gpm_initscr+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -8871,7 +8874,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lgpm  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 8874 "configure"
++#line 8877 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -8890,16 +8893,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:8893: \"$ac_link\"") >&5
++if { (eval echo "$as_me:8896: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:8896: \$? = $ac_status" >&5
++  echo "$as_me:8899: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:8899: \"$ac_try\"") >&5
++  { (eval echo "$as_me:8902: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:8902: \$? = $ac_status" >&5
++  echo "$as_me:8905: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_gpm_initscr=yes
+ else
+@@ -8910,7 +8913,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:8913: result: $ac_cv_lib_gpm_initscr" >&5
++echo "$as_me:8916: result: $ac_cv_lib_gpm_initscr" >&5
+ echo "${ECHO_T}$ac_cv_lib_gpm_initscr" >&6
+ if test "$ac_cv_lib_gpm_initscr" = yes; then
+   LIBS="$cf_ncurses_SAVE"
+@@ -8925,7 +8928,7 @@
+ 	# This is only necessary if you are linking against an obsolete
+ 	# version of ncurses (but it should do no harm, since it is static).
+ 	if test "$cf_nculib_root" = ncurses ; then
+-		echo "$as_me:8928: checking for tgoto in -lmytinfo" >&5
++		echo "$as_me:8931: checking for tgoto in -lmytinfo" >&5
+ echo $ECHO_N "checking for tgoto in -lmytinfo... $ECHO_C" >&6
+ if test "${ac_cv_lib_mytinfo_tgoto+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -8933,7 +8936,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lmytinfo  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 8936 "configure"
++#line 8939 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -8952,16 +8955,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:8955: \"$ac_link\"") >&5
++if { (eval echo "$as_me:8958: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:8958: \$? = $ac_status" >&5
++  echo "$as_me:8961: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:8961: \"$ac_try\"") >&5
++  { (eval echo "$as_me:8964: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:8964: \$? = $ac_status" >&5
++  echo "$as_me:8967: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_mytinfo_tgoto=yes
+ else
+@@ -8972,7 +8975,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:8975: result: $ac_cv_lib_mytinfo_tgoto" >&5
++echo "$as_me:8978: result: $ac_cv_lib_mytinfo_tgoto" >&5
+ echo "${ECHO_T}$ac_cv_lib_mytinfo_tgoto" >&6
+ if test "$ac_cv_lib_mytinfo_tgoto" = yes; then
+   cf_ncurses_LIBS="-lmytinfo $cf_ncurses_LIBS"
+@@ -9021,13 +9024,13 @@
+ 
+ 	eval 'cf_cv_have_lib_'"$cf_nculib_root"'=no'
+ 	cf_libdir=""
+-	echo "$as_me:9024: checking for initscr" >&5
++	echo "$as_me:9027: checking for initscr" >&5
+ echo $ECHO_N "checking for initscr... $ECHO_C" >&6
+ if test "${ac_cv_func_initscr+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 9030 "configure"
++#line 9033 "configure"
+ #include "confdefs.h"
+ #define initscr autoconf_temporary
+ #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -9058,16 +9061,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:9061: \"$ac_link\"") >&5
++if { (eval echo "$as_me:9064: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:9064: \$? = $ac_status" >&5
++  echo "$as_me:9067: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:9067: \"$ac_try\"") >&5
++  { (eval echo "$as_me:9070: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:9070: \$? = $ac_status" >&5
++  echo "$as_me:9073: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_func_initscr=yes
+ else
+@@ -9077,18 +9080,18 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:9080: result: $ac_cv_func_initscr" >&5
++echo "$as_me:9083: result: $ac_cv_func_initscr" >&5
+ echo "${ECHO_T}$ac_cv_func_initscr" >&6
+ if test "$ac_cv_func_initscr" = yes; then
+   eval 'cf_cv_have_lib_'"$cf_nculib_root"'=yes'
+ else
+ 
+ 		cf_save_LIBS="$LIBS"
+-		echo "$as_me:9087: checking for initscr in -l$cf_nculib_root" >&5
++		echo "$as_me:9090: checking for initscr in -l$cf_nculib_root" >&5
+ echo $ECHO_N "checking for initscr in -l$cf_nculib_root... $ECHO_C" >&6
+ 		LIBS="-l$cf_nculib_root $LIBS"
+ 		cat >"conftest.$ac_ext" <<_ACEOF
+-#line 9091 "configure"
++#line 9094 "configure"
+ #include "confdefs.h"
+ #include <${cf_cv_ncurses_header:-curses.h}>
+ int
+@@ -9100,25 +9103,25 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:9103: \"$ac_link\"") >&5
++if { (eval echo "$as_me:9106: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:9106: \$? = $ac_status" >&5
++  echo "$as_me:9109: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:9109: \"$ac_try\"") >&5
++  { (eval echo "$as_me:9112: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:9112: \$? = $ac_status" >&5
++  echo "$as_me:9115: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+-  echo "$as_me:9114: result: yes" >&5
++  echo "$as_me:9117: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ 			 eval 'cf_cv_have_lib_'"$cf_nculib_root"'=yes'
+ 
+ else
+   echo "$as_me: failed program was:" >&5
+ cat "conftest.$ac_ext" >&5
+-echo "$as_me:9121: result: no" >&5
++echo "$as_me:9124: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ 
+ cf_search=
+@@ -9186,11 +9189,11 @@
+ 
+ 			for cf_libdir in $cf_search
+ 			do
+-				echo "$as_me:9189: checking for -l$cf_nculib_root in $cf_libdir" >&5
++				echo "$as_me:9192: checking for -l$cf_nculib_root in $cf_libdir" >&5
+ echo $ECHO_N "checking for -l$cf_nculib_root in $cf_libdir... $ECHO_C" >&6
+ 				LIBS="-L$cf_libdir -l$cf_nculib_root $cf_save_LIBS"
+ 				cat >"conftest.$ac_ext" <<_ACEOF
+-#line 9193 "configure"
++#line 9196 "configure"
+ #include "confdefs.h"
+ #include <${cf_cv_ncurses_header:-curses.h}>
+ int
+@@ -9202,25 +9205,25 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:9205: \"$ac_link\"") >&5
++if { (eval echo "$as_me:9208: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:9208: \$? = $ac_status" >&5
++  echo "$as_me:9211: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:9211: \"$ac_try\"") >&5
++  { (eval echo "$as_me:9214: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:9214: \$? = $ac_status" >&5
++  echo "$as_me:9217: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+-  echo "$as_me:9216: result: yes" >&5
++  echo "$as_me:9219: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ 			 		 eval 'cf_cv_have_lib_'"$cf_nculib_root"'=yes'
+ 					 break
+ else
+   echo "$as_me: failed program was:" >&5
+ cat "conftest.$ac_ext" >&5
+-echo "$as_me:9223: result: no" >&5
++echo "$as_me:9226: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ 					 LIBS="$cf_save_LIBS"
+ fi
+@@ -9235,7 +9238,7 @@
+ eval 'cf_found_library="$cf_cv_have_lib_'"$cf_nculib_root"\"
+ 
+ if test "$cf_found_library" = no ; then
+-	{ { echo "$as_me:9238: error: Cannot link $cf_nculib_root library" >&5
++	{ { echo "$as_me:9241: error: Cannot link $cf_nculib_root library" >&5
+ echo "$as_me: error: Cannot link $cf_nculib_root library" >&2;}
+    { (exit 1); exit 1; }; }
+ fi
+@@ -9243,7 +9246,7 @@
+ fi
+ 
+ if test -n "$cf_ncurses_LIBS" ; then
+-	echo "$as_me:9246: checking if we can link $cf_nculib_root without $cf_ncurses_LIBS" >&5
++	echo "$as_me:9249: checking if we can link $cf_nculib_root without $cf_ncurses_LIBS" >&5
+ echo $ECHO_N "checking if we can link $cf_nculib_root without $cf_ncurses_LIBS... $ECHO_C" >&6
+ 	cf_ncurses_SAVE="$LIBS"
+ 	for p in $cf_ncurses_LIBS ; do
+@@ -9253,7 +9256,7 @@
+ 		fi
+ 	done
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 9256 "configure"
++#line 9259 "configure"
+ #include "confdefs.h"
+ #include <${cf_cv_ncurses_header:-curses.h}>
+ int
+@@ -9265,23 +9268,23 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:9268: \"$ac_link\"") >&5
++if { (eval echo "$as_me:9271: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:9271: \$? = $ac_status" >&5
++  echo "$as_me:9274: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:9274: \"$ac_try\"") >&5
++  { (eval echo "$as_me:9277: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:9277: \$? = $ac_status" >&5
++  echo "$as_me:9280: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+-  echo "$as_me:9279: result: yes" >&5
++  echo "$as_me:9282: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ else
+   echo "$as_me: failed program was:" >&5
+ cat "conftest.$ac_ext" >&5
+-echo "$as_me:9284: result: no" >&5
++echo "$as_me:9287: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ 		 LIBS="$cf_ncurses_SAVE"
+ fi
+@@ -9305,13 +9308,13 @@
+ cf_have_ncuconfig=no
+ 
+ if test "x${PKG_CONFIG:=none}" != xnone; then
+-	echo "$as_me:9308: checking pkg-config for $cf_ncuconfig_root" >&5
++	echo "$as_me:9311: checking pkg-config for $cf_ncuconfig_root" >&5
+ echo $ECHO_N "checking pkg-config for $cf_ncuconfig_root... $ECHO_C" >&6
+ 	if "$PKG_CONFIG" --exists $cf_ncuconfig_root ; then
+-		echo "$as_me:9311: result: yes" >&5
++		echo "$as_me:9314: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ 
+-		echo "$as_me:9314: checking if the $cf_ncuconfig_root package files work" >&5
++		echo "$as_me:9317: checking if the $cf_ncuconfig_root package files work" >&5
+ echo $ECHO_N "checking if the $cf_ncuconfig_root package files work... $ECHO_C" >&6
+ 		cf_have_ncuconfig=unknown
+ 
+@@ -9444,7 +9447,7 @@
+ LIBS="$cf_add_libs"
+ 
+ 			cat >"conftest.$ac_ext" <<_ACEOF
+-#line 9447 "configure"
++#line 9450 "configure"
+ #include "confdefs.h"
+ #include <${cf_cv_ncurses_header:-curses.h}>
+ int
+@@ -9456,37 +9459,37 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:9459: \"$ac_link\"") >&5
++if { (eval echo "$as_me:9462: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:9462: \$? = $ac_status" >&5
++  echo "$as_me:9465: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:9465: \"$ac_try\"") >&5
++  { (eval echo "$as_me:9468: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:9468: \$? = $ac_status" >&5
++  echo "$as_me:9471: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   if test "$cross_compiling" = yes; then
+   cf_test_ncuconfig=maybe
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 9474 "configure"
++#line 9477 "configure"
+ #include "confdefs.h"
+ #include <${cf_cv_ncurses_header:-curses.h}>
+ 					int main(void)
+ 					{ const char *xx = curses_version(); return (xx == 0); }
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:9481: \"$ac_link\"") >&5
++if { (eval echo "$as_me:9484: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:9484: \$? = $ac_status" >&5
++  echo "$as_me:9487: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:9486: \"$ac_try\"") >&5
++  { (eval echo "$as_me:9489: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:9489: \$? = $ac_status" >&5
++  echo "$as_me:9492: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_test_ncuconfig=yes
+ else
+@@ -9660,7 +9663,7 @@
+ LIBS="$cf_add_libs"
+ 
+ 		cat >"conftest.$ac_ext" <<_ACEOF
+-#line 9663 "configure"
++#line 9666 "configure"
+ #include "confdefs.h"
+ #include <${cf_cv_ncurses_header:-curses.h}>
+ int
+@@ -9672,37 +9675,37 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:9675: \"$ac_link\"") >&5
++if { (eval echo "$as_me:9678: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:9678: \$? = $ac_status" >&5
++  echo "$as_me:9681: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:9681: \"$ac_try\"") >&5
++  { (eval echo "$as_me:9684: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:9684: \$? = $ac_status" >&5
++  echo "$as_me:9687: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   if test "$cross_compiling" = yes; then
+   cf_have_ncuconfig=maybe
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 9690 "configure"
++#line 9693 "configure"
+ #include "confdefs.h"
+ #include <${cf_cv_ncurses_header:-curses.h}>
+ 				int main(void)
+ 				{ const char *xx = curses_version(); return (xx == 0); }
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:9697: \"$ac_link\"") >&5
++if { (eval echo "$as_me:9700: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:9700: \$? = $ac_status" >&5
++  echo "$as_me:9703: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:9702: \"$ac_try\"") >&5
++  { (eval echo "$as_me:9705: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:9705: \$? = $ac_status" >&5
++  echo "$as_me:9708: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_have_ncuconfig=yes
+ else
+@@ -9719,7 +9722,7 @@
+ cf_have_ncuconfig=no
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+-		echo "$as_me:9722: result: $cf_have_ncuconfig" >&5
++		echo "$as_me:9725: result: $cf_have_ncuconfig" >&5
+ echo "${ECHO_T}$cf_have_ncuconfig" >&6
+ 		test "$cf_have_ncuconfig" = maybe && cf_have_ncuconfig=yes
+ 		if test "$cf_have_ncuconfig" != "yes"
+@@ -9735,7 +9738,7 @@
+ 
+ 			NCURSES_CONFIG_PKG=$cf_ncuconfig_root
+ 
+-echo "$as_me:9738: checking for terminfo header" >&5
++echo "$as_me:9741: checking for terminfo header" >&5
+ echo $ECHO_N "checking for terminfo header... $ECHO_C" >&6
+ if test "${cf_cv_term_header+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -9753,7 +9756,7 @@
+ for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h"
+ do
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 9756 "configure"
++#line 9759 "configure"
+ #include "confdefs.h"
+ #include <stdio.h>
+ #include <${cf_cv_ncurses_header:-curses.h}>
+@@ -9768,16 +9771,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:9771: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:9774: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:9774: \$? = $ac_status" >&5
++  echo "$as_me:9777: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:9777: \"$ac_try\"") >&5
++  { (eval echo "$as_me:9780: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:9780: \$? = $ac_status" >&5
++  echo "$as_me:9783: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+ 
+ 	cf_cv_term_header="$cf_test"
+@@ -9793,7 +9796,7 @@
+ done
+ 
+ fi
+-echo "$as_me:9796: result: $cf_cv_term_header" >&5
++echo "$as_me:9799: result: $cf_cv_term_header" >&5
+ echo "${ECHO_T}$cf_cv_term_header" >&6
+ 
+ # Set definitions to allow ifdef'ing to accommodate subdirectories
+@@ -9828,7 +9831,7 @@
+ 		fi
+ 
+ 	else
+-		echo "$as_me:9831: result: no" >&5
++		echo "$as_me:9834: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ 		NCURSES_CONFIG_PKG=none
+ 	fi
+@@ -9844,7 +9847,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:9847: checking for $ac_word" >&5
++echo "$as_me:9850: checking for $ac_word" >&5
+ echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+ if test "${ac_cv_prog_NCURSES_CONFIG+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -9859,7 +9862,7 @@
+   test -z "$ac_dir" && ac_dir=.
+   $as_executable_p "$ac_dir/$ac_word" || continue
+ ac_cv_prog_NCURSES_CONFIG="$ac_tool_prefix$ac_prog"
+-echo "$as_me:9862: found $ac_dir/$ac_word" >&5
++echo "$as_me:9865: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -9867,10 +9870,10 @@
+ fi
+ NCURSES_CONFIG=$ac_cv_prog_NCURSES_CONFIG
+ if test -n "$NCURSES_CONFIG"; then
+-  echo "$as_me:9870: result: $NCURSES_CONFIG" >&5
++  echo "$as_me:9873: result: $NCURSES_CONFIG" >&5
+ echo "${ECHO_T}$NCURSES_CONFIG" >&6
+ else
+-  echo "$as_me:9873: result: no" >&5
++  echo "$as_me:9876: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -9883,7 +9886,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:9886: checking for $ac_word" >&5
++echo "$as_me:9889: checking for $ac_word" >&5
+ echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+ if test "${ac_cv_prog_ac_ct_NCURSES_CONFIG+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -9898,7 +9901,7 @@
+   test -z "$ac_dir" && ac_dir=.
+   $as_executable_p "$ac_dir/$ac_word" || continue
+ ac_cv_prog_ac_ct_NCURSES_CONFIG="$ac_prog"
+-echo "$as_me:9901: found $ac_dir/$ac_word" >&5
++echo "$as_me:9904: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -9906,10 +9909,10 @@
+ fi
+ ac_ct_NCURSES_CONFIG=$ac_cv_prog_ac_ct_NCURSES_CONFIG
+ if test -n "$ac_ct_NCURSES_CONFIG"; then
+-  echo "$as_me:9909: result: $ac_ct_NCURSES_CONFIG" >&5
++  echo "$as_me:9912: result: $ac_ct_NCURSES_CONFIG" >&5
+ echo "${ECHO_T}$ac_ct_NCURSES_CONFIG" >&6
+ else
+-  echo "$as_me:9912: result: no" >&5
++  echo "$as_me:9915: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -10066,7 +10069,7 @@
+ 
+ 		# even with config script, some packages use no-override for curses.h
+ 
+-echo "$as_me:10069: checking if we have identified curses headers" >&5
++echo "$as_me:10072: checking if we have identified curses headers" >&5
+ echo $ECHO_N "checking if we have identified curses headers... $ECHO_C" >&6
+ if test "${cf_cv_ncurses_header+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -10078,7 +10081,7 @@
+ 	curses.h ncurses/curses.h
+ do
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 10081 "configure"
++#line 10084 "configure"
+ #include "confdefs.h"
+ #include <${cf_header}>
+ int
+@@ -10090,16 +10093,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:10093: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:10096: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:10096: \$? = $ac_status" >&5
++  echo "$as_me:10099: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:10099: \"$ac_try\"") >&5
++  { (eval echo "$as_me:10102: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:10102: \$? = $ac_status" >&5
++  echo "$as_me:10105: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_ncurses_header=$cf_header; break
+ else
+@@ -10110,11 +10113,11 @@
+ done
+ 
+ fi
+-echo "$as_me:10113: result: $cf_cv_ncurses_header" >&5
++echo "$as_me:10116: result: $cf_cv_ncurses_header" >&5
+ echo "${ECHO_T}$cf_cv_ncurses_header" >&6
+ 
+ if test "$cf_cv_ncurses_header" = none ; then
+-	{ { echo "$as_me:10117: error: No curses header-files found" >&5
++	{ { echo "$as_me:10120: error: No curses header-files found" >&5
+ echo "$as_me: error: No curses header-files found" >&2;}
+    { (exit 1); exit 1; }; }
+ fi
+@@ -10124,23 +10127,23 @@
+ for ac_header in $cf_cv_ncurses_header
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-echo "$as_me:10127: checking for $ac_header" >&5
++echo "$as_me:10130: 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 10133 "configure"
++#line 10136 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:10137: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:10140: \"$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:10143: \$? = $ac_status" >&5
++  echo "$as_me:10146: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -10159,7 +10162,7 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:10162: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
++echo "$as_me:10165: 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
+@@ -10215,7 +10218,7 @@
+ 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
+ 
+ 			  cat >"conftest.$ac_ext" <<_ACEOF
+-#line 10218 "configure"
++#line 10221 "configure"
+ #include "confdefs.h"
+ #include <stdio.h>
+ int
+@@ -10227,16 +10230,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:10230: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:10233: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:10233: \$? = $ac_status" >&5
++  echo "$as_me:10236: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:10236: \"$ac_try\"") >&5
++  { (eval echo "$as_me:10239: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:10239: \$? = $ac_status" >&5
++  echo "$as_me:10242: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   :
+ else
+@@ -10253,7 +10256,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}:10256: testing adding $cf_add_incdir to include-path ..." 1>&5
++echo "${as_me:-configure}:10259: testing adding $cf_add_incdir to include-path ..." 1>&5
+ 
+ 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
+ 
+@@ -10272,7 +10275,7 @@
+ 
+ }
+ 
+-echo "$as_me:10275: checking for $cf_ncuhdr_root header in include-path" >&5
++echo "$as_me:10278: checking for $cf_ncuhdr_root header in include-path" >&5
+ echo $ECHO_N "checking for $cf_ncuhdr_root header in include-path... $ECHO_C" >&6
+ if test "${cf_cv_ncurses_h+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -10284,7 +10287,7 @@
+ 	do
+ 
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 10287 "configure"
++#line 10290 "configure"
+ #include "confdefs.h"
+ 
+ #include <$cf_header>
+@@ -10308,16 +10311,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:10311: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:10314: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:10314: \$? = $ac_status" >&5
++  echo "$as_me:10317: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:10317: \"$ac_try\"") >&5
++  { (eval echo "$as_me:10320: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:10320: \$? = $ac_status" >&5
++  echo "$as_me:10323: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_ncurses_h=$cf_header
+ 
+@@ -10332,14 +10335,14 @@
+ 	done
+ 
+ fi
+-echo "$as_me:10335: result: $cf_cv_ncurses_h" >&5
++echo "$as_me:10338: result: $cf_cv_ncurses_h" >&5
+ echo "${ECHO_T}$cf_cv_ncurses_h" >&6
+ 
+ if test "$cf_cv_ncurses_h" != no ; then
+ 	cf_cv_ncurses_header=$cf_cv_ncurses_h
+ else
+ 
+-echo "$as_me:10342: checking for $cf_ncuhdr_root include-path" >&5
++echo "$as_me:10345: checking for $cf_ncuhdr_root include-path" >&5
+ echo $ECHO_N "checking for $cf_ncuhdr_root include-path... $ECHO_C" >&6
+ if test "${cf_cv_ncurses_h2+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -10460,7 +10463,7 @@
+ 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
+ 
+ 			  cat >"conftest.$ac_ext" <<_ACEOF
+-#line 10463 "configure"
++#line 10466 "configure"
+ #include "confdefs.h"
+ #include <stdio.h>
+ int
+@@ -10472,16 +10475,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:10475: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:10478: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:10478: \$? = $ac_status" >&5
++  echo "$as_me:10481: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:10481: \"$ac_try\"") >&5
++  { (eval echo "$as_me:10484: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:10484: \$? = $ac_status" >&5
++  echo "$as_me:10487: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   :
+ else
+@@ -10498,7 +10501,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}:10501: testing adding $cf_add_incdir to include-path ..." 1>&5
++echo "${as_me:-configure}:10504: testing adding $cf_add_incdir to include-path ..." 1>&5
+ 
+ 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
+ 
+@@ -10521,7 +10524,7 @@
+ 		do
+ 
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 10524 "configure"
++#line 10527 "configure"
+ #include "confdefs.h"
+ 
+ #include <$cf_header>
+@@ -10545,16 +10548,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:10548: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:10551: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:10551: \$? = $ac_status" >&5
++  echo "$as_me:10554: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:10554: \"$ac_try\"") >&5
++  { (eval echo "$as_me:10557: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:10557: \$? = $ac_status" >&5
++  echo "$as_me:10560: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_ncurses_h2=$cf_header
+ 
+@@ -10575,12 +10578,12 @@
+ 		CPPFLAGS="$cf_save2_CPPFLAGS"
+ 		test "$cf_cv_ncurses_h2" != no && break
+ 	done
+-	test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:10578: error: not found" >&5
++	test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:10581: error: not found" >&5
+ echo "$as_me: error: not found" >&2;}
+    { (exit 1); exit 1; }; }
+ 
+ fi
+-echo "$as_me:10583: result: $cf_cv_ncurses_h2" >&5
++echo "$as_me:10586: result: $cf_cv_ncurses_h2" >&5
+ echo "${ECHO_T}$cf_cv_ncurses_h2" >&6
+ 
+ 	cf_1st_incdir=`echo "$cf_cv_ncurses_h2" | sed -e 's%/[^/]*$%%'`
+@@ -10616,7 +10619,7 @@
+ 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
+ 
+ 			  cat >"conftest.$ac_ext" <<_ACEOF
+-#line 10619 "configure"
++#line 10622 "configure"
+ #include "confdefs.h"
+ #include <stdio.h>
+ int
+@@ -10628,16 +10631,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:10631: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:10634: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:10634: \$? = $ac_status" >&5
++  echo "$as_me:10637: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:10637: \"$ac_try\"") >&5
++  { (eval echo "$as_me:10640: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:10640: \$? = $ac_status" >&5
++  echo "$as_me:10643: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   :
+ else
+@@ -10654,7 +10657,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}:10657: testing adding $cf_add_incdir to include-path ..." 1>&5
++echo "${as_me:-configure}:10660: testing adding $cf_add_incdir to include-path ..." 1>&5
+ 
+ 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
+ 
+@@ -10702,7 +10705,7 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:10705: checking for terminfo header" >&5
++echo "$as_me:10708: checking for terminfo header" >&5
+ echo $ECHO_N "checking for terminfo header... $ECHO_C" >&6
+ if test "${cf_cv_term_header+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -10720,7 +10723,7 @@
+ for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h"
+ do
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 10723 "configure"
++#line 10726 "configure"
+ #include "confdefs.h"
+ #include <stdio.h>
+ #include <${cf_cv_ncurses_header:-curses.h}>
+@@ -10735,16 +10738,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:10738: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:10741: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:10741: \$? = $ac_status" >&5
++  echo "$as_me:10744: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:10744: \"$ac_try\"") >&5
++  { (eval echo "$as_me:10747: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:10747: \$? = $ac_status" >&5
++  echo "$as_me:10750: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+ 
+ 	cf_cv_term_header="$cf_test"
+@@ -10760,7 +10763,7 @@
+ done
+ 
+ fi
+-echo "$as_me:10763: result: $cf_cv_term_header" >&5
++echo "$as_me:10766: result: $cf_cv_term_header" >&5
+ echo "${ECHO_T}$cf_cv_term_header" >&6
+ 
+ # Set definitions to allow ifdef'ing to accommodate subdirectories
+@@ -10798,7 +10801,7 @@
+ #define NCURSES 1
+ EOF
+ 
+-echo "$as_me:10801: checking for ncurses version" >&5
++echo "$as_me:10804: checking for ncurses version" >&5
+ echo $ECHO_N "checking for ncurses version... $ECHO_C" >&6
+ if test "${cf_cv_ncurses_version+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -10824,10 +10827,10 @@
+ #endif
+ EOF
+ 	cf_try="$ac_cpp conftest.$ac_ext 2>&5 | grep '^Autoconf ' >conftest.out"
+-	{ (eval echo "$as_me:10827: \"$cf_try\"") >&5
++	{ (eval echo "$as_me:10830: \"$cf_try\"") >&5
+   (eval $cf_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:10830: \$? = $ac_status" >&5
++  echo "$as_me:10833: \$? = $ac_status" >&5
+   (exit "$ac_status"); }
+ 	if test -f conftest.out ; then
+ 		cf_out=`sed -e 's%^Autoconf %%' -e 's%^[^"]*"%%' -e 's%".*%%' conftest.out`
+@@ -10837,7 +10840,7 @@
+ 
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 10840 "configure"
++#line 10843 "configure"
+ #include "confdefs.h"
+ 
+ #include <${cf_cv_ncurses_header:-curses.h}>
+@@ -10862,15 +10865,15 @@
+ }
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:10865: \"$ac_link\"") >&5
++if { (eval echo "$as_me:10868: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:10868: \$? = $ac_status" >&5
++  echo "$as_me:10871: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:10870: \"$ac_try\"") >&5
++  { (eval echo "$as_me:10873: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:10873: \$? = $ac_status" >&5
++  echo "$as_me:10876: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+ 
+ 	cf_cv_ncurses_version=`cat $cf_tempfile`
+@@ -10884,7 +10887,7 @@
+ 	rm -f "$cf_tempfile"
+ 
+ fi
+-echo "$as_me:10887: result: $cf_cv_ncurses_version" >&5
++echo "$as_me:10890: result: $cf_cv_ncurses_version" >&5
+ echo "${ECHO_T}$cf_cv_ncurses_version" >&6
+ test "$cf_cv_ncurses_version" = no ||
+ cat >>confdefs.h <<\EOF
+@@ -10897,7 +10900,7 @@
+ 	# to link gpm.
+ cf_ncurses_LIBS=""
+ cf_ncurses_SAVE="$LIBS"
+-echo "$as_me:10900: checking for Gpm_Open in -lgpm" >&5
++echo "$as_me:10903: 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
+@@ -10905,7 +10908,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lgpm  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 10908 "configure"
++#line 10911 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -10924,16 +10927,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:10927: \"$ac_link\"") >&5
++if { (eval echo "$as_me:10930: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:10930: \$? = $ac_status" >&5
++  echo "$as_me:10933: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:10933: \"$ac_try\"") >&5
++  { (eval echo "$as_me:10936: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:10936: \$? = $ac_status" >&5
++  echo "$as_me:10939: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_gpm_Gpm_Open=yes
+ else
+@@ -10944,10 +10947,10 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:10947: result: $ac_cv_lib_gpm_Gpm_Open" >&5
++echo "$as_me:10950: result: $ac_cv_lib_gpm_Gpm_Open" >&5
+ echo "${ECHO_T}$ac_cv_lib_gpm_Gpm_Open" >&6
+ if test "$ac_cv_lib_gpm_Gpm_Open" = yes; then
+-  echo "$as_me:10950: checking for initscr in -lgpm" >&5
++  echo "$as_me:10953: checking for initscr in -lgpm" >&5
+ echo $ECHO_N "checking for initscr in -lgpm... $ECHO_C" >&6
+ if test "${ac_cv_lib_gpm_initscr+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -10955,7 +10958,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lgpm  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 10958 "configure"
++#line 10961 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -10974,16 +10977,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:10977: \"$ac_link\"") >&5
++if { (eval echo "$as_me:10980: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:10980: \$? = $ac_status" >&5
++  echo "$as_me:10983: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:10983: \"$ac_try\"") >&5
++  { (eval echo "$as_me:10986: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:10986: \$? = $ac_status" >&5
++  echo "$as_me:10989: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_gpm_initscr=yes
+ else
+@@ -10994,7 +10997,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:10997: result: $ac_cv_lib_gpm_initscr" >&5
++echo "$as_me:11000: result: $ac_cv_lib_gpm_initscr" >&5
+ echo "${ECHO_T}$ac_cv_lib_gpm_initscr" >&6
+ if test "$ac_cv_lib_gpm_initscr" = yes; then
+   LIBS="$cf_ncurses_SAVE"
+@@ -11009,7 +11012,7 @@
+ 	# This is only necessary if you are linking against an obsolete
+ 	# version of ncurses (but it should do no harm, since it is static).
+ 	if test "$cf_nculib_root" = ncurses ; then
+-		echo "$as_me:11012: checking for tgoto in -lmytinfo" >&5
++		echo "$as_me:11015: checking for tgoto in -lmytinfo" >&5
+ echo $ECHO_N "checking for tgoto in -lmytinfo... $ECHO_C" >&6
+ if test "${ac_cv_lib_mytinfo_tgoto+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -11017,7 +11020,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lmytinfo  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 11020 "configure"
++#line 11023 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -11036,16 +11039,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:11039: \"$ac_link\"") >&5
++if { (eval echo "$as_me:11042: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:11042: \$? = $ac_status" >&5
++  echo "$as_me:11045: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:11045: \"$ac_try\"") >&5
++  { (eval echo "$as_me:11048: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:11048: \$? = $ac_status" >&5
++  echo "$as_me:11051: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_mytinfo_tgoto=yes
+ else
+@@ -11056,7 +11059,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:11059: result: $ac_cv_lib_mytinfo_tgoto" >&5
++echo "$as_me:11062: result: $ac_cv_lib_mytinfo_tgoto" >&5
+ echo "${ECHO_T}$ac_cv_lib_mytinfo_tgoto" >&6
+ if test "$ac_cv_lib_mytinfo_tgoto" = yes; then
+   cf_ncurses_LIBS="-lmytinfo $cf_ncurses_LIBS"
+@@ -11105,13 +11108,13 @@
+ 
+ 	eval 'cf_cv_have_lib_'"$cf_nculib_root"'=no'
+ 	cf_libdir=""
+-	echo "$as_me:11108: checking for initscr" >&5
++	echo "$as_me:11111: checking for initscr" >&5
+ echo $ECHO_N "checking for initscr... $ECHO_C" >&6
+ if test "${ac_cv_func_initscr+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 11114 "configure"
++#line 11117 "configure"
+ #include "confdefs.h"
+ #define initscr autoconf_temporary
+ #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -11142,16 +11145,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:11145: \"$ac_link\"") >&5
++if { (eval echo "$as_me:11148: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:11148: \$? = $ac_status" >&5
++  echo "$as_me:11151: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:11151: \"$ac_try\"") >&5
++  { (eval echo "$as_me:11154: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:11154: \$? = $ac_status" >&5
++  echo "$as_me:11157: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_func_initscr=yes
+ else
+@@ -11161,18 +11164,18 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:11164: result: $ac_cv_func_initscr" >&5
++echo "$as_me:11167: result: $ac_cv_func_initscr" >&5
+ echo "${ECHO_T}$ac_cv_func_initscr" >&6
+ if test "$ac_cv_func_initscr" = yes; then
+   eval 'cf_cv_have_lib_'"$cf_nculib_root"'=yes'
+ else
+ 
+ 		cf_save_LIBS="$LIBS"
+-		echo "$as_me:11171: checking for initscr in -l$cf_nculib_root" >&5
++		echo "$as_me:11174: checking for initscr in -l$cf_nculib_root" >&5
+ echo $ECHO_N "checking for initscr in -l$cf_nculib_root... $ECHO_C" >&6
+ 		LIBS="-l$cf_nculib_root $LIBS"
+ 		cat >"conftest.$ac_ext" <<_ACEOF
+-#line 11175 "configure"
++#line 11178 "configure"
+ #include "confdefs.h"
+ #include <${cf_cv_ncurses_header:-curses.h}>
+ int
+@@ -11184,25 +11187,25 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:11187: \"$ac_link\"") >&5
++if { (eval echo "$as_me:11190: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:11190: \$? = $ac_status" >&5
++  echo "$as_me:11193: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:11193: \"$ac_try\"") >&5
++  { (eval echo "$as_me:11196: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:11196: \$? = $ac_status" >&5
++  echo "$as_me:11199: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+-  echo "$as_me:11198: result: yes" >&5
++  echo "$as_me:11201: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ 			 eval 'cf_cv_have_lib_'"$cf_nculib_root"'=yes'
+ 
+ else
+   echo "$as_me: failed program was:" >&5
+ cat "conftest.$ac_ext" >&5
+-echo "$as_me:11205: result: no" >&5
++echo "$as_me:11208: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ 
+ cf_search=
+@@ -11270,11 +11273,11 @@
+ 
+ 			for cf_libdir in $cf_search
+ 			do
+-				echo "$as_me:11273: checking for -l$cf_nculib_root in $cf_libdir" >&5
++				echo "$as_me:11276: checking for -l$cf_nculib_root in $cf_libdir" >&5
+ echo $ECHO_N "checking for -l$cf_nculib_root in $cf_libdir... $ECHO_C" >&6
+ 				LIBS="-L$cf_libdir -l$cf_nculib_root $cf_save_LIBS"
+ 				cat >"conftest.$ac_ext" <<_ACEOF
+-#line 11277 "configure"
++#line 11280 "configure"
+ #include "confdefs.h"
+ #include <${cf_cv_ncurses_header:-curses.h}>
+ int
+@@ -11286,25 +11289,25 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:11289: \"$ac_link\"") >&5
++if { (eval echo "$as_me:11292: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:11292: \$? = $ac_status" >&5
++  echo "$as_me:11295: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:11295: \"$ac_try\"") >&5
++  { (eval echo "$as_me:11298: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:11298: \$? = $ac_status" >&5
++  echo "$as_me:11301: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+-  echo "$as_me:11300: result: yes" >&5
++  echo "$as_me:11303: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ 			 		 eval 'cf_cv_have_lib_'"$cf_nculib_root"'=yes'
+ 					 break
+ else
+   echo "$as_me: failed program was:" >&5
+ cat "conftest.$ac_ext" >&5
+-echo "$as_me:11307: result: no" >&5
++echo "$as_me:11310: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ 					 LIBS="$cf_save_LIBS"
+ fi
+@@ -11319,7 +11322,7 @@
+ eval 'cf_found_library="$cf_cv_have_lib_'"$cf_nculib_root"\"
+ 
+ if test "$cf_found_library" = no ; then
+-	{ { echo "$as_me:11322: error: Cannot link $cf_nculib_root library" >&5
++	{ { echo "$as_me:11325: error: Cannot link $cf_nculib_root library" >&5
+ echo "$as_me: error: Cannot link $cf_nculib_root library" >&2;}
+    { (exit 1); exit 1; }; }
+ fi
+@@ -11327,7 +11330,7 @@
+ fi
+ 
+ if test -n "$cf_ncurses_LIBS" ; then
+-	echo "$as_me:11330: checking if we can link $cf_nculib_root without $cf_ncurses_LIBS" >&5
++	echo "$as_me:11333: checking if we can link $cf_nculib_root without $cf_ncurses_LIBS" >&5
+ echo $ECHO_N "checking if we can link $cf_nculib_root without $cf_ncurses_LIBS... $ECHO_C" >&6
+ 	cf_ncurses_SAVE="$LIBS"
+ 	for p in $cf_ncurses_LIBS ; do
+@@ -11337,7 +11340,7 @@
+ 		fi
+ 	done
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 11340 "configure"
++#line 11343 "configure"
+ #include "confdefs.h"
+ #include <${cf_cv_ncurses_header:-curses.h}>
+ int
+@@ -11349,23 +11352,23 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:11352: \"$ac_link\"") >&5
++if { (eval echo "$as_me:11355: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:11355: \$? = $ac_status" >&5
++  echo "$as_me:11358: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:11358: \"$ac_try\"") >&5
++  { (eval echo "$as_me:11361: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:11361: \$? = $ac_status" >&5
++  echo "$as_me:11364: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+-  echo "$as_me:11363: result: yes" >&5
++  echo "$as_me:11366: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ else
+   echo "$as_me: failed program was:" >&5
+ cat "conftest.$ac_ext" >&5
+-echo "$as_me:11368: result: no" >&5
++echo "$as_me:11371: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ 		 LIBS="$cf_ncurses_SAVE"
+ fi
+@@ -11418,10 +11421,10 @@
+ 	AUTOCONF_$cf_name NCURSES_VERSION_$cf_name
+ CF_EOF
+ 		cf_try="$ac_cpp conftest.$ac_ext 2>&5 | fgrep AUTOCONF_$cf_name >conftest.out"
+-		{ (eval echo "$as_me:11421: \"$cf_try\"") >&5
++		{ (eval echo "$as_me:11424: \"$cf_try\"") >&5
+   (eval $cf_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:11424: \$? = $ac_status" >&5
++  echo "$as_me:11427: \$? = $ac_status" >&5
+   (exit "$ac_status"); }
+ 		if test -f conftest.out ; then
+ 			cf_result=`sed -e "s/^.*AUTOCONF_${cf_name}[ 	][ 	]*//" conftest.out`
+@@ -11439,10 +11442,10 @@
+ 
+ cf_cv_timestamp=`date`
+ 
+-echo "$as_me:11442: result: Configuring NCURSES $cf_cv_rel_version ABI $cf_cv_abi_version ($cf_cv_timestamp)" >&5
++echo "$as_me:11445: result: Configuring NCURSES $cf_cv_rel_version ABI $cf_cv_abi_version ($cf_cv_timestamp)" >&5
+ echo "${ECHO_T}Configuring NCURSES $cf_cv_rel_version ABI $cf_cv_abi_version ($cf_cv_timestamp)" >&6
+ 
+-echo "$as_me:11445: checking if you want to have a library-prefix" >&5
++echo "$as_me:11448: 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.
+@@ -11452,7 +11455,7 @@
+ else
+   with_lib_prefix=auto
+ fi;
+-echo "$as_me:11455: result: $with_lib_prefix" >&5
++echo "$as_me:11458: result: $with_lib_prefix" >&5
+ echo "${ECHO_T}$with_lib_prefix" >&6
+ 
+ if test "$with_lib_prefix" = auto
+@@ -11490,7 +11493,7 @@
+ 	test -n "$GCC" && test "${ac_cv_prog_cc_g}" != yes && CC_G_OPT=''
+ fi
+ 
+-echo "$as_me:11493: checking for default loader flags" >&5
++echo "$as_me:11496: checking for default loader flags" >&5
+ echo $ECHO_N "checking for default loader flags... $ECHO_C" >&6
+ case $DFT_LWR_MODEL in
+ (normal)  LD_MODEL=''   ;;
+@@ -11498,13 +11501,13 @@
+ (profile) LD_MODEL='-pg';;
+ (shared)  LD_MODEL=''   ;;
+ esac
+-echo "$as_me:11501: result: $LD_MODEL" >&5
++echo "$as_me:11504: result: $LD_MODEL" >&5
+ echo "${ECHO_T}$LD_MODEL" >&6
+ 
+ LD_RPATH_OPT=
+ if test "x$cf_cv_enable_rpath" != xno
+ then
+-	echo "$as_me:11507: checking for an rpath option" >&5
++	echo "$as_me:11510: checking for an rpath option" >&5
+ echo $ECHO_N "checking for an rpath option... $ECHO_C" >&6
+ 	case "$cf_cv_system_name" in
+ 	(irix*)
+@@ -11535,12 +11538,12 @@
+ 	(*)
+ 		;;
+ 	esac
+-	echo "$as_me:11538: result: $LD_RPATH_OPT" >&5
++	echo "$as_me:11541: result: $LD_RPATH_OPT" >&5
+ echo "${ECHO_T}$LD_RPATH_OPT" >&6
+ 
+ 	case "x$LD_RPATH_OPT" in
+ 	(x-R*)
+-		echo "$as_me:11543: checking if we need a space after rpath option" >&5
++		echo "$as_me:11546: 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"
+ 
+@@ -11561,7 +11564,7 @@
+ LIBS="$cf_add_libs"
+ 
+ 		cat >"conftest.$ac_ext" <<_ACEOF
+-#line 11564 "configure"
++#line 11567 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -11573,16 +11576,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:11576: \"$ac_link\"") >&5
++if { (eval echo "$as_me:11579: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:11579: \$? = $ac_status" >&5
++  echo "$as_me:11582: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:11582: \"$ac_try\"") >&5
++  { (eval echo "$as_me:11585: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:11585: \$? = $ac_status" >&5
++  echo "$as_me:11588: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_rpath_space=no
+ else
+@@ -11592,7 +11595,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ 		LIBS="$cf_save_LIBS"
+-		echo "$as_me:11595: result: $cf_rpath_space" >&5
++		echo "$as_me:11598: result: $cf_rpath_space" >&5
+ echo "${ECHO_T}$cf_rpath_space" >&6
+ 		test "$cf_rpath_space" = yes && LD_RPATH_OPT="$LD_RPATH_OPT "
+ 		;;
+@@ -11614,7 +11617,7 @@
+ 	cf_ld_rpath_opt=
+ 	test "$cf_cv_enable_rpath" = yes && cf_ld_rpath_opt="$LD_RPATH_OPT"
+ 
+-	echo "$as_me:11617: checking if release/abi version should be used for shared libs" >&5
++	echo "$as_me:11620: 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.
+@@ -11629,9 +11632,9 @@
+ 		cf_cv_shlib_version=$withval
+ 		;;
+ 	(*)
+-		echo "$as_me:11632: result: $withval" >&5
++		echo "$as_me:11635: result: $withval" >&5
+ echo "${ECHO_T}$withval" >&6
+-		{ { echo "$as_me:11634: error: option value must be one of: rel, abi, or auto" >&5
++		{ { echo "$as_me:11637: 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; }; }
+ 		;;
+@@ -11640,7 +11643,7 @@
+ else
+   cf_cv_shlib_version=auto
+ fi;
+-	echo "$as_me:11643: result: $cf_cv_shlib_version" >&5
++	echo "$as_me:11646: result: $cf_cv_shlib_version" >&5
+ echo "${ECHO_T}$cf_cv_shlib_version" >&6
+ 
+ 	cf_cv_rm_so_locs=no
+@@ -11663,14 +11666,14 @@
+ 
+ 	if test "$cf_try_fPIC" = yes
+ 	then
+-		echo "$as_me:11666: checking which $CC option to use" >&5
++		echo "$as_me:11669: 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 11673 "configure"
++#line 11676 "configure"
+ #include "confdefs.h"
+ #include <stdio.h>
+ int
+@@ -11682,16 +11685,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:11685: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:11688: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:11688: \$? = $ac_status" >&5
++  echo "$as_me:11691: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:11691: \"$ac_try\"") >&5
++  { (eval echo "$as_me:11694: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:11694: \$? = $ac_status" >&5
++  echo "$as_me:11697: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   break
+ else
+@@ -11700,7 +11703,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 		done
+-		echo "$as_me:11703: result: $CC_SHARED_OPTS" >&5
++		echo "$as_me:11706: result: $CC_SHARED_OPTS" >&5
+ echo "${ECHO_T}$CC_SHARED_OPTS" >&6
+ 		CFLAGS="$cf_save_CFLAGS"
+ 	fi
+@@ -11771,7 +11774,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:11774: checking if ld -search_paths_first works" >&5
++		echo "$as_me:11777: 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
+@@ -11780,7 +11783,7 @@
+ 			cf_save_LDFLAGS=$LDFLAGS
+ 			LDFLAGS="$LDFLAGS -Wl,-search_paths_first"
+ 			cat >"conftest.$ac_ext" <<_ACEOF
+-#line 11783 "configure"
++#line 11786 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -11792,16 +11795,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:11795: \"$ac_link\"") >&5
++if { (eval echo "$as_me:11798: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:11798: \$? = $ac_status" >&5
++  echo "$as_me:11801: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:11801: \"$ac_try\"") >&5
++  { (eval echo "$as_me:11804: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:11804: \$? = $ac_status" >&5
++  echo "$as_me:11807: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_ldflags_search_paths_first=yes
+ else
+@@ -11812,7 +11815,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ 				LDFLAGS=$cf_save_LDFLAGS
+ fi
+-echo "$as_me:11815: result: $cf_cv_ldflags_search_paths_first" >&5
++echo "$as_me:11818: 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"
+@@ -12162,7 +12165,7 @@
+ 			do
+ 				CFLAGS="$cf_shared_opts $cf_save_CFLAGS"
+ 				cat >"conftest.$ac_ext" <<_ACEOF
+-#line 12165 "configure"
++#line 12168 "configure"
+ #include "confdefs.h"
+ #include <stdio.h>
+ int
+@@ -12174,16 +12177,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:12177: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:12180: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:12180: \$? = $ac_status" >&5
++  echo "$as_me:12183: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:12183: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12186: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:12186: \$? = $ac_status" >&5
++  echo "$as_me:12189: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   break
+ else
+@@ -12220,7 +12223,7 @@
+ 			test "$cf_cv_do_symlinks" = no && cf_cv_do_symlinks=yes
+ 			;;
+ 		(*)
+-			{ echo "$as_me:12223: WARNING: ignored --with-shlib-version" >&5
++			{ echo "$as_me:12226: WARNING: ignored --with-shlib-version" >&5
+ echo "$as_me: WARNING: ignored --with-shlib-version" >&2;}
+ 			;;
+ 		esac
+@@ -12230,7 +12233,7 @@
+ 	if test -n "$cf_try_cflags"
+ 	then
+ cat > conftest.$ac_ext <<EOF
+-#line 12233 "${as_me:-configure}"
++#line 12236 "${as_me:-configure}"
+ #include <stdio.h>
+ int main(int argc, char *argv[])
+ {
+@@ -12242,18 +12245,18 @@
+ 		for cf_opt in $cf_try_cflags
+ 		do
+ 			CFLAGS="$cf_save_CFLAGS -$cf_opt"
+-			echo "$as_me:12245: checking if CFLAGS option -$cf_opt works" >&5
++			echo "$as_me:12248: 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:12247: \"$ac_compile\"") >&5
++			if { (eval echo "$as_me:12250: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:12250: \$? = $ac_status" >&5
++  echo "$as_me:12253: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; then
+-				echo "$as_me:12252: result: yes" >&5
++				echo "$as_me:12255: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ 				cf_save_CFLAGS="$CFLAGS"
+ 			else
+-				echo "$as_me:12256: result: no" >&5
++				echo "$as_me:12259: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ 			fi
+ 		done
+@@ -12268,17 +12271,17 @@
+ 
+ 	test -n "$verbose" && echo "	CC_SHARED_OPTS: $CC_SHARED_OPTS" 1>&6
+ 
+-echo "${as_me:-configure}:12271: testing CC_SHARED_OPTS: $CC_SHARED_OPTS ..." 1>&5
++echo "${as_me:-configure}:12274: 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}:12275: testing MK_SHARED_LIB:  $MK_SHARED_LIB ..." 1>&5
++echo "${as_me:-configure}:12278: testing MK_SHARED_LIB:  $MK_SHARED_LIB ..." 1>&5
+ 
+ # The test/sample programs in the original tree link using rpath option.
+ # Make it optional for packagers.
+ if test -n "$LOCAL_LDFLAGS"
+ then
+-	echo "$as_me:12281: checking if you want to link sample programs with rpath option" >&5
++	echo "$as_me:12284: checking if you want to link sample programs with rpath option" >&5
+ echo $ECHO_N "checking if you want to link sample programs with rpath option... $ECHO_C" >&6
+ 
+ # Check whether --enable-rpath-link or --disable-rpath-link was given.
+@@ -12288,7 +12291,7 @@
+ else
+   with_rpath_link=yes
+ fi;
+-	echo "$as_me:12291: result: $with_rpath_link" >&5
++	echo "$as_me:12294: result: $with_rpath_link" >&5
+ echo "${ECHO_T}$with_rpath_link" >&6
+ 	if test "$with_rpath_link" = no
+ 	then
+@@ -12301,7 +12304,7 @@
+ 
+ ###   use option --enable-broken-linker to force on use of broken-linker support
+ 
+-echo "$as_me:12304: checking if you want broken-linker support code" >&5
++echo "$as_me:12307: 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.
+@@ -12311,7 +12314,7 @@
+ else
+   with_broken_linker=no
+ fi;
+-echo "$as_me:12314: result: $with_broken_linker" >&5
++echo "$as_me:12317: result: $with_broken_linker" >&5
+ echo "${ECHO_T}$with_broken_linker" >&6
+ 
+ : "${BROKEN_LINKER:=0}"
+@@ -12326,14 +12329,14 @@
+ 
+ # Check to define _XOPEN_SOURCE "automatically"
+ 
+-echo "$as_me:12329: checking if the POSIX test-macros are already defined" >&5
++echo "$as_me:12332: 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 12336 "configure"
++#line 12339 "configure"
+ #include "confdefs.h"
+ #include <stdio.h>
+ int
+@@ -12352,16 +12355,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:12355: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:12358: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:12358: \$? = $ac_status" >&5
++  echo "$as_me:12361: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:12361: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12364: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:12364: \$? = $ac_status" >&5
++  echo "$as_me:12367: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_posix_visible=no
+ else
+@@ -12372,7 +12375,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:12375: result: $cf_cv_posix_visible" >&5
++echo "$as_me:12378: result: $cf_cv_posix_visible" >&5
+ echo "${ECHO_T}$cf_cv_posix_visible" >&6
+ 
+ if test "$cf_cv_posix_visible" = no; then
+@@ -12417,14 +12420,14 @@
+ 
+ cf_gnu_xopen_source=$cf_XOPEN_SOURCE
+ 
+-echo "$as_me:12420: checking if this is the GNU C library" >&5
++echo "$as_me:12423: 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 12427 "configure"
++#line 12430 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ int
+@@ -12443,16 +12446,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:12446: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:12449: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:12449: \$? = $ac_status" >&5
++  echo "$as_me:12452: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:12452: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12455: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:12455: \$? = $ac_status" >&5
++  echo "$as_me:12458: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_gnu_library=yes
+ else
+@@ -12463,7 +12466,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:12466: result: $cf_cv_gnu_library" >&5
++echo "$as_me:12469: result: $cf_cv_gnu_library" >&5
+ echo "${ECHO_T}$cf_cv_gnu_library" >&6
+ 
+ if test x$cf_cv_gnu_library = xyes; then
+@@ -12471,7 +12474,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:12474: checking if _DEFAULT_SOURCE can be used as a basis" >&5
++	echo "$as_me:12477: 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
+@@ -12483,7 +12486,7 @@
+ 	CPPFLAGS="${CPPFLAGS}-D_DEFAULT_SOURCE"
+ 
+ 		cat >"conftest.$ac_ext" <<_ACEOF
+-#line 12486 "configure"
++#line 12489 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ int
+@@ -12502,16 +12505,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:12505: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:12508: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:12508: \$? = $ac_status" >&5
++  echo "$as_me:12511: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:12511: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12514: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:12514: \$? = $ac_status" >&5
++  echo "$as_me:12517: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_gnu_library_219=yes
+ else
+@@ -12523,12 +12526,12 @@
+ 		CPPFLAGS="$cf_save"
+ 
+ fi
+-echo "$as_me:12526: result: $cf_cv_gnu_library_219" >&5
++echo "$as_me:12529: 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:12531: checking if _XOPEN_SOURCE=$cf_gnu_xopen_source works with _DEFAULT_SOURCE" >&5
++		echo "$as_me:12534: 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
+@@ -12633,7 +12636,7 @@
+ fi
+ 
+ 			cat >"conftest.$ac_ext" <<_ACEOF
+-#line 12636 "configure"
++#line 12639 "configure"
+ #include "confdefs.h"
+ 
+ 				#include <limits.h>
+@@ -12653,16 +12656,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:12656: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:12659: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:12659: \$? = $ac_status" >&5
++  echo "$as_me:12662: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:12662: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12665: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:12665: \$? = $ac_status" >&5
++  echo "$as_me:12668: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_gnu_dftsrc_219=yes
+ else
+@@ -12673,7 +12676,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:12676: result: $cf_cv_gnu_dftsrc_219" >&5
++echo "$as_me:12679: 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
+@@ -12682,14 +12685,14 @@
+ 
+ 	if test "x$cf_cv_gnu_dftsrc_219" != xyes; then
+ 
+-		echo "$as_me:12685: checking if we must define _GNU_SOURCE" >&5
++		echo "$as_me:12688: 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 12692 "configure"
++#line 12695 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ int
+@@ -12704,16 +12707,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:12707: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:12710: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:12710: \$? = $ac_status" >&5
++  echo "$as_me:12713: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:12713: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12716: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:12716: \$? = $ac_status" >&5
++  echo "$as_me:12719: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_gnu_source=no
+ else
+@@ -12820,7 +12823,7 @@
+ fi
+ 
+ 			 cat >"conftest.$ac_ext" <<_ACEOF
+-#line 12823 "configure"
++#line 12826 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ int
+@@ -12835,16 +12838,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:12838: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:12841: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:12841: \$? = $ac_status" >&5
++  echo "$as_me:12844: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:12844: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12847: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:12847: \$? = $ac_status" >&5
++  echo "$as_me:12850: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_gnu_source=no
+ else
+@@ -12859,12 +12862,12 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:12862: result: $cf_cv_gnu_source" >&5
++echo "$as_me:12865: 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:12867: checking if we should also define _DEFAULT_SOURCE" >&5
++		echo "$as_me:12870: 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
+@@ -12874,7 +12877,7 @@
+ 	CPPFLAGS="${CPPFLAGS}-D_GNU_SOURCE"
+ 
+ 			cat >"conftest.$ac_ext" <<_ACEOF
+-#line 12877 "configure"
++#line 12880 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ int
+@@ -12889,16 +12892,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:12892: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:12895: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:12895: \$? = $ac_status" >&5
++  echo "$as_me:12898: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:12898: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12901: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:12901: \$? = $ac_status" >&5
++  echo "$as_me:12904: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_default_source=no
+ else
+@@ -12909,7 +12912,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:12912: result: $cf_cv_default_source" >&5
++echo "$as_me:12915: result: $cf_cv_default_source" >&5
+ echo "${ECHO_T}$cf_cv_default_source" >&6
+ 			if test "$cf_cv_default_source" = yes
+ 			then
+@@ -12946,16 +12949,16 @@
+ 	sed	-e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ 	]*\)\?[ 	]/ /g' \
+ 		-e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ 	]*\)\?$//g'`
+ 
+-echo "$as_me:12949: checking if we should define _POSIX_C_SOURCE" >&5
++echo "$as_me:12952: 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}:12955: testing if the symbol is already defined go no further ..." 1>&5
++echo "${as_me:-configure}:12958: testing if the symbol is already defined go no further ..." 1>&5
+ 
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 12958 "configure"
++#line 12961 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ int
+@@ -12970,16 +12973,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:12973: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:12976: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:12976: \$? = $ac_status" >&5
++  echo "$as_me:12979: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:12979: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12982: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:12982: \$? = $ac_status" >&5
++  echo "$as_me:12985: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_posix_c_source=no
+ else
+@@ -13000,7 +13003,7 @@
+ 	 esac
+ 	 if test "$cf_want_posix_source" = yes ; then
+ 		cat >"conftest.$ac_ext" <<_ACEOF
+-#line 13003 "configure"
++#line 13006 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ int
+@@ -13015,16 +13018,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:13018: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:13021: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:13021: \$? = $ac_status" >&5
++  echo "$as_me:13024: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:13024: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13027: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:13027: \$? = $ac_status" >&5
++  echo "$as_me:13030: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   :
+ else
+@@ -13035,7 +13038,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 	 fi
+ 
+-echo "${as_me:-configure}:13038: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
++echo "${as_me:-configure}:13041: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
+ 
+ 	 CFLAGS="$cf_trim_CFLAGS"
+ 	 CPPFLAGS="$cf_trim_CPPFLAGS"
+@@ -13043,10 +13046,10 @@
+ 	test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
+ 	CPPFLAGS="${CPPFLAGS}$cf_cv_posix_c_source"
+ 
+-echo "${as_me:-configure}:13046: testing if the second compile does not leave our definition intact error ..." 1>&5
++echo "${as_me:-configure}:13049: testing if the second compile does not leave our definition intact error ..." 1>&5
+ 
+ 	 cat >"conftest.$ac_ext" <<_ACEOF
+-#line 13049 "configure"
++#line 13052 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ int
+@@ -13061,16 +13064,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:13064: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:13067: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:13067: \$? = $ac_status" >&5
++  echo "$as_me:13070: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:13070: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13073: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:13073: \$? = $ac_status" >&5
++  echo "$as_me:13076: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   :
+ else
+@@ -13086,7 +13089,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:13089: result: $cf_cv_posix_c_source" >&5
++echo "$as_me:13092: 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
+@@ -13203,7 +13206,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:13206: WARNING: this system does not provide usable locale support" >&5
++	{ echo "$as_me:13209: 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
+@@ -13235,14 +13238,14 @@
+ 	;;
+ (*)
+ 
+-echo "$as_me:13238: checking if we should define _XOPEN_SOURCE" >&5
++echo "$as_me:13241: 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 13245 "configure"
++#line 13248 "configure"
+ #include "confdefs.h"
+ 
+ #include <stdlib.h>
+@@ -13261,16 +13264,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:13264: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:13267: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:13267: \$? = $ac_status" >&5
++  echo "$as_me:13270: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:13270: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13273: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:13273: \$? = $ac_status" >&5
++  echo "$as_me:13276: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_xopen_source=no
+ else
+@@ -13282,7 +13285,7 @@
+ 	CPPFLAGS="${CPPFLAGS}-D_XOPEN_SOURCE=$cf_XOPEN_SOURCE"
+ 
+ 	 cat >"conftest.$ac_ext" <<_ACEOF
+-#line 13285 "configure"
++#line 13288 "configure"
+ #include "confdefs.h"
+ 
+ #include <stdlib.h>
+@@ -13301,16 +13304,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:13304: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:13307: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:13307: \$? = $ac_status" >&5
++  echo "$as_me:13310: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:13310: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13313: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:13313: \$? = $ac_status" >&5
++  echo "$as_me:13316: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_xopen_source=no
+ else
+@@ -13325,7 +13328,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:13328: result: $cf_cv_xopen_source" >&5
++echo "$as_me:13331: result: $cf_cv_xopen_source" >&5
+ echo "${ECHO_T}$cf_cv_xopen_source" >&6
+ 
+ if test "$cf_cv_xopen_source" != no ; then
+@@ -13483,16 +13486,16 @@
+ 	sed	-e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ 	]*\)\?[ 	]/ /g' \
+ 		-e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ 	]*\)\?$//g'`
+ 
+-echo "$as_me:13486: checking if we should define _POSIX_C_SOURCE" >&5
++echo "$as_me:13489: 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}:13492: testing if the symbol is already defined go no further ..." 1>&5
++echo "${as_me:-configure}:13495: testing if the symbol is already defined go no further ..." 1>&5
+ 
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 13495 "configure"
++#line 13498 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ int
+@@ -13507,16 +13510,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:13510: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:13513: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:13513: \$? = $ac_status" >&5
++  echo "$as_me:13516: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:13516: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13519: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:13519: \$? = $ac_status" >&5
++  echo "$as_me:13522: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_posix_c_source=no
+ else
+@@ -13537,7 +13540,7 @@
+ 	 esac
+ 	 if test "$cf_want_posix_source" = yes ; then
+ 		cat >"conftest.$ac_ext" <<_ACEOF
+-#line 13540 "configure"
++#line 13543 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ int
+@@ -13552,16 +13555,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:13555: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:13558: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:13558: \$? = $ac_status" >&5
++  echo "$as_me:13561: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:13561: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13564: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:13564: \$? = $ac_status" >&5
++  echo "$as_me:13567: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   :
+ else
+@@ -13572,7 +13575,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 	 fi
+ 
+-echo "${as_me:-configure}:13575: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
++echo "${as_me:-configure}:13578: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
+ 
+ 	 CFLAGS="$cf_trim_CFLAGS"
+ 	 CPPFLAGS="$cf_trim_CPPFLAGS"
+@@ -13580,10 +13583,10 @@
+ 	test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
+ 	CPPFLAGS="${CPPFLAGS}$cf_cv_posix_c_source"
+ 
+-echo "${as_me:-configure}:13583: testing if the second compile does not leave our definition intact error ..." 1>&5
++echo "${as_me:-configure}:13586: testing if the second compile does not leave our definition intact error ..." 1>&5
+ 
+ 	 cat >"conftest.$ac_ext" <<_ACEOF
+-#line 13586 "configure"
++#line 13589 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ int
+@@ -13598,16 +13601,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:13601: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:13604: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:13604: \$? = $ac_status" >&5
++  echo "$as_me:13607: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:13607: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13610: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:13610: \$? = $ac_status" >&5
++  echo "$as_me:13613: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   :
+ else
+@@ -13623,7 +13626,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:13626: result: $cf_cv_posix_c_source" >&5
++echo "$as_me:13629: 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
+@@ -13749,7 +13752,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}:13752: testing removing old option $cf_add_cflags from CFLAGS ..." 1>&5
++echo "${as_me:-configure}:13755: testing removing old option $cf_add_cflags from CFLAGS ..." 1>&5
+ 
+ 	CFLAGS="$cf_old_cflag"
+ done
+@@ -13761,7 +13764,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}:13764: testing removing old option $cf_add_cflags from CPPFLAGS ..." 1>&5
++echo "${as_me:-configure}:13767: testing removing old option $cf_add_cflags from CPPFLAGS ..." 1>&5
+ 
+ 	CPPFLAGS="$cf_old_cflag"
+ done
+@@ -13849,7 +13852,7 @@
+ if test -n "$cf_new_cflags" ; then
+ 	test -n "$verbose" && echo "	add to \$CFLAGS $cf_new_cflags" 1>&6
+ 
+-echo "${as_me:-configure}:13852: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
++echo "${as_me:-configure}:13855: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
+ 
+ 	test -n "$CFLAGS" && CFLAGS="$CFLAGS "
+ 	CFLAGS="${CFLAGS}$cf_new_cflags"
+@@ -13859,7 +13862,7 @@
+ if test -n "$cf_new_cppflags" ; then
+ 	test -n "$verbose" && echo "	add to \$CPPFLAGS $cf_new_cppflags" 1>&6
+ 
+-echo "${as_me:-configure}:13862: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
++echo "${as_me:-configure}:13865: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
+ 
+ 	test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
+ 	CPPFLAGS="${CPPFLAGS}$cf_new_cppflags"
+@@ -13869,7 +13872,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}:13872: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5
++echo "${as_me:-configure}:13875: 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"
+@@ -13881,10 +13884,10 @@
+ fi
+ 
+ if test -n "$cf_XOPEN_SOURCE" && test -z "$cf_cv_xopen_source" ; then
+-	echo "$as_me:13884: checking if _XOPEN_SOURCE really is set" >&5
++	echo "$as_me:13887: 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 13887 "configure"
++#line 13890 "configure"
+ #include "confdefs.h"
+ #include <stdlib.h>
+ int
+@@ -13899,16 +13902,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:13902: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:13905: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:13905: \$? = $ac_status" >&5
++  echo "$as_me:13908: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:13908: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13911: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:13911: \$? = $ac_status" >&5
++  echo "$as_me:13914: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_XOPEN_SOURCE_set=yes
+ else
+@@ -13917,12 +13920,12 @@
+ cf_XOPEN_SOURCE_set=no
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+-	echo "$as_me:13920: result: $cf_XOPEN_SOURCE_set" >&5
++	echo "$as_me:13923: 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 13925 "configure"
++#line 13928 "configure"
+ #include "confdefs.h"
+ #include <stdlib.h>
+ int
+@@ -13937,16 +13940,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:13940: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:13943: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:13943: \$? = $ac_status" >&5
++  echo "$as_me:13946: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:13946: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13949: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:13949: \$? = $ac_status" >&5
++  echo "$as_me:13952: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_XOPEN_SOURCE_set_ok=yes
+ else
+@@ -13957,19 +13960,19 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 		if test "$cf_XOPEN_SOURCE_set_ok" = no
+ 		then
+-			{ echo "$as_me:13960: WARNING: _XOPEN_SOURCE is lower than requested" >&5
++			{ echo "$as_me:13963: WARNING: _XOPEN_SOURCE is lower than requested" >&5
+ echo "$as_me: WARNING: _XOPEN_SOURCE is lower than requested" >&2;}
+ 		fi
+ 	else
+ 
+-echo "$as_me:13965: checking if we should define _XOPEN_SOURCE" >&5
++echo "$as_me:13968: 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 13972 "configure"
++#line 13975 "configure"
+ #include "confdefs.h"
+ 
+ #include <stdlib.h>
+@@ -13988,16 +13991,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:13991: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:13994: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:13994: \$? = $ac_status" >&5
++  echo "$as_me:13997: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:13997: \"$ac_try\"") >&5
++  { (eval echo "$as_me:14000: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:14000: \$? = $ac_status" >&5
++  echo "$as_me:14003: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_xopen_source=no
+ else
+@@ -14009,7 +14012,7 @@
+ 	CPPFLAGS="${CPPFLAGS}-D_XOPEN_SOURCE=$cf_XOPEN_SOURCE"
+ 
+ 	 cat >"conftest.$ac_ext" <<_ACEOF
+-#line 14012 "configure"
++#line 14015 "configure"
+ #include "confdefs.h"
+ 
+ #include <stdlib.h>
+@@ -14028,16 +14031,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:14031: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:14034: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:14034: \$? = $ac_status" >&5
++  echo "$as_me:14037: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:14037: \"$ac_try\"") >&5
++  { (eval echo "$as_me:14040: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:14040: \$? = $ac_status" >&5
++  echo "$as_me:14043: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_xopen_source=no
+ else
+@@ -14052,7 +14055,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:14055: result: $cf_cv_xopen_source" >&5
++echo "$as_me:14058: result: $cf_cv_xopen_source" >&5
+ echo "${ECHO_T}$cf_cv_xopen_source" >&6
+ 
+ if test "$cf_cv_xopen_source" != no ; then
+@@ -14206,7 +14209,7 @@
+ fi;
+ if test "$enable_largefile" != no; then
+ 
+-  echo "$as_me:14209: checking for special C compiler options needed for large files" >&5
++  echo "$as_me:14212: 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
+@@ -14218,7 +14221,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 14221 "configure"
++#line 14224 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+  /* Check that off_t can represent 2**63 - 1 correctly.
+@@ -14238,16 +14241,16 @@
+ }
+ _ACEOF
+      	 rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:14241: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:14244: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:14244: \$? = $ac_status" >&5
++  echo "$as_me:14247: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:14247: \"$ac_try\"") >&5
++  { (eval echo "$as_me:14250: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:14250: \$? = $ac_status" >&5
++  echo "$as_me:14253: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   break
+ else
+@@ -14257,16 +14260,16 @@
+ rm -f "conftest.$ac_objext"
+      	 CC="$CC -n32"
+      	 rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:14260: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:14263: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:14263: \$? = $ac_status" >&5
++  echo "$as_me:14266: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:14266: \"$ac_try\"") >&5
++  { (eval echo "$as_me:14269: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:14269: \$? = $ac_status" >&5
++  echo "$as_me:14272: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_sys_largefile_CC=' -n32'; break
+ else
+@@ -14280,13 +14283,13 @@
+        rm -f "conftest.$ac_ext"
+     fi
+ fi
+-echo "$as_me:14283: result: $ac_cv_sys_largefile_CC" >&5
++echo "$as_me:14286: 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:14289: checking for _FILE_OFFSET_BITS value needed for large files" >&5
++  echo "$as_me:14292: 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
+@@ -14294,7 +14297,7 @@
+   while :; do
+   ac_cv_sys_file_offset_bits=no
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 14297 "configure"
++#line 14300 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+  /* Check that off_t can represent 2**63 - 1 correctly.
+@@ -14314,16 +14317,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:14317: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:14320: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:14320: \$? = $ac_status" >&5
++  echo "$as_me:14323: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:14323: \"$ac_try\"") >&5
++  { (eval echo "$as_me:14326: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:14326: \$? = $ac_status" >&5
++  echo "$as_me:14329: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   break
+ else
+@@ -14332,7 +14335,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 14335 "configure"
++#line 14338 "configure"
+ #include "confdefs.h"
+ #define _FILE_OFFSET_BITS 64
+ #include <sys/types.h>
+@@ -14353,16 +14356,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:14356: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:14359: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:14359: \$? = $ac_status" >&5
++  echo "$as_me:14362: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:14362: \"$ac_try\"") >&5
++  { (eval echo "$as_me:14365: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:14365: \$? = $ac_status" >&5
++  echo "$as_me:14368: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_sys_file_offset_bits=64; break
+ else
+@@ -14373,7 +14376,7 @@
+   break
+ done
+ fi
+-echo "$as_me:14376: result: $ac_cv_sys_file_offset_bits" >&5
++echo "$as_me:14379: 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
+ 
+@@ -14383,7 +14386,7 @@
+ 
+ fi
+ rm -rf conftest*
+-  echo "$as_me:14386: checking for _LARGE_FILES value needed for large files" >&5
++  echo "$as_me:14389: 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
+@@ -14391,7 +14394,7 @@
+   while :; do
+   ac_cv_sys_large_files=no
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 14394 "configure"
++#line 14397 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+  /* Check that off_t can represent 2**63 - 1 correctly.
+@@ -14411,16 +14414,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:14414: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:14417: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:14417: \$? = $ac_status" >&5
++  echo "$as_me:14420: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:14420: \"$ac_try\"") >&5
++  { (eval echo "$as_me:14423: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:14423: \$? = $ac_status" >&5
++  echo "$as_me:14426: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   break
+ else
+@@ -14429,7 +14432,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 14432 "configure"
++#line 14435 "configure"
+ #include "confdefs.h"
+ #define _LARGE_FILES 1
+ #include <sys/types.h>
+@@ -14450,16 +14453,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:14453: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:14456: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:14456: \$? = $ac_status" >&5
++  echo "$as_me:14459: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:14459: \"$ac_try\"") >&5
++  { (eval echo "$as_me:14462: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:14462: \$? = $ac_status" >&5
++  echo "$as_me:14465: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_sys_large_files=1; break
+ else
+@@ -14470,7 +14473,7 @@
+   break
+ done
+ fi
+-echo "$as_me:14473: result: $ac_cv_sys_large_files" >&5
++echo "$as_me:14476: 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
+ 
+@@ -14483,7 +14486,7 @@
+ fi
+ 
+ 	if test "$enable_largefile" != no ; then
+-	echo "$as_me:14486: checking for _LARGEFILE_SOURCE value needed for large files" >&5
++	echo "$as_me:14489: 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
+@@ -14491,7 +14494,7 @@
+   while :; do
+   ac_cv_sys_largefile_source=no
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 14494 "configure"
++#line 14497 "configure"
+ #include "confdefs.h"
+ #include <stdio.h>
+ int
+@@ -14503,16 +14506,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:14506: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:14509: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:14509: \$? = $ac_status" >&5
++  echo "$as_me:14512: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:14512: \"$ac_try\"") >&5
++  { (eval echo "$as_me:14515: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:14515: \$? = $ac_status" >&5
++  echo "$as_me:14518: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   break
+ else
+@@ -14521,7 +14524,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 14524 "configure"
++#line 14527 "configure"
+ #include "confdefs.h"
+ #define _LARGEFILE_SOURCE 1
+ #include <stdio.h>
+@@ -14534,16 +14537,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:14537: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:14540: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:14540: \$? = $ac_status" >&5
++  echo "$as_me:14543: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:14543: \"$ac_try\"") >&5
++  { (eval echo "$as_me:14546: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:14546: \$? = $ac_status" >&5
++  echo "$as_me:14549: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_sys_largefile_source=1; break
+ else
+@@ -14554,7 +14557,7 @@
+   break
+ done
+ fi
+-echo "$as_me:14557: result: $ac_cv_sys_largefile_source" >&5
++echo "$as_me:14560: 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
+ 
+@@ -14568,13 +14571,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:14571: checking for fseeko" >&5
++echo "$as_me:14574: 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 14577 "configure"
++#line 14580 "configure"
+ #include "confdefs.h"
+ #include <stdio.h>
+ int
+@@ -14586,16 +14589,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:14589: \"$ac_link\"") >&5
++if { (eval echo "$as_me:14592: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:14592: \$? = $ac_status" >&5
++  echo "$as_me:14595: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:14595: \"$ac_try\"") >&5
++  { (eval echo "$as_me:14598: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:14598: \$? = $ac_status" >&5
++  echo "$as_me:14601: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_func_fseeko=yes
+ else
+@@ -14605,7 +14608,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:14608: result: $ac_cv_func_fseeko" >&5
++echo "$as_me:14611: result: $ac_cv_func_fseeko" >&5
+ echo "${ECHO_T}$ac_cv_func_fseeko" >&6
+ if test $ac_cv_func_fseeko = yes; then
+ 
+@@ -14644,14 +14647,14 @@
+ 
+ 	fi
+ 
+-	echo "$as_me:14647: checking whether to use struct dirent64" >&5
++	echo "$as_me:14650: 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 14654 "configure"
++#line 14657 "configure"
+ #include "confdefs.h"
+ 
+ #pragma GCC diagnostic error "-Wincompatible-pointer-types"
+@@ -14674,16 +14677,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:14677: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:14680: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:14680: \$? = $ac_status" >&5
++  echo "$as_me:14683: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:14683: \"$ac_try\"") >&5
++  { (eval echo "$as_me:14686: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:14686: \$? = $ac_status" >&5
++  echo "$as_me:14689: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_struct_dirent64=yes
+ else
+@@ -14694,7 +14697,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:14697: result: $cf_cv_struct_dirent64" >&5
++echo "$as_me:14700: result: $cf_cv_struct_dirent64" >&5
+ echo "${ECHO_T}$cf_cv_struct_dirent64" >&6
+ 	test "$cf_cv_struct_dirent64" = yes &&
+ cat >>confdefs.h <<\EOF
+@@ -14704,7 +14707,7 @@
+ 	fi
+ 
+ ### Enable compiling-in rcs id's
+-echo "$as_me:14707: checking if RCS identifiers should be compiled-in" >&5
++echo "$as_me:14710: 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.
+@@ -14714,7 +14717,7 @@
+ else
+   with_rcs_ids=no
+ fi;
+-echo "$as_me:14717: result: $with_rcs_ids" >&5
++echo "$as_me:14720: result: $with_rcs_ids" >&5
+ echo "${ECHO_T}$with_rcs_ids" >&6
+ test "$with_rcs_ids" = yes &&
+ cat >>confdefs.h <<\EOF
+@@ -14724,7 +14727,7 @@
+ ###############################################################################
+ 
+ ### Note that some functions (such as const) are normally disabled anyway.
+-echo "$as_me:14727: checking if you want to build with function extensions" >&5
++echo "$as_me:14730: 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.
+@@ -14734,7 +14737,7 @@
+ else
+   with_ext_funcs=yes
+ fi;
+-echo "$as_me:14737: result: $with_ext_funcs" >&5
++echo "$as_me:14740: result: $with_ext_funcs" >&5
+ echo "${ECHO_T}$with_ext_funcs" >&6
+ if test "$with_ext_funcs" = yes ; then
+ 	NCURSES_EXT_FUNCS=1
+@@ -14752,7 +14755,7 @@
+ fi
+ 
+ ###   use option --enable-const to turn on use of const beyond that in XSI.
+-echo "$as_me:14755: checking for extended use of const keyword" >&5
++echo "$as_me:14758: 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.
+@@ -14762,7 +14765,7 @@
+ else
+   with_ext_const=no
+ fi;
+-echo "$as_me:14765: result: $with_ext_const" >&5
++echo "$as_me:14768: result: $with_ext_const" >&5
+ echo "${ECHO_T}$with_ext_const" >&6
+ NCURSES_CONST='/*nothing*/'
+ if test "$with_ext_const" = yes ; then
+@@ -14772,7 +14775,7 @@
+ ###############################################################################
+ # These options are relatively safe to experiment with.
+ 
+-echo "$as_me:14775: checking if you want all development code" >&5
++echo "$as_me:14778: 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.
+@@ -14782,7 +14785,7 @@
+ else
+   with_develop=no
+ fi;
+-echo "$as_me:14785: result: $with_develop" >&5
++echo "$as_me:14788: result: $with_develop" >&5
+ echo "${ECHO_T}$with_develop" >&6
+ 
+ ###############################################################################
+@@ -14791,7 +14794,7 @@
+ # This is still experimental (20080329), but should ultimately be moved to
+ # the script-block --with-normal, etc.
+ 
+-echo "$as_me:14794: checking if you want to link with the pthread library" >&5
++echo "$as_me:14797: 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.
+@@ -14801,27 +14804,27 @@
+ else
+   with_pthread=no
+ fi;
+-echo "$as_me:14804: result: $with_pthread" >&5
++echo "$as_me:14807: result: $with_pthread" >&5
+ echo "${ECHO_T}$with_pthread" >&6
+ 
+ if test "$with_pthread" != no ; then
+-	echo "$as_me:14808: checking for pthread.h" >&5
++	echo "$as_me:14811: 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 14814 "configure"
++#line 14817 "configure"
+ #include "confdefs.h"
+ #include <pthread.h>
+ _ACEOF
+-if { (eval echo "$as_me:14818: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:14821: \"$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:14824: \$? = $ac_status" >&5
++  echo "$as_me:14827: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -14840,7 +14843,7 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:14843: result: $ac_cv_header_pthread_h" >&5
++echo "$as_me:14846: 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
+ 
+@@ -14850,7 +14853,7 @@
+ 
+ 	for cf_lib_pthread in pthread c_r
+ 	do
+-	    echo "$as_me:14853: checking if we can link with the $cf_lib_pthread library" >&5
++	    echo "$as_me:14856: 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"
+ 
+@@ -14871,7 +14874,7 @@
+ LIBS="$cf_add_libs"
+ 
+ 	    cat >"conftest.$ac_ext" <<_ACEOF
+-#line 14874 "configure"
++#line 14877 "configure"
+ #include "confdefs.h"
+ 
+ #include <pthread.h>
+@@ -14888,16 +14891,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:14891: \"$ac_link\"") >&5
++if { (eval echo "$as_me:14894: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:14894: \$? = $ac_status" >&5
++  echo "$as_me:14897: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:14897: \"$ac_try\"") >&5
++  { (eval echo "$as_me:14900: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:14900: \$? = $ac_status" >&5
++  echo "$as_me:14903: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   with_pthread=yes
+ else
+@@ -14907,7 +14910,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ 	    LIBS="$cf_save_LIBS"
+-	    echo "$as_me:14910: result: $with_pthread" >&5
++	    echo "$as_me:14913: result: $with_pthread" >&5
+ echo "${ECHO_T}$with_pthread" >&6
+ 	    test "$with_pthread" = yes && break
+ 	done
+@@ -14935,7 +14938,7 @@
+ EOF
+ 
+ 	else
+-	    { { echo "$as_me:14938: error: Cannot link with pthread library" >&5
++	    { { echo "$as_me:14941: error: Cannot link with pthread library" >&5
+ echo "$as_me: error: Cannot link with pthread library" >&2;}
+    { (exit 1); exit 1; }; }
+ 	fi
+@@ -14944,7 +14947,7 @@
+ 
+ fi
+ 
+-echo "$as_me:14947: checking if you want to use weak-symbols for pthreads" >&5
++echo "$as_me:14950: 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.
+@@ -14954,18 +14957,18 @@
+ else
+   use_weak_symbols=no
+ fi;
+-echo "$as_me:14957: result: $use_weak_symbols" >&5
++echo "$as_me:14960: result: $use_weak_symbols" >&5
+ echo "${ECHO_T}$use_weak_symbols" >&6
+ if test "$use_weak_symbols" = yes ; then
+ 
+-echo "$as_me:14961: checking if $CC supports weak symbols" >&5
++echo "$as_me:14964: 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 14968 "configure"
++#line 14971 "configure"
+ #include "confdefs.h"
+ 
+ #include <stdio.h>
+@@ -14991,16 +14994,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:14994: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:14997: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:14997: \$? = $ac_status" >&5
++  echo "$as_me:15000: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:15000: \"$ac_try\"") >&5
++  { (eval echo "$as_me:15003: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:15003: \$? = $ac_status" >&5
++  echo "$as_me:15006: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_weak_symbols=yes
+ else
+@@ -15011,7 +15014,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:15014: result: $cf_cv_weak_symbols" >&5
++echo "$as_me:15017: result: $cf_cv_weak_symbols" >&5
+ echo "${ECHO_T}$cf_cv_weak_symbols" >&6
+ 
+ else
+@@ -15040,13 +15043,13 @@
+ fi
+ 
+ # OpenSUSE is installing ncurses6, using reentrant option.
+-echo "$as_me:15043: checking for _nc_TABSIZE" >&5
++echo "$as_me:15046: checking for _nc_TABSIZE" >&5
+ echo $ECHO_N "checking for _nc_TABSIZE... $ECHO_C" >&6
+ if test "${ac_cv_func__nc_TABSIZE+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 15049 "configure"
++#line 15052 "configure"
+ #include "confdefs.h"
+ #define _nc_TABSIZE autoconf_temporary
+ #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -15077,16 +15080,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:15080: \"$ac_link\"") >&5
++if { (eval echo "$as_me:15083: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:15083: \$? = $ac_status" >&5
++  echo "$as_me:15086: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:15086: \"$ac_try\"") >&5
++  { (eval echo "$as_me:15089: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:15089: \$? = $ac_status" >&5
++  echo "$as_me:15092: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_func__nc_TABSIZE=yes
+ else
+@@ -15096,7 +15099,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:15099: result: $ac_cv_func__nc_TABSIZE" >&5
++echo "$as_me:15102: result: $ac_cv_func__nc_TABSIZE" >&5
+ echo "${ECHO_T}$ac_cv_func__nc_TABSIZE" >&6
+ if test "$ac_cv_func__nc_TABSIZE" = yes; then
+   assume_reentrant=yes
+@@ -15108,7 +15111,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:15111: checking if you want experimental reentrant code" >&5
++echo "$as_me:15114: checking if you want experimental reentrant code" >&5
+ echo $ECHO_N "checking if you want experimental reentrant code... $ECHO_C" >&6
+ 
+ # Check whether --enable-reentrant or --disable-reentrant was given.
+@@ -15118,7 +15121,7 @@
+ else
+   with_reentrant=$assume_reentrant
+ fi;
+-echo "$as_me:15121: result: $with_reentrant" >&5
++echo "$as_me:15124: result: $with_reentrant" >&5
+ echo "${ECHO_T}$with_reentrant" >&6
+ if test "$with_reentrant" = yes ; then
+ 	cf_cv_enable_reentrant=1
+@@ -15141,7 +15144,7 @@
+ 
+ ### Allow using a different wrap-prefix
+ if test "$cf_cv_enable_reentrant" != 0 || test "$BROKEN_LINKER" = 1 ; then
+-	echo "$as_me:15144: checking for prefix used to wrap public variables" >&5
++	echo "$as_me:15147: 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.
+@@ -15151,7 +15154,7 @@
+ else
+   NCURSES_WRAP_PREFIX=_nc_
+ fi;
+-	echo "$as_me:15154: result: $NCURSES_WRAP_PREFIX" >&5
++	echo "$as_me:15157: result: $NCURSES_WRAP_PREFIX" >&5
+ echo "${ECHO_T}$NCURSES_WRAP_PREFIX" >&6
+ else
+ 	NCURSES_WRAP_PREFIX=_nc_
+@@ -15165,7 +15168,7 @@
+ 
+ ###	use option --disable-echo to suppress full display compiling commands
+ 
+-echo "$as_me:15168: checking if you want to see long compiling messages" >&5
++echo "$as_me:15171: 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.
+@@ -15199,10 +15202,10 @@
+ 	ECHO_CC=''
+ 
+ fi;
+-echo "$as_me:15202: result: $enableval" >&5
++echo "$as_me:15205: result: $enableval" >&5
+ echo "${ECHO_T}$enableval" >&6
+ 
+-echo "$as_me:15205: checking if you want to use C11 _Noreturn feature" >&5
++echo "$as_me:15208: 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.
+@@ -15219,17 +15222,17 @@
+ 	enable_stdnoreturn=no
+ 
+ fi;
+-echo "$as_me:15222: result: $enable_stdnoreturn" >&5
++echo "$as_me:15225: result: $enable_stdnoreturn" >&5
+ echo "${ECHO_T}$enable_stdnoreturn" >&6
+ 
+ if test $enable_stdnoreturn = yes; then
+-echo "$as_me:15226: checking for C11 _Noreturn feature" >&5
++echo "$as_me:15229: 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 15232 "configure"
++#line 15235 "configure"
+ #include "confdefs.h"
+ 
+ #include <stdio.h>
+@@ -15246,16 +15249,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:15249: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:15252: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:15252: \$? = $ac_status" >&5
++  echo "$as_me:15255: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:15255: \"$ac_try\"") >&5
++  { (eval echo "$as_me:15258: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:15258: \$? = $ac_status" >&5
++  echo "$as_me:15261: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_c11_noreturn=yes
+ else
+@@ -15266,7 +15269,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:15269: result: $cf_cv_c11_noreturn" >&5
++echo "$as_me:15272: result: $cf_cv_c11_noreturn" >&5
+ echo "${ECHO_T}$cf_cv_c11_noreturn" >&6
+ else
+ 	cf_cv_c11_noreturn=no,
+@@ -15322,16 +15325,16 @@
+ 		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}:15328: testing repairing CFLAGS: $CFLAGS ..." 1>&5
+ 
+ 			CFLAGS="$cf_temp_flags"
+ 			test -n "$verbose" && echo "	... fixed $CFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:15330: testing ... fixed $CFLAGS ..." 1>&5
++echo "${as_me:-configure}:15333: testing ... fixed $CFLAGS ..." 1>&5
+ 
+ 			test -n "$verbose" && echo "	... extra $EXTRA_CFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:15334: testing ... extra $EXTRA_CFLAGS ..." 1>&5
++echo "${as_me:-configure}:15337: testing ... extra $EXTRA_CFLAGS ..." 1>&5
+ 
+ 		fi
+ 		;;
+@@ -15370,16 +15373,16 @@
+ 		then
+ 			test -n "$verbose" && echo "	repairing CPPFLAGS: $CPPFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:15373: testing repairing CPPFLAGS: $CPPFLAGS ..." 1>&5
++echo "${as_me:-configure}:15376: testing repairing CPPFLAGS: $CPPFLAGS ..." 1>&5
+ 
+ 			CPPFLAGS="$cf_temp_flags"
+ 			test -n "$verbose" && echo "	... fixed $CPPFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:15378: testing ... fixed $CPPFLAGS ..." 1>&5
++echo "${as_me:-configure}:15381: testing ... fixed $CPPFLAGS ..." 1>&5
+ 
+ 			test -n "$verbose" && echo "	... extra $EXTRA_CFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:15382: testing ... extra $EXTRA_CFLAGS ..." 1>&5
++echo "${as_me:-configure}:15385: testing ... extra $EXTRA_CFLAGS ..." 1>&5
+ 
+ 		fi
+ 		;;
+@@ -15418,23 +15421,23 @@
+ 		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}:15424: testing repairing LDFLAGS: $LDFLAGS ..." 1>&5
+ 
+ 			LDFLAGS="$cf_temp_flags"
+ 			test -n "$verbose" && echo "	... fixed $LDFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:15426: testing ... fixed $LDFLAGS ..." 1>&5
++echo "${as_me:-configure}:15429: testing ... fixed $LDFLAGS ..." 1>&5
+ 
+ 			test -n "$verbose" && echo "	... extra $EXTRA_CFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:15430: testing ... extra $EXTRA_CFLAGS ..." 1>&5
++echo "${as_me:-configure}:15433: testing ... extra $EXTRA_CFLAGS ..." 1>&5
+ 
+ 		fi
+ 		;;
+ 	esac
+ fi
+ 
+-echo "$as_me:15437: checking if you want to turn on gcc warnings" >&5
++echo "$as_me:15440: 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.
+@@ -15451,7 +15454,7 @@
+ 	enable_warnings=no
+ 
+ fi;
+-echo "$as_me:15454: result: $enable_warnings" >&5
++echo "$as_me:15457: result: $enable_warnings" >&5
+ echo "${ECHO_T}$enable_warnings" >&6
+ if test "$enable_warnings" = "yes"
+ then
+@@ -15475,7 +15478,7 @@
+ done
+ 
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 15478 "configure"
++#line 15481 "configure"
+ #include "confdefs.h"
+ 
+ #include <stdlib.h>
+@@ -15490,26 +15493,26 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:15493: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:15496: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:15496: \$? = $ac_status" >&5
++  echo "$as_me:15499: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:15499: \"$ac_try\"") >&5
++  { (eval echo "$as_me:15502: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:15502: \$? = $ac_status" >&5
++  echo "$as_me:15505: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+ 
+-echo "$as_me:15505: checking for X11/Xt const-feature" >&5
++echo "$as_me:15508: 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 15512 "configure"
++#line 15515 "configure"
+ #include "confdefs.h"
+ 
+ #define _CONST_X_STRING	/* X11R7.8 (perhaps) */
+@@ -15526,16 +15529,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:15529: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:15532: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:15532: \$? = $ac_status" >&5
++  echo "$as_me:15535: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:15535: \"$ac_try\"") >&5
++  { (eval echo "$as_me:15538: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:15538: \$? = $ac_status" >&5
++  echo "$as_me:15541: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+ 
+ 			cf_cv_const_x_string=no
+@@ -15550,7 +15553,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:15553: result: $cf_cv_const_x_string" >&5
++echo "$as_me:15556: result: $cf_cv_const_x_string" >&5
+ echo "${ECHO_T}$cf_cv_const_x_string" >&6
+ 
+ LIBS="$cf_save_LIBS_CF_CONST_X_STRING"
+@@ -15579,7 +15582,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+  fi
+ cat > "conftest.$ac_ext" <<EOF
+-#line 15582 "${as_me:-configure}"
++#line 15585 "${as_me:-configure}"
+ int main(int argc, char *argv[]) { return (argv[argc-1] == 0) ; }
+ EOF
+ if test "$INTEL_COMPILER" = yes
+@@ -15595,7 +15598,7 @@
+ # remark #981: operands are evaluated in unspecified order
+ # warning #279: controlling expression is constant
+ 
+-	{ echo "$as_me:15598: checking for $CC warning options..." >&5
++	{ echo "$as_me:15601: checking for $CC warning options..." >&5
+ echo "$as_me: checking for $CC warning options..." >&6;}
+ 	cf_save_CFLAGS="$CFLAGS"
+ 	EXTRA_CFLAGS="$EXTRA_CFLAGS -Wall"
+@@ -15611,12 +15614,12 @@
+ 		wd981
+ 	do
+ 		CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt"
+-		if { (eval echo "$as_me:15614: \"$ac_compile\"") >&5
++		if { (eval echo "$as_me:15617: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:15617: \$? = $ac_status" >&5
++  echo "$as_me:15620: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; then
+-			test -n "$verbose" && echo "$as_me:15619: result: ... -$cf_opt" >&5
++			test -n "$verbose" && echo "$as_me:15622: result: ... -$cf_opt" >&5
+ echo "${ECHO_T}... -$cf_opt" >&6
+ 			EXTRA_CFLAGS="$EXTRA_CFLAGS -$cf_opt"
+ 		fi
+@@ -15624,7 +15627,7 @@
+ 	CFLAGS="$cf_save_CFLAGS"
+ elif test "$GCC" = yes && test "$GCC_VERSION" != "unknown"
+ then
+-	{ echo "$as_me:15627: checking for $CC warning options..." >&5
++	{ echo "$as_me:15630: checking for $CC warning options..." >&5
+ echo "$as_me: checking for $CC warning options..." >&6;}
+ 	cf_save_CFLAGS="$CFLAGS"
+ 	cf_warn_CONST=""
+@@ -15647,12 +15650,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:15650: \"$ac_compile\"") >&5
++		if { (eval echo "$as_me:15653: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:15653: \$? = $ac_status" >&5
++  echo "$as_me:15656: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; then
+-			test -n "$verbose" && echo "$as_me:15655: result: ... -$cf_opt" >&5
++			test -n "$verbose" && echo "$as_me:15658: result: ... -$cf_opt" >&5
+ echo "${ECHO_T}... -$cf_opt" >&6
+ 			case "$cf_opt" in
+ 			(Winline)
+@@ -15660,7 +15663,7 @@
+ 				([34].*)
+ 					test -n "$verbose" && echo "	feature is broken in gcc $GCC_VERSION" 1>&6
+ 
+-echo "${as_me:-configure}:15663: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
++echo "${as_me:-configure}:15666: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
+ 
+ 					continue;;
+ 				esac
+@@ -15670,7 +15673,7 @@
+ 				([12].*)
+ 					test -n "$verbose" && echo "	feature is broken in gcc $GCC_VERSION" 1>&6
+ 
+-echo "${as_me:-configure}:15673: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
++echo "${as_me:-configure}:15676: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
+ 
+ 					continue;;
+ 				esac
+@@ -15703,10 +15706,10 @@
+ EOF
+ if test "$GCC" = yes
+ then
+-	{ echo "$as_me:15706: checking for $CC __attribute__ directives..." >&5
++	{ echo "$as_me:15709: checking for $CC __attribute__ directives..." >&5
+ echo "$as_me: checking for $CC __attribute__ directives..." >&6;}
+ cat > "conftest.$ac_ext" <<EOF
+-#line 15709 "${as_me:-configure}"
++#line 15712 "${as_me:-configure}"
+ #include "confdefs.h"
+ #include "conftest.h"
+ #include "conftest.i"
+@@ -15755,12 +15758,12 @@
+ 			;;
+ 		esac
+ 
+-		if { (eval echo "$as_me:15758: \"$ac_compile\"") >&5
++		if { (eval echo "$as_me:15761: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:15761: \$? = $ac_status" >&5
++  echo "$as_me:15764: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; then
+-			test -n "$verbose" && echo "$as_me:15763: result: ... $cf_attribute" >&5
++			test -n "$verbose" && echo "$as_me:15766: result: ... $cf_attribute" >&5
+ echo "${ECHO_T}... $cf_attribute" >&6
+ 			cat conftest.h >>confdefs.h
+ 			case "$cf_attribute" in
+@@ -15828,7 +15831,7 @@
+ fi
+ 
+ ###	use option --enable-assertions to turn on generation of assertion code
+-echo "$as_me:15831: checking if you want to enable runtime assertions" >&5
++echo "$as_me:15834: 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.
+@@ -15838,7 +15841,7 @@
+ else
+   with_assertions=no
+ fi;
+-echo "$as_me:15841: result: $with_assertions" >&5
++echo "$as_me:15844: result: $with_assertions" >&5
+ echo "${ECHO_T}$with_assertions" >&6
+ if test -n "$GCC"
+ then
+@@ -15891,7 +15894,7 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:15894: checking whether to add trace feature to all models" >&5
++echo "$as_me:15897: 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.
+@@ -15901,7 +15904,7 @@
+ else
+   cf_with_trace=$cf_all_traces
+ fi;
+-echo "$as_me:15904: result: $cf_with_trace" >&5
++echo "$as_me:15907: result: $cf_with_trace" >&5
+ echo "${ECHO_T}$cf_with_trace" >&6
+ 
+ if test "$cf_with_trace" = yes ; then
+@@ -16009,7 +16012,7 @@
+ 	ADA_TRACE=FALSE
+ fi
+ 
+-echo "$as_me:16012: checking if we want to use GNAT projects" >&5
++echo "$as_me:16015: 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.
+@@ -16026,21 +16029,21 @@
+ 	enable_gnat_projects=yes
+ 
+ fi;
+-echo "$as_me:16029: result: $enable_gnat_projects" >&5
++echo "$as_me:16032: 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:16036: checking if ssp library is needed" >&5
++echo "$as_me:16039: 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 16043 "configure"
++#line 16046 "configure"
+ #include "confdefs.h"
+ 
+ #include <sys/types.h>
+@@ -16057,16 +16060,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:16060: \"$ac_link\"") >&5
++if { (eval echo "$as_me:16063: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:16063: \$? = $ac_status" >&5
++  echo "$as_me:16066: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:16066: \"$ac_try\"") >&5
++  { (eval echo "$as_me:16069: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:16069: \$? = $ac_status" >&5
++  echo "$as_me:16072: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_need_libssp=no
+ else
+@@ -16076,7 +16079,7 @@
+ 	cf_save_LIBS="$LIBS"
+ 	LIBS="$LIBS -lssp"
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 16079 "configure"
++#line 16082 "configure"
+ #include "confdefs.h"
+ 
+ #include <sys/types.h>
+@@ -16093,16 +16096,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:16096: \"$ac_link\"") >&5
++if { (eval echo "$as_me:16099: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:16099: \$? = $ac_status" >&5
++  echo "$as_me:16102: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:16102: \"$ac_try\"") >&5
++  { (eval echo "$as_me:16105: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:16105: \$? = $ac_status" >&5
++  echo "$as_me:16108: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_need_libssp=yes
+ else
+@@ -16116,7 +16119,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:16119: result: $cf_cv_need_libssp" >&5
++echo "$as_me:16122: result: $cf_cv_need_libssp" >&5
+ echo "${ECHO_T}$cf_cv_need_libssp" >&6
+ 
+ if test "x$cf_cv_need_libssp" = xyes
+@@ -16142,13 +16145,13 @@
+ 
+ 	;;
+ (*)
+-echo "$as_me:16145: checking for gettimeofday" >&5
++echo "$as_me:16148: 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 16151 "configure"
++#line 16154 "configure"
+ #include "confdefs.h"
+ #define gettimeofday autoconf_temporary
+ #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -16179,16 +16182,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:16182: \"$ac_link\"") >&5
++if { (eval echo "$as_me:16185: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:16185: \$? = $ac_status" >&5
++  echo "$as_me:16188: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:16188: \"$ac_try\"") >&5
++  { (eval echo "$as_me:16191: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:16191: \$? = $ac_status" >&5
++  echo "$as_me:16194: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_func_gettimeofday=yes
+ else
+@@ -16198,7 +16201,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:16201: result: $ac_cv_func_gettimeofday" >&5
++echo "$as_me:16204: 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
+@@ -16207,7 +16210,7 @@
+ 
+ else
+ 
+-echo "$as_me:16210: checking for gettimeofday in -lbsd" >&5
++echo "$as_me:16213: 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
+@@ -16215,7 +16218,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lbsd  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 16218 "configure"
++#line 16221 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -16234,16 +16237,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:16237: \"$ac_link\"") >&5
++if { (eval echo "$as_me:16240: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:16240: \$? = $ac_status" >&5
++  echo "$as_me:16243: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:16243: \"$ac_try\"") >&5
++  { (eval echo "$as_me:16246: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:16246: \$? = $ac_status" >&5
++  echo "$as_me:16249: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_bsd_gettimeofday=yes
+ else
+@@ -16254,7 +16257,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:16257: result: $ac_cv_lib_bsd_gettimeofday" >&5
++echo "$as_me:16260: 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
+ 
+@@ -16270,13 +16273,13 @@
+ esac
+ 
+ ###	Checks for header files.
+-echo "$as_me:16273: checking for ANSI C header files" >&5
++echo "$as_me:16276: 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 16279 "configure"
++#line 16282 "configure"
+ #include "confdefs.h"
+ #include <stdlib.h>
+ #include <stdarg.h>
+@@ -16284,13 +16287,13 @@
+ #include <float.h>
+ 
+ _ACEOF
+-if { (eval echo "$as_me:16287: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:16290: \"$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:16293: \$? = $ac_status" >&5
++  echo "$as_me:16296: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -16312,7 +16315,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 16315 "configure"
++#line 16318 "configure"
+ #include "confdefs.h"
+ #include <string.h>
+ 
+@@ -16330,7 +16333,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 16333 "configure"
++#line 16336 "configure"
+ #include "confdefs.h"
+ #include <stdlib.h>
+ 
+@@ -16351,7 +16354,7 @@
+   :
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 16354 "configure"
++#line 16357 "configure"
+ #include "confdefs.h"
+ #include <ctype.h>
+ #if ((' ' & 0x0FF) == 0x020)
+@@ -16377,15 +16380,15 @@
+ }
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:16380: \"$ac_link\"") >&5
++if { (eval echo "$as_me:16383: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:16383: \$? = $ac_status" >&5
++  echo "$as_me:16386: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:16385: \"$ac_try\"") >&5
++  { (eval echo "$as_me:16388: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:16388: \$? = $ac_status" >&5
++  echo "$as_me:16391: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   :
+ else
+@@ -16398,7 +16401,7 @@
+ fi
+ fi
+ fi
+-echo "$as_me:16401: result: $ac_cv_header_stdc" >&5
++echo "$as_me:16404: result: $ac_cv_header_stdc" >&5
+ echo "${ECHO_T}$ac_cv_header_stdc" >&6
+ if test $ac_cv_header_stdc = yes; then
+ 
+@@ -16414,28 +16417,28 @@
+                   inttypes.h stdint.h unistd.h
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-echo "$as_me:16417: checking for $ac_header" >&5
++echo "$as_me:16420: 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 16423 "configure"
++#line 16426 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ #include <$ac_header>
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:16429: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:16432: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:16432: \$? = $ac_status" >&5
++  echo "$as_me:16435: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:16435: \"$ac_try\"") >&5
++  { (eval echo "$as_me:16438: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:16438: \$? = $ac_status" >&5
++  echo "$as_me:16441: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   eval "$as_ac_Header=yes"
+ else
+@@ -16445,7 +16448,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:16448: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
++echo "$as_me:16451: 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
+@@ -16455,13 +16458,13 @@
+ fi
+ done
+ 
+-echo "$as_me:16458: checking for signed char" >&5
++echo "$as_me:16461: 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 16464 "configure"
++#line 16467 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -16476,16 +16479,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:16479: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:16482: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:16482: \$? = $ac_status" >&5
++  echo "$as_me:16485: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:16485: \"$ac_try\"") >&5
++  { (eval echo "$as_me:16488: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:16488: \$? = $ac_status" >&5
++  echo "$as_me:16491: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_type_signed_char=yes
+ else
+@@ -16495,10 +16498,10 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:16498: result: $ac_cv_type_signed_char" >&5
++echo "$as_me:16501: result: $ac_cv_type_signed_char" >&5
+ echo "${ECHO_T}$ac_cv_type_signed_char" >&6
+ 
+-echo "$as_me:16501: checking size of signed char" >&5
++echo "$as_me:16504: 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
+@@ -16507,7 +16510,7 @@
+   if test "$cross_compiling" = yes; then
+   # Depending upon the size, compute the lo and hi bounds.
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 16510 "configure"
++#line 16513 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -16519,21 +16522,21 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:16522: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:16525: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:16525: \$? = $ac_status" >&5
++  echo "$as_me:16528: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:16528: \"$ac_try\"") >&5
++  { (eval echo "$as_me:16531: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:16531: \$? = $ac_status" >&5
++  echo "$as_me:16534: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_lo=0 ac_mid=0
+   while :; do
+     cat >"conftest.$ac_ext" <<_ACEOF
+-#line 16536 "configure"
++#line 16539 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -16545,16 +16548,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:16548: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:16551: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:16551: \$? = $ac_status" >&5
++  echo "$as_me:16554: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:16554: \"$ac_try\"") >&5
++  { (eval echo "$as_me:16557: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:16557: \$? = $ac_status" >&5
++  echo "$as_me:16560: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_hi=$ac_mid; break
+ else
+@@ -16570,7 +16573,7 @@
+ ac_hi=-1 ac_mid=-1
+   while :; do
+     cat >"conftest.$ac_ext" <<_ACEOF
+-#line 16573 "configure"
++#line 16576 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -16582,16 +16585,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:16585: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:16588: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:16588: \$? = $ac_status" >&5
++  echo "$as_me:16591: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:16591: \"$ac_try\"") >&5
++  { (eval echo "$as_me:16594: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:16594: \$? = $ac_status" >&5
++  echo "$as_me:16597: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_lo=$ac_mid; break
+ else
+@@ -16607,7 +16610,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 16610 "configure"
++#line 16613 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -16619,16 +16622,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:16622: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:16625: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:16625: \$? = $ac_status" >&5
++  echo "$as_me:16628: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:16628: \"$ac_try\"") >&5
++  { (eval echo "$as_me:16631: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:16631: \$? = $ac_status" >&5
++  echo "$as_me:16634: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_hi=$ac_mid
+ else
+@@ -16641,12 +16644,12 @@
+ ac_cv_sizeof_signed_char=$ac_lo
+ else
+   if test "$cross_compiling" = yes; then
+-  { { echo "$as_me:16644: error: cannot run test program while cross compiling" >&5
++  { { echo "$as_me:16647: 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 16649 "configure"
++#line 16652 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -16662,15 +16665,15 @@
+ }
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:16665: \"$ac_link\"") >&5
++if { (eval echo "$as_me:16668: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:16668: \$? = $ac_status" >&5
++  echo "$as_me:16671: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:16670: \"$ac_try\"") >&5
++  { (eval echo "$as_me:16673: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:16673: \$? = $ac_status" >&5
++  echo "$as_me:16676: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_sizeof_signed_char=`cat conftest.val`
+ else
+@@ -16686,19 +16689,19 @@
+   ac_cv_sizeof_signed_char=0
+ fi
+ fi
+-echo "$as_me:16689: result: $ac_cv_sizeof_signed_char" >&5
++echo "$as_me:16692: 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:16695: checking for ANSI C header files" >&5
++echo "$as_me:16698: 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 16701 "configure"
++#line 16704 "configure"
+ #include "confdefs.h"
+ #include <stdlib.h>
+ #include <stdarg.h>
+@@ -16706,13 +16709,13 @@
+ #include <float.h>
+ 
+ _ACEOF
+-if { (eval echo "$as_me:16709: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:16712: \"$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:16715: \$? = $ac_status" >&5
++  echo "$as_me:16718: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -16734,7 +16737,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 16737 "configure"
++#line 16740 "configure"
+ #include "confdefs.h"
+ #include <string.h>
+ 
+@@ -16752,7 +16755,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 16755 "configure"
++#line 16758 "configure"
+ #include "confdefs.h"
+ #include <stdlib.h>
+ 
+@@ -16773,7 +16776,7 @@
+   :
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 16776 "configure"
++#line 16779 "configure"
+ #include "confdefs.h"
+ #include <ctype.h>
+ #if ((' ' & 0x0FF) == 0x020)
+@@ -16799,15 +16802,15 @@
+ }
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:16802: \"$ac_link\"") >&5
++if { (eval echo "$as_me:16805: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:16805: \$? = $ac_status" >&5
++  echo "$as_me:16808: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:16807: \"$ac_try\"") >&5
++  { (eval echo "$as_me:16810: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:16810: \$? = $ac_status" >&5
++  echo "$as_me:16813: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   :
+ else
+@@ -16820,7 +16823,7 @@
+ fi
+ fi
+ fi
+-echo "$as_me:16823: result: $ac_cv_header_stdc" >&5
++echo "$as_me:16826: result: $ac_cv_header_stdc" >&5
+ echo "${ECHO_T}$ac_cv_header_stdc" >&6
+ if test $ac_cv_header_stdc = yes; then
+ 
+@@ -16833,13 +16836,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:16836: checking for $ac_hdr that defines DIR" >&5
++echo "$as_me:16839: 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 16842 "configure"
++#line 16845 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ #include <$ac_hdr>
+@@ -16854,16 +16857,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:16857: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:16860: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:16860: \$? = $ac_status" >&5
++  echo "$as_me:16863: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:16863: \"$ac_try\"") >&5
++  { (eval echo "$as_me:16866: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:16866: \$? = $ac_status" >&5
++  echo "$as_me:16869: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   eval "$as_ac_Header=yes"
+ else
+@@ -16873,7 +16876,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:16876: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
++echo "$as_me:16879: 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
+@@ -16886,7 +16889,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:16889: checking for opendir in -ldir" >&5
++  echo "$as_me:16892: 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
+@@ -16894,7 +16897,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-ldir  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 16897 "configure"
++#line 16900 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -16913,16 +16916,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:16916: \"$ac_link\"") >&5
++if { (eval echo "$as_me:16919: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:16919: \$? = $ac_status" >&5
++  echo "$as_me:16922: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:16922: \"$ac_try\"") >&5
++  { (eval echo "$as_me:16925: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:16925: \$? = $ac_status" >&5
++  echo "$as_me:16928: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_dir_opendir=yes
+ else
+@@ -16933,14 +16936,14 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:16936: result: $ac_cv_lib_dir_opendir" >&5
++echo "$as_me:16939: 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:16943: checking for opendir in -lx" >&5
++  echo "$as_me:16946: 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
+@@ -16948,7 +16951,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lx  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 16951 "configure"
++#line 16954 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -16967,16 +16970,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:16970: \"$ac_link\"") >&5
++if { (eval echo "$as_me:16973: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:16973: \$? = $ac_status" >&5
++  echo "$as_me:16976: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:16976: \"$ac_try\"") >&5
++  { (eval echo "$as_me:16979: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:16979: \$? = $ac_status" >&5
++  echo "$as_me:16982: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_x_opendir=yes
+ else
+@@ -16987,7 +16990,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:16990: result: $ac_cv_lib_x_opendir" >&5
++echo "$as_me:16993: 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"
+@@ -16995,13 +16998,13 @@
+ 
+ fi
+ 
+-echo "$as_me:16998: checking whether time.h and sys/time.h may both be included" >&5
++echo "$as_me:17001: 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 17004 "configure"
++#line 17007 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ #include <sys/time.h>
+@@ -17017,16 +17020,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:17020: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:17023: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:17023: \$? = $ac_status" >&5
++  echo "$as_me:17026: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:17026: \"$ac_try\"") >&5
++  { (eval echo "$as_me:17029: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:17029: \$? = $ac_status" >&5
++  echo "$as_me:17032: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_header_time=yes
+ else
+@@ -17036,7 +17039,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:17039: result: $ac_cv_header_time" >&5
++echo "$as_me:17042: result: $ac_cv_header_time" >&5
+ echo "${ECHO_T}$ac_cv_header_time" >&6
+ if test $ac_cv_header_time = yes; then
+ 
+@@ -17054,13 +17057,13 @@
+ ac_compiler_gnu=$ac_cv_c_compiler_gnu
+ ac_main_return="return"
+ 
+-echo "$as_me:17057: checking for an ANSI C-conforming const" >&5
++echo "$as_me:17060: 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 17063 "configure"
++#line 17066 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -17118,16 +17121,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:17121: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:17124: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:17124: \$? = $ac_status" >&5
++  echo "$as_me:17127: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:17127: \"$ac_try\"") >&5
++  { (eval echo "$as_me:17130: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:17130: \$? = $ac_status" >&5
++  echo "$as_me:17133: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_c_const=yes
+ else
+@@ -17137,7 +17140,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:17140: result: $ac_cv_c_const" >&5
++echo "$as_me:17143: result: $ac_cv_c_const" >&5
+ echo "${ECHO_T}$ac_cv_c_const" >&6
+ if test $ac_cv_c_const = no; then
+ 
+@@ -17149,7 +17152,7 @@
+ 
+ ###	Checks for external-data
+ 
+-echo "$as_me:17152: checking if data-only library module links" >&5
++echo "$as_me:17155: 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
+@@ -17157,20 +17160,20 @@
+ 
+ 	rm -f conftest.a
+ 	cat >conftest.$ac_ext <<EOF
+-#line 17160 "configure"
++#line 17163 "configure"
+ int	testdata[3] = { 123, 456, 789 };
+ EOF
+-	if { (eval echo "$as_me:17163: \"$ac_compile\"") >&5
++	if { (eval echo "$as_me:17166: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:17166: \$? = $ac_status" >&5
++  echo "$as_me:17169: \$? = $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 17173 "configure"
++#line 17176 "configure"
+ int	testfunc(void)
+ {
+ #if defined(NeXT)
+@@ -17183,10 +17186,10 @@
+ #endif
+ }
+ EOF
+-	if { (eval echo "$as_me:17186: \"$ac_compile\"") >&5
++	if { (eval echo "$as_me:17189: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:17189: \$? = $ac_status" >&5
++  echo "$as_me:17192: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; then
+ 		mv conftest.o func.o && \
+ 		( $AR $ARFLAGS conftest.a func.o ) 2>&5 1>/dev/null
+@@ -17199,7 +17202,7 @@
+   cf_cv_link_dataonly=unknown
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 17202 "configure"
++#line 17205 "configure"
+ #include "confdefs.h"
+ 
+ 	int main(void)
+@@ -17210,15 +17213,15 @@
+ 
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:17213: \"$ac_link\"") >&5
++if { (eval echo "$as_me:17216: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:17216: \$? = $ac_status" >&5
++  echo "$as_me:17219: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:17218: \"$ac_try\"") >&5
++  { (eval echo "$as_me:17221: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:17221: \$? = $ac_status" >&5
++  echo "$as_me:17224: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_link_dataonly=yes
+ else
+@@ -17233,7 +17236,7 @@
+ 
+ fi
+ 
+-echo "$as_me:17236: result: $cf_cv_link_dataonly" >&5
++echo "$as_me:17239: result: $cf_cv_link_dataonly" >&5
+ echo "${ECHO_T}$cf_cv_link_dataonly" >&6
+ 
+ if test "$cf_cv_link_dataonly" = no ; then
+@@ -17252,23 +17255,23 @@
+ 
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-echo "$as_me:17255: checking for $ac_header" >&5
++echo "$as_me:17258: 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 17261 "configure"
++#line 17264 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:17265: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:17268: \"$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:17271: \$? = $ac_status" >&5
++  echo "$as_me:17274: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -17287,7 +17290,7 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:17290: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
++echo "$as_me:17293: 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
+@@ -17297,7 +17300,7 @@
+ fi
+ done
+ 
+-echo "$as_me:17300: checking for working mkstemp" >&5
++echo "$as_me:17303: 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
+@@ -17308,7 +17311,7 @@
+   cf_cv_func_mkstemp=maybe
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 17311 "configure"
++#line 17314 "configure"
+ #include "confdefs.h"
+ 
+ #include <sys/types.h>
+@@ -17349,15 +17352,15 @@
+ 
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:17352: \"$ac_link\"") >&5
++if { (eval echo "$as_me:17355: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:17355: \$? = $ac_status" >&5
++  echo "$as_me:17358: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:17357: \"$ac_try\"") >&5
++  { (eval echo "$as_me:17360: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:17360: \$? = $ac_status" >&5
++  echo "$as_me:17363: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_func_mkstemp=yes
+ 
+@@ -17372,16 +17375,16 @@
+ fi
+ 
+ fi
+-echo "$as_me:17375: result: $cf_cv_func_mkstemp" >&5
++echo "$as_me:17378: 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:17378: checking for mkstemp" >&5
++	echo "$as_me:17381: 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 17384 "configure"
++#line 17387 "configure"
+ #include "confdefs.h"
+ #define mkstemp autoconf_temporary
+ #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -17412,16 +17415,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:17415: \"$ac_link\"") >&5
++if { (eval echo "$as_me:17418: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:17418: \$? = $ac_status" >&5
++  echo "$as_me:17421: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:17421: \"$ac_try\"") >&5
++  { (eval echo "$as_me:17424: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:17424: \$? = $ac_status" >&5
++  echo "$as_me:17427: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_func_mkstemp=yes
+ else
+@@ -17431,7 +17434,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:17434: result: $ac_cv_func_mkstemp" >&5
++echo "$as_me:17437: result: $ac_cv_func_mkstemp" >&5
+ echo "${ECHO_T}$ac_cv_func_mkstemp" >&6
+ 
+ fi
+@@ -17460,7 +17463,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:17463: checking for $ac_word" >&5
++echo "$as_me:17466: 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
+@@ -17477,7 +17480,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:17480: found $ac_dir/$ac_word" >&5
++   echo "$as_me:17483: found $ac_dir/$ac_word" >&5
+    break
+ fi
+ done
+@@ -17489,10 +17492,10 @@
+ cf_TEMP_gnat=$ac_cv_path_cf_TEMP_gnat
+ 
+ if test -n "$cf_TEMP_gnat"; then
+-  echo "$as_me:17492: result: $cf_TEMP_gnat" >&5
++  echo "$as_me:17495: result: $cf_TEMP_gnat" >&5
+ echo "${ECHO_T}$cf_TEMP_gnat" >&6
+ else
+-  echo "$as_me:17495: result: no" >&5
++  echo "$as_me:17498: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -17502,7 +17505,7 @@
+ 		unset cf_cv_gnat_version
+ 		unset cf_TEMP_gnat
+ 
+-echo "$as_me:17505: checking for $cf_prog_gnat version" >&5
++echo "$as_me:17508: 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
+@@ -17513,7 +17516,7 @@
+ 	sed -e '2,$d' -e 's/[^0-9 \.]//g' -e 's/^[ ]*//' -e 's/ .*//'`
+ 
+ fi
+-echo "$as_me:17516: result: $cf_cv_gnat_version" >&5
++echo "$as_me:17519: 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
+@@ -17542,7 +17545,7 @@
+ 			cd conftest.src
+ 			for cf_gprconfig in Ada C
+ 			do
+-				echo "$as_me:17545: checking for gprconfig name for $cf_gprconfig" >&5
++				echo "$as_me:17548: 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
+@@ -17561,10 +17564,10 @@
+ 				if test -n "$cf_gprconfig_value"
+ 				then
+ 					eval "cf_ada_config_$cf_gprconfig=$cf_gprconfig_value"
+-					echo "$as_me:17564: result: $cf_gprconfig_value" >&5
++					echo "$as_me:17567: result: $cf_gprconfig_value" >&5
+ echo "${ECHO_T}$cf_gprconfig_value" >&6
+ 				else
+-					echo "$as_me:17567: result: missing" >&5
++					echo "$as_me:17570: result: missing" >&5
+ echo "${ECHO_T}missing" >&6
+ 					cf_ada_config="#"
+ 					break
+@@ -17577,7 +17580,7 @@
+ 	if test "x$cf_ada_config" != "x#"
+ 	then
+ 
+-echo "$as_me:17580: checking for gnat version" >&5
++echo "$as_me:17583: 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
+@@ -17588,7 +17591,7 @@
+ 	sed -e '2,$d' -e 's/[^0-9 \.]//g' -e 's/^[ ]*//' -e 's/ .*//'`
+ 
+ fi
+-echo "$as_me:17591: result: $cf_cv_gnat_version" >&5
++echo "$as_me:17594: 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
+ 
+@@ -17597,7 +17600,7 @@
+ 	cf_cv_prog_gnat_correct=yes
+ 	;;
+ (*)
+-	{ 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:17603: 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
+ 	;;
+@@ -17605,7 +17608,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:17608: checking for $ac_word" >&5
++echo "$as_me:17611: 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
+@@ -17620,7 +17623,7 @@
+   test -z "$ac_dir" && ac_dir=.
+   $as_executable_p "$ac_dir/$ac_word" || continue
+ ac_cv_prog_M4_exists="yes"
+-echo "$as_me:17623: found $ac_dir/$ac_word" >&5
++echo "$as_me:17626: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -17629,20 +17632,20 @@
+ fi
+ M4_exists=$ac_cv_prog_M4_exists
+ if test -n "$M4_exists"; then
+-  echo "$as_me:17632: result: $M4_exists" >&5
++  echo "$as_me:17635: result: $M4_exists" >&5
+ echo "${ECHO_T}$M4_exists" >&6
+ else
+-  echo "$as_me:17635: result: no" >&5
++  echo "$as_me:17638: 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:17641: WARNING: Ada95 binding required program m4 not found. Ada95 binding disabled" >&5
++			{ echo "$as_me:17644: 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:17645: checking if GNAT works" >&5
++			echo "$as_me:17648: checking if GNAT works" >&5
+ echo $ECHO_N "checking if GNAT works... $ECHO_C" >&6
+ 
+ rm -rf ./conftest* ./*~conftest*
+@@ -17670,7 +17673,7 @@
+ fi
+ rm -rf ./conftest* ./*~conftest*
+ 
+-			echo "$as_me:17673: result: $cf_cv_prog_gnat_correct" >&5
++			echo "$as_me:17676: result: $cf_cv_prog_gnat_correct" >&5
+ echo "${ECHO_T}$cf_cv_prog_gnat_correct" >&6
+ 		fi
+ 	else
+@@ -17680,7 +17683,7 @@
+ 
+ 	if test	"$cf_cv_prog_gnat_correct" = yes; then
+ 
+-	echo "$as_me:17683: checking optimization options for ADAFLAGS" >&5
++	echo "$as_me:17686: checking optimization options for ADAFLAGS" >&5
+ echo $ECHO_N "checking optimization options for ADAFLAGS... $ECHO_C" >&6
+ 	case "$CFLAGS" in
+ 	(*-g*)
+@@ -17697,10 +17700,10 @@
+ 
+ 		;;
+ 	esac
+-	echo "$as_me:17700: result: $ADAFLAGS" >&5
++	echo "$as_me:17703: result: $ADAFLAGS" >&5
+ echo "${ECHO_T}$ADAFLAGS" >&6
+ 
+-echo "$as_me:17703: checking if GNATPREP supports -T option" >&5
++echo "$as_me:17706: 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
+@@ -17710,11 +17713,11 @@
+ gnatprep -T 2>/dev/null >/dev/null && cf_cv_gnatprep_opt_t=yes
+ 
+ fi
+-echo "$as_me:17713: result: $cf_cv_gnatprep_opt_t" >&5
++echo "$as_me:17716: 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:17717: checking if GNAT supports generics" >&5
++echo "$as_me:17720: 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])
+@@ -17724,7 +17727,7 @@
+ 	cf_gnat_generics=no
+ 	;;
+ esac
+-echo "$as_me:17727: result: $cf_gnat_generics" >&5
++echo "$as_me:17730: result: $cf_gnat_generics" >&5
+ echo "${ECHO_T}$cf_gnat_generics" >&6
+ 
+ if test "$cf_gnat_generics" = yes
+@@ -17736,7 +17739,7 @@
+ 	cf_generic_objects=
+ fi
+ 
+-echo "$as_me:17739: checking if GNAT supports SIGINT" >&5
++echo "$as_me:17742: 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
+@@ -17784,7 +17787,7 @@
+ rm -rf ./conftest* ./*~conftest*
+ 
+ fi
+-echo "$as_me:17787: result: $cf_cv_gnat_sigint" >&5
++echo "$as_me:17790: result: $cf_cv_gnat_sigint" >&5
+ echo "${ECHO_T}$cf_cv_gnat_sigint" >&6
+ 
+ if test "$cf_cv_gnat_sigint" = yes ; then
+@@ -17797,7 +17800,7 @@
+ cf_gnat_projects=no
+ 
+ if test "$enable_gnat_projects" != no ; then
+-echo "$as_me:17800: checking if GNAT supports project files" >&5
++echo "$as_me:17803: 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]*)
+@@ -17860,15 +17863,15 @@
+ 	esac
+ 	;;
+ esac
+-echo "$as_me:17863: result: $cf_gnat_projects" >&5
++echo "$as_me:17866: 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:17869: checking if GNAT supports libraries" >&5
++	echo "$as_me:17872: checking if GNAT supports libraries" >&5
+ echo $ECHO_N "checking if GNAT supports libraries... $ECHO_C" >&6
+-	echo "$as_me:17871: result: $cf_gnat_libraries" >&5
++	echo "$as_me:17874: result: $cf_gnat_libraries" >&5
+ echo "${ECHO_T}$cf_gnat_libraries" >&6
+ fi
+ 
+@@ -17888,7 +17891,7 @@
+ 	then
+ 		USE_GNAT_MAKE_GPR=""
+ 	else
+-		{ echo "$as_me:17891: WARNING: use old makefile rules since tools are missing" >&5
++		{ echo "$as_me:17894: 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
+@@ -17900,7 +17903,7 @@
+ 	USE_GNAT_LIBRARIES="#"
+ fi
+ 
+-echo "$as_me:17903: checking for ada-compiler" >&5
++echo "$as_me:17906: 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.
+@@ -17911,12 +17914,12 @@
+   cf_ada_compiler=gnatmake
+ fi;
+ 
+-echo "$as_me:17914: result: $cf_ada_compiler" >&5
++echo "$as_me:17917: result: $cf_ada_compiler" >&5
+ echo "${ECHO_T}$cf_ada_compiler" >&6
+ 
+ 		cf_ada_package=terminal_interface
+ 
+-echo "$as_me:17919: checking for ada-include" >&5
++echo "$as_me:17922: 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.
+@@ -17952,7 +17955,7 @@
+ 	withval=`echo "$withval" | sed -e s%NONE%$cf_path_syntax%`
+ 	;;
+ (*)
+-	{ { echo "$as_me:17955: error: expected a pathname, not \"$withval\"" >&5
++	{ { echo "$as_me:17958: error: expected a pathname, not \"$withval\"" >&5
+ echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
+    { (exit 1); exit 1; }; }
+ 	;;
+@@ -17961,10 +17964,10 @@
+ fi
+ eval ADA_INCLUDE="$withval"
+ 
+-echo "$as_me:17964: result: $ADA_INCLUDE" >&5
++echo "$as_me:17967: result: $ADA_INCLUDE" >&5
+ echo "${ECHO_T}$ADA_INCLUDE" >&6
+ 
+-echo "$as_me:17967: checking for ada-objects" >&5
++echo "$as_me:17970: 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.
+@@ -18000,7 +18003,7 @@
+ 	withval=`echo "$withval" | sed -e s%NONE%$cf_path_syntax%`
+ 	;;
+ (*)
+-	{ { echo "$as_me:18003: error: expected a pathname, not \"$withval\"" >&5
++	{ { echo "$as_me:18006: error: expected a pathname, not \"$withval\"" >&5
+ echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
+    { (exit 1); exit 1; }; }
+ 	;;
+@@ -18009,10 +18012,10 @@
+ fi
+ eval ADA_OBJECTS="$withval"
+ 
+-echo "$as_me:18012: result: $ADA_OBJECTS" >&5
++echo "$as_me:18015: result: $ADA_OBJECTS" >&5
+ echo "${ECHO_T}$ADA_OBJECTS" >&6
+ 
+-echo "$as_me:18015: checking if an Ada95 shared-library should be built" >&5
++echo "$as_me:18018: 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.
+@@ -18022,14 +18025,14 @@
+ else
+   with_ada_sharedlib=no
+ fi;
+-echo "$as_me:18025: result: $with_ada_sharedlib" >&5
++echo "$as_me:18028: 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:18032: WARNING: disabling shared-library since GNAT projects are not supported" >&5
++		{ echo "$as_me:18035: 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
+@@ -18049,7 +18052,7 @@
+ 
+ 		# allow the Ada binding to be renamed
+ 
+-echo "$as_me:18052: checking for ada-libname" >&5
++echo "$as_me:18055: 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.
+@@ -18065,16 +18068,16 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:18068: result: $ADA_LIBNAME" >&5
++echo "$as_me:18071: result: $ADA_LIBNAME" >&5
+ echo "${ECHO_T}$ADA_LIBNAME" >&6
+ 
+ 	else
+-		{ { echo "$as_me:18072: error: No usable Ada compiler found" >&5
++		{ { echo "$as_me:18075: 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:18077: error: The Ada compiler is needed for this package" >&5
++	{ { echo "$as_me:18080: 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
+@@ -18114,7 +18117,7 @@
+ fi
+ 
+ ### Build up pieces for makefile rules
+-echo "$as_me:18117: checking default library suffix" >&5
++echo "$as_me:18120: checking default library suffix" >&5
+ echo $ECHO_N "checking default library suffix... $ECHO_C" >&6
+ 
+ 	case $DFT_LWR_MODEL in
+@@ -18125,10 +18128,10 @@
+ 	(shared)  DFT_ARG_SUFFIX=''   ;;
+ 	esac
+ 	test -n "$LIB_SUFFIX" && DFT_ARG_SUFFIX="${LIB_SUFFIX}${DFT_ARG_SUFFIX}"
+-echo "$as_me:18128: result: $DFT_ARG_SUFFIX" >&5
++echo "$as_me:18131: result: $DFT_ARG_SUFFIX" >&5
+ echo "${ECHO_T}$DFT_ARG_SUFFIX" >&6
+ 
+-echo "$as_me:18131: checking default library-dependency suffix" >&5
++echo "$as_me:18134: checking default library-dependency suffix" >&5
+ echo $ECHO_N "checking default library-dependency suffix... $ECHO_C" >&6
+ 
+ 	case X$DFT_LWR_MODEL in
+@@ -18211,10 +18214,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:18214: result: $DFT_DEP_SUFFIX" >&5
++echo "$as_me:18217: result: $DFT_DEP_SUFFIX" >&5
+ echo "${ECHO_T}$DFT_DEP_SUFFIX" >&6
+ 
+-echo "$as_me:18217: checking default object directory" >&5
++echo "$as_me:18220: checking default object directory" >&5
+ echo $ECHO_N "checking default object directory... $ECHO_C" >&6
+ 
+ 	case $DFT_LWR_MODEL in
+@@ -18230,7 +18233,7 @@
+ 			DFT_OBJ_SUBDIR='obj_s' ;;
+ 		esac
+ 	esac
+-echo "$as_me:18233: result: $DFT_OBJ_SUBDIR" >&5
++echo "$as_me:18236: result: $DFT_OBJ_SUBDIR" >&5
+ echo "${ECHO_T}$DFT_OBJ_SUBDIR" >&6
+ 
+ ### Set up low-level terminfo dependencies for makefiles.
+@@ -18372,7 +18375,7 @@
+ : "${CONFIG_STATUS=./config.status}"
+ ac_clean_files_save=$ac_clean_files
+ ac_clean_files="$ac_clean_files $CONFIG_STATUS"
+-{ echo "$as_me:18375: creating $CONFIG_STATUS" >&5
++{ echo "$as_me:18378: creating $CONFIG_STATUS" >&5
+ echo "$as_me: creating $CONFIG_STATUS" >&6;}
+ cat >"$CONFIG_STATUS" <<_ACEOF
+ #! $SHELL
+@@ -18551,7 +18554,7 @@
+     echo "$ac_cs_version"; exit 0 ;;
+   --he | --h)
+     # Conflict between --help and --header
+-    { { echo "$as_me:18554: error: ambiguous option: $1
++    { { echo "$as_me:18557: 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;}
+@@ -18570,7 +18573,7 @@
+     ac_need_defaults=false;;
+ 
+   # This is an error.
+-  -*) { { echo "$as_me:18573: error: unrecognized option: $1
++  -*) { { echo "$as_me:18576: 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;}
+@@ -18644,7 +18647,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:18647: error: invalid argument: $ac_config_target" >&5
++  *) { { echo "$as_me:18650: error: invalid argument: $ac_config_target" >&5
+ echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
+    { (exit 1); exit 1; }; };;
+   esac
+@@ -19004,7 +19007,7 @@
+   esac
+ 
+   if test x"$ac_file" != x-; then
+-    { echo "$as_me:19007: creating $ac_file" >&5
++    { echo "$as_me:19010: creating $ac_file" >&5
+ echo "$as_me: creating $ac_file" >&6;}
+     rm -f "$ac_file"
+   fi
+@@ -19022,7 +19025,7 @@
+       -) echo $tmp/stdin ;;
+       [\\/$]*)
+          # Absolute (can't be DOS-style, as IFS=:)
+-         test -f "$f" || { { echo "$as_me:19025: error: cannot find input file: $f" >&5
++         test -f "$f" || { { echo "$as_me:19028: error: cannot find input file: $f" >&5
+ echo "$as_me: error: cannot find input file: $f" >&2;}
+    { (exit 1); exit 1; }; }
+          echo $f;;
+@@ -19035,7 +19038,7 @@
+            echo "$srcdir/$f"
+          else
+            # /dev/null tree
+-           { { echo "$as_me:19038: error: cannot find input file: $f" >&5
++           { { echo "$as_me:19041: error: cannot find input file: $f" >&5
+ echo "$as_me: error: cannot find input file: $f" >&2;}
+    { (exit 1); exit 1; }; }
+          fi;;
+@@ -19051,7 +19054,7 @@
+       if test -n "$ac_seen"; then
+         ac_used=`grep '@datarootdir@' "$ac_item"`
+         if test -z "$ac_used"; then
+-          { echo "$as_me:19054: WARNING: datarootdir was used implicitly but not set:
++          { echo "$as_me:19057: 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;}
+@@ -19060,7 +19063,7 @@
+       fi
+       ac_seen=`grep '${datarootdir}' "$ac_item"`
+       if test -n "$ac_seen"; then
+-        { echo "$as_me:19063: WARNING: datarootdir was used explicitly but not set:
++        { echo "$as_me:19066: 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;}
+@@ -19097,7 +19100,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:19100: WARNING: Variable $ac_name is used but was not set:
++              { echo "$as_me:19103: 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;}
+@@ -19108,7 +19111,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:19111: WARNING: Some variables may not be substituted:
++      { echo "$as_me:19114: WARNING: Some variables may not be substituted:
+ $ac_seen" >&5
+ echo "$as_me: WARNING: Some variables may not be substituted:
+ $ac_seen" >&2;}
+@@ -19157,7 +19160,7 @@
+   * )   ac_file_in=$ac_file.in ;;
+   esac
+ 
+-  test x"$ac_file" != x- && { echo "$as_me:19160: creating $ac_file" >&5
++  test x"$ac_file" != x- && { echo "$as_me:19163: creating $ac_file" >&5
+ echo "$as_me: creating $ac_file" >&6;}
+ 
+   # First look for the input files in the build tree, otherwise in the
+@@ -19168,7 +19171,7 @@
+       -) echo $tmp/stdin ;;
+       [\\/$]*)
+          # Absolute (can't be DOS-style, as IFS=:)
+-         test -f "$f" || { { echo "$as_me:19171: error: cannot find input file: $f" >&5
++         test -f "$f" || { { echo "$as_me:19174: error: cannot find input file: $f" >&5
+ echo "$as_me: error: cannot find input file: $f" >&2;}
+    { (exit 1); exit 1; }; }
+          echo $f;;
+@@ -19181,7 +19184,7 @@
+            echo "$srcdir/$f"
+          else
+            # /dev/null tree
+-           { { echo "$as_me:19184: error: cannot find input file: $f" >&5
++           { { echo "$as_me:19187: error: cannot find input file: $f" >&5
+ echo "$as_me: error: cannot find input file: $f" >&2;}
+    { (exit 1); exit 1; }; }
+          fi;;
+@@ -19239,7 +19242,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:19242: $ac_file is unchanged" >&5
++      { echo "$as_me:19245: $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.3771 
+--- ncurses-6.3-20220122+/NEWS	2022-01-23 00:20:39.000000000 +0000
++++ ncurses-6.3-20220129/NEWS	2022-01-30 01:11:51.000000000 +0000
+@@ -26,7 +26,7 @@
+ -- sale, use or other dealings in this Software without prior written        --
+ -- authorization.                                                            --
+ -------------------------------------------------------------------------------
+--- $Id: NEWS,v 1.3771 2022/01/23 00:20:39 tom Exp $
++-- $Id: NEWS,v 1.3774 2022/01/30 01:11:51 tom Exp $
+ -------------------------------------------------------------------------------
+ 
+ This is a log of changes that ncurses has gone through since Zeyd started
+@@ -46,6 +46,14 @@
+ Changes through 1.9.9e did not credit all contributions;
+ it is not possible to add this information.
+ 
++20220129
++	+ minor updates for test-packages
++	+ improve handling of --with-pkg-config-libdir option, allowing for the
++	  case where either $PKG_CONFIG_LIBDIR or the option value has a
++	  colon-separated list of directories (report by Rudi Heitbaum,
++	  cf: 20211113).
++	+ update kitty -TD
++
+ 20220122
+ 	+ add ABI 7 defaults to configure script.
+ 	+ add warning in configure script if file specified for "--with-caps"
+Index: VERSION
+--- ncurses-6.3-20220122+/VERSION	2022-01-22 15:48:54.000000000 +0000
++++ ncurses-6.3-20220129/VERSION	2022-01-29 12:21:50.000000000 +0000
+@@ -1 +1 @@
+-5:0:10	6.3	20220122
++5:0:10	6.3	20220129
+Index: aclocal.m4
+Prereq:  1.1001 
+--- ncurses-6.3-20220122+/aclocal.m4	2022-01-23 00:15:35.000000000 +0000
++++ ncurses-6.3-20220129/aclocal.m4	2022-01-29 22:05:06.000000000 +0000
+@@ -29,7 +29,7 @@
+ dnl
+ dnl Author: Thomas E. Dickey 1995-on
+ dnl
+-dnl $Id: aclocal.m4,v 1.1001 2022/01/23 00:15:35 tom Exp $
++dnl $Id: aclocal.m4,v 1.1003 2022/01/29 22:05:06 tom Exp $
+ dnl Macros used in NCURSES auto-configuration script.
+ dnl
+ dnl These macros are maintained separately from NCURSES.  The copyright on
+@@ -9317,7 +9317,7 @@
+ fi
+ ])dnl
+ dnl ---------------------------------------------------------------------------
+-dnl CF_WITH_PKG_CONFIG_LIBDIR version: 19 updated: 2021/11/20 14:57:36
++dnl CF_WITH_PKG_CONFIG_LIBDIR version: 20 updated: 2022/01/29 17:03:42
+ dnl -------------------------
+ dnl Allow the choice of the pkg-config library directory to be overridden.
+ dnl
+@@ -9349,7 +9349,7 @@
+ 	[cf_search_path=$withval],
+ 	[test "x$PKG_CONFIG" != xnone && test -z "$cf_search_path" && cf_search_path=libdir])
+ 
+-case x$cf_search_path in
++case "x$cf_search_path" in
+ (xlibdir)
+ 	PKG_CONFIG_LIBDIR='${libdir}/pkgconfig'
+ 	AC_MSG_RESULT($PKG_CONFIG_LIBDIR)
+@@ -9357,6 +9357,9 @@
+ 	;;
+ (x)
+ 	;;
++(x/*\ *)
++	PKG_CONFIG_LIBDIR=
++	;;
+ (x/*)
+ 	PKG_CONFIG_LIBDIR="$cf_search_path"
+ 	AC_MSG_RESULT($PKG_CONFIG_LIBDIR)
+Index: configure
+--- ncurses-6.3-20220122+/configure	2022-01-23 00:15:55.000000000 +0000
++++ ncurses-6.3-20220129/configure	2022-01-29 22:05:31.000000000 +0000
+@@ -4168,7 +4168,7 @@
+   test "x$PKG_CONFIG" != xnone && test -z "$cf_search_path" && cf_search_path=libdir
+ fi;
+ 
+-case x$cf_search_path in
++case "x$cf_search_path" in
+ (xlibdir)
+ 	PKG_CONFIG_LIBDIR='${libdir}/pkgconfig'
+ 	echo "$as_me:4174: result: $PKG_CONFIG_LIBDIR" >&5
+@@ -4177,18 +4177,21 @@
+ 	;;
+ (x)
+ 	;;
++(x/*\ *)
++	PKG_CONFIG_LIBDIR=
++	;;
+ (x/*)
+ 	PKG_CONFIG_LIBDIR="$cf_search_path"
+-	echo "$as_me:4182: result: $PKG_CONFIG_LIBDIR" >&5
++	echo "$as_me:4185: result: $PKG_CONFIG_LIBDIR" >&5
+ echo "${ECHO_T}$PKG_CONFIG_LIBDIR" >&6
+ 	cf_search_path=
+ 	;;
+ (xyes|xauto)
+-	echo "$as_me:4187: result: auto" >&5
++	echo "$as_me:4190: 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:4191: checking for search-list" >&5
++	echo "$as_me:4194: checking for search-list" >&5
+ echo $ECHO_N "checking for search-list... $ECHO_C" >&6
+ 	if test "x$PKG_CONFIG" != xnone
+ 	then
+@@ -4215,11 +4218,11 @@
+ "`
+ 	fi
+ 
+-	echo "$as_me:4218: result: $cf_search_path" >&5
++	echo "$as_me:4221: result: $cf_search_path" >&5
+ echo "${ECHO_T}$cf_search_path" >&6
+ 	;;
+ (*)
+-	{ { echo "$as_me:4222: error: Unexpected option value: $cf_search_path" >&5
++	{ { echo "$as_me:4225: error: Unexpected option value: $cf_search_path" >&5
+ echo "$as_me: error: Unexpected option value: $cf_search_path" >&2;}
+    { (exit 1); exit 1; }; }
+ 	;;
+@@ -4227,7 +4230,7 @@
+ 
+ if test -n "$cf_search_path"
+ then
+-	echo "$as_me:4230: checking for first directory" >&5
++	echo "$as_me:4233: 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
+@@ -4238,7 +4241,7 @@
+ 			break
+ 		fi
+ 	done
+-	echo "$as_me:4241: result: $cf_pkg_config_path" >&5
++	echo "$as_me:4244: result: $cf_pkg_config_path" >&5
+ echo "${ECHO_T}$cf_pkg_config_path" >&6
+ 
+ 	if test "x$cf_pkg_config_path" != xnone ; then
+@@ -4248,7 +4251,7 @@
+ 
+ 	if test -z "$PKG_CONFIG_LIBDIR" && test -n "$cf_search_path"
+ 	then
+-		echo "$as_me:4251: checking for workaround" >&5
++		echo "$as_me:4254: checking for workaround" >&5
+ echo $ECHO_N "checking for workaround... $ECHO_C" >&6
+ 		if test "$prefix" = "NONE" ; then
+ 			cf_prefix="$ac_default_prefix"
+@@ -4271,17 +4274,17 @@
+ 			esac
+ 		done
+ 		test -z "$PKG_CONFIG_LIBDIR" && PKG_CONFIG_LIBDIR=$cf_backup
+-		echo "$as_me:4274: result: $PKG_CONFIG_LIBDIR" >&5
++		echo "$as_me:4277: result: $PKG_CONFIG_LIBDIR" >&5
+ echo "${ECHO_T}$PKG_CONFIG_LIBDIR" >&6
+ 	fi
+ fi
+ 
+ if test "x$PKG_CONFIG" != xnone
+ then
+-	echo "$as_me:4281: checking if we should install .pc files for $PKG_CONFIG" >&5
++	echo "$as_me:4284: 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:4284: checking if we should install .pc files" >&5
++	echo "$as_me:4287: checking if we should install .pc files" >&5
+ echo $ECHO_N "checking if we should install .pc files... $ECHO_C" >&6
+ fi
+ 
+@@ -4292,7 +4295,7 @@
+ else
+   enable_pc_files=no
+ fi;
+-echo "$as_me:4295: result: $enable_pc_files" >&5
++echo "$as_me:4298: result: $enable_pc_files" >&5
+ echo "${ECHO_T}$enable_pc_files" >&6
+ 
+ if test "x$enable_pc_files" != xno
+@@ -4300,7 +4303,7 @@
+ 	MAKE_PC_FILES=
+ 	case "x$PKG_CONFIG_LIBDIR" in
+ 	(xno|xnone|xyes|x)
+-		{ echo "$as_me:4303: WARNING: no PKG_CONFIG_LIBDIR was found" >&5
++		{ echo "$as_me:4306: WARNING: no PKG_CONFIG_LIBDIR was found" >&5
+ echo "$as_me: WARNING: no PKG_CONFIG_LIBDIR was found" >&2;}
+ 		;;
+ 	(*)
+@@ -4331,7 +4334,7 @@
+ 	cf_pkg_config_libdir=`echo "$cf_pkg_config_libdir" | sed -e s%NONE%$cf_path_syntax%`
+ 	;;
+ (*)
+-	{ { echo "$as_me:4334: error: expected a pathname, not \"$cf_pkg_config_libdir\"" >&5
++	{ { echo "$as_me:4337: 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; }; }
+ 	;;
+@@ -4345,7 +4348,7 @@
+ 
+ if test -z "$MAKE_PC_FILES"
+ then
+-	echo "$as_me:4348: checking for suffix to add to pc-files" >&5
++	echo "$as_me:4351: 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.
+@@ -4360,13 +4363,13 @@
+ 	esac
+ fi;
+ 	test -z "$PC_MODULE_SUFFIX" && PC_MODULE_SUFFIX=none
+-	echo "$as_me:4363: result: $PC_MODULE_SUFFIX" >&5
++	echo "$as_me:4366: result: $PC_MODULE_SUFFIX" >&5
+ echo "${ECHO_T}$PC_MODULE_SUFFIX" >&6
+ 	test "$PC_MODULE_SUFFIX" = none && PC_MODULE_SUFFIX=
+ 
+ fi
+ 
+-echo "$as_me:4369: checking if we should assume mixed-case filenames" >&5
++echo "$as_me:4372: 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.
+@@ -4376,11 +4379,11 @@
+ else
+   enable_mixedcase=auto
+ fi;
+-echo "$as_me:4379: result: $enable_mixedcase" >&5
++echo "$as_me:4382: result: $enable_mixedcase" >&5
+ echo "${ECHO_T}$enable_mixedcase" >&6
+ if test "$enable_mixedcase" = "auto" ; then
+ 
+-echo "$as_me:4383: checking if filesystem supports mixed-case filenames" >&5
++echo "$as_me:4386: 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
+@@ -4407,7 +4410,7 @@
+ fi
+ 
+ fi
+-echo "$as_me:4410: result: $cf_cv_mixedcase" >&5
++echo "$as_me:4413: result: $cf_cv_mixedcase" >&5
+ echo "${ECHO_T}$cf_cv_mixedcase" >&6
+ test "$cf_cv_mixedcase" = yes &&
+ cat >>confdefs.h <<\EOF
+@@ -4426,7 +4429,7 @@
+ fi
+ 
+ # do this after mixed-case option (tags/TAGS is not as important as tic).
+-echo "$as_me:4429: checking whether ${MAKE-make} sets \${MAKE}" >&5
++echo "$as_me:4432: 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
+@@ -4446,16 +4449,16 @@
+ rm -f conftest.make
+ fi
+ if eval "test \"`echo '$ac_cv_prog_make_'${ac_make}_set`\" = yes"; then
+-  echo "$as_me:4449: result: yes" >&5
++  echo "$as_me:4452: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+   SET_MAKE=
+ else
+-  echo "$as_me:4453: result: no" >&5
++  echo "$as_me:4456: result: no" >&5
+ echo "${ECHO_T}no" >&6
+   SET_MAKE="MAKE=${MAKE-make}"
+ fi
+ 
+-echo "$as_me:4458: checking for \".PHONY\" make-support" >&5
++echo "$as_me:4461: 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
+@@ -4510,7 +4513,7 @@
+ 	rm -rf conftest*
+ 
+ fi
+-echo "$as_me:4513: result: $cf_cv_make_PHONY" >&5
++echo "$as_me:4516: result: $cf_cv_make_PHONY" >&5
+ echo "${ECHO_T}$cf_cv_make_PHONY" >&6
+ MAKE_NO_PHONY="#"
+ MAKE_PHONY="#"
+@@ -4521,7 +4524,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:4524: checking for $ac_word" >&5
++echo "$as_me:4527: 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
+@@ -4536,7 +4539,7 @@
+   test -z "$ac_dir" && ac_dir=.
+   $as_executable_p "$ac_dir/$ac_word" || continue
+ ac_cv_prog_CTAGS="$ac_prog"
+-echo "$as_me:4539: found $ac_dir/$ac_word" >&5
++echo "$as_me:4542: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -4544,10 +4547,10 @@
+ fi
+ CTAGS=$ac_cv_prog_CTAGS
+ if test -n "$CTAGS"; then
+-  echo "$as_me:4547: result: $CTAGS" >&5
++  echo "$as_me:4550: result: $CTAGS" >&5
+ echo "${ECHO_T}$CTAGS" >&6
+ else
+-  echo "$as_me:4550: result: no" >&5
++  echo "$as_me:4553: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -4558,7 +4561,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:4561: checking for $ac_word" >&5
++echo "$as_me:4564: 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
+@@ -4573,7 +4576,7 @@
+   test -z "$ac_dir" && ac_dir=.
+   $as_executable_p "$ac_dir/$ac_word" || continue
+ ac_cv_prog_ETAGS="$ac_prog"
+-echo "$as_me:4576: found $ac_dir/$ac_word" >&5
++echo "$as_me:4579: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -4581,10 +4584,10 @@
+ fi
+ ETAGS=$ac_cv_prog_ETAGS
+ if test -n "$ETAGS"; then
+-  echo "$as_me:4584: result: $ETAGS" >&5
++  echo "$as_me:4587: result: $ETAGS" >&5
+ echo "${ECHO_T}$ETAGS" >&6
+ else
+-  echo "$as_me:4587: result: no" >&5
++  echo "$as_me:4590: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -4593,7 +4596,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:4596: checking for $ac_word" >&5
++echo "$as_me:4599: 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
+@@ -4608,7 +4611,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:4611: found $ac_dir/$ac_word" >&5
++echo "$as_me:4614: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -4617,17 +4620,17 @@
+ fi
+ MAKE_LOWER_TAGS=$ac_cv_prog_MAKE_LOWER_TAGS
+ if test -n "$MAKE_LOWER_TAGS"; then
+-  echo "$as_me:4620: result: $MAKE_LOWER_TAGS" >&5
++  echo "$as_me:4623: result: $MAKE_LOWER_TAGS" >&5
+ echo "${ECHO_T}$MAKE_LOWER_TAGS" >&6
+ else
+-  echo "$as_me:4623: result: no" >&5
++  echo "$as_me:4626: 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:4630: checking for $ac_word" >&5
++echo "$as_me:4633: 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
+@@ -4642,7 +4645,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:4645: found $ac_dir/$ac_word" >&5
++echo "$as_me:4648: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -4651,10 +4654,10 @@
+ fi
+ MAKE_UPPER_TAGS=$ac_cv_prog_MAKE_UPPER_TAGS
+ if test -n "$MAKE_UPPER_TAGS"; then
+-  echo "$as_me:4654: result: $MAKE_UPPER_TAGS" >&5
++  echo "$as_me:4657: result: $MAKE_UPPER_TAGS" >&5
+ echo "${ECHO_T}$MAKE_UPPER_TAGS" >&6
+ else
+-  echo "$as_me:4657: result: no" >&5
++  echo "$as_me:4660: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -4674,7 +4677,7 @@
+ 	MAKE_LOWER_TAGS="#"
+ fi
+ 
+-echo "$as_me:4677: checking for makeflags variable" >&5
++echo "$as_me:4680: 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
+@@ -4704,7 +4707,7 @@
+ 			;;
+ 		(*)
+ 
+-echo "${as_me:-configure}:4707: testing given option \"$cf_option\",no match \"$cf_result\" ..." 1>&5
++echo "${as_me:-configure}:4710: testing given option \"$cf_option\",no match \"$cf_result\" ..." 1>&5
+ 
+ 			;;
+ 		esac
+@@ -4712,13 +4715,13 @@
+ 	rm -f cf_makeflags.tmp
+ 
+ fi
+-echo "$as_me:4715: result: $cf_cv_makeflags" >&5
++echo "$as_me:4718: 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:4721: checking for $ac_word" >&5
++echo "$as_me:4724: 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
+@@ -4733,7 +4736,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:4736: found $ac_dir/$ac_word" >&5
++echo "$as_me:4739: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -4741,10 +4744,10 @@
+ fi
+ RANLIB=$ac_cv_prog_RANLIB
+ if test -n "$RANLIB"; then
+-  echo "$as_me:4744: result: $RANLIB" >&5
++  echo "$as_me:4747: result: $RANLIB" >&5
+ echo "${ECHO_T}$RANLIB" >&6
+ else
+-  echo "$as_me:4747: result: no" >&5
++  echo "$as_me:4750: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -4753,7 +4756,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:4756: checking for $ac_word" >&5
++echo "$as_me:4759: 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
+@@ -4768,7 +4771,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:4771: found $ac_dir/$ac_word" >&5
++echo "$as_me:4774: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -4777,10 +4780,10 @@
+ fi
+ ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB
+ if test -n "$ac_ct_RANLIB"; then
+-  echo "$as_me:4780: result: $ac_ct_RANLIB" >&5
++  echo "$as_me:4783: result: $ac_ct_RANLIB" >&5
+ echo "${ECHO_T}$ac_ct_RANLIB" >&6
+ else
+-  echo "$as_me:4783: result: no" >&5
++  echo "$as_me:4786: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -4792,7 +4795,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:4795: checking for $ac_word" >&5
++echo "$as_me:4798: 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
+@@ -4807,7 +4810,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:4810: found $ac_dir/$ac_word" >&5
++echo "$as_me:4813: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -4815,10 +4818,10 @@
+ fi
+ LD=$ac_cv_prog_LD
+ if test -n "$LD"; then
+-  echo "$as_me:4818: result: $LD" >&5
++  echo "$as_me:4821: result: $LD" >&5
+ echo "${ECHO_T}$LD" >&6
+ else
+-  echo "$as_me:4821: result: no" >&5
++  echo "$as_me:4824: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -4827,7 +4830,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:4830: checking for $ac_word" >&5
++echo "$as_me:4833: 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
+@@ -4842,7 +4845,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:4845: found $ac_dir/$ac_word" >&5
++echo "$as_me:4848: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -4851,10 +4854,10 @@
+ fi
+ ac_ct_LD=$ac_cv_prog_ac_ct_LD
+ if test -n "$ac_ct_LD"; then
+-  echo "$as_me:4854: result: $ac_ct_LD" >&5
++  echo "$as_me:4857: result: $ac_ct_LD" >&5
+ echo "${ECHO_T}$ac_ct_LD" >&6
+ else
+-  echo "$as_me:4857: result: no" >&5
++  echo "$as_me:4860: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -4866,7 +4869,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:4869: checking for $ac_word" >&5
++echo "$as_me:4872: 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
+@@ -4881,7 +4884,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:4884: found $ac_dir/$ac_word" >&5
++echo "$as_me:4887: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -4889,10 +4892,10 @@
+ fi
+ AR=$ac_cv_prog_AR
+ if test -n "$AR"; then
+-  echo "$as_me:4892: result: $AR" >&5
++  echo "$as_me:4895: result: $AR" >&5
+ echo "${ECHO_T}$AR" >&6
+ else
+-  echo "$as_me:4895: result: no" >&5
++  echo "$as_me:4898: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -4901,7 +4904,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:4904: checking for $ac_word" >&5
++echo "$as_me:4907: 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
+@@ -4916,7 +4919,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:4919: found $ac_dir/$ac_word" >&5
++echo "$as_me:4922: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -4925,10 +4928,10 @@
+ fi
+ ac_ct_AR=$ac_cv_prog_ac_ct_AR
+ if test -n "$ac_ct_AR"; then
+-  echo "$as_me:4928: result: $ac_ct_AR" >&5
++  echo "$as_me:4931: result: $ac_ct_AR" >&5
+ echo "${ECHO_T}$ac_ct_AR" >&6
+ else
+-  echo "$as_me:4931: result: no" >&5
++  echo "$as_me:4934: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -4940,7 +4943,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:4943: checking for $ac_word" >&5
++echo "$as_me:4946: 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
+@@ -4955,7 +4958,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:4958: found $ac_dir/$ac_word" >&5
++echo "$as_me:4961: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -4963,10 +4966,10 @@
+ fi
+ NM=$ac_cv_prog_NM
+ if test -n "$NM"; then
+-  echo "$as_me:4966: result: $NM" >&5
++  echo "$as_me:4969: result: $NM" >&5
+ echo "${ECHO_T}$NM" >&6
+ else
+-  echo "$as_me:4969: result: no" >&5
++  echo "$as_me:4972: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -4975,7 +4978,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:4978: checking for $ac_word" >&5
++echo "$as_me:4981: 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
+@@ -4990,7 +4993,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:4993: found $ac_dir/$ac_word" >&5
++echo "$as_me:4996: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -4999,10 +5002,10 @@
+ fi
+ ac_ct_NM=$ac_cv_prog_ac_ct_NM
+ if test -n "$ac_ct_NM"; then
+-  echo "$as_me:5002: result: $ac_ct_NM" >&5
++  echo "$as_me:5005: result: $ac_ct_NM" >&5
+ echo "${ECHO_T}$ac_ct_NM" >&6
+ else
+-  echo "$as_me:5005: result: no" >&5
++  echo "$as_me:5008: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -5014,7 +5017,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:5017: checking for $ac_word" >&5
++echo "$as_me:5020: 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
+@@ -5029,7 +5032,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:5032: found $ac_dir/$ac_word" >&5
++echo "$as_me:5035: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -5037,10 +5040,10 @@
+ fi
+ AR=$ac_cv_prog_AR
+ if test -n "$AR"; then
+-  echo "$as_me:5040: result: $AR" >&5
++  echo "$as_me:5043: result: $AR" >&5
+ echo "${ECHO_T}$AR" >&6
+ else
+-  echo "$as_me:5043: result: no" >&5
++  echo "$as_me:5046: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -5049,7 +5052,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:5052: checking for $ac_word" >&5
++echo "$as_me:5055: 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
+@@ -5064,7 +5067,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:5067: found $ac_dir/$ac_word" >&5
++echo "$as_me:5070: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -5073,10 +5076,10 @@
+ fi
+ ac_ct_AR=$ac_cv_prog_ac_ct_AR
+ if test -n "$ac_ct_AR"; then
+-  echo "$as_me:5076: result: $ac_ct_AR" >&5
++  echo "$as_me:5079: result: $ac_ct_AR" >&5
+ echo "${ECHO_T}$ac_ct_AR" >&6
+ else
+-  echo "$as_me:5079: result: no" >&5
++  echo "$as_me:5082: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -5085,7 +5088,7 @@
+   AR="$ac_cv_prog_AR"
+ fi
+ 
+-echo "$as_me:5088: checking for options to update archives" >&5
++echo "$as_me:5091: 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
+@@ -5122,13 +5125,13 @@
+ 			rm -f conftest.a
+ 
+ 			cat >"conftest.$ac_ext" <<EOF
+-#line 5125 "configure"
++#line 5128 "configure"
+ int	testdata[3] = { 123, 456, 789 };
+ EOF
+-			if { (eval echo "$as_me:5128: \"$ac_compile\"") >&5
++			if { (eval echo "$as_me:5131: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:5131: \$? = $ac_status" >&5
++  echo "$as_me:5134: \$? = $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
+@@ -5139,7 +5142,7 @@
+ 			else
+ 				test -n "$verbose" && echo "	cannot compile test-program" 1>&6
+ 
+-echo "${as_me:-configure}:5142: testing cannot compile test-program ..." 1>&5
++echo "${as_me:-configure}:5145: testing cannot compile test-program ..." 1>&5
+ 
+ 				break
+ 			fi
+@@ -5149,7 +5152,7 @@
+ 	esac
+ 
+ fi
+-echo "$as_me:5152: result: $cf_cv_ar_flags" >&5
++echo "$as_me:5155: result: $cf_cv_ar_flags" >&5
+ echo "${ECHO_T}$cf_cv_ar_flags" >&6
+ 
+ if test -n "$ARFLAGS" ; then
+@@ -5160,7 +5163,7 @@
+ 	ARFLAGS=$cf_cv_ar_flags
+ fi
+ 
+-echo "$as_me:5163: checking if you have specified an install-prefix" >&5
++echo "$as_me:5166: 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.
+@@ -5173,7 +5176,7 @@
+ 		;;
+ 	esac
+ fi;
+-echo "$as_me:5176: result: $DESTDIR" >&5
++echo "$as_me:5179: result: $DESTDIR" >&5
+ echo "${ECHO_T}$DESTDIR" >&6
+ 
+ ###############################################################################
+@@ -5208,7 +5211,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:5211: checking for $ac_word" >&5
++echo "$as_me:5214: 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
+@@ -5223,7 +5226,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:5226: found $ac_dir/$ac_word" >&5
++echo "$as_me:5229: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -5231,10 +5234,10 @@
+ fi
+ BUILD_CC=$ac_cv_prog_BUILD_CC
+ if test -n "$BUILD_CC"; then
+-  echo "$as_me:5234: result: $BUILD_CC" >&5
++  echo "$as_me:5237: result: $BUILD_CC" >&5
+ echo "${ECHO_T}$BUILD_CC" >&6
+ else
+-  echo "$as_me:5237: result: no" >&5
++  echo "$as_me:5240: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -5243,12 +5246,12 @@
+ test -n "$BUILD_CC" || BUILD_CC="none"
+ 
+ fi;
+-	echo "$as_me:5246: checking for native build C compiler" >&5
++	echo "$as_me:5249: checking for native build C compiler" >&5
+ echo $ECHO_N "checking for native build C compiler... $ECHO_C" >&6
+-	echo "$as_me:5248: result: $BUILD_CC" >&5
++	echo "$as_me:5251: result: $BUILD_CC" >&5
+ echo "${ECHO_T}$BUILD_CC" >&6
+ 
+-	echo "$as_me:5251: checking for native build C preprocessor" >&5
++	echo "$as_me:5254: 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.
+@@ -5258,10 +5261,10 @@
+ else
+   BUILD_CPP='${BUILD_CC} -E'
+ fi;
+-	echo "$as_me:5261: result: $BUILD_CPP" >&5
++	echo "$as_me:5264: result: $BUILD_CPP" >&5
+ echo "${ECHO_T}$BUILD_CPP" >&6
+ 
+-	echo "$as_me:5264: checking for native build C flags" >&5
++	echo "$as_me:5267: 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.
+@@ -5269,10 +5272,10 @@
+   withval="$with_build_cflags"
+   BUILD_CFLAGS="$withval"
+ fi;
+-	echo "$as_me:5272: result: $BUILD_CFLAGS" >&5
++	echo "$as_me:5275: result: $BUILD_CFLAGS" >&5
+ echo "${ECHO_T}$BUILD_CFLAGS" >&6
+ 
+-	echo "$as_me:5275: checking for native build C preprocessor-flags" >&5
++	echo "$as_me:5278: 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.
+@@ -5280,10 +5283,10 @@
+   withval="$with_build_cppflags"
+   BUILD_CPPFLAGS="$withval"
+ fi;
+-	echo "$as_me:5283: result: $BUILD_CPPFLAGS" >&5
++	echo "$as_me:5286: result: $BUILD_CPPFLAGS" >&5
+ echo "${ECHO_T}$BUILD_CPPFLAGS" >&6
+ 
+-	echo "$as_me:5286: checking for native build linker-flags" >&5
++	echo "$as_me:5289: 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.
+@@ -5291,10 +5294,10 @@
+   withval="$with_build_ldflags"
+   BUILD_LDFLAGS="$withval"
+ fi;
+-	echo "$as_me:5294: result: $BUILD_LDFLAGS" >&5
++	echo "$as_me:5297: result: $BUILD_LDFLAGS" >&5
+ echo "${ECHO_T}$BUILD_LDFLAGS" >&6
+ 
+-	echo "$as_me:5297: checking for native build linker-libraries" >&5
++	echo "$as_me:5300: 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.
+@@ -5302,7 +5305,7 @@
+   withval="$with_build_libs"
+   BUILD_LIBS="$withval"
+ fi;
+-	echo "$as_me:5305: result: $BUILD_LIBS" >&5
++	echo "$as_me:5308: result: $BUILD_LIBS" >&5
+ echo "${ECHO_T}$BUILD_LIBS" >&6
+ 
+ 	# this assumes we're on Unix.
+@@ -5312,7 +5315,7 @@
+ 	: ${BUILD_CC:='${CC}'}
+ 
+ 	if { test "$BUILD_CC" = "$CC" || test "$BUILD_CC" = '${CC}'; } ; then
+-		{ { echo "$as_me:5315: error: Cross-build requires two compilers.
++		{ { echo "$as_me:5318: 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;}
+@@ -5337,7 +5340,7 @@
+ ### shared, for example.
+ cf_list_models=""
+ 
+-echo "$as_me:5340: checking if libtool -version-number should be used" >&5
++echo "$as_me:5343: 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.
+@@ -5354,7 +5357,7 @@
+ 	cf_libtool_version=yes
+ 
+ fi;
+-echo "$as_me:5357: result: $cf_libtool_version" >&5
++echo "$as_me:5360: result: $cf_libtool_version" >&5
+ echo "${ECHO_T}$cf_libtool_version" >&6
+ 
+ if test "$cf_libtool_version" = yes ; then
+@@ -5363,25 +5366,25 @@
+ 	LIBTOOL_VERSION="-version-info"
+ 	case "x$VERSION" in
+ 	(x)
+-		{ echo "$as_me:5366: WARNING: VERSION was not set" >&5
++		{ echo "$as_me:5369: 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}:5373: testing ABI_VERSION: $ABI_VERSION ..." 1>&5
++echo "${as_me:-configure}:5376: 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}:5380: testing ABI_VERSION: $ABI_VERSION ..." 1>&5
++echo "${as_me:-configure}:5383: testing ABI_VERSION: $ABI_VERSION ..." 1>&5
+ 
+ 		;;
+ 	(*)
+-		{ echo "$as_me:5384: WARNING: unexpected VERSION value: $VERSION" >&5
++		{ echo "$as_me:5387: WARNING: unexpected VERSION value: $VERSION" >&5
+ echo "$as_me: WARNING: unexpected VERSION value: $VERSION" >&2;}
+ 		;;
+ 	esac
+@@ -5403,7 +5406,7 @@
+ LIB_INSTALL=
+ LIB_UNINSTALL=
+ 
+-echo "$as_me:5406: checking if you want to build libraries with libtool" >&5
++echo "$as_me:5409: 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.
+@@ -5413,7 +5416,7 @@
+ else
+   with_libtool=no
+ fi;
+-echo "$as_me:5416: result: $with_libtool" >&5
++echo "$as_me:5419: result: $with_libtool" >&5
+ echo "${ECHO_T}$with_libtool" >&6
+ if test "$with_libtool" != "no"; then
+ 
+@@ -5444,7 +5447,7 @@
+ 	with_libtool=`echo "$with_libtool" | sed -e s%NONE%$cf_path_syntax%`
+ 	;;
+ (*)
+-	{ { echo "$as_me:5447: error: expected a pathname, not \"$with_libtool\"" >&5
++	{ { echo "$as_me:5450: error: expected a pathname, not \"$with_libtool\"" >&5
+ echo "$as_me: error: expected a pathname, not \"$with_libtool\"" >&2;}
+    { (exit 1); exit 1; }; }
+ 	;;
+@@ -5457,7 +5460,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:5460: checking for $ac_word" >&5
++echo "$as_me:5463: 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
+@@ -5472,7 +5475,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:5475: found $ac_dir/$ac_word" >&5
++echo "$as_me:5478: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -5480,10 +5483,10 @@
+ fi
+ LIBTOOL=$ac_cv_prog_LIBTOOL
+ if test -n "$LIBTOOL"; then
+-  echo "$as_me:5483: result: $LIBTOOL" >&5
++  echo "$as_me:5486: result: $LIBTOOL" >&5
+ echo "${ECHO_T}$LIBTOOL" >&6
+ else
+-  echo "$as_me:5486: result: no" >&5
++  echo "$as_me:5489: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -5496,7 +5499,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:5499: checking for $ac_word" >&5
++echo "$as_me:5502: 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
+@@ -5511,7 +5514,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:5514: found $ac_dir/$ac_word" >&5
++echo "$as_me:5517: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -5519,10 +5522,10 @@
+ fi
+ ac_ct_LIBTOOL=$ac_cv_prog_ac_ct_LIBTOOL
+ if test -n "$ac_ct_LIBTOOL"; then
+-  echo "$as_me:5522: result: $ac_ct_LIBTOOL" >&5
++  echo "$as_me:5525: result: $ac_ct_LIBTOOL" >&5
+ echo "${ECHO_T}$ac_ct_LIBTOOL" >&6
+ else
+-  echo "$as_me:5525: result: no" >&5
++  echo "$as_me:5528: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -5553,7 +5556,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:5556: checking for $ac_word" >&5
++echo "$as_me:5559: 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
+@@ -5568,7 +5571,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:5571: found $ac_dir/$ac_word" >&5
++echo "$as_me:5574: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -5576,10 +5579,10 @@
+ fi
+ LIBTOOL=$ac_cv_prog_LIBTOOL
+ if test -n "$LIBTOOL"; then
+-  echo "$as_me:5579: result: $LIBTOOL" >&5
++  echo "$as_me:5582: result: $LIBTOOL" >&5
+ echo "${ECHO_T}$LIBTOOL" >&6
+ else
+-  echo "$as_me:5582: result: no" >&5
++  echo "$as_me:5585: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -5592,7 +5595,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:5595: checking for $ac_word" >&5
++echo "$as_me:5598: 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
+@@ -5607,7 +5610,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:5610: found $ac_dir/$ac_word" >&5
++echo "$as_me:5613: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -5615,10 +5618,10 @@
+ fi
+ ac_ct_LIBTOOL=$ac_cv_prog_ac_ct_LIBTOOL
+ if test -n "$ac_ct_LIBTOOL"; then
+-  echo "$as_me:5618: result: $ac_ct_LIBTOOL" >&5
++  echo "$as_me:5621: result: $ac_ct_LIBTOOL" >&5
+ echo "${ECHO_T}$ac_ct_LIBTOOL" >&6
+ else
+-  echo "$as_me:5621: result: no" >&5
++  echo "$as_me:5624: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -5640,7 +5643,7 @@
+ 		fi
+ 	fi
+ 	if test -z "$LIBTOOL" ; then
+-		{ { echo "$as_me:5643: error: Cannot find libtool" >&5
++		{ { echo "$as_me:5646: error: Cannot find libtool" >&5
+ echo "$as_me: error: Cannot find libtool" >&2;}
+    { (exit 1); exit 1; }; }
+ 	fi
+@@ -5656,7 +5659,7 @@
+ 
+ if test -n "$LIBTOOL" && test "$LIBTOOL" != none
+ then
+-	echo "$as_me:5659: checking version of $LIBTOOL" >&5
++	echo "$as_me:5662: checking version of $LIBTOOL" >&5
+ echo $ECHO_N "checking version of $LIBTOOL... $ECHO_C" >&6
+ 
+ if test -n "$LIBTOOL" && test "$LIBTOOL" != none
+@@ -5667,7 +5670,7 @@
+ fi
+ test -z "$cf_cv_libtool_version" && unset cf_cv_libtool_version
+ 
+-	echo "$as_me:5670: result: $cf_cv_libtool_version" >&5
++	echo "$as_me:5673: result: $cf_cv_libtool_version" >&5
+ echo "${ECHO_T}$cf_cv_libtool_version" >&6
+ 	if test -n "$cf_cv_libtool_version"
+ 	then
+@@ -5676,18 +5679,18 @@
+ 		(*...GNU-libtool...*)
+ 			;;
+ 		(*)
+-			{ { echo "$as_me:5679: error: This is not GNU libtool" >&5
++			{ { echo "$as_me:5682: 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:5685: error: No version found for $LIBTOOL" >&5
++		{ { echo "$as_me:5688: 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:5690: error: GNU libtool has not been found" >&5
++	{ { echo "$as_me:5693: error: GNU libtool has not been found" >&5
+ echo "$as_me: error: GNU libtool has not been found" >&2;}
+    { (exit 1); exit 1; }; }
+ fi
+@@ -5723,7 +5726,7 @@
+ 
+ else
+ 
+-echo "$as_me:5726: checking if you want to build shared libraries" >&5
++echo "$as_me:5729: 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.
+@@ -5733,11 +5736,11 @@
+ else
+   with_shared=no
+ fi;
+-echo "$as_me:5736: result: $with_shared" >&5
++echo "$as_me:5739: 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:5740: checking if you want to build static libraries" >&5
++echo "$as_me:5743: 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.
+@@ -5747,11 +5750,11 @@
+ else
+   with_normal=yes
+ fi;
+-echo "$as_me:5750: result: $with_normal" >&5
++echo "$as_me:5753: 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:5754: checking if you want to build debug libraries" >&5
++echo "$as_me:5757: 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.
+@@ -5761,11 +5764,11 @@
+ else
+   with_debug=yes
+ fi;
+-echo "$as_me:5764: result: $with_debug" >&5
++echo "$as_me:5767: 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:5768: checking if you want to build profiling libraries" >&5
++echo "$as_me:5771: 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.
+@@ -5775,7 +5778,7 @@
+ else
+   with_profile=no
+ fi;
+-echo "$as_me:5778: result: $with_profile" >&5
++echo "$as_me:5781: result: $with_profile" >&5
+ echo "${ECHO_T}$with_profile" >&6
+ test "x$with_profile" = "xyes" && cf_list_models="$cf_list_models profile"
+ 
+@@ -5783,7 +5786,7 @@
+ 
+ if test "X$cf_with_cxx_binding" != Xno; then
+ if test "x$with_shared" = "xyes"; then
+-echo "$as_me:5786: checking if you want to build C++ shared libraries" >&5
++echo "$as_me:5789: 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.
+@@ -5793,26 +5796,26 @@
+ else
+   with_shared_cxx=no
+ fi;
+-echo "$as_me:5796: result: $with_shared_cxx" >&5
++echo "$as_me:5799: result: $with_shared_cxx" >&5
+ echo "${ECHO_T}$with_shared_cxx" >&6
+ fi
+ fi
+ 
+ ###############################################################################
+ 
+-echo "$as_me:5803: checking for specified models" >&5
++echo "$as_me:5806: 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:5807: result: $cf_list_models" >&5
++echo "$as_me:5810: 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:5812: checking for default model" >&5
++echo "$as_me:5815: 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:5815: result: $DFT_LWR_MODEL" >&5
++echo "$as_me:5818: result: $DFT_LWR_MODEL" >&5
+ echo "${ECHO_T}$DFT_LWR_MODEL" >&6
+ 
+ DFT_UPR_MODEL=`echo "$DFT_LWR_MODEL" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%`
+@@ -5826,7 +5829,7 @@
+ LIB_DIR=../lib
+ LIB_2ND=../../lib
+ 
+-echo "$as_me:5829: checking if you want to have a library-prefix" >&5
++echo "$as_me:5832: 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.
+@@ -5836,7 +5839,7 @@
+ else
+   with_lib_prefix=auto
+ fi;
+-echo "$as_me:5839: result: $with_lib_prefix" >&5
++echo "$as_me:5842: result: $with_lib_prefix" >&5
+ echo "${ECHO_T}$with_lib_prefix" >&6
+ 
+ if test "$with_lib_prefix" = auto
+@@ -5867,19 +5870,19 @@
+ 
+ LIB_SUFFIX=
+ 
+-	echo "$as_me:5870: checking for PATH separator" >&5
++	echo "$as_me:5873: 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:5877: result: $PATH_SEPARATOR" >&5
++	echo "$as_me:5880: result: $PATH_SEPARATOR" >&5
+ echo "${ECHO_T}$PATH_SEPARATOR" >&6
+ 
+ ###############################################################################
+ 
+-echo "$as_me:5882: checking if you want to build a separate terminfo library" >&5
++echo "$as_me:5885: 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.
+@@ -5889,10 +5892,10 @@
+ else
+   with_termlib=no
+ fi;
+-echo "$as_me:5892: result: $with_termlib" >&5
++echo "$as_me:5895: result: $with_termlib" >&5
+ echo "${ECHO_T}$with_termlib" >&6
+ 
+-echo "$as_me:5895: checking if you want to build a separate tic library" >&5
++echo "$as_me:5898: 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.
+@@ -5902,7 +5905,7 @@
+ else
+   with_ticlib=no
+ fi;
+-echo "$as_me:5905: result: $with_ticlib" >&5
++echo "$as_me:5908: result: $with_ticlib" >&5
+ echo "${ECHO_T}$with_ticlib" >&6
+ 
+ if test X"$CC_G_OPT" = X"" ; then
+@@ -5915,7 +5918,7 @@
+ 	test -n "$GXX" && test "x${ac_cv_prog_cxx_g}" != xyes && CXX_G_OPT=''
+ fi
+ 
+-echo "$as_me:5918: checking for default loader flags" >&5
++echo "$as_me:5921: 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=''   ;;
+@@ -5924,13 +5927,13 @@
+ (profile) LD_MODEL='-pg';;
+ (shared)  LD_MODEL=''   ;;
+ esac
+-echo "$as_me:5927: result: $LD_MODEL" >&5
++echo "$as_me:5930: result: $LD_MODEL" >&5
+ echo "${ECHO_T}$LD_MODEL" >&6
+ 
+ case "$DFT_LWR_MODEL" in
+ (shared)
+ 
+-echo "$as_me:5933: checking if rpath option should be used" >&5
++echo "$as_me:5936: 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.
+@@ -5940,10 +5943,10 @@
+ else
+   cf_cv_enable_rpath=no
+ fi;
+-echo "$as_me:5943: result: $cf_cv_enable_rpath" >&5
++echo "$as_me:5946: result: $cf_cv_enable_rpath" >&5
+ echo "${ECHO_T}$cf_cv_enable_rpath" >&6
+ 
+-echo "$as_me:5946: checking if shared libraries should be relinked during install" >&5
++echo "$as_me:5949: 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.
+@@ -5953,7 +5956,7 @@
+ else
+   cf_cv_do_relink=yes
+ fi;
+-echo "$as_me:5956: result: $cf_cv_do_relink" >&5
++echo "$as_me:5959: result: $cf_cv_do_relink" >&5
+ echo "${ECHO_T}$cf_cv_do_relink" >&6
+ 	;;
+ esac
+@@ -5964,7 +5967,7 @@
+ LD_RPATH_OPT=
+ if test "x$cf_cv_enable_rpath" != xno
+ then
+-	echo "$as_me:5967: checking for an rpath option" >&5
++	echo "$as_me:5970: checking for an rpath option" >&5
+ echo $ECHO_N "checking for an rpath option... $ECHO_C" >&6
+ 	case "$cf_cv_system_name" in
+ 	(irix*)
+@@ -5995,12 +5998,12 @@
+ 	(*)
+ 		;;
+ 	esac
+-	echo "$as_me:5998: result: $LD_RPATH_OPT" >&5
++	echo "$as_me:6001: result: $LD_RPATH_OPT" >&5
+ echo "${ECHO_T}$LD_RPATH_OPT" >&6
+ 
+ 	case "x$LD_RPATH_OPT" in
+ 	(x-R*)
+-		echo "$as_me:6003: checking if we need a space after rpath option" >&5
++		echo "$as_me:6006: 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"
+ 
+@@ -6021,7 +6024,7 @@
+ LIBS="$cf_add_libs"
+ 
+ 		cat >"conftest.$ac_ext" <<_ACEOF
+-#line 6024 "configure"
++#line 6027 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -6033,16 +6036,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:6036: \"$ac_link\"") >&5
++if { (eval echo "$as_me:6039: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:6039: \$? = $ac_status" >&5
++  echo "$as_me:6042: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:6042: \"$ac_try\"") >&5
++  { (eval echo "$as_me:6045: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:6045: \$? = $ac_status" >&5
++  echo "$as_me:6048: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_rpath_space=no
+ else
+@@ -6052,7 +6055,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ 		LIBS="$cf_save_LIBS"
+-		echo "$as_me:6055: result: $cf_rpath_space" >&5
++		echo "$as_me:6058: result: $cf_rpath_space" >&5
+ echo "${ECHO_T}$cf_rpath_space" >&6
+ 		test "$cf_rpath_space" = yes && LD_RPATH_OPT="$LD_RPATH_OPT "
+ 		;;
+@@ -6074,7 +6077,7 @@
+ 	cf_ld_rpath_opt=
+ 	test "$cf_cv_enable_rpath" = yes && cf_ld_rpath_opt="$LD_RPATH_OPT"
+ 
+-	echo "$as_me:6077: checking if release/abi version should be used for shared libs" >&5
++	echo "$as_me:6080: 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.
+@@ -6089,9 +6092,9 @@
+ 		cf_cv_shlib_version=$withval
+ 		;;
+ 	(*)
+-		echo "$as_me:6092: result: $withval" >&5
++		echo "$as_me:6095: result: $withval" >&5
+ echo "${ECHO_T}$withval" >&6
+-		{ { echo "$as_me:6094: error: option value must be one of: rel, abi, or auto" >&5
++		{ { echo "$as_me:6097: 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; }; }
+ 		;;
+@@ -6100,7 +6103,7 @@
+ else
+   cf_cv_shlib_version=auto
+ fi;
+-	echo "$as_me:6103: result: $cf_cv_shlib_version" >&5
++	echo "$as_me:6106: result: $cf_cv_shlib_version" >&5
+ echo "${ECHO_T}$cf_cv_shlib_version" >&6
+ 
+ 	cf_cv_rm_so_locs=no
+@@ -6123,14 +6126,14 @@
+ 
+ 	if test "$cf_try_fPIC" = yes
+ 	then
+-		echo "$as_me:6126: checking which $CC option to use" >&5
++		echo "$as_me:6129: 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 6133 "configure"
++#line 6136 "configure"
+ #include "confdefs.h"
+ #include <stdio.h>
+ int
+@@ -6142,16 +6145,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:6145: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:6148: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:6148: \$? = $ac_status" >&5
++  echo "$as_me:6151: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:6151: \"$ac_try\"") >&5
++  { (eval echo "$as_me:6154: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:6154: \$? = $ac_status" >&5
++  echo "$as_me:6157: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   break
+ else
+@@ -6160,7 +6163,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 		done
+-		echo "$as_me:6163: result: $CC_SHARED_OPTS" >&5
++		echo "$as_me:6166: result: $CC_SHARED_OPTS" >&5
+ echo "${ECHO_T}$CC_SHARED_OPTS" >&6
+ 		CFLAGS="$cf_save_CFLAGS"
+ 	fi
+@@ -6231,7 +6234,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:6234: checking if ld -search_paths_first works" >&5
++		echo "$as_me:6237: 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
+@@ -6240,7 +6243,7 @@
+ 			cf_save_LDFLAGS=$LDFLAGS
+ 			LDFLAGS="$LDFLAGS -Wl,-search_paths_first"
+ 			cat >"conftest.$ac_ext" <<_ACEOF
+-#line 6243 "configure"
++#line 6246 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -6252,16 +6255,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:6255: \"$ac_link\"") >&5
++if { (eval echo "$as_me:6258: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:6258: \$? = $ac_status" >&5
++  echo "$as_me:6261: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:6261: \"$ac_try\"") >&5
++  { (eval echo "$as_me:6264: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:6264: \$? = $ac_status" >&5
++  echo "$as_me:6267: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_ldflags_search_paths_first=yes
+ else
+@@ -6272,7 +6275,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ 				LDFLAGS=$cf_save_LDFLAGS
+ fi
+-echo "$as_me:6275: result: $cf_cv_ldflags_search_paths_first" >&5
++echo "$as_me:6278: 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"
+@@ -6622,7 +6625,7 @@
+ 			do
+ 				CFLAGS="$cf_shared_opts $cf_save_CFLAGS"
+ 				cat >"conftest.$ac_ext" <<_ACEOF
+-#line 6625 "configure"
++#line 6628 "configure"
+ #include "confdefs.h"
+ #include <stdio.h>
+ int
+@@ -6634,16 +6637,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:6637: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:6640: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:6640: \$? = $ac_status" >&5
++  echo "$as_me:6643: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:6643: \"$ac_try\"") >&5
++  { (eval echo "$as_me:6646: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:6646: \$? = $ac_status" >&5
++  echo "$as_me:6649: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   break
+ else
+@@ -6680,7 +6683,7 @@
+ 			test "$cf_cv_do_symlinks" = no && cf_cv_do_symlinks=yes
+ 			;;
+ 		(*)
+-			{ echo "$as_me:6683: WARNING: ignored --with-shlib-version" >&5
++			{ echo "$as_me:6686: WARNING: ignored --with-shlib-version" >&5
+ echo "$as_me: WARNING: ignored --with-shlib-version" >&2;}
+ 			;;
+ 		esac
+@@ -6690,7 +6693,7 @@
+ 	if test -n "$cf_try_cflags"
+ 	then
+ cat > conftest.$ac_ext <<EOF
+-#line 6693 "${as_me:-configure}"
++#line 6696 "${as_me:-configure}"
+ #include <stdio.h>
+ int main(int argc, char *argv[])
+ {
+@@ -6702,18 +6705,18 @@
+ 		for cf_opt in $cf_try_cflags
+ 		do
+ 			CFLAGS="$cf_save_CFLAGS -$cf_opt"
+-			echo "$as_me:6705: checking if CFLAGS option -$cf_opt works" >&5
++			echo "$as_me:6708: 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:6707: \"$ac_compile\"") >&5
++			if { (eval echo "$as_me:6710: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:6710: \$? = $ac_status" >&5
++  echo "$as_me:6713: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; then
+-				echo "$as_me:6712: result: yes" >&5
++				echo "$as_me:6715: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ 				cf_save_CFLAGS="$CFLAGS"
+ 			else
+-				echo "$as_me:6716: result: no" >&5
++				echo "$as_me:6719: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ 			fi
+ 		done
+@@ -6728,17 +6731,17 @@
+ 
+ 	test -n "$verbose" && echo "	CC_SHARED_OPTS: $CC_SHARED_OPTS" 1>&6
+ 
+-echo "${as_me:-configure}:6731: testing CC_SHARED_OPTS: $CC_SHARED_OPTS ..." 1>&5
++echo "${as_me:-configure}:6734: 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}:6735: testing MK_SHARED_LIB:  $MK_SHARED_LIB ..." 1>&5
++echo "${as_me:-configure}:6738: testing MK_SHARED_LIB:  $MK_SHARED_LIB ..." 1>&5
+ 
+ for model in $cf_list_models ; do
+ 	case "$model" in
+ 	(libtool)
+ 
+-echo "$as_me:6741: checking for additional libtool options" >&5
++echo "$as_me:6744: 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.
+@@ -6748,7 +6751,7 @@
+ else
+   with_libtool_opts=no
+ fi;
+-echo "$as_me:6751: result: $with_libtool_opts" >&5
++echo "$as_me:6754: result: $with_libtool_opts" >&5
+ echo "${ECHO_T}$with_libtool_opts" >&6
+ 
+ case .$with_libtool_opts in
+@@ -6759,7 +6762,7 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:6762: checking if exported-symbols file should be used" >&5
++echo "$as_me:6765: 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.
+@@ -6774,7 +6777,7 @@
+ 	with_export_syms='${top_srcdir}/package/${PACKAGE}.sym'
+ 
+ fi
+-echo "$as_me:6777: result: $with_export_syms" >&5
++echo "$as_me:6780: result: $with_export_syms" >&5
+ echo "${ECHO_T}$with_export_syms" >&6
+ if test "x$with_export_syms" != xno
+ then
+@@ -6785,15 +6788,15 @@
+ 		;;
+ 	(shared)
+ 		if test "$CC_SHARED_OPTS" = "unknown"; then
+-			{ { echo "$as_me:6788: error: Shared libraries are not supported in this version" >&5
++			{ { echo "$as_me:6791: 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:6793: checking if current CFLAGS link properly" >&5
++		echo "$as_me:6796: 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 6796 "configure"
++#line 6799 "configure"
+ #include "confdefs.h"
+ #include <stdio.h>
+ int
+@@ -6805,16 +6808,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:6808: \"$ac_link\"") >&5
++if { (eval echo "$as_me:6811: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:6811: \$? = $ac_status" >&5
++  echo "$as_me:6814: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:6814: \"$ac_try\"") >&5
++  { (eval echo "$as_me:6817: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:6817: \$? = $ac_status" >&5
++  echo "$as_me:6820: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cflags_work=yes
+ else
+@@ -6823,18 +6826,18 @@
+ cf_cflags_work=no
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+-		echo "$as_me:6826: result: $cf_cflags_work" >&5
++		echo "$as_me:6829: 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}:6832: testing try to work around by appending shared-options ..." 1>&5
++echo "${as_me:-configure}:6835: testing try to work around by appending shared-options ..." 1>&5
+ 
+ 			CFLAGS="$CFLAGS $CC_SHARED_OPTS"
+ 		fi
+ 
+-echo "$as_me:6837: checking if versioned-symbols file should be used" >&5
++echo "$as_me:6840: 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.
+@@ -6852,18 +6855,18 @@
+ (xno)
+ 	;;
+ (x/*)
+-	test -f "$with_versioned_syms" || { { echo "$as_me:6855: error: expected a filename: $with_versioned_syms" >&5
++	test -f "$with_versioned_syms" || { { echo "$as_me:6858: 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:6860: error: expected a filename: $with_versioned_syms" >&5
++	test -f "$with_versioned_syms" || { { echo "$as_me:6863: 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:6866: result: $with_versioned_syms" >&5
++echo "$as_me:6869: result: $with_versioned_syms" >&5
+ echo "${ECHO_T}$with_versioned_syms" >&6
+ 
+ RESULTING_SYMS=
+@@ -6879,7 +6882,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}:6882: testing MK_SHARED_LIB:  $MK_SHARED_LIB ..." 1>&5
++echo "${as_me:-configure}:6885: testing MK_SHARED_LIB:  $MK_SHARED_LIB ..." 1>&5
+ 
+ 		;;
+ 	(*-dy\ *)
+@@ -6887,11 +6890,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}:6890: testing MK_SHARED_LIB:  $MK_SHARED_LIB ..." 1>&5
++echo "${as_me:-configure}:6893: testing MK_SHARED_LIB:  $MK_SHARED_LIB ..." 1>&5
+ 
+ 		;;
+ 	(*)
+-		{ echo "$as_me:6894: WARNING: this system does not support versioned-symbols" >&5
++		{ echo "$as_me:6897: WARNING: this system does not support versioned-symbols" >&5
+ echo "$as_me: WARNING: this system does not support versioned-symbols" >&2;}
+ 		;;
+ 	esac
+@@ -6903,7 +6906,7 @@
+ 	# symbols.
+ 	if test "x$VERSIONED_SYMS" != "x"
+ 	then
+-		echo "$as_me:6906: checking if wildcards can be used to selectively omit symbols" >&5
++		echo "$as_me:6909: 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
+ 
+@@ -6940,7 +6943,7 @@
+ } submodule_1.0;
+ EOF
+ 		cat >conftest.$ac_ext <<EOF
+-#line 6943 "configure"
++#line 6946 "configure"
+ int	_ismissing(void) { return 1; }
+ int	_localf1(void) { return 1; }
+ int	_localf2(void) { return 2; }
+@@ -6971,7 +6974,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:6974: result: $WILDCARD_SYMS" >&5
++		echo "$as_me:6977: result: $WILDCARD_SYMS" >&5
+ echo "${ECHO_T}$WILDCARD_SYMS" >&6
+ 		rm -f conftest.*
+ 	fi
+@@ -6984,7 +6987,7 @@
+ ### Checks for special libraries, must be done up-front.
+ SHLIB_LIST=""
+ 
+-echo "$as_me:6987: checking if you want to link with the GPM mouse library" >&5
++echo "$as_me:6990: 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.
+@@ -6994,27 +6997,27 @@
+ else
+   with_gpm=maybe
+ fi;
+-echo "$as_me:6997: result: $with_gpm" >&5
++echo "$as_me:7000: result: $with_gpm" >&5
+ echo "${ECHO_T}$with_gpm" >&6
+ 
+ if test "$with_gpm" != no ; then
+-	echo "$as_me:7001: checking for gpm.h" >&5
++	echo "$as_me:7004: 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 7007 "configure"
++#line 7010 "configure"
+ #include "confdefs.h"
+ #include <gpm.h>
+ _ACEOF
+-if { (eval echo "$as_me:7011: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:7014: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
+   ac_status=$?
+   $EGREP -v '^ *\+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  echo "$as_me:7017: \$? = $ac_status" >&5
++  echo "$as_me:7020: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -7033,7 +7036,7 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:7036: result: $ac_cv_header_gpm_h" >&5
++echo "$as_me:7039: 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
+ 
+@@ -7044,7 +7047,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}:7047: testing assuming we really have GPM library ..." 1>&5
++echo "${as_me:-configure}:7050: testing assuming we really have GPM library ..." 1>&5
+ 
+ cat >>confdefs.h <<\EOF
+ #define HAVE_LIBGPM 1
+@@ -7052,7 +7055,7 @@
+ 
+ 			with_gpm=yes
+ 		else
+-			echo "$as_me:7055: checking for Gpm_Open in -lgpm" >&5
++			echo "$as_me:7058: 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
+@@ -7060,7 +7063,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lgpm  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 7063 "configure"
++#line 7066 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -7079,16 +7082,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:7082: \"$ac_link\"") >&5
++if { (eval echo "$as_me:7085: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:7085: \$? = $ac_status" >&5
++  echo "$as_me:7088: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:7088: \"$ac_try\"") >&5
++  { (eval echo "$as_me:7091: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:7091: \$? = $ac_status" >&5
++  echo "$as_me:7094: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_gpm_Gpm_Open=yes
+ else
+@@ -7099,18 +7102,18 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:7102: result: $ac_cv_lib_gpm_Gpm_Open" >&5
++echo "$as_me:7105: 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:7109: WARNING: Cannot link with GPM library" >&5
++					{ echo "$as_me:7112: WARNING: Cannot link with GPM library" >&5
+ echo "$as_me: WARNING: Cannot link with GPM library" >&2;}
+ 					with_gpm=no
+ 				else
+-					{ { echo "$as_me:7113: error: Cannot link with GPM library" >&5
++					{ { echo "$as_me:7116: error: Cannot link with GPM library" >&5
+ echo "$as_me: error: Cannot link with GPM library" >&2;}
+    { (exit 1); exit 1; }; }
+ 				fi
+@@ -7121,7 +7124,7 @@
+ 
+ else
+ 
+-		test "$with_gpm" != maybe && { echo "$as_me:7124: WARNING: Cannot find GPM header" >&5
++		test "$with_gpm" != maybe && { echo "$as_me:7127: WARNING: Cannot find GPM header" >&5
+ echo "$as_me: WARNING: Cannot find GPM header" >&2;}
+ 		with_gpm=no
+ 
+@@ -7130,7 +7133,7 @@
+ fi
+ 
+ if test "$with_gpm" != no ; then
+-	echo "$as_me:7133: checking if you want to load GPM dynamically" >&5
++	echo "$as_me:7136: 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.
+@@ -7140,18 +7143,18 @@
+ else
+   with_dlsym=yes
+ fi;
+-	echo "$as_me:7143: result: $with_dlsym" >&5
++	echo "$as_me:7146: result: $with_dlsym" >&5
+ echo "${ECHO_T}$with_dlsym" >&6
+ 	if test "x$with_dlsym" = xyes ; then
+ 
+ cf_have_dlsym=no
+-echo "$as_me:7148: checking for dlsym" >&5
++echo "$as_me:7151: 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 7154 "configure"
++#line 7157 "configure"
+ #include "confdefs.h"
+ #define dlsym autoconf_temporary
+ #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -7182,16 +7185,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:7185: \"$ac_link\"") >&5
++if { (eval echo "$as_me:7188: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:7188: \$? = $ac_status" >&5
++  echo "$as_me:7191: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:7191: \"$ac_try\"") >&5
++  { (eval echo "$as_me:7194: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:7194: \$? = $ac_status" >&5
++  echo "$as_me:7197: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_func_dlsym=yes
+ else
+@@ -7201,14 +7204,14 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:7204: result: $ac_cv_func_dlsym" >&5
++echo "$as_me:7207: 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:7211: checking for dlsym in -ldl" >&5
++echo "$as_me:7214: 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
+@@ -7216,7 +7219,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-ldl  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 7219 "configure"
++#line 7222 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -7235,16 +7238,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:7238: \"$ac_link\"") >&5
++if { (eval echo "$as_me:7241: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:7241: \$? = $ac_status" >&5
++  echo "$as_me:7244: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:7244: \"$ac_try\"") >&5
++  { (eval echo "$as_me:7247: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:7247: \$? = $ac_status" >&5
++  echo "$as_me:7250: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_dl_dlsym=yes
+ else
+@@ -7255,7 +7258,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:7258: result: $ac_cv_lib_dl_dlsym" >&5
++echo "$as_me:7261: 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
+ 
+@@ -7284,10 +7287,10 @@
+ LIBS="$cf_add_libs"
+  }
+ 
+-	echo "$as_me:7287: checking whether able to link to dl*() functions" >&5
++	echo "$as_me:7290: 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 7290 "configure"
++#line 7293 "configure"
+ #include "confdefs.h"
+ #include <dlfcn.h>
+ int
+@@ -7305,16 +7308,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:7308: \"$ac_link\"") >&5
++if { (eval echo "$as_me:7311: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:7311: \$? = $ac_status" >&5
++  echo "$as_me:7314: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:7314: \"$ac_try\"") >&5
++  { (eval echo "$as_me:7317: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:7317: \$? = $ac_status" >&5
++  echo "$as_me:7320: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+ 
+ cat >>confdefs.h <<\EOF
+@@ -7325,15 +7328,15 @@
+   echo "$as_me: failed program was:" >&5
+ cat "conftest.$ac_ext" >&5
+ 
+-		{ { echo "$as_me:7328: error: Cannot link test program for libdl" >&5
++		{ { echo "$as_me:7331: 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:7333: result: ok" >&5
++	echo "$as_me:7336: result: ok" >&5
+ echo "${ECHO_T}ok" >&6
+ else
+-	{ { echo "$as_me:7336: error: Cannot find dlsym function" >&5
++	{ { echo "$as_me:7339: error: Cannot find dlsym function" >&5
+ echo "$as_me: error: Cannot find dlsym function" >&2;}
+    { (exit 1); exit 1; }; }
+ fi
+@@ -7341,12 +7344,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}:7344: testing assuming soname for gpm is $with_gpm ..." 1>&5
++echo "${as_me:-configure}:7347: testing assuming soname for gpm is $with_gpm ..." 1>&5
+ 
+ 			cf_cv_gpm_soname="$with_gpm"
+ 		else
+ 
+-echo "$as_me:7349: checking for soname of gpm library" >&5
++echo "$as_me:7352: 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
+@@ -7380,15 +7383,15 @@
+ done
+ LIBS="$cf_add_libs"
+ 
+-	if { (eval echo "$as_me:7383: \"$ac_compile\"") >&5
++	if { (eval echo "$as_me:7386: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:7386: \$? = $ac_status" >&5
++  echo "$as_me:7389: \$? = $ac_status" >&5
+   (exit "$ac_status"); } ; then
+-		if { (eval echo "$as_me:7388: \"$ac_link\"") >&5
++		if { (eval echo "$as_me:7391: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:7391: \$? = $ac_status" >&5
++  echo "$as_me:7394: \$? = $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
+@@ -7399,7 +7402,7 @@
+ fi
+ 
+ fi
+-echo "$as_me:7402: result: $cf_cv_gpm_soname" >&5
++echo "$as_me:7405: result: $cf_cv_gpm_soname" >&5
+ echo "${ECHO_T}$cf_cv_gpm_soname" >&6
+ 
+ 		fi
+@@ -7467,7 +7470,7 @@
+ #define HAVE_LIBGPM 1
+ EOF
+ 
+-echo "$as_me:7470: checking for Gpm_Wgetch in -lgpm" >&5
++echo "$as_me:7473: 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
+@@ -7475,7 +7478,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lgpm  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 7478 "configure"
++#line 7481 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -7494,16 +7497,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:7497: \"$ac_link\"") >&5
++if { (eval echo "$as_me:7500: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:7500: \$? = $ac_status" >&5
++  echo "$as_me:7503: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:7503: \"$ac_try\"") >&5
++  { (eval echo "$as_me:7506: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:7506: \$? = $ac_status" >&5
++  echo "$as_me:7509: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_gpm_Gpm_Wgetch=yes
+ else
+@@ -7514,11 +7517,11 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:7517: result: $ac_cv_lib_gpm_Gpm_Wgetch" >&5
++echo "$as_me:7520: 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:7521: checking if GPM is weakly bound to curses library" >&5
++echo "$as_me:7524: 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
+@@ -7542,15 +7545,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:7545: \"$ac_compile\"") >&5
++	if { (eval echo "$as_me:7548: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:7548: \$? = $ac_status" >&5
++  echo "$as_me:7551: \$? = $ac_status" >&5
+   (exit "$ac_status"); } ; then
+-		if { (eval echo "$as_me:7550: \"$ac_link\"") >&5
++		if { (eval echo "$as_me:7553: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:7553: \$? = $ac_status" >&5
++  echo "$as_me:7556: \$? = $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
+@@ -7562,11 +7565,11 @@
+ fi
+ 
+ fi
+-echo "$as_me:7565: result: $cf_cv_check_gpm_wgetch" >&5
++echo "$as_me:7568: 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:7569: WARNING: GPM library is already linked with curses - read the FAQ" >&5
++	{ echo "$as_me:7572: 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
+ 
+@@ -7574,7 +7577,7 @@
+ 
+ fi
+ 
+-echo "$as_me:7577: checking if you want to use PCRE2 for regular-expressions" >&5
++echo "$as_me:7580: 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.
+@@ -7583,7 +7586,7 @@
+ 
+ fi;
+ test -z "$with_pcre2" && with_pcre2=no
+-echo "$as_me:7586: result: $with_pcre2" >&5
++echo "$as_me:7589: result: $with_pcre2" >&5
+ echo "${ECHO_T}$with_pcre2" >&6
+ 
+ if test "x$with_pcre2" != xno ; then
+@@ -7594,17 +7597,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}:7597: testing found package $cf_with_pcre2 ..." 1>&5
++echo "${as_me:-configure}:7600: 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}:7603: testing package $cf_with_pcre2 CFLAGS: $cf_pkgconfig_incs ..." 1>&5
++echo "${as_me:-configure}:7606: 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}:7607: testing package $cf_with_pcre2 LIBS: $cf_pkgconfig_libs ..." 1>&5
++echo "${as_me:-configure}:7610: testing package $cf_with_pcre2 LIBS: $cf_pkgconfig_libs ..." 1>&5
+ 
+ cf_fix_cppflags=no
+ cf_new_cflags=
+@@ -7728,7 +7731,7 @@
+ fi
+ 
+ 	done
+-	cf_with_pcre2_ok=yes || { { echo "$as_me:7731: error: Cannot find PCRE2 library" >&5
++	cf_with_pcre2_ok=yes || { { echo "$as_me:7734: error: Cannot find PCRE2 library" >&5
+ echo "$as_me: error: Cannot find PCRE2 library" >&2;}
+    { (exit 1); exit 1; }; }
+ 
+@@ -7741,7 +7744,7 @@
+ 	(*pcre2-posix*|*pcreposix*)
+ 		;;
+ 	(*)
+-		echo "$as_me:7744: checking for regcomp in -lpcre2-posix" >&5
++		echo "$as_me:7747: 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
+@@ -7749,7 +7752,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lpcre2-posix  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 7752 "configure"
++#line 7755 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -7768,16 +7771,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:7771: \"$ac_link\"") >&5
++if { (eval echo "$as_me:7774: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:7774: \$? = $ac_status" >&5
++  echo "$as_me:7777: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:7777: \"$ac_try\"") >&5
++  { (eval echo "$as_me:7780: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:7780: \$? = $ac_status" >&5
++  echo "$as_me:7783: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_pcre2_posix_regcomp=yes
+ else
+@@ -7788,7 +7791,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:7791: result: $ac_cv_lib_pcre2_posix_regcomp" >&5
++echo "$as_me:7794: 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
+ 
+@@ -7809,7 +7812,7 @@
+ LIBS="$cf_add_libs"
+ 
+ else
+-  echo "$as_me:7812: checking for regcomp in -lpcreposix" >&5
++  echo "$as_me:7815: 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
+@@ -7817,7 +7820,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lpcreposix  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 7820 "configure"
++#line 7823 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -7836,16 +7839,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:7839: \"$ac_link\"") >&5
++if { (eval echo "$as_me:7842: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:7842: \$? = $ac_status" >&5
++  echo "$as_me:7845: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:7845: \"$ac_try\"") >&5
++  { (eval echo "$as_me:7848: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:7848: \$? = $ac_status" >&5
++  echo "$as_me:7851: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_pcreposix_regcomp=yes
+ else
+@@ -7856,7 +7859,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:7859: result: $ac_cv_lib_pcreposix_regcomp" >&5
++echo "$as_me:7862: 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
+ 
+@@ -7877,7 +7880,7 @@
+ LIBS="$cf_add_libs"
+ 
+ else
+-  { { echo "$as_me:7880: error: Cannot find PCRE2 POSIX library" >&5
++  { { echo "$as_me:7883: error: Cannot find PCRE2 POSIX library" >&5
+ echo "$as_me: error: Cannot find PCRE2 POSIX library" >&2;}
+    { (exit 1); exit 1; }; }
+ fi
+@@ -7892,23 +7895,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:7895: checking for $ac_header" >&5
++echo "$as_me:7898: 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 7901 "configure"
++#line 7904 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:7905: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:7908: \"$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:7911: \$? = $ac_status" >&5
++  echo "$as_me:7914: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -7927,7 +7930,7 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:7930: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
++echo "$as_me:7933: 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
+@@ -7940,13 +7943,13 @@
+ for ac_func in PCRE2regcomp
+ do
+ as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+-echo "$as_me:7943: checking for $ac_func" >&5
++echo "$as_me:7946: 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 7949 "configure"
++#line 7952 "configure"
+ #include "confdefs.h"
+ #define $ac_func autoconf_temporary
+ #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -7977,16 +7980,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:7980: \"$ac_link\"") >&5
++if { (eval echo "$as_me:7983: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:7983: \$? = $ac_status" >&5
++  echo "$as_me:7986: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:7986: \"$ac_try\"") >&5
++  { (eval echo "$as_me:7989: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:7989: \$? = $ac_status" >&5
++  echo "$as_me:7992: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   eval "$as_ac_var=yes"
+ else
+@@ -7996,7 +7999,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:7999: result: `eval echo '${'"$as_ac_var"'}'`" >&5
++echo "$as_me:8002: 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
+@@ -8010,7 +8013,7 @@
+ 
+ # not everyone has "test -c"
+ if test -c /dev/sysmouse 2>/dev/null ; then
+-echo "$as_me:8013: checking if you want to use sysmouse" >&5
++echo "$as_me:8016: 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.
+@@ -8022,7 +8025,7 @@
+ fi;
+ 	if test "$cf_with_sysmouse" != no ; then
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 8025 "configure"
++#line 8028 "configure"
+ #include "confdefs.h"
+ 
+ #include <osreldate.h>
+@@ -8045,16 +8048,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:8048: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:8051: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:8051: \$? = $ac_status" >&5
++  echo "$as_me:8054: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:8054: \"$ac_try\"") >&5
++  { (eval echo "$as_me:8057: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:8057: \$? = $ac_status" >&5
++  echo "$as_me:8060: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_with_sysmouse=yes
+ else
+@@ -8064,7 +8067,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 	fi
+-echo "$as_me:8067: result: $cf_with_sysmouse" >&5
++echo "$as_me:8070: result: $cf_with_sysmouse" >&5
+ echo "${ECHO_T}$cf_with_sysmouse" >&6
+ test "$cf_with_sysmouse" = yes &&
+ cat >>confdefs.h <<\EOF
+@@ -8074,7 +8077,7 @@
+ fi
+ 
+ # pretend that ncurses==ncursesw==ncursest
+-echo "$as_me:8077: checking if you want to disable library suffixes" >&5
++echo "$as_me:8080: 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.
+@@ -8091,13 +8094,13 @@
+ 	disable_lib_suffixes=no
+ 
+ fi;
+-echo "$as_me:8094: result: $disable_lib_suffixes" >&5
++echo "$as_me:8097: 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:8100: checking if rpath-hack should be disabled" >&5
++echo "$as_me:8103: 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.
+@@ -8115,22 +8118,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:8118: result: $cf_disable_rpath_hack" >&5
++echo "$as_me:8121: result: $cf_disable_rpath_hack" >&5
+ echo "${ECHO_T}$cf_disable_rpath_hack" >&6
+ 
+ if test "$enable_rpath_hack" = yes ; then
+ 
+-echo "$as_me:8123: checking for updated LDFLAGS" >&5
++echo "$as_me:8126: 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:8126: result: maybe" >&5
++	echo "$as_me:8129: 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:8133: checking for $ac_word" >&5
++echo "$as_me:8136: 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
+@@ -8145,7 +8148,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:8148: found $ac_dir/$ac_word" >&5
++echo "$as_me:8151: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -8153,10 +8156,10 @@
+ fi
+ cf_ldd_prog=$ac_cv_prog_cf_ldd_prog
+ if test -n "$cf_ldd_prog"; then
+-  echo "$as_me:8156: result: $cf_ldd_prog" >&5
++  echo "$as_me:8159: result: $cf_ldd_prog" >&5
+ echo "${ECHO_T}$cf_ldd_prog" >&6
+ else
+-  echo "$as_me:8159: result: no" >&5
++  echo "$as_me:8162: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -8170,7 +8173,7 @@
+ 		cf_rpath_oops=
+ 
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 8173 "configure"
++#line 8176 "configure"
+ #include "confdefs.h"
+ #include <stdio.h>
+ int
+@@ -8182,16 +8185,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:8185: \"$ac_link\"") >&5
++if { (eval echo "$as_me:8188: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:8188: \$? = $ac_status" >&5
++  echo "$as_me:8191: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:8191: \"$ac_try\"") >&5
++  { (eval echo "$as_me:8194: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:8194: \$? = $ac_status" >&5
++  echo "$as_me:8197: \$? = $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`
+@@ -8219,7 +8222,7 @@
+ 					then
+ 						test -n "$verbose" && echo "	...adding -L$cf_rpath_dir/lib to LDFLAGS for $cf_rpath_src" 1>&6
+ 
+-echo "${as_me:-configure}:8222: testing ...adding -L$cf_rpath_dir/lib to LDFLAGS for $cf_rpath_src ..." 1>&5
++echo "${as_me:-configure}:8225: testing ...adding -L$cf_rpath_dir/lib to LDFLAGS for $cf_rpath_src ..." 1>&5
+ 
+ 						LDFLAGS="$LDFLAGS -L$cf_rpath_dir/lib"
+ 						break
+@@ -8231,11 +8234,11 @@
+ 
+ 	test -n "$verbose" && echo "	...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:8234: testing ...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
++echo "${as_me:-configure}:8237: testing ...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
+ 
+ test -n "$verbose" && echo "	...checking LDFLAGS $LDFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:8238: testing ...checking LDFLAGS $LDFLAGS ..." 1>&5
++echo "${as_me:-configure}:8241: testing ...checking LDFLAGS $LDFLAGS ..." 1>&5
+ 
+ cf_rpath_dst=
+ for cf_rpath_src in $LDFLAGS
+@@ -8272,7 +8275,7 @@
+ 			then
+ 				test -n "$verbose" && echo "	...Filter $cf_rpath_src ->$cf_rpath_tmp" 1>&6
+ 
+-echo "${as_me:-configure}:8275: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
++echo "${as_me:-configure}:8278: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
+ 
+ 				EXTRA_LDFLAGS="$cf_rpath_tmp $EXTRA_LDFLAGS"
+ 			fi
+@@ -8285,11 +8288,11 @@
+ 
+ test -n "$verbose" && echo "	...checked LDFLAGS $LDFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:8288: testing ...checked LDFLAGS $LDFLAGS ..." 1>&5
++echo "${as_me:-configure}:8291: testing ...checked LDFLAGS $LDFLAGS ..." 1>&5
+ 
+ test -n "$verbose" && echo "	...checking LIBS $LIBS" 1>&6
+ 
+-echo "${as_me:-configure}:8292: testing ...checking LIBS $LIBS ..." 1>&5
++echo "${as_me:-configure}:8295: testing ...checking LIBS $LIBS ..." 1>&5
+ 
+ cf_rpath_dst=
+ for cf_rpath_src in $LIBS
+@@ -8326,7 +8329,7 @@
+ 			then
+ 				test -n "$verbose" && echo "	...Filter $cf_rpath_src ->$cf_rpath_tmp" 1>&6
+ 
+-echo "${as_me:-configure}:8329: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
++echo "${as_me:-configure}:8332: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
+ 
+ 				EXTRA_LDFLAGS="$cf_rpath_tmp $EXTRA_LDFLAGS"
+ 			fi
+@@ -8339,14 +8342,14 @@
+ 
+ test -n "$verbose" && echo "	...checked LIBS $LIBS" 1>&6
+ 
+-echo "${as_me:-configure}:8342: testing ...checked LIBS $LIBS ..." 1>&5
++echo "${as_me:-configure}:8345: testing ...checked LIBS $LIBS ..." 1>&5
+ 
+ 	test -n "$verbose" && echo "	...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:8346: testing ...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
++echo "${as_me:-configure}:8349: testing ...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
+ 
+ else
+-	echo "$as_me:8349: result: no" >&5
++	echo "$as_me:8352: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -8360,7 +8363,7 @@
+ EXTRA_PKG_LDFLAGS="$LDFLAGS $EXTRA_LDFLAGS"
+ if test -n "$EXTRA_PKG_LDFLAGS"
+ then
+-	echo "$as_me:8363: checking if you want to disable extra LDFLAGS for package-scripts" >&5
++	echo "$as_me:8366: 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.
+@@ -8377,7 +8380,7 @@
+ 	disable_pkg_ldflags=no
+ 
+ fi;
+-	echo "$as_me:8380: result: $disable_pkg_ldflags" >&5
++	echo "$as_me:8383: result: $disable_pkg_ldflags" >&5
+ echo "${ECHO_T}$disable_pkg_ldflags" >&6
+ 	test "$disable_pkg_ldflags" = yes && EXTRA_PKG_LDFLAGS=
+ fi
+@@ -8385,7 +8388,7 @@
+ ###############################################################################
+ 
+ ###	use option --with-extra-suffix to append suffix to headers and libraries
+-echo "$as_me:8388: checking if you wish to append extra suffix to header/library paths" >&5
++echo "$as_me:8391: 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=
+ 
+@@ -8404,11 +8407,11 @@
+ 	esac
+ 
+ fi;
+-echo "$as_me:8407: result: $EXTRA_SUFFIX" >&5
++echo "$as_me:8410: result: $EXTRA_SUFFIX" >&5
+ echo "${ECHO_T}$EXTRA_SUFFIX" >&6
+ 
+ ###	use option --disable-overwrite to leave out the link to -lcurses
+-echo "$as_me:8411: checking if you wish to install ncurses overwriting curses" >&5
++echo "$as_me:8414: 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.
+@@ -8418,10 +8421,10 @@
+ else
+   if test "$prefix" = "/usr" ; then with_overwrite=yes; else with_overwrite=no; fi
+ fi;
+-echo "$as_me:8421: result: $with_overwrite" >&5
++echo "$as_me:8424: result: $with_overwrite" >&5
+ echo "${ECHO_T}$with_overwrite" >&6
+ 
+-echo "$as_me:8424: checking if external terminfo-database is used" >&5
++echo "$as_me:8427: 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.
+@@ -8431,7 +8434,7 @@
+ else
+   use_database=yes
+ fi;
+-echo "$as_me:8434: result: $use_database" >&5
++echo "$as_me:8437: result: $use_database" >&5
+ echo "${ECHO_T}$use_database" >&6
+ 
+ case "$host_os" in
+@@ -8447,7 +8450,7 @@
+ if test "$use_database" != no ; then
+ 	NCURSES_USE_DATABASE=1
+ 
+-	echo "$as_me:8450: checking which terminfo source-file will be installed" >&5
++	echo "$as_me:8453: 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.
+@@ -8455,10 +8458,10 @@
+   withval="$with_database"
+   TERMINFO_SRC=$withval
+ fi;
+-	echo "$as_me:8458: result: $TERMINFO_SRC" >&5
++	echo "$as_me:8461: result: $TERMINFO_SRC" >&5
+ echo "${ECHO_T}$TERMINFO_SRC" >&6
+ 
+-	echo "$as_me:8461: checking whether to use hashed database instead of directory/tree" >&5
++	echo "$as_me:8464: 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.
+@@ -8468,13 +8471,13 @@
+ else
+   with_hashed_db=no
+ fi;
+-	echo "$as_me:8471: result: $with_hashed_db" >&5
++	echo "$as_me:8474: result: $with_hashed_db" >&5
+ echo "${ECHO_T}$with_hashed_db" >&6
+ else
+ 	with_hashed_db=no
+ fi
+ 
+-echo "$as_me:8477: checking for list of fallback descriptions" >&5
++echo "$as_me:8480: 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.
+@@ -8484,7 +8487,7 @@
+ else
+   with_fallback=
+ fi;
+-echo "$as_me:8487: result: $with_fallback" >&5
++echo "$as_me:8490: result: $with_fallback" >&5
+ echo "${ECHO_T}$with_fallback" >&6
+ 
+ case ".$with_fallback" in
+@@ -8492,7 +8495,7 @@
+ 	FALLBACK_LIST=
+ 	;;
+ (.yes)
+-	{ echo "$as_me:8495: WARNING: expected a list of terminal descriptions" >&5
++	{ echo "$as_me:8498: WARNING: expected a list of terminal descriptions" >&5
+ echo "$as_me: WARNING: expected a list of terminal descriptions" >&2;}
+ 	;;
+ (*)
+@@ -8508,7 +8511,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:8511: checking for $ac_word" >&5
++echo "$as_me:8514: 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
+@@ -8523,7 +8526,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:8526: found $ac_dir/$ac_word" >&5
++echo "$as_me:8529: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -8531,10 +8534,10 @@
+ fi
+ TIC=$ac_cv_prog_TIC
+ if test -n "$TIC"; then
+-  echo "$as_me:8534: result: $TIC" >&5
++  echo "$as_me:8537: result: $TIC" >&5
+ echo "${ECHO_T}$TIC" >&6
+ else
+-  echo "$as_me:8537: result: no" >&5
++  echo "$as_me:8540: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -8543,7 +8546,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:8546: checking for $ac_word" >&5
++echo "$as_me:8549: 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
+@@ -8558,7 +8561,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:8561: found $ac_dir/$ac_word" >&5
++echo "$as_me:8564: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -8566,10 +8569,10 @@
+ fi
+ ac_ct_TIC=$ac_cv_prog_ac_ct_TIC
+ if test -n "$ac_ct_TIC"; then
+-  echo "$as_me:8569: result: $ac_ct_TIC" >&5
++  echo "$as_me:8572: result: $ac_ct_TIC" >&5
+ echo "${ECHO_T}$ac_ct_TIC" >&6
+ else
+-  echo "$as_me:8572: result: no" >&5
++  echo "$as_me:8575: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -8581,7 +8584,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:8584: checking for $ac_word" >&5
++echo "$as_me:8587: 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
+@@ -8596,7 +8599,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:8599: found $ac_dir/$ac_word" >&5
++echo "$as_me:8602: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -8604,10 +8607,10 @@
+ fi
+ INFOCMP=$ac_cv_prog_INFOCMP
+ if test -n "$INFOCMP"; then
+-  echo "$as_me:8607: result: $INFOCMP" >&5
++  echo "$as_me:8610: result: $INFOCMP" >&5
+ echo "${ECHO_T}$INFOCMP" >&6
+ else
+-  echo "$as_me:8610: result: no" >&5
++  echo "$as_me:8613: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -8616,7 +8619,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:8619: checking for $ac_word" >&5
++echo "$as_me:8622: 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
+@@ -8631,7 +8634,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:8634: found $ac_dir/$ac_word" >&5
++echo "$as_me:8637: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -8639,10 +8642,10 @@
+ fi
+ ac_ct_INFOCMP=$ac_cv_prog_ac_ct_INFOCMP
+ if test -n "$ac_ct_INFOCMP"; then
+-  echo "$as_me:8642: result: $ac_ct_INFOCMP" >&5
++  echo "$as_me:8645: result: $ac_ct_INFOCMP" >&5
+ echo "${ECHO_T}$ac_ct_INFOCMP" >&6
+ else
+-  echo "$as_me:8645: result: no" >&5
++  echo "$as_me:8648: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -8657,10 +8660,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:8660: checking for tic program for fallbacks" >&5
++  echo "$as_me:8663: checking for tic program for fallbacks" >&5
+ echo $ECHO_N "checking for tic program for fallbacks... $ECHO_C" >&6
+ 		TIC=$withval
+-		echo "$as_me:8663: result: $TIC" >&5
++		echo "$as_me:8666: result: $TIC" >&5
+ echo "${ECHO_T}$TIC" >&6
+ 
+ if test "x$prefix" != xNONE; then
+@@ -8688,7 +8691,7 @@
+ 	TIC=`echo "$TIC" | sed -e s%NONE%$cf_path_syntax%`
+ 	;;
+ (*)
+-	{ { echo "$as_me:8691: error: expected a pathname, not \"$TIC\"" >&5
++	{ { echo "$as_me:8694: error: expected a pathname, not \"$TIC\"" >&5
+ echo "$as_me: error: expected a pathname, not \"$TIC\"" >&2;}
+    { (exit 1); exit 1; }; }
+ 	;;
+@@ -8701,7 +8704,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:8704: checking for $ac_word" >&5
++echo "$as_me:8707: 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
+@@ -8718,7 +8721,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:8721: found $ac_dir/$ac_word" >&5
++   echo "$as_me:8724: found $ac_dir/$ac_word" >&5
+    break
+ fi
+ done
+@@ -8729,10 +8732,10 @@
+ TIC=$ac_cv_path_TIC
+ 
+ if test -n "$TIC"; then
+-  echo "$as_me:8732: result: $TIC" >&5
++  echo "$as_me:8735: result: $TIC" >&5
+ echo "${ECHO_T}$TIC" >&6
+ else
+-  echo "$as_me:8735: result: no" >&5
++  echo "$as_me:8738: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -8791,7 +8794,7 @@
+ 
+ if test -n "$cf_path_prog" ; then
+ 
+-echo "${as_me:-configure}:8794: testing defining path for ${cf_path_prog} ..." 1>&5
++echo "${as_me:-configure}:8797: testing defining path for ${cf_path_prog} ..." 1>&5
+ 
+ cat >>confdefs.h <<EOF
+ #define TIC_PATH "$cf_path_prog"
+@@ -8806,7 +8809,7 @@
+ 
+ 		if test -z "$TIC"
+ 		then
+-			{ echo "$as_me:8809: WARNING: no tic program found for fallbacks" >&5
++			{ echo "$as_me:8812: WARNING: no tic program found for fallbacks" >&5
+ echo "$as_me: WARNING: no tic program found for fallbacks" >&2;}
+ 		fi
+ 
+@@ -8815,10 +8818,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:8818: checking for infocmp program for fallbacks" >&5
++  echo "$as_me:8821: checking for infocmp program for fallbacks" >&5
+ echo $ECHO_N "checking for infocmp program for fallbacks... $ECHO_C" >&6
+ 		INFOCMP=$withval
+-		echo "$as_me:8821: result: $INFOCMP" >&5
++		echo "$as_me:8824: result: $INFOCMP" >&5
+ echo "${ECHO_T}$INFOCMP" >&6
+ 
+ if test "x$prefix" != xNONE; then
+@@ -8846,7 +8849,7 @@
+ 	INFOCMP=`echo "$INFOCMP" | sed -e s%NONE%$cf_path_syntax%`
+ 	;;
+ (*)
+-	{ { echo "$as_me:8849: error: expected a pathname, not \"$INFOCMP\"" >&5
++	{ { echo "$as_me:8852: error: expected a pathname, not \"$INFOCMP\"" >&5
+ echo "$as_me: error: expected a pathname, not \"$INFOCMP\"" >&2;}
+    { (exit 1); exit 1; }; }
+ 	;;
+@@ -8859,7 +8862,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:8862: checking for $ac_word" >&5
++echo "$as_me:8865: 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
+@@ -8876,7 +8879,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:8879: found $ac_dir/$ac_word" >&5
++   echo "$as_me:8882: found $ac_dir/$ac_word" >&5
+    break
+ fi
+ done
+@@ -8887,10 +8890,10 @@
+ INFOCMP=$ac_cv_path_INFOCMP
+ 
+ if test -n "$INFOCMP"; then
+-  echo "$as_me:8890: result: $INFOCMP" >&5
++  echo "$as_me:8893: result: $INFOCMP" >&5
+ echo "${ECHO_T}$INFOCMP" >&6
+ else
+-  echo "$as_me:8893: result: no" >&5
++  echo "$as_me:8896: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -8949,7 +8952,7 @@
+ 
+ if test -n "$cf_path_prog" ; then
+ 
+-echo "${as_me:-configure}:8952: testing defining path for ${cf_path_prog} ..." 1>&5
++echo "${as_me:-configure}:8955: testing defining path for ${cf_path_prog} ..." 1>&5
+ 
+ cat >>confdefs.h <<EOF
+ #define INFOCMP_PATH "$cf_path_prog"
+@@ -8964,7 +8967,7 @@
+ 
+ 		if test -z "$INFOCMP"
+ 		then
+-			{ echo "$as_me:8967: WARNING: no infocmp program found for fallbacks" >&5
++			{ echo "$as_me:8970: WARNING: no infocmp program found for fallbacks" >&5
+ echo "$as_me: WARNING: no infocmp program found for fallbacks" >&2;}
+ 		fi
+ 
+@@ -8974,7 +8977,7 @@
+ 	test -z "$INFOCMP" && FALLBACK_LIST=
+ 	if test -z "$FALLBACK_LIST"
+ 	then
+-		{ echo "$as_me:8977: WARNING: ignoring fallback option because tic/infocmp are not available" >&5
++		{ echo "$as_me:8980: 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
+@@ -8982,7 +8985,7 @@
+ USE_FALLBACKS=
+ test -z "$FALLBACK_LIST" && USE_FALLBACKS="#"
+ 
+-echo "$as_me:8985: checking if you want modern xterm or antique" >&5
++echo "$as_me:8988: 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.
+@@ -8996,11 +8999,11 @@
+ (no) with_xterm_new=xterm-old;;
+ (*)	 with_xterm_new=xterm-new;;
+ esac
+-echo "$as_me:8999: result: $with_xterm_new" >&5
++echo "$as_me:9002: result: $with_xterm_new" >&5
+ echo "${ECHO_T}$with_xterm_new" >&6
+ WHICH_XTERM=$with_xterm_new
+ 
+-echo "$as_me:9003: checking if xterm backspace sends BS or DEL" >&5
++echo "$as_me:9006: 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.
+@@ -9021,7 +9024,7 @@
+ 	with_xterm_kbs=$withval
+ 	;;
+ esac
+-echo "$as_me:9024: result: $with_xterm_kbs" >&5
++echo "$as_me:9027: result: $with_xterm_kbs" >&5
+ echo "${ECHO_T}$with_xterm_kbs" >&6
+ XTERM_KBS=$with_xterm_kbs
+ 
+@@ -9031,7 +9034,7 @@
+ 	MAKE_TERMINFO="#"
+ else
+ 
+-echo "$as_me:9034: checking for list of terminfo directories" >&5
++echo "$as_me:9037: 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.
+@@ -9071,7 +9074,7 @@
+ 	cf_src_path=`echo "$cf_src_path" | sed -e s%NONE%$cf_path_syntax%`
+ 	;;
+ (*)
+-	{ { echo "$as_me:9074: error: expected a pathname, not \"$cf_src_path\"" >&5
++	{ { echo "$as_me:9077: 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; }; }
+ 	;;
+@@ -9094,7 +9097,7 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:9097: result: $TERMINFO_DIRS" >&5
++echo "$as_me:9100: result: $TERMINFO_DIRS" >&5
+ echo "${ECHO_T}$TERMINFO_DIRS" >&6
+ test -n "$TERMINFO_DIRS" &&
+ cat >>confdefs.h <<EOF
+@@ -9103,13 +9106,13 @@
+ 
+ case "x$TERMINFO" in
+ x???:*)
+-	{ echo "$as_me:9106: WARNING: ignoring non-directory/file TERMINFO value" >&5
++	{ echo "$as_me:9109: 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:9112: checking for default terminfo directory" >&5
++echo "$as_me:9115: 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.
+@@ -9145,7 +9148,7 @@
+ 	withval=`echo "$withval" | sed -e s%NONE%$cf_path_syntax%`
+ 	;;
+ (*)
+-	{ { echo "$as_me:9148: error: expected a pathname, not \"$withval\"" >&5
++	{ { echo "$as_me:9151: error: expected a pathname, not \"$withval\"" >&5
+ echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
+    { (exit 1); exit 1; }; }
+ 	;;
+@@ -9154,7 +9157,7 @@
+ fi
+ eval TERMINFO="$withval"
+ 
+-echo "$as_me:9157: result: $TERMINFO" >&5
++echo "$as_me:9160: result: $TERMINFO" >&5
+ echo "${ECHO_T}$TERMINFO" >&6
+ 
+ cat >>confdefs.h <<EOF
+@@ -9165,7 +9168,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:9168: checking if big-core option selected" >&5
++echo "$as_me:9171: 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.
+@@ -9177,7 +9180,7 @@
+   with_big_core=no
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 9180 "configure"
++#line 9183 "configure"
+ #include "confdefs.h"
+ 
+ #include <stdlib.h>
+@@ -9191,15 +9194,15 @@
+ }
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:9194: \"$ac_link\"") >&5
++if { (eval echo "$as_me:9197: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:9197: \$? = $ac_status" >&5
++  echo "$as_me:9200: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:9199: \"$ac_try\"") >&5
++  { (eval echo "$as_me:9202: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:9202: \$? = $ac_status" >&5
++  echo "$as_me:9205: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   with_big_core=yes
+ else
+@@ -9211,7 +9214,7 @@
+ rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+ fi;
+-echo "$as_me:9214: result: $with_big_core" >&5
++echo "$as_me:9217: result: $with_big_core" >&5
+ echo "${ECHO_T}$with_big_core" >&6
+ test "x$with_big_core" = "xyes" &&
+ cat >>confdefs.h <<\EOF
+@@ -9221,7 +9224,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:9224: checking if big-strings option selected" >&5
++echo "$as_me:9227: 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.
+@@ -9245,14 +9248,14 @@
+ 	esac
+ 
+ fi;
+-echo "$as_me:9248: result: $with_big_strings" >&5
++echo "$as_me:9251: 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:9255: checking if you want termcap-fallback support" >&5
++echo "$as_me:9258: 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.
+@@ -9262,14 +9265,14 @@
+ else
+   with_termcap=no
+ fi;
+-echo "$as_me:9265: result: $with_termcap" >&5
++echo "$as_me:9268: 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:9272: error: You have disabled the database w/o specifying fallbacks" >&5
++			{ { echo "$as_me:9275: 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
+@@ -9282,13 +9285,13 @@
+ else
+ 
+ 	if test "$with_ticlib" != no ; then
+-		{ { echo "$as_me:9285: error: Options --with-ticlib and --enable-termcap cannot be combined" >&5
++		{ { echo "$as_me:9288: 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:9291: checking for list of termcap files" >&5
++	echo "$as_me:9294: 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.
+@@ -9328,7 +9331,7 @@
+ 	cf_src_path=`echo "$cf_src_path" | sed -e s%NONE%$cf_path_syntax%`
+ 	;;
+ (*)
+-	{ { echo "$as_me:9331: error: expected a pathname, not \"$cf_src_path\"" >&5
++	{ { echo "$as_me:9334: 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; }; }
+ 	;;
+@@ -9351,7 +9354,7 @@
+ 	;;
+ esac
+ 
+-	echo "$as_me:9354: result: $TERMPATH" >&5
++	echo "$as_me:9357: result: $TERMPATH" >&5
+ echo "${ECHO_T}$TERMPATH" >&6
+ 	test -n "$TERMPATH" &&
+ cat >>confdefs.h <<EOF
+@@ -9359,7 +9362,7 @@
+ EOF
+ 
+ 	###	use option --enable-getcap to use a hacked getcap for reading termcaps
+-	echo "$as_me:9362: checking if fast termcap-loader is needed" >&5
++	echo "$as_me:9365: 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.
+@@ -9369,14 +9372,14 @@
+ else
+   with_getcap=no
+ fi;
+-	echo "$as_me:9372: result: $with_getcap" >&5
++	echo "$as_me:9375: 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:9379: checking if translated termcaps will be cached in ~/.terminfo" >&5
++	echo "$as_me:9382: 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.
+@@ -9386,7 +9389,7 @@
+ else
+   with_getcap_cache=no
+ fi;
+-	echo "$as_me:9389: result: $with_getcap_cache" >&5
++	echo "$as_me:9392: result: $with_getcap_cache" >&5
+ echo "${ECHO_T}$with_getcap_cache" >&6
+ 	test "x$with_getcap_cache" = "xyes" &&
+ cat >>confdefs.h <<\EOF
+@@ -9396,7 +9399,7 @@
+ fi
+ 
+ ###   Use option --disable-home-terminfo to completely remove ~/.terminfo
+-echo "$as_me:9399: checking if ~/.terminfo is wanted" >&5
++echo "$as_me:9402: 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.
+@@ -9406,14 +9409,14 @@
+ else
+   with_home_terminfo=yes
+ fi;
+-echo "$as_me:9409: result: $with_home_terminfo" >&5
++echo "$as_me:9412: 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:9416: checking if you want to permit root to use ncurses environment variables" >&5
++echo "$as_me:9419: 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.
+@@ -9423,14 +9426,14 @@
+ else
+   with_root_environ=yes
+ fi;
+-echo "$as_me:9426: result: $with_root_environ" >&5
++echo "$as_me:9429: 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:9433: checking if you want to permit setuid programs to access all files" >&5
++echo "$as_me:9436: 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.
+@@ -9440,7 +9443,7 @@
+ else
+   with_root_access=yes
+ fi;
+-echo "$as_me:9443: result: $with_root_access" >&5
++echo "$as_me:9446: result: $with_root_access" >&5
+ echo "${ECHO_T}$with_root_access" >&6
+ test "x$with_root_access" = xyes &&
+ cat >>confdefs.h <<\EOF
+@@ -9455,23 +9458,23 @@
+ 
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-echo "$as_me:9458: checking for $ac_header" >&5
++echo "$as_me:9461: 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 9464 "configure"
++#line 9467 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:9468: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:9471: \"$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:9474: \$? = $ac_status" >&5
++  echo "$as_me:9477: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -9490,7 +9493,7 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:9493: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
++echo "$as_me:9496: 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
+@@ -9505,13 +9508,13 @@
+ 	unlink
+ do
+ as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+-echo "$as_me:9508: checking for $ac_func" >&5
++echo "$as_me:9511: 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 9514 "configure"
++#line 9517 "configure"
+ #include "confdefs.h"
+ #define $ac_func autoconf_temporary
+ #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -9542,16 +9545,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:9545: \"$ac_link\"") >&5
++if { (eval echo "$as_me:9548: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:9548: \$? = $ac_status" >&5
++  echo "$as_me:9551: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:9551: \"$ac_try\"") >&5
++  { (eval echo "$as_me:9554: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:9554: \$? = $ac_status" >&5
++  echo "$as_me:9557: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   eval "$as_ac_var=yes"
+ else
+@@ -9561,7 +9564,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:9564: result: `eval echo '${'"$as_ac_var"'}'`" >&5
++echo "$as_me:9567: 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
+@@ -9578,13 +9581,13 @@
+ 		symlink
+ do
+ as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+-echo "$as_me:9581: checking for $ac_func" >&5
++echo "$as_me:9584: 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 9587 "configure"
++#line 9590 "configure"
+ #include "confdefs.h"
+ #define $ac_func autoconf_temporary
+ #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -9615,16 +9618,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:9618: \"$ac_link\"") >&5
++if { (eval echo "$as_me:9621: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:9621: \$? = $ac_status" >&5
++  echo "$as_me:9624: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:9624: \"$ac_try\"") >&5
++  { (eval echo "$as_me:9627: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:9627: \$? = $ac_status" >&5
++  echo "$as_me:9630: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   eval "$as_ac_var=yes"
+ else
+@@ -9634,7 +9637,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:9637: result: `eval echo '${'"$as_ac_var"'}'`" >&5
++echo "$as_me:9640: 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
+@@ -9645,7 +9648,7 @@
+ done
+ 
+ else
+-	echo "$as_me:9648: checking if link/symlink functions work" >&5
++	echo "$as_me:9651: 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
+@@ -9658,7 +9661,7 @@
+ 			eval 'ac_cv_func_'$cf_func'=error'
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 9661 "configure"
++#line 9664 "configure"
+ #include "confdefs.h"
+ 
+ #include <stdio.h>
+@@ -9696,15 +9699,15 @@
+ 
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:9699: \"$ac_link\"") >&5
++if { (eval echo "$as_me:9702: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:9702: \$? = $ac_status" >&5
++  echo "$as_me:9705: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:9704: \"$ac_try\"") >&5
++  { (eval echo "$as_me:9707: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:9707: \$? = $ac_status" >&5
++  echo "$as_me:9710: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+ 
+ 			cf_cv_link_funcs="$cf_cv_link_funcs $cf_func"
+@@ -9722,7 +9725,7 @@
+ 		test -z "$cf_cv_link_funcs" && cf_cv_link_funcs=no
+ 
+ fi
+-echo "$as_me:9725: result: $cf_cv_link_funcs" >&5
++echo "$as_me:9728: result: $cf_cv_link_funcs" >&5
+ echo "${ECHO_T}$cf_cv_link_funcs" >&6
+ 	test "$ac_cv_func_link"    = yes &&
+ cat >>confdefs.h <<\EOF
+@@ -9742,7 +9745,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:9745: checking if tic should use symbolic links" >&5
++	echo "$as_me:9748: 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.
+@@ -9752,21 +9755,21 @@
+ else
+   with_symlinks=no
+ fi;
+-	echo "$as_me:9755: result: $with_symlinks" >&5
++	echo "$as_me:9758: 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:9762: checking if tic should use hard links" >&5
++	echo "$as_me:9765: 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:9769: result: $with_links" >&5
++	echo "$as_me:9772: result: $with_links" >&5
+ echo "${ECHO_T}$with_links" >&6
+ fi
+ 
+@@ -9782,7 +9785,7 @@
+ 
+ ###   use option --enable-broken-linker to force on use of broken-linker support
+ 
+-echo "$as_me:9785: checking if you want broken-linker support code" >&5
++echo "$as_me:9788: 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.
+@@ -9792,7 +9795,7 @@
+ else
+   with_broken_linker=no
+ fi;
+-echo "$as_me:9795: result: $with_broken_linker" >&5
++echo "$as_me:9798: result: $with_broken_linker" >&5
+ echo "${ECHO_T}$with_broken_linker" >&6
+ 
+ : "${BROKEN_LINKER:=0}"
+@@ -9806,7 +9809,7 @@
+ fi
+ 
+ ###   use option --enable-bsdpad to have tputs process BSD-style prefix padding
+-echo "$as_me:9809: checking if tputs should process BSD-style prefix padding" >&5
++echo "$as_me:9812: 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.
+@@ -9816,7 +9819,7 @@
+ else
+   with_bsdpad=no
+ fi;
+-echo "$as_me:9819: result: $with_bsdpad" >&5
++echo "$as_me:9822: result: $with_bsdpad" >&5
+ echo "${ECHO_T}$with_bsdpad" >&6
+ test "x$with_bsdpad" = xyes &&
+ cat >>confdefs.h <<\EOF
+@@ -9835,14 +9838,14 @@
+ # Check to define _XOPEN_SOURCE "automatically"
+ CPPFLAGS_before_XOPEN="$CPPFLAGS"
+ 
+-echo "$as_me:9838: checking if the POSIX test-macros are already defined" >&5
++echo "$as_me:9841: 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 9845 "configure"
++#line 9848 "configure"
+ #include "confdefs.h"
+ #include <stdio.h>
+ int
+@@ -9861,16 +9864,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:9864: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:9867: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:9867: \$? = $ac_status" >&5
++  echo "$as_me:9870: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:9870: \"$ac_try\"") >&5
++  { (eval echo "$as_me:9873: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:9873: \$? = $ac_status" >&5
++  echo "$as_me:9876: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_posix_visible=no
+ else
+@@ -9881,7 +9884,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:9884: result: $cf_cv_posix_visible" >&5
++echo "$as_me:9887: result: $cf_cv_posix_visible" >&5
+ echo "${ECHO_T}$cf_cv_posix_visible" >&6
+ 
+ if test "$cf_cv_posix_visible" = no; then
+@@ -9926,14 +9929,14 @@
+ 
+ cf_gnu_xopen_source=$cf_XOPEN_SOURCE
+ 
+-echo "$as_me:9929: checking if this is the GNU C library" >&5
++echo "$as_me:9932: 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 9936 "configure"
++#line 9939 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ int
+@@ -9952,16 +9955,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:9955: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:9958: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:9958: \$? = $ac_status" >&5
++  echo "$as_me:9961: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:9961: \"$ac_try\"") >&5
++  { (eval echo "$as_me:9964: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:9964: \$? = $ac_status" >&5
++  echo "$as_me:9967: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_gnu_library=yes
+ else
+@@ -9972,7 +9975,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:9975: result: $cf_cv_gnu_library" >&5
++echo "$as_me:9978: result: $cf_cv_gnu_library" >&5
+ echo "${ECHO_T}$cf_cv_gnu_library" >&6
+ 
+ if test x$cf_cv_gnu_library = xyes; then
+@@ -9980,7 +9983,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:9983: checking if _DEFAULT_SOURCE can be used as a basis" >&5
++	echo "$as_me:9986: 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
+@@ -9992,7 +9995,7 @@
+ 	CPPFLAGS="${CPPFLAGS}-D_DEFAULT_SOURCE"
+ 
+ 		cat >"conftest.$ac_ext" <<_ACEOF
+-#line 9995 "configure"
++#line 9998 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ int
+@@ -10011,16 +10014,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:10014: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:10017: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:10017: \$? = $ac_status" >&5
++  echo "$as_me:10020: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:10020: \"$ac_try\"") >&5
++  { (eval echo "$as_me:10023: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:10023: \$? = $ac_status" >&5
++  echo "$as_me:10026: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_gnu_library_219=yes
+ else
+@@ -10032,12 +10035,12 @@
+ 		CPPFLAGS="$cf_save"
+ 
+ fi
+-echo "$as_me:10035: result: $cf_cv_gnu_library_219" >&5
++echo "$as_me:10038: 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:10040: checking if _XOPEN_SOURCE=$cf_gnu_xopen_source works with _DEFAULT_SOURCE" >&5
++		echo "$as_me:10043: 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
+@@ -10142,7 +10145,7 @@
+ fi
+ 
+ 			cat >"conftest.$ac_ext" <<_ACEOF
+-#line 10145 "configure"
++#line 10148 "configure"
+ #include "confdefs.h"
+ 
+ 				#include <limits.h>
+@@ -10162,16 +10165,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:10165: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:10168: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:10168: \$? = $ac_status" >&5
++  echo "$as_me:10171: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:10171: \"$ac_try\"") >&5
++  { (eval echo "$as_me:10174: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:10174: \$? = $ac_status" >&5
++  echo "$as_me:10177: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_gnu_dftsrc_219=yes
+ else
+@@ -10182,7 +10185,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:10185: result: $cf_cv_gnu_dftsrc_219" >&5
++echo "$as_me:10188: 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
+@@ -10191,14 +10194,14 @@
+ 
+ 	if test "x$cf_cv_gnu_dftsrc_219" != xyes; then
+ 
+-		echo "$as_me:10194: checking if we must define _GNU_SOURCE" >&5
++		echo "$as_me:10197: 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 10201 "configure"
++#line 10204 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ int
+@@ -10213,16 +10216,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:10216: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:10219: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:10219: \$? = $ac_status" >&5
++  echo "$as_me:10222: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:10222: \"$ac_try\"") >&5
++  { (eval echo "$as_me:10225: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:10225: \$? = $ac_status" >&5
++  echo "$as_me:10228: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_gnu_source=no
+ else
+@@ -10329,7 +10332,7 @@
+ fi
+ 
+ 			 cat >"conftest.$ac_ext" <<_ACEOF
+-#line 10332 "configure"
++#line 10335 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ int
+@@ -10344,16 +10347,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:10347: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:10350: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:10350: \$? = $ac_status" >&5
++  echo "$as_me:10353: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:10353: \"$ac_try\"") >&5
++  { (eval echo "$as_me:10356: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:10356: \$? = $ac_status" >&5
++  echo "$as_me:10359: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_gnu_source=no
+ else
+@@ -10368,12 +10371,12 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:10371: result: $cf_cv_gnu_source" >&5
++echo "$as_me:10374: 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:10376: checking if we should also define _DEFAULT_SOURCE" >&5
++		echo "$as_me:10379: 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
+@@ -10383,7 +10386,7 @@
+ 	CPPFLAGS="${CPPFLAGS}-D_GNU_SOURCE"
+ 
+ 			cat >"conftest.$ac_ext" <<_ACEOF
+-#line 10386 "configure"
++#line 10389 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ int
+@@ -10398,16 +10401,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:10401: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:10404: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:10404: \$? = $ac_status" >&5
++  echo "$as_me:10407: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:10407: \"$ac_try\"") >&5
++  { (eval echo "$as_me:10410: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:10410: \$? = $ac_status" >&5
++  echo "$as_me:10413: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_default_source=no
+ else
+@@ -10418,7 +10421,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:10421: result: $cf_cv_default_source" >&5
++echo "$as_me:10424: result: $cf_cv_default_source" >&5
+ echo "${ECHO_T}$cf_cv_default_source" >&6
+ 			if test "$cf_cv_default_source" = yes
+ 			then
+@@ -10455,16 +10458,16 @@
+ 	sed	-e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ 	]*\)\?[ 	]/ /g' \
+ 		-e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ 	]*\)\?$//g'`
+ 
+-echo "$as_me:10458: checking if we should define _POSIX_C_SOURCE" >&5
++echo "$as_me:10461: 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}:10464: testing if the symbol is already defined go no further ..." 1>&5
++echo "${as_me:-configure}:10467: testing if the symbol is already defined go no further ..." 1>&5
+ 
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 10467 "configure"
++#line 10470 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ int
+@@ -10479,16 +10482,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:10482: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:10485: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:10485: \$? = $ac_status" >&5
++  echo "$as_me:10488: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:10488: \"$ac_try\"") >&5
++  { (eval echo "$as_me:10491: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:10491: \$? = $ac_status" >&5
++  echo "$as_me:10494: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_posix_c_source=no
+ else
+@@ -10509,7 +10512,7 @@
+ 	 esac
+ 	 if test "$cf_want_posix_source" = yes ; then
+ 		cat >"conftest.$ac_ext" <<_ACEOF
+-#line 10512 "configure"
++#line 10515 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ int
+@@ -10524,16 +10527,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:10527: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:10530: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:10530: \$? = $ac_status" >&5
++  echo "$as_me:10533: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:10533: \"$ac_try\"") >&5
++  { (eval echo "$as_me:10536: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:10536: \$? = $ac_status" >&5
++  echo "$as_me:10539: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   :
+ else
+@@ -10544,7 +10547,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 	 fi
+ 
+-echo "${as_me:-configure}:10547: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
++echo "${as_me:-configure}:10550: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
+ 
+ 	 CFLAGS="$cf_trim_CFLAGS"
+ 	 CPPFLAGS="$cf_trim_CPPFLAGS"
+@@ -10552,10 +10555,10 @@
+ 	test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
+ 	CPPFLAGS="${CPPFLAGS}$cf_cv_posix_c_source"
+ 
+-echo "${as_me:-configure}:10555: testing if the second compile does not leave our definition intact error ..." 1>&5
++echo "${as_me:-configure}:10558: testing if the second compile does not leave our definition intact error ..." 1>&5
+ 
+ 	 cat >"conftest.$ac_ext" <<_ACEOF
+-#line 10558 "configure"
++#line 10561 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ int
+@@ -10570,16 +10573,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:10573: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:10576: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:10576: \$? = $ac_status" >&5
++  echo "$as_me:10579: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:10579: \"$ac_try\"") >&5
++  { (eval echo "$as_me:10582: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:10582: \$? = $ac_status" >&5
++  echo "$as_me:10585: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   :
+ else
+@@ -10595,7 +10598,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:10598: result: $cf_cv_posix_c_source" >&5
++echo "$as_me:10601: 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
+@@ -10712,7 +10715,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:10715: WARNING: this system does not provide usable locale support" >&5
++	{ echo "$as_me:10718: 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
+@@ -10744,14 +10747,14 @@
+ 	;;
+ (*)
+ 
+-echo "$as_me:10747: checking if we should define _XOPEN_SOURCE" >&5
++echo "$as_me:10750: 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 10754 "configure"
++#line 10757 "configure"
+ #include "confdefs.h"
+ 
+ #include <stdlib.h>
+@@ -10770,16 +10773,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:10773: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:10776: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:10776: \$? = $ac_status" >&5
++  echo "$as_me:10779: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:10779: \"$ac_try\"") >&5
++  { (eval echo "$as_me:10782: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:10782: \$? = $ac_status" >&5
++  echo "$as_me:10785: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_xopen_source=no
+ else
+@@ -10791,7 +10794,7 @@
+ 	CPPFLAGS="${CPPFLAGS}-D_XOPEN_SOURCE=$cf_XOPEN_SOURCE"
+ 
+ 	 cat >"conftest.$ac_ext" <<_ACEOF
+-#line 10794 "configure"
++#line 10797 "configure"
+ #include "confdefs.h"
+ 
+ #include <stdlib.h>
+@@ -10810,16 +10813,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:10813: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:10816: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:10816: \$? = $ac_status" >&5
++  echo "$as_me:10819: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:10819: \"$ac_try\"") >&5
++  { (eval echo "$as_me:10822: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:10822: \$? = $ac_status" >&5
++  echo "$as_me:10825: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_xopen_source=no
+ else
+@@ -10834,7 +10837,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:10837: result: $cf_cv_xopen_source" >&5
++echo "$as_me:10840: result: $cf_cv_xopen_source" >&5
+ echo "${ECHO_T}$cf_cv_xopen_source" >&6
+ 
+ if test "$cf_cv_xopen_source" != no ; then
+@@ -10992,16 +10995,16 @@
+ 	sed	-e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ 	]*\)\?[ 	]/ /g' \
+ 		-e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ 	]*\)\?$//g'`
+ 
+-echo "$as_me:10995: checking if we should define _POSIX_C_SOURCE" >&5
++echo "$as_me:10998: 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}:11001: testing if the symbol is already defined go no further ..." 1>&5
++echo "${as_me:-configure}:11004: testing if the symbol is already defined go no further ..." 1>&5
+ 
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 11004 "configure"
++#line 11007 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ int
+@@ -11016,16 +11019,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:11019: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:11022: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:11022: \$? = $ac_status" >&5
++  echo "$as_me:11025: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:11025: \"$ac_try\"") >&5
++  { (eval echo "$as_me:11028: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:11028: \$? = $ac_status" >&5
++  echo "$as_me:11031: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_posix_c_source=no
+ else
+@@ -11046,7 +11049,7 @@
+ 	 esac
+ 	 if test "$cf_want_posix_source" = yes ; then
+ 		cat >"conftest.$ac_ext" <<_ACEOF
+-#line 11049 "configure"
++#line 11052 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ int
+@@ -11061,16 +11064,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:11064: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:11067: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:11067: \$? = $ac_status" >&5
++  echo "$as_me:11070: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:11070: \"$ac_try\"") >&5
++  { (eval echo "$as_me:11073: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:11073: \$? = $ac_status" >&5
++  echo "$as_me:11076: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   :
+ else
+@@ -11081,7 +11084,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 	 fi
+ 
+-echo "${as_me:-configure}:11084: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
++echo "${as_me:-configure}:11087: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
+ 
+ 	 CFLAGS="$cf_trim_CFLAGS"
+ 	 CPPFLAGS="$cf_trim_CPPFLAGS"
+@@ -11089,10 +11092,10 @@
+ 	test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
+ 	CPPFLAGS="${CPPFLAGS}$cf_cv_posix_c_source"
+ 
+-echo "${as_me:-configure}:11092: testing if the second compile does not leave our definition intact error ..." 1>&5
++echo "${as_me:-configure}:11095: testing if the second compile does not leave our definition intact error ..." 1>&5
+ 
+ 	 cat >"conftest.$ac_ext" <<_ACEOF
+-#line 11095 "configure"
++#line 11098 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ int
+@@ -11107,16 +11110,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:11110: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:11113: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:11113: \$? = $ac_status" >&5
++  echo "$as_me:11116: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:11116: \"$ac_try\"") >&5
++  { (eval echo "$as_me:11119: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:11119: \$? = $ac_status" >&5
++  echo "$as_me:11122: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   :
+ else
+@@ -11132,7 +11135,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:11135: result: $cf_cv_posix_c_source" >&5
++echo "$as_me:11138: 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
+@@ -11258,7 +11261,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}:11261: testing removing old option $cf_add_cflags from CFLAGS ..." 1>&5
++echo "${as_me:-configure}:11264: testing removing old option $cf_add_cflags from CFLAGS ..." 1>&5
+ 
+ 	CFLAGS="$cf_old_cflag"
+ done
+@@ -11270,7 +11273,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}:11273: testing removing old option $cf_add_cflags from CPPFLAGS ..." 1>&5
++echo "${as_me:-configure}:11276: testing removing old option $cf_add_cflags from CPPFLAGS ..." 1>&5
+ 
+ 	CPPFLAGS="$cf_old_cflag"
+ done
+@@ -11358,7 +11361,7 @@
+ if test -n "$cf_new_cflags" ; then
+ 	test -n "$verbose" && echo "	add to \$CFLAGS $cf_new_cflags" 1>&6
+ 
+-echo "${as_me:-configure}:11361: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
++echo "${as_me:-configure}:11364: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
+ 
+ 	test -n "$CFLAGS" && CFLAGS="$CFLAGS "
+ 	CFLAGS="${CFLAGS}$cf_new_cflags"
+@@ -11368,7 +11371,7 @@
+ if test -n "$cf_new_cppflags" ; then
+ 	test -n "$verbose" && echo "	add to \$CPPFLAGS $cf_new_cppflags" 1>&6
+ 
+-echo "${as_me:-configure}:11371: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
++echo "${as_me:-configure}:11374: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
+ 
+ 	test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
+ 	CPPFLAGS="${CPPFLAGS}$cf_new_cppflags"
+@@ -11378,7 +11381,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}:11381: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5
++echo "${as_me:-configure}:11384: 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"
+@@ -11390,10 +11393,10 @@
+ fi
+ 
+ if test -n "$cf_XOPEN_SOURCE" && test -z "$cf_cv_xopen_source" ; then
+-	echo "$as_me:11393: checking if _XOPEN_SOURCE really is set" >&5
++	echo "$as_me:11396: 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 11396 "configure"
++#line 11399 "configure"
+ #include "confdefs.h"
+ #include <stdlib.h>
+ int
+@@ -11408,16 +11411,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:11411: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:11414: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:11414: \$? = $ac_status" >&5
++  echo "$as_me:11417: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:11417: \"$ac_try\"") >&5
++  { (eval echo "$as_me:11420: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:11420: \$? = $ac_status" >&5
++  echo "$as_me:11423: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_XOPEN_SOURCE_set=yes
+ else
+@@ -11426,12 +11429,12 @@
+ cf_XOPEN_SOURCE_set=no
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+-	echo "$as_me:11429: result: $cf_XOPEN_SOURCE_set" >&5
++	echo "$as_me:11432: 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 11434 "configure"
++#line 11437 "configure"
+ #include "confdefs.h"
+ #include <stdlib.h>
+ int
+@@ -11446,16 +11449,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:11449: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:11452: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:11452: \$? = $ac_status" >&5
++  echo "$as_me:11455: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:11455: \"$ac_try\"") >&5
++  { (eval echo "$as_me:11458: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:11458: \$? = $ac_status" >&5
++  echo "$as_me:11461: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_XOPEN_SOURCE_set_ok=yes
+ else
+@@ -11466,19 +11469,19 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 		if test "$cf_XOPEN_SOURCE_set_ok" = no
+ 		then
+-			{ echo "$as_me:11469: WARNING: _XOPEN_SOURCE is lower than requested" >&5
++			{ echo "$as_me:11472: WARNING: _XOPEN_SOURCE is lower than requested" >&5
+ echo "$as_me: WARNING: _XOPEN_SOURCE is lower than requested" >&2;}
+ 		fi
+ 	else
+ 
+-echo "$as_me:11474: checking if we should define _XOPEN_SOURCE" >&5
++echo "$as_me:11477: 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 11481 "configure"
++#line 11484 "configure"
+ #include "confdefs.h"
+ 
+ #include <stdlib.h>
+@@ -11497,16 +11500,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:11500: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:11503: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:11503: \$? = $ac_status" >&5
++  echo "$as_me:11506: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:11506: \"$ac_try\"") >&5
++  { (eval echo "$as_me:11509: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:11509: \$? = $ac_status" >&5
++  echo "$as_me:11512: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_xopen_source=no
+ else
+@@ -11518,7 +11521,7 @@
+ 	CPPFLAGS="${CPPFLAGS}-D_XOPEN_SOURCE=$cf_XOPEN_SOURCE"
+ 
+ 	 cat >"conftest.$ac_ext" <<_ACEOF
+-#line 11521 "configure"
++#line 11524 "configure"
+ #include "confdefs.h"
+ 
+ #include <stdlib.h>
+@@ -11537,16 +11540,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:11540: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:11543: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:11543: \$? = $ac_status" >&5
++  echo "$as_me:11546: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:11546: \"$ac_try\"") >&5
++  { (eval echo "$as_me:11549: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:11549: \$? = $ac_status" >&5
++  echo "$as_me:11552: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_xopen_source=no
+ else
+@@ -11561,7 +11564,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:11564: result: $cf_cv_xopen_source" >&5
++echo "$as_me:11567: result: $cf_cv_xopen_source" >&5
+ echo "${ECHO_T}$cf_cv_xopen_source" >&6
+ 
+ if test "$cf_cv_xopen_source" != no ; then
+@@ -11712,14 +11715,14 @@
+ 
+ # Work around breakage on OS X
+ 
+-echo "$as_me:11715: checking if SIGWINCH is defined" >&5
++echo "$as_me:11718: 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 11722 "configure"
++#line 11725 "configure"
+ #include "confdefs.h"
+ 
+ #include <sys/types.h>
+@@ -11734,23 +11737,23 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:11737: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:11740: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:11740: \$? = $ac_status" >&5
++  echo "$as_me:11743: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:11743: \"$ac_try\"") >&5
++  { (eval echo "$as_me:11746: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:11746: \$? = $ac_status" >&5
++  echo "$as_me:11749: \$? = $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 11753 "configure"
++#line 11756 "configure"
+ #include "confdefs.h"
+ 
+ #undef _XOPEN_SOURCE
+@@ -11768,16 +11771,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:11771: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:11774: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:11774: \$? = $ac_status" >&5
++  echo "$as_me:11777: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:11777: \"$ac_try\"") >&5
++  { (eval echo "$as_me:11780: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:11780: \$? = $ac_status" >&5
++  echo "$as_me:11783: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_define_sigwinch=maybe
+ else
+@@ -11791,11 +11794,11 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:11794: result: $cf_cv_define_sigwinch" >&5
++echo "$as_me:11797: 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:11798: checking for actual SIGWINCH definition" >&5
++echo "$as_me:11801: 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
+@@ -11806,7 +11809,7 @@
+ while test "$cf_sigwinch" != 1
+ do
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 11809 "configure"
++#line 11812 "configure"
+ #include "confdefs.h"
+ 
+ #undef _XOPEN_SOURCE
+@@ -11828,16 +11831,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:11831: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:11834: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:11834: \$? = $ac_status" >&5
++  echo "$as_me:11837: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:11837: \"$ac_try\"") >&5
++  { (eval echo "$as_me:11840: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:11840: \$? = $ac_status" >&5
++  echo "$as_me:11843: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_fixup_sigwinch=$cf_sigwinch
+ 	 break
+@@ -11851,7 +11854,7 @@
+ done
+ 
+ fi
+-echo "$as_me:11854: result: $cf_cv_fixup_sigwinch" >&5
++echo "$as_me:11857: result: $cf_cv_fixup_sigwinch" >&5
+ echo "${ECHO_T}$cf_cv_fixup_sigwinch" >&6
+ 
+ 	if test "$cf_cv_fixup_sigwinch" != unknown ; then
+@@ -11861,13 +11864,13 @@
+ 
+ # Checks for CODESET support.
+ 
+-echo "$as_me:11864: checking for nl_langinfo and CODESET" >&5
++echo "$as_me:11867: 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 11870 "configure"
++#line 11873 "configure"
+ #include "confdefs.h"
+ #include <langinfo.h>
+ int
+@@ -11879,16 +11882,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:11882: \"$ac_link\"") >&5
++if { (eval echo "$as_me:11885: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:11885: \$? = $ac_status" >&5
++  echo "$as_me:11888: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:11888: \"$ac_try\"") >&5
++  { (eval echo "$as_me:11891: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:11891: \$? = $ac_status" >&5
++  echo "$as_me:11894: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   am_cv_langinfo_codeset=yes
+ else
+@@ -11899,7 +11902,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:11902: result: $am_cv_langinfo_codeset" >&5
++echo "$as_me:11905: result: $am_cv_langinfo_codeset" >&5
+ echo "${ECHO_T}$am_cv_langinfo_codeset" >&6
+ 	if test "$am_cv_langinfo_codeset" = yes; then
+ 
+@@ -11913,7 +11916,7 @@
+ NCURSES_OK_WCHAR_T=
+ NCURSES_OK_WINT_T=
+ 
+-echo "$as_me:11916: checking if you want wide-character code" >&5
++echo "$as_me:11919: 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.
+@@ -11923,7 +11926,7 @@
+ else
+   with_widec=no
+ fi;
+-echo "$as_me:11926: result: $with_widec" >&5
++echo "$as_me:11929: result: $with_widec" >&5
+ echo "${ECHO_T}$with_widec" >&6
+ 
+ NCURSES_WCWIDTH_GRAPHICS=1
+@@ -11947,23 +11950,23 @@
+ 
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-echo "$as_me:11950: checking for $ac_header" >&5
++echo "$as_me:11953: 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 11956 "configure"
++#line 11959 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:11960: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:11963: \"$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:11966: \$? = $ac_status" >&5
++  echo "$as_me:11969: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -11982,7 +11985,7 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:11985: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
++echo "$as_me:11988: 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
+@@ -11992,14 +11995,14 @@
+ fi
+ done
+ 
+-echo "$as_me:11995: checking if wchar.h can be used as is" >&5
++echo "$as_me:11998: 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 12002 "configure"
++#line 12005 "configure"
+ #include "confdefs.h"
+ 
+ #include <stdlib.h>
+@@ -12021,16 +12024,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:12024: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:12027: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:12027: \$? = $ac_status" >&5
++  echo "$as_me:12030: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:12030: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12033: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:12033: \$? = $ac_status" >&5
++  echo "$as_me:12036: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_wchar_h_okay=yes
+ else
+@@ -12040,16 +12043,16 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:12043: result: $cf_cv_wchar_h_okay" >&5
++echo "$as_me:12046: 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:12049: checking if we must define _XOPEN_SOURCE_EXTENDED" >&5
++echo "$as_me:12052: 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 12052 "configure"
++#line 12055 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ 
+@@ -12065,16 +12068,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:12068: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:12071: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:12071: \$? = $ac_status" >&5
++  echo "$as_me:12074: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:12074: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12077: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:12077: \$? = $ac_status" >&5
++  echo "$as_me:12080: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_result=no
+ else
+@@ -12083,16 +12086,16 @@
+ cf_result=yes
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+-echo "$as_me:12086: result: $cf_result" >&5
++echo "$as_me:12089: 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:12092: checking checking for compatible value versus " >&5
++	echo "$as_me:12095: 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 12095 "configure"
++#line 12098 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ 
+@@ -12108,16 +12111,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:12111: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:12114: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:12114: \$? = $ac_status" >&5
++  echo "$as_me:12117: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:12117: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12120: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:12120: \$? = $ac_status" >&5
++  echo "$as_me:12123: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_result=yes
+ else
+@@ -12126,7 +12129,7 @@
+ cf_result=no
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+-	echo "$as_me:12129: result: $cf_result" >&5
++	echo "$as_me:12132: result: $cf_result" >&5
+ echo "${ECHO_T}$cf_result" >&6
+ 	if test "$cf_result" = no ; then
+ 		# perhaps we can override it - try...
+@@ -12136,7 +12139,7 @@
+ 
+ fi
+ 
+-echo "$as_me:12139: checking if wcwidth agrees graphics are single-width" >&5
++echo "$as_me:12142: 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
+@@ -12207,7 +12210,7 @@
+   cf_cv_wcwidth_graphics=unknown
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 12210 "configure"
++#line 12213 "configure"
+ #include "confdefs.h"
+ 
+ #include <locale.h>
+@@ -12251,15 +12254,15 @@
+ 
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:12254: \"$ac_link\"") >&5
++if { (eval echo "$as_me:12257: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:12257: \$? = $ac_status" >&5
++  echo "$as_me:12260: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:12259: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12262: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:12262: \$? = $ac_status" >&5
++  echo "$as_me:12265: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_wcwidth_graphics=yes
+ else
+@@ -12272,7 +12275,7 @@
+ fi
+ 
+ fi
+-echo "$as_me:12275: result: $cf_cv_wcwidth_graphics" >&5
++echo "$as_me:12278: result: $cf_cv_wcwidth_graphics" >&5
+ echo "${ECHO_T}$cf_cv_wcwidth_graphics" >&6
+ 
+ 	test "$cf_cv_wcwidth_graphics" = no && NCURSES_WCWIDTH_GRAPHICS=0
+@@ -12283,13 +12286,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:12286: checking for $ac_func" >&5
++echo "$as_me:12289: 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 12292 "configure"
++#line 12295 "configure"
+ #include "confdefs.h"
+ #define $ac_func autoconf_temporary
+ #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -12320,16 +12323,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:12323: \"$ac_link\"") >&5
++if { (eval echo "$as_me:12326: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:12326: \$? = $ac_status" >&5
++  echo "$as_me:12329: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:12329: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12332: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:12332: \$? = $ac_status" >&5
++  echo "$as_me:12335: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   eval "$as_ac_var=yes"
+ else
+@@ -12339,7 +12342,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:12342: result: `eval echo '${'"$as_ac_var"'}'`" >&5
++echo "$as_me:12345: 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
+@@ -12354,23 +12357,23 @@
+ for ac_header in wchar.h
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-echo "$as_me:12357: checking for $ac_header" >&5
++echo "$as_me:12360: 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 12363 "configure"
++#line 12366 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:12367: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:12370: \"$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:12373: \$? = $ac_status" >&5
++  echo "$as_me:12376: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -12389,7 +12392,7 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:12392: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
++echo "$as_me:12395: 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
+@@ -12399,7 +12402,7 @@
+ fi
+ done
+ 
+-echo "$as_me:12402: checking for multibyte character support" >&5
++echo "$as_me:12405: 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
+@@ -12407,7 +12410,7 @@
+ 
+ 	cf_save_LIBS="$LIBS"
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 12410 "configure"
++#line 12413 "configure"
+ #include "confdefs.h"
+ 
+ #include <stdlib.h>
+@@ -12425,16 +12428,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:12428: \"$ac_link\"") >&5
++if { (eval echo "$as_me:12431: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:12431: \$? = $ac_status" >&5
++  echo "$as_me:12434: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:12434: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12437: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:12437: \$? = $ac_status" >&5
++  echo "$as_me:12440: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_utf8_lib=yes
+ else
+@@ -12446,12 +12449,12 @@
+ cf_cv_header_path_utf8=
+ cf_cv_library_path_utf8=
+ 
+-echo "${as_me:-configure}:12449: testing Starting FIND_LINKAGE(utf8,) ..." 1>&5
++echo "${as_me:-configure}:12452: testing Starting FIND_LINKAGE(utf8,) ..." 1>&5
+ 
+ cf_save_LIBS="$LIBS"
+ 
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 12454 "configure"
++#line 12457 "configure"
+ #include "confdefs.h"
+ 
+ #include <libutf8.h>
+@@ -12464,16 +12467,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:12467: \"$ac_link\"") >&5
++if { (eval echo "$as_me:12470: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:12470: \$? = $ac_status" >&5
++  echo "$as_me:12473: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:12473: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12476: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:12476: \$? = $ac_status" >&5
++  echo "$as_me:12479: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+ 
+ 	cf_cv_find_linkage_utf8=yes
+@@ -12487,7 +12490,7 @@
+ LIBS="-lutf8  $cf_save_LIBS"
+ 
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 12490 "configure"
++#line 12493 "configure"
+ #include "confdefs.h"
+ 
+ #include <libutf8.h>
+@@ -12500,16 +12503,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:12503: \"$ac_link\"") >&5
++if { (eval echo "$as_me:12506: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:12506: \$? = $ac_status" >&5
++  echo "$as_me:12509: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:12509: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12512: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:12512: \$? = $ac_status" >&5
++  echo "$as_me:12515: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+ 
+ 	cf_cv_find_linkage_utf8=yes
+@@ -12526,9 +12529,9 @@
+ 
+ 	test -n "$verbose" && echo "	find linkage for utf8 library" 1>&6
+ 
+-echo "${as_me:-configure}:12529: testing find linkage for utf8 library ..." 1>&5
++echo "${as_me:-configure}:12532: testing find linkage for utf8 library ..." 1>&5
+ 
+-echo "${as_me:-configure}:12531: testing Searching for headers in FIND_LINKAGE(utf8,) ..." 1>&5
++echo "${as_me:-configure}:12534: testing Searching for headers in FIND_LINKAGE(utf8,) ..." 1>&5
+ 
+ 	cf_save_CPPFLAGS="$CPPFLAGS"
+ 	cf_test_CPPFLAGS="$CPPFLAGS"
+@@ -12619,7 +12622,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}:12622: testing ... testing $cf_cv_header_path_utf8 ..." 1>&5
++echo "${as_me:-configure}:12625: testing ... testing $cf_cv_header_path_utf8 ..." 1>&5
+ 
+ 			CPPFLAGS="$cf_save_CPPFLAGS"
+ 
+@@ -12627,7 +12630,7 @@
+ 	CPPFLAGS="${CPPFLAGS}-I$cf_cv_header_path_utf8"
+ 
+ 			cat >"conftest.$ac_ext" <<_ACEOF
+-#line 12630 "configure"
++#line 12633 "configure"
+ #include "confdefs.h"
+ 
+ #include <libutf8.h>
+@@ -12640,21 +12643,21 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:12643: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:12646: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:12646: \$? = $ac_status" >&5
++  echo "$as_me:12649: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:12649: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12652: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:12652: \$? = $ac_status" >&5
++  echo "$as_me:12655: \$? = $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}:12657: testing ... found utf8 headers in $cf_cv_header_path_utf8 ..." 1>&5
++echo "${as_me:-configure}:12660: testing ... found utf8 headers in $cf_cv_header_path_utf8 ..." 1>&5
+ 
+ 				cf_cv_find_linkage_utf8=maybe
+ 				cf_test_CPPFLAGS="$CPPFLAGS"
+@@ -12672,7 +12675,7 @@
+ 
+ 	if test "$cf_cv_find_linkage_utf8" = maybe ; then
+ 
+-echo "${as_me:-configure}:12675: testing Searching for utf8 library in FIND_LINKAGE(utf8,) ..." 1>&5
++echo "${as_me:-configure}:12678: testing Searching for utf8 library in FIND_LINKAGE(utf8,) ..." 1>&5
+ 
+ 		cf_save_LIBS="$LIBS"
+ 		cf_save_LDFLAGS="$LDFLAGS"
+@@ -12747,13 +12750,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}:12750: testing ... testing $cf_cv_library_path_utf8 ..." 1>&5
++echo "${as_me:-configure}:12753: 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 12756 "configure"
++#line 12759 "configure"
+ #include "confdefs.h"
+ 
+ #include <libutf8.h>
+@@ -12766,21 +12769,21 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:12769: \"$ac_link\"") >&5
++if { (eval echo "$as_me:12772: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:12772: \$? = $ac_status" >&5
++  echo "$as_me:12775: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:12775: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12778: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:12778: \$? = $ac_status" >&5
++  echo "$as_me:12781: \$? = $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}:12783: testing ... found utf8 library in $cf_cv_library_path_utf8 ..." 1>&5
++echo "${as_me:-configure}:12786: testing ... found utf8 library in $cf_cv_library_path_utf8 ..." 1>&5
+ 
+ 					cf_cv_find_linkage_utf8=yes
+ 					cf_cv_library_file_utf8="-lutf8"
+@@ -12822,7 +12825,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:12825: result: $cf_cv_utf8_lib" >&5
++echo "$as_me:12828: 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
+@@ -12860,7 +12863,7 @@
+ 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
+ 
+ 			  cat >"conftest.$ac_ext" <<_ACEOF
+-#line 12863 "configure"
++#line 12866 "configure"
+ #include "confdefs.h"
+ #include <stdio.h>
+ int
+@@ -12872,16 +12875,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:12875: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:12878: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:12878: \$? = $ac_status" >&5
++  echo "$as_me:12881: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:12881: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12884: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:12884: \$? = $ac_status" >&5
++  echo "$as_me:12887: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   :
+ else
+@@ -12898,7 +12901,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}:12901: testing adding $cf_add_incdir to include-path ..." 1>&5
++echo "${as_me:-configure}:12904: testing adding $cf_add_incdir to include-path ..." 1>&5
+ 
+ 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
+ 
+@@ -12934,7 +12937,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}:12937: testing adding $cf_add_libdir to library-path ..." 1>&5
++echo "${as_me:-configure}:12940: testing adding $cf_add_libdir to library-path ..." 1>&5
+ 
+ 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
+ 			fi
+@@ -12966,14 +12969,14 @@
+ 	fi
+ 
+ # This is needed on Tru64 5.0 to declare mbstate_t
+-echo "$as_me:12969: checking if we must include wchar.h to declare mbstate_t" >&5
++echo "$as_me:12972: 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 12976 "configure"
++#line 12979 "configure"
+ #include "confdefs.h"
+ 
+ #include <stdlib.h>
+@@ -12991,23 +12994,23 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:12994: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:12997: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:12997: \$? = $ac_status" >&5
++  echo "$as_me:13000: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:13000: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13003: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:13003: \$? = $ac_status" >&5
++  echo "$as_me:13006: \$? = $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 13010 "configure"
++#line 13013 "configure"
+ #include "confdefs.h"
+ 
+ #include <stdlib.h>
+@@ -13026,16 +13029,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:13029: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:13032: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:13032: \$? = $ac_status" >&5
++  echo "$as_me:13035: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:13035: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13038: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:13038: \$? = $ac_status" >&5
++  echo "$as_me:13041: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_mbstate_t=yes
+ else
+@@ -13047,7 +13050,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:13050: result: $cf_cv_mbstate_t" >&5
++echo "$as_me:13053: result: $cf_cv_mbstate_t" >&5
+ echo "${ECHO_T}$cf_cv_mbstate_t" >&6
+ 
+ if test "$cf_cv_mbstate_t" = yes ; then
+@@ -13065,14 +13068,14 @@
+ fi
+ 
+ # This is needed on Tru64 5.0 to declare wchar_t
+-echo "$as_me:13068: checking if we must include wchar.h to declare wchar_t" >&5
++echo "$as_me:13071: 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 13075 "configure"
++#line 13078 "configure"
+ #include "confdefs.h"
+ 
+ #include <stdlib.h>
+@@ -13090,23 +13093,23 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:13093: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:13096: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:13096: \$? = $ac_status" >&5
++  echo "$as_me:13099: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:13099: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13102: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:13102: \$? = $ac_status" >&5
++  echo "$as_me:13105: \$? = $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 13109 "configure"
++#line 13112 "configure"
+ #include "confdefs.h"
+ 
+ #include <stdlib.h>
+@@ -13125,16 +13128,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:13128: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:13131: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:13131: \$? = $ac_status" >&5
++  echo "$as_me:13134: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:13134: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13137: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:13137: \$? = $ac_status" >&5
++  echo "$as_me:13140: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_wchar_t=yes
+ else
+@@ -13146,7 +13149,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:13149: result: $cf_cv_wchar_t" >&5
++echo "$as_me:13152: result: $cf_cv_wchar_t" >&5
+ echo "${ECHO_T}$cf_cv_wchar_t" >&6
+ 
+ if test "$cf_cv_wchar_t" = yes ; then
+@@ -13169,14 +13172,14 @@
+ fi
+ 
+ # This is needed on Tru64 5.0 to declare wint_t
+-echo "$as_me:13172: checking if we must include wchar.h to declare wint_t" >&5
++echo "$as_me:13175: 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 13179 "configure"
++#line 13182 "configure"
+ #include "confdefs.h"
+ 
+ #include <stdlib.h>
+@@ -13194,23 +13197,23 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:13197: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:13200: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:13200: \$? = $ac_status" >&5
++  echo "$as_me:13203: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:13203: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13206: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:13206: \$? = $ac_status" >&5
++  echo "$as_me:13209: \$? = $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 13213 "configure"
++#line 13216 "configure"
+ #include "confdefs.h"
+ 
+ #include <stdlib.h>
+@@ -13229,16 +13232,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:13232: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:13235: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:13235: \$? = $ac_status" >&5
++  echo "$as_me:13238: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:13238: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13241: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:13241: \$? = $ac_status" >&5
++  echo "$as_me:13244: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_wint_t=yes
+ else
+@@ -13250,7 +13253,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:13253: result: $cf_cv_wint_t" >&5
++echo "$as_me:13256: result: $cf_cv_wint_t" >&5
+ echo "${ECHO_T}$cf_cv_wint_t" >&6
+ 
+ if test "$cf_cv_wint_t" = yes ; then
+@@ -13282,7 +13285,7 @@
+ fi
+ 
+ ###   use option --disable-lp64 to allow long chtype
+-echo "$as_me:13285: checking whether to enable _LP64 definition in curses.h" >&5
++echo "$as_me:13288: 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.
+@@ -13292,7 +13295,7 @@
+ else
+   with_lp64=$cf_dft_with_lp64
+ fi;
+-echo "$as_me:13295: result: $with_lp64" >&5
++echo "$as_me:13298: result: $with_lp64" >&5
+ echo "${ECHO_T}$with_lp64" >&6
+ 
+ if test "x$with_lp64" = xyes ; then
+@@ -13308,7 +13311,7 @@
+ fi;
+ if test "$enable_largefile" != no; then
+ 
+-  echo "$as_me:13311: checking for special C compiler options needed for large files" >&5
++  echo "$as_me:13314: 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
+@@ -13320,7 +13323,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 13323 "configure"
++#line 13326 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+  /* Check that off_t can represent 2**63 - 1 correctly.
+@@ -13340,16 +13343,16 @@
+ }
+ _ACEOF
+      	 rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:13343: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:13346: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:13346: \$? = $ac_status" >&5
++  echo "$as_me:13349: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:13349: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13352: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:13352: \$? = $ac_status" >&5
++  echo "$as_me:13355: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   break
+ else
+@@ -13359,16 +13362,16 @@
+ rm -f "conftest.$ac_objext"
+      	 CC="$CC -n32"
+      	 rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:13362: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:13365: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:13365: \$? = $ac_status" >&5
++  echo "$as_me:13368: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:13368: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13371: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:13371: \$? = $ac_status" >&5
++  echo "$as_me:13374: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_sys_largefile_CC=' -n32'; break
+ else
+@@ -13382,13 +13385,13 @@
+        rm -f "conftest.$ac_ext"
+     fi
+ fi
+-echo "$as_me:13385: result: $ac_cv_sys_largefile_CC" >&5
++echo "$as_me:13388: 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:13391: checking for _FILE_OFFSET_BITS value needed for large files" >&5
++  echo "$as_me:13394: 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
+@@ -13396,7 +13399,7 @@
+   while :; do
+   ac_cv_sys_file_offset_bits=no
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 13399 "configure"
++#line 13402 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+  /* Check that off_t can represent 2**63 - 1 correctly.
+@@ -13416,16 +13419,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:13419: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:13422: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:13422: \$? = $ac_status" >&5
++  echo "$as_me:13425: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:13425: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13428: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:13428: \$? = $ac_status" >&5
++  echo "$as_me:13431: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   break
+ else
+@@ -13434,7 +13437,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 13437 "configure"
++#line 13440 "configure"
+ #include "confdefs.h"
+ #define _FILE_OFFSET_BITS 64
+ #include <sys/types.h>
+@@ -13455,16 +13458,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:13458: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:13461: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:13461: \$? = $ac_status" >&5
++  echo "$as_me:13464: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:13464: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13467: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:13467: \$? = $ac_status" >&5
++  echo "$as_me:13470: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_sys_file_offset_bits=64; break
+ else
+@@ -13475,7 +13478,7 @@
+   break
+ done
+ fi
+-echo "$as_me:13478: result: $ac_cv_sys_file_offset_bits" >&5
++echo "$as_me:13481: 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
+ 
+@@ -13485,7 +13488,7 @@
+ 
+ fi
+ rm -rf conftest*
+-  echo "$as_me:13488: checking for _LARGE_FILES value needed for large files" >&5
++  echo "$as_me:13491: 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
+@@ -13493,7 +13496,7 @@
+   while :; do
+   ac_cv_sys_large_files=no
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 13496 "configure"
++#line 13499 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+  /* Check that off_t can represent 2**63 - 1 correctly.
+@@ -13513,16 +13516,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:13516: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:13519: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:13519: \$? = $ac_status" >&5
++  echo "$as_me:13522: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:13522: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13525: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:13525: \$? = $ac_status" >&5
++  echo "$as_me:13528: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   break
+ else
+@@ -13531,7 +13534,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 13534 "configure"
++#line 13537 "configure"
+ #include "confdefs.h"
+ #define _LARGE_FILES 1
+ #include <sys/types.h>
+@@ -13552,16 +13555,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:13555: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:13558: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:13558: \$? = $ac_status" >&5
++  echo "$as_me:13561: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:13561: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13564: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:13564: \$? = $ac_status" >&5
++  echo "$as_me:13567: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_sys_large_files=1; break
+ else
+@@ -13572,7 +13575,7 @@
+   break
+ done
+ fi
+-echo "$as_me:13575: result: $ac_cv_sys_large_files" >&5
++echo "$as_me:13578: 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
+ 
+@@ -13585,7 +13588,7 @@
+ fi
+ 
+ 	if test "$enable_largefile" != no ; then
+-	echo "$as_me:13588: checking for _LARGEFILE_SOURCE value needed for large files" >&5
++	echo "$as_me:13591: 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
+@@ -13593,7 +13596,7 @@
+   while :; do
+   ac_cv_sys_largefile_source=no
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 13596 "configure"
++#line 13599 "configure"
+ #include "confdefs.h"
+ #include <stdio.h>
+ int
+@@ -13605,16 +13608,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:13608: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:13611: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:13611: \$? = $ac_status" >&5
++  echo "$as_me:13614: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:13614: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13617: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:13617: \$? = $ac_status" >&5
++  echo "$as_me:13620: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   break
+ else
+@@ -13623,7 +13626,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 13626 "configure"
++#line 13629 "configure"
+ #include "confdefs.h"
+ #define _LARGEFILE_SOURCE 1
+ #include <stdio.h>
+@@ -13636,16 +13639,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:13639: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:13642: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:13642: \$? = $ac_status" >&5
++  echo "$as_me:13645: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:13645: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13648: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:13648: \$? = $ac_status" >&5
++  echo "$as_me:13651: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_sys_largefile_source=1; break
+ else
+@@ -13656,7 +13659,7 @@
+   break
+ done
+ fi
+-echo "$as_me:13659: result: $ac_cv_sys_largefile_source" >&5
++echo "$as_me:13662: 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
+ 
+@@ -13670,13 +13673,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:13673: checking for fseeko" >&5
++echo "$as_me:13676: 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 13679 "configure"
++#line 13682 "configure"
+ #include "confdefs.h"
+ #include <stdio.h>
+ int
+@@ -13688,16 +13691,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:13691: \"$ac_link\"") >&5
++if { (eval echo "$as_me:13694: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:13694: \$? = $ac_status" >&5
++  echo "$as_me:13697: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:13697: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13700: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:13700: \$? = $ac_status" >&5
++  echo "$as_me:13703: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_func_fseeko=yes
+ else
+@@ -13707,7 +13710,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:13710: result: $ac_cv_func_fseeko" >&5
++echo "$as_me:13713: result: $ac_cv_func_fseeko" >&5
+ echo "${ECHO_T}$ac_cv_func_fseeko" >&6
+ if test $ac_cv_func_fseeko = yes; then
+ 
+@@ -13746,14 +13749,14 @@
+ 
+ 	fi
+ 
+-	echo "$as_me:13749: checking whether to use struct dirent64" >&5
++	echo "$as_me:13752: 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 13756 "configure"
++#line 13759 "configure"
+ #include "confdefs.h"
+ 
+ #pragma GCC diagnostic error "-Wincompatible-pointer-types"
+@@ -13776,16 +13779,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:13779: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:13782: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:13782: \$? = $ac_status" >&5
++  echo "$as_me:13785: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:13785: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13788: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:13788: \$? = $ac_status" >&5
++  echo "$as_me:13791: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_struct_dirent64=yes
+ else
+@@ -13796,7 +13799,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:13799: result: $cf_cv_struct_dirent64" >&5
++echo "$as_me:13802: result: $cf_cv_struct_dirent64" >&5
+ echo "${ECHO_T}$cf_cv_struct_dirent64" >&6
+ 	test "$cf_cv_struct_dirent64" = yes &&
+ cat >>confdefs.h <<\EOF
+@@ -13806,7 +13809,7 @@
+ 	fi
+ 
+ ###   use option --disable-tparm-varargs to make tparm() conform to X/Open
+-echo "$as_me:13809: checking if you want tparm not to use X/Open fixed-parameter list" >&5
++echo "$as_me:13812: 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.
+@@ -13816,14 +13819,14 @@
+ else
+   with_tparm_varargs=yes
+ fi;
+-echo "$as_me:13819: result: $with_tparm_varargs" >&5
++echo "$as_me:13822: 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:13826: checking if you want tic library to use explicit dependency on ncurses$LIB_SUFFIX library" >&5
++echo "$as_me:13829: 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.
+@@ -13833,14 +13836,14 @@
+ else
+   with_tic_depends=yes
+ fi;
+-echo "$as_me:13836: result: $with_tic_depends" >&5
++echo "$as_me:13839: 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:13843: checking if you want to enable wattr* macros" >&5
++echo "$as_me:13846: 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.
+@@ -13852,15 +13855,15 @@
+ fi;
+ if [ "x$with_wattr_macros" != xyes ]; then
+ 	NCURSES_WATTR_MACROS=0
+-	echo "$as_me:13855: result: no" >&5
++	echo "$as_me:13858: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ else
+ 	NCURSES_WATTR_MACROS=1
+-	echo "$as_me:13859: result: yes" >&5
++	echo "$as_me:13862: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ fi
+ 
+-echo "$as_me:13863: checking for X11 rgb file" >&5
++echo "$as_me:13866: 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.
+@@ -13924,7 +13927,7 @@
+ 	cf_path=`echo "$cf_path" | sed -e s%NONE%$cf_path_syntax%`
+ 	;;
+ (*)
+-	{ { echo "$as_me:13927: error: expected a pathname, not \"$cf_path\"" >&5
++	{ { echo "$as_me:13930: error: expected a pathname, not \"$cf_path\"" >&5
+ echo "$as_me: error: expected a pathname, not \"$cf_path\"" >&2;}
+    { (exit 1); exit 1; }; }
+ 	;;
+@@ -13932,7 +13935,7 @@
+ 
+ fi
+ 
+-echo "$as_me:13935: result: $RGB_PATH" >&5
++echo "$as_me:13938: result: $RGB_PATH" >&5
+ echo "${ECHO_T}$RGB_PATH" >&6
+ 
+ cat >>confdefs.h <<EOF
+@@ -13946,7 +13949,7 @@
+ fi
+ 
+ ###   use option --with-bool to override bool's type
+-echo "$as_me:13949: checking for type of bool" >&5
++echo "$as_me:13952: 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.
+@@ -13956,10 +13959,10 @@
+ else
+   NCURSES_BOOL=auto
+ fi;
+-echo "$as_me:13959: result: $NCURSES_BOOL" >&5
++echo "$as_me:13962: result: $NCURSES_BOOL" >&5
+ echo "${ECHO_T}$NCURSES_BOOL" >&6
+ 
+-echo "$as_me:13962: checking for alternate terminal capabilities file" >&5
++echo "$as_me:13965: 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.
+@@ -13971,15 +13974,15 @@
+ fi;
+ if test ! -f "${srcdir}/include/${TERMINFO_CAPS}"
+ then
+-	{ echo "$as_me:13974: WARNING: file not found: \"${srcdir}/include/${TERMINFO_CAPS}\"" >&5
++	{ echo "$as_me:13977: 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 "$as_me:13981: result: $TERMINFO_CAPS" >&5
+ echo "${ECHO_T}$TERMINFO_CAPS" >&6
+ 
+ ###   use option --with-chtype to override chtype's type
+-echo "$as_me:13982: checking for type of chtype" >&5
++echo "$as_me:13985: 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.
+@@ -13989,11 +13992,11 @@
+ else
+   NCURSES_CHTYPE=$cf_dft_chtype
+ fi;
+-echo "$as_me:13992: result: $NCURSES_CHTYPE" >&5
++echo "$as_me:13995: result: $NCURSES_CHTYPE" >&5
+ echo "${ECHO_T}$NCURSES_CHTYPE" >&6
+ 
+ ###   use option --with-ospeed to override ospeed's type
+-echo "$as_me:13996: checking for type of ospeed" >&5
++echo "$as_me:13999: 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.
+@@ -14003,11 +14006,11 @@
+ else
+   NCURSES_OSPEED=short
+ fi;
+-echo "$as_me:14006: result: $NCURSES_OSPEED" >&5
++echo "$as_me:14009: result: $NCURSES_OSPEED" >&5
+ echo "${ECHO_T}$NCURSES_OSPEED" >&6
+ 
+ ###   use option --with-mmask-t to override mmask_t's type
+-echo "$as_me:14010: checking for type of mmask_t" >&5
++echo "$as_me:14013: 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.
+@@ -14017,11 +14020,11 @@
+ else
+   NCURSES_MMASK_T=$cf_dft_mmask_t
+ fi;
+-echo "$as_me:14020: result: $NCURSES_MMASK_T" >&5
++echo "$as_me:14023: 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:14024: checking for size CCHARW_MAX" >&5
++echo "$as_me:14027: 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.
+@@ -14031,16 +14034,16 @@
+ else
+   NCURSES_CCHARW_MAX=$cf_dft_ccharw_max
+ fi;
+-echo "$as_me:14034: result: $NCURSES_CCHARW_MAX" >&5
++echo "$as_me:14037: result: $NCURSES_CCHARW_MAX" >&5
+ echo "${ECHO_T}$NCURSES_CCHARW_MAX" >&6
+ 
+-echo "$as_me:14037: checking for ANSI C header files" >&5
++echo "$as_me:14040: 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 14043 "configure"
++#line 14046 "configure"
+ #include "confdefs.h"
+ #include <stdlib.h>
+ #include <stdarg.h>
+@@ -14048,13 +14051,13 @@
+ #include <float.h>
+ 
+ _ACEOF
+-if { (eval echo "$as_me:14051: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:14054: \"$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:14057: \$? = $ac_status" >&5
++  echo "$as_me:14060: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -14076,7 +14079,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 14079 "configure"
++#line 14082 "configure"
+ #include "confdefs.h"
+ #include <string.h>
+ 
+@@ -14094,7 +14097,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 14097 "configure"
++#line 14100 "configure"
+ #include "confdefs.h"
+ #include <stdlib.h>
+ 
+@@ -14115,7 +14118,7 @@
+   :
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 14118 "configure"
++#line 14121 "configure"
+ #include "confdefs.h"
+ #include <ctype.h>
+ #if ((' ' & 0x0FF) == 0x020)
+@@ -14141,15 +14144,15 @@
+ }
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:14144: \"$ac_link\"") >&5
++if { (eval echo "$as_me:14147: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:14147: \$? = $ac_status" >&5
++  echo "$as_me:14150: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:14149: \"$ac_try\"") >&5
++  { (eval echo "$as_me:14152: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:14152: \$? = $ac_status" >&5
++  echo "$as_me:14155: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   :
+ else
+@@ -14162,7 +14165,7 @@
+ fi
+ fi
+ fi
+-echo "$as_me:14165: result: $ac_cv_header_stdc" >&5
++echo "$as_me:14168: result: $ac_cv_header_stdc" >&5
+ echo "${ECHO_T}$ac_cv_header_stdc" >&6
+ if test $ac_cv_header_stdc = yes; then
+ 
+@@ -14178,28 +14181,28 @@
+                   inttypes.h stdint.h unistd.h
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-echo "$as_me:14181: checking for $ac_header" >&5
++echo "$as_me:14184: 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 14187 "configure"
++#line 14190 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ #include <$ac_header>
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:14193: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:14196: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:14196: \$? = $ac_status" >&5
++  echo "$as_me:14199: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:14199: \"$ac_try\"") >&5
++  { (eval echo "$as_me:14202: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:14202: \$? = $ac_status" >&5
++  echo "$as_me:14205: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   eval "$as_ac_Header=yes"
+ else
+@@ -14209,7 +14212,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:14212: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
++echo "$as_me:14215: 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
+@@ -14219,13 +14222,13 @@
+ fi
+ done
+ 
+-echo "$as_me:14222: checking for signed char" >&5
++echo "$as_me:14225: 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 14228 "configure"
++#line 14231 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -14240,16 +14243,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:14243: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:14246: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:14246: \$? = $ac_status" >&5
++  echo "$as_me:14249: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:14249: \"$ac_try\"") >&5
++  { (eval echo "$as_me:14252: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:14252: \$? = $ac_status" >&5
++  echo "$as_me:14255: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_type_signed_char=yes
+ else
+@@ -14259,10 +14262,10 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:14262: result: $ac_cv_type_signed_char" >&5
++echo "$as_me:14265: result: $ac_cv_type_signed_char" >&5
+ echo "${ECHO_T}$ac_cv_type_signed_char" >&6
+ 
+-echo "$as_me:14265: checking size of signed char" >&5
++echo "$as_me:14268: 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
+@@ -14271,7 +14274,7 @@
+   if test "$cross_compiling" = yes; then
+   # Depending upon the size, compute the lo and hi bounds.
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 14274 "configure"
++#line 14277 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -14283,21 +14286,21 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:14286: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:14289: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:14289: \$? = $ac_status" >&5
++  echo "$as_me:14292: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:14292: \"$ac_try\"") >&5
++  { (eval echo "$as_me:14295: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:14295: \$? = $ac_status" >&5
++  echo "$as_me:14298: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_lo=0 ac_mid=0
+   while :; do
+     cat >"conftest.$ac_ext" <<_ACEOF
+-#line 14300 "configure"
++#line 14303 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -14309,16 +14312,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:14312: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:14315: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:14315: \$? = $ac_status" >&5
++  echo "$as_me:14318: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:14318: \"$ac_try\"") >&5
++  { (eval echo "$as_me:14321: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:14321: \$? = $ac_status" >&5
++  echo "$as_me:14324: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_hi=$ac_mid; break
+ else
+@@ -14334,7 +14337,7 @@
+ ac_hi=-1 ac_mid=-1
+   while :; do
+     cat >"conftest.$ac_ext" <<_ACEOF
+-#line 14337 "configure"
++#line 14340 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -14346,16 +14349,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:14349: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:14352: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:14352: \$? = $ac_status" >&5
++  echo "$as_me:14355: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:14355: \"$ac_try\"") >&5
++  { (eval echo "$as_me:14358: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:14358: \$? = $ac_status" >&5
++  echo "$as_me:14361: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_lo=$ac_mid; break
+ else
+@@ -14371,7 +14374,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 14374 "configure"
++#line 14377 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -14383,16 +14386,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:14386: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:14389: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:14389: \$? = $ac_status" >&5
++  echo "$as_me:14392: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:14392: \"$ac_try\"") >&5
++  { (eval echo "$as_me:14395: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:14395: \$? = $ac_status" >&5
++  echo "$as_me:14398: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_hi=$ac_mid
+ else
+@@ -14405,12 +14408,12 @@
+ ac_cv_sizeof_signed_char=$ac_lo
+ else
+   if test "$cross_compiling" = yes; then
+-  { { echo "$as_me:14408: error: cannot run test program while cross compiling" >&5
++  { { echo "$as_me:14411: 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 14413 "configure"
++#line 14416 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -14426,15 +14429,15 @@
+ }
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:14429: \"$ac_link\"") >&5
++if { (eval echo "$as_me:14432: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:14432: \$? = $ac_status" >&5
++  echo "$as_me:14435: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:14434: \"$ac_try\"") >&5
++  { (eval echo "$as_me:14437: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:14437: \$? = $ac_status" >&5
++  echo "$as_me:14440: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_sizeof_signed_char=`cat conftest.val`
+ else
+@@ -14450,7 +14453,7 @@
+   ac_cv_sizeof_signed_char=0
+ fi
+ fi
+-echo "$as_me:14453: result: $ac_cv_sizeof_signed_char" >&5
++echo "$as_me:14456: 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
+@@ -14461,7 +14464,7 @@
+ else
+ 	NCURSES_SBOOL="char"
+ fi
+-echo "$as_me:14464: checking if you want to use signed Boolean array in term.h" >&5
++echo "$as_me:14467: 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.
+@@ -14471,12 +14474,12 @@
+ else
+   with_signed_char=$cf_dft_signed_char
+ fi;
+-echo "$as_me:14474: result: $with_signed_char" >&5
++echo "$as_me:14477: 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:14479: checking for type of tparm args" >&5
++echo "$as_me:14482: 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.
+@@ -14486,11 +14489,11 @@
+ else
+   NCURSES_TPARM_ARG=$cf_dft_tparm_arg
+ fi;
+-echo "$as_me:14489: result: $NCURSES_TPARM_ARG" >&5
++echo "$as_me:14492: result: $NCURSES_TPARM_ARG" >&5
+ echo "${ECHO_T}$NCURSES_TPARM_ARG" >&6
+ 
+ ### Enable compiling-in rcs id's
+-echo "$as_me:14493: checking if RCS identifiers should be compiled-in" >&5
++echo "$as_me:14496: 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.
+@@ -14500,7 +14503,7 @@
+ else
+   with_rcs_ids=no
+ fi;
+-echo "$as_me:14503: result: $with_rcs_ids" >&5
++echo "$as_me:14506: result: $with_rcs_ids" >&5
+ echo "${ECHO_T}$with_rcs_ids" >&6
+ test "x$with_rcs_ids" = xyes &&
+ cat >>confdefs.h <<\EOF
+@@ -14509,7 +14512,7 @@
+ 
+ ###############################################################################
+ 
+-echo "$as_me:14512: checking format of man-pages" >&5
++echo "$as_me:14515: 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.
+@@ -14598,14 +14601,14 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:14601: result: $MANPAGE_FORMAT" >&5
++echo "$as_me:14604: result: $MANPAGE_FORMAT" >&5
+ echo "${ECHO_T}$MANPAGE_FORMAT" >&6
+ if test -n "$cf_unknown" ; then
+-	{ echo "$as_me:14604: WARNING: Unexpected manpage-format $cf_unknown" >&5
++	{ echo "$as_me:14607: WARNING: Unexpected manpage-format $cf_unknown" >&5
+ echo "$as_me: WARNING: Unexpected manpage-format $cf_unknown" >&2;}
+ fi
+ 
+-echo "$as_me:14608: checking for manpage renaming" >&5
++echo "$as_me:14611: 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.
+@@ -14633,7 +14636,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:14636: error: not a filename: $MANPAGE_RENAMES" >&5
++		{ { echo "$as_me:14639: error: not a filename: $MANPAGE_RENAMES" >&5
+ echo "$as_me: error: not a filename: $MANPAGE_RENAMES" >&2;}
+    { (exit 1); exit 1; }; }
+ 	fi
+@@ -14647,10 +14650,10 @@
+ 	fi
+ fi
+ 
+-echo "$as_me:14650: result: $MANPAGE_RENAMES" >&5
++echo "$as_me:14653: result: $MANPAGE_RENAMES" >&5
+ echo "${ECHO_T}$MANPAGE_RENAMES" >&6
+ 
+-echo "$as_me:14653: checking if manpage aliases will be installed" >&5
++echo "$as_me:14656: 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.
+@@ -14661,7 +14664,7 @@
+   MANPAGE_ALIASES=yes
+ fi;
+ 
+-echo "$as_me:14664: result: $MANPAGE_ALIASES" >&5
++echo "$as_me:14667: result: $MANPAGE_ALIASES" >&5
+ echo "${ECHO_T}$MANPAGE_ALIASES" >&6
+ 
+ case "x$LN_S" in
+@@ -14675,7 +14678,7 @@
+ 
+ MANPAGE_SYMLINKS=no
+ if test "$MANPAGE_ALIASES" = yes ; then
+-echo "$as_me:14678: checking if manpage symlinks should be used" >&5
++echo "$as_me:14681: 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.
+@@ -14688,17 +14691,17 @@
+ 
+ if test "$$cf_use_symlinks" = no; then
+ if test "$MANPAGE_SYMLINKS" = yes ; then
+-	{ echo "$as_me:14691: WARNING: cannot make symlinks" >&5
++	{ echo "$as_me:14694: WARNING: cannot make symlinks" >&5
+ echo "$as_me: WARNING: cannot make symlinks" >&2;}
+ 	MANPAGE_SYMLINKS=no
+ fi
+ fi
+ 
+-echo "$as_me:14697: result: $MANPAGE_SYMLINKS" >&5
++echo "$as_me:14700: result: $MANPAGE_SYMLINKS" >&5
+ echo "${ECHO_T}$MANPAGE_SYMLINKS" >&6
+ fi
+ 
+-echo "$as_me:14701: checking for manpage tbl" >&5
++echo "$as_me:14704: 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.
+@@ -14709,7 +14712,7 @@
+   MANPAGE_TBL=no
+ fi;
+ 
+-echo "$as_me:14712: result: $MANPAGE_TBL" >&5
++echo "$as_me:14715: result: $MANPAGE_TBL" >&5
+ echo "${ECHO_T}$MANPAGE_TBL" >&6
+ 
+ if test "$prefix" = "NONE" ; then
+@@ -15042,7 +15045,7 @@
+ ###############################################################################
+ 
+ ### Note that some functions (such as const) are normally disabled anyway.
+-echo "$as_me:15045: checking if you want to build with function extensions" >&5
++echo "$as_me:15048: 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.
+@@ -15052,7 +15055,7 @@
+ else
+   with_ext_funcs=yes
+ fi;
+-echo "$as_me:15055: result: $with_ext_funcs" >&5
++echo "$as_me:15058: result: $with_ext_funcs" >&5
+ echo "${ECHO_T}$with_ext_funcs" >&6
+ if test "x$with_ext_funcs" = xyes ; then
+ 	NCURSES_EXT_FUNCS=1
+@@ -15112,7 +15115,7 @@
+ 	GENERATED_EXT_FUNCS=
+ fi
+ 
+-echo "$as_me:15115: checking if you want to build with SCREEN extensions" >&5
++echo "$as_me:15118: 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.
+@@ -15122,7 +15125,7 @@
+ else
+   with_sp_funcs=$cf_dft_ext_spfuncs
+ fi;
+-echo "$as_me:15125: result: $with_sp_funcs" >&5
++echo "$as_me:15128: result: $with_sp_funcs" >&5
+ echo "${ECHO_T}$with_sp_funcs" >&6
+ if test "x$with_sp_funcs" = xyes ; then
+ 	NCURSES_SP_FUNCS=1
+@@ -15141,7 +15144,7 @@
+ 	GENERATED_SP_FUNCS=
+ fi
+ 
+-echo "$as_me:15144: checking if you want to build with terminal-driver" >&5
++echo "$as_me:15147: 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.
+@@ -15151,7 +15154,7 @@
+ else
+   with_term_driver=no
+ fi;
+-echo "$as_me:15154: result: $with_term_driver" >&5
++echo "$as_me:15157: result: $with_term_driver" >&5
+ echo "${ECHO_T}$with_term_driver" >&6
+ if test "x$with_term_driver" = xyes ; then
+ 
+@@ -15160,19 +15163,19 @@
+ EOF
+ 
+ 	if test "x$with_termlib" != xno ; then
+-		{ { echo "$as_me:15163: error: The term-driver option conflicts with the termlib option" >&5
++		{ { echo "$as_me:15166: 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:15168: error: The term-driver option relies upon sp-funcs" >&5
++		{ { echo "$as_me:15171: 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:15175: checking for extended use of const keyword" >&5
++echo "$as_me:15178: 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.
+@@ -15182,7 +15185,7 @@
+ else
+   with_ext_const=$cf_dft_ext_const
+ fi;
+-echo "$as_me:15185: result: $with_ext_const" >&5
++echo "$as_me:15188: result: $with_ext_const" >&5
+ echo "${ECHO_T}$with_ext_const" >&6
+ NCURSES_CONST='/*nothing*/'
+ if test "x$with_ext_const" = xyes ; then
+@@ -15190,7 +15193,7 @@
+ fi
+ 
+ ###   use option --enable-ext-colors to turn on use of colors beyond 16.
+-echo "$as_me:15193: checking if you want to use extended colors" >&5
++echo "$as_me:15196: 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.
+@@ -15200,12 +15203,12 @@
+ else
+   with_ext_colors=$cf_dft_ext_colors
+ fi;
+-echo "$as_me:15203: result: $with_ext_colors" >&5
++echo "$as_me:15206: 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:15208: WARNING: This option applies only to wide-character library" >&5
++		{ echo "$as_me:15211: 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)
+@@ -15215,7 +15218,7 @@
+ 	(5.*)
+ 		cf_cv_rel_version=6.0
+ 		cf_cv_abi_version=6
+-		{ echo "$as_me:15218: WARNING: overriding ABI version to $cf_cv_abi_version" >&5
++		{ echo "$as_me:15221: WARNING: overriding ABI version to $cf_cv_abi_version" >&5
+ echo "$as_me: WARNING: overriding ABI version to $cf_cv_abi_version" >&2;}
+ 		;;
+ 	esac
+@@ -15243,7 +15246,7 @@
+ fi
+ 
+ ###   use option --enable-ext-mouse to modify coding to support 5-button mice
+-echo "$as_me:15246: checking if you want to use extended mouse encoding" >&5
++echo "$as_me:15249: 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.
+@@ -15253,7 +15256,7 @@
+ else
+   with_ext_mouse=$cf_dft_ext_mouse
+ fi;
+-echo "$as_me:15256: result: $with_ext_mouse" >&5
++echo "$as_me:15259: result: $with_ext_mouse" >&5
+ echo "${ECHO_T}$with_ext_mouse" >&6
+ if test "x$with_ext_mouse" = xyes ; then
+ 
+@@ -15262,7 +15265,7 @@
+ 	(5.*)
+ 		cf_cv_rel_version=6.0
+ 		cf_cv_abi_version=6
+-		{ echo "$as_me:15265: WARNING: overriding ABI version to $cf_cv_abi_version" >&5
++		{ echo "$as_me:15268: WARNING: overriding ABI version to $cf_cv_abi_version" >&5
+ echo "$as_me: WARNING: overriding ABI version to $cf_cv_abi_version" >&2;}
+ 		;;
+ 	esac
+@@ -15283,7 +15286,7 @@
+ esac
+ 
+ ###   use option --enable-ext-putwin to turn on extended screendumps
+-echo "$as_me:15286: checking if you want to use extended putwin/screendump" >&5
++echo "$as_me:15289: 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.
+@@ -15293,7 +15296,7 @@
+ else
+   with_ext_putwin=$cf_dft_ext_putwin
+ fi;
+-echo "$as_me:15296: result: $with_ext_putwin" >&5
++echo "$as_me:15299: result: $with_ext_putwin" >&5
+ echo "${ECHO_T}$with_ext_putwin" >&6
+ if test "x$with_ext_putwin" = xyes ; then
+ 
+@@ -15303,7 +15306,7 @@
+ 
+ fi
+ 
+-echo "$as_me:15306: checking if you want \$NCURSES_NO_PADDING code" >&5
++echo "$as_me:15309: 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.
+@@ -15313,7 +15316,7 @@
+ else
+   with_no_padding=$with_ext_funcs
+ fi;
+-echo "$as_me:15316: result: $with_no_padding" >&5
++echo "$as_me:15319: result: $with_no_padding" >&5
+ echo "${ECHO_T}$with_no_padding" >&6
+ test "x$with_no_padding" = xyes &&
+ cat >>confdefs.h <<\EOF
+@@ -15321,7 +15324,7 @@
+ EOF
+ 
+ ###   use option --enable-sigwinch to turn on use of SIGWINCH logic
+-echo "$as_me:15324: checking if you want SIGWINCH handler" >&5
++echo "$as_me:15327: 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.
+@@ -15331,7 +15334,7 @@
+ else
+   with_sigwinch=$with_ext_funcs
+ fi;
+-echo "$as_me:15334: result: $with_sigwinch" >&5
++echo "$as_me:15337: result: $with_sigwinch" >&5
+ echo "${ECHO_T}$with_sigwinch" >&6
+ test "x$with_sigwinch" = xyes &&
+ cat >>confdefs.h <<\EOF
+@@ -15339,7 +15342,7 @@
+ EOF
+ 
+ ###   use option --enable-tcap-names to allow user to define new capabilities
+-echo "$as_me:15342: checking if you want user-definable terminal capabilities like termcap" >&5
++echo "$as_me:15345: 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.
+@@ -15349,14 +15352,14 @@
+ else
+   with_tcap_names=$with_ext_funcs
+ fi;
+-echo "$as_me:15352: result: $with_tcap_names" >&5
++echo "$as_me:15355: 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:15359: checking if you want to link with the pthread library" >&5
++echo "$as_me:15362: 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.
+@@ -15366,27 +15369,27 @@
+ else
+   with_pthread=no
+ fi;
+-echo "$as_me:15369: result: $with_pthread" >&5
++echo "$as_me:15372: result: $with_pthread" >&5
+ echo "${ECHO_T}$with_pthread" >&6
+ 
+ if test "$with_pthread" != no ; then
+-	echo "$as_me:15373: checking for pthread.h" >&5
++	echo "$as_me:15376: 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 15379 "configure"
++#line 15382 "configure"
+ #include "confdefs.h"
+ #include <pthread.h>
+ _ACEOF
+-if { (eval echo "$as_me:15383: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:15386: \"$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:15389: \$? = $ac_status" >&5
++  echo "$as_me:15392: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -15405,7 +15408,7 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:15408: result: $ac_cv_header_pthread_h" >&5
++echo "$as_me:15411: 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
+ 
+@@ -15415,7 +15418,7 @@
+ 
+ 	for cf_lib_pthread in pthread c_r
+ 	do
+-	    echo "$as_me:15418: checking if we can link with the $cf_lib_pthread library" >&5
++	    echo "$as_me:15421: 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"
+ 
+@@ -15436,7 +15439,7 @@
+ LIBS="$cf_add_libs"
+ 
+ 	    cat >"conftest.$ac_ext" <<_ACEOF
+-#line 15439 "configure"
++#line 15442 "configure"
+ #include "confdefs.h"
+ 
+ #include <pthread.h>
+@@ -15453,16 +15456,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:15456: \"$ac_link\"") >&5
++if { (eval echo "$as_me:15459: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:15459: \$? = $ac_status" >&5
++  echo "$as_me:15462: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:15462: \"$ac_try\"") >&5
++  { (eval echo "$as_me:15465: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:15465: \$? = $ac_status" >&5
++  echo "$as_me:15468: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   with_pthread=yes
+ else
+@@ -15472,7 +15475,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ 	    LIBS="$cf_save_LIBS"
+-	    echo "$as_me:15475: result: $with_pthread" >&5
++	    echo "$as_me:15478: result: $with_pthread" >&5
+ echo "${ECHO_T}$with_pthread" >&6
+ 	    test "$with_pthread" = yes && break
+ 	done
+@@ -15500,7 +15503,7 @@
+ EOF
+ 
+ 	else
+-	    { { echo "$as_me:15503: error: Cannot link with pthread library" >&5
++	    { { echo "$as_me:15506: error: Cannot link with pthread library" >&5
+ echo "$as_me: error: Cannot link with pthread library" >&2;}
+    { (exit 1); exit 1; }; }
+ 	fi
+@@ -15510,13 +15513,13 @@
+ fi
+ 
+ if test "x$with_pthread" != xno; then
+-	echo "$as_me:15513: checking for pthread_kill" >&5
++	echo "$as_me:15516: 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 15519 "configure"
++#line 15522 "configure"
+ #include "confdefs.h"
+ #define pthread_kill autoconf_temporary
+ #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -15547,16 +15550,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:15550: \"$ac_link\"") >&5
++if { (eval echo "$as_me:15553: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:15553: \$? = $ac_status" >&5
++  echo "$as_me:15556: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:15556: \"$ac_try\"") >&5
++  { (eval echo "$as_me:15559: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:15559: \$? = $ac_status" >&5
++  echo "$as_me:15562: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_func_pthread_kill=yes
+ else
+@@ -15566,11 +15569,11 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:15569: result: $ac_cv_func_pthread_kill" >&5
++echo "$as_me:15572: 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:15573: checking if you want to allow EINTR in wgetch with pthreads" >&5
++		echo "$as_me:15576: 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.
+@@ -15580,7 +15583,7 @@
+ else
+   use_pthreads_eintr=no
+ fi;
+-		echo "$as_me:15583: result: $use_pthreads_eintr" >&5
++		echo "$as_me:15586: result: $use_pthreads_eintr" >&5
+ echo "${ECHO_T}$use_pthreads_eintr" >&6
+ 		if test "x$use_pthreads_eintr" = xyes ; then
+ 
+@@ -15591,7 +15594,7 @@
+ 		fi
+ fi
+ 
+-	echo "$as_me:15594: checking if you want to use weak-symbols for pthreads" >&5
++	echo "$as_me:15597: 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.
+@@ -15601,18 +15604,18 @@
+ else
+   use_weak_symbols=no
+ fi;
+-	echo "$as_me:15604: result: $use_weak_symbols" >&5
++	echo "$as_me:15607: result: $use_weak_symbols" >&5
+ echo "${ECHO_T}$use_weak_symbols" >&6
+ 	if test "x$use_weak_symbols" = xyes ; then
+ 
+-echo "$as_me:15608: checking if $CC supports weak symbols" >&5
++echo "$as_me:15611: 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 15615 "configure"
++#line 15618 "configure"
+ #include "confdefs.h"
+ 
+ #include <stdio.h>
+@@ -15638,16 +15641,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:15641: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:15644: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:15644: \$? = $ac_status" >&5
++  echo "$as_me:15647: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:15647: \"$ac_try\"") >&5
++  { (eval echo "$as_me:15650: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:15650: \$? = $ac_status" >&5
++  echo "$as_me:15653: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_weak_symbols=yes
+ else
+@@ -15658,7 +15661,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:15661: result: $cf_cv_weak_symbols" >&5
++echo "$as_me:15664: result: $cf_cv_weak_symbols" >&5
+ echo "${ECHO_T}$cf_cv_weak_symbols" >&6
+ 
+ 	else
+@@ -15708,7 +15711,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:15711: checking if you want reentrant code" >&5
++echo "$as_me:15714: 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.
+@@ -15718,7 +15721,7 @@
+ else
+   with_reentrant=no
+ fi;
+-echo "$as_me:15721: result: $with_reentrant" >&5
++echo "$as_me:15724: result: $with_reentrant" >&5
+ echo "${ECHO_T}$with_reentrant" >&6
+ if test "x$with_reentrant" = xyes ; then
+ 	cf_cv_enable_reentrant=1
+@@ -15806,7 +15809,7 @@
+ 	(5.*)
+ 		cf_cv_rel_version=6.0
+ 		cf_cv_abi_version=6
+-		{ echo "$as_me:15809: WARNING: overriding ABI version to $cf_cv_abi_version" >&5
++		{ echo "$as_me:15812: WARNING: overriding ABI version to $cf_cv_abi_version" >&5
+ echo "$as_me: WARNING: overriding ABI version to $cf_cv_abi_version" >&2;}
+ 		;;
+ 	esac
+@@ -15818,7 +15821,7 @@
+ 	NCURSES_SIZE_T=$cf_dft_ordinate_type
+ fi
+ 
+-echo "$as_me:15821: checking if you want opaque curses-library structures" >&5
++echo "$as_me:15824: 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.
+@@ -15840,16 +15843,16 @@
+ 	 test "$cf_cv_enable_reentrant" = 1 || enable_opaque_curses=$cf_dft_opaque_curses
+ 
+ fi;
+-echo "$as_me:15843: result: $enable_opaque_curses" >&5
++echo "$as_me:15846: 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:15848: error: reentrant configuration requires opaque library" >&5
++{ { echo "$as_me:15851: error: reentrant configuration requires opaque library" >&5
+ echo "$as_me: error: reentrant configuration requires opaque library" >&2;}
+    { (exit 1); exit 1; }; }
+ 
+-echo "$as_me:15852: checking if you want opaque form-library structures" >&5
++echo "$as_me:15855: 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.
+@@ -15859,10 +15862,10 @@
+ else
+   enable_opaque_form=no
+ fi;
+-echo "$as_me:15862: result: $enable_opaque_form" >&5
++echo "$as_me:15865: result: $enable_opaque_form" >&5
+ echo "${ECHO_T}$enable_opaque_form" >&6
+ 
+-echo "$as_me:15865: checking if you want opaque menu-library structures" >&5
++echo "$as_me:15868: 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.
+@@ -15872,10 +15875,10 @@
+ else
+   enable_opaque_menu=no
+ fi;
+-echo "$as_me:15875: result: $enable_opaque_menu" >&5
++echo "$as_me:15878: result: $enable_opaque_menu" >&5
+ echo "${ECHO_T}$enable_opaque_menu" >&6
+ 
+-echo "$as_me:15878: checking if you want opaque panel-library structures" >&5
++echo "$as_me:15881: 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.
+@@ -15885,7 +15888,7 @@
+ else
+   enable_opaque_panel=no
+ fi;
+-echo "$as_me:15888: result: $enable_opaque_panel" >&5
++echo "$as_me:15891: result: $enable_opaque_panel" >&5
+ echo "${ECHO_T}$enable_opaque_panel" >&6
+ 
+ NCURSES_OPAQUE=0;		test "$enable_opaque_curses" = yes && NCURSES_OPAQUE=1
+@@ -15895,7 +15898,7 @@
+ 
+ ### Allow using a different wrap-prefix
+ if test "$cf_cv_enable_reentrant" != 0 || test "$BROKEN_LINKER" = 1 ; then
+-	echo "$as_me:15898: checking for prefix used to wrap public variables" >&5
++	echo "$as_me:15901: 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.
+@@ -15905,7 +15908,7 @@
+ else
+   NCURSES_WRAP_PREFIX=_nc_
+ fi;
+-	echo "$as_me:15908: result: $NCURSES_WRAP_PREFIX" >&5
++	echo "$as_me:15911: result: $NCURSES_WRAP_PREFIX" >&5
+ echo "${ECHO_T}$NCURSES_WRAP_PREFIX" >&6
+ else
+ 	NCURSES_WRAP_PREFIX=_nc_
+@@ -15918,7 +15921,7 @@
+ ###############################################################################
+ # These options are relatively safe to experiment with.
+ 
+-echo "$as_me:15921: checking if you want all development code" >&5
++echo "$as_me:15924: 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.
+@@ -15928,11 +15931,11 @@
+ else
+   with_develop=no
+ fi;
+-echo "$as_me:15931: result: $with_develop" >&5
++echo "$as_me:15934: 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:15935: checking if you want hard-tabs code" >&5
++echo "$as_me:15938: 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.
+@@ -15942,7 +15945,7 @@
+ else
+   enable_hard_tabs=$with_develop
+ fi;
+-echo "$as_me:15945: result: $enable_hard_tabs" >&5
++echo "$as_me:15948: result: $enable_hard_tabs" >&5
+ echo "${ECHO_T}$enable_hard_tabs" >&6
+ test "x$enable_hard_tabs" = xyes &&
+ cat >>confdefs.h <<\EOF
+@@ -15950,7 +15953,7 @@
+ EOF
+ 
+ ###   use option --enable-xmc-glitch to turn on use of magic-cookie optimize
+-echo "$as_me:15953: checking if you want limited support for xmc" >&5
++echo "$as_me:15956: 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.
+@@ -15960,7 +15963,7 @@
+ else
+   enable_xmc_glitch=$with_develop
+ fi;
+-echo "$as_me:15963: result: $enable_xmc_glitch" >&5
++echo "$as_me:15966: result: $enable_xmc_glitch" >&5
+ echo "${ECHO_T}$enable_xmc_glitch" >&6
+ test "x$enable_xmc_glitch" = xyes &&
+ cat >>confdefs.h <<\EOF
+@@ -15970,7 +15973,7 @@
+ ###############################################################################
+ # These are just experimental, probably should not be in a package:
+ 
+-echo "$as_me:15973: checking if you do not want to assume colors are white-on-black" >&5
++echo "$as_me:15976: 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.
+@@ -15980,7 +15983,7 @@
+ else
+   with_assumed_color=yes
+ fi;
+-echo "$as_me:15983: result: $with_assumed_color" >&5
++echo "$as_me:15986: result: $with_assumed_color" >&5
+ echo "${ECHO_T}$with_assumed_color" >&6
+ test "x$with_assumed_color" = xyes &&
+ cat >>confdefs.h <<\EOF
+@@ -15988,7 +15991,7 @@
+ EOF
+ 
+ ###   use option --enable-hashmap to turn on use of hashmap scrolling logic
+-echo "$as_me:15991: checking if you want hashmap scrolling-optimization code" >&5
++echo "$as_me:15994: 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.
+@@ -15998,7 +16001,7 @@
+ else
+   with_hashmap=yes
+ fi;
+-echo "$as_me:16001: result: $with_hashmap" >&5
++echo "$as_me:16004: result: $with_hashmap" >&5
+ echo "${ECHO_T}$with_hashmap" >&6
+ test "x$with_hashmap" = xyes &&
+ cat >>confdefs.h <<\EOF
+@@ -16006,7 +16009,7 @@
+ EOF
+ 
+ ###   use option --enable-colorfgbg to turn on use of $COLORFGBG environment
+-echo "$as_me:16009: checking if you want colorfgbg code" >&5
++echo "$as_me:16012: 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.
+@@ -16016,7 +16019,7 @@
+ else
+   with_colorfgbg=no
+ fi;
+-echo "$as_me:16019: result: $with_colorfgbg" >&5
++echo "$as_me:16022: result: $with_colorfgbg" >&5
+ echo "${ECHO_T}$with_colorfgbg" >&6
+ test "x$with_colorfgbg" = xyes &&
+ cat >>confdefs.h <<\EOF
+@@ -16024,7 +16027,7 @@
+ EOF
+ 
+ ###   use option --enable-fvisibility to turn on use of gcc-specific feature
+-echo "$as_me:16027: checking if you want to use gcc -fvisibility option" >&5
++echo "$as_me:16030: 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.
+@@ -16034,14 +16037,14 @@
+ else
+   cf_with_fvisibility=no
+ fi;
+-echo "$as_me:16037: result: $cf_with_fvisibility" >&5
++echo "$as_me:16040: 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:16044: checking if $CC -fvisibility=hidden option works" >&5
++echo "$as_me:16047: 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
+@@ -16050,7 +16053,7 @@
+     cf_save_cflags="$CFLAGS"
+     CFLAGS="$CFLAGS -fvisibility=hidden"
+     cat >"conftest.$ac_ext" <<_ACEOF
+-#line 16053 "configure"
++#line 16056 "configure"
+ #include "confdefs.h"
+ 
+ __attribute__ ((visibility("default"))) int somefunc() {return 42;}
+@@ -16066,16 +16069,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:16069: \"$ac_link\"") >&5
++if { (eval echo "$as_me:16072: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:16072: \$? = $ac_status" >&5
++  echo "$as_me:16075: \$? = $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:16078: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:16078: \$? = $ac_status" >&5
++  echo "$as_me:16081: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_fvisibility_hidden=yes
+ else
+@@ -16087,7 +16090,7 @@
+     CFLAGS=$cf_save_cflags
+ 
+ fi
+-echo "$as_me:16090: result: $cf_cv_fvisibility_hidden" >&5
++echo "$as_me:16093: result: $cf_cv_fvisibility_hidden" >&5
+ echo "${ECHO_T}$cf_cv_fvisibility_hidden" >&6
+ 
+ 	if test "x$cf_cv_fvisibility_hidden" = xyes
+@@ -16202,7 +16205,7 @@
+ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
+ ac_main_return="return"
+ 
+-echo "$as_me:16205: checking if $CXX -fvisibility=hidden option works" >&5
++echo "$as_me:16208: 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
+@@ -16211,7 +16214,7 @@
+     cf_save_cflags="$CXXFLAGS"
+     CXXFLAGS="$CXXFLAGS -fvisibility=hidden"
+     cat >"conftest.$ac_ext" <<_ACEOF
+-#line 16214 "configure"
++#line 16217 "configure"
+ #include "confdefs.h"
+ 
+ __attribute__ ((visibility("default"))) int somefunc() {return 42;}
+@@ -16227,16 +16230,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:16230: \"$ac_link\"") >&5
++if { (eval echo "$as_me:16233: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:16233: \$? = $ac_status" >&5
++  echo "$as_me:16236: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:16236: \"$ac_try\"") >&5
++  { (eval echo "$as_me:16239: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:16239: \$? = $ac_status" >&5
++  echo "$as_me:16242: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_fvisibility_hidden2=yes
+ else
+@@ -16248,7 +16251,7 @@
+     CXXFLAGS=$cf_save_cflags
+ 
+ fi
+-echo "$as_me:16251: result: $cf_cv_fvisibility_hidden2" >&5
++echo "$as_me:16254: result: $cf_cv_fvisibility_hidden2" >&5
+ echo "${ECHO_T}$cf_cv_fvisibility_hidden2" >&6
+ 
+ 		if test "x$cf_cv_fvisibility_hidden2" = xyes
+@@ -16371,7 +16374,7 @@
+ fi
+ 
+ ###   use option --enable-interop to turn on use of bindings used for interop
+-echo "$as_me:16374: checking if you want interop bindings" >&5
++echo "$as_me:16377: 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.
+@@ -16381,13 +16384,13 @@
+ else
+   with_exp_interop=$cf_dft_interop
+ fi;
+-echo "$as_me:16384: result: $with_exp_interop" >&5
++echo "$as_me:16387: 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:16390: checking if you want experimental safe-sprintf code" >&5
++echo "$as_me:16393: 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.
+@@ -16397,13 +16400,13 @@
+ else
+   with_safe_sprintf=no
+ fi;
+-echo "$as_me:16400: result: $with_safe_sprintf" >&5
++echo "$as_me:16403: 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:16406: checking if you want to experiment without scrolling-hints code" >&5
++echo "$as_me:16409: 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.
+@@ -16413,7 +16416,7 @@
+ else
+   with_scroll_hints=yes
+ fi;
+-echo "$as_me:16416: result: $with_scroll_hints" >&5
++echo "$as_me:16419: result: $with_scroll_hints" >&5
+ echo "${ECHO_T}$with_scroll_hints" >&6
+ test "x$with_scroll_hints" = xyes &&
+ cat >>confdefs.h <<\EOF
+@@ -16422,7 +16425,7 @@
+ 
+ fi
+ 
+-echo "$as_me:16425: checking if you want wgetch-events code" >&5
++echo "$as_me:16428: 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.
+@@ -16432,7 +16435,7 @@
+ else
+   with_wgetch_events=no
+ fi;
+-echo "$as_me:16435: result: $with_wgetch_events" >&5
++echo "$as_me:16438: result: $with_wgetch_events" >&5
+ echo "${ECHO_T}$with_wgetch_events" >&6
+ if test "x$with_wgetch_events" = xyes ; then
+ 
+@@ -16447,7 +16450,7 @@
+ 
+ case "$cf_cv_system_name" in
+ (*mingw32*|*mingw64*|*-msvc*)
+-	echo "$as_me:16450: checking if you want experimental-Windows driver" >&5
++	echo "$as_me:16453: 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.
+@@ -16457,7 +16460,7 @@
+ else
+   with_exp_win32=no
+ fi;
+-	echo "$as_me:16460: result: $with_exp_win32" >&5
++	echo "$as_me:16463: result: $with_exp_win32" >&5
+ echo "${ECHO_T}$with_exp_win32" >&6
+ 	if test "x$with_exp_win32" = xyes
+ 	then
+@@ -16483,7 +16486,7 @@
+ 
+ ###	use option --disable-echo to suppress full display compiling commands
+ 
+-echo "$as_me:16486: checking if you want to see long compiling messages" >&5
++echo "$as_me:16489: 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.
+@@ -16517,7 +16520,7 @@
+ 	ECHO_CC=''
+ 
+ fi;
+-echo "$as_me:16520: result: $enableval" >&5
++echo "$as_me:16523: result: $enableval" >&5
+ echo "${ECHO_T}$enableval" >&6
+ 
+ if test "x$enable_echo" = xyes; then
+@@ -16530,7 +16533,7 @@
+ 
+ # --disable-stripping is used for debugging
+ 
+-echo "$as_me:16533: checking if you want to install stripped executables" >&5
++echo "$as_me:16536: 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.
+@@ -16547,7 +16550,7 @@
+ 	enable_stripping=yes
+ 
+ fi;
+-echo "$as_me:16550: result: $enable_stripping" >&5
++echo "$as_me:16553: result: $enable_stripping" >&5
+ echo "${ECHO_T}$enable_stripping" >&6
+ 
+ if test "$enable_stripping" = yes
+@@ -16558,7 +16561,7 @@
+ fi
+ 
+ : "${INSTALL:=install}"
+-echo "$as_me:16561: checking if install accepts -p option" >&5
++echo "$as_me:16564: 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
+@@ -16589,10 +16592,10 @@
+ 	rm -rf ./conftest*
+ 
+ fi
+-echo "$as_me:16592: result: $cf_cv_install_p" >&5
++echo "$as_me:16595: result: $cf_cv_install_p" >&5
+ echo "${ECHO_T}$cf_cv_install_p" >&6
+ 
+-echo "$as_me:16595: checking if install needs to be told about ownership" >&5
++echo "$as_me:16598: 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)
+@@ -16603,7 +16606,7 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:16606: result: $with_install_o" >&5
++echo "$as_me:16609: result: $with_install_o" >&5
+ echo "${ECHO_T}$with_install_o" >&6
+ if test "x$with_install_o" = xyes
+ then
+@@ -16628,7 +16631,7 @@
+ 
+ ###	use option --enable-warnings to turn on all gcc warnings
+ 
+-echo "$as_me:16631: checking if you want to use C11 _Noreturn feature" >&5
++echo "$as_me:16634: 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.
+@@ -16645,17 +16648,17 @@
+ 	enable_stdnoreturn=no
+ 
+ fi;
+-echo "$as_me:16648: result: $enable_stdnoreturn" >&5
++echo "$as_me:16651: result: $enable_stdnoreturn" >&5
+ echo "${ECHO_T}$enable_stdnoreturn" >&6
+ 
+ if test $enable_stdnoreturn = yes; then
+-echo "$as_me:16652: checking for C11 _Noreturn feature" >&5
++echo "$as_me:16655: 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 16658 "configure"
++#line 16661 "configure"
+ #include "confdefs.h"
+ 
+ #include <stdio.h>
+@@ -16672,16 +16675,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:16675: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:16678: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:16678: \$? = $ac_status" >&5
++  echo "$as_me:16681: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:16681: \"$ac_try\"") >&5
++  { (eval echo "$as_me:16684: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:16684: \$? = $ac_status" >&5
++  echo "$as_me:16687: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_c11_noreturn=yes
+ else
+@@ -16692,7 +16695,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:16695: result: $cf_cv_c11_noreturn" >&5
++echo "$as_me:16698: result: $cf_cv_c11_noreturn" >&5
+ echo "${ECHO_T}$cf_cv_c11_noreturn" >&6
+ else
+ 	cf_cv_c11_noreturn=no,
+@@ -16748,16 +16751,16 @@
+ 		then
+ 			test -n "$verbose" && echo "	repairing CFLAGS: $CFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:16751: testing repairing CFLAGS: $CFLAGS ..." 1>&5
++echo "${as_me:-configure}:16754: testing repairing CFLAGS: $CFLAGS ..." 1>&5
+ 
+ 			CFLAGS="$cf_temp_flags"
+ 			test -n "$verbose" && echo "	... fixed $CFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:16756: testing ... fixed $CFLAGS ..." 1>&5
++echo "${as_me:-configure}:16759: 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
++echo "${as_me:-configure}:16763: testing ... extra $EXTRA_CFLAGS ..." 1>&5
+ 
+ 		fi
+ 		;;
+@@ -16796,16 +16799,16 @@
+ 		then
+ 			test -n "$verbose" && echo "	repairing CPPFLAGS: $CPPFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:16799: testing repairing CPPFLAGS: $CPPFLAGS ..." 1>&5
++echo "${as_me:-configure}:16802: testing repairing CPPFLAGS: $CPPFLAGS ..." 1>&5
+ 
+ 			CPPFLAGS="$cf_temp_flags"
+ 			test -n "$verbose" && echo "	... fixed $CPPFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:16804: testing ... fixed $CPPFLAGS ..." 1>&5
++echo "${as_me:-configure}:16807: testing ... fixed $CPPFLAGS ..." 1>&5
+ 
+ 			test -n "$verbose" && echo "	... extra $EXTRA_CFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:16808: testing ... extra $EXTRA_CFLAGS ..." 1>&5
++echo "${as_me:-configure}:16811: testing ... extra $EXTRA_CFLAGS ..." 1>&5
+ 
+ 		fi
+ 		;;
+@@ -16844,23 +16847,23 @@
+ 		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}:16850: testing repairing LDFLAGS: $LDFLAGS ..." 1>&5
+ 
+ 			LDFLAGS="$cf_temp_flags"
+ 			test -n "$verbose" && echo "	... fixed $LDFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:16852: testing ... fixed $LDFLAGS ..." 1>&5
++echo "${as_me:-configure}:16855: testing ... fixed $LDFLAGS ..." 1>&5
+ 
+ 			test -n "$verbose" && echo "	... extra $EXTRA_CFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:16856: testing ... extra $EXTRA_CFLAGS ..." 1>&5
++echo "${as_me:-configure}:16859: testing ... extra $EXTRA_CFLAGS ..." 1>&5
+ 
+ 		fi
+ 		;;
+ 	esac
+ fi
+ 
+-echo "$as_me:16863: checking if you want to turn on gcc warnings" >&5
++echo "$as_me:16866: 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.
+@@ -16877,7 +16880,7 @@
+ 	enable_warnings=no
+ 
+ fi;
+-echo "$as_me:16880: result: $enable_warnings" >&5
++echo "$as_me:16883: result: $enable_warnings" >&5
+ echo "${ECHO_T}$enable_warnings" >&6
+ if test "$enable_warnings" = "yes"
+ then
+@@ -16901,7 +16904,7 @@
+ done
+ 
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 16904 "configure"
++#line 16907 "configure"
+ #include "confdefs.h"
+ 
+ #include <stdlib.h>
+@@ -16916,26 +16919,26 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:16919: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:16922: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:16922: \$? = $ac_status" >&5
++  echo "$as_me:16925: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:16925: \"$ac_try\"") >&5
++  { (eval echo "$as_me:16928: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:16928: \$? = $ac_status" >&5
++  echo "$as_me:16931: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+ 
+-echo "$as_me:16931: checking for X11/Xt const-feature" >&5
++echo "$as_me:16934: 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 16938 "configure"
++#line 16941 "configure"
+ #include "confdefs.h"
+ 
+ #define _CONST_X_STRING	/* X11R7.8 (perhaps) */
+@@ -16952,16 +16955,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:16955: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:16958: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:16958: \$? = $ac_status" >&5
++  echo "$as_me:16961: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:16961: \"$ac_try\"") >&5
++  { (eval echo "$as_me:16964: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:16964: \$? = $ac_status" >&5
++  echo "$as_me:16967: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+ 
+ 			cf_cv_const_x_string=no
+@@ -16976,7 +16979,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:16979: result: $cf_cv_const_x_string" >&5
++echo "$as_me:16982: result: $cf_cv_const_x_string" >&5
+ echo "${ECHO_T}$cf_cv_const_x_string" >&6
+ 
+ LIBS="$cf_save_LIBS_CF_CONST_X_STRING"
+@@ -17005,7 +17008,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+  fi
+ cat > "conftest.$ac_ext" <<EOF
+-#line 17008 "${as_me:-configure}"
++#line 17011 "${as_me:-configure}"
+ int main(int argc, char *argv[]) { return (argv[argc-1] == 0) ; }
+ EOF
+ if test "$INTEL_COMPILER" = yes
+@@ -17021,7 +17024,7 @@
+ # remark #981: operands are evaluated in unspecified order
+ # warning #279: controlling expression is constant
+ 
+-	{ echo "$as_me:17024: checking for $CC warning options..." >&5
++	{ echo "$as_me:17027: checking for $CC warning options..." >&5
+ echo "$as_me: checking for $CC warning options..." >&6;}
+ 	cf_save_CFLAGS="$CFLAGS"
+ 	EXTRA_CFLAGS="$EXTRA_CFLAGS -Wall"
+@@ -17037,12 +17040,12 @@
+ 		wd981
+ 	do
+ 		CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt"
+-		if { (eval echo "$as_me:17040: \"$ac_compile\"") >&5
++		if { (eval echo "$as_me:17043: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:17043: \$? = $ac_status" >&5
++  echo "$as_me:17046: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; then
+-			test -n "$verbose" && echo "$as_me:17045: result: ... -$cf_opt" >&5
++			test -n "$verbose" && echo "$as_me:17048: result: ... -$cf_opt" >&5
+ echo "${ECHO_T}... -$cf_opt" >&6
+ 			EXTRA_CFLAGS="$EXTRA_CFLAGS -$cf_opt"
+ 		fi
+@@ -17050,7 +17053,7 @@
+ 	CFLAGS="$cf_save_CFLAGS"
+ elif test "$GCC" = yes && test "$GCC_VERSION" != "unknown"
+ then
+-	{ echo "$as_me:17053: checking for $CC warning options..." >&5
++	{ echo "$as_me:17056: checking for $CC warning options..." >&5
+ echo "$as_me: checking for $CC warning options..." >&6;}
+ 	cf_save_CFLAGS="$CFLAGS"
+ 	cf_warn_CONST=""
+@@ -17073,12 +17076,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:17076: \"$ac_compile\"") >&5
++		if { (eval echo "$as_me:17079: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:17079: \$? = $ac_status" >&5
++  echo "$as_me:17082: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; then
+-			test -n "$verbose" && echo "$as_me:17081: result: ... -$cf_opt" >&5
++			test -n "$verbose" && echo "$as_me:17084: result: ... -$cf_opt" >&5
+ echo "${ECHO_T}... -$cf_opt" >&6
+ 			case "$cf_opt" in
+ 			(Winline)
+@@ -17086,7 +17089,7 @@
+ 				([34].*)
+ 					test -n "$verbose" && echo "	feature is broken in gcc $GCC_VERSION" 1>&6
+ 
+-echo "${as_me:-configure}:17089: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
++echo "${as_me:-configure}:17092: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
+ 
+ 					continue;;
+ 				esac
+@@ -17096,7 +17099,7 @@
+ 				([12].*)
+ 					test -n "$verbose" && echo "	feature is broken in gcc $GCC_VERSION" 1>&6
+ 
+-echo "${as_me:-configure}:17099: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
++echo "${as_me:-configure}:17102: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
+ 
+ 					continue;;
+ 				esac
+@@ -17129,10 +17132,10 @@
+ EOF
+ if test "$GCC" = yes
+ then
+-	{ echo "$as_me:17132: checking for $CC __attribute__ directives..." >&5
++	{ echo "$as_me:17135: checking for $CC __attribute__ directives..." >&5
+ echo "$as_me: checking for $CC __attribute__ directives..." >&6;}
+ cat > "conftest.$ac_ext" <<EOF
+-#line 17135 "${as_me:-configure}"
++#line 17138 "${as_me:-configure}"
+ #include "confdefs.h"
+ #include "conftest.h"
+ #include "conftest.i"
+@@ -17181,12 +17184,12 @@
+ 			;;
+ 		esac
+ 
+-		if { (eval echo "$as_me:17184: \"$ac_compile\"") >&5
++		if { (eval echo "$as_me:17187: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:17187: \$? = $ac_status" >&5
++  echo "$as_me:17190: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; then
+-			test -n "$verbose" && echo "$as_me:17189: result: ... $cf_attribute" >&5
++			test -n "$verbose" && echo "$as_me:17192: result: ... $cf_attribute" >&5
+ echo "${ECHO_T}... $cf_attribute" >&6
+ 			cat conftest.h >>confdefs.h
+ 			case "$cf_attribute" in
+@@ -17258,12 +17261,12 @@
+ if test "$GCC" = yes ; then
+ 	case "$host_os" in
+ 	(linux*|gnu*)
+-		echo "$as_me:17261: checking if this is really Intel C++ compiler" >&5
++		echo "$as_me:17264: 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 17266 "configure"
++#line 17269 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -17280,16 +17283,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:17283: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:17286: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:17286: \$? = $ac_status" >&5
++  echo "$as_me:17289: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:17289: \"$ac_try\"") >&5
++  { (eval echo "$as_me:17292: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:17292: \$? = $ac_status" >&5
++  echo "$as_me:17295: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   INTEL_CPLUSPLUS=yes
+ cf_save_CFLAGS="$cf_save_CFLAGS -we147"
+@@ -17300,7 +17303,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 		CXXFLAGS="$cf_save_CFLAGS"
+-		echo "$as_me:17303: result: $INTEL_CPLUSPLUS" >&5
++		echo "$as_me:17306: result: $INTEL_CPLUSPLUS" >&5
+ echo "${ECHO_T}$INTEL_CPLUSPLUS" >&6
+ 		;;
+ 	esac
+@@ -17309,11 +17312,11 @@
+ CLANG_CPLUSPLUS=no
+ 
+ if test "$GCC" = yes ; then
+-	echo "$as_me:17312: checking if this is really Clang C++ compiler" >&5
++	echo "$as_me:17315: 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 17316 "configure"
++#line 17319 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -17330,16 +17333,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:17333: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:17336: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:17336: \$? = $ac_status" >&5
++  echo "$as_me:17339: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:17339: \"$ac_try\"") >&5
++  { (eval echo "$as_me:17342: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:17342: \$? = $ac_status" >&5
++  echo "$as_me:17345: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   CLANG_CPLUSPLUS=yes
+ 
+@@ -17349,7 +17352,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 	CXXFLAGS="$cf_save_CFLAGS"
+-	echo "$as_me:17352: result: $CLANG_CPLUSPLUS" >&5
++	echo "$as_me:17355: result: $CLANG_CPLUSPLUS" >&5
+ echo "${ECHO_T}$CLANG_CPLUSPLUS" >&6
+ fi
+ 
+@@ -17358,30 +17361,30 @@
+ if test "x$CLANG_CPLUSPLUS" = "xyes" ; then
+ 	case "$CC" in
+ 	(c[1-9][0-9]|*/c[1-9][0-9])
+-		{ echo "$as_me:17361: WARNING: replacing broken compiler alias $CC" >&5
++		{ echo "$as_me:17364: 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:17368: checking version of $CC" >&5
++	echo "$as_me:17371: 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:17372: result: $CLANG_VERSION" >&5
++	echo "$as_me:17375: 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:17379: checking if option $cf_clang_opt works" >&5
++		echo "$as_me:17382: 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 17384 "configure"
++#line 17387 "configure"
+ #include "confdefs.h"
+ 
+ 			#include <stdio.h>
+@@ -17395,16 +17398,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:17398: \"$ac_link\"") >&5
++if { (eval echo "$as_me:17401: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:17401: \$? = $ac_status" >&5
++  echo "$as_me:17404: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:17404: \"$ac_try\"") >&5
++  { (eval echo "$as_me:17407: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:17407: \$? = $ac_status" >&5
++  echo "$as_me:17410: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+ 
+ 			cf_clang_optok=yes
+@@ -17415,13 +17418,13 @@
+ 			cf_clang_optok=no
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+-		echo "$as_me:17418: result: $cf_clang_optok" >&5
++		echo "$as_me:17421: 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}:17424: testing adding option $cf_clang_opt ..." 1>&5
++echo "${as_me:-configure}:17427: testing adding option $cf_clang_opt ..." 1>&5
+ 
+ 	test -n "$CFLAGS" && CFLAGS="$CFLAGS "
+ 	CFLAGS="${CFLAGS}$cf_clang_opt"
+@@ -17438,7 +17441,7 @@
+ ac_main_return="return"
+ 
+ cat > conftest.$ac_ext <<EOF
+-#line 17441 "configure"
++#line 17444 "configure"
+ int main(int argc, char *argv[]) { return (argv[argc-1] == 0) ; }
+ EOF
+ 
+@@ -17456,7 +17459,7 @@
+ # remark #981: operands are evaluated in unspecified order
+ # warning #269: invalid format string conversion
+ 
+-	{ echo "$as_me:17459: checking for $CC warning options..." >&5
++	{ echo "$as_me:17462: checking for $CC warning options..." >&5
+ echo "$as_me: checking for $CC warning options..." >&6;}
+ 	cf_save_CXXFLAGS="$CXXFLAGS"
+ 	EXTRA_CXXFLAGS="-Wall"
+@@ -17473,12 +17476,12 @@
+ 		wd981
+ 	do
+ 		CXXFLAGS="$cf_save_CXXFLAGS $EXTRA_CXXFLAGS -$cf_opt"
+-		if { (eval echo "$as_me:17476: \"$ac_compile\"") >&5
++		if { (eval echo "$as_me:17479: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:17479: \$? = $ac_status" >&5
++  echo "$as_me:17482: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; then
+-			test -n "$verbose" && echo "$as_me:17481: result: ... -$cf_opt" >&5
++			test -n "$verbose" && echo "$as_me:17484: result: ... -$cf_opt" >&5
+ echo "${ECHO_T}... -$cf_opt" >&6
+ 			EXTRA_CXXFLAGS="$EXTRA_CXXFLAGS -$cf_opt"
+ 		fi
+@@ -17487,7 +17490,7 @@
+ 
+ elif test "$GXX" = yes
+ then
+-	{ echo "$as_me:17490: checking for $CXX warning options..." >&5
++	{ echo "$as_me:17493: checking for $CXX warning options..." >&5
+ echo "$as_me: checking for $CXX warning options..." >&6;}
+ 	cf_save_CXXFLAGS="$CXXFLAGS"
+ 	EXTRA_CXXFLAGS="-W -Wall"
+@@ -17517,16 +17520,16 @@
+ 		Wundef $cf_gxx_extra_warnings Wno-unused
+ 	do
+ 		CXXFLAGS="$cf_save_CXXFLAGS $EXTRA_CXXFLAGS -Werror -$cf_opt"
+-		if { (eval echo "$as_me:17520: \"$ac_compile\"") >&5
++		if { (eval echo "$as_me:17523: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:17523: \$? = $ac_status" >&5
++  echo "$as_me:17526: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; then
+-			test -n "$verbose" && echo "$as_me:17525: result: ... -$cf_opt" >&5
++			test -n "$verbose" && echo "$as_me:17528: result: ... -$cf_opt" >&5
+ echo "${ECHO_T}... -$cf_opt" >&6
+ 			EXTRA_CXXFLAGS="$EXTRA_CXXFLAGS -$cf_opt"
+ 		else
+-			test -n "$verbose" && echo "$as_me:17529: result: ... no -$cf_opt" >&5
++			test -n "$verbose" && echo "$as_me:17532: result: ... no -$cf_opt" >&5
+ echo "${ECHO_T}... no -$cf_opt" >&6
+ 		fi
+ 	done
+@@ -17544,7 +17547,7 @@
+ 	fi
+ fi
+ 
+-echo "$as_me:17547: checking if you want to work around bogus compiler/loader warnings" >&5
++echo "$as_me:17550: 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.
+@@ -17554,7 +17557,7 @@
+ else
+   enable_string_hacks=no
+ fi;
+-echo "$as_me:17557: result: $enable_string_hacks" >&5
++echo "$as_me:17560: result: $enable_string_hacks" >&5
+ echo "${ECHO_T}$enable_string_hacks" >&6
+ 
+ if test "x$enable_string_hacks" = "xyes"; then
+@@ -17563,15 +17566,15 @@
+ #define USE_STRING_HACKS 1
+ EOF
+ 
+-	{ echo "$as_me:17566: WARNING: enabling string-hacks to work around bogus compiler/loader warnings" >&5
++	{ echo "$as_me:17569: 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:17568: checking for strlcat" >&5
++	echo "$as_me:17571: 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 17574 "configure"
++#line 17577 "configure"
+ #include "confdefs.h"
+ #define strlcat autoconf_temporary
+ #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -17602,16 +17605,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:17605: \"$ac_link\"") >&5
++if { (eval echo "$as_me:17608: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:17608: \$? = $ac_status" >&5
++  echo "$as_me:17611: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:17611: \"$ac_try\"") >&5
++  { (eval echo "$as_me:17614: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:17614: \$? = $ac_status" >&5
++  echo "$as_me:17617: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_func_strlcat=yes
+ else
+@@ -17621,7 +17624,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:17624: result: $ac_cv_func_strlcat" >&5
++echo "$as_me:17627: result: $ac_cv_func_strlcat" >&5
+ echo "${ECHO_T}$ac_cv_func_strlcat" >&6
+ if test "$ac_cv_func_strlcat" = yes; then
+ 
+@@ -17631,7 +17634,7 @@
+ 
+ else
+ 
+-		echo "$as_me:17634: checking for strlcat in -lbsd" >&5
++		echo "$as_me:17637: 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
+@@ -17639,7 +17642,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lbsd  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 17642 "configure"
++#line 17645 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -17658,16 +17661,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:17661: \"$ac_link\"") >&5
++if { (eval echo "$as_me:17664: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:17664: \$? = $ac_status" >&5
++  echo "$as_me:17667: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:17667: \"$ac_try\"") >&5
++  { (eval echo "$as_me:17670: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:17670: \$? = $ac_status" >&5
++  echo "$as_me:17673: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_bsd_strlcat=yes
+ else
+@@ -17678,7 +17681,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:17681: result: $ac_cv_lib_bsd_strlcat" >&5
++echo "$as_me:17684: 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
+ 
+@@ -17701,23 +17704,23 @@
+ for ac_header in bsd/string.h
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-echo "$as_me:17704: checking for $ac_header" >&5
++echo "$as_me:17707: 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 17710 "configure"
++#line 17713 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:17714: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:17717: \"$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:17720: \$? = $ac_status" >&5
++  echo "$as_me:17723: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -17736,7 +17739,7 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:17739: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
++echo "$as_me:17742: 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
+@@ -17757,13 +17760,13 @@
+ for ac_func in strlcpy snprintf
+ do
+ as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+-echo "$as_me:17760: checking for $ac_func" >&5
++echo "$as_me:17763: 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 17766 "configure"
++#line 17769 "configure"
+ #include "confdefs.h"
+ #define $ac_func autoconf_temporary
+ #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -17794,16 +17797,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:17797: \"$ac_link\"") >&5
++if { (eval echo "$as_me:17800: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:17800: \$? = $ac_status" >&5
++  echo "$as_me:17803: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:17803: \"$ac_try\"") >&5
++  { (eval echo "$as_me:17806: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:17806: \$? = $ac_status" >&5
++  echo "$as_me:17809: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   eval "$as_ac_var=yes"
+ else
+@@ -17813,7 +17816,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:17816: result: `eval echo '${'"$as_ac_var"'}'`" >&5
++echo "$as_me:17819: 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
+@@ -17826,7 +17829,7 @@
+ fi
+ 
+ ###	use option --enable-assertions to turn on generation of assertion code
+-echo "$as_me:17829: checking if you want to enable runtime assertions" >&5
++echo "$as_me:17832: 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.
+@@ -17836,7 +17839,7 @@
+ else
+   with_assertions=no
+ fi;
+-echo "$as_me:17839: result: $with_assertions" >&5
++echo "$as_me:17842: result: $with_assertions" >&5
+ echo "${ECHO_T}$with_assertions" >&6
+ if test -n "$GCC"
+ then
+@@ -17852,7 +17855,7 @@
+ 
+ ###	use option --disable-leaks to suppress "permanent" leaks, for testing
+ 
+-echo "$as_me:17855: checking if you want to use dmalloc for testing" >&5
++echo "$as_me:17858: 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.
+@@ -17874,7 +17877,7 @@
+ else
+   with_dmalloc=
+ fi;
+-echo "$as_me:17877: result: ${with_dmalloc:-no}" >&5
++echo "$as_me:17880: result: ${with_dmalloc:-no}" >&5
+ echo "${ECHO_T}${with_dmalloc:-no}" >&6
+ 
+ case ".$with_cflags" in
+@@ -17988,23 +17991,23 @@
+ esac
+ 
+ if test "$with_dmalloc" = yes ; then
+-	echo "$as_me:17991: checking for dmalloc.h" >&5
++	echo "$as_me:17994: 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 17997 "configure"
++#line 18000 "configure"
+ #include "confdefs.h"
+ #include <dmalloc.h>
+ _ACEOF
+-if { (eval echo "$as_me:18001: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:18004: \"$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:18007: \$? = $ac_status" >&5
++  echo "$as_me:18010: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -18023,11 +18026,11 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:18026: result: $ac_cv_header_dmalloc_h" >&5
++echo "$as_me:18029: 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:18030: checking for dmalloc_debug in -ldmalloc" >&5
++echo "$as_me:18033: 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
+@@ -18035,7 +18038,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-ldmalloc  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 18038 "configure"
++#line 18041 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -18054,16 +18057,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:18057: \"$ac_link\"") >&5
++if { (eval echo "$as_me:18060: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:18060: \$? = $ac_status" >&5
++  echo "$as_me:18063: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:18063: \"$ac_try\"") >&5
++  { (eval echo "$as_me:18066: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:18066: \$? = $ac_status" >&5
++  echo "$as_me:18069: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_dmalloc_dmalloc_debug=yes
+ else
+@@ -18074,7 +18077,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:18077: result: $ac_cv_lib_dmalloc_dmalloc_debug" >&5
++echo "$as_me:18080: 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
+@@ -18089,7 +18092,7 @@
+ 
+ fi
+ 
+-echo "$as_me:18092: checking if you want to use dbmalloc for testing" >&5
++echo "$as_me:18095: 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.
+@@ -18111,7 +18114,7 @@
+ else
+   with_dbmalloc=
+ fi;
+-echo "$as_me:18114: result: ${with_dbmalloc:-no}" >&5
++echo "$as_me:18117: result: ${with_dbmalloc:-no}" >&5
+ echo "${ECHO_T}${with_dbmalloc:-no}" >&6
+ 
+ case ".$with_cflags" in
+@@ -18225,23 +18228,23 @@
+ esac
+ 
+ if test "$with_dbmalloc" = yes ; then
+-	echo "$as_me:18228: checking for dbmalloc.h" >&5
++	echo "$as_me:18231: 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 18234 "configure"
++#line 18237 "configure"
+ #include "confdefs.h"
+ #include <dbmalloc.h>
+ _ACEOF
+-if { (eval echo "$as_me:18238: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:18241: \"$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:18244: \$? = $ac_status" >&5
++  echo "$as_me:18247: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -18260,11 +18263,11 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:18263: result: $ac_cv_header_dbmalloc_h" >&5
++echo "$as_me:18266: 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:18267: checking for debug_malloc in -ldbmalloc" >&5
++echo "$as_me:18270: 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
+@@ -18272,7 +18275,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-ldbmalloc  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 18275 "configure"
++#line 18278 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -18291,16 +18294,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:18294: \"$ac_link\"") >&5
++if { (eval echo "$as_me:18297: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:18297: \$? = $ac_status" >&5
++  echo "$as_me:18300: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:18300: \"$ac_try\"") >&5
++  { (eval echo "$as_me:18303: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:18303: \$? = $ac_status" >&5
++  echo "$as_me:18306: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_dbmalloc_debug_malloc=yes
+ else
+@@ -18311,7 +18314,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:18314: result: $ac_cv_lib_dbmalloc_debug_malloc" >&5
++echo "$as_me:18317: 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
+@@ -18326,7 +18329,7 @@
+ 
+ fi
+ 
+-echo "$as_me:18329: checking if you want to use valgrind for testing" >&5
++echo "$as_me:18332: 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.
+@@ -18348,7 +18351,7 @@
+ else
+   with_valgrind=
+ fi;
+-echo "$as_me:18351: result: ${with_valgrind:-no}" >&5
++echo "$as_me:18354: result: ${with_valgrind:-no}" >&5
+ echo "${ECHO_T}${with_valgrind:-no}" >&6
+ 
+ case ".$with_cflags" in
+@@ -18461,7 +18464,7 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:18464: checking if you want to perform memory-leak testing" >&5
++echo "$as_me:18467: 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.
+@@ -18472,7 +18475,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:18475: result: $with_no_leaks" >&5
++echo "$as_me:18478: result: $with_no_leaks" >&5
+ echo "${ECHO_T}$with_no_leaks" >&6
+ 
+ if test "$enable_leaks" = no ; then
+@@ -18524,7 +18527,7 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:18527: checking whether to add trace feature to all models" >&5
++echo "$as_me:18530: 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.
+@@ -18534,7 +18537,7 @@
+ else
+   cf_with_trace=$cf_all_traces
+ fi;
+-echo "$as_me:18537: result: $cf_with_trace" >&5
++echo "$as_me:18540: result: $cf_with_trace" >&5
+ echo "${ECHO_T}$cf_with_trace" >&6
+ 
+ if test "x$cf_with_trace" = xyes ; then
+@@ -18648,7 +18651,7 @@
+ 	ADA_TRACE=FALSE
+ fi
+ 
+-echo "$as_me:18651: checking if we want to use GNAT projects" >&5
++echo "$as_me:18654: 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.
+@@ -18665,7 +18668,7 @@
+ 	enable_gnat_projects=yes
+ 
+ fi;
+-echo "$as_me:18668: result: $enable_gnat_projects" >&5
++echo "$as_me:18671: result: $enable_gnat_projects" >&5
+ echo "${ECHO_T}$enable_gnat_projects" >&6
+ 
+ ###	Checks for libraries.
+@@ -18678,14 +18681,14 @@
+ 		CPPFLAGS="$CPPFLAGS -DWINVER=0x0501 -DWIN32_LEAN_AND_MEAN"
+ 	fi
+ 
+-echo "$as_me:18681: checking if ssp library is needed" >&5
++echo "$as_me:18684: 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 18688 "configure"
++#line 18691 "configure"
+ #include "confdefs.h"
+ 
+ #include <sys/types.h>
+@@ -18702,16 +18705,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:18705: \"$ac_link\"") >&5
++if { (eval echo "$as_me:18708: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:18708: \$? = $ac_status" >&5
++  echo "$as_me:18711: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:18711: \"$ac_try\"") >&5
++  { (eval echo "$as_me:18714: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:18714: \$? = $ac_status" >&5
++  echo "$as_me:18717: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_need_libssp=no
+ else
+@@ -18721,7 +18724,7 @@
+ 	cf_save_LIBS="$LIBS"
+ 	LIBS="$LIBS -lssp"
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 18724 "configure"
++#line 18727 "configure"
+ #include "confdefs.h"
+ 
+ #include <sys/types.h>
+@@ -18738,16 +18741,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:18741: \"$ac_link\"") >&5
++if { (eval echo "$as_me:18744: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:18744: \$? = $ac_status" >&5
++  echo "$as_me:18747: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:18747: \"$ac_try\"") >&5
++  { (eval echo "$as_me:18750: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:18750: \$? = $ac_status" >&5
++  echo "$as_me:18753: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_need_libssp=yes
+ else
+@@ -18761,7 +18764,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:18764: result: $cf_cv_need_libssp" >&5
++echo "$as_me:18767: result: $cf_cv_need_libssp" >&5
+ echo "${ECHO_T}$cf_cv_need_libssp" >&6
+ 
+ if test "x$cf_cv_need_libssp" = xyes
+@@ -18787,13 +18790,13 @@
+ 
+ 	;;
+ (*)
+-echo "$as_me:18790: checking for gettimeofday" >&5
++echo "$as_me:18793: 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 18796 "configure"
++#line 18799 "configure"
+ #include "confdefs.h"
+ #define gettimeofday autoconf_temporary
+ #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -18824,16 +18827,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:18827: \"$ac_link\"") >&5
++if { (eval echo "$as_me:18830: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:18830: \$? = $ac_status" >&5
++  echo "$as_me:18833: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:18833: \"$ac_try\"") >&5
++  { (eval echo "$as_me:18836: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:18836: \$? = $ac_status" >&5
++  echo "$as_me:18839: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_func_gettimeofday=yes
+ else
+@@ -18843,7 +18846,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:18846: result: $ac_cv_func_gettimeofday" >&5
++echo "$as_me:18849: result: $ac_cv_func_gettimeofday" >&5
+ echo "${ECHO_T}$ac_cv_func_gettimeofday" >&6
+ if test "$ac_cv_func_gettimeofday" = yes; then
+ 
+@@ -18853,7 +18856,7 @@
+ 
+ else
+ 
+-echo "$as_me:18856: checking for gettimeofday in -lbsd" >&5
++echo "$as_me:18859: 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
+@@ -18861,7 +18864,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lbsd  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 18864 "configure"
++#line 18867 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -18880,16 +18883,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:18883: \"$ac_link\"") >&5
++if { (eval echo "$as_me:18886: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:18886: \$? = $ac_status" >&5
++  echo "$as_me:18889: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:18889: \"$ac_try\"") >&5
++  { (eval echo "$as_me:18892: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:18892: \$? = $ac_status" >&5
++  echo "$as_me:18895: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_bsd_gettimeofday=yes
+ else
+@@ -18900,7 +18903,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:18903: result: $ac_cv_lib_bsd_gettimeofday" >&5
++echo "$as_me:18906: 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
+ 
+@@ -18930,14 +18933,14 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:18933: checking if -lm needed for math functions" >&5
++echo "$as_me:18936: 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 18940 "configure"
++#line 18943 "configure"
+ #include "confdefs.h"
+ 
+ 	#include <stdio.h>
+@@ -18953,16 +18956,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:18956: \"$ac_link\"") >&5
++if { (eval echo "$as_me:18959: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:18959: \$? = $ac_status" >&5
++  echo "$as_me:18962: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:18962: \"$ac_try\"") >&5
++  { (eval echo "$as_me:18965: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:18965: \$? = $ac_status" >&5
++  echo "$as_me:18968: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_need_libm=no
+ else
+@@ -18972,7 +18975,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:18975: result: $cf_cv_need_libm" >&5
++echo "$as_me:18978: result: $cf_cv_need_libm" >&5
+ echo "${ECHO_T}$cf_cv_need_libm" >&6
+ if test "$cf_cv_need_libm" = yes
+ then
+@@ -18980,13 +18983,13 @@
+ fi
+ 
+ ###	Checks for header files.
+-echo "$as_me:18983: checking for ANSI C header files" >&5
++echo "$as_me:18986: 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 18989 "configure"
++#line 18992 "configure"
+ #include "confdefs.h"
+ #include <stdlib.h>
+ #include <stdarg.h>
+@@ -18994,13 +18997,13 @@
+ #include <float.h>
+ 
+ _ACEOF
+-if { (eval echo "$as_me:18997: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:19000: \"$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:19003: \$? = $ac_status" >&5
++  echo "$as_me:19006: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -19022,7 +19025,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 19025 "configure"
++#line 19028 "configure"
+ #include "confdefs.h"
+ #include <string.h>
+ 
+@@ -19040,7 +19043,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 19043 "configure"
++#line 19046 "configure"
+ #include "confdefs.h"
+ #include <stdlib.h>
+ 
+@@ -19061,7 +19064,7 @@
+   :
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 19064 "configure"
++#line 19067 "configure"
+ #include "confdefs.h"
+ #include <ctype.h>
+ #if ((' ' & 0x0FF) == 0x020)
+@@ -19087,15 +19090,15 @@
+ }
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:19090: \"$ac_link\"") >&5
++if { (eval echo "$as_me:19093: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:19093: \$? = $ac_status" >&5
++  echo "$as_me:19096: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:19095: \"$ac_try\"") >&5
++  { (eval echo "$as_me:19098: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:19098: \$? = $ac_status" >&5
++  echo "$as_me:19101: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   :
+ else
+@@ -19108,7 +19111,7 @@
+ fi
+ fi
+ fi
+-echo "$as_me:19111: result: $ac_cv_header_stdc" >&5
++echo "$as_me:19114: result: $ac_cv_header_stdc" >&5
+ echo "${ECHO_T}$ac_cv_header_stdc" >&6
+ if test $ac_cv_header_stdc = yes; then
+ 
+@@ -19121,13 +19124,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:19124: checking for $ac_hdr that defines DIR" >&5
++echo "$as_me:19127: 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 19130 "configure"
++#line 19133 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ #include <$ac_hdr>
+@@ -19142,16 +19145,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:19145: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:19148: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:19148: \$? = $ac_status" >&5
++  echo "$as_me:19151: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:19151: \"$ac_try\"") >&5
++  { (eval echo "$as_me:19154: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:19154: \$? = $ac_status" >&5
++  echo "$as_me:19157: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   eval "$as_ac_Header=yes"
+ else
+@@ -19161,7 +19164,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:19164: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
++echo "$as_me:19167: 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
+@@ -19174,7 +19177,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:19177: checking for opendir in -ldir" >&5
++  echo "$as_me:19180: 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
+@@ -19182,7 +19185,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-ldir  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 19185 "configure"
++#line 19188 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -19201,16 +19204,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:19204: \"$ac_link\"") >&5
++if { (eval echo "$as_me:19207: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:19207: \$? = $ac_status" >&5
++  echo "$as_me:19210: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:19210: \"$ac_try\"") >&5
++  { (eval echo "$as_me:19213: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:19213: \$? = $ac_status" >&5
++  echo "$as_me:19216: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_dir_opendir=yes
+ else
+@@ -19221,14 +19224,14 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:19224: result: $ac_cv_lib_dir_opendir" >&5
++echo "$as_me:19227: 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:19231: checking for opendir in -lx" >&5
++  echo "$as_me:19234: 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
+@@ -19236,7 +19239,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lx  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 19239 "configure"
++#line 19242 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -19255,16 +19258,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:19258: \"$ac_link\"") >&5
++if { (eval echo "$as_me:19261: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:19261: \$? = $ac_status" >&5
++  echo "$as_me:19264: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:19264: \"$ac_try\"") >&5
++  { (eval echo "$as_me:19267: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:19267: \$? = $ac_status" >&5
++  echo "$as_me:19270: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_x_opendir=yes
+ else
+@@ -19275,7 +19278,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:19278: result: $ac_cv_lib_x_opendir" >&5
++echo "$as_me:19281: 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"
+@@ -19283,13 +19286,13 @@
+ 
+ fi
+ 
+-echo "$as_me:19286: checking whether time.h and sys/time.h may both be included" >&5
++echo "$as_me:19289: 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 19292 "configure"
++#line 19295 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ #include <sys/time.h>
+@@ -19305,16 +19308,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:19308: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:19311: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:19311: \$? = $ac_status" >&5
++  echo "$as_me:19314: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:19314: \"$ac_try\"") >&5
++  { (eval echo "$as_me:19317: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:19317: \$? = $ac_status" >&5
++  echo "$as_me:19320: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_header_time=yes
+ else
+@@ -19324,7 +19327,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:19327: result: $ac_cv_header_time" >&5
++echo "$as_me:19330: result: $ac_cv_header_time" >&5
+ echo "${ECHO_T}$ac_cv_header_time" >&6
+ if test $ac_cv_header_time = yes; then
+ 
+@@ -19339,7 +19342,7 @@
+ case "$host_os" in
+ (mingw*)
+ 	# -lsystre -ltre -lintl -liconv
+-	echo "$as_me:19342: checking for regcomp in -lsystre" >&5
++	echo "$as_me:19345: 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
+@@ -19347,7 +19350,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lsystre  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 19350 "configure"
++#line 19353 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -19366,16 +19369,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:19369: \"$ac_link\"") >&5
++if { (eval echo "$as_me:19372: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:19372: \$? = $ac_status" >&5
++  echo "$as_me:19375: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:19375: \"$ac_try\"") >&5
++  { (eval echo "$as_me:19378: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:19378: \$? = $ac_status" >&5
++  echo "$as_me:19381: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_systre_regcomp=yes
+ else
+@@ -19386,11 +19389,11 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:19389: result: $ac_cv_lib_systre_regcomp" >&5
++echo "$as_me:19392: 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:19393: checking for libiconv_open in -liconv" >&5
++		echo "$as_me:19396: 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
+@@ -19398,7 +19401,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-liconv  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 19401 "configure"
++#line 19404 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -19417,16 +19420,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:19420: \"$ac_link\"") >&5
++if { (eval echo "$as_me:19423: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:19423: \$? = $ac_status" >&5
++  echo "$as_me:19426: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:19426: \"$ac_try\"") >&5
++  { (eval echo "$as_me:19429: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:19429: \$? = $ac_status" >&5
++  echo "$as_me:19432: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_iconv_libiconv_open=yes
+ else
+@@ -19437,7 +19440,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:19440: result: $ac_cv_lib_iconv_libiconv_open" >&5
++echo "$as_me:19443: 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
+ 
+@@ -19459,7 +19462,7 @@
+ 
+ fi
+ 
+-		echo "$as_me:19462: checking for libintl_gettext in -lintl" >&5
++		echo "$as_me:19465: 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
+@@ -19467,7 +19470,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lintl  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 19470 "configure"
++#line 19473 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -19486,16 +19489,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:19489: \"$ac_link\"") >&5
++if { (eval echo "$as_me:19492: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:19492: \$? = $ac_status" >&5
++  echo "$as_me:19495: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:19495: \"$ac_try\"") >&5
++  { (eval echo "$as_me:19498: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:19498: \$? = $ac_status" >&5
++  echo "$as_me:19501: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_intl_libintl_gettext=yes
+ else
+@@ -19506,7 +19509,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:19509: result: $ac_cv_lib_intl_libintl_gettext" >&5
++echo "$as_me:19512: 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
+ 
+@@ -19528,7 +19531,7 @@
+ 
+ fi
+ 
+-		echo "$as_me:19531: checking for tre_regcomp in -ltre" >&5
++		echo "$as_me:19534: 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
+@@ -19536,7 +19539,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-ltre  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 19539 "configure"
++#line 19542 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -19555,16 +19558,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:19558: \"$ac_link\"") >&5
++if { (eval echo "$as_me:19561: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:19561: \$? = $ac_status" >&5
++  echo "$as_me:19564: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:19564: \"$ac_try\"") >&5
++  { (eval echo "$as_me:19567: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:19567: \$? = $ac_status" >&5
++  echo "$as_me:19570: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_tre_tre_regcomp=yes
+ else
+@@ -19575,7 +19578,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:19578: result: $ac_cv_lib_tre_tre_regcomp" >&5
++echo "$as_me:19581: 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
+ 
+@@ -19617,7 +19620,7 @@
+ 
+ else
+ 
+-		echo "$as_me:19620: checking for regcomp in -lgnurx" >&5
++		echo "$as_me:19623: 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
+@@ -19625,7 +19628,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lgnurx  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 19628 "configure"
++#line 19631 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -19644,16 +19647,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:19647: \"$ac_link\"") >&5
++if { (eval echo "$as_me:19650: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:19650: \$? = $ac_status" >&5
++  echo "$as_me:19653: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:19653: \"$ac_try\"") >&5
++  { (eval echo "$as_me:19656: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:19656: \$? = $ac_status" >&5
++  echo "$as_me:19659: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_gnurx_regcomp=yes
+ else
+@@ -19664,7 +19667,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:19667: result: $ac_cv_lib_gnurx_regcomp" >&5
++echo "$as_me:19670: 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
+ 
+@@ -19692,13 +19695,13 @@
+ 	;;
+ (*)
+ 	cf_regex_libs="regex re"
+-	echo "$as_me:19695: checking for regcomp" >&5
++	echo "$as_me:19698: 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 19701 "configure"
++#line 19704 "configure"
+ #include "confdefs.h"
+ #define regcomp autoconf_temporary
+ #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -19729,16 +19732,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:19732: \"$ac_link\"") >&5
++if { (eval echo "$as_me:19735: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:19735: \$? = $ac_status" >&5
++  echo "$as_me:19738: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:19738: \"$ac_try\"") >&5
++  { (eval echo "$as_me:19741: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:19741: \$? = $ac_status" >&5
++  echo "$as_me:19744: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_func_regcomp=yes
+ else
+@@ -19748,7 +19751,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:19751: result: $ac_cv_func_regcomp" >&5
++echo "$as_me:19754: 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
+@@ -19757,7 +19760,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:19760: checking for regcomp in -l$cf_regex_lib" >&5
++echo "$as_me:19763: 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
+@@ -19765,7 +19768,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-l$cf_regex_lib  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 19768 "configure"
++#line 19771 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -19784,16 +19787,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:19787: \"$ac_link\"") >&5
++if { (eval echo "$as_me:19790: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:19790: \$? = $ac_status" >&5
++  echo "$as_me:19793: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:19793: \"$ac_try\"") >&5
++  { (eval echo "$as_me:19796: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:19796: \$? = $ac_status" >&5
++  echo "$as_me:19799: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   eval "$as_ac_Lib=yes"
+ else
+@@ -19804,7 +19807,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:19807: result: `eval echo '${'"$as_ac_Lib"'}'`" >&5
++echo "$as_me:19810: 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
+ 
+@@ -19836,13 +19839,13 @@
+ esac
+ 
+ if test "$cf_regex_func" = no ; then
+-	echo "$as_me:19839: checking for compile" >&5
++	echo "$as_me:19842: 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 19845 "configure"
++#line 19848 "configure"
+ #include "confdefs.h"
+ #define compile autoconf_temporary
+ #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -19873,16 +19876,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:19876: \"$ac_link\"") >&5
++if { (eval echo "$as_me:19879: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:19879: \$? = $ac_status" >&5
++  echo "$as_me:19882: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:19882: \"$ac_try\"") >&5
++  { (eval echo "$as_me:19885: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:19885: \$? = $ac_status" >&5
++  echo "$as_me:19888: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_func_compile=yes
+ else
+@@ -19892,13 +19895,13 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:19895: result: $ac_cv_func_compile" >&5
++echo "$as_me:19898: 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:19901: checking for compile in -lgen" >&5
++		echo "$as_me:19904: 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
+@@ -19906,7 +19909,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lgen  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 19909 "configure"
++#line 19912 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -19925,16 +19928,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:19928: \"$ac_link\"") >&5
++if { (eval echo "$as_me:19931: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:19931: \$? = $ac_status" >&5
++  echo "$as_me:19934: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:19934: \"$ac_try\"") >&5
++  { (eval echo "$as_me:19937: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:19937: \$? = $ac_status" >&5
++  echo "$as_me:19940: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_gen_compile=yes
+ else
+@@ -19945,7 +19948,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:19948: result: $ac_cv_lib_gen_compile" >&5
++echo "$as_me:19951: 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
+ 
+@@ -19973,11 +19976,11 @@
+ fi
+ 
+ if test "$cf_regex_func" = no ; then
+-	{ echo "$as_me:19976: WARNING: cannot find regular expression library" >&5
++	{ echo "$as_me:19979: WARNING: cannot find regular expression library" >&5
+ echo "$as_me: WARNING: cannot find regular expression library" >&2;}
+ fi
+ 
+-echo "$as_me:19980: checking for regular-expression headers" >&5
++echo "$as_me:19983: 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
+@@ -19989,7 +19992,7 @@
+ 	for cf_regex_hdr in regexp.h regexpr.h
+ 	do
+ 		cat >"conftest.$ac_ext" <<_ACEOF
+-#line 19992 "configure"
++#line 19995 "configure"
+ #include "confdefs.h"
+ #include <$cf_regex_hdr>
+ int
+@@ -20006,16 +20009,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:20009: \"$ac_link\"") >&5
++if { (eval echo "$as_me:20012: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:20012: \$? = $ac_status" >&5
++  echo "$as_me:20015: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:20015: \"$ac_try\"") >&5
++  { (eval echo "$as_me:20018: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:20018: \$? = $ac_status" >&5
++  echo "$as_me:20021: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+ 
+ 			cf_cv_regex_hdrs=$cf_regex_hdr
+@@ -20032,7 +20035,7 @@
+ 	for cf_regex_hdr in regex.h
+ 	do
+ 		cat >"conftest.$ac_ext" <<_ACEOF
+-#line 20035 "configure"
++#line 20038 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ #include <$cf_regex_hdr>
+@@ -20052,16 +20055,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:20055: \"$ac_link\"") >&5
++if { (eval echo "$as_me:20058: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:20058: \$? = $ac_status" >&5
++  echo "$as_me:20061: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:20061: \"$ac_try\"") >&5
++  { (eval echo "$as_me:20064: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:20064: \$? = $ac_status" >&5
++  echo "$as_me:20067: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+ 
+ 			cf_cv_regex_hdrs=$cf_regex_hdr
+@@ -20077,11 +20080,11 @@
+ esac
+ 
+ fi
+-echo "$as_me:20080: result: $cf_cv_regex_hdrs" >&5
++echo "$as_me:20083: result: $cf_cv_regex_hdrs" >&5
+ echo "${ECHO_T}$cf_cv_regex_hdrs" >&6
+ 
+ case "$cf_cv_regex_hdrs" in
+-	(no)		{ echo "$as_me:20084: WARNING: no regular expression header found" >&5
++	(no)		{ echo "$as_me:20087: WARNING: no regular expression header found" >&5
+ echo "$as_me: WARNING: no regular expression header found" >&2;} ;;
+ 	(regex.h)
+ cat >>confdefs.h <<\EOF
+@@ -20118,23 +20121,23 @@
+ 
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-echo "$as_me:20121: checking for $ac_header" >&5
++echo "$as_me:20124: 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 20127 "configure"
++#line 20130 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:20131: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:20134: \"$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:20137: \$? = $ac_status" >&5
++  echo "$as_me:20140: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -20153,7 +20156,7 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:20156: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
++echo "$as_me:20159: 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
+@@ -20166,23 +20169,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:20169: checking for $ac_header" >&5
++echo "$as_me:20172: 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 20175 "configure"
++#line 20178 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:20179: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:20182: \"$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:20185: \$? = $ac_status" >&5
++  echo "$as_me:20188: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -20201,7 +20204,7 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:20204: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
++echo "$as_me:20207: 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
+@@ -20211,7 +20214,7 @@
+ fi
+ done
+ 
+-echo "$as_me:20214: checking for header declaring getopt variables" >&5
++echo "$as_me:20217: 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
+@@ -20221,7 +20224,7 @@
+ for cf_header in stdio.h stdlib.h unistd.h getopt.h
+ do
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 20224 "configure"
++#line 20227 "configure"
+ #include "confdefs.h"
+ 
+ #include <$cf_header>
+@@ -20234,16 +20237,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:20237: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:20240: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:20240: \$? = $ac_status" >&5
++  echo "$as_me:20243: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:20243: \"$ac_try\"") >&5
++  { (eval echo "$as_me:20246: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:20246: \$? = $ac_status" >&5
++  echo "$as_me:20249: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_getopt_header=$cf_header
+  break
+@@ -20255,7 +20258,7 @@
+ done
+ 
+ fi
+-echo "$as_me:20258: result: $cf_cv_getopt_header" >&5
++echo "$as_me:20261: result: $cf_cv_getopt_header" >&5
+ echo "${ECHO_T}$cf_cv_getopt_header" >&6
+ if test "$cf_cv_getopt_header" != none ; then
+ 
+@@ -20272,14 +20275,14 @@
+ 
+ fi
+ 
+-echo "$as_me:20275: checking if external environ is declared" >&5
++echo "$as_me:20278: 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 20282 "configure"
++#line 20285 "configure"
+ #include "confdefs.h"
+ 
+ #ifdef HAVE_STDLIB_H
+@@ -20295,16 +20298,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:20298: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:20301: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:20301: \$? = $ac_status" >&5
++  echo "$as_me:20304: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:20304: \"$ac_try\"") >&5
++  { (eval echo "$as_me:20307: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:20307: \$? = $ac_status" >&5
++  echo "$as_me:20310: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_dcl_environ=yes
+ else
+@@ -20315,7 +20318,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:20318: result: $cf_cv_dcl_environ" >&5
++echo "$as_me:20321: result: $cf_cv_dcl_environ" >&5
+ echo "${ECHO_T}$cf_cv_dcl_environ" >&6
+ 
+ if test "$cf_cv_dcl_environ" = no ; then
+@@ -20330,14 +20333,14 @@
+ 
+ # It's possible (for near-UNIX clones) that the data doesn't exist
+ 
+-echo "$as_me:20333: checking if external environ exists" >&5
++echo "$as_me:20336: 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 20340 "configure"
++#line 20343 "configure"
+ #include "confdefs.h"
+ 
+ #undef environ
+@@ -20352,16 +20355,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:20355: \"$ac_link\"") >&5
++if { (eval echo "$as_me:20358: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:20358: \$? = $ac_status" >&5
++  echo "$as_me:20361: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:20361: \"$ac_try\"") >&5
++  { (eval echo "$as_me:20364: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:20364: \$? = $ac_status" >&5
++  echo "$as_me:20367: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_have_environ=yes
+ else
+@@ -20372,7 +20375,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:20375: result: $cf_cv_have_environ" >&5
++echo "$as_me:20378: result: $cf_cv_have_environ" >&5
+ echo "${ECHO_T}$cf_cv_have_environ" >&6
+ 
+ if test "$cf_cv_have_environ" = yes ; then
+@@ -20385,13 +20388,13 @@
+ 
+ fi
+ 
+-echo "$as_me:20388: checking for getenv" >&5
++echo "$as_me:20391: 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 20394 "configure"
++#line 20397 "configure"
+ #include "confdefs.h"
+ #define getenv autoconf_temporary
+ #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -20422,16 +20425,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:20425: \"$ac_link\"") >&5
++if { (eval echo "$as_me:20428: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:20428: \$? = $ac_status" >&5
++  echo "$as_me:20431: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:20431: \"$ac_try\"") >&5
++  { (eval echo "$as_me:20434: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:20434: \$? = $ac_status" >&5
++  echo "$as_me:20437: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_func_getenv=yes
+ else
+@@ -20441,19 +20444,19 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:20444: result: $ac_cv_func_getenv" >&5
++echo "$as_me:20447: 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:20450: checking for $ac_func" >&5
++echo "$as_me:20453: 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 20456 "configure"
++#line 20459 "configure"
+ #include "confdefs.h"
+ #define $ac_func autoconf_temporary
+ #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -20484,16 +20487,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:20487: \"$ac_link\"") >&5
++if { (eval echo "$as_me:20490: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:20490: \$? = $ac_status" >&5
++  echo "$as_me:20493: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:20493: \"$ac_try\"") >&5
++  { (eval echo "$as_me:20496: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:20496: \$? = $ac_status" >&5
++  echo "$as_me:20499: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   eval "$as_ac_var=yes"
+ else
+@@ -20503,7 +20506,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:20506: result: `eval echo '${'"$as_ac_var"'}'`" >&5
++echo "$as_me:20509: 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
+@@ -20513,7 +20516,7 @@
+ fi
+ done
+ 
+-echo "$as_me:20516: checking if getenv returns consistent values" >&5
++echo "$as_me:20519: 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
+@@ -20523,7 +20526,7 @@
+   cf_cv_consistent_getenv=unknown
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 20526 "configure"
++#line 20529 "configure"
+ #include "confdefs.h"
+ 
+ #include <stdlib.h>
+@@ -20632,15 +20635,15 @@
+ 
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:20635: \"$ac_link\"") >&5
++if { (eval echo "$as_me:20638: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:20638: \$? = $ac_status" >&5
++  echo "$as_me:20641: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:20640: \"$ac_try\"") >&5
++  { (eval echo "$as_me:20643: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:20643: \$? = $ac_status" >&5
++  echo "$as_me:20646: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_consistent_getenv=yes
+ else
+@@ -20653,7 +20656,7 @@
+ fi
+ 
+ fi
+-echo "$as_me:20656: result: $cf_cv_consistent_getenv" >&5
++echo "$as_me:20659: result: $cf_cv_consistent_getenv" >&5
+ echo "${ECHO_T}$cf_cv_consistent_getenv" >&6
+ 
+ if test "x$cf_cv_consistent_getenv" = xno
+@@ -20668,18 +20671,18 @@
+ if test "x$cf_cv_consistent_getenv" = xno && \
+ 	test "x$cf_with_trace" = xyes
+ then
+-	{ echo "$as_me:20671: WARNING: The NCURSES_TRACE environment variable is not supported with this configuration" >&5
++	{ echo "$as_me:20674: 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:20675: checking if sys/time.h works with sys/select.h" >&5
++echo "$as_me:20678: 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 20682 "configure"
++#line 20685 "configure"
+ #include "confdefs.h"
+ 
+ #include <sys/types.h>
+@@ -20699,16 +20702,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:20702: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:20705: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:20705: \$? = $ac_status" >&5
++  echo "$as_me:20708: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:20708: \"$ac_try\"") >&5
++  { (eval echo "$as_me:20711: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:20711: \$? = $ac_status" >&5
++  echo "$as_me:20714: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_sys_time_select=yes
+ else
+@@ -20720,7 +20723,7 @@
+ 
+ fi
+ 
+-echo "$as_me:20723: result: $cf_cv_sys_time_select" >&5
++echo "$as_me:20726: 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
+@@ -20735,13 +20738,13 @@
+ ac_compiler_gnu=$ac_cv_c_compiler_gnu
+ ac_main_return="return"
+ 
+-echo "$as_me:20738: checking for an ANSI C-conforming const" >&5
++echo "$as_me:20741: 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 20744 "configure"
++#line 20747 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -20799,16 +20802,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:20802: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:20805: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:20805: \$? = $ac_status" >&5
++  echo "$as_me:20808: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:20808: \"$ac_try\"") >&5
++  { (eval echo "$as_me:20811: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:20811: \$? = $ac_status" >&5
++  echo "$as_me:20814: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_c_const=yes
+ else
+@@ -20818,7 +20821,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:20821: result: $ac_cv_c_const" >&5
++echo "$as_me:20824: result: $ac_cv_c_const" >&5
+ echo "${ECHO_T}$ac_cv_c_const" >&6
+ if test $ac_cv_c_const = no; then
+ 
+@@ -20828,7 +20831,7 @@
+ 
+ fi
+ 
+-echo "$as_me:20831: checking for inline" >&5
++echo "$as_me:20834: 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
+@@ -20836,7 +20839,7 @@
+   ac_cv_c_inline=no
+ for ac_kw in inline __inline__ __inline; do
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 20839 "configure"
++#line 20842 "configure"
+ #include "confdefs.h"
+ #ifndef __cplusplus
+ static $ac_kw int static_foo () {return 0; }
+@@ -20845,16 +20848,16 @@
+ 
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:20848: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:20851: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:20851: \$? = $ac_status" >&5
++  echo "$as_me:20854: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:20854: \"$ac_try\"") >&5
++  { (eval echo "$as_me:20857: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:20857: \$? = $ac_status" >&5
++  echo "$as_me:20860: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_c_inline=$ac_kw; break
+ else
+@@ -20865,7 +20868,7 @@
+ done
+ 
+ fi
+-echo "$as_me:20868: result: $ac_cv_c_inline" >&5
++echo "$as_me:20871: result: $ac_cv_c_inline" >&5
+ echo "${ECHO_T}$ac_cv_c_inline" >&6
+ case $ac_cv_c_inline in
+   inline | yes) ;;
+@@ -20891,7 +20894,7 @@
+ 		:
+ 	elif test "$GCC" = yes
+ 	then
+-		echo "$as_me:20894: checking if $CC supports options to tune inlining" >&5
++		echo "$as_me:20897: 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
+@@ -20900,7 +20903,7 @@
+ 		cf_save_CFLAGS=$CFLAGS
+ 		CFLAGS="$CFLAGS --param max-inline-insns-single=1200"
+ 		cat >"conftest.$ac_ext" <<_ACEOF
+-#line 20903 "configure"
++#line 20906 "configure"
+ #include "confdefs.h"
+ inline int foo(void) { return 1; }
+ int
+@@ -20912,16 +20915,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:20915: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:20918: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:20918: \$? = $ac_status" >&5
++  echo "$as_me:20921: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:20921: \"$ac_try\"") >&5
++  { (eval echo "$as_me:20924: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:20924: \$? = $ac_status" >&5
++  echo "$as_me:20927: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_gcc_inline=yes
+ else
+@@ -20933,7 +20936,7 @@
+ 		CFLAGS=$cf_save_CFLAGS
+ 
+ fi
+-echo "$as_me:20936: result: $cf_cv_gcc_inline" >&5
++echo "$as_me:20939: result: $cf_cv_gcc_inline" >&5
+ echo "${ECHO_T}$cf_cv_gcc_inline" >&6
+ 		if test "$cf_cv_gcc_inline" = yes ; then
+ 
+@@ -21039,7 +21042,7 @@
+ 	fi
+ fi
+ 
+-echo "$as_me:21042: checking for signal global datatype" >&5
++echo "$as_me:21045: 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
+@@ -21051,7 +21054,7 @@
+ 		"int"
+ 	do
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 21054 "configure"
++#line 21057 "configure"
+ #include "confdefs.h"
+ 
+ #include <sys/types.h>
+@@ -21075,16 +21078,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:21078: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:21081: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:21081: \$? = $ac_status" >&5
++  echo "$as_me:21084: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:21084: \"$ac_try\"") >&5
++  { (eval echo "$as_me:21087: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:21087: \$? = $ac_status" >&5
++  echo "$as_me:21090: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_sig_atomic_t=$cf_type
+ else
+@@ -21098,7 +21101,7 @@
+ 
+ fi
+ 
+-echo "$as_me:21101: result: $cf_cv_sig_atomic_t" >&5
++echo "$as_me:21104: 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
+@@ -21107,7 +21110,7 @@
+ 
+ if test "$NCURSES_CHTYPE" = auto ; then
+ 
+-echo "$as_me:21110: checking for type of chtype" >&5
++echo "$as_me:21113: 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
+@@ -21117,7 +21120,7 @@
+   cf_cv_typeof_chtype=long
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 21120 "configure"
++#line 21123 "configure"
+ #include "confdefs.h"
+ 
+ #define WANT_BITS 31
+@@ -21152,15 +21155,15 @@
+ 
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:21155: \"$ac_link\"") >&5
++if { (eval echo "$as_me:21158: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:21158: \$? = $ac_status" >&5
++  echo "$as_me:21161: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:21160: \"$ac_try\"") >&5
++  { (eval echo "$as_me:21163: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:21163: \$? = $ac_status" >&5
++  echo "$as_me:21166: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_typeof_chtype=`cat cf_test.out`
+ else
+@@ -21175,7 +21178,7 @@
+ 
+ fi
+ 
+-echo "$as_me:21178: result: $cf_cv_typeof_chtype" >&5
++echo "$as_me:21181: result: $cf_cv_typeof_chtype" >&5
+ echo "${ECHO_T}$cf_cv_typeof_chtype" >&6
+ 
+ cat >>confdefs.h <<EOF
+@@ -21187,14 +21190,14 @@
+ fi
+ test "$cf_cv_typeof_chtype" = unsigned && cf_cv_typeof_chtype=""
+ 
+-echo "$as_me:21190: checking if unsigned literals are legal" >&5
++echo "$as_me:21193: 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 21197 "configure"
++#line 21200 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -21206,16 +21209,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:21209: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:21212: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:21212: \$? = $ac_status" >&5
++  echo "$as_me:21215: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:21215: \"$ac_try\"") >&5
++  { (eval echo "$as_me:21218: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:21218: \$? = $ac_status" >&5
++  echo "$as_me:21221: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_unsigned_literals=yes
+ else
+@@ -21227,7 +21230,7 @@
+ 
+ fi
+ 
+-echo "$as_me:21230: result: $cf_cv_unsigned_literals" >&5
++echo "$as_me:21233: result: $cf_cv_unsigned_literals" >&5
+ echo "${ECHO_T}$cf_cv_unsigned_literals" >&6
+ 
+ cf_cv_1UL="1"
+@@ -21243,14 +21246,14 @@
+ 
+ ###	Checks for external-data
+ 
+-echo "$as_me:21246: checking if external errno is declared" >&5
++echo "$as_me:21249: 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 21253 "configure"
++#line 21256 "configure"
+ #include "confdefs.h"
+ 
+ #ifdef HAVE_STDLIB_H
+@@ -21268,16 +21271,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:21271: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:21274: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:21274: \$? = $ac_status" >&5
++  echo "$as_me:21277: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:21277: \"$ac_try\"") >&5
++  { (eval echo "$as_me:21280: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:21280: \$? = $ac_status" >&5
++  echo "$as_me:21283: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_dcl_errno=yes
+ else
+@@ -21288,7 +21291,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:21291: result: $cf_cv_dcl_errno" >&5
++echo "$as_me:21294: result: $cf_cv_dcl_errno" >&5
+ echo "${ECHO_T}$cf_cv_dcl_errno" >&6
+ 
+ if test "$cf_cv_dcl_errno" = no ; then
+@@ -21303,14 +21306,14 @@
+ 
+ # It's possible (for near-UNIX clones) that the data doesn't exist
+ 
+-echo "$as_me:21306: checking if external errno exists" >&5
++echo "$as_me:21309: 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 21313 "configure"
++#line 21316 "configure"
+ #include "confdefs.h"
+ 
+ #undef errno
+@@ -21325,16 +21328,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:21328: \"$ac_link\"") >&5
++if { (eval echo "$as_me:21331: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:21331: \$? = $ac_status" >&5
++  echo "$as_me:21334: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:21334: \"$ac_try\"") >&5
++  { (eval echo "$as_me:21337: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:21337: \$? = $ac_status" >&5
++  echo "$as_me:21340: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_have_errno=yes
+ else
+@@ -21345,7 +21348,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:21348: result: $cf_cv_have_errno" >&5
++echo "$as_me:21351: result: $cf_cv_have_errno" >&5
+ echo "${ECHO_T}$cf_cv_have_errno" >&6
+ 
+ if test "$cf_cv_have_errno" = yes ; then
+@@ -21358,7 +21361,7 @@
+ 
+ fi
+ 
+-echo "$as_me:21361: checking if data-only library module links" >&5
++echo "$as_me:21364: 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
+@@ -21366,20 +21369,20 @@
+ 
+ 	rm -f conftest.a
+ 	cat >conftest.$ac_ext <<EOF
+-#line 21369 "configure"
++#line 21372 "configure"
+ int	testdata[3] = { 123, 456, 789 };
+ EOF
+-	if { (eval echo "$as_me:21372: \"$ac_compile\"") >&5
++	if { (eval echo "$as_me:21375: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:21375: \$? = $ac_status" >&5
++  echo "$as_me:21378: \$? = $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 21382 "configure"
++#line 21385 "configure"
+ int	testfunc(void)
+ {
+ #if defined(NeXT)
+@@ -21392,10 +21395,10 @@
+ #endif
+ }
+ EOF
+-	if { (eval echo "$as_me:21395: \"$ac_compile\"") >&5
++	if { (eval echo "$as_me:21398: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:21398: \$? = $ac_status" >&5
++  echo "$as_me:21401: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; then
+ 		mv conftest.o func.o && \
+ 		( $AR $ARFLAGS conftest.a func.o ) 2>&5 1>/dev/null
+@@ -21408,7 +21411,7 @@
+   cf_cv_link_dataonly=unknown
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 21411 "configure"
++#line 21414 "configure"
+ #include "confdefs.h"
+ 
+ 	int main(void)
+@@ -21419,15 +21422,15 @@
+ 
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:21422: \"$ac_link\"") >&5
++if { (eval echo "$as_me:21425: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:21425: \$? = $ac_status" >&5
++  echo "$as_me:21428: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:21427: \"$ac_try\"") >&5
++  { (eval echo "$as_me:21430: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:21430: \$? = $ac_status" >&5
++  echo "$as_me:21433: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_link_dataonly=yes
+ else
+@@ -21442,7 +21445,7 @@
+ 
+ fi
+ 
+-echo "$as_me:21445: result: $cf_cv_link_dataonly" >&5
++echo "$as_me:21448: result: $cf_cv_link_dataonly" >&5
+ echo "${ECHO_T}$cf_cv_link_dataonly" >&6
+ 
+ if test "$cf_cv_link_dataonly" = no ; then
+@@ -21485,13 +21488,13 @@
+ 
+ do
+ as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+-echo "$as_me:21488: checking for $ac_func" >&5
++echo "$as_me:21491: 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 21494 "configure"
++#line 21497 "configure"
+ #include "confdefs.h"
+ #define $ac_func autoconf_temporary
+ #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -21522,16 +21525,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:21525: \"$ac_link\"") >&5
++if { (eval echo "$as_me:21528: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:21528: \$? = $ac_status" >&5
++  echo "$as_me:21531: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:21531: \"$ac_try\"") >&5
++  { (eval echo "$as_me:21534: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:21534: \$? = $ac_status" >&5
++  echo "$as_me:21537: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   eval "$as_ac_var=yes"
+ else
+@@ -21541,7 +21544,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:21544: result: `eval echo '${'"$as_ac_var"'}'`" >&5
++echo "$as_me:21547: 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
+@@ -21551,14 +21554,14 @@
+ fi
+ done
+ 
+-echo "$as_me:21554: checking if _PATH_TTYS is defined in ttyent.h" >&5
++echo "$as_me:21557: 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 21561 "configure"
++#line 21564 "configure"
+ #include "confdefs.h"
+ 
+ #include <stdio.h>
+@@ -21573,16 +21576,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:21576: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:21579: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:21579: \$? = $ac_status" >&5
++  echo "$as_me:21582: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:21582: \"$ac_try\"") >&5
++  { (eval echo "$as_me:21585: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:21585: \$? = $ac_status" >&5
++  echo "$as_me:21588: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_PATH_TTYS=yes
+ else
+@@ -21592,7 +21595,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:21595: result: $cf_cv_PATH_TTYS" >&5
++echo "$as_me:21598: result: $cf_cv_PATH_TTYS" >&5
+ echo "${ECHO_T}$cf_cv_PATH_TTYS" >&6
+ 
+ if test $cf_cv_PATH_TTYS = no
+@@ -21614,7 +21617,7 @@
+ 
+ if test $cf_cv_PATH_TTYS != no
+ then
+-	echo "$as_me:21617: checking if _PATH_TTYS file exists" >&5
++	echo "$as_me:21620: 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
+@@ -21624,7 +21627,7 @@
+   cf_cv_have_PATH_TTYS=unknown
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 21627 "configure"
++#line 21630 "configure"
+ #include "confdefs.h"
+ 
+ #include <stdio.h>
+@@ -21635,15 +21638,15 @@
+ }
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:21638: \"$ac_link\"") >&5
++if { (eval echo "$as_me:21641: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:21641: \$? = $ac_status" >&5
++  echo "$as_me:21644: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:21643: \"$ac_try\"") >&5
++  { (eval echo "$as_me:21646: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:21646: \$? = $ac_status" >&5
++  echo "$as_me:21649: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_have_PATH_TTYS=yes
+ else
+@@ -21655,7 +21658,7 @@
+ rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+ fi
+-echo "$as_me:21658: result: $cf_cv_have_PATH_TTYS" >&5
++echo "$as_me:21661: 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
+@@ -21667,14 +21670,14 @@
+ #define HAVE_PATH_TTYS 1
+ EOF
+ 
+-	echo "$as_me:21670: checking for getttynam" >&5
++	echo "$as_me:21673: 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 21677 "configure"
++#line 21680 "configure"
+ #include "confdefs.h"
+ #include <ttyent.h>
+ int
+@@ -21686,16 +21689,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:21689: \"$ac_link\"") >&5
++if { (eval echo "$as_me:21692: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:21692: \$? = $ac_status" >&5
++  echo "$as_me:21695: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:21695: \"$ac_try\"") >&5
++  { (eval echo "$as_me:21698: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:21698: \$? = $ac_status" >&5
++  echo "$as_me:21701: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_func_getttynam=yes
+ else
+@@ -21705,7 +21708,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:21708: result: $cf_cv_func_getttynam" >&5
++echo "$as_me:21711: 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
+@@ -21715,7 +21718,7 @@
+ 
+ if test "x$ac_cv_func_getopt" = xno && \
+    test "x$cf_with_progs$cf_with_tests" != xnono; then
+-	{ { echo "$as_me:21718: error: getopt is required for building programs" >&5
++	{ { echo "$as_me:21721: error: getopt is required for building programs" >&5
+ echo "$as_me: error: getopt is required for building programs" >&2;}
+    { (exit 1); exit 1; }; }
+ fi
+@@ -21724,7 +21727,7 @@
+ then
+ 	if test "x$ac_cv_func_vsnprintf" = xyes
+ 	then
+-		{ echo "$as_me:21727: WARNING: will use vsnprintf instead of safe-sprintf option" >&5
++		{ echo "$as_me:21730: WARNING: will use vsnprintf instead of safe-sprintf option" >&5
+ echo "$as_me: WARNING: will use vsnprintf instead of safe-sprintf option" >&2;}
+ 	else
+ 
+@@ -21737,14 +21740,14 @@
+ 
+ if test "x$with_getcap" = "xyes" ; then
+ 
+-echo "$as_me:21740: checking for terminal-capability database functions" >&5
++echo "$as_me:21743: 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 21747 "configure"
++#line 21750 "configure"
+ #include "confdefs.h"
+ 
+ #include <stdlib.h>
+@@ -21764,16 +21767,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:21767: \"$ac_link\"") >&5
++if { (eval echo "$as_me:21770: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:21770: \$? = $ac_status" >&5
++  echo "$as_me:21773: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:21773: \"$ac_try\"") >&5
++  { (eval echo "$as_me:21776: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:21776: \$? = $ac_status" >&5
++  echo "$as_me:21779: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_cgetent=yes
+ else
+@@ -21784,7 +21787,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:21787: result: $cf_cv_cgetent" >&5
++echo "$as_me:21790: result: $cf_cv_cgetent" >&5
+ echo "${ECHO_T}$cf_cv_cgetent" >&6
+ 
+ if test "$cf_cv_cgetent" = yes
+@@ -21794,14 +21797,14 @@
+ #define HAVE_BSD_CGETENT 1
+ EOF
+ 
+-echo "$as_me:21797: checking if cgetent uses const parameter" >&5
++echo "$as_me:21800: 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 21804 "configure"
++#line 21807 "configure"
+ #include "confdefs.h"
+ 
+ #pragma GCC diagnostic error "-Wincompatible-pointer-types-discards-qualifiers"
+@@ -21824,16 +21827,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:21827: \"$ac_link\"") >&5
++if { (eval echo "$as_me:21830: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:21830: \$? = $ac_status" >&5
++  echo "$as_me:21833: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:21833: \"$ac_try\"") >&5
++  { (eval echo "$as_me:21836: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:21836: \$? = $ac_status" >&5
++  echo "$as_me:21839: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_cgetent_const=yes
+ else
+@@ -21844,7 +21847,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:21847: result: $cf_cv_cgetent_const" >&5
++echo "$as_me:21850: result: $cf_cv_cgetent_const" >&5
+ echo "${ECHO_T}$cf_cv_cgetent_const" >&6
+ 	if test "$cf_cv_cgetent_const" = yes
+ 	then
+@@ -21858,14 +21861,14 @@
+ 
+ fi
+ 
+-echo "$as_me:21861: checking for isascii" >&5
++echo "$as_me:21864: 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 21868 "configure"
++#line 21871 "configure"
+ #include "confdefs.h"
+ #include <ctype.h>
+ int
+@@ -21877,16 +21880,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:21880: \"$ac_link\"") >&5
++if { (eval echo "$as_me:21883: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:21883: \$? = $ac_status" >&5
++  echo "$as_me:21886: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:21886: \"$ac_try\"") >&5
++  { (eval echo "$as_me:21889: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:21889: \$? = $ac_status" >&5
++  echo "$as_me:21892: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_have_isascii=yes
+ else
+@@ -21897,7 +21900,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:21900: result: $cf_cv_have_isascii" >&5
++echo "$as_me:21903: result: $cf_cv_have_isascii" >&5
+ echo "${ECHO_T}$cf_cv_have_isascii" >&6
+ test "$cf_cv_have_isascii" = yes &&
+ cat >>confdefs.h <<\EOF
+@@ -21905,10 +21908,10 @@
+ EOF
+ 
+ if test "$ac_cv_func_sigaction" = yes; then
+-echo "$as_me:21908: checking whether sigaction needs _POSIX_SOURCE" >&5
++echo "$as_me:21911: 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 21911 "configure"
++#line 21914 "configure"
+ #include "confdefs.h"
+ 
+ #include <sys/types.h>
+@@ -21922,16 +21925,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:21925: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:21928: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:21928: \$? = $ac_status" >&5
++  echo "$as_me:21931: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:21931: \"$ac_try\"") >&5
++  { (eval echo "$as_me:21934: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:21934: \$? = $ac_status" >&5
++  echo "$as_me:21937: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   sigact_bad=no
+ else
+@@ -21939,7 +21942,7 @@
+ cat "conftest.$ac_ext" >&5
+ 
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 21942 "configure"
++#line 21945 "configure"
+ #include "confdefs.h"
+ 
+ #define _POSIX_SOURCE
+@@ -21954,16 +21957,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:21957: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:21960: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:21960: \$? = $ac_status" >&5
++  echo "$as_me:21963: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:21963: \"$ac_try\"") >&5
++  { (eval echo "$as_me:21966: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:21966: \$? = $ac_status" >&5
++  echo "$as_me:21969: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   sigact_bad=yes
+ 
+@@ -21979,11 +21982,11 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+-echo "$as_me:21982: result: $sigact_bad" >&5
++echo "$as_me:21985: result: $sigact_bad" >&5
+ echo "${ECHO_T}$sigact_bad" >&6
+ fi
+ 
+-echo "$as_me:21986: checking if nanosleep really works" >&5
++echo "$as_me:21989: 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
+@@ -21993,7 +21996,7 @@
+   cf_cv_func_nanosleep=unknown
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 21996 "configure"
++#line 21999 "configure"
+ #include "confdefs.h"
+ 
+ #include <stdio.h>
+@@ -22018,15 +22021,15 @@
+ 
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:22021: \"$ac_link\"") >&5
++if { (eval echo "$as_me:22024: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:22024: \$? = $ac_status" >&5
++  echo "$as_me:22027: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:22026: \"$ac_try\"") >&5
++  { (eval echo "$as_me:22029: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:22029: \$? = $ac_status" >&5
++  echo "$as_me:22032: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_func_nanosleep=yes
+ else
+@@ -22038,7 +22041,7 @@
+ rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+ fi
+-echo "$as_me:22041: result: $cf_cv_func_nanosleep" >&5
++echo "$as_me:22044: result: $cf_cv_func_nanosleep" >&5
+ echo "${ECHO_T}$cf_cv_func_nanosleep" >&6
+ 
+ test "$cf_cv_func_nanosleep" = "yes" &&
+@@ -22055,23 +22058,23 @@
+ 
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-echo "$as_me:22058: checking for $ac_header" >&5
++echo "$as_me:22061: 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 22064 "configure"
++#line 22067 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:22068: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:22071: \"$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:22074: \$? = $ac_status" >&5
++  echo "$as_me:22077: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -22090,7 +22093,7 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:22093: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
++echo "$as_me:22096: 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
+@@ -22107,10 +22110,10 @@
+ 	(*)	termios_bad=maybe ;;
+ 	esac
+ 	if test "$termios_bad" = maybe ; then
+-	echo "$as_me:22110: checking whether termios.h needs _POSIX_SOURCE" >&5
++	echo "$as_me:22113: 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 22113 "configure"
++#line 22116 "configure"
+ #include "confdefs.h"
+ #include <termios.h>
+ int
+@@ -22122,16 +22125,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:22125: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:22128: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:22128: \$? = $ac_status" >&5
++  echo "$as_me:22131: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:22131: \"$ac_try\"") >&5
++  { (eval echo "$as_me:22134: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:22134: \$? = $ac_status" >&5
++  echo "$as_me:22137: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   termios_bad=no
+ else
+@@ -22139,7 +22142,7 @@
+ cat "conftest.$ac_ext" >&5
+ 
+ 		cat >"conftest.$ac_ext" <<_ACEOF
+-#line 22142 "configure"
++#line 22145 "configure"
+ #include "confdefs.h"
+ 
+ #define _POSIX_SOURCE
+@@ -22153,16 +22156,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:22156: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:22159: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:22159: \$? = $ac_status" >&5
++  echo "$as_me:22162: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:22162: \"$ac_try\"") >&5
++  { (eval echo "$as_me:22165: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:22165: \$? = $ac_status" >&5
++  echo "$as_me:22168: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   termios_bad=unknown
+ else
+@@ -22178,19 +22181,19 @@
+ 
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+-	echo "$as_me:22181: result: $termios_bad" >&5
++	echo "$as_me:22184: result: $termios_bad" >&5
+ echo "${ECHO_T}$termios_bad" >&6
+ 	fi
+ fi
+ 
+-echo "$as_me:22186: checking for tcgetattr" >&5
++echo "$as_me:22189: 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 22193 "configure"
++#line 22196 "configure"
+ #include "confdefs.h"
+ 
+ #include <sys/types.h>
+@@ -22218,16 +22221,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:22221: \"$ac_link\"") >&5
++if { (eval echo "$as_me:22224: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:22224: \$? = $ac_status" >&5
++  echo "$as_me:22227: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:22227: \"$ac_try\"") >&5
++  { (eval echo "$as_me:22230: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:22230: \$? = $ac_status" >&5
++  echo "$as_me:22233: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_have_tcgetattr=yes
+ else
+@@ -22237,21 +22240,21 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:22240: result: $cf_cv_have_tcgetattr" >&5
++echo "$as_me:22243: 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:22247: checking for vsscanf function or workaround" >&5
++echo "$as_me:22250: 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 22254 "configure"
++#line 22257 "configure"
+ #include "confdefs.h"
+ 
+ #include <stdarg.h>
+@@ -22267,16 +22270,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:22270: \"$ac_link\"") >&5
++if { (eval echo "$as_me:22273: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:22273: \$? = $ac_status" >&5
++  echo "$as_me:22276: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:22276: \"$ac_try\"") >&5
++  { (eval echo "$as_me:22279: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:22279: \$? = $ac_status" >&5
++  echo "$as_me:22282: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_func_vsscanf=vsscanf
+ else
+@@ -22284,7 +22287,7 @@
+ cat "conftest.$ac_ext" >&5
+ 
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 22287 "configure"
++#line 22290 "configure"
+ #include "confdefs.h"
+ 
+ #include <stdarg.h>
+@@ -22306,16 +22309,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:22309: \"$ac_link\"") >&5
++if { (eval echo "$as_me:22312: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:22312: \$? = $ac_status" >&5
++  echo "$as_me:22315: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:22315: \"$ac_try\"") >&5
++  { (eval echo "$as_me:22318: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:22318: \$? = $ac_status" >&5
++  echo "$as_me:22321: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_func_vsscanf=vfscanf
+ else
+@@ -22323,7 +22326,7 @@
+ cat "conftest.$ac_ext" >&5
+ 
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 22326 "configure"
++#line 22329 "configure"
+ #include "confdefs.h"
+ 
+ #include <stdarg.h>
+@@ -22345,16 +22348,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:22348: \"$ac_link\"") >&5
++if { (eval echo "$as_me:22351: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:22351: \$? = $ac_status" >&5
++  echo "$as_me:22354: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:22354: \"$ac_try\"") >&5
++  { (eval echo "$as_me:22357: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:22357: \$? = $ac_status" >&5
++  echo "$as_me:22360: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_func_vsscanf=_doscan
+ else
+@@ -22369,7 +22372,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:22372: result: $cf_cv_func_vsscanf" >&5
++echo "$as_me:22375: result: $cf_cv_func_vsscanf" >&5
+ echo "${ECHO_T}$cf_cv_func_vsscanf" >&6
+ 
+ case "$cf_cv_func_vsscanf" in
+@@ -22395,23 +22398,23 @@
+ 
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-echo "$as_me:22398: checking for $ac_header" >&5
++echo "$as_me:22401: 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 22404 "configure"
++#line 22407 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:22408: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:22411: \"$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:22414: \$? = $ac_status" >&5
++  echo "$as_me:22417: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -22430,7 +22433,7 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:22433: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
++echo "$as_me:22436: 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
+@@ -22440,7 +22443,7 @@
+ fi
+ done
+ 
+-echo "$as_me:22443: checking for working mkstemp" >&5
++echo "$as_me:22446: 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
+@@ -22451,7 +22454,7 @@
+   cf_cv_func_mkstemp=maybe
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 22454 "configure"
++#line 22457 "configure"
+ #include "confdefs.h"
+ 
+ #include <sys/types.h>
+@@ -22492,15 +22495,15 @@
+ 
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:22495: \"$ac_link\"") >&5
++if { (eval echo "$as_me:22498: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:22498: \$? = $ac_status" >&5
++  echo "$as_me:22501: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:22500: \"$ac_try\"") >&5
++  { (eval echo "$as_me:22503: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:22503: \$? = $ac_status" >&5
++  echo "$as_me:22506: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_func_mkstemp=yes
+ 
+@@ -22515,16 +22518,16 @@
+ fi
+ 
+ fi
+-echo "$as_me:22518: result: $cf_cv_func_mkstemp" >&5
++echo "$as_me:22521: 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:22521: checking for mkstemp" >&5
++	echo "$as_me:22524: 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 22527 "configure"
++#line 22530 "configure"
+ #include "confdefs.h"
+ #define mkstemp autoconf_temporary
+ #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -22555,16 +22558,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:22558: \"$ac_link\"") >&5
++if { (eval echo "$as_me:22561: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:22561: \$? = $ac_status" >&5
++  echo "$as_me:22564: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:22564: \"$ac_try\"") >&5
++  { (eval echo "$as_me:22567: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:22567: \$? = $ac_status" >&5
++  echo "$as_me:22570: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_func_mkstemp=yes
+ else
+@@ -22574,7 +22577,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:22577: result: $ac_cv_func_mkstemp" >&5
++echo "$as_me:22580: result: $ac_cv_func_mkstemp" >&5
+ echo "${ECHO_T}$ac_cv_func_mkstemp" >&6
+ 
+ fi
+@@ -22595,21 +22598,21 @@
+ fi
+ 
+ if test "x$cross_compiling" = xyes ; then
+-	{ echo "$as_me:22598: WARNING: cross compiling: assume setvbuf params not reversed" >&5
++	{ echo "$as_me:22601: 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:22601: checking whether setvbuf arguments are reversed" >&5
++	echo "$as_me:22604: 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:22607: error: cannot run test program while cross compiling" >&5
++  { { echo "$as_me:22610: 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 22612 "configure"
++#line 22615 "configure"
+ #include "confdefs.h"
+ #include <stdio.h>
+ /* If setvbuf has the reversed format, exit 0. */
+@@ -22626,15 +22629,15 @@
+ }
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:22629: \"$ac_link\"") >&5
++if { (eval echo "$as_me:22632: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:22632: \$? = $ac_status" >&5
++  echo "$as_me:22635: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:22634: \"$ac_try\"") >&5
++  { (eval echo "$as_me:22637: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:22637: \$? = $ac_status" >&5
++  echo "$as_me:22640: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_func_setvbuf_reversed=yes
+ else
+@@ -22647,7 +22650,7 @@
+ fi
+ rm -f core ./core.* ./*.core
+ fi
+-echo "$as_me:22650: result: $ac_cv_func_setvbuf_reversed" >&5
++echo "$as_me:22653: 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
+ 
+@@ -22658,13 +22661,13 @@
+ fi
+ 
+ fi
+-echo "$as_me:22661: checking for intptr_t" >&5
++echo "$as_me:22664: 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 22667 "configure"
++#line 22670 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -22679,16 +22682,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:22682: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:22685: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:22685: \$? = $ac_status" >&5
++  echo "$as_me:22688: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:22688: \"$ac_try\"") >&5
++  { (eval echo "$as_me:22691: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:22691: \$? = $ac_status" >&5
++  echo "$as_me:22694: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_type_intptr_t=yes
+ else
+@@ -22698,7 +22701,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:22701: result: $ac_cv_type_intptr_t" >&5
++echo "$as_me:22704: 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
+   :
+@@ -22710,13 +22713,13 @@
+ 
+ fi
+ 
+-echo "$as_me:22713: checking for ssize_t" >&5
++echo "$as_me:22716: 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 22719 "configure"
++#line 22722 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -22731,16 +22734,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:22734: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:22737: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:22737: \$? = $ac_status" >&5
++  echo "$as_me:22740: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:22740: \"$ac_try\"") >&5
++  { (eval echo "$as_me:22743: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:22743: \$? = $ac_status" >&5
++  echo "$as_me:22746: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_type_ssize_t=yes
+ else
+@@ -22750,7 +22753,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:22753: result: $ac_cv_type_ssize_t" >&5
++echo "$as_me:22756: 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
+   :
+@@ -22762,14 +22765,14 @@
+ 
+ fi
+ 
+-echo "$as_me:22765: checking for type sigaction_t" >&5
++echo "$as_me:22768: 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 22772 "configure"
++#line 22775 "configure"
+ #include "confdefs.h"
+ 
+ #include <signal.h>
+@@ -22782,16 +22785,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:22785: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:22788: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:22788: \$? = $ac_status" >&5
++  echo "$as_me:22791: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:22791: \"$ac_try\"") >&5
++  { (eval echo "$as_me:22794: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:22794: \$? = $ac_status" >&5
++  echo "$as_me:22797: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_type_sigaction=yes
+ else
+@@ -22802,14 +22805,14 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+ 
+-echo "$as_me:22805: result: $cf_cv_type_sigaction" >&5
++echo "$as_me:22808: 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:22812: checking declaration of size-change" >&5
++echo "$as_me:22815: 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
+@@ -22830,7 +22833,7 @@
+ 
+ 	fi
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 22833 "configure"
++#line 22836 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ #ifdef HAVE_TERMIOS_H
+@@ -22880,16 +22883,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:22883: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:22886: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:22886: \$? = $ac_status" >&5
++  echo "$as_me:22889: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:22889: \"$ac_try\"") >&5
++  { (eval echo "$as_me:22892: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:22892: \$? = $ac_status" >&5
++  echo "$as_me:22895: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_sizechange=yes
+ else
+@@ -22908,7 +22911,7 @@
+ done
+ 
+ fi
+-echo "$as_me:22911: result: $cf_cv_sizechange" >&5
++echo "$as_me:22914: result: $cf_cv_sizechange" >&5
+ echo "${ECHO_T}$cf_cv_sizechange" >&6
+ if test "$cf_cv_sizechange" != no ; then
+ 
+@@ -22926,13 +22929,13 @@
+ 	esac
+ fi
+ 
+-echo "$as_me:22929: checking for memmove" >&5
++echo "$as_me:22932: 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 22935 "configure"
++#line 22938 "configure"
+ #include "confdefs.h"
+ #define memmove autoconf_temporary
+ #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -22963,16 +22966,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:22966: \"$ac_link\"") >&5
++if { (eval echo "$as_me:22969: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:22969: \$? = $ac_status" >&5
++  echo "$as_me:22972: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:22972: \"$ac_try\"") >&5
++  { (eval echo "$as_me:22975: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:22975: \$? = $ac_status" >&5
++  echo "$as_me:22978: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_func_memmove=yes
+ else
+@@ -22982,19 +22985,19 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:22985: result: $ac_cv_func_memmove" >&5
++echo "$as_me:22988: 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:22991: checking for bcopy" >&5
++echo "$as_me:22994: 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 22997 "configure"
++#line 23000 "configure"
+ #include "confdefs.h"
+ #define bcopy autoconf_temporary
+ #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -23025,16 +23028,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:23028: \"$ac_link\"") >&5
++if { (eval echo "$as_me:23031: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:23031: \$? = $ac_status" >&5
++  echo "$as_me:23034: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:23034: \"$ac_try\"") >&5
++  { (eval echo "$as_me:23037: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:23037: \$? = $ac_status" >&5
++  echo "$as_me:23040: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_func_bcopy=yes
+ else
+@@ -23044,11 +23047,11 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:23047: result: $ac_cv_func_bcopy" >&5
++echo "$as_me:23050: 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:23051: checking if bcopy does overlapping moves" >&5
++	echo "$as_me:23054: 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
+@@ -23058,7 +23061,7 @@
+   cf_cv_good_bcopy=unknown
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 23061 "configure"
++#line 23064 "configure"
+ #include "confdefs.h"
+ 
+ int main(void) {
+@@ -23072,15 +23075,15 @@
+ 
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:23075: \"$ac_link\"") >&5
++if { (eval echo "$as_me:23078: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:23078: \$? = $ac_status" >&5
++  echo "$as_me:23081: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:23080: \"$ac_try\"") >&5
++  { (eval echo "$as_me:23083: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:23083: \$? = $ac_status" >&5
++  echo "$as_me:23086: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_good_bcopy=yes
+ else
+@@ -23093,7 +23096,7 @@
+ fi
+ 
+ fi
+-echo "$as_me:23096: result: $cf_cv_good_bcopy" >&5
++echo "$as_me:23099: result: $cf_cv_good_bcopy" >&5
+ echo "${ECHO_T}$cf_cv_good_bcopy" >&6
+ 
+ else
+@@ -23120,13 +23123,13 @@
+ for ac_func in posix_openpt
+ do
+ as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+-echo "$as_me:23123: checking for $ac_func" >&5
++echo "$as_me:23126: 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 23129 "configure"
++#line 23132 "configure"
+ #include "confdefs.h"
+ #define $ac_func autoconf_temporary
+ #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -23157,16 +23160,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:23160: \"$ac_link\"") >&5
++if { (eval echo "$as_me:23163: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:23163: \$? = $ac_status" >&5
++  echo "$as_me:23166: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:23166: \"$ac_try\"") >&5
++  { (eval echo "$as_me:23169: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:23169: \$? = $ac_status" >&5
++  echo "$as_me:23172: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   eval "$as_ac_var=yes"
+ else
+@@ -23176,7 +23179,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:23179: result: `eval echo '${'"$as_ac_var"'}'`" >&5
++echo "$as_me:23182: 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
+@@ -23186,7 +23189,7 @@
+ fi
+ done
+  }
+-echo "$as_me:23189: checking if poll really works" >&5
++echo "$as_me:23192: 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
+@@ -23196,7 +23199,7 @@
+   cf_cv_working_poll=unknown
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 23199 "configure"
++#line 23202 "configure"
+ #include "confdefs.h"
+ 
+ #include <stdlib.h>
+@@ -23248,15 +23251,15 @@
+ }
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:23251: \"$ac_link\"") >&5
++if { (eval echo "$as_me:23254: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:23254: \$? = $ac_status" >&5
++  echo "$as_me:23257: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:23256: \"$ac_try\"") >&5
++  { (eval echo "$as_me:23259: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:23259: \$? = $ac_status" >&5
++  echo "$as_me:23262: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_working_poll=yes
+ else
+@@ -23268,21 +23271,21 @@
+ rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+ fi
+-echo "$as_me:23271: result: $cf_cv_working_poll" >&5
++echo "$as_me:23274: 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:23278: checking for va_copy" >&5
++echo "$as_me:23281: 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 23285 "configure"
++#line 23288 "configure"
+ #include "confdefs.h"
+ 
+ #include <stdarg.h>
+@@ -23299,16 +23302,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:23302: \"$ac_link\"") >&5
++if { (eval echo "$as_me:23305: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:23305: \$? = $ac_status" >&5
++  echo "$as_me:23308: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:23308: \"$ac_try\"") >&5
++  { (eval echo "$as_me:23311: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:23311: \$? = $ac_status" >&5
++  echo "$as_me:23314: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_have_va_copy=yes
+ else
+@@ -23318,7 +23321,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:23321: result: $cf_cv_have_va_copy" >&5
++echo "$as_me:23324: result: $cf_cv_have_va_copy" >&5
+ echo "${ECHO_T}$cf_cv_have_va_copy" >&6
+ 
+ if test "$cf_cv_have_va_copy" = yes;
+@@ -23330,14 +23333,14 @@
+ 
+ else # !cf_cv_have_va_copy
+ 
+-echo "$as_me:23333: checking for __va_copy" >&5
++echo "$as_me:23336: 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 23340 "configure"
++#line 23343 "configure"
+ #include "confdefs.h"
+ 
+ #include <stdarg.h>
+@@ -23354,16 +23357,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:23357: \"$ac_link\"") >&5
++if { (eval echo "$as_me:23360: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:23360: \$? = $ac_status" >&5
++  echo "$as_me:23363: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:23363: \"$ac_try\"") >&5
++  { (eval echo "$as_me:23366: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:23366: \$? = $ac_status" >&5
++  echo "$as_me:23369: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_have___va_copy=yes
+ else
+@@ -23373,7 +23376,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:23376: result: $cf_cv_have___va_copy" >&5
++echo "$as_me:23379: result: $cf_cv_have___va_copy" >&5
+ echo "${ECHO_T}$cf_cv_have___va_copy" >&6
+ 
+ if test "$cf_cv_have___va_copy" = yes
+@@ -23385,14 +23388,14 @@
+ 
+ else # !cf_cv_have___va_copy
+ 
+-echo "$as_me:23388: checking for __builtin_va_copy" >&5
++echo "$as_me:23391: 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 23395 "configure"
++#line 23398 "configure"
+ #include "confdefs.h"
+ 
+ #include <stdarg.h>
+@@ -23409,16 +23412,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:23412: \"$ac_link\"") >&5
++if { (eval echo "$as_me:23415: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:23415: \$? = $ac_status" >&5
++  echo "$as_me:23418: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:23418: \"$ac_try\"") >&5
++  { (eval echo "$as_me:23421: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:23421: \$? = $ac_status" >&5
++  echo "$as_me:23424: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_have___builtin_va_copy=yes
+ else
+@@ -23428,7 +23431,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:23431: result: $cf_cv_have___builtin_va_copy" >&5
++echo "$as_me:23434: 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 &&
+@@ -23446,14 +23449,14 @@
+ 	;;
+ 
+ (*)
+-	echo "$as_me:23449: checking if we can simply copy va_list" >&5
++	echo "$as_me:23452: 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 23456 "configure"
++#line 23459 "configure"
+ #include "confdefs.h"
+ 
+ #include <stdarg.h>
+@@ -23470,16 +23473,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:23473: \"$ac_link\"") >&5
++if { (eval echo "$as_me:23476: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:23476: \$? = $ac_status" >&5
++  echo "$as_me:23479: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:23479: \"$ac_try\"") >&5
++  { (eval echo "$as_me:23482: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:23482: \$? = $ac_status" >&5
++  echo "$as_me:23485: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_pointer_va_list=yes
+ else
+@@ -23489,19 +23492,19 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:23492: result: $cf_cv_pointer_va_list" >&5
++echo "$as_me:23495: 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:23497: checking if we can copy va_list indirectly" >&5
++		echo "$as_me:23500: 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 23504 "configure"
++#line 23507 "configure"
+ #include "confdefs.h"
+ 
+ #include <stdarg.h>
+@@ -23518,16 +23521,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:23521: \"$ac_link\"") >&5
++if { (eval echo "$as_me:23524: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:23524: \$? = $ac_status" >&5
++  echo "$as_me:23527: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:23527: \"$ac_try\"") >&5
++  { (eval echo "$as_me:23530: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:23530: \$? = $ac_status" >&5
++  echo "$as_me:23533: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_array_va_list=yes
+ else
+@@ -23537,7 +23540,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:23540: result: $cf_cv_array_va_list" >&5
++echo "$as_me:23543: 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
+@@ -23548,13 +23551,13 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:23551: checking for pid_t" >&5
++echo "$as_me:23554: 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 23557 "configure"
++#line 23560 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -23569,16 +23572,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:23572: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:23575: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:23575: \$? = $ac_status" >&5
++  echo "$as_me:23578: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:23578: \"$ac_try\"") >&5
++  { (eval echo "$as_me:23581: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:23581: \$? = $ac_status" >&5
++  echo "$as_me:23584: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_type_pid_t=yes
+ else
+@@ -23588,7 +23591,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:23591: result: $ac_cv_type_pid_t" >&5
++echo "$as_me:23594: 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
+   :
+@@ -23603,23 +23606,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:23606: checking for $ac_header" >&5
++echo "$as_me:23609: 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 23612 "configure"
++#line 23615 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:23616: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:23619: \"$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:23622: \$? = $ac_status" >&5
++  echo "$as_me:23625: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -23638,7 +23641,7 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:23641: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
++echo "$as_me:23644: 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
+@@ -23651,13 +23654,13 @@
+ for ac_func in fork vfork
+ do
+ as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+-echo "$as_me:23654: checking for $ac_func" >&5
++echo "$as_me:23657: 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 23660 "configure"
++#line 23663 "configure"
+ #include "confdefs.h"
+ #define $ac_func autoconf_temporary
+ #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -23688,16 +23691,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:23691: \"$ac_link\"") >&5
++if { (eval echo "$as_me:23694: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:23694: \$? = $ac_status" >&5
++  echo "$as_me:23697: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:23697: \"$ac_try\"") >&5
++  { (eval echo "$as_me:23700: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:23700: \$? = $ac_status" >&5
++  echo "$as_me:23703: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   eval "$as_ac_var=yes"
+ else
+@@ -23707,7 +23710,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:23710: result: `eval echo '${'"$as_ac_var"'}'`" >&5
++echo "$as_me:23713: 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
+@@ -23719,7 +23722,7 @@
+ 
+ ac_cv_func_fork_works=$ac_cv_func_fork
+ if test "x$ac_cv_func_fork" = xyes; then
+-  echo "$as_me:23722: checking for working fork" >&5
++  echo "$as_me:23725: 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
+@@ -23742,15 +23745,15 @@
+       }
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:23745: \"$ac_link\"") >&5
++if { (eval echo "$as_me:23748: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:23748: \$? = $ac_status" >&5
++  echo "$as_me:23751: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:23750: \"$ac_try\"") >&5
++  { (eval echo "$as_me:23753: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:23753: \$? = $ac_status" >&5
++  echo "$as_me:23756: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_func_fork_works=yes
+ else
+@@ -23762,7 +23765,7 @@
+ rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+ fi
+-echo "$as_me:23765: result: $ac_cv_func_fork_works" >&5
++echo "$as_me:23768: result: $ac_cv_func_fork_works" >&5
+ echo "${ECHO_T}$ac_cv_func_fork_works" >&6
+ 
+ fi
+@@ -23776,12 +23779,12 @@
+       ac_cv_func_fork_works=yes
+       ;;
+   esac
+-  { echo "$as_me:23779: WARNING: CROSS: Result $ac_cv_func_fork_works guessed due to cross-compiling." >&5
++  { echo "$as_me:23782: 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:23784: checking for working vfork" >&5
++  echo "$as_me:23787: 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
+@@ -23790,7 +23793,7 @@
+   ac_cv_func_vfork_works=cross
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 23793 "configure"
++#line 23796 "configure"
+ #include "confdefs.h"
+ /* Thanks to Paul Eggert for this test.  */
+ #include <stdio.h>
+@@ -23887,15 +23890,15 @@
+ }
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:23890: \"$ac_link\"") >&5
++if { (eval echo "$as_me:23893: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:23893: \$? = $ac_status" >&5
++  echo "$as_me:23896: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:23895: \"$ac_try\"") >&5
++  { (eval echo "$as_me:23898: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:23898: \$? = $ac_status" >&5
++  echo "$as_me:23901: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_func_vfork_works=yes
+ else
+@@ -23907,13 +23910,13 @@
+ rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+ fi
+-echo "$as_me:23910: result: $ac_cv_func_vfork_works" >&5
++echo "$as_me:23913: 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:23916: WARNING: CROSS: Result $ac_cv_func_vfork_works guessed due to cross-compiling." >&5
++  { echo "$as_me:23919: 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
+ 
+@@ -23938,7 +23941,7 @@
+ 
+ fi
+ 
+-echo "$as_me:23941: checking if fopen accepts explicit binary mode" >&5
++echo "$as_me:23944: 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
+@@ -23948,7 +23951,7 @@
+   cf_cv_fopen_bin_r=unknown
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 23951 "configure"
++#line 23954 "configure"
+ #include "confdefs.h"
+ 
+ #include <stdio.h>
+@@ -23981,15 +23984,15 @@
+ 
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:23984: \"$ac_link\"") >&5
++if { (eval echo "$as_me:23987: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:23987: \$? = $ac_status" >&5
++  echo "$as_me:23990: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:23989: \"$ac_try\"") >&5
++  { (eval echo "$as_me:23992: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:23992: \$? = $ac_status" >&5
++  echo "$as_me:23995: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_fopen_bin_r=yes
+ else
+@@ -24002,7 +24005,7 @@
+ fi
+ 
+ fi
+-echo "$as_me:24005: result: $cf_cv_fopen_bin_r" >&5
++echo "$as_me:24008: 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
+@@ -24011,7 +24014,7 @@
+ 
+ # special check for test/ditto.c
+ 
+-echo "$as_me:24014: checking for openpty in -lutil" >&5
++echo "$as_me:24017: 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
+@@ -24019,7 +24022,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lutil  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 24022 "configure"
++#line 24025 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -24038,16 +24041,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:24041: \"$ac_link\"") >&5
++if { (eval echo "$as_me:24044: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:24044: \$? = $ac_status" >&5
++  echo "$as_me:24047: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:24047: \"$ac_try\"") >&5
++  { (eval echo "$as_me:24050: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:24050: \$? = $ac_status" >&5
++  echo "$as_me:24053: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_util_openpty=yes
+ else
+@@ -24058,7 +24061,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:24061: result: $ac_cv_lib_util_openpty" >&5
++echo "$as_me:24064: 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
+@@ -24066,7 +24069,7 @@
+   cf_cv_lib_util=no
+ fi
+ 
+-echo "$as_me:24069: checking for openpty header" >&5
++echo "$as_me:24072: 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
+@@ -24093,7 +24096,7 @@
+ 	for cf_header in pty.h libutil.h util.h
+ 	do
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 24096 "configure"
++#line 24099 "configure"
+ #include "confdefs.h"
+ 
+ #include <$cf_header>
+@@ -24110,16 +24113,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:24113: \"$ac_link\"") >&5
++if { (eval echo "$as_me:24116: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:24116: \$? = $ac_status" >&5
++  echo "$as_me:24119: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:24119: \"$ac_try\"") >&5
++  { (eval echo "$as_me:24122: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:24122: \$? = $ac_status" >&5
++  echo "$as_me:24125: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+ 
+ 		cf_cv_func_openpty=$cf_header
+@@ -24137,7 +24140,7 @@
+ 	LIBS="$cf_save_LIBS"
+ 
+ fi
+-echo "$as_me:24140: result: $cf_cv_func_openpty" >&5
++echo "$as_me:24143: result: $cf_cv_func_openpty" >&5
+ echo "${ECHO_T}$cf_cv_func_openpty" >&6
+ 
+ if test "$cf_cv_func_openpty" != no ; then
+@@ -24210,7 +24213,7 @@
+ 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
+ 
+ 			  cat >"conftest.$ac_ext" <<_ACEOF
+-#line 24213 "configure"
++#line 24216 "configure"
+ #include "confdefs.h"
+ #include <stdio.h>
+ int
+@@ -24222,16 +24225,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:24225: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:24228: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:24228: \$? = $ac_status" >&5
++  echo "$as_me:24231: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:24231: \"$ac_try\"") >&5
++  { (eval echo "$as_me:24234: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:24234: \$? = $ac_status" >&5
++  echo "$as_me:24237: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   :
+ else
+@@ -24248,7 +24251,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}:24251: testing adding $cf_add_incdir to include-path ..." 1>&5
++echo "${as_me:-configure}:24254: testing adding $cf_add_incdir to include-path ..." 1>&5
+ 
+ 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
+ 
+@@ -24284,7 +24287,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}:24287: testing adding $cf_add_libdir to library-path ..." 1>&5
++echo "${as_me:-configure}:24290: testing adding $cf_add_libdir to library-path ..." 1>&5
+ 
+ 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
+ 			fi
+@@ -24295,7 +24298,7 @@
+ 	else
+ 		case "$with_hashed_db" in
+ 		(./*|../*|/*)
+-			{ echo "$as_me:24298: WARNING: no such directory $with_hashed_db" >&5
++			{ echo "$as_me:24301: WARNING: no such directory $with_hashed_db" >&5
+ echo "$as_me: WARNING: no such directory $with_hashed_db" >&2;}
+ 			;;
+ 		(*)
+@@ -24367,7 +24370,7 @@
+ 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
+ 
+ 			  cat >"conftest.$ac_ext" <<_ACEOF
+-#line 24370 "configure"
++#line 24373 "configure"
+ #include "confdefs.h"
+ #include <stdio.h>
+ int
+@@ -24379,16 +24382,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:24382: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:24385: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:24385: \$? = $ac_status" >&5
++  echo "$as_me:24388: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:24388: \"$ac_try\"") >&5
++  { (eval echo "$as_me:24391: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:24391: \$? = $ac_status" >&5
++  echo "$as_me:24394: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   :
+ else
+@@ -24405,7 +24408,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}:24408: testing adding $cf_add_incdir to include-path ..." 1>&5
++echo "${as_me:-configure}:24411: testing adding $cf_add_incdir to include-path ..." 1>&5
+ 
+ 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
+ 
+@@ -24485,7 +24488,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}:24488: testing adding $cf_add_libdir to library-path ..." 1>&5
++echo "${as_me:-configure}:24491: testing adding $cf_add_libdir to library-path ..." 1>&5
+ 
+ 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
+ 			fi
+@@ -24502,23 +24505,23 @@
+ 	fi
+ esac
+ 
+-echo "$as_me:24505: checking for db.h" >&5
++echo "$as_me:24508: 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 24511 "configure"
++#line 24514 "configure"
+ #include "confdefs.h"
+ #include <db.h>
+ _ACEOF
+-if { (eval echo "$as_me:24515: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:24518: \"$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:24521: \$? = $ac_status" >&5
++  echo "$as_me:24524: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -24537,11 +24540,11 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:24540: result: $ac_cv_header_db_h" >&5
++echo "$as_me:24543: 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:24544: checking for version of db" >&5
++echo "$as_me:24547: 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
+@@ -24552,10 +24555,10 @@
+ for cf_db_version in 1 2 3 4 5 6
+ do
+ 
+-echo "${as_me:-configure}:24555: testing checking for db version $cf_db_version ..." 1>&5
++echo "${as_me:-configure}:24558: testing checking for db version $cf_db_version ..." 1>&5
+ 
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 24558 "configure"
++#line 24561 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -24585,16 +24588,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:24588: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:24591: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:24591: \$? = $ac_status" >&5
++  echo "$as_me:24594: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:24594: \"$ac_try\"") >&5
++  { (eval echo "$as_me:24597: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:24597: \$? = $ac_status" >&5
++  echo "$as_me:24600: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+ 
+ 	cf_cv_hashed_db_version=$cf_db_version
+@@ -24608,16 +24611,16 @@
+ done
+ 
+ fi
+-echo "$as_me:24611: result: $cf_cv_hashed_db_version" >&5
++echo "$as_me:24614: 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:24615: error: Cannot determine version of db" >&5
++	{ { echo "$as_me:24618: 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:24620: checking for db libraries" >&5
++echo "$as_me:24623: 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
+@@ -24647,10 +24650,10 @@
+ 
+ 	fi
+ 
+-echo "${as_me:-configure}:24650: testing checking for library $cf_db_libs ..." 1>&5
++echo "${as_me:-configure}:24653: testing checking for library $cf_db_libs ..." 1>&5
+ 
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 24653 "configure"
++#line 24656 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -24705,16 +24708,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:24708: \"$ac_link\"") >&5
++if { (eval echo "$as_me:24711: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:24711: \$? = $ac_status" >&5
++  echo "$as_me:24714: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:24714: \"$ac_try\"") >&5
++  { (eval echo "$as_me:24717: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:24717: \$? = $ac_status" >&5
++  echo "$as_me:24720: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+ 
+ 	if test -n "$cf_db_libs" ; then
+@@ -24734,11 +24737,11 @@
+ done
+ 
+ fi
+-echo "$as_me:24737: result: $cf_cv_hashed_db_libs" >&5
++echo "$as_me:24740: 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:24741: error: Cannot determine library for db" >&5
++		{ { echo "$as_me:24744: 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
+@@ -24764,7 +24767,7 @@
+ 
+ else
+ 
+-	{ { echo "$as_me:24767: error: Cannot find db.h" >&5
++	{ { echo "$as_me:24770: error: Cannot find db.h" >&5
+ echo "$as_me: error: Cannot find db.h" >&2;}
+    { (exit 1); exit 1; }; }
+ 
+@@ -24779,7 +24782,7 @@
+ 
+ # Just in case, check if the C compiler has a bool type.
+ 
+-echo "$as_me:24782: checking if we should include stdbool.h" >&5
++echo "$as_me:24785: 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
+@@ -24787,7 +24790,7 @@
+ else
+ 
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 24790 "configure"
++#line 24793 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -24799,23 +24802,23 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:24802: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:24805: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:24805: \$? = $ac_status" >&5
++  echo "$as_me:24808: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:24808: \"$ac_try\"") >&5
++  { (eval echo "$as_me:24811: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:24811: \$? = $ac_status" >&5
++  echo "$as_me:24814: \$? = $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 24818 "configure"
++#line 24821 "configure"
+ #include "confdefs.h"
+ 
+ #ifndef __BEOS__
+@@ -24831,16 +24834,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:24834: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:24837: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:24837: \$? = $ac_status" >&5
++  echo "$as_me:24840: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:24840: \"$ac_try\"") >&5
++  { (eval echo "$as_me:24843: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:24843: \$? = $ac_status" >&5
++  echo "$as_me:24846: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_header_stdbool_h=1
+ else
+@@ -24854,13 +24857,13 @@
+ fi
+ 
+ if test "$cf_cv_header_stdbool_h" = 1
+-then	echo "$as_me:24857: result: yes" >&5
++then	echo "$as_me:24860: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+-else	echo "$as_me:24859: result: no" >&5
++else	echo "$as_me:24862: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+-echo "$as_me:24863: checking for builtin bool type" >&5
++echo "$as_me:24866: 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
+@@ -24868,7 +24871,7 @@
+ else
+ 
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 24871 "configure"
++#line 24874 "configure"
+ #include "confdefs.h"
+ 
+ #include <stdio.h>
+@@ -24883,16 +24886,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:24886: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:24889: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:24889: \$? = $ac_status" >&5
++  echo "$as_me:24892: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:24892: \"$ac_try\"") >&5
++  { (eval echo "$as_me:24895: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:24895: \$? = $ac_status" >&5
++  echo "$as_me:24898: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_cc_bool_type=1
+ else
+@@ -24905,9 +24908,9 @@
+ fi
+ 
+ if test "$cf_cv_cc_bool_type" = 1
+-then	echo "$as_me:24908: result: yes" >&5
++then	echo "$as_me:24911: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+-else	echo "$as_me:24910: result: no" >&5
++else	echo "$as_me:24913: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -24924,10 +24927,10 @@
+ 
+ 	cf_save="$LIBS"
+ 	LIBS="$LIBS $CXXLIBS"
+-	echo "$as_me:24927: checking if we already have C++ library" >&5
++	echo "$as_me:24930: 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 24930 "configure"
++#line 24933 "configure"
+ #include "confdefs.h"
+ 
+ 			#include <iostream>
+@@ -24941,16 +24944,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:24944: \"$ac_link\"") >&5
++if { (eval echo "$as_me:24947: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:24947: \$? = $ac_status" >&5
++  echo "$as_me:24950: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:24950: \"$ac_try\"") >&5
++  { (eval echo "$as_me:24953: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:24953: \$? = $ac_status" >&5
++  echo "$as_me:24956: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_have_libstdcpp=yes
+ else
+@@ -24959,7 +24962,7 @@
+ cf_have_libstdcpp=no
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+-	echo "$as_me:24962: result: $cf_have_libstdcpp" >&5
++	echo "$as_me:24965: result: $cf_have_libstdcpp" >&5
+ echo "${ECHO_T}$cf_have_libstdcpp" >&6
+ 	LIBS="$cf_save"
+ 
+@@ -24978,7 +24981,7 @@
+ 			;;
+ 		esac
+ 
+-		echo "$as_me:24981: checking for library $cf_stdcpp_libname" >&5
++		echo "$as_me:24984: 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
+@@ -25004,7 +25007,7 @@
+ LIBS="$cf_add_libs"
+ 
+ 		cat >"conftest.$ac_ext" <<_ACEOF
+-#line 25007 "configure"
++#line 25010 "configure"
+ #include "confdefs.h"
+ 
+ 				#include <iostream>
+@@ -25018,16 +25021,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:25021: \"$ac_link\"") >&5
++if { (eval echo "$as_me:25024: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:25024: \$? = $ac_status" >&5
++  echo "$as_me:25027: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:25027: \"$ac_try\"") >&5
++  { (eval echo "$as_me:25030: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:25030: \$? = $ac_status" >&5
++  echo "$as_me:25033: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_libstdcpp=yes
+ else
+@@ -25039,7 +25042,7 @@
+ 			LIBS="$cf_save"
+ 
+ fi
+-echo "$as_me:25042: result: $cf_cv_libstdcpp" >&5
++echo "$as_me:25045: result: $cf_cv_libstdcpp" >&5
+ echo "${ECHO_T}$cf_cv_libstdcpp" >&6
+ 		test "$cf_cv_libstdcpp" = yes && {
+ cf_add_libs="$CXXLIBS"
+@@ -25061,7 +25064,7 @@
+ 	fi
+ fi
+ 
+-	echo "$as_me:25064: checking whether $CXX understands -c and -o together" >&5
++	echo "$as_me:25067: 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
+@@ -25076,15 +25079,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:25079: \"$ac_try\"") >&5
++if { (eval echo "$as_me:25082: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:25082: \$? = $ac_status" >&5
++  echo "$as_me:25085: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+-  test -f conftest2.$ac_objext && { (eval echo "$as_me:25084: \"$ac_try\"") >&5
++  test -f conftest2.$ac_objext && { (eval echo "$as_me:25087: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:25087: \$? = $ac_status" >&5
++  echo "$as_me:25090: \$? = $ac_status" >&5
+   (exit "$ac_status"); };
+ then
+   eval cf_cv_prog_CXX_c_o=yes
+@@ -25095,10 +25098,10 @@
+ 
+ fi
+ if test "$cf_cv_prog_CXX_c_o" = yes; then
+-  echo "$as_me:25098: result: yes" >&5
++  echo "$as_me:25101: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ else
+-  echo "$as_me:25101: result: no" >&5
++  echo "$as_me:25104: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -25118,7 +25121,7 @@
+ 	;;
+ esac
+ if test "$GXX" = yes; then
+-	echo "$as_me:25121: checking for lib$cf_gpp_libname" >&5
++	echo "$as_me:25124: checking for lib$cf_gpp_libname" >&5
+ echo $ECHO_N "checking for lib$cf_gpp_libname... $ECHO_C" >&6
+ 	cf_save="$LIBS"
+ 
+@@ -25139,7 +25142,7 @@
+ LIBS="$cf_add_libs"
+ 
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 25142 "configure"
++#line 25145 "configure"
+ #include "confdefs.h"
+ 
+ #include <$cf_gpp_libname/builtin.h>
+@@ -25153,16 +25156,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:25156: \"$ac_link\"") >&5
++if { (eval echo "$as_me:25159: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:25159: \$? = $ac_status" >&5
++  echo "$as_me:25162: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:25162: \"$ac_try\"") >&5
++  { (eval echo "$as_me:25165: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:25165: \$? = $ac_status" >&5
++  echo "$as_me:25168: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cxx_library=yes
+ 
+@@ -25199,7 +25202,7 @@
+   echo "$as_me: failed program was:" >&5
+ cat "conftest.$ac_ext" >&5
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 25202 "configure"
++#line 25205 "configure"
+ #include "confdefs.h"
+ 
+ #include <builtin.h>
+@@ -25213,16 +25216,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:25216: \"$ac_link\"") >&5
++if { (eval echo "$as_me:25219: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:25219: \$? = $ac_status" >&5
++  echo "$as_me:25222: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:25222: \"$ac_try\"") >&5
++  { (eval echo "$as_me:25225: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:25225: \$? = $ac_status" >&5
++  echo "$as_me:25228: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cxx_library=yes
+ 
+@@ -25255,7 +25258,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ 	LIBS="$cf_save"
+-	echo "$as_me:25258: result: $cf_cxx_library" >&5
++	echo "$as_me:25261: result: $cf_cxx_library" >&5
+ echo "${ECHO_T}$cf_cxx_library" >&6
+ fi
+ 
+@@ -25271,7 +25274,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:25274: checking how to run the C++ preprocessor" >&5
++echo "$as_me:25277: 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
+@@ -25288,18 +25291,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 25291 "configure"
++#line 25294 "configure"
+ #include "confdefs.h"
+ #include <assert.h>
+                      Syntax error
+ _ACEOF
+-if { (eval echo "$as_me:25296: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:25299: \"$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:25302: \$? = $ac_status" >&5
++  echo "$as_me:25305: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_cxx_preproc_warn_flag
+@@ -25322,17 +25325,17 @@
+   # OK, works on sane cases.  Now check whether non-existent headers
+   # can be detected and how.
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 25325 "configure"
++#line 25328 "configure"
+ #include "confdefs.h"
+ #include <ac_nonexistent.h>
+ _ACEOF
+-if { (eval echo "$as_me:25329: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:25332: \"$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:25335: \$? = $ac_status" >&5
++  echo "$as_me:25338: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_cxx_preproc_warn_flag
+@@ -25369,7 +25372,7 @@
+ else
+   ac_cv_prog_CXXCPP=$CXXCPP
+ fi
+-echo "$as_me:25372: result: $CXXCPP" >&5
++echo "$as_me:25375: result: $CXXCPP" >&5
+ echo "${ECHO_T}$CXXCPP" >&6
+ ac_preproc_ok=false
+ for ac_cxx_preproc_warn_flag in '' yes
+@@ -25379,18 +25382,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 25382 "configure"
++#line 25385 "configure"
+ #include "confdefs.h"
+ #include <assert.h>
+                      Syntax error
+ _ACEOF
+-if { (eval echo "$as_me:25387: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:25390: \"$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:25393: \$? = $ac_status" >&5
++  echo "$as_me:25396: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_cxx_preproc_warn_flag
+@@ -25413,17 +25416,17 @@
+   # OK, works on sane cases.  Now check whether non-existent headers
+   # can be detected and how.
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 25416 "configure"
++#line 25419 "configure"
+ #include "confdefs.h"
+ #include <ac_nonexistent.h>
+ _ACEOF
+-if { (eval echo "$as_me:25420: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:25423: \"$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:25429: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_cxx_preproc_warn_flag
+@@ -25451,7 +25454,7 @@
+ if $ac_preproc_ok; then
+   :
+ else
+-  { { echo "$as_me:25454: error: C++ preprocessor \"$CXXCPP\" fails sanity check" >&5
++  { { echo "$as_me:25457: error: C++ preprocessor \"$CXXCPP\" fails sanity check" >&5
+ echo "$as_me: error: C++ preprocessor \"$CXXCPP\" fails sanity check" >&2;}
+    { (exit 1); exit 1; }; }
+ fi
+@@ -25466,23 +25469,23 @@
+ for ac_header in typeinfo
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-echo "$as_me:25469: checking for $ac_header" >&5
++echo "$as_me:25472: 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 25475 "configure"
++#line 25478 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:25479: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:25482: \"$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:25485: \$? = $ac_status" >&5
++  echo "$as_me:25488: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_cxx_preproc_warn_flag
+@@ -25501,7 +25504,7 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:25504: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
++echo "$as_me:25507: 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
+@@ -25514,23 +25517,23 @@
+ for ac_header in iostream
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-echo "$as_me:25517: checking for $ac_header" >&5
++echo "$as_me:25520: 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 25523 "configure"
++#line 25526 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:25527: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:25530: \"$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:25533: \$? = $ac_status" >&5
++  echo "$as_me:25536: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_cxx_preproc_warn_flag
+@@ -25549,7 +25552,7 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:25552: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
++echo "$as_me:25555: 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
+@@ -25560,10 +25563,10 @@
+ done
+ 
+ if test x"$ac_cv_header_iostream" = xyes ; then
+-	echo "$as_me:25563: checking if iostream uses std-namespace" >&5
++	echo "$as_me:25566: 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 25566 "configure"
++#line 25569 "configure"
+ #include "confdefs.h"
+ 
+ #include <iostream>
+@@ -25580,16 +25583,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:25583: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:25586: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:25586: \$? = $ac_status" >&5
++  echo "$as_me:25589: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:25589: \"$ac_try\"") >&5
++  { (eval echo "$as_me:25592: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:25592: \$? = $ac_status" >&5
++  echo "$as_me:25595: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_iostream_namespace=yes
+ else
+@@ -25598,7 +25601,7 @@
+ cf_iostream_namespace=no
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+-	echo "$as_me:25601: result: $cf_iostream_namespace" >&5
++	echo "$as_me:25604: result: $cf_iostream_namespace" >&5
+ echo "${ECHO_T}$cf_iostream_namespace" >&6
+ 	if test "$cf_iostream_namespace" = yes ; then
+ 
+@@ -25609,7 +25612,7 @@
+ 	fi
+ fi
+ 
+-echo "$as_me:25612: checking if we should include stdbool.h" >&5
++echo "$as_me:25615: 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
+@@ -25617,7 +25620,7 @@
+ else
+ 
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 25620 "configure"
++#line 25623 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -25629,23 +25632,23 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:25632: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:25635: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:25635: \$? = $ac_status" >&5
++  echo "$as_me:25638: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:25638: \"$ac_try\"") >&5
++  { (eval echo "$as_me:25641: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:25641: \$? = $ac_status" >&5
++  echo "$as_me:25644: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_header_stdbool_h=0
+ else
+   echo "$as_me: failed program was:" >&5
+ cat "conftest.$ac_ext" >&5
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 25648 "configure"
++#line 25651 "configure"
+ #include "confdefs.h"
+ 
+ #ifndef __BEOS__
+@@ -25661,16 +25664,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:25664: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:25667: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:25667: \$? = $ac_status" >&5
++  echo "$as_me:25670: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:25670: \"$ac_try\"") >&5
++  { (eval echo "$as_me:25673: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:25673: \$? = $ac_status" >&5
++  echo "$as_me:25676: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_header_stdbool_h=1
+ else
+@@ -25684,13 +25687,13 @@
+ fi
+ 
+ if test "$cf_cv_header_stdbool_h" = 1
+-then	echo "$as_me:25687: result: yes" >&5
++then	echo "$as_me:25690: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+-else	echo "$as_me:25689: result: no" >&5
++else	echo "$as_me:25692: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+-echo "$as_me:25693: checking for builtin bool type" >&5
++echo "$as_me:25696: 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
+@@ -25698,7 +25701,7 @@
+ else
+ 
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 25701 "configure"
++#line 25704 "configure"
+ #include "confdefs.h"
+ 
+ #include <stdio.h>
+@@ -25713,16 +25716,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:25716: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:25719: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:25719: \$? = $ac_status" >&5
++  echo "$as_me:25722: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:25722: \"$ac_try\"") >&5
++  { (eval echo "$as_me:25725: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:25725: \$? = $ac_status" >&5
++  echo "$as_me:25728: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_builtin_bool=1
+ else
+@@ -25735,19 +25738,19 @@
+ fi
+ 
+ if test "$cf_cv_builtin_bool" = 1
+-then	echo "$as_me:25738: result: yes" >&5
++then	echo "$as_me:25741: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+-else	echo "$as_me:25740: result: no" >&5
++else	echo "$as_me:25743: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+-echo "$as_me:25744: checking for bool" >&5
++echo "$as_me:25747: 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 25750 "configure"
++#line 25753 "configure"
+ #include "confdefs.h"
+ 
+ #include <stdlib.h>
+@@ -25783,16 +25786,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:25786: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:25789: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:25789: \$? = $ac_status" >&5
++  echo "$as_me:25792: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:25792: \"$ac_try\"") >&5
++  { (eval echo "$as_me:25795: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:25795: \$? = $ac_status" >&5
++  echo "$as_me:25798: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_type_bool=yes
+ else
+@@ -25802,10 +25805,10 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:25805: result: $ac_cv_type_bool" >&5
++echo "$as_me:25808: result: $ac_cv_type_bool" >&5
+ echo "${ECHO_T}$ac_cv_type_bool" >&6
+ 
+-echo "$as_me:25808: checking size of bool" >&5
++echo "$as_me:25811: 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
+@@ -25814,7 +25817,7 @@
+   if test "$cross_compiling" = yes; then
+   # Depending upon the size, compute the lo and hi bounds.
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 25817 "configure"
++#line 25820 "configure"
+ #include "confdefs.h"
+ 
+ #include <stdlib.h>
+@@ -25847,21 +25850,21 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:25850: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:25853: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:25853: \$? = $ac_status" >&5
++  echo "$as_me:25856: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:25856: \"$ac_try\"") >&5
++  { (eval echo "$as_me:25859: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:25859: \$? = $ac_status" >&5
++  echo "$as_me:25862: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_lo=0 ac_mid=0
+   while :; do
+     cat >"conftest.$ac_ext" <<_ACEOF
+-#line 25864 "configure"
++#line 25867 "configure"
+ #include "confdefs.h"
+ 
+ #include <stdlib.h>
+@@ -25894,16 +25897,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:25897: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:25900: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:25900: \$? = $ac_status" >&5
++  echo "$as_me:25903: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:25903: \"$ac_try\"") >&5
++  { (eval echo "$as_me:25906: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:25906: \$? = $ac_status" >&5
++  echo "$as_me:25909: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_hi=$ac_mid; break
+ else
+@@ -25919,7 +25922,7 @@
+ ac_hi=-1 ac_mid=-1
+   while :; do
+     cat >"conftest.$ac_ext" <<_ACEOF
+-#line 25922 "configure"
++#line 25925 "configure"
+ #include "confdefs.h"
+ 
+ #include <stdlib.h>
+@@ -25952,16 +25955,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:25955: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:25958: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:25958: \$? = $ac_status" >&5
++  echo "$as_me:25961: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:25961: \"$ac_try\"") >&5
++  { (eval echo "$as_me:25964: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:25964: \$? = $ac_status" >&5
++  echo "$as_me:25967: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_lo=$ac_mid; break
+ else
+@@ -25977,7 +25980,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 25980 "configure"
++#line 25983 "configure"
+ #include "confdefs.h"
+ 
+ #include <stdlib.h>
+@@ -26010,16 +26013,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:26013: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:26016: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:26016: \$? = $ac_status" >&5
++  echo "$as_me:26019: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:26019: \"$ac_try\"") >&5
++  { (eval echo "$as_me:26022: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:26022: \$? = $ac_status" >&5
++  echo "$as_me:26025: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_hi=$ac_mid
+ else
+@@ -26032,12 +26035,12 @@
+ ac_cv_sizeof_bool=$ac_lo
+ else
+   if test "$cross_compiling" = yes; then
+-  { { echo "$as_me:26035: error: cannot run test program while cross compiling" >&5
++  { { echo "$as_me:26038: 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 26040 "configure"
++#line 26043 "configure"
+ #include "confdefs.h"
+ 
+ #include <stdlib.h>
+@@ -26074,15 +26077,15 @@
+ }
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:26077: \"$ac_link\"") >&5
++if { (eval echo "$as_me:26080: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:26080: \$? = $ac_status" >&5
++  echo "$as_me:26083: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:26082: \"$ac_try\"") >&5
++  { (eval echo "$as_me:26085: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:26085: \$? = $ac_status" >&5
++  echo "$as_me:26088: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_sizeof_bool=`cat conftest.val`
+ else
+@@ -26098,13 +26101,13 @@
+   ac_cv_sizeof_bool=0
+ fi
+ fi
+-echo "$as_me:26101: result: $ac_cv_sizeof_bool" >&5
++echo "$as_me:26104: 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:26107: checking for type of bool" >&5
++echo "$as_me:26110: 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
+@@ -26123,7 +26126,7 @@
+ 
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 26126 "configure"
++#line 26129 "configure"
+ #include "confdefs.h"
+ 
+ #include <stdlib.h>
+@@ -26165,15 +26168,15 @@
+ 
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:26168: \"$ac_link\"") >&5
++if { (eval echo "$as_me:26171: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:26171: \$? = $ac_status" >&5
++  echo "$as_me:26174: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:26173: \"$ac_try\"") >&5
++  { (eval echo "$as_me:26176: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:26176: \$? = $ac_status" >&5
++  echo "$as_me:26179: \$? = $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
+@@ -26190,19 +26193,19 @@
+ 	rm -f cf_test.out
+ 
+ fi
+-echo "$as_me:26193: result: $cf_cv_type_of_bool" >&5
++echo "$as_me:26196: 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:26200: WARNING: Assuming $NCURSES_BOOL for type of bool" >&5
++	{ echo "$as_me:26203: 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:26205: checking for special defines needed for etip.h" >&5
++echo "$as_me:26208: 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"
+@@ -26220,7 +26223,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 26223 "configure"
++#line 26226 "configure"
+ #include "confdefs.h"
+ 
+ #include <etip.h.in>
+@@ -26234,16 +26237,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:26237: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:26240: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:26240: \$? = $ac_status" >&5
++  echo "$as_me:26243: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:26243: \"$ac_try\"") >&5
++  { (eval echo "$as_me:26246: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:26246: \$? = $ac_status" >&5
++  echo "$as_me:26249: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+ 
+ 	test -n "$cf_math" && cat >>confdefs.h <<EOF
+@@ -26264,12 +26267,12 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ done
+ done
+-echo "$as_me:26267: result: $cf_result" >&5
++echo "$as_me:26270: result: $cf_result" >&5
+ echo "${ECHO_T}$cf_result" >&6
+ CXXFLAGS="$cf_save_CXXFLAGS"
+ 
+ if test -n "$CXX"; then
+-echo "$as_me:26272: checking if $CXX accepts parameter initialization" >&5
++echo "$as_me:26275: 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
+@@ -26286,7 +26289,7 @@
+   cf_cv_cpp_param_init=unknown
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 26289 "configure"
++#line 26292 "configure"
+ #include "confdefs.h"
+ 
+ class TEST {
+@@ -26305,15 +26308,15 @@
+ 
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:26308: \"$ac_link\"") >&5
++if { (eval echo "$as_me:26311: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:26311: \$? = $ac_status" >&5
++  echo "$as_me:26314: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:26313: \"$ac_try\"") >&5
++  { (eval echo "$as_me:26316: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:26316: \$? = $ac_status" >&5
++  echo "$as_me:26319: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_cpp_param_init=yes
+ else
+@@ -26332,7 +26335,7 @@
+ ac_main_return="return"
+ 
+ fi
+-echo "$as_me:26335: result: $cf_cv_cpp_param_init" >&5
++echo "$as_me:26338: result: $cf_cv_cpp_param_init" >&5
+ echo "${ECHO_T}$cf_cv_cpp_param_init" >&6
+ fi
+ test "$cf_cv_cpp_param_init" = yes &&
+@@ -26342,7 +26345,7 @@
+ 
+ if test -n "$CXX"; then
+ 
+-echo "$as_me:26345: checking if $CXX accepts static_cast" >&5
++echo "$as_me:26348: 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
+@@ -26356,7 +26359,7 @@
+ ac_main_return="return"
+ 
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 26359 "configure"
++#line 26362 "configure"
+ #include "confdefs.h"
+ 
+ class NCursesPanel
+@@ -26400,16 +26403,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:26403: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:26406: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:26406: \$? = $ac_status" >&5
++  echo "$as_me:26409: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:26409: \"$ac_try\"") >&5
++  { (eval echo "$as_me:26412: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:26412: \$? = $ac_status" >&5
++  echo "$as_me:26415: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_cpp_static_cast=yes
+ else
+@@ -26427,7 +26430,7 @@
+ ac_main_return="return"
+ 
+ fi
+-echo "$as_me:26430: result: $cf_cv_cpp_static_cast" >&5
++echo "$as_me:26433: result: $cf_cv_cpp_static_cast" >&5
+ echo "${ECHO_T}$cf_cv_cpp_static_cast" >&6
+ 
+ fi
+@@ -26476,13 +26479,13 @@
+ 	else
+ 		if test "$cf_cv_header_stdbool_h" = 1 ; then
+ 
+-echo "$as_me:26479: checking for bool" >&5
++echo "$as_me:26482: 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 26485 "configure"
++#line 26488 "configure"
+ #include "confdefs.h"
+ 
+ #include <stdlib.h>
+@@ -26518,16 +26521,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:26521: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:26524: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:26524: \$? = $ac_status" >&5
++  echo "$as_me:26527: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:26527: \"$ac_try\"") >&5
++  { (eval echo "$as_me:26530: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:26530: \$? = $ac_status" >&5
++  echo "$as_me:26533: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_type_bool=yes
+ else
+@@ -26537,10 +26540,10 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:26540: result: $ac_cv_type_bool" >&5
++echo "$as_me:26543: result: $ac_cv_type_bool" >&5
+ echo "${ECHO_T}$ac_cv_type_bool" >&6
+ 
+-echo "$as_me:26543: checking size of bool" >&5
++echo "$as_me:26546: 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
+@@ -26549,7 +26552,7 @@
+   if test "$cross_compiling" = yes; then
+   # Depending upon the size, compute the lo and hi bounds.
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 26552 "configure"
++#line 26555 "configure"
+ #include "confdefs.h"
+ 
+ #include <stdlib.h>
+@@ -26582,21 +26585,21 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:26585: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:26588: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:26588: \$? = $ac_status" >&5
++  echo "$as_me:26591: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:26591: \"$ac_try\"") >&5
++  { (eval echo "$as_me:26594: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:26594: \$? = $ac_status" >&5
++  echo "$as_me:26597: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_lo=0 ac_mid=0
+   while :; do
+     cat >"conftest.$ac_ext" <<_ACEOF
+-#line 26599 "configure"
++#line 26602 "configure"
+ #include "confdefs.h"
+ 
+ #include <stdlib.h>
+@@ -26629,16 +26632,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:26632: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:26635: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:26635: \$? = $ac_status" >&5
++  echo "$as_me:26638: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:26638: \"$ac_try\"") >&5
++  { (eval echo "$as_me:26641: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:26641: \$? = $ac_status" >&5
++  echo "$as_me:26644: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_hi=$ac_mid; break
+ else
+@@ -26654,7 +26657,7 @@
+ ac_hi=-1 ac_mid=-1
+   while :; do
+     cat >"conftest.$ac_ext" <<_ACEOF
+-#line 26657 "configure"
++#line 26660 "configure"
+ #include "confdefs.h"
+ 
+ #include <stdlib.h>
+@@ -26687,16 +26690,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:26690: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:26693: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:26693: \$? = $ac_status" >&5
++  echo "$as_me:26696: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:26696: \"$ac_try\"") >&5
++  { (eval echo "$as_me:26699: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:26699: \$? = $ac_status" >&5
++  echo "$as_me:26702: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_lo=$ac_mid; break
+ else
+@@ -26712,7 +26715,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 26715 "configure"
++#line 26718 "configure"
+ #include "confdefs.h"
+ 
+ #include <stdlib.h>
+@@ -26745,16 +26748,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:26748: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:26751: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:26751: \$? = $ac_status" >&5
++  echo "$as_me:26754: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:26754: \"$ac_try\"") >&5
++  { (eval echo "$as_me:26757: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:26757: \$? = $ac_status" >&5
++  echo "$as_me:26760: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_hi=$ac_mid
+ else
+@@ -26767,12 +26770,12 @@
+ ac_cv_sizeof_bool=$ac_lo
+ else
+   if test "$cross_compiling" = yes; then
+-  { { echo "$as_me:26770: error: cannot run test program while cross compiling" >&5
++  { { echo "$as_me:26773: 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 26775 "configure"
++#line 26778 "configure"
+ #include "confdefs.h"
+ 
+ #include <stdlib.h>
+@@ -26809,15 +26812,15 @@
+ }
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:26812: \"$ac_link\"") >&5
++if { (eval echo "$as_me:26815: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:26815: \$? = $ac_status" >&5
++  echo "$as_me:26818: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:26817: \"$ac_try\"") >&5
++  { (eval echo "$as_me:26820: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:26820: \$? = $ac_status" >&5
++  echo "$as_me:26823: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_sizeof_bool=`cat conftest.val`
+ else
+@@ -26833,13 +26836,13 @@
+   ac_cv_sizeof_bool=0
+ fi
+ fi
+-echo "$as_me:26836: result: $ac_cv_sizeof_bool" >&5
++echo "$as_me:26839: 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:26842: checking for type of bool" >&5
++echo "$as_me:26845: 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
+@@ -26858,7 +26861,7 @@
+ 
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 26861 "configure"
++#line 26864 "configure"
+ #include "confdefs.h"
+ 
+ #include <stdlib.h>
+@@ -26900,15 +26903,15 @@
+ 
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:26903: \"$ac_link\"") >&5
++if { (eval echo "$as_me:26906: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:26906: \$? = $ac_status" >&5
++  echo "$as_me:26909: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:26908: \"$ac_try\"") >&5
++  { (eval echo "$as_me:26911: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:26911: \$? = $ac_status" >&5
++  echo "$as_me:26914: \$? = $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
+@@ -26925,26 +26928,26 @@
+ 	rm -f cf_test.out
+ 
+ fi
+-echo "$as_me:26928: result: $cf_cv_type_of_bool" >&5
++echo "$as_me:26931: 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:26935: WARNING: Assuming $NCURSES_BOOL for type of bool" >&5
++	{ echo "$as_me:26938: 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:26941: checking for fallback type of bool" >&5
++			echo "$as_me:26944: 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:26947: result: $cf_cv_type_of_bool" >&5
++			echo "$as_me:26950: result: $cf_cv_type_of_bool" >&5
+ echo "${ECHO_T}$cf_cv_type_of_bool" >&6
+ 		fi
+ 	fi
+@@ -26973,7 +26976,7 @@
+ 
+ 	if test "$cf_with_ada" != "no" ; then
+ 		if test "$with_libtool" != "no"; then
+-			{ echo "$as_me:26976: WARNING: libtool does not support Ada - disabling feature" >&5
++			{ echo "$as_me:26979: 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
+@@ -26990,7 +26993,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:26993: checking for $ac_word" >&5
++echo "$as_me:26996: 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
+@@ -27007,7 +27010,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:27010: found $ac_dir/$ac_word" >&5
++   echo "$as_me:27013: found $ac_dir/$ac_word" >&5
+    break
+ fi
+ done
+@@ -27019,10 +27022,10 @@
+ cf_TEMP_gnat=$ac_cv_path_cf_TEMP_gnat
+ 
+ if test -n "$cf_TEMP_gnat"; then
+-  echo "$as_me:27022: result: $cf_TEMP_gnat" >&5
++  echo "$as_me:27025: result: $cf_TEMP_gnat" >&5
+ echo "${ECHO_T}$cf_TEMP_gnat" >&6
+ else
+-  echo "$as_me:27025: result: no" >&5
++  echo "$as_me:27028: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -27032,7 +27035,7 @@
+ 		unset cf_cv_gnat_version
+ 		unset cf_TEMP_gnat
+ 
+-echo "$as_me:27035: checking for $cf_prog_gnat version" >&5
++echo "$as_me:27038: 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
+@@ -27043,7 +27046,7 @@
+ 	sed -e '2,$d' -e 's/[^0-9 \.]//g' -e 's/^[ ]*//' -e 's/ .*//'`
+ 
+ fi
+-echo "$as_me:27046: result: $cf_cv_gnat_version" >&5
++echo "$as_me:27049: 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
+@@ -27072,7 +27075,7 @@
+ 			cd conftest.src
+ 			for cf_gprconfig in Ada C
+ 			do
+-				echo "$as_me:27075: checking for gprconfig name for $cf_gprconfig" >&5
++				echo "$as_me:27078: 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
+@@ -27091,10 +27094,10 @@
+ 				if test -n "$cf_gprconfig_value"
+ 				then
+ 					eval "cf_ada_config_$cf_gprconfig=$cf_gprconfig_value"
+-					echo "$as_me:27094: result: $cf_gprconfig_value" >&5
++					echo "$as_me:27097: result: $cf_gprconfig_value" >&5
+ echo "${ECHO_T}$cf_gprconfig_value" >&6
+ 				else
+-					echo "$as_me:27097: result: missing" >&5
++					echo "$as_me:27100: result: missing" >&5
+ echo "${ECHO_T}missing" >&6
+ 					cf_ada_config="#"
+ 					break
+@@ -27107,7 +27110,7 @@
+ 	if test "x$cf_ada_config" != "x#"
+ 	then
+ 
+-echo "$as_me:27110: checking for gnat version" >&5
++echo "$as_me:27113: 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
+@@ -27118,7 +27121,7 @@
+ 	sed -e '2,$d' -e 's/[^0-9 \.]//g' -e 's/^[ ]*//' -e 's/ .*//'`
+ 
+ fi
+-echo "$as_me:27121: result: $cf_cv_gnat_version" >&5
++echo "$as_me:27124: 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
+ 
+@@ -27127,7 +27130,7 @@
+ 	cf_cv_prog_gnat_correct=yes
+ 	;;
+ (*)
+-	{ 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:27133: 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
+ 	;;
+@@ -27135,7 +27138,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:27138: checking for $ac_word" >&5
++echo "$as_me:27141: 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
+@@ -27150,7 +27153,7 @@
+   test -z "$ac_dir" && ac_dir=.
+   $as_executable_p "$ac_dir/$ac_word" || continue
+ ac_cv_prog_M4_exists="yes"
+-echo "$as_me:27153: found $ac_dir/$ac_word" >&5
++echo "$as_me:27156: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -27159,20 +27162,20 @@
+ fi
+ M4_exists=$ac_cv_prog_M4_exists
+ if test -n "$M4_exists"; then
+-  echo "$as_me:27162: result: $M4_exists" >&5
++  echo "$as_me:27165: result: $M4_exists" >&5
+ echo "${ECHO_T}$M4_exists" >&6
+ else
+-  echo "$as_me:27165: result: no" >&5
++  echo "$as_me:27168: 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:27171: WARNING: Ada95 binding required program m4 not found. Ada95 binding disabled" >&5
++			{ echo "$as_me:27174: 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:27175: checking if GNAT works" >&5
++			echo "$as_me:27178: checking if GNAT works" >&5
+ echo $ECHO_N "checking if GNAT works... $ECHO_C" >&6
+ 
+ rm -rf ./conftest* ./*~conftest*
+@@ -27200,7 +27203,7 @@
+ fi
+ rm -rf ./conftest* ./*~conftest*
+ 
+-			echo "$as_me:27203: result: $cf_cv_prog_gnat_correct" >&5
++			echo "$as_me:27206: result: $cf_cv_prog_gnat_correct" >&5
+ echo "${ECHO_T}$cf_cv_prog_gnat_correct" >&6
+ 		fi
+ 	else
+@@ -27212,7 +27215,7 @@
+ 
+  	ADAFLAGS="$ADAFLAGS -gnatpn"
+ 
+-	echo "$as_me:27215: checking optimization options for ADAFLAGS" >&5
++	echo "$as_me:27218: checking optimization options for ADAFLAGS" >&5
+ echo $ECHO_N "checking optimization options for ADAFLAGS... $ECHO_C" >&6
+ 	case "$CFLAGS" in
+ 	(*-g*)
+@@ -27229,10 +27232,10 @@
+ 
+ 		;;
+ 	esac
+-	echo "$as_me:27232: result: $ADAFLAGS" >&5
++	echo "$as_me:27235: result: $ADAFLAGS" >&5
+ echo "${ECHO_T}$ADAFLAGS" >&6
+ 
+-echo "$as_me:27235: checking if GNATPREP supports -T option" >&5
++echo "$as_me:27238: 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
+@@ -27242,11 +27245,11 @@
+ gnatprep -T 2>/dev/null >/dev/null && cf_cv_gnatprep_opt_t=yes
+ 
+ fi
+-echo "$as_me:27245: result: $cf_cv_gnatprep_opt_t" >&5
++echo "$as_me:27248: 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:27249: checking if GNAT supports generics" >&5
++echo "$as_me:27252: 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])
+@@ -27256,7 +27259,7 @@
+ 	cf_gnat_generics=no
+ 	;;
+ esac
+-echo "$as_me:27259: result: $cf_gnat_generics" >&5
++echo "$as_me:27262: result: $cf_gnat_generics" >&5
+ echo "${ECHO_T}$cf_gnat_generics" >&6
+ 
+ if test "$cf_gnat_generics" = yes
+@@ -27268,7 +27271,7 @@
+ 	cf_generic_objects=
+ fi
+ 
+-echo "$as_me:27271: checking if GNAT supports SIGINT" >&5
++echo "$as_me:27274: 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
+@@ -27316,7 +27319,7 @@
+ rm -rf ./conftest* ./*~conftest*
+ 
+ fi
+-echo "$as_me:27319: result: $cf_cv_gnat_sigint" >&5
++echo "$as_me:27322: result: $cf_cv_gnat_sigint" >&5
+ echo "${ECHO_T}$cf_cv_gnat_sigint" >&6
+ 
+ if test "$cf_cv_gnat_sigint" = yes ; then
+@@ -27329,7 +27332,7 @@
+ cf_gnat_projects=no
+ 
+ if test "$enable_gnat_projects" != no ; then
+-echo "$as_me:27332: checking if GNAT supports project files" >&5
++echo "$as_me:27335: 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]*)
+@@ -27392,15 +27395,15 @@
+ 	esac
+ 	;;
+ esac
+-echo "$as_me:27395: result: $cf_gnat_projects" >&5
++echo "$as_me:27398: 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:27401: checking if GNAT supports libraries" >&5
++	echo "$as_me:27404: checking if GNAT supports libraries" >&5
+ echo $ECHO_N "checking if GNAT supports libraries... $ECHO_C" >&6
+-	echo "$as_me:27403: result: $cf_gnat_libraries" >&5
++	echo "$as_me:27406: result: $cf_gnat_libraries" >&5
+ echo "${ECHO_T}$cf_gnat_libraries" >&6
+ fi
+ 
+@@ -27420,7 +27423,7 @@
+ 	then
+ 		USE_GNAT_MAKE_GPR=""
+ 	else
+-		{ echo "$as_me:27423: WARNING: use old makefile rules since tools are missing" >&5
++		{ echo "$as_me:27426: 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
+@@ -27432,7 +27435,7 @@
+ 	USE_GNAT_LIBRARIES="#"
+ fi
+ 
+-echo "$as_me:27435: checking for ada-compiler" >&5
++echo "$as_me:27438: 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.
+@@ -27443,12 +27446,12 @@
+   cf_ada_compiler=gnatmake
+ fi;
+ 
+-echo "$as_me:27446: result: $cf_ada_compiler" >&5
++echo "$as_me:27449: result: $cf_ada_compiler" >&5
+ echo "${ECHO_T}$cf_ada_compiler" >&6
+ 
+ 			cf_ada_package=terminal_interface
+ 
+-echo "$as_me:27451: checking for ada-include" >&5
++echo "$as_me:27454: 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.
+@@ -27484,7 +27487,7 @@
+ 	withval=`echo "$withval" | sed -e s%NONE%$cf_path_syntax%`
+ 	;;
+ (*)
+-	{ { echo "$as_me:27487: error: expected a pathname, not \"$withval\"" >&5
++	{ { echo "$as_me:27490: error: expected a pathname, not \"$withval\"" >&5
+ echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
+    { (exit 1); exit 1; }; }
+ 	;;
+@@ -27493,10 +27496,10 @@
+ fi
+ eval ADA_INCLUDE="$withval"
+ 
+-echo "$as_me:27496: result: $ADA_INCLUDE" >&5
++echo "$as_me:27499: result: $ADA_INCLUDE" >&5
+ echo "${ECHO_T}$ADA_INCLUDE" >&6
+ 
+-echo "$as_me:27499: checking for ada-objects" >&5
++echo "$as_me:27502: 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.
+@@ -27532,7 +27535,7 @@
+ 	withval=`echo "$withval" | sed -e s%NONE%$cf_path_syntax%`
+ 	;;
+ (*)
+-	{ { echo "$as_me:27535: error: expected a pathname, not \"$withval\"" >&5
++	{ { echo "$as_me:27538: error: expected a pathname, not \"$withval\"" >&5
+ echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
+    { (exit 1); exit 1; }; }
+ 	;;
+@@ -27541,10 +27544,10 @@
+ fi
+ eval ADA_OBJECTS="$withval"
+ 
+-echo "$as_me:27544: result: $ADA_OBJECTS" >&5
++echo "$as_me:27547: result: $ADA_OBJECTS" >&5
+ echo "${ECHO_T}$ADA_OBJECTS" >&6
+ 
+-echo "$as_me:27547: checking if an Ada95 shared-library should be built" >&5
++echo "$as_me:27550: 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.
+@@ -27554,14 +27557,14 @@
+ else
+   with_ada_sharedlib=no
+ fi;
+-echo "$as_me:27557: result: $with_ada_sharedlib" >&5
++echo "$as_me:27560: 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:27564: WARNING: disabling shared-library since GNAT projects are not supported" >&5
++		{ echo "$as_me:27567: 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
+@@ -27581,7 +27584,7 @@
+ 
+ 			# allow the Ada binding to be renamed
+ 
+-echo "$as_me:27584: checking for ada-libname" >&5
++echo "$as_me:27587: 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.
+@@ -27597,7 +27600,7 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:27600: result: $ADA_LIBNAME" >&5
++echo "$as_me:27603: result: $ADA_LIBNAME" >&5
+ echo "${ECHO_T}$ADA_LIBNAME" >&6
+ 
+ 		fi
+@@ -27608,13 +27611,13 @@
+ 
+ # do this "late" to avoid conflict with header-checks
+ if test "x$with_widec" = xyes ; then
+-	echo "$as_me:27611: checking for wchar_t" >&5
++	echo "$as_me:27614: 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 27617 "configure"
++#line 27620 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -27629,16 +27632,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:27632: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:27635: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:27635: \$? = $ac_status" >&5
++  echo "$as_me:27638: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:27638: \"$ac_try\"") >&5
++  { (eval echo "$as_me:27641: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:27641: \$? = $ac_status" >&5
++  echo "$as_me:27644: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_type_wchar_t=yes
+ else
+@@ -27648,10 +27651,10 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:27651: result: $ac_cv_type_wchar_t" >&5
++echo "$as_me:27654: result: $ac_cv_type_wchar_t" >&5
+ echo "${ECHO_T}$ac_cv_type_wchar_t" >&6
+ 
+-echo "$as_me:27654: checking size of wchar_t" >&5
++echo "$as_me:27657: 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
+@@ -27660,7 +27663,7 @@
+   if test "$cross_compiling" = yes; then
+   # Depending upon the size, compute the lo and hi bounds.
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 27663 "configure"
++#line 27666 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -27672,21 +27675,21 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:27675: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:27678: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:27678: \$? = $ac_status" >&5
++  echo "$as_me:27681: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:27681: \"$ac_try\"") >&5
++  { (eval echo "$as_me:27684: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:27684: \$? = $ac_status" >&5
++  echo "$as_me:27687: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_lo=0 ac_mid=0
+   while :; do
+     cat >"conftest.$ac_ext" <<_ACEOF
+-#line 27689 "configure"
++#line 27692 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -27698,16 +27701,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:27701: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:27704: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:27704: \$? = $ac_status" >&5
++  echo "$as_me:27707: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:27707: \"$ac_try\"") >&5
++  { (eval echo "$as_me:27710: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:27710: \$? = $ac_status" >&5
++  echo "$as_me:27713: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_hi=$ac_mid; break
+ else
+@@ -27723,7 +27726,7 @@
+ ac_hi=-1 ac_mid=-1
+   while :; do
+     cat >"conftest.$ac_ext" <<_ACEOF
+-#line 27726 "configure"
++#line 27729 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -27735,16 +27738,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:27738: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:27741: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:27741: \$? = $ac_status" >&5
++  echo "$as_me:27744: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:27744: \"$ac_try\"") >&5
++  { (eval echo "$as_me:27747: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:27747: \$? = $ac_status" >&5
++  echo "$as_me:27750: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_lo=$ac_mid; break
+ else
+@@ -27760,7 +27763,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 27763 "configure"
++#line 27766 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -27772,16 +27775,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:27775: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:27778: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:27778: \$? = $ac_status" >&5
++  echo "$as_me:27781: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:27781: \"$ac_try\"") >&5
++  { (eval echo "$as_me:27784: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:27784: \$? = $ac_status" >&5
++  echo "$as_me:27787: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_hi=$ac_mid
+ else
+@@ -27794,12 +27797,12 @@
+ ac_cv_sizeof_wchar_t=$ac_lo
+ else
+   if test "$cross_compiling" = yes; then
+-  { { echo "$as_me:27797: error: cannot run test program while cross compiling" >&5
++  { { echo "$as_me:27800: 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 27802 "configure"
++#line 27805 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -27815,15 +27818,15 @@
+ }
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:27818: \"$ac_link\"") >&5
++if { (eval echo "$as_me:27821: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:27821: \$? = $ac_status" >&5
++  echo "$as_me:27824: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:27823: \"$ac_try\"") >&5
++  { (eval echo "$as_me:27826: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:27826: \$? = $ac_status" >&5
++  echo "$as_me:27829: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_sizeof_wchar_t=`cat conftest.val`
+ else
+@@ -27839,7 +27842,7 @@
+   ac_cv_sizeof_wchar_t=0
+ fi
+ fi
+-echo "$as_me:27842: result: $ac_cv_sizeof_wchar_t" >&5
++echo "$as_me:27845: 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
+@@ -27852,7 +27855,7 @@
+ 	then
+ 		test -n "$verbose" && echo "	test failed (assume 2)" 1>&6
+ 
+-echo "${as_me:-configure}:27855: testing test failed (assume 2) ..." 1>&5
++echo "${as_me:-configure}:27858: testing test failed (assume 2) ..." 1>&5
+ 
+ 		sed /SIZEOF_WCHAR_T/d confdefs.h >confdefs.tmp
+ 		mv confdefs.tmp confdefs.h
+@@ -27870,7 +27873,7 @@
+ ### chooses to split module lists into libraries.
+ ###
+ ### (see CF_LIB_RULES).
+-echo "$as_me:27873: checking for library subsets" >&5
++echo "$as_me:27876: checking for library subsets" >&5
+ echo $ECHO_N "checking for library subsets... $ECHO_C" >&6
+ LIB_SUBSETS=
+ 
+@@ -27924,7 +27927,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:27927: result: $LIB_SUBSETS" >&5
++echo "$as_me:27930: result: $LIB_SUBSETS" >&5
+ echo "${ECHO_T}$LIB_SUBSETS" >&6
+ 
+ ### Construct the list of include-directories to be generated
+@@ -27955,7 +27958,7 @@
+ fi
+ 
+ ### Build up pieces for makefile rules
+-echo "$as_me:27958: checking default library suffix" >&5
++echo "$as_me:27961: checking default library suffix" >&5
+ echo $ECHO_N "checking default library suffix... $ECHO_C" >&6
+ 
+ 	case $DFT_LWR_MODEL in
+@@ -27966,10 +27969,10 @@
+ 	(shared)  DFT_ARG_SUFFIX=''   ;;
+ 	esac
+ 	test -n "$LIB_SUFFIX" && DFT_ARG_SUFFIX="${LIB_SUFFIX}${DFT_ARG_SUFFIX}"
+-echo "$as_me:27969: result: $DFT_ARG_SUFFIX" >&5
++echo "$as_me:27972: result: $DFT_ARG_SUFFIX" >&5
+ echo "${ECHO_T}$DFT_ARG_SUFFIX" >&6
+ 
+-echo "$as_me:27972: checking default library-dependency suffix" >&5
++echo "$as_me:27975: checking default library-dependency suffix" >&5
+ echo $ECHO_N "checking default library-dependency suffix... $ECHO_C" >&6
+ 
+ 	case X$DFT_LWR_MODEL in
+@@ -28052,10 +28055,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:28055: result: $DFT_DEP_SUFFIX" >&5
++echo "$as_me:28058: result: $DFT_DEP_SUFFIX" >&5
+ echo "${ECHO_T}$DFT_DEP_SUFFIX" >&6
+ 
+-echo "$as_me:28058: checking default object directory" >&5
++echo "$as_me:28061: checking default object directory" >&5
+ echo $ECHO_N "checking default object directory... $ECHO_C" >&6
+ 
+ 	case $DFT_LWR_MODEL in
+@@ -28071,11 +28074,11 @@
+ 			DFT_OBJ_SUBDIR='obj_s' ;;
+ 		esac
+ 	esac
+-echo "$as_me:28074: result: $DFT_OBJ_SUBDIR" >&5
++echo "$as_me:28077: result: $DFT_OBJ_SUBDIR" >&5
+ echo "${ECHO_T}$DFT_OBJ_SUBDIR" >&6
+ 
+ if test "x$cf_with_cxx" = xyes ; then
+-echo "$as_me:28078: checking c++ library-dependency suffix" >&5
++echo "$as_me:28081: 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++)
+@@ -28168,7 +28171,7 @@
+ 	fi
+ 
+ fi
+-echo "$as_me:28171: result: $CXX_LIB_SUFFIX" >&5
++echo "$as_me:28174: result: $CXX_LIB_SUFFIX" >&5
+ echo "${ECHO_T}$CXX_LIB_SUFFIX" >&6
+ 
+ fi
+@@ -28344,19 +28347,19 @@
+ 
+ if test -n "$LDFLAGS_STATIC" && test -n "$LDFLAGS_SHARED"
+ then
+-	echo "$as_me:28347: checking if linker supports switching between static/dynamic" >&5
++	echo "$as_me:28350: 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 28352 "configure"
++#line 28355 "configure"
+ #include <stdio.h>
+ int cf_ldflags_static(FILE *fp) { return fflush(fp); }
+ EOF
+-	if { (eval echo "$as_me:28356: \"$ac_compile\"") >&5
++	if { (eval echo "$as_me:28359: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:28359: \$? = $ac_status" >&5
++  echo "$as_me:28362: \$? = $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
+@@ -28367,10 +28370,10 @@
+ 
+ 	LIBS="$LDFLAGS_STATIC -L`pwd` -lconftest $LDFLAGS_DYNAMIC $LIBS"
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 28370 "configure"
++#line 28373 "configure"
+ #include "confdefs.h"
+ 
+-#line 28373 "configure"
++#line 28376 "configure"
+ #include <stdio.h>
+ int cf_ldflags_static(FILE *fp);
+ 
+@@ -28385,16 +28388,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:28388: \"$ac_link\"") >&5
++if { (eval echo "$as_me:28391: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:28391: \$? = $ac_status" >&5
++  echo "$as_me:28394: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:28394: \"$ac_try\"") >&5
++  { (eval echo "$as_me:28397: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:28397: \$? = $ac_status" >&5
++  echo "$as_me:28400: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+ 
+ 	# some linkers simply ignore the -dynamic
+@@ -28417,7 +28420,7 @@
+ 	rm -f libconftest.*
+ 	LIBS="$cf_save_LIBS"
+ 
+-	echo "$as_me:28420: result: $cf_ldflags_static" >&5
++	echo "$as_me:28423: result: $cf_ldflags_static" >&5
+ echo "${ECHO_T}$cf_ldflags_static" >&6
+ 
+ 	if test "$cf_ldflags_static" != yes
+@@ -28433,7 +28436,7 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:28436: checking where we will install curses.h" >&5
++echo "$as_me:28439: checking where we will install curses.h" >&5
+ echo $ECHO_N "checking where we will install curses.h... $ECHO_C" >&6
+ 
+ includesubdir=
+@@ -28443,7 +28446,7 @@
+ then
+ 	includesubdir="/ncurses${USE_LIB_SUFFIX}"
+ fi
+-echo "$as_me:28446: result: ${includedir}${includesubdir}" >&5
++echo "$as_me:28449: result: ${includedir}${includesubdir}" >&5
+ echo "${ECHO_T}${includedir}${includesubdir}" >&6
+ 
+ ### Resolve a conflict between normal and wide-curses by forcing applications
+@@ -28451,7 +28454,7 @@
+ if test "$with_overwrite" != no ; then
+ if test "$NCURSES_LIBUTF8" = 1 ; then
+ 	NCURSES_LIBUTF8='defined(HAVE_LIBUTF8_H)'
+-	{ echo "$as_me:28454: WARNING: Wide-character applications must define HAVE_LIBUTF8_H to include curses.h" >&5
++	{ echo "$as_me:28457: 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
+@@ -28479,7 +28482,7 @@
+ 
+ # pkgsrc uses these
+ 
+-echo "$as_me:28482: checking for desired basename for form library" >&5
++echo "$as_me:28485: 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.
+@@ -28499,10 +28502,10 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:28502: result: $FORM_NAME" >&5
++echo "$as_me:28505: result: $FORM_NAME" >&5
+ echo "${ECHO_T}$FORM_NAME" >&6
+ 
+-echo "$as_me:28505: checking for desired basename for menu library" >&5
++echo "$as_me:28508: 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.
+@@ -28522,10 +28525,10 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:28525: result: $MENU_NAME" >&5
++echo "$as_me:28528: result: $MENU_NAME" >&5
+ echo "${ECHO_T}$MENU_NAME" >&6
+ 
+-echo "$as_me:28528: checking for desired basename for panel library" >&5
++echo "$as_me:28531: 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.
+@@ -28545,10 +28548,10 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:28548: result: $PANEL_NAME" >&5
++echo "$as_me:28551: result: $PANEL_NAME" >&5
+ echo "${ECHO_T}$PANEL_NAME" >&6
+ 
+-echo "$as_me:28551: checking for desired basename for cxx library" >&5
++echo "$as_me:28554: 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.
+@@ -28568,13 +28571,13 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:28571: result: $CXX_NAME" >&5
++echo "$as_me:28574: 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:28577: checking for src modules" >&5
++echo "$as_me:28580: checking for src modules" >&5
+ echo $ECHO_N "checking for src modules... $ECHO_C" >&6
+ 
+ # dependencies and linker-arguments for test-programs
+@@ -28643,7 +28646,7 @@
+ 		fi
+ 	fi
+ done
+-echo "$as_me:28646: result: $cf_cv_src_modules" >&5
++echo "$as_me:28649: result: $cf_cv_src_modules" >&5
+ echo "${ECHO_T}$cf_cv_src_modules" >&6
+ 
+ TEST_ARGS="-L${LIB_DIR} $TEST_ARGS"
+@@ -28804,7 +28807,7 @@
+ 	(*-D_XOPEN_SOURCE_EXTENDED*)
+ 		test -n "$verbose" && echo "	moving _XOPEN_SOURCE_EXTENDED to work around g++ problem" 1>&6
+ 
+-echo "${as_me:-configure}:28807: testing moving _XOPEN_SOURCE_EXTENDED to work around g++ problem ..." 1>&5
++echo "${as_me:-configure}:28810: 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//'`
+@@ -28815,7 +28818,7 @@
+ 
+ # Help to automatically enable the extended curses features when using either
+ # the *-config or the ".pc" files by adding defines.
+-echo "$as_me:28818: checking for defines to add to ncurses${USE_CFG_SUFFIX}-config script" >&5
++echo "$as_me:28821: 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
+@@ -28831,7 +28834,7 @@
+ 	done
+ 	test "$cf_found" = no && PKG_CFLAGS="$PKG_CFLAGS $cf_loop1"
+ done
+-echo "$as_me:28834: result: $PKG_CFLAGS" >&5
++echo "$as_me:28837: result: $PKG_CFLAGS" >&5
+ echo "${ECHO_T}$PKG_CFLAGS" >&6
+ 
+ # AC_CHECK_SIZEOF demands a literal parameter, no variables.  So we do this.
+@@ -28892,7 +28895,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}:28895: testing will map symbols to ABI=$cf_cv_abi_version ..." 1>&5
++echo "${as_me:-configure}:28898: testing will map symbols to ABI=$cf_cv_abi_version ..." 1>&5
+ 
+ fi
+ 
+@@ -28919,7 +28922,7 @@
+ 
+ # This is used for the *-config script and *.pc data files.
+ 
+-echo "$as_me:28922: checking for linker search path" >&5
++echo "$as_me:28925: 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
+@@ -28967,7 +28970,7 @@
+ 			cf_pathlist="$cf_pathlist /lib /usr/lib"
+ 			;;
+ 		(*)
+-			{ echo "$as_me:28970: WARNING: problem with Solaris architecture" >&5
++			{ echo "$as_me:28973: WARNING: problem with Solaris architecture" >&5
+ echo "$as_me: WARNING: problem with Solaris architecture" >&2;}
+ 			;;
+ 		esac
+@@ -29008,7 +29011,7 @@
+ test -z "$cf_cv_ld_searchpath" && cf_cv_ld_searchpath=/usr/lib
+ 
+ fi
+-echo "$as_me:29011: result: $cf_cv_ld_searchpath" >&5
++echo "$as_me:29014: 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'`
+@@ -29098,7 +29101,7 @@
+ : "${CONFIG_STATUS=./config.status}"
+ ac_clean_files_save=$ac_clean_files
+ ac_clean_files="$ac_clean_files $CONFIG_STATUS"
+-{ echo "$as_me:29101: creating $CONFIG_STATUS" >&5
++{ echo "$as_me:29104: creating $CONFIG_STATUS" >&5
+ echo "$as_me: creating $CONFIG_STATUS" >&6;}
+ cat >"$CONFIG_STATUS" <<_ACEOF
+ #! $SHELL
+@@ -29277,7 +29280,7 @@
+     echo "$ac_cs_version"; exit 0 ;;
+   --he | --h)
+     # Conflict between --help and --header
+-    { { echo "$as_me:29280: error: ambiguous option: $1
++    { { echo "$as_me:29283: 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;}
+@@ -29296,7 +29299,7 @@
+     ac_need_defaults=false;;
+ 
+   # This is an error.
+-  -*) { { echo "$as_me:29299: error: unrecognized option: $1
++  -*) { { echo "$as_me:29302: 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;}
+@@ -29422,7 +29425,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:29425: error: invalid argument: $ac_config_target" >&5
++  *) { { echo "$as_me:29428: error: invalid argument: $ac_config_target" >&5
+ echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
+    { (exit 1); exit 1; }; };;
+   esac
+@@ -29934,7 +29937,7 @@
+   esac
+ 
+   if test x"$ac_file" != x-; then
+-    { echo "$as_me:29937: creating $ac_file" >&5
++    { echo "$as_me:29940: creating $ac_file" >&5
+ echo "$as_me: creating $ac_file" >&6;}
+     rm -f "$ac_file"
+   fi
+@@ -29952,7 +29955,7 @@
+       -) echo $tmp/stdin ;;
+       [\\/$]*)
+          # Absolute (can't be DOS-style, as IFS=:)
+-         test -f "$f" || { { echo "$as_me:29955: error: cannot find input file: $f" >&5
++         test -f "$f" || { { echo "$as_me:29958: error: cannot find input file: $f" >&5
+ echo "$as_me: error: cannot find input file: $f" >&2;}
+    { (exit 1); exit 1; }; }
+          echo $f;;
+@@ -29965,7 +29968,7 @@
+            echo "$srcdir/$f"
+          else
+            # /dev/null tree
+-           { { echo "$as_me:29968: error: cannot find input file: $f" >&5
++           { { echo "$as_me:29971: error: cannot find input file: $f" >&5
+ echo "$as_me: error: cannot find input file: $f" >&2;}
+    { (exit 1); exit 1; }; }
+          fi;;
+@@ -29981,7 +29984,7 @@
+       if test -n "$ac_seen"; then
+         ac_used=`grep '@datarootdir@' "$ac_item"`
+         if test -z "$ac_used"; then
+-          { echo "$as_me:29984: WARNING: datarootdir was used implicitly but not set:
++          { echo "$as_me:29987: 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;}
+@@ -29990,7 +29993,7 @@
+       fi
+       ac_seen=`grep '${datarootdir}' "$ac_item"`
+       if test -n "$ac_seen"; then
+-        { echo "$as_me:29993: WARNING: datarootdir was used explicitly but not set:
++        { echo "$as_me:29996: 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;}
+@@ -30027,7 +30030,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:30030: WARNING: Variable $ac_name is used but was not set:
++              { echo "$as_me:30033: 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;}
+@@ -30038,7 +30041,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:30041: WARNING: Some variables may not be substituted:
++      { echo "$as_me:30044: WARNING: Some variables may not be substituted:
+ $ac_seen" >&5
+ echo "$as_me: WARNING: Some variables may not be substituted:
+ $ac_seen" >&2;}
+@@ -30087,7 +30090,7 @@
+   * )   ac_file_in=$ac_file.in ;;
+   esac
+ 
+-  test x"$ac_file" != x- && { echo "$as_me:30090: creating $ac_file" >&5
++  test x"$ac_file" != x- && { echo "$as_me:30093: creating $ac_file" >&5
+ echo "$as_me: creating $ac_file" >&6;}
+ 
+   # First look for the input files in the build tree, otherwise in the
+@@ -30098,7 +30101,7 @@
+       -) echo $tmp/stdin ;;
+       [\\/$]*)
+          # Absolute (can't be DOS-style, as IFS=:)
+-         test -f "$f" || { { echo "$as_me:30101: error: cannot find input file: $f" >&5
++         test -f "$f" || { { echo "$as_me:30104: error: cannot find input file: $f" >&5
+ echo "$as_me: error: cannot find input file: $f" >&2;}
+    { (exit 1); exit 1; }; }
+          echo $f;;
+@@ -30111,7 +30114,7 @@
+            echo "$srcdir/$f"
+          else
+            # /dev/null tree
+-           { { echo "$as_me:30114: error: cannot find input file: $f" >&5
++           { { echo "$as_me:30117: error: cannot find input file: $f" >&5
+ echo "$as_me: error: cannot find input file: $f" >&2;}
+    { (exit 1); exit 1; }; }
+          fi;;
+@@ -30169,7 +30172,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:30172: $ac_file is unchanged" >&5
++      { echo "$as_me:30175: $ac_file is unchanged" >&5
+ echo "$as_me: $ac_file is unchanged" >&6;}
+     else
+       ac_dir=`$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+@@ -30556,7 +30559,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}:30559: testing overriding CXX_MODEL to SHARED ..." 1>&5
++echo "${as_me:-configure}:30562: testing overriding CXX_MODEL to SHARED ..." 1>&5
+ 
+ 					with_shared_cxx=yes
+ 					;;
+Index: dist.mk
+Prereq:  1.1463 
+--- ncurses-6.3-20220122+/dist.mk	2022-01-22 15:48:54.000000000 +0000
++++ ncurses-6.3-20220129/dist.mk	2022-01-29 12:21:50.000000000 +0000
+@@ -26,7 +26,7 @@
+ # use or other dealings in this Software without prior written               #
+ # authorization.                                                             #
+ ##############################################################################
+-# $Id: dist.mk,v 1.1463 2022/01/22 15:48:54 tom Exp $
++# $Id: dist.mk,v 1.1464 2022/01/29 12:21:50 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 = 20220122
++NCURSES_PATCH = 20220129
+ 
+ # We don't append the patch to the version, since this only applies to releases
+ VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR)
+Index: misc/terminfo.src
+--- ncurses-6.3-20220122+/misc/terminfo.src	2021-11-27 21:53:31.000000000 +0000
++++ ncurses-6.3-20220129/misc/terminfo.src	2022-01-23 22:33:01.000000000 +0000
+@@ -6,8 +6,8 @@
+ # Report bugs and new terminal descriptions to
+ #	bug-ncurses@gnu.org
+ #
+-#	$Revision: 1.970 $
+-#	$Date: 2021/11/27 21:53:31 $
++#	$Revision: 1.974 $
++#	$Date: 2022/01/23 22:33:01 $
+ #
+ # The original header is preserved below for reference.  It is noted that there
+ # is a "newer" version which differs in some cosmetic details (but actually
+@@ -7531,7 +7531,26 @@
+ #	http://lists.gnu.org/archive/html/bug-ncurses/2018-09/msg00005.html
+ #	https://github.com/kovidgoyal/kitty/issues/879
+ #
+-# Version 0.19.1
++# Version 0.21.2 (June 28, 2021)
++# changes since 0.19.1
++# Notes:
++#	Repeatable tests with tack and vttest assume a standard screensize --
++#	measured in characters.  However, kitty uses pixel-measurements and
++#	does not readily use characters.
++#	Resizing with twm shows only pixel-based hint rather than characters
++#	manual page states that it is possible to override initial window size,
++#	but configuration file has no effect on initial window size.
++#	The same problem with XFCE4, but editing the cached json file works
++#	for setting the window size (the "c" suffix for cells does not):
++#		{"window-size": [720, 440]}
++#	though the values depend upon the font in use.
++# vttest
++# tack
++#	flash works
++#	invisible text still does not work
++#	function/special key modifiers finally work
++#
++# Version 0.19.1 (October 6, 2020)
+ # changes since 0.13.3:
+ # vttest
+ #	ISO-6429
+@@ -7547,7 +7566,7 @@
+ #	rs1 adds an empty string for resetting title- and other OSC-strings.
+ #	italics work
+ #
+-# Version 0.13.3
++# Version 0.13.3 (January 19, 2019)
+ # Notes:
+ #	initial screensize 71x22
+ #	does not respond to "resize -s"
+@@ -7625,30 +7644,31 @@
+ 	dl1=\E[M, ech=\E[%p1%dX, ed=\E[J, el=\E[K, el1=\E[1K,
+ 	flash=\E[?5h$<100/>\E[?5l, home=\E[H, hpa=\E[%i%p1%dG,
+ 	ht=^I, hts=\EH, ich=\E[%p1%d@, il=\E[%p1%dL, il1=\E[L,
+-	ind=\n, kbs=^?, kcbt=\E[Z, kcub1=\EOD, kcud1=\EOB,
+-	kcuf1=\EOC, kcuu1=\EOA, kdch1=\E[3~, kend=\EOF, kf1=\EOP,
+-	kf10=\E[21~, kf11=\E[23~, kf12=\E[24~, kf13=\E[1;2P,
+-	kf14=\E[1;2Q, kf15=\E[1;2R, kf16=\E[1;2S, kf17=\E[15;2~,
+-	kf18=\E[17;2~, kf19=\E[18;2~, kf2=\EOQ, kf20=\E[19;2~,
+-	kf21=\E[20;2~, kf22=\E[21;2~, kf23=\E[23;2~,
+-	kf24=\E[24;2~, kf25=\E[1;5P, kf26=\E[1;5Q, kf27=\E[1;5R,
+-	kf28=\E[1;5S, kf29=\E[15;5~, kf3=\EOR, kf30=\E[17;5~,
+-	kf31=\E[18;5~, kf32=\E[19;5~, kf33=\E[20;5~,
+-	kf34=\E[21;5~, kf35=\E[23;5~, kf36=\E[24;5~, kf4=\EOS,
+-	kf5=\E[15~, kf6=\E[17~, kf7=\E[18~, kf8=\E[19~, kf9=\E[20~,
+-	khome=\EOH, kich1=\E[2~, kind=\E[1;2B, knp=\E[6~,
+-	kpp=\E[5~, kri=\E[1;2A, op=\E[39;49m, rc=\E8, rev=\E[7m,
+-	ri=\EM, rmacs=\E(B, rmam=\E[?7l, rmir=\E[4l, rmkx=\E[?1l,
++	ind=\n, kBEG=\E[1;2E, kbeg=\EOE, kbs=^?, kcbt=\E[Z,
++	kcub1=\EOD, kcud1=\EOB, kcuf1=\EOC, kcuu1=\EOA,
++	kdch1=\E[3~, kend=\EOF, kf1=\EOP, kf10=\E[21~, kf11=\E[23~,
++	kf12=\E[24~, kf13=\E[1;2P, kf14=\E[1;2Q, kf15=\E[1;2R,
++	kf16=\E[1;2S, kf17=\E[15;2~, kf18=\E[17;2~,
++	kf19=\E[18;2~, kf2=\EOQ, kf20=\E[19;2~, kf21=\E[20;2~,
++	kf22=\E[21;2~, kf23=\E[23;2~, kf24=\E[24;2~,
++	kf25=\E[1;5P, kf26=\E[1;5Q, kf27=\E[1;5R, kf28=\E[1;5S,
++	kf29=\E[15;5~, kf3=\EOR, kf30=\E[17;5~, kf31=\E[18;5~,
++	kf32=\E[19;5~, kf33=\E[20;5~, kf34=\E[21;5~,
++	kf35=\E[23;5~, kf36=\E[24;5~, kf4=\EOS, kf5=\E[15~,
++	kf6=\E[17~, kf7=\E[18~, kf8=\E[19~, kf9=\E[20~, khome=\EOH,
++	kich1=\E[2~, kind=\E[1;2B, knp=\E[6~, kpp=\E[5~,
++	kri=\E[1;2A, op=\E[39;49m, rc=\E8, rev=\E[7m, ri=\EM,
++	rmacs=\E(B, rmam=\E[?7l, rmir=\E[4l, rmkx=\E[?1l,
+ 	rmso=\E[27m, rmul=\E[24m, rs1=\E]\E\\\Ec, sc=\E7,
+ 	sgr=%?%p9%t\E(0%e\E(B%;\E[0%?%p6%t;1%;%?%p5%t;2%;%?%p2%t;4%;
+ 	    %?%p1%p3%|%t;7%;m,
+ 	sgr0=\E(B\E[m, smacs=\E(0, smam=\E[?7h, smir=\E[4h,
+ 	smkx=\E[?1h, smso=\E[7m, smul=\E[4m, tbc=\E[3g,
+-	vpa=\E[%i%p1%dd, use=ansi+enq, use=ansi+rep,
+-	use=xterm+sm+1006, use=ecma+index, use=xterm+sl-twm,
+-	use=ecma+strikeout, use=xterm+pce2, use=xterm+pcc2,
+-	use=ecma+italics, use=xterm+alt1049, use=att610+cvis,
+-	use=xterm+tmux,
++	vpa=\E[%i%p1%dd, Smulx=\E[4:%p1%dm, use=ansi+enq,
++	use=ansi+rep, use=xterm+sm+1006, use=ecma+index,
++	use=xterm+pcfkeys, use=xterm+sl-twm,
++	use=ecma+strikeout, use=ecma+italics,
++	use=xterm+alt1049, use=att610+cvis, use=xterm+tmux,
+ 
+ ######## WAYLAND CLIENTS
+ 
+@@ -27320,4 +27340,7 @@
+ #	+ fix errata in description fields (report by Eric Lindblad) -TD
+ #	+ add x10term+sl, aixterm+sl, ncr260vp+sl, ncr260vp+vt, wyse+sl -TD
+ #
++# 2022-01-23
++#	+ update kitty -TD
++#
+ ######## SHANTIH!  SHANTIH!  SHANTIH!
+Index: package/debian-mingw/changelog
+--- ncurses-6.3-20220122+/package/debian-mingw/changelog	2022-01-22 15:48:54.000000000 +0000
++++ ncurses-6.3-20220129/package/debian-mingw/changelog	2022-01-29 12:21:50.000000000 +0000
+@@ -1,8 +1,8 @@
+-ncurses6 (6.3+20220122) unstable; urgency=low
++ncurses6 (6.3+20220129) unstable; urgency=low
+ 
+   * latest weekly patch
+ 
+- -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 22 Jan 2022 10:48:54 -0500
++ -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 29 Jan 2022 07:21:50 -0500
+ 
+ ncurses6 (5.9-20131005) unstable; urgency=low
+ 
+Index: package/debian-mingw64/changelog
+--- ncurses-6.3-20220122+/package/debian-mingw64/changelog	2022-01-22 15:48:54.000000000 +0000
++++ ncurses-6.3-20220129/package/debian-mingw64/changelog	2022-01-29 12:21:50.000000000 +0000
+@@ -1,8 +1,8 @@
+-ncurses6 (6.3+20220122) unstable; urgency=low
++ncurses6 (6.3+20220129) unstable; urgency=low
+ 
+   * latest weekly patch
+ 
+- -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 22 Jan 2022 10:48:54 -0500
++ -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 29 Jan 2022 07:21:50 -0500
+ 
+ ncurses6 (5.9-20131005) unstable; urgency=low
+ 
+Index: package/debian/changelog
+--- ncurses-6.3-20220122+/package/debian/changelog	2022-01-22 15:48:54.000000000 +0000
++++ ncurses-6.3-20220129/package/debian/changelog	2022-01-29 12:21:50.000000000 +0000
+@@ -1,8 +1,8 @@
+-ncurses6 (6.3+20220122) unstable; urgency=low
++ncurses6 (6.3+20220129) unstable; urgency=low
+ 
+   * latest weekly patch
+ 
+- -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 22 Jan 2022 10:48:54 -0500
++ -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 29 Jan 2022 07:21:49 -0500
+ 
+ ncurses6 (5.9-20120608) unstable; urgency=low
+ 
+Index: package/debian/ncurses6.lintian-overrides
+--- ncurses-6.3-20220122+/package/debian/ncurses6.lintian-overrides	2018-08-18 20:35:02.000000000 +0000
++++ ncurses-6.3-20220129/package/debian/ncurses6.lintian-overrides	2022-01-30 01:01:57.000000000 +0000
+@@ -1,15 +1,17 @@
+ # This is intentional.
+ ncurses6: package-name-doesnt-match-sonames libformw6-6 libmenuw6-6 libncurses++w6-6 libncursesw6-6 libpanelw6-6 libticw6-6 libtinfow6-6
+ 
+-# This works around a bug in Debian's build-scripts.
+-ncurses6: latest-debian-changelog-entry-changed-to-native
++# This worked around a bug in Debian's build-scripts.
++#ncurses6: latest-debian-changelog-entry-changed-to-native
+ 
+ ncurses6: hardening-no-fortify-functions usr/lib/libncurses++w6.so.6.1
++#ncurses6: hardening-no-fortify-functions usr/lib/libformw6.so.6.1
++ncurses6: hardening-no-fortify-functions usr/lib/libmenuw6.so.6.1
+ 
+ # This is intentional.
+ ncurses6: binary-without-manpage
+ ncurses6: non-dev-pkg-with-shlib-symlink
+-ncurses6: embedded-library usr/lib/libtinfow6.so.6.1: ncurses
+-ncurses6: postinst-must-call-ldconfig usr/lib/libtinfow6.so.6.1
++ncurses6: embedded-library ncurses usr/lib/libtinfow6.so.6.1
++#ncurses6: postinst-must-call-ldconfig usr/lib/libtinfow6.so.6.1
+ 
+ # vile: confmode
+Index: package/debian/ncursest6.lintian-overrides
+--- ncurses-6.3-20220122+/package/debian/ncursest6.lintian-overrides	2018-08-18 20:35:07.000000000 +0000
++++ ncurses-6.3-20220129/package/debian/ncursest6.lintian-overrides	2022-01-30 01:02:06.000000000 +0000
+@@ -1,15 +1,17 @@
+ # This is intentional.
+ ncursest6: package-name-doesnt-match-sonames libformtw6-6 libmenutw6-6 libncurses++tw6-6 libncursestw6-6 libpaneltw6-6 libtictw6-6 libtinfotw6-6
+ 
+-# This works around a bug in Debian's build-scripts.
+-ncursest6: latest-debian-changelog-entry-changed-to-native
++# This worked around a bug in Debian's build-scripts.
++#ncursest6: latest-debian-changelog-entry-changed-to-native
+ 
+ ncursest6: hardening-no-fortify-functions usr/lib/libncurses++tw6.so.6.1
++#ncursest6: hardening-no-fortify-functions usr/lib/libformtw6.so.6.1
++ncursest6: hardening-no-fortify-functions usr/lib/libmenutw6.so.6.1
+ 
+ # This is intentional.
+ ncursest6: binary-without-manpage
+ ncursest6: non-dev-pkg-with-shlib-symlink
+-ncursest6: embedded-library usr/lib/libtinfotw6.so.6.1: ncurses
+-ncursest6: postinst-must-call-ldconfig usr/lib/libtinfotw6.so.6.1
++ncursest6: embedded-library ncurses usr/lib/libtinfotw6.so.6.1
++#ncursest6: postinst-must-call-ldconfig usr/lib/libtinfotw6.so.6.1
+ 
+ # vile: confmode
+Index: package/debian/rules
+Prereq:  1.42 
+--- ncurses-6.3-20220122+/package/debian/rules	2021-11-20 15:51:09.000000000 +0000
++++ ncurses-6.3-20220129/package/debian/rules	2022-01-30 01:09:39.000000000 +0000
+@@ -1,5 +1,5 @@
+ #!/usr/bin/make -f
+-# $Id: rules,v 1.42 2021/11/20 15:51:09 tom Exp $
++# $Id: rules,v 1.44 2022/01/30 01:09:39 tom Exp $
+ 
+ # Uncomment this to turn on verbose mode.
+ #export DH_VERBOSE=1
+@@ -254,6 +254,13 @@
+ 	rm -f $(PACKAGES.arch:%=install-%-stamp)
+ 	dh_testdir
+ 	dh_testroot
++
++	version=`set -x; awk 'BEGIN{major=minor=0} /^NCURSES_MAJOR/{major=$$3} /^NCURSES_MINOR/{minor=$$3} END{print major "." minor}' < dist.mk`; \
++	sed -i \
++		-e "s, usr/lib, usr/lib/$(DEB_HOST_MULTIARCH)," \
++		-e "s,6\.1,$${version}," \
++		debian/*.lintian-overrides
++
+ 	dh_lintian           $(verbose) $(PACKAGES.arch:%=-p%)
+ 	dh_installdocs       $(verbose) $(PACKAGES.arch:%=-p%)
+ 	dh_installchangelogs $(verbose) $(PACKAGES.arch:%=-p%)  NEWS
+Index: package/mingw-ncurses.nsi
+Prereq:  1.503 
+--- ncurses-6.3-20220122+/package/mingw-ncurses.nsi	2022-01-22 15:48:54.000000000 +0000
++++ ncurses-6.3-20220129/package/mingw-ncurses.nsi	2022-01-29 12:21:50.000000000 +0000
+@@ -1,4 +1,4 @@
+-; $Id: mingw-ncurses.nsi,v 1.503 2022/01/22 15:48:54 tom Exp $

++; $Id: mingw-ncurses.nsi,v 1.504 2022/01/29 12:21:50 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  "0122"

++!define VERSION_MMDD  "0129"

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

+ 

+ !define MY_ABI   "5"

+Index: package/mingw-ncurses.spec
+--- ncurses-6.3-20220122+/package/mingw-ncurses.spec	2022-01-22 15:48:54.000000000 +0000
++++ ncurses-6.3-20220129/package/mingw-ncurses.spec	2022-01-29 12:21:50.000000000 +0000
+@@ -3,7 +3,7 @@
+ Summary: shared libraries for terminal handling
+ Name: mingw32-ncurses6
+ Version: 6.3
+-Release: 20220122
++Release: 20220129
+ License: X11
+ Group: Development/Libraries
+ Source: ncurses-%{version}-%{release}.tgz
+Index: package/ncurses.spec
+--- ncurses-6.3-20220122+/package/ncurses.spec	2022-01-22 15:48:54.000000000 +0000
++++ ncurses-6.3-20220129/package/ncurses.spec	2022-01-29 12:21:50.000000000 +0000
+@@ -1,7 +1,7 @@
+ Summary: shared libraries for terminal handling
+ Name: ncurses6
+ Version: 6.3
+-Release: 20220122
++Release: 20220129
+ License: X11
+ Group: Development/Libraries
+ Source: ncurses-%{version}-%{release}.tgz
+Index: package/ncursest.spec
+--- ncurses-6.3-20220122+/package/ncursest.spec	2022-01-22 15:48:54.000000000 +0000
++++ ncurses-6.3-20220129/package/ncursest.spec	2022-01-29 12:21:50.000000000 +0000
+@@ -1,7 +1,7 @@
+ Summary: Curses library with POSIX thread support.
+ Name: ncursest6
+ Version: 6.3
+-Release: 20220122
++Release: 20220129
+ License: X11
+ Group: Development/Libraries
+ Source: ncurses-%{version}-%{release}.tgz