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

1 files changed, 23868 insertions, 0 deletions

diff --git a/system/ncurses/ncurses-6.3-20211120.patch b/system/ncurses/ncurses-6.3-20211120.patch
new file mode 100644
index 000000000..6e5b015df
--- /dev/null
+++ b/system/ncurses/ncurses-6.3-20211120.patch
@@ -0,0 +1,23868 @@
+# ncurses 6.3 - patch 20211120 - 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-20211120.patch.gz
+# patch by Thomas E. Dickey <dickey@invisible-island.net>
+# created  Sun Nov 21 01:19:08 UTC 2021
+# ------------------------------------------------------------------------------
+# Ada95/aclocal.m4                 |  102 
+# Ada95/configure                  | 2492 ++++++++++-----------
+# INSTALL                          |    5 
+# NEWS                             |   12 
+# VERSION                          |    2 
+# aclocal.m4                       |  107 
+# configure                        | 4377 ++++++++++++++++++-------------------
+# dist.mk                          |    4 
+# include/nc_alloc.h               |    3 
+# misc/terminfo.src                |   17 
+# ncurses/term.priv.h              |    5 
+# ncurses/tinfo/entries.c          |    6 
+# ncurses/tinfo/lib_cur_term.c     |    6 
+# ncurses/tinfo/lib_data.c         |    3 
+# ncurses/tinfo/lib_setup.c        |    3 
+# ncurses/tinfo/lib_tparm.c        |   12 
+# package/debian-mingw/changelog   |    4 
+# package/debian-mingw64/changelog |    4 
+# package/debian/changelog         |    4 
+# package/debian/control           |    2 
+# package/debian/rules             |   16 
+# package/mingw-ncurses.nsi        |    4 
+# package/mingw-ncurses.spec       |    2 
+# package/ncurses.spec             |    2 
+# package/ncursest.spec            |    2 
+# 25 files changed, 3645 insertions(+), 3551 deletions(-)
+# ------------------------------------------------------------------------------
+Index: Ada95/aclocal.m4
+Prereq:  1.189 
+--- ncurses-6.3-20211115+/Ada95/aclocal.m4	2021-11-07 15:35:59.000000000 +0000
++++ ncurses-6.3-20211120/Ada95/aclocal.m4	2021-11-20 19:58:23.000000000 +0000
+@@ -29,7 +29,7 @@
+ dnl
+ dnl Author: Thomas E. Dickey
+ dnl
+-dnl $Id: aclocal.m4,v 1.189 2021/11/07 15:35:59 tom Exp $
++dnl $Id: aclocal.m4,v 1.191 2021/11/20 19:58:23 tom Exp $
+ dnl Macros used in NCURSES Ada95 auto-configuration script.
+ dnl
+ dnl These macros are maintained separately from NCURSES.  The copyright on
+@@ -4802,7 +4802,7 @@
+ AC_SUBST($3)dnl
+ ])dnl
+ dnl ---------------------------------------------------------------------------
+-dnl CF_WITH_PKG_CONFIG_LIBDIR version: 17 updated: 2021/11/07 10:30:15
++dnl CF_WITH_PKG_CONFIG_LIBDIR version: 19 updated: 2021/11/20 14:57:36
+ dnl -------------------------
+ dnl Allow the choice of the pkg-config library directory to be overridden.
+ dnl
+@@ -4825,18 +4825,31 @@
+ 	;;
+ esac
+ 
++# if $PKG_CONFIG_LIBDIR is set, try to use that
+ cf_search_path=`echo "$PKG_CONFIG_LIBDIR" | sed -e 's/:/ /g' -e 's,^[[ 	]]*,,'`
++
++# if the option is used, let that override.  otherwise default to "libdir"
+ AC_ARG_WITH(pkg-config-libdir,
+ 	[  --with-pkg-config-libdir=XXX use given directory for installing pc-files],
+ 	[cf_search_path=$withval],
+-	[test "x$PKG_CONFIG" != xnone && cf_search_path=yes])
++	[test "x$PKG_CONFIG" != xnone && test -z "$cf_search_path" && cf_search_path=libdir])
+ 
+ case x$cf_search_path in
++(xlibdir)
++	PKG_CONFIG_LIBDIR='${libdir}/pkgconfig'
++	AC_MSG_RESULT($PKG_CONFIG_LIBDIR)
++	cf_search_path=
++	;;
++(x)
++	;;
+ (x/*)
++	PKG_CONFIG_LIBDIR="$cf_search_path"
++	AC_MSG_RESULT($PKG_CONFIG_LIBDIR)
++	cf_search_path=
+ 	;;
+-(xyes)
++(xyes|xauto)
++	AC_MSG_RESULT(auto)
+ 	cf_search_path=
+-	CF_VERBOSE(auto...)
+ 	# Look for the library directory using the same prefix as the executable
+ 	AC_MSG_CHECKING(for search-list)
+ 	if test "x$PKG_CONFIG" != xnone
+@@ -4865,54 +4878,57 @@
+ 	fi
+ 
+ 	AC_MSG_RESULT($cf_search_path)
+-
+ 	;;
+ (*)
++	AC_MSG_ERROR(Unexpected option value: $cf_search_path)
+ 	;;
+ esac
+ 
+-AC_MSG_CHECKING(for first directory)
+-cf_pkg_config_path=none
+-for cf_config in $cf_search_path
+-do
+-	if test -d "$cf_config"
+-	then
+-		cf_pkg_config_path=$cf_config
+-		break
+-	fi
+-done
+-AC_MSG_RESULT($cf_pkg_config_path)
+-
+-if test "x$cf_pkg_config_path" != xnone ; then
+-	# limit this to the first directory found
+-	PKG_CONFIG_LIBDIR="$cf_pkg_config_path"
+-fi
+-
+-if test -z "$PKG_CONFIG_LIBDIR" && test -n "$cf_search_path"
++if test -n "$cf_search_path"
+ then
+-	AC_MSG_CHECKING(for workaround)
+-	if test "$prefix" = "NONE" ; then
+-		cf_prefix="$ac_default_prefix"
+-	else
+-		cf_prefix="$prefix"
+-	fi
+-	eval cf_libdir=$libdir
+-	cf_libdir=`echo "$cf_libdir" | sed -e "s,^NONE,$cf_prefix,"`
+-	cf_backup=
++	AC_MSG_CHECKING(for first directory)
++	cf_pkg_config_path=none
+ 	for cf_config in $cf_search_path
+ 	do
+-		case $cf_config in
+-		$cf_libdir/pkgconfig)
+-			PKG_CONFIG_LIBDIR=$cf_libdir/pkgconfig
++		if test -d "$cf_config"
++		then
++			cf_pkg_config_path=$cf_config
+ 			break
+-			;;
+-		*)
+-			test -z "$cf_backup" && cf_backup=$cf_config
+-			;;
+-		esac
++		fi
+ 	done
+-	test -z "$PKG_CONFIG_LIBDIR" && PKG_CONFIG_LIBDIR=$cf_backup
+-	AC_MSG_RESULT($PKG_CONFIG_LIBDIR)
++	AC_MSG_RESULT($cf_pkg_config_path)
++
++	if test "x$cf_pkg_config_path" != xnone ; then
++		# limit this to the first directory found
++		PKG_CONFIG_LIBDIR="$cf_pkg_config_path"
++	fi
++
++	if test -z "$PKG_CONFIG_LIBDIR" && test -n "$cf_search_path"
++	then
++		AC_MSG_CHECKING(for workaround)
++		if test "$prefix" = "NONE" ; then
++			cf_prefix="$ac_default_prefix"
++		else
++			cf_prefix="$prefix"
++		fi
++		eval cf_libdir=$libdir
++		cf_libdir=`echo "$cf_libdir" | sed -e "s,^NONE,$cf_prefix,"`
++		cf_backup=
++		for cf_config in $cf_search_path
++		do
++			case $cf_config in
++			$cf_libdir/pkgconfig)
++				PKG_CONFIG_LIBDIR=$cf_libdir/pkgconfig
++				break
++				;;
++			*)
++				test -z "$cf_backup" && cf_backup=$cf_config
++				;;
++			esac
++		done
++		test -z "$PKG_CONFIG_LIBDIR" && PKG_CONFIG_LIBDIR=$cf_backup
++		AC_MSG_RESULT($PKG_CONFIG_LIBDIR)
++	fi
+ fi
+ 
+ AC_SUBST(PKG_CONFIG_LIBDIR)
+Index: Ada95/configure
+--- ncurses-6.3-20211115+/Ada95/configure	2021-11-07 15:36:29.000000000 +0000
++++ ncurses-6.3-20211120/Ada95/configure	2021-11-20 19:58:46.000000000 +0000
+@@ -3279,27 +3279,40 @@
+ 	;;
+ esac
+ 
++# if $PKG_CONFIG_LIBDIR is set, try to use that
+ cf_search_path=`echo "$PKG_CONFIG_LIBDIR" | sed -e 's/:/ /g' -e 's,^[ 	]*,,'`
+ 
++# if the option is used, let that override.  otherwise default to "libdir"
++
+ # Check whether --with-pkg-config-libdir or --without-pkg-config-libdir was given.
+ if test "${with_pkg_config_libdir+set}" = set; then
+   withval="$with_pkg_config_libdir"
+   cf_search_path=$withval
+ else
+-  test "x$PKG_CONFIG" != xnone && cf_search_path=yes
++  test "x$PKG_CONFIG" != xnone && test -z "$cf_search_path" && cf_search_path=libdir
+ fi;
+ 
+ case x$cf_search_path in
++(xlibdir)
++	PKG_CONFIG_LIBDIR='${libdir}/pkgconfig'
++	echo "$as_me:3298: result: $PKG_CONFIG_LIBDIR" >&5
++echo "${ECHO_T}$PKG_CONFIG_LIBDIR" >&6
++	cf_search_path=
++	;;
++(x)
++	;;
+ (x/*)
++	PKG_CONFIG_LIBDIR="$cf_search_path"
++	echo "$as_me:3306: result: $PKG_CONFIG_LIBDIR" >&5
++echo "${ECHO_T}$PKG_CONFIG_LIBDIR" >&6
++	cf_search_path=
+ 	;;
+-(xyes)
++(xyes|xauto)
++	echo "$as_me:3311: result: auto" >&5
++echo "${ECHO_T}auto" >&6
+ 	cf_search_path=
+-	test -n "$verbose" && echo "	auto..." 1>&6
+-
+-echo "${as_me:-configure}:3299: testing auto... ..." 1>&5
+-
+ 	# Look for the library directory using the same prefix as the executable
+-	echo "$as_me:3302: checking for search-list" >&5
++	echo "$as_me:3315: checking for search-list" >&5
+ echo $ECHO_N "checking for search-list... $ECHO_C" >&6
+ 	if test "x$PKG_CONFIG" != xnone
+ 	then
+@@ -3326,63 +3339,68 @@
+ "`
+ 	fi
+ 
+-	echo "$as_me:3329: result: $cf_search_path" >&5
++	echo "$as_me:3342: 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: error: Unexpected option value: $cf_search_path" >&2;}
++   { (exit 1); exit 1; }; }
+ 	;;
+ esac
+ 
+-echo "$as_me:3337: 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
+-do
+-	if test -d "$cf_config"
+-	then
+-		cf_pkg_config_path=$cf_config
+-		break
+-	fi
+-done
+-echo "$as_me:3348: result: $cf_pkg_config_path" >&5
+-echo "${ECHO_T}$cf_pkg_config_path" >&6
+-
+-if test "x$cf_pkg_config_path" != xnone ; then
+-	# limit this to the first directory found
+-	PKG_CONFIG_LIBDIR="$cf_pkg_config_path"
+-fi
+-
+-if test -z "$PKG_CONFIG_LIBDIR" && test -n "$cf_search_path"
++if test -n "$cf_search_path"
+ then
+-	echo "$as_me:3358: checking for workaround" >&5
+-echo $ECHO_N "checking for workaround... $ECHO_C" >&6
+-	if test "$prefix" = "NONE" ; then
+-		cf_prefix="$ac_default_prefix"
+-	else
+-		cf_prefix="$prefix"
+-	fi
+-	eval cf_libdir=$libdir
+-	cf_libdir=`echo "$cf_libdir" | sed -e "s,^NONE,$cf_prefix,"`
+-	cf_backup=
++	echo "$as_me:3354: 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
+ 	do
+-		case $cf_config in
+-		$cf_libdir/pkgconfig)
+-			PKG_CONFIG_LIBDIR=$cf_libdir/pkgconfig
++		if test -d "$cf_config"
++		then
++			cf_pkg_config_path=$cf_config
+ 			break
+-			;;
+-		*)
+-			test -z "$cf_backup" && cf_backup=$cf_config
+-			;;
+-		esac
++		fi
+ 	done
+-	test -z "$PKG_CONFIG_LIBDIR" && PKG_CONFIG_LIBDIR=$cf_backup
+-	echo "$as_me:3381: result: $PKG_CONFIG_LIBDIR" >&5
++	echo "$as_me:3365: result: $cf_pkg_config_path" >&5
++echo "${ECHO_T}$cf_pkg_config_path" >&6
++
++	if test "x$cf_pkg_config_path" != xnone ; then
++		# limit this to the first directory found
++		PKG_CONFIG_LIBDIR="$cf_pkg_config_path"
++	fi
++
++	if test -z "$PKG_CONFIG_LIBDIR" && test -n "$cf_search_path"
++	then
++		echo "$as_me:3375: checking for workaround" >&5
++echo $ECHO_N "checking for workaround... $ECHO_C" >&6
++		if test "$prefix" = "NONE" ; then
++			cf_prefix="$ac_default_prefix"
++		else
++			cf_prefix="$prefix"
++		fi
++		eval cf_libdir=$libdir
++		cf_libdir=`echo "$cf_libdir" | sed -e "s,^NONE,$cf_prefix,"`
++		cf_backup=
++		for cf_config in $cf_search_path
++		do
++			case $cf_config in
++			$cf_libdir/pkgconfig)
++				PKG_CONFIG_LIBDIR=$cf_libdir/pkgconfig
++				break
++				;;
++			*)
++				test -z "$cf_backup" && cf_backup=$cf_config
++				;;
++			esac
++		done
++		test -z "$PKG_CONFIG_LIBDIR" && PKG_CONFIG_LIBDIR=$cf_backup
++		echo "$as_me:3398: result: $PKG_CONFIG_LIBDIR" >&5
+ echo "${ECHO_T}$PKG_CONFIG_LIBDIR" >&6
++	fi
+ fi
+ 
+-echo "$as_me:3385: checking if you want to build test-programs" >&5
++echo "$as_me:3403: 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.
+@@ -3392,10 +3410,10 @@
+ else
+   cf_with_tests=yes
+ fi;
+-echo "$as_me:3395: result: $cf_with_tests" >&5
++echo "$as_me:3413: result: $cf_with_tests" >&5
+ echo "${ECHO_T}$cf_with_tests" >&6
+ 
+-echo "$as_me:3398: checking if we should assume mixed-case filenames" >&5
++echo "$as_me:3416: 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.
+@@ -3405,11 +3423,11 @@
+ else
+   enable_mixedcase=auto
+ fi;
+-echo "$as_me:3408: result: $enable_mixedcase" >&5
++echo "$as_me:3426: result: $enable_mixedcase" >&5
+ echo "${ECHO_T}$enable_mixedcase" >&6
+ if test "$enable_mixedcase" = "auto" ; then
+ 
+-echo "$as_me:3412: checking if filesystem supports mixed-case filenames" >&5
++echo "$as_me:3430: 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
+@@ -3436,7 +3454,7 @@
+ fi
+ 
+ fi
+-echo "$as_me:3439: result: $cf_cv_mixedcase" >&5
++echo "$as_me:3457: result: $cf_cv_mixedcase" >&5
+ echo "${ECHO_T}$cf_cv_mixedcase" >&6
+ test "$cf_cv_mixedcase" = yes &&
+ cat >>confdefs.h <<\EOF
+@@ -3454,7 +3472,7 @@
+ fi
+ 
+ # do this after mixed-case option (tags/TAGS is not as important as tic).
+-echo "$as_me:3457: checking whether ${MAKE-make} sets \${MAKE}" >&5
++echo "$as_me:3475: 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
+@@ -3474,16 +3492,16 @@
+ rm -f conftest.make
+ fi
+ if eval "test \"`echo '$ac_cv_prog_make_'${ac_make}_set`\" = yes"; then
+-  echo "$as_me:3477: result: yes" >&5
++  echo "$as_me:3495: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+   SET_MAKE=
+ else
+-  echo "$as_me:3481: result: no" >&5
++  echo "$as_me:3499: result: no" >&5
+ echo "${ECHO_T}no" >&6
+   SET_MAKE="MAKE=${MAKE-make}"
+ fi
+ 
+-echo "$as_me:3486: checking for \".PHONY\" make-support" >&5
++echo "$as_me:3504: 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
+@@ -3538,7 +3556,7 @@
+ 	rm -rf conftest*
+ 
+ fi
+-echo "$as_me:3541: result: $cf_cv_make_PHONY" >&5
++echo "$as_me:3559: result: $cf_cv_make_PHONY" >&5
+ echo "${ECHO_T}$cf_cv_make_PHONY" >&6
+ MAKE_NO_PHONY="#"
+ MAKE_PHONY="#"
+@@ -3549,7 +3567,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:3552: checking for $ac_word" >&5
++echo "$as_me:3570: checking for $ac_word" >&5
+ echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+ if test "${ac_cv_prog_CTAGS+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -3564,7 +3582,7 @@
+   test -z "$ac_dir" && ac_dir=.
+   $as_executable_p "$ac_dir/$ac_word" || continue
+ ac_cv_prog_CTAGS="$ac_prog"
+-echo "$as_me:3567: found $ac_dir/$ac_word" >&5
++echo "$as_me:3585: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -3572,10 +3590,10 @@
+ fi
+ CTAGS=$ac_cv_prog_CTAGS
+ if test -n "$CTAGS"; then
+-  echo "$as_me:3575: result: $CTAGS" >&5
++  echo "$as_me:3593: result: $CTAGS" >&5
+ echo "${ECHO_T}$CTAGS" >&6
+ else
+-  echo "$as_me:3578: result: no" >&5
++  echo "$as_me:3596: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -3586,7 +3604,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:3589: checking for $ac_word" >&5
++echo "$as_me:3607: 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
+@@ -3601,7 +3619,7 @@
+   test -z "$ac_dir" && ac_dir=.
+   $as_executable_p "$ac_dir/$ac_word" || continue
+ ac_cv_prog_ETAGS="$ac_prog"
+-echo "$as_me:3604: found $ac_dir/$ac_word" >&5
++echo "$as_me:3622: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -3609,10 +3627,10 @@
+ fi
+ ETAGS=$ac_cv_prog_ETAGS
+ if test -n "$ETAGS"; then
+-  echo "$as_me:3612: result: $ETAGS" >&5
++  echo "$as_me:3630: result: $ETAGS" >&5
+ echo "${ECHO_T}$ETAGS" >&6
+ else
+-  echo "$as_me:3615: result: no" >&5
++  echo "$as_me:3633: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -3621,7 +3639,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:3624: checking for $ac_word" >&5
++echo "$as_me:3642: 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
+@@ -3636,7 +3654,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:3639: found $ac_dir/$ac_word" >&5
++echo "$as_me:3657: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -3645,17 +3663,17 @@
+ fi
+ MAKE_LOWER_TAGS=$ac_cv_prog_MAKE_LOWER_TAGS
+ if test -n "$MAKE_LOWER_TAGS"; then
+-  echo "$as_me:3648: result: $MAKE_LOWER_TAGS" >&5
++  echo "$as_me:3666: result: $MAKE_LOWER_TAGS" >&5
+ echo "${ECHO_T}$MAKE_LOWER_TAGS" >&6
+ else
+-  echo "$as_me:3651: result: no" >&5
++  echo "$as_me:3669: 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:3658: checking for $ac_word" >&5
++echo "$as_me:3676: 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
+@@ -3670,7 +3688,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:3673: found $ac_dir/$ac_word" >&5
++echo "$as_me:3691: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -3679,10 +3697,10 @@
+ fi
+ MAKE_UPPER_TAGS=$ac_cv_prog_MAKE_UPPER_TAGS
+ if test -n "$MAKE_UPPER_TAGS"; then
+-  echo "$as_me:3682: result: $MAKE_UPPER_TAGS" >&5
++  echo "$as_me:3700: result: $MAKE_UPPER_TAGS" >&5
+ echo "${ECHO_T}$MAKE_UPPER_TAGS" >&6
+ else
+-  echo "$as_me:3685: result: no" >&5
++  echo "$as_me:3703: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -3702,7 +3720,7 @@
+ 	MAKE_LOWER_TAGS="#"
+ fi
+ 
+-echo "$as_me:3705: checking for makeflags variable" >&5
++echo "$as_me:3723: 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
+@@ -3732,7 +3750,7 @@
+ 			;;
+ 		(*)
+ 
+-echo "${as_me:-configure}:3735: testing given option \"$cf_option\",no match \"$cf_result\" ..." 1>&5
++echo "${as_me:-configure}:3753: testing given option \"$cf_option\",no match \"$cf_result\" ..." 1>&5
+ 
+ 			;;
+ 		esac
+@@ -3740,13 +3758,13 @@
+ 	rm -f cf_makeflags.tmp
+ 
+ fi
+-echo "$as_me:3743: result: $cf_cv_makeflags" >&5
++echo "$as_me:3761: 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:3749: checking for $ac_word" >&5
++echo "$as_me:3767: 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
+@@ -3761,7 +3779,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:3764: found $ac_dir/$ac_word" >&5
++echo "$as_me:3782: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -3769,10 +3787,10 @@
+ fi
+ RANLIB=$ac_cv_prog_RANLIB
+ if test -n "$RANLIB"; then
+-  echo "$as_me:3772: result: $RANLIB" >&5
++  echo "$as_me:3790: result: $RANLIB" >&5
+ echo "${ECHO_T}$RANLIB" >&6
+ else
+-  echo "$as_me:3775: result: no" >&5
++  echo "$as_me:3793: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -3781,7 +3799,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:3784: checking for $ac_word" >&5
++echo "$as_me:3802: 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
+@@ -3796,7 +3814,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:3799: found $ac_dir/$ac_word" >&5
++echo "$as_me:3817: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -3805,10 +3823,10 @@
+ fi
+ ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB
+ if test -n "$ac_ct_RANLIB"; then
+-  echo "$as_me:3808: result: $ac_ct_RANLIB" >&5
++  echo "$as_me:3826: result: $ac_ct_RANLIB" >&5
+ echo "${ECHO_T}$ac_ct_RANLIB" >&6
+ else
+-  echo "$as_me:3811: result: no" >&5
++  echo "$as_me:3829: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -3820,7 +3838,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:3823: checking for $ac_word" >&5
++echo "$as_me:3841: 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
+@@ -3835,7 +3853,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:3838: found $ac_dir/$ac_word" >&5
++echo "$as_me:3856: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -3843,10 +3861,10 @@
+ fi
+ LD=$ac_cv_prog_LD
+ if test -n "$LD"; then
+-  echo "$as_me:3846: result: $LD" >&5
++  echo "$as_me:3864: result: $LD" >&5
+ echo "${ECHO_T}$LD" >&6
+ else
+-  echo "$as_me:3849: result: no" >&5
++  echo "$as_me:3867: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -3855,7 +3873,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:3858: checking for $ac_word" >&5
++echo "$as_me:3876: 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
+@@ -3870,7 +3888,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:3873: found $ac_dir/$ac_word" >&5
++echo "$as_me:3891: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -3879,10 +3897,10 @@
+ fi
+ ac_ct_LD=$ac_cv_prog_ac_ct_LD
+ if test -n "$ac_ct_LD"; then
+-  echo "$as_me:3882: result: $ac_ct_LD" >&5
++  echo "$as_me:3900: result: $ac_ct_LD" >&5
+ echo "${ECHO_T}$ac_ct_LD" >&6
+ else
+-  echo "$as_me:3885: result: no" >&5
++  echo "$as_me:3903: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -3894,7 +3912,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:3897: checking for $ac_word" >&5
++echo "$as_me:3915: 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
+@@ -3909,7 +3927,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:3912: found $ac_dir/$ac_word" >&5
++echo "$as_me:3930: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -3917,10 +3935,10 @@
+ fi
+ AR=$ac_cv_prog_AR
+ if test -n "$AR"; then
+-  echo "$as_me:3920: result: $AR" >&5
++  echo "$as_me:3938: result: $AR" >&5
+ echo "${ECHO_T}$AR" >&6
+ else
+-  echo "$as_me:3923: result: no" >&5
++  echo "$as_me:3941: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -3929,7 +3947,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:3932: checking for $ac_word" >&5
++echo "$as_me:3950: 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
+@@ -3944,7 +3962,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:3947: found $ac_dir/$ac_word" >&5
++echo "$as_me:3965: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -3953,10 +3971,10 @@
+ fi
+ ac_ct_AR=$ac_cv_prog_ac_ct_AR
+ if test -n "$ac_ct_AR"; then
+-  echo "$as_me:3956: result: $ac_ct_AR" >&5
++  echo "$as_me:3974: result: $ac_ct_AR" >&5
+ echo "${ECHO_T}$ac_ct_AR" >&6
+ else
+-  echo "$as_me:3959: result: no" >&5
++  echo "$as_me:3977: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -3968,7 +3986,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:3971: checking for $ac_word" >&5
++echo "$as_me:3989: 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
+@@ -3983,7 +4001,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:3986: found $ac_dir/$ac_word" >&5
++echo "$as_me:4004: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -3991,10 +4009,10 @@
+ fi
+ AR=$ac_cv_prog_AR
+ if test -n "$AR"; then
+-  echo "$as_me:3994: result: $AR" >&5
++  echo "$as_me:4012: result: $AR" >&5
+ echo "${ECHO_T}$AR" >&6
+ else
+-  echo "$as_me:3997: result: no" >&5
++  echo "$as_me:4015: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -4003,7 +4021,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:4006: checking for $ac_word" >&5
++echo "$as_me:4024: 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
+@@ -4018,7 +4036,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:4021: found $ac_dir/$ac_word" >&5
++echo "$as_me:4039: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -4027,10 +4045,10 @@
+ fi
+ ac_ct_AR=$ac_cv_prog_ac_ct_AR
+ if test -n "$ac_ct_AR"; then
+-  echo "$as_me:4030: result: $ac_ct_AR" >&5
++  echo "$as_me:4048: result: $ac_ct_AR" >&5
+ echo "${ECHO_T}$ac_ct_AR" >&6
+ else
+-  echo "$as_me:4033: result: no" >&5
++  echo "$as_me:4051: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -4039,7 +4057,7 @@
+   AR="$ac_cv_prog_AR"
+ fi
+ 
+-echo "$as_me:4042: checking for options to update archives" >&5
++echo "$as_me:4060: 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
+@@ -4076,13 +4094,13 @@
+ 			rm -f conftest.a
+ 
+ 			cat >"conftest.$ac_ext" <<EOF
+-#line 4079 "configure"
++#line 4097 "configure"
+ int	testdata[3] = { 123, 456, 789 };
+ EOF
+-			if { (eval echo "$as_me:4082: \"$ac_compile\"") >&5
++			if { (eval echo "$as_me:4100: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:4085: \$? = $ac_status" >&5
++  echo "$as_me:4103: \$? = $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
+@@ -4093,7 +4111,7 @@
+ 			else
+ 				test -n "$verbose" && echo "	cannot compile test-program" 1>&6
+ 
+-echo "${as_me:-configure}:4096: testing cannot compile test-program ..." 1>&5
++echo "${as_me:-configure}:4114: testing cannot compile test-program ..." 1>&5
+ 
+ 				break
+ 			fi
+@@ -4103,7 +4121,7 @@
+ 	esac
+ 
+ fi
+-echo "$as_me:4106: result: $cf_cv_ar_flags" >&5
++echo "$as_me:4124: result: $cf_cv_ar_flags" >&5
+ echo "${ECHO_T}$cf_cv_ar_flags" >&6
+ 
+ if test -n "$ARFLAGS" ; then
+@@ -4114,17 +4132,17 @@
+ 	ARFLAGS=$cf_cv_ar_flags
+ fi
+ 
+-	echo "$as_me:4117: checking for PATH separator" >&5
++	echo "$as_me:4135: 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:4124: result: $PATH_SEPARATOR" >&5
++	echo "$as_me:4142: result: $PATH_SEPARATOR" >&5
+ echo "${ECHO_T}$PATH_SEPARATOR" >&6
+ 
+-echo "$as_me:4127: checking if you have specified an install-prefix" >&5
++echo "$as_me:4145: 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.
+@@ -4137,7 +4155,7 @@
+ 		;;
+ 	esac
+ fi;
+-echo "$as_me:4140: result: $DESTDIR" >&5
++echo "$as_me:4158: result: $DESTDIR" >&5
+ echo "${ECHO_T}$DESTDIR" >&6
+ 
+ ###############################################################################
+@@ -4165,7 +4183,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:4168: checking for $ac_word" >&5
++echo "$as_me:4186: 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
+@@ -4180,7 +4198,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:4183: found $ac_dir/$ac_word" >&5
++echo "$as_me:4201: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -4188,10 +4206,10 @@
+ fi
+ BUILD_CC=$ac_cv_prog_BUILD_CC
+ if test -n "$BUILD_CC"; then
+-  echo "$as_me:4191: result: $BUILD_CC" >&5
++  echo "$as_me:4209: result: $BUILD_CC" >&5
+ echo "${ECHO_T}$BUILD_CC" >&6
+ else
+-  echo "$as_me:4194: result: no" >&5
++  echo "$as_me:4212: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -4200,12 +4218,12 @@
+ test -n "$BUILD_CC" || BUILD_CC="none"
+ 
+ fi;
+-	echo "$as_me:4203: checking for native build C compiler" >&5
++	echo "$as_me:4221: checking for native build C compiler" >&5
+ echo $ECHO_N "checking for native build C compiler... $ECHO_C" >&6
+-	echo "$as_me:4205: result: $BUILD_CC" >&5
++	echo "$as_me:4223: result: $BUILD_CC" >&5
+ echo "${ECHO_T}$BUILD_CC" >&6
+ 
+-	echo "$as_me:4208: checking for native build C preprocessor" >&5
++	echo "$as_me:4226: 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.
+@@ -4215,10 +4233,10 @@
+ else
+   BUILD_CPP='${BUILD_CC} -E'
+ fi;
+-	echo "$as_me:4218: result: $BUILD_CPP" >&5
++	echo "$as_me:4236: result: $BUILD_CPP" >&5
+ echo "${ECHO_T}$BUILD_CPP" >&6
+ 
+-	echo "$as_me:4221: checking for native build C flags" >&5
++	echo "$as_me:4239: 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.
+@@ -4226,10 +4244,10 @@
+   withval="$with_build_cflags"
+   BUILD_CFLAGS="$withval"
+ fi;
+-	echo "$as_me:4229: result: $BUILD_CFLAGS" >&5
++	echo "$as_me:4247: result: $BUILD_CFLAGS" >&5
+ echo "${ECHO_T}$BUILD_CFLAGS" >&6
+ 
+-	echo "$as_me:4232: checking for native build C preprocessor-flags" >&5
++	echo "$as_me:4250: 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.
+@@ -4237,10 +4255,10 @@
+   withval="$with_build_cppflags"
+   BUILD_CPPFLAGS="$withval"
+ fi;
+-	echo "$as_me:4240: result: $BUILD_CPPFLAGS" >&5
++	echo "$as_me:4258: result: $BUILD_CPPFLAGS" >&5
+ echo "${ECHO_T}$BUILD_CPPFLAGS" >&6
+ 
+-	echo "$as_me:4243: checking for native build linker-flags" >&5
++	echo "$as_me:4261: 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.
+@@ -4248,10 +4266,10 @@
+   withval="$with_build_ldflags"
+   BUILD_LDFLAGS="$withval"
+ fi;
+-	echo "$as_me:4251: result: $BUILD_LDFLAGS" >&5
++	echo "$as_me:4269: result: $BUILD_LDFLAGS" >&5
+ echo "${ECHO_T}$BUILD_LDFLAGS" >&6
+ 
+-	echo "$as_me:4254: checking for native build linker-libraries" >&5
++	echo "$as_me:4272: 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.
+@@ -4259,7 +4277,7 @@
+   withval="$with_build_libs"
+   BUILD_LIBS="$withval"
+ fi;
+-	echo "$as_me:4262: result: $BUILD_LIBS" >&5
++	echo "$as_me:4280: result: $BUILD_LIBS" >&5
+ echo "${ECHO_T}$BUILD_LIBS" >&6
+ 
+ 	# this assumes we're on Unix.
+@@ -4269,7 +4287,7 @@
+ 	: ${BUILD_CC:='${CC}'}
+ 
+ 	if { test "$BUILD_CC" = "$CC" || test "$BUILD_CC" = '${CC}'; } ; then
+-		{ { echo "$as_me:4272: error: Cross-build requires two compilers.
++		{ { echo "$as_me:4290: 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;}
+@@ -4294,7 +4312,7 @@
+ ### shared, for example.
+ cf_list_models=""
+ 
+-echo "$as_me:4297: checking if you want to build shared C-objects" >&5
++echo "$as_me:4315: 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.
+@@ -4304,27 +4322,27 @@
+ else
+   with_shared=no
+ fi;
+-echo "$as_me:4307: result: $with_shared" >&5
++echo "$as_me:4325: result: $with_shared" >&5
+ echo "${ECHO_T}$with_shared" >&6
+ test "$with_shared" = "yes" && cf_list_models="$cf_list_models shared"
+ 
+-echo "$as_me:4311: checking for specified models" >&5
++echo "$as_me:4329: 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:4314: result: $cf_list_models" >&5
++echo "$as_me:4332: 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:4319: checking for default model" >&5
++echo "$as_me:4337: 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:4322: result: $DFT_LWR_MODEL" >&5
++echo "$as_me:4340: 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:4327: checking for specific curses-directory" >&5
++echo "$as_me:4345: 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.
+@@ -4334,7 +4352,7 @@
+ else
+   cf_cv_curses_dir=no
+ fi;
+-echo "$as_me:4337: result: $cf_cv_curses_dir" >&5
++echo "$as_me:4355: 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"
+@@ -4365,7 +4383,7 @@
+ 	withval=`echo "$withval" | sed -e s%NONE%$cf_path_syntax%`
+ 	;;
+ (*)
+-	{ { echo "$as_me:4368: error: expected a pathname, not \"$withval\"" >&5
++	{ { echo "$as_me:4386: error: expected a pathname, not \"$withval\"" >&5
+ echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
+    { (exit 1); exit 1; }; }
+ 	;;
+@@ -4401,7 +4419,7 @@
+ 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
+ 
+ 			  cat >"conftest.$ac_ext" <<_ACEOF
+-#line 4404 "configure"
++#line 4422 "configure"
+ #include "confdefs.h"
+ #include <stdio.h>
+ int
+@@ -4413,16 +4431,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:4416: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:4434: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:4419: \$? = $ac_status" >&5
++  echo "$as_me:4437: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:4422: \"$ac_try\"") >&5
++  { (eval echo "$as_me:4440: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:4425: \$? = $ac_status" >&5
++  echo "$as_me:4443: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   :
+ else
+@@ -4439,7 +4457,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}:4442: testing adding $cf_add_incdir to include-path ..." 1>&5
++echo "${as_me:-configure}:4460: testing adding $cf_add_incdir to include-path ..." 1>&5
+ 
+ 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
+ 
+@@ -4475,7 +4493,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}:4478: testing adding $cf_add_libdir to library-path ..." 1>&5
++echo "${as_me:-configure}:4496: testing adding $cf_add_libdir to library-path ..." 1>&5
+ 
+ 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
+ 			fi
+@@ -4490,13 +4508,13 @@
+ cf_have_ncuconfig=no
+ 
+ if test "x${PKG_CONFIG:=none}" != xnone; then
+-	echo "$as_me:4493: checking pkg-config for $cf_ncuconfig_root" >&5
++	echo "$as_me:4511: 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:4496: result: yes" >&5
++		echo "$as_me:4514: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ 
+-		echo "$as_me:4499: checking if the $cf_ncuconfig_root package files work" >&5
++		echo "$as_me:4517: 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
+ 
+@@ -4629,7 +4647,7 @@
+ LIBS="$cf_add_libs"
+ 
+ 			cat >"conftest.$ac_ext" <<_ACEOF
+-#line 4632 "configure"
++#line 4650 "configure"
+ #include "confdefs.h"
+ #include <${cf_cv_ncurses_header:-curses.h}>
+ int
+@@ -4641,37 +4659,37 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:4644: \"$ac_link\"") >&5
++if { (eval echo "$as_me:4662: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:4647: \$? = $ac_status" >&5
++  echo "$as_me:4665: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:4650: \"$ac_try\"") >&5
++  { (eval echo "$as_me:4668: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:4653: \$? = $ac_status" >&5
++  echo "$as_me:4671: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   if test "$cross_compiling" = yes; then
+   cf_test_ncuconfig=maybe
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 4659 "configure"
++#line 4677 "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:4666: \"$ac_link\"") >&5
++if { (eval echo "$as_me:4684: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:4669: \$? = $ac_status" >&5
++  echo "$as_me:4687: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:4671: \"$ac_try\"") >&5
++  { (eval echo "$as_me:4689: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:4674: \$? = $ac_status" >&5
++  echo "$as_me:4692: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_test_ncuconfig=yes
+ else
+@@ -4845,7 +4863,7 @@
+ LIBS="$cf_add_libs"
+ 
+ 		cat >"conftest.$ac_ext" <<_ACEOF
+-#line 4848 "configure"
++#line 4866 "configure"
+ #include "confdefs.h"
+ #include <${cf_cv_ncurses_header:-curses.h}>
+ int
+@@ -4857,37 +4875,37 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:4860: \"$ac_link\"") >&5
++if { (eval echo "$as_me:4878: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:4863: \$? = $ac_status" >&5
++  echo "$as_me:4881: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:4866: \"$ac_try\"") >&5
++  { (eval echo "$as_me:4884: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:4869: \$? = $ac_status" >&5
++  echo "$as_me:4887: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   if test "$cross_compiling" = yes; then
+   cf_have_ncuconfig=maybe
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 4875 "configure"
++#line 4893 "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:4882: \"$ac_link\"") >&5
++if { (eval echo "$as_me:4900: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:4885: \$? = $ac_status" >&5
++  echo "$as_me:4903: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:4887: \"$ac_try\"") >&5
++  { (eval echo "$as_me:4905: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:4890: \$? = $ac_status" >&5
++  echo "$as_me:4908: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_have_ncuconfig=yes
+ else
+@@ -4904,7 +4922,7 @@
+ cf_have_ncuconfig=no
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+-		echo "$as_me:4907: result: $cf_have_ncuconfig" >&5
++		echo "$as_me:4925: 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"
+@@ -4920,7 +4938,7 @@
+ 
+ 			NCURSES_CONFIG_PKG=$cf_ncuconfig_root
+ 
+-echo "$as_me:4923: checking for terminfo header" >&5
++echo "$as_me:4941: 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
+@@ -4938,7 +4956,7 @@
+ for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h"
+ do
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 4941 "configure"
++#line 4959 "configure"
+ #include "confdefs.h"
+ #include <stdio.h>
+ #include <${cf_cv_ncurses_header:-curses.h}>
+@@ -4953,16 +4971,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:4956: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:4974: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:4959: \$? = $ac_status" >&5
++  echo "$as_me:4977: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:4962: \"$ac_try\"") >&5
++  { (eval echo "$as_me:4980: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:4965: \$? = $ac_status" >&5
++  echo "$as_me:4983: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+ 
+ 	cf_cv_term_header="$cf_test"
+@@ -4978,7 +4996,7 @@
+ done
+ 
+ fi
+-echo "$as_me:4981: result: $cf_cv_term_header" >&5
++echo "$as_me:4999: result: $cf_cv_term_header" >&5
+ echo "${ECHO_T}$cf_cv_term_header" >&6
+ 
+ # Set definitions to allow ifdef'ing to accommodate subdirectories
+@@ -5013,7 +5031,7 @@
+ 		fi
+ 
+ 	else
+-		echo "$as_me:5016: result: no" >&5
++		echo "$as_me:5034: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ 		NCURSES_CONFIG_PKG=none
+ 	fi
+@@ -5029,7 +5047,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:5032: checking for $ac_word" >&5
++echo "$as_me:5050: 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
+@@ -5044,7 +5062,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:5047: found $ac_dir/$ac_word" >&5
++echo "$as_me:5065: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -5052,10 +5070,10 @@
+ fi
+ NCURSES_CONFIG=$ac_cv_prog_NCURSES_CONFIG
+ if test -n "$NCURSES_CONFIG"; then
+-  echo "$as_me:5055: result: $NCURSES_CONFIG" >&5
++  echo "$as_me:5073: result: $NCURSES_CONFIG" >&5
+ echo "${ECHO_T}$NCURSES_CONFIG" >&6
+ else
+-  echo "$as_me:5058: result: no" >&5
++  echo "$as_me:5076: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -5068,7 +5086,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:5071: checking for $ac_word" >&5
++echo "$as_me:5089: 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
+@@ -5083,7 +5101,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:5086: found $ac_dir/$ac_word" >&5
++echo "$as_me:5104: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -5091,10 +5109,10 @@
+ fi
+ ac_ct_NCURSES_CONFIG=$ac_cv_prog_ac_ct_NCURSES_CONFIG
+ if test -n "$ac_ct_NCURSES_CONFIG"; then
+-  echo "$as_me:5094: result: $ac_ct_NCURSES_CONFIG" >&5
++  echo "$as_me:5112: result: $ac_ct_NCURSES_CONFIG" >&5
+ echo "${ECHO_T}$ac_ct_NCURSES_CONFIG" >&6
+ else
+-  echo "$as_me:5097: result: no" >&5
++  echo "$as_me:5115: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -5251,7 +5269,7 @@
+ 
+ 		# even with config script, some packages use no-override for curses.h
+ 
+-echo "$as_me:5254: checking if we have identified curses headers" >&5
++echo "$as_me:5272: 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
+@@ -5263,7 +5281,7 @@
+ 	curses.h ncurses/curses.h
+ do
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 5266 "configure"
++#line 5284 "configure"
+ #include "confdefs.h"
+ #include <${cf_header}>
+ int
+@@ -5275,16 +5293,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:5278: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:5296: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:5281: \$? = $ac_status" >&5
++  echo "$as_me:5299: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:5284: \"$ac_try\"") >&5
++  { (eval echo "$as_me:5302: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:5287: \$? = $ac_status" >&5
++  echo "$as_me:5305: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_ncurses_header=$cf_header; break
+ else
+@@ -5295,11 +5313,11 @@
+ done
+ 
+ fi
+-echo "$as_me:5298: result: $cf_cv_ncurses_header" >&5
++echo "$as_me:5316: 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:5302: error: No curses header-files found" >&5
++	{ { echo "$as_me:5320: error: No curses header-files found" >&5
+ echo "$as_me: error: No curses header-files found" >&2;}
+    { (exit 1); exit 1; }; }
+ fi
+@@ -5309,23 +5327,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:5312: checking for $ac_header" >&5
++echo "$as_me:5330: 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 5318 "configure"
++#line 5336 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:5322: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:5340: \"$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:5328: \$? = $ac_status" >&5
++  echo "$as_me:5346: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -5344,7 +5362,7 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:5347: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
++echo "$as_me:5365: 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
+@@ -5400,7 +5418,7 @@
+ 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
+ 
+ 			  cat >"conftest.$ac_ext" <<_ACEOF
+-#line 5403 "configure"
++#line 5421 "configure"
+ #include "confdefs.h"
+ #include <stdio.h>
+ int
+@@ -5412,16 +5430,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:5415: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:5433: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:5418: \$? = $ac_status" >&5
++  echo "$as_me:5436: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:5421: \"$ac_try\"") >&5
++  { (eval echo "$as_me:5439: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:5424: \$? = $ac_status" >&5
++  echo "$as_me:5442: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   :
+ else
+@@ -5438,7 +5456,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}:5441: testing adding $cf_add_incdir to include-path ..." 1>&5
++echo "${as_me:-configure}:5459: testing adding $cf_add_incdir to include-path ..." 1>&5
+ 
+ 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
+ 
+@@ -5457,7 +5475,7 @@
+ 
+ }
+ 
+-echo "$as_me:5460: checking for $cf_ncuhdr_root header in include-path" >&5
++echo "$as_me:5478: 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
+@@ -5469,7 +5487,7 @@
+ 	do
+ 
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 5472 "configure"
++#line 5490 "configure"
+ #include "confdefs.h"
+ 
+ #include <$cf_header>
+@@ -5493,16 +5511,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:5496: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:5514: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:5499: \$? = $ac_status" >&5
++  echo "$as_me:5517: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:5502: \"$ac_try\"") >&5
++  { (eval echo "$as_me:5520: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:5505: \$? = $ac_status" >&5
++  echo "$as_me:5523: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_ncurses_h=$cf_header
+ 
+@@ -5517,14 +5535,14 @@
+ 	done
+ 
+ fi
+-echo "$as_me:5520: result: $cf_cv_ncurses_h" >&5
++echo "$as_me:5538: 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:5527: checking for $cf_ncuhdr_root include-path" >&5
++echo "$as_me:5545: 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
+@@ -5645,7 +5663,7 @@
+ 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
+ 
+ 			  cat >"conftest.$ac_ext" <<_ACEOF
+-#line 5648 "configure"
++#line 5666 "configure"
+ #include "confdefs.h"
+ #include <stdio.h>
+ int
+@@ -5657,16 +5675,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:5660: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:5678: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:5663: \$? = $ac_status" >&5
++  echo "$as_me:5681: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:5666: \"$ac_try\"") >&5
++  { (eval echo "$as_me:5684: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:5669: \$? = $ac_status" >&5
++  echo "$as_me:5687: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   :
+ else
+@@ -5683,7 +5701,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}:5686: testing adding $cf_add_incdir to include-path ..." 1>&5
++echo "${as_me:-configure}:5704: testing adding $cf_add_incdir to include-path ..." 1>&5
+ 
+ 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
+ 
+@@ -5706,7 +5724,7 @@
+ 		do
+ 
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 5709 "configure"
++#line 5727 "configure"
+ #include "confdefs.h"
+ 
+ #include <$cf_header>
+@@ -5730,16 +5748,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:5733: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:5751: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:5736: \$? = $ac_status" >&5
++  echo "$as_me:5754: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:5739: \"$ac_try\"") >&5
++  { (eval echo "$as_me:5757: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:5742: \$? = $ac_status" >&5
++  echo "$as_me:5760: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_ncurses_h2=$cf_header
+ 
+@@ -5760,12 +5778,12 @@
+ 		CPPFLAGS="$cf_save2_CPPFLAGS"
+ 		test "$cf_cv_ncurses_h2" != no && break
+ 	done
+-	test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:5763: error: not found" >&5
++	test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:5781: error: not found" >&5
+ echo "$as_me: error: not found" >&2;}
+    { (exit 1); exit 1; }; }
+ 
+ fi
+-echo "$as_me:5768: result: $cf_cv_ncurses_h2" >&5
++echo "$as_me:5786: 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%/[^/]*$%%'`
+@@ -5801,7 +5819,7 @@
+ 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
+ 
+ 			  cat >"conftest.$ac_ext" <<_ACEOF
+-#line 5804 "configure"
++#line 5822 "configure"
+ #include "confdefs.h"
+ #include <stdio.h>
+ int
+@@ -5813,16 +5831,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:5816: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:5834: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:5819: \$? = $ac_status" >&5
++  echo "$as_me:5837: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:5822: \"$ac_try\"") >&5
++  { (eval echo "$as_me:5840: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:5825: \$? = $ac_status" >&5
++  echo "$as_me:5843: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   :
+ else
+@@ -5839,7 +5857,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}:5842: testing adding $cf_add_incdir to include-path ..." 1>&5
++echo "${as_me:-configure}:5860: testing adding $cf_add_incdir to include-path ..." 1>&5
+ 
+ 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
+ 
+@@ -5887,7 +5905,7 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:5890: checking for terminfo header" >&5
++echo "$as_me:5908: 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
+@@ -5905,7 +5923,7 @@
+ for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h"
+ do
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 5908 "configure"
++#line 5926 "configure"
+ #include "confdefs.h"
+ #include <stdio.h>
+ #include <${cf_cv_ncurses_header:-curses.h}>
+@@ -5920,16 +5938,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:5923: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:5941: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:5926: \$? = $ac_status" >&5
++  echo "$as_me:5944: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:5929: \"$ac_try\"") >&5
++  { (eval echo "$as_me:5947: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:5932: \$? = $ac_status" >&5
++  echo "$as_me:5950: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+ 
+ 	cf_cv_term_header="$cf_test"
+@@ -5945,7 +5963,7 @@
+ done
+ 
+ fi
+-echo "$as_me:5948: result: $cf_cv_term_header" >&5
++echo "$as_me:5966: result: $cf_cv_term_header" >&5
+ echo "${ECHO_T}$cf_cv_term_header" >&6
+ 
+ # Set definitions to allow ifdef'ing to accommodate subdirectories
+@@ -5983,7 +6001,7 @@
+ #define NCURSES 1
+ EOF
+ 
+-echo "$as_me:5986: checking for ncurses version" >&5
++echo "$as_me:6004: 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
+@@ -6009,10 +6027,10 @@
+ #endif
+ EOF
+ 	cf_try="$ac_cpp conftest.$ac_ext 2>&5 | grep '^Autoconf ' >conftest.out"
+-	{ (eval echo "$as_me:6012: \"$cf_try\"") >&5
++	{ (eval echo "$as_me:6030: \"$cf_try\"") >&5
+   (eval $cf_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:6015: \$? = $ac_status" >&5
++  echo "$as_me:6033: \$? = $ac_status" >&5
+   (exit "$ac_status"); }
+ 	if test -f conftest.out ; then
+ 		cf_out=`sed -e 's%^Autoconf %%' -e 's%^[^"]*"%%' -e 's%".*%%' conftest.out`
+@@ -6022,7 +6040,7 @@
+ 
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 6025 "configure"
++#line 6043 "configure"
+ #include "confdefs.h"
+ 
+ #include <${cf_cv_ncurses_header:-curses.h}>
+@@ -6047,15 +6065,15 @@
+ }
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:6050: \"$ac_link\"") >&5
++if { (eval echo "$as_me:6068: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:6053: \$? = $ac_status" >&5
++  echo "$as_me:6071: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:6055: \"$ac_try\"") >&5
++  { (eval echo "$as_me:6073: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:6058: \$? = $ac_status" >&5
++  echo "$as_me:6076: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+ 
+ 	cf_cv_ncurses_version=`cat $cf_tempfile`
+@@ -6069,7 +6087,7 @@
+ 	rm -f "$cf_tempfile"
+ 
+ fi
+-echo "$as_me:6072: result: $cf_cv_ncurses_version" >&5
++echo "$as_me:6090: result: $cf_cv_ncurses_version" >&5
+ echo "${ECHO_T}$cf_cv_ncurses_version" >&6
+ test "$cf_cv_ncurses_version" = no ||
+ cat >>confdefs.h <<\EOF
+@@ -6082,7 +6100,7 @@
+ 	# to link gpm.
+ cf_ncurses_LIBS=""
+ cf_ncurses_SAVE="$LIBS"
+-echo "$as_me:6085: checking for Gpm_Open in -lgpm" >&5
++echo "$as_me:6103: 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
+@@ -6090,7 +6108,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lgpm  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 6093 "configure"
++#line 6111 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -6109,16 +6127,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:6112: \"$ac_link\"") >&5
++if { (eval echo "$as_me:6130: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:6115: \$? = $ac_status" >&5
++  echo "$as_me:6133: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:6118: \"$ac_try\"") >&5
++  { (eval echo "$as_me:6136: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:6121: \$? = $ac_status" >&5
++  echo "$as_me:6139: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_gpm_Gpm_Open=yes
+ else
+@@ -6129,10 +6147,10 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:6132: result: $ac_cv_lib_gpm_Gpm_Open" >&5
++echo "$as_me:6150: 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:6135: checking for initscr in -lgpm" >&5
++  echo "$as_me:6153: 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
+@@ -6140,7 +6158,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lgpm  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 6143 "configure"
++#line 6161 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -6159,16 +6177,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:6162: \"$ac_link\"") >&5
++if { (eval echo "$as_me:6180: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:6165: \$? = $ac_status" >&5
++  echo "$as_me:6183: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:6168: \"$ac_try\"") >&5
++  { (eval echo "$as_me:6186: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:6171: \$? = $ac_status" >&5
++  echo "$as_me:6189: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_gpm_initscr=yes
+ else
+@@ -6179,7 +6197,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:6182: result: $ac_cv_lib_gpm_initscr" >&5
++echo "$as_me:6200: 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"
+@@ -6194,7 +6212,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:6197: checking for tgoto in -lmytinfo" >&5
++		echo "$as_me:6215: 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
+@@ -6202,7 +6220,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lmytinfo  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 6205 "configure"
++#line 6223 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -6221,16 +6239,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:6224: \"$ac_link\"") >&5
++if { (eval echo "$as_me:6242: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:6227: \$? = $ac_status" >&5
++  echo "$as_me:6245: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:6230: \"$ac_try\"") >&5
++  { (eval echo "$as_me:6248: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:6233: \$? = $ac_status" >&5
++  echo "$as_me:6251: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_mytinfo_tgoto=yes
+ else
+@@ -6241,7 +6259,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:6244: result: $ac_cv_lib_mytinfo_tgoto" >&5
++echo "$as_me:6262: 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"
+@@ -6290,13 +6308,13 @@
+ 
+ 	eval 'cf_cv_have_lib_'"$cf_nculib_root"'=no'
+ 	cf_libdir=""
+-	echo "$as_me:6293: checking for initscr" >&5
++	echo "$as_me:6311: 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 6299 "configure"
++#line 6317 "configure"
+ #include "confdefs.h"
+ #define initscr autoconf_temporary
+ #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -6327,16 +6345,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:6330: \"$ac_link\"") >&5
++if { (eval echo "$as_me:6348: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:6333: \$? = $ac_status" >&5
++  echo "$as_me:6351: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:6336: \"$ac_try\"") >&5
++  { (eval echo "$as_me:6354: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:6339: \$? = $ac_status" >&5
++  echo "$as_me:6357: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_func_initscr=yes
+ else
+@@ -6346,18 +6364,18 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:6349: result: $ac_cv_func_initscr" >&5
++echo "$as_me:6367: 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:6356: checking for initscr in -l$cf_nculib_root" >&5
++		echo "$as_me:6374: 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 6360 "configure"
++#line 6378 "configure"
+ #include "confdefs.h"
+ #include <${cf_cv_ncurses_header:-curses.h}>
+ int
+@@ -6369,25 +6387,25 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:6372: \"$ac_link\"") >&5
++if { (eval echo "$as_me:6390: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:6375: \$? = $ac_status" >&5
++  echo "$as_me:6393: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:6378: \"$ac_try\"") >&5
++  { (eval echo "$as_me:6396: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:6381: \$? = $ac_status" >&5
++  echo "$as_me:6399: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+-  echo "$as_me:6383: result: yes" >&5
++  echo "$as_me:6401: 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:6390: result: no" >&5
++echo "$as_me:6408: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ 
+ cf_search=
+@@ -6455,11 +6473,11 @@
+ 
+ 			for cf_libdir in $cf_search
+ 			do
+-				echo "$as_me:6458: checking for -l$cf_nculib_root in $cf_libdir" >&5
++				echo "$as_me:6476: 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 6462 "configure"
++#line 6480 "configure"
+ #include "confdefs.h"
+ #include <${cf_cv_ncurses_header:-curses.h}>
+ int
+@@ -6471,25 +6489,25 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:6474: \"$ac_link\"") >&5
++if { (eval echo "$as_me:6492: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:6477: \$? = $ac_status" >&5
++  echo "$as_me:6495: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:6480: \"$ac_try\"") >&5
++  { (eval echo "$as_me:6498: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:6483: \$? = $ac_status" >&5
++  echo "$as_me:6501: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+-  echo "$as_me:6485: result: yes" >&5
++  echo "$as_me:6503: 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:6492: result: no" >&5
++echo "$as_me:6510: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ 					 LIBS="$cf_save_LIBS"
+ fi
+@@ -6504,7 +6522,7 @@
+ eval 'cf_found_library="$cf_cv_have_lib_'"$cf_nculib_root"\"
+ 
+ if test "$cf_found_library" = no ; then
+-	{ { echo "$as_me:6507: error: Cannot link $cf_nculib_root library" >&5
++	{ { echo "$as_me:6525: error: Cannot link $cf_nculib_root library" >&5
+ echo "$as_me: error: Cannot link $cf_nculib_root library" >&2;}
+    { (exit 1); exit 1; }; }
+ fi
+@@ -6512,7 +6530,7 @@
+ fi
+ 
+ if test -n "$cf_ncurses_LIBS" ; then
+-	echo "$as_me:6515: checking if we can link $cf_nculib_root without $cf_ncurses_LIBS" >&5
++	echo "$as_me:6533: 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
+@@ -6522,7 +6540,7 @@
+ 		fi
+ 	done
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 6525 "configure"
++#line 6543 "configure"
+ #include "confdefs.h"
+ #include <${cf_cv_ncurses_header:-curses.h}>
+ int
+@@ -6534,23 +6552,23 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:6537: \"$ac_link\"") >&5
++if { (eval echo "$as_me:6555: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:6540: \$? = $ac_status" >&5
++  echo "$as_me:6558: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:6543: \"$ac_try\"") >&5
++  { (eval echo "$as_me:6561: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:6546: \$? = $ac_status" >&5
++  echo "$as_me:6564: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+-  echo "$as_me:6548: result: yes" >&5
++  echo "$as_me:6566: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ else
+   echo "$as_me: failed program was:" >&5
+ cat "conftest.$ac_ext" >&5
+-echo "$as_me:6553: result: no" >&5
++echo "$as_me:6571: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ 		 LIBS="$cf_ncurses_SAVE"
+ fi
+@@ -6568,7 +6586,7 @@
+ 	NCURSES_CONFIG=none
+ fi
+ 
+-echo "$as_me:6571: checking if you want wide-character code" >&5
++echo "$as_me:6589: 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.
+@@ -6578,30 +6596,30 @@
+ else
+   with_widec=no
+ fi;
+-echo "$as_me:6581: result: $with_widec" >&5
++echo "$as_me:6599: 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:6588: checking for $ac_header" >&5
++echo "$as_me:6606: 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 6594 "configure"
++#line 6612 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:6598: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:6616: \"$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:6604: \$? = $ac_status" >&5
++  echo "$as_me:6622: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -6620,7 +6638,7 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:6623: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
++echo "$as_me:6641: 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
+@@ -6630,7 +6648,7 @@
+ fi
+ done
+ 
+-echo "$as_me:6633: checking for multibyte character support" >&5
++echo "$as_me:6651: 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
+@@ -6638,7 +6656,7 @@
+ 
+ 	cf_save_LIBS="$LIBS"
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 6641 "configure"
++#line 6659 "configure"
+ #include "confdefs.h"
+ 
+ #include <stdlib.h>
+@@ -6656,16 +6674,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:6659: \"$ac_link\"") >&5
++if { (eval echo "$as_me:6677: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:6662: \$? = $ac_status" >&5
++  echo "$as_me:6680: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:6665: \"$ac_try\"") >&5
++  { (eval echo "$as_me:6683: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:6668: \$? = $ac_status" >&5
++  echo "$as_me:6686: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_utf8_lib=yes
+ else
+@@ -6677,12 +6695,12 @@
+ cf_cv_header_path_utf8=
+ cf_cv_library_path_utf8=
+ 
+-echo "${as_me:-configure}:6680: testing Starting FIND_LINKAGE(utf8,) ..." 1>&5
++echo "${as_me:-configure}:6698: testing Starting FIND_LINKAGE(utf8,) ..." 1>&5
+ 
+ cf_save_LIBS="$LIBS"
+ 
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 6685 "configure"
++#line 6703 "configure"
+ #include "confdefs.h"
+ 
+ #include <libutf8.h>
+@@ -6695,16 +6713,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:6698: \"$ac_link\"") >&5
++if { (eval echo "$as_me:6716: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:6701: \$? = $ac_status" >&5
++  echo "$as_me:6719: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:6704: \"$ac_try\"") >&5
++  { (eval echo "$as_me:6722: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:6707: \$? = $ac_status" >&5
++  echo "$as_me:6725: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+ 
+ 	cf_cv_find_linkage_utf8=yes
+@@ -6718,7 +6736,7 @@
+ LIBS="-lutf8  $cf_save_LIBS"
+ 
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 6721 "configure"
++#line 6739 "configure"
+ #include "confdefs.h"
+ 
+ #include <libutf8.h>
+@@ -6731,16 +6749,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:6734: \"$ac_link\"") >&5
++if { (eval echo "$as_me:6752: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:6737: \$? = $ac_status" >&5
++  echo "$as_me:6755: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:6740: \"$ac_try\"") >&5
++  { (eval echo "$as_me:6758: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:6743: \$? = $ac_status" >&5
++  echo "$as_me:6761: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+ 
+ 	cf_cv_find_linkage_utf8=yes
+@@ -6757,9 +6775,9 @@
+ 
+ 	test -n "$verbose" && echo "	find linkage for utf8 library" 1>&6
+ 
+-echo "${as_me:-configure}:6760: testing find linkage for utf8 library ..." 1>&5
++echo "${as_me:-configure}:6778: testing find linkage for utf8 library ..." 1>&5
+ 
+-echo "${as_me:-configure}:6762: testing Searching for headers in FIND_LINKAGE(utf8,) ..." 1>&5
++echo "${as_me:-configure}:6780: testing Searching for headers in FIND_LINKAGE(utf8,) ..." 1>&5
+ 
+ 	cf_save_CPPFLAGS="$CPPFLAGS"
+ 	cf_test_CPPFLAGS="$CPPFLAGS"
+@@ -6850,7 +6868,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}:6853: testing ... testing $cf_cv_header_path_utf8 ..." 1>&5
++echo "${as_me:-configure}:6871: testing ... testing $cf_cv_header_path_utf8 ..." 1>&5
+ 
+ 			CPPFLAGS="$cf_save_CPPFLAGS"
+ 
+@@ -6858,7 +6876,7 @@
+ 	CPPFLAGS="${CPPFLAGS}-I$cf_cv_header_path_utf8"
+ 
+ 			cat >"conftest.$ac_ext" <<_ACEOF
+-#line 6861 "configure"
++#line 6879 "configure"
+ #include "confdefs.h"
+ 
+ #include <libutf8.h>
+@@ -6871,21 +6889,21 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:6874: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:6892: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:6877: \$? = $ac_status" >&5
++  echo "$as_me:6895: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:6880: \"$ac_try\"") >&5
++  { (eval echo "$as_me:6898: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:6883: \$? = $ac_status" >&5
++  echo "$as_me:6901: \$? = $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}:6888: testing ... found utf8 headers in $cf_cv_header_path_utf8 ..." 1>&5
++echo "${as_me:-configure}:6906: testing ... found utf8 headers in $cf_cv_header_path_utf8 ..." 1>&5
+ 
+ 				cf_cv_find_linkage_utf8=maybe
+ 				cf_test_CPPFLAGS="$CPPFLAGS"
+@@ -6903,7 +6921,7 @@
+ 
+ 	if test "$cf_cv_find_linkage_utf8" = maybe ; then
+ 
+-echo "${as_me:-configure}:6906: testing Searching for utf8 library in FIND_LINKAGE(utf8,) ..." 1>&5
++echo "${as_me:-configure}:6924: testing Searching for utf8 library in FIND_LINKAGE(utf8,) ..." 1>&5
+ 
+ 		cf_save_LIBS="$LIBS"
+ 		cf_save_LDFLAGS="$LDFLAGS"
+@@ -6978,13 +6996,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}:6981: testing ... testing $cf_cv_library_path_utf8 ..." 1>&5
++echo "${as_me:-configure}:6999: 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 6987 "configure"
++#line 7005 "configure"
+ #include "confdefs.h"
+ 
+ #include <libutf8.h>
+@@ -6997,21 +7015,21 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:7000: \"$ac_link\"") >&5
++if { (eval echo "$as_me:7018: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:7003: \$? = $ac_status" >&5
++  echo "$as_me:7021: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:7006: \"$ac_try\"") >&5
++  { (eval echo "$as_me:7024: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:7009: \$? = $ac_status" >&5
++  echo "$as_me:7027: \$? = $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}:7014: testing ... found utf8 library in $cf_cv_library_path_utf8 ..." 1>&5
++echo "${as_me:-configure}:7032: testing ... found utf8 library in $cf_cv_library_path_utf8 ..." 1>&5
+ 
+ 					cf_cv_find_linkage_utf8=yes
+ 					cf_cv_library_file_utf8="-lutf8"
+@@ -7053,7 +7071,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:7056: result: $cf_cv_utf8_lib" >&5
++echo "$as_me:7074: 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
+@@ -7091,7 +7109,7 @@
+ 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
+ 
+ 			  cat >"conftest.$ac_ext" <<_ACEOF
+-#line 7094 "configure"
++#line 7112 "configure"
+ #include "confdefs.h"
+ #include <stdio.h>
+ int
+@@ -7103,16 +7121,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:7106: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:7124: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:7109: \$? = $ac_status" >&5
++  echo "$as_me:7127: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:7112: \"$ac_try\"") >&5
++  { (eval echo "$as_me:7130: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:7115: \$? = $ac_status" >&5
++  echo "$as_me:7133: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   :
+ else
+@@ -7129,7 +7147,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}:7132: testing adding $cf_add_incdir to include-path ..." 1>&5
++echo "${as_me:-configure}:7150: testing adding $cf_add_incdir to include-path ..." 1>&5
+ 
+ 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
+ 
+@@ -7165,7 +7183,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}:7168: testing adding $cf_add_libdir to library-path ..." 1>&5
++echo "${as_me:-configure}:7186: testing adding $cf_add_libdir to library-path ..." 1>&5
+ 
+ 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
+ 			fi
+@@ -7195,13 +7213,13 @@
+ cf_have_ncuconfig=no
+ 
+ if test "x${PKG_CONFIG:=none}" != xnone; then
+-	echo "$as_me:7198: checking pkg-config for $cf_ncuconfig_root" >&5
++	echo "$as_me:7216: 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:7201: result: yes" >&5
++		echo "$as_me:7219: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ 
+-		echo "$as_me:7204: checking if the $cf_ncuconfig_root package files work" >&5
++		echo "$as_me:7222: 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
+ 
+@@ -7334,7 +7352,7 @@
+ LIBS="$cf_add_libs"
+ 
+ 			cat >"conftest.$ac_ext" <<_ACEOF
+-#line 7337 "configure"
++#line 7355 "configure"
+ #include "confdefs.h"
+ #include <${cf_cv_ncurses_header:-curses.h}>
+ int
+@@ -7346,37 +7364,37 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:7349: \"$ac_link\"") >&5
++if { (eval echo "$as_me:7367: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:7352: \$? = $ac_status" >&5
++  echo "$as_me:7370: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:7355: \"$ac_try\"") >&5
++  { (eval echo "$as_me:7373: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:7358: \$? = $ac_status" >&5
++  echo "$as_me:7376: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   if test "$cross_compiling" = yes; then
+   cf_test_ncuconfig=maybe
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 7364 "configure"
++#line 7382 "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:7371: \"$ac_link\"") >&5
++if { (eval echo "$as_me:7389: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:7374: \$? = $ac_status" >&5
++  echo "$as_me:7392: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:7376: \"$ac_try\"") >&5
++  { (eval echo "$as_me:7394: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:7379: \$? = $ac_status" >&5
++  echo "$as_me:7397: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_test_ncuconfig=yes
+ else
+@@ -7550,7 +7568,7 @@
+ LIBS="$cf_add_libs"
+ 
+ 		cat >"conftest.$ac_ext" <<_ACEOF
+-#line 7553 "configure"
++#line 7571 "configure"
+ #include "confdefs.h"
+ #include <${cf_cv_ncurses_header:-curses.h}>
+ int
+@@ -7562,37 +7580,37 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:7565: \"$ac_link\"") >&5
++if { (eval echo "$as_me:7583: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:7568: \$? = $ac_status" >&5
++  echo "$as_me:7586: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:7571: \"$ac_try\"") >&5
++  { (eval echo "$as_me:7589: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:7574: \$? = $ac_status" >&5
++  echo "$as_me:7592: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   if test "$cross_compiling" = yes; then
+   cf_have_ncuconfig=maybe
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 7580 "configure"
++#line 7598 "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:7587: \"$ac_link\"") >&5
++if { (eval echo "$as_me:7605: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:7590: \$? = $ac_status" >&5
++  echo "$as_me:7608: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:7592: \"$ac_try\"") >&5
++  { (eval echo "$as_me:7610: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:7595: \$? = $ac_status" >&5
++  echo "$as_me:7613: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_have_ncuconfig=yes
+ else
+@@ -7609,7 +7627,7 @@
+ cf_have_ncuconfig=no
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+-		echo "$as_me:7612: result: $cf_have_ncuconfig" >&5
++		echo "$as_me:7630: 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"
+@@ -7625,7 +7643,7 @@
+ 
+ 			NCURSES_CONFIG_PKG=$cf_ncuconfig_root
+ 
+-echo "$as_me:7628: checking for terminfo header" >&5
++echo "$as_me:7646: 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
+@@ -7643,7 +7661,7 @@
+ for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h"
+ do
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 7646 "configure"
++#line 7664 "configure"
+ #include "confdefs.h"
+ #include <stdio.h>
+ #include <${cf_cv_ncurses_header:-curses.h}>
+@@ -7658,16 +7676,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:7661: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:7679: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:7664: \$? = $ac_status" >&5
++  echo "$as_me:7682: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:7667: \"$ac_try\"") >&5
++  { (eval echo "$as_me:7685: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:7670: \$? = $ac_status" >&5
++  echo "$as_me:7688: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+ 
+ 	cf_cv_term_header="$cf_test"
+@@ -7683,7 +7701,7 @@
+ done
+ 
+ fi
+-echo "$as_me:7686: result: $cf_cv_term_header" >&5
++echo "$as_me:7704: result: $cf_cv_term_header" >&5
+ echo "${ECHO_T}$cf_cv_term_header" >&6
+ 
+ # Set definitions to allow ifdef'ing to accommodate subdirectories
+@@ -7718,7 +7736,7 @@
+ 		fi
+ 
+ 	else
+-		echo "$as_me:7721: result: no" >&5
++		echo "$as_me:7739: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ 		NCURSES_CONFIG_PKG=none
+ 	fi
+@@ -7734,7 +7752,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:7737: checking for $ac_word" >&5
++echo "$as_me:7755: 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
+@@ -7749,7 +7767,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:7752: found $ac_dir/$ac_word" >&5
++echo "$as_me:7770: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -7757,10 +7775,10 @@
+ fi
+ NCURSES_CONFIG=$ac_cv_prog_NCURSES_CONFIG
+ if test -n "$NCURSES_CONFIG"; then
+-  echo "$as_me:7760: result: $NCURSES_CONFIG" >&5
++  echo "$as_me:7778: result: $NCURSES_CONFIG" >&5
+ echo "${ECHO_T}$NCURSES_CONFIG" >&6
+ else
+-  echo "$as_me:7763: result: no" >&5
++  echo "$as_me:7781: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -7773,7 +7791,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:7776: checking for $ac_word" >&5
++echo "$as_me:7794: 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
+@@ -7788,7 +7806,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:7791: found $ac_dir/$ac_word" >&5
++echo "$as_me:7809: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -7796,10 +7814,10 @@
+ fi
+ ac_ct_NCURSES_CONFIG=$ac_cv_prog_ac_ct_NCURSES_CONFIG
+ if test -n "$ac_ct_NCURSES_CONFIG"; then
+-  echo "$as_me:7799: result: $ac_ct_NCURSES_CONFIG" >&5
++  echo "$as_me:7817: result: $ac_ct_NCURSES_CONFIG" >&5
+ echo "${ECHO_T}$ac_ct_NCURSES_CONFIG" >&6
+ else
+-  echo "$as_me:7802: result: no" >&5
++  echo "$as_me:7820: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -7956,7 +7974,7 @@
+ 
+ 		# even with config script, some packages use no-override for curses.h
+ 
+-echo "$as_me:7959: checking if we have identified curses headers" >&5
++echo "$as_me:7977: 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
+@@ -7968,7 +7986,7 @@
+ 	curses.h ncursesw/curses.h
+ do
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 7971 "configure"
++#line 7989 "configure"
+ #include "confdefs.h"
+ #include <${cf_header}>
+ int
+@@ -7980,16 +7998,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:7983: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:8001: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:7986: \$? = $ac_status" >&5
++  echo "$as_me:8004: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:7989: \"$ac_try\"") >&5
++  { (eval echo "$as_me:8007: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:7992: \$? = $ac_status" >&5
++  echo "$as_me:8010: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_ncurses_header=$cf_header; break
+ else
+@@ -8000,11 +8018,11 @@
+ done
+ 
+ fi
+-echo "$as_me:8003: result: $cf_cv_ncurses_header" >&5
++echo "$as_me:8021: 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:8007: error: No curses header-files found" >&5
++	{ { echo "$as_me:8025: error: No curses header-files found" >&5
+ echo "$as_me: error: No curses header-files found" >&2;}
+    { (exit 1); exit 1; }; }
+ fi
+@@ -8014,23 +8032,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:8017: checking for $ac_header" >&5
++echo "$as_me:8035: 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 8023 "configure"
++#line 8041 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:8027: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:8045: \"$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:8033: \$? = $ac_status" >&5
++  echo "$as_me:8051: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -8049,7 +8067,7 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:8052: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
++echo "$as_me:8070: 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
+@@ -8105,7 +8123,7 @@
+ 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
+ 
+ 			  cat >"conftest.$ac_ext" <<_ACEOF
+-#line 8108 "configure"
++#line 8126 "configure"
+ #include "confdefs.h"
+ #include <stdio.h>
+ int
+@@ -8117,16 +8135,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:8120: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:8138: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:8123: \$? = $ac_status" >&5
++  echo "$as_me:8141: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:8126: \"$ac_try\"") >&5
++  { (eval echo "$as_me:8144: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:8129: \$? = $ac_status" >&5
++  echo "$as_me:8147: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   :
+ else
+@@ -8143,7 +8161,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}:8146: testing adding $cf_add_incdir to include-path ..." 1>&5
++echo "${as_me:-configure}:8164: testing adding $cf_add_incdir to include-path ..." 1>&5
+ 
+ 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
+ 
+@@ -8162,7 +8180,7 @@
+ 
+ }
+ 
+-echo "$as_me:8165: checking for $cf_ncuhdr_root header in include-path" >&5
++echo "$as_me:8183: 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
+@@ -8174,7 +8192,7 @@
+ 	do
+ 
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 8177 "configure"
++#line 8195 "configure"
+ #include "confdefs.h"
+ 
+ #define _XOPEN_SOURCE_EXTENDED
+@@ -8206,16 +8224,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:8209: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:8227: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:8212: \$? = $ac_status" >&5
++  echo "$as_me:8230: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:8215: \"$ac_try\"") >&5
++  { (eval echo "$as_me:8233: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:8218: \$? = $ac_status" >&5
++  echo "$as_me:8236: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_ncurses_h=$cf_header
+ 
+@@ -8230,14 +8248,14 @@
+ 	done
+ 
+ fi
+-echo "$as_me:8233: result: $cf_cv_ncurses_h" >&5
++echo "$as_me:8251: 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:8240: checking for $cf_ncuhdr_root include-path" >&5
++echo "$as_me:8258: 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
+@@ -8358,7 +8376,7 @@
+ 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
+ 
+ 			  cat >"conftest.$ac_ext" <<_ACEOF
+-#line 8361 "configure"
++#line 8379 "configure"
+ #include "confdefs.h"
+ #include <stdio.h>
+ int
+@@ -8370,16 +8388,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:8373: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:8391: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:8376: \$? = $ac_status" >&5
++  echo "$as_me:8394: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:8379: \"$ac_try\"") >&5
++  { (eval echo "$as_me:8397: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:8382: \$? = $ac_status" >&5
++  echo "$as_me:8400: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   :
+ else
+@@ -8396,7 +8414,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}:8399: testing adding $cf_add_incdir to include-path ..." 1>&5
++echo "${as_me:-configure}:8417: testing adding $cf_add_incdir to include-path ..." 1>&5
+ 
+ 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
+ 
+@@ -8419,7 +8437,7 @@
+ 		do
+ 
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 8422 "configure"
++#line 8440 "configure"
+ #include "confdefs.h"
+ 
+ #include <$cf_header>
+@@ -8443,16 +8461,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:8446: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:8464: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:8449: \$? = $ac_status" >&5
++  echo "$as_me:8467: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:8452: \"$ac_try\"") >&5
++  { (eval echo "$as_me:8470: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:8455: \$? = $ac_status" >&5
++  echo "$as_me:8473: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_ncurses_h2=$cf_header
+ 
+@@ -8473,12 +8491,12 @@
+ 		CPPFLAGS="$cf_save2_CPPFLAGS"
+ 		test "$cf_cv_ncurses_h2" != no && break
+ 	done
+-	test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:8476: error: not found" >&5
++	test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:8494: error: not found" >&5
+ echo "$as_me: error: not found" >&2;}
+    { (exit 1); exit 1; }; }
+ 
+ fi
+-echo "$as_me:8481: result: $cf_cv_ncurses_h2" >&5
++echo "$as_me:8499: 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%/[^/]*$%%'`
+@@ -8514,7 +8532,7 @@
+ 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
+ 
+ 			  cat >"conftest.$ac_ext" <<_ACEOF
+-#line 8517 "configure"
++#line 8535 "configure"
+ #include "confdefs.h"
+ #include <stdio.h>
+ int
+@@ -8526,16 +8544,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:8529: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:8547: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:8532: \$? = $ac_status" >&5
++  echo "$as_me:8550: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:8535: \"$ac_try\"") >&5
++  { (eval echo "$as_me:8553: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:8538: \$? = $ac_status" >&5
++  echo "$as_me:8556: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   :
+ else
+@@ -8552,7 +8570,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}:8555: testing adding $cf_add_incdir to include-path ..." 1>&5
++echo "${as_me:-configure}:8573: testing adding $cf_add_incdir to include-path ..." 1>&5
+ 
+ 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
+ 
+@@ -8600,7 +8618,7 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:8603: checking for terminfo header" >&5
++echo "$as_me:8621: 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
+@@ -8618,7 +8636,7 @@
+ for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h"
+ do
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 8621 "configure"
++#line 8639 "configure"
+ #include "confdefs.h"
+ #include <stdio.h>
+ #include <${cf_cv_ncurses_header:-curses.h}>
+@@ -8633,16 +8651,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:8636: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:8654: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:8639: \$? = $ac_status" >&5
++  echo "$as_me:8657: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:8642: \"$ac_try\"") >&5
++  { (eval echo "$as_me:8660: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:8645: \$? = $ac_status" >&5
++  echo "$as_me:8663: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+ 
+ 	cf_cv_term_header="$cf_test"
+@@ -8658,7 +8676,7 @@
+ done
+ 
+ fi
+-echo "$as_me:8661: result: $cf_cv_term_header" >&5
++echo "$as_me:8679: result: $cf_cv_term_header" >&5
+ echo "${ECHO_T}$cf_cv_term_header" >&6
+ 
+ # Set definitions to allow ifdef'ing to accommodate subdirectories
+@@ -8696,7 +8714,7 @@
+ #define NCURSES 1
+ EOF
+ 
+-echo "$as_me:8699: checking for ncurses version" >&5
++echo "$as_me:8717: 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
+@@ -8722,10 +8740,10 @@
+ #endif
+ EOF
+ 	cf_try="$ac_cpp conftest.$ac_ext 2>&5 | grep '^Autoconf ' >conftest.out"
+-	{ (eval echo "$as_me:8725: \"$cf_try\"") >&5
++	{ (eval echo "$as_me:8743: \"$cf_try\"") >&5
+   (eval $cf_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:8728: \$? = $ac_status" >&5
++  echo "$as_me:8746: \$? = $ac_status" >&5
+   (exit "$ac_status"); }
+ 	if test -f conftest.out ; then
+ 		cf_out=`sed -e 's%^Autoconf %%' -e 's%^[^"]*"%%' -e 's%".*%%' conftest.out`
+@@ -8735,7 +8753,7 @@
+ 
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 8738 "configure"
++#line 8756 "configure"
+ #include "confdefs.h"
+ 
+ #include <${cf_cv_ncurses_header:-curses.h}>
+@@ -8760,15 +8778,15 @@
+ }
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:8763: \"$ac_link\"") >&5
++if { (eval echo "$as_me:8781: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:8766: \$? = $ac_status" >&5
++  echo "$as_me:8784: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:8768: \"$ac_try\"") >&5
++  { (eval echo "$as_me:8786: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:8771: \$? = $ac_status" >&5
++  echo "$as_me:8789: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+ 
+ 	cf_cv_ncurses_version=`cat $cf_tempfile`
+@@ -8782,7 +8800,7 @@
+ 	rm -f "$cf_tempfile"
+ 
+ fi
+-echo "$as_me:8785: result: $cf_cv_ncurses_version" >&5
++echo "$as_me:8803: result: $cf_cv_ncurses_version" >&5
+ echo "${ECHO_T}$cf_cv_ncurses_version" >&6
+ test "$cf_cv_ncurses_version" = no ||
+ cat >>confdefs.h <<\EOF
+@@ -8795,7 +8813,7 @@
+ 	# to link gpm.
+ cf_ncurses_LIBS=""
+ cf_ncurses_SAVE="$LIBS"
+-echo "$as_me:8798: checking for Gpm_Open in -lgpm" >&5
++echo "$as_me:8816: 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
+@@ -8803,7 +8821,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lgpm  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 8806 "configure"
++#line 8824 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -8822,16 +8840,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:8825: \"$ac_link\"") >&5
++if { (eval echo "$as_me:8843: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:8828: \$? = $ac_status" >&5
++  echo "$as_me:8846: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:8831: \"$ac_try\"") >&5
++  { (eval echo "$as_me:8849: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:8834: \$? = $ac_status" >&5
++  echo "$as_me:8852: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_gpm_Gpm_Open=yes
+ else
+@@ -8842,10 +8860,10 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:8845: result: $ac_cv_lib_gpm_Gpm_Open" >&5
++echo "$as_me:8863: 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:8848: checking for initscr in -lgpm" >&5
++  echo "$as_me:8866: 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
+@@ -8853,7 +8871,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lgpm  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 8856 "configure"
++#line 8874 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -8872,16 +8890,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:8875: \"$ac_link\"") >&5
++if { (eval echo "$as_me:8893: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:8878: \$? = $ac_status" >&5
++  echo "$as_me:8896: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:8881: \"$ac_try\"") >&5
++  { (eval echo "$as_me:8899: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:8884: \$? = $ac_status" >&5
++  echo "$as_me:8902: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_gpm_initscr=yes
+ else
+@@ -8892,7 +8910,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:8895: result: $ac_cv_lib_gpm_initscr" >&5
++echo "$as_me:8913: 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"
+@@ -8907,7 +8925,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:8910: checking for tgoto in -lmytinfo" >&5
++		echo "$as_me:8928: 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
+@@ -8915,7 +8933,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lmytinfo  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 8918 "configure"
++#line 8936 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -8934,16 +8952,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:8937: \"$ac_link\"") >&5
++if { (eval echo "$as_me:8955: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:8940: \$? = $ac_status" >&5
++  echo "$as_me:8958: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:8943: \"$ac_try\"") >&5
++  { (eval echo "$as_me:8961: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:8946: \$? = $ac_status" >&5
++  echo "$as_me:8964: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_mytinfo_tgoto=yes
+ else
+@@ -8954,7 +8972,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:8957: result: $ac_cv_lib_mytinfo_tgoto" >&5
++echo "$as_me:8975: 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"
+@@ -9003,13 +9021,13 @@
+ 
+ 	eval 'cf_cv_have_lib_'"$cf_nculib_root"'=no'
+ 	cf_libdir=""
+-	echo "$as_me:9006: checking for initscr" >&5
++	echo "$as_me:9024: 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 9012 "configure"
++#line 9030 "configure"
+ #include "confdefs.h"
+ #define initscr autoconf_temporary
+ #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -9040,16 +9058,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:9043: \"$ac_link\"") >&5
++if { (eval echo "$as_me:9061: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:9046: \$? = $ac_status" >&5
++  echo "$as_me:9064: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:9049: \"$ac_try\"") >&5
++  { (eval echo "$as_me:9067: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:9052: \$? = $ac_status" >&5
++  echo "$as_me:9070: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_func_initscr=yes
+ else
+@@ -9059,18 +9077,18 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:9062: result: $ac_cv_func_initscr" >&5
++echo "$as_me:9080: 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:9069: checking for initscr in -l$cf_nculib_root" >&5
++		echo "$as_me:9087: 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 9073 "configure"
++#line 9091 "configure"
+ #include "confdefs.h"
+ #include <${cf_cv_ncurses_header:-curses.h}>
+ int
+@@ -9082,25 +9100,25 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:9085: \"$ac_link\"") >&5
++if { (eval echo "$as_me:9103: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:9088: \$? = $ac_status" >&5
++  echo "$as_me:9106: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:9091: \"$ac_try\"") >&5
++  { (eval echo "$as_me:9109: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:9094: \$? = $ac_status" >&5
++  echo "$as_me:9112: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+-  echo "$as_me:9096: result: yes" >&5
++  echo "$as_me:9114: 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:9103: result: no" >&5
++echo "$as_me:9121: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ 
+ cf_search=
+@@ -9168,11 +9186,11 @@
+ 
+ 			for cf_libdir in $cf_search
+ 			do
+-				echo "$as_me:9171: checking for -l$cf_nculib_root in $cf_libdir" >&5
++				echo "$as_me:9189: 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 9175 "configure"
++#line 9193 "configure"
+ #include "confdefs.h"
+ #include <${cf_cv_ncurses_header:-curses.h}>
+ int
+@@ -9184,25 +9202,25 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:9187: \"$ac_link\"") >&5
++if { (eval echo "$as_me:9205: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:9190: \$? = $ac_status" >&5
++  echo "$as_me:9208: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:9193: \"$ac_try\"") >&5
++  { (eval echo "$as_me:9211: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:9196: \$? = $ac_status" >&5
++  echo "$as_me:9214: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+-  echo "$as_me:9198: result: yes" >&5
++  echo "$as_me:9216: 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:9205: result: no" >&5
++echo "$as_me:9223: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ 					 LIBS="$cf_save_LIBS"
+ fi
+@@ -9217,7 +9235,7 @@
+ eval 'cf_found_library="$cf_cv_have_lib_'"$cf_nculib_root"\"
+ 
+ if test "$cf_found_library" = no ; then
+-	{ { echo "$as_me:9220: error: Cannot link $cf_nculib_root library" >&5
++	{ { echo "$as_me:9238: error: Cannot link $cf_nculib_root library" >&5
+ echo "$as_me: error: Cannot link $cf_nculib_root library" >&2;}
+    { (exit 1); exit 1; }; }
+ fi
+@@ -9225,7 +9243,7 @@
+ fi
+ 
+ if test -n "$cf_ncurses_LIBS" ; then
+-	echo "$as_me:9228: checking if we can link $cf_nculib_root without $cf_ncurses_LIBS" >&5
++	echo "$as_me:9246: 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
+@@ -9235,7 +9253,7 @@
+ 		fi
+ 	done
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 9238 "configure"
++#line 9256 "configure"
+ #include "confdefs.h"
+ #include <${cf_cv_ncurses_header:-curses.h}>
+ int
+@@ -9247,23 +9265,23 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:9250: \"$ac_link\"") >&5
++if { (eval echo "$as_me:9268: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:9253: \$? = $ac_status" >&5
++  echo "$as_me:9271: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:9256: \"$ac_try\"") >&5
++  { (eval echo "$as_me:9274: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:9259: \$? = $ac_status" >&5
++  echo "$as_me:9277: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+-  echo "$as_me:9261: result: yes" >&5
++  echo "$as_me:9279: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ else
+   echo "$as_me: failed program was:" >&5
+ cat "conftest.$ac_ext" >&5
+-echo "$as_me:9266: result: no" >&5
++echo "$as_me:9284: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ 		 LIBS="$cf_ncurses_SAVE"
+ fi
+@@ -9287,13 +9305,13 @@
+ cf_have_ncuconfig=no
+ 
+ if test "x${PKG_CONFIG:=none}" != xnone; then
+-	echo "$as_me:9290: checking pkg-config for $cf_ncuconfig_root" >&5
++	echo "$as_me:9308: 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:9293: result: yes" >&5
++		echo "$as_me:9311: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ 
+-		echo "$as_me:9296: checking if the $cf_ncuconfig_root package files work" >&5
++		echo "$as_me:9314: 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
+ 
+@@ -9426,7 +9444,7 @@
+ LIBS="$cf_add_libs"
+ 
+ 			cat >"conftest.$ac_ext" <<_ACEOF
+-#line 9429 "configure"
++#line 9447 "configure"
+ #include "confdefs.h"
+ #include <${cf_cv_ncurses_header:-curses.h}>
+ int
+@@ -9438,37 +9456,37 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:9441: \"$ac_link\"") >&5
++if { (eval echo "$as_me:9459: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:9444: \$? = $ac_status" >&5
++  echo "$as_me:9462: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:9447: \"$ac_try\"") >&5
++  { (eval echo "$as_me:9465: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:9450: \$? = $ac_status" >&5
++  echo "$as_me:9468: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   if test "$cross_compiling" = yes; then
+   cf_test_ncuconfig=maybe
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 9456 "configure"
++#line 9474 "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:9463: \"$ac_link\"") >&5
++if { (eval echo "$as_me:9481: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:9466: \$? = $ac_status" >&5
++  echo "$as_me:9484: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:9468: \"$ac_try\"") >&5
++  { (eval echo "$as_me:9486: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:9471: \$? = $ac_status" >&5
++  echo "$as_me:9489: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_test_ncuconfig=yes
+ else
+@@ -9642,7 +9660,7 @@
+ LIBS="$cf_add_libs"
+ 
+ 		cat >"conftest.$ac_ext" <<_ACEOF
+-#line 9645 "configure"
++#line 9663 "configure"
+ #include "confdefs.h"
+ #include <${cf_cv_ncurses_header:-curses.h}>
+ int
+@@ -9654,37 +9672,37 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:9657: \"$ac_link\"") >&5
++if { (eval echo "$as_me:9675: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:9660: \$? = $ac_status" >&5
++  echo "$as_me:9678: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:9663: \"$ac_try\"") >&5
++  { (eval echo "$as_me:9681: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:9666: \$? = $ac_status" >&5
++  echo "$as_me:9684: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   if test "$cross_compiling" = yes; then
+   cf_have_ncuconfig=maybe
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 9672 "configure"
++#line 9690 "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:9679: \"$ac_link\"") >&5
++if { (eval echo "$as_me:9697: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:9682: \$? = $ac_status" >&5
++  echo "$as_me:9700: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:9684: \"$ac_try\"") >&5
++  { (eval echo "$as_me:9702: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:9687: \$? = $ac_status" >&5
++  echo "$as_me:9705: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_have_ncuconfig=yes
+ else
+@@ -9701,7 +9719,7 @@
+ cf_have_ncuconfig=no
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+-		echo "$as_me:9704: result: $cf_have_ncuconfig" >&5
++		echo "$as_me:9722: 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"
+@@ -9717,7 +9735,7 @@
+ 
+ 			NCURSES_CONFIG_PKG=$cf_ncuconfig_root
+ 
+-echo "$as_me:9720: checking for terminfo header" >&5
++echo "$as_me:9738: 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
+@@ -9735,7 +9753,7 @@
+ for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h"
+ do
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 9738 "configure"
++#line 9756 "configure"
+ #include "confdefs.h"
+ #include <stdio.h>
+ #include <${cf_cv_ncurses_header:-curses.h}>
+@@ -9750,16 +9768,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:9753: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:9771: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:9756: \$? = $ac_status" >&5
++  echo "$as_me:9774: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:9759: \"$ac_try\"") >&5
++  { (eval echo "$as_me:9777: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:9762: \$? = $ac_status" >&5
++  echo "$as_me:9780: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+ 
+ 	cf_cv_term_header="$cf_test"
+@@ -9775,7 +9793,7 @@
+ done
+ 
+ fi
+-echo "$as_me:9778: result: $cf_cv_term_header" >&5
++echo "$as_me:9796: result: $cf_cv_term_header" >&5
+ echo "${ECHO_T}$cf_cv_term_header" >&6
+ 
+ # Set definitions to allow ifdef'ing to accommodate subdirectories
+@@ -9810,7 +9828,7 @@
+ 		fi
+ 
+ 	else
+-		echo "$as_me:9813: result: no" >&5
++		echo "$as_me:9831: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ 		NCURSES_CONFIG_PKG=none
+ 	fi
+@@ -9826,7 +9844,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:9829: checking for $ac_word" >&5
++echo "$as_me:9847: 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
+@@ -9841,7 +9859,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:9844: found $ac_dir/$ac_word" >&5
++echo "$as_me:9862: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -9849,10 +9867,10 @@
+ fi
+ NCURSES_CONFIG=$ac_cv_prog_NCURSES_CONFIG
+ if test -n "$NCURSES_CONFIG"; then
+-  echo "$as_me:9852: result: $NCURSES_CONFIG" >&5
++  echo "$as_me:9870: result: $NCURSES_CONFIG" >&5
+ echo "${ECHO_T}$NCURSES_CONFIG" >&6
+ else
+-  echo "$as_me:9855: result: no" >&5
++  echo "$as_me:9873: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -9865,7 +9883,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:9868: checking for $ac_word" >&5
++echo "$as_me:9886: 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
+@@ -9880,7 +9898,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:9883: found $ac_dir/$ac_word" >&5
++echo "$as_me:9901: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -9888,10 +9906,10 @@
+ fi
+ ac_ct_NCURSES_CONFIG=$ac_cv_prog_ac_ct_NCURSES_CONFIG
+ if test -n "$ac_ct_NCURSES_CONFIG"; then
+-  echo "$as_me:9891: result: $ac_ct_NCURSES_CONFIG" >&5
++  echo "$as_me:9909: result: $ac_ct_NCURSES_CONFIG" >&5
+ echo "${ECHO_T}$ac_ct_NCURSES_CONFIG" >&6
+ else
+-  echo "$as_me:9894: result: no" >&5
++  echo "$as_me:9912: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -10048,7 +10066,7 @@
+ 
+ 		# even with config script, some packages use no-override for curses.h
+ 
+-echo "$as_me:10051: checking if we have identified curses headers" >&5
++echo "$as_me:10069: 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
+@@ -10060,7 +10078,7 @@
+ 	curses.h ncurses/curses.h
+ do
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 10063 "configure"
++#line 10081 "configure"
+ #include "confdefs.h"
+ #include <${cf_header}>
+ int
+@@ -10072,16 +10090,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:10075: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:10093: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:10078: \$? = $ac_status" >&5
++  echo "$as_me:10096: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:10081: \"$ac_try\"") >&5
++  { (eval echo "$as_me:10099: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:10084: \$? = $ac_status" >&5
++  echo "$as_me:10102: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_ncurses_header=$cf_header; break
+ else
+@@ -10092,11 +10110,11 @@
+ done
+ 
+ fi
+-echo "$as_me:10095: result: $cf_cv_ncurses_header" >&5
++echo "$as_me:10113: 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:10099: error: No curses header-files found" >&5
++	{ { echo "$as_me:10117: error: No curses header-files found" >&5
+ echo "$as_me: error: No curses header-files found" >&2;}
+    { (exit 1); exit 1; }; }
+ fi
+@@ -10106,23 +10124,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:10109: checking for $ac_header" >&5
++echo "$as_me:10127: 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 10115 "configure"
++#line 10133 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:10119: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:10137: \"$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:10125: \$? = $ac_status" >&5
++  echo "$as_me:10143: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -10141,7 +10159,7 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:10144: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
++echo "$as_me:10162: 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
+@@ -10197,7 +10215,7 @@
+ 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
+ 
+ 			  cat >"conftest.$ac_ext" <<_ACEOF
+-#line 10200 "configure"
++#line 10218 "configure"
+ #include "confdefs.h"
+ #include <stdio.h>
+ int
+@@ -10209,16 +10227,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:10212: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:10230: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:10215: \$? = $ac_status" >&5
++  echo "$as_me:10233: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:10218: \"$ac_try\"") >&5
++  { (eval echo "$as_me:10236: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:10221: \$? = $ac_status" >&5
++  echo "$as_me:10239: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   :
+ else
+@@ -10235,7 +10253,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}:10238: testing adding $cf_add_incdir to include-path ..." 1>&5
++echo "${as_me:-configure}:10256: testing adding $cf_add_incdir to include-path ..." 1>&5
+ 
+ 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
+ 
+@@ -10254,7 +10272,7 @@
+ 
+ }
+ 
+-echo "$as_me:10257: checking for $cf_ncuhdr_root header in include-path" >&5
++echo "$as_me:10275: 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
+@@ -10266,7 +10284,7 @@
+ 	do
+ 
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 10269 "configure"
++#line 10287 "configure"
+ #include "confdefs.h"
+ 
+ #include <$cf_header>
+@@ -10290,16 +10308,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:10293: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:10311: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:10296: \$? = $ac_status" >&5
++  echo "$as_me:10314: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:10299: \"$ac_try\"") >&5
++  { (eval echo "$as_me:10317: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:10302: \$? = $ac_status" >&5
++  echo "$as_me:10320: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_ncurses_h=$cf_header
+ 
+@@ -10314,14 +10332,14 @@
+ 	done
+ 
+ fi
+-echo "$as_me:10317: result: $cf_cv_ncurses_h" >&5
++echo "$as_me:10335: 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:10324: checking for $cf_ncuhdr_root include-path" >&5
++echo "$as_me:10342: 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
+@@ -10442,7 +10460,7 @@
+ 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
+ 
+ 			  cat >"conftest.$ac_ext" <<_ACEOF
+-#line 10445 "configure"
++#line 10463 "configure"
+ #include "confdefs.h"
+ #include <stdio.h>
+ int
+@@ -10454,16 +10472,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:10457: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:10475: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:10460: \$? = $ac_status" >&5
++  echo "$as_me:10478: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:10463: \"$ac_try\"") >&5
++  { (eval echo "$as_me:10481: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:10466: \$? = $ac_status" >&5
++  echo "$as_me:10484: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   :
+ else
+@@ -10480,7 +10498,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}:10483: testing adding $cf_add_incdir to include-path ..." 1>&5
++echo "${as_me:-configure}:10501: testing adding $cf_add_incdir to include-path ..." 1>&5
+ 
+ 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
+ 
+@@ -10503,7 +10521,7 @@
+ 		do
+ 
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 10506 "configure"
++#line 10524 "configure"
+ #include "confdefs.h"
+ 
+ #include <$cf_header>
+@@ -10527,16 +10545,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:10530: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:10548: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:10533: \$? = $ac_status" >&5
++  echo "$as_me:10551: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:10536: \"$ac_try\"") >&5
++  { (eval echo "$as_me:10554: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:10539: \$? = $ac_status" >&5
++  echo "$as_me:10557: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_ncurses_h2=$cf_header
+ 
+@@ -10557,12 +10575,12 @@
+ 		CPPFLAGS="$cf_save2_CPPFLAGS"
+ 		test "$cf_cv_ncurses_h2" != no && break
+ 	done
+-	test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:10560: error: not found" >&5
++	test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:10578: error: not found" >&5
+ echo "$as_me: error: not found" >&2;}
+    { (exit 1); exit 1; }; }
+ 
+ fi
+-echo "$as_me:10565: result: $cf_cv_ncurses_h2" >&5
++echo "$as_me:10583: 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%/[^/]*$%%'`
+@@ -10598,7 +10616,7 @@
+ 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
+ 
+ 			  cat >"conftest.$ac_ext" <<_ACEOF
+-#line 10601 "configure"
++#line 10619 "configure"
+ #include "confdefs.h"
+ #include <stdio.h>
+ int
+@@ -10610,16 +10628,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:10613: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:10631: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:10616: \$? = $ac_status" >&5
++  echo "$as_me:10634: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:10619: \"$ac_try\"") >&5
++  { (eval echo "$as_me:10637: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:10622: \$? = $ac_status" >&5
++  echo "$as_me:10640: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   :
+ else
+@@ -10636,7 +10654,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}:10639: testing adding $cf_add_incdir to include-path ..." 1>&5
++echo "${as_me:-configure}:10657: testing adding $cf_add_incdir to include-path ..." 1>&5
+ 
+ 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
+ 
+@@ -10684,7 +10702,7 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:10687: checking for terminfo header" >&5
++echo "$as_me:10705: 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
+@@ -10702,7 +10720,7 @@
+ for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h"
+ do
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 10705 "configure"
++#line 10723 "configure"
+ #include "confdefs.h"
+ #include <stdio.h>
+ #include <${cf_cv_ncurses_header:-curses.h}>
+@@ -10717,16 +10735,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:10720: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:10738: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:10723: \$? = $ac_status" >&5
++  echo "$as_me:10741: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:10726: \"$ac_try\"") >&5
++  { (eval echo "$as_me:10744: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:10729: \$? = $ac_status" >&5
++  echo "$as_me:10747: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+ 
+ 	cf_cv_term_header="$cf_test"
+@@ -10742,7 +10760,7 @@
+ done
+ 
+ fi
+-echo "$as_me:10745: result: $cf_cv_term_header" >&5
++echo "$as_me:10763: result: $cf_cv_term_header" >&5
+ echo "${ECHO_T}$cf_cv_term_header" >&6
+ 
+ # Set definitions to allow ifdef'ing to accommodate subdirectories
+@@ -10780,7 +10798,7 @@
+ #define NCURSES 1
+ EOF
+ 
+-echo "$as_me:10783: checking for ncurses version" >&5
++echo "$as_me:10801: 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
+@@ -10806,10 +10824,10 @@
+ #endif
+ EOF
+ 	cf_try="$ac_cpp conftest.$ac_ext 2>&5 | grep '^Autoconf ' >conftest.out"
+-	{ (eval echo "$as_me:10809: \"$cf_try\"") >&5
++	{ (eval echo "$as_me:10827: \"$cf_try\"") >&5
+   (eval $cf_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:10812: \$? = $ac_status" >&5
++  echo "$as_me:10830: \$? = $ac_status" >&5
+   (exit "$ac_status"); }
+ 	if test -f conftest.out ; then
+ 		cf_out=`sed -e 's%^Autoconf %%' -e 's%^[^"]*"%%' -e 's%".*%%' conftest.out`
+@@ -10819,7 +10837,7 @@
+ 
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 10822 "configure"
++#line 10840 "configure"
+ #include "confdefs.h"
+ 
+ #include <${cf_cv_ncurses_header:-curses.h}>
+@@ -10844,15 +10862,15 @@
+ }
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:10847: \"$ac_link\"") >&5
++if { (eval echo "$as_me:10865: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:10850: \$? = $ac_status" >&5
++  echo "$as_me:10868: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:10852: \"$ac_try\"") >&5
++  { (eval echo "$as_me:10870: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:10855: \$? = $ac_status" >&5
++  echo "$as_me:10873: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+ 
+ 	cf_cv_ncurses_version=`cat $cf_tempfile`
+@@ -10866,7 +10884,7 @@
+ 	rm -f "$cf_tempfile"
+ 
+ fi
+-echo "$as_me:10869: result: $cf_cv_ncurses_version" >&5
++echo "$as_me:10887: result: $cf_cv_ncurses_version" >&5
+ echo "${ECHO_T}$cf_cv_ncurses_version" >&6
+ test "$cf_cv_ncurses_version" = no ||
+ cat >>confdefs.h <<\EOF
+@@ -10879,7 +10897,7 @@
+ 	# to link gpm.
+ cf_ncurses_LIBS=""
+ cf_ncurses_SAVE="$LIBS"
+-echo "$as_me:10882: checking for Gpm_Open in -lgpm" >&5
++echo "$as_me:10900: 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
+@@ -10887,7 +10905,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lgpm  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 10890 "configure"
++#line 10908 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -10906,16 +10924,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:10909: \"$ac_link\"") >&5
++if { (eval echo "$as_me:10927: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:10912: \$? = $ac_status" >&5
++  echo "$as_me:10930: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:10915: \"$ac_try\"") >&5
++  { (eval echo "$as_me:10933: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:10918: \$? = $ac_status" >&5
++  echo "$as_me:10936: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_gpm_Gpm_Open=yes
+ else
+@@ -10926,10 +10944,10 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:10929: result: $ac_cv_lib_gpm_Gpm_Open" >&5
++echo "$as_me:10947: 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:10932: checking for initscr in -lgpm" >&5
++  echo "$as_me:10950: 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
+@@ -10937,7 +10955,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lgpm  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 10940 "configure"
++#line 10958 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -10956,16 +10974,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:10959: \"$ac_link\"") >&5
++if { (eval echo "$as_me:10977: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:10962: \$? = $ac_status" >&5
++  echo "$as_me:10980: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:10965: \"$ac_try\"") >&5
++  { (eval echo "$as_me:10983: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:10968: \$? = $ac_status" >&5
++  echo "$as_me:10986: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_gpm_initscr=yes
+ else
+@@ -10976,7 +10994,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:10979: result: $ac_cv_lib_gpm_initscr" >&5
++echo "$as_me:10997: 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"
+@@ -10991,7 +11009,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:10994: checking for tgoto in -lmytinfo" >&5
++		echo "$as_me:11012: 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
+@@ -10999,7 +11017,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lmytinfo  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 11002 "configure"
++#line 11020 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -11018,16 +11036,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:11021: \"$ac_link\"") >&5
++if { (eval echo "$as_me:11039: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:11024: \$? = $ac_status" >&5
++  echo "$as_me:11042: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:11027: \"$ac_try\"") >&5
++  { (eval echo "$as_me:11045: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:11030: \$? = $ac_status" >&5
++  echo "$as_me:11048: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_mytinfo_tgoto=yes
+ else
+@@ -11038,7 +11056,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:11041: result: $ac_cv_lib_mytinfo_tgoto" >&5
++echo "$as_me:11059: 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"
+@@ -11087,13 +11105,13 @@
+ 
+ 	eval 'cf_cv_have_lib_'"$cf_nculib_root"'=no'
+ 	cf_libdir=""
+-	echo "$as_me:11090: checking for initscr" >&5
++	echo "$as_me:11108: 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 11096 "configure"
++#line 11114 "configure"
+ #include "confdefs.h"
+ #define initscr autoconf_temporary
+ #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -11124,16 +11142,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:11127: \"$ac_link\"") >&5
++if { (eval echo "$as_me:11145: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:11130: \$? = $ac_status" >&5
++  echo "$as_me:11148: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:11133: \"$ac_try\"") >&5
++  { (eval echo "$as_me:11151: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:11136: \$? = $ac_status" >&5
++  echo "$as_me:11154: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_func_initscr=yes
+ else
+@@ -11143,18 +11161,18 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:11146: result: $ac_cv_func_initscr" >&5
++echo "$as_me:11164: 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:11153: checking for initscr in -l$cf_nculib_root" >&5
++		echo "$as_me:11171: 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 11157 "configure"
++#line 11175 "configure"
+ #include "confdefs.h"
+ #include <${cf_cv_ncurses_header:-curses.h}>
+ int
+@@ -11166,25 +11184,25 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:11169: \"$ac_link\"") >&5
++if { (eval echo "$as_me:11187: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:11172: \$? = $ac_status" >&5
++  echo "$as_me:11190: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:11175: \"$ac_try\"") >&5
++  { (eval echo "$as_me:11193: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:11178: \$? = $ac_status" >&5
++  echo "$as_me:11196: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+-  echo "$as_me:11180: result: yes" >&5
++  echo "$as_me:11198: 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:11187: result: no" >&5
++echo "$as_me:11205: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ 
+ cf_search=
+@@ -11252,11 +11270,11 @@
+ 
+ 			for cf_libdir in $cf_search
+ 			do
+-				echo "$as_me:11255: checking for -l$cf_nculib_root in $cf_libdir" >&5
++				echo "$as_me:11273: 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 11259 "configure"
++#line 11277 "configure"
+ #include "confdefs.h"
+ #include <${cf_cv_ncurses_header:-curses.h}>
+ int
+@@ -11268,25 +11286,25 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:11271: \"$ac_link\"") >&5
++if { (eval echo "$as_me:11289: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:11274: \$? = $ac_status" >&5
++  echo "$as_me:11292: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:11277: \"$ac_try\"") >&5
++  { (eval echo "$as_me:11295: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:11280: \$? = $ac_status" >&5
++  echo "$as_me:11298: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+-  echo "$as_me:11282: result: yes" >&5
++  echo "$as_me:11300: 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:11289: result: no" >&5
++echo "$as_me:11307: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ 					 LIBS="$cf_save_LIBS"
+ fi
+@@ -11301,7 +11319,7 @@
+ eval 'cf_found_library="$cf_cv_have_lib_'"$cf_nculib_root"\"
+ 
+ if test "$cf_found_library" = no ; then
+-	{ { echo "$as_me:11304: error: Cannot link $cf_nculib_root library" >&5
++	{ { echo "$as_me:11322: error: Cannot link $cf_nculib_root library" >&5
+ echo "$as_me: error: Cannot link $cf_nculib_root library" >&2;}
+    { (exit 1); exit 1; }; }
+ fi
+@@ -11309,7 +11327,7 @@
+ fi
+ 
+ if test -n "$cf_ncurses_LIBS" ; then
+-	echo "$as_me:11312: checking if we can link $cf_nculib_root without $cf_ncurses_LIBS" >&5
++	echo "$as_me:11330: 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
+@@ -11319,7 +11337,7 @@
+ 		fi
+ 	done
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 11322 "configure"
++#line 11340 "configure"
+ #include "confdefs.h"
+ #include <${cf_cv_ncurses_header:-curses.h}>
+ int
+@@ -11331,23 +11349,23 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:11334: \"$ac_link\"") >&5
++if { (eval echo "$as_me:11352: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:11337: \$? = $ac_status" >&5
++  echo "$as_me:11355: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:11340: \"$ac_try\"") >&5
++  { (eval echo "$as_me:11358: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:11343: \$? = $ac_status" >&5
++  echo "$as_me:11361: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+-  echo "$as_me:11345: result: yes" >&5
++  echo "$as_me:11363: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ else
+   echo "$as_me: failed program was:" >&5
+ cat "conftest.$ac_ext" >&5
+-echo "$as_me:11350: result: no" >&5
++echo "$as_me:11368: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ 		 LIBS="$cf_ncurses_SAVE"
+ fi
+@@ -11400,10 +11418,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:11403: \"$cf_try\"") >&5
++		{ (eval echo "$as_me:11421: \"$cf_try\"") >&5
+   (eval $cf_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:11406: \$? = $ac_status" >&5
++  echo "$as_me:11424: \$? = $ac_status" >&5
+   (exit "$ac_status"); }
+ 		if test -f conftest.out ; then
+ 			cf_result=`sed -e "s/^.*AUTOCONF_${cf_name}[ 	][ 	]*//" conftest.out`
+@@ -11421,10 +11439,10 @@
+ 
+ cf_cv_timestamp=`date`
+ 
+-echo "$as_me:11424: result: Configuring NCURSES $cf_cv_rel_version ABI $cf_cv_abi_version ($cf_cv_timestamp)" >&5
++echo "$as_me:11442: 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:11427: checking if you want to have a library-prefix" >&5
++echo "$as_me:11445: 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.
+@@ -11434,7 +11452,7 @@
+ else
+   with_lib_prefix=auto
+ fi;
+-echo "$as_me:11437: result: $with_lib_prefix" >&5
++echo "$as_me:11455: result: $with_lib_prefix" >&5
+ echo "${ECHO_T}$with_lib_prefix" >&6
+ 
+ if test "$with_lib_prefix" = auto
+@@ -11472,7 +11490,7 @@
+ 	test -n "$GCC" && test "${ac_cv_prog_cc_g}" != yes && CC_G_OPT=''
+ fi
+ 
+-echo "$as_me:11475: checking for default loader flags" >&5
++echo "$as_me:11493: 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=''   ;;
+@@ -11480,13 +11498,13 @@
+ (profile) LD_MODEL='-pg';;
+ (shared)  LD_MODEL=''   ;;
+ esac
+-echo "$as_me:11483: result: $LD_MODEL" >&5
++echo "$as_me:11501: 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:11489: checking for an rpath option" >&5
++	echo "$as_me:11507: checking for an rpath option" >&5
+ echo $ECHO_N "checking for an rpath option... $ECHO_C" >&6
+ 	case "$cf_cv_system_name" in
+ 	(irix*)
+@@ -11517,12 +11535,12 @@
+ 	(*)
+ 		;;
+ 	esac
+-	echo "$as_me:11520: result: $LD_RPATH_OPT" >&5
++	echo "$as_me:11538: result: $LD_RPATH_OPT" >&5
+ echo "${ECHO_T}$LD_RPATH_OPT" >&6
+ 
+ 	case "x$LD_RPATH_OPT" in
+ 	(x-R*)
+-		echo "$as_me:11525: checking if we need a space after rpath option" >&5
++		echo "$as_me:11543: 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"
+ 
+@@ -11543,7 +11561,7 @@
+ LIBS="$cf_add_libs"
+ 
+ 		cat >"conftest.$ac_ext" <<_ACEOF
+-#line 11546 "configure"
++#line 11564 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -11555,16 +11573,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:11558: \"$ac_link\"") >&5
++if { (eval echo "$as_me:11576: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:11561: \$? = $ac_status" >&5
++  echo "$as_me:11579: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:11564: \"$ac_try\"") >&5
++  { (eval echo "$as_me:11582: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:11567: \$? = $ac_status" >&5
++  echo "$as_me:11585: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_rpath_space=no
+ else
+@@ -11574,7 +11592,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ 		LIBS="$cf_save_LIBS"
+-		echo "$as_me:11577: result: $cf_rpath_space" >&5
++		echo "$as_me:11595: result: $cf_rpath_space" >&5
+ echo "${ECHO_T}$cf_rpath_space" >&6
+ 		test "$cf_rpath_space" = yes && LD_RPATH_OPT="$LD_RPATH_OPT "
+ 		;;
+@@ -11596,7 +11614,7 @@
+ 	cf_ld_rpath_opt=
+ 	test "$cf_cv_enable_rpath" = yes && cf_ld_rpath_opt="$LD_RPATH_OPT"
+ 
+-	echo "$as_me:11599: checking if release/abi version should be used for shared libs" >&5
++	echo "$as_me:11617: 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.
+@@ -11611,9 +11629,9 @@
+ 		cf_cv_shlib_version=$withval
+ 		;;
+ 	(*)
+-		echo "$as_me:11614: result: $withval" >&5
++		echo "$as_me:11632: result: $withval" >&5
+ echo "${ECHO_T}$withval" >&6
+-		{ { echo "$as_me:11616: error: option value must be one of: rel, abi, or auto" >&5
++		{ { echo "$as_me:11634: 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; }; }
+ 		;;
+@@ -11622,7 +11640,7 @@
+ else
+   cf_cv_shlib_version=auto
+ fi;
+-	echo "$as_me:11625: result: $cf_cv_shlib_version" >&5
++	echo "$as_me:11643: result: $cf_cv_shlib_version" >&5
+ echo "${ECHO_T}$cf_cv_shlib_version" >&6
+ 
+ 	cf_cv_rm_so_locs=no
+@@ -11645,14 +11663,14 @@
+ 
+ 	if test "$cf_try_fPIC" = yes
+ 	then
+-		echo "$as_me:11648: checking which $CC option to use" >&5
++		echo "$as_me:11666: 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 11655 "configure"
++#line 11673 "configure"
+ #include "confdefs.h"
+ #include <stdio.h>
+ int
+@@ -11664,16 +11682,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:11667: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:11685: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:11670: \$? = $ac_status" >&5
++  echo "$as_me:11688: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:11673: \"$ac_try\"") >&5
++  { (eval echo "$as_me:11691: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:11676: \$? = $ac_status" >&5
++  echo "$as_me:11694: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   break
+ else
+@@ -11682,7 +11700,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 		done
+-		echo "$as_me:11685: result: $CC_SHARED_OPTS" >&5
++		echo "$as_me:11703: result: $CC_SHARED_OPTS" >&5
+ echo "${ECHO_T}$CC_SHARED_OPTS" >&6
+ 		CFLAGS="$cf_save_CFLAGS"
+ 	fi
+@@ -11753,7 +11771,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:11756: checking if ld -search_paths_first works" >&5
++		echo "$as_me:11774: 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
+@@ -11762,7 +11780,7 @@
+ 			cf_save_LDFLAGS=$LDFLAGS
+ 			LDFLAGS="$LDFLAGS -Wl,-search_paths_first"
+ 			cat >"conftest.$ac_ext" <<_ACEOF
+-#line 11765 "configure"
++#line 11783 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -11774,16 +11792,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:11777: \"$ac_link\"") >&5
++if { (eval echo "$as_me:11795: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:11780: \$? = $ac_status" >&5
++  echo "$as_me:11798: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:11783: \"$ac_try\"") >&5
++  { (eval echo "$as_me:11801: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:11786: \$? = $ac_status" >&5
++  echo "$as_me:11804: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_ldflags_search_paths_first=yes
+ else
+@@ -11794,7 +11812,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ 				LDFLAGS=$cf_save_LDFLAGS
+ fi
+-echo "$as_me:11797: result: $cf_cv_ldflags_search_paths_first" >&5
++echo "$as_me:11815: 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"
+@@ -12144,7 +12162,7 @@
+ 			do
+ 				CFLAGS="$cf_shared_opts $cf_save_CFLAGS"
+ 				cat >"conftest.$ac_ext" <<_ACEOF
+-#line 12147 "configure"
++#line 12165 "configure"
+ #include "confdefs.h"
+ #include <stdio.h>
+ int
+@@ -12156,16 +12174,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:12159: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:12177: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:12162: \$? = $ac_status" >&5
++  echo "$as_me:12180: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:12165: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12183: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:12168: \$? = $ac_status" >&5
++  echo "$as_me:12186: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   break
+ else
+@@ -12202,7 +12220,7 @@
+ 			test "$cf_cv_do_symlinks" = no && cf_cv_do_symlinks=yes
+ 			;;
+ 		(*)
+-			{ echo "$as_me:12205: WARNING: ignored --with-shlib-version" >&5
++			{ echo "$as_me:12223: WARNING: ignored --with-shlib-version" >&5
+ echo "$as_me: WARNING: ignored --with-shlib-version" >&2;}
+ 			;;
+ 		esac
+@@ -12212,7 +12230,7 @@
+ 	if test -n "$cf_try_cflags"
+ 	then
+ cat > conftest.$ac_ext <<EOF
+-#line 12215 "${as_me:-configure}"
++#line 12233 "${as_me:-configure}"
+ #include <stdio.h>
+ int main(int argc, char *argv[])
+ {
+@@ -12224,18 +12242,18 @@
+ 		for cf_opt in $cf_try_cflags
+ 		do
+ 			CFLAGS="$cf_save_CFLAGS -$cf_opt"
+-			echo "$as_me:12227: checking if CFLAGS option -$cf_opt works" >&5
++			echo "$as_me:12245: 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:12229: \"$ac_compile\"") >&5
++			if { (eval echo "$as_me:12247: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:12232: \$? = $ac_status" >&5
++  echo "$as_me:12250: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; then
+-				echo "$as_me:12234: result: yes" >&5
++				echo "$as_me:12252: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ 				cf_save_CFLAGS="$CFLAGS"
+ 			else
+-				echo "$as_me:12238: result: no" >&5
++				echo "$as_me:12256: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ 			fi
+ 		done
+@@ -12250,17 +12268,17 @@
+ 
+ 	test -n "$verbose" && echo "	CC_SHARED_OPTS: $CC_SHARED_OPTS" 1>&6
+ 
+-echo "${as_me:-configure}:12253: testing CC_SHARED_OPTS: $CC_SHARED_OPTS ..." 1>&5
++echo "${as_me:-configure}:12271: 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}:12257: testing MK_SHARED_LIB:  $MK_SHARED_LIB ..." 1>&5
++echo "${as_me:-configure}:12275: 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:12263: checking if you want to link sample programs with rpath option" >&5
++	echo "$as_me:12281: 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.
+@@ -12270,7 +12288,7 @@
+ else
+   with_rpath_link=yes
+ fi;
+-	echo "$as_me:12273: result: $with_rpath_link" >&5
++	echo "$as_me:12291: result: $with_rpath_link" >&5
+ echo "${ECHO_T}$with_rpath_link" >&6
+ 	if test "$with_rpath_link" = no
+ 	then
+@@ -12283,7 +12301,7 @@
+ 
+ ###   use option --enable-broken-linker to force on use of broken-linker support
+ 
+-echo "$as_me:12286: checking if you want broken-linker support code" >&5
++echo "$as_me:12304: 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.
+@@ -12293,7 +12311,7 @@
+ else
+   with_broken_linker=no
+ fi;
+-echo "$as_me:12296: result: $with_broken_linker" >&5
++echo "$as_me:12314: result: $with_broken_linker" >&5
+ echo "${ECHO_T}$with_broken_linker" >&6
+ 
+ : "${BROKEN_LINKER:=0}"
+@@ -12308,14 +12326,14 @@
+ 
+ # Check to define _XOPEN_SOURCE "automatically"
+ 
+-echo "$as_me:12311: checking if the POSIX test-macros are already defined" >&5
++echo "$as_me:12329: 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 12318 "configure"
++#line 12336 "configure"
+ #include "confdefs.h"
+ #include <stdio.h>
+ int
+@@ -12334,16 +12352,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:12337: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:12355: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:12340: \$? = $ac_status" >&5
++  echo "$as_me:12358: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:12343: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12361: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:12346: \$? = $ac_status" >&5
++  echo "$as_me:12364: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_posix_visible=no
+ else
+@@ -12354,7 +12372,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:12357: result: $cf_cv_posix_visible" >&5
++echo "$as_me:12375: result: $cf_cv_posix_visible" >&5
+ echo "${ECHO_T}$cf_cv_posix_visible" >&6
+ 
+ if test "$cf_cv_posix_visible" = no; then
+@@ -12399,14 +12417,14 @@
+ 
+ cf_gnu_xopen_source=$cf_XOPEN_SOURCE
+ 
+-echo "$as_me:12402: checking if this is the GNU C library" >&5
++echo "$as_me:12420: 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 12409 "configure"
++#line 12427 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ int
+@@ -12425,16 +12443,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:12428: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:12446: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:12431: \$? = $ac_status" >&5
++  echo "$as_me:12449: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:12434: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12452: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:12437: \$? = $ac_status" >&5
++  echo "$as_me:12455: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_gnu_library=yes
+ else
+@@ -12445,7 +12463,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:12448: result: $cf_cv_gnu_library" >&5
++echo "$as_me:12466: result: $cf_cv_gnu_library" >&5
+ echo "${ECHO_T}$cf_cv_gnu_library" >&6
+ 
+ if test x$cf_cv_gnu_library = xyes; then
+@@ -12453,7 +12471,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:12456: checking if _DEFAULT_SOURCE can be used as a basis" >&5
++	echo "$as_me:12474: 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
+@@ -12465,7 +12483,7 @@
+ 	CPPFLAGS="${CPPFLAGS}-D_DEFAULT_SOURCE"
+ 
+ 		cat >"conftest.$ac_ext" <<_ACEOF
+-#line 12468 "configure"
++#line 12486 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ int
+@@ -12484,16 +12502,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:12487: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:12505: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:12490: \$? = $ac_status" >&5
++  echo "$as_me:12508: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:12493: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12511: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:12496: \$? = $ac_status" >&5
++  echo "$as_me:12514: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_gnu_library_219=yes
+ else
+@@ -12505,12 +12523,12 @@
+ 		CPPFLAGS="$cf_save"
+ 
+ fi
+-echo "$as_me:12508: result: $cf_cv_gnu_library_219" >&5
++echo "$as_me:12526: 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:12513: checking if _XOPEN_SOURCE=$cf_gnu_xopen_source works with _DEFAULT_SOURCE" >&5
++		echo "$as_me:12531: 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
+@@ -12615,7 +12633,7 @@
+ fi
+ 
+ 			cat >"conftest.$ac_ext" <<_ACEOF
+-#line 12618 "configure"
++#line 12636 "configure"
+ #include "confdefs.h"
+ 
+ 				#include <limits.h>
+@@ -12635,16 +12653,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:12638: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:12656: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:12641: \$? = $ac_status" >&5
++  echo "$as_me:12659: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:12644: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12662: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:12647: \$? = $ac_status" >&5
++  echo "$as_me:12665: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_gnu_dftsrc_219=yes
+ else
+@@ -12655,7 +12673,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:12658: result: $cf_cv_gnu_dftsrc_219" >&5
++echo "$as_me:12676: 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
+@@ -12664,14 +12682,14 @@
+ 
+ 	if test "x$cf_cv_gnu_dftsrc_219" != xyes; then
+ 
+-		echo "$as_me:12667: checking if we must define _GNU_SOURCE" >&5
++		echo "$as_me:12685: 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 12674 "configure"
++#line 12692 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ int
+@@ -12686,16 +12704,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:12689: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:12707: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:12692: \$? = $ac_status" >&5
++  echo "$as_me:12710: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:12695: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12713: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:12698: \$? = $ac_status" >&5
++  echo "$as_me:12716: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_gnu_source=no
+ else
+@@ -12802,7 +12820,7 @@
+ fi
+ 
+ 			 cat >"conftest.$ac_ext" <<_ACEOF
+-#line 12805 "configure"
++#line 12823 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ int
+@@ -12817,16 +12835,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:12820: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:12838: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:12823: \$? = $ac_status" >&5
++  echo "$as_me:12841: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:12826: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12844: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:12829: \$? = $ac_status" >&5
++  echo "$as_me:12847: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_gnu_source=no
+ else
+@@ -12841,12 +12859,12 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:12844: result: $cf_cv_gnu_source" >&5
++echo "$as_me:12862: 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:12849: checking if we should also define _DEFAULT_SOURCE" >&5
++		echo "$as_me:12867: 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
+@@ -12856,7 +12874,7 @@
+ 	CPPFLAGS="${CPPFLAGS}-D_GNU_SOURCE"
+ 
+ 			cat >"conftest.$ac_ext" <<_ACEOF
+-#line 12859 "configure"
++#line 12877 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ int
+@@ -12871,16 +12889,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:12874: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:12892: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:12877: \$? = $ac_status" >&5
++  echo "$as_me:12895: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:12880: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12898: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:12883: \$? = $ac_status" >&5
++  echo "$as_me:12901: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_default_source=no
+ else
+@@ -12891,7 +12909,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:12894: result: $cf_cv_default_source" >&5
++echo "$as_me:12912: result: $cf_cv_default_source" >&5
+ echo "${ECHO_T}$cf_cv_default_source" >&6
+ 			if test "$cf_cv_default_source" = yes
+ 			then
+@@ -12928,16 +12946,16 @@
+ 	sed	-e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ 	]*\)\?[ 	]/ /g' \
+ 		-e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ 	]*\)\?$//g'`
+ 
+-echo "$as_me:12931: checking if we should define _POSIX_C_SOURCE" >&5
++echo "$as_me:12949: 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}:12937: testing if the symbol is already defined go no further ..." 1>&5
++echo "${as_me:-configure}:12955: testing if the symbol is already defined go no further ..." 1>&5
+ 
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 12940 "configure"
++#line 12958 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ int
+@@ -12952,16 +12970,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:12955: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:12973: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:12958: \$? = $ac_status" >&5
++  echo "$as_me:12976: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:12961: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12979: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:12964: \$? = $ac_status" >&5
++  echo "$as_me:12982: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_posix_c_source=no
+ else
+@@ -12982,7 +13000,7 @@
+ 	 esac
+ 	 if test "$cf_want_posix_source" = yes ; then
+ 		cat >"conftest.$ac_ext" <<_ACEOF
+-#line 12985 "configure"
++#line 13003 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ int
+@@ -12997,16 +13015,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:13000: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:13018: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:13003: \$? = $ac_status" >&5
++  echo "$as_me:13021: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:13006: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13024: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:13009: \$? = $ac_status" >&5
++  echo "$as_me:13027: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   :
+ else
+@@ -13017,7 +13035,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 	 fi
+ 
+-echo "${as_me:-configure}:13020: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
++echo "${as_me:-configure}:13038: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
+ 
+ 	 CFLAGS="$cf_trim_CFLAGS"
+ 	 CPPFLAGS="$cf_trim_CPPFLAGS"
+@@ -13025,10 +13043,10 @@
+ 	test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
+ 	CPPFLAGS="${CPPFLAGS}$cf_cv_posix_c_source"
+ 
+-echo "${as_me:-configure}:13028: testing if the second compile does not leave our definition intact error ..." 1>&5
++echo "${as_me:-configure}:13046: testing if the second compile does not leave our definition intact error ..." 1>&5
+ 
+ 	 cat >"conftest.$ac_ext" <<_ACEOF
+-#line 13031 "configure"
++#line 13049 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ int
+@@ -13043,16 +13061,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:13046: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:13064: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:13049: \$? = $ac_status" >&5
++  echo "$as_me:13067: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:13052: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13070: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:13055: \$? = $ac_status" >&5
++  echo "$as_me:13073: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   :
+ else
+@@ -13068,7 +13086,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:13071: result: $cf_cv_posix_c_source" >&5
++echo "$as_me:13089: 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
+@@ -13185,7 +13203,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:13188: WARNING: this system does not provide usable locale support" >&5
++	{ echo "$as_me:13206: 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
+@@ -13217,14 +13235,14 @@
+ 	;;
+ (*)
+ 
+-echo "$as_me:13220: checking if we should define _XOPEN_SOURCE" >&5
++echo "$as_me:13238: 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 13227 "configure"
++#line 13245 "configure"
+ #include "confdefs.h"
+ 
+ #include <stdlib.h>
+@@ -13243,16 +13261,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:13246: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:13264: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:13249: \$? = $ac_status" >&5
++  echo "$as_me:13267: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:13252: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13270: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:13255: \$? = $ac_status" >&5
++  echo "$as_me:13273: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_xopen_source=no
+ else
+@@ -13264,7 +13282,7 @@
+ 	CPPFLAGS="${CPPFLAGS}-D_XOPEN_SOURCE=$cf_XOPEN_SOURCE"
+ 
+ 	 cat >"conftest.$ac_ext" <<_ACEOF
+-#line 13267 "configure"
++#line 13285 "configure"
+ #include "confdefs.h"
+ 
+ #include <stdlib.h>
+@@ -13283,16 +13301,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:13286: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:13304: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:13289: \$? = $ac_status" >&5
++  echo "$as_me:13307: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:13292: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13310: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:13295: \$? = $ac_status" >&5
++  echo "$as_me:13313: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_xopen_source=no
+ else
+@@ -13307,7 +13325,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:13310: result: $cf_cv_xopen_source" >&5
++echo "$as_me:13328: result: $cf_cv_xopen_source" >&5
+ echo "${ECHO_T}$cf_cv_xopen_source" >&6
+ 
+ if test "$cf_cv_xopen_source" != no ; then
+@@ -13465,16 +13483,16 @@
+ 	sed	-e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ 	]*\)\?[ 	]/ /g' \
+ 		-e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ 	]*\)\?$//g'`
+ 
+-echo "$as_me:13468: checking if we should define _POSIX_C_SOURCE" >&5
++echo "$as_me:13486: 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}:13474: testing if the symbol is already defined go no further ..." 1>&5
++echo "${as_me:-configure}:13492: testing if the symbol is already defined go no further ..." 1>&5
+ 
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 13477 "configure"
++#line 13495 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ int
+@@ -13489,16 +13507,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:13492: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:13510: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:13495: \$? = $ac_status" >&5
++  echo "$as_me:13513: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:13498: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13516: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:13501: \$? = $ac_status" >&5
++  echo "$as_me:13519: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_posix_c_source=no
+ else
+@@ -13519,7 +13537,7 @@
+ 	 esac
+ 	 if test "$cf_want_posix_source" = yes ; then
+ 		cat >"conftest.$ac_ext" <<_ACEOF
+-#line 13522 "configure"
++#line 13540 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ int
+@@ -13534,16 +13552,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:13537: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:13555: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:13540: \$? = $ac_status" >&5
++  echo "$as_me:13558: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:13543: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13561: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:13546: \$? = $ac_status" >&5
++  echo "$as_me:13564: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   :
+ else
+@@ -13554,7 +13572,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 	 fi
+ 
+-echo "${as_me:-configure}:13557: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
++echo "${as_me:-configure}:13575: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
+ 
+ 	 CFLAGS="$cf_trim_CFLAGS"
+ 	 CPPFLAGS="$cf_trim_CPPFLAGS"
+@@ -13562,10 +13580,10 @@
+ 	test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
+ 	CPPFLAGS="${CPPFLAGS}$cf_cv_posix_c_source"
+ 
+-echo "${as_me:-configure}:13565: testing if the second compile does not leave our definition intact error ..." 1>&5
++echo "${as_me:-configure}:13583: testing if the second compile does not leave our definition intact error ..." 1>&5
+ 
+ 	 cat >"conftest.$ac_ext" <<_ACEOF
+-#line 13568 "configure"
++#line 13586 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ int
+@@ -13580,16 +13598,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:13583: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:13601: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:13586: \$? = $ac_status" >&5
++  echo "$as_me:13604: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:13589: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13607: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:13592: \$? = $ac_status" >&5
++  echo "$as_me:13610: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   :
+ else
+@@ -13605,7 +13623,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:13608: result: $cf_cv_posix_c_source" >&5
++echo "$as_me:13626: 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
+@@ -13731,7 +13749,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}:13734: testing removing old option $cf_add_cflags from CFLAGS ..." 1>&5
++echo "${as_me:-configure}:13752: testing removing old option $cf_add_cflags from CFLAGS ..." 1>&5
+ 
+ 	CFLAGS="$cf_old_cflag"
+ done
+@@ -13743,7 +13761,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}:13746: testing removing old option $cf_add_cflags from CPPFLAGS ..." 1>&5
++echo "${as_me:-configure}:13764: testing removing old option $cf_add_cflags from CPPFLAGS ..." 1>&5
+ 
+ 	CPPFLAGS="$cf_old_cflag"
+ done
+@@ -13831,7 +13849,7 @@
+ if test -n "$cf_new_cflags" ; then
+ 	test -n "$verbose" && echo "	add to \$CFLAGS $cf_new_cflags" 1>&6
+ 
+-echo "${as_me:-configure}:13834: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
++echo "${as_me:-configure}:13852: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
+ 
+ 	test -n "$CFLAGS" && CFLAGS="$CFLAGS "
+ 	CFLAGS="${CFLAGS}$cf_new_cflags"
+@@ -13841,7 +13859,7 @@
+ if test -n "$cf_new_cppflags" ; then
+ 	test -n "$verbose" && echo "	add to \$CPPFLAGS $cf_new_cppflags" 1>&6
+ 
+-echo "${as_me:-configure}:13844: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
++echo "${as_me:-configure}:13862: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
+ 
+ 	test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
+ 	CPPFLAGS="${CPPFLAGS}$cf_new_cppflags"
+@@ -13851,7 +13869,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}:13854: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5
++echo "${as_me:-configure}:13872: 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"
+@@ -13863,10 +13881,10 @@
+ fi
+ 
+ if test -n "$cf_XOPEN_SOURCE" && test -z "$cf_cv_xopen_source" ; then
+-	echo "$as_me:13866: checking if _XOPEN_SOURCE really is set" >&5
++	echo "$as_me:13884: 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 13869 "configure"
++#line 13887 "configure"
+ #include "confdefs.h"
+ #include <stdlib.h>
+ int
+@@ -13881,16 +13899,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:13884: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:13902: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:13887: \$? = $ac_status" >&5
++  echo "$as_me:13905: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:13890: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13908: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:13893: \$? = $ac_status" >&5
++  echo "$as_me:13911: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_XOPEN_SOURCE_set=yes
+ else
+@@ -13899,12 +13917,12 @@
+ cf_XOPEN_SOURCE_set=no
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+-	echo "$as_me:13902: result: $cf_XOPEN_SOURCE_set" >&5
++	echo "$as_me:13920: 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 13907 "configure"
++#line 13925 "configure"
+ #include "confdefs.h"
+ #include <stdlib.h>
+ int
+@@ -13919,16 +13937,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:13922: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:13940: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:13925: \$? = $ac_status" >&5
++  echo "$as_me:13943: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:13928: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13946: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:13931: \$? = $ac_status" >&5
++  echo "$as_me:13949: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_XOPEN_SOURCE_set_ok=yes
+ else
+@@ -13939,19 +13957,19 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 		if test "$cf_XOPEN_SOURCE_set_ok" = no
+ 		then
+-			{ echo "$as_me:13942: WARNING: _XOPEN_SOURCE is lower than requested" >&5
++			{ echo "$as_me:13960: WARNING: _XOPEN_SOURCE is lower than requested" >&5
+ echo "$as_me: WARNING: _XOPEN_SOURCE is lower than requested" >&2;}
+ 		fi
+ 	else
+ 
+-echo "$as_me:13947: checking if we should define _XOPEN_SOURCE" >&5
++echo "$as_me:13965: 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 13954 "configure"
++#line 13972 "configure"
+ #include "confdefs.h"
+ 
+ #include <stdlib.h>
+@@ -13970,16 +13988,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:13973: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:13991: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:13976: \$? = $ac_status" >&5
++  echo "$as_me:13994: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:13979: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13997: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:13982: \$? = $ac_status" >&5
++  echo "$as_me:14000: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_xopen_source=no
+ else
+@@ -13991,7 +14009,7 @@
+ 	CPPFLAGS="${CPPFLAGS}-D_XOPEN_SOURCE=$cf_XOPEN_SOURCE"
+ 
+ 	 cat >"conftest.$ac_ext" <<_ACEOF
+-#line 13994 "configure"
++#line 14012 "configure"
+ #include "confdefs.h"
+ 
+ #include <stdlib.h>
+@@ -14010,16 +14028,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:14013: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:14031: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:14016: \$? = $ac_status" >&5
++  echo "$as_me:14034: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:14019: \"$ac_try\"") >&5
++  { (eval echo "$as_me:14037: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:14022: \$? = $ac_status" >&5
++  echo "$as_me:14040: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_xopen_source=no
+ else
+@@ -14034,7 +14052,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:14037: result: $cf_cv_xopen_source" >&5
++echo "$as_me:14055: result: $cf_cv_xopen_source" >&5
+ echo "${ECHO_T}$cf_cv_xopen_source" >&6
+ 
+ if test "$cf_cv_xopen_source" != no ; then
+@@ -14188,7 +14206,7 @@
+ fi;
+ if test "$enable_largefile" != no; then
+ 
+-  echo "$as_me:14191: checking for special C compiler options needed for large files" >&5
++  echo "$as_me:14209: 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
+@@ -14200,7 +14218,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 14203 "configure"
++#line 14221 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+  /* Check that off_t can represent 2**63 - 1 correctly.
+@@ -14220,16 +14238,16 @@
+ }
+ _ACEOF
+      	 rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:14223: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:14241: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:14226: \$? = $ac_status" >&5
++  echo "$as_me:14244: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:14229: \"$ac_try\"") >&5
++  { (eval echo "$as_me:14247: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:14232: \$? = $ac_status" >&5
++  echo "$as_me:14250: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   break
+ else
+@@ -14239,16 +14257,16 @@
+ rm -f "conftest.$ac_objext"
+      	 CC="$CC -n32"
+      	 rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:14242: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:14260: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:14245: \$? = $ac_status" >&5
++  echo "$as_me:14263: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:14248: \"$ac_try\"") >&5
++  { (eval echo "$as_me:14266: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:14251: \$? = $ac_status" >&5
++  echo "$as_me:14269: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_sys_largefile_CC=' -n32'; break
+ else
+@@ -14262,13 +14280,13 @@
+        rm -f "conftest.$ac_ext"
+     fi
+ fi
+-echo "$as_me:14265: result: $ac_cv_sys_largefile_CC" >&5
++echo "$as_me:14283: 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:14271: checking for _FILE_OFFSET_BITS value needed for large files" >&5
++  echo "$as_me:14289: 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
+@@ -14276,7 +14294,7 @@
+   while :; do
+   ac_cv_sys_file_offset_bits=no
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 14279 "configure"
++#line 14297 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+  /* Check that off_t can represent 2**63 - 1 correctly.
+@@ -14296,16 +14314,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:14299: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:14317: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:14302: \$? = $ac_status" >&5
++  echo "$as_me:14320: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:14305: \"$ac_try\"") >&5
++  { (eval echo "$as_me:14323: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:14308: \$? = $ac_status" >&5
++  echo "$as_me:14326: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   break
+ else
+@@ -14314,7 +14332,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 14317 "configure"
++#line 14335 "configure"
+ #include "confdefs.h"
+ #define _FILE_OFFSET_BITS 64
+ #include <sys/types.h>
+@@ -14335,16 +14353,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:14338: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:14356: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:14341: \$? = $ac_status" >&5
++  echo "$as_me:14359: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:14344: \"$ac_try\"") >&5
++  { (eval echo "$as_me:14362: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:14347: \$? = $ac_status" >&5
++  echo "$as_me:14365: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_sys_file_offset_bits=64; break
+ else
+@@ -14355,7 +14373,7 @@
+   break
+ done
+ fi
+-echo "$as_me:14358: result: $ac_cv_sys_file_offset_bits" >&5
++echo "$as_me:14376: 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
+ 
+@@ -14365,7 +14383,7 @@
+ 
+ fi
+ rm -rf conftest*
+-  echo "$as_me:14368: checking for _LARGE_FILES value needed for large files" >&5
++  echo "$as_me:14386: 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
+@@ -14373,7 +14391,7 @@
+   while :; do
+   ac_cv_sys_large_files=no
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 14376 "configure"
++#line 14394 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+  /* Check that off_t can represent 2**63 - 1 correctly.
+@@ -14393,16 +14411,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:14396: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:14414: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:14399: \$? = $ac_status" >&5
++  echo "$as_me:14417: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:14402: \"$ac_try\"") >&5
++  { (eval echo "$as_me:14420: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:14405: \$? = $ac_status" >&5
++  echo "$as_me:14423: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   break
+ else
+@@ -14411,7 +14429,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 14414 "configure"
++#line 14432 "configure"
+ #include "confdefs.h"
+ #define _LARGE_FILES 1
+ #include <sys/types.h>
+@@ -14432,16 +14450,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:14435: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:14453: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:14438: \$? = $ac_status" >&5
++  echo "$as_me:14456: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:14441: \"$ac_try\"") >&5
++  { (eval echo "$as_me:14459: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:14444: \$? = $ac_status" >&5
++  echo "$as_me:14462: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_sys_large_files=1; break
+ else
+@@ -14452,7 +14470,7 @@
+   break
+ done
+ fi
+-echo "$as_me:14455: result: $ac_cv_sys_large_files" >&5
++echo "$as_me:14473: 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
+ 
+@@ -14465,7 +14483,7 @@
+ fi
+ 
+ 	if test "$enable_largefile" != no ; then
+-	echo "$as_me:14468: checking for _LARGEFILE_SOURCE value needed for large files" >&5
++	echo "$as_me:14486: 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
+@@ -14473,7 +14491,7 @@
+   while :; do
+   ac_cv_sys_largefile_source=no
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 14476 "configure"
++#line 14494 "configure"
+ #include "confdefs.h"
+ #include <stdio.h>
+ int
+@@ -14485,16 +14503,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:14488: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:14506: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:14491: \$? = $ac_status" >&5
++  echo "$as_me:14509: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:14494: \"$ac_try\"") >&5
++  { (eval echo "$as_me:14512: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:14497: \$? = $ac_status" >&5
++  echo "$as_me:14515: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   break
+ else
+@@ -14503,7 +14521,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 14506 "configure"
++#line 14524 "configure"
+ #include "confdefs.h"
+ #define _LARGEFILE_SOURCE 1
+ #include <stdio.h>
+@@ -14516,16 +14534,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:14519: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:14537: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:14522: \$? = $ac_status" >&5
++  echo "$as_me:14540: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:14525: \"$ac_try\"") >&5
++  { (eval echo "$as_me:14543: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:14528: \$? = $ac_status" >&5
++  echo "$as_me:14546: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_sys_largefile_source=1; break
+ else
+@@ -14536,7 +14554,7 @@
+   break
+ done
+ fi
+-echo "$as_me:14539: result: $ac_cv_sys_largefile_source" >&5
++echo "$as_me:14557: 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
+ 
+@@ -14550,13 +14568,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:14553: checking for fseeko" >&5
++echo "$as_me:14571: 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 14559 "configure"
++#line 14577 "configure"
+ #include "confdefs.h"
+ #include <stdio.h>
+ int
+@@ -14568,16 +14586,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:14571: \"$ac_link\"") >&5
++if { (eval echo "$as_me:14589: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:14574: \$? = $ac_status" >&5
++  echo "$as_me:14592: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:14577: \"$ac_try\"") >&5
++  { (eval echo "$as_me:14595: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:14580: \$? = $ac_status" >&5
++  echo "$as_me:14598: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_func_fseeko=yes
+ else
+@@ -14587,7 +14605,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:14590: result: $ac_cv_func_fseeko" >&5
++echo "$as_me:14608: result: $ac_cv_func_fseeko" >&5
+ echo "${ECHO_T}$ac_cv_func_fseeko" >&6
+ if test $ac_cv_func_fseeko = yes; then
+ 
+@@ -14626,14 +14644,14 @@
+ 
+ 	fi
+ 
+-	echo "$as_me:14629: checking whether to use struct dirent64" >&5
++	echo "$as_me:14647: 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 14636 "configure"
++#line 14654 "configure"
+ #include "confdefs.h"
+ 
+ #pragma GCC diagnostic error "-Wincompatible-pointer-types"
+@@ -14656,16 +14674,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:14659: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:14677: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:14662: \$? = $ac_status" >&5
++  echo "$as_me:14680: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:14665: \"$ac_try\"") >&5
++  { (eval echo "$as_me:14683: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:14668: \$? = $ac_status" >&5
++  echo "$as_me:14686: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_struct_dirent64=yes
+ else
+@@ -14676,7 +14694,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:14679: result: $cf_cv_struct_dirent64" >&5
++echo "$as_me:14697: result: $cf_cv_struct_dirent64" >&5
+ echo "${ECHO_T}$cf_cv_struct_dirent64" >&6
+ 	test "$cf_cv_struct_dirent64" = yes &&
+ cat >>confdefs.h <<\EOF
+@@ -14686,7 +14704,7 @@
+ 	fi
+ 
+ ### Enable compiling-in rcs id's
+-echo "$as_me:14689: checking if RCS identifiers should be compiled-in" >&5
++echo "$as_me:14707: 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.
+@@ -14696,7 +14714,7 @@
+ else
+   with_rcs_ids=no
+ fi;
+-echo "$as_me:14699: result: $with_rcs_ids" >&5
++echo "$as_me:14717: result: $with_rcs_ids" >&5
+ echo "${ECHO_T}$with_rcs_ids" >&6
+ test "$with_rcs_ids" = yes &&
+ cat >>confdefs.h <<\EOF
+@@ -14706,7 +14724,7 @@
+ ###############################################################################
+ 
+ ### Note that some functions (such as const) are normally disabled anyway.
+-echo "$as_me:14709: checking if you want to build with function extensions" >&5
++echo "$as_me:14727: 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.
+@@ -14716,7 +14734,7 @@
+ else
+   with_ext_funcs=yes
+ fi;
+-echo "$as_me:14719: result: $with_ext_funcs" >&5
++echo "$as_me:14737: result: $with_ext_funcs" >&5
+ echo "${ECHO_T}$with_ext_funcs" >&6
+ if test "$with_ext_funcs" = yes ; then
+ 	NCURSES_EXT_FUNCS=1
+@@ -14734,7 +14752,7 @@
+ fi
+ 
+ ###   use option --enable-const to turn on use of const beyond that in XSI.
+-echo "$as_me:14737: checking for extended use of const keyword" >&5
++echo "$as_me:14755: 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.
+@@ -14744,7 +14762,7 @@
+ else
+   with_ext_const=no
+ fi;
+-echo "$as_me:14747: result: $with_ext_const" >&5
++echo "$as_me:14765: result: $with_ext_const" >&5
+ echo "${ECHO_T}$with_ext_const" >&6
+ NCURSES_CONST='/*nothing*/'
+ if test "$with_ext_const" = yes ; then
+@@ -14754,7 +14772,7 @@
+ ###############################################################################
+ # These options are relatively safe to experiment with.
+ 
+-echo "$as_me:14757: checking if you want all development code" >&5
++echo "$as_me:14775: 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.
+@@ -14764,7 +14782,7 @@
+ else
+   with_develop=no
+ fi;
+-echo "$as_me:14767: result: $with_develop" >&5
++echo "$as_me:14785: result: $with_develop" >&5
+ echo "${ECHO_T}$with_develop" >&6
+ 
+ ###############################################################################
+@@ -14773,7 +14791,7 @@
+ # This is still experimental (20080329), but should ultimately be moved to
+ # the script-block --with-normal, etc.
+ 
+-echo "$as_me:14776: checking if you want to link with the pthread library" >&5
++echo "$as_me:14794: 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.
+@@ -14783,27 +14801,27 @@
+ else
+   with_pthread=no
+ fi;
+-echo "$as_me:14786: result: $with_pthread" >&5
++echo "$as_me:14804: result: $with_pthread" >&5
+ echo "${ECHO_T}$with_pthread" >&6
+ 
+ if test "$with_pthread" != no ; then
+-	echo "$as_me:14790: checking for pthread.h" >&5
++	echo "$as_me:14808: 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 14796 "configure"
++#line 14814 "configure"
+ #include "confdefs.h"
+ #include <pthread.h>
+ _ACEOF
+-if { (eval echo "$as_me:14800: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:14818: \"$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:14806: \$? = $ac_status" >&5
++  echo "$as_me:14824: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -14822,7 +14840,7 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:14825: result: $ac_cv_header_pthread_h" >&5
++echo "$as_me:14843: 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
+ 
+@@ -14832,7 +14850,7 @@
+ 
+ 	for cf_lib_pthread in pthread c_r
+ 	do
+-	    echo "$as_me:14835: checking if we can link with the $cf_lib_pthread library" >&5
++	    echo "$as_me:14853: 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"
+ 
+@@ -14853,7 +14871,7 @@
+ LIBS="$cf_add_libs"
+ 
+ 	    cat >"conftest.$ac_ext" <<_ACEOF
+-#line 14856 "configure"
++#line 14874 "configure"
+ #include "confdefs.h"
+ 
+ #include <pthread.h>
+@@ -14870,16 +14888,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:14873: \"$ac_link\"") >&5
++if { (eval echo "$as_me:14891: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:14876: \$? = $ac_status" >&5
++  echo "$as_me:14894: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:14879: \"$ac_try\"") >&5
++  { (eval echo "$as_me:14897: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:14882: \$? = $ac_status" >&5
++  echo "$as_me:14900: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   with_pthread=yes
+ else
+@@ -14889,7 +14907,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ 	    LIBS="$cf_save_LIBS"
+-	    echo "$as_me:14892: result: $with_pthread" >&5
++	    echo "$as_me:14910: result: $with_pthread" >&5
+ echo "${ECHO_T}$with_pthread" >&6
+ 	    test "$with_pthread" = yes && break
+ 	done
+@@ -14917,7 +14935,7 @@
+ EOF
+ 
+ 	else
+-	    { { echo "$as_me:14920: error: Cannot link with pthread library" >&5
++	    { { echo "$as_me:14938: error: Cannot link with pthread library" >&5
+ echo "$as_me: error: Cannot link with pthread library" >&2;}
+    { (exit 1); exit 1; }; }
+ 	fi
+@@ -14926,7 +14944,7 @@
+ 
+ fi
+ 
+-echo "$as_me:14929: checking if you want to use weak-symbols for pthreads" >&5
++echo "$as_me:14947: 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.
+@@ -14936,18 +14954,18 @@
+ else
+   use_weak_symbols=no
+ fi;
+-echo "$as_me:14939: result: $use_weak_symbols" >&5
++echo "$as_me:14957: result: $use_weak_symbols" >&5
+ echo "${ECHO_T}$use_weak_symbols" >&6
+ if test "$use_weak_symbols" = yes ; then
+ 
+-echo "$as_me:14943: checking if $CC supports weak symbols" >&5
++echo "$as_me:14961: 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 14950 "configure"
++#line 14968 "configure"
+ #include "confdefs.h"
+ 
+ #include <stdio.h>
+@@ -14973,16 +14991,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:14976: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:14994: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:14979: \$? = $ac_status" >&5
++  echo "$as_me:14997: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:14982: \"$ac_try\"") >&5
++  { (eval echo "$as_me:15000: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:14985: \$? = $ac_status" >&5
++  echo "$as_me:15003: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_weak_symbols=yes
+ else
+@@ -14993,7 +15011,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:14996: result: $cf_cv_weak_symbols" >&5
++echo "$as_me:15014: result: $cf_cv_weak_symbols" >&5
+ echo "${ECHO_T}$cf_cv_weak_symbols" >&6
+ 
+ else
+@@ -15022,13 +15040,13 @@
+ fi
+ 
+ # OpenSUSE is installing ncurses6, using reentrant option.
+-echo "$as_me:15025: checking for _nc_TABSIZE" >&5
++echo "$as_me:15043: 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 15031 "configure"
++#line 15049 "configure"
+ #include "confdefs.h"
+ #define _nc_TABSIZE autoconf_temporary
+ #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -15059,16 +15077,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:15062: \"$ac_link\"") >&5
++if { (eval echo "$as_me:15080: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:15065: \$? = $ac_status" >&5
++  echo "$as_me:15083: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:15068: \"$ac_try\"") >&5
++  { (eval echo "$as_me:15086: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:15071: \$? = $ac_status" >&5
++  echo "$as_me:15089: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_func__nc_TABSIZE=yes
+ else
+@@ -15078,7 +15096,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:15081: result: $ac_cv_func__nc_TABSIZE" >&5
++echo "$as_me:15099: 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
+@@ -15090,7 +15108,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:15093: checking if you want experimental reentrant code" >&5
++echo "$as_me:15111: 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.
+@@ -15100,7 +15118,7 @@
+ else
+   with_reentrant=$assume_reentrant
+ fi;
+-echo "$as_me:15103: result: $with_reentrant" >&5
++echo "$as_me:15121: result: $with_reentrant" >&5
+ echo "${ECHO_T}$with_reentrant" >&6
+ if test "$with_reentrant" = yes ; then
+ 	cf_cv_enable_reentrant=1
+@@ -15123,7 +15141,7 @@
+ 
+ ### Allow using a different wrap-prefix
+ if test "$cf_cv_enable_reentrant" != 0 || test "$BROKEN_LINKER" = 1 ; then
+-	echo "$as_me:15126: checking for prefix used to wrap public variables" >&5
++	echo "$as_me:15144: 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.
+@@ -15133,7 +15151,7 @@
+ else
+   NCURSES_WRAP_PREFIX=_nc_
+ fi;
+-	echo "$as_me:15136: result: $NCURSES_WRAP_PREFIX" >&5
++	echo "$as_me:15154: result: $NCURSES_WRAP_PREFIX" >&5
+ echo "${ECHO_T}$NCURSES_WRAP_PREFIX" >&6
+ else
+ 	NCURSES_WRAP_PREFIX=_nc_
+@@ -15147,7 +15165,7 @@
+ 
+ ###	use option --disable-echo to suppress full display compiling commands
+ 
+-echo "$as_me:15150: checking if you want to see long compiling messages" >&5
++echo "$as_me:15168: 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.
+@@ -15181,10 +15199,10 @@
+ 	ECHO_CC=''
+ 
+ fi;
+-echo "$as_me:15184: result: $enableval" >&5
++echo "$as_me:15202: result: $enableval" >&5
+ echo "${ECHO_T}$enableval" >&6
+ 
+-echo "$as_me:15187: checking if you want to use C11 _Noreturn feature" >&5
++echo "$as_me:15205: 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.
+@@ -15201,17 +15219,17 @@
+ 	enable_stdnoreturn=no
+ 
+ fi;
+-echo "$as_me:15204: result: $enable_stdnoreturn" >&5
++echo "$as_me:15222: result: $enable_stdnoreturn" >&5
+ echo "${ECHO_T}$enable_stdnoreturn" >&6
+ 
+ if test $enable_stdnoreturn = yes; then
+-echo "$as_me:15208: checking for C11 _Noreturn feature" >&5
++echo "$as_me:15226: 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 15214 "configure"
++#line 15232 "configure"
+ #include "confdefs.h"
+ 
+ #include <stdio.h>
+@@ -15228,16 +15246,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:15231: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:15249: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:15234: \$? = $ac_status" >&5
++  echo "$as_me:15252: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:15237: \"$ac_try\"") >&5
++  { (eval echo "$as_me:15255: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:15240: \$? = $ac_status" >&5
++  echo "$as_me:15258: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_c11_noreturn=yes
+ else
+@@ -15248,7 +15266,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:15251: result: $cf_cv_c11_noreturn" >&5
++echo "$as_me:15269: result: $cf_cv_c11_noreturn" >&5
+ echo "${ECHO_T}$cf_cv_c11_noreturn" >&6
+ else
+ 	cf_cv_c11_noreturn=no,
+@@ -15278,7 +15296,7 @@
+ 	(*-Werror=*)
+ 		test -n "$verbose" && echo "	repairing CFLAGS: $CFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:15281: testing repairing CFLAGS: $CFLAGS ..." 1>&5
++echo "${as_me:-configure}:15299: testing repairing CFLAGS: $CFLAGS ..." 1>&5
+ 
+ 		cf_temp_flags=
+ 		for cf_temp_scan in $CFLAGS
+@@ -15301,11 +15319,11 @@
+ 		CFLAGS="$cf_temp_flags"
+ 		test -n "$verbose" && echo "	... fixed $CFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:15304: testing ... fixed $CFLAGS ..." 1>&5
++echo "${as_me:-configure}:15322: testing ... fixed $CFLAGS ..." 1>&5
+ 
+ 		test -n "$verbose" && echo "	... extra $EXTRA_CFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:15308: testing ... extra $EXTRA_CFLAGS ..." 1>&5
++echo "${as_me:-configure}:15326: testing ... extra $EXTRA_CFLAGS ..." 1>&5
+ 
+ 		;;
+ 	esac
+@@ -15317,7 +15335,7 @@
+ 	(*-Werror=*)
+ 		test -n "$verbose" && echo "	repairing CPPFLAGS: $CPPFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:15320: testing repairing CPPFLAGS: $CPPFLAGS ..." 1>&5
++echo "${as_me:-configure}:15338: testing repairing CPPFLAGS: $CPPFLAGS ..." 1>&5
+ 
+ 		cf_temp_flags=
+ 		for cf_temp_scan in $CPPFLAGS
+@@ -15340,11 +15358,11 @@
+ 		CPPFLAGS="$cf_temp_flags"
+ 		test -n "$verbose" && echo "	... fixed $CPPFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:15343: testing ... fixed $CPPFLAGS ..." 1>&5
++echo "${as_me:-configure}:15361: testing ... fixed $CPPFLAGS ..." 1>&5
+ 
+ 		test -n "$verbose" && echo "	... extra $EXTRA_CFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:15347: testing ... extra $EXTRA_CFLAGS ..." 1>&5
++echo "${as_me:-configure}:15365: testing ... extra $EXTRA_CFLAGS ..." 1>&5
+ 
+ 		;;
+ 	esac
+@@ -15356,7 +15374,7 @@
+ 	(*-Werror=*)
+ 		test -n "$verbose" && echo "	repairing LDFLAGS: $LDFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:15359: testing repairing LDFLAGS: $LDFLAGS ..." 1>&5
++echo "${as_me:-configure}:15377: testing repairing LDFLAGS: $LDFLAGS ..." 1>&5
+ 
+ 		cf_temp_flags=
+ 		for cf_temp_scan in $LDFLAGS
+@@ -15379,17 +15397,17 @@
+ 		LDFLAGS="$cf_temp_flags"
+ 		test -n "$verbose" && echo "	... fixed $LDFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:15382: testing ... fixed $LDFLAGS ..." 1>&5
++echo "${as_me:-configure}:15400: testing ... fixed $LDFLAGS ..." 1>&5
+ 
+ 		test -n "$verbose" && echo "	... extra $EXTRA_CFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:15386: testing ... extra $EXTRA_CFLAGS ..." 1>&5
++echo "${as_me:-configure}:15404: testing ... extra $EXTRA_CFLAGS ..." 1>&5
+ 
+ 		;;
+ 	esac
+ fi
+ 
+-echo "$as_me:15392: checking if you want to turn on gcc warnings" >&5
++echo "$as_me:15410: 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.
+@@ -15406,7 +15424,7 @@
+ 	enable_warnings=no
+ 
+ fi;
+-echo "$as_me:15409: result: $enable_warnings" >&5
++echo "$as_me:15427: result: $enable_warnings" >&5
+ echo "${ECHO_T}$enable_warnings" >&6
+ if test "$enable_warnings" = "yes"
+ then
+@@ -15430,7 +15448,7 @@
+ done
+ 
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 15433 "configure"
++#line 15451 "configure"
+ #include "confdefs.h"
+ 
+ #include <stdlib.h>
+@@ -15445,26 +15463,26 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:15448: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:15466: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:15451: \$? = $ac_status" >&5
++  echo "$as_me:15469: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:15454: \"$ac_try\"") >&5
++  { (eval echo "$as_me:15472: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:15457: \$? = $ac_status" >&5
++  echo "$as_me:15475: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+ 
+-echo "$as_me:15460: checking for X11/Xt const-feature" >&5
++echo "$as_me:15478: 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 15467 "configure"
++#line 15485 "configure"
+ #include "confdefs.h"
+ 
+ #define _CONST_X_STRING	/* X11R7.8 (perhaps) */
+@@ -15481,16 +15499,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:15484: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:15502: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:15487: \$? = $ac_status" >&5
++  echo "$as_me:15505: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:15490: \"$ac_try\"") >&5
++  { (eval echo "$as_me:15508: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:15493: \$? = $ac_status" >&5
++  echo "$as_me:15511: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+ 
+ 			cf_cv_const_x_string=no
+@@ -15505,7 +15523,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:15508: result: $cf_cv_const_x_string" >&5
++echo "$as_me:15526: result: $cf_cv_const_x_string" >&5
+ echo "${ECHO_T}$cf_cv_const_x_string" >&6
+ 
+ LIBS="$cf_save_LIBS_CF_CONST_X_STRING"
+@@ -15534,7 +15552,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+  fi
+ cat > "conftest.$ac_ext" <<EOF
+-#line 15537 "${as_me:-configure}"
++#line 15555 "${as_me:-configure}"
+ int main(int argc, char *argv[]) { return (argv[argc-1] == 0) ; }
+ EOF
+ if test "$INTEL_COMPILER" = yes
+@@ -15550,7 +15568,7 @@
+ # remark #981: operands are evaluated in unspecified order
+ # warning #279: controlling expression is constant
+ 
+-	{ echo "$as_me:15553: checking for $CC warning options..." >&5
++	{ echo "$as_me:15571: checking for $CC warning options..." >&5
+ echo "$as_me: checking for $CC warning options..." >&6;}
+ 	cf_save_CFLAGS="$CFLAGS"
+ 	EXTRA_CFLAGS="$EXTRA_CFLAGS -Wall"
+@@ -15566,12 +15584,12 @@
+ 		wd981
+ 	do
+ 		CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt"
+-		if { (eval echo "$as_me:15569: \"$ac_compile\"") >&5
++		if { (eval echo "$as_me:15587: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:15572: \$? = $ac_status" >&5
++  echo "$as_me:15590: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; then
+-			test -n "$verbose" && echo "$as_me:15574: result: ... -$cf_opt" >&5
++			test -n "$verbose" && echo "$as_me:15592: result: ... -$cf_opt" >&5
+ echo "${ECHO_T}... -$cf_opt" >&6
+ 			EXTRA_CFLAGS="$EXTRA_CFLAGS -$cf_opt"
+ 		fi
+@@ -15579,7 +15597,7 @@
+ 	CFLAGS="$cf_save_CFLAGS"
+ elif test "$GCC" = yes && test "$GCC_VERSION" != "unknown"
+ then
+-	{ echo "$as_me:15582: checking for $CC warning options..." >&5
++	{ echo "$as_me:15600: checking for $CC warning options..." >&5
+ echo "$as_me: checking for $CC warning options..." >&6;}
+ 	cf_save_CFLAGS="$CFLAGS"
+ 	cf_warn_CONST=""
+@@ -15602,12 +15620,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:15605: \"$ac_compile\"") >&5
++		if { (eval echo "$as_me:15623: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:15608: \$? = $ac_status" >&5
++  echo "$as_me:15626: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; then
+-			test -n "$verbose" && echo "$as_me:15610: result: ... -$cf_opt" >&5
++			test -n "$verbose" && echo "$as_me:15628: result: ... -$cf_opt" >&5
+ echo "${ECHO_T}... -$cf_opt" >&6
+ 			case "$cf_opt" in
+ 			(Winline)
+@@ -15615,7 +15633,7 @@
+ 				([34].*)
+ 					test -n "$verbose" && echo "	feature is broken in gcc $GCC_VERSION" 1>&6
+ 
+-echo "${as_me:-configure}:15618: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
++echo "${as_me:-configure}:15636: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
+ 
+ 					continue;;
+ 				esac
+@@ -15625,7 +15643,7 @@
+ 				([12].*)
+ 					test -n "$verbose" && echo "	feature is broken in gcc $GCC_VERSION" 1>&6
+ 
+-echo "${as_me:-configure}:15628: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
++echo "${as_me:-configure}:15646: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
+ 
+ 					continue;;
+ 				esac
+@@ -15658,10 +15676,10 @@
+ EOF
+ if test "$GCC" = yes
+ then
+-	{ echo "$as_me:15661: checking for $CC __attribute__ directives..." >&5
++	{ echo "$as_me:15679: checking for $CC __attribute__ directives..." >&5
+ echo "$as_me: checking for $CC __attribute__ directives..." >&6;}
+ cat > "conftest.$ac_ext" <<EOF
+-#line 15664 "${as_me:-configure}"
++#line 15682 "${as_me:-configure}"
+ #include "confdefs.h"
+ #include "conftest.h"
+ #include "conftest.i"
+@@ -15710,12 +15728,12 @@
+ 			;;
+ 		esac
+ 
+-		if { (eval echo "$as_me:15713: \"$ac_compile\"") >&5
++		if { (eval echo "$as_me:15731: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:15716: \$? = $ac_status" >&5
++  echo "$as_me:15734: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; then
+-			test -n "$verbose" && echo "$as_me:15718: result: ... $cf_attribute" >&5
++			test -n "$verbose" && echo "$as_me:15736: result: ... $cf_attribute" >&5
+ echo "${ECHO_T}... $cf_attribute" >&6
+ 			cat conftest.h >>confdefs.h
+ 			case "$cf_attribute" in
+@@ -15783,7 +15801,7 @@
+ fi
+ 
+ ###	use option --enable-assertions to turn on generation of assertion code
+-echo "$as_me:15786: checking if you want to enable runtime assertions" >&5
++echo "$as_me:15804: 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.
+@@ -15793,7 +15811,7 @@
+ else
+   with_assertions=no
+ fi;
+-echo "$as_me:15796: result: $with_assertions" >&5
++echo "$as_me:15814: result: $with_assertions" >&5
+ echo "${ECHO_T}$with_assertions" >&6
+ if test -n "$GCC"
+ then
+@@ -15846,7 +15864,7 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:15849: checking whether to add trace feature to all models" >&5
++echo "$as_me:15867: 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.
+@@ -15856,7 +15874,7 @@
+ else
+   cf_with_trace=$cf_all_traces
+ fi;
+-echo "$as_me:15859: result: $cf_with_trace" >&5
++echo "$as_me:15877: result: $cf_with_trace" >&5
+ echo "${ECHO_T}$cf_with_trace" >&6
+ 
+ if test "$cf_with_trace" = yes ; then
+@@ -15964,7 +15982,7 @@
+ 	ADA_TRACE=FALSE
+ fi
+ 
+-echo "$as_me:15967: checking if we want to use GNAT projects" >&5
++echo "$as_me:15985: 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.
+@@ -15981,21 +15999,21 @@
+ 	enable_gnat_projects=yes
+ 
+ fi;
+-echo "$as_me:15984: result: $enable_gnat_projects" >&5
++echo "$as_me:16002: 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:15991: checking if ssp library is needed" >&5
++echo "$as_me:16009: 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 15998 "configure"
++#line 16016 "configure"
+ #include "confdefs.h"
+ 
+ #include <sys/types.h>
+@@ -16012,16 +16030,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:16015: \"$ac_link\"") >&5
++if { (eval echo "$as_me:16033: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:16018: \$? = $ac_status" >&5
++  echo "$as_me:16036: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:16021: \"$ac_try\"") >&5
++  { (eval echo "$as_me:16039: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:16024: \$? = $ac_status" >&5
++  echo "$as_me:16042: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_need_libssp=no
+ else
+@@ -16031,7 +16049,7 @@
+ 	cf_save_LIBS="$LIBS"
+ 	LIBS="$LIBS -lssp"
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 16034 "configure"
++#line 16052 "configure"
+ #include "confdefs.h"
+ 
+ #include <sys/types.h>
+@@ -16048,16 +16066,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:16051: \"$ac_link\"") >&5
++if { (eval echo "$as_me:16069: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:16054: \$? = $ac_status" >&5
++  echo "$as_me:16072: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:16057: \"$ac_try\"") >&5
++  { (eval echo "$as_me:16075: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:16060: \$? = $ac_status" >&5
++  echo "$as_me:16078: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_need_libssp=yes
+ else
+@@ -16071,7 +16089,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:16074: result: $cf_cv_need_libssp" >&5
++echo "$as_me:16092: result: $cf_cv_need_libssp" >&5
+ echo "${ECHO_T}$cf_cv_need_libssp" >&6
+ 
+ if test "x$cf_cv_need_libssp" = xyes
+@@ -16097,13 +16115,13 @@
+ 
+ 	;;
+ (*)
+-echo "$as_me:16100: checking for gettimeofday" >&5
++echo "$as_me:16118: 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 16106 "configure"
++#line 16124 "configure"
+ #include "confdefs.h"
+ #define gettimeofday autoconf_temporary
+ #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -16134,16 +16152,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:16137: \"$ac_link\"") >&5
++if { (eval echo "$as_me:16155: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:16140: \$? = $ac_status" >&5
++  echo "$as_me:16158: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:16143: \"$ac_try\"") >&5
++  { (eval echo "$as_me:16161: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:16146: \$? = $ac_status" >&5
++  echo "$as_me:16164: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_func_gettimeofday=yes
+ else
+@@ -16153,7 +16171,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:16156: result: $ac_cv_func_gettimeofday" >&5
++echo "$as_me:16174: 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
+@@ -16162,7 +16180,7 @@
+ 
+ else
+ 
+-echo "$as_me:16165: checking for gettimeofday in -lbsd" >&5
++echo "$as_me:16183: 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
+@@ -16170,7 +16188,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lbsd  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 16173 "configure"
++#line 16191 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -16189,16 +16207,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:16192: \"$ac_link\"") >&5
++if { (eval echo "$as_me:16210: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:16195: \$? = $ac_status" >&5
++  echo "$as_me:16213: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:16198: \"$ac_try\"") >&5
++  { (eval echo "$as_me:16216: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:16201: \$? = $ac_status" >&5
++  echo "$as_me:16219: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_bsd_gettimeofday=yes
+ else
+@@ -16209,7 +16227,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:16212: result: $ac_cv_lib_bsd_gettimeofday" >&5
++echo "$as_me:16230: 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
+ 
+@@ -16225,13 +16243,13 @@
+ esac
+ 
+ ###	Checks for header files.
+-echo "$as_me:16228: checking for ANSI C header files" >&5
++echo "$as_me:16246: 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 16234 "configure"
++#line 16252 "configure"
+ #include "confdefs.h"
+ #include <stdlib.h>
+ #include <stdarg.h>
+@@ -16239,13 +16257,13 @@
+ #include <float.h>
+ 
+ _ACEOF
+-if { (eval echo "$as_me:16242: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:16260: \"$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:16248: \$? = $ac_status" >&5
++  echo "$as_me:16266: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -16267,7 +16285,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 16270 "configure"
++#line 16288 "configure"
+ #include "confdefs.h"
+ #include <string.h>
+ 
+@@ -16285,7 +16303,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 16288 "configure"
++#line 16306 "configure"
+ #include "confdefs.h"
+ #include <stdlib.h>
+ 
+@@ -16306,7 +16324,7 @@
+   :
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 16309 "configure"
++#line 16327 "configure"
+ #include "confdefs.h"
+ #include <ctype.h>
+ #if ((' ' & 0x0FF) == 0x020)
+@@ -16332,15 +16350,15 @@
+ }
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:16335: \"$ac_link\"") >&5
++if { (eval echo "$as_me:16353: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:16338: \$? = $ac_status" >&5
++  echo "$as_me:16356: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:16340: \"$ac_try\"") >&5
++  { (eval echo "$as_me:16358: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:16343: \$? = $ac_status" >&5
++  echo "$as_me:16361: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   :
+ else
+@@ -16353,7 +16371,7 @@
+ fi
+ fi
+ fi
+-echo "$as_me:16356: result: $ac_cv_header_stdc" >&5
++echo "$as_me:16374: result: $ac_cv_header_stdc" >&5
+ echo "${ECHO_T}$ac_cv_header_stdc" >&6
+ if test $ac_cv_header_stdc = yes; then
+ 
+@@ -16369,28 +16387,28 @@
+                   inttypes.h stdint.h unistd.h
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-echo "$as_me:16372: checking for $ac_header" >&5
++echo "$as_me:16390: 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 16378 "configure"
++#line 16396 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ #include <$ac_header>
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:16384: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:16402: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:16387: \$? = $ac_status" >&5
++  echo "$as_me:16405: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:16390: \"$ac_try\"") >&5
++  { (eval echo "$as_me:16408: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:16393: \$? = $ac_status" >&5
++  echo "$as_me:16411: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   eval "$as_ac_Header=yes"
+ else
+@@ -16400,7 +16418,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:16403: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
++echo "$as_me:16421: 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
+@@ -16410,13 +16428,13 @@
+ fi
+ done
+ 
+-echo "$as_me:16413: checking for signed char" >&5
++echo "$as_me:16431: 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 16419 "configure"
++#line 16437 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -16431,16 +16449,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:16434: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:16452: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:16437: \$? = $ac_status" >&5
++  echo "$as_me:16455: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:16440: \"$ac_try\"") >&5
++  { (eval echo "$as_me:16458: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:16443: \$? = $ac_status" >&5
++  echo "$as_me:16461: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_type_signed_char=yes
+ else
+@@ -16450,10 +16468,10 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:16453: result: $ac_cv_type_signed_char" >&5
++echo "$as_me:16471: result: $ac_cv_type_signed_char" >&5
+ echo "${ECHO_T}$ac_cv_type_signed_char" >&6
+ 
+-echo "$as_me:16456: checking size of signed char" >&5
++echo "$as_me:16474: 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
+@@ -16462,7 +16480,7 @@
+   if test "$cross_compiling" = yes; then
+   # Depending upon the size, compute the lo and hi bounds.
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 16465 "configure"
++#line 16483 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -16474,21 +16492,21 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:16477: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:16495: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:16480: \$? = $ac_status" >&5
++  echo "$as_me:16498: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:16483: \"$ac_try\"") >&5
++  { (eval echo "$as_me:16501: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:16486: \$? = $ac_status" >&5
++  echo "$as_me:16504: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_lo=0 ac_mid=0
+   while :; do
+     cat >"conftest.$ac_ext" <<_ACEOF
+-#line 16491 "configure"
++#line 16509 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -16500,16 +16518,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:16503: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:16521: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:16506: \$? = $ac_status" >&5
++  echo "$as_me:16524: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:16509: \"$ac_try\"") >&5
++  { (eval echo "$as_me:16527: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:16512: \$? = $ac_status" >&5
++  echo "$as_me:16530: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_hi=$ac_mid; break
+ else
+@@ -16525,7 +16543,7 @@
+ ac_hi=-1 ac_mid=-1
+   while :; do
+     cat >"conftest.$ac_ext" <<_ACEOF
+-#line 16528 "configure"
++#line 16546 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -16537,16 +16555,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:16540: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:16558: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:16543: \$? = $ac_status" >&5
++  echo "$as_me:16561: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:16546: \"$ac_try\"") >&5
++  { (eval echo "$as_me:16564: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:16549: \$? = $ac_status" >&5
++  echo "$as_me:16567: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_lo=$ac_mid; break
+ else
+@@ -16562,7 +16580,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 16565 "configure"
++#line 16583 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -16574,16 +16592,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:16577: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:16595: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:16580: \$? = $ac_status" >&5
++  echo "$as_me:16598: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:16583: \"$ac_try\"") >&5
++  { (eval echo "$as_me:16601: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:16586: \$? = $ac_status" >&5
++  echo "$as_me:16604: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_hi=$ac_mid
+ else
+@@ -16596,12 +16614,12 @@
+ ac_cv_sizeof_signed_char=$ac_lo
+ else
+   if test "$cross_compiling" = yes; then
+-  { { echo "$as_me:16599: error: cannot run test program while cross compiling" >&5
++  { { echo "$as_me:16617: 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 16604 "configure"
++#line 16622 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -16617,15 +16635,15 @@
+ }
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:16620: \"$ac_link\"") >&5
++if { (eval echo "$as_me:16638: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:16623: \$? = $ac_status" >&5
++  echo "$as_me:16641: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:16625: \"$ac_try\"") >&5
++  { (eval echo "$as_me:16643: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:16628: \$? = $ac_status" >&5
++  echo "$as_me:16646: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_sizeof_signed_char=`cat conftest.val`
+ else
+@@ -16641,19 +16659,19 @@
+   ac_cv_sizeof_signed_char=0
+ fi
+ fi
+-echo "$as_me:16644: result: $ac_cv_sizeof_signed_char" >&5
++echo "$as_me:16662: 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:16650: checking for ANSI C header files" >&5
++echo "$as_me:16668: 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 16656 "configure"
++#line 16674 "configure"
+ #include "confdefs.h"
+ #include <stdlib.h>
+ #include <stdarg.h>
+@@ -16661,13 +16679,13 @@
+ #include <float.h>
+ 
+ _ACEOF
+-if { (eval echo "$as_me:16664: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:16682: \"$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:16670: \$? = $ac_status" >&5
++  echo "$as_me:16688: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -16689,7 +16707,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 16692 "configure"
++#line 16710 "configure"
+ #include "confdefs.h"
+ #include <string.h>
+ 
+@@ -16707,7 +16725,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 16710 "configure"
++#line 16728 "configure"
+ #include "confdefs.h"
+ #include <stdlib.h>
+ 
+@@ -16728,7 +16746,7 @@
+   :
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 16731 "configure"
++#line 16749 "configure"
+ #include "confdefs.h"
+ #include <ctype.h>
+ #if ((' ' & 0x0FF) == 0x020)
+@@ -16754,15 +16772,15 @@
+ }
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:16757: \"$ac_link\"") >&5
++if { (eval echo "$as_me:16775: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:16760: \$? = $ac_status" >&5
++  echo "$as_me:16778: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:16762: \"$ac_try\"") >&5
++  { (eval echo "$as_me:16780: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:16765: \$? = $ac_status" >&5
++  echo "$as_me:16783: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   :
+ else
+@@ -16775,7 +16793,7 @@
+ fi
+ fi
+ fi
+-echo "$as_me:16778: result: $ac_cv_header_stdc" >&5
++echo "$as_me:16796: result: $ac_cv_header_stdc" >&5
+ echo "${ECHO_T}$ac_cv_header_stdc" >&6
+ if test $ac_cv_header_stdc = yes; then
+ 
+@@ -16788,13 +16806,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:16791: checking for $ac_hdr that defines DIR" >&5
++echo "$as_me:16809: 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 16797 "configure"
++#line 16815 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ #include <$ac_hdr>
+@@ -16809,16 +16827,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:16812: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:16830: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:16815: \$? = $ac_status" >&5
++  echo "$as_me:16833: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:16818: \"$ac_try\"") >&5
++  { (eval echo "$as_me:16836: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:16821: \$? = $ac_status" >&5
++  echo "$as_me:16839: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   eval "$as_ac_Header=yes"
+ else
+@@ -16828,7 +16846,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:16831: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
++echo "$as_me:16849: 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
+@@ -16841,7 +16859,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:16844: checking for opendir in -ldir" >&5
++  echo "$as_me:16862: 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
+@@ -16849,7 +16867,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-ldir  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 16852 "configure"
++#line 16870 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -16868,16 +16886,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:16871: \"$ac_link\"") >&5
++if { (eval echo "$as_me:16889: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:16874: \$? = $ac_status" >&5
++  echo "$as_me:16892: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:16877: \"$ac_try\"") >&5
++  { (eval echo "$as_me:16895: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:16880: \$? = $ac_status" >&5
++  echo "$as_me:16898: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_dir_opendir=yes
+ else
+@@ -16888,14 +16906,14 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:16891: result: $ac_cv_lib_dir_opendir" >&5
++echo "$as_me:16909: 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:16898: checking for opendir in -lx" >&5
++  echo "$as_me:16916: 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
+@@ -16903,7 +16921,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lx  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 16906 "configure"
++#line 16924 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -16922,16 +16940,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:16925: \"$ac_link\"") >&5
++if { (eval echo "$as_me:16943: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:16928: \$? = $ac_status" >&5
++  echo "$as_me:16946: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:16931: \"$ac_try\"") >&5
++  { (eval echo "$as_me:16949: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:16934: \$? = $ac_status" >&5
++  echo "$as_me:16952: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_x_opendir=yes
+ else
+@@ -16942,7 +16960,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:16945: result: $ac_cv_lib_x_opendir" >&5
++echo "$as_me:16963: 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"
+@@ -16950,13 +16968,13 @@
+ 
+ fi
+ 
+-echo "$as_me:16953: checking whether time.h and sys/time.h may both be included" >&5
++echo "$as_me:16971: 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 16959 "configure"
++#line 16977 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ #include <sys/time.h>
+@@ -16972,16 +16990,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:16975: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:16993: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:16978: \$? = $ac_status" >&5
++  echo "$as_me:16996: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:16981: \"$ac_try\"") >&5
++  { (eval echo "$as_me:16999: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:16984: \$? = $ac_status" >&5
++  echo "$as_me:17002: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_header_time=yes
+ else
+@@ -16991,7 +17009,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:16994: result: $ac_cv_header_time" >&5
++echo "$as_me:17012: result: $ac_cv_header_time" >&5
+ echo "${ECHO_T}$ac_cv_header_time" >&6
+ if test $ac_cv_header_time = yes; then
+ 
+@@ -17009,13 +17027,13 @@
+ ac_compiler_gnu=$ac_cv_c_compiler_gnu
+ ac_main_return="return"
+ 
+-echo "$as_me:17012: checking for an ANSI C-conforming const" >&5
++echo "$as_me:17030: 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 17018 "configure"
++#line 17036 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -17073,16 +17091,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:17076: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:17094: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:17079: \$? = $ac_status" >&5
++  echo "$as_me:17097: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:17082: \"$ac_try\"") >&5
++  { (eval echo "$as_me:17100: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:17085: \$? = $ac_status" >&5
++  echo "$as_me:17103: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_c_const=yes
+ else
+@@ -17092,7 +17110,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:17095: result: $ac_cv_c_const" >&5
++echo "$as_me:17113: result: $ac_cv_c_const" >&5
+ echo "${ECHO_T}$ac_cv_c_const" >&6
+ if test $ac_cv_c_const = no; then
+ 
+@@ -17104,7 +17122,7 @@
+ 
+ ###	Checks for external-data
+ 
+-echo "$as_me:17107: checking if data-only library module links" >&5
++echo "$as_me:17125: 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
+@@ -17112,20 +17130,20 @@
+ 
+ 	rm -f conftest.a
+ 	cat >conftest.$ac_ext <<EOF
+-#line 17115 "configure"
++#line 17133 "configure"
+ int	testdata[3] = { 123, 456, 789 };
+ EOF
+-	if { (eval echo "$as_me:17118: \"$ac_compile\"") >&5
++	if { (eval echo "$as_me:17136: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:17121: \$? = $ac_status" >&5
++  echo "$as_me:17139: \$? = $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 17128 "configure"
++#line 17146 "configure"
+ int	testfunc(void)
+ {
+ #if defined(NeXT)
+@@ -17138,10 +17156,10 @@
+ #endif
+ }
+ EOF
+-	if { (eval echo "$as_me:17141: \"$ac_compile\"") >&5
++	if { (eval echo "$as_me:17159: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:17144: \$? = $ac_status" >&5
++  echo "$as_me:17162: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; then
+ 		mv conftest.o func.o && \
+ 		( $AR $ARFLAGS conftest.a func.o ) 2>&5 1>/dev/null
+@@ -17154,7 +17172,7 @@
+   cf_cv_link_dataonly=unknown
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 17157 "configure"
++#line 17175 "configure"
+ #include "confdefs.h"
+ 
+ 	int main(void)
+@@ -17165,15 +17183,15 @@
+ 
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:17168: \"$ac_link\"") >&5
++if { (eval echo "$as_me:17186: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:17171: \$? = $ac_status" >&5
++  echo "$as_me:17189: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:17173: \"$ac_try\"") >&5
++  { (eval echo "$as_me:17191: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:17176: \$? = $ac_status" >&5
++  echo "$as_me:17194: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_link_dataonly=yes
+ else
+@@ -17188,7 +17206,7 @@
+ 
+ fi
+ 
+-echo "$as_me:17191: result: $cf_cv_link_dataonly" >&5
++echo "$as_me:17209: result: $cf_cv_link_dataonly" >&5
+ echo "${ECHO_T}$cf_cv_link_dataonly" >&6
+ 
+ if test "$cf_cv_link_dataonly" = no ; then
+@@ -17207,23 +17225,23 @@
+ 
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-echo "$as_me:17210: checking for $ac_header" >&5
++echo "$as_me:17228: 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 17216 "configure"
++#line 17234 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:17220: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:17238: \"$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:17226: \$? = $ac_status" >&5
++  echo "$as_me:17244: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -17242,7 +17260,7 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:17245: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
++echo "$as_me:17263: 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
+@@ -17252,7 +17270,7 @@
+ fi
+ done
+ 
+-echo "$as_me:17255: checking for working mkstemp" >&5
++echo "$as_me:17273: 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
+@@ -17263,7 +17281,7 @@
+   cf_cv_func_mkstemp=maybe
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 17266 "configure"
++#line 17284 "configure"
+ #include "confdefs.h"
+ 
+ #include <sys/types.h>
+@@ -17304,15 +17322,15 @@
+ 
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:17307: \"$ac_link\"") >&5
++if { (eval echo "$as_me:17325: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:17310: \$? = $ac_status" >&5
++  echo "$as_me:17328: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:17312: \"$ac_try\"") >&5
++  { (eval echo "$as_me:17330: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:17315: \$? = $ac_status" >&5
++  echo "$as_me:17333: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_func_mkstemp=yes
+ 
+@@ -17327,16 +17345,16 @@
+ fi
+ 
+ fi
+-echo "$as_me:17330: result: $cf_cv_func_mkstemp" >&5
++echo "$as_me:17348: 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:17333: checking for mkstemp" >&5
++	echo "$as_me:17351: 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 17339 "configure"
++#line 17357 "configure"
+ #include "confdefs.h"
+ #define mkstemp autoconf_temporary
+ #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -17367,16 +17385,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:17370: \"$ac_link\"") >&5
++if { (eval echo "$as_me:17388: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:17373: \$? = $ac_status" >&5
++  echo "$as_me:17391: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:17376: \"$ac_try\"") >&5
++  { (eval echo "$as_me:17394: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:17379: \$? = $ac_status" >&5
++  echo "$as_me:17397: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_func_mkstemp=yes
+ else
+@@ -17386,7 +17404,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:17389: result: $ac_cv_func_mkstemp" >&5
++echo "$as_me:17407: result: $ac_cv_func_mkstemp" >&5
+ echo "${ECHO_T}$ac_cv_func_mkstemp" >&6
+ 
+ fi
+@@ -17415,7 +17433,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:17418: checking for $ac_word" >&5
++echo "$as_me:17436: 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
+@@ -17432,7 +17450,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:17435: found $ac_dir/$ac_word" >&5
++   echo "$as_me:17453: found $ac_dir/$ac_word" >&5
+    break
+ fi
+ done
+@@ -17444,10 +17462,10 @@
+ cf_TEMP_gnat=$ac_cv_path_cf_TEMP_gnat
+ 
+ if test -n "$cf_TEMP_gnat"; then
+-  echo "$as_me:17447: result: $cf_TEMP_gnat" >&5
++  echo "$as_me:17465: result: $cf_TEMP_gnat" >&5
+ echo "${ECHO_T}$cf_TEMP_gnat" >&6
+ else
+-  echo "$as_me:17450: result: no" >&5
++  echo "$as_me:17468: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -17457,7 +17475,7 @@
+ 		unset cf_cv_gnat_version
+ 		unset cf_TEMP_gnat
+ 
+-echo "$as_me:17460: checking for $cf_prog_gnat version" >&5
++echo "$as_me:17478: 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
+@@ -17468,7 +17486,7 @@
+ 	sed -e '2,$d' -e 's/[^0-9 \.]//g' -e 's/^[ ]*//' -e 's/ .*//'`
+ 
+ fi
+-echo "$as_me:17471: result: $cf_cv_gnat_version" >&5
++echo "$as_me:17489: 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
+@@ -17497,7 +17515,7 @@
+ 			cd conftest.src
+ 			for cf_gprconfig in Ada C
+ 			do
+-				echo "$as_me:17500: checking for gprconfig name for $cf_gprconfig" >&5
++				echo "$as_me:17518: 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
+@@ -17516,10 +17534,10 @@
+ 				if test -n "$cf_gprconfig_value"
+ 				then
+ 					eval "cf_ada_config_$cf_gprconfig=$cf_gprconfig_value"
+-					echo "$as_me:17519: result: $cf_gprconfig_value" >&5
++					echo "$as_me:17537: result: $cf_gprconfig_value" >&5
+ echo "${ECHO_T}$cf_gprconfig_value" >&6
+ 				else
+-					echo "$as_me:17522: result: missing" >&5
++					echo "$as_me:17540: result: missing" >&5
+ echo "${ECHO_T}missing" >&6
+ 					cf_ada_config="#"
+ 					break
+@@ -17532,7 +17550,7 @@
+ 	if test "x$cf_ada_config" != "x#"
+ 	then
+ 
+-echo "$as_me:17535: checking for gnat version" >&5
++echo "$as_me:17553: 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
+@@ -17543,7 +17561,7 @@
+ 	sed -e '2,$d' -e 's/[^0-9 \.]//g' -e 's/^[ ]*//' -e 's/ .*//'`
+ 
+ fi
+-echo "$as_me:17546: result: $cf_cv_gnat_version" >&5
++echo "$as_me:17564: 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
+ 
+@@ -17552,7 +17570,7 @@
+ 	cf_cv_prog_gnat_correct=yes
+ 	;;
+ (*)
+-	{ echo "$as_me:17555: WARNING: Unsupported GNAT version $cf_cv_gnat_version. We require 3.11 or better. Disabling Ada95 binding." >&5
++	{ echo "$as_me:17573: WARNING: Unsupported GNAT version $cf_cv_gnat_version. We require 3.11 or better. Disabling Ada95 binding." >&5
+ echo "$as_me: WARNING: Unsupported GNAT version $cf_cv_gnat_version. We require 3.11 or better. Disabling Ada95 binding." >&2;}
+ 	cf_cv_prog_gnat_correct=no
+ 	;;
+@@ -17560,7 +17578,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:17563: checking for $ac_word" >&5
++echo "$as_me:17581: 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
+@@ -17575,7 +17593,7 @@
+   test -z "$ac_dir" && ac_dir=.
+   $as_executable_p "$ac_dir/$ac_word" || continue
+ ac_cv_prog_M4_exists="yes"
+-echo "$as_me:17578: found $ac_dir/$ac_word" >&5
++echo "$as_me:17596: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -17584,20 +17602,20 @@
+ fi
+ M4_exists=$ac_cv_prog_M4_exists
+ if test -n "$M4_exists"; then
+-  echo "$as_me:17587: result: $M4_exists" >&5
++  echo "$as_me:17605: result: $M4_exists" >&5
+ echo "${ECHO_T}$M4_exists" >&6
+ else
+-  echo "$as_me:17590: result: no" >&5
++  echo "$as_me:17608: 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:17596: WARNING: Ada95 binding required program m4 not found. Ada95 binding disabled" >&5
++			{ echo "$as_me:17614: 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:17600: checking if GNAT works" >&5
++			echo "$as_me:17618: checking if GNAT works" >&5
+ echo $ECHO_N "checking if GNAT works... $ECHO_C" >&6
+ 
+ rm -rf ./conftest* ./*~conftest*
+@@ -17625,7 +17643,7 @@
+ fi
+ rm -rf ./conftest* ./*~conftest*
+ 
+-			echo "$as_me:17628: result: $cf_cv_prog_gnat_correct" >&5
++			echo "$as_me:17646: result: $cf_cv_prog_gnat_correct" >&5
+ echo "${ECHO_T}$cf_cv_prog_gnat_correct" >&6
+ 		fi
+ 	else
+@@ -17635,7 +17653,7 @@
+ 
+ 	if test	"$cf_cv_prog_gnat_correct" = yes; then
+ 
+-	echo "$as_me:17638: checking optimization options for ADAFLAGS" >&5
++	echo "$as_me:17656: checking optimization options for ADAFLAGS" >&5
+ echo $ECHO_N "checking optimization options for ADAFLAGS... $ECHO_C" >&6
+ 	case "$CFLAGS" in
+ 	(*-g*)
+@@ -17652,10 +17670,10 @@
+ 
+ 		;;
+ 	esac
+-	echo "$as_me:17655: result: $ADAFLAGS" >&5
++	echo "$as_me:17673: result: $ADAFLAGS" >&5
+ echo "${ECHO_T}$ADAFLAGS" >&6
+ 
+-echo "$as_me:17658: checking if GNATPREP supports -T option" >&5
++echo "$as_me:17676: 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
+@@ -17665,11 +17683,11 @@
+ gnatprep -T 2>/dev/null >/dev/null && cf_cv_gnatprep_opt_t=yes
+ 
+ fi
+-echo "$as_me:17668: result: $cf_cv_gnatprep_opt_t" >&5
++echo "$as_me:17686: 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:17672: checking if GNAT supports generics" >&5
++echo "$as_me:17690: 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])
+@@ -17679,7 +17697,7 @@
+ 	cf_gnat_generics=no
+ 	;;
+ esac
+-echo "$as_me:17682: result: $cf_gnat_generics" >&5
++echo "$as_me:17700: result: $cf_gnat_generics" >&5
+ echo "${ECHO_T}$cf_gnat_generics" >&6
+ 
+ if test "$cf_gnat_generics" = yes
+@@ -17691,7 +17709,7 @@
+ 	cf_generic_objects=
+ fi
+ 
+-echo "$as_me:17694: checking if GNAT supports SIGINT" >&5
++echo "$as_me:17712: 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
+@@ -17739,7 +17757,7 @@
+ rm -rf ./conftest* ./*~conftest*
+ 
+ fi
+-echo "$as_me:17742: result: $cf_cv_gnat_sigint" >&5
++echo "$as_me:17760: result: $cf_cv_gnat_sigint" >&5
+ echo "${ECHO_T}$cf_cv_gnat_sigint" >&6
+ 
+ if test "$cf_cv_gnat_sigint" = yes ; then
+@@ -17752,7 +17770,7 @@
+ cf_gnat_projects=no
+ 
+ if test "$enable_gnat_projects" != no ; then
+-echo "$as_me:17755: checking if GNAT supports project files" >&5
++echo "$as_me:17773: 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]*)
+@@ -17815,15 +17833,15 @@
+ 	esac
+ 	;;
+ esac
+-echo "$as_me:17818: result: $cf_gnat_projects" >&5
++echo "$as_me:17836: 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:17824: checking if GNAT supports libraries" >&5
++	echo "$as_me:17842: checking if GNAT supports libraries" >&5
+ echo $ECHO_N "checking if GNAT supports libraries... $ECHO_C" >&6
+-	echo "$as_me:17826: result: $cf_gnat_libraries" >&5
++	echo "$as_me:17844: result: $cf_gnat_libraries" >&5
+ echo "${ECHO_T}$cf_gnat_libraries" >&6
+ fi
+ 
+@@ -17843,7 +17861,7 @@
+ 	then
+ 		USE_GNAT_MAKE_GPR=""
+ 	else
+-		{ echo "$as_me:17846: WARNING: use old makefile rules since tools are missing" >&5
++		{ echo "$as_me:17864: 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
+@@ -17855,7 +17873,7 @@
+ 	USE_GNAT_LIBRARIES="#"
+ fi
+ 
+-echo "$as_me:17858: checking for ada-compiler" >&5
++echo "$as_me:17876: 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.
+@@ -17866,12 +17884,12 @@
+   cf_ada_compiler=gnatmake
+ fi;
+ 
+-echo "$as_me:17869: result: $cf_ada_compiler" >&5
++echo "$as_me:17887: result: $cf_ada_compiler" >&5
+ echo "${ECHO_T}$cf_ada_compiler" >&6
+ 
+ 		cf_ada_package=terminal_interface
+ 
+-echo "$as_me:17874: checking for ada-include" >&5
++echo "$as_me:17892: 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.
+@@ -17907,7 +17925,7 @@
+ 	withval=`echo "$withval" | sed -e s%NONE%$cf_path_syntax%`
+ 	;;
+ (*)
+-	{ { echo "$as_me:17910: error: expected a pathname, not \"$withval\"" >&5
++	{ { echo "$as_me:17928: error: expected a pathname, not \"$withval\"" >&5
+ echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
+    { (exit 1); exit 1; }; }
+ 	;;
+@@ -17916,10 +17934,10 @@
+ fi
+ eval ADA_INCLUDE="$withval"
+ 
+-echo "$as_me:17919: result: $ADA_INCLUDE" >&5
++echo "$as_me:17937: result: $ADA_INCLUDE" >&5
+ echo "${ECHO_T}$ADA_INCLUDE" >&6
+ 
+-echo "$as_me:17922: checking for ada-objects" >&5
++echo "$as_me:17940: 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.
+@@ -17955,7 +17973,7 @@
+ 	withval=`echo "$withval" | sed -e s%NONE%$cf_path_syntax%`
+ 	;;
+ (*)
+-	{ { echo "$as_me:17958: error: expected a pathname, not \"$withval\"" >&5
++	{ { echo "$as_me:17976: error: expected a pathname, not \"$withval\"" >&5
+ echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
+    { (exit 1); exit 1; }; }
+ 	;;
+@@ -17964,10 +17982,10 @@
+ fi
+ eval ADA_OBJECTS="$withval"
+ 
+-echo "$as_me:17967: result: $ADA_OBJECTS" >&5
++echo "$as_me:17985: result: $ADA_OBJECTS" >&5
+ echo "${ECHO_T}$ADA_OBJECTS" >&6
+ 
+-echo "$as_me:17970: checking if an Ada95 shared-library should be built" >&5
++echo "$as_me:17988: 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.
+@@ -17977,14 +17995,14 @@
+ else
+   with_ada_sharedlib=no
+ fi;
+-echo "$as_me:17980: result: $with_ada_sharedlib" >&5
++echo "$as_me:17998: 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:17987: WARNING: disabling shared-library since GNAT projects are not supported" >&5
++		{ echo "$as_me:18005: 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
+@@ -18004,7 +18022,7 @@
+ 
+ 		# allow the Ada binding to be renamed
+ 
+-echo "$as_me:18007: checking for ada-libname" >&5
++echo "$as_me:18025: 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.
+@@ -18020,16 +18038,16 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:18023: result: $ADA_LIBNAME" >&5
++echo "$as_me:18041: result: $ADA_LIBNAME" >&5
+ echo "${ECHO_T}$ADA_LIBNAME" >&6
+ 
+ 	else
+-		{ { echo "$as_me:18027: error: No usable Ada compiler found" >&5
++		{ { echo "$as_me:18045: 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:18032: error: The Ada compiler is needed for this package" >&5
++	{ { echo "$as_me:18050: 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
+@@ -18069,7 +18087,7 @@
+ fi
+ 
+ ### Build up pieces for makefile rules
+-echo "$as_me:18072: checking default library suffix" >&5
++echo "$as_me:18090: checking default library suffix" >&5
+ echo $ECHO_N "checking default library suffix... $ECHO_C" >&6
+ 
+ 	case $DFT_LWR_MODEL in
+@@ -18080,10 +18098,10 @@
+ 	(shared)  DFT_ARG_SUFFIX=''   ;;
+ 	esac
+ 	test -n "$LIB_SUFFIX" && DFT_ARG_SUFFIX="${LIB_SUFFIX}${DFT_ARG_SUFFIX}"
+-echo "$as_me:18083: result: $DFT_ARG_SUFFIX" >&5
++echo "$as_me:18101: result: $DFT_ARG_SUFFIX" >&5
+ echo "${ECHO_T}$DFT_ARG_SUFFIX" >&6
+ 
+-echo "$as_me:18086: checking default library-dependency suffix" >&5
++echo "$as_me:18104: checking default library-dependency suffix" >&5
+ echo $ECHO_N "checking default library-dependency suffix... $ECHO_C" >&6
+ 
+ 	case X$DFT_LWR_MODEL in
+@@ -18166,10 +18184,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:18169: result: $DFT_DEP_SUFFIX" >&5
++echo "$as_me:18187: result: $DFT_DEP_SUFFIX" >&5
+ echo "${ECHO_T}$DFT_DEP_SUFFIX" >&6
+ 
+-echo "$as_me:18172: checking default object directory" >&5
++echo "$as_me:18190: checking default object directory" >&5
+ echo $ECHO_N "checking default object directory... $ECHO_C" >&6
+ 
+ 	case $DFT_LWR_MODEL in
+@@ -18185,7 +18203,7 @@
+ 			DFT_OBJ_SUBDIR='obj_s' ;;
+ 		esac
+ 	esac
+-echo "$as_me:18188: result: $DFT_OBJ_SUBDIR" >&5
++echo "$as_me:18206: result: $DFT_OBJ_SUBDIR" >&5
+ echo "${ECHO_T}$DFT_OBJ_SUBDIR" >&6
+ 
+ ### Set up low-level terminfo dependencies for makefiles.
+@@ -18327,7 +18345,7 @@
+ : "${CONFIG_STATUS=./config.status}"
+ ac_clean_files_save=$ac_clean_files
+ ac_clean_files="$ac_clean_files $CONFIG_STATUS"
+-{ echo "$as_me:18330: creating $CONFIG_STATUS" >&5
++{ echo "$as_me:18348: creating $CONFIG_STATUS" >&5
+ echo "$as_me: creating $CONFIG_STATUS" >&6;}
+ cat >"$CONFIG_STATUS" <<_ACEOF
+ #! $SHELL
+@@ -18506,7 +18524,7 @@
+     echo "$ac_cs_version"; exit 0 ;;
+   --he | --h)
+     # Conflict between --help and --header
+-    { { echo "$as_me:18509: error: ambiguous option: $1
++    { { echo "$as_me:18527: 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;}
+@@ -18525,7 +18543,7 @@
+     ac_need_defaults=false;;
+ 
+   # This is an error.
+-  -*) { { echo "$as_me:18528: error: unrecognized option: $1
++  -*) { { echo "$as_me:18546: 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;}
+@@ -18599,7 +18617,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:18602: error: invalid argument: $ac_config_target" >&5
++  *) { { echo "$as_me:18620: error: invalid argument: $ac_config_target" >&5
+ echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
+    { (exit 1); exit 1; }; };;
+   esac
+@@ -18959,7 +18977,7 @@
+   esac
+ 
+   if test x"$ac_file" != x-; then
+-    { echo "$as_me:18962: creating $ac_file" >&5
++    { echo "$as_me:18980: creating $ac_file" >&5
+ echo "$as_me: creating $ac_file" >&6;}
+     rm -f "$ac_file"
+   fi
+@@ -18977,7 +18995,7 @@
+       -) echo $tmp/stdin ;;
+       [\\/$]*)
+          # Absolute (can't be DOS-style, as IFS=:)
+-         test -f "$f" || { { echo "$as_me:18980: error: cannot find input file: $f" >&5
++         test -f "$f" || { { echo "$as_me:18998: error: cannot find input file: $f" >&5
+ echo "$as_me: error: cannot find input file: $f" >&2;}
+    { (exit 1); exit 1; }; }
+          echo $f;;
+@@ -18990,7 +19008,7 @@
+            echo "$srcdir/$f"
+          else
+            # /dev/null tree
+-           { { echo "$as_me:18993: error: cannot find input file: $f" >&5
++           { { echo "$as_me:19011: error: cannot find input file: $f" >&5
+ echo "$as_me: error: cannot find input file: $f" >&2;}
+    { (exit 1); exit 1; }; }
+          fi;;
+@@ -19006,7 +19024,7 @@
+       if test -n "$ac_seen"; then
+         ac_used=`grep '@datarootdir@' "$ac_item"`
+         if test -z "$ac_used"; then
+-          { echo "$as_me:19009: WARNING: datarootdir was used implicitly but not set:
++          { echo "$as_me:19027: 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;}
+@@ -19015,7 +19033,7 @@
+       fi
+       ac_seen=`grep '${datarootdir}' "$ac_item"`
+       if test -n "$ac_seen"; then
+-        { echo "$as_me:19018: WARNING: datarootdir was used explicitly but not set:
++        { echo "$as_me:19036: 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;}
+@@ -19052,7 +19070,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:19055: WARNING: Variable $ac_name is used but was not set:
++              { echo "$as_me:19073: 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;}
+@@ -19063,7 +19081,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:19066: WARNING: Some variables may not be substituted:
++      { echo "$as_me:19084: WARNING: Some variables may not be substituted:
+ $ac_seen" >&5
+ echo "$as_me: WARNING: Some variables may not be substituted:
+ $ac_seen" >&2;}
+@@ -19112,7 +19130,7 @@
+   * )   ac_file_in=$ac_file.in ;;
+   esac
+ 
+-  test x"$ac_file" != x- && { echo "$as_me:19115: creating $ac_file" >&5
++  test x"$ac_file" != x- && { echo "$as_me:19133: creating $ac_file" >&5
+ echo "$as_me: creating $ac_file" >&6;}
+ 
+   # First look for the input files in the build tree, otherwise in the
+@@ -19123,7 +19141,7 @@
+       -) echo $tmp/stdin ;;
+       [\\/$]*)
+          # Absolute (can't be DOS-style, as IFS=:)
+-         test -f "$f" || { { echo "$as_me:19126: error: cannot find input file: $f" >&5
++         test -f "$f" || { { echo "$as_me:19144: error: cannot find input file: $f" >&5
+ echo "$as_me: error: cannot find input file: $f" >&2;}
+    { (exit 1); exit 1; }; }
+          echo $f;;
+@@ -19136,7 +19154,7 @@
+            echo "$srcdir/$f"
+          else
+            # /dev/null tree
+-           { { echo "$as_me:19139: error: cannot find input file: $f" >&5
++           { { echo "$as_me:19157: error: cannot find input file: $f" >&5
+ echo "$as_me: error: cannot find input file: $f" >&2;}
+    { (exit 1); exit 1; }; }
+          fi;;
+@@ -19194,7 +19212,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:19197: $ac_file is unchanged" >&5
++      { echo "$as_me:19215: $ac_file is unchanged" >&5
+ echo "$as_me: $ac_file is unchanged" >&6;}
+     else
+       ac_dir=`$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+Index: INSTALL
+Prereq:  1.236 
+--- ncurses-6.3-20211115+/INSTALL	2021-10-26 07:55:02.000000000 +0000
++++ ncurses-6.3-20211120/INSTALL	2021-11-20 17:54:20.000000000 +0000
+@@ -26,7 +26,7 @@
+ -- sale, use or other dealings in this Software without prior written        --
+ -- authorization.                                                            --
+ -------------------------------------------------------------------------------
+--- $Id: INSTALL,v 1.236 2021/10/26 07:55:02 tom Exp $
++-- $Id: INSTALL,v 1.237 2021/11/20 17:54:20 tom Exp $
+ ---------------------------------------------------------------------
+              How to install Ncurses/Terminfo on your system
+ ---------------------------------------------------------------------
+@@ -1156,6 +1156,9 @@
+ 	Automatic selection is overridden by providing an option-value
+ 	beginning with "/".
+ 
++	If this option is omitted, the default directory for installing
++	".pc" files is ${libdir}/pkgconfig
++
+     --with-profile
+ 	Generate profile-libraries These are named by adding "_p" to the root,
+ 	e.g., libncurses_p.a
+Index: NEWS
+Prereq:  1.3745 
+--- ncurses-6.3-20211115+/NEWS	2021-11-16 00:26:15.000000000 +0000
++++ ncurses-6.3-20211120/NEWS	2021-11-21 00:03:54.000000000 +0000
+@@ -26,7 +26,7 @@
+ -- sale, use or other dealings in this Software without prior written        --
+ -- authorization.                                                            --
+ -------------------------------------------------------------------------------
+--- $Id: NEWS,v 1.3745 2021/11/16 00:26:15 tom Exp $
++-- $Id: NEWS,v 1.3749 2021/11/21 00:03:54 tom Exp $
+ -------------------------------------------------------------------------------
+ 
+ This is a log of changes that ncurses has gone through since Zeyd started
+@@ -46,6 +46,16 @@
+ Changes through 1.9.9e did not credit all contributions;
+ it is not possible to add this information.
+ 
++20211120
++	+ add dim, ecma+strikeout to st-0.6 -TD
++	+ deallocate the tparm cache when del_curterm is called for the last
++	  allocated TERMINAL structure (report/testcase by Bram Moolenaar,
++	  cf: 20200531).
++	+ modify test-package to more closely conform to Debian multi-arch.
++	+ if the --with-pkg-config-libdir option is not given, use
++	  ${libdir}/pkgconfig as a default (prompted by discussion with Ross
++	  Burton).
++
+ 20211115
+ 	+ fix memory-leak in delwin for pads (report by Werner Fink, OpenSUSE
+ 	  #1192668, cf:  20211106),
+Index: VERSION
+--- ncurses-6.3-20211115+/VERSION	2021-11-15 23:51:41.000000000 +0000
++++ ncurses-6.3-20211120/VERSION	2021-11-20 12:06:33.000000000 +0000
+@@ -1 +1 @@
+-5:0:10	6.3	20211115
++5:0:10	6.3	20211120
+Index: aclocal.m4
+Prereq:  1.992 
+--- ncurses-6.3-20211115+/aclocal.m4	2021-11-07 15:31:47.000000000 +0000
++++ ncurses-6.3-20211120/aclocal.m4	2021-11-20 19:56:38.000000000 +0000
+@@ -29,7 +29,7 @@
+ dnl
+ dnl Author: Thomas E. Dickey 1995-on
+ dnl
+-dnl $Id: aclocal.m4,v 1.992 2021/11/07 15:31:47 tom Exp $
++dnl $Id: aclocal.m4,v 1.997 2021/11/20 19:56:38 tom Exp $
+ dnl Macros used in NCURSES auto-configuration script.
+ dnl
+ dnl These macros are maintained separately from NCURSES.  The copyright on
+@@ -2072,7 +2072,7 @@
+ AC_SUBST(BROKEN_LINKER)
+ ])dnl
+ dnl ---------------------------------------------------------------------------
+-dnl CF_ENABLE_PC_FILES version: 15 updated: 2021/10/25 19:21:54
++dnl CF_ENABLE_PC_FILES version: 16 updated: 2021/11/20 12:48:37
+ dnl ------------------
+ dnl This is the "--enable-pc-files" option, which is available if there is a
+ dnl pkg-config configuration on the local machine.
+@@ -2101,7 +2101,8 @@
+ 		AC_MSG_WARN(no PKG_CONFIG_LIBDIR was found)
+ 		;;
+ 	(*)
+-		CF_PATH_SYNTAX(PKG_CONFIG_LIBDIR)
++		cf_pkg_config_libdir="$PKG_CONFIG_LIBDIR"
++		CF_PATH_SYNTAX(cf_pkg_config_libdir)
+ 		;;
+ 	esac
+ else
+@@ -9237,7 +9238,7 @@
+ fi
+ ])dnl
+ dnl ---------------------------------------------------------------------------
+-dnl CF_WITH_PKG_CONFIG_LIBDIR version: 17 updated: 2021/11/07 10:30:15
++dnl CF_WITH_PKG_CONFIG_LIBDIR version: 18 updated: 2021/11/20 12:48:37
+ dnl -------------------------
+ dnl Allow the choice of the pkg-config library directory to be overridden.
+ dnl
+@@ -9260,18 +9261,31 @@
+ 	;;
+ esac
+ 
++# if $PKG_CONFIG_LIBDIR is set, try to use that
+ cf_search_path=`echo "$PKG_CONFIG_LIBDIR" | sed -e 's/:/ /g' -e 's,^[[ 	]]*,,'`
++
++# if the option is used, let that override.  otherwise default to "libdir"
+ AC_ARG_WITH(pkg-config-libdir,
+ 	[  --with-pkg-config-libdir=XXX use given directory for installing pc-files],
+ 	[cf_search_path=$withval],
+-	[test "x$PKG_CONFIG" != xnone && cf_search_path=yes])
++	[test "x$PKG_CONFIG" != xnone && test -z "$cf_search_path" && cf_search_path=libdir])
+ 
+ case x$cf_search_path in
++(xlibdir)
++	PKG_CONFIG_LIBDIR='${libdir}/pkgconfig'
++	AC_MSG_RESULT($PKG_CONFIG_LIBDIR)
++	cf_search_path=
++	;;
++(x)
++	;;
+ (x/*)
++	PKG_CONFIG_LIBDIR="$cf_search_path"
++	AC_MSG_RESULT($PKG_CONFIG_LIBDIR)
++	cf_search_path=
+ 	;;
+-(xyes)
++(xyes|xauto)
++	AC_MSG_RESULT(auto)
+ 	cf_search_path=
+-	CF_VERBOSE(auto...)
+ 	# Look for the library directory using the same prefix as the executable
+ 	AC_MSG_CHECKING(for search-list)
+ 	if test "x$PKG_CONFIG" != xnone
+@@ -9300,54 +9314,57 @@
+ 	fi
+ 
+ 	AC_MSG_RESULT($cf_search_path)
+-
+ 	;;
+ (*)
++	AC_MSG_ERROR(Unexpected option value: $cf_search_path)
+ 	;;
+ esac
+ 
+-AC_MSG_CHECKING(for first directory)
+-cf_pkg_config_path=none
+-for cf_config in $cf_search_path
+-do
+-	if test -d "$cf_config"
+-	then
+-		cf_pkg_config_path=$cf_config
+-		break
+-	fi
+-done
+-AC_MSG_RESULT($cf_pkg_config_path)
+-
+-if test "x$cf_pkg_config_path" != xnone ; then
+-	# limit this to the first directory found
+-	PKG_CONFIG_LIBDIR="$cf_pkg_config_path"
+-fi
+-
+-if test -z "$PKG_CONFIG_LIBDIR" && test -n "$cf_search_path"
++if test -n "$cf_search_path"
+ then
+-	AC_MSG_CHECKING(for workaround)
+-	if test "$prefix" = "NONE" ; then
+-		cf_prefix="$ac_default_prefix"
+-	else
+-		cf_prefix="$prefix"
+-	fi
+-	eval cf_libdir=$libdir
+-	cf_libdir=`echo "$cf_libdir" | sed -e "s,^NONE,$cf_prefix,"`
+-	cf_backup=
++	AC_MSG_CHECKING(for first directory)
++	cf_pkg_config_path=none
+ 	for cf_config in $cf_search_path
+ 	do
+-		case $cf_config in
+-		$cf_libdir/pkgconfig)
+-			PKG_CONFIG_LIBDIR=$cf_libdir/pkgconfig
++		if test -d "$cf_config"
++		then
++			cf_pkg_config_path=$cf_config
+ 			break
+-			;;
+-		*)
+-			test -z "$cf_backup" && cf_backup=$cf_config
+-			;;
+-		esac
++		fi
+ 	done
+-	test -z "$PKG_CONFIG_LIBDIR" && PKG_CONFIG_LIBDIR=$cf_backup
+-	AC_MSG_RESULT($PKG_CONFIG_LIBDIR)
++	AC_MSG_RESULT($cf_pkg_config_path)
++
++	if test "x$cf_pkg_config_path" != xnone ; then
++		# limit this to the first directory found
++		PKG_CONFIG_LIBDIR="$cf_pkg_config_path"
++	fi
++
++	if test -z "$PKG_CONFIG_LIBDIR" && test -n "$cf_search_path"
++	then
++		AC_MSG_CHECKING(for workaround)
++		if test "$prefix" = "NONE" ; then
++			cf_prefix="$ac_default_prefix"
++		else
++			cf_prefix="$prefix"
++		fi
++		eval cf_libdir=$libdir
++		cf_libdir=`echo "$cf_libdir" | sed -e "s,^NONE,$cf_prefix,"`
++		cf_backup=
++		for cf_config in $cf_search_path
++		do
++			case $cf_config in
++			$cf_libdir/pkgconfig)
++				PKG_CONFIG_LIBDIR=$cf_libdir/pkgconfig
++				break
++				;;
++			*)
++				test -z "$cf_backup" && cf_backup=$cf_config
++				;;
++			esac
++		done
++		test -z "$PKG_CONFIG_LIBDIR" && PKG_CONFIG_LIBDIR=$cf_backup
++		AC_MSG_RESULT($PKG_CONFIG_LIBDIR)
++	fi
+ fi
+ 
+ AC_SUBST(PKG_CONFIG_LIBDIR)
+Index: configure
+--- ncurses-6.3-20211115+/configure	2021-11-07 15:32:40.000000000 +0000
++++ ncurses-6.3-20211120/configure	2021-11-20 19:57:11.000000000 +0000
+@@ -4138,27 +4138,40 @@
+ 	;;
+ esac
+ 
++# if $PKG_CONFIG_LIBDIR is set, try to use that
+ cf_search_path=`echo "$PKG_CONFIG_LIBDIR" | sed -e 's/:/ /g' -e 's,^[ 	]*,,'`
+ 
++# if the option is used, let that override.  otherwise default to "libdir"
++
+ # Check whether --with-pkg-config-libdir or --without-pkg-config-libdir was given.
+ if test "${with_pkg_config_libdir+set}" = set; then
+   withval="$with_pkg_config_libdir"
+   cf_search_path=$withval
+ else
+-  test "x$PKG_CONFIG" != xnone && cf_search_path=yes
++  test "x$PKG_CONFIG" != xnone && test -z "$cf_search_path" && cf_search_path=libdir
+ fi;
+ 
+ case x$cf_search_path in
++(xlibdir)
++	PKG_CONFIG_LIBDIR='${libdir}/pkgconfig'
++	echo "$as_me:4157: result: $PKG_CONFIG_LIBDIR" >&5
++echo "${ECHO_T}$PKG_CONFIG_LIBDIR" >&6
++	cf_search_path=
++	;;
++(x)
++	;;
+ (x/*)
++	PKG_CONFIG_LIBDIR="$cf_search_path"
++	echo "$as_me:4165: result: $PKG_CONFIG_LIBDIR" >&5
++echo "${ECHO_T}$PKG_CONFIG_LIBDIR" >&6
++	cf_search_path=
+ 	;;
+-(xyes)
++(xyes|xauto)
++	echo "$as_me:4170: result: auto" >&5
++echo "${ECHO_T}auto" >&6
+ 	cf_search_path=
+-	test -n "$verbose" && echo "	auto..." 1>&6
+-
+-echo "${as_me:-configure}:4158: testing auto... ..." 1>&5
+-
+ 	# Look for the library directory using the same prefix as the executable
+-	echo "$as_me:4161: checking for search-list" >&5
++	echo "$as_me:4174: checking for search-list" >&5
+ echo $ECHO_N "checking for search-list... $ECHO_C" >&6
+ 	if test "x$PKG_CONFIG" != xnone
+ 	then
+@@ -4185,68 +4198,73 @@
+ "`
+ 	fi
+ 
+-	echo "$as_me:4188: result: $cf_search_path" >&5
++	echo "$as_me:4201: result: $cf_search_path" >&5
+ echo "${ECHO_T}$cf_search_path" >&6
+-
+ 	;;
+ (*)
++	{ { echo "$as_me:4205: error: Unexpected option value: $cf_search_path" >&5
++echo "$as_me: error: Unexpected option value: $cf_search_path" >&2;}
++   { (exit 1); exit 1; }; }
+ 	;;
+ esac
+ 
+-echo "$as_me:4196: 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
+-do
+-	if test -d "$cf_config"
+-	then
+-		cf_pkg_config_path=$cf_config
+-		break
+-	fi
+-done
+-echo "$as_me:4207: result: $cf_pkg_config_path" >&5
+-echo "${ECHO_T}$cf_pkg_config_path" >&6
+-
+-if test "x$cf_pkg_config_path" != xnone ; then
+-	# limit this to the first directory found
+-	PKG_CONFIG_LIBDIR="$cf_pkg_config_path"
+-fi
+-
+-if test -z "$PKG_CONFIG_LIBDIR" && test -n "$cf_search_path"
++if test -n "$cf_search_path"
+ then
+-	echo "$as_me:4217: checking for workaround" >&5
+-echo $ECHO_N "checking for workaround... $ECHO_C" >&6
+-	if test "$prefix" = "NONE" ; then
+-		cf_prefix="$ac_default_prefix"
+-	else
+-		cf_prefix="$prefix"
+-	fi
+-	eval cf_libdir=$libdir
+-	cf_libdir=`echo "$cf_libdir" | sed -e "s,^NONE,$cf_prefix,"`
+-	cf_backup=
++	echo "$as_me:4213: 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
+ 	do
+-		case $cf_config in
+-		$cf_libdir/pkgconfig)
+-			PKG_CONFIG_LIBDIR=$cf_libdir/pkgconfig
++		if test -d "$cf_config"
++		then
++			cf_pkg_config_path=$cf_config
+ 			break
+-			;;
+-		*)
+-			test -z "$cf_backup" && cf_backup=$cf_config
+-			;;
+-		esac
++		fi
+ 	done
+-	test -z "$PKG_CONFIG_LIBDIR" && PKG_CONFIG_LIBDIR=$cf_backup
+-	echo "$as_me:4240: result: $PKG_CONFIG_LIBDIR" >&5
++	echo "$as_me:4224: result: $cf_pkg_config_path" >&5
++echo "${ECHO_T}$cf_pkg_config_path" >&6
++
++	if test "x$cf_pkg_config_path" != xnone ; then
++		# limit this to the first directory found
++		PKG_CONFIG_LIBDIR="$cf_pkg_config_path"
++	fi
++
++	if test -z "$PKG_CONFIG_LIBDIR" && test -n "$cf_search_path"
++	then
++		echo "$as_me:4234: checking for workaround" >&5
++echo $ECHO_N "checking for workaround... $ECHO_C" >&6
++		if test "$prefix" = "NONE" ; then
++			cf_prefix="$ac_default_prefix"
++		else
++			cf_prefix="$prefix"
++		fi
++		eval cf_libdir=$libdir
++		cf_libdir=`echo "$cf_libdir" | sed -e "s,^NONE,$cf_prefix,"`
++		cf_backup=
++		for cf_config in $cf_search_path
++		do
++			case $cf_config in
++			$cf_libdir/pkgconfig)
++				PKG_CONFIG_LIBDIR=$cf_libdir/pkgconfig
++				break
++				;;
++			*)
++				test -z "$cf_backup" && cf_backup=$cf_config
++				;;
++			esac
++		done
++		test -z "$PKG_CONFIG_LIBDIR" && PKG_CONFIG_LIBDIR=$cf_backup
++		echo "$as_me:4257: result: $PKG_CONFIG_LIBDIR" >&5
+ echo "${ECHO_T}$PKG_CONFIG_LIBDIR" >&6
++	fi
+ fi
+ 
+ if test "x$PKG_CONFIG" != xnone
+ then
+-	echo "$as_me:4246: checking if we should install .pc files for $PKG_CONFIG" >&5
++	echo "$as_me:4264: 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:4249: checking if we should install .pc files" >&5
++	echo "$as_me:4267: checking if we should install .pc files" >&5
+ echo $ECHO_N "checking if we should install .pc files... $ECHO_C" >&6
+ fi
+ 
+@@ -4257,7 +4275,7 @@
+ else
+   enable_pc_files=no
+ fi;
+-echo "$as_me:4260: result: $enable_pc_files" >&5
++echo "$as_me:4278: result: $enable_pc_files" >&5
+ echo "${ECHO_T}$enable_pc_files" >&6
+ 
+ if test "x$enable_pc_files" != xno
+@@ -4265,10 +4283,11 @@
+ 	MAKE_PC_FILES=
+ 	case "x$PKG_CONFIG_LIBDIR" in
+ 	(xno|xnone|xyes|x)
+-		{ echo "$as_me:4268: WARNING: no PKG_CONFIG_LIBDIR was found" >&5
++		{ echo "$as_me:4286: WARNING: no PKG_CONFIG_LIBDIR was found" >&5
+ echo "$as_me: WARNING: no PKG_CONFIG_LIBDIR was found" >&2;}
+ 		;;
+ 	(*)
++		cf_pkg_config_libdir="$PKG_CONFIG_LIBDIR"
+ 
+ if test "x$prefix" != xNONE; then
+ 	cf_path_syntax="$prefix"
+@@ -4276,7 +4295,7 @@
+ 	cf_path_syntax="$ac_default_prefix"
+ fi
+ 
+-case ".$PKG_CONFIG_LIBDIR" in
++case ".$cf_pkg_config_libdir" in
+ (.\$\(*\)*|.\'*\'*)
+ 	;;
+ (..|./*|.\\*)
+@@ -4284,19 +4303,19 @@
+ (.[a-zA-Z]:[\\/]*) # OS/2 EMX
+ 	;;
+ (.\$\{*prefix\}*|.\$\{*dir\}*)
+-	eval PKG_CONFIG_LIBDIR="$PKG_CONFIG_LIBDIR"
+-	case ".$PKG_CONFIG_LIBDIR" in
++	eval cf_pkg_config_libdir="$cf_pkg_config_libdir"
++	case ".$cf_pkg_config_libdir" in
+ 	(.NONE/*)
+-		PKG_CONFIG_LIBDIR=`echo "$PKG_CONFIG_LIBDIR" | sed -e s%NONE%$cf_path_syntax%`
++		cf_pkg_config_libdir=`echo "$cf_pkg_config_libdir" | sed -e s%NONE%$cf_path_syntax%`
+ 		;;
+ 	esac
+ 	;;
+ (.no|.NONE/*)
+-	PKG_CONFIG_LIBDIR=`echo "$PKG_CONFIG_LIBDIR" | sed -e s%NONE%$cf_path_syntax%`
++	cf_pkg_config_libdir=`echo "$cf_pkg_config_libdir" | sed -e s%NONE%$cf_path_syntax%`
+ 	;;
+ (*)
+-	{ { echo "$as_me:4298: error: expected a pathname, not \"$PKG_CONFIG_LIBDIR\"" >&5
+-echo "$as_me: error: expected a pathname, not \"$PKG_CONFIG_LIBDIR\"" >&2;}
++	{ { echo "$as_me:4317: 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; }; }
+ 	;;
+ esac
+@@ -4309,7 +4328,7 @@
+ 
+ if test -z "$MAKE_PC_FILES"
+ then
+-	echo "$as_me:4312: checking for suffix to add to pc-files" >&5
++	echo "$as_me:4331: 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.
+@@ -4324,13 +4343,13 @@
+ 	esac
+ fi;
+ 	test -z "$PC_MODULE_SUFFIX" && PC_MODULE_SUFFIX=none
+-	echo "$as_me:4327: result: $PC_MODULE_SUFFIX" >&5
++	echo "$as_me:4346: result: $PC_MODULE_SUFFIX" >&5
+ echo "${ECHO_T}$PC_MODULE_SUFFIX" >&6
+ 	test "$PC_MODULE_SUFFIX" = none && PC_MODULE_SUFFIX=
+ 
+ fi
+ 
+-echo "$as_me:4333: checking if we should assume mixed-case filenames" >&5
++echo "$as_me:4352: 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.
+@@ -4340,11 +4359,11 @@
+ else
+   enable_mixedcase=auto
+ fi;
+-echo "$as_me:4343: result: $enable_mixedcase" >&5
++echo "$as_me:4362: result: $enable_mixedcase" >&5
+ echo "${ECHO_T}$enable_mixedcase" >&6
+ if test "$enable_mixedcase" = "auto" ; then
+ 
+-echo "$as_me:4347: checking if filesystem supports mixed-case filenames" >&5
++echo "$as_me:4366: 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
+@@ -4371,7 +4390,7 @@
+ fi
+ 
+ fi
+-echo "$as_me:4374: result: $cf_cv_mixedcase" >&5
++echo "$as_me:4393: result: $cf_cv_mixedcase" >&5
+ echo "${ECHO_T}$cf_cv_mixedcase" >&6
+ test "$cf_cv_mixedcase" = yes &&
+ cat >>confdefs.h <<\EOF
+@@ -4390,7 +4409,7 @@
+ fi
+ 
+ # do this after mixed-case option (tags/TAGS is not as important as tic).
+-echo "$as_me:4393: checking whether ${MAKE-make} sets \${MAKE}" >&5
++echo "$as_me:4412: 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
+@@ -4410,16 +4429,16 @@
+ rm -f conftest.make
+ fi
+ if eval "test \"`echo '$ac_cv_prog_make_'${ac_make}_set`\" = yes"; then
+-  echo "$as_me:4413: result: yes" >&5
++  echo "$as_me:4432: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+   SET_MAKE=
+ else
+-  echo "$as_me:4417: result: no" >&5
++  echo "$as_me:4436: result: no" >&5
+ echo "${ECHO_T}no" >&6
+   SET_MAKE="MAKE=${MAKE-make}"
+ fi
+ 
+-echo "$as_me:4422: checking for \".PHONY\" make-support" >&5
++echo "$as_me:4441: 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
+@@ -4474,7 +4493,7 @@
+ 	rm -rf conftest*
+ 
+ fi
+-echo "$as_me:4477: result: $cf_cv_make_PHONY" >&5
++echo "$as_me:4496: result: $cf_cv_make_PHONY" >&5
+ echo "${ECHO_T}$cf_cv_make_PHONY" >&6
+ MAKE_NO_PHONY="#"
+ MAKE_PHONY="#"
+@@ -4485,7 +4504,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:4488: checking for $ac_word" >&5
++echo "$as_me:4507: 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
+@@ -4500,7 +4519,7 @@
+   test -z "$ac_dir" && ac_dir=.
+   $as_executable_p "$ac_dir/$ac_word" || continue
+ ac_cv_prog_CTAGS="$ac_prog"
+-echo "$as_me:4503: found $ac_dir/$ac_word" >&5
++echo "$as_me:4522: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -4508,10 +4527,10 @@
+ fi
+ CTAGS=$ac_cv_prog_CTAGS
+ if test -n "$CTAGS"; then
+-  echo "$as_me:4511: result: $CTAGS" >&5
++  echo "$as_me:4530: result: $CTAGS" >&5
+ echo "${ECHO_T}$CTAGS" >&6
+ else
+-  echo "$as_me:4514: result: no" >&5
++  echo "$as_me:4533: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -4522,7 +4541,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:4525: checking for $ac_word" >&5
++echo "$as_me:4544: 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
+@@ -4537,7 +4556,7 @@
+   test -z "$ac_dir" && ac_dir=.
+   $as_executable_p "$ac_dir/$ac_word" || continue
+ ac_cv_prog_ETAGS="$ac_prog"
+-echo "$as_me:4540: found $ac_dir/$ac_word" >&5
++echo "$as_me:4559: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -4545,10 +4564,10 @@
+ fi
+ ETAGS=$ac_cv_prog_ETAGS
+ if test -n "$ETAGS"; then
+-  echo "$as_me:4548: result: $ETAGS" >&5
++  echo "$as_me:4567: result: $ETAGS" >&5
+ echo "${ECHO_T}$ETAGS" >&6
+ else
+-  echo "$as_me:4551: result: no" >&5
++  echo "$as_me:4570: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -4557,7 +4576,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:4560: checking for $ac_word" >&5
++echo "$as_me:4579: 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
+@@ -4572,7 +4591,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:4575: found $ac_dir/$ac_word" >&5
++echo "$as_me:4594: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -4581,17 +4600,17 @@
+ fi
+ MAKE_LOWER_TAGS=$ac_cv_prog_MAKE_LOWER_TAGS
+ if test -n "$MAKE_LOWER_TAGS"; then
+-  echo "$as_me:4584: result: $MAKE_LOWER_TAGS" >&5
++  echo "$as_me:4603: result: $MAKE_LOWER_TAGS" >&5
+ echo "${ECHO_T}$MAKE_LOWER_TAGS" >&6
+ else
+-  echo "$as_me:4587: result: no" >&5
++  echo "$as_me:4606: 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:4594: checking for $ac_word" >&5
++echo "$as_me:4613: 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
+@@ -4606,7 +4625,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:4609: found $ac_dir/$ac_word" >&5
++echo "$as_me:4628: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -4615,10 +4634,10 @@
+ fi
+ MAKE_UPPER_TAGS=$ac_cv_prog_MAKE_UPPER_TAGS
+ if test -n "$MAKE_UPPER_TAGS"; then
+-  echo "$as_me:4618: result: $MAKE_UPPER_TAGS" >&5
++  echo "$as_me:4637: result: $MAKE_UPPER_TAGS" >&5
+ echo "${ECHO_T}$MAKE_UPPER_TAGS" >&6
+ else
+-  echo "$as_me:4621: result: no" >&5
++  echo "$as_me:4640: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -4638,7 +4657,7 @@
+ 	MAKE_LOWER_TAGS="#"
+ fi
+ 
+-echo "$as_me:4641: checking for makeflags variable" >&5
++echo "$as_me:4660: 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
+@@ -4668,7 +4687,7 @@
+ 			;;
+ 		(*)
+ 
+-echo "${as_me:-configure}:4671: testing given option \"$cf_option\",no match \"$cf_result\" ..." 1>&5
++echo "${as_me:-configure}:4690: testing given option \"$cf_option\",no match \"$cf_result\" ..." 1>&5
+ 
+ 			;;
+ 		esac
+@@ -4676,13 +4695,13 @@
+ 	rm -f cf_makeflags.tmp
+ 
+ fi
+-echo "$as_me:4679: result: $cf_cv_makeflags" >&5
++echo "$as_me:4698: 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:4685: checking for $ac_word" >&5
++echo "$as_me:4704: 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
+@@ -4697,7 +4716,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:4700: found $ac_dir/$ac_word" >&5
++echo "$as_me:4719: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -4705,10 +4724,10 @@
+ fi
+ RANLIB=$ac_cv_prog_RANLIB
+ if test -n "$RANLIB"; then
+-  echo "$as_me:4708: result: $RANLIB" >&5
++  echo "$as_me:4727: result: $RANLIB" >&5
+ echo "${ECHO_T}$RANLIB" >&6
+ else
+-  echo "$as_me:4711: result: no" >&5
++  echo "$as_me:4730: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -4717,7 +4736,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:4720: checking for $ac_word" >&5
++echo "$as_me:4739: 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
+@@ -4732,7 +4751,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:4735: found $ac_dir/$ac_word" >&5
++echo "$as_me:4754: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -4741,10 +4760,10 @@
+ fi
+ ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB
+ if test -n "$ac_ct_RANLIB"; then
+-  echo "$as_me:4744: result: $ac_ct_RANLIB" >&5
++  echo "$as_me:4763: result: $ac_ct_RANLIB" >&5
+ echo "${ECHO_T}$ac_ct_RANLIB" >&6
+ else
+-  echo "$as_me:4747: result: no" >&5
++  echo "$as_me:4766: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -4756,7 +4775,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:4759: checking for $ac_word" >&5
++echo "$as_me:4778: 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
+@@ -4771,7 +4790,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:4774: found $ac_dir/$ac_word" >&5
++echo "$as_me:4793: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -4779,10 +4798,10 @@
+ fi
+ LD=$ac_cv_prog_LD
+ if test -n "$LD"; then
+-  echo "$as_me:4782: result: $LD" >&5
++  echo "$as_me:4801: result: $LD" >&5
+ echo "${ECHO_T}$LD" >&6
+ else
+-  echo "$as_me:4785: result: no" >&5
++  echo "$as_me:4804: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -4791,7 +4810,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:4794: checking for $ac_word" >&5
++echo "$as_me:4813: 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
+@@ -4806,7 +4825,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:4809: found $ac_dir/$ac_word" >&5
++echo "$as_me:4828: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -4815,10 +4834,10 @@
+ fi
+ ac_ct_LD=$ac_cv_prog_ac_ct_LD
+ if test -n "$ac_ct_LD"; then
+-  echo "$as_me:4818: result: $ac_ct_LD" >&5
++  echo "$as_me:4837: result: $ac_ct_LD" >&5
+ echo "${ECHO_T}$ac_ct_LD" >&6
+ else
+-  echo "$as_me:4821: result: no" >&5
++  echo "$as_me:4840: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -4830,7 +4849,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:4833: checking for $ac_word" >&5
++echo "$as_me:4852: 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
+@@ -4845,7 +4864,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:4848: found $ac_dir/$ac_word" >&5
++echo "$as_me:4867: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -4853,10 +4872,10 @@
+ fi
+ AR=$ac_cv_prog_AR
+ if test -n "$AR"; then
+-  echo "$as_me:4856: result: $AR" >&5
++  echo "$as_me:4875: result: $AR" >&5
+ echo "${ECHO_T}$AR" >&6
+ else
+-  echo "$as_me:4859: result: no" >&5
++  echo "$as_me:4878: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -4865,7 +4884,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:4868: checking for $ac_word" >&5
++echo "$as_me:4887: 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
+@@ -4880,7 +4899,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:4883: found $ac_dir/$ac_word" >&5
++echo "$as_me:4902: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -4889,10 +4908,10 @@
+ fi
+ ac_ct_AR=$ac_cv_prog_ac_ct_AR
+ if test -n "$ac_ct_AR"; then
+-  echo "$as_me:4892: result: $ac_ct_AR" >&5
++  echo "$as_me:4911: result: $ac_ct_AR" >&5
+ echo "${ECHO_T}$ac_ct_AR" >&6
+ else
+-  echo "$as_me:4895: result: no" >&5
++  echo "$as_me:4914: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -4904,7 +4923,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:4907: checking for $ac_word" >&5
++echo "$as_me:4926: 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
+@@ -4919,7 +4938,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:4922: found $ac_dir/$ac_word" >&5
++echo "$as_me:4941: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -4927,10 +4946,10 @@
+ fi
+ NM=$ac_cv_prog_NM
+ if test -n "$NM"; then
+-  echo "$as_me:4930: result: $NM" >&5
++  echo "$as_me:4949: result: $NM" >&5
+ echo "${ECHO_T}$NM" >&6
+ else
+-  echo "$as_me:4933: result: no" >&5
++  echo "$as_me:4952: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -4939,7 +4958,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:4942: checking for $ac_word" >&5
++echo "$as_me:4961: 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
+@@ -4954,7 +4973,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:4957: found $ac_dir/$ac_word" >&5
++echo "$as_me:4976: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -4963,10 +4982,10 @@
+ fi
+ ac_ct_NM=$ac_cv_prog_ac_ct_NM
+ if test -n "$ac_ct_NM"; then
+-  echo "$as_me:4966: result: $ac_ct_NM" >&5
++  echo "$as_me:4985: result: $ac_ct_NM" >&5
+ echo "${ECHO_T}$ac_ct_NM" >&6
+ else
+-  echo "$as_me:4969: result: no" >&5
++  echo "$as_me:4988: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -4978,7 +4997,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:4981: checking for $ac_word" >&5
++echo "$as_me:5000: 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
+@@ -4993,7 +5012,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:4996: found $ac_dir/$ac_word" >&5
++echo "$as_me:5015: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -5001,10 +5020,10 @@
+ fi
+ AR=$ac_cv_prog_AR
+ if test -n "$AR"; then
+-  echo "$as_me:5004: result: $AR" >&5
++  echo "$as_me:5023: result: $AR" >&5
+ echo "${ECHO_T}$AR" >&6
+ else
+-  echo "$as_me:5007: result: no" >&5
++  echo "$as_me:5026: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -5013,7 +5032,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:5016: checking for $ac_word" >&5
++echo "$as_me:5035: 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
+@@ -5028,7 +5047,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:5031: found $ac_dir/$ac_word" >&5
++echo "$as_me:5050: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -5037,10 +5056,10 @@
+ fi
+ ac_ct_AR=$ac_cv_prog_ac_ct_AR
+ if test -n "$ac_ct_AR"; then
+-  echo "$as_me:5040: result: $ac_ct_AR" >&5
++  echo "$as_me:5059: result: $ac_ct_AR" >&5
+ echo "${ECHO_T}$ac_ct_AR" >&6
+ else
+-  echo "$as_me:5043: result: no" >&5
++  echo "$as_me:5062: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -5049,7 +5068,7 @@
+   AR="$ac_cv_prog_AR"
+ fi
+ 
+-echo "$as_me:5052: checking for options to update archives" >&5
++echo "$as_me:5071: 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
+@@ -5086,13 +5105,13 @@
+ 			rm -f conftest.a
+ 
+ 			cat >"conftest.$ac_ext" <<EOF
+-#line 5089 "configure"
++#line 5108 "configure"
+ int	testdata[3] = { 123, 456, 789 };
+ EOF
+-			if { (eval echo "$as_me:5092: \"$ac_compile\"") >&5
++			if { (eval echo "$as_me:5111: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:5095: \$? = $ac_status" >&5
++  echo "$as_me:5114: \$? = $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
+@@ -5103,7 +5122,7 @@
+ 			else
+ 				test -n "$verbose" && echo "	cannot compile test-program" 1>&6
+ 
+-echo "${as_me:-configure}:5106: testing cannot compile test-program ..." 1>&5
++echo "${as_me:-configure}:5125: testing cannot compile test-program ..." 1>&5
+ 
+ 				break
+ 			fi
+@@ -5113,7 +5132,7 @@
+ 	esac
+ 
+ fi
+-echo "$as_me:5116: result: $cf_cv_ar_flags" >&5
++echo "$as_me:5135: result: $cf_cv_ar_flags" >&5
+ echo "${ECHO_T}$cf_cv_ar_flags" >&6
+ 
+ if test -n "$ARFLAGS" ; then
+@@ -5124,7 +5143,7 @@
+ 	ARFLAGS=$cf_cv_ar_flags
+ fi
+ 
+-echo "$as_me:5127: checking if you have specified an install-prefix" >&5
++echo "$as_me:5146: 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.
+@@ -5137,7 +5156,7 @@
+ 		;;
+ 	esac
+ fi;
+-echo "$as_me:5140: result: $DESTDIR" >&5
++echo "$as_me:5159: result: $DESTDIR" >&5
+ echo "${ECHO_T}$DESTDIR" >&6
+ 
+ ###############################################################################
+@@ -5172,7 +5191,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:5175: checking for $ac_word" >&5
++echo "$as_me:5194: 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
+@@ -5187,7 +5206,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:5190: found $ac_dir/$ac_word" >&5
++echo "$as_me:5209: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -5195,10 +5214,10 @@
+ fi
+ BUILD_CC=$ac_cv_prog_BUILD_CC
+ if test -n "$BUILD_CC"; then
+-  echo "$as_me:5198: result: $BUILD_CC" >&5
++  echo "$as_me:5217: result: $BUILD_CC" >&5
+ echo "${ECHO_T}$BUILD_CC" >&6
+ else
+-  echo "$as_me:5201: result: no" >&5
++  echo "$as_me:5220: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -5207,12 +5226,12 @@
+ test -n "$BUILD_CC" || BUILD_CC="none"
+ 
+ fi;
+-	echo "$as_me:5210: checking for native build C compiler" >&5
++	echo "$as_me:5229: checking for native build C compiler" >&5
+ echo $ECHO_N "checking for native build C compiler... $ECHO_C" >&6
+-	echo "$as_me:5212: result: $BUILD_CC" >&5
++	echo "$as_me:5231: result: $BUILD_CC" >&5
+ echo "${ECHO_T}$BUILD_CC" >&6
+ 
+-	echo "$as_me:5215: checking for native build C preprocessor" >&5
++	echo "$as_me:5234: 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.
+@@ -5222,10 +5241,10 @@
+ else
+   BUILD_CPP='${BUILD_CC} -E'
+ fi;
+-	echo "$as_me:5225: result: $BUILD_CPP" >&5
++	echo "$as_me:5244: result: $BUILD_CPP" >&5
+ echo "${ECHO_T}$BUILD_CPP" >&6
+ 
+-	echo "$as_me:5228: checking for native build C flags" >&5
++	echo "$as_me:5247: 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.
+@@ -5233,10 +5252,10 @@
+   withval="$with_build_cflags"
+   BUILD_CFLAGS="$withval"
+ fi;
+-	echo "$as_me:5236: result: $BUILD_CFLAGS" >&5
++	echo "$as_me:5255: result: $BUILD_CFLAGS" >&5
+ echo "${ECHO_T}$BUILD_CFLAGS" >&6
+ 
+-	echo "$as_me:5239: checking for native build C preprocessor-flags" >&5
++	echo "$as_me:5258: 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.
+@@ -5244,10 +5263,10 @@
+   withval="$with_build_cppflags"
+   BUILD_CPPFLAGS="$withval"
+ fi;
+-	echo "$as_me:5247: result: $BUILD_CPPFLAGS" >&5
++	echo "$as_me:5266: result: $BUILD_CPPFLAGS" >&5
+ echo "${ECHO_T}$BUILD_CPPFLAGS" >&6
+ 
+-	echo "$as_me:5250: checking for native build linker-flags" >&5
++	echo "$as_me:5269: 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.
+@@ -5255,10 +5274,10 @@
+   withval="$with_build_ldflags"
+   BUILD_LDFLAGS="$withval"
+ fi;
+-	echo "$as_me:5258: result: $BUILD_LDFLAGS" >&5
++	echo "$as_me:5277: result: $BUILD_LDFLAGS" >&5
+ echo "${ECHO_T}$BUILD_LDFLAGS" >&6
+ 
+-	echo "$as_me:5261: checking for native build linker-libraries" >&5
++	echo "$as_me:5280: 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.
+@@ -5266,7 +5285,7 @@
+   withval="$with_build_libs"
+   BUILD_LIBS="$withval"
+ fi;
+-	echo "$as_me:5269: result: $BUILD_LIBS" >&5
++	echo "$as_me:5288: result: $BUILD_LIBS" >&5
+ echo "${ECHO_T}$BUILD_LIBS" >&6
+ 
+ 	# this assumes we're on Unix.
+@@ -5276,7 +5295,7 @@
+ 	: ${BUILD_CC:='${CC}'}
+ 
+ 	if { test "$BUILD_CC" = "$CC" || test "$BUILD_CC" = '${CC}'; } ; then
+-		{ { echo "$as_me:5279: error: Cross-build requires two compilers.
++		{ { echo "$as_me:5298: 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;}
+@@ -5301,7 +5320,7 @@
+ ### shared, for example.
+ cf_list_models=""
+ 
+-echo "$as_me:5304: checking if libtool -version-number should be used" >&5
++echo "$as_me:5323: 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.
+@@ -5318,7 +5337,7 @@
+ 	cf_libtool_version=yes
+ 
+ fi;
+-echo "$as_me:5321: result: $cf_libtool_version" >&5
++echo "$as_me:5340: result: $cf_libtool_version" >&5
+ echo "${ECHO_T}$cf_libtool_version" >&6
+ 
+ if test "$cf_libtool_version" = yes ; then
+@@ -5327,25 +5346,25 @@
+ 	LIBTOOL_VERSION="-version-info"
+ 	case "x$VERSION" in
+ 	(x)
+-		{ echo "$as_me:5330: WARNING: VERSION was not set" >&5
++		{ echo "$as_me:5349: 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}:5337: testing ABI_VERSION: $ABI_VERSION ..." 1>&5
++echo "${as_me:-configure}:5356: 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}:5344: testing ABI_VERSION: $ABI_VERSION ..." 1>&5
++echo "${as_me:-configure}:5363: testing ABI_VERSION: $ABI_VERSION ..." 1>&5
+ 
+ 		;;
+ 	(*)
+-		{ echo "$as_me:5348: WARNING: unexpected VERSION value: $VERSION" >&5
++		{ echo "$as_me:5367: WARNING: unexpected VERSION value: $VERSION" >&5
+ echo "$as_me: WARNING: unexpected VERSION value: $VERSION" >&2;}
+ 		;;
+ 	esac
+@@ -5367,7 +5386,7 @@
+ LIB_INSTALL=
+ LIB_UNINSTALL=
+ 
+-echo "$as_me:5370: checking if you want to build libraries with libtool" >&5
++echo "$as_me:5389: 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.
+@@ -5377,7 +5396,7 @@
+ else
+   with_libtool=no
+ fi;
+-echo "$as_me:5380: result: $with_libtool" >&5
++echo "$as_me:5399: result: $with_libtool" >&5
+ echo "${ECHO_T}$with_libtool" >&6
+ if test "$with_libtool" != "no"; then
+ 
+@@ -5408,7 +5427,7 @@
+ 	with_libtool=`echo "$with_libtool" | sed -e s%NONE%$cf_path_syntax%`
+ 	;;
+ (*)
+-	{ { echo "$as_me:5411: error: expected a pathname, not \"$with_libtool\"" >&5
++	{ { echo "$as_me:5430: error: expected a pathname, not \"$with_libtool\"" >&5
+ echo "$as_me: error: expected a pathname, not \"$with_libtool\"" >&2;}
+    { (exit 1); exit 1; }; }
+ 	;;
+@@ -5421,7 +5440,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:5424: checking for $ac_word" >&5
++echo "$as_me:5443: 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
+@@ -5436,7 +5455,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:5439: found $ac_dir/$ac_word" >&5
++echo "$as_me:5458: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -5444,10 +5463,10 @@
+ fi
+ LIBTOOL=$ac_cv_prog_LIBTOOL
+ if test -n "$LIBTOOL"; then
+-  echo "$as_me:5447: result: $LIBTOOL" >&5
++  echo "$as_me:5466: result: $LIBTOOL" >&5
+ echo "${ECHO_T}$LIBTOOL" >&6
+ else
+-  echo "$as_me:5450: result: no" >&5
++  echo "$as_me:5469: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -5460,7 +5479,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:5463: checking for $ac_word" >&5
++echo "$as_me:5482: 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
+@@ -5475,7 +5494,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:5478: found $ac_dir/$ac_word" >&5
++echo "$as_me:5497: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -5483,10 +5502,10 @@
+ fi
+ ac_ct_LIBTOOL=$ac_cv_prog_ac_ct_LIBTOOL
+ if test -n "$ac_ct_LIBTOOL"; then
+-  echo "$as_me:5486: result: $ac_ct_LIBTOOL" >&5
++  echo "$as_me:5505: result: $ac_ct_LIBTOOL" >&5
+ echo "${ECHO_T}$ac_ct_LIBTOOL" >&6
+ else
+-  echo "$as_me:5489: result: no" >&5
++  echo "$as_me:5508: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -5517,7 +5536,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:5520: checking for $ac_word" >&5
++echo "$as_me:5539: 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
+@@ -5532,7 +5551,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:5535: found $ac_dir/$ac_word" >&5
++echo "$as_me:5554: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -5540,10 +5559,10 @@
+ fi
+ LIBTOOL=$ac_cv_prog_LIBTOOL
+ if test -n "$LIBTOOL"; then
+-  echo "$as_me:5543: result: $LIBTOOL" >&5
++  echo "$as_me:5562: result: $LIBTOOL" >&5
+ echo "${ECHO_T}$LIBTOOL" >&6
+ else
+-  echo "$as_me:5546: result: no" >&5
++  echo "$as_me:5565: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -5556,7 +5575,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:5559: checking for $ac_word" >&5
++echo "$as_me:5578: 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
+@@ -5571,7 +5590,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:5574: found $ac_dir/$ac_word" >&5
++echo "$as_me:5593: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -5579,10 +5598,10 @@
+ fi
+ ac_ct_LIBTOOL=$ac_cv_prog_ac_ct_LIBTOOL
+ if test -n "$ac_ct_LIBTOOL"; then
+-  echo "$as_me:5582: result: $ac_ct_LIBTOOL" >&5
++  echo "$as_me:5601: result: $ac_ct_LIBTOOL" >&5
+ echo "${ECHO_T}$ac_ct_LIBTOOL" >&6
+ else
+-  echo "$as_me:5585: result: no" >&5
++  echo "$as_me:5604: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -5604,7 +5623,7 @@
+ 		fi
+ 	fi
+ 	if test -z "$LIBTOOL" ; then
+-		{ { echo "$as_me:5607: error: Cannot find libtool" >&5
++		{ { echo "$as_me:5626: error: Cannot find libtool" >&5
+ echo "$as_me: error: Cannot find libtool" >&2;}
+    { (exit 1); exit 1; }; }
+ 	fi
+@@ -5620,7 +5639,7 @@
+ 
+ if test -n "$LIBTOOL" && test "$LIBTOOL" != none
+ then
+-	echo "$as_me:5623: checking version of $LIBTOOL" >&5
++	echo "$as_me:5642: checking version of $LIBTOOL" >&5
+ echo $ECHO_N "checking version of $LIBTOOL... $ECHO_C" >&6
+ 
+ if test -n "$LIBTOOL" && test "$LIBTOOL" != none
+@@ -5631,7 +5650,7 @@
+ fi
+ test -z "$cf_cv_libtool_version" && unset cf_cv_libtool_version
+ 
+-	echo "$as_me:5634: result: $cf_cv_libtool_version" >&5
++	echo "$as_me:5653: result: $cf_cv_libtool_version" >&5
+ echo "${ECHO_T}$cf_cv_libtool_version" >&6
+ 	if test -n "$cf_cv_libtool_version"
+ 	then
+@@ -5640,18 +5659,18 @@
+ 		(*...GNU-libtool...*)
+ 			;;
+ 		(*)
+-			{ { echo "$as_me:5643: error: This is not GNU libtool" >&5
++			{ { echo "$as_me:5662: 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:5649: error: No version found for $LIBTOOL" >&5
++		{ { echo "$as_me:5668: 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:5654: error: GNU libtool has not been found" >&5
++	{ { echo "$as_me:5673: error: GNU libtool has not been found" >&5
+ echo "$as_me: error: GNU libtool has not been found" >&2;}
+    { (exit 1); exit 1; }; }
+ fi
+@@ -5687,7 +5706,7 @@
+ 
+ else
+ 
+-echo "$as_me:5690: checking if you want to build shared libraries" >&5
++echo "$as_me:5709: 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.
+@@ -5697,11 +5716,11 @@
+ else
+   with_shared=no
+ fi;
+-echo "$as_me:5700: result: $with_shared" >&5
++echo "$as_me:5719: 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:5704: checking if you want to build static libraries" >&5
++echo "$as_me:5723: 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.
+@@ -5711,11 +5730,11 @@
+ else
+   with_normal=yes
+ fi;
+-echo "$as_me:5714: result: $with_normal" >&5
++echo "$as_me:5733: 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:5718: checking if you want to build debug libraries" >&5
++echo "$as_me:5737: 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.
+@@ -5725,11 +5744,11 @@
+ else
+   with_debug=yes
+ fi;
+-echo "$as_me:5728: result: $with_debug" >&5
++echo "$as_me:5747: 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:5732: checking if you want to build profiling libraries" >&5
++echo "$as_me:5751: 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.
+@@ -5739,7 +5758,7 @@
+ else
+   with_profile=no
+ fi;
+-echo "$as_me:5742: result: $with_profile" >&5
++echo "$as_me:5761: result: $with_profile" >&5
+ echo "${ECHO_T}$with_profile" >&6
+ test "x$with_profile" = "xyes" && cf_list_models="$cf_list_models profile"
+ 
+@@ -5747,7 +5766,7 @@
+ 
+ if test "X$cf_with_cxx_binding" != Xno; then
+ if test "x$with_shared" = "xyes"; then
+-echo "$as_me:5750: checking if you want to build C++ shared libraries" >&5
++echo "$as_me:5769: 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.
+@@ -5757,26 +5776,26 @@
+ else
+   with_shared_cxx=no
+ fi;
+-echo "$as_me:5760: result: $with_shared_cxx" >&5
++echo "$as_me:5779: result: $with_shared_cxx" >&5
+ echo "${ECHO_T}$with_shared_cxx" >&6
+ fi
+ fi
+ 
+ ###############################################################################
+ 
+-echo "$as_me:5767: checking for specified models" >&5
++echo "$as_me:5786: 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:5771: result: $cf_list_models" >&5
++echo "$as_me:5790: 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:5776: checking for default model" >&5
++echo "$as_me:5795: 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:5779: result: $DFT_LWR_MODEL" >&5
++echo "$as_me:5798: result: $DFT_LWR_MODEL" >&5
+ echo "${ECHO_T}$DFT_LWR_MODEL" >&6
+ 
+ DFT_UPR_MODEL=`echo "$DFT_LWR_MODEL" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%`
+@@ -5790,7 +5809,7 @@
+ LIB_DIR=../lib
+ LIB_2ND=../../lib
+ 
+-echo "$as_me:5793: checking if you want to have a library-prefix" >&5
++echo "$as_me:5812: 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.
+@@ -5800,7 +5819,7 @@
+ else
+   with_lib_prefix=auto
+ fi;
+-echo "$as_me:5803: result: $with_lib_prefix" >&5
++echo "$as_me:5822: result: $with_lib_prefix" >&5
+ echo "${ECHO_T}$with_lib_prefix" >&6
+ 
+ if test "$with_lib_prefix" = auto
+@@ -5831,19 +5850,19 @@
+ 
+ LIB_SUFFIX=
+ 
+-	echo "$as_me:5834: checking for PATH separator" >&5
++	echo "$as_me:5853: 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:5841: result: $PATH_SEPARATOR" >&5
++	echo "$as_me:5860: result: $PATH_SEPARATOR" >&5
+ echo "${ECHO_T}$PATH_SEPARATOR" >&6
+ 
+ ###############################################################################
+ 
+-echo "$as_me:5846: checking if you want to build a separate terminfo library" >&5
++echo "$as_me:5865: 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.
+@@ -5853,10 +5872,10 @@
+ else
+   with_termlib=no
+ fi;
+-echo "$as_me:5856: result: $with_termlib" >&5
++echo "$as_me:5875: result: $with_termlib" >&5
+ echo "${ECHO_T}$with_termlib" >&6
+ 
+-echo "$as_me:5859: checking if you want to build a separate tic library" >&5
++echo "$as_me:5878: 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.
+@@ -5866,7 +5885,7 @@
+ else
+   with_ticlib=no
+ fi;
+-echo "$as_me:5869: result: $with_ticlib" >&5
++echo "$as_me:5888: result: $with_ticlib" >&5
+ echo "${ECHO_T}$with_ticlib" >&6
+ 
+ if test X"$CC_G_OPT" = X"" ; then
+@@ -5879,7 +5898,7 @@
+ 	test -n "$GXX" && test "x${ac_cv_prog_cxx_g}" != xyes && CXX_G_OPT=''
+ fi
+ 
+-echo "$as_me:5882: checking for default loader flags" >&5
++echo "$as_me:5901: 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=''   ;;
+@@ -5888,13 +5907,13 @@
+ (profile) LD_MODEL='-pg';;
+ (shared)  LD_MODEL=''   ;;
+ esac
+-echo "$as_me:5891: result: $LD_MODEL" >&5
++echo "$as_me:5910: result: $LD_MODEL" >&5
+ echo "${ECHO_T}$LD_MODEL" >&6
+ 
+ case "$DFT_LWR_MODEL" in
+ (shared)
+ 
+-echo "$as_me:5897: checking if rpath option should be used" >&5
++echo "$as_me:5916: 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.
+@@ -5904,10 +5923,10 @@
+ else
+   cf_cv_enable_rpath=no
+ fi;
+-echo "$as_me:5907: result: $cf_cv_enable_rpath" >&5
++echo "$as_me:5926: result: $cf_cv_enable_rpath" >&5
+ echo "${ECHO_T}$cf_cv_enable_rpath" >&6
+ 
+-echo "$as_me:5910: checking if shared libraries should be relinked during install" >&5
++echo "$as_me:5929: 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.
+@@ -5917,7 +5936,7 @@
+ else
+   cf_cv_do_relink=yes
+ fi;
+-echo "$as_me:5920: result: $cf_cv_do_relink" >&5
++echo "$as_me:5939: result: $cf_cv_do_relink" >&5
+ echo "${ECHO_T}$cf_cv_do_relink" >&6
+ 	;;
+ esac
+@@ -5928,7 +5947,7 @@
+ LD_RPATH_OPT=
+ if test "x$cf_cv_enable_rpath" != xno
+ then
+-	echo "$as_me:5931: checking for an rpath option" >&5
++	echo "$as_me:5950: checking for an rpath option" >&5
+ echo $ECHO_N "checking for an rpath option... $ECHO_C" >&6
+ 	case "$cf_cv_system_name" in
+ 	(irix*)
+@@ -5959,12 +5978,12 @@
+ 	(*)
+ 		;;
+ 	esac
+-	echo "$as_me:5962: result: $LD_RPATH_OPT" >&5
++	echo "$as_me:5981: result: $LD_RPATH_OPT" >&5
+ echo "${ECHO_T}$LD_RPATH_OPT" >&6
+ 
+ 	case "x$LD_RPATH_OPT" in
+ 	(x-R*)
+-		echo "$as_me:5967: checking if we need a space after rpath option" >&5
++		echo "$as_me:5986: 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"
+ 
+@@ -5985,7 +6004,7 @@
+ LIBS="$cf_add_libs"
+ 
+ 		cat >"conftest.$ac_ext" <<_ACEOF
+-#line 5988 "configure"
++#line 6007 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -5997,16 +6016,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:6000: \"$ac_link\"") >&5
++if { (eval echo "$as_me:6019: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:6003: \$? = $ac_status" >&5
++  echo "$as_me:6022: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:6006: \"$ac_try\"") >&5
++  { (eval echo "$as_me:6025: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:6009: \$? = $ac_status" >&5
++  echo "$as_me:6028: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_rpath_space=no
+ else
+@@ -6016,7 +6035,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ 		LIBS="$cf_save_LIBS"
+-		echo "$as_me:6019: result: $cf_rpath_space" >&5
++		echo "$as_me:6038: result: $cf_rpath_space" >&5
+ echo "${ECHO_T}$cf_rpath_space" >&6
+ 		test "$cf_rpath_space" = yes && LD_RPATH_OPT="$LD_RPATH_OPT "
+ 		;;
+@@ -6038,7 +6057,7 @@
+ 	cf_ld_rpath_opt=
+ 	test "$cf_cv_enable_rpath" = yes && cf_ld_rpath_opt="$LD_RPATH_OPT"
+ 
+-	echo "$as_me:6041: checking if release/abi version should be used for shared libs" >&5
++	echo "$as_me:6060: 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.
+@@ -6053,9 +6072,9 @@
+ 		cf_cv_shlib_version=$withval
+ 		;;
+ 	(*)
+-		echo "$as_me:6056: result: $withval" >&5
++		echo "$as_me:6075: result: $withval" >&5
+ echo "${ECHO_T}$withval" >&6
+-		{ { echo "$as_me:6058: error: option value must be one of: rel, abi, or auto" >&5
++		{ { echo "$as_me:6077: 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; }; }
+ 		;;
+@@ -6064,7 +6083,7 @@
+ else
+   cf_cv_shlib_version=auto
+ fi;
+-	echo "$as_me:6067: result: $cf_cv_shlib_version" >&5
++	echo "$as_me:6086: result: $cf_cv_shlib_version" >&5
+ echo "${ECHO_T}$cf_cv_shlib_version" >&6
+ 
+ 	cf_cv_rm_so_locs=no
+@@ -6087,14 +6106,14 @@
+ 
+ 	if test "$cf_try_fPIC" = yes
+ 	then
+-		echo "$as_me:6090: checking which $CC option to use" >&5
++		echo "$as_me:6109: 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 6097 "configure"
++#line 6116 "configure"
+ #include "confdefs.h"
+ #include <stdio.h>
+ int
+@@ -6106,16 +6125,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:6109: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:6128: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:6112: \$? = $ac_status" >&5
++  echo "$as_me:6131: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:6115: \"$ac_try\"") >&5
++  { (eval echo "$as_me:6134: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:6118: \$? = $ac_status" >&5
++  echo "$as_me:6137: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   break
+ else
+@@ -6124,7 +6143,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 		done
+-		echo "$as_me:6127: result: $CC_SHARED_OPTS" >&5
++		echo "$as_me:6146: result: $CC_SHARED_OPTS" >&5
+ echo "${ECHO_T}$CC_SHARED_OPTS" >&6
+ 		CFLAGS="$cf_save_CFLAGS"
+ 	fi
+@@ -6195,7 +6214,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:6198: checking if ld -search_paths_first works" >&5
++		echo "$as_me:6217: 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
+@@ -6204,7 +6223,7 @@
+ 			cf_save_LDFLAGS=$LDFLAGS
+ 			LDFLAGS="$LDFLAGS -Wl,-search_paths_first"
+ 			cat >"conftest.$ac_ext" <<_ACEOF
+-#line 6207 "configure"
++#line 6226 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -6216,16 +6235,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:6219: \"$ac_link\"") >&5
++if { (eval echo "$as_me:6238: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:6222: \$? = $ac_status" >&5
++  echo "$as_me:6241: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:6225: \"$ac_try\"") >&5
++  { (eval echo "$as_me:6244: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:6228: \$? = $ac_status" >&5
++  echo "$as_me:6247: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_ldflags_search_paths_first=yes
+ else
+@@ -6236,7 +6255,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ 				LDFLAGS=$cf_save_LDFLAGS
+ fi
+-echo "$as_me:6239: result: $cf_cv_ldflags_search_paths_first" >&5
++echo "$as_me:6258: 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"
+@@ -6586,7 +6605,7 @@
+ 			do
+ 				CFLAGS="$cf_shared_opts $cf_save_CFLAGS"
+ 				cat >"conftest.$ac_ext" <<_ACEOF
+-#line 6589 "configure"
++#line 6608 "configure"
+ #include "confdefs.h"
+ #include <stdio.h>
+ int
+@@ -6598,16 +6617,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:6601: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:6620: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:6604: \$? = $ac_status" >&5
++  echo "$as_me:6623: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:6607: \"$ac_try\"") >&5
++  { (eval echo "$as_me:6626: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:6610: \$? = $ac_status" >&5
++  echo "$as_me:6629: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   break
+ else
+@@ -6644,7 +6663,7 @@
+ 			test "$cf_cv_do_symlinks" = no && cf_cv_do_symlinks=yes
+ 			;;
+ 		(*)
+-			{ echo "$as_me:6647: WARNING: ignored --with-shlib-version" >&5
++			{ echo "$as_me:6666: WARNING: ignored --with-shlib-version" >&5
+ echo "$as_me: WARNING: ignored --with-shlib-version" >&2;}
+ 			;;
+ 		esac
+@@ -6654,7 +6673,7 @@
+ 	if test -n "$cf_try_cflags"
+ 	then
+ cat > conftest.$ac_ext <<EOF
+-#line 6657 "${as_me:-configure}"
++#line 6676 "${as_me:-configure}"
+ #include <stdio.h>
+ int main(int argc, char *argv[])
+ {
+@@ -6666,18 +6685,18 @@
+ 		for cf_opt in $cf_try_cflags
+ 		do
+ 			CFLAGS="$cf_save_CFLAGS -$cf_opt"
+-			echo "$as_me:6669: checking if CFLAGS option -$cf_opt works" >&5
++			echo "$as_me:6688: 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:6671: \"$ac_compile\"") >&5
++			if { (eval echo "$as_me:6690: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:6674: \$? = $ac_status" >&5
++  echo "$as_me:6693: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; then
+-				echo "$as_me:6676: result: yes" >&5
++				echo "$as_me:6695: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ 				cf_save_CFLAGS="$CFLAGS"
+ 			else
+-				echo "$as_me:6680: result: no" >&5
++				echo "$as_me:6699: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ 			fi
+ 		done
+@@ -6692,17 +6711,17 @@
+ 
+ 	test -n "$verbose" && echo "	CC_SHARED_OPTS: $CC_SHARED_OPTS" 1>&6
+ 
+-echo "${as_me:-configure}:6695: testing CC_SHARED_OPTS: $CC_SHARED_OPTS ..." 1>&5
++echo "${as_me:-configure}:6714: 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}:6699: testing MK_SHARED_LIB:  $MK_SHARED_LIB ..." 1>&5
++echo "${as_me:-configure}:6718: testing MK_SHARED_LIB:  $MK_SHARED_LIB ..." 1>&5
+ 
+ for model in $cf_list_models ; do
+ 	case "$model" in
+ 	(libtool)
+ 
+-echo "$as_me:6705: checking for additional libtool options" >&5
++echo "$as_me:6724: 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.
+@@ -6712,7 +6731,7 @@
+ else
+   with_libtool_opts=no
+ fi;
+-echo "$as_me:6715: result: $with_libtool_opts" >&5
++echo "$as_me:6734: result: $with_libtool_opts" >&5
+ echo "${ECHO_T}$with_libtool_opts" >&6
+ 
+ case .$with_libtool_opts in
+@@ -6723,7 +6742,7 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:6726: checking if exported-symbols file should be used" >&5
++echo "$as_me:6745: 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.
+@@ -6738,7 +6757,7 @@
+ 	with_export_syms='${top_srcdir}/package/${PACKAGE}.sym'
+ 
+ fi
+-echo "$as_me:6741: result: $with_export_syms" >&5
++echo "$as_me:6760: result: $with_export_syms" >&5
+ echo "${ECHO_T}$with_export_syms" >&6
+ if test "x$with_export_syms" != xno
+ then
+@@ -6749,15 +6768,15 @@
+ 		;;
+ 	(shared)
+ 		if test "$CC_SHARED_OPTS" = "unknown"; then
+-			{ { echo "$as_me:6752: error: Shared libraries are not supported in this version" >&5
++			{ { echo "$as_me:6771: 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:6757: checking if current CFLAGS link properly" >&5
++		echo "$as_me:6776: 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 6760 "configure"
++#line 6779 "configure"
+ #include "confdefs.h"
+ #include <stdio.h>
+ int
+@@ -6769,16 +6788,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:6772: \"$ac_link\"") >&5
++if { (eval echo "$as_me:6791: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:6775: \$? = $ac_status" >&5
++  echo "$as_me:6794: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:6778: \"$ac_try\"") >&5
++  { (eval echo "$as_me:6797: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:6781: \$? = $ac_status" >&5
++  echo "$as_me:6800: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cflags_work=yes
+ else
+@@ -6787,18 +6806,18 @@
+ cf_cflags_work=no
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+-		echo "$as_me:6790: result: $cf_cflags_work" >&5
++		echo "$as_me:6809: 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}:6796: testing try to work around by appending shared-options ..." 1>&5
++echo "${as_me:-configure}:6815: testing try to work around by appending shared-options ..." 1>&5
+ 
+ 			CFLAGS="$CFLAGS $CC_SHARED_OPTS"
+ 		fi
+ 
+-echo "$as_me:6801: checking if versioned-symbols file should be used" >&5
++echo "$as_me:6820: 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.
+@@ -6816,18 +6835,18 @@
+ (xno)
+ 	;;
+ (x/*)
+-	test -f "$with_versioned_syms" || { { echo "$as_me:6819: error: expected a filename: $with_versioned_syms" >&5
++	test -f "$with_versioned_syms" || { { echo "$as_me:6838: 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:6824: error: expected a filename: $with_versioned_syms" >&5
++	test -f "$with_versioned_syms" || { { echo "$as_me:6843: 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:6830: result: $with_versioned_syms" >&5
++echo "$as_me:6849: result: $with_versioned_syms" >&5
+ echo "${ECHO_T}$with_versioned_syms" >&6
+ 
+ RESULTING_SYMS=
+@@ -6843,7 +6862,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}:6846: testing MK_SHARED_LIB:  $MK_SHARED_LIB ..." 1>&5
++echo "${as_me:-configure}:6865: testing MK_SHARED_LIB:  $MK_SHARED_LIB ..." 1>&5
+ 
+ 		;;
+ 	(*-dy\ *)
+@@ -6851,11 +6870,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}:6854: testing MK_SHARED_LIB:  $MK_SHARED_LIB ..." 1>&5
++echo "${as_me:-configure}:6873: testing MK_SHARED_LIB:  $MK_SHARED_LIB ..." 1>&5
+ 
+ 		;;
+ 	(*)
+-		{ echo "$as_me:6858: WARNING: this system does not support versioned-symbols" >&5
++		{ echo "$as_me:6877: WARNING: this system does not support versioned-symbols" >&5
+ echo "$as_me: WARNING: this system does not support versioned-symbols" >&2;}
+ 		;;
+ 	esac
+@@ -6867,7 +6886,7 @@
+ 	# symbols.
+ 	if test "x$VERSIONED_SYMS" != "x"
+ 	then
+-		echo "$as_me:6870: checking if wildcards can be used to selectively omit symbols" >&5
++		echo "$as_me:6889: 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
+ 
+@@ -6904,7 +6923,7 @@
+ } submodule_1.0;
+ EOF
+ 		cat >conftest.$ac_ext <<EOF
+-#line 6907 "configure"
++#line 6926 "configure"
+ int	_ismissing(void) { return 1; }
+ int	_localf1(void) { return 1; }
+ int	_localf2(void) { return 2; }
+@@ -6935,7 +6954,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:6938: result: $WILDCARD_SYMS" >&5
++		echo "$as_me:6957: result: $WILDCARD_SYMS" >&5
+ echo "${ECHO_T}$WILDCARD_SYMS" >&6
+ 		rm -f conftest.*
+ 	fi
+@@ -6948,7 +6967,7 @@
+ ### Checks for special libraries, must be done up-front.
+ SHLIB_LIST=""
+ 
+-echo "$as_me:6951: checking if you want to link with the GPM mouse library" >&5
++echo "$as_me:6970: 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.
+@@ -6958,27 +6977,27 @@
+ else
+   with_gpm=maybe
+ fi;
+-echo "$as_me:6961: result: $with_gpm" >&5
++echo "$as_me:6980: result: $with_gpm" >&5
+ echo "${ECHO_T}$with_gpm" >&6
+ 
+ if test "$with_gpm" != no ; then
+-	echo "$as_me:6965: checking for gpm.h" >&5
++	echo "$as_me:6984: 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 6971 "configure"
++#line 6990 "configure"
+ #include "confdefs.h"
+ #include <gpm.h>
+ _ACEOF
+-if { (eval echo "$as_me:6975: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:6994: \"$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:6981: \$? = $ac_status" >&5
++  echo "$as_me:7000: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -6997,7 +7016,7 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:7000: result: $ac_cv_header_gpm_h" >&5
++echo "$as_me:7019: 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
+ 
+@@ -7008,7 +7027,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}:7011: testing assuming we really have GPM library ..." 1>&5
++echo "${as_me:-configure}:7030: testing assuming we really have GPM library ..." 1>&5
+ 
+ cat >>confdefs.h <<\EOF
+ #define HAVE_LIBGPM 1
+@@ -7016,7 +7035,7 @@
+ 
+ 			with_gpm=yes
+ 		else
+-			echo "$as_me:7019: checking for Gpm_Open in -lgpm" >&5
++			echo "$as_me:7038: 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
+@@ -7024,7 +7043,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lgpm  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 7027 "configure"
++#line 7046 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -7043,16 +7062,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:7046: \"$ac_link\"") >&5
++if { (eval echo "$as_me:7065: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:7049: \$? = $ac_status" >&5
++  echo "$as_me:7068: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:7052: \"$ac_try\"") >&5
++  { (eval echo "$as_me:7071: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:7055: \$? = $ac_status" >&5
++  echo "$as_me:7074: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_gpm_Gpm_Open=yes
+ else
+@@ -7063,18 +7082,18 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:7066: result: $ac_cv_lib_gpm_Gpm_Open" >&5
++echo "$as_me:7085: 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:7073: WARNING: Cannot link with GPM library" >&5
++					{ echo "$as_me:7092: WARNING: Cannot link with GPM library" >&5
+ echo "$as_me: WARNING: Cannot link with GPM library" >&2;}
+ 					with_gpm=no
+ 				else
+-					{ { echo "$as_me:7077: error: Cannot link with GPM library" >&5
++					{ { echo "$as_me:7096: error: Cannot link with GPM library" >&5
+ echo "$as_me: error: Cannot link with GPM library" >&2;}
+    { (exit 1); exit 1; }; }
+ 				fi
+@@ -7085,7 +7104,7 @@
+ 
+ else
+ 
+-		test "$with_gpm" != maybe && { echo "$as_me:7088: WARNING: Cannot find GPM header" >&5
++		test "$with_gpm" != maybe && { echo "$as_me:7107: WARNING: Cannot find GPM header" >&5
+ echo "$as_me: WARNING: Cannot find GPM header" >&2;}
+ 		with_gpm=no
+ 
+@@ -7094,7 +7113,7 @@
+ fi
+ 
+ if test "$with_gpm" != no ; then
+-	echo "$as_me:7097: checking if you want to load GPM dynamically" >&5
++	echo "$as_me:7116: 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.
+@@ -7104,18 +7123,18 @@
+ else
+   with_dlsym=yes
+ fi;
+-	echo "$as_me:7107: result: $with_dlsym" >&5
++	echo "$as_me:7126: result: $with_dlsym" >&5
+ echo "${ECHO_T}$with_dlsym" >&6
+ 	if test "x$with_dlsym" = xyes ; then
+ 
+ cf_have_dlsym=no
+-echo "$as_me:7112: checking for dlsym" >&5
++echo "$as_me:7131: 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 7118 "configure"
++#line 7137 "configure"
+ #include "confdefs.h"
+ #define dlsym autoconf_temporary
+ #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -7146,16 +7165,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:7149: \"$ac_link\"") >&5
++if { (eval echo "$as_me:7168: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:7152: \$? = $ac_status" >&5
++  echo "$as_me:7171: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:7155: \"$ac_try\"") >&5
++  { (eval echo "$as_me:7174: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:7158: \$? = $ac_status" >&5
++  echo "$as_me:7177: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_func_dlsym=yes
+ else
+@@ -7165,14 +7184,14 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:7168: result: $ac_cv_func_dlsym" >&5
++echo "$as_me:7187: 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:7175: checking for dlsym in -ldl" >&5
++echo "$as_me:7194: 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
+@@ -7180,7 +7199,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-ldl  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 7183 "configure"
++#line 7202 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -7199,16 +7218,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:7202: \"$ac_link\"") >&5
++if { (eval echo "$as_me:7221: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:7205: \$? = $ac_status" >&5
++  echo "$as_me:7224: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:7208: \"$ac_try\"") >&5
++  { (eval echo "$as_me:7227: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:7211: \$? = $ac_status" >&5
++  echo "$as_me:7230: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_dl_dlsym=yes
+ else
+@@ -7219,7 +7238,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:7222: result: $ac_cv_lib_dl_dlsym" >&5
++echo "$as_me:7241: 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
+ 
+@@ -7248,10 +7267,10 @@
+ LIBS="$cf_add_libs"
+  }
+ 
+-	echo "$as_me:7251: checking whether able to link to dl*() functions" >&5
++	echo "$as_me:7270: 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 7254 "configure"
++#line 7273 "configure"
+ #include "confdefs.h"
+ #include <dlfcn.h>
+ int
+@@ -7269,16 +7288,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:7272: \"$ac_link\"") >&5
++if { (eval echo "$as_me:7291: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:7275: \$? = $ac_status" >&5
++  echo "$as_me:7294: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:7278: \"$ac_try\"") >&5
++  { (eval echo "$as_me:7297: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:7281: \$? = $ac_status" >&5
++  echo "$as_me:7300: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+ 
+ cat >>confdefs.h <<\EOF
+@@ -7289,15 +7308,15 @@
+   echo "$as_me: failed program was:" >&5
+ cat "conftest.$ac_ext" >&5
+ 
+-		{ { echo "$as_me:7292: error: Cannot link test program for libdl" >&5
++		{ { echo "$as_me:7311: 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:7297: result: ok" >&5
++	echo "$as_me:7316: result: ok" >&5
+ echo "${ECHO_T}ok" >&6
+ else
+-	{ { echo "$as_me:7300: error: Cannot find dlsym function" >&5
++	{ { echo "$as_me:7319: error: Cannot find dlsym function" >&5
+ echo "$as_me: error: Cannot find dlsym function" >&2;}
+    { (exit 1); exit 1; }; }
+ fi
+@@ -7305,12 +7324,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}:7308: testing assuming soname for gpm is $with_gpm ..." 1>&5
++echo "${as_me:-configure}:7327: testing assuming soname for gpm is $with_gpm ..." 1>&5
+ 
+ 			cf_cv_gpm_soname="$with_gpm"
+ 		else
+ 
+-echo "$as_me:7313: checking for soname of gpm library" >&5
++echo "$as_me:7332: 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
+@@ -7344,15 +7363,15 @@
+ done
+ LIBS="$cf_add_libs"
+ 
+-	if { (eval echo "$as_me:7347: \"$ac_compile\"") >&5
++	if { (eval echo "$as_me:7366: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:7350: \$? = $ac_status" >&5
++  echo "$as_me:7369: \$? = $ac_status" >&5
+   (exit "$ac_status"); } ; then
+-		if { (eval echo "$as_me:7352: \"$ac_link\"") >&5
++		if { (eval echo "$as_me:7371: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:7355: \$? = $ac_status" >&5
++  echo "$as_me:7374: \$? = $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
+@@ -7363,7 +7382,7 @@
+ fi
+ 
+ fi
+-echo "$as_me:7366: result: $cf_cv_gpm_soname" >&5
++echo "$as_me:7385: result: $cf_cv_gpm_soname" >&5
+ echo "${ECHO_T}$cf_cv_gpm_soname" >&6
+ 
+ 		fi
+@@ -7431,7 +7450,7 @@
+ #define HAVE_LIBGPM 1
+ EOF
+ 
+-echo "$as_me:7434: checking for Gpm_Wgetch in -lgpm" >&5
++echo "$as_me:7453: 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
+@@ -7439,7 +7458,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lgpm  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 7442 "configure"
++#line 7461 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -7458,16 +7477,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:7461: \"$ac_link\"") >&5
++if { (eval echo "$as_me:7480: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:7464: \$? = $ac_status" >&5
++  echo "$as_me:7483: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:7467: \"$ac_try\"") >&5
++  { (eval echo "$as_me:7486: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:7470: \$? = $ac_status" >&5
++  echo "$as_me:7489: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_gpm_Gpm_Wgetch=yes
+ else
+@@ -7478,11 +7497,11 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:7481: result: $ac_cv_lib_gpm_Gpm_Wgetch" >&5
++echo "$as_me:7500: 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:7485: checking if GPM is weakly bound to curses library" >&5
++echo "$as_me:7504: 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
+@@ -7506,15 +7525,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:7509: \"$ac_compile\"") >&5
++	if { (eval echo "$as_me:7528: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:7512: \$? = $ac_status" >&5
++  echo "$as_me:7531: \$? = $ac_status" >&5
+   (exit "$ac_status"); } ; then
+-		if { (eval echo "$as_me:7514: \"$ac_link\"") >&5
++		if { (eval echo "$as_me:7533: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:7517: \$? = $ac_status" >&5
++  echo "$as_me:7536: \$? = $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
+@@ -7526,11 +7545,11 @@
+ fi
+ 
+ fi
+-echo "$as_me:7529: result: $cf_cv_check_gpm_wgetch" >&5
++echo "$as_me:7548: 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:7533: WARNING: GPM library is already linked with curses - read the FAQ" >&5
++	{ echo "$as_me:7552: 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
+ 
+@@ -7538,7 +7557,7 @@
+ 
+ fi
+ 
+-echo "$as_me:7541: checking if you want to use PCRE2 for regular-expressions" >&5
++echo "$as_me:7560: 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.
+@@ -7547,7 +7566,7 @@
+ 
+ fi;
+ test -z "$with_pcre2" && with_pcre2=no
+-echo "$as_me:7550: result: $with_pcre2" >&5
++echo "$as_me:7569: result: $with_pcre2" >&5
+ echo "${ECHO_T}$with_pcre2" >&6
+ 
+ if test "x$with_pcre2" != xno ; then
+@@ -7558,17 +7577,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}:7561: testing found package $cf_with_pcre2 ..." 1>&5
++echo "${as_me:-configure}:7580: 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}:7567: testing package $cf_with_pcre2 CFLAGS: $cf_pkgconfig_incs ..." 1>&5
++echo "${as_me:-configure}:7586: 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}:7571: testing package $cf_with_pcre2 LIBS: $cf_pkgconfig_libs ..." 1>&5
++echo "${as_me:-configure}:7590: testing package $cf_with_pcre2 LIBS: $cf_pkgconfig_libs ..." 1>&5
+ 
+ cf_fix_cppflags=no
+ cf_new_cflags=
+@@ -7692,7 +7711,7 @@
+ fi
+ 
+ 	done
+-	cf_with_pcre2_ok=yes || { { echo "$as_me:7695: error: Cannot find PCRE2 library" >&5
++	cf_with_pcre2_ok=yes || { { echo "$as_me:7714: error: Cannot find PCRE2 library" >&5
+ echo "$as_me: error: Cannot find PCRE2 library" >&2;}
+    { (exit 1); exit 1; }; }
+ 
+@@ -7705,7 +7724,7 @@
+ 	(*pcre2-posix*|*pcreposix*)
+ 		;;
+ 	(*)
+-		echo "$as_me:7708: checking for regcomp in -lpcre2-posix" >&5
++		echo "$as_me:7727: 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
+@@ -7713,7 +7732,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lpcre2-posix  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 7716 "configure"
++#line 7735 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -7732,16 +7751,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:7735: \"$ac_link\"") >&5
++if { (eval echo "$as_me:7754: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:7738: \$? = $ac_status" >&5
++  echo "$as_me:7757: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:7741: \"$ac_try\"") >&5
++  { (eval echo "$as_me:7760: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:7744: \$? = $ac_status" >&5
++  echo "$as_me:7763: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_pcre2_posix_regcomp=yes
+ else
+@@ -7752,7 +7771,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:7755: result: $ac_cv_lib_pcre2_posix_regcomp" >&5
++echo "$as_me:7774: 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
+ 
+@@ -7773,7 +7792,7 @@
+ LIBS="$cf_add_libs"
+ 
+ else
+-  echo "$as_me:7776: checking for regcomp in -lpcreposix" >&5
++  echo "$as_me:7795: 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
+@@ -7781,7 +7800,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lpcreposix  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 7784 "configure"
++#line 7803 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -7800,16 +7819,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:7803: \"$ac_link\"") >&5
++if { (eval echo "$as_me:7822: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:7806: \$? = $ac_status" >&5
++  echo "$as_me:7825: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:7809: \"$ac_try\"") >&5
++  { (eval echo "$as_me:7828: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:7812: \$? = $ac_status" >&5
++  echo "$as_me:7831: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_pcreposix_regcomp=yes
+ else
+@@ -7820,7 +7839,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:7823: result: $ac_cv_lib_pcreposix_regcomp" >&5
++echo "$as_me:7842: 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
+ 
+@@ -7841,7 +7860,7 @@
+ LIBS="$cf_add_libs"
+ 
+ else
+-  { { echo "$as_me:7844: error: Cannot find PCRE2 POSIX library" >&5
++  { { echo "$as_me:7863: error: Cannot find PCRE2 POSIX library" >&5
+ echo "$as_me: error: Cannot find PCRE2 POSIX library" >&2;}
+    { (exit 1); exit 1; }; }
+ fi
+@@ -7856,23 +7875,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:7859: checking for $ac_header" >&5
++echo "$as_me:7878: 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 7865 "configure"
++#line 7884 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:7869: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:7888: \"$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:7875: \$? = $ac_status" >&5
++  echo "$as_me:7894: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -7891,7 +7910,7 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:7894: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
++echo "$as_me:7913: 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
+@@ -7904,13 +7923,13 @@
+ for ac_func in PCRE2regcomp
+ do
+ as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+-echo "$as_me:7907: checking for $ac_func" >&5
++echo "$as_me:7926: 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 7913 "configure"
++#line 7932 "configure"
+ #include "confdefs.h"
+ #define $ac_func autoconf_temporary
+ #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -7941,16 +7960,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:7944: \"$ac_link\"") >&5
++if { (eval echo "$as_me:7963: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:7947: \$? = $ac_status" >&5
++  echo "$as_me:7966: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:7950: \"$ac_try\"") >&5
++  { (eval echo "$as_me:7969: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:7953: \$? = $ac_status" >&5
++  echo "$as_me:7972: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   eval "$as_ac_var=yes"
+ else
+@@ -7960,7 +7979,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:7963: result: `eval echo '${'"$as_ac_var"'}'`" >&5
++echo "$as_me:7982: 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
+@@ -7974,7 +7993,7 @@
+ 
+ # not everyone has "test -c"
+ if test -c /dev/sysmouse 2>/dev/null ; then
+-echo "$as_me:7977: checking if you want to use sysmouse" >&5
++echo "$as_me:7996: 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.
+@@ -7986,7 +8005,7 @@
+ fi;
+ 	if test "$cf_with_sysmouse" != no ; then
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 7989 "configure"
++#line 8008 "configure"
+ #include "confdefs.h"
+ 
+ #include <osreldate.h>
+@@ -8009,16 +8028,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:8012: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:8031: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:8015: \$? = $ac_status" >&5
++  echo "$as_me:8034: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:8018: \"$ac_try\"") >&5
++  { (eval echo "$as_me:8037: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:8021: \$? = $ac_status" >&5
++  echo "$as_me:8040: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_with_sysmouse=yes
+ else
+@@ -8028,7 +8047,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 	fi
+-echo "$as_me:8031: result: $cf_with_sysmouse" >&5
++echo "$as_me:8050: result: $cf_with_sysmouse" >&5
+ echo "${ECHO_T}$cf_with_sysmouse" >&6
+ test "$cf_with_sysmouse" = yes &&
+ cat >>confdefs.h <<\EOF
+@@ -8038,7 +8057,7 @@
+ fi
+ 
+ # pretend that ncurses==ncursesw==ncursest
+-echo "$as_me:8041: checking if you want to disable library suffixes" >&5
++echo "$as_me:8060: 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.
+@@ -8055,13 +8074,13 @@
+ 	disable_lib_suffixes=no
+ 
+ fi;
+-echo "$as_me:8058: result: $disable_lib_suffixes" >&5
++echo "$as_me:8077: 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:8064: checking if rpath-hack should be disabled" >&5
++echo "$as_me:8083: 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.
+@@ -8079,22 +8098,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:8082: result: $cf_disable_rpath_hack" >&5
++echo "$as_me:8101: result: $cf_disable_rpath_hack" >&5
+ echo "${ECHO_T}$cf_disable_rpath_hack" >&6
+ 
+ if test "$enable_rpath_hack" = yes ; then
+ 
+-echo "$as_me:8087: checking for updated LDFLAGS" >&5
++echo "$as_me:8106: 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:8090: result: maybe" >&5
++	echo "$as_me:8109: 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:8097: checking for $ac_word" >&5
++echo "$as_me:8116: 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
+@@ -8109,7 +8128,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:8112: found $ac_dir/$ac_word" >&5
++echo "$as_me:8131: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -8117,10 +8136,10 @@
+ fi
+ cf_ldd_prog=$ac_cv_prog_cf_ldd_prog
+ if test -n "$cf_ldd_prog"; then
+-  echo "$as_me:8120: result: $cf_ldd_prog" >&5
++  echo "$as_me:8139: result: $cf_ldd_prog" >&5
+ echo "${ECHO_T}$cf_ldd_prog" >&6
+ else
+-  echo "$as_me:8123: result: no" >&5
++  echo "$as_me:8142: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -8134,7 +8153,7 @@
+ 		cf_rpath_oops=
+ 
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 8137 "configure"
++#line 8156 "configure"
+ #include "confdefs.h"
+ #include <stdio.h>
+ int
+@@ -8146,16 +8165,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:8149: \"$ac_link\"") >&5
++if { (eval echo "$as_me:8168: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:8152: \$? = $ac_status" >&5
++  echo "$as_me:8171: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:8155: \"$ac_try\"") >&5
++  { (eval echo "$as_me:8174: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:8158: \$? = $ac_status" >&5
++  echo "$as_me:8177: \$? = $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`
+@@ -8183,7 +8202,7 @@
+ 					then
+ 						test -n "$verbose" && echo "	...adding -L$cf_rpath_dir/lib to LDFLAGS for $cf_rpath_src" 1>&6
+ 
+-echo "${as_me:-configure}:8186: testing ...adding -L$cf_rpath_dir/lib to LDFLAGS for $cf_rpath_src ..." 1>&5
++echo "${as_me:-configure}:8205: testing ...adding -L$cf_rpath_dir/lib to LDFLAGS for $cf_rpath_src ..." 1>&5
+ 
+ 						LDFLAGS="$LDFLAGS -L$cf_rpath_dir/lib"
+ 						break
+@@ -8195,11 +8214,11 @@
+ 
+ 	test -n "$verbose" && echo "	...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:8198: testing ...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
++echo "${as_me:-configure}:8217: testing ...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
+ 
+ test -n "$verbose" && echo "	...checking LDFLAGS $LDFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:8202: testing ...checking LDFLAGS $LDFLAGS ..." 1>&5
++echo "${as_me:-configure}:8221: testing ...checking LDFLAGS $LDFLAGS ..." 1>&5
+ 
+ cf_rpath_dst=
+ for cf_rpath_src in $LDFLAGS
+@@ -8236,7 +8255,7 @@
+ 			then
+ 				test -n "$verbose" && echo "	...Filter $cf_rpath_src ->$cf_rpath_tmp" 1>&6
+ 
+-echo "${as_me:-configure}:8239: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
++echo "${as_me:-configure}:8258: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
+ 
+ 				EXTRA_LDFLAGS="$cf_rpath_tmp $EXTRA_LDFLAGS"
+ 			fi
+@@ -8249,11 +8268,11 @@
+ 
+ test -n "$verbose" && echo "	...checked LDFLAGS $LDFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:8252: testing ...checked LDFLAGS $LDFLAGS ..." 1>&5
++echo "${as_me:-configure}:8271: testing ...checked LDFLAGS $LDFLAGS ..." 1>&5
+ 
+ test -n "$verbose" && echo "	...checking LIBS $LIBS" 1>&6
+ 
+-echo "${as_me:-configure}:8256: testing ...checking LIBS $LIBS ..." 1>&5
++echo "${as_me:-configure}:8275: testing ...checking LIBS $LIBS ..." 1>&5
+ 
+ cf_rpath_dst=
+ for cf_rpath_src in $LIBS
+@@ -8290,7 +8309,7 @@
+ 			then
+ 				test -n "$verbose" && echo "	...Filter $cf_rpath_src ->$cf_rpath_tmp" 1>&6
+ 
+-echo "${as_me:-configure}:8293: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
++echo "${as_me:-configure}:8312: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
+ 
+ 				EXTRA_LDFLAGS="$cf_rpath_tmp $EXTRA_LDFLAGS"
+ 			fi
+@@ -8303,14 +8322,14 @@
+ 
+ test -n "$verbose" && echo "	...checked LIBS $LIBS" 1>&6
+ 
+-echo "${as_me:-configure}:8306: testing ...checked LIBS $LIBS ..." 1>&5
++echo "${as_me:-configure}:8325: testing ...checked LIBS $LIBS ..." 1>&5
+ 
+ 	test -n "$verbose" && echo "	...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:8310: testing ...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
++echo "${as_me:-configure}:8329: testing ...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
+ 
+ else
+-	echo "$as_me:8313: result: no" >&5
++	echo "$as_me:8332: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -8324,7 +8343,7 @@
+ EXTRA_PKG_LDFLAGS="$LDFLAGS $EXTRA_LDFLAGS"
+ if test -n "$EXTRA_PKG_LDFLAGS"
+ then
+-	echo "$as_me:8327: checking if you want to disable extra LDFLAGS for package-scripts" >&5
++	echo "$as_me:8346: 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.
+@@ -8341,7 +8360,7 @@
+ 	disable_pkg_ldflags=no
+ 
+ fi;
+-	echo "$as_me:8344: result: $disable_pkg_ldflags" >&5
++	echo "$as_me:8363: result: $disable_pkg_ldflags" >&5
+ echo "${ECHO_T}$disable_pkg_ldflags" >&6
+ 	test "$disable_pkg_ldflags" = yes && EXTRA_PKG_LDFLAGS=
+ fi
+@@ -8349,7 +8368,7 @@
+ ###############################################################################
+ 
+ ###	use option --with-extra-suffix to append suffix to headers and libraries
+-echo "$as_me:8352: checking if you wish to append extra suffix to header/library paths" >&5
++echo "$as_me:8371: 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=
+ 
+@@ -8368,11 +8387,11 @@
+ 	esac
+ 
+ fi;
+-echo "$as_me:8371: result: $EXTRA_SUFFIX" >&5
++echo "$as_me:8390: result: $EXTRA_SUFFIX" >&5
+ echo "${ECHO_T}$EXTRA_SUFFIX" >&6
+ 
+ ###	use option --disable-overwrite to leave out the link to -lcurses
+-echo "$as_me:8375: checking if you wish to install ncurses overwriting curses" >&5
++echo "$as_me:8394: 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.
+@@ -8382,10 +8401,10 @@
+ else
+   if test "$prefix" = "/usr" ; then with_overwrite=yes; else with_overwrite=no; fi
+ fi;
+-echo "$as_me:8385: result: $with_overwrite" >&5
++echo "$as_me:8404: result: $with_overwrite" >&5
+ echo "${ECHO_T}$with_overwrite" >&6
+ 
+-echo "$as_me:8388: checking if external terminfo-database is used" >&5
++echo "$as_me:8407: 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.
+@@ -8395,7 +8414,7 @@
+ else
+   use_database=yes
+ fi;
+-echo "$as_me:8398: result: $use_database" >&5
++echo "$as_me:8417: result: $use_database" >&5
+ echo "${ECHO_T}$use_database" >&6
+ 
+ case "$host_os" in
+@@ -8411,7 +8430,7 @@
+ if test "$use_database" != no ; then
+ 	NCURSES_USE_DATABASE=1
+ 
+-	echo "$as_me:8414: checking which terminfo source-file will be installed" >&5
++	echo "$as_me:8433: 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.
+@@ -8419,10 +8438,10 @@
+   withval="$with_database"
+   TERMINFO_SRC=$withval
+ fi;
+-	echo "$as_me:8422: result: $TERMINFO_SRC" >&5
++	echo "$as_me:8441: result: $TERMINFO_SRC" >&5
+ echo "${ECHO_T}$TERMINFO_SRC" >&6
+ 
+-	echo "$as_me:8425: checking whether to use hashed database instead of directory/tree" >&5
++	echo "$as_me:8444: 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.
+@@ -8432,13 +8451,13 @@
+ else
+   with_hashed_db=no
+ fi;
+-	echo "$as_me:8435: result: $with_hashed_db" >&5
++	echo "$as_me:8454: result: $with_hashed_db" >&5
+ echo "${ECHO_T}$with_hashed_db" >&6
+ else
+ 	with_hashed_db=no
+ fi
+ 
+-echo "$as_me:8441: checking for list of fallback descriptions" >&5
++echo "$as_me:8460: 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.
+@@ -8448,7 +8467,7 @@
+ else
+   with_fallback=
+ fi;
+-echo "$as_me:8451: result: $with_fallback" >&5
++echo "$as_me:8470: result: $with_fallback" >&5
+ echo "${ECHO_T}$with_fallback" >&6
+ 
+ case ".$with_fallback" in
+@@ -8456,7 +8475,7 @@
+ 	FALLBACK_LIST=
+ 	;;
+ (.yes)
+-	{ echo "$as_me:8459: WARNING: expected a list of terminal descriptions" >&5
++	{ echo "$as_me:8478: WARNING: expected a list of terminal descriptions" >&5
+ echo "$as_me: WARNING: expected a list of terminal descriptions" >&2;}
+ 	;;
+ (*)
+@@ -8472,7 +8491,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:8475: checking for $ac_word" >&5
++echo "$as_me:8494: 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
+@@ -8487,7 +8506,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:8490: found $ac_dir/$ac_word" >&5
++echo "$as_me:8509: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -8495,10 +8514,10 @@
+ fi
+ TIC=$ac_cv_prog_TIC
+ if test -n "$TIC"; then
+-  echo "$as_me:8498: result: $TIC" >&5
++  echo "$as_me:8517: result: $TIC" >&5
+ echo "${ECHO_T}$TIC" >&6
+ else
+-  echo "$as_me:8501: result: no" >&5
++  echo "$as_me:8520: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -8507,7 +8526,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:8510: checking for $ac_word" >&5
++echo "$as_me:8529: 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
+@@ -8522,7 +8541,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:8525: found $ac_dir/$ac_word" >&5
++echo "$as_me:8544: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -8530,10 +8549,10 @@
+ fi
+ ac_ct_TIC=$ac_cv_prog_ac_ct_TIC
+ if test -n "$ac_ct_TIC"; then
+-  echo "$as_me:8533: result: $ac_ct_TIC" >&5
++  echo "$as_me:8552: result: $ac_ct_TIC" >&5
+ echo "${ECHO_T}$ac_ct_TIC" >&6
+ else
+-  echo "$as_me:8536: result: no" >&5
++  echo "$as_me:8555: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -8545,7 +8564,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:8548: checking for $ac_word" >&5
++echo "$as_me:8567: 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
+@@ -8560,7 +8579,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:8563: found $ac_dir/$ac_word" >&5
++echo "$as_me:8582: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -8568,10 +8587,10 @@
+ fi
+ INFOCMP=$ac_cv_prog_INFOCMP
+ if test -n "$INFOCMP"; then
+-  echo "$as_me:8571: result: $INFOCMP" >&5
++  echo "$as_me:8590: result: $INFOCMP" >&5
+ echo "${ECHO_T}$INFOCMP" >&6
+ else
+-  echo "$as_me:8574: result: no" >&5
++  echo "$as_me:8593: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -8580,7 +8599,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:8583: checking for $ac_word" >&5
++echo "$as_me:8602: 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
+@@ -8595,7 +8614,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:8598: found $ac_dir/$ac_word" >&5
++echo "$as_me:8617: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -8603,10 +8622,10 @@
+ fi
+ ac_ct_INFOCMP=$ac_cv_prog_ac_ct_INFOCMP
+ if test -n "$ac_ct_INFOCMP"; then
+-  echo "$as_me:8606: result: $ac_ct_INFOCMP" >&5
++  echo "$as_me:8625: result: $ac_ct_INFOCMP" >&5
+ echo "${ECHO_T}$ac_ct_INFOCMP" >&6
+ else
+-  echo "$as_me:8609: result: no" >&5
++  echo "$as_me:8628: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -8621,10 +8640,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:8624: checking for tic program for fallbacks" >&5
++  echo "$as_me:8643: checking for tic program for fallbacks" >&5
+ echo $ECHO_N "checking for tic program for fallbacks... $ECHO_C" >&6
+ 		TIC=$withval
+-		echo "$as_me:8627: result: $TIC" >&5
++		echo "$as_me:8646: result: $TIC" >&5
+ echo "${ECHO_T}$TIC" >&6
+ 
+ if test "x$prefix" != xNONE; then
+@@ -8652,7 +8671,7 @@
+ 	TIC=`echo "$TIC" | sed -e s%NONE%$cf_path_syntax%`
+ 	;;
+ (*)
+-	{ { echo "$as_me:8655: error: expected a pathname, not \"$TIC\"" >&5
++	{ { echo "$as_me:8674: error: expected a pathname, not \"$TIC\"" >&5
+ echo "$as_me: error: expected a pathname, not \"$TIC\"" >&2;}
+    { (exit 1); exit 1; }; }
+ 	;;
+@@ -8665,7 +8684,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:8668: checking for $ac_word" >&5
++echo "$as_me:8687: 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
+@@ -8682,7 +8701,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:8685: found $ac_dir/$ac_word" >&5
++   echo "$as_me:8704: found $ac_dir/$ac_word" >&5
+    break
+ fi
+ done
+@@ -8693,10 +8712,10 @@
+ TIC=$ac_cv_path_TIC
+ 
+ if test -n "$TIC"; then
+-  echo "$as_me:8696: result: $TIC" >&5
++  echo "$as_me:8715: result: $TIC" >&5
+ echo "${ECHO_T}$TIC" >&6
+ else
+-  echo "$as_me:8699: result: no" >&5
++  echo "$as_me:8718: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -8755,7 +8774,7 @@
+ 
+ if test -n "$cf_path_prog" ; then
+ 
+-echo "${as_me:-configure}:8758: testing defining path for ${cf_path_prog} ..." 1>&5
++echo "${as_me:-configure}:8777: testing defining path for ${cf_path_prog} ..." 1>&5
+ 
+ cat >>confdefs.h <<EOF
+ #define TIC_PATH "$cf_path_prog"
+@@ -8770,7 +8789,7 @@
+ 
+ 		if test -z "$TIC"
+ 		then
+-			{ echo "$as_me:8773: WARNING: no tic program found for fallbacks" >&5
++			{ echo "$as_me:8792: WARNING: no tic program found for fallbacks" >&5
+ echo "$as_me: WARNING: no tic program found for fallbacks" >&2;}
+ 		fi
+ 
+@@ -8779,10 +8798,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:8782: checking for infocmp program for fallbacks" >&5
++  echo "$as_me:8801: checking for infocmp program for fallbacks" >&5
+ echo $ECHO_N "checking for infocmp program for fallbacks... $ECHO_C" >&6
+ 		INFOCMP=$withval
+-		echo "$as_me:8785: result: $INFOCMP" >&5
++		echo "$as_me:8804: result: $INFOCMP" >&5
+ echo "${ECHO_T}$INFOCMP" >&6
+ 
+ if test "x$prefix" != xNONE; then
+@@ -8810,7 +8829,7 @@
+ 	INFOCMP=`echo "$INFOCMP" | sed -e s%NONE%$cf_path_syntax%`
+ 	;;
+ (*)
+-	{ { echo "$as_me:8813: error: expected a pathname, not \"$INFOCMP\"" >&5
++	{ { echo "$as_me:8832: error: expected a pathname, not \"$INFOCMP\"" >&5
+ echo "$as_me: error: expected a pathname, not \"$INFOCMP\"" >&2;}
+    { (exit 1); exit 1; }; }
+ 	;;
+@@ -8823,7 +8842,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:8826: checking for $ac_word" >&5
++echo "$as_me:8845: 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
+@@ -8840,7 +8859,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:8843: found $ac_dir/$ac_word" >&5
++   echo "$as_me:8862: found $ac_dir/$ac_word" >&5
+    break
+ fi
+ done
+@@ -8851,10 +8870,10 @@
+ INFOCMP=$ac_cv_path_INFOCMP
+ 
+ if test -n "$INFOCMP"; then
+-  echo "$as_me:8854: result: $INFOCMP" >&5
++  echo "$as_me:8873: result: $INFOCMP" >&5
+ echo "${ECHO_T}$INFOCMP" >&6
+ else
+-  echo "$as_me:8857: result: no" >&5
++  echo "$as_me:8876: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -8913,7 +8932,7 @@
+ 
+ if test -n "$cf_path_prog" ; then
+ 
+-echo "${as_me:-configure}:8916: testing defining path for ${cf_path_prog} ..." 1>&5
++echo "${as_me:-configure}:8935: testing defining path for ${cf_path_prog} ..." 1>&5
+ 
+ cat >>confdefs.h <<EOF
+ #define INFOCMP_PATH "$cf_path_prog"
+@@ -8928,7 +8947,7 @@
+ 
+ 		if test -z "$INFOCMP"
+ 		then
+-			{ echo "$as_me:8931: WARNING: no infocmp program found for fallbacks" >&5
++			{ echo "$as_me:8950: WARNING: no infocmp program found for fallbacks" >&5
+ echo "$as_me: WARNING: no infocmp program found for fallbacks" >&2;}
+ 		fi
+ 
+@@ -8938,7 +8957,7 @@
+ 	test -z "$INFOCMP" && FALLBACK_LIST=
+ 	if test -z "$FALLBACK_LIST"
+ 	then
+-		{ echo "$as_me:8941: WARNING: ignoring fallback option because tic/infocmp are not available" >&5
++		{ echo "$as_me:8960: 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
+@@ -8946,7 +8965,7 @@
+ USE_FALLBACKS=
+ test -z "$FALLBACK_LIST" && USE_FALLBACKS="#"
+ 
+-echo "$as_me:8949: checking if you want modern xterm or antique" >&5
++echo "$as_me:8968: 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.
+@@ -8960,11 +8979,11 @@
+ (no) with_xterm_new=xterm-old;;
+ (*)	 with_xterm_new=xterm-new;;
+ esac
+-echo "$as_me:8963: result: $with_xterm_new" >&5
++echo "$as_me:8982: result: $with_xterm_new" >&5
+ echo "${ECHO_T}$with_xterm_new" >&6
+ WHICH_XTERM=$with_xterm_new
+ 
+-echo "$as_me:8967: checking if xterm backspace sends BS or DEL" >&5
++echo "$as_me:8986: 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.
+@@ -8985,7 +9004,7 @@
+ 	with_xterm_kbs=$withval
+ 	;;
+ esac
+-echo "$as_me:8988: result: $with_xterm_kbs" >&5
++echo "$as_me:9007: result: $with_xterm_kbs" >&5
+ echo "${ECHO_T}$with_xterm_kbs" >&6
+ XTERM_KBS=$with_xterm_kbs
+ 
+@@ -8995,7 +9014,7 @@
+ 	MAKE_TERMINFO="#"
+ else
+ 
+-echo "$as_me:8998: checking for list of terminfo directories" >&5
++echo "$as_me:9017: 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.
+@@ -9035,7 +9054,7 @@
+ 	cf_src_path=`echo "$cf_src_path" | sed -e s%NONE%$cf_path_syntax%`
+ 	;;
+ (*)
+-	{ { echo "$as_me:9038: error: expected a pathname, not \"$cf_src_path\"" >&5
++	{ { echo "$as_me:9057: 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; }; }
+ 	;;
+@@ -9058,7 +9077,7 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:9061: result: $TERMINFO_DIRS" >&5
++echo "$as_me:9080: result: $TERMINFO_DIRS" >&5
+ echo "${ECHO_T}$TERMINFO_DIRS" >&6
+ test -n "$TERMINFO_DIRS" &&
+ cat >>confdefs.h <<EOF
+@@ -9067,13 +9086,13 @@
+ 
+ case "x$TERMINFO" in
+ x???:*)
+-	{ echo "$as_me:9070: WARNING: ignoring non-directory/file TERMINFO value" >&5
++	{ echo "$as_me:9089: 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:9076: checking for default terminfo directory" >&5
++echo "$as_me:9095: 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.
+@@ -9109,7 +9128,7 @@
+ 	withval=`echo "$withval" | sed -e s%NONE%$cf_path_syntax%`
+ 	;;
+ (*)
+-	{ { echo "$as_me:9112: error: expected a pathname, not \"$withval\"" >&5
++	{ { echo "$as_me:9131: error: expected a pathname, not \"$withval\"" >&5
+ echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
+    { (exit 1); exit 1; }; }
+ 	;;
+@@ -9118,7 +9137,7 @@
+ fi
+ eval TERMINFO="$withval"
+ 
+-echo "$as_me:9121: result: $TERMINFO" >&5
++echo "$as_me:9140: result: $TERMINFO" >&5
+ echo "${ECHO_T}$TERMINFO" >&6
+ 
+ cat >>confdefs.h <<EOF
+@@ -9129,7 +9148,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:9132: checking if big-core option selected" >&5
++echo "$as_me:9151: 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.
+@@ -9141,7 +9160,7 @@
+   with_big_core=no
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 9144 "configure"
++#line 9163 "configure"
+ #include "confdefs.h"
+ 
+ #include <stdlib.h>
+@@ -9155,15 +9174,15 @@
+ }
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:9158: \"$ac_link\"") >&5
++if { (eval echo "$as_me:9177: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:9161: \$? = $ac_status" >&5
++  echo "$as_me:9180: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:9163: \"$ac_try\"") >&5
++  { (eval echo "$as_me:9182: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:9166: \$? = $ac_status" >&5
++  echo "$as_me:9185: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   with_big_core=yes
+ else
+@@ -9175,7 +9194,7 @@
+ rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+ fi;
+-echo "$as_me:9178: result: $with_big_core" >&5
++echo "$as_me:9197: result: $with_big_core" >&5
+ echo "${ECHO_T}$with_big_core" >&6
+ test "x$with_big_core" = "xyes" &&
+ cat >>confdefs.h <<\EOF
+@@ -9185,7 +9204,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:9188: checking if big-strings option selected" >&5
++echo "$as_me:9207: 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.
+@@ -9209,14 +9228,14 @@
+ 	esac
+ 
+ fi;
+-echo "$as_me:9212: result: $with_big_strings" >&5
++echo "$as_me:9231: 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:9219: checking if you want termcap-fallback support" >&5
++echo "$as_me:9238: 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.
+@@ -9226,14 +9245,14 @@
+ else
+   with_termcap=no
+ fi;
+-echo "$as_me:9229: result: $with_termcap" >&5
++echo "$as_me:9248: 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:9236: error: You have disabled the database w/o specifying fallbacks" >&5
++			{ { echo "$as_me:9255: 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
+@@ -9246,13 +9265,13 @@
+ else
+ 
+ 	if test "$with_ticlib" != no ; then
+-		{ { echo "$as_me:9249: error: Options --with-ticlib and --enable-termcap cannot be combined" >&5
++		{ { echo "$as_me:9268: 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:9255: checking for list of termcap files" >&5
++	echo "$as_me:9274: 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.
+@@ -9292,7 +9311,7 @@
+ 	cf_src_path=`echo "$cf_src_path" | sed -e s%NONE%$cf_path_syntax%`
+ 	;;
+ (*)
+-	{ { echo "$as_me:9295: error: expected a pathname, not \"$cf_src_path\"" >&5
++	{ { echo "$as_me:9314: 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; }; }
+ 	;;
+@@ -9315,7 +9334,7 @@
+ 	;;
+ esac
+ 
+-	echo "$as_me:9318: result: $TERMPATH" >&5
++	echo "$as_me:9337: result: $TERMPATH" >&5
+ echo "${ECHO_T}$TERMPATH" >&6
+ 	test -n "$TERMPATH" &&
+ cat >>confdefs.h <<EOF
+@@ -9323,7 +9342,7 @@
+ EOF
+ 
+ 	###	use option --enable-getcap to use a hacked getcap for reading termcaps
+-	echo "$as_me:9326: checking if fast termcap-loader is needed" >&5
++	echo "$as_me:9345: 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.
+@@ -9333,14 +9352,14 @@
+ else
+   with_getcap=no
+ fi;
+-	echo "$as_me:9336: result: $with_getcap" >&5
++	echo "$as_me:9355: 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:9343: checking if translated termcaps will be cached in ~/.terminfo" >&5
++	echo "$as_me:9362: 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.
+@@ -9350,7 +9369,7 @@
+ else
+   with_getcap_cache=no
+ fi;
+-	echo "$as_me:9353: result: $with_getcap_cache" >&5
++	echo "$as_me:9372: result: $with_getcap_cache" >&5
+ echo "${ECHO_T}$with_getcap_cache" >&6
+ 	test "x$with_getcap_cache" = "xyes" &&
+ cat >>confdefs.h <<\EOF
+@@ -9360,7 +9379,7 @@
+ fi
+ 
+ ###   Use option --disable-home-terminfo to completely remove ~/.terminfo
+-echo "$as_me:9363: checking if ~/.terminfo is wanted" >&5
++echo "$as_me:9382: 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.
+@@ -9370,14 +9389,14 @@
+ else
+   with_home_terminfo=yes
+ fi;
+-echo "$as_me:9373: result: $with_home_terminfo" >&5
++echo "$as_me:9392: 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:9380: checking if you want to permit root to use ncurses environment variables" >&5
++echo "$as_me:9399: 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.
+@@ -9387,14 +9406,14 @@
+ else
+   with_root_environ=yes
+ fi;
+-echo "$as_me:9390: result: $with_root_environ" >&5
++echo "$as_me:9409: 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:9397: checking if you want to permit setuid programs to access all files" >&5
++echo "$as_me:9416: 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.
+@@ -9404,7 +9423,7 @@
+ else
+   with_root_access=yes
+ fi;
+-echo "$as_me:9407: result: $with_root_access" >&5
++echo "$as_me:9426: result: $with_root_access" >&5
+ echo "${ECHO_T}$with_root_access" >&6
+ test "x$with_root_access" = xyes &&
+ cat >>confdefs.h <<\EOF
+@@ -9419,23 +9438,23 @@
+ 
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-echo "$as_me:9422: checking for $ac_header" >&5
++echo "$as_me:9441: 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 9428 "configure"
++#line 9447 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:9432: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:9451: \"$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:9438: \$? = $ac_status" >&5
++  echo "$as_me:9457: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -9454,7 +9473,7 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:9457: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
++echo "$as_me:9476: 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
+@@ -9469,13 +9488,13 @@
+ 	unlink
+ do
+ as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+-echo "$as_me:9472: checking for $ac_func" >&5
++echo "$as_me:9491: 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 9478 "configure"
++#line 9497 "configure"
+ #include "confdefs.h"
+ #define $ac_func autoconf_temporary
+ #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -9506,16 +9525,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:9509: \"$ac_link\"") >&5
++if { (eval echo "$as_me:9528: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:9512: \$? = $ac_status" >&5
++  echo "$as_me:9531: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:9515: \"$ac_try\"") >&5
++  { (eval echo "$as_me:9534: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:9518: \$? = $ac_status" >&5
++  echo "$as_me:9537: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   eval "$as_ac_var=yes"
+ else
+@@ -9525,7 +9544,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:9528: result: `eval echo '${'"$as_ac_var"'}'`" >&5
++echo "$as_me:9547: 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
+@@ -9542,13 +9561,13 @@
+ 		symlink
+ do
+ as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+-echo "$as_me:9545: checking for $ac_func" >&5
++echo "$as_me:9564: 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 9551 "configure"
++#line 9570 "configure"
+ #include "confdefs.h"
+ #define $ac_func autoconf_temporary
+ #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -9579,16 +9598,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:9582: \"$ac_link\"") >&5
++if { (eval echo "$as_me:9601: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:9585: \$? = $ac_status" >&5
++  echo "$as_me:9604: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:9588: \"$ac_try\"") >&5
++  { (eval echo "$as_me:9607: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:9591: \$? = $ac_status" >&5
++  echo "$as_me:9610: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   eval "$as_ac_var=yes"
+ else
+@@ -9598,7 +9617,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:9601: result: `eval echo '${'"$as_ac_var"'}'`" >&5
++echo "$as_me:9620: 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
+@@ -9609,7 +9628,7 @@
+ done
+ 
+ else
+-	echo "$as_me:9612: checking if link/symlink functions work" >&5
++	echo "$as_me:9631: 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
+@@ -9622,7 +9641,7 @@
+ 			eval 'ac_cv_func_'$cf_func'=error'
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 9625 "configure"
++#line 9644 "configure"
+ #include "confdefs.h"
+ 
+ #include <stdio.h>
+@@ -9660,15 +9679,15 @@
+ 
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:9663: \"$ac_link\"") >&5
++if { (eval echo "$as_me:9682: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:9666: \$? = $ac_status" >&5
++  echo "$as_me:9685: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:9668: \"$ac_try\"") >&5
++  { (eval echo "$as_me:9687: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:9671: \$? = $ac_status" >&5
++  echo "$as_me:9690: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+ 
+ 			cf_cv_link_funcs="$cf_cv_link_funcs $cf_func"
+@@ -9686,7 +9705,7 @@
+ 		test -z "$cf_cv_link_funcs" && cf_cv_link_funcs=no
+ 
+ fi
+-echo "$as_me:9689: result: $cf_cv_link_funcs" >&5
++echo "$as_me:9708: result: $cf_cv_link_funcs" >&5
+ echo "${ECHO_T}$cf_cv_link_funcs" >&6
+ 	test "$ac_cv_func_link"    = yes &&
+ cat >>confdefs.h <<\EOF
+@@ -9706,7 +9725,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:9709: checking if tic should use symbolic links" >&5
++	echo "$as_me:9728: 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.
+@@ -9716,21 +9735,21 @@
+ else
+   with_symlinks=no
+ fi;
+-	echo "$as_me:9719: result: $with_symlinks" >&5
++	echo "$as_me:9738: 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:9726: checking if tic should use hard links" >&5
++	echo "$as_me:9745: 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:9733: result: $with_links" >&5
++	echo "$as_me:9752: result: $with_links" >&5
+ echo "${ECHO_T}$with_links" >&6
+ fi
+ 
+@@ -9746,7 +9765,7 @@
+ 
+ ###   use option --enable-broken-linker to force on use of broken-linker support
+ 
+-echo "$as_me:9749: checking if you want broken-linker support code" >&5
++echo "$as_me:9768: 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.
+@@ -9756,7 +9775,7 @@
+ else
+   with_broken_linker=no
+ fi;
+-echo "$as_me:9759: result: $with_broken_linker" >&5
++echo "$as_me:9778: result: $with_broken_linker" >&5
+ echo "${ECHO_T}$with_broken_linker" >&6
+ 
+ : "${BROKEN_LINKER:=0}"
+@@ -9770,7 +9789,7 @@
+ fi
+ 
+ ###   use option --enable-bsdpad to have tputs process BSD-style prefix padding
+-echo "$as_me:9773: checking if tputs should process BSD-style prefix padding" >&5
++echo "$as_me:9792: 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.
+@@ -9780,7 +9799,7 @@
+ else
+   with_bsdpad=no
+ fi;
+-echo "$as_me:9783: result: $with_bsdpad" >&5
++echo "$as_me:9802: result: $with_bsdpad" >&5
+ echo "${ECHO_T}$with_bsdpad" >&6
+ test "x$with_bsdpad" = xyes &&
+ cat >>confdefs.h <<\EOF
+@@ -9799,14 +9818,14 @@
+ # Check to define _XOPEN_SOURCE "automatically"
+ CPPFLAGS_before_XOPEN="$CPPFLAGS"
+ 
+-echo "$as_me:9802: checking if the POSIX test-macros are already defined" >&5
++echo "$as_me:9821: 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 9809 "configure"
++#line 9828 "configure"
+ #include "confdefs.h"
+ #include <stdio.h>
+ int
+@@ -9825,16 +9844,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:9828: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:9847: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:9831: \$? = $ac_status" >&5
++  echo "$as_me:9850: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:9834: \"$ac_try\"") >&5
++  { (eval echo "$as_me:9853: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:9837: \$? = $ac_status" >&5
++  echo "$as_me:9856: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_posix_visible=no
+ else
+@@ -9845,7 +9864,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:9848: result: $cf_cv_posix_visible" >&5
++echo "$as_me:9867: result: $cf_cv_posix_visible" >&5
+ echo "${ECHO_T}$cf_cv_posix_visible" >&6
+ 
+ if test "$cf_cv_posix_visible" = no; then
+@@ -9890,14 +9909,14 @@
+ 
+ cf_gnu_xopen_source=$cf_XOPEN_SOURCE
+ 
+-echo "$as_me:9893: checking if this is the GNU C library" >&5
++echo "$as_me:9912: 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 9900 "configure"
++#line 9919 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ int
+@@ -9916,16 +9935,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:9919: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:9938: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:9922: \$? = $ac_status" >&5
++  echo "$as_me:9941: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:9925: \"$ac_try\"") >&5
++  { (eval echo "$as_me:9944: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:9928: \$? = $ac_status" >&5
++  echo "$as_me:9947: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_gnu_library=yes
+ else
+@@ -9936,7 +9955,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:9939: result: $cf_cv_gnu_library" >&5
++echo "$as_me:9958: result: $cf_cv_gnu_library" >&5
+ echo "${ECHO_T}$cf_cv_gnu_library" >&6
+ 
+ if test x$cf_cv_gnu_library = xyes; then
+@@ -9944,7 +9963,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:9947: checking if _DEFAULT_SOURCE can be used as a basis" >&5
++	echo "$as_me:9966: 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
+@@ -9956,7 +9975,7 @@
+ 	CPPFLAGS="${CPPFLAGS}-D_DEFAULT_SOURCE"
+ 
+ 		cat >"conftest.$ac_ext" <<_ACEOF
+-#line 9959 "configure"
++#line 9978 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ int
+@@ -9975,16 +9994,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:9978: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:9997: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:9981: \$? = $ac_status" >&5
++  echo "$as_me:10000: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:9984: \"$ac_try\"") >&5
++  { (eval echo "$as_me:10003: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:9987: \$? = $ac_status" >&5
++  echo "$as_me:10006: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_gnu_library_219=yes
+ else
+@@ -9996,12 +10015,12 @@
+ 		CPPFLAGS="$cf_save"
+ 
+ fi
+-echo "$as_me:9999: result: $cf_cv_gnu_library_219" >&5
++echo "$as_me:10018: 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:10004: checking if _XOPEN_SOURCE=$cf_gnu_xopen_source works with _DEFAULT_SOURCE" >&5
++		echo "$as_me:10023: 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
+@@ -10106,7 +10125,7 @@
+ fi
+ 
+ 			cat >"conftest.$ac_ext" <<_ACEOF
+-#line 10109 "configure"
++#line 10128 "configure"
+ #include "confdefs.h"
+ 
+ 				#include <limits.h>
+@@ -10126,16 +10145,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:10129: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:10148: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:10132: \$? = $ac_status" >&5
++  echo "$as_me:10151: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:10135: \"$ac_try\"") >&5
++  { (eval echo "$as_me:10154: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:10138: \$? = $ac_status" >&5
++  echo "$as_me:10157: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_gnu_dftsrc_219=yes
+ else
+@@ -10146,7 +10165,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:10149: result: $cf_cv_gnu_dftsrc_219" >&5
++echo "$as_me:10168: 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
+@@ -10155,14 +10174,14 @@
+ 
+ 	if test "x$cf_cv_gnu_dftsrc_219" != xyes; then
+ 
+-		echo "$as_me:10158: checking if we must define _GNU_SOURCE" >&5
++		echo "$as_me:10177: 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 10165 "configure"
++#line 10184 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ int
+@@ -10177,16 +10196,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:10180: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:10199: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:10183: \$? = $ac_status" >&5
++  echo "$as_me:10202: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:10186: \"$ac_try\"") >&5
++  { (eval echo "$as_me:10205: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:10189: \$? = $ac_status" >&5
++  echo "$as_me:10208: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_gnu_source=no
+ else
+@@ -10293,7 +10312,7 @@
+ fi
+ 
+ 			 cat >"conftest.$ac_ext" <<_ACEOF
+-#line 10296 "configure"
++#line 10315 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ int
+@@ -10308,16 +10327,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:10311: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:10330: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:10314: \$? = $ac_status" >&5
++  echo "$as_me:10333: \$? = $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:10336: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:10320: \$? = $ac_status" >&5
++  echo "$as_me:10339: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_gnu_source=no
+ else
+@@ -10332,12 +10351,12 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:10335: result: $cf_cv_gnu_source" >&5
++echo "$as_me:10354: 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:10340: checking if we should also define _DEFAULT_SOURCE" >&5
++		echo "$as_me:10359: 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
+@@ -10347,7 +10366,7 @@
+ 	CPPFLAGS="${CPPFLAGS}-D_GNU_SOURCE"
+ 
+ 			cat >"conftest.$ac_ext" <<_ACEOF
+-#line 10350 "configure"
++#line 10369 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ int
+@@ -10362,16 +10381,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:10365: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:10384: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:10368: \$? = $ac_status" >&5
++  echo "$as_me:10387: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:10371: \"$ac_try\"") >&5
++  { (eval echo "$as_me:10390: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:10374: \$? = $ac_status" >&5
++  echo "$as_me:10393: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_default_source=no
+ else
+@@ -10382,7 +10401,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:10385: result: $cf_cv_default_source" >&5
++echo "$as_me:10404: result: $cf_cv_default_source" >&5
+ echo "${ECHO_T}$cf_cv_default_source" >&6
+ 			if test "$cf_cv_default_source" = yes
+ 			then
+@@ -10419,16 +10438,16 @@
+ 	sed	-e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ 	]*\)\?[ 	]/ /g' \
+ 		-e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ 	]*\)\?$//g'`
+ 
+-echo "$as_me:10422: checking if we should define _POSIX_C_SOURCE" >&5
++echo "$as_me:10441: 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}:10428: testing if the symbol is already defined go no further ..." 1>&5
++echo "${as_me:-configure}:10447: testing if the symbol is already defined go no further ..." 1>&5
+ 
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 10431 "configure"
++#line 10450 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ int
+@@ -10443,16 +10462,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:10446: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:10465: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:10449: \$? = $ac_status" >&5
++  echo "$as_me:10468: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:10452: \"$ac_try\"") >&5
++  { (eval echo "$as_me:10471: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:10455: \$? = $ac_status" >&5
++  echo "$as_me:10474: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_posix_c_source=no
+ else
+@@ -10473,7 +10492,7 @@
+ 	 esac
+ 	 if test "$cf_want_posix_source" = yes ; then
+ 		cat >"conftest.$ac_ext" <<_ACEOF
+-#line 10476 "configure"
++#line 10495 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ int
+@@ -10488,16 +10507,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:10491: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:10510: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:10494: \$? = $ac_status" >&5
++  echo "$as_me:10513: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:10497: \"$ac_try\"") >&5
++  { (eval echo "$as_me:10516: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:10500: \$? = $ac_status" >&5
++  echo "$as_me:10519: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   :
+ else
+@@ -10508,7 +10527,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 	 fi
+ 
+-echo "${as_me:-configure}:10511: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
++echo "${as_me:-configure}:10530: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
+ 
+ 	 CFLAGS="$cf_trim_CFLAGS"
+ 	 CPPFLAGS="$cf_trim_CPPFLAGS"
+@@ -10516,10 +10535,10 @@
+ 	test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
+ 	CPPFLAGS="${CPPFLAGS}$cf_cv_posix_c_source"
+ 
+-echo "${as_me:-configure}:10519: testing if the second compile does not leave our definition intact error ..." 1>&5
++echo "${as_me:-configure}:10538: testing if the second compile does not leave our definition intact error ..." 1>&5
+ 
+ 	 cat >"conftest.$ac_ext" <<_ACEOF
+-#line 10522 "configure"
++#line 10541 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ int
+@@ -10534,16 +10553,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:10537: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:10556: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:10540: \$? = $ac_status" >&5
++  echo "$as_me:10559: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:10543: \"$ac_try\"") >&5
++  { (eval echo "$as_me:10562: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:10546: \$? = $ac_status" >&5
++  echo "$as_me:10565: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   :
+ else
+@@ -10559,7 +10578,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:10562: result: $cf_cv_posix_c_source" >&5
++echo "$as_me:10581: 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
+@@ -10676,7 +10695,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:10679: WARNING: this system does not provide usable locale support" >&5
++	{ echo "$as_me:10698: 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
+@@ -10708,14 +10727,14 @@
+ 	;;
+ (*)
+ 
+-echo "$as_me:10711: checking if we should define _XOPEN_SOURCE" >&5
++echo "$as_me:10730: 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 10718 "configure"
++#line 10737 "configure"
+ #include "confdefs.h"
+ 
+ #include <stdlib.h>
+@@ -10734,16 +10753,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:10737: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:10756: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:10740: \$? = $ac_status" >&5
++  echo "$as_me:10759: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:10743: \"$ac_try\"") >&5
++  { (eval echo "$as_me:10762: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:10746: \$? = $ac_status" >&5
++  echo "$as_me:10765: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_xopen_source=no
+ else
+@@ -10755,7 +10774,7 @@
+ 	CPPFLAGS="${CPPFLAGS}-D_XOPEN_SOURCE=$cf_XOPEN_SOURCE"
+ 
+ 	 cat >"conftest.$ac_ext" <<_ACEOF
+-#line 10758 "configure"
++#line 10777 "configure"
+ #include "confdefs.h"
+ 
+ #include <stdlib.h>
+@@ -10774,16 +10793,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:10777: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:10796: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:10780: \$? = $ac_status" >&5
++  echo "$as_me:10799: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:10783: \"$ac_try\"") >&5
++  { (eval echo "$as_me:10802: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:10786: \$? = $ac_status" >&5
++  echo "$as_me:10805: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_xopen_source=no
+ else
+@@ -10798,7 +10817,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:10801: result: $cf_cv_xopen_source" >&5
++echo "$as_me:10820: result: $cf_cv_xopen_source" >&5
+ echo "${ECHO_T}$cf_cv_xopen_source" >&6
+ 
+ if test "$cf_cv_xopen_source" != no ; then
+@@ -10956,16 +10975,16 @@
+ 	sed	-e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ 	]*\)\?[ 	]/ /g' \
+ 		-e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ 	]*\)\?$//g'`
+ 
+-echo "$as_me:10959: checking if we should define _POSIX_C_SOURCE" >&5
++echo "$as_me:10978: 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}:10965: testing if the symbol is already defined go no further ..." 1>&5
++echo "${as_me:-configure}:10984: testing if the symbol is already defined go no further ..." 1>&5
+ 
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 10968 "configure"
++#line 10987 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ int
+@@ -10980,16 +10999,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:10983: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:11002: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:10986: \$? = $ac_status" >&5
++  echo "$as_me:11005: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:10989: \"$ac_try\"") >&5
++  { (eval echo "$as_me:11008: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:10992: \$? = $ac_status" >&5
++  echo "$as_me:11011: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_posix_c_source=no
+ else
+@@ -11010,7 +11029,7 @@
+ 	 esac
+ 	 if test "$cf_want_posix_source" = yes ; then
+ 		cat >"conftest.$ac_ext" <<_ACEOF
+-#line 11013 "configure"
++#line 11032 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ int
+@@ -11025,16 +11044,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:11028: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:11047: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:11031: \$? = $ac_status" >&5
++  echo "$as_me:11050: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:11034: \"$ac_try\"") >&5
++  { (eval echo "$as_me:11053: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:11037: \$? = $ac_status" >&5
++  echo "$as_me:11056: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   :
+ else
+@@ -11045,7 +11064,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 	 fi
+ 
+-echo "${as_me:-configure}:11048: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
++echo "${as_me:-configure}:11067: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
+ 
+ 	 CFLAGS="$cf_trim_CFLAGS"
+ 	 CPPFLAGS="$cf_trim_CPPFLAGS"
+@@ -11053,10 +11072,10 @@
+ 	test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
+ 	CPPFLAGS="${CPPFLAGS}$cf_cv_posix_c_source"
+ 
+-echo "${as_me:-configure}:11056: testing if the second compile does not leave our definition intact error ..." 1>&5
++echo "${as_me:-configure}:11075: testing if the second compile does not leave our definition intact error ..." 1>&5
+ 
+ 	 cat >"conftest.$ac_ext" <<_ACEOF
+-#line 11059 "configure"
++#line 11078 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ int
+@@ -11071,16 +11090,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:11074: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:11093: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:11077: \$? = $ac_status" >&5
++  echo "$as_me:11096: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:11080: \"$ac_try\"") >&5
++  { (eval echo "$as_me:11099: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:11083: \$? = $ac_status" >&5
++  echo "$as_me:11102: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   :
+ else
+@@ -11096,7 +11115,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:11099: result: $cf_cv_posix_c_source" >&5
++echo "$as_me:11118: 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
+@@ -11222,7 +11241,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}:11225: testing removing old option $cf_add_cflags from CFLAGS ..." 1>&5
++echo "${as_me:-configure}:11244: testing removing old option $cf_add_cflags from CFLAGS ..." 1>&5
+ 
+ 	CFLAGS="$cf_old_cflag"
+ done
+@@ -11234,7 +11253,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}:11237: testing removing old option $cf_add_cflags from CPPFLAGS ..." 1>&5
++echo "${as_me:-configure}:11256: testing removing old option $cf_add_cflags from CPPFLAGS ..." 1>&5
+ 
+ 	CPPFLAGS="$cf_old_cflag"
+ done
+@@ -11322,7 +11341,7 @@
+ if test -n "$cf_new_cflags" ; then
+ 	test -n "$verbose" && echo "	add to \$CFLAGS $cf_new_cflags" 1>&6
+ 
+-echo "${as_me:-configure}:11325: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
++echo "${as_me:-configure}:11344: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
+ 
+ 	test -n "$CFLAGS" && CFLAGS="$CFLAGS "
+ 	CFLAGS="${CFLAGS}$cf_new_cflags"
+@@ -11332,7 +11351,7 @@
+ if test -n "$cf_new_cppflags" ; then
+ 	test -n "$verbose" && echo "	add to \$CPPFLAGS $cf_new_cppflags" 1>&6
+ 
+-echo "${as_me:-configure}:11335: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
++echo "${as_me:-configure}:11354: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
+ 
+ 	test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
+ 	CPPFLAGS="${CPPFLAGS}$cf_new_cppflags"
+@@ -11342,7 +11361,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}:11345: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5
++echo "${as_me:-configure}:11364: 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"
+@@ -11354,10 +11373,10 @@
+ fi
+ 
+ if test -n "$cf_XOPEN_SOURCE" && test -z "$cf_cv_xopen_source" ; then
+-	echo "$as_me:11357: checking if _XOPEN_SOURCE really is set" >&5
++	echo "$as_me:11376: 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 11360 "configure"
++#line 11379 "configure"
+ #include "confdefs.h"
+ #include <stdlib.h>
+ int
+@@ -11372,16 +11391,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:11375: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:11394: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:11378: \$? = $ac_status" >&5
++  echo "$as_me:11397: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:11381: \"$ac_try\"") >&5
++  { (eval echo "$as_me:11400: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:11384: \$? = $ac_status" >&5
++  echo "$as_me:11403: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_XOPEN_SOURCE_set=yes
+ else
+@@ -11390,12 +11409,12 @@
+ cf_XOPEN_SOURCE_set=no
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+-	echo "$as_me:11393: result: $cf_XOPEN_SOURCE_set" >&5
++	echo "$as_me:11412: 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 11398 "configure"
++#line 11417 "configure"
+ #include "confdefs.h"
+ #include <stdlib.h>
+ int
+@@ -11410,16 +11429,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:11413: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:11432: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:11416: \$? = $ac_status" >&5
++  echo "$as_me:11435: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:11419: \"$ac_try\"") >&5
++  { (eval echo "$as_me:11438: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:11422: \$? = $ac_status" >&5
++  echo "$as_me:11441: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_XOPEN_SOURCE_set_ok=yes
+ else
+@@ -11430,19 +11449,19 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 		if test "$cf_XOPEN_SOURCE_set_ok" = no
+ 		then
+-			{ echo "$as_me:11433: WARNING: _XOPEN_SOURCE is lower than requested" >&5
++			{ echo "$as_me:11452: WARNING: _XOPEN_SOURCE is lower than requested" >&5
+ echo "$as_me: WARNING: _XOPEN_SOURCE is lower than requested" >&2;}
+ 		fi
+ 	else
+ 
+-echo "$as_me:11438: checking if we should define _XOPEN_SOURCE" >&5
++echo "$as_me:11457: 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 11445 "configure"
++#line 11464 "configure"
+ #include "confdefs.h"
+ 
+ #include <stdlib.h>
+@@ -11461,16 +11480,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:11464: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:11483: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:11467: \$? = $ac_status" >&5
++  echo "$as_me:11486: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:11470: \"$ac_try\"") >&5
++  { (eval echo "$as_me:11489: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:11473: \$? = $ac_status" >&5
++  echo "$as_me:11492: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_xopen_source=no
+ else
+@@ -11482,7 +11501,7 @@
+ 	CPPFLAGS="${CPPFLAGS}-D_XOPEN_SOURCE=$cf_XOPEN_SOURCE"
+ 
+ 	 cat >"conftest.$ac_ext" <<_ACEOF
+-#line 11485 "configure"
++#line 11504 "configure"
+ #include "confdefs.h"
+ 
+ #include <stdlib.h>
+@@ -11501,16 +11520,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:11504: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:11523: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:11507: \$? = $ac_status" >&5
++  echo "$as_me:11526: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:11510: \"$ac_try\"") >&5
++  { (eval echo "$as_me:11529: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:11513: \$? = $ac_status" >&5
++  echo "$as_me:11532: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_xopen_source=no
+ else
+@@ -11525,7 +11544,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:11528: result: $cf_cv_xopen_source" >&5
++echo "$as_me:11547: result: $cf_cv_xopen_source" >&5
+ echo "${ECHO_T}$cf_cv_xopen_source" >&6
+ 
+ if test "$cf_cv_xopen_source" != no ; then
+@@ -11676,14 +11695,14 @@
+ 
+ # Work around breakage on OS X
+ 
+-echo "$as_me:11679: checking if SIGWINCH is defined" >&5
++echo "$as_me:11698: 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 11686 "configure"
++#line 11705 "configure"
+ #include "confdefs.h"
+ 
+ #include <sys/types.h>
+@@ -11698,23 +11717,23 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:11701: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:11720: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:11704: \$? = $ac_status" >&5
++  echo "$as_me:11723: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:11707: \"$ac_try\"") >&5
++  { (eval echo "$as_me:11726: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:11710: \$? = $ac_status" >&5
++  echo "$as_me:11729: \$? = $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 11717 "configure"
++#line 11736 "configure"
+ #include "confdefs.h"
+ 
+ #undef _XOPEN_SOURCE
+@@ -11732,16 +11751,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:11735: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:11754: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:11738: \$? = $ac_status" >&5
++  echo "$as_me:11757: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:11741: \"$ac_try\"") >&5
++  { (eval echo "$as_me:11760: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:11744: \$? = $ac_status" >&5
++  echo "$as_me:11763: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_define_sigwinch=maybe
+ else
+@@ -11755,11 +11774,11 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:11758: result: $cf_cv_define_sigwinch" >&5
++echo "$as_me:11777: 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:11762: checking for actual SIGWINCH definition" >&5
++echo "$as_me:11781: 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
+@@ -11770,7 +11789,7 @@
+ while test "$cf_sigwinch" != 1
+ do
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 11773 "configure"
++#line 11792 "configure"
+ #include "confdefs.h"
+ 
+ #undef _XOPEN_SOURCE
+@@ -11792,16 +11811,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:11795: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:11814: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:11798: \$? = $ac_status" >&5
++  echo "$as_me:11817: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:11801: \"$ac_try\"") >&5
++  { (eval echo "$as_me:11820: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:11804: \$? = $ac_status" >&5
++  echo "$as_me:11823: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_fixup_sigwinch=$cf_sigwinch
+ 	 break
+@@ -11815,7 +11834,7 @@
+ done
+ 
+ fi
+-echo "$as_me:11818: result: $cf_cv_fixup_sigwinch" >&5
++echo "$as_me:11837: result: $cf_cv_fixup_sigwinch" >&5
+ echo "${ECHO_T}$cf_cv_fixup_sigwinch" >&6
+ 
+ 	if test "$cf_cv_fixup_sigwinch" != unknown ; then
+@@ -11825,13 +11844,13 @@
+ 
+ # Checks for CODESET support.
+ 
+-echo "$as_me:11828: checking for nl_langinfo and CODESET" >&5
++echo "$as_me:11847: 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 11834 "configure"
++#line 11853 "configure"
+ #include "confdefs.h"
+ #include <langinfo.h>
+ int
+@@ -11843,16 +11862,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:11846: \"$ac_link\"") >&5
++if { (eval echo "$as_me:11865: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:11849: \$? = $ac_status" >&5
++  echo "$as_me:11868: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:11852: \"$ac_try\"") >&5
++  { (eval echo "$as_me:11871: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:11855: \$? = $ac_status" >&5
++  echo "$as_me:11874: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   am_cv_langinfo_codeset=yes
+ else
+@@ -11863,7 +11882,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:11866: result: $am_cv_langinfo_codeset" >&5
++echo "$as_me:11885: result: $am_cv_langinfo_codeset" >&5
+ echo "${ECHO_T}$am_cv_langinfo_codeset" >&6
+ 	if test "$am_cv_langinfo_codeset" = yes; then
+ 
+@@ -11877,7 +11896,7 @@
+ NCURSES_OK_WCHAR_T=
+ NCURSES_OK_WINT_T=
+ 
+-echo "$as_me:11880: checking if you want wide-character code" >&5
++echo "$as_me:11899: 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.
+@@ -11887,7 +11906,7 @@
+ else
+   with_widec=no
+ fi;
+-echo "$as_me:11890: result: $with_widec" >&5
++echo "$as_me:11909: result: $with_widec" >&5
+ echo "${ECHO_T}$with_widec" >&6
+ 
+ NCURSES_WCWIDTH_GRAPHICS=1
+@@ -11911,23 +11930,23 @@
+ 
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-echo "$as_me:11914: checking for $ac_header" >&5
++echo "$as_me:11933: 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 11920 "configure"
++#line 11939 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:11924: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:11943: \"$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:11930: \$? = $ac_status" >&5
++  echo "$as_me:11949: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -11946,7 +11965,7 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:11949: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
++echo "$as_me:11968: 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
+@@ -11956,14 +11975,14 @@
+ fi
+ done
+ 
+-echo "$as_me:11959: checking if wchar.h can be used as is" >&5
++echo "$as_me:11978: 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 11966 "configure"
++#line 11985 "configure"
+ #include "confdefs.h"
+ 
+ #include <stdlib.h>
+@@ -11985,16 +12004,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:11988: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:12007: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:11991: \$? = $ac_status" >&5
++  echo "$as_me:12010: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:11994: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12013: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:11997: \$? = $ac_status" >&5
++  echo "$as_me:12016: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_wchar_h_okay=yes
+ else
+@@ -12004,16 +12023,16 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:12007: result: $cf_cv_wchar_h_okay" >&5
++echo "$as_me:12026: 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:12013: checking if we must define _XOPEN_SOURCE_EXTENDED" >&5
++echo "$as_me:12032: 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 12016 "configure"
++#line 12035 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ 
+@@ -12029,16 +12048,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:12032: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:12051: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:12035: \$? = $ac_status" >&5
++  echo "$as_me:12054: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:12038: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12057: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:12041: \$? = $ac_status" >&5
++  echo "$as_me:12060: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_result=no
+ else
+@@ -12047,16 +12066,16 @@
+ cf_result=yes
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+-echo "$as_me:12050: result: $cf_result" >&5
++echo "$as_me:12069: 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:12056: checking checking for compatible value versus " >&5
++	echo "$as_me:12075: 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 12059 "configure"
++#line 12078 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ 
+@@ -12072,16 +12091,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:12075: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:12094: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:12078: \$? = $ac_status" >&5
++  echo "$as_me:12097: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:12081: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12100: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:12084: \$? = $ac_status" >&5
++  echo "$as_me:12103: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_result=yes
+ else
+@@ -12090,7 +12109,7 @@
+ cf_result=no
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+-	echo "$as_me:12093: result: $cf_result" >&5
++	echo "$as_me:12112: result: $cf_result" >&5
+ echo "${ECHO_T}$cf_result" >&6
+ 	if test "$cf_result" = no ; then
+ 		# perhaps we can override it - try...
+@@ -12100,7 +12119,7 @@
+ 
+ fi
+ 
+-echo "$as_me:12103: checking if wcwidth agrees graphics are single-width" >&5
++echo "$as_me:12122: 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
+@@ -12171,7 +12190,7 @@
+   cf_cv_wcwidth_graphics=unknown
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 12174 "configure"
++#line 12193 "configure"
+ #include "confdefs.h"
+ 
+ #include <locale.h>
+@@ -12215,15 +12234,15 @@
+ 
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:12218: \"$ac_link\"") >&5
++if { (eval echo "$as_me:12237: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:12221: \$? = $ac_status" >&5
++  echo "$as_me:12240: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:12223: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12242: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:12226: \$? = $ac_status" >&5
++  echo "$as_me:12245: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_wcwidth_graphics=yes
+ else
+@@ -12236,7 +12255,7 @@
+ fi
+ 
+ fi
+-echo "$as_me:12239: result: $cf_cv_wcwidth_graphics" >&5
++echo "$as_me:12258: result: $cf_cv_wcwidth_graphics" >&5
+ echo "${ECHO_T}$cf_cv_wcwidth_graphics" >&6
+ 
+ 	test "$cf_cv_wcwidth_graphics" = no && NCURSES_WCWIDTH_GRAPHICS=0
+@@ -12247,13 +12266,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:12250: checking for $ac_func" >&5
++echo "$as_me:12269: 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 12256 "configure"
++#line 12275 "configure"
+ #include "confdefs.h"
+ #define $ac_func autoconf_temporary
+ #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -12284,16 +12303,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:12287: \"$ac_link\"") >&5
++if { (eval echo "$as_me:12306: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:12290: \$? = $ac_status" >&5
++  echo "$as_me:12309: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:12293: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12312: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:12296: \$? = $ac_status" >&5
++  echo "$as_me:12315: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   eval "$as_ac_var=yes"
+ else
+@@ -12303,7 +12322,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:12306: result: `eval echo '${'"$as_ac_var"'}'`" >&5
++echo "$as_me:12325: 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
+@@ -12318,23 +12337,23 @@
+ for ac_header in wchar.h
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-echo "$as_me:12321: checking for $ac_header" >&5
++echo "$as_me:12340: 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 12327 "configure"
++#line 12346 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:12331: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:12350: \"$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:12337: \$? = $ac_status" >&5
++  echo "$as_me:12356: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -12353,7 +12372,7 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:12356: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
++echo "$as_me:12375: 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
+@@ -12363,7 +12382,7 @@
+ fi
+ done
+ 
+-echo "$as_me:12366: checking for multibyte character support" >&5
++echo "$as_me:12385: 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
+@@ -12371,7 +12390,7 @@
+ 
+ 	cf_save_LIBS="$LIBS"
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 12374 "configure"
++#line 12393 "configure"
+ #include "confdefs.h"
+ 
+ #include <stdlib.h>
+@@ -12389,16 +12408,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:12392: \"$ac_link\"") >&5
++if { (eval echo "$as_me:12411: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:12395: \$? = $ac_status" >&5
++  echo "$as_me:12414: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:12398: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12417: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:12401: \$? = $ac_status" >&5
++  echo "$as_me:12420: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_utf8_lib=yes
+ else
+@@ -12410,12 +12429,12 @@
+ cf_cv_header_path_utf8=
+ cf_cv_library_path_utf8=
+ 
+-echo "${as_me:-configure}:12413: testing Starting FIND_LINKAGE(utf8,) ..." 1>&5
++echo "${as_me:-configure}:12432: testing Starting FIND_LINKAGE(utf8,) ..." 1>&5
+ 
+ cf_save_LIBS="$LIBS"
+ 
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 12418 "configure"
++#line 12437 "configure"
+ #include "confdefs.h"
+ 
+ #include <libutf8.h>
+@@ -12428,16 +12447,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:12431: \"$ac_link\"") >&5
++if { (eval echo "$as_me:12450: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:12434: \$? = $ac_status" >&5
++  echo "$as_me:12453: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:12437: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12456: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:12440: \$? = $ac_status" >&5
++  echo "$as_me:12459: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+ 
+ 	cf_cv_find_linkage_utf8=yes
+@@ -12451,7 +12470,7 @@
+ LIBS="-lutf8  $cf_save_LIBS"
+ 
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 12454 "configure"
++#line 12473 "configure"
+ #include "confdefs.h"
+ 
+ #include <libutf8.h>
+@@ -12464,16 +12483,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:12467: \"$ac_link\"") >&5
++if { (eval echo "$as_me:12486: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:12470: \$? = $ac_status" >&5
++  echo "$as_me:12489: \$? = $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:12492: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:12476: \$? = $ac_status" >&5
++  echo "$as_me:12495: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+ 
+ 	cf_cv_find_linkage_utf8=yes
+@@ -12490,9 +12509,9 @@
+ 
+ 	test -n "$verbose" && echo "	find linkage for utf8 library" 1>&6
+ 
+-echo "${as_me:-configure}:12493: testing find linkage for utf8 library ..." 1>&5
++echo "${as_me:-configure}:12512: testing find linkage for utf8 library ..." 1>&5
+ 
+-echo "${as_me:-configure}:12495: testing Searching for headers in FIND_LINKAGE(utf8,) ..." 1>&5
++echo "${as_me:-configure}:12514: testing Searching for headers in FIND_LINKAGE(utf8,) ..." 1>&5
+ 
+ 	cf_save_CPPFLAGS="$CPPFLAGS"
+ 	cf_test_CPPFLAGS="$CPPFLAGS"
+@@ -12583,7 +12602,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}:12586: testing ... testing $cf_cv_header_path_utf8 ..." 1>&5
++echo "${as_me:-configure}:12605: testing ... testing $cf_cv_header_path_utf8 ..." 1>&5
+ 
+ 			CPPFLAGS="$cf_save_CPPFLAGS"
+ 
+@@ -12591,7 +12610,7 @@
+ 	CPPFLAGS="${CPPFLAGS}-I$cf_cv_header_path_utf8"
+ 
+ 			cat >"conftest.$ac_ext" <<_ACEOF
+-#line 12594 "configure"
++#line 12613 "configure"
+ #include "confdefs.h"
+ 
+ #include <libutf8.h>
+@@ -12604,21 +12623,21 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:12607: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:12626: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:12610: \$? = $ac_status" >&5
++  echo "$as_me:12629: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:12613: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12632: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:12616: \$? = $ac_status" >&5
++  echo "$as_me:12635: \$? = $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}:12621: testing ... found utf8 headers in $cf_cv_header_path_utf8 ..." 1>&5
++echo "${as_me:-configure}:12640: testing ... found utf8 headers in $cf_cv_header_path_utf8 ..." 1>&5
+ 
+ 				cf_cv_find_linkage_utf8=maybe
+ 				cf_test_CPPFLAGS="$CPPFLAGS"
+@@ -12636,7 +12655,7 @@
+ 
+ 	if test "$cf_cv_find_linkage_utf8" = maybe ; then
+ 
+-echo "${as_me:-configure}:12639: testing Searching for utf8 library in FIND_LINKAGE(utf8,) ..." 1>&5
++echo "${as_me:-configure}:12658: testing Searching for utf8 library in FIND_LINKAGE(utf8,) ..." 1>&5
+ 
+ 		cf_save_LIBS="$LIBS"
+ 		cf_save_LDFLAGS="$LDFLAGS"
+@@ -12711,13 +12730,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}:12714: testing ... testing $cf_cv_library_path_utf8 ..." 1>&5
++echo "${as_me:-configure}:12733: 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 12720 "configure"
++#line 12739 "configure"
+ #include "confdefs.h"
+ 
+ #include <libutf8.h>
+@@ -12730,21 +12749,21 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:12733: \"$ac_link\"") >&5
++if { (eval echo "$as_me:12752: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:12736: \$? = $ac_status" >&5
++  echo "$as_me:12755: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:12739: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12758: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:12742: \$? = $ac_status" >&5
++  echo "$as_me:12761: \$? = $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}:12747: testing ... found utf8 library in $cf_cv_library_path_utf8 ..." 1>&5
++echo "${as_me:-configure}:12766: testing ... found utf8 library in $cf_cv_library_path_utf8 ..." 1>&5
+ 
+ 					cf_cv_find_linkage_utf8=yes
+ 					cf_cv_library_file_utf8="-lutf8"
+@@ -12786,7 +12805,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:12789: result: $cf_cv_utf8_lib" >&5
++echo "$as_me:12808: 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
+@@ -12824,7 +12843,7 @@
+ 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
+ 
+ 			  cat >"conftest.$ac_ext" <<_ACEOF
+-#line 12827 "configure"
++#line 12846 "configure"
+ #include "confdefs.h"
+ #include <stdio.h>
+ int
+@@ -12836,16 +12855,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:12839: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:12858: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:12842: \$? = $ac_status" >&5
++  echo "$as_me:12861: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:12845: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12864: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:12848: \$? = $ac_status" >&5
++  echo "$as_me:12867: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   :
+ else
+@@ -12862,7 +12881,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}:12865: testing adding $cf_add_incdir to include-path ..." 1>&5
++echo "${as_me:-configure}:12884: testing adding $cf_add_incdir to include-path ..." 1>&5
+ 
+ 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
+ 
+@@ -12898,7 +12917,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}:12901: testing adding $cf_add_libdir to library-path ..." 1>&5
++echo "${as_me:-configure}:12920: testing adding $cf_add_libdir to library-path ..." 1>&5
+ 
+ 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
+ 			fi
+@@ -12930,14 +12949,14 @@
+ 	fi
+ 
+ # This is needed on Tru64 5.0 to declare mbstate_t
+-echo "$as_me:12933: checking if we must include wchar.h to declare mbstate_t" >&5
++echo "$as_me:12952: 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 12940 "configure"
++#line 12959 "configure"
+ #include "confdefs.h"
+ 
+ #include <stdlib.h>
+@@ -12955,23 +12974,23 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:12958: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:12977: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:12961: \$? = $ac_status" >&5
++  echo "$as_me:12980: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:12964: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12983: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:12967: \$? = $ac_status" >&5
++  echo "$as_me:12986: \$? = $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 12974 "configure"
++#line 12993 "configure"
+ #include "confdefs.h"
+ 
+ #include <stdlib.h>
+@@ -12990,16 +13009,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:12993: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:13012: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:12996: \$? = $ac_status" >&5
++  echo "$as_me:13015: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:12999: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13018: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:13002: \$? = $ac_status" >&5
++  echo "$as_me:13021: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_mbstate_t=yes
+ else
+@@ -13011,7 +13030,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:13014: result: $cf_cv_mbstate_t" >&5
++echo "$as_me:13033: result: $cf_cv_mbstate_t" >&5
+ echo "${ECHO_T}$cf_cv_mbstate_t" >&6
+ 
+ if test "$cf_cv_mbstate_t" = yes ; then
+@@ -13029,14 +13048,14 @@
+ fi
+ 
+ # This is needed on Tru64 5.0 to declare wchar_t
+-echo "$as_me:13032: checking if we must include wchar.h to declare wchar_t" >&5
++echo "$as_me:13051: 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 13039 "configure"
++#line 13058 "configure"
+ #include "confdefs.h"
+ 
+ #include <stdlib.h>
+@@ -13054,23 +13073,23 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:13057: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:13076: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:13060: \$? = $ac_status" >&5
++  echo "$as_me:13079: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:13063: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13082: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:13066: \$? = $ac_status" >&5
++  echo "$as_me:13085: \$? = $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 13073 "configure"
++#line 13092 "configure"
+ #include "confdefs.h"
+ 
+ #include <stdlib.h>
+@@ -13089,16 +13108,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:13092: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:13111: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:13095: \$? = $ac_status" >&5
++  echo "$as_me:13114: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:13098: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13117: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:13101: \$? = $ac_status" >&5
++  echo "$as_me:13120: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_wchar_t=yes
+ else
+@@ -13110,7 +13129,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:13113: result: $cf_cv_wchar_t" >&5
++echo "$as_me:13132: result: $cf_cv_wchar_t" >&5
+ echo "${ECHO_T}$cf_cv_wchar_t" >&6
+ 
+ if test "$cf_cv_wchar_t" = yes ; then
+@@ -13133,14 +13152,14 @@
+ fi
+ 
+ # This is needed on Tru64 5.0 to declare wint_t
+-echo "$as_me:13136: checking if we must include wchar.h to declare wint_t" >&5
++echo "$as_me:13155: 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 13143 "configure"
++#line 13162 "configure"
+ #include "confdefs.h"
+ 
+ #include <stdlib.h>
+@@ -13158,23 +13177,23 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:13161: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:13180: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:13164: \$? = $ac_status" >&5
++  echo "$as_me:13183: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:13167: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13186: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:13170: \$? = $ac_status" >&5
++  echo "$as_me:13189: \$? = $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 13177 "configure"
++#line 13196 "configure"
+ #include "confdefs.h"
+ 
+ #include <stdlib.h>
+@@ -13193,16 +13212,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:13196: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:13215: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:13199: \$? = $ac_status" >&5
++  echo "$as_me:13218: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:13202: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13221: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:13205: \$? = $ac_status" >&5
++  echo "$as_me:13224: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_wint_t=yes
+ else
+@@ -13214,7 +13233,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:13217: result: $cf_cv_wint_t" >&5
++echo "$as_me:13236: result: $cf_cv_wint_t" >&5
+ echo "${ECHO_T}$cf_cv_wint_t" >&6
+ 
+ if test "$cf_cv_wint_t" = yes ; then
+@@ -13246,7 +13265,7 @@
+ fi
+ 
+ ###   use option --disable-lp64 to allow long chtype
+-echo "$as_me:13249: checking whether to enable _LP64 definition in curses.h" >&5
++echo "$as_me:13268: 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.
+@@ -13256,7 +13275,7 @@
+ else
+   with_lp64=$cf_dft_with_lp64
+ fi;
+-echo "$as_me:13259: result: $with_lp64" >&5
++echo "$as_me:13278: result: $with_lp64" >&5
+ echo "${ECHO_T}$with_lp64" >&6
+ 
+ if test "x$with_lp64" = xyes ; then
+@@ -13272,7 +13291,7 @@
+ fi;
+ if test "$enable_largefile" != no; then
+ 
+-  echo "$as_me:13275: checking for special C compiler options needed for large files" >&5
++  echo "$as_me:13294: 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
+@@ -13284,7 +13303,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 13287 "configure"
++#line 13306 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+  /* Check that off_t can represent 2**63 - 1 correctly.
+@@ -13304,16 +13323,16 @@
+ }
+ _ACEOF
+      	 rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:13307: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:13326: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:13310: \$? = $ac_status" >&5
++  echo "$as_me:13329: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:13313: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13332: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:13316: \$? = $ac_status" >&5
++  echo "$as_me:13335: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   break
+ else
+@@ -13323,16 +13342,16 @@
+ rm -f "conftest.$ac_objext"
+      	 CC="$CC -n32"
+      	 rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:13326: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:13345: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:13329: \$? = $ac_status" >&5
++  echo "$as_me:13348: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:13332: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13351: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:13335: \$? = $ac_status" >&5
++  echo "$as_me:13354: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_sys_largefile_CC=' -n32'; break
+ else
+@@ -13346,13 +13365,13 @@
+        rm -f "conftest.$ac_ext"
+     fi
+ fi
+-echo "$as_me:13349: result: $ac_cv_sys_largefile_CC" >&5
++echo "$as_me:13368: 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:13355: checking for _FILE_OFFSET_BITS value needed for large files" >&5
++  echo "$as_me:13374: 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
+@@ -13360,7 +13379,7 @@
+   while :; do
+   ac_cv_sys_file_offset_bits=no
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 13363 "configure"
++#line 13382 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+  /* Check that off_t can represent 2**63 - 1 correctly.
+@@ -13380,16 +13399,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:13383: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:13402: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:13386: \$? = $ac_status" >&5
++  echo "$as_me:13405: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:13389: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13408: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:13392: \$? = $ac_status" >&5
++  echo "$as_me:13411: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   break
+ else
+@@ -13398,7 +13417,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 13401 "configure"
++#line 13420 "configure"
+ #include "confdefs.h"
+ #define _FILE_OFFSET_BITS 64
+ #include <sys/types.h>
+@@ -13419,16 +13438,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:13422: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:13441: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:13425: \$? = $ac_status" >&5
++  echo "$as_me:13444: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:13428: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13447: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:13431: \$? = $ac_status" >&5
++  echo "$as_me:13450: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_sys_file_offset_bits=64; break
+ else
+@@ -13439,7 +13458,7 @@
+   break
+ done
+ fi
+-echo "$as_me:13442: result: $ac_cv_sys_file_offset_bits" >&5
++echo "$as_me:13461: 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
+ 
+@@ -13449,7 +13468,7 @@
+ 
+ fi
+ rm -rf conftest*
+-  echo "$as_me:13452: checking for _LARGE_FILES value needed for large files" >&5
++  echo "$as_me:13471: 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
+@@ -13457,7 +13476,7 @@
+   while :; do
+   ac_cv_sys_large_files=no
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 13460 "configure"
++#line 13479 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+  /* Check that off_t can represent 2**63 - 1 correctly.
+@@ -13477,16 +13496,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:13480: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:13499: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:13483: \$? = $ac_status" >&5
++  echo "$as_me:13502: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:13486: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13505: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:13489: \$? = $ac_status" >&5
++  echo "$as_me:13508: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   break
+ else
+@@ -13495,7 +13514,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 13498 "configure"
++#line 13517 "configure"
+ #include "confdefs.h"
+ #define _LARGE_FILES 1
+ #include <sys/types.h>
+@@ -13516,16 +13535,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:13519: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:13538: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:13522: \$? = $ac_status" >&5
++  echo "$as_me:13541: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:13525: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13544: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:13528: \$? = $ac_status" >&5
++  echo "$as_me:13547: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_sys_large_files=1; break
+ else
+@@ -13536,7 +13555,7 @@
+   break
+ done
+ fi
+-echo "$as_me:13539: result: $ac_cv_sys_large_files" >&5
++echo "$as_me:13558: 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
+ 
+@@ -13549,7 +13568,7 @@
+ fi
+ 
+ 	if test "$enable_largefile" != no ; then
+-	echo "$as_me:13552: checking for _LARGEFILE_SOURCE value needed for large files" >&5
++	echo "$as_me:13571: 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
+@@ -13557,7 +13576,7 @@
+   while :; do
+   ac_cv_sys_largefile_source=no
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 13560 "configure"
++#line 13579 "configure"
+ #include "confdefs.h"
+ #include <stdio.h>
+ int
+@@ -13569,16 +13588,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:13572: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:13591: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:13575: \$? = $ac_status" >&5
++  echo "$as_me:13594: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:13578: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13597: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:13581: \$? = $ac_status" >&5
++  echo "$as_me:13600: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   break
+ else
+@@ -13587,7 +13606,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 13590 "configure"
++#line 13609 "configure"
+ #include "confdefs.h"
+ #define _LARGEFILE_SOURCE 1
+ #include <stdio.h>
+@@ -13600,16 +13619,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:13603: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:13622: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:13606: \$? = $ac_status" >&5
++  echo "$as_me:13625: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:13609: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13628: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:13612: \$? = $ac_status" >&5
++  echo "$as_me:13631: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_sys_largefile_source=1; break
+ else
+@@ -13620,7 +13639,7 @@
+   break
+ done
+ fi
+-echo "$as_me:13623: result: $ac_cv_sys_largefile_source" >&5
++echo "$as_me:13642: 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
+ 
+@@ -13634,13 +13653,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:13637: checking for fseeko" >&5
++echo "$as_me:13656: 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 13643 "configure"
++#line 13662 "configure"
+ #include "confdefs.h"
+ #include <stdio.h>
+ int
+@@ -13652,16 +13671,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:13655: \"$ac_link\"") >&5
++if { (eval echo "$as_me:13674: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:13658: \$? = $ac_status" >&5
++  echo "$as_me:13677: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:13661: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13680: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:13664: \$? = $ac_status" >&5
++  echo "$as_me:13683: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_func_fseeko=yes
+ else
+@@ -13671,7 +13690,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:13674: result: $ac_cv_func_fseeko" >&5
++echo "$as_me:13693: result: $ac_cv_func_fseeko" >&5
+ echo "${ECHO_T}$ac_cv_func_fseeko" >&6
+ if test $ac_cv_func_fseeko = yes; then
+ 
+@@ -13710,14 +13729,14 @@
+ 
+ 	fi
+ 
+-	echo "$as_me:13713: checking whether to use struct dirent64" >&5
++	echo "$as_me:13732: 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 13720 "configure"
++#line 13739 "configure"
+ #include "confdefs.h"
+ 
+ #pragma GCC diagnostic error "-Wincompatible-pointer-types"
+@@ -13740,16 +13759,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:13743: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:13762: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:13746: \$? = $ac_status" >&5
++  echo "$as_me:13765: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:13749: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13768: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:13752: \$? = $ac_status" >&5
++  echo "$as_me:13771: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_struct_dirent64=yes
+ else
+@@ -13760,7 +13779,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:13763: result: $cf_cv_struct_dirent64" >&5
++echo "$as_me:13782: result: $cf_cv_struct_dirent64" >&5
+ echo "${ECHO_T}$cf_cv_struct_dirent64" >&6
+ 	test "$cf_cv_struct_dirent64" = yes &&
+ cat >>confdefs.h <<\EOF
+@@ -13770,7 +13789,7 @@
+ 	fi
+ 
+ ###   use option --disable-tparm-varargs to make tparm() conform to X/Open
+-echo "$as_me:13773: checking if you want tparm not to use X/Open fixed-parameter list" >&5
++echo "$as_me:13792: 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.
+@@ -13780,14 +13799,14 @@
+ else
+   with_tparm_varargs=yes
+ fi;
+-echo "$as_me:13783: result: $with_tparm_varargs" >&5
++echo "$as_me:13802: 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:13790: checking if you want tic library to use explicit dependency on ncurses$LIB_SUFFIX library" >&5
++echo "$as_me:13809: 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.
+@@ -13797,14 +13816,14 @@
+ else
+   with_tic_depends=yes
+ fi;
+-echo "$as_me:13800: result: $with_tic_depends" >&5
++echo "$as_me:13819: 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:13807: checking if you want to enable wattr* macros" >&5
++echo "$as_me:13826: 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.
+@@ -13816,15 +13835,15 @@
+ fi;
+ if [ "x$with_wattr_macros" != xyes ]; then
+ 	NCURSES_WATTR_MACROS=0
+-	echo "$as_me:13819: result: no" >&5
++	echo "$as_me:13838: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ else
+ 	NCURSES_WATTR_MACROS=1
+-	echo "$as_me:13823: result: yes" >&5
++	echo "$as_me:13842: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ fi
+ 
+-echo "$as_me:13827: checking for X11 rgb file" >&5
++echo "$as_me:13846: 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.
+@@ -13888,7 +13907,7 @@
+ 	cf_path=`echo "$cf_path" | sed -e s%NONE%$cf_path_syntax%`
+ 	;;
+ (*)
+-	{ { echo "$as_me:13891: error: expected a pathname, not \"$cf_path\"" >&5
++	{ { echo "$as_me:13910: error: expected a pathname, not \"$cf_path\"" >&5
+ echo "$as_me: error: expected a pathname, not \"$cf_path\"" >&2;}
+    { (exit 1); exit 1; }; }
+ 	;;
+@@ -13896,7 +13915,7 @@
+ 
+ fi
+ 
+-echo "$as_me:13899: result: $RGB_PATH" >&5
++echo "$as_me:13918: result: $RGB_PATH" >&5
+ echo "${ECHO_T}$RGB_PATH" >&6
+ 
+ cat >>confdefs.h <<EOF
+@@ -13910,7 +13929,7 @@
+ fi
+ 
+ ###   use option --with-bool to override bool's type
+-echo "$as_me:13913: checking for type of bool" >&5
++echo "$as_me:13932: 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.
+@@ -13920,10 +13939,10 @@
+ else
+   NCURSES_BOOL=auto
+ fi;
+-echo "$as_me:13923: result: $NCURSES_BOOL" >&5
++echo "$as_me:13942: result: $NCURSES_BOOL" >&5
+ echo "${ECHO_T}$NCURSES_BOOL" >&6
+ 
+-echo "$as_me:13926: checking for alternate terminal capabilities file" >&5
++echo "$as_me:13945: 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.
+@@ -13934,11 +13953,11 @@
+   TERMINFO_CAPS=Caps
+ fi;
+ test -f "${srcdir}/include/${TERMINFO_CAPS}" || TERMINFO_CAPS=Caps
+-echo "$as_me:13937: result: $TERMINFO_CAPS" >&5
++echo "$as_me:13956: result: $TERMINFO_CAPS" >&5
+ echo "${ECHO_T}$TERMINFO_CAPS" >&6
+ 
+ ###   use option --with-chtype to override chtype's type
+-echo "$as_me:13941: checking for type of chtype" >&5
++echo "$as_me:13960: 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.
+@@ -13948,11 +13967,11 @@
+ else
+   NCURSES_CHTYPE=$cf_dft_chtype
+ fi;
+-echo "$as_me:13951: result: $NCURSES_CHTYPE" >&5
++echo "$as_me:13970: result: $NCURSES_CHTYPE" >&5
+ echo "${ECHO_T}$NCURSES_CHTYPE" >&6
+ 
+ ###   use option --with-ospeed to override ospeed's type
+-echo "$as_me:13955: checking for type of ospeed" >&5
++echo "$as_me:13974: 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.
+@@ -13962,11 +13981,11 @@
+ else
+   NCURSES_OSPEED=short
+ fi;
+-echo "$as_me:13965: result: $NCURSES_OSPEED" >&5
++echo "$as_me:13984: result: $NCURSES_OSPEED" >&5
+ echo "${ECHO_T}$NCURSES_OSPEED" >&6
+ 
+ ###   use option --with-mmask-t to override mmask_t's type
+-echo "$as_me:13969: checking for type of mmask_t" >&5
++echo "$as_me:13988: 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.
+@@ -13976,11 +13995,11 @@
+ else
+   NCURSES_MMASK_T=$cf_dft_mmask_t
+ fi;
+-echo "$as_me:13979: result: $NCURSES_MMASK_T" >&5
++echo "$as_me:13998: 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:13983: checking for size CCHARW_MAX" >&5
++echo "$as_me:14002: 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.
+@@ -13990,16 +14009,16 @@
+ else
+   NCURSES_CCHARW_MAX=5
+ fi;
+-echo "$as_me:13993: result: $NCURSES_CCHARW_MAX" >&5
++echo "$as_me:14012: result: $NCURSES_CCHARW_MAX" >&5
+ echo "${ECHO_T}$NCURSES_CCHARW_MAX" >&6
+ 
+-echo "$as_me:13996: checking for ANSI C header files" >&5
++echo "$as_me:14015: 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 14002 "configure"
++#line 14021 "configure"
+ #include "confdefs.h"
+ #include <stdlib.h>
+ #include <stdarg.h>
+@@ -14007,13 +14026,13 @@
+ #include <float.h>
+ 
+ _ACEOF
+-if { (eval echo "$as_me:14010: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:14029: \"$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:14016: \$? = $ac_status" >&5
++  echo "$as_me:14035: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -14035,7 +14054,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 14038 "configure"
++#line 14057 "configure"
+ #include "confdefs.h"
+ #include <string.h>
+ 
+@@ -14053,7 +14072,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 14056 "configure"
++#line 14075 "configure"
+ #include "confdefs.h"
+ #include <stdlib.h>
+ 
+@@ -14074,7 +14093,7 @@
+   :
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 14077 "configure"
++#line 14096 "configure"
+ #include "confdefs.h"
+ #include <ctype.h>
+ #if ((' ' & 0x0FF) == 0x020)
+@@ -14100,15 +14119,15 @@
+ }
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:14103: \"$ac_link\"") >&5
++if { (eval echo "$as_me:14122: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:14106: \$? = $ac_status" >&5
++  echo "$as_me:14125: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:14108: \"$ac_try\"") >&5
++  { (eval echo "$as_me:14127: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:14111: \$? = $ac_status" >&5
++  echo "$as_me:14130: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   :
+ else
+@@ -14121,7 +14140,7 @@
+ fi
+ fi
+ fi
+-echo "$as_me:14124: result: $ac_cv_header_stdc" >&5
++echo "$as_me:14143: result: $ac_cv_header_stdc" >&5
+ echo "${ECHO_T}$ac_cv_header_stdc" >&6
+ if test $ac_cv_header_stdc = yes; then
+ 
+@@ -14137,28 +14156,28 @@
+                   inttypes.h stdint.h unistd.h
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-echo "$as_me:14140: checking for $ac_header" >&5
++echo "$as_me:14159: 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 14146 "configure"
++#line 14165 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ #include <$ac_header>
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:14152: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:14171: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:14155: \$? = $ac_status" >&5
++  echo "$as_me:14174: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:14158: \"$ac_try\"") >&5
++  { (eval echo "$as_me:14177: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:14161: \$? = $ac_status" >&5
++  echo "$as_me:14180: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   eval "$as_ac_Header=yes"
+ else
+@@ -14168,7 +14187,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:14171: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
++echo "$as_me:14190: 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
+@@ -14178,13 +14197,13 @@
+ fi
+ done
+ 
+-echo "$as_me:14181: checking for signed char" >&5
++echo "$as_me:14200: 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 14187 "configure"
++#line 14206 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -14199,16 +14218,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:14202: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:14221: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:14205: \$? = $ac_status" >&5
++  echo "$as_me:14224: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:14208: \"$ac_try\"") >&5
++  { (eval echo "$as_me:14227: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:14211: \$? = $ac_status" >&5
++  echo "$as_me:14230: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_type_signed_char=yes
+ else
+@@ -14218,10 +14237,10 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:14221: result: $ac_cv_type_signed_char" >&5
++echo "$as_me:14240: result: $ac_cv_type_signed_char" >&5
+ echo "${ECHO_T}$ac_cv_type_signed_char" >&6
+ 
+-echo "$as_me:14224: checking size of signed char" >&5
++echo "$as_me:14243: 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
+@@ -14230,7 +14249,7 @@
+   if test "$cross_compiling" = yes; then
+   # Depending upon the size, compute the lo and hi bounds.
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 14233 "configure"
++#line 14252 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -14242,21 +14261,21 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:14245: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:14264: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:14248: \$? = $ac_status" >&5
++  echo "$as_me:14267: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:14251: \"$ac_try\"") >&5
++  { (eval echo "$as_me:14270: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:14254: \$? = $ac_status" >&5
++  echo "$as_me:14273: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_lo=0 ac_mid=0
+   while :; do
+     cat >"conftest.$ac_ext" <<_ACEOF
+-#line 14259 "configure"
++#line 14278 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -14268,16 +14287,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:14271: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:14290: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:14274: \$? = $ac_status" >&5
++  echo "$as_me:14293: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:14277: \"$ac_try\"") >&5
++  { (eval echo "$as_me:14296: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:14280: \$? = $ac_status" >&5
++  echo "$as_me:14299: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_hi=$ac_mid; break
+ else
+@@ -14293,7 +14312,7 @@
+ ac_hi=-1 ac_mid=-1
+   while :; do
+     cat >"conftest.$ac_ext" <<_ACEOF
+-#line 14296 "configure"
++#line 14315 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -14305,16 +14324,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:14308: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:14327: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:14311: \$? = $ac_status" >&5
++  echo "$as_me:14330: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:14314: \"$ac_try\"") >&5
++  { (eval echo "$as_me:14333: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:14317: \$? = $ac_status" >&5
++  echo "$as_me:14336: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_lo=$ac_mid; break
+ else
+@@ -14330,7 +14349,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 14333 "configure"
++#line 14352 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -14342,16 +14361,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:14345: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:14364: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:14348: \$? = $ac_status" >&5
++  echo "$as_me:14367: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:14351: \"$ac_try\"") >&5
++  { (eval echo "$as_me:14370: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:14354: \$? = $ac_status" >&5
++  echo "$as_me:14373: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_hi=$ac_mid
+ else
+@@ -14364,12 +14383,12 @@
+ ac_cv_sizeof_signed_char=$ac_lo
+ else
+   if test "$cross_compiling" = yes; then
+-  { { echo "$as_me:14367: error: cannot run test program while cross compiling" >&5
++  { { echo "$as_me:14386: 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 14372 "configure"
++#line 14391 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -14385,15 +14404,15 @@
+ }
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:14388: \"$ac_link\"") >&5
++if { (eval echo "$as_me:14407: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:14391: \$? = $ac_status" >&5
++  echo "$as_me:14410: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:14393: \"$ac_try\"") >&5
++  { (eval echo "$as_me:14412: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:14396: \$? = $ac_status" >&5
++  echo "$as_me:14415: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_sizeof_signed_char=`cat conftest.val`
+ else
+@@ -14409,7 +14428,7 @@
+   ac_cv_sizeof_signed_char=0
+ fi
+ fi
+-echo "$as_me:14412: result: $ac_cv_sizeof_signed_char" >&5
++echo "$as_me:14431: 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
+@@ -14420,7 +14439,7 @@
+ else
+ 	NCURSES_SBOOL="char"
+ fi
+-echo "$as_me:14423: checking if you want to use signed Boolean array in term.h" >&5
++echo "$as_me:14442: 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.
+@@ -14430,12 +14449,12 @@
+ else
+   with_signed_char=no
+ fi;
+-echo "$as_me:14433: result: $with_signed_char" >&5
++echo "$as_me:14452: 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:14438: checking for type of tparm args" >&5
++echo "$as_me:14457: 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.
+@@ -14445,11 +14464,11 @@
+ else
+   NCURSES_TPARM_ARG=$cf_dft_tparm_arg
+ fi;
+-echo "$as_me:14448: result: $NCURSES_TPARM_ARG" >&5
++echo "$as_me:14467: result: $NCURSES_TPARM_ARG" >&5
+ echo "${ECHO_T}$NCURSES_TPARM_ARG" >&6
+ 
+ ### Enable compiling-in rcs id's
+-echo "$as_me:14452: checking if RCS identifiers should be compiled-in" >&5
++echo "$as_me:14471: 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.
+@@ -14459,7 +14478,7 @@
+ else
+   with_rcs_ids=no
+ fi;
+-echo "$as_me:14462: result: $with_rcs_ids" >&5
++echo "$as_me:14481: result: $with_rcs_ids" >&5
+ echo "${ECHO_T}$with_rcs_ids" >&6
+ test "x$with_rcs_ids" = xyes &&
+ cat >>confdefs.h <<\EOF
+@@ -14468,7 +14487,7 @@
+ 
+ ###############################################################################
+ 
+-echo "$as_me:14471: checking format of man-pages" >&5
++echo "$as_me:14490: 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.
+@@ -14557,14 +14576,14 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:14560: result: $MANPAGE_FORMAT" >&5
++echo "$as_me:14579: result: $MANPAGE_FORMAT" >&5
+ echo "${ECHO_T}$MANPAGE_FORMAT" >&6
+ if test -n "$cf_unknown" ; then
+-	{ echo "$as_me:14563: WARNING: Unexpected manpage-format $cf_unknown" >&5
++	{ echo "$as_me:14582: WARNING: Unexpected manpage-format $cf_unknown" >&5
+ echo "$as_me: WARNING: Unexpected manpage-format $cf_unknown" >&2;}
+ fi
+ 
+-echo "$as_me:14567: checking for manpage renaming" >&5
++echo "$as_me:14586: 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.
+@@ -14592,7 +14611,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:14595: error: not a filename: $MANPAGE_RENAMES" >&5
++		{ { echo "$as_me:14614: error: not a filename: $MANPAGE_RENAMES" >&5
+ echo "$as_me: error: not a filename: $MANPAGE_RENAMES" >&2;}
+    { (exit 1); exit 1; }; }
+ 	fi
+@@ -14606,10 +14625,10 @@
+ 	fi
+ fi
+ 
+-echo "$as_me:14609: result: $MANPAGE_RENAMES" >&5
++echo "$as_me:14628: result: $MANPAGE_RENAMES" >&5
+ echo "${ECHO_T}$MANPAGE_RENAMES" >&6
+ 
+-echo "$as_me:14612: checking if manpage aliases will be installed" >&5
++echo "$as_me:14631: 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.
+@@ -14620,7 +14639,7 @@
+   MANPAGE_ALIASES=yes
+ fi;
+ 
+-echo "$as_me:14623: result: $MANPAGE_ALIASES" >&5
++echo "$as_me:14642: result: $MANPAGE_ALIASES" >&5
+ echo "${ECHO_T}$MANPAGE_ALIASES" >&6
+ 
+ case "x$LN_S" in
+@@ -14634,7 +14653,7 @@
+ 
+ MANPAGE_SYMLINKS=no
+ if test "$MANPAGE_ALIASES" = yes ; then
+-echo "$as_me:14637: checking if manpage symlinks should be used" >&5
++echo "$as_me:14656: 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.
+@@ -14647,17 +14666,17 @@
+ 
+ if test "$$cf_use_symlinks" = no; then
+ if test "$MANPAGE_SYMLINKS" = yes ; then
+-	{ echo "$as_me:14650: WARNING: cannot make symlinks" >&5
++	{ echo "$as_me:14669: WARNING: cannot make symlinks" >&5
+ echo "$as_me: WARNING: cannot make symlinks" >&2;}
+ 	MANPAGE_SYMLINKS=no
+ fi
+ fi
+ 
+-echo "$as_me:14656: result: $MANPAGE_SYMLINKS" >&5
++echo "$as_me:14675: result: $MANPAGE_SYMLINKS" >&5
+ echo "${ECHO_T}$MANPAGE_SYMLINKS" >&6
+ fi
+ 
+-echo "$as_me:14660: checking for manpage tbl" >&5
++echo "$as_me:14679: 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.
+@@ -14668,7 +14687,7 @@
+   MANPAGE_TBL=no
+ fi;
+ 
+-echo "$as_me:14671: result: $MANPAGE_TBL" >&5
++echo "$as_me:14690: result: $MANPAGE_TBL" >&5
+ echo "${ECHO_T}$MANPAGE_TBL" >&6
+ 
+ if test "$prefix" = "NONE" ; then
+@@ -15001,7 +15020,7 @@
+ ###############################################################################
+ 
+ ### Note that some functions (such as const) are normally disabled anyway.
+-echo "$as_me:15004: checking if you want to build with function extensions" >&5
++echo "$as_me:15023: 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.
+@@ -15011,7 +15030,7 @@
+ else
+   with_ext_funcs=yes
+ fi;
+-echo "$as_me:15014: result: $with_ext_funcs" >&5
++echo "$as_me:15033: result: $with_ext_funcs" >&5
+ echo "${ECHO_T}$with_ext_funcs" >&6
+ if test "x$with_ext_funcs" = xyes ; then
+ 	NCURSES_EXT_FUNCS=1
+@@ -15071,7 +15090,7 @@
+ 	GENERATED_EXT_FUNCS=
+ fi
+ 
+-echo "$as_me:15074: checking if you want to build with SCREEN extensions" >&5
++echo "$as_me:15093: 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.
+@@ -15081,7 +15100,7 @@
+ else
+   with_sp_funcs=$cf_dft_ext_spfuncs
+ fi;
+-echo "$as_me:15084: result: $with_sp_funcs" >&5
++echo "$as_me:15103: result: $with_sp_funcs" >&5
+ echo "${ECHO_T}$with_sp_funcs" >&6
+ if test "x$with_sp_funcs" = xyes ; then
+ 	NCURSES_SP_FUNCS=1
+@@ -15100,7 +15119,7 @@
+ 	GENERATED_SP_FUNCS=
+ fi
+ 
+-echo "$as_me:15103: checking if you want to build with terminal-driver" >&5
++echo "$as_me:15122: 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.
+@@ -15110,7 +15129,7 @@
+ else
+   with_term_driver=no
+ fi;
+-echo "$as_me:15113: result: $with_term_driver" >&5
++echo "$as_me:15132: result: $with_term_driver" >&5
+ echo "${ECHO_T}$with_term_driver" >&6
+ if test "x$with_term_driver" = xyes ; then
+ 
+@@ -15119,19 +15138,19 @@
+ EOF
+ 
+ 	if test "x$with_termlib" != xno ; then
+-		{ { echo "$as_me:15122: error: The term-driver option conflicts with the termlib option" >&5
++		{ { echo "$as_me:15141: 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:15127: error: The term-driver option relies upon sp-funcs" >&5
++		{ { echo "$as_me:15146: 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:15134: checking for extended use of const keyword" >&5
++echo "$as_me:15153: 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.
+@@ -15141,7 +15160,7 @@
+ else
+   with_ext_const=$cf_dft_ext_const
+ fi;
+-echo "$as_me:15144: result: $with_ext_const" >&5
++echo "$as_me:15163: result: $with_ext_const" >&5
+ echo "${ECHO_T}$with_ext_const" >&6
+ NCURSES_CONST='/*nothing*/'
+ if test "x$with_ext_const" = xyes ; then
+@@ -15149,7 +15168,7 @@
+ fi
+ 
+ ###   use option --enable-ext-colors to turn on use of colors beyond 16.
+-echo "$as_me:15152: checking if you want to use extended colors" >&5
++echo "$as_me:15171: 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.
+@@ -15159,12 +15178,12 @@
+ else
+   with_ext_colors=$cf_dft_ext_colors
+ fi;
+-echo "$as_me:15162: result: $with_ext_colors" >&5
++echo "$as_me:15181: 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:15167: WARNING: This option applies only to wide-character library" >&5
++		{ echo "$as_me:15186: 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)
+@@ -15174,7 +15193,7 @@
+ 	(5.*)
+ 		cf_cv_rel_version=6.0
+ 		cf_cv_abi_version=6
+-		{ echo "$as_me:15177: WARNING: overriding ABI version to $cf_cv_abi_version" >&5
++		{ echo "$as_me:15196: WARNING: overriding ABI version to $cf_cv_abi_version" >&5
+ echo "$as_me: WARNING: overriding ABI version to $cf_cv_abi_version" >&2;}
+ 		;;
+ 	esac
+@@ -15202,7 +15221,7 @@
+ fi
+ 
+ ###   use option --enable-ext-mouse to modify coding to support 5-button mice
+-echo "$as_me:15205: checking if you want to use extended mouse encoding" >&5
++echo "$as_me:15224: 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.
+@@ -15212,7 +15231,7 @@
+ else
+   with_ext_mouse=$cf_dft_ext_mouse
+ fi;
+-echo "$as_me:15215: result: $with_ext_mouse" >&5
++echo "$as_me:15234: result: $with_ext_mouse" >&5
+ echo "${ECHO_T}$with_ext_mouse" >&6
+ NCURSES_MOUSE_VERSION=1
+ if test "x$with_ext_mouse" = xyes ; then
+@@ -15223,7 +15242,7 @@
+ 	(5.*)
+ 		cf_cv_rel_version=6.0
+ 		cf_cv_abi_version=6
+-		{ echo "$as_me:15226: WARNING: overriding ABI version to $cf_cv_abi_version" >&5
++		{ echo "$as_me:15245: WARNING: overriding ABI version to $cf_cv_abi_version" >&5
+ echo "$as_me: WARNING: overriding ABI version to $cf_cv_abi_version" >&2;}
+ 		;;
+ 	esac
+@@ -15232,7 +15251,7 @@
+ fi
+ 
+ ###   use option --enable-ext-putwin to turn on extended screendumps
+-echo "$as_me:15235: checking if you want to use extended putwin/screendump" >&5
++echo "$as_me:15254: 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.
+@@ -15242,7 +15261,7 @@
+ else
+   with_ext_putwin=$cf_dft_ext_putwin
+ fi;
+-echo "$as_me:15245: result: $with_ext_putwin" >&5
++echo "$as_me:15264: result: $with_ext_putwin" >&5
+ echo "${ECHO_T}$with_ext_putwin" >&6
+ if test "x$with_ext_putwin" = xyes ; then
+ 
+@@ -15252,7 +15271,7 @@
+ 
+ fi
+ 
+-echo "$as_me:15255: checking if you want \$NCURSES_NO_PADDING code" >&5
++echo "$as_me:15274: 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.
+@@ -15262,7 +15281,7 @@
+ else
+   with_no_padding=$with_ext_funcs
+ fi;
+-echo "$as_me:15265: result: $with_no_padding" >&5
++echo "$as_me:15284: result: $with_no_padding" >&5
+ echo "${ECHO_T}$with_no_padding" >&6
+ test "x$with_no_padding" = xyes &&
+ cat >>confdefs.h <<\EOF
+@@ -15270,7 +15289,7 @@
+ EOF
+ 
+ ###   use option --enable-sigwinch to turn on use of SIGWINCH logic
+-echo "$as_me:15273: checking if you want SIGWINCH handler" >&5
++echo "$as_me:15292: 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.
+@@ -15280,7 +15299,7 @@
+ else
+   with_sigwinch=$with_ext_funcs
+ fi;
+-echo "$as_me:15283: result: $with_sigwinch" >&5
++echo "$as_me:15302: result: $with_sigwinch" >&5
+ echo "${ECHO_T}$with_sigwinch" >&6
+ test "x$with_sigwinch" = xyes &&
+ cat >>confdefs.h <<\EOF
+@@ -15288,7 +15307,7 @@
+ EOF
+ 
+ ###   use option --enable-tcap-names to allow user to define new capabilities
+-echo "$as_me:15291: checking if you want user-definable terminal capabilities like termcap" >&5
++echo "$as_me:15310: 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.
+@@ -15298,14 +15317,14 @@
+ else
+   with_tcap_names=$with_ext_funcs
+ fi;
+-echo "$as_me:15301: result: $with_tcap_names" >&5
++echo "$as_me:15320: 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:15308: checking if you want to link with the pthread library" >&5
++echo "$as_me:15327: 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.
+@@ -15315,27 +15334,27 @@
+ else
+   with_pthread=no
+ fi;
+-echo "$as_me:15318: result: $with_pthread" >&5
++echo "$as_me:15337: result: $with_pthread" >&5
+ echo "${ECHO_T}$with_pthread" >&6
+ 
+ if test "$with_pthread" != no ; then
+-	echo "$as_me:15322: checking for pthread.h" >&5
++	echo "$as_me:15341: 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 15328 "configure"
++#line 15347 "configure"
+ #include "confdefs.h"
+ #include <pthread.h>
+ _ACEOF
+-if { (eval echo "$as_me:15332: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:15351: \"$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:15338: \$? = $ac_status" >&5
++  echo "$as_me:15357: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -15354,7 +15373,7 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:15357: result: $ac_cv_header_pthread_h" >&5
++echo "$as_me:15376: 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
+ 
+@@ -15364,7 +15383,7 @@
+ 
+ 	for cf_lib_pthread in pthread c_r
+ 	do
+-	    echo "$as_me:15367: checking if we can link with the $cf_lib_pthread library" >&5
++	    echo "$as_me:15386: 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"
+ 
+@@ -15385,7 +15404,7 @@
+ LIBS="$cf_add_libs"
+ 
+ 	    cat >"conftest.$ac_ext" <<_ACEOF
+-#line 15388 "configure"
++#line 15407 "configure"
+ #include "confdefs.h"
+ 
+ #include <pthread.h>
+@@ -15402,16 +15421,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:15405: \"$ac_link\"") >&5
++if { (eval echo "$as_me:15424: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:15408: \$? = $ac_status" >&5
++  echo "$as_me:15427: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:15411: \"$ac_try\"") >&5
++  { (eval echo "$as_me:15430: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:15414: \$? = $ac_status" >&5
++  echo "$as_me:15433: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   with_pthread=yes
+ else
+@@ -15421,7 +15440,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ 	    LIBS="$cf_save_LIBS"
+-	    echo "$as_me:15424: result: $with_pthread" >&5
++	    echo "$as_me:15443: result: $with_pthread" >&5
+ echo "${ECHO_T}$with_pthread" >&6
+ 	    test "$with_pthread" = yes && break
+ 	done
+@@ -15449,7 +15468,7 @@
+ EOF
+ 
+ 	else
+-	    { { echo "$as_me:15452: error: Cannot link with pthread library" >&5
++	    { { echo "$as_me:15471: error: Cannot link with pthread library" >&5
+ echo "$as_me: error: Cannot link with pthread library" >&2;}
+    { (exit 1); exit 1; }; }
+ 	fi
+@@ -15459,13 +15478,13 @@
+ fi
+ 
+ if test "x$with_pthread" != xno; then
+-	echo "$as_me:15462: checking for pthread_kill" >&5
++	echo "$as_me:15481: 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 15468 "configure"
++#line 15487 "configure"
+ #include "confdefs.h"
+ #define pthread_kill autoconf_temporary
+ #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -15496,16 +15515,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:15499: \"$ac_link\"") >&5
++if { (eval echo "$as_me:15518: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:15502: \$? = $ac_status" >&5
++  echo "$as_me:15521: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:15505: \"$ac_try\"") >&5
++  { (eval echo "$as_me:15524: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:15508: \$? = $ac_status" >&5
++  echo "$as_me:15527: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_func_pthread_kill=yes
+ else
+@@ -15515,11 +15534,11 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:15518: result: $ac_cv_func_pthread_kill" >&5
++echo "$as_me:15537: 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:15522: checking if you want to allow EINTR in wgetch with pthreads" >&5
++		echo "$as_me:15541: 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.
+@@ -15529,7 +15548,7 @@
+ else
+   use_pthreads_eintr=no
+ fi;
+-		echo "$as_me:15532: result: $use_pthreads_eintr" >&5
++		echo "$as_me:15551: result: $use_pthreads_eintr" >&5
+ echo "${ECHO_T}$use_pthreads_eintr" >&6
+ 		if test "x$use_pthreads_eintr" = xyes ; then
+ 
+@@ -15540,7 +15559,7 @@
+ 		fi
+ fi
+ 
+-	echo "$as_me:15543: checking if you want to use weak-symbols for pthreads" >&5
++	echo "$as_me:15562: 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.
+@@ -15550,18 +15569,18 @@
+ else
+   use_weak_symbols=no
+ fi;
+-	echo "$as_me:15553: result: $use_weak_symbols" >&5
++	echo "$as_me:15572: result: $use_weak_symbols" >&5
+ echo "${ECHO_T}$use_weak_symbols" >&6
+ 	if test "x$use_weak_symbols" = xyes ; then
+ 
+-echo "$as_me:15557: checking if $CC supports weak symbols" >&5
++echo "$as_me:15576: 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 15564 "configure"
++#line 15583 "configure"
+ #include "confdefs.h"
+ 
+ #include <stdio.h>
+@@ -15587,16 +15606,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:15590: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:15609: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:15593: \$? = $ac_status" >&5
++  echo "$as_me:15612: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:15596: \"$ac_try\"") >&5
++  { (eval echo "$as_me:15615: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:15599: \$? = $ac_status" >&5
++  echo "$as_me:15618: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_weak_symbols=yes
+ else
+@@ -15607,7 +15626,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:15610: result: $cf_cv_weak_symbols" >&5
++echo "$as_me:15629: result: $cf_cv_weak_symbols" >&5
+ echo "${ECHO_T}$cf_cv_weak_symbols" >&6
+ 
+ 	else
+@@ -15657,7 +15676,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:15660: checking if you want reentrant code" >&5
++echo "$as_me:15679: 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.
+@@ -15667,7 +15686,7 @@
+ else
+   with_reentrant=no
+ fi;
+-echo "$as_me:15670: result: $with_reentrant" >&5
++echo "$as_me:15689: result: $with_reentrant" >&5
+ echo "${ECHO_T}$with_reentrant" >&6
+ if test "x$with_reentrant" = xyes ; then
+ 	cf_cv_enable_reentrant=1
+@@ -15755,7 +15774,7 @@
+ 	(5.*)
+ 		cf_cv_rel_version=6.0
+ 		cf_cv_abi_version=6
+-		{ echo "$as_me:15758: WARNING: overriding ABI version to $cf_cv_abi_version" >&5
++		{ echo "$as_me:15777: WARNING: overriding ABI version to $cf_cv_abi_version" >&5
+ echo "$as_me: WARNING: overriding ABI version to $cf_cv_abi_version" >&2;}
+ 		;;
+ 	esac
+@@ -15767,7 +15786,7 @@
+ 	NCURSES_SIZE_T=short
+ fi
+ 
+-echo "$as_me:15770: checking if you want opaque curses-library structures" >&5
++echo "$as_me:15789: 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.
+@@ -15789,16 +15808,16 @@
+ 	 test "$cf_cv_enable_reentrant" = 1 || enable_opaque_curses=no
+ 
+ fi;
+-echo "$as_me:15792: result: $enable_opaque_curses" >&5
++echo "$as_me:15811: 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:15797: error: reentrant configuration requires opaque library" >&5
++{ { echo "$as_me:15816: error: reentrant configuration requires opaque library" >&5
+ echo "$as_me: error: reentrant configuration requires opaque library" >&2;}
+    { (exit 1); exit 1; }; }
+ 
+-echo "$as_me:15801: checking if you want opaque form-library structures" >&5
++echo "$as_me:15820: 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.
+@@ -15808,10 +15827,10 @@
+ else
+   enable_opaque_form=no
+ fi;
+-echo "$as_me:15811: result: $enable_opaque_form" >&5
++echo "$as_me:15830: result: $enable_opaque_form" >&5
+ echo "${ECHO_T}$enable_opaque_form" >&6
+ 
+-echo "$as_me:15814: checking if you want opaque menu-library structures" >&5
++echo "$as_me:15833: 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.
+@@ -15821,10 +15840,10 @@
+ else
+   enable_opaque_menu=no
+ fi;
+-echo "$as_me:15824: result: $enable_opaque_menu" >&5
++echo "$as_me:15843: result: $enable_opaque_menu" >&5
+ echo "${ECHO_T}$enable_opaque_menu" >&6
+ 
+-echo "$as_me:15827: checking if you want opaque panel-library structures" >&5
++echo "$as_me:15846: 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.
+@@ -15834,7 +15853,7 @@
+ else
+   enable_opaque_panel=no
+ fi;
+-echo "$as_me:15837: result: $enable_opaque_panel" >&5
++echo "$as_me:15856: result: $enable_opaque_panel" >&5
+ echo "${ECHO_T}$enable_opaque_panel" >&6
+ 
+ NCURSES_OPAQUE=0;		test "$enable_opaque_curses" = yes && NCURSES_OPAQUE=1
+@@ -15844,7 +15863,7 @@
+ 
+ ### Allow using a different wrap-prefix
+ if test "$cf_cv_enable_reentrant" != 0 || test "$BROKEN_LINKER" = 1 ; then
+-	echo "$as_me:15847: checking for prefix used to wrap public variables" >&5
++	echo "$as_me:15866: 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.
+@@ -15854,7 +15873,7 @@
+ else
+   NCURSES_WRAP_PREFIX=_nc_
+ fi;
+-	echo "$as_me:15857: result: $NCURSES_WRAP_PREFIX" >&5
++	echo "$as_me:15876: result: $NCURSES_WRAP_PREFIX" >&5
+ echo "${ECHO_T}$NCURSES_WRAP_PREFIX" >&6
+ else
+ 	NCURSES_WRAP_PREFIX=_nc_
+@@ -15867,7 +15886,7 @@
+ ###############################################################################
+ # These options are relatively safe to experiment with.
+ 
+-echo "$as_me:15870: checking if you want all development code" >&5
++echo "$as_me:15889: 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.
+@@ -15877,11 +15896,11 @@
+ else
+   with_develop=no
+ fi;
+-echo "$as_me:15880: result: $with_develop" >&5
++echo "$as_me:15899: 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:15884: checking if you want hard-tabs code" >&5
++echo "$as_me:15903: 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.
+@@ -15891,7 +15910,7 @@
+ else
+   enable_hard_tabs=$with_develop
+ fi;
+-echo "$as_me:15894: result: $enable_hard_tabs" >&5
++echo "$as_me:15913: result: $enable_hard_tabs" >&5
+ echo "${ECHO_T}$enable_hard_tabs" >&6
+ test "x$enable_hard_tabs" = xyes &&
+ cat >>confdefs.h <<\EOF
+@@ -15899,7 +15918,7 @@
+ EOF
+ 
+ ###   use option --enable-xmc-glitch to turn on use of magic-cookie optimize
+-echo "$as_me:15902: checking if you want limited support for xmc" >&5
++echo "$as_me:15921: 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.
+@@ -15909,7 +15928,7 @@
+ else
+   enable_xmc_glitch=$with_develop
+ fi;
+-echo "$as_me:15912: result: $enable_xmc_glitch" >&5
++echo "$as_me:15931: result: $enable_xmc_glitch" >&5
+ echo "${ECHO_T}$enable_xmc_glitch" >&6
+ test "x$enable_xmc_glitch" = xyes &&
+ cat >>confdefs.h <<\EOF
+@@ -15919,7 +15938,7 @@
+ ###############################################################################
+ # These are just experimental, probably should not be in a package:
+ 
+-echo "$as_me:15922: checking if you do not want to assume colors are white-on-black" >&5
++echo "$as_me:15941: 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.
+@@ -15929,7 +15948,7 @@
+ else
+   with_assumed_color=yes
+ fi;
+-echo "$as_me:15932: result: $with_assumed_color" >&5
++echo "$as_me:15951: result: $with_assumed_color" >&5
+ echo "${ECHO_T}$with_assumed_color" >&6
+ test "x$with_assumed_color" = xyes &&
+ cat >>confdefs.h <<\EOF
+@@ -15937,7 +15956,7 @@
+ EOF
+ 
+ ###   use option --enable-hashmap to turn on use of hashmap scrolling logic
+-echo "$as_me:15940: checking if you want hashmap scrolling-optimization code" >&5
++echo "$as_me:15959: 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.
+@@ -15947,7 +15966,7 @@
+ else
+   with_hashmap=yes
+ fi;
+-echo "$as_me:15950: result: $with_hashmap" >&5
++echo "$as_me:15969: result: $with_hashmap" >&5
+ echo "${ECHO_T}$with_hashmap" >&6
+ test "x$with_hashmap" = xyes &&
+ cat >>confdefs.h <<\EOF
+@@ -15955,7 +15974,7 @@
+ EOF
+ 
+ ###   use option --enable-colorfgbg to turn on use of $COLORFGBG environment
+-echo "$as_me:15958: checking if you want colorfgbg code" >&5
++echo "$as_me:15977: 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.
+@@ -15965,7 +15984,7 @@
+ else
+   with_colorfgbg=no
+ fi;
+-echo "$as_me:15968: result: $with_colorfgbg" >&5
++echo "$as_me:15987: result: $with_colorfgbg" >&5
+ echo "${ECHO_T}$with_colorfgbg" >&6
+ test "x$with_colorfgbg" = xyes &&
+ cat >>confdefs.h <<\EOF
+@@ -15973,7 +15992,7 @@
+ EOF
+ 
+ ###   use option --enable-fvisibility to turn on use of gcc-specific feature
+-echo "$as_me:15976: checking if you want to use gcc -fvisibility option" >&5
++echo "$as_me:15995: 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.
+@@ -15983,14 +16002,14 @@
+ else
+   cf_with_fvisibility=no
+ fi;
+-echo "$as_me:15986: result: $cf_with_fvisibility" >&5
++echo "$as_me:16005: 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:15993: checking if $CC -fvisibility=hidden option works" >&5
++echo "$as_me:16012: 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
+@@ -15999,7 +16018,7 @@
+     cf_save_cflags="$CFLAGS"
+     CFLAGS="$CFLAGS -fvisibility=hidden"
+     cat >"conftest.$ac_ext" <<_ACEOF
+-#line 16002 "configure"
++#line 16021 "configure"
+ #include "confdefs.h"
+ 
+ __attribute__ ((visibility("default"))) int somefunc() {return 42;}
+@@ -16015,16 +16034,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:16018: \"$ac_link\"") >&5
++if { (eval echo "$as_me:16037: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:16021: \$? = $ac_status" >&5
++  echo "$as_me:16040: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:16024: \"$ac_try\"") >&5
++  { (eval echo "$as_me:16043: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:16027: \$? = $ac_status" >&5
++  echo "$as_me:16046: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_fvisibility_hidden=yes
+ else
+@@ -16036,7 +16055,7 @@
+     CFLAGS=$cf_save_cflags
+ 
+ fi
+-echo "$as_me:16039: result: $cf_cv_fvisibility_hidden" >&5
++echo "$as_me:16058: result: $cf_cv_fvisibility_hidden" >&5
+ echo "${ECHO_T}$cf_cv_fvisibility_hidden" >&6
+ 
+ 	if test "x$cf_cv_fvisibility_hidden" = xyes
+@@ -16151,7 +16170,7 @@
+ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
+ ac_main_return="return"
+ 
+-echo "$as_me:16154: checking if $CXX -fvisibility=hidden option works" >&5
++echo "$as_me:16173: 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
+@@ -16160,7 +16179,7 @@
+     cf_save_cflags="$CXXFLAGS"
+     CXXFLAGS="$CXXFLAGS -fvisibility=hidden"
+     cat >"conftest.$ac_ext" <<_ACEOF
+-#line 16163 "configure"
++#line 16182 "configure"
+ #include "confdefs.h"
+ 
+ __attribute__ ((visibility("default"))) int somefunc() {return 42;}
+@@ -16176,16 +16195,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:16179: \"$ac_link\"") >&5
++if { (eval echo "$as_me:16198: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:16182: \$? = $ac_status" >&5
++  echo "$as_me:16201: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:16185: \"$ac_try\"") >&5
++  { (eval echo "$as_me:16204: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:16188: \$? = $ac_status" >&5
++  echo "$as_me:16207: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_fvisibility_hidden2=yes
+ else
+@@ -16197,7 +16216,7 @@
+     CXXFLAGS=$cf_save_cflags
+ 
+ fi
+-echo "$as_me:16200: result: $cf_cv_fvisibility_hidden2" >&5
++echo "$as_me:16219: result: $cf_cv_fvisibility_hidden2" >&5
+ echo "${ECHO_T}$cf_cv_fvisibility_hidden2" >&6
+ 
+ 		if test "x$cf_cv_fvisibility_hidden2" = xyes
+@@ -16320,7 +16339,7 @@
+ fi
+ 
+ ###   use option --enable-interop to turn on use of bindings used for interop
+-echo "$as_me:16323: checking if you want interop bindings" >&5
++echo "$as_me:16342: 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.
+@@ -16330,13 +16349,13 @@
+ else
+   with_exp_interop=$cf_dft_interop
+ fi;
+-echo "$as_me:16333: result: $with_exp_interop" >&5
++echo "$as_me:16352: 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:16339: checking if you want experimental safe-sprintf code" >&5
++echo "$as_me:16358: 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.
+@@ -16346,13 +16365,13 @@
+ else
+   with_safe_sprintf=no
+ fi;
+-echo "$as_me:16349: result: $with_safe_sprintf" >&5
++echo "$as_me:16368: 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:16355: checking if you want to experiment without scrolling-hints code" >&5
++echo "$as_me:16374: 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.
+@@ -16362,7 +16381,7 @@
+ else
+   with_scroll_hints=yes
+ fi;
+-echo "$as_me:16365: result: $with_scroll_hints" >&5
++echo "$as_me:16384: result: $with_scroll_hints" >&5
+ echo "${ECHO_T}$with_scroll_hints" >&6
+ test "x$with_scroll_hints" = xyes &&
+ cat >>confdefs.h <<\EOF
+@@ -16371,7 +16390,7 @@
+ 
+ fi
+ 
+-echo "$as_me:16374: checking if you want wgetch-events code" >&5
++echo "$as_me:16393: 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.
+@@ -16381,7 +16400,7 @@
+ else
+   with_wgetch_events=no
+ fi;
+-echo "$as_me:16384: result: $with_wgetch_events" >&5
++echo "$as_me:16403: result: $with_wgetch_events" >&5
+ echo "${ECHO_T}$with_wgetch_events" >&6
+ if test "x$with_wgetch_events" = xyes ; then
+ 
+@@ -16396,7 +16415,7 @@
+ 
+ case "$cf_cv_system_name" in
+ (*mingw32*|*mingw64*|*-msvc*)
+-	echo "$as_me:16399: checking if you want experimental-Windows driver" >&5
++	echo "$as_me:16418: 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.
+@@ -16406,7 +16425,7 @@
+ else
+   with_exp_win32=no
+ fi;
+-	echo "$as_me:16409: result: $with_exp_win32" >&5
++	echo "$as_me:16428: result: $with_exp_win32" >&5
+ echo "${ECHO_T}$with_exp_win32" >&6
+ 	if test "x$with_exp_win32" = xyes
+ 	then
+@@ -16432,7 +16451,7 @@
+ 
+ ###	use option --disable-echo to suppress full display compiling commands
+ 
+-echo "$as_me:16435: checking if you want to see long compiling messages" >&5
++echo "$as_me:16454: 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.
+@@ -16466,7 +16485,7 @@
+ 	ECHO_CC=''
+ 
+ fi;
+-echo "$as_me:16469: result: $enableval" >&5
++echo "$as_me:16488: result: $enableval" >&5
+ echo "${ECHO_T}$enableval" >&6
+ 
+ if test "x$enable_echo" = xyes; then
+@@ -16479,7 +16498,7 @@
+ 
+ # --disable-stripping is used for debugging
+ 
+-echo "$as_me:16482: checking if you want to install stripped executables" >&5
++echo "$as_me:16501: 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.
+@@ -16496,7 +16515,7 @@
+ 	enable_stripping=yes
+ 
+ fi;
+-echo "$as_me:16499: result: $enable_stripping" >&5
++echo "$as_me:16518: result: $enable_stripping" >&5
+ echo "${ECHO_T}$enable_stripping" >&6
+ 
+ if test "$enable_stripping" = yes
+@@ -16507,7 +16526,7 @@
+ fi
+ 
+ : "${INSTALL:=install}"
+-echo "$as_me:16510: checking if install accepts -p option" >&5
++echo "$as_me:16529: 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
+@@ -16538,10 +16557,10 @@
+ 	rm -rf ./conftest*
+ 
+ fi
+-echo "$as_me:16541: result: $cf_cv_install_p" >&5
++echo "$as_me:16560: result: $cf_cv_install_p" >&5
+ echo "${ECHO_T}$cf_cv_install_p" >&6
+ 
+-echo "$as_me:16544: checking if install needs to be told about ownership" >&5
++echo "$as_me:16563: 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)
+@@ -16552,7 +16571,7 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:16555: result: $with_install_o" >&5
++echo "$as_me:16574: result: $with_install_o" >&5
+ echo "${ECHO_T}$with_install_o" >&6
+ if test "x$with_install_o" = xyes
+ then
+@@ -16577,7 +16596,7 @@
+ 
+ ###	use option --enable-warnings to turn on all gcc warnings
+ 
+-echo "$as_me:16580: checking if you want to use C11 _Noreturn feature" >&5
++echo "$as_me:16599: 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.
+@@ -16594,17 +16613,17 @@
+ 	enable_stdnoreturn=no
+ 
+ fi;
+-echo "$as_me:16597: result: $enable_stdnoreturn" >&5
++echo "$as_me:16616: result: $enable_stdnoreturn" >&5
+ echo "${ECHO_T}$enable_stdnoreturn" >&6
+ 
+ if test $enable_stdnoreturn = yes; then
+-echo "$as_me:16601: checking for C11 _Noreturn feature" >&5
++echo "$as_me:16620: 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 16607 "configure"
++#line 16626 "configure"
+ #include "confdefs.h"
+ 
+ #include <stdio.h>
+@@ -16621,16 +16640,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:16624: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:16643: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:16627: \$? = $ac_status" >&5
++  echo "$as_me:16646: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:16630: \"$ac_try\"") >&5
++  { (eval echo "$as_me:16649: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:16633: \$? = $ac_status" >&5
++  echo "$as_me:16652: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_c11_noreturn=yes
+ else
+@@ -16641,7 +16660,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:16644: result: $cf_cv_c11_noreturn" >&5
++echo "$as_me:16663: result: $cf_cv_c11_noreturn" >&5
+ echo "${ECHO_T}$cf_cv_c11_noreturn" >&6
+ else
+ 	cf_cv_c11_noreturn=no,
+@@ -16671,7 +16690,7 @@
+ 	(*-Werror=*)
+ 		test -n "$verbose" && echo "	repairing CFLAGS: $CFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:16674: testing repairing CFLAGS: $CFLAGS ..." 1>&5
++echo "${as_me:-configure}:16693: testing repairing CFLAGS: $CFLAGS ..." 1>&5
+ 
+ 		cf_temp_flags=
+ 		for cf_temp_scan in $CFLAGS
+@@ -16694,11 +16713,11 @@
+ 		CFLAGS="$cf_temp_flags"
+ 		test -n "$verbose" && echo "	... fixed $CFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:16697: testing ... fixed $CFLAGS ..." 1>&5
++echo "${as_me:-configure}:16716: testing ... fixed $CFLAGS ..." 1>&5
+ 
+ 		test -n "$verbose" && echo "	... extra $EXTRA_CFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:16701: testing ... extra $EXTRA_CFLAGS ..." 1>&5
++echo "${as_me:-configure}:16720: testing ... extra $EXTRA_CFLAGS ..." 1>&5
+ 
+ 		;;
+ 	esac
+@@ -16710,7 +16729,7 @@
+ 	(*-Werror=*)
+ 		test -n "$verbose" && echo "	repairing CPPFLAGS: $CPPFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:16713: testing repairing CPPFLAGS: $CPPFLAGS ..." 1>&5
++echo "${as_me:-configure}:16732: testing repairing CPPFLAGS: $CPPFLAGS ..." 1>&5
+ 
+ 		cf_temp_flags=
+ 		for cf_temp_scan in $CPPFLAGS
+@@ -16733,11 +16752,11 @@
+ 		CPPFLAGS="$cf_temp_flags"
+ 		test -n "$verbose" && echo "	... fixed $CPPFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:16736: testing ... fixed $CPPFLAGS ..." 1>&5
++echo "${as_me:-configure}:16755: testing ... fixed $CPPFLAGS ..." 1>&5
+ 
+ 		test -n "$verbose" && echo "	... extra $EXTRA_CFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:16740: testing ... extra $EXTRA_CFLAGS ..." 1>&5
++echo "${as_me:-configure}:16759: testing ... extra $EXTRA_CFLAGS ..." 1>&5
+ 
+ 		;;
+ 	esac
+@@ -16749,7 +16768,7 @@
+ 	(*-Werror=*)
+ 		test -n "$verbose" && echo "	repairing LDFLAGS: $LDFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:16752: testing repairing LDFLAGS: $LDFLAGS ..." 1>&5
++echo "${as_me:-configure}:16771: testing repairing LDFLAGS: $LDFLAGS ..." 1>&5
+ 
+ 		cf_temp_flags=
+ 		for cf_temp_scan in $LDFLAGS
+@@ -16772,17 +16791,17 @@
+ 		LDFLAGS="$cf_temp_flags"
+ 		test -n "$verbose" && echo "	... fixed $LDFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:16775: testing ... fixed $LDFLAGS ..." 1>&5
++echo "${as_me:-configure}:16794: testing ... fixed $LDFLAGS ..." 1>&5
+ 
+ 		test -n "$verbose" && echo "	... extra $EXTRA_CFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:16779: testing ... extra $EXTRA_CFLAGS ..." 1>&5
++echo "${as_me:-configure}:16798: testing ... extra $EXTRA_CFLAGS ..." 1>&5
+ 
+ 		;;
+ 	esac
+ fi
+ 
+-echo "$as_me:16785: checking if you want to turn on gcc warnings" >&5
++echo "$as_me:16804: 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.
+@@ -16799,7 +16818,7 @@
+ 	enable_warnings=no
+ 
+ fi;
+-echo "$as_me:16802: result: $enable_warnings" >&5
++echo "$as_me:16821: result: $enable_warnings" >&5
+ echo "${ECHO_T}$enable_warnings" >&6
+ if test "$enable_warnings" = "yes"
+ then
+@@ -16823,7 +16842,7 @@
+ done
+ 
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 16826 "configure"
++#line 16845 "configure"
+ #include "confdefs.h"
+ 
+ #include <stdlib.h>
+@@ -16838,26 +16857,26 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:16841: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:16860: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:16844: \$? = $ac_status" >&5
++  echo "$as_me:16863: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:16847: \"$ac_try\"") >&5
++  { (eval echo "$as_me:16866: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:16850: \$? = $ac_status" >&5
++  echo "$as_me:16869: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+ 
+-echo "$as_me:16853: checking for X11/Xt const-feature" >&5
++echo "$as_me:16872: 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 16860 "configure"
++#line 16879 "configure"
+ #include "confdefs.h"
+ 
+ #define _CONST_X_STRING	/* X11R7.8 (perhaps) */
+@@ -16874,16 +16893,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:16877: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:16896: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:16880: \$? = $ac_status" >&5
++  echo "$as_me:16899: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:16883: \"$ac_try\"") >&5
++  { (eval echo "$as_me:16902: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:16886: \$? = $ac_status" >&5
++  echo "$as_me:16905: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+ 
+ 			cf_cv_const_x_string=no
+@@ -16898,7 +16917,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:16901: result: $cf_cv_const_x_string" >&5
++echo "$as_me:16920: result: $cf_cv_const_x_string" >&5
+ echo "${ECHO_T}$cf_cv_const_x_string" >&6
+ 
+ LIBS="$cf_save_LIBS_CF_CONST_X_STRING"
+@@ -16927,7 +16946,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+  fi
+ cat > "conftest.$ac_ext" <<EOF
+-#line 16930 "${as_me:-configure}"
++#line 16949 "${as_me:-configure}"
+ int main(int argc, char *argv[]) { return (argv[argc-1] == 0) ; }
+ EOF
+ if test "$INTEL_COMPILER" = yes
+@@ -16943,7 +16962,7 @@
+ # remark #981: operands are evaluated in unspecified order
+ # warning #279: controlling expression is constant
+ 
+-	{ echo "$as_me:16946: checking for $CC warning options..." >&5
++	{ echo "$as_me:16965: checking for $CC warning options..." >&5
+ echo "$as_me: checking for $CC warning options..." >&6;}
+ 	cf_save_CFLAGS="$CFLAGS"
+ 	EXTRA_CFLAGS="$EXTRA_CFLAGS -Wall"
+@@ -16959,12 +16978,12 @@
+ 		wd981
+ 	do
+ 		CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt"
+-		if { (eval echo "$as_me:16962: \"$ac_compile\"") >&5
++		if { (eval echo "$as_me:16981: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:16965: \$? = $ac_status" >&5
++  echo "$as_me:16984: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; then
+-			test -n "$verbose" && echo "$as_me:16967: result: ... -$cf_opt" >&5
++			test -n "$verbose" && echo "$as_me:16986: result: ... -$cf_opt" >&5
+ echo "${ECHO_T}... -$cf_opt" >&6
+ 			EXTRA_CFLAGS="$EXTRA_CFLAGS -$cf_opt"
+ 		fi
+@@ -16972,7 +16991,7 @@
+ 	CFLAGS="$cf_save_CFLAGS"
+ elif test "$GCC" = yes && test "$GCC_VERSION" != "unknown"
+ then
+-	{ echo "$as_me:16975: checking for $CC warning options..." >&5
++	{ echo "$as_me:16994: checking for $CC warning options..." >&5
+ echo "$as_me: checking for $CC warning options..." >&6;}
+ 	cf_save_CFLAGS="$CFLAGS"
+ 	cf_warn_CONST=""
+@@ -16995,12 +17014,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:16998: \"$ac_compile\"") >&5
++		if { (eval echo "$as_me:17017: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:17001: \$? = $ac_status" >&5
++  echo "$as_me:17020: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; then
+-			test -n "$verbose" && echo "$as_me:17003: result: ... -$cf_opt" >&5
++			test -n "$verbose" && echo "$as_me:17022: result: ... -$cf_opt" >&5
+ echo "${ECHO_T}... -$cf_opt" >&6
+ 			case "$cf_opt" in
+ 			(Winline)
+@@ -17008,7 +17027,7 @@
+ 				([34].*)
+ 					test -n "$verbose" && echo "	feature is broken in gcc $GCC_VERSION" 1>&6
+ 
+-echo "${as_me:-configure}:17011: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
++echo "${as_me:-configure}:17030: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
+ 
+ 					continue;;
+ 				esac
+@@ -17018,7 +17037,7 @@
+ 				([12].*)
+ 					test -n "$verbose" && echo "	feature is broken in gcc $GCC_VERSION" 1>&6
+ 
+-echo "${as_me:-configure}:17021: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
++echo "${as_me:-configure}:17040: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
+ 
+ 					continue;;
+ 				esac
+@@ -17051,10 +17070,10 @@
+ EOF
+ if test "$GCC" = yes
+ then
+-	{ echo "$as_me:17054: checking for $CC __attribute__ directives..." >&5
++	{ echo "$as_me:17073: checking for $CC __attribute__ directives..." >&5
+ echo "$as_me: checking for $CC __attribute__ directives..." >&6;}
+ cat > "conftest.$ac_ext" <<EOF
+-#line 17057 "${as_me:-configure}"
++#line 17076 "${as_me:-configure}"
+ #include "confdefs.h"
+ #include "conftest.h"
+ #include "conftest.i"
+@@ -17103,12 +17122,12 @@
+ 			;;
+ 		esac
+ 
+-		if { (eval echo "$as_me:17106: \"$ac_compile\"") >&5
++		if { (eval echo "$as_me:17125: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:17109: \$? = $ac_status" >&5
++  echo "$as_me:17128: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; then
+-			test -n "$verbose" && echo "$as_me:17111: result: ... $cf_attribute" >&5
++			test -n "$verbose" && echo "$as_me:17130: result: ... $cf_attribute" >&5
+ echo "${ECHO_T}... $cf_attribute" >&6
+ 			cat conftest.h >>confdefs.h
+ 			case "$cf_attribute" in
+@@ -17180,12 +17199,12 @@
+ if test "$GCC" = yes ; then
+ 	case "$host_os" in
+ 	(linux*|gnu*)
+-		echo "$as_me:17183: checking if this is really Intel C++ compiler" >&5
++		echo "$as_me:17202: 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 17188 "configure"
++#line 17207 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -17202,16 +17221,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:17205: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:17224: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:17208: \$? = $ac_status" >&5
++  echo "$as_me:17227: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:17211: \"$ac_try\"") >&5
++  { (eval echo "$as_me:17230: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:17214: \$? = $ac_status" >&5
++  echo "$as_me:17233: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   INTEL_CPLUSPLUS=yes
+ cf_save_CFLAGS="$cf_save_CFLAGS -we147"
+@@ -17222,7 +17241,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 		CXXFLAGS="$cf_save_CFLAGS"
+-		echo "$as_me:17225: result: $INTEL_CPLUSPLUS" >&5
++		echo "$as_me:17244: result: $INTEL_CPLUSPLUS" >&5
+ echo "${ECHO_T}$INTEL_CPLUSPLUS" >&6
+ 		;;
+ 	esac
+@@ -17231,11 +17250,11 @@
+ CLANG_CPLUSPLUS=no
+ 
+ if test "$GCC" = yes ; then
+-	echo "$as_me:17234: checking if this is really Clang C++ compiler" >&5
++	echo "$as_me:17253: 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 17238 "configure"
++#line 17257 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -17252,16 +17271,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:17255: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:17274: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:17258: \$? = $ac_status" >&5
++  echo "$as_me:17277: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:17261: \"$ac_try\"") >&5
++  { (eval echo "$as_me:17280: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:17264: \$? = $ac_status" >&5
++  echo "$as_me:17283: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   CLANG_CPLUSPLUS=yes
+ 
+@@ -17271,7 +17290,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 	CXXFLAGS="$cf_save_CFLAGS"
+-	echo "$as_me:17274: result: $CLANG_CPLUSPLUS" >&5
++	echo "$as_me:17293: result: $CLANG_CPLUSPLUS" >&5
+ echo "${ECHO_T}$CLANG_CPLUSPLUS" >&6
+ fi
+ 
+@@ -17280,30 +17299,30 @@
+ if test "x$CLANG_CPLUSPLUS" = "xyes" ; then
+ 	case "$CC" in
+ 	(c[1-9][0-9]|*/c[1-9][0-9])
+-		{ echo "$as_me:17283: WARNING: replacing broken compiler alias $CC" >&5
++		{ echo "$as_me:17302: 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:17290: checking version of $CC" >&5
++	echo "$as_me:17309: 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:17294: result: $CLANG_VERSION" >&5
++	echo "$as_me:17313: 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:17301: checking if option $cf_clang_opt works" >&5
++		echo "$as_me:17320: 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 17306 "configure"
++#line 17325 "configure"
+ #include "confdefs.h"
+ 
+ 			#include <stdio.h>
+@@ -17317,16 +17336,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:17320: \"$ac_link\"") >&5
++if { (eval echo "$as_me:17339: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:17323: \$? = $ac_status" >&5
++  echo "$as_me:17342: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:17326: \"$ac_try\"") >&5
++  { (eval echo "$as_me:17345: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:17329: \$? = $ac_status" >&5
++  echo "$as_me:17348: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+ 
+ 			cf_clang_optok=yes
+@@ -17337,13 +17356,13 @@
+ 			cf_clang_optok=no
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+-		echo "$as_me:17340: result: $cf_clang_optok" >&5
++		echo "$as_me:17359: 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}:17346: testing adding option $cf_clang_opt ..." 1>&5
++echo "${as_me:-configure}:17365: testing adding option $cf_clang_opt ..." 1>&5
+ 
+ 	test -n "$CFLAGS" && CFLAGS="$CFLAGS "
+ 	CFLAGS="${CFLAGS}$cf_clang_opt"
+@@ -17360,7 +17379,7 @@
+ ac_main_return="return"
+ 
+ cat > conftest.$ac_ext <<EOF
+-#line 17363 "configure"
++#line 17382 "configure"
+ int main(int argc, char *argv[]) { return (argv[argc-1] == 0) ; }
+ EOF
+ 
+@@ -17378,7 +17397,7 @@
+ # remark #981: operands are evaluated in unspecified order
+ # warning #269: invalid format string conversion
+ 
+-	{ echo "$as_me:17381: checking for $CC warning options..." >&5
++	{ echo "$as_me:17400: checking for $CC warning options..." >&5
+ echo "$as_me: checking for $CC warning options..." >&6;}
+ 	cf_save_CXXFLAGS="$CXXFLAGS"
+ 	EXTRA_CXXFLAGS="-Wall"
+@@ -17395,12 +17414,12 @@
+ 		wd981
+ 	do
+ 		CXXFLAGS="$cf_save_CXXFLAGS $EXTRA_CXXFLAGS -$cf_opt"
+-		if { (eval echo "$as_me:17398: \"$ac_compile\"") >&5
++		if { (eval echo "$as_me:17417: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:17401: \$? = $ac_status" >&5
++  echo "$as_me:17420: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; then
+-			test -n "$verbose" && echo "$as_me:17403: result: ... -$cf_opt" >&5
++			test -n "$verbose" && echo "$as_me:17422: result: ... -$cf_opt" >&5
+ echo "${ECHO_T}... -$cf_opt" >&6
+ 			EXTRA_CXXFLAGS="$EXTRA_CXXFLAGS -$cf_opt"
+ 		fi
+@@ -17409,7 +17428,7 @@
+ 
+ elif test "$GXX" = yes
+ then
+-	{ echo "$as_me:17412: checking for $CXX warning options..." >&5
++	{ echo "$as_me:17431: checking for $CXX warning options..." >&5
+ echo "$as_me: checking for $CXX warning options..." >&6;}
+ 	cf_save_CXXFLAGS="$CXXFLAGS"
+ 	EXTRA_CXXFLAGS="-W -Wall"
+@@ -17439,16 +17458,16 @@
+ 		Wundef $cf_gxx_extra_warnings Wno-unused
+ 	do
+ 		CXXFLAGS="$cf_save_CXXFLAGS $EXTRA_CXXFLAGS -Werror -$cf_opt"
+-		if { (eval echo "$as_me:17442: \"$ac_compile\"") >&5
++		if { (eval echo "$as_me:17461: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:17445: \$? = $ac_status" >&5
++  echo "$as_me:17464: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; then
+-			test -n "$verbose" && echo "$as_me:17447: result: ... -$cf_opt" >&5
++			test -n "$verbose" && echo "$as_me:17466: result: ... -$cf_opt" >&5
+ echo "${ECHO_T}... -$cf_opt" >&6
+ 			EXTRA_CXXFLAGS="$EXTRA_CXXFLAGS -$cf_opt"
+ 		else
+-			test -n "$verbose" && echo "$as_me:17451: result: ... no -$cf_opt" >&5
++			test -n "$verbose" && echo "$as_me:17470: result: ... no -$cf_opt" >&5
+ echo "${ECHO_T}... no -$cf_opt" >&6
+ 		fi
+ 	done
+@@ -17466,7 +17485,7 @@
+ 	fi
+ fi
+ 
+-echo "$as_me:17469: checking if you want to work around bogus compiler/loader warnings" >&5
++echo "$as_me:17488: 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.
+@@ -17476,7 +17495,7 @@
+ else
+   enable_string_hacks=no
+ fi;
+-echo "$as_me:17479: result: $enable_string_hacks" >&5
++echo "$as_me:17498: result: $enable_string_hacks" >&5
+ echo "${ECHO_T}$enable_string_hacks" >&6
+ 
+ if test "x$enable_string_hacks" = "xyes"; then
+@@ -17485,15 +17504,15 @@
+ #define USE_STRING_HACKS 1
+ EOF
+ 
+-	{ echo "$as_me:17488: WARNING: enabling string-hacks to work around bogus compiler/loader warnings" >&5
++	{ echo "$as_me:17507: 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:17490: checking for strlcat" >&5
++	echo "$as_me:17509: 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 17496 "configure"
++#line 17515 "configure"
+ #include "confdefs.h"
+ #define strlcat autoconf_temporary
+ #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -17524,16 +17543,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:17527: \"$ac_link\"") >&5
++if { (eval echo "$as_me:17546: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:17530: \$? = $ac_status" >&5
++  echo "$as_me:17549: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:17533: \"$ac_try\"") >&5
++  { (eval echo "$as_me:17552: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:17536: \$? = $ac_status" >&5
++  echo "$as_me:17555: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_func_strlcat=yes
+ else
+@@ -17543,7 +17562,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:17546: result: $ac_cv_func_strlcat" >&5
++echo "$as_me:17565: result: $ac_cv_func_strlcat" >&5
+ echo "${ECHO_T}$ac_cv_func_strlcat" >&6
+ if test "$ac_cv_func_strlcat" = yes; then
+ 
+@@ -17553,7 +17572,7 @@
+ 
+ else
+ 
+-		echo "$as_me:17556: checking for strlcat in -lbsd" >&5
++		echo "$as_me:17575: 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
+@@ -17561,7 +17580,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lbsd  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 17564 "configure"
++#line 17583 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -17580,16 +17599,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:17583: \"$ac_link\"") >&5
++if { (eval echo "$as_me:17602: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:17586: \$? = $ac_status" >&5
++  echo "$as_me:17605: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:17589: \"$ac_try\"") >&5
++  { (eval echo "$as_me:17608: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:17592: \$? = $ac_status" >&5
++  echo "$as_me:17611: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_bsd_strlcat=yes
+ else
+@@ -17600,7 +17619,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:17603: result: $ac_cv_lib_bsd_strlcat" >&5
++echo "$as_me:17622: 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
+ 
+@@ -17623,23 +17642,23 @@
+ for ac_header in bsd/string.h
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-echo "$as_me:17626: checking for $ac_header" >&5
++echo "$as_me:17645: 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 17632 "configure"
++#line 17651 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:17636: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:17655: \"$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:17642: \$? = $ac_status" >&5
++  echo "$as_me:17661: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -17658,7 +17677,7 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:17661: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
++echo "$as_me:17680: 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
+@@ -17679,13 +17698,13 @@
+ for ac_func in strlcpy snprintf
+ do
+ as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+-echo "$as_me:17682: checking for $ac_func" >&5
++echo "$as_me:17701: 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 17688 "configure"
++#line 17707 "configure"
+ #include "confdefs.h"
+ #define $ac_func autoconf_temporary
+ #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -17716,16 +17735,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:17719: \"$ac_link\"") >&5
++if { (eval echo "$as_me:17738: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:17722: \$? = $ac_status" >&5
++  echo "$as_me:17741: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:17725: \"$ac_try\"") >&5
++  { (eval echo "$as_me:17744: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:17728: \$? = $ac_status" >&5
++  echo "$as_me:17747: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   eval "$as_ac_var=yes"
+ else
+@@ -17735,7 +17754,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:17738: result: `eval echo '${'"$as_ac_var"'}'`" >&5
++echo "$as_me:17757: 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
+@@ -17748,7 +17767,7 @@
+ fi
+ 
+ ###	use option --enable-assertions to turn on generation of assertion code
+-echo "$as_me:17751: checking if you want to enable runtime assertions" >&5
++echo "$as_me:17770: 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.
+@@ -17758,7 +17777,7 @@
+ else
+   with_assertions=no
+ fi;
+-echo "$as_me:17761: result: $with_assertions" >&5
++echo "$as_me:17780: result: $with_assertions" >&5
+ echo "${ECHO_T}$with_assertions" >&6
+ if test -n "$GCC"
+ then
+@@ -17774,7 +17793,7 @@
+ 
+ ###	use option --disable-leaks to suppress "permanent" leaks, for testing
+ 
+-echo "$as_me:17777: checking if you want to use dmalloc for testing" >&5
++echo "$as_me:17796: 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.
+@@ -17796,7 +17815,7 @@
+ else
+   with_dmalloc=
+ fi;
+-echo "$as_me:17799: result: ${with_dmalloc:-no}" >&5
++echo "$as_me:17818: result: ${with_dmalloc:-no}" >&5
+ echo "${ECHO_T}${with_dmalloc:-no}" >&6
+ 
+ case ".$with_cflags" in
+@@ -17910,23 +17929,23 @@
+ esac
+ 
+ if test "$with_dmalloc" = yes ; then
+-	echo "$as_me:17913: checking for dmalloc.h" >&5
++	echo "$as_me:17932: 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 17919 "configure"
++#line 17938 "configure"
+ #include "confdefs.h"
+ #include <dmalloc.h>
+ _ACEOF
+-if { (eval echo "$as_me:17923: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:17942: \"$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:17929: \$? = $ac_status" >&5
++  echo "$as_me:17948: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -17945,11 +17964,11 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:17948: result: $ac_cv_header_dmalloc_h" >&5
++echo "$as_me:17967: 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:17952: checking for dmalloc_debug in -ldmalloc" >&5
++echo "$as_me:17971: 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
+@@ -17957,7 +17976,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-ldmalloc  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 17960 "configure"
++#line 17979 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -17976,16 +17995,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:17979: \"$ac_link\"") >&5
++if { (eval echo "$as_me:17998: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:17982: \$? = $ac_status" >&5
++  echo "$as_me:18001: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:17985: \"$ac_try\"") >&5
++  { (eval echo "$as_me:18004: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:17988: \$? = $ac_status" >&5
++  echo "$as_me:18007: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_dmalloc_dmalloc_debug=yes
+ else
+@@ -17996,7 +18015,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:17999: result: $ac_cv_lib_dmalloc_dmalloc_debug" >&5
++echo "$as_me:18018: 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
+@@ -18011,7 +18030,7 @@
+ 
+ fi
+ 
+-echo "$as_me:18014: checking if you want to use dbmalloc for testing" >&5
++echo "$as_me:18033: 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.
+@@ -18033,7 +18052,7 @@
+ else
+   with_dbmalloc=
+ fi;
+-echo "$as_me:18036: result: ${with_dbmalloc:-no}" >&5
++echo "$as_me:18055: result: ${with_dbmalloc:-no}" >&5
+ echo "${ECHO_T}${with_dbmalloc:-no}" >&6
+ 
+ case ".$with_cflags" in
+@@ -18147,23 +18166,23 @@
+ esac
+ 
+ if test "$with_dbmalloc" = yes ; then
+-	echo "$as_me:18150: checking for dbmalloc.h" >&5
++	echo "$as_me:18169: 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 18156 "configure"
++#line 18175 "configure"
+ #include "confdefs.h"
+ #include <dbmalloc.h>
+ _ACEOF
+-if { (eval echo "$as_me:18160: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:18179: \"$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:18166: \$? = $ac_status" >&5
++  echo "$as_me:18185: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -18182,11 +18201,11 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:18185: result: $ac_cv_header_dbmalloc_h" >&5
++echo "$as_me:18204: 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:18189: checking for debug_malloc in -ldbmalloc" >&5
++echo "$as_me:18208: 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
+@@ -18194,7 +18213,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-ldbmalloc  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 18197 "configure"
++#line 18216 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -18213,16 +18232,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:18216: \"$ac_link\"") >&5
++if { (eval echo "$as_me:18235: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:18219: \$? = $ac_status" >&5
++  echo "$as_me:18238: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:18222: \"$ac_try\"") >&5
++  { (eval echo "$as_me:18241: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:18225: \$? = $ac_status" >&5
++  echo "$as_me:18244: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_dbmalloc_debug_malloc=yes
+ else
+@@ -18233,7 +18252,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:18236: result: $ac_cv_lib_dbmalloc_debug_malloc" >&5
++echo "$as_me:18255: 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
+@@ -18248,7 +18267,7 @@
+ 
+ fi
+ 
+-echo "$as_me:18251: checking if you want to use valgrind for testing" >&5
++echo "$as_me:18270: 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.
+@@ -18270,7 +18289,7 @@
+ else
+   with_valgrind=
+ fi;
+-echo "$as_me:18273: result: ${with_valgrind:-no}" >&5
++echo "$as_me:18292: result: ${with_valgrind:-no}" >&5
+ echo "${ECHO_T}${with_valgrind:-no}" >&6
+ 
+ case ".$with_cflags" in
+@@ -18383,7 +18402,7 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:18386: checking if you want to perform memory-leak testing" >&5
++echo "$as_me:18405: 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.
+@@ -18394,7 +18413,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:18397: result: $with_no_leaks" >&5
++echo "$as_me:18416: result: $with_no_leaks" >&5
+ echo "${ECHO_T}$with_no_leaks" >&6
+ 
+ if test "$enable_leaks" = no ; then
+@@ -18446,7 +18465,7 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:18449: checking whether to add trace feature to all models" >&5
++echo "$as_me:18468: 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.
+@@ -18456,7 +18475,7 @@
+ else
+   cf_with_trace=$cf_all_traces
+ fi;
+-echo "$as_me:18459: result: $cf_with_trace" >&5
++echo "$as_me:18478: result: $cf_with_trace" >&5
+ echo "${ECHO_T}$cf_with_trace" >&6
+ 
+ if test "x$cf_with_trace" = xyes ; then
+@@ -18570,7 +18589,7 @@
+ 	ADA_TRACE=FALSE
+ fi
+ 
+-echo "$as_me:18573: checking if we want to use GNAT projects" >&5
++echo "$as_me:18592: 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.
+@@ -18587,7 +18606,7 @@
+ 	enable_gnat_projects=yes
+ 
+ fi;
+-echo "$as_me:18590: result: $enable_gnat_projects" >&5
++echo "$as_me:18609: result: $enable_gnat_projects" >&5
+ echo "${ECHO_T}$enable_gnat_projects" >&6
+ 
+ ###	Checks for libraries.
+@@ -18600,14 +18619,14 @@
+ 		CPPFLAGS="$CPPFLAGS -DWINVER=0x0501 -DWIN32_LEAN_AND_MEAN"
+ 	fi
+ 
+-echo "$as_me:18603: checking if ssp library is needed" >&5
++echo "$as_me:18622: 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 18610 "configure"
++#line 18629 "configure"
+ #include "confdefs.h"
+ 
+ #include <sys/types.h>
+@@ -18624,16 +18643,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:18627: \"$ac_link\"") >&5
++if { (eval echo "$as_me:18646: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:18630: \$? = $ac_status" >&5
++  echo "$as_me:18649: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:18633: \"$ac_try\"") >&5
++  { (eval echo "$as_me:18652: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:18636: \$? = $ac_status" >&5
++  echo "$as_me:18655: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_need_libssp=no
+ else
+@@ -18643,7 +18662,7 @@
+ 	cf_save_LIBS="$LIBS"
+ 	LIBS="$LIBS -lssp"
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 18646 "configure"
++#line 18665 "configure"
+ #include "confdefs.h"
+ 
+ #include <sys/types.h>
+@@ -18660,16 +18679,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:18663: \"$ac_link\"") >&5
++if { (eval echo "$as_me:18682: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:18666: \$? = $ac_status" >&5
++  echo "$as_me:18685: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:18669: \"$ac_try\"") >&5
++  { (eval echo "$as_me:18688: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:18672: \$? = $ac_status" >&5
++  echo "$as_me:18691: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_need_libssp=yes
+ else
+@@ -18683,7 +18702,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:18686: result: $cf_cv_need_libssp" >&5
++echo "$as_me:18705: result: $cf_cv_need_libssp" >&5
+ echo "${ECHO_T}$cf_cv_need_libssp" >&6
+ 
+ if test "x$cf_cv_need_libssp" = xyes
+@@ -18709,13 +18728,13 @@
+ 
+ 	;;
+ (*)
+-echo "$as_me:18712: checking for gettimeofday" >&5
++echo "$as_me:18731: 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 18718 "configure"
++#line 18737 "configure"
+ #include "confdefs.h"
+ #define gettimeofday autoconf_temporary
+ #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -18746,16 +18765,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:18749: \"$ac_link\"") >&5
++if { (eval echo "$as_me:18768: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:18752: \$? = $ac_status" >&5
++  echo "$as_me:18771: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:18755: \"$ac_try\"") >&5
++  { (eval echo "$as_me:18774: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:18758: \$? = $ac_status" >&5
++  echo "$as_me:18777: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_func_gettimeofday=yes
+ else
+@@ -18765,7 +18784,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:18768: result: $ac_cv_func_gettimeofday" >&5
++echo "$as_me:18787: result: $ac_cv_func_gettimeofday" >&5
+ echo "${ECHO_T}$ac_cv_func_gettimeofday" >&6
+ if test "$ac_cv_func_gettimeofday" = yes; then
+ 
+@@ -18775,7 +18794,7 @@
+ 
+ else
+ 
+-echo "$as_me:18778: checking for gettimeofday in -lbsd" >&5
++echo "$as_me:18797: 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
+@@ -18783,7 +18802,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lbsd  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 18786 "configure"
++#line 18805 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -18802,16 +18821,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:18805: \"$ac_link\"") >&5
++if { (eval echo "$as_me:18824: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:18808: \$? = $ac_status" >&5
++  echo "$as_me:18827: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:18811: \"$ac_try\"") >&5
++  { (eval echo "$as_me:18830: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:18814: \$? = $ac_status" >&5
++  echo "$as_me:18833: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_bsd_gettimeofday=yes
+ else
+@@ -18822,7 +18841,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:18825: result: $ac_cv_lib_bsd_gettimeofday" >&5
++echo "$as_me:18844: 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
+ 
+@@ -18852,14 +18871,14 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:18855: checking if -lm needed for math functions" >&5
++echo "$as_me:18874: 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 18862 "configure"
++#line 18881 "configure"
+ #include "confdefs.h"
+ 
+ 	#include <stdio.h>
+@@ -18875,16 +18894,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:18878: \"$ac_link\"") >&5
++if { (eval echo "$as_me:18897: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:18881: \$? = $ac_status" >&5
++  echo "$as_me:18900: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:18884: \"$ac_try\"") >&5
++  { (eval echo "$as_me:18903: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:18887: \$? = $ac_status" >&5
++  echo "$as_me:18906: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_need_libm=no
+ else
+@@ -18894,7 +18913,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:18897: result: $cf_cv_need_libm" >&5
++echo "$as_me:18916: result: $cf_cv_need_libm" >&5
+ echo "${ECHO_T}$cf_cv_need_libm" >&6
+ if test "$cf_cv_need_libm" = yes
+ then
+@@ -18902,13 +18921,13 @@
+ fi
+ 
+ ###	Checks for header files.
+-echo "$as_me:18905: checking for ANSI C header files" >&5
++echo "$as_me:18924: 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 18911 "configure"
++#line 18930 "configure"
+ #include "confdefs.h"
+ #include <stdlib.h>
+ #include <stdarg.h>
+@@ -18916,13 +18935,13 @@
+ #include <float.h>
+ 
+ _ACEOF
+-if { (eval echo "$as_me:18919: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:18938: \"$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:18925: \$? = $ac_status" >&5
++  echo "$as_me:18944: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -18944,7 +18963,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 18947 "configure"
++#line 18966 "configure"
+ #include "confdefs.h"
+ #include <string.h>
+ 
+@@ -18962,7 +18981,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 18965 "configure"
++#line 18984 "configure"
+ #include "confdefs.h"
+ #include <stdlib.h>
+ 
+@@ -18983,7 +19002,7 @@
+   :
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 18986 "configure"
++#line 19005 "configure"
+ #include "confdefs.h"
+ #include <ctype.h>
+ #if ((' ' & 0x0FF) == 0x020)
+@@ -19009,15 +19028,15 @@
+ }
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:19012: \"$ac_link\"") >&5
++if { (eval echo "$as_me:19031: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:19015: \$? = $ac_status" >&5
++  echo "$as_me:19034: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:19017: \"$ac_try\"") >&5
++  { (eval echo "$as_me:19036: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:19020: \$? = $ac_status" >&5
++  echo "$as_me:19039: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   :
+ else
+@@ -19030,7 +19049,7 @@
+ fi
+ fi
+ fi
+-echo "$as_me:19033: result: $ac_cv_header_stdc" >&5
++echo "$as_me:19052: result: $ac_cv_header_stdc" >&5
+ echo "${ECHO_T}$ac_cv_header_stdc" >&6
+ if test $ac_cv_header_stdc = yes; then
+ 
+@@ -19043,13 +19062,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:19046: checking for $ac_hdr that defines DIR" >&5
++echo "$as_me:19065: 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 19052 "configure"
++#line 19071 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ #include <$ac_hdr>
+@@ -19064,16 +19083,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:19067: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:19086: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:19070: \$? = $ac_status" >&5
++  echo "$as_me:19089: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:19073: \"$ac_try\"") >&5
++  { (eval echo "$as_me:19092: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:19076: \$? = $ac_status" >&5
++  echo "$as_me:19095: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   eval "$as_ac_Header=yes"
+ else
+@@ -19083,7 +19102,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:19086: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
++echo "$as_me:19105: 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
+@@ -19096,7 +19115,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:19099: checking for opendir in -ldir" >&5
++  echo "$as_me:19118: 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
+@@ -19104,7 +19123,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-ldir  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 19107 "configure"
++#line 19126 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -19123,16 +19142,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:19126: \"$ac_link\"") >&5
++if { (eval echo "$as_me:19145: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:19129: \$? = $ac_status" >&5
++  echo "$as_me:19148: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:19132: \"$ac_try\"") >&5
++  { (eval echo "$as_me:19151: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:19135: \$? = $ac_status" >&5
++  echo "$as_me:19154: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_dir_opendir=yes
+ else
+@@ -19143,14 +19162,14 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:19146: result: $ac_cv_lib_dir_opendir" >&5
++echo "$as_me:19165: 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:19153: checking for opendir in -lx" >&5
++  echo "$as_me:19172: 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
+@@ -19158,7 +19177,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lx  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 19161 "configure"
++#line 19180 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -19177,16 +19196,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:19180: \"$ac_link\"") >&5
++if { (eval echo "$as_me:19199: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:19183: \$? = $ac_status" >&5
++  echo "$as_me:19202: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:19186: \"$ac_try\"") >&5
++  { (eval echo "$as_me:19205: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:19189: \$? = $ac_status" >&5
++  echo "$as_me:19208: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_x_opendir=yes
+ else
+@@ -19197,7 +19216,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:19200: result: $ac_cv_lib_x_opendir" >&5
++echo "$as_me:19219: 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"
+@@ -19205,13 +19224,13 @@
+ 
+ fi
+ 
+-echo "$as_me:19208: checking whether time.h and sys/time.h may both be included" >&5
++echo "$as_me:19227: 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 19214 "configure"
++#line 19233 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ #include <sys/time.h>
+@@ -19227,16 +19246,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:19230: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:19249: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:19233: \$? = $ac_status" >&5
++  echo "$as_me:19252: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:19236: \"$ac_try\"") >&5
++  { (eval echo "$as_me:19255: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:19239: \$? = $ac_status" >&5
++  echo "$as_me:19258: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_header_time=yes
+ else
+@@ -19246,7 +19265,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:19249: result: $ac_cv_header_time" >&5
++echo "$as_me:19268: result: $ac_cv_header_time" >&5
+ echo "${ECHO_T}$ac_cv_header_time" >&6
+ if test $ac_cv_header_time = yes; then
+ 
+@@ -19261,7 +19280,7 @@
+ case "$host_os" in
+ (mingw*)
+ 	# -lsystre -ltre -lintl -liconv
+-	echo "$as_me:19264: checking for regcomp in -lsystre" >&5
++	echo "$as_me:19283: 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
+@@ -19269,7 +19288,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lsystre  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 19272 "configure"
++#line 19291 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -19288,16 +19307,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:19291: \"$ac_link\"") >&5
++if { (eval echo "$as_me:19310: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:19294: \$? = $ac_status" >&5
++  echo "$as_me:19313: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:19297: \"$ac_try\"") >&5
++  { (eval echo "$as_me:19316: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:19300: \$? = $ac_status" >&5
++  echo "$as_me:19319: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_systre_regcomp=yes
+ else
+@@ -19308,11 +19327,11 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:19311: result: $ac_cv_lib_systre_regcomp" >&5
++echo "$as_me:19330: 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:19315: checking for libiconv_open in -liconv" >&5
++		echo "$as_me:19334: 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
+@@ -19320,7 +19339,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-liconv  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 19323 "configure"
++#line 19342 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -19339,16 +19358,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:19342: \"$ac_link\"") >&5
++if { (eval echo "$as_me:19361: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:19345: \$? = $ac_status" >&5
++  echo "$as_me:19364: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:19348: \"$ac_try\"") >&5
++  { (eval echo "$as_me:19367: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:19351: \$? = $ac_status" >&5
++  echo "$as_me:19370: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_iconv_libiconv_open=yes
+ else
+@@ -19359,7 +19378,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:19362: result: $ac_cv_lib_iconv_libiconv_open" >&5
++echo "$as_me:19381: 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
+ 
+@@ -19381,7 +19400,7 @@
+ 
+ fi
+ 
+-		echo "$as_me:19384: checking for libintl_gettext in -lintl" >&5
++		echo "$as_me:19403: 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
+@@ -19389,7 +19408,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lintl  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 19392 "configure"
++#line 19411 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -19408,16 +19427,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:19411: \"$ac_link\"") >&5
++if { (eval echo "$as_me:19430: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:19414: \$? = $ac_status" >&5
++  echo "$as_me:19433: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:19417: \"$ac_try\"") >&5
++  { (eval echo "$as_me:19436: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:19420: \$? = $ac_status" >&5
++  echo "$as_me:19439: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_intl_libintl_gettext=yes
+ else
+@@ -19428,7 +19447,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:19431: result: $ac_cv_lib_intl_libintl_gettext" >&5
++echo "$as_me:19450: 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
+ 
+@@ -19450,7 +19469,7 @@
+ 
+ fi
+ 
+-		echo "$as_me:19453: checking for tre_regcomp in -ltre" >&5
++		echo "$as_me:19472: 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
+@@ -19458,7 +19477,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-ltre  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 19461 "configure"
++#line 19480 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -19477,16 +19496,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:19480: \"$ac_link\"") >&5
++if { (eval echo "$as_me:19499: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:19483: \$? = $ac_status" >&5
++  echo "$as_me:19502: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:19486: \"$ac_try\"") >&5
++  { (eval echo "$as_me:19505: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:19489: \$? = $ac_status" >&5
++  echo "$as_me:19508: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_tre_tre_regcomp=yes
+ else
+@@ -19497,7 +19516,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:19500: result: $ac_cv_lib_tre_tre_regcomp" >&5
++echo "$as_me:19519: 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
+ 
+@@ -19539,7 +19558,7 @@
+ 
+ else
+ 
+-		echo "$as_me:19542: checking for regcomp in -lgnurx" >&5
++		echo "$as_me:19561: 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
+@@ -19547,7 +19566,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lgnurx  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 19550 "configure"
++#line 19569 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -19566,16 +19585,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:19569: \"$ac_link\"") >&5
++if { (eval echo "$as_me:19588: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:19572: \$? = $ac_status" >&5
++  echo "$as_me:19591: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:19575: \"$ac_try\"") >&5
++  { (eval echo "$as_me:19594: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:19578: \$? = $ac_status" >&5
++  echo "$as_me:19597: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_gnurx_regcomp=yes
+ else
+@@ -19586,7 +19605,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:19589: result: $ac_cv_lib_gnurx_regcomp" >&5
++echo "$as_me:19608: 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
+ 
+@@ -19614,13 +19633,13 @@
+ 	;;
+ (*)
+ 	cf_regex_libs="regex re"
+-	echo "$as_me:19617: checking for regcomp" >&5
++	echo "$as_me:19636: 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 19623 "configure"
++#line 19642 "configure"
+ #include "confdefs.h"
+ #define regcomp autoconf_temporary
+ #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -19651,16 +19670,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:19654: \"$ac_link\"") >&5
++if { (eval echo "$as_me:19673: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:19657: \$? = $ac_status" >&5
++  echo "$as_me:19676: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:19660: \"$ac_try\"") >&5
++  { (eval echo "$as_me:19679: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:19663: \$? = $ac_status" >&5
++  echo "$as_me:19682: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_func_regcomp=yes
+ else
+@@ -19670,7 +19689,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:19673: result: $ac_cv_func_regcomp" >&5
++echo "$as_me:19692: 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
+@@ -19679,7 +19698,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:19682: checking for regcomp in -l$cf_regex_lib" >&5
++echo "$as_me:19701: 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
+@@ -19687,7 +19706,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-l$cf_regex_lib  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 19690 "configure"
++#line 19709 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -19706,16 +19725,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:19709: \"$ac_link\"") >&5
++if { (eval echo "$as_me:19728: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:19712: \$? = $ac_status" >&5
++  echo "$as_me:19731: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:19715: \"$ac_try\"") >&5
++  { (eval echo "$as_me:19734: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:19718: \$? = $ac_status" >&5
++  echo "$as_me:19737: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   eval "$as_ac_Lib=yes"
+ else
+@@ -19726,7 +19745,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:19729: result: `eval echo '${'"$as_ac_Lib"'}'`" >&5
++echo "$as_me:19748: 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
+ 
+@@ -19758,13 +19777,13 @@
+ esac
+ 
+ if test "$cf_regex_func" = no ; then
+-	echo "$as_me:19761: checking for compile" >&5
++	echo "$as_me:19780: 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 19767 "configure"
++#line 19786 "configure"
+ #include "confdefs.h"
+ #define compile autoconf_temporary
+ #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -19795,16 +19814,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:19798: \"$ac_link\"") >&5
++if { (eval echo "$as_me:19817: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:19801: \$? = $ac_status" >&5
++  echo "$as_me:19820: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:19804: \"$ac_try\"") >&5
++  { (eval echo "$as_me:19823: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:19807: \$? = $ac_status" >&5
++  echo "$as_me:19826: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_func_compile=yes
+ else
+@@ -19814,13 +19833,13 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:19817: result: $ac_cv_func_compile" >&5
++echo "$as_me:19836: 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:19823: checking for compile in -lgen" >&5
++		echo "$as_me:19842: 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
+@@ -19828,7 +19847,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lgen  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 19831 "configure"
++#line 19850 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -19847,16 +19866,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:19850: \"$ac_link\"") >&5
++if { (eval echo "$as_me:19869: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:19853: \$? = $ac_status" >&5
++  echo "$as_me:19872: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:19856: \"$ac_try\"") >&5
++  { (eval echo "$as_me:19875: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:19859: \$? = $ac_status" >&5
++  echo "$as_me:19878: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_gen_compile=yes
+ else
+@@ -19867,7 +19886,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:19870: result: $ac_cv_lib_gen_compile" >&5
++echo "$as_me:19889: 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
+ 
+@@ -19895,11 +19914,11 @@
+ fi
+ 
+ if test "$cf_regex_func" = no ; then
+-	{ echo "$as_me:19898: WARNING: cannot find regular expression library" >&5
++	{ echo "$as_me:19917: WARNING: cannot find regular expression library" >&5
+ echo "$as_me: WARNING: cannot find regular expression library" >&2;}
+ fi
+ 
+-echo "$as_me:19902: checking for regular-expression headers" >&5
++echo "$as_me:19921: 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
+@@ -19911,7 +19930,7 @@
+ 	for cf_regex_hdr in regexp.h regexpr.h
+ 	do
+ 		cat >"conftest.$ac_ext" <<_ACEOF
+-#line 19914 "configure"
++#line 19933 "configure"
+ #include "confdefs.h"
+ #include <$cf_regex_hdr>
+ int
+@@ -19928,16 +19947,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:19931: \"$ac_link\"") >&5
++if { (eval echo "$as_me:19950: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:19934: \$? = $ac_status" >&5
++  echo "$as_me:19953: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:19937: \"$ac_try\"") >&5
++  { (eval echo "$as_me:19956: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:19940: \$? = $ac_status" >&5
++  echo "$as_me:19959: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+ 
+ 			cf_cv_regex_hdrs=$cf_regex_hdr
+@@ -19954,7 +19973,7 @@
+ 	for cf_regex_hdr in regex.h
+ 	do
+ 		cat >"conftest.$ac_ext" <<_ACEOF
+-#line 19957 "configure"
++#line 19976 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ #include <$cf_regex_hdr>
+@@ -19974,16 +19993,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:19977: \"$ac_link\"") >&5
++if { (eval echo "$as_me:19996: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:19980: \$? = $ac_status" >&5
++  echo "$as_me:19999: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:19983: \"$ac_try\"") >&5
++  { (eval echo "$as_me:20002: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:19986: \$? = $ac_status" >&5
++  echo "$as_me:20005: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+ 
+ 			cf_cv_regex_hdrs=$cf_regex_hdr
+@@ -19999,11 +20018,11 @@
+ esac
+ 
+ fi
+-echo "$as_me:20002: result: $cf_cv_regex_hdrs" >&5
++echo "$as_me:20021: result: $cf_cv_regex_hdrs" >&5
+ echo "${ECHO_T}$cf_cv_regex_hdrs" >&6
+ 
+ case "$cf_cv_regex_hdrs" in
+-	(no)		{ echo "$as_me:20006: WARNING: no regular expression header found" >&5
++	(no)		{ echo "$as_me:20025: WARNING: no regular expression header found" >&5
+ echo "$as_me: WARNING: no regular expression header found" >&2;} ;;
+ 	(regex.h)
+ cat >>confdefs.h <<\EOF
+@@ -20041,23 +20060,23 @@
+ 
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-echo "$as_me:20044: checking for $ac_header" >&5
++echo "$as_me:20063: 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 20050 "configure"
++#line 20069 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:20054: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:20073: \"$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:20060: \$? = $ac_status" >&5
++  echo "$as_me:20079: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -20076,7 +20095,7 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:20079: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
++echo "$as_me:20098: 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
+@@ -20089,23 +20108,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:20092: checking for $ac_header" >&5
++echo "$as_me:20111: 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 20098 "configure"
++#line 20117 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:20102: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:20121: \"$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:20108: \$? = $ac_status" >&5
++  echo "$as_me:20127: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -20124,7 +20143,7 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:20127: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
++echo "$as_me:20146: 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
+@@ -20134,7 +20153,7 @@
+ fi
+ done
+ 
+-echo "$as_me:20137: checking for header declaring getopt variables" >&5
++echo "$as_me:20156: 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
+@@ -20144,7 +20163,7 @@
+ for cf_header in stdio.h stdlib.h unistd.h getopt.h
+ do
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 20147 "configure"
++#line 20166 "configure"
+ #include "confdefs.h"
+ 
+ #include <$cf_header>
+@@ -20157,16 +20176,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:20160: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:20179: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:20163: \$? = $ac_status" >&5
++  echo "$as_me:20182: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:20166: \"$ac_try\"") >&5
++  { (eval echo "$as_me:20185: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:20169: \$? = $ac_status" >&5
++  echo "$as_me:20188: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_getopt_header=$cf_header
+  break
+@@ -20178,7 +20197,7 @@
+ done
+ 
+ fi
+-echo "$as_me:20181: result: $cf_cv_getopt_header" >&5
++echo "$as_me:20200: result: $cf_cv_getopt_header" >&5
+ echo "${ECHO_T}$cf_cv_getopt_header" >&6
+ if test "$cf_cv_getopt_header" != none ; then
+ 
+@@ -20195,14 +20214,14 @@
+ 
+ fi
+ 
+-echo "$as_me:20198: checking if external environ is declared" >&5
++echo "$as_me:20217: 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 20205 "configure"
++#line 20224 "configure"
+ #include "confdefs.h"
+ 
+ #ifdef HAVE_STDLIB_H
+@@ -20218,16 +20237,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:20221: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:20240: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:20224: \$? = $ac_status" >&5
++  echo "$as_me:20243: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:20227: \"$ac_try\"") >&5
++  { (eval echo "$as_me:20246: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:20230: \$? = $ac_status" >&5
++  echo "$as_me:20249: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_dcl_environ=yes
+ else
+@@ -20238,7 +20257,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:20241: result: $cf_cv_dcl_environ" >&5
++echo "$as_me:20260: result: $cf_cv_dcl_environ" >&5
+ echo "${ECHO_T}$cf_cv_dcl_environ" >&6
+ 
+ if test "$cf_cv_dcl_environ" = no ; then
+@@ -20253,14 +20272,14 @@
+ 
+ # It's possible (for near-UNIX clones) that the data doesn't exist
+ 
+-echo "$as_me:20256: checking if external environ exists" >&5
++echo "$as_me:20275: 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 20263 "configure"
++#line 20282 "configure"
+ #include "confdefs.h"
+ 
+ #undef environ
+@@ -20275,16 +20294,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:20278: \"$ac_link\"") >&5
++if { (eval echo "$as_me:20297: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:20281: \$? = $ac_status" >&5
++  echo "$as_me:20300: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:20284: \"$ac_try\"") >&5
++  { (eval echo "$as_me:20303: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:20287: \$? = $ac_status" >&5
++  echo "$as_me:20306: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_have_environ=yes
+ else
+@@ -20295,7 +20314,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:20298: result: $cf_cv_have_environ" >&5
++echo "$as_me:20317: result: $cf_cv_have_environ" >&5
+ echo "${ECHO_T}$cf_cv_have_environ" >&6
+ 
+ if test "$cf_cv_have_environ" = yes ; then
+@@ -20308,13 +20327,13 @@
+ 
+ fi
+ 
+-echo "$as_me:20311: checking for getenv" >&5
++echo "$as_me:20330: 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 20317 "configure"
++#line 20336 "configure"
+ #include "confdefs.h"
+ #define getenv autoconf_temporary
+ #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -20345,16 +20364,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:20348: \"$ac_link\"") >&5
++if { (eval echo "$as_me:20367: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:20351: \$? = $ac_status" >&5
++  echo "$as_me:20370: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:20354: \"$ac_try\"") >&5
++  { (eval echo "$as_me:20373: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:20357: \$? = $ac_status" >&5
++  echo "$as_me:20376: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_func_getenv=yes
+ else
+@@ -20364,19 +20383,19 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:20367: result: $ac_cv_func_getenv" >&5
++echo "$as_me:20386: 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:20373: checking for $ac_func" >&5
++echo "$as_me:20392: 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 20379 "configure"
++#line 20398 "configure"
+ #include "confdefs.h"
+ #define $ac_func autoconf_temporary
+ #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -20407,16 +20426,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:20410: \"$ac_link\"") >&5
++if { (eval echo "$as_me:20429: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:20413: \$? = $ac_status" >&5
++  echo "$as_me:20432: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:20416: \"$ac_try\"") >&5
++  { (eval echo "$as_me:20435: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:20419: \$? = $ac_status" >&5
++  echo "$as_me:20438: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   eval "$as_ac_var=yes"
+ else
+@@ -20426,7 +20445,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:20429: result: `eval echo '${'"$as_ac_var"'}'`" >&5
++echo "$as_me:20448: 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
+@@ -20436,7 +20455,7 @@
+ fi
+ done
+ 
+-echo "$as_me:20439: checking if getenv returns consistent values" >&5
++echo "$as_me:20458: 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
+@@ -20446,7 +20465,7 @@
+   cf_cv_consistent_getenv=unknown
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 20449 "configure"
++#line 20468 "configure"
+ #include "confdefs.h"
+ 
+ #include <stdlib.h>
+@@ -20555,15 +20574,15 @@
+ 
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:20558: \"$ac_link\"") >&5
++if { (eval echo "$as_me:20577: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:20561: \$? = $ac_status" >&5
++  echo "$as_me:20580: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:20563: \"$ac_try\"") >&5
++  { (eval echo "$as_me:20582: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:20566: \$? = $ac_status" >&5
++  echo "$as_me:20585: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_consistent_getenv=yes
+ else
+@@ -20576,7 +20595,7 @@
+ fi
+ 
+ fi
+-echo "$as_me:20579: result: $cf_cv_consistent_getenv" >&5
++echo "$as_me:20598: result: $cf_cv_consistent_getenv" >&5
+ echo "${ECHO_T}$cf_cv_consistent_getenv" >&6
+ 
+ if test "x$cf_cv_consistent_getenv" = xno
+@@ -20591,18 +20610,18 @@
+ if test "x$cf_cv_consistent_getenv" = xno && \
+ 	test "x$cf_with_trace" = xyes
+ then
+-	{ echo "$as_me:20594: WARNING: The NCURSES_TRACE environment variable is not supported with this configuration" >&5
++	{ echo "$as_me:20613: 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:20598: checking if sys/time.h works with sys/select.h" >&5
++echo "$as_me:20617: 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 20605 "configure"
++#line 20624 "configure"
+ #include "confdefs.h"
+ 
+ #include <sys/types.h>
+@@ -20622,16 +20641,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:20625: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:20644: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:20628: \$? = $ac_status" >&5
++  echo "$as_me:20647: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:20631: \"$ac_try\"") >&5
++  { (eval echo "$as_me:20650: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:20634: \$? = $ac_status" >&5
++  echo "$as_me:20653: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_sys_time_select=yes
+ else
+@@ -20643,7 +20662,7 @@
+ 
+ fi
+ 
+-echo "$as_me:20646: result: $cf_cv_sys_time_select" >&5
++echo "$as_me:20665: 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
+@@ -20658,13 +20677,13 @@
+ ac_compiler_gnu=$ac_cv_c_compiler_gnu
+ ac_main_return="return"
+ 
+-echo "$as_me:20661: checking for an ANSI C-conforming const" >&5
++echo "$as_me:20680: 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 20667 "configure"
++#line 20686 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -20722,16 +20741,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:20725: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:20744: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:20728: \$? = $ac_status" >&5
++  echo "$as_me:20747: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:20731: \"$ac_try\"") >&5
++  { (eval echo "$as_me:20750: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:20734: \$? = $ac_status" >&5
++  echo "$as_me:20753: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_c_const=yes
+ else
+@@ -20741,7 +20760,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:20744: result: $ac_cv_c_const" >&5
++echo "$as_me:20763: result: $ac_cv_c_const" >&5
+ echo "${ECHO_T}$ac_cv_c_const" >&6
+ if test $ac_cv_c_const = no; then
+ 
+@@ -20751,7 +20770,7 @@
+ 
+ fi
+ 
+-echo "$as_me:20754: checking for inline" >&5
++echo "$as_me:20773: 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
+@@ -20759,7 +20778,7 @@
+   ac_cv_c_inline=no
+ for ac_kw in inline __inline__ __inline; do
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 20762 "configure"
++#line 20781 "configure"
+ #include "confdefs.h"
+ #ifndef __cplusplus
+ static $ac_kw int static_foo () {return 0; }
+@@ -20768,16 +20787,16 @@
+ 
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:20771: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:20790: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:20774: \$? = $ac_status" >&5
++  echo "$as_me:20793: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:20777: \"$ac_try\"") >&5
++  { (eval echo "$as_me:20796: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:20780: \$? = $ac_status" >&5
++  echo "$as_me:20799: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_c_inline=$ac_kw; break
+ else
+@@ -20788,7 +20807,7 @@
+ done
+ 
+ fi
+-echo "$as_me:20791: result: $ac_cv_c_inline" >&5
++echo "$as_me:20810: result: $ac_cv_c_inline" >&5
+ echo "${ECHO_T}$ac_cv_c_inline" >&6
+ case $ac_cv_c_inline in
+   inline | yes) ;;
+@@ -20814,7 +20833,7 @@
+ 		:
+ 	elif test "$GCC" = yes
+ 	then
+-		echo "$as_me:20817: checking if $CC supports options to tune inlining" >&5
++		echo "$as_me:20836: 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
+@@ -20823,7 +20842,7 @@
+ 		cf_save_CFLAGS=$CFLAGS
+ 		CFLAGS="$CFLAGS --param max-inline-insns-single=1200"
+ 		cat >"conftest.$ac_ext" <<_ACEOF
+-#line 20826 "configure"
++#line 20845 "configure"
+ #include "confdefs.h"
+ inline int foo(void) { return 1; }
+ int
+@@ -20835,16 +20854,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:20838: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:20857: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:20841: \$? = $ac_status" >&5
++  echo "$as_me:20860: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:20844: \"$ac_try\"") >&5
++  { (eval echo "$as_me:20863: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:20847: \$? = $ac_status" >&5
++  echo "$as_me:20866: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_gcc_inline=yes
+ else
+@@ -20856,7 +20875,7 @@
+ 		CFLAGS=$cf_save_CFLAGS
+ 
+ fi
+-echo "$as_me:20859: result: $cf_cv_gcc_inline" >&5
++echo "$as_me:20878: result: $cf_cv_gcc_inline" >&5
+ echo "${ECHO_T}$cf_cv_gcc_inline" >&6
+ 		if test "$cf_cv_gcc_inline" = yes ; then
+ 
+@@ -20962,7 +20981,7 @@
+ 	fi
+ fi
+ 
+-echo "$as_me:20965: checking for signal global datatype" >&5
++echo "$as_me:20984: 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
+@@ -20974,7 +20993,7 @@
+ 		"int"
+ 	do
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 20977 "configure"
++#line 20996 "configure"
+ #include "confdefs.h"
+ 
+ #include <sys/types.h>
+@@ -20998,16 +21017,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:21001: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:21020: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:21004: \$? = $ac_status" >&5
++  echo "$as_me:21023: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:21007: \"$ac_try\"") >&5
++  { (eval echo "$as_me:21026: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:21010: \$? = $ac_status" >&5
++  echo "$as_me:21029: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_sig_atomic_t=$cf_type
+ else
+@@ -21021,7 +21040,7 @@
+ 
+ fi
+ 
+-echo "$as_me:21024: result: $cf_cv_sig_atomic_t" >&5
++echo "$as_me:21043: 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
+@@ -21030,7 +21049,7 @@
+ 
+ if test "$NCURSES_CHTYPE" = auto ; then
+ 
+-echo "$as_me:21033: checking for type of chtype" >&5
++echo "$as_me:21052: 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
+@@ -21040,7 +21059,7 @@
+   cf_cv_typeof_chtype=long
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 21043 "configure"
++#line 21062 "configure"
+ #include "confdefs.h"
+ 
+ #define WANT_BITS 31
+@@ -21075,15 +21094,15 @@
+ 
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:21078: \"$ac_link\"") >&5
++if { (eval echo "$as_me:21097: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:21081: \$? = $ac_status" >&5
++  echo "$as_me:21100: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:21083: \"$ac_try\"") >&5
++  { (eval echo "$as_me:21102: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:21086: \$? = $ac_status" >&5
++  echo "$as_me:21105: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_typeof_chtype=`cat cf_test.out`
+ else
+@@ -21098,7 +21117,7 @@
+ 
+ fi
+ 
+-echo "$as_me:21101: result: $cf_cv_typeof_chtype" >&5
++echo "$as_me:21120: result: $cf_cv_typeof_chtype" >&5
+ echo "${ECHO_T}$cf_cv_typeof_chtype" >&6
+ 
+ cat >>confdefs.h <<EOF
+@@ -21110,14 +21129,14 @@
+ fi
+ test "$cf_cv_typeof_chtype" = unsigned && cf_cv_typeof_chtype=""
+ 
+-echo "$as_me:21113: checking if unsigned literals are legal" >&5
++echo "$as_me:21132: 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 21120 "configure"
++#line 21139 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -21129,16 +21148,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:21132: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:21151: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:21135: \$? = $ac_status" >&5
++  echo "$as_me:21154: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:21138: \"$ac_try\"") >&5
++  { (eval echo "$as_me:21157: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:21141: \$? = $ac_status" >&5
++  echo "$as_me:21160: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_unsigned_literals=yes
+ else
+@@ -21150,7 +21169,7 @@
+ 
+ fi
+ 
+-echo "$as_me:21153: result: $cf_cv_unsigned_literals" >&5
++echo "$as_me:21172: result: $cf_cv_unsigned_literals" >&5
+ echo "${ECHO_T}$cf_cv_unsigned_literals" >&6
+ 
+ cf_cv_1UL="1"
+@@ -21166,14 +21185,14 @@
+ 
+ ###	Checks for external-data
+ 
+-echo "$as_me:21169: checking if external errno is declared" >&5
++echo "$as_me:21188: 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 21176 "configure"
++#line 21195 "configure"
+ #include "confdefs.h"
+ 
+ #ifdef HAVE_STDLIB_H
+@@ -21191,16 +21210,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:21194: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:21213: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:21197: \$? = $ac_status" >&5
++  echo "$as_me:21216: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:21200: \"$ac_try\"") >&5
++  { (eval echo "$as_me:21219: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:21203: \$? = $ac_status" >&5
++  echo "$as_me:21222: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_dcl_errno=yes
+ else
+@@ -21211,7 +21230,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:21214: result: $cf_cv_dcl_errno" >&5
++echo "$as_me:21233: result: $cf_cv_dcl_errno" >&5
+ echo "${ECHO_T}$cf_cv_dcl_errno" >&6
+ 
+ if test "$cf_cv_dcl_errno" = no ; then
+@@ -21226,14 +21245,14 @@
+ 
+ # It's possible (for near-UNIX clones) that the data doesn't exist
+ 
+-echo "$as_me:21229: checking if external errno exists" >&5
++echo "$as_me:21248: 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 21236 "configure"
++#line 21255 "configure"
+ #include "confdefs.h"
+ 
+ #undef errno
+@@ -21248,16 +21267,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:21251: \"$ac_link\"") >&5
++if { (eval echo "$as_me:21270: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:21254: \$? = $ac_status" >&5
++  echo "$as_me:21273: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:21257: \"$ac_try\"") >&5
++  { (eval echo "$as_me:21276: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:21260: \$? = $ac_status" >&5
++  echo "$as_me:21279: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_have_errno=yes
+ else
+@@ -21268,7 +21287,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:21271: result: $cf_cv_have_errno" >&5
++echo "$as_me:21290: result: $cf_cv_have_errno" >&5
+ echo "${ECHO_T}$cf_cv_have_errno" >&6
+ 
+ if test "$cf_cv_have_errno" = yes ; then
+@@ -21281,7 +21300,7 @@
+ 
+ fi
+ 
+-echo "$as_me:21284: checking if data-only library module links" >&5
++echo "$as_me:21303: 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
+@@ -21289,20 +21308,20 @@
+ 
+ 	rm -f conftest.a
+ 	cat >conftest.$ac_ext <<EOF
+-#line 21292 "configure"
++#line 21311 "configure"
+ int	testdata[3] = { 123, 456, 789 };
+ EOF
+-	if { (eval echo "$as_me:21295: \"$ac_compile\"") >&5
++	if { (eval echo "$as_me:21314: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:21298: \$? = $ac_status" >&5
++  echo "$as_me:21317: \$? = $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 21305 "configure"
++#line 21324 "configure"
+ int	testfunc(void)
+ {
+ #if defined(NeXT)
+@@ -21315,10 +21334,10 @@
+ #endif
+ }
+ EOF
+-	if { (eval echo "$as_me:21318: \"$ac_compile\"") >&5
++	if { (eval echo "$as_me:21337: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:21321: \$? = $ac_status" >&5
++  echo "$as_me:21340: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; then
+ 		mv conftest.o func.o && \
+ 		( $AR $ARFLAGS conftest.a func.o ) 2>&5 1>/dev/null
+@@ -21331,7 +21350,7 @@
+   cf_cv_link_dataonly=unknown
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 21334 "configure"
++#line 21353 "configure"
+ #include "confdefs.h"
+ 
+ 	int main(void)
+@@ -21342,15 +21361,15 @@
+ 
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:21345: \"$ac_link\"") >&5
++if { (eval echo "$as_me:21364: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:21348: \$? = $ac_status" >&5
++  echo "$as_me:21367: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:21350: \"$ac_try\"") >&5
++  { (eval echo "$as_me:21369: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:21353: \$? = $ac_status" >&5
++  echo "$as_me:21372: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_link_dataonly=yes
+ else
+@@ -21365,7 +21384,7 @@
+ 
+ fi
+ 
+-echo "$as_me:21368: result: $cf_cv_link_dataonly" >&5
++echo "$as_me:21387: result: $cf_cv_link_dataonly" >&5
+ echo "${ECHO_T}$cf_cv_link_dataonly" >&6
+ 
+ if test "$cf_cv_link_dataonly" = no ; then
+@@ -21409,13 +21428,13 @@
+ 
+ do
+ as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+-echo "$as_me:21412: checking for $ac_func" >&5
++echo "$as_me:21431: 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 21418 "configure"
++#line 21437 "configure"
+ #include "confdefs.h"
+ #define $ac_func autoconf_temporary
+ #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -21446,16 +21465,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:21449: \"$ac_link\"") >&5
++if { (eval echo "$as_me:21468: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:21452: \$? = $ac_status" >&5
++  echo "$as_me:21471: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:21455: \"$ac_try\"") >&5
++  { (eval echo "$as_me:21474: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:21458: \$? = $ac_status" >&5
++  echo "$as_me:21477: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   eval "$as_ac_var=yes"
+ else
+@@ -21465,7 +21484,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:21468: result: `eval echo '${'"$as_ac_var"'}'`" >&5
++echo "$as_me:21487: 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
+@@ -21477,7 +21496,7 @@
+ 
+ if test "x$ac_cv_func_getopt" = xno && \
+    test "x$cf_with_progs$cf_with_tests" != xnono; then
+-	{ { echo "$as_me:21480: error: getopt is required for building programs" >&5
++	{ { echo "$as_me:21499: error: getopt is required for building programs" >&5
+ echo "$as_me: error: getopt is required for building programs" >&2;}
+    { (exit 1); exit 1; }; }
+ fi
+@@ -21486,7 +21505,7 @@
+ then
+ 	if test "x$ac_cv_func_vsnprintf" = xyes
+ 	then
+-		{ echo "$as_me:21489: WARNING: will use vsnprintf instead of safe-sprintf option" >&5
++		{ echo "$as_me:21508: WARNING: will use vsnprintf instead of safe-sprintf option" >&5
+ echo "$as_me: WARNING: will use vsnprintf instead of safe-sprintf option" >&2;}
+ 	else
+ 
+@@ -21499,14 +21518,14 @@
+ 
+ if test "x$with_getcap" = "xyes" ; then
+ 
+-echo "$as_me:21502: checking for terminal-capability database functions" >&5
++echo "$as_me:21521: 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 21509 "configure"
++#line 21528 "configure"
+ #include "confdefs.h"
+ 
+ #include <stdlib.h>
+@@ -21526,16 +21545,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:21529: \"$ac_link\"") >&5
++if { (eval echo "$as_me:21548: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:21532: \$? = $ac_status" >&5
++  echo "$as_me:21551: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:21535: \"$ac_try\"") >&5
++  { (eval echo "$as_me:21554: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:21538: \$? = $ac_status" >&5
++  echo "$as_me:21557: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_cgetent=yes
+ else
+@@ -21546,7 +21565,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:21549: result: $cf_cv_cgetent" >&5
++echo "$as_me:21568: result: $cf_cv_cgetent" >&5
+ echo "${ECHO_T}$cf_cv_cgetent" >&6
+ 
+ if test "$cf_cv_cgetent" = yes
+@@ -21556,14 +21575,14 @@
+ #define HAVE_BSD_CGETENT 1
+ EOF
+ 
+-echo "$as_me:21559: checking if cgetent uses const parameter" >&5
++echo "$as_me:21578: 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 21566 "configure"
++#line 21585 "configure"
+ #include "confdefs.h"
+ 
+ #pragma GCC diagnostic error "-Wincompatible-pointer-types-discards-qualifiers"
+@@ -21586,16 +21605,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:21589: \"$ac_link\"") >&5
++if { (eval echo "$as_me:21608: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:21592: \$? = $ac_status" >&5
++  echo "$as_me:21611: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:21595: \"$ac_try\"") >&5
++  { (eval echo "$as_me:21614: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:21598: \$? = $ac_status" >&5
++  echo "$as_me:21617: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_cgetent_const=yes
+ else
+@@ -21606,7 +21625,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:21609: result: $cf_cv_cgetent_const" >&5
++echo "$as_me:21628: result: $cf_cv_cgetent_const" >&5
+ echo "${ECHO_T}$cf_cv_cgetent_const" >&6
+ 	if test "$cf_cv_cgetent_const" = yes
+ 	then
+@@ -21620,14 +21639,14 @@
+ 
+ fi
+ 
+-echo "$as_me:21623: checking for isascii" >&5
++echo "$as_me:21642: 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 21630 "configure"
++#line 21649 "configure"
+ #include "confdefs.h"
+ #include <ctype.h>
+ int
+@@ -21639,16 +21658,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:21642: \"$ac_link\"") >&5
++if { (eval echo "$as_me:21661: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:21645: \$? = $ac_status" >&5
++  echo "$as_me:21664: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:21648: \"$ac_try\"") >&5
++  { (eval echo "$as_me:21667: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:21651: \$? = $ac_status" >&5
++  echo "$as_me:21670: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_have_isascii=yes
+ else
+@@ -21659,7 +21678,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:21662: result: $cf_cv_have_isascii" >&5
++echo "$as_me:21681: result: $cf_cv_have_isascii" >&5
+ echo "${ECHO_T}$cf_cv_have_isascii" >&6
+ test "$cf_cv_have_isascii" = yes &&
+ cat >>confdefs.h <<\EOF
+@@ -21667,10 +21686,10 @@
+ EOF
+ 
+ if test "$ac_cv_func_sigaction" = yes; then
+-echo "$as_me:21670: checking whether sigaction needs _POSIX_SOURCE" >&5
++echo "$as_me:21689: 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 21673 "configure"
++#line 21692 "configure"
+ #include "confdefs.h"
+ 
+ #include <sys/types.h>
+@@ -21684,16 +21703,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:21687: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:21706: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:21690: \$? = $ac_status" >&5
++  echo "$as_me:21709: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:21693: \"$ac_try\"") >&5
++  { (eval echo "$as_me:21712: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:21696: \$? = $ac_status" >&5
++  echo "$as_me:21715: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   sigact_bad=no
+ else
+@@ -21701,7 +21720,7 @@
+ cat "conftest.$ac_ext" >&5
+ 
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 21704 "configure"
++#line 21723 "configure"
+ #include "confdefs.h"
+ 
+ #define _POSIX_SOURCE
+@@ -21716,16 +21735,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:21719: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:21738: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:21722: \$? = $ac_status" >&5
++  echo "$as_me:21741: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:21725: \"$ac_try\"") >&5
++  { (eval echo "$as_me:21744: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:21728: \$? = $ac_status" >&5
++  echo "$as_me:21747: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   sigact_bad=yes
+ 
+@@ -21741,11 +21760,11 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+-echo "$as_me:21744: result: $sigact_bad" >&5
++echo "$as_me:21763: result: $sigact_bad" >&5
+ echo "${ECHO_T}$sigact_bad" >&6
+ fi
+ 
+-echo "$as_me:21748: checking if nanosleep really works" >&5
++echo "$as_me:21767: 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
+@@ -21755,7 +21774,7 @@
+   cf_cv_func_nanosleep=unknown
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 21758 "configure"
++#line 21777 "configure"
+ #include "confdefs.h"
+ 
+ #include <stdio.h>
+@@ -21780,15 +21799,15 @@
+ 
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:21783: \"$ac_link\"") >&5
++if { (eval echo "$as_me:21802: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:21786: \$? = $ac_status" >&5
++  echo "$as_me:21805: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:21788: \"$ac_try\"") >&5
++  { (eval echo "$as_me:21807: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:21791: \$? = $ac_status" >&5
++  echo "$as_me:21810: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_func_nanosleep=yes
+ else
+@@ -21800,7 +21819,7 @@
+ rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+ fi
+-echo "$as_me:21803: result: $cf_cv_func_nanosleep" >&5
++echo "$as_me:21822: result: $cf_cv_func_nanosleep" >&5
+ echo "${ECHO_T}$cf_cv_func_nanosleep" >&6
+ 
+ test "$cf_cv_func_nanosleep" = "yes" &&
+@@ -21817,23 +21836,23 @@
+ 
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-echo "$as_me:21820: checking for $ac_header" >&5
++echo "$as_me:21839: 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 21826 "configure"
++#line 21845 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:21830: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:21849: \"$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:21836: \$? = $ac_status" >&5
++  echo "$as_me:21855: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -21852,7 +21871,7 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:21855: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
++echo "$as_me:21874: 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
+@@ -21869,10 +21888,10 @@
+ 	(*)	termios_bad=maybe ;;
+ 	esac
+ 	if test "$termios_bad" = maybe ; then
+-	echo "$as_me:21872: checking whether termios.h needs _POSIX_SOURCE" >&5
++	echo "$as_me:21891: 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 21875 "configure"
++#line 21894 "configure"
+ #include "confdefs.h"
+ #include <termios.h>
+ int
+@@ -21884,16 +21903,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:21887: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:21906: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:21890: \$? = $ac_status" >&5
++  echo "$as_me:21909: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:21893: \"$ac_try\"") >&5
++  { (eval echo "$as_me:21912: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:21896: \$? = $ac_status" >&5
++  echo "$as_me:21915: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   termios_bad=no
+ else
+@@ -21901,7 +21920,7 @@
+ cat "conftest.$ac_ext" >&5
+ 
+ 		cat >"conftest.$ac_ext" <<_ACEOF
+-#line 21904 "configure"
++#line 21923 "configure"
+ #include "confdefs.h"
+ 
+ #define _POSIX_SOURCE
+@@ -21915,16 +21934,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:21918: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:21937: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:21921: \$? = $ac_status" >&5
++  echo "$as_me:21940: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:21924: \"$ac_try\"") >&5
++  { (eval echo "$as_me:21943: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:21927: \$? = $ac_status" >&5
++  echo "$as_me:21946: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   termios_bad=unknown
+ else
+@@ -21940,19 +21959,19 @@
+ 
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+-	echo "$as_me:21943: result: $termios_bad" >&5
++	echo "$as_me:21962: result: $termios_bad" >&5
+ echo "${ECHO_T}$termios_bad" >&6
+ 	fi
+ fi
+ 
+-echo "$as_me:21948: checking for tcgetattr" >&5
++echo "$as_me:21967: 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 21955 "configure"
++#line 21974 "configure"
+ #include "confdefs.h"
+ 
+ #include <sys/types.h>
+@@ -21980,16 +21999,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:21983: \"$ac_link\"") >&5
++if { (eval echo "$as_me:22002: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:21986: \$? = $ac_status" >&5
++  echo "$as_me:22005: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:21989: \"$ac_try\"") >&5
++  { (eval echo "$as_me:22008: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:21992: \$? = $ac_status" >&5
++  echo "$as_me:22011: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_have_tcgetattr=yes
+ else
+@@ -21999,21 +22018,21 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:22002: result: $cf_cv_have_tcgetattr" >&5
++echo "$as_me:22021: 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:22009: checking for vsscanf function or workaround" >&5
++echo "$as_me:22028: 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 22016 "configure"
++#line 22035 "configure"
+ #include "confdefs.h"
+ 
+ #include <stdarg.h>
+@@ -22029,16 +22048,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:22032: \"$ac_link\"") >&5
++if { (eval echo "$as_me:22051: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:22035: \$? = $ac_status" >&5
++  echo "$as_me:22054: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:22038: \"$ac_try\"") >&5
++  { (eval echo "$as_me:22057: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:22041: \$? = $ac_status" >&5
++  echo "$as_me:22060: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_func_vsscanf=vsscanf
+ else
+@@ -22046,7 +22065,7 @@
+ cat "conftest.$ac_ext" >&5
+ 
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 22049 "configure"
++#line 22068 "configure"
+ #include "confdefs.h"
+ 
+ #include <stdarg.h>
+@@ -22068,16 +22087,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:22071: \"$ac_link\"") >&5
++if { (eval echo "$as_me:22090: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:22074: \$? = $ac_status" >&5
++  echo "$as_me:22093: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:22077: \"$ac_try\"") >&5
++  { (eval echo "$as_me:22096: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:22080: \$? = $ac_status" >&5
++  echo "$as_me:22099: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_func_vsscanf=vfscanf
+ else
+@@ -22085,7 +22104,7 @@
+ cat "conftest.$ac_ext" >&5
+ 
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 22088 "configure"
++#line 22107 "configure"
+ #include "confdefs.h"
+ 
+ #include <stdarg.h>
+@@ -22107,16 +22126,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:22110: \"$ac_link\"") >&5
++if { (eval echo "$as_me:22129: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:22113: \$? = $ac_status" >&5
++  echo "$as_me:22132: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:22116: \"$ac_try\"") >&5
++  { (eval echo "$as_me:22135: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:22119: \$? = $ac_status" >&5
++  echo "$as_me:22138: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_func_vsscanf=_doscan
+ else
+@@ -22131,7 +22150,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:22134: result: $cf_cv_func_vsscanf" >&5
++echo "$as_me:22153: result: $cf_cv_func_vsscanf" >&5
+ echo "${ECHO_T}$cf_cv_func_vsscanf" >&6
+ 
+ case "$cf_cv_func_vsscanf" in
+@@ -22157,23 +22176,23 @@
+ 
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-echo "$as_me:22160: checking for $ac_header" >&5
++echo "$as_me:22179: 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 22166 "configure"
++#line 22185 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:22170: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:22189: \"$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:22176: \$? = $ac_status" >&5
++  echo "$as_me:22195: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -22192,7 +22211,7 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:22195: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
++echo "$as_me:22214: 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
+@@ -22202,7 +22221,7 @@
+ fi
+ done
+ 
+-echo "$as_me:22205: checking for working mkstemp" >&5
++echo "$as_me:22224: 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
+@@ -22213,7 +22232,7 @@
+   cf_cv_func_mkstemp=maybe
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 22216 "configure"
++#line 22235 "configure"
+ #include "confdefs.h"
+ 
+ #include <sys/types.h>
+@@ -22254,15 +22273,15 @@
+ 
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:22257: \"$ac_link\"") >&5
++if { (eval echo "$as_me:22276: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:22260: \$? = $ac_status" >&5
++  echo "$as_me:22279: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:22262: \"$ac_try\"") >&5
++  { (eval echo "$as_me:22281: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:22265: \$? = $ac_status" >&5
++  echo "$as_me:22284: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_func_mkstemp=yes
+ 
+@@ -22277,16 +22296,16 @@
+ fi
+ 
+ fi
+-echo "$as_me:22280: result: $cf_cv_func_mkstemp" >&5
++echo "$as_me:22299: 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:22283: checking for mkstemp" >&5
++	echo "$as_me:22302: 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 22289 "configure"
++#line 22308 "configure"
+ #include "confdefs.h"
+ #define mkstemp autoconf_temporary
+ #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -22317,16 +22336,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:22320: \"$ac_link\"") >&5
++if { (eval echo "$as_me:22339: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:22323: \$? = $ac_status" >&5
++  echo "$as_me:22342: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:22326: \"$ac_try\"") >&5
++  { (eval echo "$as_me:22345: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:22329: \$? = $ac_status" >&5
++  echo "$as_me:22348: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_func_mkstemp=yes
+ else
+@@ -22336,7 +22355,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:22339: result: $ac_cv_func_mkstemp" >&5
++echo "$as_me:22358: result: $ac_cv_func_mkstemp" >&5
+ echo "${ECHO_T}$ac_cv_func_mkstemp" >&6
+ 
+ fi
+@@ -22357,21 +22376,21 @@
+ fi
+ 
+ if test "x$cross_compiling" = xyes ; then
+-	{ echo "$as_me:22360: WARNING: cross compiling: assume setvbuf params not reversed" >&5
++	{ echo "$as_me:22379: 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:22363: checking whether setvbuf arguments are reversed" >&5
++	echo "$as_me:22382: 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:22369: error: cannot run test program while cross compiling" >&5
++  { { echo "$as_me:22388: 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 22374 "configure"
++#line 22393 "configure"
+ #include "confdefs.h"
+ #include <stdio.h>
+ /* If setvbuf has the reversed format, exit 0. */
+@@ -22388,15 +22407,15 @@
+ }
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:22391: \"$ac_link\"") >&5
++if { (eval echo "$as_me:22410: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:22394: \$? = $ac_status" >&5
++  echo "$as_me:22413: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:22396: \"$ac_try\"") >&5
++  { (eval echo "$as_me:22415: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:22399: \$? = $ac_status" >&5
++  echo "$as_me:22418: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_func_setvbuf_reversed=yes
+ else
+@@ -22409,7 +22428,7 @@
+ fi
+ rm -f core ./core.* ./*.core
+ fi
+-echo "$as_me:22412: result: $ac_cv_func_setvbuf_reversed" >&5
++echo "$as_me:22431: 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
+ 
+@@ -22420,13 +22439,13 @@
+ fi
+ 
+ fi
+-echo "$as_me:22423: checking for intptr_t" >&5
++echo "$as_me:22442: 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 22429 "configure"
++#line 22448 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -22441,16 +22460,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:22444: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:22463: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:22447: \$? = $ac_status" >&5
++  echo "$as_me:22466: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:22450: \"$ac_try\"") >&5
++  { (eval echo "$as_me:22469: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:22453: \$? = $ac_status" >&5
++  echo "$as_me:22472: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_type_intptr_t=yes
+ else
+@@ -22460,7 +22479,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:22463: result: $ac_cv_type_intptr_t" >&5
++echo "$as_me:22482: 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
+   :
+@@ -22472,13 +22491,13 @@
+ 
+ fi
+ 
+-echo "$as_me:22475: checking for ssize_t" >&5
++echo "$as_me:22494: 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 22481 "configure"
++#line 22500 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -22493,16 +22512,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:22496: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:22515: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:22499: \$? = $ac_status" >&5
++  echo "$as_me:22518: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:22502: \"$ac_try\"") >&5
++  { (eval echo "$as_me:22521: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:22505: \$? = $ac_status" >&5
++  echo "$as_me:22524: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_type_ssize_t=yes
+ else
+@@ -22512,7 +22531,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:22515: result: $ac_cv_type_ssize_t" >&5
++echo "$as_me:22534: 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
+   :
+@@ -22524,14 +22543,14 @@
+ 
+ fi
+ 
+-echo "$as_me:22527: checking for type sigaction_t" >&5
++echo "$as_me:22546: 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 22534 "configure"
++#line 22553 "configure"
+ #include "confdefs.h"
+ 
+ #include <signal.h>
+@@ -22544,16 +22563,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:22547: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:22566: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:22550: \$? = $ac_status" >&5
++  echo "$as_me:22569: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:22553: \"$ac_try\"") >&5
++  { (eval echo "$as_me:22572: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:22556: \$? = $ac_status" >&5
++  echo "$as_me:22575: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_type_sigaction=yes
+ else
+@@ -22564,14 +22583,14 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+ 
+-echo "$as_me:22567: result: $cf_cv_type_sigaction" >&5
++echo "$as_me:22586: 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:22574: checking declaration of size-change" >&5
++echo "$as_me:22593: 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
+@@ -22592,7 +22611,7 @@
+ 
+ 	fi
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 22595 "configure"
++#line 22614 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ #ifdef HAVE_TERMIOS_H
+@@ -22642,16 +22661,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:22645: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:22664: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:22648: \$? = $ac_status" >&5
++  echo "$as_me:22667: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:22651: \"$ac_try\"") >&5
++  { (eval echo "$as_me:22670: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:22654: \$? = $ac_status" >&5
++  echo "$as_me:22673: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_sizechange=yes
+ else
+@@ -22670,7 +22689,7 @@
+ done
+ 
+ fi
+-echo "$as_me:22673: result: $cf_cv_sizechange" >&5
++echo "$as_me:22692: result: $cf_cv_sizechange" >&5
+ echo "${ECHO_T}$cf_cv_sizechange" >&6
+ if test "$cf_cv_sizechange" != no ; then
+ 
+@@ -22688,13 +22707,13 @@
+ 	esac
+ fi
+ 
+-echo "$as_me:22691: checking for memmove" >&5
++echo "$as_me:22710: 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 22697 "configure"
++#line 22716 "configure"
+ #include "confdefs.h"
+ #define memmove autoconf_temporary
+ #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -22725,16 +22744,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:22728: \"$ac_link\"") >&5
++if { (eval echo "$as_me:22747: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:22731: \$? = $ac_status" >&5
++  echo "$as_me:22750: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:22734: \"$ac_try\"") >&5
++  { (eval echo "$as_me:22753: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:22737: \$? = $ac_status" >&5
++  echo "$as_me:22756: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_func_memmove=yes
+ else
+@@ -22744,19 +22763,19 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:22747: result: $ac_cv_func_memmove" >&5
++echo "$as_me:22766: 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:22753: checking for bcopy" >&5
++echo "$as_me:22772: 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 22759 "configure"
++#line 22778 "configure"
+ #include "confdefs.h"
+ #define bcopy autoconf_temporary
+ #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -22787,16 +22806,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:22790: \"$ac_link\"") >&5
++if { (eval echo "$as_me:22809: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:22793: \$? = $ac_status" >&5
++  echo "$as_me:22812: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:22796: \"$ac_try\"") >&5
++  { (eval echo "$as_me:22815: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:22799: \$? = $ac_status" >&5
++  echo "$as_me:22818: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_func_bcopy=yes
+ else
+@@ -22806,11 +22825,11 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:22809: result: $ac_cv_func_bcopy" >&5
++echo "$as_me:22828: 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:22813: checking if bcopy does overlapping moves" >&5
++	echo "$as_me:22832: 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
+@@ -22820,7 +22839,7 @@
+   cf_cv_good_bcopy=unknown
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 22823 "configure"
++#line 22842 "configure"
+ #include "confdefs.h"
+ 
+ int main(void) {
+@@ -22834,15 +22853,15 @@
+ 
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:22837: \"$ac_link\"") >&5
++if { (eval echo "$as_me:22856: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:22840: \$? = $ac_status" >&5
++  echo "$as_me:22859: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:22842: \"$ac_try\"") >&5
++  { (eval echo "$as_me:22861: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:22845: \$? = $ac_status" >&5
++  echo "$as_me:22864: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_good_bcopy=yes
+ else
+@@ -22855,7 +22874,7 @@
+ fi
+ 
+ fi
+-echo "$as_me:22858: result: $cf_cv_good_bcopy" >&5
++echo "$as_me:22877: result: $cf_cv_good_bcopy" >&5
+ echo "${ECHO_T}$cf_cv_good_bcopy" >&6
+ 
+ else
+@@ -22882,13 +22901,13 @@
+ for ac_func in posix_openpt
+ do
+ as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+-echo "$as_me:22885: checking for $ac_func" >&5
++echo "$as_me:22904: 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 22891 "configure"
++#line 22910 "configure"
+ #include "confdefs.h"
+ #define $ac_func autoconf_temporary
+ #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -22919,16 +22938,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:22922: \"$ac_link\"") >&5
++if { (eval echo "$as_me:22941: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:22925: \$? = $ac_status" >&5
++  echo "$as_me:22944: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:22928: \"$ac_try\"") >&5
++  { (eval echo "$as_me:22947: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:22931: \$? = $ac_status" >&5
++  echo "$as_me:22950: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   eval "$as_ac_var=yes"
+ else
+@@ -22938,7 +22957,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:22941: result: `eval echo '${'"$as_ac_var"'}'`" >&5
++echo "$as_me:22960: 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
+@@ -22948,7 +22967,7 @@
+ fi
+ done
+  }
+-echo "$as_me:22951: checking if poll really works" >&5
++echo "$as_me:22970: 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
+@@ -22958,7 +22977,7 @@
+   cf_cv_working_poll=unknown
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 22961 "configure"
++#line 22980 "configure"
+ #include "confdefs.h"
+ 
+ #include <stdlib.h>
+@@ -23010,15 +23029,15 @@
+ }
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:23013: \"$ac_link\"") >&5
++if { (eval echo "$as_me:23032: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:23016: \$? = $ac_status" >&5
++  echo "$as_me:23035: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:23018: \"$ac_try\"") >&5
++  { (eval echo "$as_me:23037: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:23021: \$? = $ac_status" >&5
++  echo "$as_me:23040: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_working_poll=yes
+ else
+@@ -23030,21 +23049,21 @@
+ rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+ fi
+-echo "$as_me:23033: result: $cf_cv_working_poll" >&5
++echo "$as_me:23052: 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:23040: checking for va_copy" >&5
++echo "$as_me:23059: 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 23047 "configure"
++#line 23066 "configure"
+ #include "confdefs.h"
+ 
+ #include <stdarg.h>
+@@ -23061,16 +23080,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:23064: \"$ac_link\"") >&5
++if { (eval echo "$as_me:23083: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:23067: \$? = $ac_status" >&5
++  echo "$as_me:23086: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:23070: \"$ac_try\"") >&5
++  { (eval echo "$as_me:23089: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:23073: \$? = $ac_status" >&5
++  echo "$as_me:23092: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_have_va_copy=yes
+ else
+@@ -23080,7 +23099,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:23083: result: $cf_cv_have_va_copy" >&5
++echo "$as_me:23102: result: $cf_cv_have_va_copy" >&5
+ echo "${ECHO_T}$cf_cv_have_va_copy" >&6
+ 
+ if test "$cf_cv_have_va_copy" = yes;
+@@ -23092,14 +23111,14 @@
+ 
+ else # !cf_cv_have_va_copy
+ 
+-echo "$as_me:23095: checking for __va_copy" >&5
++echo "$as_me:23114: 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 23102 "configure"
++#line 23121 "configure"
+ #include "confdefs.h"
+ 
+ #include <stdarg.h>
+@@ -23116,16 +23135,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:23119: \"$ac_link\"") >&5
++if { (eval echo "$as_me:23138: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:23122: \$? = $ac_status" >&5
++  echo "$as_me:23141: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:23125: \"$ac_try\"") >&5
++  { (eval echo "$as_me:23144: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:23128: \$? = $ac_status" >&5
++  echo "$as_me:23147: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_have___va_copy=yes
+ else
+@@ -23135,7 +23154,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:23138: result: $cf_cv_have___va_copy" >&5
++echo "$as_me:23157: result: $cf_cv_have___va_copy" >&5
+ echo "${ECHO_T}$cf_cv_have___va_copy" >&6
+ 
+ if test "$cf_cv_have___va_copy" = yes
+@@ -23147,14 +23166,14 @@
+ 
+ else # !cf_cv_have___va_copy
+ 
+-echo "$as_me:23150: checking for __builtin_va_copy" >&5
++echo "$as_me:23169: 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 23157 "configure"
++#line 23176 "configure"
+ #include "confdefs.h"
+ 
+ #include <stdarg.h>
+@@ -23171,16 +23190,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:23174: \"$ac_link\"") >&5
++if { (eval echo "$as_me:23193: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:23177: \$? = $ac_status" >&5
++  echo "$as_me:23196: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:23180: \"$ac_try\"") >&5
++  { (eval echo "$as_me:23199: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:23183: \$? = $ac_status" >&5
++  echo "$as_me:23202: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_have___builtin_va_copy=yes
+ else
+@@ -23190,7 +23209,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:23193: result: $cf_cv_have___builtin_va_copy" >&5
++echo "$as_me:23212: 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 &&
+@@ -23208,14 +23227,14 @@
+ 	;;
+ 
+ (*)
+-	echo "$as_me:23211: checking if we can simply copy va_list" >&5
++	echo "$as_me:23230: 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 23218 "configure"
++#line 23237 "configure"
+ #include "confdefs.h"
+ 
+ #include <stdarg.h>
+@@ -23232,16 +23251,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:23235: \"$ac_link\"") >&5
++if { (eval echo "$as_me:23254: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:23238: \$? = $ac_status" >&5
++  echo "$as_me:23257: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:23241: \"$ac_try\"") >&5
++  { (eval echo "$as_me:23260: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:23244: \$? = $ac_status" >&5
++  echo "$as_me:23263: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_pointer_va_list=yes
+ else
+@@ -23251,19 +23270,19 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:23254: result: $cf_cv_pointer_va_list" >&5
++echo "$as_me:23273: 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:23259: checking if we can copy va_list indirectly" >&5
++		echo "$as_me:23278: 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 23266 "configure"
++#line 23285 "configure"
+ #include "confdefs.h"
+ 
+ #include <stdarg.h>
+@@ -23280,16 +23299,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:23283: \"$ac_link\"") >&5
++if { (eval echo "$as_me:23302: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:23286: \$? = $ac_status" >&5
++  echo "$as_me:23305: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:23289: \"$ac_try\"") >&5
++  { (eval echo "$as_me:23308: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:23292: \$? = $ac_status" >&5
++  echo "$as_me:23311: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_array_va_list=yes
+ else
+@@ -23299,7 +23318,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:23302: result: $cf_cv_array_va_list" >&5
++echo "$as_me:23321: 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
+@@ -23310,13 +23329,13 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:23313: checking for pid_t" >&5
++echo "$as_me:23332: 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 23319 "configure"
++#line 23338 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -23331,16 +23350,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:23334: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:23353: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:23337: \$? = $ac_status" >&5
++  echo "$as_me:23356: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:23340: \"$ac_try\"") >&5
++  { (eval echo "$as_me:23359: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:23343: \$? = $ac_status" >&5
++  echo "$as_me:23362: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_type_pid_t=yes
+ else
+@@ -23350,7 +23369,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:23353: result: $ac_cv_type_pid_t" >&5
++echo "$as_me:23372: 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
+   :
+@@ -23365,23 +23384,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:23368: checking for $ac_header" >&5
++echo "$as_me:23387: 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 23374 "configure"
++#line 23393 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:23378: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:23397: \"$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:23384: \$? = $ac_status" >&5
++  echo "$as_me:23403: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -23400,7 +23419,7 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:23403: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
++echo "$as_me:23422: 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
+@@ -23413,13 +23432,13 @@
+ for ac_func in fork vfork
+ do
+ as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+-echo "$as_me:23416: checking for $ac_func" >&5
++echo "$as_me:23435: 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 23422 "configure"
++#line 23441 "configure"
+ #include "confdefs.h"
+ #define $ac_func autoconf_temporary
+ #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -23450,16 +23469,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:23453: \"$ac_link\"") >&5
++if { (eval echo "$as_me:23472: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:23456: \$? = $ac_status" >&5
++  echo "$as_me:23475: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:23459: \"$ac_try\"") >&5
++  { (eval echo "$as_me:23478: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:23462: \$? = $ac_status" >&5
++  echo "$as_me:23481: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   eval "$as_ac_var=yes"
+ else
+@@ -23469,7 +23488,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:23472: result: `eval echo '${'"$as_ac_var"'}'`" >&5
++echo "$as_me:23491: 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
+@@ -23481,7 +23500,7 @@
+ 
+ ac_cv_func_fork_works=$ac_cv_func_fork
+ if test "x$ac_cv_func_fork" = xyes; then
+-  echo "$as_me:23484: checking for working fork" >&5
++  echo "$as_me:23503: 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
+@@ -23504,15 +23523,15 @@
+       }
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:23507: \"$ac_link\"") >&5
++if { (eval echo "$as_me:23526: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:23510: \$? = $ac_status" >&5
++  echo "$as_me:23529: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:23512: \"$ac_try\"") >&5
++  { (eval echo "$as_me:23531: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:23515: \$? = $ac_status" >&5
++  echo "$as_me:23534: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_func_fork_works=yes
+ else
+@@ -23524,7 +23543,7 @@
+ rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+ fi
+-echo "$as_me:23527: result: $ac_cv_func_fork_works" >&5
++echo "$as_me:23546: result: $ac_cv_func_fork_works" >&5
+ echo "${ECHO_T}$ac_cv_func_fork_works" >&6
+ 
+ fi
+@@ -23538,12 +23557,12 @@
+       ac_cv_func_fork_works=yes
+       ;;
+   esac
+-  { echo "$as_me:23541: WARNING: CROSS: Result $ac_cv_func_fork_works guessed due to cross-compiling." >&5
++  { echo "$as_me:23560: 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:23546: checking for working vfork" >&5
++  echo "$as_me:23565: 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
+@@ -23552,7 +23571,7 @@
+   ac_cv_func_vfork_works=cross
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 23555 "configure"
++#line 23574 "configure"
+ #include "confdefs.h"
+ /* Thanks to Paul Eggert for this test.  */
+ #include <stdio.h>
+@@ -23649,15 +23668,15 @@
+ }
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:23652: \"$ac_link\"") >&5
++if { (eval echo "$as_me:23671: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:23655: \$? = $ac_status" >&5
++  echo "$as_me:23674: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:23657: \"$ac_try\"") >&5
++  { (eval echo "$as_me:23676: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:23660: \$? = $ac_status" >&5
++  echo "$as_me:23679: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_func_vfork_works=yes
+ else
+@@ -23669,13 +23688,13 @@
+ rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+ fi
+-echo "$as_me:23672: result: $ac_cv_func_vfork_works" >&5
++echo "$as_me:23691: 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:23678: WARNING: CROSS: Result $ac_cv_func_vfork_works guessed due to cross-compiling." >&5
++  { echo "$as_me:23697: 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
+ 
+@@ -23700,7 +23719,7 @@
+ 
+ fi
+ 
+-echo "$as_me:23703: checking if fopen accepts explicit binary mode" >&5
++echo "$as_me:23722: 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
+@@ -23710,7 +23729,7 @@
+   cf_cv_fopen_bin_r=unknown
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 23713 "configure"
++#line 23732 "configure"
+ #include "confdefs.h"
+ 
+ #include <stdio.h>
+@@ -23743,15 +23762,15 @@
+ 
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:23746: \"$ac_link\"") >&5
++if { (eval echo "$as_me:23765: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:23749: \$? = $ac_status" >&5
++  echo "$as_me:23768: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:23751: \"$ac_try\"") >&5
++  { (eval echo "$as_me:23770: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:23754: \$? = $ac_status" >&5
++  echo "$as_me:23773: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_fopen_bin_r=yes
+ else
+@@ -23764,7 +23783,7 @@
+ fi
+ 
+ fi
+-echo "$as_me:23767: result: $cf_cv_fopen_bin_r" >&5
++echo "$as_me:23786: 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
+@@ -23773,7 +23792,7 @@
+ 
+ # special check for test/ditto.c
+ 
+-echo "$as_me:23776: checking for openpty in -lutil" >&5
++echo "$as_me:23795: 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
+@@ -23781,7 +23800,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lutil  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 23784 "configure"
++#line 23803 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -23800,16 +23819,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:23803: \"$ac_link\"") >&5
++if { (eval echo "$as_me:23822: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:23806: \$? = $ac_status" >&5
++  echo "$as_me:23825: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:23809: \"$ac_try\"") >&5
++  { (eval echo "$as_me:23828: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:23812: \$? = $ac_status" >&5
++  echo "$as_me:23831: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_util_openpty=yes
+ else
+@@ -23820,7 +23839,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:23823: result: $ac_cv_lib_util_openpty" >&5
++echo "$as_me:23842: 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
+@@ -23828,7 +23847,7 @@
+   cf_cv_lib_util=no
+ fi
+ 
+-echo "$as_me:23831: checking for openpty header" >&5
++echo "$as_me:23850: 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
+@@ -23855,7 +23874,7 @@
+ 	for cf_header in pty.h libutil.h util.h
+ 	do
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 23858 "configure"
++#line 23877 "configure"
+ #include "confdefs.h"
+ 
+ #include <$cf_header>
+@@ -23872,16 +23891,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:23875: \"$ac_link\"") >&5
++if { (eval echo "$as_me:23894: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:23878: \$? = $ac_status" >&5
++  echo "$as_me:23897: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:23881: \"$ac_try\"") >&5
++  { (eval echo "$as_me:23900: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:23884: \$? = $ac_status" >&5
++  echo "$as_me:23903: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+ 
+ 		cf_cv_func_openpty=$cf_header
+@@ -23899,7 +23918,7 @@
+ 	LIBS="$cf_save_LIBS"
+ 
+ fi
+-echo "$as_me:23902: result: $cf_cv_func_openpty" >&5
++echo "$as_me:23921: result: $cf_cv_func_openpty" >&5
+ echo "${ECHO_T}$cf_cv_func_openpty" >&6
+ 
+ if test "$cf_cv_func_openpty" != no ; then
+@@ -23972,7 +23991,7 @@
+ 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
+ 
+ 			  cat >"conftest.$ac_ext" <<_ACEOF
+-#line 23975 "configure"
++#line 23994 "configure"
+ #include "confdefs.h"
+ #include <stdio.h>
+ int
+@@ -23984,16 +24003,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:23987: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:24006: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:23990: \$? = $ac_status" >&5
++  echo "$as_me:24009: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:23993: \"$ac_try\"") >&5
++  { (eval echo "$as_me:24012: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:23996: \$? = $ac_status" >&5
++  echo "$as_me:24015: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   :
+ else
+@@ -24010,7 +24029,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}:24013: testing adding $cf_add_incdir to include-path ..." 1>&5
++echo "${as_me:-configure}:24032: testing adding $cf_add_incdir to include-path ..." 1>&5
+ 
+ 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
+ 
+@@ -24046,7 +24065,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}:24049: testing adding $cf_add_libdir to library-path ..." 1>&5
++echo "${as_me:-configure}:24068: testing adding $cf_add_libdir to library-path ..." 1>&5
+ 
+ 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
+ 			fi
+@@ -24057,7 +24076,7 @@
+ 	else
+ 		case "$with_hashed_db" in
+ 		(./*|../*|/*)
+-			{ echo "$as_me:24060: WARNING: no such directory $with_hashed_db" >&5
++			{ echo "$as_me:24079: WARNING: no such directory $with_hashed_db" >&5
+ echo "$as_me: WARNING: no such directory $with_hashed_db" >&2;}
+ 			;;
+ 		(*)
+@@ -24129,7 +24148,7 @@
+ 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
+ 
+ 			  cat >"conftest.$ac_ext" <<_ACEOF
+-#line 24132 "configure"
++#line 24151 "configure"
+ #include "confdefs.h"
+ #include <stdio.h>
+ int
+@@ -24141,16 +24160,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:24144: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:24163: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:24147: \$? = $ac_status" >&5
++  echo "$as_me:24166: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:24150: \"$ac_try\"") >&5
++  { (eval echo "$as_me:24169: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:24153: \$? = $ac_status" >&5
++  echo "$as_me:24172: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   :
+ else
+@@ -24167,7 +24186,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}:24170: testing adding $cf_add_incdir to include-path ..." 1>&5
++echo "${as_me:-configure}:24189: testing adding $cf_add_incdir to include-path ..." 1>&5
+ 
+ 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
+ 
+@@ -24247,7 +24266,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}:24250: testing adding $cf_add_libdir to library-path ..." 1>&5
++echo "${as_me:-configure}:24269: testing adding $cf_add_libdir to library-path ..." 1>&5
+ 
+ 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
+ 			fi
+@@ -24264,23 +24283,23 @@
+ 	fi
+ esac
+ 
+-echo "$as_me:24267: checking for db.h" >&5
++echo "$as_me:24286: 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 24273 "configure"
++#line 24292 "configure"
+ #include "confdefs.h"
+ #include <db.h>
+ _ACEOF
+-if { (eval echo "$as_me:24277: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:24296: \"$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:24283: \$? = $ac_status" >&5
++  echo "$as_me:24302: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -24299,11 +24318,11 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:24302: result: $ac_cv_header_db_h" >&5
++echo "$as_me:24321: 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:24306: checking for version of db" >&5
++echo "$as_me:24325: 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
+@@ -24314,10 +24333,10 @@
+ for cf_db_version in 1 2 3 4 5 6
+ do
+ 
+-echo "${as_me:-configure}:24317: testing checking for db version $cf_db_version ..." 1>&5
++echo "${as_me:-configure}:24336: testing checking for db version $cf_db_version ..." 1>&5
+ 
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 24320 "configure"
++#line 24339 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -24347,16 +24366,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:24350: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:24369: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:24353: \$? = $ac_status" >&5
++  echo "$as_me:24372: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:24356: \"$ac_try\"") >&5
++  { (eval echo "$as_me:24375: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:24359: \$? = $ac_status" >&5
++  echo "$as_me:24378: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+ 
+ 	cf_cv_hashed_db_version=$cf_db_version
+@@ -24370,16 +24389,16 @@
+ done
+ 
+ fi
+-echo "$as_me:24373: result: $cf_cv_hashed_db_version" >&5
++echo "$as_me:24392: 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:24377: error: Cannot determine version of db" >&5
++	{ { echo "$as_me:24396: 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:24382: checking for db libraries" >&5
++echo "$as_me:24401: 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
+@@ -24409,10 +24428,10 @@
+ 
+ 	fi
+ 
+-echo "${as_me:-configure}:24412: testing checking for library $cf_db_libs ..." 1>&5
++echo "${as_me:-configure}:24431: testing checking for library $cf_db_libs ..." 1>&5
+ 
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 24415 "configure"
++#line 24434 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -24467,16 +24486,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:24470: \"$ac_link\"") >&5
++if { (eval echo "$as_me:24489: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:24473: \$? = $ac_status" >&5
++  echo "$as_me:24492: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:24476: \"$ac_try\"") >&5
++  { (eval echo "$as_me:24495: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:24479: \$? = $ac_status" >&5
++  echo "$as_me:24498: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+ 
+ 	if test -n "$cf_db_libs" ; then
+@@ -24496,11 +24515,11 @@
+ done
+ 
+ fi
+-echo "$as_me:24499: result: $cf_cv_hashed_db_libs" >&5
++echo "$as_me:24518: 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:24503: error: Cannot determine library for db" >&5
++		{ { echo "$as_me:24522: 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
+@@ -24526,7 +24545,7 @@
+ 
+ else
+ 
+-	{ { echo "$as_me:24529: error: Cannot find db.h" >&5
++	{ { echo "$as_me:24548: error: Cannot find db.h" >&5
+ echo "$as_me: error: Cannot find db.h" >&2;}
+    { (exit 1); exit 1; }; }
+ 
+@@ -24541,7 +24560,7 @@
+ 
+ # Just in case, check if the C compiler has a bool type.
+ 
+-echo "$as_me:24544: checking if we should include stdbool.h" >&5
++echo "$as_me:24563: 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
+@@ -24549,7 +24568,7 @@
+ else
+ 
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 24552 "configure"
++#line 24571 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -24561,23 +24580,23 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:24564: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:24583: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:24567: \$? = $ac_status" >&5
++  echo "$as_me:24586: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:24570: \"$ac_try\"") >&5
++  { (eval echo "$as_me:24589: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:24573: \$? = $ac_status" >&5
++  echo "$as_me:24592: \$? = $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 24580 "configure"
++#line 24599 "configure"
+ #include "confdefs.h"
+ 
+ #ifndef __BEOS__
+@@ -24593,16 +24612,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:24596: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:24615: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:24599: \$? = $ac_status" >&5
++  echo "$as_me:24618: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:24602: \"$ac_try\"") >&5
++  { (eval echo "$as_me:24621: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:24605: \$? = $ac_status" >&5
++  echo "$as_me:24624: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_header_stdbool_h=1
+ else
+@@ -24616,13 +24635,13 @@
+ fi
+ 
+ if test "$cf_cv_header_stdbool_h" = 1
+-then	echo "$as_me:24619: result: yes" >&5
++then	echo "$as_me:24638: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+-else	echo "$as_me:24621: result: no" >&5
++else	echo "$as_me:24640: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+-echo "$as_me:24625: checking for builtin bool type" >&5
++echo "$as_me:24644: 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
+@@ -24630,7 +24649,7 @@
+ else
+ 
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 24633 "configure"
++#line 24652 "configure"
+ #include "confdefs.h"
+ 
+ #include <stdio.h>
+@@ -24645,16 +24664,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:24648: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:24667: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:24651: \$? = $ac_status" >&5
++  echo "$as_me:24670: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:24654: \"$ac_try\"") >&5
++  { (eval echo "$as_me:24673: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:24657: \$? = $ac_status" >&5
++  echo "$as_me:24676: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_cc_bool_type=1
+ else
+@@ -24667,9 +24686,9 @@
+ fi
+ 
+ if test "$cf_cv_cc_bool_type" = 1
+-then	echo "$as_me:24670: result: yes" >&5
++then	echo "$as_me:24689: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+-else	echo "$as_me:24672: result: no" >&5
++else	echo "$as_me:24691: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -24686,10 +24705,10 @@
+ 
+ 	cf_save="$LIBS"
+ 	LIBS="$LIBS $CXXLIBS"
+-	echo "$as_me:24689: checking if we already have C++ library" >&5
++	echo "$as_me:24708: 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 24692 "configure"
++#line 24711 "configure"
+ #include "confdefs.h"
+ 
+ 			#include <iostream>
+@@ -24703,16 +24722,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:24706: \"$ac_link\"") >&5
++if { (eval echo "$as_me:24725: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:24709: \$? = $ac_status" >&5
++  echo "$as_me:24728: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:24712: \"$ac_try\"") >&5
++  { (eval echo "$as_me:24731: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:24715: \$? = $ac_status" >&5
++  echo "$as_me:24734: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_have_libstdcpp=yes
+ else
+@@ -24721,7 +24740,7 @@
+ cf_have_libstdcpp=no
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+-	echo "$as_me:24724: result: $cf_have_libstdcpp" >&5
++	echo "$as_me:24743: result: $cf_have_libstdcpp" >&5
+ echo "${ECHO_T}$cf_have_libstdcpp" >&6
+ 	LIBS="$cf_save"
+ 
+@@ -24740,7 +24759,7 @@
+ 			;;
+ 		esac
+ 
+-		echo "$as_me:24743: checking for library $cf_stdcpp_libname" >&5
++		echo "$as_me:24762: 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
+@@ -24766,7 +24785,7 @@
+ LIBS="$cf_add_libs"
+ 
+ 		cat >"conftest.$ac_ext" <<_ACEOF
+-#line 24769 "configure"
++#line 24788 "configure"
+ #include "confdefs.h"
+ 
+ 				#include <iostream>
+@@ -24780,16 +24799,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:24783: \"$ac_link\"") >&5
++if { (eval echo "$as_me:24802: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:24786: \$? = $ac_status" >&5
++  echo "$as_me:24805: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:24789: \"$ac_try\"") >&5
++  { (eval echo "$as_me:24808: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:24792: \$? = $ac_status" >&5
++  echo "$as_me:24811: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_libstdcpp=yes
+ else
+@@ -24801,7 +24820,7 @@
+ 			LIBS="$cf_save"
+ 
+ fi
+-echo "$as_me:24804: result: $cf_cv_libstdcpp" >&5
++echo "$as_me:24823: result: $cf_cv_libstdcpp" >&5
+ echo "${ECHO_T}$cf_cv_libstdcpp" >&6
+ 		test "$cf_cv_libstdcpp" = yes && {
+ cf_add_libs="$CXXLIBS"
+@@ -24823,7 +24842,7 @@
+ 	fi
+ fi
+ 
+-	echo "$as_me:24826: checking whether $CXX understands -c and -o together" >&5
++	echo "$as_me:24845: 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
+@@ -24838,15 +24857,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:24841: \"$ac_try\"") >&5
++if { (eval echo "$as_me:24860: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:24844: \$? = $ac_status" >&5
++  echo "$as_me:24863: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+-  test -f conftest2.$ac_objext && { (eval echo "$as_me:24846: \"$ac_try\"") >&5
++  test -f conftest2.$ac_objext && { (eval echo "$as_me:24865: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:24849: \$? = $ac_status" >&5
++  echo "$as_me:24868: \$? = $ac_status" >&5
+   (exit "$ac_status"); };
+ then
+   eval cf_cv_prog_CXX_c_o=yes
+@@ -24857,10 +24876,10 @@
+ 
+ fi
+ if test "$cf_cv_prog_CXX_c_o" = yes; then
+-  echo "$as_me:24860: result: yes" >&5
++  echo "$as_me:24879: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ else
+-  echo "$as_me:24863: result: no" >&5
++  echo "$as_me:24882: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -24880,7 +24899,7 @@
+ 	;;
+ esac
+ if test "$GXX" = yes; then
+-	echo "$as_me:24883: checking for lib$cf_gpp_libname" >&5
++	echo "$as_me:24902: checking for lib$cf_gpp_libname" >&5
+ echo $ECHO_N "checking for lib$cf_gpp_libname... $ECHO_C" >&6
+ 	cf_save="$LIBS"
+ 
+@@ -24901,7 +24920,7 @@
+ LIBS="$cf_add_libs"
+ 
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 24904 "configure"
++#line 24923 "configure"
+ #include "confdefs.h"
+ 
+ #include <$cf_gpp_libname/builtin.h>
+@@ -24915,16 +24934,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:24918: \"$ac_link\"") >&5
++if { (eval echo "$as_me:24937: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:24921: \$? = $ac_status" >&5
++  echo "$as_me:24940: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:24924: \"$ac_try\"") >&5
++  { (eval echo "$as_me:24943: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:24927: \$? = $ac_status" >&5
++  echo "$as_me:24946: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cxx_library=yes
+ 
+@@ -24961,7 +24980,7 @@
+   echo "$as_me: failed program was:" >&5
+ cat "conftest.$ac_ext" >&5
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 24964 "configure"
++#line 24983 "configure"
+ #include "confdefs.h"
+ 
+ #include <builtin.h>
+@@ -24975,16 +24994,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:24978: \"$ac_link\"") >&5
++if { (eval echo "$as_me:24997: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:24981: \$? = $ac_status" >&5
++  echo "$as_me:25000: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:24984: \"$ac_try\"") >&5
++  { (eval echo "$as_me:25003: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:24987: \$? = $ac_status" >&5
++  echo "$as_me:25006: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cxx_library=yes
+ 
+@@ -25017,7 +25036,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ 	LIBS="$cf_save"
+-	echo "$as_me:25020: result: $cf_cxx_library" >&5
++	echo "$as_me:25039: result: $cf_cxx_library" >&5
+ echo "${ECHO_T}$cf_cxx_library" >&6
+ fi
+ 
+@@ -25033,7 +25052,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:25036: checking how to run the C++ preprocessor" >&5
++echo "$as_me:25055: 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
+@@ -25050,18 +25069,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 25053 "configure"
++#line 25072 "configure"
+ #include "confdefs.h"
+ #include <assert.h>
+                      Syntax error
+ _ACEOF
+-if { (eval echo "$as_me:25058: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:25077: \"$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:25064: \$? = $ac_status" >&5
++  echo "$as_me:25083: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_cxx_preproc_warn_flag
+@@ -25084,17 +25103,17 @@
+   # OK, works on sane cases.  Now check whether non-existent headers
+   # can be detected and how.
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 25087 "configure"
++#line 25106 "configure"
+ #include "confdefs.h"
+ #include <ac_nonexistent.h>
+ _ACEOF
+-if { (eval echo "$as_me:25091: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:25110: \"$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:25097: \$? = $ac_status" >&5
++  echo "$as_me:25116: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_cxx_preproc_warn_flag
+@@ -25131,7 +25150,7 @@
+ else
+   ac_cv_prog_CXXCPP=$CXXCPP
+ fi
+-echo "$as_me:25134: result: $CXXCPP" >&5
++echo "$as_me:25153: result: $CXXCPP" >&5
+ echo "${ECHO_T}$CXXCPP" >&6
+ ac_preproc_ok=false
+ for ac_cxx_preproc_warn_flag in '' yes
+@@ -25141,18 +25160,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 25144 "configure"
++#line 25163 "configure"
+ #include "confdefs.h"
+ #include <assert.h>
+                      Syntax error
+ _ACEOF
+-if { (eval echo "$as_me:25149: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:25168: \"$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:25155: \$? = $ac_status" >&5
++  echo "$as_me:25174: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_cxx_preproc_warn_flag
+@@ -25175,17 +25194,17 @@
+   # OK, works on sane cases.  Now check whether non-existent headers
+   # can be detected and how.
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 25178 "configure"
++#line 25197 "configure"
+ #include "confdefs.h"
+ #include <ac_nonexistent.h>
+ _ACEOF
+-if { (eval echo "$as_me:25182: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:25201: \"$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:25188: \$? = $ac_status" >&5
++  echo "$as_me:25207: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_cxx_preproc_warn_flag
+@@ -25213,7 +25232,7 @@
+ if $ac_preproc_ok; then
+   :
+ else
+-  { { echo "$as_me:25216: error: C++ preprocessor \"$CXXCPP\" fails sanity check" >&5
++  { { echo "$as_me:25235: error: C++ preprocessor \"$CXXCPP\" fails sanity check" >&5
+ echo "$as_me: error: C++ preprocessor \"$CXXCPP\" fails sanity check" >&2;}
+    { (exit 1); exit 1; }; }
+ fi
+@@ -25228,23 +25247,23 @@
+ for ac_header in typeinfo
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-echo "$as_me:25231: checking for $ac_header" >&5
++echo "$as_me:25250: 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 25237 "configure"
++#line 25256 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:25241: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:25260: \"$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:25247: \$? = $ac_status" >&5
++  echo "$as_me:25266: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_cxx_preproc_warn_flag
+@@ -25263,7 +25282,7 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:25266: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
++echo "$as_me:25285: 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
+@@ -25276,23 +25295,23 @@
+ for ac_header in iostream
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-echo "$as_me:25279: checking for $ac_header" >&5
++echo "$as_me:25298: 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 25285 "configure"
++#line 25304 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:25289: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:25308: \"$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:25295: \$? = $ac_status" >&5
++  echo "$as_me:25314: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_cxx_preproc_warn_flag
+@@ -25311,7 +25330,7 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:25314: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
++echo "$as_me:25333: 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
+@@ -25322,10 +25341,10 @@
+ done
+ 
+ if test x"$ac_cv_header_iostream" = xyes ; then
+-	echo "$as_me:25325: checking if iostream uses std-namespace" >&5
++	echo "$as_me:25344: 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 25328 "configure"
++#line 25347 "configure"
+ #include "confdefs.h"
+ 
+ #include <iostream>
+@@ -25342,16 +25361,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:25345: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:25364: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:25348: \$? = $ac_status" >&5
++  echo "$as_me:25367: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:25351: \"$ac_try\"") >&5
++  { (eval echo "$as_me:25370: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:25354: \$? = $ac_status" >&5
++  echo "$as_me:25373: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_iostream_namespace=yes
+ else
+@@ -25360,7 +25379,7 @@
+ cf_iostream_namespace=no
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+-	echo "$as_me:25363: result: $cf_iostream_namespace" >&5
++	echo "$as_me:25382: result: $cf_iostream_namespace" >&5
+ echo "${ECHO_T}$cf_iostream_namespace" >&6
+ 	if test "$cf_iostream_namespace" = yes ; then
+ 
+@@ -25371,7 +25390,7 @@
+ 	fi
+ fi
+ 
+-echo "$as_me:25374: checking if we should include stdbool.h" >&5
++echo "$as_me:25393: 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
+@@ -25379,7 +25398,7 @@
+ else
+ 
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 25382 "configure"
++#line 25401 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -25391,23 +25410,23 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:25394: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:25413: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:25397: \$? = $ac_status" >&5
++  echo "$as_me:25416: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:25400: \"$ac_try\"") >&5
++  { (eval echo "$as_me:25419: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:25403: \$? = $ac_status" >&5
++  echo "$as_me:25422: \$? = $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 25410 "configure"
++#line 25429 "configure"
+ #include "confdefs.h"
+ 
+ #ifndef __BEOS__
+@@ -25423,16 +25442,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:25426: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:25445: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:25429: \$? = $ac_status" >&5
++  echo "$as_me:25448: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:25432: \"$ac_try\"") >&5
++  { (eval echo "$as_me:25451: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:25435: \$? = $ac_status" >&5
++  echo "$as_me:25454: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_header_stdbool_h=1
+ else
+@@ -25446,13 +25465,13 @@
+ fi
+ 
+ if test "$cf_cv_header_stdbool_h" = 1
+-then	echo "$as_me:25449: result: yes" >&5
++then	echo "$as_me:25468: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+-else	echo "$as_me:25451: result: no" >&5
++else	echo "$as_me:25470: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+-echo "$as_me:25455: checking for builtin bool type" >&5
++echo "$as_me:25474: 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
+@@ -25460,7 +25479,7 @@
+ else
+ 
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 25463 "configure"
++#line 25482 "configure"
+ #include "confdefs.h"
+ 
+ #include <stdio.h>
+@@ -25475,16 +25494,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:25478: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:25497: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:25481: \$? = $ac_status" >&5
++  echo "$as_me:25500: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:25484: \"$ac_try\"") >&5
++  { (eval echo "$as_me:25503: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:25487: \$? = $ac_status" >&5
++  echo "$as_me:25506: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_builtin_bool=1
+ else
+@@ -25497,19 +25516,19 @@
+ fi
+ 
+ if test "$cf_cv_builtin_bool" = 1
+-then	echo "$as_me:25500: result: yes" >&5
++then	echo "$as_me:25519: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+-else	echo "$as_me:25502: result: no" >&5
++else	echo "$as_me:25521: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+-echo "$as_me:25506: checking for bool" >&5
++echo "$as_me:25525: 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 25512 "configure"
++#line 25531 "configure"
+ #include "confdefs.h"
+ 
+ #include <stdlib.h>
+@@ -25545,16 +25564,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:25548: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:25567: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:25551: \$? = $ac_status" >&5
++  echo "$as_me:25570: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:25554: \"$ac_try\"") >&5
++  { (eval echo "$as_me:25573: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:25557: \$? = $ac_status" >&5
++  echo "$as_me:25576: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_type_bool=yes
+ else
+@@ -25564,10 +25583,10 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:25567: result: $ac_cv_type_bool" >&5
++echo "$as_me:25586: result: $ac_cv_type_bool" >&5
+ echo "${ECHO_T}$ac_cv_type_bool" >&6
+ 
+-echo "$as_me:25570: checking size of bool" >&5
++echo "$as_me:25589: 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
+@@ -25576,7 +25595,7 @@
+   if test "$cross_compiling" = yes; then
+   # Depending upon the size, compute the lo and hi bounds.
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 25579 "configure"
++#line 25598 "configure"
+ #include "confdefs.h"
+ 
+ #include <stdlib.h>
+@@ -25609,21 +25628,21 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:25612: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:25631: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:25615: \$? = $ac_status" >&5
++  echo "$as_me:25634: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:25618: \"$ac_try\"") >&5
++  { (eval echo "$as_me:25637: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:25621: \$? = $ac_status" >&5
++  echo "$as_me:25640: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_lo=0 ac_mid=0
+   while :; do
+     cat >"conftest.$ac_ext" <<_ACEOF
+-#line 25626 "configure"
++#line 25645 "configure"
+ #include "confdefs.h"
+ 
+ #include <stdlib.h>
+@@ -25656,16 +25675,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:25659: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:25678: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:25662: \$? = $ac_status" >&5
++  echo "$as_me:25681: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:25665: \"$ac_try\"") >&5
++  { (eval echo "$as_me:25684: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:25668: \$? = $ac_status" >&5
++  echo "$as_me:25687: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_hi=$ac_mid; break
+ else
+@@ -25681,7 +25700,7 @@
+ ac_hi=-1 ac_mid=-1
+   while :; do
+     cat >"conftest.$ac_ext" <<_ACEOF
+-#line 25684 "configure"
++#line 25703 "configure"
+ #include "confdefs.h"
+ 
+ #include <stdlib.h>
+@@ -25714,16 +25733,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:25717: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:25736: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:25720: \$? = $ac_status" >&5
++  echo "$as_me:25739: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:25723: \"$ac_try\"") >&5
++  { (eval echo "$as_me:25742: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:25726: \$? = $ac_status" >&5
++  echo "$as_me:25745: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_lo=$ac_mid; break
+ else
+@@ -25739,7 +25758,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 25742 "configure"
++#line 25761 "configure"
+ #include "confdefs.h"
+ 
+ #include <stdlib.h>
+@@ -25772,16 +25791,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:25775: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:25794: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:25778: \$? = $ac_status" >&5
++  echo "$as_me:25797: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:25781: \"$ac_try\"") >&5
++  { (eval echo "$as_me:25800: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:25784: \$? = $ac_status" >&5
++  echo "$as_me:25803: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_hi=$ac_mid
+ else
+@@ -25794,12 +25813,12 @@
+ ac_cv_sizeof_bool=$ac_lo
+ else
+   if test "$cross_compiling" = yes; then
+-  { { echo "$as_me:25797: error: cannot run test program while cross compiling" >&5
++  { { echo "$as_me:25816: 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 25802 "configure"
++#line 25821 "configure"
+ #include "confdefs.h"
+ 
+ #include <stdlib.h>
+@@ -25836,15 +25855,15 @@
+ }
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:25839: \"$ac_link\"") >&5
++if { (eval echo "$as_me:25858: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:25842: \$? = $ac_status" >&5
++  echo "$as_me:25861: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:25844: \"$ac_try\"") >&5
++  { (eval echo "$as_me:25863: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:25847: \$? = $ac_status" >&5
++  echo "$as_me:25866: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_sizeof_bool=`cat conftest.val`
+ else
+@@ -25860,13 +25879,13 @@
+   ac_cv_sizeof_bool=0
+ fi
+ fi
+-echo "$as_me:25863: result: $ac_cv_sizeof_bool" >&5
++echo "$as_me:25882: 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:25869: checking for type of bool" >&5
++echo "$as_me:25888: 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
+@@ -25885,7 +25904,7 @@
+ 
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 25888 "configure"
++#line 25907 "configure"
+ #include "confdefs.h"
+ 
+ #include <stdlib.h>
+@@ -25927,15 +25946,15 @@
+ 
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:25930: \"$ac_link\"") >&5
++if { (eval echo "$as_me:25949: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:25933: \$? = $ac_status" >&5
++  echo "$as_me:25952: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:25935: \"$ac_try\"") >&5
++  { (eval echo "$as_me:25954: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:25938: \$? = $ac_status" >&5
++  echo "$as_me:25957: \$? = $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
+@@ -25952,19 +25971,19 @@
+ 	rm -f cf_test.out
+ 
+ fi
+-echo "$as_me:25955: result: $cf_cv_type_of_bool" >&5
++echo "$as_me:25974: 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:25962: WARNING: Assuming $NCURSES_BOOL for type of bool" >&5
++	{ echo "$as_me:25981: 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:25967: checking for special defines needed for etip.h" >&5
++echo "$as_me:25986: 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"
+@@ -25982,7 +26001,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 25985 "configure"
++#line 26004 "configure"
+ #include "confdefs.h"
+ 
+ #include <etip.h.in>
+@@ -25996,16 +26015,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:25999: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:26018: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:26002: \$? = $ac_status" >&5
++  echo "$as_me:26021: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:26005: \"$ac_try\"") >&5
++  { (eval echo "$as_me:26024: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:26008: \$? = $ac_status" >&5
++  echo "$as_me:26027: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+ 
+ 	test -n "$cf_math" && cat >>confdefs.h <<EOF
+@@ -26026,12 +26045,12 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ done
+ done
+-echo "$as_me:26029: result: $cf_result" >&5
++echo "$as_me:26048: result: $cf_result" >&5
+ echo "${ECHO_T}$cf_result" >&6
+ CXXFLAGS="$cf_save_CXXFLAGS"
+ 
+ if test -n "$CXX"; then
+-echo "$as_me:26034: checking if $CXX accepts parameter initialization" >&5
++echo "$as_me:26053: 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
+@@ -26048,7 +26067,7 @@
+   cf_cv_cpp_param_init=unknown
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 26051 "configure"
++#line 26070 "configure"
+ #include "confdefs.h"
+ 
+ class TEST {
+@@ -26067,15 +26086,15 @@
+ 
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:26070: \"$ac_link\"") >&5
++if { (eval echo "$as_me:26089: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:26073: \$? = $ac_status" >&5
++  echo "$as_me:26092: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:26075: \"$ac_try\"") >&5
++  { (eval echo "$as_me:26094: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:26078: \$? = $ac_status" >&5
++  echo "$as_me:26097: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_cpp_param_init=yes
+ else
+@@ -26094,7 +26113,7 @@
+ ac_main_return="return"
+ 
+ fi
+-echo "$as_me:26097: result: $cf_cv_cpp_param_init" >&5
++echo "$as_me:26116: result: $cf_cv_cpp_param_init" >&5
+ echo "${ECHO_T}$cf_cv_cpp_param_init" >&6
+ fi
+ test "$cf_cv_cpp_param_init" = yes &&
+@@ -26104,7 +26123,7 @@
+ 
+ if test -n "$CXX"; then
+ 
+-echo "$as_me:26107: checking if $CXX accepts static_cast" >&5
++echo "$as_me:26126: 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
+@@ -26118,7 +26137,7 @@
+ ac_main_return="return"
+ 
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 26121 "configure"
++#line 26140 "configure"
+ #include "confdefs.h"
+ 
+ class NCursesPanel
+@@ -26162,16 +26181,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:26165: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:26184: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:26168: \$? = $ac_status" >&5
++  echo "$as_me:26187: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:26171: \"$ac_try\"") >&5
++  { (eval echo "$as_me:26190: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:26174: \$? = $ac_status" >&5
++  echo "$as_me:26193: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_cpp_static_cast=yes
+ else
+@@ -26189,7 +26208,7 @@
+ ac_main_return="return"
+ 
+ fi
+-echo "$as_me:26192: result: $cf_cv_cpp_static_cast" >&5
++echo "$as_me:26211: result: $cf_cv_cpp_static_cast" >&5
+ echo "${ECHO_T}$cf_cv_cpp_static_cast" >&6
+ 
+ fi
+@@ -26238,13 +26257,13 @@
+ 	else
+ 		if test "$cf_cv_header_stdbool_h" = 1 ; then
+ 
+-echo "$as_me:26241: checking for bool" >&5
++echo "$as_me:26260: 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 26247 "configure"
++#line 26266 "configure"
+ #include "confdefs.h"
+ 
+ #include <stdlib.h>
+@@ -26280,16 +26299,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:26283: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:26302: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:26286: \$? = $ac_status" >&5
++  echo "$as_me:26305: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:26289: \"$ac_try\"") >&5
++  { (eval echo "$as_me:26308: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:26292: \$? = $ac_status" >&5
++  echo "$as_me:26311: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_type_bool=yes
+ else
+@@ -26299,10 +26318,10 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:26302: result: $ac_cv_type_bool" >&5
++echo "$as_me:26321: result: $ac_cv_type_bool" >&5
+ echo "${ECHO_T}$ac_cv_type_bool" >&6
+ 
+-echo "$as_me:26305: checking size of bool" >&5
++echo "$as_me:26324: 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
+@@ -26311,7 +26330,7 @@
+   if test "$cross_compiling" = yes; then
+   # Depending upon the size, compute the lo and hi bounds.
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 26314 "configure"
++#line 26333 "configure"
+ #include "confdefs.h"
+ 
+ #include <stdlib.h>
+@@ -26344,21 +26363,21 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:26347: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:26366: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:26350: \$? = $ac_status" >&5
++  echo "$as_me:26369: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:26353: \"$ac_try\"") >&5
++  { (eval echo "$as_me:26372: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:26356: \$? = $ac_status" >&5
++  echo "$as_me:26375: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_lo=0 ac_mid=0
+   while :; do
+     cat >"conftest.$ac_ext" <<_ACEOF
+-#line 26361 "configure"
++#line 26380 "configure"
+ #include "confdefs.h"
+ 
+ #include <stdlib.h>
+@@ -26391,16 +26410,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:26394: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:26413: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:26397: \$? = $ac_status" >&5
++  echo "$as_me:26416: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:26400: \"$ac_try\"") >&5
++  { (eval echo "$as_me:26419: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:26403: \$? = $ac_status" >&5
++  echo "$as_me:26422: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_hi=$ac_mid; break
+ else
+@@ -26416,7 +26435,7 @@
+ ac_hi=-1 ac_mid=-1
+   while :; do
+     cat >"conftest.$ac_ext" <<_ACEOF
+-#line 26419 "configure"
++#line 26438 "configure"
+ #include "confdefs.h"
+ 
+ #include <stdlib.h>
+@@ -26449,16 +26468,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:26452: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:26471: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:26455: \$? = $ac_status" >&5
++  echo "$as_me:26474: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:26458: \"$ac_try\"") >&5
++  { (eval echo "$as_me:26477: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:26461: \$? = $ac_status" >&5
++  echo "$as_me:26480: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_lo=$ac_mid; break
+ else
+@@ -26474,7 +26493,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 26477 "configure"
++#line 26496 "configure"
+ #include "confdefs.h"
+ 
+ #include <stdlib.h>
+@@ -26507,16 +26526,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:26510: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:26529: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:26513: \$? = $ac_status" >&5
++  echo "$as_me:26532: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:26516: \"$ac_try\"") >&5
++  { (eval echo "$as_me:26535: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:26519: \$? = $ac_status" >&5
++  echo "$as_me:26538: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_hi=$ac_mid
+ else
+@@ -26529,12 +26548,12 @@
+ ac_cv_sizeof_bool=$ac_lo
+ else
+   if test "$cross_compiling" = yes; then
+-  { { echo "$as_me:26532: error: cannot run test program while cross compiling" >&5
++  { { echo "$as_me:26551: 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 26537 "configure"
++#line 26556 "configure"
+ #include "confdefs.h"
+ 
+ #include <stdlib.h>
+@@ -26571,15 +26590,15 @@
+ }
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:26574: \"$ac_link\"") >&5
++if { (eval echo "$as_me:26593: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:26577: \$? = $ac_status" >&5
++  echo "$as_me:26596: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:26579: \"$ac_try\"") >&5
++  { (eval echo "$as_me:26598: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:26582: \$? = $ac_status" >&5
++  echo "$as_me:26601: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_sizeof_bool=`cat conftest.val`
+ else
+@@ -26595,13 +26614,13 @@
+   ac_cv_sizeof_bool=0
+ fi
+ fi
+-echo "$as_me:26598: result: $ac_cv_sizeof_bool" >&5
++echo "$as_me:26617: 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:26604: checking for type of bool" >&5
++echo "$as_me:26623: 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
+@@ -26620,7 +26639,7 @@
+ 
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 26623 "configure"
++#line 26642 "configure"
+ #include "confdefs.h"
+ 
+ #include <stdlib.h>
+@@ -26662,15 +26681,15 @@
+ 
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:26665: \"$ac_link\"") >&5
++if { (eval echo "$as_me:26684: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:26668: \$? = $ac_status" >&5
++  echo "$as_me:26687: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:26670: \"$ac_try\"") >&5
++  { (eval echo "$as_me:26689: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:26673: \$? = $ac_status" >&5
++  echo "$as_me:26692: \$? = $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
+@@ -26687,26 +26706,26 @@
+ 	rm -f cf_test.out
+ 
+ fi
+-echo "$as_me:26690: result: $cf_cv_type_of_bool" >&5
++echo "$as_me:26709: 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:26697: WARNING: Assuming $NCURSES_BOOL for type of bool" >&5
++	{ echo "$as_me:26716: 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:26703: checking for fallback type of bool" >&5
++			echo "$as_me:26722: 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:26709: result: $cf_cv_type_of_bool" >&5
++			echo "$as_me:26728: result: $cf_cv_type_of_bool" >&5
+ echo "${ECHO_T}$cf_cv_type_of_bool" >&6
+ 		fi
+ 	fi
+@@ -26735,7 +26754,7 @@
+ 
+ 	if test "$cf_with_ada" != "no" ; then
+ 		if test "$with_libtool" != "no"; then
+-			{ echo "$as_me:26738: WARNING: libtool does not support Ada - disabling feature" >&5
++			{ echo "$as_me:26757: 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
+@@ -26752,7 +26771,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:26755: checking for $ac_word" >&5
++echo "$as_me:26774: 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
+@@ -26769,7 +26788,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:26772: found $ac_dir/$ac_word" >&5
++   echo "$as_me:26791: found $ac_dir/$ac_word" >&5
+    break
+ fi
+ done
+@@ -26781,10 +26800,10 @@
+ cf_TEMP_gnat=$ac_cv_path_cf_TEMP_gnat
+ 
+ if test -n "$cf_TEMP_gnat"; then
+-  echo "$as_me:26784: result: $cf_TEMP_gnat" >&5
++  echo "$as_me:26803: result: $cf_TEMP_gnat" >&5
+ echo "${ECHO_T}$cf_TEMP_gnat" >&6
+ else
+-  echo "$as_me:26787: result: no" >&5
++  echo "$as_me:26806: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -26794,7 +26813,7 @@
+ 		unset cf_cv_gnat_version
+ 		unset cf_TEMP_gnat
+ 
+-echo "$as_me:26797: checking for $cf_prog_gnat version" >&5
++echo "$as_me:26816: 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
+@@ -26805,7 +26824,7 @@
+ 	sed -e '2,$d' -e 's/[^0-9 \.]//g' -e 's/^[ ]*//' -e 's/ .*//'`
+ 
+ fi
+-echo "$as_me:26808: result: $cf_cv_gnat_version" >&5
++echo "$as_me:26827: 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
+@@ -26834,7 +26853,7 @@
+ 			cd conftest.src
+ 			for cf_gprconfig in Ada C
+ 			do
+-				echo "$as_me:26837: checking for gprconfig name for $cf_gprconfig" >&5
++				echo "$as_me:26856: 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
+@@ -26853,10 +26872,10 @@
+ 				if test -n "$cf_gprconfig_value"
+ 				then
+ 					eval "cf_ada_config_$cf_gprconfig=$cf_gprconfig_value"
+-					echo "$as_me:26856: result: $cf_gprconfig_value" >&5
++					echo "$as_me:26875: result: $cf_gprconfig_value" >&5
+ echo "${ECHO_T}$cf_gprconfig_value" >&6
+ 				else
+-					echo "$as_me:26859: result: missing" >&5
++					echo "$as_me:26878: result: missing" >&5
+ echo "${ECHO_T}missing" >&6
+ 					cf_ada_config="#"
+ 					break
+@@ -26869,7 +26888,7 @@
+ 	if test "x$cf_ada_config" != "x#"
+ 	then
+ 
+-echo "$as_me:26872: checking for gnat version" >&5
++echo "$as_me:26891: 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
+@@ -26880,7 +26899,7 @@
+ 	sed -e '2,$d' -e 's/[^0-9 \.]//g' -e 's/^[ ]*//' -e 's/ .*//'`
+ 
+ fi
+-echo "$as_me:26883: result: $cf_cv_gnat_version" >&5
++echo "$as_me:26902: 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
+ 
+@@ -26889,7 +26908,7 @@
+ 	cf_cv_prog_gnat_correct=yes
+ 	;;
+ (*)
+-	{ echo "$as_me:26892: WARNING: Unsupported GNAT version $cf_cv_gnat_version. We require 3.11 or better. Disabling Ada95 binding." >&5
++	{ echo "$as_me:26911: 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
+ 	;;
+@@ -26897,7 +26916,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:26900: checking for $ac_word" >&5
++echo "$as_me:26919: 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
+@@ -26912,7 +26931,7 @@
+   test -z "$ac_dir" && ac_dir=.
+   $as_executable_p "$ac_dir/$ac_word" || continue
+ ac_cv_prog_M4_exists="yes"
+-echo "$as_me:26915: found $ac_dir/$ac_word" >&5
++echo "$as_me:26934: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -26921,20 +26940,20 @@
+ fi
+ M4_exists=$ac_cv_prog_M4_exists
+ if test -n "$M4_exists"; then
+-  echo "$as_me:26924: result: $M4_exists" >&5
++  echo "$as_me:26943: result: $M4_exists" >&5
+ echo "${ECHO_T}$M4_exists" >&6
+ else
+-  echo "$as_me:26927: result: no" >&5
++  echo "$as_me:26946: 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:26933: WARNING: Ada95 binding required program m4 not found. Ada95 binding disabled" >&5
++			{ echo "$as_me:26952: 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:26937: checking if GNAT works" >&5
++			echo "$as_me:26956: checking if GNAT works" >&5
+ echo $ECHO_N "checking if GNAT works... $ECHO_C" >&6
+ 
+ rm -rf ./conftest* ./*~conftest*
+@@ -26962,7 +26981,7 @@
+ fi
+ rm -rf ./conftest* ./*~conftest*
+ 
+-			echo "$as_me:26965: result: $cf_cv_prog_gnat_correct" >&5
++			echo "$as_me:26984: result: $cf_cv_prog_gnat_correct" >&5
+ echo "${ECHO_T}$cf_cv_prog_gnat_correct" >&6
+ 		fi
+ 	else
+@@ -26974,7 +26993,7 @@
+ 
+  	ADAFLAGS="$ADAFLAGS -gnatpn"
+ 
+-	echo "$as_me:26977: checking optimization options for ADAFLAGS" >&5
++	echo "$as_me:26996: checking optimization options for ADAFLAGS" >&5
+ echo $ECHO_N "checking optimization options for ADAFLAGS... $ECHO_C" >&6
+ 	case "$CFLAGS" in
+ 	(*-g*)
+@@ -26991,10 +27010,10 @@
+ 
+ 		;;
+ 	esac
+-	echo "$as_me:26994: result: $ADAFLAGS" >&5
++	echo "$as_me:27013: result: $ADAFLAGS" >&5
+ echo "${ECHO_T}$ADAFLAGS" >&6
+ 
+-echo "$as_me:26997: checking if GNATPREP supports -T option" >&5
++echo "$as_me:27016: 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
+@@ -27004,11 +27023,11 @@
+ gnatprep -T 2>/dev/null >/dev/null && cf_cv_gnatprep_opt_t=yes
+ 
+ fi
+-echo "$as_me:27007: result: $cf_cv_gnatprep_opt_t" >&5
++echo "$as_me:27026: 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:27011: checking if GNAT supports generics" >&5
++echo "$as_me:27030: 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])
+@@ -27018,7 +27037,7 @@
+ 	cf_gnat_generics=no
+ 	;;
+ esac
+-echo "$as_me:27021: result: $cf_gnat_generics" >&5
++echo "$as_me:27040: result: $cf_gnat_generics" >&5
+ echo "${ECHO_T}$cf_gnat_generics" >&6
+ 
+ if test "$cf_gnat_generics" = yes
+@@ -27030,7 +27049,7 @@
+ 	cf_generic_objects=
+ fi
+ 
+-echo "$as_me:27033: checking if GNAT supports SIGINT" >&5
++echo "$as_me:27052: 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
+@@ -27078,7 +27097,7 @@
+ rm -rf ./conftest* ./*~conftest*
+ 
+ fi
+-echo "$as_me:27081: result: $cf_cv_gnat_sigint" >&5
++echo "$as_me:27100: result: $cf_cv_gnat_sigint" >&5
+ echo "${ECHO_T}$cf_cv_gnat_sigint" >&6
+ 
+ if test "$cf_cv_gnat_sigint" = yes ; then
+@@ -27091,7 +27110,7 @@
+ cf_gnat_projects=no
+ 
+ if test "$enable_gnat_projects" != no ; then
+-echo "$as_me:27094: checking if GNAT supports project files" >&5
++echo "$as_me:27113: 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]*)
+@@ -27154,15 +27173,15 @@
+ 	esac
+ 	;;
+ esac
+-echo "$as_me:27157: result: $cf_gnat_projects" >&5
++echo "$as_me:27176: 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:27163: checking if GNAT supports libraries" >&5
++	echo "$as_me:27182: checking if GNAT supports libraries" >&5
+ echo $ECHO_N "checking if GNAT supports libraries... $ECHO_C" >&6
+-	echo "$as_me:27165: result: $cf_gnat_libraries" >&5
++	echo "$as_me:27184: result: $cf_gnat_libraries" >&5
+ echo "${ECHO_T}$cf_gnat_libraries" >&6
+ fi
+ 
+@@ -27182,7 +27201,7 @@
+ 	then
+ 		USE_GNAT_MAKE_GPR=""
+ 	else
+-		{ echo "$as_me:27185: WARNING: use old makefile rules since tools are missing" >&5
++		{ echo "$as_me:27204: 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
+@@ -27194,7 +27213,7 @@
+ 	USE_GNAT_LIBRARIES="#"
+ fi
+ 
+-echo "$as_me:27197: checking for ada-compiler" >&5
++echo "$as_me:27216: 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.
+@@ -27205,12 +27224,12 @@
+   cf_ada_compiler=gnatmake
+ fi;
+ 
+-echo "$as_me:27208: result: $cf_ada_compiler" >&5
++echo "$as_me:27227: result: $cf_ada_compiler" >&5
+ echo "${ECHO_T}$cf_ada_compiler" >&6
+ 
+ 			cf_ada_package=terminal_interface
+ 
+-echo "$as_me:27213: checking for ada-include" >&5
++echo "$as_me:27232: 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.
+@@ -27246,7 +27265,7 @@
+ 	withval=`echo "$withval" | sed -e s%NONE%$cf_path_syntax%`
+ 	;;
+ (*)
+-	{ { echo "$as_me:27249: error: expected a pathname, not \"$withval\"" >&5
++	{ { echo "$as_me:27268: error: expected a pathname, not \"$withval\"" >&5
+ echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
+    { (exit 1); exit 1; }; }
+ 	;;
+@@ -27255,10 +27274,10 @@
+ fi
+ eval ADA_INCLUDE="$withval"
+ 
+-echo "$as_me:27258: result: $ADA_INCLUDE" >&5
++echo "$as_me:27277: result: $ADA_INCLUDE" >&5
+ echo "${ECHO_T}$ADA_INCLUDE" >&6
+ 
+-echo "$as_me:27261: checking for ada-objects" >&5
++echo "$as_me:27280: 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.
+@@ -27294,7 +27313,7 @@
+ 	withval=`echo "$withval" | sed -e s%NONE%$cf_path_syntax%`
+ 	;;
+ (*)
+-	{ { echo "$as_me:27297: error: expected a pathname, not \"$withval\"" >&5
++	{ { echo "$as_me:27316: error: expected a pathname, not \"$withval\"" >&5
+ echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
+    { (exit 1); exit 1; }; }
+ 	;;
+@@ -27303,10 +27322,10 @@
+ fi
+ eval ADA_OBJECTS="$withval"
+ 
+-echo "$as_me:27306: result: $ADA_OBJECTS" >&5
++echo "$as_me:27325: result: $ADA_OBJECTS" >&5
+ echo "${ECHO_T}$ADA_OBJECTS" >&6
+ 
+-echo "$as_me:27309: checking if an Ada95 shared-library should be built" >&5
++echo "$as_me:27328: 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.
+@@ -27316,14 +27335,14 @@
+ else
+   with_ada_sharedlib=no
+ fi;
+-echo "$as_me:27319: result: $with_ada_sharedlib" >&5
++echo "$as_me:27338: 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:27326: WARNING: disabling shared-library since GNAT projects are not supported" >&5
++		{ echo "$as_me:27345: 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
+@@ -27343,7 +27362,7 @@
+ 
+ 			# allow the Ada binding to be renamed
+ 
+-echo "$as_me:27346: checking for ada-libname" >&5
++echo "$as_me:27365: 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.
+@@ -27359,7 +27378,7 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:27362: result: $ADA_LIBNAME" >&5
++echo "$as_me:27381: result: $ADA_LIBNAME" >&5
+ echo "${ECHO_T}$ADA_LIBNAME" >&6
+ 
+ 		fi
+@@ -27370,13 +27389,13 @@
+ 
+ # do this "late" to avoid conflict with header-checks
+ if test "x$with_widec" = xyes ; then
+-	echo "$as_me:27373: checking for wchar_t" >&5
++	echo "$as_me:27392: 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 27379 "configure"
++#line 27398 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -27391,16 +27410,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:27394: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:27413: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:27397: \$? = $ac_status" >&5
++  echo "$as_me:27416: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:27400: \"$ac_try\"") >&5
++  { (eval echo "$as_me:27419: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:27403: \$? = $ac_status" >&5
++  echo "$as_me:27422: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_type_wchar_t=yes
+ else
+@@ -27410,10 +27429,10 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:27413: result: $ac_cv_type_wchar_t" >&5
++echo "$as_me:27432: result: $ac_cv_type_wchar_t" >&5
+ echo "${ECHO_T}$ac_cv_type_wchar_t" >&6
+ 
+-echo "$as_me:27416: checking size of wchar_t" >&5
++echo "$as_me:27435: 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
+@@ -27422,7 +27441,7 @@
+   if test "$cross_compiling" = yes; then
+   # Depending upon the size, compute the lo and hi bounds.
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 27425 "configure"
++#line 27444 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -27434,21 +27453,21 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:27437: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:27456: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:27440: \$? = $ac_status" >&5
++  echo "$as_me:27459: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:27443: \"$ac_try\"") >&5
++  { (eval echo "$as_me:27462: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:27446: \$? = $ac_status" >&5
++  echo "$as_me:27465: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_lo=0 ac_mid=0
+   while :; do
+     cat >"conftest.$ac_ext" <<_ACEOF
+-#line 27451 "configure"
++#line 27470 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -27460,16 +27479,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:27463: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:27482: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:27466: \$? = $ac_status" >&5
++  echo "$as_me:27485: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:27469: \"$ac_try\"") >&5
++  { (eval echo "$as_me:27488: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:27472: \$? = $ac_status" >&5
++  echo "$as_me:27491: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_hi=$ac_mid; break
+ else
+@@ -27485,7 +27504,7 @@
+ ac_hi=-1 ac_mid=-1
+   while :; do
+     cat >"conftest.$ac_ext" <<_ACEOF
+-#line 27488 "configure"
++#line 27507 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -27497,16 +27516,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:27500: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:27519: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:27503: \$? = $ac_status" >&5
++  echo "$as_me:27522: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:27506: \"$ac_try\"") >&5
++  { (eval echo "$as_me:27525: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:27509: \$? = $ac_status" >&5
++  echo "$as_me:27528: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_lo=$ac_mid; break
+ else
+@@ -27522,7 +27541,7 @@
+ while test "x$ac_lo" != "x$ac_hi"; do
+   ac_mid=`expr '(' "$ac_hi" - "$ac_lo" ')' / 2 + "$ac_lo"`
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 27525 "configure"
++#line 27544 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -27534,16 +27553,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:27537: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:27556: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:27540: \$? = $ac_status" >&5
++  echo "$as_me:27559: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:27543: \"$ac_try\"") >&5
++  { (eval echo "$as_me:27562: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:27546: \$? = $ac_status" >&5
++  echo "$as_me:27565: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_hi=$ac_mid
+ else
+@@ -27556,12 +27575,12 @@
+ ac_cv_sizeof_wchar_t=$ac_lo
+ else
+   if test "$cross_compiling" = yes; then
+-  { { echo "$as_me:27559: error: cannot run test program while cross compiling" >&5
++  { { echo "$as_me:27578: 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 27564 "configure"
++#line 27583 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -27577,15 +27596,15 @@
+ }
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:27580: \"$ac_link\"") >&5
++if { (eval echo "$as_me:27599: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:27583: \$? = $ac_status" >&5
++  echo "$as_me:27602: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:27585: \"$ac_try\"") >&5
++  { (eval echo "$as_me:27604: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:27588: \$? = $ac_status" >&5
++  echo "$as_me:27607: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_sizeof_wchar_t=`cat conftest.val`
+ else
+@@ -27601,7 +27620,7 @@
+   ac_cv_sizeof_wchar_t=0
+ fi
+ fi
+-echo "$as_me:27604: result: $ac_cv_sizeof_wchar_t" >&5
++echo "$as_me:27623: 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
+@@ -27614,7 +27633,7 @@
+ 	then
+ 		test -n "$verbose" && echo "	test failed (assume 2)" 1>&6
+ 
+-echo "${as_me:-configure}:27617: testing test failed (assume 2) ..." 1>&5
++echo "${as_me:-configure}:27636: testing test failed (assume 2) ..." 1>&5
+ 
+ 		sed /SIZEOF_WCHAR_T/d confdefs.h >confdefs.tmp
+ 		mv confdefs.tmp confdefs.h
+@@ -27632,7 +27651,7 @@
+ ### chooses to split module lists into libraries.
+ ###
+ ### (see CF_LIB_RULES).
+-echo "$as_me:27635: checking for library subsets" >&5
++echo "$as_me:27654: checking for library subsets" >&5
+ echo $ECHO_N "checking for library subsets... $ECHO_C" >&6
+ LIB_SUBSETS=
+ 
+@@ -27686,7 +27705,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:27689: result: $LIB_SUBSETS" >&5
++echo "$as_me:27708: result: $LIB_SUBSETS" >&5
+ echo "${ECHO_T}$LIB_SUBSETS" >&6
+ 
+ ### Construct the list of include-directories to be generated
+@@ -27717,7 +27736,7 @@
+ fi
+ 
+ ### Build up pieces for makefile rules
+-echo "$as_me:27720: checking default library suffix" >&5
++echo "$as_me:27739: checking default library suffix" >&5
+ echo $ECHO_N "checking default library suffix... $ECHO_C" >&6
+ 
+ 	case $DFT_LWR_MODEL in
+@@ -27728,10 +27747,10 @@
+ 	(shared)  DFT_ARG_SUFFIX=''   ;;
+ 	esac
+ 	test -n "$LIB_SUFFIX" && DFT_ARG_SUFFIX="${LIB_SUFFIX}${DFT_ARG_SUFFIX}"
+-echo "$as_me:27731: result: $DFT_ARG_SUFFIX" >&5
++echo "$as_me:27750: result: $DFT_ARG_SUFFIX" >&5
+ echo "${ECHO_T}$DFT_ARG_SUFFIX" >&6
+ 
+-echo "$as_me:27734: checking default library-dependency suffix" >&5
++echo "$as_me:27753: checking default library-dependency suffix" >&5
+ echo $ECHO_N "checking default library-dependency suffix... $ECHO_C" >&6
+ 
+ 	case X$DFT_LWR_MODEL in
+@@ -27814,10 +27833,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:27817: result: $DFT_DEP_SUFFIX" >&5
++echo "$as_me:27836: result: $DFT_DEP_SUFFIX" >&5
+ echo "${ECHO_T}$DFT_DEP_SUFFIX" >&6
+ 
+-echo "$as_me:27820: checking default object directory" >&5
++echo "$as_me:27839: checking default object directory" >&5
+ echo $ECHO_N "checking default object directory... $ECHO_C" >&6
+ 
+ 	case $DFT_LWR_MODEL in
+@@ -27833,11 +27852,11 @@
+ 			DFT_OBJ_SUBDIR='obj_s' ;;
+ 		esac
+ 	esac
+-echo "$as_me:27836: result: $DFT_OBJ_SUBDIR" >&5
++echo "$as_me:27855: result: $DFT_OBJ_SUBDIR" >&5
+ echo "${ECHO_T}$DFT_OBJ_SUBDIR" >&6
+ 
+ if test "x$cf_with_cxx" = xyes ; then
+-echo "$as_me:27840: checking c++ library-dependency suffix" >&5
++echo "$as_me:27859: 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++)
+@@ -27930,7 +27949,7 @@
+ 	fi
+ 
+ fi
+-echo "$as_me:27933: result: $CXX_LIB_SUFFIX" >&5
++echo "$as_me:27952: result: $CXX_LIB_SUFFIX" >&5
+ echo "${ECHO_T}$CXX_LIB_SUFFIX" >&6
+ 
+ fi
+@@ -28106,19 +28125,19 @@
+ 
+ if test -n "$LDFLAGS_STATIC" && test -n "$LDFLAGS_SHARED"
+ then
+-	echo "$as_me:28109: checking if linker supports switching between static/dynamic" >&5
++	echo "$as_me:28128: 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 28114 "configure"
++#line 28133 "configure"
+ #include <stdio.h>
+ int cf_ldflags_static(FILE *fp) { return fflush(fp); }
+ EOF
+-	if { (eval echo "$as_me:28118: \"$ac_compile\"") >&5
++	if { (eval echo "$as_me:28137: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:28121: \$? = $ac_status" >&5
++  echo "$as_me:28140: \$? = $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
+@@ -28129,10 +28148,10 @@
+ 
+ 	LIBS="$LDFLAGS_STATIC -L`pwd` -lconftest $LDFLAGS_DYNAMIC $LIBS"
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 28132 "configure"
++#line 28151 "configure"
+ #include "confdefs.h"
+ 
+-#line 28135 "configure"
++#line 28154 "configure"
+ #include <stdio.h>
+ int cf_ldflags_static(FILE *fp);
+ 
+@@ -28147,16 +28166,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:28150: \"$ac_link\"") >&5
++if { (eval echo "$as_me:28169: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:28153: \$? = $ac_status" >&5
++  echo "$as_me:28172: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:28156: \"$ac_try\"") >&5
++  { (eval echo "$as_me:28175: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:28159: \$? = $ac_status" >&5
++  echo "$as_me:28178: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+ 
+ 	# some linkers simply ignore the -dynamic
+@@ -28179,7 +28198,7 @@
+ 	rm -f libconftest.*
+ 	LIBS="$cf_save_LIBS"
+ 
+-	echo "$as_me:28182: result: $cf_ldflags_static" >&5
++	echo "$as_me:28201: result: $cf_ldflags_static" >&5
+ echo "${ECHO_T}$cf_ldflags_static" >&6
+ 
+ 	if test "$cf_ldflags_static" != yes
+@@ -28195,7 +28214,7 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:28198: checking where we will install curses.h" >&5
++echo "$as_me:28217: checking where we will install curses.h" >&5
+ echo $ECHO_N "checking where we will install curses.h... $ECHO_C" >&6
+ 
+ includesubdir=
+@@ -28205,7 +28224,7 @@
+ then
+ 	includesubdir="/ncurses${USE_LIB_SUFFIX}"
+ fi
+-echo "$as_me:28208: result: ${includedir}${includesubdir}" >&5
++echo "$as_me:28227: result: ${includedir}${includesubdir}" >&5
+ echo "${ECHO_T}${includedir}${includesubdir}" >&6
+ 
+ ### Resolve a conflict between normal and wide-curses by forcing applications
+@@ -28213,7 +28232,7 @@
+ if test "$with_overwrite" != no ; then
+ if test "$NCURSES_LIBUTF8" = 1 ; then
+ 	NCURSES_LIBUTF8='defined(HAVE_LIBUTF8_H)'
+-	{ echo "$as_me:28216: WARNING: Wide-character applications must define HAVE_LIBUTF8_H to include curses.h" >&5
++	{ echo "$as_me:28235: 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
+@@ -28241,7 +28260,7 @@
+ 
+ # pkgsrc uses these
+ 
+-echo "$as_me:28244: checking for desired basename for form library" >&5
++echo "$as_me:28263: 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.
+@@ -28261,10 +28280,10 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:28264: result: $FORM_NAME" >&5
++echo "$as_me:28283: result: $FORM_NAME" >&5
+ echo "${ECHO_T}$FORM_NAME" >&6
+ 
+-echo "$as_me:28267: checking for desired basename for menu library" >&5
++echo "$as_me:28286: 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.
+@@ -28284,10 +28303,10 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:28287: result: $MENU_NAME" >&5
++echo "$as_me:28306: result: $MENU_NAME" >&5
+ echo "${ECHO_T}$MENU_NAME" >&6
+ 
+-echo "$as_me:28290: checking for desired basename for panel library" >&5
++echo "$as_me:28309: 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.
+@@ -28307,10 +28326,10 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:28310: result: $PANEL_NAME" >&5
++echo "$as_me:28329: result: $PANEL_NAME" >&5
+ echo "${ECHO_T}$PANEL_NAME" >&6
+ 
+-echo "$as_me:28313: checking for desired basename for cxx library" >&5
++echo "$as_me:28332: 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.
+@@ -28330,13 +28349,13 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:28333: result: $CXX_NAME" >&5
++echo "$as_me:28352: 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:28339: checking for src modules" >&5
++echo "$as_me:28358: checking for src modules" >&5
+ echo $ECHO_N "checking for src modules... $ECHO_C" >&6
+ 
+ # dependencies and linker-arguments for test-programs
+@@ -28405,7 +28424,7 @@
+ 		fi
+ 	fi
+ done
+-echo "$as_me:28408: result: $cf_cv_src_modules" >&5
++echo "$as_me:28427: result: $cf_cv_src_modules" >&5
+ echo "${ECHO_T}$cf_cv_src_modules" >&6
+ 
+ TEST_ARGS="-L${LIB_DIR} $TEST_ARGS"
+@@ -28566,7 +28585,7 @@
+ 	(*-D_XOPEN_SOURCE_EXTENDED*)
+ 		test -n "$verbose" && echo "	moving _XOPEN_SOURCE_EXTENDED to work around g++ problem" 1>&6
+ 
+-echo "${as_me:-configure}:28569: testing moving _XOPEN_SOURCE_EXTENDED to work around g++ problem ..." 1>&5
++echo "${as_me:-configure}:28588: 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//'`
+@@ -28577,7 +28596,7 @@
+ 
+ # Help to automatically enable the extended curses features when using either
+ # the *-config or the ".pc" files by adding defines.
+-echo "$as_me:28580: checking for defines to add to ncurses${USE_CFG_SUFFIX}-config script" >&5
++echo "$as_me:28599: 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
+@@ -28593,7 +28612,7 @@
+ 	done
+ 	test "$cf_found" = no && PKG_CFLAGS="$PKG_CFLAGS $cf_loop1"
+ done
+-echo "$as_me:28596: result: $PKG_CFLAGS" >&5
++echo "$as_me:28615: result: $PKG_CFLAGS" >&5
+ echo "${ECHO_T}$PKG_CFLAGS" >&6
+ 
+ # AC_CHECK_SIZEOF demands a literal parameter, no variables.  So we do this.
+@@ -28654,7 +28673,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}:28657: testing will map symbols to ABI=$cf_cv_abi_version ..." 1>&5
++echo "${as_me:-configure}:28676: testing will map symbols to ABI=$cf_cv_abi_version ..." 1>&5
+ 
+ fi
+ 
+@@ -28681,7 +28700,7 @@
+ 
+ # This is used for the *-config script and *.pc data files.
+ 
+-echo "$as_me:28684: checking for linker search path" >&5
++echo "$as_me:28703: 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
+@@ -28729,7 +28748,7 @@
+ 			cf_pathlist="$cf_pathlist /lib /usr/lib"
+ 			;;
+ 		(*)
+-			{ echo "$as_me:28732: WARNING: problem with Solaris architecture" >&5
++			{ echo "$as_me:28751: WARNING: problem with Solaris architecture" >&5
+ echo "$as_me: WARNING: problem with Solaris architecture" >&2;}
+ 			;;
+ 		esac
+@@ -28770,7 +28789,7 @@
+ test -z "$cf_cv_ld_searchpath" && cf_cv_ld_searchpath=/usr/lib
+ 
+ fi
+-echo "$as_me:28773: result: $cf_cv_ld_searchpath" >&5
++echo "$as_me:28792: 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'`
+@@ -28860,7 +28879,7 @@
+ : "${CONFIG_STATUS=./config.status}"
+ ac_clean_files_save=$ac_clean_files
+ ac_clean_files="$ac_clean_files $CONFIG_STATUS"
+-{ echo "$as_me:28863: creating $CONFIG_STATUS" >&5
++{ echo "$as_me:28882: creating $CONFIG_STATUS" >&5
+ echo "$as_me: creating $CONFIG_STATUS" >&6;}
+ cat >"$CONFIG_STATUS" <<_ACEOF
+ #! $SHELL
+@@ -29039,7 +29058,7 @@
+     echo "$ac_cs_version"; exit 0 ;;
+   --he | --h)
+     # Conflict between --help and --header
+-    { { echo "$as_me:29042: error: ambiguous option: $1
++    { { echo "$as_me:29061: 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;}
+@@ -29058,7 +29077,7 @@
+     ac_need_defaults=false;;
+ 
+   # This is an error.
+-  -*) { { echo "$as_me:29061: error: unrecognized option: $1
++  -*) { { echo "$as_me:29080: 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;}
+@@ -29184,7 +29203,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:29187: error: invalid argument: $ac_config_target" >&5
++  *) { { echo "$as_me:29206: error: invalid argument: $ac_config_target" >&5
+ echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
+    { (exit 1); exit 1; }; };;
+   esac
+@@ -29696,7 +29715,7 @@
+   esac
+ 
+   if test x"$ac_file" != x-; then
+-    { echo "$as_me:29699: creating $ac_file" >&5
++    { echo "$as_me:29718: creating $ac_file" >&5
+ echo "$as_me: creating $ac_file" >&6;}
+     rm -f "$ac_file"
+   fi
+@@ -29714,7 +29733,7 @@
+       -) echo $tmp/stdin ;;
+       [\\/$]*)
+          # Absolute (can't be DOS-style, as IFS=:)
+-         test -f "$f" || { { echo "$as_me:29717: error: cannot find input file: $f" >&5
++         test -f "$f" || { { echo "$as_me:29736: error: cannot find input file: $f" >&5
+ echo "$as_me: error: cannot find input file: $f" >&2;}
+    { (exit 1); exit 1; }; }
+          echo $f;;
+@@ -29727,7 +29746,7 @@
+            echo "$srcdir/$f"
+          else
+            # /dev/null tree
+-           { { echo "$as_me:29730: error: cannot find input file: $f" >&5
++           { { echo "$as_me:29749: error: cannot find input file: $f" >&5
+ echo "$as_me: error: cannot find input file: $f" >&2;}
+    { (exit 1); exit 1; }; }
+          fi;;
+@@ -29743,7 +29762,7 @@
+       if test -n "$ac_seen"; then
+         ac_used=`grep '@datarootdir@' "$ac_item"`
+         if test -z "$ac_used"; then
+-          { echo "$as_me:29746: WARNING: datarootdir was used implicitly but not set:
++          { echo "$as_me:29765: 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;}
+@@ -29752,7 +29771,7 @@
+       fi
+       ac_seen=`grep '${datarootdir}' "$ac_item"`
+       if test -n "$ac_seen"; then
+-        { echo "$as_me:29755: WARNING: datarootdir was used explicitly but not set:
++        { echo "$as_me:29774: 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;}
+@@ -29789,7 +29808,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:29792: WARNING: Variable $ac_name is used but was not set:
++              { echo "$as_me:29811: 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;}
+@@ -29800,7 +29819,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:29803: WARNING: Some variables may not be substituted:
++      { echo "$as_me:29822: WARNING: Some variables may not be substituted:
+ $ac_seen" >&5
+ echo "$as_me: WARNING: Some variables may not be substituted:
+ $ac_seen" >&2;}
+@@ -29849,7 +29868,7 @@
+   * )   ac_file_in=$ac_file.in ;;
+   esac
+ 
+-  test x"$ac_file" != x- && { echo "$as_me:29852: creating $ac_file" >&5
++  test x"$ac_file" != x- && { echo "$as_me:29871: creating $ac_file" >&5
+ echo "$as_me: creating $ac_file" >&6;}
+ 
+   # First look for the input files in the build tree, otherwise in the
+@@ -29860,7 +29879,7 @@
+       -) echo $tmp/stdin ;;
+       [\\/$]*)
+          # Absolute (can't be DOS-style, as IFS=:)
+-         test -f "$f" || { { echo "$as_me:29863: error: cannot find input file: $f" >&5
++         test -f "$f" || { { echo "$as_me:29882: error: cannot find input file: $f" >&5
+ echo "$as_me: error: cannot find input file: $f" >&2;}
+    { (exit 1); exit 1; }; }
+          echo $f;;
+@@ -29873,7 +29892,7 @@
+            echo "$srcdir/$f"
+          else
+            # /dev/null tree
+-           { { echo "$as_me:29876: error: cannot find input file: $f" >&5
++           { { echo "$as_me:29895: error: cannot find input file: $f" >&5
+ echo "$as_me: error: cannot find input file: $f" >&2;}
+    { (exit 1); exit 1; }; }
+          fi;;
+@@ -29931,7 +29950,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:29934: $ac_file is unchanged" >&5
++      { echo "$as_me:29953: $ac_file is unchanged" >&5
+ echo "$as_me: $ac_file is unchanged" >&6;}
+     else
+       ac_dir=`$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+@@ -30318,7 +30337,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}:30321: testing overriding CXX_MODEL to SHARED ..." 1>&5
++echo "${as_me:-configure}:30340: testing overriding CXX_MODEL to SHARED ..." 1>&5
+ 
+ 					with_shared_cxx=yes
+ 					;;
+Index: dist.mk
+Prereq:  1.1450 
+--- ncurses-6.3-20211115+/dist.mk	2021-11-15 23:51:41.000000000 +0000
++++ ncurses-6.3-20211120/dist.mk	2021-11-20 12:06:33.000000000 +0000
+@@ -26,7 +26,7 @@
+ # use or other dealings in this Software without prior written               #
+ # authorization.                                                             #
+ ##############################################################################
+-# $Id: dist.mk,v 1.1450 2021/11/15 23:51:41 tom Exp $
++# $Id: dist.mk,v 1.1451 2021/11/20 12:06:33 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 = 20211115
++NCURSES_PATCH = 20211120
+ 
+ # We don't append the patch to the version, since this only applies to releases
+ VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR)
+Index: include/nc_alloc.h
+Prereq:  1.28 
+--- ncurses-6.3-20211115+/include/nc_alloc.h	2021-03-20 16:07:29.000000000 +0000
++++ ncurses-6.3-20211120/include/nc_alloc.h	2021-11-20 23:33:38.000000000 +0000
+@@ -30,7 +30,7 @@
+ /****************************************************************************
+  *  Author: Thomas E. Dickey                    1996-on                     *
+  ****************************************************************************/
+-/* $Id: nc_alloc.h,v 1.28 2021/03/20 16:07:29 tom Exp $ */
++/* $Id: nc_alloc.h,v 1.30 2021/11/20 23:33:38 tom Exp $ */
+ 
+ #ifndef NC_ALLOC_included
+ #define NC_ALLOC_included 1
+@@ -77,7 +77,6 @@
+ 
+ #ifdef NCURSES_INTERNALS
+ extern GCC_NORETURN NCURSES_EXPORT(void) _nc_free_tic(int);
+-extern NCURSES_EXPORT(void) _nc_free_tparm(void);
+ extern void _nc_leaks_dump_entry(void);
+ extern NCURSES_EXPORT(void) _nc_leaks_tic(void);
+ 
+Index: misc/terminfo.src
+--- ncurses-6.3-20211115+/misc/terminfo.src	2021-11-14 00:01:04.000000000 +0000
++++ ncurses-6.3-20211120/misc/terminfo.src	2021-11-20 23:59:38.000000000 +0000
+@@ -6,8 +6,8 @@
+ # Report bugs and new terminal descriptions to
+ #	bug-ncurses@gnu.org
+ #
+-#	$Revision: 1.947 $
+-#	$Date: 2021/11/14 00:01:04 $
++#	$Revision: 1.949 $
++#	$Date: 2021/11/20 23:59:38 $
+ #
+ # 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
+@@ -7126,9 +7126,9 @@
+ 	cr=\r, csr=\E[%i%p1%d;%p2%dr, cub=\E[%p1%dD, cub1=^H,
+ 	cud=\E[%p1%dB, cud1=\n, cuf=\E[%p1%dC, cuf1=\E[C,
+ 	cup=\E[%i%p1%d;%p2%dH, cuu=\E[%p1%dA, cuu1=\E[A,
+-	dch=\E[%p1%dP, dch1=\E[P, dl=\E[%p1%dM, dl1=\E[M,
+-	ech=\E[%p1%dX, ed=\E[J, el=\E[K, el1=\E[1K, enacs=\E)0,
+-	flash=\E[?5h$<100/>\E[?5l, fsl=^G, home=\E[H,
++	dch=\E[%p1%dP, dch1=\E[P, dim=\E[2m, dl=\E[%p1%dM,
++	dl1=\E[M, ech=\E[%p1%dX, ed=\E[J, el=\E[K, el1=\E[1K,
++	enacs=\E)0, flash=\E[?5h$<100/>\E[?5l, fsl=^G, 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, invis=\E[8m,
+ 	is2=\E[4l\E>\E[?1034l, kDC=\E[3;2~, kEND=\E[1;2F,
+@@ -7165,13 +7165,13 @@
+ 	setf=\E[3%?%p1%{1}%=%t4%e%p1%{3}%=%t6%e%p1%{4}%=%t1%e%p1%{6}
+ 	     %=%t3%e%p1%d%;m,
+ 	sgr=%?%p9%t\E(0%e\E(B%;\E[0%?%p6%t;1%;%?%p2%t;4%;%?%p1%p3%|
+-	    %t;7%;%?%p4%t;5%;%?%p7%t;8%;m,
++	    %t;7%;%?%p4%t;5%;%?%p5%t;2%;%?%p7%t;8%;m,
+ 	sgr0=\E[0m, smacs=\E(0, smir=\E[4h, smkx=\E[?1h\E=,
+ 	smso=\E[7m, smul=\E[4m, tbc=\E[3g, u6=\E[%i%d;%dR,
+ 	u7=\E[6n, u8=\E[?1;2c, u9=\E[c, vpa=\E[%i%p1%dd, Se=\E[2 q,
+ 	Ss=\E[%p1%d q, use=vt220+pcedit, use=ecma+index,
+ 	use=xterm+alt1049, use=vt220+cvis, use=xterm+sl,
+-	use=ecma+italics,
++	use=ecma+italics, use=ecma+strikeout,
+ #
+ # st-0.1.1
+ #
+@@ -27297,4 +27297,7 @@
+ #	+ add xterm+sl-alt, use that in foot+base (report by Jonas Grosse
+ #	  Sundrup) -TD
+ #
++# 2021-11-20
++#	+ add dim, ecma+strikeout to st-0.6 -TD
++#
+ ######## SHANTIH!  SHANTIH!  SHANTIH!
+Index: ncurses/term.priv.h
+Prereq:  1.6 
+--- ncurses-6.3-20211115+/ncurses/term.priv.h	2021-09-26 20:43:08.000000000 +0000
++++ ncurses-6.3-20211120/ncurses/term.priv.h	2021-11-20 23:33:33.000000000 +0000
+@@ -27,7 +27,7 @@
+  ****************************************************************************/
+ 
+ /*
+- * $Id: term.priv.h,v 1.6 2021/09/26 20:43:08 tom Exp $
++ * $Id: term.priv.h,v 1.7 2021/11/20 23:33:33 tom Exp $
+  *
+  *	term.priv.h
+  *
+@@ -185,6 +185,7 @@
+ 	TGETENT_CACHE	tgetent_cache[TGETENT_MAX];
+ 	int		tgetent_index;
+ 	long		tgetent_sequence;
++	int		terminal_count;
+ 
+ 	char *		dbd_blob;	/* string-heap for dbd_list[] */
+ 	char **		dbd_list;	/* distinct places to look for data */
+@@ -323,6 +324,8 @@
+ 
+ extern NCURSES_EXPORT_VAR(NCURSES_PRESCREEN) _nc_prescreen;
+ 
++extern NCURSES_EXPORT(void) _nc_free_tparm(TERMINAL*);
++
+ #ifdef __cplusplus
+ }
+ #endif
+Index: ncurses/tinfo/entries.c
+Prereq:  1.30 
+--- ncurses-6.3-20211115+/ncurses/tinfo/entries.c	2020-02-02 23:34:34.000000000 +0000
++++ ncurses-6.3-20211120/ncurses/tinfo/entries.c	2021-11-20 23:40:57.000000000 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright 2019,2020 Thomas E. Dickey                                     *
++ * Copyright 2019-2020,2021 Thomas E. Dickey                                *
+  * Copyright 2006-2012,2017 Free Software Foundation, Inc.                  *
+  *                                                                          *
+  * Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -38,7 +38,7 @@
+ 
+ #include <tic.h>
+ 
+-MODULE_ID("$Id: entries.c,v 1.30 2020/02/02 23:34:34 tom Exp $")
++MODULE_ID("$Id: entries.c,v 1.32 2021/11/20 23:40:57 tom Exp $")
+ 
+ /****************************************************************************
+  *
+@@ -122,7 +122,7 @@
+     T((T_CALLED("_nc_free_tinfo()")));
+ #if NO_LEAKS
+     _nc_globals.leak_checking = TRUE;
+-    _nc_free_tparm();
++    _nc_free_tparm(cur_term);
+     _nc_tgetent_leaks();
+ 
+     if (TerminalOf(CURRENT_SCREEN) != 0) {
+Index: ncurses/tinfo/lib_cur_term.c
+Prereq:  1.44 
+--- ncurses-6.3-20211115+/ncurses/tinfo/lib_cur_term.c	2021-11-06 19:04:21.000000000 +0000
++++ ncurses-6.3-20211120/ncurses/tinfo/lib_cur_term.c	2021-11-20 23:19:41.000000000 +0000
+@@ -41,7 +41,7 @@
+ #include <termcap.h>		/* ospeed */
+ #include <tic.h>		/* VALID_STRING */
+ 
+-MODULE_ID("$Id: lib_cur_term.c,v 1.44 2021/11/06 19:04:21 tom Exp $")
++MODULE_ID("$Id: lib_cur_term.c,v 1.45 2021/11/20 23:19:41 tom Exp $")
+ 
+ #undef CUR
+ #define CUR TerminalType(termp).
+@@ -167,6 +167,10 @@
+ 	/* discard memory used in tgetent's cache for this terminal */
+ 	_nc_tgetent_leak(termp);
+ #endif
++	if (--_nc_globals.terminal_count == 0) {
++	    _nc_free_tparm(termp);
++	}
++
+ 	free(termp->tparm_state.fmt_buff);
+ 	free(termp->tparm_state.out_buff);
+ 	free(termp);
+Index: ncurses/tinfo/lib_data.c
+Prereq:  1.85 
+--- ncurses-6.3-20211115+/ncurses/tinfo/lib_data.c	2021-09-04 10:54:35.000000000 +0000
++++ ncurses-6.3-20211120/ncurses/tinfo/lib_data.c	2021-11-20 23:14:34.000000000 +0000
+@@ -43,7 +43,7 @@
+ 
+ #include <curses.priv.h>
+ 
+-MODULE_ID("$Id: lib_data.c,v 1.85 2021/09/04 10:54:35 tom Exp $")
++MODULE_ID("$Id: lib_data.c,v 1.86 2021/11/20 23:14:34 tom Exp $")
+ 
+ /*
+  * OS/2's native linker complains if we don't initialize public data when
+@@ -148,6 +148,7 @@
+     TGETENT_0s,			/* tgetent_cache */
+     0,				/* tgetent_index */
+     0,				/* tgetent_sequence */
++    0,				/* terminal_count */
+ 
+     0,				/* dbd_blob */
+     0,				/* dbd_list */
+Index: ncurses/tinfo/lib_setup.c
+Prereq:  1.214 
+--- ncurses-6.3-20211115+/ncurses/tinfo/lib_setup.c	2021-09-01 23:38:12.000000000 +0000
++++ ncurses-6.3-20211120/ncurses/tinfo/lib_setup.c	2021-11-20 23:11:31.000000000 +0000
+@@ -49,7 +49,7 @@
+ #include <locale.h>
+ #endif
+ 
+-MODULE_ID("$Id: lib_setup.c,v 1.214 2021/09/01 23:38:12 tom Exp $")
++MODULE_ID("$Id: lib_setup.c,v 1.215 2021/11/20 23:11:31 tom Exp $")
+ 
+ /****************************************************************************
+  *
+@@ -743,6 +743,7 @@
+ 		       "Not enough memory to create terminal structure.\n",
+ 		       myname, free(myname));
+ 	}
++	++_nc_globals.terminal_count;
+ #if HAVE_SYSCONF
+ 	{
+ 	    long limit;
+Index: ncurses/tinfo/lib_tparm.c
+Prereq:  1.135 
+--- ncurses-6.3-20211115+/ncurses/tinfo/lib_tparm.c	2021-11-15 23:31:31.000000000 +0000
++++ ncurses-6.3-20211120/ncurses/tinfo/lib_tparm.c	2021-11-20 23:29:15.000000000 +0000
+@@ -53,7 +53,7 @@
+ #include <ctype.h>
+ #include <tic.h>
+ 
+-MODULE_ID("$Id: lib_tparm.c,v 1.135 2021/11/15 23:31:31 tom Exp $")
++MODULE_ID("$Id: lib_tparm.c,v 1.137 2021/11/20 23:29:15 tom Exp $")
+ 
+ /*
+  *	char *
+@@ -142,10 +142,8 @@
+ #if HAVE_TSEARCH
+ #define MyCache _nc_globals.cached_tparm
+ #define MyCount _nc_globals.count_tparm
+-#if NO_LEAKS
+ static int which_tparm;
+ static TPARM_DATA **delete_tparm;
+-#endif
+ #endif /* HAVE_TSEARCH */
+ 
+ static char dummy[] = "";	/* avoid const-cast */
+@@ -160,10 +158,9 @@
+ }
+ #endif
+ 
+-#if NO_LEAKS
+ #if HAVE_TSEARCH
+ static void
+-visit_nodes(const void *nodep, const VISIT which, const int depth)
++visit_nodes(const void *nodep, VISIT which, int depth)
+ {
+     (void) depth;
+     if (which == preorder || which == leaf) {
+@@ -174,9 +171,9 @@
+ #endif
+ 
+ NCURSES_EXPORT(void)
+-_nc_free_tparm(void)
++_nc_free_tparm(TERMINAL *termp)
+ {
+-    TPARM_STATE *tps = get_tparm_state(cur_term);	/* FIXME */
++    TPARM_STATE *tps = get_tparm_state(termp);
+ #if HAVE_TSEARCH
+     if (MyCount != 0) {
+ 	delete_tparm = typeCalloc(TPARM_DATA *, MyCount);
+@@ -204,7 +201,6 @@
+     FreeAndNull(TPS(fmt_buff));
+     TPS(fmt_size) = 0;
+ }
+-#endif
+ 
+ static int
+ tparm_error(TPARM_STATE *tps, const char *message)
+Index: package/debian-mingw/changelog
+--- ncurses-6.3-20211115+/package/debian-mingw/changelog	2021-11-15 23:51:41.000000000 +0000
++++ ncurses-6.3-20211120/package/debian-mingw/changelog	2021-11-20 12:06:33.000000000 +0000
+@@ -1,8 +1,8 @@
+-ncurses6 (6.3+20211115) unstable; urgency=low
++ncurses6 (6.3+20211120) unstable; urgency=low
+ 
+   * latest weekly patch
+ 
+- -- Thomas E. Dickey <dickey@invisible-island.net>  Mon, 15 Nov 2021 18:51:41 -0500
++ -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 20 Nov 2021 07:06:33 -0500
+ 
+ ncurses6 (5.9-20131005) unstable; urgency=low
+ 
+Index: package/debian-mingw64/changelog
+--- ncurses-6.3-20211115+/package/debian-mingw64/changelog	2021-11-15 23:51:41.000000000 +0000
++++ ncurses-6.3-20211120/package/debian-mingw64/changelog	2021-11-20 12:06:33.000000000 +0000
+@@ -1,8 +1,8 @@
+-ncurses6 (6.3+20211115) unstable; urgency=low
++ncurses6 (6.3+20211120) unstable; urgency=low
+ 
+   * latest weekly patch
+ 
+- -- Thomas E. Dickey <dickey@invisible-island.net>  Mon, 15 Nov 2021 18:51:41 -0500
++ -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 20 Nov 2021 07:06:33 -0500
+ 
+ ncurses6 (5.9-20131005) unstable; urgency=low
+ 
+Index: package/debian/changelog
+--- ncurses-6.3-20211115+/package/debian/changelog	2021-11-15 23:51:41.000000000 +0000
++++ ncurses-6.3-20211120/package/debian/changelog	2021-11-20 12:06:33.000000000 +0000
+@@ -1,8 +1,8 @@
+-ncurses6 (6.3+20211115) unstable; urgency=low
++ncurses6 (6.3+20211120) unstable; urgency=low
+ 
+   * latest weekly patch
+ 
+- -- Thomas E. Dickey <dickey@invisible-island.net>  Mon, 15 Nov 2021 18:51:41 -0500
++ -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 20 Nov 2021 07:06:33 -0500
+ 
+ ncurses6 (5.9-20120608) unstable; urgency=low
+ 
+Index: package/debian/control
+--- ncurses-6.3-20211115+/package/debian/control	2018-01-01 11:55:00.000000000 +0000
++++ ncurses-6.3-20211120/package/debian/control	2021-11-20 15:52:13.000000000 +0000
+@@ -3,7 +3,7 @@
+ Priority: optional
+ Maintainer: Thomas E. Dickey <dickey@invisible-island.net>
+ Homepage: https://invisible-island.net/ncurses/
+-Build-Depends: debhelper (>= 7)
++Build-Depends: debhelper (>= 8.1.3)
+ Standards-Version: 3.8.2
+ 
+ Package: ncurses6
+Index: package/debian/rules
+Prereq:  1.41 
+--- ncurses-6.3-20211115+/package/debian/rules	2021-10-11 18:18:08.000000000 +0000
++++ ncurses-6.3-20211120/package/debian/rules	2021-11-20 15:51:09.000000000 +0000
+@@ -1,5 +1,5 @@
+ #!/usr/bin/make -f
+-# $Id: rules,v 1.41 2021/10/11 18:18:08 tom Exp $
++# $Id: rules,v 1.42 2021/11/20 15:51:09 tom Exp $
+ 
+ # Uncomment this to turn on verbose mode.
+ #export DH_VERBOSE=1
+@@ -12,12 +12,15 @@
+ # from having to guess our platform (since we know it already)
+ DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
+ DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
++DEB_HOST_MULTIARCH  ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
+ 
+ CC_NORMAL = -Wall -Wstrict-prototypes -Wmissing-prototypes -Wshadow -Wconversion
+ CC_STRICT = $(CC_NORMAL) -W -Wbad-function-cast -Wcast-align -Wcast-qual -Wmissing-declarations -Wnested-externs -Wpointer-arith -Wwrite-strings -ansi -pedantic
+ 
+ MY_ABI=6
+ MY_DIR=/usr
++BINDIR=$(MY_DIR)/bin
++LIBDIR=$(MY_DIR)/lib/$(DEB_HOST_MULTIARCH)
+ MYDATA=/usr/local/ncurses/share/terminfo
+ NORMAL_DIR=$(CURDIR)/debian/ncurses$(MY_ABI)
+ THREAD_DIR=$(CURDIR)/debian/ncursest$(MY_ABI)
+@@ -28,7 +31,7 @@
+ LDFLAGS  = $(shell dpkg-buildflags --get LDFLAGS)
+ 
+ ifneq ($(MY_DIR),/usr)
+-	RPATH_ENV = RPATH_LIST=../lib:$(MY_DIR)/lib
++	RPATH_ENV = RPATH_LIST=../lib:$(LIBDIR)
+ 	RPATH_OPT = --enable-rpath
+ else
+ 	RPATH_ENV =
+@@ -54,6 +57,7 @@
+ 		--host=$(DEB_HOST_GNU_TYPE) \
+ 		--build=$(DEB_BUILD_GNU_TYPE) \
+ 		--prefix=$(MY_DIR) \
++		--libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH) \
+ 		--disable-echo \
+ 		--disable-getcap \
+ 		--disable-leaks \
+@@ -182,9 +186,9 @@
+ 	dh_prep        $(verbose) -pncurses6
+ 
+ 	$(MAKE) -C t/ncurses6 install.libs install.progs DESTDIR=$(NCURSES6_DIR)
+-	$(MAKE) -C t/ncurses6/test ncurses LOCAL_LIBDIR=$(MY_DIR)/lib
++	$(MAKE) -C t/ncurses6/test ncurses LOCAL_LIBDIR=$(LIBDIR)
+ 
+-	mv t/ncurses6/test/ncurses $(NCURSES6_DIR)$(MY_DIR)/bin/ncurses$(MY_ABI)
++	mv t/ncurses6/test/ncurses $(NCURSES6_DIR)$(BINDIR)/ncurses$(MY_ABI)
+ 
+ 	touch $@
+ 
+@@ -195,9 +199,9 @@
+ 	dh_prep        $(verbose) -pncursest6
+ 
+ 	$(MAKE) -C t/ncursest6 install.libs install.progs DESTDIR=$(NCURSEST6_DIR)
+-	$(MAKE) -C t/ncursest6/test ncurses LOCAL_LIBDIR=$(MY_DIR)/lib
++	$(MAKE) -C t/ncursest6/test ncurses LOCAL_LIBDIR=$(LIBDIR)
+ 
+-	mv t/ncursest6/test/ncurses $(NCURSEST6_DIR)$(MY_DIR)/bin/ncursest$(MY_ABI)
++	mv t/ncursest6/test/ncurses $(NCURSEST6_DIR)$(BINDIR)/ncursest$(MY_ABI)
+ 
+ 	touch $@
+ 
+Index: package/mingw-ncurses.nsi
+Prereq:  1.492 
+--- ncurses-6.3-20211115+/package/mingw-ncurses.nsi	2021-11-15 23:51:41.000000000 +0000
++++ ncurses-6.3-20211120/package/mingw-ncurses.nsi	2021-11-20 12:06:33.000000000 +0000
+@@ -1,4 +1,4 @@
+-; $Id: mingw-ncurses.nsi,v 1.492 2021/11/15 23:51:41 tom Exp $

++; $Id: mingw-ncurses.nsi,v 1.493 2021/11/20 12:06:33 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  "2021"

+-!define VERSION_MMDD  "1115"

++!define VERSION_MMDD  "1120"

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

+ 

+ !define MY_ABI   "5"

+Index: package/mingw-ncurses.spec
+--- ncurses-6.3-20211115+/package/mingw-ncurses.spec	2021-11-15 23:51:41.000000000 +0000
++++ ncurses-6.3-20211120/package/mingw-ncurses.spec	2021-11-20 12:06:33.000000000 +0000
+@@ -3,7 +3,7 @@
+ Summary: shared libraries for terminal handling
+ Name: mingw32-ncurses6
+ Version: 6.3
+-Release: 20211115
++Release: 20211120
+ License: X11
+ Group: Development/Libraries
+ Source: ncurses-%{version}-%{release}.tgz
+Index: package/ncurses.spec
+--- ncurses-6.3-20211115+/package/ncurses.spec	2021-11-15 23:51:41.000000000 +0000
++++ ncurses-6.3-20211120/package/ncurses.spec	2021-11-20 12:06:33.000000000 +0000
+@@ -1,7 +1,7 @@
+ Summary: shared libraries for terminal handling
+ Name: ncurses6
+ Version: 6.3
+-Release: 20211115
++Release: 20211120
+ License: X11
+ Group: Development/Libraries
+ Source: ncurses-%{version}-%{release}.tgz
+Index: package/ncursest.spec
+--- ncurses-6.3-20211115+/package/ncursest.spec	2021-11-15 23:51:41.000000000 +0000
++++ ncurses-6.3-20211120/package/ncursest.spec	2021-11-20 12:06:33.000000000 +0000
+@@ -1,7 +1,7 @@
+ Summary: Curses library with POSIX thread support.
+ Name: ncursest6
+ Version: 6.3
+-Release: 20211115
++Release: 20211120
+ License: X11
+ Group: Development/Libraries
+ Source: ncurses-%{version}-%{release}.tgz