summaryrefslogtreecommitdiff
path: root/patches/ncurses/6.0/180-ncurses-6.0-20151017.patch
diff options
context:
space:
mode:
Diffstat (limited to 'patches/ncurses/6.0/180-ncurses-6.0-20151017.patch')
-rw-r--r--patches/ncurses/6.0/180-ncurses-6.0-20151017.patch23170
1 files changed, 23170 insertions, 0 deletions
diff --git a/patches/ncurses/6.0/180-ncurses-6.0-20151017.patch b/patches/ncurses/6.0/180-ncurses-6.0-20151017.patch
new file mode 100644
index 0000000..6bb1cd3
--- /dev/null
+++ b/patches/ncurses/6.0/180-ncurses-6.0-20151017.patch
@@ -0,0 +1,23170 @@
+# ncurses 6.0 - patch 20151017 - Thomas E. Dickey
+#
+# ------------------------------------------------------------------------------
+#
+# Ncurses 6.0 is at
+# ftp.gnu.org:/pub/gnu
+#
+# Patches for ncurses 6.0 can be found at
+# ftp://invisible-island.net/ncurses/6.0
+# http://invisible-mirror.net/archives/ncurses/6.0
+#
+# ------------------------------------------------------------------------------
+# ftp://invisible-island.net/ncurses/6.0/ncurses-6.0-20151017.patch.gz
+# patch by Thomas E. Dickey <dickey@invisible-island.net>
+# created Sun Oct 18 00:40:46 UTC 2015
+# ------------------------------------------------------------------------------
+# Ada95/aclocal.m4 | 15
+# Ada95/configure | 977 +++++------
+# NEWS | 16
+# VERSION | 2
+# aclocal.m4 | 27
+# c++/Makefile.in | 4
+# configure | 3156 ++++++++++++++++++-------------------
+# configure.in | 15
+# dist.mk | 4
+# ncurses/Makefile.in | 4
+# ncurses/base/lib_color.c | 4
+# ncurses/base/lib_mouse.c | 4
+# package/debian-mingw/changelog | 4
+# package/debian-mingw64/changelog | 4
+# package/debian/changelog | 4
+# package/mingw-ncurses.nsi | 4
+# package/mingw-ncurses.spec | 2
+# package/ncurses.spec | 2
+# test/aclocal.m4 | 7
+# test/configure | 2585 +++++++++++++++---------------
+# 20 files changed, 3457 insertions(+), 3383 deletions(-)
+# ------------------------------------------------------------------------------
+Index: Ada95/aclocal.m4
+Prereq: 1.107
+--- ncurses-6.0-20151010+/Ada95/aclocal.m4 2015-10-10 19:52:33.000000000 +0000
++++ ncurses-6.0-20151017/Ada95/aclocal.m4 2015-10-17 23:07:06.000000000 +0000
+@@ -28,7 +28,7 @@
+ dnl
+ dnl Author: Thomas E. Dickey
+ dnl
+-dnl $Id: aclocal.m4,v 1.107 2015/10/10 19:52:33 tom Exp $
++dnl $Id: aclocal.m4,v 1.108 2015/10/17 23:07:06 tom Exp $
+ dnl Macros used in NCURSES Ada95 auto-configuration script.
+ dnl
+ dnl These macros are maintained separately from NCURSES. The copyright on
+@@ -1755,7 +1755,7 @@
+ $1="$cf_library_path_list [$]$1"
+ ])dnl
+ dnl ---------------------------------------------------------------------------
+-dnl CF_LIB_PREFIX version: 11 updated: 2015/04/18 08:56:57
++dnl CF_LIB_PREFIX version: 12 updated: 2015/10/17 19:03:33
+ dnl -------------
+ dnl Compute the library-prefix for the given host system
+ dnl $1 = variable to set
+@@ -1763,7 +1763,11 @@
+ [
+ case $cf_cv_system_name in
+ (OS/2*|os2*)
+- LIB_PREFIX=''
++ if test "$DFT_LWR_MODEL" = libtool; then
++ LIB_PREFIX='lib'
++ else
++ LIB_PREFIX=''
++ fi
+ ;;
+ (*) LIB_PREFIX='lib'
+ ;;
+@@ -3849,7 +3853,7 @@
+ ])
+ ])dnl
+ dnl ---------------------------------------------------------------------------
+-dnl CF_XOPEN_SOURCE version: 49 updated: 2015/04/12 15:39:00
++dnl CF_XOPEN_SOURCE version: 50 updated: 2015/10/17 19:03:33
+ dnl ---------------
+ dnl Try to get _XOPEN_SOURCE defined properly that we can use POSIX functions,
+ dnl or adapt to the vendor's definitions to get equivalent functionality,
+@@ -3919,6 +3923,9 @@
+ (openbsd*)
+ # setting _XOPEN_SOURCE breaks xterm on OpenBSD 2.8, is not needed for ncursesw
+ ;;
++(os2*)
++ cf_XOPEN_SOURCE=
++ ;;
+ (osf[[45]]*)
+ cf_xopen_source="-D_OSF_SOURCE"
+ ;;
+Index: Ada95/configure
+--- ncurses-6.0-20151010+/Ada95/configure 2015-10-10 19:53:00.000000000 +0000
++++ ncurses-6.0-20151017/Ada95/configure 2015-10-17 23:07:23.000000000 +0000
+@@ -8943,7 +8943,11 @@
+
+ case $cf_cv_system_name in
+ (OS/2*|os2*)
+- LIB_PREFIX=''
++ if test "$DFT_LWR_MODEL" = libtool; then
++ LIB_PREFIX='lib'
++ else
++ LIB_PREFIX=''
++ fi
+ ;;
+ (*) LIB_PREFIX='lib'
+ ;;
+@@ -8966,7 +8970,7 @@
+ test -n "$GCC" && test "${ac_cv_prog_cc_g}" != yes && CC_G_OPT=''
+ fi
+
+-echo "$as_me:8969: checking for default loader flags" >&5
++echo "$as_me:8973: 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='' ;;
+@@ -8974,11 +8978,11 @@
+ (profile) LD_MODEL='-pg';;
+ (shared) LD_MODEL='' ;;
+ esac
+-echo "$as_me:8977: result: $LD_MODEL" >&5
++echo "$as_me:8981: result: $LD_MODEL" >&5
+ echo "${ECHO_T}$LD_MODEL" >&6
+
+ LD_RPATH_OPT=
+-echo "$as_me:8981: checking for an rpath option" >&5
++echo "$as_me:8985: checking for an rpath option" >&5
+ echo $ECHO_N "checking for an rpath option... $ECHO_C" >&6
+ case $cf_cv_system_name in
+ (irix*)
+@@ -9009,12 +9013,12 @@
+ (*)
+ ;;
+ esac
+-echo "$as_me:9012: result: $LD_RPATH_OPT" >&5
++echo "$as_me:9016: result: $LD_RPATH_OPT" >&5
+ echo "${ECHO_T}$LD_RPATH_OPT" >&6
+
+ case "x$LD_RPATH_OPT" in
+ (x-R*)
+- echo "$as_me:9017: checking if we need a space after rpath option" >&5
++ echo "$as_me:9021: 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"
+
+@@ -9035,7 +9039,7 @@
+ LIBS="$cf_add_libs"
+
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 9038 "configure"
++#line 9042 "configure"
+ #include "confdefs.h"
+
+ int
+@@ -9047,16 +9051,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:9050: \"$ac_link\"") >&5
++if { (eval echo "$as_me:9054: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:9053: \$? = $ac_status" >&5
++ echo "$as_me:9057: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -s conftest$ac_exeext'
+- { (eval echo "$as_me:9056: \"$ac_try\"") >&5
++ { (eval echo "$as_me:9060: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:9059: \$? = $ac_status" >&5
++ echo "$as_me:9063: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ cf_rpath_space=no
+ else
+@@ -9066,7 +9070,7 @@
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ LIBS="$cf_save_LIBS"
+- echo "$as_me:9069: result: $cf_rpath_space" >&5
++ echo "$as_me:9073: result: $cf_rpath_space" >&5
+ echo "${ECHO_T}$cf_rpath_space" >&6
+ test "$cf_rpath_space" = yes && LD_RPATH_OPT="$LD_RPATH_OPT "
+ ;;
+@@ -9087,7 +9091,7 @@
+ cf_ld_rpath_opt=
+ test "$cf_cv_enable_rpath" = yes && cf_ld_rpath_opt="$LD_RPATH_OPT"
+
+- echo "$as_me:9090: checking if release/abi version should be used for shared libs" >&5
++ echo "$as_me:9094: 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.
+@@ -9102,9 +9106,9 @@
+ cf_cv_shlib_version=$withval
+ ;;
+ (*)
+- echo "$as_me:9105: result: $withval" >&5
++ echo "$as_me:9109: result: $withval" >&5
+ echo "${ECHO_T}$withval" >&6
+- { { echo "$as_me:9107: error: option value must be one of: rel, abi, or auto" >&5
++ { { echo "$as_me:9111: 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; }; }
+ ;;
+@@ -9113,7 +9117,7 @@
+ else
+ cf_cv_shlib_version=auto
+ fi;
+- echo "$as_me:9116: result: $cf_cv_shlib_version" >&5
++ echo "$as_me:9120: result: $cf_cv_shlib_version" >&5
+ echo "${ECHO_T}$cf_cv_shlib_version" >&6
+
+ cf_cv_rm_so_locs=no
+@@ -9123,14 +9127,14 @@
+ CC_SHARED_OPTS=
+ if test "$GCC" = yes
+ then
+- echo "$as_me:9126: checking which $CC option to use" >&5
++ echo "$as_me:9130: 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 9133 "configure"
++#line 9137 "configure"
+ #include "confdefs.h"
+ #include <stdio.h>
+ int
+@@ -9142,16 +9146,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:9145: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:9149: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:9148: \$? = $ac_status" >&5
++ echo "$as_me:9152: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:9151: \"$ac_try\"") >&5
++ { (eval echo "$as_me:9155: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:9154: \$? = $ac_status" >&5
++ echo "$as_me:9158: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ break
+ else
+@@ -9160,7 +9164,7 @@
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ done
+- echo "$as_me:9163: result: $CC_SHARED_OPTS" >&5
++ echo "$as_me:9167: result: $CC_SHARED_OPTS" >&5
+ echo "${ECHO_T}$CC_SHARED_OPTS" >&6
+ CFLAGS="$cf_save_CFLAGS"
+ fi
+@@ -9231,7 +9235,7 @@
+ MK_SHARED_LIB='${CC} ${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:9234: checking if ld -search_paths_first works" >&5
++ echo "$as_me:9238: 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
+@@ -9240,7 +9244,7 @@
+ cf_save_LDFLAGS=$LDFLAGS
+ LDFLAGS="$LDFLAGS -Wl,-search_paths_first"
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 9243 "configure"
++#line 9247 "configure"
+ #include "confdefs.h"
+
+ int
+@@ -9252,16 +9256,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:9255: \"$ac_link\"") >&5
++if { (eval echo "$as_me:9259: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:9258: \$? = $ac_status" >&5
++ echo "$as_me:9262: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -s conftest$ac_exeext'
+- { (eval echo "$as_me:9261: \"$ac_try\"") >&5
++ { (eval echo "$as_me:9265: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:9264: \$? = $ac_status" >&5
++ echo "$as_me:9268: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ cf_cv_ldflags_search_paths_first=yes
+ else
+@@ -9272,7 +9276,7 @@
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ LDFLAGS=$cf_save_LDFLAGS
+ fi
+-echo "$as_me:9275: result: $cf_cv_ldflags_search_paths_first" >&5
++echo "$as_me:9279: 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"
+@@ -9497,7 +9501,7 @@
+ do
+ CFLAGS="$cf_shared_opts $cf_save_CFLAGS"
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 9500 "configure"
++#line 9504 "configure"
+ #include "confdefs.h"
+ #include <stdio.h>
+ int
+@@ -9509,16 +9513,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:9512: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:9516: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:9515: \$? = $ac_status" >&5
++ echo "$as_me:9519: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:9518: \"$ac_try\"") >&5
++ { (eval echo "$as_me:9522: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:9521: \$? = $ac_status" >&5
++ echo "$as_me:9525: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ break
+ else
+@@ -9555,7 +9559,7 @@
+ test "$cf_cv_do_symlinks" = no && cf_cv_do_symlinks=yes
+ ;;
+ (*)
+- { echo "$as_me:9558: WARNING: ignored --with-shlib-version" >&5
++ { echo "$as_me:9562: WARNING: ignored --with-shlib-version" >&5
+ echo "$as_me: WARNING: ignored --with-shlib-version" >&2;}
+ ;;
+ esac
+@@ -9565,7 +9569,7 @@
+ if test -n "$cf_try_cflags"
+ then
+ cat > conftest.$ac_ext <<EOF
+-#line 9568 "${as_me:-configure}"
++#line 9572 "${as_me:-configure}"
+ #include <stdio.h>
+ int main(int argc, char *argv[])
+ {
+@@ -9577,18 +9581,18 @@
+ for cf_opt in $cf_try_cflags
+ do
+ CFLAGS="$cf_save_CFLAGS -$cf_opt"
+- echo "$as_me:9580: checking if CFLAGS option -$cf_opt works" >&5
++ echo "$as_me:9584: 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:9582: \"$ac_compile\"") >&5
++ if { (eval echo "$as_me:9586: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:9585: \$? = $ac_status" >&5
++ echo "$as_me:9589: \$? = $ac_status" >&5
+ (exit $ac_status); }; then
+- echo "$as_me:9587: result: yes" >&5
++ echo "$as_me:9591: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ cf_save_CFLAGS="$CFLAGS"
+ else
+- echo "$as_me:9591: result: no" >&5
++ echo "$as_me:9595: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ done
+@@ -9603,17 +9607,17 @@
+
+ test -n "$verbose" && echo " CC_SHARED_OPTS: $CC_SHARED_OPTS" 1>&6
+
+-echo "${as_me:-configure}:9606: testing CC_SHARED_OPTS: $CC_SHARED_OPTS ..." 1>&5
++echo "${as_me:-configure}:9610: 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}:9610: testing MK_SHARED_LIB: $MK_SHARED_LIB ..." 1>&5
++echo "${as_me:-configure}:9614: 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:9616: checking if you want to link sample programs with rpath option" >&5
++ echo "$as_me:9620: 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.
+@@ -9623,7 +9627,7 @@
+ else
+ with_rpath_link=yes
+ fi;
+- echo "$as_me:9626: result: $with_rpath_link" >&5
++ echo "$as_me:9630: result: $with_rpath_link" >&5
+ echo "${ECHO_T}$with_rpath_link" >&6
+ if test "$with_rpath_link" = no
+ then
+@@ -9635,7 +9639,7 @@
+ ###############################################################################
+
+ ### use option --enable-broken-linker to force on use of broken-linker support
+-echo "$as_me:9638: checking if you want broken-linker support code" >&5
++echo "$as_me:9642: 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.
+@@ -9645,7 +9649,7 @@
+ else
+ with_broken_linker=${BROKEN_LINKER:-no}
+ fi;
+-echo "$as_me:9648: result: $with_broken_linker" >&5
++echo "$as_me:9652: result: $with_broken_linker" >&5
+ echo "${ECHO_T}$with_broken_linker" >&6
+
+ BROKEN_LINKER=0
+@@ -9665,7 +9669,7 @@
+ BROKEN_LINKER=1
+ test -n "$verbose" && echo " cygwin linker is broken anyway" 1>&6
+
+-echo "${as_me:-configure}:9668: testing cygwin linker is broken anyway ..." 1>&5
++echo "${as_me:-configure}:9672: testing cygwin linker is broken anyway ..." 1>&5
+
+ ;;
+ esac
+@@ -9711,14 +9715,14 @@
+ ;;
+ (linux*|gnu*|mint*|k*bsd*-gnu)
+
+-echo "$as_me:9714: checking if we must define _GNU_SOURCE" >&5
++echo "$as_me:9718: 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 9721 "configure"
++#line 9725 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ int
+@@ -9733,16 +9737,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:9736: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:9740: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:9739: \$? = $ac_status" >&5
++ echo "$as_me:9743: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:9742: \"$ac_try\"") >&5
++ { (eval echo "$as_me:9746: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:9745: \$? = $ac_status" >&5
++ echo "$as_me:9749: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ cf_cv_gnu_source=no
+ else
+@@ -9751,7 +9755,7 @@
+ cf_save="$CPPFLAGS"
+ CPPFLAGS="$CPPFLAGS -D_GNU_SOURCE"
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 9754 "configure"
++#line 9758 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ int
+@@ -9766,16 +9770,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:9769: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:9773: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:9772: \$? = $ac_status" >&5
++ echo "$as_me:9776: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:9775: \"$ac_try\"") >&5
++ { (eval echo "$as_me:9779: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:9778: \$? = $ac_status" >&5
++ echo "$as_me:9782: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ cf_cv_gnu_source=no
+ else
+@@ -9790,7 +9794,7 @@
+ rm -f conftest.$ac_objext conftest.$ac_ext
+
+ fi
+-echo "$as_me:9793: result: $cf_cv_gnu_source" >&5
++echo "$as_me:9797: result: $cf_cv_gnu_source" >&5
+ echo "${ECHO_T}$cf_cv_gnu_source" >&6
+ test "$cf_cv_gnu_source" = yes && CPPFLAGS="$CPPFLAGS -D_GNU_SOURCE"
+
+@@ -9815,16 +9819,16 @@
+ sed -e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ ]*\)\?[ ]/ /g' \
+ -e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ ]*\)\?$//g'`
+
+-echo "$as_me:9818: checking if we should define _POSIX_C_SOURCE" >&5
++echo "$as_me:9822: 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}:9824: testing if the symbol is already defined go no further ..." 1>&5
++echo "${as_me:-configure}:9828: testing if the symbol is already defined go no further ..." 1>&5
+
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 9827 "configure"
++#line 9831 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ int
+@@ -9839,16 +9843,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:9842: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:9846: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:9845: \$? = $ac_status" >&5
++ echo "$as_me:9849: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:9848: \"$ac_try\"") >&5
++ { (eval echo "$as_me:9852: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:9851: \$? = $ac_status" >&5
++ echo "$as_me:9855: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ cf_cv_posix_c_source=no
+ else
+@@ -9869,7 +9873,7 @@
+ esac
+ if test "$cf_want_posix_source" = yes ; then
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 9872 "configure"
++#line 9876 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ int
+@@ -9884,16 +9888,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:9887: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:9891: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:9890: \$? = $ac_status" >&5
++ echo "$as_me:9894: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:9893: \"$ac_try\"") >&5
++ { (eval echo "$as_me:9897: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:9896: \$? = $ac_status" >&5
++ echo "$as_me:9900: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ :
+ else
+@@ -9904,15 +9908,15 @@
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ fi
+
+-echo "${as_me:-configure}:9907: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
++echo "${as_me:-configure}:9911: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
+
+ CFLAGS="$cf_trim_CFLAGS"
+ CPPFLAGS="$cf_trim_CPPFLAGS $cf_cv_posix_c_source"
+
+-echo "${as_me:-configure}:9912: testing if the second compile does not leave our definition intact error ..." 1>&5
++echo "${as_me:-configure}:9916: testing if the second compile does not leave our definition intact error ..." 1>&5
+
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 9915 "configure"
++#line 9919 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ int
+@@ -9927,16 +9931,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:9930: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:9934: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:9933: \$? = $ac_status" >&5
++ echo "$as_me:9937: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:9936: \"$ac_try\"") >&5
++ { (eval echo "$as_me:9940: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:9939: \$? = $ac_status" >&5
++ echo "$as_me:9943: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ :
+ else
+@@ -9952,7 +9956,7 @@
+ rm -f conftest.$ac_objext conftest.$ac_ext
+
+ fi
+-echo "$as_me:9955: result: $cf_cv_posix_c_source" >&5
++echo "$as_me:9959: 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
+@@ -10051,6 +10055,9 @@
+ (openbsd*)
+ # setting _XOPEN_SOURCE breaks xterm on OpenBSD 2.8, is not needed for ncursesw
+ ;;
++(os2*)
++ cf_XOPEN_SOURCE=
++ ;;
+ (osf[45]*)
+ cf_xopen_source="-D_OSF_SOURCE"
+ ;;
+@@ -10070,14 +10077,14 @@
+ ;;
+ (*)
+
+-echo "$as_me:10073: checking if we should define _XOPEN_SOURCE" >&5
++echo "$as_me:10080: 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 10080 "configure"
++#line 10087 "configure"
+ #include "confdefs.h"
+
+ #include <stdlib.h>
+@@ -10096,16 +10103,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:10099: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:10106: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:10102: \$? = $ac_status" >&5
++ echo "$as_me:10109: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:10105: \"$ac_try\"") >&5
++ { (eval echo "$as_me:10112: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:10108: \$? = $ac_status" >&5
++ echo "$as_me:10115: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ cf_cv_xopen_source=no
+ else
+@@ -10114,7 +10121,7 @@
+ cf_save="$CPPFLAGS"
+ CPPFLAGS="$CPPFLAGS -D_XOPEN_SOURCE=$cf_XOPEN_SOURCE"
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 10117 "configure"
++#line 10124 "configure"
+ #include "confdefs.h"
+
+ #include <stdlib.h>
+@@ -10133,16 +10140,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:10136: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:10143: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:10139: \$? = $ac_status" >&5
++ echo "$as_me:10146: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:10142: \"$ac_try\"") >&5
++ { (eval echo "$as_me:10149: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:10145: \$? = $ac_status" >&5
++ echo "$as_me:10152: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ cf_cv_xopen_source=no
+ else
+@@ -10157,7 +10164,7 @@
+ rm -f conftest.$ac_objext conftest.$ac_ext
+
+ fi
+-echo "$as_me:10160: result: $cf_cv_xopen_source" >&5
++echo "$as_me:10167: result: $cf_cv_xopen_source" >&5
+ echo "${ECHO_T}$cf_cv_xopen_source" >&6
+
+ if test "$cf_cv_xopen_source" != no ; then
+@@ -10265,16 +10272,16 @@
+ sed -e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ ]*\)\?[ ]/ /g' \
+ -e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ ]*\)\?$//g'`
+
+-echo "$as_me:10268: checking if we should define _POSIX_C_SOURCE" >&5
++echo "$as_me:10275: 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}:10274: testing if the symbol is already defined go no further ..." 1>&5
++echo "${as_me:-configure}:10281: testing if the symbol is already defined go no further ..." 1>&5
+
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 10277 "configure"
++#line 10284 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ int
+@@ -10289,16 +10296,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:10292: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:10299: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:10295: \$? = $ac_status" >&5
++ echo "$as_me:10302: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:10298: \"$ac_try\"") >&5
++ { (eval echo "$as_me:10305: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:10301: \$? = $ac_status" >&5
++ echo "$as_me:10308: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ cf_cv_posix_c_source=no
+ else
+@@ -10319,7 +10326,7 @@
+ esac
+ if test "$cf_want_posix_source" = yes ; then
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 10322 "configure"
++#line 10329 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ int
+@@ -10334,16 +10341,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:10337: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:10344: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:10340: \$? = $ac_status" >&5
++ echo "$as_me:10347: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:10343: \"$ac_try\"") >&5
++ { (eval echo "$as_me:10350: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:10346: \$? = $ac_status" >&5
++ echo "$as_me:10353: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ :
+ else
+@@ -10354,15 +10361,15 @@
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ fi
+
+-echo "${as_me:-configure}:10357: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
++echo "${as_me:-configure}:10364: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
+
+ CFLAGS="$cf_trim_CFLAGS"
+ CPPFLAGS="$cf_trim_CPPFLAGS $cf_cv_posix_c_source"
+
+-echo "${as_me:-configure}:10362: testing if the second compile does not leave our definition intact error ..." 1>&5
++echo "${as_me:-configure}:10369: testing if the second compile does not leave our definition intact error ..." 1>&5
+
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 10365 "configure"
++#line 10372 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ int
+@@ -10377,16 +10384,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:10380: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:10387: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:10383: \$? = $ac_status" >&5
++ echo "$as_me:10390: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:10386: \"$ac_try\"") >&5
++ { (eval echo "$as_me:10393: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:10389: \$? = $ac_status" >&5
++ echo "$as_me:10396: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ :
+ else
+@@ -10402,7 +10409,7 @@
+ rm -f conftest.$ac_objext conftest.$ac_ext
+
+ fi
+-echo "$as_me:10405: result: $cf_cv_posix_c_source" >&5
++echo "$as_me:10412: 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
+@@ -10560,7 +10567,7 @@
+ if test -n "$cf_new_cflags" ; then
+ test -n "$verbose" && echo " add to \$CFLAGS $cf_new_cflags" 1>&6
+
+-echo "${as_me:-configure}:10563: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
++echo "${as_me:-configure}:10570: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
+
+ CFLAGS="$CFLAGS $cf_new_cflags"
+ fi
+@@ -10568,7 +10575,7 @@
+ if test -n "$cf_new_cppflags" ; then
+ test -n "$verbose" && echo " add to \$CPPFLAGS $cf_new_cppflags" 1>&6
+
+-echo "${as_me:-configure}:10571: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
++echo "${as_me:-configure}:10578: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
+
+ CPPFLAGS="$CPPFLAGS $cf_new_cppflags"
+ fi
+@@ -10576,7 +10583,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}:10579: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5
++echo "${as_me:-configure}:10586: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5
+
+ EXTRA_CPPFLAGS="$cf_new_extra_cppflags $EXTRA_CPPFLAGS"
+ fi
+@@ -10584,10 +10591,10 @@
+ fi
+
+ if test -n "$cf_XOPEN_SOURCE" && test -z "$cf_cv_xopen_source" ; then
+- echo "$as_me:10587: checking if _XOPEN_SOURCE really is set" >&5
++ echo "$as_me:10594: 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 10590 "configure"
++#line 10597 "configure"
+ #include "confdefs.h"
+ #include <stdlib.h>
+ int
+@@ -10602,16 +10609,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:10605: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:10612: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:10608: \$? = $ac_status" >&5
++ echo "$as_me:10615: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:10611: \"$ac_try\"") >&5
++ { (eval echo "$as_me:10618: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:10614: \$? = $ac_status" >&5
++ echo "$as_me:10621: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ cf_XOPEN_SOURCE_set=yes
+ else
+@@ -10620,12 +10627,12 @@
+ cf_XOPEN_SOURCE_set=no
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+- echo "$as_me:10623: result: $cf_XOPEN_SOURCE_set" >&5
++ echo "$as_me:10630: 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 10628 "configure"
++#line 10635 "configure"
+ #include "confdefs.h"
+ #include <stdlib.h>
+ int
+@@ -10640,16 +10647,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:10643: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:10650: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:10646: \$? = $ac_status" >&5
++ echo "$as_me:10653: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:10649: \"$ac_try\"") >&5
++ { (eval echo "$as_me:10656: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:10652: \$? = $ac_status" >&5
++ echo "$as_me:10659: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ cf_XOPEN_SOURCE_set_ok=yes
+ else
+@@ -10660,19 +10667,19 @@
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ if test $cf_XOPEN_SOURCE_set_ok = no
+ then
+- { echo "$as_me:10663: WARNING: _XOPEN_SOURCE is lower than requested" >&5
++ { echo "$as_me:10670: WARNING: _XOPEN_SOURCE is lower than requested" >&5
+ echo "$as_me: WARNING: _XOPEN_SOURCE is lower than requested" >&2;}
+ fi
+ else
+
+-echo "$as_me:10668: checking if we should define _XOPEN_SOURCE" >&5
++echo "$as_me:10675: 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 10675 "configure"
++#line 10682 "configure"
+ #include "confdefs.h"
+
+ #include <stdlib.h>
+@@ -10691,16 +10698,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:10694: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:10701: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:10697: \$? = $ac_status" >&5
++ echo "$as_me:10704: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:10700: \"$ac_try\"") >&5
++ { (eval echo "$as_me:10707: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:10703: \$? = $ac_status" >&5
++ echo "$as_me:10710: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ cf_cv_xopen_source=no
+ else
+@@ -10709,7 +10716,7 @@
+ cf_save="$CPPFLAGS"
+ CPPFLAGS="$CPPFLAGS -D_XOPEN_SOURCE=$cf_XOPEN_SOURCE"
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 10712 "configure"
++#line 10719 "configure"
+ #include "confdefs.h"
+
+ #include <stdlib.h>
+@@ -10728,16 +10735,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:10731: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:10738: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:10734: \$? = $ac_status" >&5
++ echo "$as_me:10741: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:10737: \"$ac_try\"") >&5
++ { (eval echo "$as_me:10744: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:10740: \$? = $ac_status" >&5
++ echo "$as_me:10747: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ cf_cv_xopen_source=no
+ else
+@@ -10752,7 +10759,7 @@
+ rm -f conftest.$ac_objext conftest.$ac_ext
+
+ fi
+-echo "$as_me:10755: result: $cf_cv_xopen_source" >&5
++echo "$as_me:10762: result: $cf_cv_xopen_source" >&5
+ echo "${ECHO_T}$cf_cv_xopen_source" >&6
+
+ if test "$cf_cv_xopen_source" != no ; then
+@@ -10857,7 +10864,7 @@
+ fi;
+ if test "$enable_largefile" != no; then
+
+- echo "$as_me:10860: checking for special C compiler options needed for large files" >&5
++ echo "$as_me:10867: 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
+@@ -10869,7 +10876,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 10872 "configure"
++#line 10879 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ /* Check that off_t can represent 2**63 - 1 correctly.
+@@ -10889,16 +10896,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:10892: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:10899: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:10895: \$? = $ac_status" >&5
++ echo "$as_me:10902: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:10898: \"$ac_try\"") >&5
++ { (eval echo "$as_me:10905: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:10901: \$? = $ac_status" >&5
++ echo "$as_me:10908: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ break
+ else
+@@ -10908,16 +10915,16 @@
+ rm -f conftest.$ac_objext
+ CC="$CC -n32"
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:10911: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:10918: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:10914: \$? = $ac_status" >&5
++ echo "$as_me:10921: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:10917: \"$ac_try\"") >&5
++ { (eval echo "$as_me:10924: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:10920: \$? = $ac_status" >&5
++ echo "$as_me:10927: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ ac_cv_sys_largefile_CC=' -n32'; break
+ else
+@@ -10931,13 +10938,13 @@
+ rm -f conftest.$ac_ext
+ fi
+ fi
+-echo "$as_me:10934: result: $ac_cv_sys_largefile_CC" >&5
++echo "$as_me:10941: 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:10940: checking for _FILE_OFFSET_BITS value needed for large files" >&5
++ echo "$as_me:10947: 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
+@@ -10945,7 +10952,7 @@
+ while :; do
+ ac_cv_sys_file_offset_bits=no
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 10948 "configure"
++#line 10955 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ /* Check that off_t can represent 2**63 - 1 correctly.
+@@ -10965,16 +10972,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:10968: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:10975: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:10971: \$? = $ac_status" >&5
++ echo "$as_me:10978: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:10974: \"$ac_try\"") >&5
++ { (eval echo "$as_me:10981: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:10977: \$? = $ac_status" >&5
++ echo "$as_me:10984: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ break
+ else
+@@ -10983,7 +10990,7 @@
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 10986 "configure"
++#line 10993 "configure"
+ #include "confdefs.h"
+ #define _FILE_OFFSET_BITS 64
+ #include <sys/types.h>
+@@ -11004,16 +11011,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:11007: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:11014: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:11010: \$? = $ac_status" >&5
++ echo "$as_me:11017: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:11013: \"$ac_try\"") >&5
++ { (eval echo "$as_me:11020: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:11016: \$? = $ac_status" >&5
++ echo "$as_me:11023: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ ac_cv_sys_file_offset_bits=64; break
+ else
+@@ -11024,7 +11031,7 @@
+ break
+ done
+ fi
+-echo "$as_me:11027: result: $ac_cv_sys_file_offset_bits" >&5
++echo "$as_me:11034: 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
+
+@@ -11034,7 +11041,7 @@
+
+ fi
+ rm -rf conftest*
+- echo "$as_me:11037: checking for _LARGE_FILES value needed for large files" >&5
++ echo "$as_me:11044: 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
+@@ -11042,7 +11049,7 @@
+ while :; do
+ ac_cv_sys_large_files=no
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 11045 "configure"
++#line 11052 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ /* Check that off_t can represent 2**63 - 1 correctly.
+@@ -11062,16 +11069,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:11065: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:11072: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:11068: \$? = $ac_status" >&5
++ echo "$as_me:11075: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:11071: \"$ac_try\"") >&5
++ { (eval echo "$as_me:11078: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:11074: \$? = $ac_status" >&5
++ echo "$as_me:11081: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ break
+ else
+@@ -11080,7 +11087,7 @@
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 11083 "configure"
++#line 11090 "configure"
+ #include "confdefs.h"
+ #define _LARGE_FILES 1
+ #include <sys/types.h>
+@@ -11101,16 +11108,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:11104: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:11111: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:11107: \$? = $ac_status" >&5
++ echo "$as_me:11114: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:11110: \"$ac_try\"") >&5
++ { (eval echo "$as_me:11117: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:11113: \$? = $ac_status" >&5
++ echo "$as_me:11120: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ ac_cv_sys_large_files=1; break
+ else
+@@ -11121,7 +11128,7 @@
+ break
+ done
+ fi
+-echo "$as_me:11124: result: $ac_cv_sys_large_files" >&5
++echo "$as_me:11131: 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
+
+@@ -11134,7 +11141,7 @@
+ fi
+
+ if test "$enable_largefile" != no ; then
+- echo "$as_me:11137: checking for _LARGEFILE_SOURCE value needed for large files" >&5
++ echo "$as_me:11144: 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
+@@ -11142,7 +11149,7 @@
+ while :; do
+ ac_cv_sys_largefile_source=no
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 11145 "configure"
++#line 11152 "configure"
+ #include "confdefs.h"
+ #include <stdio.h>
+ int
+@@ -11154,16 +11161,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:11157: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:11164: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:11160: \$? = $ac_status" >&5
++ echo "$as_me:11167: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:11163: \"$ac_try\"") >&5
++ { (eval echo "$as_me:11170: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:11166: \$? = $ac_status" >&5
++ echo "$as_me:11173: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ break
+ else
+@@ -11172,7 +11179,7 @@
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 11175 "configure"
++#line 11182 "configure"
+ #include "confdefs.h"
+ #define _LARGEFILE_SOURCE 1
+ #include <stdio.h>
+@@ -11185,16 +11192,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:11188: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:11195: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:11191: \$? = $ac_status" >&5
++ echo "$as_me:11198: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:11194: \"$ac_try\"") >&5
++ { (eval echo "$as_me:11201: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:11197: \$? = $ac_status" >&5
++ echo "$as_me:11204: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ ac_cv_sys_largefile_source=1; break
+ else
+@@ -11205,7 +11212,7 @@
+ break
+ done
+ fi
+-echo "$as_me:11208: result: $ac_cv_sys_largefile_source" >&5
++echo "$as_me:11215: 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
+
+@@ -11219,13 +11226,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:11222: checking for fseeko" >&5
++echo "$as_me:11229: 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 11228 "configure"
++#line 11235 "configure"
+ #include "confdefs.h"
+ #include <stdio.h>
+ int
+@@ -11237,16 +11244,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:11240: \"$ac_link\"") >&5
++if { (eval echo "$as_me:11247: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:11243: \$? = $ac_status" >&5
++ echo "$as_me:11250: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -s conftest$ac_exeext'
+- { (eval echo "$as_me:11246: \"$ac_try\"") >&5
++ { (eval echo "$as_me:11253: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:11249: \$? = $ac_status" >&5
++ echo "$as_me:11256: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ ac_cv_func_fseeko=yes
+ else
+@@ -11256,7 +11263,7 @@
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "$as_me:11259: result: $ac_cv_func_fseeko" >&5
++echo "$as_me:11266: result: $ac_cv_func_fseeko" >&5
+ echo "${ECHO_T}$ac_cv_func_fseeko" >&6
+ if test $ac_cv_func_fseeko = yes; then
+
+@@ -11277,14 +11284,14 @@
+ test "$ac_cv_sys_largefile_source" != no && CPPFLAGS="$CPPFLAGS -D_LARGEFILE_SOURCE "
+ test "$ac_cv_sys_file_offset_bits" != no && CPPFLAGS="$CPPFLAGS -D_FILE_OFFSET_BITS=$ac_cv_sys_file_offset_bits "
+
+- echo "$as_me:11280: checking whether to use struct dirent64" >&5
++ echo "$as_me:11287: 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 11287 "configure"
++#line 11294 "configure"
+ #include "confdefs.h"
+
+ #include <sys/types.h>
+@@ -11305,16 +11312,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:11308: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:11315: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:11311: \$? = $ac_status" >&5
++ echo "$as_me:11318: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:11314: \"$ac_try\"") >&5
++ { (eval echo "$as_me:11321: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:11317: \$? = $ac_status" >&5
++ echo "$as_me:11324: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ cf_cv_struct_dirent64=yes
+ else
+@@ -11325,7 +11332,7 @@
+ rm -f conftest.$ac_objext conftest.$ac_ext
+
+ fi
+-echo "$as_me:11328: result: $cf_cv_struct_dirent64" >&5
++echo "$as_me:11335: result: $cf_cv_struct_dirent64" >&5
+ echo "${ECHO_T}$cf_cv_struct_dirent64" >&6
+ test "$cf_cv_struct_dirent64" = yes &&
+ cat >>confdefs.h <<\EOF
+@@ -11335,7 +11342,7 @@
+ fi
+
+ ### Enable compiling-in rcs id's
+-echo "$as_me:11338: checking if RCS identifiers should be compiled-in" >&5
++echo "$as_me:11345: 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.
+@@ -11345,7 +11352,7 @@
+ else
+ with_rcs_ids=no
+ fi;
+-echo "$as_me:11348: result: $with_rcs_ids" >&5
++echo "$as_me:11355: result: $with_rcs_ids" >&5
+ echo "${ECHO_T}$with_rcs_ids" >&6
+ test "$with_rcs_ids" = yes &&
+ cat >>confdefs.h <<\EOF
+@@ -11355,7 +11362,7 @@
+ ###############################################################################
+
+ ### Note that some functions (such as const) are normally disabled anyway.
+-echo "$as_me:11358: checking if you want to build with function extensions" >&5
++echo "$as_me:11365: 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.
+@@ -11365,7 +11372,7 @@
+ else
+ with_ext_funcs=yes
+ fi;
+-echo "$as_me:11368: result: $with_ext_funcs" >&5
++echo "$as_me:11375: result: $with_ext_funcs" >&5
+ echo "${ECHO_T}$with_ext_funcs" >&6
+ if test "$with_ext_funcs" = yes ; then
+ NCURSES_EXT_FUNCS=1
+@@ -11383,7 +11390,7 @@
+ fi
+
+ ### use option --enable-const to turn on use of const beyond that in XSI.
+-echo "$as_me:11386: checking for extended use of const keyword" >&5
++echo "$as_me:11393: 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.
+@@ -11393,7 +11400,7 @@
+ else
+ with_ext_const=no
+ fi;
+-echo "$as_me:11396: result: $with_ext_const" >&5
++echo "$as_me:11403: result: $with_ext_const" >&5
+ echo "${ECHO_T}$with_ext_const" >&6
+ NCURSES_CONST='/*nothing*/'
+ if test "$with_ext_const" = yes ; then
+@@ -11403,7 +11410,7 @@
+ ###############################################################################
+ # These options are relatively safe to experiment with.
+
+-echo "$as_me:11406: checking if you want all development code" >&5
++echo "$as_me:11413: 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.
+@@ -11413,7 +11420,7 @@
+ else
+ with_develop=no
+ fi;
+-echo "$as_me:11416: result: $with_develop" >&5
++echo "$as_me:11423: result: $with_develop" >&5
+ echo "${ECHO_T}$with_develop" >&6
+
+ ###############################################################################
+@@ -11422,7 +11429,7 @@
+ # This is still experimental (20080329), but should ultimately be moved to
+ # the script-block --with-normal, etc.
+
+-echo "$as_me:11425: checking if you want to link with the pthread library" >&5
++echo "$as_me:11432: 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.
+@@ -11432,27 +11439,27 @@
+ else
+ with_pthread=no
+ fi;
+-echo "$as_me:11435: result: $with_pthread" >&5
++echo "$as_me:11442: result: $with_pthread" >&5
+ echo "${ECHO_T}$with_pthread" >&6
+
+ if test "$with_pthread" != no ; then
+- echo "$as_me:11439: checking for pthread.h" >&5
++ echo "$as_me:11446: 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 11445 "configure"
++#line 11452 "configure"
+ #include "confdefs.h"
+ #include <pthread.h>
+ _ACEOF
+-if { (eval echo "$as_me:11449: \"$ac_cpp conftest.$ac_ext\"") >&5
++if { (eval echo "$as_me:11456: \"$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:11455: \$? = $ac_status" >&5
++ echo "$as_me:11462: \$? = $ac_status" >&5
+ (exit $ac_status); } >/dev/null; then
+ if test -s conftest.err; then
+ ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -11471,7 +11478,7 @@
+ fi
+ rm -f conftest.err conftest.$ac_ext
+ fi
+-echo "$as_me:11474: result: $ac_cv_header_pthread_h" >&5
++echo "$as_me:11481: 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
+
+@@ -11481,7 +11488,7 @@
+
+ for cf_lib_pthread in pthread c_r
+ do
+- echo "$as_me:11484: checking if we can link with the $cf_lib_pthread library" >&5
++ echo "$as_me:11491: 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"
+
+@@ -11502,7 +11509,7 @@
+ LIBS="$cf_add_libs"
+
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 11505 "configure"
++#line 11512 "configure"
+ #include "confdefs.h"
+
+ #include <pthread.h>
+@@ -11519,16 +11526,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:11522: \"$ac_link\"") >&5
++if { (eval echo "$as_me:11529: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:11525: \$? = $ac_status" >&5
++ echo "$as_me:11532: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -s conftest$ac_exeext'
+- { (eval echo "$as_me:11528: \"$ac_try\"") >&5
++ { (eval echo "$as_me:11535: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:11531: \$? = $ac_status" >&5
++ echo "$as_me:11538: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ with_pthread=yes
+ else
+@@ -11538,7 +11545,7 @@
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ LIBS="$cf_save_LIBS"
+- echo "$as_me:11541: result: $with_pthread" >&5
++ echo "$as_me:11548: result: $with_pthread" >&5
+ echo "${ECHO_T}$with_pthread" >&6
+ test "$with_pthread" = yes && break
+ done
+@@ -11566,7 +11573,7 @@
+ EOF
+
+ else
+- { { echo "$as_me:11569: error: Cannot link with pthread library" >&5
++ { { echo "$as_me:11576: error: Cannot link with pthread library" >&5
+ echo "$as_me: error: Cannot link with pthread library" >&2;}
+ { (exit 1); exit 1; }; }
+ fi
+@@ -11575,7 +11582,7 @@
+
+ fi
+
+-echo "$as_me:11578: checking if you want to use weak-symbols for pthreads" >&5
++echo "$as_me:11585: 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.
+@@ -11585,18 +11592,18 @@
+ else
+ use_weak_symbols=no
+ fi;
+-echo "$as_me:11588: result: $use_weak_symbols" >&5
++echo "$as_me:11595: result: $use_weak_symbols" >&5
+ echo "${ECHO_T}$use_weak_symbols" >&6
+ if test "$use_weak_symbols" = yes ; then
+
+-echo "$as_me:11592: checking if $CC supports weak symbols" >&5
++echo "$as_me:11599: 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 11599 "configure"
++#line 11606 "configure"
+ #include "confdefs.h"
+
+ #include <stdio.h>
+@@ -11622,16 +11629,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:11625: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:11632: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:11628: \$? = $ac_status" >&5
++ echo "$as_me:11635: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:11631: \"$ac_try\"") >&5
++ { (eval echo "$as_me:11638: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:11634: \$? = $ac_status" >&5
++ echo "$as_me:11641: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ cf_cv_weak_symbols=yes
+ else
+@@ -11642,7 +11649,7 @@
+ rm -f conftest.$ac_objext conftest.$ac_ext
+
+ fi
+-echo "$as_me:11645: result: $cf_cv_weak_symbols" >&5
++echo "$as_me:11652: result: $cf_cv_weak_symbols" >&5
+ echo "${ECHO_T}$cf_cv_weak_symbols" >&6
+
+ else
+@@ -11671,13 +11678,13 @@
+ fi
+
+ # OpenSUSE is installing ncurses6, using reentrant option.
+-echo "$as_me:11674: checking for _nc_TABSIZE" >&5
++echo "$as_me:11681: 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 11680 "configure"
++#line 11687 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+ which can conflict with char _nc_TABSIZE (); below. */
+@@ -11708,16 +11715,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:11711: \"$ac_link\"") >&5
++if { (eval echo "$as_me:11718: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:11714: \$? = $ac_status" >&5
++ echo "$as_me:11721: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -s conftest$ac_exeext'
+- { (eval echo "$as_me:11717: \"$ac_try\"") >&5
++ { (eval echo "$as_me:11724: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:11720: \$? = $ac_status" >&5
++ echo "$as_me:11727: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ ac_cv_func__nc_TABSIZE=yes
+ else
+@@ -11727,7 +11734,7 @@
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "$as_me:11730: result: $ac_cv_func__nc_TABSIZE" >&5
++echo "$as_me:11737: 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
+@@ -11739,7 +11746,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:11742: checking if you want experimental reentrant code" >&5
++echo "$as_me:11749: 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.
+@@ -11749,7 +11756,7 @@
+ else
+ with_reentrant=$assume_reentrant
+ fi;
+-echo "$as_me:11752: result: $with_reentrant" >&5
++echo "$as_me:11759: result: $with_reentrant" >&5
+ echo "${ECHO_T}$with_reentrant" >&6
+ if test "$with_reentrant" = yes ; then
+ cf_cv_enable_reentrant=1
+@@ -11772,7 +11779,7 @@
+
+ ### Allow using a different wrap-prefix
+ if test "$cf_cv_enable_reentrant" != 0 || test "$BROKEN_LINKER" = 1 ; then
+- echo "$as_me:11775: checking for prefix used to wrap public variables" >&5
++ echo "$as_me:11782: 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.
+@@ -11782,7 +11789,7 @@
+ else
+ NCURSES_WRAP_PREFIX=_nc_
+ fi;
+- echo "$as_me:11785: result: $NCURSES_WRAP_PREFIX" >&5
++ echo "$as_me:11792: result: $NCURSES_WRAP_PREFIX" >&5
+ echo "${ECHO_T}$NCURSES_WRAP_PREFIX" >&6
+ else
+ NCURSES_WRAP_PREFIX=_nc_
+@@ -11796,7 +11803,7 @@
+
+ ### use option --disable-echo to suppress full display compiling commands
+
+-echo "$as_me:11799: checking if you want to see long compiling messages" >&5
++echo "$as_me:11806: 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.
+@@ -11830,11 +11837,11 @@
+ ECHO_CC=''
+
+ fi;
+-echo "$as_me:11833: result: $enableval" >&5
++echo "$as_me:11840: result: $enableval" >&5
+ echo "${ECHO_T}$enableval" >&6
+
+ ### use option --enable-warnings to turn on all gcc warnings
+-echo "$as_me:11837: checking if you want to see compiler warnings" >&5
++echo "$as_me:11844: checking if you want to see compiler warnings" >&5
+ echo $ECHO_N "checking if you want to see compiler warnings... $ECHO_C" >&6
+
+ # Check whether --enable-warnings or --disable-warnings was given.
+@@ -11842,7 +11849,7 @@
+ enableval="$enable_warnings"
+ with_warnings=$enableval
+ fi;
+-echo "$as_me:11845: result: $with_warnings" >&5
++echo "$as_me:11852: result: $with_warnings" >&5
+ echo "${ECHO_T}$with_warnings" >&6
+
+ if test "x$with_warnings" = "xyes"; then
+@@ -11854,12 +11861,12 @@
+ if test "$GCC" = yes ; then
+ case $host_os in
+ (linux*|gnu*)
+- echo "$as_me:11857: checking if this is really Intel C compiler" >&5
++ echo "$as_me:11864: checking if this is really Intel C compiler" >&5
+ echo $ECHO_N "checking if this is really Intel C compiler... $ECHO_C" >&6
+ cf_save_CFLAGS="$CFLAGS"
+ CFLAGS="$CFLAGS -no-gcc"
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 11862 "configure"
++#line 11869 "configure"
+ #include "confdefs.h"
+
+ int
+@@ -11876,16 +11883,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:11879: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:11886: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:11882: \$? = $ac_status" >&5
++ echo "$as_me:11889: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:11885: \"$ac_try\"") >&5
++ { (eval echo "$as_me:11892: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:11888: \$? = $ac_status" >&5
++ echo "$as_me:11895: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ INTEL_COMPILER=yes
+ cf_save_CFLAGS="$cf_save_CFLAGS -we147"
+@@ -11896,7 +11903,7 @@
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ CFLAGS="$cf_save_CFLAGS"
+- echo "$as_me:11899: result: $INTEL_COMPILER" >&5
++ echo "$as_me:11906: result: $INTEL_COMPILER" >&5
+ echo "${ECHO_T}$INTEL_COMPILER" >&6
+ ;;
+ esac
+@@ -11905,12 +11912,12 @@
+ CLANG_COMPILER=no
+
+ if test "$GCC" = yes ; then
+- echo "$as_me:11908: checking if this is really Clang C compiler" >&5
++ echo "$as_me:11915: checking if this is really Clang C compiler" >&5
+ echo $ECHO_N "checking if this is really Clang C compiler... $ECHO_C" >&6
+ cf_save_CFLAGS="$CFLAGS"
+ CFLAGS="$CFLAGS -Qunused-arguments"
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 11913 "configure"
++#line 11920 "configure"
+ #include "confdefs.h"
+
+ int
+@@ -11927,16 +11934,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:11930: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:11937: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:11933: \$? = $ac_status" >&5
++ echo "$as_me:11940: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:11936: \"$ac_try\"") >&5
++ { (eval echo "$as_me:11943: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:11939: \$? = $ac_status" >&5
++ echo "$as_me:11946: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ CLANG_COMPILER=yes
+ cf_save_CFLAGS="$cf_save_CFLAGS -Qunused-arguments"
+@@ -11947,12 +11954,12 @@
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ CFLAGS="$cf_save_CFLAGS"
+- echo "$as_me:11950: result: $CLANG_COMPILER" >&5
++ echo "$as_me:11957: result: $CLANG_COMPILER" >&5
+ echo "${ECHO_T}$CLANG_COMPILER" >&6
+ fi
+
+ cat > conftest.$ac_ext <<EOF
+-#line 11955 "${as_me:-configure}"
++#line 11962 "${as_me:-configure}"
+ int main(int argc, char *argv[]) { return (argv[argc-1] == 0) ; }
+ EOF
+
+@@ -11969,7 +11976,7 @@
+ # remark #981: operands are evaluated in unspecified order
+ # warning #279: controlling expression is constant
+
+- { echo "$as_me:11972: checking for $CC warning options..." >&5
++ { echo "$as_me:11979: checking for $CC warning options..." >&5
+ echo "$as_me: checking for $CC warning options..." >&6;}
+ cf_save_CFLAGS="$CFLAGS"
+ EXTRA_CFLAGS="-Wall"
+@@ -11985,12 +11992,12 @@
+ wd981
+ do
+ CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt"
+- if { (eval echo "$as_me:11988: \"$ac_compile\"") >&5
++ if { (eval echo "$as_me:11995: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:11991: \$? = $ac_status" >&5
++ echo "$as_me:11998: \$? = $ac_status" >&5
+ (exit $ac_status); }; then
+- test -n "$verbose" && echo "$as_me:11993: result: ... -$cf_opt" >&5
++ test -n "$verbose" && echo "$as_me:12000: result: ... -$cf_opt" >&5
+ echo "${ECHO_T}... -$cf_opt" >&6
+ EXTRA_CFLAGS="$EXTRA_CFLAGS -$cf_opt"
+ fi
+@@ -11999,7 +12006,7 @@
+
+ elif test "$GCC" = yes
+ then
+- { echo "$as_me:12002: checking for $CC warning options..." >&5
++ { echo "$as_me:12009: checking for $CC warning options..." >&5
+ echo "$as_me: checking for $CC warning options..." >&6;}
+ cf_save_CFLAGS="$CFLAGS"
+ EXTRA_CFLAGS=
+@@ -12023,12 +12030,12 @@
+ Wundef $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:12026: \"$ac_compile\"") >&5
++ if { (eval echo "$as_me:12033: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:12029: \$? = $ac_status" >&5
++ echo "$as_me:12036: \$? = $ac_status" >&5
+ (exit $ac_status); }; then
+- test -n "$verbose" && echo "$as_me:12031: result: ... -$cf_opt" >&5
++ test -n "$verbose" && echo "$as_me:12038: result: ... -$cf_opt" >&5
+ echo "${ECHO_T}... -$cf_opt" >&6
+ case $cf_opt in
+ (Wcast-qual)
+@@ -12039,7 +12046,7 @@
+ ([34].*)
+ test -n "$verbose" && echo " feature is broken in gcc $GCC_VERSION" 1>&6
+
+-echo "${as_me:-configure}:12042: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
++echo "${as_me:-configure}:12049: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
+
+ continue;;
+ esac
+@@ -12049,7 +12056,7 @@
+ ([12].*)
+ test -n "$verbose" && echo " feature is broken in gcc $GCC_VERSION" 1>&6
+
+-echo "${as_me:-configure}:12052: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
++echo "${as_me:-configure}:12059: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
+
+ continue;;
+ esac
+@@ -12082,10 +12089,10 @@
+ EOF
+ if test "$GCC" = yes
+ then
+- { echo "$as_me:12085: checking for $CC __attribute__ directives..." >&5
++ { echo "$as_me:12092: checking for $CC __attribute__ directives..." >&5
+ echo "$as_me: checking for $CC __attribute__ directives..." >&6;}
+ cat > conftest.$ac_ext <<EOF
+-#line 12088 "${as_me:-configure}"
++#line 12095 "${as_me:-configure}"
+ #include "confdefs.h"
+ #include "conftest.h"
+ #include "conftest.i"
+@@ -12134,12 +12141,12 @@
+ ;;
+ esac
+
+- if { (eval echo "$as_me:12137: \"$ac_compile\"") >&5
++ if { (eval echo "$as_me:12144: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:12140: \$? = $ac_status" >&5
++ echo "$as_me:12147: \$? = $ac_status" >&5
+ (exit $ac_status); }; then
+- test -n "$verbose" && echo "$as_me:12142: result: ... $cf_attribute" >&5
++ test -n "$verbose" && echo "$as_me:12149: result: ... $cf_attribute" >&5
+ echo "${ECHO_T}... $cf_attribute" >&6
+ cat conftest.h >>confdefs.h
+ case $cf_attribute in
+@@ -12199,7 +12206,7 @@
+ fi
+
+ ### use option --enable-assertions to turn on generation of assertion code
+-echo "$as_me:12202: checking if you want to enable runtime assertions" >&5
++echo "$as_me:12209: 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.
+@@ -12209,7 +12216,7 @@
+ else
+ with_assertions=no
+ fi;
+-echo "$as_me:12212: result: $with_assertions" >&5
++echo "$as_me:12219: result: $with_assertions" >&5
+ echo "${ECHO_T}$with_assertions" >&6
+ if test -n "$GCC"
+ then
+@@ -12262,7 +12269,7 @@
+ ;;
+ esac
+
+-echo "$as_me:12265: checking whether to add trace feature to all models" >&5
++echo "$as_me:12272: 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.
+@@ -12272,7 +12279,7 @@
+ else
+ cf_with_trace=$cf_all_traces
+ fi;
+-echo "$as_me:12275: result: $cf_with_trace" >&5
++echo "$as_me:12282: result: $cf_with_trace" >&5
+ echo "${ECHO_T}$cf_with_trace" >&6
+
+ if test "$cf_with_trace" = yes ; then
+@@ -12360,7 +12367,7 @@
+ ADA_TRACE=FALSE
+ fi
+
+-echo "$as_me:12363: checking if we want to use GNAT projects" >&5
++echo "$as_me:12370: 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.
+@@ -12377,7 +12384,7 @@
+ enable_gnat_projects=yes
+
+ fi;
+-echo "$as_me:12380: result: $enable_gnat_projects" >&5
++echo "$as_me:12387: result: $enable_gnat_projects" >&5
+ echo "${ECHO_T}$enable_gnat_projects" >&6
+
+ ### Checks for libraries.
+@@ -12385,13 +12392,13 @@
+ (*mingw32*)
+ ;;
+ (*)
+-echo "$as_me:12388: checking for gettimeofday" >&5
++echo "$as_me:12395: 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 12394 "configure"
++#line 12401 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+ which can conflict with char gettimeofday (); below. */
+@@ -12422,16 +12429,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:12425: \"$ac_link\"") >&5
++if { (eval echo "$as_me:12432: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:12428: \$? = $ac_status" >&5
++ echo "$as_me:12435: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -s conftest$ac_exeext'
+- { (eval echo "$as_me:12431: \"$ac_try\"") >&5
++ { (eval echo "$as_me:12438: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:12434: \$? = $ac_status" >&5
++ echo "$as_me:12441: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ ac_cv_func_gettimeofday=yes
+ else
+@@ -12441,7 +12448,7 @@
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "$as_me:12444: result: $ac_cv_func_gettimeofday" >&5
++echo "$as_me:12451: 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
+@@ -12450,7 +12457,7 @@
+
+ else
+
+-echo "$as_me:12453: checking for gettimeofday in -lbsd" >&5
++echo "$as_me:12460: 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
+@@ -12458,7 +12465,7 @@
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lbsd $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 12461 "configure"
++#line 12468 "configure"
+ #include "confdefs.h"
+
+ /* Override any gcc2 internal prototype to avoid an error. */
+@@ -12477,16 +12484,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:12480: \"$ac_link\"") >&5
++if { (eval echo "$as_me:12487: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:12483: \$? = $ac_status" >&5
++ echo "$as_me:12490: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -s conftest$ac_exeext'
+- { (eval echo "$as_me:12486: \"$ac_try\"") >&5
++ { (eval echo "$as_me:12493: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:12489: \$? = $ac_status" >&5
++ echo "$as_me:12496: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ ac_cv_lib_bsd_gettimeofday=yes
+ else
+@@ -12497,7 +12504,7 @@
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:12500: result: $ac_cv_lib_bsd_gettimeofday" >&5
++echo "$as_me:12507: 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
+
+@@ -12513,13 +12520,13 @@
+ esac
+
+ ### Checks for header files.
+-echo "$as_me:12516: checking for ANSI C header files" >&5
++echo "$as_me:12523: 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 12522 "configure"
++#line 12529 "configure"
+ #include "confdefs.h"
+ #include <stdlib.h>
+ #include <stdarg.h>
+@@ -12527,13 +12534,13 @@
+ #include <float.h>
+
+ _ACEOF
+-if { (eval echo "$as_me:12530: \"$ac_cpp conftest.$ac_ext\"") >&5
++if { (eval echo "$as_me:12537: \"$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:12536: \$? = $ac_status" >&5
++ echo "$as_me:12543: \$? = $ac_status" >&5
+ (exit $ac_status); } >/dev/null; then
+ if test -s conftest.err; then
+ ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -12555,7 +12562,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 12558 "configure"
++#line 12565 "configure"
+ #include "confdefs.h"
+ #include <string.h>
+
+@@ -12573,7 +12580,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 12576 "configure"
++#line 12583 "configure"
+ #include "confdefs.h"
+ #include <stdlib.h>
+
+@@ -12594,7 +12601,7 @@
+ :
+ else
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 12597 "configure"
++#line 12604 "configure"
+ #include "confdefs.h"
+ #include <ctype.h>
+ #if ((' ' & 0x0FF) == 0x020)
+@@ -12620,15 +12627,15 @@
+ }
+ _ACEOF
+ rm -f conftest$ac_exeext
+-if { (eval echo "$as_me:12623: \"$ac_link\"") >&5
++if { (eval echo "$as_me:12630: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:12626: \$? = $ac_status" >&5
++ echo "$as_me:12633: \$? = $ac_status" >&5
+ (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+- { (eval echo "$as_me:12628: \"$ac_try\"") >&5
++ { (eval echo "$as_me:12635: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:12631: \$? = $ac_status" >&5
++ echo "$as_me:12638: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ :
+ else
+@@ -12641,7 +12648,7 @@
+ fi
+ fi
+ fi
+-echo "$as_me:12644: result: $ac_cv_header_stdc" >&5
++echo "$as_me:12651: result: $ac_cv_header_stdc" >&5
+ echo "${ECHO_T}$ac_cv_header_stdc" >&6
+ if test $ac_cv_header_stdc = yes; then
+
+@@ -12657,28 +12664,28 @@
+ inttypes.h stdint.h unistd.h
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-echo "$as_me:12660: checking for $ac_header" >&5
++echo "$as_me:12667: 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 12666 "configure"
++#line 12673 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ #include <$ac_header>
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:12672: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:12679: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:12675: \$? = $ac_status" >&5
++ echo "$as_me:12682: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:12678: \"$ac_try\"") >&5
++ { (eval echo "$as_me:12685: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:12681: \$? = $ac_status" >&5
++ echo "$as_me:12688: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ eval "$as_ac_Header=yes"
+ else
+@@ -12688,7 +12695,7 @@
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ fi
+-echo "$as_me:12691: result: `eval echo '${'$as_ac_Header'}'`" >&5
++echo "$as_me:12698: 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
+@@ -12698,13 +12705,13 @@
+ fi
+ done
+
+-echo "$as_me:12701: checking for signed char" >&5
++echo "$as_me:12708: 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 12707 "configure"
++#line 12714 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -12719,16 +12726,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:12722: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:12729: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:12725: \$? = $ac_status" >&5
++ echo "$as_me:12732: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:12728: \"$ac_try\"") >&5
++ { (eval echo "$as_me:12735: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:12731: \$? = $ac_status" >&5
++ echo "$as_me:12738: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ ac_cv_type_signed_char=yes
+ else
+@@ -12738,10 +12745,10 @@
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ fi
+-echo "$as_me:12741: result: $ac_cv_type_signed_char" >&5
++echo "$as_me:12748: result: $ac_cv_type_signed_char" >&5
+ echo "${ECHO_T}$ac_cv_type_signed_char" >&6
+
+-echo "$as_me:12744: checking size of signed char" >&5
++echo "$as_me:12751: 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
+@@ -12750,7 +12757,7 @@
+ if test "$cross_compiling" = yes; then
+ # Depending upon the size, compute the lo and hi bounds.
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 12753 "configure"
++#line 12760 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -12762,21 +12769,21 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:12765: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:12772: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:12768: \$? = $ac_status" >&5
++ echo "$as_me:12775: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:12771: \"$ac_try\"") >&5
++ { (eval echo "$as_me:12778: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:12774: \$? = $ac_status" >&5
++ echo "$as_me:12781: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ ac_lo=0 ac_mid=0
+ while :; do
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 12779 "configure"
++#line 12786 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -12788,16 +12795,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:12791: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:12798: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:12794: \$? = $ac_status" >&5
++ echo "$as_me:12801: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:12797: \"$ac_try\"") >&5
++ { (eval echo "$as_me:12804: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:12800: \$? = $ac_status" >&5
++ echo "$as_me:12807: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ ac_hi=$ac_mid; break
+ else
+@@ -12813,7 +12820,7 @@
+ ac_hi=-1 ac_mid=-1
+ while :; do
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 12816 "configure"
++#line 12823 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -12825,16 +12832,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:12828: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:12835: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:12831: \$? = $ac_status" >&5
++ echo "$as_me:12838: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:12834: \"$ac_try\"") >&5
++ { (eval echo "$as_me:12841: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:12837: \$? = $ac_status" >&5
++ echo "$as_me:12844: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ ac_lo=$ac_mid; break
+ else
+@@ -12850,7 +12857,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 12853 "configure"
++#line 12860 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -12862,16 +12869,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:12865: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:12872: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:12868: \$? = $ac_status" >&5
++ echo "$as_me:12875: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:12871: \"$ac_try\"") >&5
++ { (eval echo "$as_me:12878: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:12874: \$? = $ac_status" >&5
++ echo "$as_me:12881: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ ac_hi=$ac_mid
+ else
+@@ -12884,12 +12891,12 @@
+ ac_cv_sizeof_signed_char=$ac_lo
+ else
+ if test "$cross_compiling" = yes; then
+- { { echo "$as_me:12887: error: cannot run test program while cross compiling" >&5
++ { { echo "$as_me:12894: 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 12892 "configure"
++#line 12899 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -12905,15 +12912,15 @@
+ }
+ _ACEOF
+ rm -f conftest$ac_exeext
+-if { (eval echo "$as_me:12908: \"$ac_link\"") >&5
++if { (eval echo "$as_me:12915: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:12911: \$? = $ac_status" >&5
++ echo "$as_me:12918: \$? = $ac_status" >&5
+ (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+- { (eval echo "$as_me:12913: \"$ac_try\"") >&5
++ { (eval echo "$as_me:12920: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:12916: \$? = $ac_status" >&5
++ echo "$as_me:12923: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ ac_cv_sizeof_signed_char=`cat conftest.val`
+ else
+@@ -12929,19 +12936,19 @@
+ ac_cv_sizeof_signed_char=0
+ fi
+ fi
+-echo "$as_me:12932: result: $ac_cv_sizeof_signed_char" >&5
++echo "$as_me:12939: 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:12938: checking for ANSI C header files" >&5
++echo "$as_me:12945: 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 12944 "configure"
++#line 12951 "configure"
+ #include "confdefs.h"
+ #include <stdlib.h>
+ #include <stdarg.h>
+@@ -12949,13 +12956,13 @@
+ #include <float.h>
+
+ _ACEOF
+-if { (eval echo "$as_me:12952: \"$ac_cpp conftest.$ac_ext\"") >&5
++if { (eval echo "$as_me:12959: \"$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:12958: \$? = $ac_status" >&5
++ echo "$as_me:12965: \$? = $ac_status" >&5
+ (exit $ac_status); } >/dev/null; then
+ if test -s conftest.err; then
+ ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -12977,7 +12984,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 12980 "configure"
++#line 12987 "configure"
+ #include "confdefs.h"
+ #include <string.h>
+
+@@ -12995,7 +13002,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 12998 "configure"
++#line 13005 "configure"
+ #include "confdefs.h"
+ #include <stdlib.h>
+
+@@ -13016,7 +13023,7 @@
+ :
+ else
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 13019 "configure"
++#line 13026 "configure"
+ #include "confdefs.h"
+ #include <ctype.h>
+ #if ((' ' & 0x0FF) == 0x020)
+@@ -13042,15 +13049,15 @@
+ }
+ _ACEOF
+ rm -f conftest$ac_exeext
+-if { (eval echo "$as_me:13045: \"$ac_link\"") >&5
++if { (eval echo "$as_me:13052: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:13048: \$? = $ac_status" >&5
++ echo "$as_me:13055: \$? = $ac_status" >&5
+ (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+- { (eval echo "$as_me:13050: \"$ac_try\"") >&5
++ { (eval echo "$as_me:13057: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:13053: \$? = $ac_status" >&5
++ echo "$as_me:13060: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ :
+ else
+@@ -13063,7 +13070,7 @@
+ fi
+ fi
+ fi
+-echo "$as_me:13066: result: $ac_cv_header_stdc" >&5
++echo "$as_me:13073: result: $ac_cv_header_stdc" >&5
+ echo "${ECHO_T}$ac_cv_header_stdc" >&6
+ if test $ac_cv_header_stdc = yes; then
+
+@@ -13076,13 +13083,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:13079: checking for $ac_hdr that defines DIR" >&5
++echo "$as_me:13086: 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 13085 "configure"
++#line 13092 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ #include <$ac_hdr>
+@@ -13097,16 +13104,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:13100: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:13107: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:13103: \$? = $ac_status" >&5
++ echo "$as_me:13110: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:13106: \"$ac_try\"") >&5
++ { (eval echo "$as_me:13113: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:13109: \$? = $ac_status" >&5
++ echo "$as_me:13116: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ eval "$as_ac_Header=yes"
+ else
+@@ -13116,7 +13123,7 @@
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ fi
+-echo "$as_me:13119: result: `eval echo '${'$as_ac_Header'}'`" >&5
++echo "$as_me:13126: 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
+@@ -13129,7 +13136,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:13132: checking for opendir in -ldir" >&5
++ echo "$as_me:13139: 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
+@@ -13137,7 +13144,7 @@
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-ldir $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 13140 "configure"
++#line 13147 "configure"
+ #include "confdefs.h"
+
+ /* Override any gcc2 internal prototype to avoid an error. */
+@@ -13156,16 +13163,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:13159: \"$ac_link\"") >&5
++if { (eval echo "$as_me:13166: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:13162: \$? = $ac_status" >&5
++ echo "$as_me:13169: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -s conftest$ac_exeext'
+- { (eval echo "$as_me:13165: \"$ac_try\"") >&5
++ { (eval echo "$as_me:13172: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:13168: \$? = $ac_status" >&5
++ echo "$as_me:13175: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ ac_cv_lib_dir_opendir=yes
+ else
+@@ -13176,14 +13183,14 @@
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:13179: result: $ac_cv_lib_dir_opendir" >&5
++echo "$as_me:13186: 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:13186: checking for opendir in -lx" >&5
++ echo "$as_me:13193: 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
+@@ -13191,7 +13198,7 @@
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lx $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 13194 "configure"
++#line 13201 "configure"
+ #include "confdefs.h"
+
+ /* Override any gcc2 internal prototype to avoid an error. */
+@@ -13210,16 +13217,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:13213: \"$ac_link\"") >&5
++if { (eval echo "$as_me:13220: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:13216: \$? = $ac_status" >&5
++ echo "$as_me:13223: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -s conftest$ac_exeext'
+- { (eval echo "$as_me:13219: \"$ac_try\"") >&5
++ { (eval echo "$as_me:13226: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:13222: \$? = $ac_status" >&5
++ echo "$as_me:13229: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ ac_cv_lib_x_opendir=yes
+ else
+@@ -13230,7 +13237,7 @@
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:13233: result: $ac_cv_lib_x_opendir" >&5
++echo "$as_me:13240: 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"
+@@ -13238,13 +13245,13 @@
+
+ fi
+
+-echo "$as_me:13241: checking whether time.h and sys/time.h may both be included" >&5
++echo "$as_me:13248: 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 13247 "configure"
++#line 13254 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ #include <sys/time.h>
+@@ -13260,16 +13267,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:13263: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:13270: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:13266: \$? = $ac_status" >&5
++ echo "$as_me:13273: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:13269: \"$ac_try\"") >&5
++ { (eval echo "$as_me:13276: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:13272: \$? = $ac_status" >&5
++ echo "$as_me:13279: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ ac_cv_header_time=yes
+ else
+@@ -13279,7 +13286,7 @@
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ fi
+-echo "$as_me:13282: result: $ac_cv_header_time" >&5
++echo "$as_me:13289: result: $ac_cv_header_time" >&5
+ echo "${ECHO_T}$ac_cv_header_time" >&6
+ if test $ac_cv_header_time = yes; then
+
+@@ -13297,13 +13304,13 @@
+ ac_compiler_gnu=$ac_cv_c_compiler_gnu
+ ac_main_return=return
+
+-echo "$as_me:13300: checking for an ANSI C-conforming const" >&5
++echo "$as_me:13307: 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 13306 "configure"
++#line 13313 "configure"
+ #include "confdefs.h"
+
+ int
+@@ -13361,16 +13368,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:13364: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:13371: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:13367: \$? = $ac_status" >&5
++ echo "$as_me:13374: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:13370: \"$ac_try\"") >&5
++ { (eval echo "$as_me:13377: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:13373: \$? = $ac_status" >&5
++ echo "$as_me:13380: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ ac_cv_c_const=yes
+ else
+@@ -13380,7 +13387,7 @@
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ fi
+-echo "$as_me:13383: result: $ac_cv_c_const" >&5
++echo "$as_me:13390: result: $ac_cv_c_const" >&5
+ echo "${ECHO_T}$ac_cv_c_const" >&6
+ if test $ac_cv_c_const = no; then
+
+@@ -13392,7 +13399,7 @@
+
+ ### Checks for external-data
+
+-echo "$as_me:13395: checking if data-only library module links" >&5
++echo "$as_me:13402: 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
+@@ -13400,20 +13407,20 @@
+
+ rm -f conftest.a
+ cat >conftest.$ac_ext <<EOF
+-#line 13403 "configure"
++#line 13410 "configure"
+ int testdata[3] = { 123, 456, 789 };
+ EOF
+- if { (eval echo "$as_me:13406: \"$ac_compile\"") >&5
++ if { (eval echo "$as_me:13413: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:13409: \$? = $ac_status" >&5
++ echo "$as_me:13416: \$? = $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 13416 "configure"
++#line 13423 "configure"
+ int testfunc()
+ {
+ #if defined(NeXT)
+@@ -13426,10 +13433,10 @@
+ #endif
+ }
+ EOF
+- if { (eval echo "$as_me:13429: \"$ac_compile\"") >&5
++ if { (eval echo "$as_me:13436: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:13432: \$? = $ac_status" >&5
++ echo "$as_me:13439: \$? = $ac_status" >&5
+ (exit $ac_status); }; then
+ mv conftest.o func.o && \
+ ( $AR $ARFLAGS conftest.a func.o ) 2>&5 1>/dev/null
+@@ -13442,7 +13449,7 @@
+ cf_cv_link_dataonly=unknown
+ else
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 13445 "configure"
++#line 13452 "configure"
+ #include "confdefs.h"
+
+ int main()
+@@ -13453,15 +13460,15 @@
+
+ _ACEOF
+ rm -f conftest$ac_exeext
+-if { (eval echo "$as_me:13456: \"$ac_link\"") >&5
++if { (eval echo "$as_me:13463: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:13459: \$? = $ac_status" >&5
++ echo "$as_me:13466: \$? = $ac_status" >&5
+ (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+- { (eval echo "$as_me:13461: \"$ac_try\"") >&5
++ { (eval echo "$as_me:13468: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:13464: \$? = $ac_status" >&5
++ echo "$as_me:13471: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ cf_cv_link_dataonly=yes
+ else
+@@ -13476,7 +13483,7 @@
+
+ fi
+
+-echo "$as_me:13479: result: $cf_cv_link_dataonly" >&5
++echo "$as_me:13486: result: $cf_cv_link_dataonly" >&5
+ echo "${ECHO_T}$cf_cv_link_dataonly" >&6
+
+ if test "$cf_cv_link_dataonly" = no ; then
+@@ -13490,7 +13497,7 @@
+
+ ### Checks for library functions.
+
+-echo "$as_me:13493: checking for working mkstemp" >&5
++echo "$as_me:13500: 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
+@@ -13501,7 +13508,7 @@
+ cf_cv_func_mkstemp=maybe
+ else
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 13504 "configure"
++#line 13511 "configure"
+ #include "confdefs.h"
+
+ #include <sys/types.h>
+@@ -13539,15 +13546,15 @@
+
+ _ACEOF
+ rm -f conftest$ac_exeext
+-if { (eval echo "$as_me:13542: \"$ac_link\"") >&5
++if { (eval echo "$as_me:13549: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:13545: \$? = $ac_status" >&5
++ echo "$as_me:13552: \$? = $ac_status" >&5
+ (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+- { (eval echo "$as_me:13547: \"$ac_try\"") >&5
++ { (eval echo "$as_me:13554: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:13550: \$? = $ac_status" >&5
++ echo "$as_me:13557: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ cf_cv_func_mkstemp=yes
+
+@@ -13562,16 +13569,16 @@
+ fi
+
+ fi
+-echo "$as_me:13565: result: $cf_cv_func_mkstemp" >&5
++echo "$as_me:13572: 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:13568: checking for mkstemp" >&5
++ echo "$as_me:13575: 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 13574 "configure"
++#line 13581 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+ which can conflict with char mkstemp (); below. */
+@@ -13602,16 +13609,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:13605: \"$ac_link\"") >&5
++if { (eval echo "$as_me:13612: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:13608: \$? = $ac_status" >&5
++ echo "$as_me:13615: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -s conftest$ac_exeext'
+- { (eval echo "$as_me:13611: \"$ac_try\"") >&5
++ { (eval echo "$as_me:13618: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:13614: \$? = $ac_status" >&5
++ echo "$as_me:13621: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ ac_cv_func_mkstemp=yes
+ else
+@@ -13621,7 +13628,7 @@
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "$as_me:13624: result: $ac_cv_func_mkstemp" >&5
++echo "$as_me:13631: result: $ac_cv_func_mkstemp" >&5
+ echo "${ECHO_T}$ac_cv_func_mkstemp" >&6
+
+ fi
+@@ -13644,7 +13651,7 @@
+ cf_ada_make=gnatmake
+ # Extract the first word of "$cf_ada_make", so it can be a program name with args.
+ set dummy $cf_ada_make; ac_word=$2
+-echo "$as_me:13647: checking for $ac_word" >&5
++echo "$as_me:13654: checking for $ac_word" >&5
+ echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+ if test "${ac_cv_prog_gnat_exists+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -13659,7 +13666,7 @@
+ test -z "$ac_dir" && ac_dir=.
+ $as_executable_p "$ac_dir/$ac_word" || continue
+ ac_cv_prog_gnat_exists="yes"
+-echo "$as_me:13662: found $ac_dir/$ac_word" >&5
++echo "$as_me:13669: found $ac_dir/$ac_word" >&5
+ break
+ done
+
+@@ -13668,10 +13675,10 @@
+ fi
+ gnat_exists=$ac_cv_prog_gnat_exists
+ if test -n "$gnat_exists"; then
+- echo "$as_me:13671: result: $gnat_exists" >&5
++ echo "$as_me:13678: result: $gnat_exists" >&5
+ echo "${ECHO_T}$gnat_exists" >&6
+ else
+- echo "$as_me:13674: result: no" >&5
++ echo "$as_me:13681: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+
+@@ -13680,12 +13687,12 @@
+ cf_cv_prog_gnat_correct=no
+ else
+
+-echo "$as_me:13683: checking for gnat version" >&5
++echo "$as_me:13690: checking for gnat version" >&5
+ echo $ECHO_N "checking for gnat version... $ECHO_C" >&6
+ cf_gnat_version=`${cf_ada_make:-gnatmake} -v 2>&1 | \
+ grep '[0-9].[0-9][0-9]*' |\
+ sed -e '2,$d' -e 's/[^0-9 \.]//g' -e 's/^[ ]*//' -e 's/ .*//'`
+-echo "$as_me:13688: result: $cf_gnat_version" >&5
++echo "$as_me:13695: result: $cf_gnat_version" >&5
+ echo "${ECHO_T}$cf_gnat_version" >&6
+
+ case $cf_gnat_version in
+@@ -13693,7 +13700,7 @@
+ cf_cv_prog_gnat_correct=yes
+ ;;
+ (*)
+- { echo "$as_me:13696: WARNING: Unsupported GNAT version $cf_gnat_version. We require 3.11 or better. Disabling Ada95 binding." >&5
++ { echo "$as_me:13703: WARNING: Unsupported GNAT version $cf_gnat_version. We require 3.11 or better. Disabling Ada95 binding." >&5
+ echo "$as_me: WARNING: Unsupported GNAT version $cf_gnat_version. We require 3.11 or better. Disabling Ada95 binding." >&2;}
+ cf_cv_prog_gnat_correct=no
+ ;;
+@@ -13701,7 +13708,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:13704: checking for $ac_word" >&5
++echo "$as_me:13711: 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
+@@ -13716,7 +13723,7 @@
+ test -z "$ac_dir" && ac_dir=.
+ $as_executable_p "$ac_dir/$ac_word" || continue
+ ac_cv_prog_M4_exists="yes"
+-echo "$as_me:13719: found $ac_dir/$ac_word" >&5
++echo "$as_me:13726: found $ac_dir/$ac_word" >&5
+ break
+ done
+
+@@ -13725,10 +13732,10 @@
+ fi
+ M4_exists=$ac_cv_prog_M4_exists
+ if test -n "$M4_exists"; then
+- echo "$as_me:13728: result: $M4_exists" >&5
++ echo "$as_me:13735: result: $M4_exists" >&5
+ echo "${ECHO_T}$M4_exists" >&6
+ else
+- echo "$as_me:13731: result: no" >&5
++ echo "$as_me:13738: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+
+@@ -13737,7 +13744,7 @@
+ echo Ada95 binding required program m4 not found. Ada95 binding disabled.
+ fi
+ if test "$cf_cv_prog_gnat_correct" = yes; then
+- echo "$as_me:13740: checking if GNAT works" >&5
++ echo "$as_me:13747: checking if GNAT works" >&5
+ echo $ECHO_N "checking if GNAT works... $ECHO_C" >&6
+
+ rm -rf conftest* *~conftest*
+@@ -13765,14 +13772,14 @@
+ fi
+ rm -rf conftest* *~conftest*
+
+- echo "$as_me:13768: result: $cf_cv_prog_gnat_correct" >&5
++ echo "$as_me:13775: result: $cf_cv_prog_gnat_correct" >&5
+ echo "${ECHO_T}$cf_cv_prog_gnat_correct" >&6
+ fi
+ fi
+
+ if test "$cf_cv_prog_gnat_correct" = yes; then
+
+- echo "$as_me:13775: checking optimization options for ADAFLAGS" >&5
++ echo "$as_me:13782: checking optimization options for ADAFLAGS" >&5
+ echo $ECHO_N "checking optimization options for ADAFLAGS... $ECHO_C" >&6
+ case "$CFLAGS" in
+ (*-g*)
+@@ -13789,10 +13796,10 @@
+
+ ;;
+ esac
+- echo "$as_me:13792: result: $ADAFLAGS" >&5
++ echo "$as_me:13799: result: $ADAFLAGS" >&5
+ echo "${ECHO_T}$ADAFLAGS" >&6
+
+-echo "$as_me:13795: checking if GNATPREP supports -T option" >&5
++echo "$as_me:13802: 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
+@@ -13802,11 +13809,11 @@
+ gnatprep -T 2>/dev/null >/dev/null && cf_cv_gnatprep_opt_t=yes
+
+ fi
+-echo "$as_me:13805: result: $cf_cv_gnatprep_opt_t" >&5
++echo "$as_me:13812: 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:13809: checking if GNAT supports generics" >&5
++echo "$as_me:13816: checking if GNAT supports generics" >&5
+ echo $ECHO_N "checking if GNAT supports generics... $ECHO_C" >&6
+ case $cf_gnat_version in
+ (3.[1-9]*|[4-9].*)
+@@ -13816,7 +13823,7 @@
+ cf_gnat_generics=no
+ ;;
+ esac
+-echo "$as_me:13819: result: $cf_gnat_generics" >&5
++echo "$as_me:13826: result: $cf_gnat_generics" >&5
+ echo "${ECHO_T}$cf_gnat_generics" >&6
+
+ if test "$cf_gnat_generics" = yes
+@@ -13828,7 +13835,7 @@
+ cf_generic_objects=
+ fi
+
+-echo "$as_me:13831: checking if GNAT supports SIGINT" >&5
++echo "$as_me:13838: 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
+@@ -13876,7 +13883,7 @@
+ rm -rf conftest* *~conftest*
+
+ fi
+-echo "$as_me:13879: result: $cf_cv_gnat_sigint" >&5
++echo "$as_me:13886: result: $cf_cv_gnat_sigint" >&5
+ echo "${ECHO_T}$cf_cv_gnat_sigint" >&6
+
+ if test $cf_cv_gnat_sigint = yes ; then
+@@ -13889,7 +13896,7 @@
+ cf_gnat_projects=no
+
+ if test "$enable_gnat_projects" != no ; then
+-echo "$as_me:13892: checking if GNAT supports project files" >&5
++echo "$as_me:13899: checking if GNAT supports project files" >&5
+ echo $ECHO_N "checking if GNAT supports project files... $ECHO_C" >&6
+ case $cf_gnat_version in
+ (3.[0-9]*)
+@@ -13949,15 +13956,15 @@
+ esac
+ ;;
+ esac
+-echo "$as_me:13952: result: $cf_gnat_projects" >&5
++echo "$as_me:13959: 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:13958: checking if GNAT supports libraries" >&5
++ echo "$as_me:13965: checking if GNAT supports libraries" >&5
+ echo $ECHO_N "checking if GNAT supports libraries... $ECHO_C" >&6
+- echo "$as_me:13960: result: $cf_gnat_libraries" >&5
++ echo "$as_me:13967: result: $cf_gnat_libraries" >&5
+ echo "${ECHO_T}$cf_gnat_libraries" >&6
+ fi
+
+@@ -13977,7 +13984,7 @@
+ USE_GNAT_LIBRARIES="#"
+ fi
+
+-echo "$as_me:13980: checking for ada-compiler" >&5
++echo "$as_me:13987: 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.
+@@ -13988,12 +13995,12 @@
+ cf_ada_compiler=gnatmake
+ fi;
+
+-echo "$as_me:13991: result: $cf_ada_compiler" >&5
++echo "$as_me:13998: result: $cf_ada_compiler" >&5
+ echo "${ECHO_T}$cf_ada_compiler" >&6
+
+ cf_ada_package=terminal_interface
+
+-echo "$as_me:13996: checking for ada-include" >&5
++echo "$as_me:14003: 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.
+@@ -14029,7 +14036,7 @@
+ withval=`echo $withval | sed -e s%NONE%$cf_path_syntax%`
+ ;;
+ (*)
+- { { echo "$as_me:14032: error: expected a pathname, not \"$withval\"" >&5
++ { { echo "$as_me:14039: error: expected a pathname, not \"$withval\"" >&5
+ echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
+ { (exit 1); exit 1; }; }
+ ;;
+@@ -14038,10 +14045,10 @@
+ fi
+ eval ADA_INCLUDE="$withval"
+
+-echo "$as_me:14041: result: $ADA_INCLUDE" >&5
++echo "$as_me:14048: result: $ADA_INCLUDE" >&5
+ echo "${ECHO_T}$ADA_INCLUDE" >&6
+
+-echo "$as_me:14044: checking for ada-objects" >&5
++echo "$as_me:14051: 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.
+@@ -14077,7 +14084,7 @@
+ withval=`echo $withval | sed -e s%NONE%$cf_path_syntax%`
+ ;;
+ (*)
+- { { echo "$as_me:14080: error: expected a pathname, not \"$withval\"" >&5
++ { { echo "$as_me:14087: error: expected a pathname, not \"$withval\"" >&5
+ echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
+ { (exit 1); exit 1; }; }
+ ;;
+@@ -14086,10 +14093,10 @@
+ fi
+ eval ADA_OBJECTS="$withval"
+
+-echo "$as_me:14089: result: $ADA_OBJECTS" >&5
++echo "$as_me:14096: result: $ADA_OBJECTS" >&5
+ echo "${ECHO_T}$ADA_OBJECTS" >&6
+
+-echo "$as_me:14092: checking if an Ada95 shared-library should be built" >&5
++echo "$as_me:14099: 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.
+@@ -14099,7 +14106,7 @@
+ else
+ with_ada_sharedlib=no
+ fi;
+-echo "$as_me:14102: result: $with_ada_sharedlib" >&5
++echo "$as_me:14109: result: $with_ada_sharedlib" >&5
+ echo "${ECHO_T}$with_ada_sharedlib" >&6
+
+ ADA_SHAREDLIB='lib$(LIB_NAME).so.1'
+@@ -14115,12 +14122,12 @@
+ fi
+
+ else
+- { { echo "$as_me:14118: error: No usable Ada compiler found" >&5
++ { { echo "$as_me:14125: 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:14123: error: The Ada compiler is needed for this package" >&5
++ { { echo "$as_me:14130: 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
+@@ -14160,7 +14167,7 @@
+ fi
+
+ ### Build up pieces for makefile rules
+-echo "$as_me:14163: checking default library suffix" >&5
++echo "$as_me:14170: checking default library suffix" >&5
+ echo $ECHO_N "checking default library suffix... $ECHO_C" >&6
+
+ case $DFT_LWR_MODEL in
+@@ -14171,10 +14178,10 @@
+ (shared) DFT_ARG_SUFFIX='' ;;
+ esac
+ test -n "$LIB_SUFFIX" && DFT_ARG_SUFFIX="${LIB_SUFFIX}${DFT_ARG_SUFFIX}"
+-echo "$as_me:14174: result: $DFT_ARG_SUFFIX" >&5
++echo "$as_me:14181: result: $DFT_ARG_SUFFIX" >&5
+ echo "${ECHO_T}$DFT_ARG_SUFFIX" >&6
+
+-echo "$as_me:14177: checking default library-dependency suffix" >&5
++echo "$as_me:14184: checking default library-dependency suffix" >&5
+ echo $ECHO_N "checking default library-dependency suffix... $ECHO_C" >&6
+
+ case X$DFT_LWR_MODEL in
+@@ -14232,10 +14239,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:14235: result: $DFT_DEP_SUFFIX" >&5
++echo "$as_me:14242: result: $DFT_DEP_SUFFIX" >&5
+ echo "${ECHO_T}$DFT_DEP_SUFFIX" >&6
+
+-echo "$as_me:14238: checking default object directory" >&5
++echo "$as_me:14245: checking default object directory" >&5
+ echo $ECHO_N "checking default object directory... $ECHO_C" >&6
+
+ case $DFT_LWR_MODEL in
+@@ -14251,7 +14258,7 @@
+ DFT_OBJ_SUBDIR='obj_s' ;;
+ esac
+ esac
+-echo "$as_me:14254: result: $DFT_OBJ_SUBDIR" >&5
++echo "$as_me:14261: result: $DFT_OBJ_SUBDIR" >&5
+ echo "${ECHO_T}$DFT_OBJ_SUBDIR" >&6
+
+ ### Set up low-level terminfo dependencies for makefiles.
+@@ -14469,7 +14476,7 @@
+ : ${CONFIG_STATUS=./config.status}
+ ac_clean_files_save=$ac_clean_files
+ ac_clean_files="$ac_clean_files $CONFIG_STATUS"
+-{ echo "$as_me:14472: creating $CONFIG_STATUS" >&5
++{ echo "$as_me:14479: creating $CONFIG_STATUS" >&5
+ echo "$as_me: creating $CONFIG_STATUS" >&6;}
+ cat >$CONFIG_STATUS <<_ACEOF
+ #! $SHELL
+@@ -14645,7 +14652,7 @@
+ echo "$ac_cs_version"; exit 0 ;;
+ --he | --h)
+ # Conflict between --help and --header
+- { { echo "$as_me:14648: error: ambiguous option: $1
++ { { echo "$as_me:14655: 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;}
+@@ -14664,7 +14671,7 @@
+ ac_need_defaults=false;;
+
+ # This is an error.
+- -*) { { echo "$as_me:14667: error: unrecognized option: $1
++ -*) { { echo "$as_me:14674: 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;}
+@@ -14735,7 +14742,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:14738: error: invalid argument: $ac_config_target" >&5
++ *) { { echo "$as_me:14745: error: invalid argument: $ac_config_target" >&5
+ echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
+ { (exit 1); exit 1; }; };;
+ esac
+@@ -15078,7 +15085,7 @@
+ esac
+
+ if test x"$ac_file" != x-; then
+- { echo "$as_me:15081: creating $ac_file" >&5
++ { echo "$as_me:15088: creating $ac_file" >&5
+ echo "$as_me: creating $ac_file" >&6;}
+ rm -f "$ac_file"
+ fi
+@@ -15096,7 +15103,7 @@
+ -) echo $tmp/stdin ;;
+ [\\/$]*)
+ # Absolute (can't be DOS-style, as IFS=:)
+- test -f "$f" || { { echo "$as_me:15099: error: cannot find input file: $f" >&5
++ test -f "$f" || { { echo "$as_me:15106: error: cannot find input file: $f" >&5
+ echo "$as_me: error: cannot find input file: $f" >&2;}
+ { (exit 1); exit 1; }; }
+ echo $f;;
+@@ -15109,7 +15116,7 @@
+ echo $srcdir/$f
+ else
+ # /dev/null tree
+- { { echo "$as_me:15112: error: cannot find input file: $f" >&5
++ { { echo "$as_me:15119: error: cannot find input file: $f" >&5
+ echo "$as_me: error: cannot find input file: $f" >&2;}
+ { (exit 1); exit 1; }; }
+ fi;;
+@@ -15125,7 +15132,7 @@
+ if test -n "$ac_seen"; then
+ ac_used=`grep '@datarootdir@' $ac_item`
+ if test -z "$ac_used"; then
+- { echo "$as_me:15128: WARNING: datarootdir was used implicitly but not set:
++ { echo "$as_me:15135: 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;}
+@@ -15134,7 +15141,7 @@
+ fi
+ ac_seen=`grep '${datarootdir}' $ac_item`
+ if test -n "$ac_seen"; then
+- { echo "$as_me:15137: WARNING: datarootdir was used explicitly but not set:
++ { echo "$as_me:15144: 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;}
+@@ -15171,7 +15178,7 @@
+ ac_init=`egrep '[ ]*'$ac_name'[ ]*=' $ac_file`
+ if test -z "$ac_init"; then
+ ac_seen=`echo "$ac_seen" |sed -e 's,^,'$ac_file':,'`
+- { echo "$as_me:15174: WARNING: Variable $ac_name is used but was not set:
++ { echo "$as_me:15181: 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;}
+@@ -15182,7 +15189,7 @@
+ egrep -n '@[A-Z_][A-Z_0-9]+@' $ac_file >>$tmp/out
+ if test -s $tmp/out; then
+ ac_seen=`sed -e 's,^,'$ac_file':,' < $tmp/out`
+- { echo "$as_me:15185: WARNING: Some variables may not be substituted:
++ { echo "$as_me:15192: WARNING: Some variables may not be substituted:
+ $ac_seen" >&5
+ echo "$as_me: WARNING: Some variables may not be substituted:
+ $ac_seen" >&2;}
+@@ -15231,7 +15238,7 @@
+ * ) ac_file_in=$ac_file.in ;;
+ esac
+
+- test x"$ac_file" != x- && { echo "$as_me:15234: creating $ac_file" >&5
++ test x"$ac_file" != x- && { echo "$as_me:15241: creating $ac_file" >&5
+ echo "$as_me: creating $ac_file" >&6;}
+
+ # First look for the input files in the build tree, otherwise in the
+@@ -15242,7 +15249,7 @@
+ -) echo $tmp/stdin ;;
+ [\\/$]*)
+ # Absolute (can't be DOS-style, as IFS=:)
+- test -f "$f" || { { echo "$as_me:15245: error: cannot find input file: $f" >&5
++ test -f "$f" || { { echo "$as_me:15252: error: cannot find input file: $f" >&5
+ echo "$as_me: error: cannot find input file: $f" >&2;}
+ { (exit 1); exit 1; }; }
+ echo $f;;
+@@ -15255,7 +15262,7 @@
+ echo $srcdir/$f
+ else
+ # /dev/null tree
+- { { echo "$as_me:15258: error: cannot find input file: $f" >&5
++ { { echo "$as_me:15265: error: cannot find input file: $f" >&5
+ echo "$as_me: error: cannot find input file: $f" >&2;}
+ { (exit 1); exit 1; }; }
+ fi;;
+@@ -15313,7 +15320,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:15316: $ac_file is unchanged" >&5
++ { echo "$as_me:15323: $ac_file is unchanged" >&5
+ echo "$as_me: $ac_file is unchanged" >&6;}
+ else
+ ac_dir=`$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+Index: NEWS
+Prereq: 1.2505
+--- ncurses-6.0-20151010+/NEWS 2015-10-10 20:24:26.000000000 +0000
++++ ncurses-6.0-20151017/NEWS 2015-10-17 22:02:46.000000000 +0000
+@@ -25,7 +25,7 @@
+ -- sale, use or other dealings in this Software without prior written --
+ -- authorization. --
+ -------------------------------------------------------------------------------
+--- $Id: NEWS,v 1.2505 2015/10/10 20:24:26 tom Exp $
++-- $Id: NEWS,v 1.2509 2015/10/17 22:02:46 tom Exp $
+ -------------------------------------------------------------------------------
+
+ This is a log of changes that ncurses has gone through since Zeyd started
+@@ -45,6 +45,18 @@
+ Changes through 1.9.9e did not credit all contributions;
+ it is not possible to add this information.
+
++20151017
++ + modify ncurses/Makefile.in to sort keys.list in POSIX locale
++ (Debian #801864, patch by Esa Peuha).
++ + remove an early-return from _nc_do_color, which can interfere with
++ data needed by bkgd when ncurses is configured with extended colors
++ (patch by Denis Tikhomirov).
++ > fixes for OS/2 (patches by KO Myung-Hun)
++ + use button instead of kbuf[0] in EMX-specific part of lib_mouse.c
++ + support building with libtool on OS/2
++ + use stdc++ on OS/2 kLIBC
++ + clear cf_XOPEN_SOURCE on OS/2
++
+ 20151010
+ + add configure check for openpty to test/configure script, for ditto.
+ + minor fixes to test/view.c in investigating Debian #790847.
+@@ -1713,7 +1725,7 @@
+ + modify check_existence() in db_iterator.c to simply check if the
+ path is a directory or file, according to the need. Checking for
+ directory size also gives no usable result with OS/2 (cf: 20120107).
+- + support OS/2 kLIBC (patch by KO Myung-Han).
++ + support OS/2 kLIBC (patch by KO Myung-Hun).
+
+ 20120114
+ + several improvements to test/movewindow.c (prompted by discussion on
+Index: VERSION
+--- ncurses-6.0-20151010+/VERSION 2015-10-10 17:06:12.000000000 +0000
++++ ncurses-6.0-20151017/VERSION 2015-10-17 20:29:47.000000000 +0000
+@@ -1 +1 @@
+-5:0:9 6.0 20151010
++5:0:9 6.0 20151017
+Index: aclocal.m4
+Prereq: 1.770
+--- ncurses-6.0-20151010+/aclocal.m4 2015-10-10 19:27:07.000000000 +0000
++++ ncurses-6.0-20151017/aclocal.m4 2015-10-17 23:05:09.000000000 +0000
+@@ -28,7 +28,7 @@
+ dnl
+ dnl Author: Thomas E. Dickey 1995-on
+ dnl
+-dnl $Id: aclocal.m4,v 1.770 2015/10/10 19:27:07 tom Exp $
++dnl $Id: aclocal.m4,v 1.774 2015/10/17 23:05:09 tom Exp $
+ dnl Macros used in NCURSES auto-configuration script.
+ dnl
+ dnl These macros are maintained separately from NCURSES. The copyright on
+@@ -3221,7 +3221,7 @@
+ test -z "$cf_cv_libtool_version" && unset cf_cv_libtool_version
+ ])dnl
+ dnl ---------------------------------------------------------------------------
+-dnl CF_LIB_PREFIX version: 11 updated: 2015/04/18 08:56:57
++dnl CF_LIB_PREFIX version: 12 updated: 2015/10/17 19:03:33
+ dnl -------------
+ dnl Compute the library-prefix for the given host system
+ dnl $1 = variable to set
+@@ -3229,7 +3229,11 @@
+ [
+ case $cf_cv_system_name in
+ (OS/2*|os2*)
+- LIB_PREFIX=''
++ if test "$DFT_LWR_MODEL" = libtool; then
++ LIB_PREFIX='lib'
++ else
++ LIB_PREFIX=''
++ fi
+ ;;
+ (*) LIB_PREFIX='lib'
+ ;;
+@@ -6257,7 +6261,7 @@
+ fi
+ ])dnl
+ dnl ---------------------------------------------------------------------------
+-dnl CF_STDCPP_LIBRARY version: 10 updated: 2015/09/12 15:53:39
++dnl CF_STDCPP_LIBRARY version: 11 updated: 2015/10/17 19:03:33
+ dnl -----------------
+ dnl Check for -lstdc++, which is GNU's standard C++ library.
+ dnl If $CXXLIBS is set, add that to the libraries used for test-linking.
+@@ -6282,7 +6286,11 @@
+ then
+ case $cf_cv_system_name in
+ (os2*)
+- cf_stdcpp_libname=stdcpp
++ if test -z "`g++ -dM -E - < /dev/null | grep __KLIBC__`"; then
++ cf_stdcpp_libname=stdcpp
++ else
++ cf_stdcpp_libname=stdc++
++ fi
+ ;;
+ (*)
+ cf_stdcpp_libname=stdc++
+@@ -7047,7 +7055,7 @@
+ fi
+ ])
+ dnl ---------------------------------------------------------------------------
+-dnl CF_WITH_LIBTOOL version: 32 updated: 2015/04/17 21:13:04
++dnl CF_WITH_LIBTOOL version: 33 updated: 2015/10/17 19:03:33
+ dnl ---------------
+ dnl Provide a configure option to incorporate libtool. Define several useful
+ dnl symbols for the makefile rules.
+@@ -7145,7 +7153,7 @@
+ # special hack to add -no-undefined (which libtool should do for itself)
+ LT_UNDEF=
+ case "$cf_cv_system_name" in
+- (cygwin*|msys*|mingw32*|uwin*|aix[[4-7]])
++ (cygwin*|msys*|mingw32*|os2*|uwin*|aix[[4-7]])
+ LT_UNDEF=-no-undefined
+ ;;
+ esac
+@@ -7643,7 +7651,7 @@
+ AC_SUBST(WILDCARD_SYMS)
+ ])dnl
+ dnl ---------------------------------------------------------------------------
+-dnl CF_XOPEN_SOURCE version: 49 updated: 2015/04/12 15:39:00
++dnl CF_XOPEN_SOURCE version: 50 updated: 2015/10/17 19:03:33
+ dnl ---------------
+ dnl Try to get _XOPEN_SOURCE defined properly that we can use POSIX functions,
+ dnl or adapt to the vendor's definitions to get equivalent functionality,
+@@ -7713,6 +7721,9 @@
+ (openbsd*)
+ # setting _XOPEN_SOURCE breaks xterm on OpenBSD 2.8, is not needed for ncursesw
+ ;;
++(os2*)
++ cf_XOPEN_SOURCE=
++ ;;
+ (osf[[45]]*)
+ cf_xopen_source="-D_OSF_SOURCE"
+ ;;
+Index: c++/Makefile.in
+Prereq: 1.111
+--- ncurses-6.0-20151010+/c++/Makefile.in 2015-08-05 23:15:41.000000000 +0000
++++ ncurses-6.0-20151017/c++/Makefile.in 2015-10-17 22:59:12.000000000 +0000
+@@ -1,4 +1,4 @@
+-# $Id: Makefile.in,v 1.111 2015/08/05 23:15:41 tom Exp $
++# $Id: Makefile.in,v 1.113 2015/10/17 22:59:12 tom Exp $
+ ##############################################################################
+ # Copyright (c) 1998-2014,2015 Free Software Foundation, Inc. #
+ # #
+@@ -58,7 +58,7 @@
+ PACKAGE = @PACKAGE@
+
+ LIBTOOL = @LIBTOOL_CXX@
+-LIBTOOL_OPTS = @LIBTOOL_OPTS@
++LIBTOOL_OPTS = @LIBTOOL_OPTS@ @LIBTOOL_OPTS_CXX@
+ LIBTOOL_CLEAN = @LIB_CLEAN@
+ LIBTOOL_COMPILE = @LIB_COMPILE@
+ LIBTOOL_LINK = @LIB_LINK@
+Index: configure
+--- ncurses-6.0-20151010+/configure 2015-10-10 19:18:37.000000000 +0000
++++ ncurses-6.0-20151017/configure 2015-10-17 23:05:27.000000000 +0000
+@@ -1,5 +1,5 @@
+ #! /bin/sh
+-# From configure.in Revision: 1.619 .
++# From configure.in Revision: 1.620 .
+ # Guess values for system-dependent variables and create Makefiles.
+ # Generated by Autoconf 2.52.20150926.
+ #
+@@ -4975,7 +4975,7 @@
+ # special hack to add -no-undefined (which libtool should do for itself)
+ LT_UNDEF=
+ case "$cf_cv_system_name" in
+- (cygwin*|msys*|mingw32*|uwin*|aix[4-7])
++ (cygwin*|msys*|mingw32*|os2*|uwin*|aix[4-7])
+ LT_UNDEF=-no-undefined
+ ;;
+ esac
+@@ -5124,7 +5124,11 @@
+
+ case $cf_cv_system_name in
+ (OS/2*|os2*)
+- LIB_PREFIX=''
++ if test "$DFT_LWR_MODEL" = libtool; then
++ LIB_PREFIX='lib'
++ else
++ LIB_PREFIX=''
++ fi
+ ;;
+ (*) LIB_PREFIX='lib'
+ ;;
+@@ -5140,19 +5144,19 @@
+
+ LIB_SUFFIX=
+
+- echo "$as_me:5143: checking for PATH separator" >&5
++ echo "$as_me:5147: 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:5150: result: $PATH_SEPARATOR" >&5
++ echo "$as_me:5154: result: $PATH_SEPARATOR" >&5
+ echo "${ECHO_T}$PATH_SEPARATOR" >&6
+
+ ###############################################################################
+
+-echo "$as_me:5155: checking if you want to build a separate terminfo library" >&5
++echo "$as_me:5159: 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.
+@@ -5162,10 +5166,10 @@
+ else
+ with_termlib=no
+ fi;
+-echo "$as_me:5165: result: $with_termlib" >&5
++echo "$as_me:5169: result: $with_termlib" >&5
+ echo "${ECHO_T}$with_termlib" >&6
+
+-echo "$as_me:5168: checking if you want to build a separate tic library" >&5
++echo "$as_me:5172: 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.
+@@ -5175,13 +5179,13 @@
+ else
+ with_ticlib=no
+ fi;
+-echo "$as_me:5178: result: $with_ticlib" >&5
++echo "$as_me:5182: result: $with_ticlib" >&5
+ echo "${ECHO_T}$with_ticlib" >&6
+
+ ### Checks for special libraries, must be done up-front.
+ SHLIB_LIST=""
+
+-echo "$as_me:5184: checking if you want to link with the GPM mouse library" >&5
++echo "$as_me:5188: 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.
+@@ -5191,27 +5195,27 @@
+ else
+ with_gpm=maybe
+ fi;
+-echo "$as_me:5194: result: $with_gpm" >&5
++echo "$as_me:5198: result: $with_gpm" >&5
+ echo "${ECHO_T}$with_gpm" >&6
+
+ if test "$with_gpm" != no ; then
+- echo "$as_me:5198: checking for gpm.h" >&5
++ echo "$as_me:5202: 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 5204 "configure"
++#line 5208 "configure"
+ #include "confdefs.h"
+ #include <gpm.h>
+ _ACEOF
+-if { (eval echo "$as_me:5208: \"$ac_cpp conftest.$ac_ext\"") >&5
++if { (eval echo "$as_me:5212: \"$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:5214: \$? = $ac_status" >&5
++ echo "$as_me:5218: \$? = $ac_status" >&5
+ (exit $ac_status); } >/dev/null; then
+ if test -s conftest.err; then
+ ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -5230,7 +5234,7 @@
+ fi
+ rm -f conftest.err conftest.$ac_ext
+ fi
+-echo "$as_me:5233: result: $ac_cv_header_gpm_h" >&5
++echo "$as_me:5237: 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
+
+@@ -5241,14 +5245,14 @@
+ 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}:5244: testing assuming we really have GPM library ..." 1>&5
++echo "${as_me:-configure}:5248: testing assuming we really have GPM library ..." 1>&5
+
+ cat >>confdefs.h <<\EOF
+ #define HAVE_LIBGPM 1
+ EOF
+
+ else
+- echo "$as_me:5251: checking for Gpm_Open in -lgpm" >&5
++ echo "$as_me:5255: 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
+@@ -5256,7 +5260,7 @@
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lgpm $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 5259 "configure"
++#line 5263 "configure"
+ #include "confdefs.h"
+
+ /* Override any gcc2 internal prototype to avoid an error. */
+@@ -5275,16 +5279,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:5278: \"$ac_link\"") >&5
++if { (eval echo "$as_me:5282: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:5281: \$? = $ac_status" >&5
++ echo "$as_me:5285: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -s conftest$ac_exeext'
+- { (eval echo "$as_me:5284: \"$ac_try\"") >&5
++ { (eval echo "$as_me:5288: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:5287: \$? = $ac_status" >&5
++ echo "$as_me:5291: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ ac_cv_lib_gpm_Gpm_Open=yes
+ else
+@@ -5295,13 +5299,13 @@
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:5298: result: $ac_cv_lib_gpm_Gpm_Open" >&5
++echo "$as_me:5302: 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
+ :
+ else
+
+- { { echo "$as_me:5304: error: Cannot link with GPM library" >&5
++ { { echo "$as_me:5308: error: Cannot link with GPM library" >&5
+ echo "$as_me: error: Cannot link with GPM library" >&2;}
+ { (exit 1); exit 1; }; }
+ fi
+@@ -5311,7 +5315,7 @@
+
+ else
+
+- test "$with_gpm" != maybe && { echo "$as_me:5314: WARNING: Cannot find GPM header" >&5
++ test "$with_gpm" != maybe && { echo "$as_me:5318: WARNING: Cannot find GPM header" >&5
+ echo "$as_me: WARNING: Cannot find GPM header" >&2;}
+ with_gpm=no
+
+@@ -5320,7 +5324,7 @@
+ fi
+
+ if test "$with_gpm" != no ; then
+- echo "$as_me:5323: checking if you want to load GPM dynamically" >&5
++ echo "$as_me:5327: 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.
+@@ -5330,18 +5334,18 @@
+ else
+ with_dlsym=yes
+ fi;
+- echo "$as_me:5333: result: $with_dlsym" >&5
++ echo "$as_me:5337: result: $with_dlsym" >&5
+ echo "${ECHO_T}$with_dlsym" >&6
+ if test "x$with_dlsym" = xyes ; then
+
+ cf_have_dlsym=no
+-echo "$as_me:5338: checking for dlsym" >&5
++echo "$as_me:5342: 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 5344 "configure"
++#line 5348 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+ which can conflict with char dlsym (); below. */
+@@ -5372,16 +5376,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:5375: \"$ac_link\"") >&5
++if { (eval echo "$as_me:5379: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:5378: \$? = $ac_status" >&5
++ echo "$as_me:5382: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -s conftest$ac_exeext'
+- { (eval echo "$as_me:5381: \"$ac_try\"") >&5
++ { (eval echo "$as_me:5385: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:5384: \$? = $ac_status" >&5
++ echo "$as_me:5388: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ ac_cv_func_dlsym=yes
+ else
+@@ -5391,14 +5395,14 @@
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "$as_me:5394: result: $ac_cv_func_dlsym" >&5
++echo "$as_me:5398: 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:5401: checking for dlsym in -ldl" >&5
++echo "$as_me:5405: 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
+@@ -5406,7 +5410,7 @@
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-ldl $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 5409 "configure"
++#line 5413 "configure"
+ #include "confdefs.h"
+
+ /* Override any gcc2 internal prototype to avoid an error. */
+@@ -5425,16 +5429,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:5428: \"$ac_link\"") >&5
++if { (eval echo "$as_me:5432: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:5431: \$? = $ac_status" >&5
++ echo "$as_me:5435: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -s conftest$ac_exeext'
+- { (eval echo "$as_me:5434: \"$ac_try\"") >&5
++ { (eval echo "$as_me:5438: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:5437: \$? = $ac_status" >&5
++ echo "$as_me:5441: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ ac_cv_lib_dl_dlsym=yes
+ else
+@@ -5445,7 +5449,7 @@
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:5448: result: $ac_cv_lib_dl_dlsym" >&5
++echo "$as_me:5452: 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
+
+@@ -5474,10 +5478,10 @@
+ LIBS="$cf_add_libs"
+ }
+
+- echo "$as_me:5477: checking whether able to link to dl*() functions" >&5
++ echo "$as_me:5481: 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 5480 "configure"
++#line 5484 "configure"
+ #include "confdefs.h"
+ #include <dlfcn.h>
+ int
+@@ -5495,16 +5499,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:5498: \"$ac_link\"") >&5
++if { (eval echo "$as_me:5502: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:5501: \$? = $ac_status" >&5
++ echo "$as_me:5505: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -s conftest$ac_exeext'
+- { (eval echo "$as_me:5504: \"$ac_try\"") >&5
++ { (eval echo "$as_me:5508: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:5507: \$? = $ac_status" >&5
++ echo "$as_me:5511: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+
+ cat >>confdefs.h <<\EOF
+@@ -5515,15 +5519,15 @@
+ echo "$as_me: failed program was:" >&5
+ cat conftest.$ac_ext >&5
+
+- { { echo "$as_me:5518: error: Cannot link test program for libdl" >&5
++ { { echo "$as_me:5522: 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:5523: result: ok" >&5
++ echo "$as_me:5527: result: ok" >&5
+ echo "${ECHO_T}ok" >&6
+ else
+- { { echo "$as_me:5526: error: Cannot find dlsym function" >&5
++ { { echo "$as_me:5530: error: Cannot find dlsym function" >&5
+ echo "$as_me: error: Cannot find dlsym function" >&2;}
+ { (exit 1); exit 1; }; }
+ fi
+@@ -5531,12 +5535,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}:5534: testing assuming soname for gpm is $with_gpm ..." 1>&5
++echo "${as_me:-configure}:5538: testing assuming soname for gpm is $with_gpm ..." 1>&5
+
+ cf_cv_gpm_soname="$with_gpm"
+ else
+
+-echo "$as_me:5539: checking for soname of gpm library" >&5
++echo "$as_me:5543: 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
+@@ -5570,15 +5574,15 @@
+ done
+ LIBS="$cf_add_libs"
+
+- if { (eval echo "$as_me:5573: \"$ac_compile\"") >&5
++ if { (eval echo "$as_me:5577: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:5576: \$? = $ac_status" >&5
++ echo "$as_me:5580: \$? = $ac_status" >&5
+ (exit $ac_status); } ; then
+- if { (eval echo "$as_me:5578: \"$ac_link\"") >&5
++ if { (eval echo "$as_me:5582: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:5581: \$? = $ac_status" >&5
++ echo "$as_me:5585: \$? = $ac_status" >&5
+ (exit $ac_status); } ; then
+ cf_cv_gpm_soname=`ldd conftest$ac_exeext 2>/dev/null | sed -e 's,^.*/,,' -e 's, .*$,,' | fgrep libgpm.`
+ test -z "$cf_cv_gpm_soname" && cf_cv_gpm_soname=unknown
+@@ -5589,7 +5593,7 @@
+ fi
+
+ fi
+-echo "$as_me:5592: result: $cf_cv_gpm_soname" >&5
++echo "$as_me:5596: result: $cf_cv_gpm_soname" >&5
+ echo "${ECHO_T}$cf_cv_gpm_soname" >&6
+
+ fi
+@@ -5624,7 +5628,7 @@
+ #define HAVE_LIBGPM 1
+ EOF
+
+-echo "$as_me:5627: checking for Gpm_Wgetch in -lgpm" >&5
++echo "$as_me:5631: 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
+@@ -5632,7 +5636,7 @@
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lgpm $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 5635 "configure"
++#line 5639 "configure"
+ #include "confdefs.h"
+
+ /* Override any gcc2 internal prototype to avoid an error. */
+@@ -5651,16 +5655,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:5654: \"$ac_link\"") >&5
++if { (eval echo "$as_me:5658: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:5657: \$? = $ac_status" >&5
++ echo "$as_me:5661: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -s conftest$ac_exeext'
+- { (eval echo "$as_me:5660: \"$ac_try\"") >&5
++ { (eval echo "$as_me:5664: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:5663: \$? = $ac_status" >&5
++ echo "$as_me:5667: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ ac_cv_lib_gpm_Gpm_Wgetch=yes
+ else
+@@ -5671,11 +5675,11 @@
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:5674: result: $ac_cv_lib_gpm_Gpm_Wgetch" >&5
++echo "$as_me:5678: 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:5678: checking if GPM is weakly bound to curses library" >&5
++echo "$as_me:5682: 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
+@@ -5699,15 +5703,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:5702: \"$ac_compile\"") >&5
++ if { (eval echo "$as_me:5706: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:5705: \$? = $ac_status" >&5
++ echo "$as_me:5709: \$? = $ac_status" >&5
+ (exit $ac_status); } ; then
+- if { (eval echo "$as_me:5707: \"$ac_link\"") >&5
++ if { (eval echo "$as_me:5711: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:5710: \$? = $ac_status" >&5
++ echo "$as_me:5714: \$? = $ac_status" >&5
+ (exit $ac_status); } ; then
+ cf_cv_check_gpm_wgetch=`nm conftest$ac_exeext | egrep '\<wgetch\>' | egrep '\<[vVwW]\>'`
+ test -n "$cf_cv_check_gpm_wgetch" && cf_cv_check_gpm_wgetch=yes
+@@ -5719,11 +5723,11 @@
+ fi
+
+ fi
+-echo "$as_me:5722: result: $cf_cv_check_gpm_wgetch" >&5
++echo "$as_me:5726: 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:5726: WARNING: GPM library is already linked with curses - read the FAQ" >&5
++ { echo "$as_me:5730: 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
+
+@@ -5733,7 +5737,7 @@
+
+ # not everyone has "test -c"
+ if test -c /dev/sysmouse 2>/dev/null ; then
+-echo "$as_me:5736: checking if you want to use sysmouse" >&5
++echo "$as_me:5740: 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.
+@@ -5745,7 +5749,7 @@
+ fi;
+ if test "$cf_with_sysmouse" != no ; then
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 5748 "configure"
++#line 5752 "configure"
+ #include "confdefs.h"
+
+ #include <osreldate.h>
+@@ -5768,16 +5772,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:5771: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:5775: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:5774: \$? = $ac_status" >&5
++ echo "$as_me:5778: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:5777: \"$ac_try\"") >&5
++ { (eval echo "$as_me:5781: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:5780: \$? = $ac_status" >&5
++ echo "$as_me:5784: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ cf_with_sysmouse=yes
+ else
+@@ -5787,7 +5791,7 @@
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ fi
+-echo "$as_me:5790: result: $cf_with_sysmouse" >&5
++echo "$as_me:5794: result: $cf_with_sysmouse" >&5
+ echo "${ECHO_T}$cf_with_sysmouse" >&6
+ test "$cf_with_sysmouse" = yes &&
+ cat >>confdefs.h <<\EOF
+@@ -5806,7 +5810,7 @@
+ test -n "$GXX" && test "x${ac_cv_prog_cxx_g}" != xyes && CXX_G_OPT=''
+ fi
+
+-echo "$as_me:5809: checking for default loader flags" >&5
++echo "$as_me:5813: 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='' ;;
+@@ -5815,13 +5819,13 @@
+ (profile) LD_MODEL='-pg';;
+ (shared) LD_MODEL='' ;;
+ esac
+-echo "$as_me:5818: result: $LD_MODEL" >&5
++echo "$as_me:5822: result: $LD_MODEL" >&5
+ echo "${ECHO_T}$LD_MODEL" >&6
+
+ case $DFT_LWR_MODEL in
+ (shared)
+
+-echo "$as_me:5824: checking if rpath option should be used" >&5
++echo "$as_me:5828: 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.
+@@ -5831,10 +5835,10 @@
+ else
+ cf_cv_enable_rpath=no
+ fi;
+-echo "$as_me:5834: result: $cf_cv_enable_rpath" >&5
++echo "$as_me:5838: result: $cf_cv_enable_rpath" >&5
+ echo "${ECHO_T}$cf_cv_enable_rpath" >&6
+
+-echo "$as_me:5837: checking if shared libraries should be relinked during install" >&5
++echo "$as_me:5841: 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.
+@@ -5844,7 +5848,7 @@
+ else
+ cf_cv_do_relink=yes
+ fi;
+-echo "$as_me:5847: result: $cf_cv_do_relink" >&5
++echo "$as_me:5851: result: $cf_cv_do_relink" >&5
+ echo "${ECHO_T}$cf_cv_do_relink" >&6
+ ;;
+ esac
+@@ -5853,7 +5857,7 @@
+ rel_builddir=..
+
+ LD_RPATH_OPT=
+-echo "$as_me:5856: checking for an rpath option" >&5
++echo "$as_me:5860: checking for an rpath option" >&5
+ echo $ECHO_N "checking for an rpath option... $ECHO_C" >&6
+ case $cf_cv_system_name in
+ (irix*)
+@@ -5884,12 +5888,12 @@
+ (*)
+ ;;
+ esac
+-echo "$as_me:5887: result: $LD_RPATH_OPT" >&5
++echo "$as_me:5891: result: $LD_RPATH_OPT" >&5
+ echo "${ECHO_T}$LD_RPATH_OPT" >&6
+
+ case "x$LD_RPATH_OPT" in
+ (x-R*)
+- echo "$as_me:5892: checking if we need a space after rpath option" >&5
++ echo "$as_me:5896: 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"
+
+@@ -5910,7 +5914,7 @@
+ LIBS="$cf_add_libs"
+
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 5913 "configure"
++#line 5917 "configure"
+ #include "confdefs.h"
+
+ int
+@@ -5922,16 +5926,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:5925: \"$ac_link\"") >&5
++if { (eval echo "$as_me:5929: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:5928: \$? = $ac_status" >&5
++ echo "$as_me:5932: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -s conftest$ac_exeext'
+- { (eval echo "$as_me:5931: \"$ac_try\"") >&5
++ { (eval echo "$as_me:5935: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:5934: \$? = $ac_status" >&5
++ echo "$as_me:5938: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ cf_rpath_space=no
+ else
+@@ -5941,7 +5945,7 @@
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ LIBS="$cf_save_LIBS"
+- echo "$as_me:5944: result: $cf_rpath_space" >&5
++ echo "$as_me:5948: result: $cf_rpath_space" >&5
+ echo "${ECHO_T}$cf_rpath_space" >&6
+ test "$cf_rpath_space" = yes && LD_RPATH_OPT="$LD_RPATH_OPT "
+ ;;
+@@ -5962,7 +5966,7 @@
+ cf_ld_rpath_opt=
+ test "$cf_cv_enable_rpath" = yes && cf_ld_rpath_opt="$LD_RPATH_OPT"
+
+- echo "$as_me:5965: checking if release/abi version should be used for shared libs" >&5
++ echo "$as_me:5969: 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.
+@@ -5977,9 +5981,9 @@
+ cf_cv_shlib_version=$withval
+ ;;
+ (*)
+- echo "$as_me:5980: result: $withval" >&5
++ echo "$as_me:5984: result: $withval" >&5
+ echo "${ECHO_T}$withval" >&6
+- { { echo "$as_me:5982: error: option value must be one of: rel, abi, or auto" >&5
++ { { echo "$as_me:5986: 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; }; }
+ ;;
+@@ -5988,7 +5992,7 @@
+ else
+ cf_cv_shlib_version=auto
+ fi;
+- echo "$as_me:5991: result: $cf_cv_shlib_version" >&5
++ echo "$as_me:5995: result: $cf_cv_shlib_version" >&5
+ echo "${ECHO_T}$cf_cv_shlib_version" >&6
+
+ cf_cv_rm_so_locs=no
+@@ -5998,14 +6002,14 @@
+ CC_SHARED_OPTS=
+ if test "$GCC" = yes
+ then
+- echo "$as_me:6001: checking which $CC option to use" >&5
++ echo "$as_me:6005: 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 6008 "configure"
++#line 6012 "configure"
+ #include "confdefs.h"
+ #include <stdio.h>
+ int
+@@ -6017,16 +6021,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:6020: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:6024: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:6023: \$? = $ac_status" >&5
++ echo "$as_me:6027: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:6026: \"$ac_try\"") >&5
++ { (eval echo "$as_me:6030: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:6029: \$? = $ac_status" >&5
++ echo "$as_me:6033: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ break
+ else
+@@ -6035,7 +6039,7 @@
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ done
+- echo "$as_me:6038: result: $CC_SHARED_OPTS" >&5
++ echo "$as_me:6042: result: $CC_SHARED_OPTS" >&5
+ echo "${ECHO_T}$CC_SHARED_OPTS" >&6
+ CFLAGS="$cf_save_CFLAGS"
+ fi
+@@ -6106,7 +6110,7 @@
+ MK_SHARED_LIB='${CC} ${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:6109: checking if ld -search_paths_first works" >&5
++ echo "$as_me:6113: 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
+@@ -6115,7 +6119,7 @@
+ cf_save_LDFLAGS=$LDFLAGS
+ LDFLAGS="$LDFLAGS -Wl,-search_paths_first"
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 6118 "configure"
++#line 6122 "configure"
+ #include "confdefs.h"
+
+ int
+@@ -6127,16 +6131,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:6130: \"$ac_link\"") >&5
++if { (eval echo "$as_me:6134: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:6133: \$? = $ac_status" >&5
++ echo "$as_me:6137: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -s conftest$ac_exeext'
+- { (eval echo "$as_me:6136: \"$ac_try\"") >&5
++ { (eval echo "$as_me:6140: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:6139: \$? = $ac_status" >&5
++ echo "$as_me:6143: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ cf_cv_ldflags_search_paths_first=yes
+ else
+@@ -6147,7 +6151,7 @@
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ LDFLAGS=$cf_save_LDFLAGS
+ fi
+-echo "$as_me:6150: result: $cf_cv_ldflags_search_paths_first" >&5
++echo "$as_me:6154: 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"
+@@ -6372,7 +6376,7 @@
+ do
+ CFLAGS="$cf_shared_opts $cf_save_CFLAGS"
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 6375 "configure"
++#line 6379 "configure"
+ #include "confdefs.h"
+ #include <stdio.h>
+ int
+@@ -6384,16 +6388,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:6387: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:6391: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:6390: \$? = $ac_status" >&5
++ echo "$as_me:6394: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:6393: \"$ac_try\"") >&5
++ { (eval echo "$as_me:6397: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:6396: \$? = $ac_status" >&5
++ echo "$as_me:6400: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ break
+ else
+@@ -6430,7 +6434,7 @@
+ test "$cf_cv_do_symlinks" = no && cf_cv_do_symlinks=yes
+ ;;
+ (*)
+- { echo "$as_me:6433: WARNING: ignored --with-shlib-version" >&5
++ { echo "$as_me:6437: WARNING: ignored --with-shlib-version" >&5
+ echo "$as_me: WARNING: ignored --with-shlib-version" >&2;}
+ ;;
+ esac
+@@ -6440,7 +6444,7 @@
+ if test -n "$cf_try_cflags"
+ then
+ cat > conftest.$ac_ext <<EOF
+-#line 6443 "${as_me:-configure}"
++#line 6447 "${as_me:-configure}"
+ #include <stdio.h>
+ int main(int argc, char *argv[])
+ {
+@@ -6452,18 +6456,18 @@
+ for cf_opt in $cf_try_cflags
+ do
+ CFLAGS="$cf_save_CFLAGS -$cf_opt"
+- echo "$as_me:6455: checking if CFLAGS option -$cf_opt works" >&5
++ echo "$as_me:6459: 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:6457: \"$ac_compile\"") >&5
++ if { (eval echo "$as_me:6461: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:6460: \$? = $ac_status" >&5
++ echo "$as_me:6464: \$? = $ac_status" >&5
+ (exit $ac_status); }; then
+- echo "$as_me:6462: result: yes" >&5
++ echo "$as_me:6466: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ cf_save_CFLAGS="$CFLAGS"
+ else
+- echo "$as_me:6466: result: no" >&5
++ echo "$as_me:6470: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ done
+@@ -6478,17 +6482,17 @@
+
+ test -n "$verbose" && echo " CC_SHARED_OPTS: $CC_SHARED_OPTS" 1>&6
+
+-echo "${as_me:-configure}:6481: testing CC_SHARED_OPTS: $CC_SHARED_OPTS ..." 1>&5
++echo "${as_me:-configure}:6485: 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}:6485: testing MK_SHARED_LIB: $MK_SHARED_LIB ..." 1>&5
++echo "${as_me:-configure}:6489: testing MK_SHARED_LIB: $MK_SHARED_LIB ..." 1>&5
+
+ for model in $cf_list_models; do
+ case $model in
+ (libtool)
+
+-echo "$as_me:6491: checking for additional libtool options" >&5
++echo "$as_me:6495: 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.
+@@ -6498,7 +6502,7 @@
+ else
+ with_libtool_opts=no
+ fi;
+-echo "$as_me:6501: result: $with_libtool_opts" >&5
++echo "$as_me:6505: result: $with_libtool_opts" >&5
+ echo "${ECHO_T}$with_libtool_opts" >&6
+
+ case .$with_libtool_opts in
+@@ -6509,7 +6513,7 @@
+ ;;
+ esac
+
+-echo "$as_me:6512: checking if exported-symbols file should be used" >&5
++echo "$as_me:6516: 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.
+@@ -6524,7 +6528,7 @@
+ with_export_syms='${top_srcdir}/package/${PACKAGE}.sym'
+
+ fi
+-echo "$as_me:6527: result: $with_export_syms" >&5
++echo "$as_me:6531: result: $with_export_syms" >&5
+ echo "${ECHO_T}$with_export_syms" >&6
+ if test "x$with_export_syms" != xno
+ then
+@@ -6535,12 +6539,12 @@
+ ;;
+ (shared)
+ if test "$CC_SHARED_OPTS" = "unknown"; then
+- { { echo "$as_me:6538: error: Shared libraries are not supported in this version" >&5
++ { { echo "$as_me:6542: 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
+
+-echo "$as_me:6543: checking if versioned-symbols file should be used" >&5
++echo "$as_me:6547: 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.
+@@ -6555,7 +6559,7 @@
+ with_versioned_syms='${top_srcdir}/package/${PACKAGE}.map'
+
+ fi
+-echo "$as_me:6558: result: $with_versioned_syms" >&5
++echo "$as_me:6562: result: $with_versioned_syms" >&5
+ echo "${ECHO_T}$with_versioned_syms" >&6
+
+ RESULTING_SYMS=
+@@ -6571,7 +6575,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}:6574: testing MK_SHARED_LIB: $MK_SHARED_LIB ..." 1>&5
++echo "${as_me:-configure}:6578: testing MK_SHARED_LIB: $MK_SHARED_LIB ..." 1>&5
+
+ ;;
+ (*-dy\ *)
+@@ -6579,11 +6583,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}:6582: testing MK_SHARED_LIB: $MK_SHARED_LIB ..." 1>&5
++echo "${as_me:-configure}:6586: testing MK_SHARED_LIB: $MK_SHARED_LIB ..." 1>&5
+
+ ;;
+ (*)
+- { echo "$as_me:6586: WARNING: this system does not support versioned-symbols" >&5
++ { echo "$as_me:6590: WARNING: this system does not support versioned-symbols" >&5
+ echo "$as_me: WARNING: this system does not support versioned-symbols" >&2;}
+ ;;
+ esac
+@@ -6595,7 +6599,7 @@
+ # symbols.
+ if test "x$VERSIONED_SYMS" != "x"
+ then
+- echo "$as_me:6598: checking if wildcards can be used to selectively omit symbols" >&5
++ echo "$as_me:6602: 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
+
+@@ -6632,7 +6636,7 @@
+ } submodule_1.0;
+ EOF
+ cat >conftest.$ac_ext <<EOF
+-#line 6635 "configure"
++#line 6639 "configure"
+ int _ismissing(void) { return 1; }
+ int _localf1(void) { return 1; }
+ int _localf2(void) { return 2; }
+@@ -6663,7 +6667,7 @@
+ cf_missing=`nm -P conftest.so 2>&5 |fgrep _ismissing | egrep '[ ]T[ ]'`
+ test -n "$cf_missing" && WILDCARD_SYMS=yes
+ fi
+- echo "$as_me:6666: result: $WILDCARD_SYMS" >&5
++ echo "$as_me:6670: result: $WILDCARD_SYMS" >&5
+ echo "${ECHO_T}$WILDCARD_SYMS" >&6
+ rm -f conftest.*
+ fi
+@@ -6674,7 +6678,7 @@
+ done
+
+ # pretend that ncurses==ncursesw==ncursest
+-echo "$as_me:6677: checking if you want to disable library suffixes" >&5
++echo "$as_me:6681: 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.
+@@ -6691,13 +6695,13 @@
+ disable_lib_suffixes=no
+
+ fi;
+-echo "$as_me:6694: result: $disable_lib_suffixes" >&5
++echo "$as_me:6698: 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"; then
+
+-echo "$as_me:6700: checking if rpath-hack should be disabled" >&5
++echo "$as_me:6704: 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.
+@@ -6714,21 +6718,21 @@
+ cf_disable_rpath_hack=no
+
+ fi;
+-echo "$as_me:6717: result: $cf_disable_rpath_hack" >&5
++echo "$as_me:6721: result: $cf_disable_rpath_hack" >&5
+ echo "${ECHO_T}$cf_disable_rpath_hack" >&6
+ if test "$cf_disable_rpath_hack" = no ; then
+
+-echo "$as_me:6721: checking for updated LDFLAGS" >&5
++echo "$as_me:6725: 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:6724: result: maybe" >&5
++ echo "$as_me:6728: 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:6731: checking for $ac_word" >&5
++echo "$as_me:6735: 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
+@@ -6743,7 +6747,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:6746: found $ac_dir/$ac_word" >&5
++echo "$as_me:6750: found $ac_dir/$ac_word" >&5
+ break
+ done
+
+@@ -6751,10 +6755,10 @@
+ fi
+ cf_ldd_prog=$ac_cv_prog_cf_ldd_prog
+ if test -n "$cf_ldd_prog"; then
+- echo "$as_me:6754: result: $cf_ldd_prog" >&5
++ echo "$as_me:6758: result: $cf_ldd_prog" >&5
+ echo "${ECHO_T}$cf_ldd_prog" >&6
+ else
+- echo "$as_me:6757: result: no" >&5
++ echo "$as_me:6761: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+
+@@ -6768,7 +6772,7 @@
+ cf_rpath_oops=
+
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 6771 "configure"
++#line 6775 "configure"
+ #include "confdefs.h"
+ #include <stdio.h>
+ int
+@@ -6780,16 +6784,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:6783: \"$ac_link\"") >&5
++if { (eval echo "$as_me:6787: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:6786: \$? = $ac_status" >&5
++ echo "$as_me:6790: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -s conftest$ac_exeext'
+- { (eval echo "$as_me:6789: \"$ac_try\"") >&5
++ { (eval echo "$as_me:6793: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:6792: \$? = $ac_status" >&5
++ echo "$as_me:6796: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ cf_rpath_oops=`$cf_ldd_prog conftest$ac_exeext | fgrep ' not found' | sed -e 's% =>.*$%%' |sort | uniq`
+ cf_rpath_list=`$cf_ldd_prog conftest$ac_exeext | fgrep / | sed -e 's%^.*[ ]/%/%' -e 's%/[^/][^/]*$%%' |sort | uniq`
+@@ -6817,7 +6821,7 @@
+ then
+ test -n "$verbose" && echo " ...adding -L$cf_rpath_dir/lib to LDFLAGS for $cf_rpath_src" 1>&6
+
+-echo "${as_me:-configure}:6820: testing ...adding -L$cf_rpath_dir/lib to LDFLAGS for $cf_rpath_src ..." 1>&5
++echo "${as_me:-configure}:6824: testing ...adding -L$cf_rpath_dir/lib to LDFLAGS for $cf_rpath_src ..." 1>&5
+
+ LDFLAGS="$LDFLAGS -L$cf_rpath_dir/lib"
+ break
+@@ -6829,11 +6833,11 @@
+
+ test -n "$verbose" && echo " ...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS" 1>&6
+
+-echo "${as_me:-configure}:6832: testing ...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
++echo "${as_me:-configure}:6836: testing ...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
+
+ test -n "$verbose" && echo " ...checking LDFLAGS $LDFLAGS" 1>&6
+
+-echo "${as_me:-configure}:6836: testing ...checking LDFLAGS $LDFLAGS ..." 1>&5
++echo "${as_me:-configure}:6840: testing ...checking LDFLAGS $LDFLAGS ..." 1>&5
+
+ cf_rpath_dst=
+ for cf_rpath_src in $LDFLAGS
+@@ -6870,7 +6874,7 @@
+ then
+ test -n "$verbose" && echo " ...Filter $cf_rpath_src ->$cf_rpath_tmp" 1>&6
+
+-echo "${as_me:-configure}:6873: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
++echo "${as_me:-configure}:6877: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
+
+ EXTRA_LDFLAGS="$cf_rpath_tmp $EXTRA_LDFLAGS"
+ fi
+@@ -6883,11 +6887,11 @@
+
+ test -n "$verbose" && echo " ...checked LDFLAGS $LDFLAGS" 1>&6
+
+-echo "${as_me:-configure}:6886: testing ...checked LDFLAGS $LDFLAGS ..." 1>&5
++echo "${as_me:-configure}:6890: testing ...checked LDFLAGS $LDFLAGS ..." 1>&5
+
+ test -n "$verbose" && echo " ...checking LIBS $LIBS" 1>&6
+
+-echo "${as_me:-configure}:6890: testing ...checking LIBS $LIBS ..." 1>&5
++echo "${as_me:-configure}:6894: testing ...checking LIBS $LIBS ..." 1>&5
+
+ cf_rpath_dst=
+ for cf_rpath_src in $LIBS
+@@ -6924,7 +6928,7 @@
+ then
+ test -n "$verbose" && echo " ...Filter $cf_rpath_src ->$cf_rpath_tmp" 1>&6
+
+-echo "${as_me:-configure}:6927: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
++echo "${as_me:-configure}:6931: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
+
+ EXTRA_LDFLAGS="$cf_rpath_tmp $EXTRA_LDFLAGS"
+ fi
+@@ -6937,14 +6941,14 @@
+
+ test -n "$verbose" && echo " ...checked LIBS $LIBS" 1>&6
+
+-echo "${as_me:-configure}:6940: testing ...checked LIBS $LIBS ..." 1>&5
++echo "${as_me:-configure}:6944: testing ...checked LIBS $LIBS ..." 1>&5
+
+ test -n "$verbose" && echo " ...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS" 1>&6
+
+-echo "${as_me:-configure}:6944: testing ...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
++echo "${as_me:-configure}:6948: testing ...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
+
+ else
+- echo "$as_me:6947: result: no" >&5
++ echo "$as_me:6951: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+
+@@ -6955,7 +6959,7 @@
+ ###############################################################################
+
+ ### use option --with-extra-suffix to append suffix to headers and libraries
+-echo "$as_me:6958: checking if you wish to append extra suffix to header/library paths" >&5
++echo "$as_me:6962: 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=
+
+@@ -6974,11 +6978,11 @@
+ esac
+
+ fi;
+-echo "$as_me:6977: result: $EXTRA_SUFFIX" >&5
++echo "$as_me:6981: result: $EXTRA_SUFFIX" >&5
+ echo "${ECHO_T}$EXTRA_SUFFIX" >&6
+
+ ### use option --disable-overwrite to leave out the link to -lcurses
+-echo "$as_me:6981: checking if you wish to install ncurses overwriting curses" >&5
++echo "$as_me:6985: 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.
+@@ -6988,10 +6992,10 @@
+ else
+ if test "$prefix" = "/usr" ; then with_overwrite=yes; else with_overwrite=no; fi
+ fi;
+-echo "$as_me:6991: result: $with_overwrite" >&5
++echo "$as_me:6995: result: $with_overwrite" >&5
+ echo "${ECHO_T}$with_overwrite" >&6
+
+-echo "$as_me:6994: checking if external terminfo-database is used" >&5
++echo "$as_me:6998: 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.
+@@ -7001,7 +7005,7 @@
+ else
+ use_database=yes
+ fi;
+-echo "$as_me:7004: result: $use_database" >&5
++echo "$as_me:7008: result: $use_database" >&5
+ echo "${ECHO_T}$use_database" >&6
+
+ case $host_os in
+@@ -7017,7 +7021,7 @@
+ if test "$use_database" != no ; then
+ NCURSES_USE_DATABASE=1
+
+- echo "$as_me:7020: checking which terminfo source-file will be installed" >&5
++ echo "$as_me:7024: 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.
+@@ -7025,10 +7029,10 @@
+ withval="$with_database"
+ TERMINFO_SRC=$withval
+ fi;
+- echo "$as_me:7028: result: $TERMINFO_SRC" >&5
++ echo "$as_me:7032: result: $TERMINFO_SRC" >&5
+ echo "${ECHO_T}$TERMINFO_SRC" >&6
+
+- echo "$as_me:7031: checking whether to use hashed database instead of directory/tree" >&5
++ echo "$as_me:7035: 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.
+@@ -7038,13 +7042,13 @@
+ else
+ with_hashed_db=no
+ fi;
+- echo "$as_me:7041: result: $with_hashed_db" >&5
++ echo "$as_me:7045: result: $with_hashed_db" >&5
+ echo "${ECHO_T}$with_hashed_db" >&6
+ else
+ with_hashed_db=no
+ fi
+
+-echo "$as_me:7047: checking for list of fallback descriptions" >&5
++echo "$as_me:7051: 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.
+@@ -7054,11 +7058,11 @@
+ else
+ with_fallback=
+ fi;
+-echo "$as_me:7057: result: $with_fallback" >&5
++echo "$as_me:7061: result: $with_fallback" >&5
+ echo "${ECHO_T}$with_fallback" >&6
+ FALLBACK_LIST=`echo "$with_fallback" | sed -e 's/,/ /g'`
+
+-echo "$as_me:7061: checking if you want modern xterm or antique" >&5
++echo "$as_me:7065: 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.
+@@ -7072,11 +7076,11 @@
+ (no) with_xterm_new=xterm-old;;
+ (*) with_xterm_new=xterm-new;;
+ esac
+-echo "$as_me:7075: result: $with_xterm_new" >&5
++echo "$as_me:7079: result: $with_xterm_new" >&5
+ echo "${ECHO_T}$with_xterm_new" >&6
+ WHICH_XTERM=$with_xterm_new
+
+-echo "$as_me:7079: checking if xterm backspace sends BS or DEL" >&5
++echo "$as_me:7083: 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.
+@@ -7097,7 +7101,7 @@
+ with_xterm_kbs=$withval
+ ;;
+ esac
+-echo "$as_me:7100: result: $with_xterm_kbs" >&5
++echo "$as_me:7104: result: $with_xterm_kbs" >&5
+ echo "${ECHO_T}$with_xterm_kbs" >&6
+ XTERM_KBS=$with_xterm_kbs
+
+@@ -7107,7 +7111,7 @@
+ MAKE_TERMINFO="#"
+ else
+
+-echo "$as_me:7110: checking for list of terminfo directories" >&5
++echo "$as_me:7114: 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.
+@@ -7147,7 +7151,7 @@
+ cf_src_path=`echo $cf_src_path | sed -e s%NONE%$cf_path_syntax%`
+ ;;
+ (*)
+- { { echo "$as_me:7150: error: expected a pathname, not \"$cf_src_path\"" >&5
++ { { echo "$as_me:7154: 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; }; }
+ ;;
+@@ -7170,14 +7174,14 @@
+ ;;
+ esac
+
+-echo "$as_me:7173: result: $TERMINFO_DIRS" >&5
++echo "$as_me:7177: result: $TERMINFO_DIRS" >&5
+ echo "${ECHO_T}$TERMINFO_DIRS" >&6
+ test -n "$TERMINFO_DIRS" &&
+ cat >>confdefs.h <<EOF
+ #define TERMINFO_DIRS "$TERMINFO_DIRS"
+ EOF
+
+-echo "$as_me:7180: checking for default terminfo directory" >&5
++echo "$as_me:7184: 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.
+@@ -7213,7 +7217,7 @@
+ withval=`echo $withval | sed -e s%NONE%$cf_path_syntax%`
+ ;;
+ (*)
+- { { echo "$as_me:7216: error: expected a pathname, not \"$withval\"" >&5
++ { { echo "$as_me:7220: error: expected a pathname, not \"$withval\"" >&5
+ echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
+ { (exit 1); exit 1; }; }
+ ;;
+@@ -7222,7 +7226,7 @@
+ fi
+ eval TERMINFO="$withval"
+
+-echo "$as_me:7225: result: $TERMINFO" >&5
++echo "$as_me:7229: result: $TERMINFO" >&5
+ echo "${ECHO_T}$TERMINFO" >&6
+
+ cat >>confdefs.h <<EOF
+@@ -7233,7 +7237,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:7236: checking if big-core option selected" >&5
++echo "$as_me:7240: 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.
+@@ -7245,7 +7249,7 @@
+ with_big_core=no
+ else
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 7248 "configure"
++#line 7252 "configure"
+ #include "confdefs.h"
+
+ #include <stdlib.h>
+@@ -7259,15 +7263,15 @@
+ }
+ _ACEOF
+ rm -f conftest$ac_exeext
+-if { (eval echo "$as_me:7262: \"$ac_link\"") >&5
++if { (eval echo "$as_me:7266: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:7265: \$? = $ac_status" >&5
++ echo "$as_me:7269: \$? = $ac_status" >&5
+ (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+- { (eval echo "$as_me:7267: \"$ac_try\"") >&5
++ { (eval echo "$as_me:7271: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:7270: \$? = $ac_status" >&5
++ echo "$as_me:7274: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ with_big_core=yes
+ else
+@@ -7279,7 +7283,7 @@
+ rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+ fi
+ fi;
+-echo "$as_me:7282: result: $with_big_core" >&5
++echo "$as_me:7286: result: $with_big_core" >&5
+ echo "${ECHO_T}$with_big_core" >&6
+ test "x$with_big_core" = "xyes" &&
+ cat >>confdefs.h <<\EOF
+@@ -7289,7 +7293,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:7292: checking if big-strings option selected" >&5
++echo "$as_me:7296: 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.
+@@ -7313,14 +7317,14 @@
+ esac
+
+ fi;
+-echo "$as_me:7316: result: $with_big_strings" >&5
++echo "$as_me:7320: 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:7323: checking if you want termcap-fallback support" >&5
++echo "$as_me:7327: 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.
+@@ -7330,14 +7334,14 @@
+ else
+ with_termcap=no
+ fi;
+-echo "$as_me:7333: result: $with_termcap" >&5
++echo "$as_me:7337: 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:7340: error: You have disabled the database w/o specifying fallbacks" >&5
++ { { echo "$as_me:7344: 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
+@@ -7350,13 +7354,13 @@
+ else
+
+ if test "$with_ticlib" != no ; then
+- { { echo "$as_me:7353: error: Options --with-ticlib and --enable-termcap cannot be combined" >&5
++ { { echo "$as_me:7357: 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:7359: checking for list of termcap files" >&5
++ echo "$as_me:7363: 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.
+@@ -7396,7 +7400,7 @@
+ cf_src_path=`echo $cf_src_path | sed -e s%NONE%$cf_path_syntax%`
+ ;;
+ (*)
+- { { echo "$as_me:7399: error: expected a pathname, not \"$cf_src_path\"" >&5
++ { { echo "$as_me:7403: 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; }; }
+ ;;
+@@ -7419,7 +7423,7 @@
+ ;;
+ esac
+
+- echo "$as_me:7422: result: $TERMPATH" >&5
++ echo "$as_me:7426: result: $TERMPATH" >&5
+ echo "${ECHO_T}$TERMPATH" >&6
+ test -n "$TERMPATH" &&
+ cat >>confdefs.h <<EOF
+@@ -7427,7 +7431,7 @@
+ EOF
+
+ ### use option --enable-getcap to use a hacked getcap for reading termcaps
+- echo "$as_me:7430: checking if fast termcap-loader is needed" >&5
++ echo "$as_me:7434: 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.
+@@ -7437,14 +7441,14 @@
+ else
+ with_getcap=no
+ fi;
+- echo "$as_me:7440: result: $with_getcap" >&5
++ echo "$as_me:7444: 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:7447: checking if translated termcaps will be cached in ~/.terminfo" >&5
++ echo "$as_me:7451: 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.
+@@ -7454,7 +7458,7 @@
+ else
+ with_getcap_cache=no
+ fi;
+- echo "$as_me:7457: result: $with_getcap_cache" >&5
++ echo "$as_me:7461: result: $with_getcap_cache" >&5
+ echo "${ECHO_T}$with_getcap_cache" >&6
+ test "x$with_getcap_cache" = "xyes" &&
+ cat >>confdefs.h <<\EOF
+@@ -7464,7 +7468,7 @@
+ fi
+
+ ### Use option --disable-home-terminfo to completely remove ~/.terminfo
+-echo "$as_me:7467: checking if ~/.terminfo is wanted" >&5
++echo "$as_me:7471: 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.
+@@ -7474,14 +7478,14 @@
+ else
+ with_home_terminfo=yes
+ fi;
+-echo "$as_me:7477: result: $with_home_terminfo" >&5
++echo "$as_me:7481: 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:7484: checking if you want to use restricted environment when running as root" >&5
++echo "$as_me:7488: checking if you want to use restricted environment when running as root" >&5
+ echo $ECHO_N "checking if you want to use restricted environment when running as root... $ECHO_C" >&6
+
+ # Check whether --enable-root-environ or --disable-root-environ was given.
+@@ -7491,7 +7495,7 @@
+ else
+ with_root_environ=yes
+ fi;
+-echo "$as_me:7494: result: $with_root_environ" >&5
++echo "$as_me:7498: result: $with_root_environ" >&5
+ echo "${ECHO_T}$with_root_environ" >&6
+ test "x$with_root_environ" = xyes &&
+ cat >>confdefs.h <<\EOF
+@@ -7506,13 +7510,13 @@
+ unlink
+ do
+ as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+-echo "$as_me:7509: checking for $ac_func" >&5
++echo "$as_me:7513: 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 7515 "configure"
++#line 7519 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+ which can conflict with char $ac_func (); below. */
+@@ -7543,16 +7547,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:7546: \"$ac_link\"") >&5
++if { (eval echo "$as_me:7550: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:7549: \$? = $ac_status" >&5
++ echo "$as_me:7553: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -s conftest$ac_exeext'
+- { (eval echo "$as_me:7552: \"$ac_try\"") >&5
++ { (eval echo "$as_me:7556: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:7555: \$? = $ac_status" >&5
++ echo "$as_me:7559: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ eval "$as_ac_var=yes"
+ else
+@@ -7562,7 +7566,7 @@
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "$as_me:7565: result: `eval echo '${'$as_ac_var'}'`" >&5
++echo "$as_me:7569: 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
+@@ -7579,13 +7583,13 @@
+ symlink
+ do
+ as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+-echo "$as_me:7582: checking for $ac_func" >&5
++echo "$as_me:7586: 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 7588 "configure"
++#line 7592 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+ which can conflict with char $ac_func (); below. */
+@@ -7616,16 +7620,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:7619: \"$ac_link\"") >&5
++if { (eval echo "$as_me:7623: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:7622: \$? = $ac_status" >&5
++ echo "$as_me:7626: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -s conftest$ac_exeext'
+- { (eval echo "$as_me:7625: \"$ac_try\"") >&5
++ { (eval echo "$as_me:7629: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:7628: \$? = $ac_status" >&5
++ echo "$as_me:7632: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ eval "$as_ac_var=yes"
+ else
+@@ -7635,7 +7639,7 @@
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "$as_me:7638: result: `eval echo '${'$as_ac_var'}'`" >&5
++echo "$as_me:7642: 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
+@@ -7646,7 +7650,7 @@
+ done
+
+ else
+- echo "$as_me:7649: checking if link/symlink functions work" >&5
++ echo "$as_me:7653: 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
+@@ -7659,7 +7663,7 @@
+ eval 'ac_cv_func_'$cf_func'=error'
+ else
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 7662 "configure"
++#line 7666 "configure"
+ #include "confdefs.h"
+
+ #include <sys/types.h>
+@@ -7689,15 +7693,15 @@
+
+ _ACEOF
+ rm -f conftest$ac_exeext
+-if { (eval echo "$as_me:7692: \"$ac_link\"") >&5
++if { (eval echo "$as_me:7696: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:7695: \$? = $ac_status" >&5
++ echo "$as_me:7699: \$? = $ac_status" >&5
+ (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+- { (eval echo "$as_me:7697: \"$ac_try\"") >&5
++ { (eval echo "$as_me:7701: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:7700: \$? = $ac_status" >&5
++ echo "$as_me:7704: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+
+ cf_cv_link_funcs="$cf_cv_link_funcs $cf_func"
+@@ -7715,7 +7719,7 @@
+ test -z "$cf_cv_link_funcs" && cf_cv_link_funcs=no
+
+ fi
+-echo "$as_me:7718: result: $cf_cv_link_funcs" >&5
++echo "$as_me:7722: result: $cf_cv_link_funcs" >&5
+ echo "${ECHO_T}$cf_cv_link_funcs" >&6
+ test "$ac_cv_func_link" = yes &&
+ cat >>confdefs.h <<\EOF
+@@ -7735,7 +7739,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:7738: checking if tic should use symbolic links" >&5
++ echo "$as_me:7742: 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.
+@@ -7745,21 +7749,21 @@
+ else
+ with_symlinks=no
+ fi;
+- echo "$as_me:7748: result: $with_symlinks" >&5
++ echo "$as_me:7752: 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:7755: checking if tic should use hard links" >&5
++ echo "$as_me:7759: 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:7762: result: $with_links" >&5
++ echo "$as_me:7766: result: $with_links" >&5
+ echo "${ECHO_T}$with_links" >&6
+ fi
+
+@@ -7774,7 +7778,7 @@
+ EOF
+
+ ### use option --enable-broken-linker to force on use of broken-linker support
+-echo "$as_me:7777: checking if you want broken-linker support code" >&5
++echo "$as_me:7781: 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.
+@@ -7784,7 +7788,7 @@
+ else
+ with_broken_linker=${BROKEN_LINKER:-no}
+ fi;
+-echo "$as_me:7787: result: $with_broken_linker" >&5
++echo "$as_me:7791: result: $with_broken_linker" >&5
+ echo "${ECHO_T}$with_broken_linker" >&6
+
+ BROKEN_LINKER=0
+@@ -7806,14 +7810,14 @@
+ BROKEN_LINKER=1
+ test -n "$verbose" && echo " cygwin linker is broken anyway" 1>&6
+
+-echo "${as_me:-configure}:7809: testing cygwin linker is broken anyway ..." 1>&5
++echo "${as_me:-configure}:7813: testing cygwin linker is broken anyway ..." 1>&5
+
+ ;;
+ esac
+ fi
+
+ ### use option --enable-bsdpad to have tputs process BSD-style prefix padding
+-echo "$as_me:7816: checking if tputs should process BSD-style prefix padding" >&5
++echo "$as_me:7820: 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.
+@@ -7823,7 +7827,7 @@
+ else
+ with_bsdpad=no
+ fi;
+-echo "$as_me:7826: result: $with_bsdpad" >&5
++echo "$as_me:7830: result: $with_bsdpad" >&5
+ echo "${ECHO_T}$with_bsdpad" >&6
+ test "x$with_bsdpad" = xyes &&
+ cat >>confdefs.h <<\EOF
+@@ -7880,14 +7884,14 @@
+ ;;
+ (linux*|gnu*|mint*|k*bsd*-gnu)
+
+-echo "$as_me:7883: checking if we must define _GNU_SOURCE" >&5
++echo "$as_me:7887: 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 7890 "configure"
++#line 7894 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ int
+@@ -7902,16 +7906,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:7905: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:7909: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:7908: \$? = $ac_status" >&5
++ echo "$as_me:7912: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:7911: \"$ac_try\"") >&5
++ { (eval echo "$as_me:7915: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:7914: \$? = $ac_status" >&5
++ echo "$as_me:7918: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ cf_cv_gnu_source=no
+ else
+@@ -7920,7 +7924,7 @@
+ cf_save="$CPPFLAGS"
+ CPPFLAGS="$CPPFLAGS -D_GNU_SOURCE"
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 7923 "configure"
++#line 7927 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ int
+@@ -7935,16 +7939,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:7938: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:7942: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:7941: \$? = $ac_status" >&5
++ echo "$as_me:7945: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:7944: \"$ac_try\"") >&5
++ { (eval echo "$as_me:7948: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:7947: \$? = $ac_status" >&5
++ echo "$as_me:7951: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ cf_cv_gnu_source=no
+ else
+@@ -7959,7 +7963,7 @@
+ rm -f conftest.$ac_objext conftest.$ac_ext
+
+ fi
+-echo "$as_me:7962: result: $cf_cv_gnu_source" >&5
++echo "$as_me:7966: result: $cf_cv_gnu_source" >&5
+ echo "${ECHO_T}$cf_cv_gnu_source" >&6
+ test "$cf_cv_gnu_source" = yes && CPPFLAGS="$CPPFLAGS -D_GNU_SOURCE"
+
+@@ -7984,16 +7988,16 @@
+ sed -e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ ]*\)\?[ ]/ /g' \
+ -e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ ]*\)\?$//g'`
+
+-echo "$as_me:7987: checking if we should define _POSIX_C_SOURCE" >&5
++echo "$as_me:7991: 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}:7993: testing if the symbol is already defined go no further ..." 1>&5
++echo "${as_me:-configure}:7997: testing if the symbol is already defined go no further ..." 1>&5
+
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 7996 "configure"
++#line 8000 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ int
+@@ -8008,16 +8012,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:8011: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:8015: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:8014: \$? = $ac_status" >&5
++ echo "$as_me:8018: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:8017: \"$ac_try\"") >&5
++ { (eval echo "$as_me:8021: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:8020: \$? = $ac_status" >&5
++ echo "$as_me:8024: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ cf_cv_posix_c_source=no
+ else
+@@ -8038,7 +8042,7 @@
+ esac
+ if test "$cf_want_posix_source" = yes ; then
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 8041 "configure"
++#line 8045 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ int
+@@ -8053,16 +8057,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:8056: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:8060: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:8059: \$? = $ac_status" >&5
++ echo "$as_me:8063: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:8062: \"$ac_try\"") >&5
++ { (eval echo "$as_me:8066: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:8065: \$? = $ac_status" >&5
++ echo "$as_me:8069: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ :
+ else
+@@ -8073,15 +8077,15 @@
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ fi
+
+-echo "${as_me:-configure}:8076: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
++echo "${as_me:-configure}:8080: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
+
+ CFLAGS="$cf_trim_CFLAGS"
+ CPPFLAGS="$cf_trim_CPPFLAGS $cf_cv_posix_c_source"
+
+-echo "${as_me:-configure}:8081: testing if the second compile does not leave our definition intact error ..." 1>&5
++echo "${as_me:-configure}:8085: testing if the second compile does not leave our definition intact error ..." 1>&5
+
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 8084 "configure"
++#line 8088 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ int
+@@ -8096,16 +8100,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:8099: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:8103: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:8102: \$? = $ac_status" >&5
++ echo "$as_me:8106: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:8105: \"$ac_try\"") >&5
++ { (eval echo "$as_me:8109: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:8108: \$? = $ac_status" >&5
++ echo "$as_me:8112: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ :
+ else
+@@ -8121,7 +8125,7 @@
+ rm -f conftest.$ac_objext conftest.$ac_ext
+
+ fi
+-echo "$as_me:8124: result: $cf_cv_posix_c_source" >&5
++echo "$as_me:8128: 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
+@@ -8220,6 +8224,9 @@
+ (openbsd*)
+ # setting _XOPEN_SOURCE breaks xterm on OpenBSD 2.8, is not needed for ncursesw
+ ;;
++(os2*)
++ cf_XOPEN_SOURCE=
++ ;;
+ (osf[45]*)
+ cf_xopen_source="-D_OSF_SOURCE"
+ ;;
+@@ -8239,14 +8246,14 @@
+ ;;
+ (*)
+
+-echo "$as_me:8242: checking if we should define _XOPEN_SOURCE" >&5
++echo "$as_me:8249: 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 8249 "configure"
++#line 8256 "configure"
+ #include "confdefs.h"
+
+ #include <stdlib.h>
+@@ -8265,16 +8272,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:8268: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:8275: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:8271: \$? = $ac_status" >&5
++ echo "$as_me:8278: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:8274: \"$ac_try\"") >&5
++ { (eval echo "$as_me:8281: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:8277: \$? = $ac_status" >&5
++ echo "$as_me:8284: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ cf_cv_xopen_source=no
+ else
+@@ -8283,7 +8290,7 @@
+ cf_save="$CPPFLAGS"
+ CPPFLAGS="$CPPFLAGS -D_XOPEN_SOURCE=$cf_XOPEN_SOURCE"
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 8286 "configure"
++#line 8293 "configure"
+ #include "confdefs.h"
+
+ #include <stdlib.h>
+@@ -8302,16 +8309,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:8305: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:8312: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:8308: \$? = $ac_status" >&5
++ echo "$as_me:8315: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:8311: \"$ac_try\"") >&5
++ { (eval echo "$as_me:8318: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:8314: \$? = $ac_status" >&5
++ echo "$as_me:8321: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ cf_cv_xopen_source=no
+ else
+@@ -8326,7 +8333,7 @@
+ rm -f conftest.$ac_objext conftest.$ac_ext
+
+ fi
+-echo "$as_me:8329: result: $cf_cv_xopen_source" >&5
++echo "$as_me:8336: result: $cf_cv_xopen_source" >&5
+ echo "${ECHO_T}$cf_cv_xopen_source" >&6
+
+ if test "$cf_cv_xopen_source" != no ; then
+@@ -8434,16 +8441,16 @@
+ sed -e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ ]*\)\?[ ]/ /g' \
+ -e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ ]*\)\?$//g'`
+
+-echo "$as_me:8437: checking if we should define _POSIX_C_SOURCE" >&5
++echo "$as_me:8444: 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}:8443: testing if the symbol is already defined go no further ..." 1>&5
++echo "${as_me:-configure}:8450: testing if the symbol is already defined go no further ..." 1>&5
+
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 8446 "configure"
++#line 8453 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ int
+@@ -8458,16 +8465,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:8461: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:8468: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:8464: \$? = $ac_status" >&5
++ echo "$as_me:8471: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:8467: \"$ac_try\"") >&5
++ { (eval echo "$as_me:8474: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:8470: \$? = $ac_status" >&5
++ echo "$as_me:8477: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ cf_cv_posix_c_source=no
+ else
+@@ -8488,7 +8495,7 @@
+ esac
+ if test "$cf_want_posix_source" = yes ; then
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 8491 "configure"
++#line 8498 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ int
+@@ -8503,16 +8510,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:8506: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:8513: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:8509: \$? = $ac_status" >&5
++ echo "$as_me:8516: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:8512: \"$ac_try\"") >&5
++ { (eval echo "$as_me:8519: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:8515: \$? = $ac_status" >&5
++ echo "$as_me:8522: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ :
+ else
+@@ -8523,15 +8530,15 @@
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ fi
+
+-echo "${as_me:-configure}:8526: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
++echo "${as_me:-configure}:8533: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
+
+ CFLAGS="$cf_trim_CFLAGS"
+ CPPFLAGS="$cf_trim_CPPFLAGS $cf_cv_posix_c_source"
+
+-echo "${as_me:-configure}:8531: testing if the second compile does not leave our definition intact error ..." 1>&5
++echo "${as_me:-configure}:8538: testing if the second compile does not leave our definition intact error ..." 1>&5
+
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 8534 "configure"
++#line 8541 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ int
+@@ -8546,16 +8553,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:8549: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:8556: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:8552: \$? = $ac_status" >&5
++ echo "$as_me:8559: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:8555: \"$ac_try\"") >&5
++ { (eval echo "$as_me:8562: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:8558: \$? = $ac_status" >&5
++ echo "$as_me:8565: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ :
+ else
+@@ -8571,7 +8578,7 @@
+ rm -f conftest.$ac_objext conftest.$ac_ext
+
+ fi
+-echo "$as_me:8574: result: $cf_cv_posix_c_source" >&5
++echo "$as_me:8581: 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
+@@ -8729,7 +8736,7 @@
+ if test -n "$cf_new_cflags" ; then
+ test -n "$verbose" && echo " add to \$CFLAGS $cf_new_cflags" 1>&6
+
+-echo "${as_me:-configure}:8732: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
++echo "${as_me:-configure}:8739: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
+
+ CFLAGS="$CFLAGS $cf_new_cflags"
+ fi
+@@ -8737,7 +8744,7 @@
+ if test -n "$cf_new_cppflags" ; then
+ test -n "$verbose" && echo " add to \$CPPFLAGS $cf_new_cppflags" 1>&6
+
+-echo "${as_me:-configure}:8740: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
++echo "${as_me:-configure}:8747: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
+
+ CPPFLAGS="$CPPFLAGS $cf_new_cppflags"
+ fi
+@@ -8745,7 +8752,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}:8748: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5
++echo "${as_me:-configure}:8755: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5
+
+ EXTRA_CPPFLAGS="$cf_new_extra_cppflags $EXTRA_CPPFLAGS"
+ fi
+@@ -8753,10 +8760,10 @@
+ fi
+
+ if test -n "$cf_XOPEN_SOURCE" && test -z "$cf_cv_xopen_source" ; then
+- echo "$as_me:8756: checking if _XOPEN_SOURCE really is set" >&5
++ echo "$as_me:8763: 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 8759 "configure"
++#line 8766 "configure"
+ #include "confdefs.h"
+ #include <stdlib.h>
+ int
+@@ -8771,16 +8778,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:8774: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:8781: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:8777: \$? = $ac_status" >&5
++ echo "$as_me:8784: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:8780: \"$ac_try\"") >&5
++ { (eval echo "$as_me:8787: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:8783: \$? = $ac_status" >&5
++ echo "$as_me:8790: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ cf_XOPEN_SOURCE_set=yes
+ else
+@@ -8789,12 +8796,12 @@
+ cf_XOPEN_SOURCE_set=no
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+- echo "$as_me:8792: result: $cf_XOPEN_SOURCE_set" >&5
++ echo "$as_me:8799: 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 8797 "configure"
++#line 8804 "configure"
+ #include "confdefs.h"
+ #include <stdlib.h>
+ int
+@@ -8809,16 +8816,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:8812: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:8819: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:8815: \$? = $ac_status" >&5
++ echo "$as_me:8822: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:8818: \"$ac_try\"") >&5
++ { (eval echo "$as_me:8825: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:8821: \$? = $ac_status" >&5
++ echo "$as_me:8828: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ cf_XOPEN_SOURCE_set_ok=yes
+ else
+@@ -8829,19 +8836,19 @@
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ if test $cf_XOPEN_SOURCE_set_ok = no
+ then
+- { echo "$as_me:8832: WARNING: _XOPEN_SOURCE is lower than requested" >&5
++ { echo "$as_me:8839: WARNING: _XOPEN_SOURCE is lower than requested" >&5
+ echo "$as_me: WARNING: _XOPEN_SOURCE is lower than requested" >&2;}
+ fi
+ else
+
+-echo "$as_me:8837: checking if we should define _XOPEN_SOURCE" >&5
++echo "$as_me:8844: 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 8844 "configure"
++#line 8851 "configure"
+ #include "confdefs.h"
+
+ #include <stdlib.h>
+@@ -8860,16 +8867,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:8863: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:8870: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:8866: \$? = $ac_status" >&5
++ echo "$as_me:8873: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:8869: \"$ac_try\"") >&5
++ { (eval echo "$as_me:8876: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:8872: \$? = $ac_status" >&5
++ echo "$as_me:8879: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ cf_cv_xopen_source=no
+ else
+@@ -8878,7 +8885,7 @@
+ cf_save="$CPPFLAGS"
+ CPPFLAGS="$CPPFLAGS -D_XOPEN_SOURCE=$cf_XOPEN_SOURCE"
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 8881 "configure"
++#line 8888 "configure"
+ #include "confdefs.h"
+
+ #include <stdlib.h>
+@@ -8897,16 +8904,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:8900: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:8907: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:8903: \$? = $ac_status" >&5
++ echo "$as_me:8910: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:8906: \"$ac_try\"") >&5
++ { (eval echo "$as_me:8913: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:8909: \$? = $ac_status" >&5
++ echo "$as_me:8916: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ cf_cv_xopen_source=no
+ else
+@@ -8921,7 +8928,7 @@
+ rm -f conftest.$ac_objext conftest.$ac_ext
+
+ fi
+-echo "$as_me:8924: result: $cf_cv_xopen_source" >&5
++echo "$as_me:8931: result: $cf_cv_xopen_source" >&5
+ echo "${ECHO_T}$cf_cv_xopen_source" >&6
+
+ if test "$cf_cv_xopen_source" != no ; then
+@@ -9023,14 +9030,14 @@
+
+ # Work around breakage on OS X
+
+-echo "$as_me:9026: checking if SIGWINCH is defined" >&5
++echo "$as_me:9033: 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 9033 "configure"
++#line 9040 "configure"
+ #include "confdefs.h"
+
+ #include <sys/types.h>
+@@ -9045,23 +9052,23 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:9048: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:9055: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:9051: \$? = $ac_status" >&5
++ echo "$as_me:9058: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:9054: \"$ac_try\"") >&5
++ { (eval echo "$as_me:9061: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:9057: \$? = $ac_status" >&5
++ echo "$as_me:9064: \$? = $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 9064 "configure"
++#line 9071 "configure"
+ #include "confdefs.h"
+
+ #undef _XOPEN_SOURCE
+@@ -9079,16 +9086,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:9082: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:9089: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:9085: \$? = $ac_status" >&5
++ echo "$as_me:9092: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:9088: \"$ac_try\"") >&5
++ { (eval echo "$as_me:9095: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:9091: \$? = $ac_status" >&5
++ echo "$as_me:9098: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ cf_cv_define_sigwinch=maybe
+ else
+@@ -9102,11 +9109,11 @@
+ rm -f conftest.$ac_objext conftest.$ac_ext
+
+ fi
+-echo "$as_me:9105: result: $cf_cv_define_sigwinch" >&5
++echo "$as_me:9112: 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:9109: checking for actual SIGWINCH definition" >&5
++echo "$as_me:9116: 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
+@@ -9117,7 +9124,7 @@
+ while test $cf_sigwinch != 1
+ do
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 9120 "configure"
++#line 9127 "configure"
+ #include "confdefs.h"
+
+ #undef _XOPEN_SOURCE
+@@ -9139,16 +9146,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:9142: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:9149: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:9145: \$? = $ac_status" >&5
++ echo "$as_me:9152: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:9148: \"$ac_try\"") >&5
++ { (eval echo "$as_me:9155: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:9151: \$? = $ac_status" >&5
++ echo "$as_me:9158: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ cf_cv_fixup_sigwinch=$cf_sigwinch
+ break
+@@ -9162,7 +9169,7 @@
+ done
+
+ fi
+-echo "$as_me:9165: result: $cf_cv_fixup_sigwinch" >&5
++echo "$as_me:9172: result: $cf_cv_fixup_sigwinch" >&5
+ echo "${ECHO_T}$cf_cv_fixup_sigwinch" >&6
+
+ if test "$cf_cv_fixup_sigwinch" != unknown ; then
+@@ -9172,13 +9179,13 @@
+
+ # Checks for CODESET support.
+
+-echo "$as_me:9175: checking for nl_langinfo and CODESET" >&5
++echo "$as_me:9182: 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 9181 "configure"
++#line 9188 "configure"
+ #include "confdefs.h"
+ #include <langinfo.h>
+ int
+@@ -9190,16 +9197,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:9193: \"$ac_link\"") >&5
++if { (eval echo "$as_me:9200: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:9196: \$? = $ac_status" >&5
++ echo "$as_me:9203: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -s conftest$ac_exeext'
+- { (eval echo "$as_me:9199: \"$ac_try\"") >&5
++ { (eval echo "$as_me:9206: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:9202: \$? = $ac_status" >&5
++ echo "$as_me:9209: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ am_cv_langinfo_codeset=yes
+ else
+@@ -9210,7 +9217,7 @@
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+
+ fi
+-echo "$as_me:9213: result: $am_cv_langinfo_codeset" >&5
++echo "$as_me:9220: result: $am_cv_langinfo_codeset" >&5
+ echo "${ECHO_T}$am_cv_langinfo_codeset" >&6
+ if test $am_cv_langinfo_codeset = yes; then
+
+@@ -9224,7 +9231,7 @@
+ NCURSES_OK_WCHAR_T=
+ NCURSES_OK_WINT_T=
+
+-echo "$as_me:9227: checking if you want wide-character code" >&5
++echo "$as_me:9234: 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.
+@@ -9234,7 +9241,7 @@
+ else
+ with_widec=no
+ fi;
+-echo "$as_me:9237: result: $with_widec" >&5
++echo "$as_me:9244: result: $with_widec" >&5
+ echo "${ECHO_T}$with_widec" >&6
+ if test "x$with_widec" = xyes ; then
+ if test "x$disable_lib_suffixes" = xno ; then
+@@ -9249,14 +9256,14 @@
+ #define NCURSES_WIDECHAR 1
+ EOF
+
+-echo "$as_me:9252: checking if wchar.h can be used as is" >&5
++echo "$as_me:9259: 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 9259 "configure"
++#line 9266 "configure"
+ #include "confdefs.h"
+
+ #include <stdlib.h>
+@@ -9273,16 +9280,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:9276: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:9283: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:9279: \$? = $ac_status" >&5
++ echo "$as_me:9286: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:9282: \"$ac_try\"") >&5
++ { (eval echo "$as_me:9289: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:9285: \$? = $ac_status" >&5
++ echo "$as_me:9292: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ cf_cv_wchar_h_okay=yes
+ else
+@@ -9292,16 +9299,16 @@
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ fi
+-echo "$as_me:9295: result: $cf_cv_wchar_h_okay" >&5
++echo "$as_me:9302: 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:9301: checking if we must define _XOPEN_SOURCE_EXTENDED" >&5
++echo "$as_me:9308: 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 9304 "configure"
++#line 9311 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+
+@@ -9317,16 +9324,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:9320: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:9327: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:9323: \$? = $ac_status" >&5
++ echo "$as_me:9330: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:9326: \"$ac_try\"") >&5
++ { (eval echo "$as_me:9333: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:9329: \$? = $ac_status" >&5
++ echo "$as_me:9336: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ cf_result=no
+ else
+@@ -9335,16 +9342,16 @@
+ cf_result=yes
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+-echo "$as_me:9338: result: $cf_result" >&5
++echo "$as_me:9345: 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:9344: checking checking for compatible value versus " >&5
++ echo "$as_me:9351: 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 9347 "configure"
++#line 9354 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+
+@@ -9360,16 +9367,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:9363: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:9370: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:9366: \$? = $ac_status" >&5
++ echo "$as_me:9373: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:9369: \"$ac_try\"") >&5
++ { (eval echo "$as_me:9376: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:9372: \$? = $ac_status" >&5
++ echo "$as_me:9379: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ cf_result=yes
+ else
+@@ -9378,7 +9385,7 @@
+ cf_result=no
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+- echo "$as_me:9381: result: $cf_result" >&5
++ echo "$as_me:9388: result: $cf_result" >&5
+ echo "${ECHO_T}$cf_result" >&6
+ if test "$cf_result" = no ; then
+ # perhaps we can override it - try...
+@@ -9394,13 +9401,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:9397: checking for $ac_func" >&5
++echo "$as_me:9404: 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 9403 "configure"
++#line 9410 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+ which can conflict with char $ac_func (); below. */
+@@ -9431,16 +9438,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:9434: \"$ac_link\"") >&5
++if { (eval echo "$as_me:9441: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:9437: \$? = $ac_status" >&5
++ echo "$as_me:9444: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -s conftest$ac_exeext'
+- { (eval echo "$as_me:9440: \"$ac_try\"") >&5
++ { (eval echo "$as_me:9447: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:9443: \$? = $ac_status" >&5
++ echo "$as_me:9450: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ eval "$as_ac_var=yes"
+ else
+@@ -9450,7 +9457,7 @@
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "$as_me:9453: result: `eval echo '${'$as_ac_var'}'`" >&5
++echo "$as_me:9460: 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
+@@ -9462,7 +9469,7 @@
+
+ if test "x$ac_cv_func_putwc" != xyes ; then
+
+-echo "$as_me:9465: checking for multibyte character support" >&5
++echo "$as_me:9472: 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
+@@ -9470,7 +9477,7 @@
+
+ cf_save_LIBS="$LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 9473 "configure"
++#line 9480 "configure"
+ #include "confdefs.h"
+
+ #include <stdlib.h>
+@@ -9483,16 +9490,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:9486: \"$ac_link\"") >&5
++if { (eval echo "$as_me:9493: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:9489: \$? = $ac_status" >&5
++ echo "$as_me:9496: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -s conftest$ac_exeext'
+- { (eval echo "$as_me:9492: \"$ac_try\"") >&5
++ { (eval echo "$as_me:9499: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:9495: \$? = $ac_status" >&5
++ echo "$as_me:9502: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ cf_cv_utf8_lib=yes
+ else
+@@ -9504,12 +9511,12 @@
+ cf_cv_header_path_utf8=
+ cf_cv_library_path_utf8=
+
+-echo "${as_me:-configure}:9507: testing Starting FIND_LINKAGE(utf8,) ..." 1>&5
++echo "${as_me:-configure}:9514: testing Starting FIND_LINKAGE(utf8,) ..." 1>&5
+
+ cf_save_LIBS="$LIBS"
+
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 9512 "configure"
++#line 9519 "configure"
+ #include "confdefs.h"
+
+ #include <libutf8.h>
+@@ -9522,16 +9529,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:9525: \"$ac_link\"") >&5
++if { (eval echo "$as_me:9532: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:9528: \$? = $ac_status" >&5
++ echo "$as_me:9535: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -s conftest$ac_exeext'
+- { (eval echo "$as_me:9531: \"$ac_try\"") >&5
++ { (eval echo "$as_me:9538: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:9534: \$? = $ac_status" >&5
++ echo "$as_me:9541: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+
+ cf_cv_find_linkage_utf8=yes
+@@ -9545,7 +9552,7 @@
+ LIBS="-lutf8 $cf_save_LIBS"
+
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 9548 "configure"
++#line 9555 "configure"
+ #include "confdefs.h"
+
+ #include <libutf8.h>
+@@ -9558,16 +9565,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:9561: \"$ac_link\"") >&5
++if { (eval echo "$as_me:9568: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:9564: \$? = $ac_status" >&5
++ echo "$as_me:9571: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -s conftest$ac_exeext'
+- { (eval echo "$as_me:9567: \"$ac_try\"") >&5
++ { (eval echo "$as_me:9574: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:9570: \$? = $ac_status" >&5
++ echo "$as_me:9577: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+
+ cf_cv_find_linkage_utf8=yes
+@@ -9584,9 +9591,9 @@
+
+ test -n "$verbose" && echo " find linkage for utf8 library" 1>&6
+
+-echo "${as_me:-configure}:9587: testing find linkage for utf8 library ..." 1>&5
++echo "${as_me:-configure}:9594: testing find linkage for utf8 library ..." 1>&5
+
+-echo "${as_me:-configure}:9589: testing Searching for headers in FIND_LINKAGE(utf8,) ..." 1>&5
++echo "${as_me:-configure}:9596: testing Searching for headers in FIND_LINKAGE(utf8,) ..." 1>&5
+
+ cf_save_CPPFLAGS="$CPPFLAGS"
+ cf_test_CPPFLAGS="$CPPFLAGS"
+@@ -9677,11 +9684,11 @@
+ 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}:9680: testing ... testing $cf_cv_header_path_utf8 ..." 1>&5
++echo "${as_me:-configure}:9687: testing ... testing $cf_cv_header_path_utf8 ..." 1>&5
+
+ CPPFLAGS="$cf_save_CPPFLAGS -I$cf_cv_header_path_utf8"
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 9684 "configure"
++#line 9691 "configure"
+ #include "confdefs.h"
+
+ #include <libutf8.h>
+@@ -9694,21 +9701,21 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:9697: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:9704: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:9700: \$? = $ac_status" >&5
++ echo "$as_me:9707: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:9703: \"$ac_try\"") >&5
++ { (eval echo "$as_me:9710: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:9706: \$? = $ac_status" >&5
++ echo "$as_me:9713: \$? = $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}:9711: testing ... found utf8 headers in $cf_cv_header_path_utf8 ..." 1>&5
++echo "${as_me:-configure}:9718: testing ... found utf8 headers in $cf_cv_header_path_utf8 ..." 1>&5
+
+ cf_cv_find_linkage_utf8=maybe
+ cf_test_CPPFLAGS="$CPPFLAGS"
+@@ -9726,7 +9733,7 @@
+
+ if test "$cf_cv_find_linkage_utf8" = maybe ; then
+
+-echo "${as_me:-configure}:9729: testing Searching for utf8 library in FIND_LINKAGE(utf8,) ..." 1>&5
++echo "${as_me:-configure}:9736: testing Searching for utf8 library in FIND_LINKAGE(utf8,) ..." 1>&5
+
+ cf_save_LIBS="$LIBS"
+ cf_save_LDFLAGS="$LDFLAGS"
+@@ -9801,13 +9808,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}:9804: testing ... testing $cf_cv_library_path_utf8 ..." 1>&5
++echo "${as_me:-configure}:9811: 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 9810 "configure"
++#line 9817 "configure"
+ #include "confdefs.h"
+
+ #include <libutf8.h>
+@@ -9820,21 +9827,21 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:9823: \"$ac_link\"") >&5
++if { (eval echo "$as_me:9830: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:9826: \$? = $ac_status" >&5
++ echo "$as_me:9833: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -s conftest$ac_exeext'
+- { (eval echo "$as_me:9829: \"$ac_try\"") >&5
++ { (eval echo "$as_me:9836: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:9832: \$? = $ac_status" >&5
++ echo "$as_me:9839: \$? = $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}:9837: testing ... found utf8 library in $cf_cv_library_path_utf8 ..." 1>&5
++echo "${as_me:-configure}:9844: testing ... found utf8 library in $cf_cv_library_path_utf8 ..." 1>&5
+
+ cf_cv_find_linkage_utf8=yes
+ cf_cv_library_file_utf8="-lutf8"
+@@ -9876,7 +9883,7 @@
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "$as_me:9879: result: $cf_cv_utf8_lib" >&5
++echo "$as_me:9886: 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
+@@ -9911,7 +9918,7 @@
+ cf_save_CPPFLAGS=$CPPFLAGS
+ CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 9914 "configure"
++#line 9921 "configure"
+ #include "confdefs.h"
+ #include <stdio.h>
+ int
+@@ -9923,16 +9930,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:9926: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:9933: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:9929: \$? = $ac_status" >&5
++ echo "$as_me:9936: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:9932: \"$ac_try\"") >&5
++ { (eval echo "$as_me:9939: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:9935: \$? = $ac_status" >&5
++ echo "$as_me:9942: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ :
+ else
+@@ -9949,7 +9956,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}:9952: testing adding $cf_add_incdir to include-path ..." 1>&5
++echo "${as_me:-configure}:9959: testing adding $cf_add_incdir to include-path ..." 1>&5
+
+ CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
+
+@@ -9985,7 +9992,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}:9988: testing adding $cf_add_libdir to library-path ..." 1>&5
++echo "${as_me:-configure}:9995: testing adding $cf_add_libdir to library-path ..." 1>&5
+
+ LDFLAGS="-L$cf_add_libdir $LDFLAGS"
+ fi
+@@ -10017,14 +10024,14 @@
+ fi
+
+ # This is needed on Tru64 5.0 to declare mbstate_t
+-echo "$as_me:10020: checking if we must include wchar.h to declare mbstate_t" >&5
++echo "$as_me:10027: 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 10027 "configure"
++#line 10034 "configure"
+ #include "confdefs.h"
+
+ #include <stdlib.h>
+@@ -10042,23 +10049,23 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:10045: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:10052: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:10048: \$? = $ac_status" >&5
++ echo "$as_me:10055: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:10051: \"$ac_try\"") >&5
++ { (eval echo "$as_me:10058: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:10054: \$? = $ac_status" >&5
++ echo "$as_me:10061: \$? = $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 10061 "configure"
++#line 10068 "configure"
+ #include "confdefs.h"
+
+ #include <stdlib.h>
+@@ -10077,16 +10084,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:10080: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:10087: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:10083: \$? = $ac_status" >&5
++ echo "$as_me:10090: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:10086: \"$ac_try\"") >&5
++ { (eval echo "$as_me:10093: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:10089: \$? = $ac_status" >&5
++ echo "$as_me:10096: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ cf_cv_mbstate_t=yes
+ else
+@@ -10098,7 +10105,7 @@
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ fi
+-echo "$as_me:10101: result: $cf_cv_mbstate_t" >&5
++echo "$as_me:10108: result: $cf_cv_mbstate_t" >&5
+ echo "${ECHO_T}$cf_cv_mbstate_t" >&6
+
+ if test "$cf_cv_mbstate_t" = yes ; then
+@@ -10116,14 +10123,14 @@
+ fi
+
+ # This is needed on Tru64 5.0 to declare wchar_t
+-echo "$as_me:10119: checking if we must include wchar.h to declare wchar_t" >&5
++echo "$as_me:10126: 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 10126 "configure"
++#line 10133 "configure"
+ #include "confdefs.h"
+
+ #include <stdlib.h>
+@@ -10141,23 +10148,23 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:10144: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:10151: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:10147: \$? = $ac_status" >&5
++ echo "$as_me:10154: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:10150: \"$ac_try\"") >&5
++ { (eval echo "$as_me:10157: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:10153: \$? = $ac_status" >&5
++ echo "$as_me:10160: \$? = $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 10160 "configure"
++#line 10167 "configure"
+ #include "confdefs.h"
+
+ #include <stdlib.h>
+@@ -10176,16 +10183,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:10179: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:10186: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:10182: \$? = $ac_status" >&5
++ echo "$as_me:10189: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:10185: \"$ac_try\"") >&5
++ { (eval echo "$as_me:10192: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:10188: \$? = $ac_status" >&5
++ echo "$as_me:10195: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ cf_cv_wchar_t=yes
+ else
+@@ -10197,7 +10204,7 @@
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ fi
+-echo "$as_me:10200: result: $cf_cv_wchar_t" >&5
++echo "$as_me:10207: result: $cf_cv_wchar_t" >&5
+ echo "${ECHO_T}$cf_cv_wchar_t" >&6
+
+ if test "$cf_cv_wchar_t" = yes ; then
+@@ -10220,14 +10227,14 @@
+ fi
+
+ # This is needed on Tru64 5.0 to declare wint_t
+-echo "$as_me:10223: checking if we must include wchar.h to declare wint_t" >&5
++echo "$as_me:10230: 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 10230 "configure"
++#line 10237 "configure"
+ #include "confdefs.h"
+
+ #include <stdlib.h>
+@@ -10245,23 +10252,23 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:10248: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:10255: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:10251: \$? = $ac_status" >&5
++ echo "$as_me:10258: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:10254: \"$ac_try\"") >&5
++ { (eval echo "$as_me:10261: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:10257: \$? = $ac_status" >&5
++ echo "$as_me:10264: \$? = $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 10264 "configure"
++#line 10271 "configure"
+ #include "confdefs.h"
+
+ #include <stdlib.h>
+@@ -10280,16 +10287,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:10283: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:10290: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:10286: \$? = $ac_status" >&5
++ echo "$as_me:10293: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:10289: \"$ac_try\"") >&5
++ { (eval echo "$as_me:10296: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:10292: \$? = $ac_status" >&5
++ echo "$as_me:10299: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ cf_cv_wint_t=yes
+ else
+@@ -10301,7 +10308,7 @@
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ fi
+-echo "$as_me:10304: result: $cf_cv_wint_t" >&5
++echo "$as_me:10311: result: $cf_cv_wint_t" >&5
+ echo "${ECHO_T}$cf_cv_wint_t" >&6
+
+ if test "$cf_cv_wint_t" = yes ; then
+@@ -10333,7 +10340,7 @@
+ fi
+
+ ### use option --disable-lp64 to allow long chtype
+-echo "$as_me:10336: checking whether to enable _LP64 definition in curses.h" >&5
++echo "$as_me:10343: 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.
+@@ -10343,7 +10350,7 @@
+ else
+ with_lp64=$cf_dft_with_lp64
+ fi;
+-echo "$as_me:10346: result: $with_lp64" >&5
++echo "$as_me:10353: result: $with_lp64" >&5
+ echo "${ECHO_T}$with_lp64" >&6
+
+ if test "x$with_lp64" = xyes ; then
+@@ -10359,7 +10366,7 @@
+ fi;
+ if test "$enable_largefile" != no; then
+
+- echo "$as_me:10362: checking for special C compiler options needed for large files" >&5
++ echo "$as_me:10369: 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
+@@ -10371,7 +10378,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 10374 "configure"
++#line 10381 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ /* Check that off_t can represent 2**63 - 1 correctly.
+@@ -10391,16 +10398,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:10394: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:10401: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:10397: \$? = $ac_status" >&5
++ echo "$as_me:10404: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:10400: \"$ac_try\"") >&5
++ { (eval echo "$as_me:10407: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:10403: \$? = $ac_status" >&5
++ echo "$as_me:10410: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ break
+ else
+@@ -10410,16 +10417,16 @@
+ rm -f conftest.$ac_objext
+ CC="$CC -n32"
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:10413: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:10420: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:10416: \$? = $ac_status" >&5
++ echo "$as_me:10423: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:10419: \"$ac_try\"") >&5
++ { (eval echo "$as_me:10426: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:10422: \$? = $ac_status" >&5
++ echo "$as_me:10429: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ ac_cv_sys_largefile_CC=' -n32'; break
+ else
+@@ -10433,13 +10440,13 @@
+ rm -f conftest.$ac_ext
+ fi
+ fi
+-echo "$as_me:10436: result: $ac_cv_sys_largefile_CC" >&5
++echo "$as_me:10443: 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:10442: checking for _FILE_OFFSET_BITS value needed for large files" >&5
++ echo "$as_me:10449: 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
+@@ -10447,7 +10454,7 @@
+ while :; do
+ ac_cv_sys_file_offset_bits=no
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 10450 "configure"
++#line 10457 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ /* Check that off_t can represent 2**63 - 1 correctly.
+@@ -10467,16 +10474,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:10470: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:10477: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:10473: \$? = $ac_status" >&5
++ echo "$as_me:10480: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:10476: \"$ac_try\"") >&5
++ { (eval echo "$as_me:10483: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:10479: \$? = $ac_status" >&5
++ echo "$as_me:10486: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ break
+ else
+@@ -10485,7 +10492,7 @@
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 10488 "configure"
++#line 10495 "configure"
+ #include "confdefs.h"
+ #define _FILE_OFFSET_BITS 64
+ #include <sys/types.h>
+@@ -10506,16 +10513,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:10509: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:10516: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:10512: \$? = $ac_status" >&5
++ echo "$as_me:10519: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:10515: \"$ac_try\"") >&5
++ { (eval echo "$as_me:10522: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:10518: \$? = $ac_status" >&5
++ echo "$as_me:10525: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ ac_cv_sys_file_offset_bits=64; break
+ else
+@@ -10526,7 +10533,7 @@
+ break
+ done
+ fi
+-echo "$as_me:10529: result: $ac_cv_sys_file_offset_bits" >&5
++echo "$as_me:10536: 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
+
+@@ -10536,7 +10543,7 @@
+
+ fi
+ rm -rf conftest*
+- echo "$as_me:10539: checking for _LARGE_FILES value needed for large files" >&5
++ echo "$as_me:10546: 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
+@@ -10544,7 +10551,7 @@
+ while :; do
+ ac_cv_sys_large_files=no
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 10547 "configure"
++#line 10554 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ /* Check that off_t can represent 2**63 - 1 correctly.
+@@ -10564,16 +10571,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:10567: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:10574: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:10570: \$? = $ac_status" >&5
++ echo "$as_me:10577: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:10573: \"$ac_try\"") >&5
++ { (eval echo "$as_me:10580: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:10576: \$? = $ac_status" >&5
++ echo "$as_me:10583: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ break
+ else
+@@ -10582,7 +10589,7 @@
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 10585 "configure"
++#line 10592 "configure"
+ #include "confdefs.h"
+ #define _LARGE_FILES 1
+ #include <sys/types.h>
+@@ -10603,16 +10610,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:10606: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:10613: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:10609: \$? = $ac_status" >&5
++ echo "$as_me:10616: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:10612: \"$ac_try\"") >&5
++ { (eval echo "$as_me:10619: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:10615: \$? = $ac_status" >&5
++ echo "$as_me:10622: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ ac_cv_sys_large_files=1; break
+ else
+@@ -10623,7 +10630,7 @@
+ break
+ done
+ fi
+-echo "$as_me:10626: result: $ac_cv_sys_large_files" >&5
++echo "$as_me:10633: 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
+
+@@ -10636,7 +10643,7 @@
+ fi
+
+ if test "$enable_largefile" != no ; then
+- echo "$as_me:10639: checking for _LARGEFILE_SOURCE value needed for large files" >&5
++ echo "$as_me:10646: 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
+@@ -10644,7 +10651,7 @@
+ while :; do
+ ac_cv_sys_largefile_source=no
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 10647 "configure"
++#line 10654 "configure"
+ #include "confdefs.h"
+ #include <stdio.h>
+ int
+@@ -10656,16 +10663,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:10659: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:10666: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:10662: \$? = $ac_status" >&5
++ echo "$as_me:10669: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:10665: \"$ac_try\"") >&5
++ { (eval echo "$as_me:10672: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:10668: \$? = $ac_status" >&5
++ echo "$as_me:10675: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ break
+ else
+@@ -10674,7 +10681,7 @@
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 10677 "configure"
++#line 10684 "configure"
+ #include "confdefs.h"
+ #define _LARGEFILE_SOURCE 1
+ #include <stdio.h>
+@@ -10687,16 +10694,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:10690: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:10697: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:10693: \$? = $ac_status" >&5
++ echo "$as_me:10700: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:10696: \"$ac_try\"") >&5
++ { (eval echo "$as_me:10703: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:10699: \$? = $ac_status" >&5
++ echo "$as_me:10706: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ ac_cv_sys_largefile_source=1; break
+ else
+@@ -10707,7 +10714,7 @@
+ break
+ done
+ fi
+-echo "$as_me:10710: result: $ac_cv_sys_largefile_source" >&5
++echo "$as_me:10717: 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
+
+@@ -10721,13 +10728,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:10724: checking for fseeko" >&5
++echo "$as_me:10731: 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 10730 "configure"
++#line 10737 "configure"
+ #include "confdefs.h"
+ #include <stdio.h>
+ int
+@@ -10739,16 +10746,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:10742: \"$ac_link\"") >&5
++if { (eval echo "$as_me:10749: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:10745: \$? = $ac_status" >&5
++ echo "$as_me:10752: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -s conftest$ac_exeext'
+- { (eval echo "$as_me:10748: \"$ac_try\"") >&5
++ { (eval echo "$as_me:10755: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:10751: \$? = $ac_status" >&5
++ echo "$as_me:10758: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ ac_cv_func_fseeko=yes
+ else
+@@ -10758,7 +10765,7 @@
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "$as_me:10761: result: $ac_cv_func_fseeko" >&5
++echo "$as_me:10768: result: $ac_cv_func_fseeko" >&5
+ echo "${ECHO_T}$ac_cv_func_fseeko" >&6
+ if test $ac_cv_func_fseeko = yes; then
+
+@@ -10779,14 +10786,14 @@
+ test "$ac_cv_sys_largefile_source" != no && CPPFLAGS="$CPPFLAGS -D_LARGEFILE_SOURCE "
+ test "$ac_cv_sys_file_offset_bits" != no && CPPFLAGS="$CPPFLAGS -D_FILE_OFFSET_BITS=$ac_cv_sys_file_offset_bits "
+
+- echo "$as_me:10782: checking whether to use struct dirent64" >&5
++ echo "$as_me:10789: 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 10789 "configure"
++#line 10796 "configure"
+ #include "confdefs.h"
+
+ #include <sys/types.h>
+@@ -10807,16 +10814,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:10810: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:10817: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:10813: \$? = $ac_status" >&5
++ echo "$as_me:10820: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:10816: \"$ac_try\"") >&5
++ { (eval echo "$as_me:10823: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:10819: \$? = $ac_status" >&5
++ echo "$as_me:10826: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ cf_cv_struct_dirent64=yes
+ else
+@@ -10827,7 +10834,7 @@
+ rm -f conftest.$ac_objext conftest.$ac_ext
+
+ fi
+-echo "$as_me:10830: result: $cf_cv_struct_dirent64" >&5
++echo "$as_me:10837: result: $cf_cv_struct_dirent64" >&5
+ echo "${ECHO_T}$cf_cv_struct_dirent64" >&6
+ test "$cf_cv_struct_dirent64" = yes &&
+ cat >>confdefs.h <<\EOF
+@@ -10837,7 +10844,7 @@
+ fi
+
+ ### use option --disable-tparm-varargs to make tparm() conform to X/Open
+-echo "$as_me:10840: checking if you want tparm not to use X/Open fixed-parameter list" >&5
++echo "$as_me:10847: 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.
+@@ -10847,14 +10854,14 @@
+ else
+ with_tparm_varargs=yes
+ fi;
+-echo "$as_me:10850: result: $with_tparm_varargs" >&5
++echo "$as_me:10857: 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:10857: checking if you want tic library to use explicit dependency on ncurses$LIB_SUFFIX library" >&5
++echo "$as_me:10864: 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.
+@@ -10864,14 +10871,14 @@
+ else
+ with_tic_depends=yes
+ fi;
+-echo "$as_me:10867: result: $with_tic_depends" >&5
++echo "$as_me:10874: result: $with_tic_depends" >&5
+ echo "${ECHO_T}$with_tic_depends" >&6
+ else
+ with_tic_depends=no
+ fi
+
+ ### use option --with-bool to override bool's type
+-echo "$as_me:10874: checking for type of bool" >&5
++echo "$as_me:10881: 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.
+@@ -10881,10 +10888,10 @@
+ else
+ NCURSES_BOOL=auto
+ fi;
+-echo "$as_me:10884: result: $NCURSES_BOOL" >&5
++echo "$as_me:10891: result: $NCURSES_BOOL" >&5
+ echo "${ECHO_T}$NCURSES_BOOL" >&6
+
+-echo "$as_me:10887: checking for alternate terminal capabilities file" >&5
++echo "$as_me:10894: 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.
+@@ -10895,11 +10902,11 @@
+ TERMINFO_CAPS=Caps
+ fi;
+ test -f "${srcdir}/include/${TERMINFO_CAPS}" || TERMINFO_CAPS=Caps
+-echo "$as_me:10898: result: $TERMINFO_CAPS" >&5
++echo "$as_me:10905: result: $TERMINFO_CAPS" >&5
+ echo "${ECHO_T}$TERMINFO_CAPS" >&6
+
+ ### use option --with-chtype to override chtype's type
+-echo "$as_me:10902: checking for type of chtype" >&5
++echo "$as_me:10909: 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.
+@@ -10909,11 +10916,11 @@
+ else
+ NCURSES_CHTYPE=$cf_dft_chtype
+ fi;
+-echo "$as_me:10912: result: $NCURSES_CHTYPE" >&5
++echo "$as_me:10919: result: $NCURSES_CHTYPE" >&5
+ echo "${ECHO_T}$NCURSES_CHTYPE" >&6
+
+ ### use option --with-ospeed to override ospeed's type
+-echo "$as_me:10916: checking for type of ospeed" >&5
++echo "$as_me:10923: 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.
+@@ -10923,11 +10930,11 @@
+ else
+ NCURSES_OSPEED=short
+ fi;
+-echo "$as_me:10926: result: $NCURSES_OSPEED" >&5
++echo "$as_me:10933: result: $NCURSES_OSPEED" >&5
+ echo "${ECHO_T}$NCURSES_OSPEED" >&6
+
+ ### use option --with-mmask-t to override mmask_t's type
+-echo "$as_me:10930: checking for type of mmask_t" >&5
++echo "$as_me:10937: 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.
+@@ -10937,11 +10944,11 @@
+ else
+ NCURSES_MMASK_T=$cf_dft_mmask_t
+ fi;
+-echo "$as_me:10940: result: $NCURSES_MMASK_T" >&5
++echo "$as_me:10947: 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:10944: checking for size CCHARW_MAX" >&5
++echo "$as_me:10951: 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.
+@@ -10951,11 +10958,11 @@
+ else
+ NCURSES_CCHARW_MAX=5
+ fi;
+-echo "$as_me:10954: result: $NCURSES_CCHARW_MAX" >&5
++echo "$as_me:10961: result: $NCURSES_CCHARW_MAX" >&5
+ echo "${ECHO_T}$NCURSES_CCHARW_MAX" >&6
+
+ ### use option --with-tparm-arg to override tparm's argument type
+-echo "$as_me:10958: checking for type of tparm args" >&5
++echo "$as_me:10965: 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.
+@@ -10965,11 +10972,11 @@
+ else
+ NCURSES_TPARM_ARG=$cf_dft_tparm_arg
+ fi;
+-echo "$as_me:10968: result: $NCURSES_TPARM_ARG" >&5
++echo "$as_me:10975: result: $NCURSES_TPARM_ARG" >&5
+ echo "${ECHO_T}$NCURSES_TPARM_ARG" >&6
+
+ ### Enable compiling-in rcs id's
+-echo "$as_me:10972: checking if RCS identifiers should be compiled-in" >&5
++echo "$as_me:10979: 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.
+@@ -10979,7 +10986,7 @@
+ else
+ with_rcs_ids=no
+ fi;
+-echo "$as_me:10982: result: $with_rcs_ids" >&5
++echo "$as_me:10989: result: $with_rcs_ids" >&5
+ echo "${ECHO_T}$with_rcs_ids" >&6
+ test "x$with_rcs_ids" = xyes &&
+ cat >>confdefs.h <<\EOF
+@@ -10988,7 +10995,7 @@
+
+ ###############################################################################
+
+-echo "$as_me:10991: checking format of man-pages" >&5
++echo "$as_me:10998: 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.
+@@ -11077,14 +11084,14 @@
+ ;;
+ esac
+
+-echo "$as_me:11080: result: $MANPAGE_FORMAT" >&5
++echo "$as_me:11087: result: $MANPAGE_FORMAT" >&5
+ echo "${ECHO_T}$MANPAGE_FORMAT" >&6
+ if test -n "$cf_unknown" ; then
+- { echo "$as_me:11083: WARNING: Unexpected manpage-format $cf_unknown" >&5
++ { echo "$as_me:11090: WARNING: Unexpected manpage-format $cf_unknown" >&5
+ echo "$as_me: WARNING: Unexpected manpage-format $cf_unknown" >&2;}
+ fi
+
+-echo "$as_me:11087: checking for manpage renaming" >&5
++echo "$as_me:11094: 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.
+@@ -11112,7 +11119,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:11115: error: not a filename: $MANPAGE_RENAMES" >&5
++ { { echo "$as_me:11122: error: not a filename: $MANPAGE_RENAMES" >&5
+ echo "$as_me: error: not a filename: $MANPAGE_RENAMES" >&2;}
+ { (exit 1); exit 1; }; }
+ fi
+@@ -11126,10 +11133,10 @@
+ fi
+ fi
+
+-echo "$as_me:11129: result: $MANPAGE_RENAMES" >&5
++echo "$as_me:11136: result: $MANPAGE_RENAMES" >&5
+ echo "${ECHO_T}$MANPAGE_RENAMES" >&6
+
+-echo "$as_me:11132: checking if manpage aliases will be installed" >&5
++echo "$as_me:11139: 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.
+@@ -11140,7 +11147,7 @@
+ MANPAGE_ALIASES=yes
+ fi;
+
+-echo "$as_me:11143: result: $MANPAGE_ALIASES" >&5
++echo "$as_me:11150: result: $MANPAGE_ALIASES" >&5
+ echo "${ECHO_T}$MANPAGE_ALIASES" >&6
+
+ case "x$LN_S" in
+@@ -11154,7 +11161,7 @@
+
+ MANPAGE_SYMLINKS=no
+ if test "$MANPAGE_ALIASES" = yes ; then
+-echo "$as_me:11157: checking if manpage symlinks should be used" >&5
++echo "$as_me:11164: 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.
+@@ -11167,17 +11174,17 @@
+
+ if test "$$cf_use_symlinks" = no; then
+ if test "$MANPAGE_SYMLINKS" = yes ; then
+- { echo "$as_me:11170: WARNING: cannot make symlinks" >&5
++ { echo "$as_me:11177: WARNING: cannot make symlinks" >&5
+ echo "$as_me: WARNING: cannot make symlinks" >&2;}
+ MANPAGE_SYMLINKS=no
+ fi
+ fi
+
+-echo "$as_me:11176: result: $MANPAGE_SYMLINKS" >&5
++echo "$as_me:11183: result: $MANPAGE_SYMLINKS" >&5
+ echo "${ECHO_T}$MANPAGE_SYMLINKS" >&6
+ fi
+
+-echo "$as_me:11180: checking for manpage tbl" >&5
++echo "$as_me:11187: 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.
+@@ -11188,7 +11195,7 @@
+ MANPAGE_TBL=no
+ fi;
+
+-echo "$as_me:11191: result: $MANPAGE_TBL" >&5
++echo "$as_me:11198: result: $MANPAGE_TBL" >&5
+ echo "${ECHO_T}$MANPAGE_TBL" >&6
+
+ if test "$prefix" = "NONE" ; then
+@@ -11521,7 +11528,7 @@
+ ###############################################################################
+
+ ### Note that some functions (such as const) are normally disabled anyway.
+-echo "$as_me:11524: checking if you want to build with function extensions" >&5
++echo "$as_me:11531: 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.
+@@ -11531,7 +11538,7 @@
+ else
+ with_ext_funcs=yes
+ fi;
+-echo "$as_me:11534: result: $with_ext_funcs" >&5
++echo "$as_me:11541: result: $with_ext_funcs" >&5
+ echo "${ECHO_T}$with_ext_funcs" >&6
+ if test "x$with_ext_funcs" = xyes ; then
+ NCURSES_EXT_FUNCS=1
+@@ -11586,7 +11593,7 @@
+ GENERATED_EXT_FUNCS=
+ fi
+
+-echo "$as_me:11589: checking if you want to build with SCREEN extensions" >&5
++echo "$as_me:11596: 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.
+@@ -11596,7 +11603,7 @@
+ else
+ with_sp_funcs=$cf_dft_ext_spfuncs
+ fi;
+-echo "$as_me:11599: result: $with_sp_funcs" >&5
++echo "$as_me:11606: result: $with_sp_funcs" >&5
+ echo "${ECHO_T}$with_sp_funcs" >&6
+ if test "x$with_sp_funcs" = xyes ; then
+ NCURSES_SP_FUNCS=1
+@@ -11611,7 +11618,7 @@
+ GENERATED_SP_FUNCS=
+ fi
+
+-echo "$as_me:11614: checking if you want to build with terminal-driver" >&5
++echo "$as_me:11621: 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.
+@@ -11621,7 +11628,7 @@
+ else
+ with_term_driver=no
+ fi;
+-echo "$as_me:11624: result: $with_term_driver" >&5
++echo "$as_me:11631: result: $with_term_driver" >&5
+ echo "${ECHO_T}$with_term_driver" >&6
+ if test "x$with_term_driver" = xyes ; then
+
+@@ -11630,19 +11637,19 @@
+ EOF
+
+ if test "x$with_termlib" != xno ; then
+- { { echo "$as_me:11633: error: The term-driver option conflicts with the termlib option" >&5
++ { { echo "$as_me:11640: 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:11638: error: The term-driver option relies upon sp-funcs" >&5
++ { { echo "$as_me:11645: 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:11645: checking for extended use of const keyword" >&5
++echo "$as_me:11652: 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.
+@@ -11652,7 +11659,7 @@
+ else
+ with_ext_const=$cf_dft_ext_const
+ fi;
+-echo "$as_me:11655: result: $with_ext_const" >&5
++echo "$as_me:11662: result: $with_ext_const" >&5
+ echo "${ECHO_T}$with_ext_const" >&6
+ NCURSES_CONST='/*nothing*/'
+ if test "x$with_ext_const" = xyes ; then
+@@ -11660,7 +11667,7 @@
+ fi
+
+ ### use option --enable-ext-colors to turn on use of colors beyond 16.
+-echo "$as_me:11663: checking if you want to use extended colors" >&5
++echo "$as_me:11670: 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.
+@@ -11670,12 +11677,12 @@
+ else
+ with_ext_colors=$cf_dft_ext_colors
+ fi;
+-echo "$as_me:11673: result: $with_ext_colors" >&5
++echo "$as_me:11680: 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:11678: WARNING: This option applies only to wide-character library" >&5
++ { echo "$as_me:11685: 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)
+@@ -11685,7 +11692,7 @@
+ (5.*)
+ cf_cv_rel_version=6.0
+ cf_cv_abi_version=6
+- { echo "$as_me:11688: WARNING: overriding ABI version to $cf_cv_abi_version" >&5
++ { echo "$as_me:11695: WARNING: overriding ABI version to $cf_cv_abi_version" >&5
+ echo "$as_me: WARNING: overriding ABI version to $cf_cv_abi_version" >&2;}
+ ;;
+ esac
+@@ -11701,7 +11708,7 @@
+ fi
+
+ ### use option --enable-ext-mouse to modify coding to support 5-button mice
+-echo "$as_me:11704: checking if you want to use extended mouse encoding" >&5
++echo "$as_me:11711: 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.
+@@ -11711,7 +11718,7 @@
+ else
+ with_ext_mouse=$cf_dft_ext_mouse
+ fi;
+-echo "$as_me:11714: result: $with_ext_mouse" >&5
++echo "$as_me:11721: result: $with_ext_mouse" >&5
+ echo "${ECHO_T}$with_ext_mouse" >&6
+ NCURSES_MOUSE_VERSION=1
+ if test "x$with_ext_mouse" = xyes ; then
+@@ -11722,7 +11729,7 @@
+ (5.*)
+ cf_cv_rel_version=6.0
+ cf_cv_abi_version=6
+- { echo "$as_me:11725: WARNING: overriding ABI version to $cf_cv_abi_version" >&5
++ { echo "$as_me:11732: WARNING: overriding ABI version to $cf_cv_abi_version" >&5
+ echo "$as_me: WARNING: overriding ABI version to $cf_cv_abi_version" >&2;}
+ ;;
+ esac
+@@ -11731,7 +11738,7 @@
+ fi
+
+ ### use option --enable-ext-putwin to turn on extended screendumps
+-echo "$as_me:11734: checking if you want to use extended putwin/screendump" >&5
++echo "$as_me:11741: 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.
+@@ -11741,7 +11748,7 @@
+ else
+ with_ext_putwin=$cf_dft_ext_putwin
+ fi;
+-echo "$as_me:11744: result: $with_ext_putwin" >&5
++echo "$as_me:11751: result: $with_ext_putwin" >&5
+ echo "${ECHO_T}$with_ext_putwin" >&6
+ if test "x$with_ext_putwin" = xyes ; then
+
+@@ -11751,7 +11758,7 @@
+
+ fi
+
+-echo "$as_me:11754: checking if you want \$NCURSES_NO_PADDING code" >&5
++echo "$as_me:11761: 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.
+@@ -11761,20 +11768,20 @@
+ else
+ with_no_padding=$with_ext_funcs
+ fi;
+-echo "$as_me:11764: result: $with_no_padding" >&5
++echo "$as_me:11771: result: $with_no_padding" >&5
+ echo "${ECHO_T}$with_no_padding" >&6
+ test "x$with_no_padding" = xyes &&
+ cat >>confdefs.h <<\EOF
+ #define NCURSES_NO_PADDING 1
+ EOF
+
+-echo "$as_me:11771: checking for ANSI C header files" >&5
++echo "$as_me:11778: 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 11777 "configure"
++#line 11784 "configure"
+ #include "confdefs.h"
+ #include <stdlib.h>
+ #include <stdarg.h>
+@@ -11782,13 +11789,13 @@
+ #include <float.h>
+
+ _ACEOF
+-if { (eval echo "$as_me:11785: \"$ac_cpp conftest.$ac_ext\"") >&5
++if { (eval echo "$as_me:11792: \"$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:11791: \$? = $ac_status" >&5
++ echo "$as_me:11798: \$? = $ac_status" >&5
+ (exit $ac_status); } >/dev/null; then
+ if test -s conftest.err; then
+ ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -11810,7 +11817,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 11813 "configure"
++#line 11820 "configure"
+ #include "confdefs.h"
+ #include <string.h>
+
+@@ -11828,7 +11835,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 11831 "configure"
++#line 11838 "configure"
+ #include "confdefs.h"
+ #include <stdlib.h>
+
+@@ -11849,7 +11856,7 @@
+ :
+ else
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 11852 "configure"
++#line 11859 "configure"
+ #include "confdefs.h"
+ #include <ctype.h>
+ #if ((' ' & 0x0FF) == 0x020)
+@@ -11875,15 +11882,15 @@
+ }
+ _ACEOF
+ rm -f conftest$ac_exeext
+-if { (eval echo "$as_me:11878: \"$ac_link\"") >&5
++if { (eval echo "$as_me:11885: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:11881: \$? = $ac_status" >&5
++ echo "$as_me:11888: \$? = $ac_status" >&5
+ (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+- { (eval echo "$as_me:11883: \"$ac_try\"") >&5
++ { (eval echo "$as_me:11890: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:11886: \$? = $ac_status" >&5
++ echo "$as_me:11893: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ :
+ else
+@@ -11896,7 +11903,7 @@
+ fi
+ fi
+ fi
+-echo "$as_me:11899: result: $ac_cv_header_stdc" >&5
++echo "$as_me:11906: result: $ac_cv_header_stdc" >&5
+ echo "${ECHO_T}$ac_cv_header_stdc" >&6
+ if test $ac_cv_header_stdc = yes; then
+
+@@ -11912,28 +11919,28 @@
+ inttypes.h stdint.h unistd.h
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-echo "$as_me:11915: checking for $ac_header" >&5
++echo "$as_me:11922: 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 11921 "configure"
++#line 11928 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ #include <$ac_header>
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:11927: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:11934: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:11930: \$? = $ac_status" >&5
++ echo "$as_me:11937: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:11933: \"$ac_try\"") >&5
++ { (eval echo "$as_me:11940: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:11936: \$? = $ac_status" >&5
++ echo "$as_me:11943: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ eval "$as_ac_Header=yes"
+ else
+@@ -11943,7 +11950,7 @@
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ fi
+-echo "$as_me:11946: result: `eval echo '${'$as_ac_Header'}'`" >&5
++echo "$as_me:11953: 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
+@@ -11953,13 +11960,13 @@
+ fi
+ done
+
+-echo "$as_me:11956: checking for signed char" >&5
++echo "$as_me:11963: 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 11962 "configure"
++#line 11969 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -11974,16 +11981,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:11977: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:11984: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:11980: \$? = $ac_status" >&5
++ echo "$as_me:11987: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:11983: \"$ac_try\"") >&5
++ { (eval echo "$as_me:11990: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:11986: \$? = $ac_status" >&5
++ echo "$as_me:11993: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ ac_cv_type_signed_char=yes
+ else
+@@ -11993,10 +12000,10 @@
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ fi
+-echo "$as_me:11996: result: $ac_cv_type_signed_char" >&5
++echo "$as_me:12003: result: $ac_cv_type_signed_char" >&5
+ echo "${ECHO_T}$ac_cv_type_signed_char" >&6
+
+-echo "$as_me:11999: checking size of signed char" >&5
++echo "$as_me:12006: 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
+@@ -12005,7 +12012,7 @@
+ if test "$cross_compiling" = yes; then
+ # Depending upon the size, compute the lo and hi bounds.
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 12008 "configure"
++#line 12015 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -12017,21 +12024,21 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:12020: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:12027: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:12023: \$? = $ac_status" >&5
++ echo "$as_me:12030: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:12026: \"$ac_try\"") >&5
++ { (eval echo "$as_me:12033: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:12029: \$? = $ac_status" >&5
++ echo "$as_me:12036: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ ac_lo=0 ac_mid=0
+ while :; do
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 12034 "configure"
++#line 12041 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -12043,16 +12050,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:12046: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:12053: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:12049: \$? = $ac_status" >&5
++ echo "$as_me:12056: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:12052: \"$ac_try\"") >&5
++ { (eval echo "$as_me:12059: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:12055: \$? = $ac_status" >&5
++ echo "$as_me:12062: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ ac_hi=$ac_mid; break
+ else
+@@ -12068,7 +12075,7 @@
+ ac_hi=-1 ac_mid=-1
+ while :; do
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 12071 "configure"
++#line 12078 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -12080,16 +12087,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:12083: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:12090: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:12086: \$? = $ac_status" >&5
++ echo "$as_me:12093: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:12089: \"$ac_try\"") >&5
++ { (eval echo "$as_me:12096: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:12092: \$? = $ac_status" >&5
++ echo "$as_me:12099: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ ac_lo=$ac_mid; break
+ else
+@@ -12105,7 +12112,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 12108 "configure"
++#line 12115 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -12117,16 +12124,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:12120: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:12127: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:12123: \$? = $ac_status" >&5
++ echo "$as_me:12130: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:12126: \"$ac_try\"") >&5
++ { (eval echo "$as_me:12133: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:12129: \$? = $ac_status" >&5
++ echo "$as_me:12136: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ ac_hi=$ac_mid
+ else
+@@ -12139,12 +12146,12 @@
+ ac_cv_sizeof_signed_char=$ac_lo
+ else
+ if test "$cross_compiling" = yes; then
+- { { echo "$as_me:12142: error: cannot run test program while cross compiling" >&5
++ { { echo "$as_me:12149: 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 12147 "configure"
++#line 12154 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -12160,15 +12167,15 @@
+ }
+ _ACEOF
+ rm -f conftest$ac_exeext
+-if { (eval echo "$as_me:12163: \"$ac_link\"") >&5
++if { (eval echo "$as_me:12170: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:12166: \$? = $ac_status" >&5
++ echo "$as_me:12173: \$? = $ac_status" >&5
+ (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+- { (eval echo "$as_me:12168: \"$ac_try\"") >&5
++ { (eval echo "$as_me:12175: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:12171: \$? = $ac_status" >&5
++ echo "$as_me:12178: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ ac_cv_sizeof_signed_char=`cat conftest.val`
+ else
+@@ -12184,7 +12191,7 @@
+ ac_cv_sizeof_signed_char=0
+ fi
+ fi
+-echo "$as_me:12187: result: $ac_cv_sizeof_signed_char" >&5
++echo "$as_me:12194: 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
+@@ -12195,7 +12202,7 @@
+ else
+ NCURSES_SBOOL="char"
+ fi
+-echo "$as_me:12198: checking if you want to use signed Boolean array in term.h" >&5
++echo "$as_me:12205: 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.
+@@ -12205,12 +12212,12 @@
+ else
+ with_signed_char=no
+ fi;
+-echo "$as_me:12208: result: $with_signed_char" >&5
++echo "$as_me:12215: result: $with_signed_char" >&5
+ echo "${ECHO_T}$with_signed_char" >&6
+ test "x$with_signed_char" != xyes && NCURSES_SBOOL="char"
+
+ ### use option --enable-sigwinch to turn on use of SIGWINCH logic
+-echo "$as_me:12213: checking if you want SIGWINCH handler" >&5
++echo "$as_me:12220: 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.
+@@ -12220,7 +12227,7 @@
+ else
+ with_sigwinch=$with_ext_funcs
+ fi;
+-echo "$as_me:12223: result: $with_sigwinch" >&5
++echo "$as_me:12230: result: $with_sigwinch" >&5
+ echo "${ECHO_T}$with_sigwinch" >&6
+ test "x$with_sigwinch" = xyes &&
+ cat >>confdefs.h <<\EOF
+@@ -12228,7 +12235,7 @@
+ EOF
+
+ ### use option --enable-tcap-names to allow user to define new capabilities
+-echo "$as_me:12231: checking if you want user-definable terminal capabilities like termcap" >&5
++echo "$as_me:12238: 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.
+@@ -12238,7 +12245,7 @@
+ else
+ with_tcap_names=$with_ext_funcs
+ fi;
+-echo "$as_me:12241: result: $with_tcap_names" >&5
++echo "$as_me:12248: result: $with_tcap_names" >&5
+ echo "${ECHO_T}$with_tcap_names" >&6
+ NCURSES_XNAMES=0
+ test "x$with_tcap_names" = xyes && NCURSES_XNAMES=1
+@@ -12246,7 +12253,7 @@
+ ###############################################################################
+ # These options are relatively safe to experiment with.
+
+-echo "$as_me:12249: checking if you want all development code" >&5
++echo "$as_me:12256: 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.
+@@ -12256,11 +12263,11 @@
+ else
+ with_develop=no
+ fi;
+-echo "$as_me:12259: result: $with_develop" >&5
++echo "$as_me:12266: 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:12263: checking if you want hard-tabs code" >&5
++echo "$as_me:12270: 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.
+@@ -12270,7 +12277,7 @@
+ else
+ enable_hard_tabs=$with_develop
+ fi;
+-echo "$as_me:12273: result: $enable_hard_tabs" >&5
++echo "$as_me:12280: result: $enable_hard_tabs" >&5
+ echo "${ECHO_T}$enable_hard_tabs" >&6
+ test "x$enable_hard_tabs" = xyes &&
+ cat >>confdefs.h <<\EOF
+@@ -12278,7 +12285,7 @@
+ EOF
+
+ ### use option --enable-xmc-glitch to turn on use of magic-cookie optimize
+-echo "$as_me:12281: checking if you want limited support for xmc" >&5
++echo "$as_me:12288: 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.
+@@ -12288,7 +12295,7 @@
+ else
+ enable_xmc_glitch=$with_develop
+ fi;
+-echo "$as_me:12291: result: $enable_xmc_glitch" >&5
++echo "$as_me:12298: result: $enable_xmc_glitch" >&5
+ echo "${ECHO_T}$enable_xmc_glitch" >&6
+ test "x$enable_xmc_glitch" = xyes &&
+ cat >>confdefs.h <<\EOF
+@@ -12298,7 +12305,7 @@
+ ###############################################################################
+ # These are just experimental, probably should not be in a package:
+
+-echo "$as_me:12301: checking if you do not want to assume colors are white-on-black" >&5
++echo "$as_me:12308: 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.
+@@ -12308,7 +12315,7 @@
+ else
+ with_assumed_color=yes
+ fi;
+-echo "$as_me:12311: result: $with_assumed_color" >&5
++echo "$as_me:12318: result: $with_assumed_color" >&5
+ echo "${ECHO_T}$with_assumed_color" >&6
+ test "x$with_assumed_color" = xyes &&
+ cat >>confdefs.h <<\EOF
+@@ -12316,7 +12323,7 @@
+ EOF
+
+ ### use option --enable-hashmap to turn on use of hashmap scrolling logic
+-echo "$as_me:12319: checking if you want hashmap scrolling-optimization code" >&5
++echo "$as_me:12326: 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.
+@@ -12326,7 +12333,7 @@
+ else
+ with_hashmap=yes
+ fi;
+-echo "$as_me:12329: result: $with_hashmap" >&5
++echo "$as_me:12336: result: $with_hashmap" >&5
+ echo "${ECHO_T}$with_hashmap" >&6
+ test "x$with_hashmap" = xyes &&
+ cat >>confdefs.h <<\EOF
+@@ -12334,7 +12341,7 @@
+ EOF
+
+ ### use option --enable-colorfgbg to turn on use of $COLORFGBG environment
+-echo "$as_me:12337: checking if you want colorfgbg code" >&5
++echo "$as_me:12344: 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.
+@@ -12344,7 +12351,7 @@
+ else
+ with_colorfgbg=no
+ fi;
+-echo "$as_me:12347: result: $with_colorfgbg" >&5
++echo "$as_me:12354: result: $with_colorfgbg" >&5
+ echo "${ECHO_T}$with_colorfgbg" >&6
+ test "x$with_colorfgbg" = xyes &&
+ cat >>confdefs.h <<\EOF
+@@ -12352,7 +12359,7 @@
+ EOF
+
+ ### use option --enable-interop to turn on use of bindings used for interop
+-echo "$as_me:12355: checking if you want interop bindings" >&5
++echo "$as_me:12362: 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.
+@@ -12362,7 +12369,7 @@
+ else
+ with_exp_interop=$cf_dft_interop
+ fi;
+-echo "$as_me:12365: result: $with_exp_interop" >&5
++echo "$as_me:12372: result: $with_exp_interop" >&5
+ echo "${ECHO_T}$with_exp_interop" >&6
+
+ NCURSES_INTEROP_FUNCS=0
+@@ -12371,7 +12378,7 @@
+ # This is still experimental (20080329), but should ultimately be moved to
+ # the script-block --with-normal, etc.
+
+-echo "$as_me:12374: checking if you want to link with the pthread library" >&5
++echo "$as_me:12381: 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.
+@@ -12381,27 +12388,27 @@
+ else
+ with_pthread=no
+ fi;
+-echo "$as_me:12384: result: $with_pthread" >&5
++echo "$as_me:12391: result: $with_pthread" >&5
+ echo "${ECHO_T}$with_pthread" >&6
+
+ if test "$with_pthread" != no ; then
+- echo "$as_me:12388: checking for pthread.h" >&5
++ echo "$as_me:12395: 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 12394 "configure"
++#line 12401 "configure"
+ #include "confdefs.h"
+ #include <pthread.h>
+ _ACEOF
+-if { (eval echo "$as_me:12398: \"$ac_cpp conftest.$ac_ext\"") >&5
++if { (eval echo "$as_me:12405: \"$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:12404: \$? = $ac_status" >&5
++ echo "$as_me:12411: \$? = $ac_status" >&5
+ (exit $ac_status); } >/dev/null; then
+ if test -s conftest.err; then
+ ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -12420,7 +12427,7 @@
+ fi
+ rm -f conftest.err conftest.$ac_ext
+ fi
+-echo "$as_me:12423: result: $ac_cv_header_pthread_h" >&5
++echo "$as_me:12430: 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
+
+@@ -12430,7 +12437,7 @@
+
+ for cf_lib_pthread in pthread c_r
+ do
+- echo "$as_me:12433: checking if we can link with the $cf_lib_pthread library" >&5
++ echo "$as_me:12440: 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"
+
+@@ -12451,7 +12458,7 @@
+ LIBS="$cf_add_libs"
+
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 12454 "configure"
++#line 12461 "configure"
+ #include "confdefs.h"
+
+ #include <pthread.h>
+@@ -12468,16 +12475,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:12471: \"$ac_link\"") >&5
++if { (eval echo "$as_me:12478: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:12474: \$? = $ac_status" >&5
++ echo "$as_me:12481: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -s conftest$ac_exeext'
+- { (eval echo "$as_me:12477: \"$ac_try\"") >&5
++ { (eval echo "$as_me:12484: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:12480: \$? = $ac_status" >&5
++ echo "$as_me:12487: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ with_pthread=yes
+ else
+@@ -12487,7 +12494,7 @@
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ LIBS="$cf_save_LIBS"
+- echo "$as_me:12490: result: $with_pthread" >&5
++ echo "$as_me:12497: result: $with_pthread" >&5
+ echo "${ECHO_T}$with_pthread" >&6
+ test "$with_pthread" = yes && break
+ done
+@@ -12515,7 +12522,7 @@
+ EOF
+
+ else
+- { { echo "$as_me:12518: error: Cannot link with pthread library" >&5
++ { { echo "$as_me:12525: error: Cannot link with pthread library" >&5
+ echo "$as_me: error: Cannot link with pthread library" >&2;}
+ { (exit 1); exit 1; }; }
+ fi
+@@ -12525,13 +12532,13 @@
+ fi
+
+ if test "x$with_pthread" != xno; then
+- echo "$as_me:12528: checking for pthread_kill" >&5
++ echo "$as_me:12535: 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 12534 "configure"
++#line 12541 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+ which can conflict with char pthread_kill (); below. */
+@@ -12562,16 +12569,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:12565: \"$ac_link\"") >&5
++if { (eval echo "$as_me:12572: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:12568: \$? = $ac_status" >&5
++ echo "$as_me:12575: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -s conftest$ac_exeext'
+- { (eval echo "$as_me:12571: \"$ac_try\"") >&5
++ { (eval echo "$as_me:12578: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:12574: \$? = $ac_status" >&5
++ echo "$as_me:12581: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ ac_cv_func_pthread_kill=yes
+ else
+@@ -12581,11 +12588,11 @@
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "$as_me:12584: result: $ac_cv_func_pthread_kill" >&5
++echo "$as_me:12591: 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:12588: checking if you want to allow EINTR in wgetch with pthreads" >&5
++ echo "$as_me:12595: 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.
+@@ -12595,7 +12602,7 @@
+ else
+ use_pthreads_eintr=no
+ fi;
+- echo "$as_me:12598: result: $use_pthreads_eintr" >&5
++ echo "$as_me:12605: result: $use_pthreads_eintr" >&5
+ echo "${ECHO_T}$use_pthreads_eintr" >&6
+ if test "x$use_pthreads_eintr" = xyes ; then
+
+@@ -12606,7 +12613,7 @@
+ fi
+ fi
+
+- echo "$as_me:12609: checking if you want to use weak-symbols for pthreads" >&5
++ echo "$as_me:12616: 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.
+@@ -12616,18 +12623,18 @@
+ else
+ use_weak_symbols=no
+ fi;
+- echo "$as_me:12619: result: $use_weak_symbols" >&5
++ echo "$as_me:12626: result: $use_weak_symbols" >&5
+ echo "${ECHO_T}$use_weak_symbols" >&6
+ if test "x$use_weak_symbols" = xyes ; then
+
+-echo "$as_me:12623: checking if $CC supports weak symbols" >&5
++echo "$as_me:12630: 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 12630 "configure"
++#line 12637 "configure"
+ #include "confdefs.h"
+
+ #include <stdio.h>
+@@ -12653,16 +12660,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:12656: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:12663: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:12659: \$? = $ac_status" >&5
++ echo "$as_me:12666: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:12662: \"$ac_try\"") >&5
++ { (eval echo "$as_me:12669: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:12665: \$? = $ac_status" >&5
++ echo "$as_me:12672: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ cf_cv_weak_symbols=yes
+ else
+@@ -12673,7 +12680,7 @@
+ rm -f conftest.$ac_objext conftest.$ac_ext
+
+ fi
+-echo "$as_me:12676: result: $cf_cv_weak_symbols" >&5
++echo "$as_me:12683: result: $cf_cv_weak_symbols" >&5
+ echo "${ECHO_T}$cf_cv_weak_symbols" >&6
+
+ else
+@@ -12706,7 +12713,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:12709: checking if you want reentrant code" >&5
++echo "$as_me:12716: 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.
+@@ -12716,7 +12723,7 @@
+ else
+ with_reentrant=no
+ fi;
+-echo "$as_me:12719: result: $with_reentrant" >&5
++echo "$as_me:12726: result: $with_reentrant" >&5
+ echo "${ECHO_T}$with_reentrant" >&6
+ if test "x$with_reentrant" = xyes ; then
+ cf_cv_enable_reentrant=1
+@@ -12789,7 +12796,7 @@
+ (5.*)
+ cf_cv_rel_version=6.0
+ cf_cv_abi_version=6
+- { echo "$as_me:12792: WARNING: overriding ABI version to $cf_cv_abi_version" >&5
++ { echo "$as_me:12799: WARNING: overriding ABI version to $cf_cv_abi_version" >&5
+ echo "$as_me: WARNING: overriding ABI version to $cf_cv_abi_version" >&2;}
+ ;;
+ esac
+@@ -12804,7 +12811,7 @@
+
+ ### Allow using a different wrap-prefix
+ if test "$cf_cv_enable_reentrant" != 0 || test "$BROKEN_LINKER" = 1 ; then
+- echo "$as_me:12807: checking for prefix used to wrap public variables" >&5
++ echo "$as_me:12814: 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.
+@@ -12814,7 +12821,7 @@
+ else
+ NCURSES_WRAP_PREFIX=_nc_
+ fi;
+- echo "$as_me:12817: result: $NCURSES_WRAP_PREFIX" >&5
++ echo "$as_me:12824: result: $NCURSES_WRAP_PREFIX" >&5
+ echo "${ECHO_T}$NCURSES_WRAP_PREFIX" >&6
+ else
+ NCURSES_WRAP_PREFIX=_nc_
+@@ -12824,7 +12831,7 @@
+ #define NCURSES_WRAP_PREFIX "$NCURSES_WRAP_PREFIX"
+ EOF
+
+-echo "$as_me:12827: checking if you want experimental safe-sprintf code" >&5
++echo "$as_me:12834: 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.
+@@ -12834,7 +12841,7 @@
+ else
+ with_safe_sprintf=no
+ fi;
+-echo "$as_me:12837: result: $with_safe_sprintf" >&5
++echo "$as_me:12844: result: $with_safe_sprintf" >&5
+ echo "${ECHO_T}$with_safe_sprintf" >&6
+ test "x$with_safe_sprintf" = xyes &&
+ cat >>confdefs.h <<\EOF
+@@ -12844,7 +12851,7 @@
+ ### 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:12847: checking if you want to experiment without scrolling-hints code" >&5
++echo "$as_me:12854: 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.
+@@ -12854,7 +12861,7 @@
+ else
+ with_scroll_hints=yes
+ fi;
+-echo "$as_me:12857: result: $with_scroll_hints" >&5
++echo "$as_me:12864: result: $with_scroll_hints" >&5
+ echo "${ECHO_T}$with_scroll_hints" >&6
+ test "x$with_scroll_hints" = xyes &&
+ cat >>confdefs.h <<\EOF
+@@ -12863,7 +12870,7 @@
+
+ fi
+
+-echo "$as_me:12866: checking if you want wgetch-events code" >&5
++echo "$as_me:12873: 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.
+@@ -12873,7 +12880,7 @@
+ else
+ with_wgetch_events=no
+ fi;
+-echo "$as_me:12876: result: $with_wgetch_events" >&5
++echo "$as_me:12883: result: $with_wgetch_events" >&5
+ echo "${ECHO_T}$with_wgetch_events" >&6
+ test "x$with_wgetch_events" = xyes &&
+ cat >>confdefs.h <<\EOF
+@@ -12884,7 +12891,7 @@
+
+ ### use option --disable-echo to suppress full display compiling commands
+
+-echo "$as_me:12887: checking if you want to see long compiling messages" >&5
++echo "$as_me:12894: 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.
+@@ -12918,7 +12925,7 @@
+ ECHO_CC=''
+
+ fi;
+-echo "$as_me:12921: result: $enableval" >&5
++echo "$as_me:12928: result: $enableval" >&5
+ echo "${ECHO_T}$enableval" >&6
+
+ if test "x$enable_echo" = xyes; then
+@@ -12930,7 +12937,7 @@
+ fi
+
+ ### use option --enable-warnings to turn on all gcc warnings
+-echo "$as_me:12933: checking if you want to see compiler warnings" >&5
++echo "$as_me:12940: checking if you want to see compiler warnings" >&5
+ echo $ECHO_N "checking if you want to see compiler warnings... $ECHO_C" >&6
+
+ # Check whether --enable-warnings or --disable-warnings was given.
+@@ -12938,7 +12945,7 @@
+ enableval="$enable_warnings"
+ with_warnings=$enableval
+ fi;
+-echo "$as_me:12941: result: $with_warnings" >&5
++echo "$as_me:12948: result: $with_warnings" >&5
+ echo "${ECHO_T}$with_warnings" >&6
+
+ if test "x$with_warnings" = "xyes"; then
+@@ -12950,12 +12957,12 @@
+ if test "$GCC" = yes ; then
+ case $host_os in
+ (linux*|gnu*)
+- echo "$as_me:12953: checking if this is really Intel C compiler" >&5
++ echo "$as_me:12960: checking if this is really Intel C compiler" >&5
+ echo $ECHO_N "checking if this is really Intel C compiler... $ECHO_C" >&6
+ cf_save_CFLAGS="$CFLAGS"
+ CFLAGS="$CFLAGS -no-gcc"
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 12958 "configure"
++#line 12965 "configure"
+ #include "confdefs.h"
+
+ int
+@@ -12972,16 +12979,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:12975: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:12982: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:12978: \$? = $ac_status" >&5
++ echo "$as_me:12985: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:12981: \"$ac_try\"") >&5
++ { (eval echo "$as_me:12988: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:12984: \$? = $ac_status" >&5
++ echo "$as_me:12991: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ INTEL_COMPILER=yes
+ cf_save_CFLAGS="$cf_save_CFLAGS -we147"
+@@ -12992,7 +12999,7 @@
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ CFLAGS="$cf_save_CFLAGS"
+- echo "$as_me:12995: result: $INTEL_COMPILER" >&5
++ echo "$as_me:13002: result: $INTEL_COMPILER" >&5
+ echo "${ECHO_T}$INTEL_COMPILER" >&6
+ ;;
+ esac
+@@ -13001,12 +13008,12 @@
+ CLANG_COMPILER=no
+
+ if test "$GCC" = yes ; then
+- echo "$as_me:13004: checking if this is really Clang C compiler" >&5
++ echo "$as_me:13011: checking if this is really Clang C compiler" >&5
+ echo $ECHO_N "checking if this is really Clang C compiler... $ECHO_C" >&6
+ cf_save_CFLAGS="$CFLAGS"
+ CFLAGS="$CFLAGS -Qunused-arguments"
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 13009 "configure"
++#line 13016 "configure"
+ #include "confdefs.h"
+
+ int
+@@ -13023,16 +13030,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:13026: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:13033: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:13029: \$? = $ac_status" >&5
++ echo "$as_me:13036: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:13032: \"$ac_try\"") >&5
++ { (eval echo "$as_me:13039: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:13035: \$? = $ac_status" >&5
++ echo "$as_me:13042: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ CLANG_COMPILER=yes
+ cf_save_CFLAGS="$cf_save_CFLAGS -Qunused-arguments"
+@@ -13043,12 +13050,12 @@
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ CFLAGS="$cf_save_CFLAGS"
+- echo "$as_me:13046: result: $CLANG_COMPILER" >&5
++ echo "$as_me:13053: result: $CLANG_COMPILER" >&5
+ echo "${ECHO_T}$CLANG_COMPILER" >&6
+ fi
+
+ cat > conftest.$ac_ext <<EOF
+-#line 13051 "${as_me:-configure}"
++#line 13058 "${as_me:-configure}"
+ int main(int argc, char *argv[]) { return (argv[argc-1] == 0) ; }
+ EOF
+
+@@ -13065,7 +13072,7 @@
+ # remark #981: operands are evaluated in unspecified order
+ # warning #279: controlling expression is constant
+
+- { echo "$as_me:13068: checking for $CC warning options..." >&5
++ { echo "$as_me:13075: checking for $CC warning options..." >&5
+ echo "$as_me: checking for $CC warning options..." >&6;}
+ cf_save_CFLAGS="$CFLAGS"
+ EXTRA_CFLAGS="-Wall"
+@@ -13081,12 +13088,12 @@
+ wd981
+ do
+ CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt"
+- if { (eval echo "$as_me:13084: \"$ac_compile\"") >&5
++ if { (eval echo "$as_me:13091: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:13087: \$? = $ac_status" >&5
++ echo "$as_me:13094: \$? = $ac_status" >&5
+ (exit $ac_status); }; then
+- test -n "$verbose" && echo "$as_me:13089: result: ... -$cf_opt" >&5
++ test -n "$verbose" && echo "$as_me:13096: result: ... -$cf_opt" >&5
+ echo "${ECHO_T}... -$cf_opt" >&6
+ EXTRA_CFLAGS="$EXTRA_CFLAGS -$cf_opt"
+ fi
+@@ -13095,7 +13102,7 @@
+
+ elif test "$GCC" = yes
+ then
+- { echo "$as_me:13098: checking for $CC warning options..." >&5
++ { echo "$as_me:13105: checking for $CC warning options..." >&5
+ echo "$as_me: checking for $CC warning options..." >&6;}
+ cf_save_CFLAGS="$CFLAGS"
+ EXTRA_CFLAGS=
+@@ -13119,12 +13126,12 @@
+ Wundef $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:13122: \"$ac_compile\"") >&5
++ if { (eval echo "$as_me:13129: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:13125: \$? = $ac_status" >&5
++ echo "$as_me:13132: \$? = $ac_status" >&5
+ (exit $ac_status); }; then
+- test -n "$verbose" && echo "$as_me:13127: result: ... -$cf_opt" >&5
++ test -n "$verbose" && echo "$as_me:13134: result: ... -$cf_opt" >&5
+ echo "${ECHO_T}... -$cf_opt" >&6
+ case $cf_opt in
+ (Wcast-qual)
+@@ -13135,7 +13142,7 @@
+ ([34].*)
+ test -n "$verbose" && echo " feature is broken in gcc $GCC_VERSION" 1>&6
+
+-echo "${as_me:-configure}:13138: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
++echo "${as_me:-configure}:13145: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
+
+ continue;;
+ esac
+@@ -13145,7 +13152,7 @@
+ ([12].*)
+ test -n "$verbose" && echo " feature is broken in gcc $GCC_VERSION" 1>&6
+
+-echo "${as_me:-configure}:13148: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
++echo "${as_me:-configure}:13155: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
+
+ continue;;
+ esac
+@@ -13165,12 +13172,12 @@
+ if test "$GCC" = yes ; then
+ case $host_os in
+ (linux*|gnu*)
+- echo "$as_me:13168: checking if this is really Intel C++ compiler" >&5
++ echo "$as_me:13175: 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 13173 "configure"
++#line 13180 "configure"
+ #include "confdefs.h"
+
+ int
+@@ -13187,16 +13194,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:13190: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:13197: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:13193: \$? = $ac_status" >&5
++ echo "$as_me:13200: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:13196: \"$ac_try\"") >&5
++ { (eval echo "$as_me:13203: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:13199: \$? = $ac_status" >&5
++ echo "$as_me:13206: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ INTEL_CPLUSPLUS=yes
+ cf_save_CFLAGS="$cf_save_CFLAGS -we147"
+@@ -13207,7 +13214,7 @@
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ CXXFLAGS="$cf_save_CFLAGS"
+- echo "$as_me:13210: result: $INTEL_CPLUSPLUS" >&5
++ echo "$as_me:13217: result: $INTEL_CPLUSPLUS" >&5
+ echo "${ECHO_T}$INTEL_CPLUSPLUS" >&6
+ ;;
+ esac
+@@ -13216,12 +13223,12 @@
+ CLANG_CPLUSPLUS=no
+
+ if test "$GCC" = yes ; then
+- echo "$as_me:13219: checking if this is really Clang C++ compiler" >&5
++ echo "$as_me:13226: 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"
+ CXXFLAGS="$CXXFLAGS -Qunused-arguments"
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 13224 "configure"
++#line 13231 "configure"
+ #include "confdefs.h"
+
+ int
+@@ -13238,16 +13245,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:13241: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:13248: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:13244: \$? = $ac_status" >&5
++ echo "$as_me:13251: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:13247: \"$ac_try\"") >&5
++ { (eval echo "$as_me:13254: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:13250: \$? = $ac_status" >&5
++ echo "$as_me:13257: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ CLANG_CPLUSPLUS=yes
+ cf_save_CFLAGS="$cf_save_CFLAGS -Qunused-arguments"
+@@ -13258,7 +13265,7 @@
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ CXXFLAGS="$cf_save_CFLAGS"
+- echo "$as_me:13261: result: $CLANG_CPLUSPLUS" >&5
++ echo "$as_me:13268: result: $CLANG_CPLUSPLUS" >&5
+ echo "${ECHO_T}$CLANG_CPLUSPLUS" >&6
+ fi
+
+@@ -13270,7 +13277,7 @@
+ ac_main_return=return
+
+ cat > conftest.$ac_ext <<EOF
+-#line 13273 "configure"
++#line 13280 "configure"
+ int main(int argc, char *argv[]) { return (argv[argc-1] == 0) ; }
+ EOF
+
+@@ -13288,7 +13295,7 @@
+ # remark #981: operands are evaluated in unspecified order
+ # warning #269: invalid format string conversion
+
+- { echo "$as_me:13291: checking for $CC warning options..." >&5
++ { echo "$as_me:13298: checking for $CC warning options..." >&5
+ echo "$as_me: checking for $CC warning options..." >&6;}
+ cf_save_CXXFLAGS="$CXXFLAGS"
+ EXTRA_CXXFLAGS="-Wall"
+@@ -13305,12 +13312,12 @@
+ wd981
+ do
+ CXXFLAGS="$cf_save_CXXFLAGS $EXTRA_CXXFLAGS -$cf_opt"
+- if { (eval echo "$as_me:13308: \"$ac_compile\"") >&5
++ if { (eval echo "$as_me:13315: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:13311: \$? = $ac_status" >&5
++ echo "$as_me:13318: \$? = $ac_status" >&5
+ (exit $ac_status); }; then
+- test -n "$verbose" && echo "$as_me:13313: result: ... -$cf_opt" >&5
++ test -n "$verbose" && echo "$as_me:13320: result: ... -$cf_opt" >&5
+ echo "${ECHO_T}... -$cf_opt" >&6
+ EXTRA_CXXFLAGS="$EXTRA_CXXFLAGS -$cf_opt"
+ fi
+@@ -13319,7 +13326,7 @@
+
+ elif test "$GXX" = yes
+ then
+- { echo "$as_me:13322: checking for $CXX warning options..." >&5
++ { echo "$as_me:13329: checking for $CXX warning options..." >&5
+ echo "$as_me: checking for $CXX warning options..." >&6;}
+ cf_save_CXXFLAGS="$CXXFLAGS"
+ EXTRA_CXXFLAGS="-W -Wall"
+@@ -13349,16 +13356,16 @@
+ Wundef $cf_gxx_extra_warnings Wno-unused
+ do
+ CXXFLAGS="$cf_save_CXXFLAGS $EXTRA_CXXFLAGS -Werror -$cf_opt"
+- if { (eval echo "$as_me:13352: \"$ac_compile\"") >&5
++ if { (eval echo "$as_me:13359: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:13355: \$? = $ac_status" >&5
++ echo "$as_me:13362: \$? = $ac_status" >&5
+ (exit $ac_status); }; then
+- test -n "$verbose" && echo "$as_me:13357: result: ... -$cf_opt" >&5
++ test -n "$verbose" && echo "$as_me:13364: result: ... -$cf_opt" >&5
+ echo "${ECHO_T}... -$cf_opt" >&6
+ EXTRA_CXXFLAGS="$EXTRA_CXXFLAGS -$cf_opt"
+ else
+- test -n "$verbose" && echo "$as_me:13361: result: ... no -$cf_opt" >&5
++ test -n "$verbose" && echo "$as_me:13368: result: ... no -$cf_opt" >&5
+ echo "${ECHO_T}... no -$cf_opt" >&6
+ fi
+ done
+@@ -13394,10 +13401,10 @@
+ EOF
+ if test "$GCC" = yes
+ then
+- { echo "$as_me:13397: checking for $CC __attribute__ directives..." >&5
++ { echo "$as_me:13404: checking for $CC __attribute__ directives..." >&5
+ echo "$as_me: checking for $CC __attribute__ directives..." >&6;}
+ cat > conftest.$ac_ext <<EOF
+-#line 13400 "${as_me:-configure}"
++#line 13407 "${as_me:-configure}"
+ #include "confdefs.h"
+ #include "conftest.h"
+ #include "conftest.i"
+@@ -13446,12 +13453,12 @@
+ ;;
+ esac
+
+- if { (eval echo "$as_me:13449: \"$ac_compile\"") >&5
++ if { (eval echo "$as_me:13456: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:13452: \$? = $ac_status" >&5
++ echo "$as_me:13459: \$? = $ac_status" >&5
+ (exit $ac_status); }; then
+- test -n "$verbose" && echo "$as_me:13454: result: ... $cf_attribute" >&5
++ test -n "$verbose" && echo "$as_me:13461: result: ... $cf_attribute" >&5
+ echo "${ECHO_T}... $cf_attribute" >&6
+ cat conftest.h >>confdefs.h
+ case $cf_attribute in
+@@ -13510,7 +13517,7 @@
+ rm -rf conftest*
+ fi
+
+-echo "$as_me:13513: checking if you want to work around bogus compiler/loader warnings" >&5
++echo "$as_me:13520: 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.
+@@ -13520,7 +13527,7 @@
+ else
+ with_string_hacks=no
+ fi;
+-echo "$as_me:13523: result: $with_string_hacks" >&5
++echo "$as_me:13530: result: $with_string_hacks" >&5
+ echo "${ECHO_T}$with_string_hacks" >&6
+
+ if test "x$with_string_hacks" = "xyes"; then
+@@ -13529,19 +13536,19 @@
+ #define USE_STRING_HACKS 1
+ EOF
+
+- { echo "$as_me:13532: WARNING: enabling string-hacks to work around bogus compiler/loader warnings" >&5
++ { echo "$as_me:13539: 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;}
+
+ for ac_func in strlcat strlcpy snprintf
+ do
+ as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+-echo "$as_me:13538: checking for $ac_func" >&5
++echo "$as_me:13545: 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 13544 "configure"
++#line 13551 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+ which can conflict with char $ac_func (); below. */
+@@ -13572,16 +13579,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:13575: \"$ac_link\"") >&5
++if { (eval echo "$as_me:13582: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:13578: \$? = $ac_status" >&5
++ echo "$as_me:13585: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -s conftest$ac_exeext'
+- { (eval echo "$as_me:13581: \"$ac_try\"") >&5
++ { (eval echo "$as_me:13588: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:13584: \$? = $ac_status" >&5
++ echo "$as_me:13591: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ eval "$as_ac_var=yes"
+ else
+@@ -13591,7 +13598,7 @@
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "$as_me:13594: result: `eval echo '${'$as_ac_var'}'`" >&5
++echo "$as_me:13601: 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
+@@ -13604,7 +13611,7 @@
+ fi
+
+ ### use option --enable-assertions to turn on generation of assertion code
+-echo "$as_me:13607: checking if you want to enable runtime assertions" >&5
++echo "$as_me:13614: 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.
+@@ -13614,7 +13621,7 @@
+ else
+ with_assertions=no
+ fi;
+-echo "$as_me:13617: result: $with_assertions" >&5
++echo "$as_me:13624: result: $with_assertions" >&5
+ echo "${ECHO_T}$with_assertions" >&6
+ if test -n "$GCC"
+ then
+@@ -13630,7 +13637,7 @@
+
+ ### use option --disable-leaks to suppress "permanent" leaks, for testing
+
+-echo "$as_me:13633: checking if you want to use dmalloc for testing" >&5
++echo "$as_me:13640: 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.
+@@ -13647,7 +13654,7 @@
+ else
+ with_dmalloc=
+ fi;
+-echo "$as_me:13650: result: ${with_dmalloc:-no}" >&5
++echo "$as_me:13657: result: ${with_dmalloc:-no}" >&5
+ echo "${ECHO_T}${with_dmalloc:-no}" >&6
+
+ case .$with_cflags in
+@@ -13741,23 +13748,23 @@
+ esac
+
+ if test "$with_dmalloc" = yes ; then
+- echo "$as_me:13744: checking for dmalloc.h" >&5
++ echo "$as_me:13751: 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 13750 "configure"
++#line 13757 "configure"
+ #include "confdefs.h"
+ #include <dmalloc.h>
+ _ACEOF
+-if { (eval echo "$as_me:13754: \"$ac_cpp conftest.$ac_ext\"") >&5
++if { (eval echo "$as_me:13761: \"$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:13760: \$? = $ac_status" >&5
++ echo "$as_me:13767: \$? = $ac_status" >&5
+ (exit $ac_status); } >/dev/null; then
+ if test -s conftest.err; then
+ ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -13776,11 +13783,11 @@
+ fi
+ rm -f conftest.err conftest.$ac_ext
+ fi
+-echo "$as_me:13779: result: $ac_cv_header_dmalloc_h" >&5
++echo "$as_me:13786: 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:13783: checking for dmalloc_debug in -ldmalloc" >&5
++echo "$as_me:13790: 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
+@@ -13788,7 +13795,7 @@
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-ldmalloc $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 13791 "configure"
++#line 13798 "configure"
+ #include "confdefs.h"
+
+ /* Override any gcc2 internal prototype to avoid an error. */
+@@ -13807,16 +13814,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:13810: \"$ac_link\"") >&5
++if { (eval echo "$as_me:13817: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:13813: \$? = $ac_status" >&5
++ echo "$as_me:13820: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -s conftest$ac_exeext'
+- { (eval echo "$as_me:13816: \"$ac_try\"") >&5
++ { (eval echo "$as_me:13823: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:13819: \$? = $ac_status" >&5
++ echo "$as_me:13826: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ ac_cv_lib_dmalloc_dmalloc_debug=yes
+ else
+@@ -13827,7 +13834,7 @@
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:13830: result: $ac_cv_lib_dmalloc_dmalloc_debug" >&5
++echo "$as_me:13837: 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
+@@ -13842,7 +13849,7 @@
+
+ fi
+
+-echo "$as_me:13845: checking if you want to use dbmalloc for testing" >&5
++echo "$as_me:13852: 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.
+@@ -13859,7 +13866,7 @@
+ else
+ with_dbmalloc=
+ fi;
+-echo "$as_me:13862: result: ${with_dbmalloc:-no}" >&5
++echo "$as_me:13869: result: ${with_dbmalloc:-no}" >&5
+ echo "${ECHO_T}${with_dbmalloc:-no}" >&6
+
+ case .$with_cflags in
+@@ -13953,23 +13960,23 @@
+ esac
+
+ if test "$with_dbmalloc" = yes ; then
+- echo "$as_me:13956: checking for dbmalloc.h" >&5
++ echo "$as_me:13963: 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 13962 "configure"
++#line 13969 "configure"
+ #include "confdefs.h"
+ #include <dbmalloc.h>
+ _ACEOF
+-if { (eval echo "$as_me:13966: \"$ac_cpp conftest.$ac_ext\"") >&5
++if { (eval echo "$as_me:13973: \"$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:13972: \$? = $ac_status" >&5
++ echo "$as_me:13979: \$? = $ac_status" >&5
+ (exit $ac_status); } >/dev/null; then
+ if test -s conftest.err; then
+ ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -13988,11 +13995,11 @@
+ fi
+ rm -f conftest.err conftest.$ac_ext
+ fi
+-echo "$as_me:13991: result: $ac_cv_header_dbmalloc_h" >&5
++echo "$as_me:13998: 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:13995: checking for debug_malloc in -ldbmalloc" >&5
++echo "$as_me:14002: 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
+@@ -14000,7 +14007,7 @@
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-ldbmalloc $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 14003 "configure"
++#line 14010 "configure"
+ #include "confdefs.h"
+
+ /* Override any gcc2 internal prototype to avoid an error. */
+@@ -14019,16 +14026,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:14022: \"$ac_link\"") >&5
++if { (eval echo "$as_me:14029: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:14025: \$? = $ac_status" >&5
++ echo "$as_me:14032: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -s conftest$ac_exeext'
+- { (eval echo "$as_me:14028: \"$ac_try\"") >&5
++ { (eval echo "$as_me:14035: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:14031: \$? = $ac_status" >&5
++ echo "$as_me:14038: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ ac_cv_lib_dbmalloc_debug_malloc=yes
+ else
+@@ -14039,7 +14046,7 @@
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:14042: result: $ac_cv_lib_dbmalloc_debug_malloc" >&5
++echo "$as_me:14049: 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
+@@ -14054,7 +14061,7 @@
+
+ fi
+
+-echo "$as_me:14057: checking if you want to use valgrind for testing" >&5
++echo "$as_me:14064: 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.
+@@ -14071,7 +14078,7 @@
+ else
+ with_valgrind=
+ fi;
+-echo "$as_me:14074: result: ${with_valgrind:-no}" >&5
++echo "$as_me:14081: result: ${with_valgrind:-no}" >&5
+ echo "${ECHO_T}${with_valgrind:-no}" >&6
+
+ case .$with_cflags in
+@@ -14164,7 +14171,7 @@
+ ;;
+ esac
+
+-echo "$as_me:14167: checking if you want to perform memory-leak testing" >&5
++echo "$as_me:14174: 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.
+@@ -14174,7 +14181,7 @@
+ else
+ : ${with_no_leaks:=no}
+ fi;
+-echo "$as_me:14177: result: $with_no_leaks" >&5
++echo "$as_me:14184: result: $with_no_leaks" >&5
+ echo "${ECHO_T}$with_no_leaks" >&6
+
+ if test "$with_no_leaks" = yes ; then
+@@ -14226,7 +14233,7 @@
+ ;;
+ esac
+
+-echo "$as_me:14229: checking whether to add trace feature to all models" >&5
++echo "$as_me:14236: 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.
+@@ -14236,7 +14243,7 @@
+ else
+ cf_with_trace=$cf_all_traces
+ fi;
+-echo "$as_me:14239: result: $cf_with_trace" >&5
++echo "$as_me:14246: result: $cf_with_trace" >&5
+ echo "${ECHO_T}$cf_with_trace" >&6
+
+ if test "x$cf_with_trace" = xyes ; then
+@@ -14326,7 +14333,7 @@
+ ADA_TRACE=FALSE
+ fi
+
+-echo "$as_me:14329: checking if we want to use GNAT projects" >&5
++echo "$as_me:14336: 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.
+@@ -14343,7 +14350,7 @@
+ enable_gnat_projects=yes
+
+ fi;
+-echo "$as_me:14346: result: $enable_gnat_projects" >&5
++echo "$as_me:14353: result: $enable_gnat_projects" >&5
+ echo "${ECHO_T}$enable_gnat_projects" >&6
+
+ ### Checks for libraries.
+@@ -14353,13 +14360,13 @@
+ LIBS=" -lpsapi $LIBS"
+ ;;
+ (*)
+-echo "$as_me:14356: checking for gettimeofday" >&5
++echo "$as_me:14363: 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 14362 "configure"
++#line 14369 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+ which can conflict with char gettimeofday (); below. */
+@@ -14390,16 +14397,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:14393: \"$ac_link\"") >&5
++if { (eval echo "$as_me:14400: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:14396: \$? = $ac_status" >&5
++ echo "$as_me:14403: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -s conftest$ac_exeext'
+- { (eval echo "$as_me:14399: \"$ac_try\"") >&5
++ { (eval echo "$as_me:14406: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:14402: \$? = $ac_status" >&5
++ echo "$as_me:14409: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ ac_cv_func_gettimeofday=yes
+ else
+@@ -14409,7 +14416,7 @@
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "$as_me:14412: result: $ac_cv_func_gettimeofday" >&5
++echo "$as_me:14419: result: $ac_cv_func_gettimeofday" >&5
+ echo "${ECHO_T}$ac_cv_func_gettimeofday" >&6
+ if test $ac_cv_func_gettimeofday = yes; then
+
+@@ -14419,7 +14426,7 @@
+
+ else
+
+-echo "$as_me:14422: checking for gettimeofday in -lbsd" >&5
++echo "$as_me:14429: 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
+@@ -14427,7 +14434,7 @@
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lbsd $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 14430 "configure"
++#line 14437 "configure"
+ #include "confdefs.h"
+
+ /* Override any gcc2 internal prototype to avoid an error. */
+@@ -14446,16 +14453,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:14449: \"$ac_link\"") >&5
++if { (eval echo "$as_me:14456: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:14452: \$? = $ac_status" >&5
++ echo "$as_me:14459: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -s conftest$ac_exeext'
+- { (eval echo "$as_me:14455: \"$ac_try\"") >&5
++ { (eval echo "$as_me:14462: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:14458: \$? = $ac_status" >&5
++ echo "$as_me:14465: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ ac_cv_lib_bsd_gettimeofday=yes
+ else
+@@ -14466,7 +14473,7 @@
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:14469: result: $ac_cv_lib_bsd_gettimeofday" >&5
++echo "$as_me:14476: 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
+
+@@ -14496,14 +14503,14 @@
+ ;;
+ esac
+
+-echo "$as_me:14499: checking if -lm needed for math functions" >&5
++echo "$as_me:14506: 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 14506 "configure"
++#line 14513 "configure"
+ #include "confdefs.h"
+
+ #include <stdio.h>
+@@ -14518,16 +14525,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:14521: \"$ac_link\"") >&5
++if { (eval echo "$as_me:14528: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:14524: \$? = $ac_status" >&5
++ echo "$as_me:14531: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -s conftest$ac_exeext'
+- { (eval echo "$as_me:14527: \"$ac_try\"") >&5
++ { (eval echo "$as_me:14534: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:14530: \$? = $ac_status" >&5
++ echo "$as_me:14537: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ cf_cv_need_libm=no
+ else
+@@ -14537,7 +14544,7 @@
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "$as_me:14540: result: $cf_cv_need_libm" >&5
++echo "$as_me:14547: result: $cf_cv_need_libm" >&5
+ echo "${ECHO_T}$cf_cv_need_libm" >&6
+ if test "$cf_cv_need_libm" = yes
+ then
+@@ -14545,13 +14552,13 @@
+ fi
+
+ ### Checks for header files.
+-echo "$as_me:14548: checking for ANSI C header files" >&5
++echo "$as_me:14555: 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 14554 "configure"
++#line 14561 "configure"
+ #include "confdefs.h"
+ #include <stdlib.h>
+ #include <stdarg.h>
+@@ -14559,13 +14566,13 @@
+ #include <float.h>
+
+ _ACEOF
+-if { (eval echo "$as_me:14562: \"$ac_cpp conftest.$ac_ext\"") >&5
++if { (eval echo "$as_me:14569: \"$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:14568: \$? = $ac_status" >&5
++ echo "$as_me:14575: \$? = $ac_status" >&5
+ (exit $ac_status); } >/dev/null; then
+ if test -s conftest.err; then
+ ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -14587,7 +14594,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 14590 "configure"
++#line 14597 "configure"
+ #include "confdefs.h"
+ #include <string.h>
+
+@@ -14605,7 +14612,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 14608 "configure"
++#line 14615 "configure"
+ #include "confdefs.h"
+ #include <stdlib.h>
+
+@@ -14626,7 +14633,7 @@
+ :
+ else
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 14629 "configure"
++#line 14636 "configure"
+ #include "confdefs.h"
+ #include <ctype.h>
+ #if ((' ' & 0x0FF) == 0x020)
+@@ -14652,15 +14659,15 @@
+ }
+ _ACEOF
+ rm -f conftest$ac_exeext
+-if { (eval echo "$as_me:14655: \"$ac_link\"") >&5
++if { (eval echo "$as_me:14662: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:14658: \$? = $ac_status" >&5
++ echo "$as_me:14665: \$? = $ac_status" >&5
+ (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+- { (eval echo "$as_me:14660: \"$ac_try\"") >&5
++ { (eval echo "$as_me:14667: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:14663: \$? = $ac_status" >&5
++ echo "$as_me:14670: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ :
+ else
+@@ -14673,7 +14680,7 @@
+ fi
+ fi
+ fi
+-echo "$as_me:14676: result: $ac_cv_header_stdc" >&5
++echo "$as_me:14683: result: $ac_cv_header_stdc" >&5
+ echo "${ECHO_T}$ac_cv_header_stdc" >&6
+ if test $ac_cv_header_stdc = yes; then
+
+@@ -14686,13 +14693,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:14689: checking for $ac_hdr that defines DIR" >&5
++echo "$as_me:14696: 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 14695 "configure"
++#line 14702 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ #include <$ac_hdr>
+@@ -14707,16 +14714,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:14710: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:14717: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:14713: \$? = $ac_status" >&5
++ echo "$as_me:14720: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:14716: \"$ac_try\"") >&5
++ { (eval echo "$as_me:14723: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:14719: \$? = $ac_status" >&5
++ echo "$as_me:14726: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ eval "$as_ac_Header=yes"
+ else
+@@ -14726,7 +14733,7 @@
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ fi
+-echo "$as_me:14729: result: `eval echo '${'$as_ac_Header'}'`" >&5
++echo "$as_me:14736: 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
+@@ -14739,7 +14746,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:14742: checking for opendir in -ldir" >&5
++ echo "$as_me:14749: 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
+@@ -14747,7 +14754,7 @@
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-ldir $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 14750 "configure"
++#line 14757 "configure"
+ #include "confdefs.h"
+
+ /* Override any gcc2 internal prototype to avoid an error. */
+@@ -14766,16 +14773,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:14769: \"$ac_link\"") >&5
++if { (eval echo "$as_me:14776: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:14772: \$? = $ac_status" >&5
++ echo "$as_me:14779: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -s conftest$ac_exeext'
+- { (eval echo "$as_me:14775: \"$ac_try\"") >&5
++ { (eval echo "$as_me:14782: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:14778: \$? = $ac_status" >&5
++ echo "$as_me:14785: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ ac_cv_lib_dir_opendir=yes
+ else
+@@ -14786,14 +14793,14 @@
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:14789: result: $ac_cv_lib_dir_opendir" >&5
++echo "$as_me:14796: 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:14796: checking for opendir in -lx" >&5
++ echo "$as_me:14803: 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
+@@ -14801,7 +14808,7 @@
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lx $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 14804 "configure"
++#line 14811 "configure"
+ #include "confdefs.h"
+
+ /* Override any gcc2 internal prototype to avoid an error. */
+@@ -14820,16 +14827,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:14823: \"$ac_link\"") >&5
++if { (eval echo "$as_me:14830: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:14826: \$? = $ac_status" >&5
++ echo "$as_me:14833: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -s conftest$ac_exeext'
+- { (eval echo "$as_me:14829: \"$ac_try\"") >&5
++ { (eval echo "$as_me:14836: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:14832: \$? = $ac_status" >&5
++ echo "$as_me:14839: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ ac_cv_lib_x_opendir=yes
+ else
+@@ -14840,7 +14847,7 @@
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:14843: result: $ac_cv_lib_x_opendir" >&5
++echo "$as_me:14850: 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"
+@@ -14848,13 +14855,13 @@
+
+ fi
+
+-echo "$as_me:14851: checking whether time.h and sys/time.h may both be included" >&5
++echo "$as_me:14858: 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 14857 "configure"
++#line 14864 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ #include <sys/time.h>
+@@ -14870,16 +14877,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:14873: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:14880: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:14876: \$? = $ac_status" >&5
++ echo "$as_me:14883: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:14879: \"$ac_try\"") >&5
++ { (eval echo "$as_me:14886: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:14882: \$? = $ac_status" >&5
++ echo "$as_me:14889: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ ac_cv_header_time=yes
+ else
+@@ -14889,7 +14896,7 @@
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ fi
+-echo "$as_me:14892: result: $ac_cv_header_time" >&5
++echo "$as_me:14899: result: $ac_cv_header_time" >&5
+ echo "${ECHO_T}$ac_cv_header_time" >&6
+ if test $ac_cv_header_time = yes; then
+
+@@ -14908,13 +14915,13 @@
+ ;;
+ esac
+
+-echo "$as_me:14911: checking for regcomp" >&5
++echo "$as_me:14918: 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 14917 "configure"
++#line 14924 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+ which can conflict with char regcomp (); below. */
+@@ -14945,16 +14952,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:14948: \"$ac_link\"") >&5
++if { (eval echo "$as_me:14955: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:14951: \$? = $ac_status" >&5
++ echo "$as_me:14958: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -s conftest$ac_exeext'
+- { (eval echo "$as_me:14954: \"$ac_try\"") >&5
++ { (eval echo "$as_me:14961: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:14957: \$? = $ac_status" >&5
++ echo "$as_me:14964: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ ac_cv_func_regcomp=yes
+ else
+@@ -14964,7 +14971,7 @@
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "$as_me:14967: result: $ac_cv_func_regcomp" >&5
++echo "$as_me:14974: 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
+@@ -14973,7 +14980,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:14976: checking for regcomp in -l$cf_regex_lib" >&5
++echo "$as_me:14983: 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
+@@ -14981,7 +14988,7 @@
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-l$cf_regex_lib $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 14984 "configure"
++#line 14991 "configure"
+ #include "confdefs.h"
+
+ /* Override any gcc2 internal prototype to avoid an error. */
+@@ -15000,16 +15007,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:15003: \"$ac_link\"") >&5
++if { (eval echo "$as_me:15010: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:15006: \$? = $ac_status" >&5
++ echo "$as_me:15013: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -s conftest$ac_exeext'
+- { (eval echo "$as_me:15009: \"$ac_try\"") >&5
++ { (eval echo "$as_me:15016: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:15012: \$? = $ac_status" >&5
++ echo "$as_me:15019: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ eval "$as_ac_Lib=yes"
+ else
+@@ -15020,7 +15027,7 @@
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:15023: result: `eval echo '${'$as_ac_Lib'}'`" >&5
++echo "$as_me:15030: 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
+
+@@ -15049,13 +15056,13 @@
+ fi
+
+ if test "$cf_regex_func" = no ; then
+- echo "$as_me:15052: checking for compile" >&5
++ echo "$as_me:15059: 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 15058 "configure"
++#line 15065 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+ which can conflict with char compile (); below. */
+@@ -15086,16 +15093,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:15089: \"$ac_link\"") >&5
++if { (eval echo "$as_me:15096: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:15092: \$? = $ac_status" >&5
++ echo "$as_me:15099: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -s conftest$ac_exeext'
+- { (eval echo "$as_me:15095: \"$ac_try\"") >&5
++ { (eval echo "$as_me:15102: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:15098: \$? = $ac_status" >&5
++ echo "$as_me:15105: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ ac_cv_func_compile=yes
+ else
+@@ -15105,13 +15112,13 @@
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "$as_me:15108: result: $ac_cv_func_compile" >&5
++echo "$as_me:15115: 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:15114: checking for compile in -lgen" >&5
++ echo "$as_me:15121: 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
+@@ -15119,7 +15126,7 @@
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lgen $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 15122 "configure"
++#line 15129 "configure"
+ #include "confdefs.h"
+
+ /* Override any gcc2 internal prototype to avoid an error. */
+@@ -15138,16 +15145,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:15141: \"$ac_link\"") >&5
++if { (eval echo "$as_me:15148: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:15144: \$? = $ac_status" >&5
++ echo "$as_me:15151: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -s conftest$ac_exeext'
+- { (eval echo "$as_me:15147: \"$ac_try\"") >&5
++ { (eval echo "$as_me:15154: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:15150: \$? = $ac_status" >&5
++ echo "$as_me:15157: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ ac_cv_lib_gen_compile=yes
+ else
+@@ -15158,7 +15165,7 @@
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:15161: result: $ac_cv_lib_gen_compile" >&5
++echo "$as_me:15168: 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
+
+@@ -15186,11 +15193,11 @@
+ fi
+
+ if test "$cf_regex_func" = no ; then
+- { echo "$as_me:15189: WARNING: cannot find regular expression library" >&5
++ { echo "$as_me:15196: WARNING: cannot find regular expression library" >&5
+ echo "$as_me: WARNING: cannot find regular expression library" >&2;}
+ fi
+
+-echo "$as_me:15193: checking for regular-expression headers" >&5
++echo "$as_me:15200: 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
+@@ -15202,7 +15209,7 @@
+ for cf_regex_hdr in regexp.h regexpr.h
+ do
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 15205 "configure"
++#line 15212 "configure"
+ #include "confdefs.h"
+ #include <$cf_regex_hdr>
+ int
+@@ -15217,16 +15224,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:15220: \"$ac_link\"") >&5
++if { (eval echo "$as_me:15227: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:15223: \$? = $ac_status" >&5
++ echo "$as_me:15230: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -s conftest$ac_exeext'
+- { (eval echo "$as_me:15226: \"$ac_try\"") >&5
++ { (eval echo "$as_me:15233: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:15229: \$? = $ac_status" >&5
++ echo "$as_me:15236: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+
+ cf_cv_regex_hdrs=$cf_regex_hdr
+@@ -15243,7 +15250,7 @@
+ for cf_regex_hdr in regex.h
+ do
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 15246 "configure"
++#line 15253 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ #include <$cf_regex_hdr>
+@@ -15261,16 +15268,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:15264: \"$ac_link\"") >&5
++if { (eval echo "$as_me:15271: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:15267: \$? = $ac_status" >&5
++ echo "$as_me:15274: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -s conftest$ac_exeext'
+- { (eval echo "$as_me:15270: \"$ac_try\"") >&5
++ { (eval echo "$as_me:15277: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:15273: \$? = $ac_status" >&5
++ echo "$as_me:15280: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+
+ cf_cv_regex_hdrs=$cf_regex_hdr
+@@ -15286,11 +15293,11 @@
+ esac
+
+ fi
+-echo "$as_me:15289: result: $cf_cv_regex_hdrs" >&5
++echo "$as_me:15296: result: $cf_cv_regex_hdrs" >&5
+ echo "${ECHO_T}$cf_cv_regex_hdrs" >&6
+
+ case $cf_cv_regex_hdrs in
+- (no) { echo "$as_me:15293: WARNING: no regular expression header found" >&5
++ (no) { echo "$as_me:15300: WARNING: no regular expression header found" >&5
+ echo "$as_me: WARNING: no regular expression header found" >&2;} ;;
+ (regex.h)
+ cat >>confdefs.h <<\EOF
+@@ -15329,23 +15336,23 @@
+
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-echo "$as_me:15332: checking for $ac_header" >&5
++echo "$as_me:15339: 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 15338 "configure"
++#line 15345 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:15342: \"$ac_cpp conftest.$ac_ext\"") >&5
++if { (eval echo "$as_me:15349: \"$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:15348: \$? = $ac_status" >&5
++ echo "$as_me:15355: \$? = $ac_status" >&5
+ (exit $ac_status); } >/dev/null; then
+ if test -s conftest.err; then
+ ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -15364,7 +15371,7 @@
+ fi
+ rm -f conftest.err conftest.$ac_ext
+ fi
+-echo "$as_me:15367: result: `eval echo '${'$as_ac_Header'}'`" >&5
++echo "$as_me:15374: 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
+@@ -15377,23 +15384,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:15380: checking for $ac_header" >&5
++echo "$as_me:15387: 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 15386 "configure"
++#line 15393 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:15390: \"$ac_cpp conftest.$ac_ext\"") >&5
++if { (eval echo "$as_me:15397: \"$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:15396: \$? = $ac_status" >&5
++ echo "$as_me:15403: \$? = $ac_status" >&5
+ (exit $ac_status); } >/dev/null; then
+ if test -s conftest.err; then
+ ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -15412,7 +15419,7 @@
+ fi
+ rm -f conftest.err conftest.$ac_ext
+ fi
+-echo "$as_me:15415: result: `eval echo '${'$as_ac_Header'}'`" >&5
++echo "$as_me:15422: 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
+@@ -15422,7 +15429,7 @@
+ fi
+ done
+
+-echo "$as_me:15425: checking for header declaring getopt variables" >&5
++echo "$as_me:15432: 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
+@@ -15432,7 +15439,7 @@
+ for cf_header in stdio.h stdlib.h unistd.h getopt.h
+ do
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 15435 "configure"
++#line 15442 "configure"
+ #include "confdefs.h"
+
+ #include <$cf_header>
+@@ -15445,16 +15452,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:15448: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:15455: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:15451: \$? = $ac_status" >&5
++ echo "$as_me:15458: \$? = $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:15461: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:15457: \$? = $ac_status" >&5
++ echo "$as_me:15464: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ cf_cv_getopt_header=$cf_header
+ break
+@@ -15466,7 +15473,7 @@
+ done
+
+ fi
+-echo "$as_me:15469: result: $cf_cv_getopt_header" >&5
++echo "$as_me:15476: result: $cf_cv_getopt_header" >&5
+ echo "${ECHO_T}$cf_cv_getopt_header" >&6
+ if test $cf_cv_getopt_header != none ; then
+
+@@ -15487,7 +15494,7 @@
+ # Note: even non-Posix ISC needs <sys/bsdtypes.h> to declare fd_set
+ if test "x$ISC" = xyes ; then
+
+-echo "$as_me:15490: checking for main in -lcposix" >&5
++echo "$as_me:15497: checking for main in -lcposix" >&5
+ echo $ECHO_N "checking for main in -lcposix... $ECHO_C" >&6
+ if test "${ac_cv_lib_cposix_main+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -15495,7 +15502,7 @@
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lcposix $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 15498 "configure"
++#line 15505 "configure"
+ #include "confdefs.h"
+
+ int
+@@ -15507,16 +15514,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:15510: \"$ac_link\"") >&5
++if { (eval echo "$as_me:15517: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:15513: \$? = $ac_status" >&5
++ echo "$as_me:15520: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -s conftest$ac_exeext'
+- { (eval echo "$as_me:15516: \"$ac_try\"") >&5
++ { (eval echo "$as_me:15523: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:15519: \$? = $ac_status" >&5
++ echo "$as_me:15526: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ ac_cv_lib_cposix_main=yes
+ else
+@@ -15527,7 +15534,7 @@
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:15530: result: $ac_cv_lib_cposix_main" >&5
++echo "$as_me:15537: result: $ac_cv_lib_cposix_main" >&5
+ echo "${ECHO_T}$ac_cv_lib_cposix_main" >&6
+ if test $ac_cv_lib_cposix_main = yes; then
+ cat >>confdefs.h <<EOF
+@@ -15538,7 +15545,7 @@
+
+ fi
+
+- echo "$as_me:15541: checking for bzero in -linet" >&5
++ echo "$as_me:15548: checking for bzero in -linet" >&5
+ echo $ECHO_N "checking for bzero in -linet... $ECHO_C" >&6
+ if test "${ac_cv_lib_inet_bzero+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -15546,7 +15553,7 @@
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-linet $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 15549 "configure"
++#line 15556 "configure"
+ #include "confdefs.h"
+
+ /* Override any gcc2 internal prototype to avoid an error. */
+@@ -15565,16 +15572,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:15568: \"$ac_link\"") >&5
++if { (eval echo "$as_me:15575: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:15571: \$? = $ac_status" >&5
++ echo "$as_me:15578: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -s conftest$ac_exeext'
+- { (eval echo "$as_me:15574: \"$ac_try\"") >&5
++ { (eval echo "$as_me:15581: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:15577: \$? = $ac_status" >&5
++ echo "$as_me:15584: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ ac_cv_lib_inet_bzero=yes
+ else
+@@ -15585,7 +15592,7 @@
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:15588: result: $ac_cv_lib_inet_bzero" >&5
++echo "$as_me:15595: result: $ac_cv_lib_inet_bzero" >&5
+ echo "${ECHO_T}$ac_cv_lib_inet_bzero" >&6
+ if test $ac_cv_lib_inet_bzero = yes; then
+
+@@ -15608,14 +15615,14 @@
+ fi
+ fi
+
+-echo "$as_me:15611: checking if sys/time.h works with sys/select.h" >&5
++echo "$as_me:15618: 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 15618 "configure"
++#line 15625 "configure"
+ #include "confdefs.h"
+
+ #include <sys/types.h>
+@@ -15635,16 +15642,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:15638: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:15645: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:15641: \$? = $ac_status" >&5
++ echo "$as_me:15648: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:15644: \"$ac_try\"") >&5
++ { (eval echo "$as_me:15651: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:15647: \$? = $ac_status" >&5
++ echo "$as_me:15654: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ cf_cv_sys_time_select=yes
+ else
+@@ -15656,7 +15663,7 @@
+
+ fi
+
+-echo "$as_me:15659: result: $cf_cv_sys_time_select" >&5
++echo "$as_me:15666: 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
+@@ -15671,13 +15678,13 @@
+ ac_compiler_gnu=$ac_cv_c_compiler_gnu
+ ac_main_return=return
+
+-echo "$as_me:15674: checking for an ANSI C-conforming const" >&5
++echo "$as_me:15681: 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 15680 "configure"
++#line 15687 "configure"
+ #include "confdefs.h"
+
+ int
+@@ -15735,16 +15742,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:15738: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:15745: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:15741: \$? = $ac_status" >&5
++ echo "$as_me:15748: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:15744: \"$ac_try\"") >&5
++ { (eval echo "$as_me:15751: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:15747: \$? = $ac_status" >&5
++ echo "$as_me:15754: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ ac_cv_c_const=yes
+ else
+@@ -15754,7 +15761,7 @@
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ fi
+-echo "$as_me:15757: result: $ac_cv_c_const" >&5
++echo "$as_me:15764: result: $ac_cv_c_const" >&5
+ echo "${ECHO_T}$ac_cv_c_const" >&6
+ if test $ac_cv_c_const = no; then
+
+@@ -15764,7 +15771,7 @@
+
+ fi
+
+-echo "$as_me:15767: checking for inline" >&5
++echo "$as_me:15774: 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
+@@ -15772,7 +15779,7 @@
+ ac_cv_c_inline=no
+ for ac_kw in inline __inline__ __inline; do
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 15775 "configure"
++#line 15782 "configure"
+ #include "confdefs.h"
+ #ifndef __cplusplus
+ static $ac_kw int static_foo () {return 0; }
+@@ -15781,16 +15788,16 @@
+
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:15784: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:15791: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:15787: \$? = $ac_status" >&5
++ echo "$as_me:15794: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:15790: \"$ac_try\"") >&5
++ { (eval echo "$as_me:15797: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:15793: \$? = $ac_status" >&5
++ echo "$as_me:15800: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ ac_cv_c_inline=$ac_kw; break
+ else
+@@ -15801,7 +15808,7 @@
+ done
+
+ fi
+-echo "$as_me:15804: result: $ac_cv_c_inline" >&5
++echo "$as_me:15811: result: $ac_cv_c_inline" >&5
+ echo "${ECHO_T}$ac_cv_c_inline" >&6
+ case $ac_cv_c_inline in
+ inline | yes) ;;
+@@ -15827,7 +15834,7 @@
+ :
+ elif test "$GCC" = yes
+ then
+- echo "$as_me:15830: checking if $CC supports options to tune inlining" >&5
++ echo "$as_me:15837: 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
+@@ -15836,7 +15843,7 @@
+ cf_save_CFLAGS=$CFLAGS
+ CFLAGS="$CFLAGS --param max-inline-insns-single=1200"
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 15839 "configure"
++#line 15846 "configure"
+ #include "confdefs.h"
+ inline int foo(void) { return 1; }
+ int
+@@ -15848,16 +15855,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:15851: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:15858: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:15854: \$? = $ac_status" >&5
++ echo "$as_me:15861: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:15857: \"$ac_try\"") >&5
++ { (eval echo "$as_me:15864: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:15860: \$? = $ac_status" >&5
++ echo "$as_me:15867: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ cf_cv_gcc_inline=yes
+ else
+@@ -15869,7 +15876,7 @@
+ CFLAGS=$cf_save_CFLAGS
+
+ fi
+-echo "$as_me:15872: result: $cf_cv_gcc_inline" >&5
++echo "$as_me:15879: result: $cf_cv_gcc_inline" >&5
+ echo "${ECHO_T}$cf_cv_gcc_inline" >&6
+ if test "$cf_cv_gcc_inline" = yes ; then
+
+@@ -15955,7 +15962,7 @@
+ fi
+ fi
+
+-echo "$as_me:15958: checking for signal global datatype" >&5
++echo "$as_me:15965: 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
+@@ -15967,7 +15974,7 @@
+ "int"
+ do
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 15970 "configure"
++#line 15977 "configure"
+ #include "confdefs.h"
+
+ #include <sys/types.h>
+@@ -15990,16 +15997,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:15993: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:16000: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:15996: \$? = $ac_status" >&5
++ echo "$as_me:16003: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:15999: \"$ac_try\"") >&5
++ { (eval echo "$as_me:16006: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:16002: \$? = $ac_status" >&5
++ echo "$as_me:16009: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ cf_cv_sig_atomic_t=$cf_type
+ else
+@@ -16013,7 +16020,7 @@
+
+ fi
+
+-echo "$as_me:16016: result: $cf_cv_sig_atomic_t" >&5
++echo "$as_me:16023: 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
+@@ -16022,7 +16029,7 @@
+
+ if test $NCURSES_CHTYPE = auto ; then
+
+-echo "$as_me:16025: checking for type of chtype" >&5
++echo "$as_me:16032: 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
+@@ -16032,7 +16039,7 @@
+ cf_cv_typeof_chtype=long
+ else
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 16035 "configure"
++#line 16042 "configure"
+ #include "confdefs.h"
+
+ #define WANT_BITS 31
+@@ -16067,15 +16074,15 @@
+
+ _ACEOF
+ rm -f conftest$ac_exeext
+-if { (eval echo "$as_me:16070: \"$ac_link\"") >&5
++if { (eval echo "$as_me:16077: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:16073: \$? = $ac_status" >&5
++ echo "$as_me:16080: \$? = $ac_status" >&5
+ (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+- { (eval echo "$as_me:16075: \"$ac_try\"") >&5
++ { (eval echo "$as_me:16082: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:16078: \$? = $ac_status" >&5
++ echo "$as_me:16085: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ cf_cv_typeof_chtype=`cat cf_test.out`
+ else
+@@ -16090,7 +16097,7 @@
+
+ fi
+
+-echo "$as_me:16093: result: $cf_cv_typeof_chtype" >&5
++echo "$as_me:16100: result: $cf_cv_typeof_chtype" >&5
+ echo "${ECHO_T}$cf_cv_typeof_chtype" >&6
+
+ cat >>confdefs.h <<EOF
+@@ -16102,14 +16109,14 @@
+ fi
+ test "$cf_cv_typeof_chtype" = unsigned && cf_cv_typeof_chtype=""
+
+-echo "$as_me:16105: checking if unsigned literals are legal" >&5
++echo "$as_me:16112: 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 16112 "configure"
++#line 16119 "configure"
+ #include "confdefs.h"
+
+ int
+@@ -16121,16 +16128,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:16124: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:16131: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:16127: \$? = $ac_status" >&5
++ echo "$as_me:16134: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:16130: \"$ac_try\"") >&5
++ { (eval echo "$as_me:16137: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:16133: \$? = $ac_status" >&5
++ echo "$as_me:16140: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ cf_cv_unsigned_literals=yes
+ else
+@@ -16142,7 +16149,7 @@
+
+ fi
+
+-echo "$as_me:16145: result: $cf_cv_unsigned_literals" >&5
++echo "$as_me:16152: result: $cf_cv_unsigned_literals" >&5
+ echo "${ECHO_T}$cf_cv_unsigned_literals" >&6
+
+ cf_cv_1UL="1"
+@@ -16158,14 +16165,14 @@
+
+ ### Checks for external-data
+
+-echo "$as_me:16161: checking if external errno is declared" >&5
++echo "$as_me:16168: 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 16168 "configure"
++#line 16175 "configure"
+ #include "confdefs.h"
+
+ #ifdef HAVE_STDLIB_H
+@@ -16183,16 +16190,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:16186: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:16193: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:16189: \$? = $ac_status" >&5
++ echo "$as_me:16196: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:16192: \"$ac_try\"") >&5
++ { (eval echo "$as_me:16199: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:16195: \$? = $ac_status" >&5
++ echo "$as_me:16202: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ cf_cv_dcl_errno=yes
+ else
+@@ -16203,7 +16210,7 @@
+ rm -f conftest.$ac_objext conftest.$ac_ext
+
+ fi
+-echo "$as_me:16206: result: $cf_cv_dcl_errno" >&5
++echo "$as_me:16213: result: $cf_cv_dcl_errno" >&5
+ echo "${ECHO_T}$cf_cv_dcl_errno" >&6
+
+ if test "$cf_cv_dcl_errno" = no ; then
+@@ -16218,14 +16225,14 @@
+
+ # It's possible (for near-UNIX clones) that the data doesn't exist
+
+-echo "$as_me:16221: checking if external errno exists" >&5
++echo "$as_me:16228: 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 16228 "configure"
++#line 16235 "configure"
+ #include "confdefs.h"
+
+ #undef errno
+@@ -16240,16 +16247,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:16243: \"$ac_link\"") >&5
++if { (eval echo "$as_me:16250: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:16246: \$? = $ac_status" >&5
++ echo "$as_me:16253: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -s conftest$ac_exeext'
+- { (eval echo "$as_me:16249: \"$ac_try\"") >&5
++ { (eval echo "$as_me:16256: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:16252: \$? = $ac_status" >&5
++ echo "$as_me:16259: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ cf_cv_have_errno=yes
+ else
+@@ -16260,7 +16267,7 @@
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+
+ fi
+-echo "$as_me:16263: result: $cf_cv_have_errno" >&5
++echo "$as_me:16270: result: $cf_cv_have_errno" >&5
+ echo "${ECHO_T}$cf_cv_have_errno" >&6
+
+ if test "$cf_cv_have_errno" = yes ; then
+@@ -16273,7 +16280,7 @@
+
+ fi
+
+-echo "$as_me:16276: checking if data-only library module links" >&5
++echo "$as_me:16283: 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
+@@ -16281,20 +16288,20 @@
+
+ rm -f conftest.a
+ cat >conftest.$ac_ext <<EOF
+-#line 16284 "configure"
++#line 16291 "configure"
+ int testdata[3] = { 123, 456, 789 };
+ EOF
+- if { (eval echo "$as_me:16287: \"$ac_compile\"") >&5
++ if { (eval echo "$as_me:16294: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:16290: \$? = $ac_status" >&5
++ echo "$as_me:16297: \$? = $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 16297 "configure"
++#line 16304 "configure"
+ int testfunc()
+ {
+ #if defined(NeXT)
+@@ -16307,10 +16314,10 @@
+ #endif
+ }
+ EOF
+- if { (eval echo "$as_me:16310: \"$ac_compile\"") >&5
++ if { (eval echo "$as_me:16317: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:16313: \$? = $ac_status" >&5
++ echo "$as_me:16320: \$? = $ac_status" >&5
+ (exit $ac_status); }; then
+ mv conftest.o func.o && \
+ ( $AR $ARFLAGS conftest.a func.o ) 2>&5 1>/dev/null
+@@ -16323,7 +16330,7 @@
+ cf_cv_link_dataonly=unknown
+ else
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 16326 "configure"
++#line 16333 "configure"
+ #include "confdefs.h"
+
+ int main()
+@@ -16334,15 +16341,15 @@
+
+ _ACEOF
+ rm -f conftest$ac_exeext
+-if { (eval echo "$as_me:16337: \"$ac_link\"") >&5
++if { (eval echo "$as_me:16344: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:16340: \$? = $ac_status" >&5
++ echo "$as_me:16347: \$? = $ac_status" >&5
+ (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+- { (eval echo "$as_me:16342: \"$ac_try\"") >&5
++ { (eval echo "$as_me:16349: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:16345: \$? = $ac_status" >&5
++ echo "$as_me:16352: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ cf_cv_link_dataonly=yes
+ else
+@@ -16357,7 +16364,7 @@
+
+ fi
+
+-echo "$as_me:16360: result: $cf_cv_link_dataonly" >&5
++echo "$as_me:16367: result: $cf_cv_link_dataonly" >&5
+ echo "${ECHO_T}$cf_cv_link_dataonly" >&6
+
+ if test "$cf_cv_link_dataonly" = no ; then
+@@ -16396,13 +16403,13 @@
+
+ do
+ as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+-echo "$as_me:16399: checking for $ac_func" >&5
++echo "$as_me:16406: 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 16405 "configure"
++#line 16412 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+ which can conflict with char $ac_func (); below. */
+@@ -16433,16 +16440,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:16436: \"$ac_link\"") >&5
++if { (eval echo "$as_me:16443: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:16439: \$? = $ac_status" >&5
++ echo "$as_me:16446: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -s conftest$ac_exeext'
+- { (eval echo "$as_me:16442: \"$ac_try\"") >&5
++ { (eval echo "$as_me:16449: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:16445: \$? = $ac_status" >&5
++ echo "$as_me:16452: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ eval "$as_ac_var=yes"
+ else
+@@ -16452,7 +16459,7 @@
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "$as_me:16455: result: `eval echo '${'$as_ac_var'}'`" >&5
++echo "$as_me:16462: 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
+@@ -16464,21 +16471,21 @@
+
+ if test "x$ac_cv_func_getopt" = xno &&
+ test "x$cf_with_progs$cf_with_tests" != xnono; then
+- { { echo "$as_me:16467: error: getopt is required for building programs" >&5
++ { { echo "$as_me:16474: error: getopt is required for building programs" >&5
+ echo "$as_me: error: getopt is required for building programs" >&2;}
+ { (exit 1); exit 1; }; }
+ fi
+
+ if test "x$with_getcap" = "xyes" ; then
+
+-echo "$as_me:16474: checking for terminal-capability database functions" >&5
++echo "$as_me:16481: 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 16481 "configure"
++#line 16488 "configure"
+ #include "confdefs.h"
+
+ #include <stdlib.h>
+@@ -16498,16 +16505,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:16501: \"$ac_link\"") >&5
++if { (eval echo "$as_me:16508: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:16504: \$? = $ac_status" >&5
++ echo "$as_me:16511: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -s conftest$ac_exeext'
+- { (eval echo "$as_me:16507: \"$ac_try\"") >&5
++ { (eval echo "$as_me:16514: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:16510: \$? = $ac_status" >&5
++ echo "$as_me:16517: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ cf_cv_cgetent=yes
+ else
+@@ -16518,7 +16525,7 @@
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+
+ fi
+-echo "$as_me:16521: result: $cf_cv_cgetent" >&5
++echo "$as_me:16528: result: $cf_cv_cgetent" >&5
+ echo "${ECHO_T}$cf_cv_cgetent" >&6
+
+ if test "$cf_cv_cgetent" = yes
+@@ -16528,14 +16535,14 @@
+ #define HAVE_BSD_CGETENT 1
+ EOF
+
+-echo "$as_me:16531: checking if cgetent uses const parameter" >&5
++echo "$as_me:16538: 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 16538 "configure"
++#line 16545 "configure"
+ #include "confdefs.h"
+
+ #include <stdlib.h>
+@@ -16557,16 +16564,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:16560: \"$ac_link\"") >&5
++if { (eval echo "$as_me:16567: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:16563: \$? = $ac_status" >&5
++ echo "$as_me:16570: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -s conftest$ac_exeext'
+- { (eval echo "$as_me:16566: \"$ac_try\"") >&5
++ { (eval echo "$as_me:16573: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:16569: \$? = $ac_status" >&5
++ echo "$as_me:16576: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ cf_cv_cgetent_const=yes
+ else
+@@ -16577,7 +16584,7 @@
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+
+ fi
+-echo "$as_me:16580: result: $cf_cv_cgetent_const" >&5
++echo "$as_me:16587: result: $cf_cv_cgetent_const" >&5
+ echo "${ECHO_T}$cf_cv_cgetent_const" >&6
+ if test "$cf_cv_cgetent_const" = yes
+ then
+@@ -16591,14 +16598,14 @@
+
+ fi
+
+-echo "$as_me:16594: checking for isascii" >&5
++echo "$as_me:16601: 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 16601 "configure"
++#line 16608 "configure"
+ #include "confdefs.h"
+ #include <ctype.h>
+ int
+@@ -16610,16 +16617,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:16613: \"$ac_link\"") >&5
++if { (eval echo "$as_me:16620: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:16616: \$? = $ac_status" >&5
++ echo "$as_me:16623: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -s conftest$ac_exeext'
+- { (eval echo "$as_me:16619: \"$ac_try\"") >&5
++ { (eval echo "$as_me:16626: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:16622: \$? = $ac_status" >&5
++ echo "$as_me:16629: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ cf_cv_have_isascii=yes
+ else
+@@ -16630,7 +16637,7 @@
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+
+ fi
+-echo "$as_me:16633: result: $cf_cv_have_isascii" >&5
++echo "$as_me:16640: result: $cf_cv_have_isascii" >&5
+ echo "${ECHO_T}$cf_cv_have_isascii" >&6
+ test "$cf_cv_have_isascii" = yes &&
+ cat >>confdefs.h <<\EOF
+@@ -16638,10 +16645,10 @@
+ EOF
+
+ if test "$ac_cv_func_sigaction" = yes; then
+-echo "$as_me:16641: checking whether sigaction needs _POSIX_SOURCE" >&5
++echo "$as_me:16648: 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 16644 "configure"
++#line 16651 "configure"
+ #include "confdefs.h"
+
+ #include <sys/types.h>
+@@ -16655,16 +16662,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:16658: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:16665: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:16661: \$? = $ac_status" >&5
++ echo "$as_me:16668: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:16664: \"$ac_try\"") >&5
++ { (eval echo "$as_me:16671: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:16667: \$? = $ac_status" >&5
++ echo "$as_me:16674: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ sigact_bad=no
+ else
+@@ -16672,7 +16679,7 @@
+ cat conftest.$ac_ext >&5
+
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 16675 "configure"
++#line 16682 "configure"
+ #include "confdefs.h"
+
+ #define _POSIX_SOURCE
+@@ -16687,16 +16694,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:16690: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:16697: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:16693: \$? = $ac_status" >&5
++ echo "$as_me:16700: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:16696: \"$ac_try\"") >&5
++ { (eval echo "$as_me:16703: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:16699: \$? = $ac_status" >&5
++ echo "$as_me:16706: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ sigact_bad=yes
+
+@@ -16712,11 +16719,11 @@
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+-echo "$as_me:16715: result: $sigact_bad" >&5
++echo "$as_me:16722: result: $sigact_bad" >&5
+ echo "${ECHO_T}$sigact_bad" >&6
+ fi
+
+-echo "$as_me:16719: checking if nanosleep really works" >&5
++echo "$as_me:16726: 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
+@@ -16726,7 +16733,7 @@
+ cf_cv_func_nanosleep=unknown
+ else
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 16729 "configure"
++#line 16736 "configure"
+ #include "confdefs.h"
+
+ #include <stdio.h>
+@@ -16751,15 +16758,15 @@
+
+ _ACEOF
+ rm -f conftest$ac_exeext
+-if { (eval echo "$as_me:16754: \"$ac_link\"") >&5
++if { (eval echo "$as_me:16761: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:16757: \$? = $ac_status" >&5
++ echo "$as_me:16764: \$? = $ac_status" >&5
+ (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+- { (eval echo "$as_me:16759: \"$ac_try\"") >&5
++ { (eval echo "$as_me:16766: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:16762: \$? = $ac_status" >&5
++ echo "$as_me:16769: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ cf_cv_func_nanosleep=yes
+ else
+@@ -16771,7 +16778,7 @@
+ rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+ fi
+ fi
+-echo "$as_me:16774: result: $cf_cv_func_nanosleep" >&5
++echo "$as_me:16781: result: $cf_cv_func_nanosleep" >&5
+ echo "${ECHO_T}$cf_cv_func_nanosleep" >&6
+
+ test "$cf_cv_func_nanosleep" = "yes" &&
+@@ -16786,23 +16793,23 @@
+
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-echo "$as_me:16789: checking for $ac_header" >&5
++echo "$as_me:16796: 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 16795 "configure"
++#line 16802 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:16799: \"$ac_cpp conftest.$ac_ext\"") >&5
++if { (eval echo "$as_me:16806: \"$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:16805: \$? = $ac_status" >&5
++ echo "$as_me:16812: \$? = $ac_status" >&5
+ (exit $ac_status); } >/dev/null; then
+ if test -s conftest.err; then
+ ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -16821,7 +16828,7 @@
+ fi
+ rm -f conftest.err conftest.$ac_ext
+ fi
+-echo "$as_me:16824: result: `eval echo '${'$as_ac_Header'}'`" >&5
++echo "$as_me:16831: 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
+@@ -16836,23 +16843,23 @@
+ for ac_header in sys/termio.h
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-echo "$as_me:16839: checking for $ac_header" >&5
++echo "$as_me:16846: 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 16845 "configure"
++#line 16852 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:16849: \"$ac_cpp conftest.$ac_ext\"") >&5
++if { (eval echo "$as_me:16856: \"$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:16855: \$? = $ac_status" >&5
++ echo "$as_me:16862: \$? = $ac_status" >&5
+ (exit $ac_status); } >/dev/null; then
+ if test -s conftest.err; then
+ ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -16871,7 +16878,7 @@
+ fi
+ rm -f conftest.err conftest.$ac_ext
+ fi
+-echo "$as_me:16874: result: `eval echo '${'$as_ac_Header'}'`" >&5
++echo "$as_me:16881: 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
+@@ -16889,10 +16896,10 @@
+ (*) termios_bad=maybe ;;
+ esac
+ if test "$termios_bad" = maybe ; then
+- echo "$as_me:16892: checking whether termios.h needs _POSIX_SOURCE" >&5
++ echo "$as_me:16899: 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 16895 "configure"
++#line 16902 "configure"
+ #include "confdefs.h"
+ #include <termios.h>
+ int
+@@ -16904,16 +16911,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:16907: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:16914: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:16910: \$? = $ac_status" >&5
++ echo "$as_me:16917: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:16913: \"$ac_try\"") >&5
++ { (eval echo "$as_me:16920: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:16916: \$? = $ac_status" >&5
++ echo "$as_me:16923: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ termios_bad=no
+ else
+@@ -16921,7 +16928,7 @@
+ cat conftest.$ac_ext >&5
+
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 16924 "configure"
++#line 16931 "configure"
+ #include "confdefs.h"
+
+ #define _POSIX_SOURCE
+@@ -16935,16 +16942,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:16938: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:16945: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:16941: \$? = $ac_status" >&5
++ echo "$as_me:16948: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:16944: \"$ac_try\"") >&5
++ { (eval echo "$as_me:16951: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:16947: \$? = $ac_status" >&5
++ echo "$as_me:16954: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ termios_bad=unknown
+ else
+@@ -16960,19 +16967,19 @@
+
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+- echo "$as_me:16963: result: $termios_bad" >&5
++ echo "$as_me:16970: result: $termios_bad" >&5
+ echo "${ECHO_T}$termios_bad" >&6
+ fi
+ fi
+
+-echo "$as_me:16968: checking for tcgetattr" >&5
++echo "$as_me:16975: 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 16975 "configure"
++#line 16982 "configure"
+ #include "confdefs.h"
+
+ #include <sys/types.h>
+@@ -17000,16 +17007,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:17003: \"$ac_link\"") >&5
++if { (eval echo "$as_me:17010: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:17006: \$? = $ac_status" >&5
++ echo "$as_me:17013: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -s conftest$ac_exeext'
+- { (eval echo "$as_me:17009: \"$ac_try\"") >&5
++ { (eval echo "$as_me:17016: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:17012: \$? = $ac_status" >&5
++ echo "$as_me:17019: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ cf_cv_have_tcgetattr=yes
+ else
+@@ -17019,21 +17026,21 @@
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "$as_me:17022: result: $cf_cv_have_tcgetattr" >&5
++echo "$as_me:17029: 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:17029: checking for vsscanf function or workaround" >&5
++echo "$as_me:17036: 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 17036 "configure"
++#line 17043 "configure"
+ #include "confdefs.h"
+
+ #include <stdarg.h>
+@@ -17049,16 +17056,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:17052: \"$ac_link\"") >&5
++if { (eval echo "$as_me:17059: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:17055: \$? = $ac_status" >&5
++ echo "$as_me:17062: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -s conftest$ac_exeext'
+- { (eval echo "$as_me:17058: \"$ac_try\"") >&5
++ { (eval echo "$as_me:17065: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:17061: \$? = $ac_status" >&5
++ echo "$as_me:17068: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ cf_cv_func_vsscanf=vsscanf
+ else
+@@ -17066,7 +17073,7 @@
+ cat conftest.$ac_ext >&5
+
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 17069 "configure"
++#line 17076 "configure"
+ #include "confdefs.h"
+
+ #include <stdarg.h>
+@@ -17088,16 +17095,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:17091: \"$ac_link\"") >&5
++if { (eval echo "$as_me:17098: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:17094: \$? = $ac_status" >&5
++ echo "$as_me:17101: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -s conftest$ac_exeext'
+- { (eval echo "$as_me:17097: \"$ac_try\"") >&5
++ { (eval echo "$as_me:17104: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:17100: \$? = $ac_status" >&5
++ echo "$as_me:17107: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ cf_cv_func_vsscanf=vfscanf
+ else
+@@ -17105,7 +17112,7 @@
+ cat conftest.$ac_ext >&5
+
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 17108 "configure"
++#line 17115 "configure"
+ #include "confdefs.h"
+
+ #include <stdarg.h>
+@@ -17127,16 +17134,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:17130: \"$ac_link\"") >&5
++if { (eval echo "$as_me:17137: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:17133: \$? = $ac_status" >&5
++ echo "$as_me:17140: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -s conftest$ac_exeext'
+- { (eval echo "$as_me:17136: \"$ac_try\"") >&5
++ { (eval echo "$as_me:17143: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:17139: \$? = $ac_status" >&5
++ echo "$as_me:17146: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ cf_cv_func_vsscanf=_doscan
+ else
+@@ -17151,7 +17158,7 @@
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "$as_me:17154: result: $cf_cv_func_vsscanf" >&5
++echo "$as_me:17161: result: $cf_cv_func_vsscanf" >&5
+ echo "${ECHO_T}$cf_cv_func_vsscanf" >&6
+
+ case $cf_cv_func_vsscanf in
+@@ -17172,7 +17179,7 @@
+ ;;
+ esac
+
+-echo "$as_me:17175: checking for working mkstemp" >&5
++echo "$as_me:17182: 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
+@@ -17183,7 +17190,7 @@
+ cf_cv_func_mkstemp=maybe
+ else
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 17186 "configure"
++#line 17193 "configure"
+ #include "confdefs.h"
+
+ #include <sys/types.h>
+@@ -17221,15 +17228,15 @@
+
+ _ACEOF
+ rm -f conftest$ac_exeext
+-if { (eval echo "$as_me:17224: \"$ac_link\"") >&5
++if { (eval echo "$as_me:17231: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:17227: \$? = $ac_status" >&5
++ echo "$as_me:17234: \$? = $ac_status" >&5
+ (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+- { (eval echo "$as_me:17229: \"$ac_try\"") >&5
++ { (eval echo "$as_me:17236: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:17232: \$? = $ac_status" >&5
++ echo "$as_me:17239: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ cf_cv_func_mkstemp=yes
+
+@@ -17244,16 +17251,16 @@
+ fi
+
+ fi
+-echo "$as_me:17247: result: $cf_cv_func_mkstemp" >&5
++echo "$as_me:17254: 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:17250: checking for mkstemp" >&5
++ echo "$as_me:17257: 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 17256 "configure"
++#line 17263 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+ which can conflict with char mkstemp (); below. */
+@@ -17284,16 +17291,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:17287: \"$ac_link\"") >&5
++if { (eval echo "$as_me:17294: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:17290: \$? = $ac_status" >&5
++ echo "$as_me:17297: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -s conftest$ac_exeext'
+- { (eval echo "$as_me:17293: \"$ac_try\"") >&5
++ { (eval echo "$as_me:17300: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:17296: \$? = $ac_status" >&5
++ echo "$as_me:17303: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ ac_cv_func_mkstemp=yes
+ else
+@@ -17303,7 +17310,7 @@
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "$as_me:17306: result: $ac_cv_func_mkstemp" >&5
++echo "$as_me:17313: result: $ac_cv_func_mkstemp" >&5
+ echo "${ECHO_T}$ac_cv_func_mkstemp" >&6
+
+ fi
+@@ -17324,21 +17331,21 @@
+ fi
+
+ if test "x$cross_compiling" = xyes ; then
+- { echo "$as_me:17327: WARNING: cross compiling: assume setvbuf params not reversed" >&5
++ { echo "$as_me:17334: 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:17330: checking whether setvbuf arguments are reversed" >&5
++ echo "$as_me:17337: 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:17336: error: cannot run test program while cross compiling" >&5
++ { { echo "$as_me:17343: 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 17341 "configure"
++#line 17348 "configure"
+ #include "confdefs.h"
+ #include <stdio.h>
+ /* If setvbuf has the reversed format, exit 0. */
+@@ -17355,15 +17362,15 @@
+ }
+ _ACEOF
+ rm -f conftest$ac_exeext
+-if { (eval echo "$as_me:17358: \"$ac_link\"") >&5
++if { (eval echo "$as_me:17365: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:17361: \$? = $ac_status" >&5
++ echo "$as_me:17368: \$? = $ac_status" >&5
+ (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+- { (eval echo "$as_me:17363: \"$ac_try\"") >&5
++ { (eval echo "$as_me:17370: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:17366: \$? = $ac_status" >&5
++ echo "$as_me:17373: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ ac_cv_func_setvbuf_reversed=yes
+ else
+@@ -17376,7 +17383,7 @@
+ fi
+ rm -f core core.* *.core
+ fi
+-echo "$as_me:17379: result: $ac_cv_func_setvbuf_reversed" >&5
++echo "$as_me:17386: 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
+
+@@ -17387,13 +17394,13 @@
+ fi
+
+ fi
+-echo "$as_me:17390: checking for intptr_t" >&5
++echo "$as_me:17397: 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 17396 "configure"
++#line 17403 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -17408,16 +17415,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:17411: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:17418: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:17414: \$? = $ac_status" >&5
++ echo "$as_me:17421: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:17417: \"$ac_try\"") >&5
++ { (eval echo "$as_me:17424: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:17420: \$? = $ac_status" >&5
++ echo "$as_me:17427: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ ac_cv_type_intptr_t=yes
+ else
+@@ -17427,7 +17434,7 @@
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ fi
+-echo "$as_me:17430: result: $ac_cv_type_intptr_t" >&5
++echo "$as_me:17437: 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
+ :
+@@ -17439,13 +17446,13 @@
+
+ fi
+
+-echo "$as_me:17442: checking for ssize_t" >&5
++echo "$as_me:17449: 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 17448 "configure"
++#line 17455 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -17460,16 +17467,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:17463: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:17470: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:17466: \$? = $ac_status" >&5
++ echo "$as_me:17473: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:17469: \"$ac_try\"") >&5
++ { (eval echo "$as_me:17476: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:17472: \$? = $ac_status" >&5
++ echo "$as_me:17479: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ ac_cv_type_ssize_t=yes
+ else
+@@ -17479,7 +17486,7 @@
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ fi
+-echo "$as_me:17482: result: $ac_cv_type_ssize_t" >&5
++echo "$as_me:17489: 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
+ :
+@@ -17491,14 +17498,14 @@
+
+ fi
+
+-echo "$as_me:17494: checking for type sigaction_t" >&5
++echo "$as_me:17501: 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 17501 "configure"
++#line 17508 "configure"
+ #include "confdefs.h"
+
+ #include <signal.h>
+@@ -17511,16 +17518,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:17514: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:17521: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:17517: \$? = $ac_status" >&5
++ echo "$as_me:17524: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:17520: \"$ac_try\"") >&5
++ { (eval echo "$as_me:17527: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:17523: \$? = $ac_status" >&5
++ echo "$as_me:17530: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ cf_cv_type_sigaction=yes
+ else
+@@ -17531,14 +17538,14 @@
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ fi
+
+-echo "$as_me:17534: result: $cf_cv_type_sigaction" >&5
++echo "$as_me:17541: 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:17541: checking declaration of size-change" >&5
++echo "$as_me:17548: 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
+@@ -17553,7 +17560,7 @@
+ CPPFLAGS="$cf_save_CPPFLAGS"
+ test -n "$cf_opts" && CPPFLAGS="$CPPFLAGS -D$cf_opts"
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 17556 "configure"
++#line 17563 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ #ifdef HAVE_TERMIOS_H
+@@ -17597,16 +17604,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:17600: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:17607: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:17603: \$? = $ac_status" >&5
++ echo "$as_me:17610: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:17606: \"$ac_try\"") >&5
++ { (eval echo "$as_me:17613: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:17609: \$? = $ac_status" >&5
++ echo "$as_me:17616: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ cf_cv_sizechange=yes
+ else
+@@ -17625,7 +17632,7 @@
+ done
+
+ fi
+-echo "$as_me:17628: result: $cf_cv_sizechange" >&5
++echo "$as_me:17635: result: $cf_cv_sizechange" >&5
+ echo "${ECHO_T}$cf_cv_sizechange" >&6
+ if test "$cf_cv_sizechange" != no ; then
+
+@@ -17643,13 +17650,13 @@
+ esac
+ fi
+
+-echo "$as_me:17646: checking for memmove" >&5
++echo "$as_me:17653: 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 17652 "configure"
++#line 17659 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+ which can conflict with char memmove (); below. */
+@@ -17680,16 +17687,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:17683: \"$ac_link\"") >&5
++if { (eval echo "$as_me:17690: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:17686: \$? = $ac_status" >&5
++ echo "$as_me:17693: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -s conftest$ac_exeext'
+- { (eval echo "$as_me:17689: \"$ac_try\"") >&5
++ { (eval echo "$as_me:17696: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:17692: \$? = $ac_status" >&5
++ echo "$as_me:17699: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ ac_cv_func_memmove=yes
+ else
+@@ -17699,19 +17706,19 @@
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "$as_me:17702: result: $ac_cv_func_memmove" >&5
++echo "$as_me:17709: 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:17708: checking for bcopy" >&5
++echo "$as_me:17715: 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 17714 "configure"
++#line 17721 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+ which can conflict with char bcopy (); below. */
+@@ -17742,16 +17749,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:17745: \"$ac_link\"") >&5
++if { (eval echo "$as_me:17752: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:17748: \$? = $ac_status" >&5
++ echo "$as_me:17755: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -s conftest$ac_exeext'
+- { (eval echo "$as_me:17751: \"$ac_try\"") >&5
++ { (eval echo "$as_me:17758: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:17754: \$? = $ac_status" >&5
++ echo "$as_me:17761: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ ac_cv_func_bcopy=yes
+ else
+@@ -17761,11 +17768,11 @@
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "$as_me:17764: result: $ac_cv_func_bcopy" >&5
++echo "$as_me:17771: 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:17768: checking if bcopy does overlapping moves" >&5
++ echo "$as_me:17775: 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
+@@ -17775,7 +17782,7 @@
+ cf_cv_good_bcopy=unknown
+ else
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 17778 "configure"
++#line 17785 "configure"
+ #include "confdefs.h"
+
+ int main() {
+@@ -17789,15 +17796,15 @@
+
+ _ACEOF
+ rm -f conftest$ac_exeext
+-if { (eval echo "$as_me:17792: \"$ac_link\"") >&5
++if { (eval echo "$as_me:17799: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:17795: \$? = $ac_status" >&5
++ echo "$as_me:17802: \$? = $ac_status" >&5
+ (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+- { (eval echo "$as_me:17797: \"$ac_try\"") >&5
++ { (eval echo "$as_me:17804: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:17800: \$? = $ac_status" >&5
++ echo "$as_me:17807: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ cf_cv_good_bcopy=yes
+ else
+@@ -17810,7 +17817,7 @@
+ fi
+
+ fi
+-echo "$as_me:17813: result: $cf_cv_good_bcopy" >&5
++echo "$as_me:17820: result: $cf_cv_good_bcopy" >&5
+ echo "${ECHO_T}$cf_cv_good_bcopy" >&6
+
+ else
+@@ -17837,13 +17844,13 @@
+ for ac_func in posix_openpt
+ do
+ as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+-echo "$as_me:17840: checking for $ac_func" >&5
++echo "$as_me:17847: 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 17846 "configure"
++#line 17853 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+ which can conflict with char $ac_func (); below. */
+@@ -17874,16 +17881,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:17877: \"$ac_link\"") >&5
++if { (eval echo "$as_me:17884: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:17880: \$? = $ac_status" >&5
++ echo "$as_me:17887: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -s conftest$ac_exeext'
+- { (eval echo "$as_me:17883: \"$ac_try\"") >&5
++ { (eval echo "$as_me:17890: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:17886: \$? = $ac_status" >&5
++ echo "$as_me:17893: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ eval "$as_ac_var=yes"
+ else
+@@ -17893,7 +17900,7 @@
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "$as_me:17896: result: `eval echo '${'$as_ac_var'}'`" >&5
++echo "$as_me:17903: 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
+@@ -17903,7 +17910,7 @@
+ fi
+ done
+ }
+-echo "$as_me:17906: checking if poll really works" >&5
++echo "$as_me:17913: 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
+@@ -17913,7 +17920,7 @@
+ cf_cv_working_poll=unknown
+ else
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 17916 "configure"
++#line 17923 "configure"
+ #include "confdefs.h"
+
+ #include <stdlib.h>
+@@ -17965,15 +17972,15 @@
+ }
+ _ACEOF
+ rm -f conftest$ac_exeext
+-if { (eval echo "$as_me:17968: \"$ac_link\"") >&5
++if { (eval echo "$as_me:17975: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:17971: \$? = $ac_status" >&5
++ echo "$as_me:17978: \$? = $ac_status" >&5
+ (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+- { (eval echo "$as_me:17973: \"$ac_try\"") >&5
++ { (eval echo "$as_me:17980: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:17976: \$? = $ac_status" >&5
++ echo "$as_me:17983: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ cf_cv_working_poll=yes
+ else
+@@ -17985,21 +17992,21 @@
+ rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+ fi
+ fi
+-echo "$as_me:17988: result: $cf_cv_working_poll" >&5
++echo "$as_me:17995: 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:17995: checking for va_copy" >&5
++echo "$as_me:18002: 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 18002 "configure"
++#line 18009 "configure"
+ #include "confdefs.h"
+
+ #include <stdarg.h>
+@@ -18016,16 +18023,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:18019: \"$ac_link\"") >&5
++if { (eval echo "$as_me:18026: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:18022: \$? = $ac_status" >&5
++ echo "$as_me:18029: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -s conftest$ac_exeext'
+- { (eval echo "$as_me:18025: \"$ac_try\"") >&5
++ { (eval echo "$as_me:18032: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:18028: \$? = $ac_status" >&5
++ echo "$as_me:18035: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ cf_cv_have_va_copy=yes
+ else
+@@ -18035,7 +18042,7 @@
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "$as_me:18038: result: $cf_cv_have_va_copy" >&5
++echo "$as_me:18045: result: $cf_cv_have_va_copy" >&5
+ echo "${ECHO_T}$cf_cv_have_va_copy" >&6
+
+ test "$cf_cv_have_va_copy" = yes &&
+@@ -18043,14 +18050,14 @@
+ #define HAVE_VA_COPY 1
+ EOF
+
+-echo "$as_me:18046: checking for __va_copy" >&5
++echo "$as_me:18053: 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 18053 "configure"
++#line 18060 "configure"
+ #include "confdefs.h"
+
+ #include <stdarg.h>
+@@ -18067,16 +18074,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:18070: \"$ac_link\"") >&5
++if { (eval echo "$as_me:18077: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:18073: \$? = $ac_status" >&5
++ echo "$as_me:18080: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -s conftest$ac_exeext'
+- { (eval echo "$as_me:18076: \"$ac_try\"") >&5
++ { (eval echo "$as_me:18083: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:18079: \$? = $ac_status" >&5
++ echo "$as_me:18086: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ cf_cv_have___va_copy=yes
+ else
+@@ -18086,7 +18093,7 @@
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "$as_me:18089: result: $cf_cv_have___va_copy" >&5
++echo "$as_me:18096: result: $cf_cv_have___va_copy" >&5
+ echo "${ECHO_T}$cf_cv_have___va_copy" >&6
+
+ test "$cf_cv_have___va_copy" = yes &&
+@@ -18094,13 +18101,13 @@
+ #define HAVE___VA_COPY 1
+ EOF
+
+-echo "$as_me:18097: checking for pid_t" >&5
++echo "$as_me:18104: 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 18103 "configure"
++#line 18110 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -18115,16 +18122,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:18118: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:18125: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:18121: \$? = $ac_status" >&5
++ echo "$as_me:18128: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:18124: \"$ac_try\"") >&5
++ { (eval echo "$as_me:18131: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:18127: \$? = $ac_status" >&5
++ echo "$as_me:18134: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ ac_cv_type_pid_t=yes
+ else
+@@ -18134,7 +18141,7 @@
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ fi
+-echo "$as_me:18137: result: $ac_cv_type_pid_t" >&5
++echo "$as_me:18144: 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
+ :
+@@ -18149,23 +18156,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:18152: checking for $ac_header" >&5
++echo "$as_me:18159: 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 18158 "configure"
++#line 18165 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:18162: \"$ac_cpp conftest.$ac_ext\"") >&5
++if { (eval echo "$as_me:18169: \"$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:18168: \$? = $ac_status" >&5
++ echo "$as_me:18175: \$? = $ac_status" >&5
+ (exit $ac_status); } >/dev/null; then
+ if test -s conftest.err; then
+ ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -18184,7 +18191,7 @@
+ fi
+ rm -f conftest.err conftest.$ac_ext
+ fi
+-echo "$as_me:18187: result: `eval echo '${'$as_ac_Header'}'`" >&5
++echo "$as_me:18194: 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
+@@ -18197,13 +18204,13 @@
+ for ac_func in fork vfork
+ do
+ as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+-echo "$as_me:18200: checking for $ac_func" >&5
++echo "$as_me:18207: 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 18206 "configure"
++#line 18213 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+ which can conflict with char $ac_func (); below. */
+@@ -18234,16 +18241,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:18237: \"$ac_link\"") >&5
++if { (eval echo "$as_me:18244: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:18240: \$? = $ac_status" >&5
++ echo "$as_me:18247: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -s conftest$ac_exeext'
+- { (eval echo "$as_me:18243: \"$ac_try\"") >&5
++ { (eval echo "$as_me:18250: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:18246: \$? = $ac_status" >&5
++ echo "$as_me:18253: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ eval "$as_ac_var=yes"
+ else
+@@ -18253,7 +18260,7 @@
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "$as_me:18256: result: `eval echo '${'$as_ac_var'}'`" >&5
++echo "$as_me:18263: 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
+@@ -18265,7 +18272,7 @@
+
+ ac_cv_func_fork_works=$ac_cv_func_fork
+ if test "x$ac_cv_func_fork" = xyes; then
+- echo "$as_me:18268: checking for working fork" >&5
++ echo "$as_me:18275: 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
+@@ -18288,15 +18295,15 @@
+ }
+ _ACEOF
+ rm -f conftest$ac_exeext
+-if { (eval echo "$as_me:18291: \"$ac_link\"") >&5
++if { (eval echo "$as_me:18298: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:18294: \$? = $ac_status" >&5
++ echo "$as_me:18301: \$? = $ac_status" >&5
+ (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+- { (eval echo "$as_me:18296: \"$ac_try\"") >&5
++ { (eval echo "$as_me:18303: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:18299: \$? = $ac_status" >&5
++ echo "$as_me:18306: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ ac_cv_func_fork_works=yes
+ else
+@@ -18308,7 +18315,7 @@
+ rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+ fi
+ fi
+-echo "$as_me:18311: result: $ac_cv_func_fork_works" >&5
++echo "$as_me:18318: result: $ac_cv_func_fork_works" >&5
+ echo "${ECHO_T}$ac_cv_func_fork_works" >&6
+
+ fi
+@@ -18322,12 +18329,12 @@
+ ac_cv_func_fork_works=yes
+ ;;
+ esac
+- { echo "$as_me:18325: WARNING: CROSS: Result $ac_cv_func_fork_works guessed due to cross-compiling." >&5
++ { echo "$as_me:18332: 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:18330: checking for working vfork" >&5
++ echo "$as_me:18337: 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
+@@ -18336,7 +18343,7 @@
+ ac_cv_func_vfork_works=cross
+ else
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 18339 "configure"
++#line 18346 "configure"
+ #include "confdefs.h"
+ /* Thanks to Paul Eggert for this test. */
+ #include <stdio.h>
+@@ -18433,15 +18440,15 @@
+ }
+ _ACEOF
+ rm -f conftest$ac_exeext
+-if { (eval echo "$as_me:18436: \"$ac_link\"") >&5
++if { (eval echo "$as_me:18443: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:18439: \$? = $ac_status" >&5
++ echo "$as_me:18446: \$? = $ac_status" >&5
+ (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+- { (eval echo "$as_me:18441: \"$ac_try\"") >&5
++ { (eval echo "$as_me:18448: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:18444: \$? = $ac_status" >&5
++ echo "$as_me:18451: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ ac_cv_func_vfork_works=yes
+ else
+@@ -18453,13 +18460,13 @@
+ rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+ fi
+ fi
+-echo "$as_me:18456: result: $ac_cv_func_vfork_works" >&5
++echo "$as_me:18463: 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:18462: WARNING: CROSS: Result $ac_cv_func_vfork_works guessed due to cross-compiling." >&5
++ { echo "$as_me:18469: 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
+
+@@ -18486,7 +18493,7 @@
+
+ # special check for test/ditto.c
+
+-echo "$as_me:18489: checking for openpty in -lutil" >&5
++echo "$as_me:18496: 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
+@@ -18494,7 +18501,7 @@
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lutil $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 18497 "configure"
++#line 18504 "configure"
+ #include "confdefs.h"
+
+ /* Override any gcc2 internal prototype to avoid an error. */
+@@ -18513,16 +18520,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:18516: \"$ac_link\"") >&5
++if { (eval echo "$as_me:18523: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:18519: \$? = $ac_status" >&5
++ echo "$as_me:18526: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -s conftest$ac_exeext'
+- { (eval echo "$as_me:18522: \"$ac_try\"") >&5
++ { (eval echo "$as_me:18529: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:18525: \$? = $ac_status" >&5
++ echo "$as_me:18532: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ ac_cv_lib_util_openpty=yes
+ else
+@@ -18533,7 +18540,7 @@
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:18536: result: $ac_cv_lib_util_openpty" >&5
++echo "$as_me:18543: 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
+@@ -18541,7 +18548,7 @@
+ cf_cv_lib_util=no
+ fi
+
+-echo "$as_me:18544: checking for openpty header" >&5
++echo "$as_me:18551: 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
+@@ -18568,7 +18575,7 @@
+ for cf_header in pty.h libutil.h util.h
+ do
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 18571 "configure"
++#line 18578 "configure"
+ #include "confdefs.h"
+
+ #include <$cf_header>
+@@ -18585,16 +18592,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:18588: \"$ac_link\"") >&5
++if { (eval echo "$as_me:18595: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:18591: \$? = $ac_status" >&5
++ echo "$as_me:18598: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -s conftest$ac_exeext'
+- { (eval echo "$as_me:18594: \"$ac_try\"") >&5
++ { (eval echo "$as_me:18601: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:18597: \$? = $ac_status" >&5
++ echo "$as_me:18604: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+
+ cf_cv_func_openpty=$cf_header
+@@ -18612,7 +18619,7 @@
+ LIBS="$cf_save_LIBS"
+
+ fi
+-echo "$as_me:18615: result: $cf_cv_func_openpty" >&5
++echo "$as_me:18622: result: $cf_cv_func_openpty" >&5
+ echo "${ECHO_T}$cf_cv_func_openpty" >&6
+
+ if test "$cf_cv_func_openpty" != no ; then
+@@ -18682,7 +18689,7 @@
+ cf_save_CPPFLAGS=$CPPFLAGS
+ CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 18685 "configure"
++#line 18692 "configure"
+ #include "confdefs.h"
+ #include <stdio.h>
+ int
+@@ -18694,16 +18701,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:18697: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:18704: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:18700: \$? = $ac_status" >&5
++ echo "$as_me:18707: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:18703: \"$ac_try\"") >&5
++ { (eval echo "$as_me:18710: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:18706: \$? = $ac_status" >&5
++ echo "$as_me:18713: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ :
+ else
+@@ -18720,7 +18727,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}:18723: testing adding $cf_add_incdir to include-path ..." 1>&5
++echo "${as_me:-configure}:18730: testing adding $cf_add_incdir to include-path ..." 1>&5
+
+ CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
+
+@@ -18756,7 +18763,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}:18759: testing adding $cf_add_libdir to library-path ..." 1>&5
++echo "${as_me:-configure}:18766: testing adding $cf_add_libdir to library-path ..." 1>&5
+
+ LDFLAGS="-L$cf_add_libdir $LDFLAGS"
+ fi
+@@ -18767,7 +18774,7 @@
+ else
+ case "$with_hashed_db" in
+ (./*|../*|/*)
+- { echo "$as_me:18770: WARNING: no such directory $with_hashed_db" >&5
++ { echo "$as_me:18777: WARNING: no such directory $with_hashed_db" >&5
+ echo "$as_me: WARNING: no such directory $with_hashed_db" >&2;}
+ ;;
+ (*)
+@@ -18836,7 +18843,7 @@
+ cf_save_CPPFLAGS=$CPPFLAGS
+ CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 18839 "configure"
++#line 18846 "configure"
+ #include "confdefs.h"
+ #include <stdio.h>
+ int
+@@ -18848,16 +18855,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:18851: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:18858: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:18854: \$? = $ac_status" >&5
++ echo "$as_me:18861: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:18857: \"$ac_try\"") >&5
++ { (eval echo "$as_me:18864: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:18860: \$? = $ac_status" >&5
++ echo "$as_me:18867: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ :
+ else
+@@ -18874,7 +18881,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}:18877: testing adding $cf_add_incdir to include-path ..." 1>&5
++echo "${as_me:-configure}:18884: testing adding $cf_add_incdir to include-path ..." 1>&5
+
+ CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
+
+@@ -18954,7 +18961,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}:18957: testing adding $cf_add_libdir to library-path ..." 1>&5
++echo "${as_me:-configure}:18964: testing adding $cf_add_libdir to library-path ..." 1>&5
+
+ LDFLAGS="-L$cf_add_libdir $LDFLAGS"
+ fi
+@@ -18971,23 +18978,23 @@
+ fi
+ esac
+
+-echo "$as_me:18974: checking for db.h" >&5
++echo "$as_me:18981: 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 18980 "configure"
++#line 18987 "configure"
+ #include "confdefs.h"
+ #include <db.h>
+ _ACEOF
+-if { (eval echo "$as_me:18984: \"$ac_cpp conftest.$ac_ext\"") >&5
++if { (eval echo "$as_me:18991: \"$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:18990: \$? = $ac_status" >&5
++ echo "$as_me:18997: \$? = $ac_status" >&5
+ (exit $ac_status); } >/dev/null; then
+ if test -s conftest.err; then
+ ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -19006,11 +19013,11 @@
+ fi
+ rm -f conftest.err conftest.$ac_ext
+ fi
+-echo "$as_me:19009: result: $ac_cv_header_db_h" >&5
++echo "$as_me:19016: 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:19013: checking for version of db" >&5
++echo "$as_me:19020: 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
+@@ -19021,10 +19028,10 @@
+ for cf_db_version in 1 2 3 4 5 6
+ do
+
+-echo "${as_me:-configure}:19024: testing checking for db version $cf_db_version ..." 1>&5
++echo "${as_me:-configure}:19031: testing checking for db version $cf_db_version ..." 1>&5
+
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 19027 "configure"
++#line 19034 "configure"
+ #include "confdefs.h"
+
+ $ac_includes_default
+@@ -19054,16 +19061,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:19057: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:19064: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:19060: \$? = $ac_status" >&5
++ echo "$as_me:19067: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:19063: \"$ac_try\"") >&5
++ { (eval echo "$as_me:19070: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:19066: \$? = $ac_status" >&5
++ echo "$as_me:19073: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+
+ cf_cv_hashed_db_version=$cf_db_version
+@@ -19077,16 +19084,16 @@
+ done
+
+ fi
+-echo "$as_me:19080: result: $cf_cv_hashed_db_version" >&5
++echo "$as_me:19087: 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:19084: error: Cannot determine version of db" >&5
++ { { echo "$as_me:19091: 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:19089: checking for db libraries" >&5
++echo "$as_me:19096: 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
+@@ -19116,10 +19123,10 @@
+
+ fi
+
+-echo "${as_me:-configure}:19119: testing checking for library "$cf_db_libs" ..." 1>&5
++echo "${as_me:-configure}:19126: testing checking for library "$cf_db_libs" ..." 1>&5
+
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 19122 "configure"
++#line 19129 "configure"
+ #include "confdefs.h"
+
+ $ac_includes_default
+@@ -19174,16 +19181,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:19177: \"$ac_link\"") >&5
++if { (eval echo "$as_me:19184: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:19180: \$? = $ac_status" >&5
++ echo "$as_me:19187: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -s conftest$ac_exeext'
+- { (eval echo "$as_me:19183: \"$ac_try\"") >&5
++ { (eval echo "$as_me:19190: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:19186: \$? = $ac_status" >&5
++ echo "$as_me:19193: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+
+ if test -n "$cf_db_libs" ; then
+@@ -19203,11 +19210,11 @@
+ done
+
+ fi
+-echo "$as_me:19206: result: $cf_cv_hashed_db_libs" >&5
++echo "$as_me:19213: 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:19210: error: Cannot determine library for db" >&5
++ { { echo "$as_me:19217: 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
+@@ -19233,7 +19240,7 @@
+
+ else
+
+- { { echo "$as_me:19236: error: Cannot find db.h" >&5
++ { { echo "$as_me:19243: error: Cannot find db.h" >&5
+ echo "$as_me: error: Cannot find db.h" >&2;}
+ { (exit 1); exit 1; }; }
+
+@@ -19248,7 +19255,7 @@
+
+ # Just in case, check if the C compiler has a bool type.
+
+-echo "$as_me:19251: checking if we should include stdbool.h" >&5
++echo "$as_me:19258: 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
+@@ -19256,7 +19263,7 @@
+ else
+
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 19259 "configure"
++#line 19266 "configure"
+ #include "confdefs.h"
+
+ int
+@@ -19268,23 +19275,23 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:19271: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:19278: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:19274: \$? = $ac_status" >&5
++ echo "$as_me:19281: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:19277: \"$ac_try\"") >&5
++ { (eval echo "$as_me:19284: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:19280: \$? = $ac_status" >&5
++ echo "$as_me:19287: \$? = $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 19287 "configure"
++#line 19294 "configure"
+ #include "confdefs.h"
+
+ #ifndef __BEOS__
+@@ -19300,16 +19307,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:19303: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:19310: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:19306: \$? = $ac_status" >&5
++ echo "$as_me:19313: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:19309: \"$ac_try\"") >&5
++ { (eval echo "$as_me:19316: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:19312: \$? = $ac_status" >&5
++ echo "$as_me:19319: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ cf_cv_header_stdbool_h=1
+ else
+@@ -19323,13 +19330,13 @@
+ fi
+
+ if test "$cf_cv_header_stdbool_h" = 1
+-then echo "$as_me:19326: result: yes" >&5
++then echo "$as_me:19333: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+-else echo "$as_me:19328: result: no" >&5
++else echo "$as_me:19335: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+
+-echo "$as_me:19332: checking for builtin bool type" >&5
++echo "$as_me:19339: 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
+@@ -19337,7 +19344,7 @@
+ else
+
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 19340 "configure"
++#line 19347 "configure"
+ #include "confdefs.h"
+
+ #include <stdio.h>
+@@ -19352,16 +19359,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:19355: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:19362: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:19358: \$? = $ac_status" >&5
++ echo "$as_me:19365: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:19361: \"$ac_try\"") >&5
++ { (eval echo "$as_me:19368: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:19364: \$? = $ac_status" >&5
++ echo "$as_me:19371: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ cf_cv_cc_bool_type=1
+ else
+@@ -19374,9 +19381,9 @@
+ fi
+
+ if test "$cf_cv_cc_bool_type" = 1
+-then echo "$as_me:19377: result: yes" >&5
++then echo "$as_me:19384: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+-else echo "$as_me:19379: result: no" >&5
++else echo "$as_me:19386: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+
+@@ -19393,10 +19400,10 @@
+
+ cf_save="$LIBS"
+ LIBS="$LIBS $CXXLIBS"
+- echo "$as_me:19396: checking if we already have C++ library" >&5
++ echo "$as_me:19403: 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 19399 "configure"
++#line 19406 "configure"
+ #include "confdefs.h"
+
+ #include <iostream>
+@@ -19410,16 +19417,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:19413: \"$ac_link\"") >&5
++if { (eval echo "$as_me:19420: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:19416: \$? = $ac_status" >&5
++ echo "$as_me:19423: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -s conftest$ac_exeext'
+- { (eval echo "$as_me:19419: \"$ac_try\"") >&5
++ { (eval echo "$as_me:19426: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:19422: \$? = $ac_status" >&5
++ echo "$as_me:19429: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ cf_have_libstdcpp=yes
+ else
+@@ -19428,7 +19435,7 @@
+ cf_have_libstdcpp=no
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+- echo "$as_me:19431: result: $cf_have_libstdcpp" >&5
++ echo "$as_me:19438: result: $cf_have_libstdcpp" >&5
+ echo "${ECHO_T}$cf_have_libstdcpp" >&6
+ LIBS="$cf_save"
+
+@@ -19436,14 +19443,18 @@
+ then
+ case $cf_cv_system_name in
+ (os2*)
+- cf_stdcpp_libname=stdcpp
++ if test -z "`g++ -dM -E - < /dev/null | grep __KLIBC__`"; then
++ cf_stdcpp_libname=stdcpp
++ else
++ cf_stdcpp_libname=stdc++
++ fi
+ ;;
+ (*)
+ cf_stdcpp_libname=stdc++
+ ;;
+ esac
+
+- echo "$as_me:19446: checking for library $cf_stdcpp_libname" >&5
++ echo "$as_me:19457: 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
+@@ -19469,7 +19480,7 @@
+ LIBS="$cf_add_libs"
+
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 19472 "configure"
++#line 19483 "configure"
+ #include "confdefs.h"
+
+ #include <iostream>
+@@ -19483,16 +19494,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:19486: \"$ac_link\"") >&5
++if { (eval echo "$as_me:19497: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:19489: \$? = $ac_status" >&5
++ echo "$as_me:19500: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -s conftest$ac_exeext'
+- { (eval echo "$as_me:19492: \"$ac_try\"") >&5
++ { (eval echo "$as_me:19503: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:19495: \$? = $ac_status" >&5
++ echo "$as_me:19506: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ cf_cv_libstdcpp=yes
+ else
+@@ -19504,7 +19515,7 @@
+ LIBS="$cf_save"
+
+ fi
+-echo "$as_me:19507: result: $cf_cv_libstdcpp" >&5
++echo "$as_me:19518: result: $cf_cv_libstdcpp" >&5
+ echo "${ECHO_T}$cf_cv_libstdcpp" >&6
+ test "$cf_cv_libstdcpp" = yes && {
+ cf_add_libs="-l$cf_stdcpp_libname"
+@@ -19526,7 +19537,7 @@
+ fi
+ fi
+
+- echo "$as_me:19529: checking whether $CXX understands -c and -o together" >&5
++ echo "$as_me:19540: 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
+@@ -19542,15 +19553,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 -c conftest.$ac_ext -o conftest2.$ac_objext >&5'
+-if { (eval echo "$as_me:19545: \"$ac_try\"") >&5
++if { (eval echo "$as_me:19556: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:19548: \$? = $ac_status" >&5
++ echo "$as_me:19559: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- test -f conftest2.$ac_objext && { (eval echo "$as_me:19550: \"$ac_try\"") >&5
++ test -f conftest2.$ac_objext && { (eval echo "$as_me:19561: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:19553: \$? = $ac_status" >&5
++ echo "$as_me:19564: \$? = $ac_status" >&5
+ (exit $ac_status); };
+ then
+ eval cf_cv_prog_CXX_c_o=yes
+@@ -19561,10 +19572,10 @@
+
+ fi
+ if test $cf_cv_prog_CXX_c_o = yes; then
+- echo "$as_me:19564: result: yes" >&5
++ echo "$as_me:19575: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ else
+- echo "$as_me:19567: result: no" >&5
++ echo "$as_me:19578: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+
+@@ -19584,7 +19595,7 @@
+ ;;
+ esac
+ if test "$GXX" = yes; then
+- echo "$as_me:19587: checking for lib$cf_gpp_libname" >&5
++ echo "$as_me:19598: checking for lib$cf_gpp_libname" >&5
+ echo $ECHO_N "checking for lib$cf_gpp_libname... $ECHO_C" >&6
+ cf_save="$LIBS"
+
+@@ -19605,7 +19616,7 @@
+ LIBS="$cf_add_libs"
+
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 19608 "configure"
++#line 19619 "configure"
+ #include "confdefs.h"
+
+ #include <$cf_gpp_libname/builtin.h>
+@@ -19619,16 +19630,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:19622: \"$ac_link\"") >&5
++if { (eval echo "$as_me:19633: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:19625: \$? = $ac_status" >&5
++ echo "$as_me:19636: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -s conftest$ac_exeext'
+- { (eval echo "$as_me:19628: \"$ac_try\"") >&5
++ { (eval echo "$as_me:19639: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:19631: \$? = $ac_status" >&5
++ echo "$as_me:19642: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ cf_cxx_library=yes
+
+@@ -19665,7 +19676,7 @@
+ echo "$as_me: failed program was:" >&5
+ cat conftest.$ac_ext >&5
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 19668 "configure"
++#line 19679 "configure"
+ #include "confdefs.h"
+
+ #include <builtin.h>
+@@ -19679,16 +19690,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:19682: \"$ac_link\"") >&5
++if { (eval echo "$as_me:19693: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:19685: \$? = $ac_status" >&5
++ echo "$as_me:19696: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -s conftest$ac_exeext'
+- { (eval echo "$as_me:19688: \"$ac_try\"") >&5
++ { (eval echo "$as_me:19699: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:19691: \$? = $ac_status" >&5
++ echo "$as_me:19702: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ cf_cxx_library=yes
+
+@@ -19721,7 +19732,7 @@
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ LIBS="$cf_save"
+- echo "$as_me:19724: result: $cf_cxx_library" >&5
++ echo "$as_me:19735: result: $cf_cxx_library" >&5
+ echo "${ECHO_T}$cf_cxx_library" >&6
+ fi
+
+@@ -19737,7 +19748,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:19740: checking how to run the C++ preprocessor" >&5
++echo "$as_me:19751: 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
+@@ -19754,18 +19765,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 19757 "configure"
++#line 19768 "configure"
+ #include "confdefs.h"
+ #include <assert.h>
+ Syntax error
+ _ACEOF
+-if { (eval echo "$as_me:19762: \"$ac_cpp conftest.$ac_ext\"") >&5
++if { (eval echo "$as_me:19773: \"$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:19768: \$? = $ac_status" >&5
++ echo "$as_me:19779: \$? = $ac_status" >&5
+ (exit $ac_status); } >/dev/null; then
+ if test -s conftest.err; then
+ ac_cpp_err=$ac_cxx_preproc_warn_flag
+@@ -19788,17 +19799,17 @@
+ # OK, works on sane cases. Now check whether non-existent headers
+ # can be detected and how.
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 19791 "configure"
++#line 19802 "configure"
+ #include "confdefs.h"
+ #include <ac_nonexistent.h>
+ _ACEOF
+-if { (eval echo "$as_me:19795: \"$ac_cpp conftest.$ac_ext\"") >&5
++if { (eval echo "$as_me:19806: \"$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:19801: \$? = $ac_status" >&5
++ echo "$as_me:19812: \$? = $ac_status" >&5
+ (exit $ac_status); } >/dev/null; then
+ if test -s conftest.err; then
+ ac_cpp_err=$ac_cxx_preproc_warn_flag
+@@ -19835,7 +19846,7 @@
+ else
+ ac_cv_prog_CXXCPP=$CXXCPP
+ fi
+-echo "$as_me:19838: result: $CXXCPP" >&5
++echo "$as_me:19849: result: $CXXCPP" >&5
+ echo "${ECHO_T}$CXXCPP" >&6
+ ac_preproc_ok=false
+ for ac_cxx_preproc_warn_flag in '' yes
+@@ -19845,18 +19856,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 19848 "configure"
++#line 19859 "configure"
+ #include "confdefs.h"
+ #include <assert.h>
+ Syntax error
+ _ACEOF
+-if { (eval echo "$as_me:19853: \"$ac_cpp conftest.$ac_ext\"") >&5
++if { (eval echo "$as_me:19864: \"$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:19859: \$? = $ac_status" >&5
++ echo "$as_me:19870: \$? = $ac_status" >&5
+ (exit $ac_status); } >/dev/null; then
+ if test -s conftest.err; then
+ ac_cpp_err=$ac_cxx_preproc_warn_flag
+@@ -19879,17 +19890,17 @@
+ # OK, works on sane cases. Now check whether non-existent headers
+ # can be detected and how.
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 19882 "configure"
++#line 19893 "configure"
+ #include "confdefs.h"
+ #include <ac_nonexistent.h>
+ _ACEOF
+-if { (eval echo "$as_me:19886: \"$ac_cpp conftest.$ac_ext\"") >&5
++if { (eval echo "$as_me:19897: \"$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:19892: \$? = $ac_status" >&5
++ echo "$as_me:19903: \$? = $ac_status" >&5
+ (exit $ac_status); } >/dev/null; then
+ if test -s conftest.err; then
+ ac_cpp_err=$ac_cxx_preproc_warn_flag
+@@ -19917,7 +19928,7 @@
+ if $ac_preproc_ok; then
+ :
+ else
+- { { echo "$as_me:19920: error: C++ preprocessor \"$CXXCPP\" fails sanity check" >&5
++ { { echo "$as_me:19931: error: C++ preprocessor \"$CXXCPP\" fails sanity check" >&5
+ echo "$as_me: error: C++ preprocessor \"$CXXCPP\" fails sanity check" >&2;}
+ { (exit 1); exit 1; }; }
+ fi
+@@ -19932,23 +19943,23 @@
+ for ac_header in typeinfo
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-echo "$as_me:19935: checking for $ac_header" >&5
++echo "$as_me:19946: 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 19941 "configure"
++#line 19952 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:19945: \"$ac_cpp conftest.$ac_ext\"") >&5
++if { (eval echo "$as_me:19956: \"$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:19951: \$? = $ac_status" >&5
++ echo "$as_me:19962: \$? = $ac_status" >&5
+ (exit $ac_status); } >/dev/null; then
+ if test -s conftest.err; then
+ ac_cpp_err=$ac_cxx_preproc_warn_flag
+@@ -19967,7 +19978,7 @@
+ fi
+ rm -f conftest.err conftest.$ac_ext
+ fi
+-echo "$as_me:19970: result: `eval echo '${'$as_ac_Header'}'`" >&5
++echo "$as_me:19981: 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
+@@ -19980,23 +19991,23 @@
+ for ac_header in iostream
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-echo "$as_me:19983: checking for $ac_header" >&5
++echo "$as_me:19994: 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 19989 "configure"
++#line 20000 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:19993: \"$ac_cpp conftest.$ac_ext\"") >&5
++if { (eval echo "$as_me:20004: \"$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:19999: \$? = $ac_status" >&5
++ echo "$as_me:20010: \$? = $ac_status" >&5
+ (exit $ac_status); } >/dev/null; then
+ if test -s conftest.err; then
+ ac_cpp_err=$ac_cxx_preproc_warn_flag
+@@ -20015,7 +20026,7 @@
+ fi
+ rm -f conftest.err conftest.$ac_ext
+ fi
+-echo "$as_me:20018: result: `eval echo '${'$as_ac_Header'}'`" >&5
++echo "$as_me:20029: 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
+@@ -20026,10 +20037,10 @@
+ done
+
+ if test x"$ac_cv_header_iostream" = xyes ; then
+- echo "$as_me:20029: checking if iostream uses std-namespace" >&5
++ echo "$as_me:20040: 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 20032 "configure"
++#line 20043 "configure"
+ #include "confdefs.h"
+
+ #include <iostream>
+@@ -20046,16 +20057,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:20049: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:20060: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:20052: \$? = $ac_status" >&5
++ echo "$as_me:20063: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:20055: \"$ac_try\"") >&5
++ { (eval echo "$as_me:20066: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:20058: \$? = $ac_status" >&5
++ echo "$as_me:20069: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ cf_iostream_namespace=yes
+ else
+@@ -20064,7 +20075,7 @@
+ cf_iostream_namespace=no
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+- echo "$as_me:20067: result: $cf_iostream_namespace" >&5
++ echo "$as_me:20078: result: $cf_iostream_namespace" >&5
+ echo "${ECHO_T}$cf_iostream_namespace" >&6
+ if test "$cf_iostream_namespace" = yes ; then
+
+@@ -20075,7 +20086,7 @@
+ fi
+ fi
+
+-echo "$as_me:20078: checking if we should include stdbool.h" >&5
++echo "$as_me:20089: 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
+@@ -20083,7 +20094,7 @@
+ else
+
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 20086 "configure"
++#line 20097 "configure"
+ #include "confdefs.h"
+
+ int
+@@ -20095,23 +20106,23 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:20098: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:20109: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:20101: \$? = $ac_status" >&5
++ echo "$as_me:20112: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:20104: \"$ac_try\"") >&5
++ { (eval echo "$as_me:20115: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:20107: \$? = $ac_status" >&5
++ echo "$as_me:20118: \$? = $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 20114 "configure"
++#line 20125 "configure"
+ #include "confdefs.h"
+
+ #ifndef __BEOS__
+@@ -20127,16 +20138,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:20130: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:20141: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:20133: \$? = $ac_status" >&5
++ echo "$as_me:20144: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:20136: \"$ac_try\"") >&5
++ { (eval echo "$as_me:20147: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:20139: \$? = $ac_status" >&5
++ echo "$as_me:20150: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ cf_cv_header_stdbool_h=1
+ else
+@@ -20150,13 +20161,13 @@
+ fi
+
+ if test "$cf_cv_header_stdbool_h" = 1
+-then echo "$as_me:20153: result: yes" >&5
++then echo "$as_me:20164: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+-else echo "$as_me:20155: result: no" >&5
++else echo "$as_me:20166: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+
+-echo "$as_me:20159: checking for builtin bool type" >&5
++echo "$as_me:20170: 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
+@@ -20164,7 +20175,7 @@
+ else
+
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 20167 "configure"
++#line 20178 "configure"
+ #include "confdefs.h"
+
+ #include <stdio.h>
+@@ -20179,16 +20190,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:20182: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:20193: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:20185: \$? = $ac_status" >&5
++ echo "$as_me:20196: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:20188: \"$ac_try\"") >&5
++ { (eval echo "$as_me:20199: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:20191: \$? = $ac_status" >&5
++ echo "$as_me:20202: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ cf_cv_builtin_bool=1
+ else
+@@ -20201,13 +20212,13 @@
+ fi
+
+ if test "$cf_cv_builtin_bool" = 1
+-then echo "$as_me:20204: result: yes" >&5
++then echo "$as_me:20215: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+-else echo "$as_me:20206: result: no" >&5
++else echo "$as_me:20217: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+
+-echo "$as_me:20210: checking for size of bool" >&5
++echo "$as_me:20221: checking for size of bool" >&5
+ echo $ECHO_N "checking for size of bool... $ECHO_C" >&6
+ if test "${cf_cv_type_of_bool+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -20218,7 +20229,7 @@
+ cf_cv_type_of_bool=unknown
+ else
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 20221 "configure"
++#line 20232 "configure"
+ #include "confdefs.h"
+
+ #include <stdlib.h>
+@@ -20260,15 +20271,15 @@
+
+ _ACEOF
+ rm -f conftest$ac_exeext
+-if { (eval echo "$as_me:20263: \"$ac_link\"") >&5
++if { (eval echo "$as_me:20274: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:20266: \$? = $ac_status" >&5
++ echo "$as_me:20277: \$? = $ac_status" >&5
+ (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+- { (eval echo "$as_me:20268: \"$ac_try\"") >&5
++ { (eval echo "$as_me:20279: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:20271: \$? = $ac_status" >&5
++ echo "$as_me:20282: \$? = $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
+@@ -20286,18 +20297,18 @@
+ fi
+
+ rm -f cf_test.out
+-echo "$as_me:20289: result: $cf_cv_type_of_bool" >&5
++echo "$as_me:20300: 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:20295: WARNING: Assuming $NCURSES_BOOL for type of bool" >&5
++ { echo "$as_me:20306: 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:20300: checking for special defines needed for etip.h" >&5
++echo "$as_me:20311: 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"
+@@ -20315,7 +20326,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 20318 "configure"
++#line 20329 "configure"
+ #include "confdefs.h"
+
+ #include <etip.h.in>
+@@ -20329,16 +20340,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:20332: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:20343: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:20335: \$? = $ac_status" >&5
++ echo "$as_me:20346: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:20338: \"$ac_try\"") >&5
++ { (eval echo "$as_me:20349: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:20341: \$? = $ac_status" >&5
++ echo "$as_me:20352: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+
+ test -n "$cf_math" && cat >>confdefs.h <<EOF
+@@ -20359,12 +20370,12 @@
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ done
+ done
+-echo "$as_me:20362: result: $cf_result" >&5
++echo "$as_me:20373: result: $cf_result" >&5
+ echo "${ECHO_T}$cf_result" >&6
+ CXXFLAGS="$cf_save_CXXFLAGS"
+
+ if test -n "$CXX"; then
+-echo "$as_me:20367: checking if $CXX accepts parameter initialization" >&5
++echo "$as_me:20378: 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
+@@ -20381,7 +20392,7 @@
+ cf_cv_cpp_param_init=unknown
+ else
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 20384 "configure"
++#line 20395 "configure"
+ #include "confdefs.h"
+
+ class TEST {
+@@ -20400,15 +20411,15 @@
+
+ _ACEOF
+ rm -f conftest$ac_exeext
+-if { (eval echo "$as_me:20403: \"$ac_link\"") >&5
++if { (eval echo "$as_me:20414: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:20406: \$? = $ac_status" >&5
++ echo "$as_me:20417: \$? = $ac_status" >&5
+ (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+- { (eval echo "$as_me:20408: \"$ac_try\"") >&5
++ { (eval echo "$as_me:20419: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:20411: \$? = $ac_status" >&5
++ echo "$as_me:20422: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ cf_cv_cpp_param_init=yes
+ else
+@@ -20427,7 +20438,7 @@
+ ac_main_return=return
+
+ fi
+-echo "$as_me:20430: result: $cf_cv_cpp_param_init" >&5
++echo "$as_me:20441: result: $cf_cv_cpp_param_init" >&5
+ echo "${ECHO_T}$cf_cv_cpp_param_init" >&6
+ fi
+ test "$cf_cv_cpp_param_init" = yes &&
+@@ -20437,7 +20448,7 @@
+
+ if test -n "$CXX"; then
+
+-echo "$as_me:20440: checking if $CXX accepts static_cast" >&5
++echo "$as_me:20451: 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
+@@ -20451,7 +20462,7 @@
+ ac_main_return=return
+
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 20454 "configure"
++#line 20465 "configure"
+ #include "confdefs.h"
+
+ class NCursesPanel
+@@ -20495,16 +20506,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:20498: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:20509: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:20501: \$? = $ac_status" >&5
++ echo "$as_me:20512: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:20504: \"$ac_try\"") >&5
++ { (eval echo "$as_me:20515: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:20507: \$? = $ac_status" >&5
++ echo "$as_me:20518: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ cf_cv_cpp_static_cast=yes
+ else
+@@ -20522,7 +20533,7 @@
+ ac_main_return=return
+
+ fi
+-echo "$as_me:20525: result: $cf_cv_cpp_static_cast" >&5
++echo "$as_me:20536: result: $cf_cv_cpp_static_cast" >&5
+ echo "${ECHO_T}$cf_cv_cpp_static_cast" >&6
+
+ fi
+@@ -20571,7 +20582,7 @@
+ else
+ if test "$cf_cv_header_stdbool_h" = 1 ; then
+
+-echo "$as_me:20574: checking for size of bool" >&5
++echo "$as_me:20585: checking for size of bool" >&5
+ echo $ECHO_N "checking for size of bool... $ECHO_C" >&6
+ if test "${cf_cv_type_of_bool+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -20582,7 +20593,7 @@
+ cf_cv_type_of_bool=unknown
+ else
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 20585 "configure"
++#line 20596 "configure"
+ #include "confdefs.h"
+
+ #include <stdlib.h>
+@@ -20624,15 +20635,15 @@
+
+ _ACEOF
+ rm -f conftest$ac_exeext
+-if { (eval echo "$as_me:20627: \"$ac_link\"") >&5
++if { (eval echo "$as_me:20638: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:20630: \$? = $ac_status" >&5
++ echo "$as_me:20641: \$? = $ac_status" >&5
+ (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+- { (eval echo "$as_me:20632: \"$ac_try\"") >&5
++ { (eval echo "$as_me:20643: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:20635: \$? = $ac_status" >&5
++ echo "$as_me:20646: \$? = $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
+@@ -20650,25 +20661,25 @@
+ fi
+
+ rm -f cf_test.out
+-echo "$as_me:20653: result: $cf_cv_type_of_bool" >&5
++echo "$as_me:20664: 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:20659: WARNING: Assuming $NCURSES_BOOL for type of bool" >&5
++ { echo "$as_me:20670: 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:20665: checking for fallback type of bool" >&5
++ echo "$as_me:20676: 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:20671: result: $cf_cv_type_of_bool" >&5
++ echo "$as_me:20682: result: $cf_cv_type_of_bool" >&5
+ echo "${ECHO_T}$cf_cv_type_of_bool" >&6
+ fi
+ fi
+@@ -20697,7 +20708,7 @@
+
+ if test "$cf_with_ada" != "no" ; then
+ if test "$with_libtool" != "no"; then
+- { echo "$as_me:20700: WARNING: libtool does not support Ada - disabling feature" >&5
++ { echo "$as_me:20711: 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
+@@ -20708,7 +20719,7 @@
+ cf_ada_make=gnatmake
+ # Extract the first word of "$cf_ada_make", so it can be a program name with args.
+ set dummy $cf_ada_make; ac_word=$2
+-echo "$as_me:20711: checking for $ac_word" >&5
++echo "$as_me:20722: checking for $ac_word" >&5
+ echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+ if test "${ac_cv_prog_gnat_exists+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -20723,7 +20734,7 @@
+ test -z "$ac_dir" && ac_dir=.
+ $as_executable_p "$ac_dir/$ac_word" || continue
+ ac_cv_prog_gnat_exists="yes"
+-echo "$as_me:20726: found $ac_dir/$ac_word" >&5
++echo "$as_me:20737: found $ac_dir/$ac_word" >&5
+ break
+ done
+
+@@ -20732,10 +20743,10 @@
+ fi
+ gnat_exists=$ac_cv_prog_gnat_exists
+ if test -n "$gnat_exists"; then
+- echo "$as_me:20735: result: $gnat_exists" >&5
++ echo "$as_me:20746: result: $gnat_exists" >&5
+ echo "${ECHO_T}$gnat_exists" >&6
+ else
+- echo "$as_me:20738: result: no" >&5
++ echo "$as_me:20749: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+
+@@ -20744,12 +20755,12 @@
+ cf_cv_prog_gnat_correct=no
+ else
+
+-echo "$as_me:20747: checking for gnat version" >&5
++echo "$as_me:20758: checking for gnat version" >&5
+ echo $ECHO_N "checking for gnat version... $ECHO_C" >&6
+ cf_gnat_version=`${cf_ada_make:-gnatmake} -v 2>&1 | \
+ grep '[0-9].[0-9][0-9]*' |\
+ sed -e '2,$d' -e 's/[^0-9 \.]//g' -e 's/^[ ]*//' -e 's/ .*//'`
+-echo "$as_me:20752: result: $cf_gnat_version" >&5
++echo "$as_me:20763: result: $cf_gnat_version" >&5
+ echo "${ECHO_T}$cf_gnat_version" >&6
+
+ case $cf_gnat_version in
+@@ -20757,7 +20768,7 @@
+ cf_cv_prog_gnat_correct=yes
+ ;;
+ (*)
+- { echo "$as_me:20760: WARNING: Unsupported GNAT version $cf_gnat_version. We require 3.11 or better. Disabling Ada95 binding." >&5
++ { echo "$as_me:20771: WARNING: Unsupported GNAT version $cf_gnat_version. We require 3.11 or better. Disabling Ada95 binding." >&5
+ echo "$as_me: WARNING: Unsupported GNAT version $cf_gnat_version. We require 3.11 or better. Disabling Ada95 binding." >&2;}
+ cf_cv_prog_gnat_correct=no
+ ;;
+@@ -20765,7 +20776,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:20768: checking for $ac_word" >&5
++echo "$as_me:20779: 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
+@@ -20780,7 +20791,7 @@
+ test -z "$ac_dir" && ac_dir=.
+ $as_executable_p "$ac_dir/$ac_word" || continue
+ ac_cv_prog_M4_exists="yes"
+-echo "$as_me:20783: found $ac_dir/$ac_word" >&5
++echo "$as_me:20794: found $ac_dir/$ac_word" >&5
+ break
+ done
+
+@@ -20789,10 +20800,10 @@
+ fi
+ M4_exists=$ac_cv_prog_M4_exists
+ if test -n "$M4_exists"; then
+- echo "$as_me:20792: result: $M4_exists" >&5
++ echo "$as_me:20803: result: $M4_exists" >&5
+ echo "${ECHO_T}$M4_exists" >&6
+ else
+- echo "$as_me:20795: result: no" >&5
++ echo "$as_me:20806: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+
+@@ -20801,7 +20812,7 @@
+ echo Ada95 binding required program m4 not found. Ada95 binding disabled.
+ fi
+ if test "$cf_cv_prog_gnat_correct" = yes; then
+- echo "$as_me:20804: checking if GNAT works" >&5
++ echo "$as_me:20815: checking if GNAT works" >&5
+ echo $ECHO_N "checking if GNAT works... $ECHO_C" >&6
+
+ rm -rf conftest* *~conftest*
+@@ -20829,7 +20840,7 @@
+ fi
+ rm -rf conftest* *~conftest*
+
+- echo "$as_me:20832: result: $cf_cv_prog_gnat_correct" >&5
++ echo "$as_me:20843: result: $cf_cv_prog_gnat_correct" >&5
+ echo "${ECHO_T}$cf_cv_prog_gnat_correct" >&6
+ fi
+ fi
+@@ -20838,7 +20849,7 @@
+
+ ADAFLAGS="$ADAFLAGS -gnatpn"
+
+- echo "$as_me:20841: checking optimization options for ADAFLAGS" >&5
++ echo "$as_me:20852: checking optimization options for ADAFLAGS" >&5
+ echo $ECHO_N "checking optimization options for ADAFLAGS... $ECHO_C" >&6
+ case "$CFLAGS" in
+ (*-g*)
+@@ -20855,10 +20866,10 @@
+
+ ;;
+ esac
+- echo "$as_me:20858: result: $ADAFLAGS" >&5
++ echo "$as_me:20869: result: $ADAFLAGS" >&5
+ echo "${ECHO_T}$ADAFLAGS" >&6
+
+-echo "$as_me:20861: checking if GNATPREP supports -T option" >&5
++echo "$as_me:20872: 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
+@@ -20868,11 +20879,11 @@
+ gnatprep -T 2>/dev/null >/dev/null && cf_cv_gnatprep_opt_t=yes
+
+ fi
+-echo "$as_me:20871: result: $cf_cv_gnatprep_opt_t" >&5
++echo "$as_me:20882: 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:20875: checking if GNAT supports generics" >&5
++echo "$as_me:20886: checking if GNAT supports generics" >&5
+ echo $ECHO_N "checking if GNAT supports generics... $ECHO_C" >&6
+ case $cf_gnat_version in
+ (3.[1-9]*|[4-9].*)
+@@ -20882,7 +20893,7 @@
+ cf_gnat_generics=no
+ ;;
+ esac
+-echo "$as_me:20885: result: $cf_gnat_generics" >&5
++echo "$as_me:20896: result: $cf_gnat_generics" >&5
+ echo "${ECHO_T}$cf_gnat_generics" >&6
+
+ if test "$cf_gnat_generics" = yes
+@@ -20894,7 +20905,7 @@
+ cf_generic_objects=
+ fi
+
+-echo "$as_me:20897: checking if GNAT supports SIGINT" >&5
++echo "$as_me:20908: 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
+@@ -20942,7 +20953,7 @@
+ rm -rf conftest* *~conftest*
+
+ fi
+-echo "$as_me:20945: result: $cf_cv_gnat_sigint" >&5
++echo "$as_me:20956: result: $cf_cv_gnat_sigint" >&5
+ echo "${ECHO_T}$cf_cv_gnat_sigint" >&6
+
+ if test $cf_cv_gnat_sigint = yes ; then
+@@ -20955,7 +20966,7 @@
+ cf_gnat_projects=no
+
+ if test "$enable_gnat_projects" != no ; then
+-echo "$as_me:20958: checking if GNAT supports project files" >&5
++echo "$as_me:20969: checking if GNAT supports project files" >&5
+ echo $ECHO_N "checking if GNAT supports project files... $ECHO_C" >&6
+ case $cf_gnat_version in
+ (3.[0-9]*)
+@@ -21015,15 +21026,15 @@
+ esac
+ ;;
+ esac
+-echo "$as_me:21018: result: $cf_gnat_projects" >&5
++echo "$as_me:21029: 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:21024: checking if GNAT supports libraries" >&5
++ echo "$as_me:21035: checking if GNAT supports libraries" >&5
+ echo $ECHO_N "checking if GNAT supports libraries... $ECHO_C" >&6
+- echo "$as_me:21026: result: $cf_gnat_libraries" >&5
++ echo "$as_me:21037: result: $cf_gnat_libraries" >&5
+ echo "${ECHO_T}$cf_gnat_libraries" >&6
+ fi
+
+@@ -21043,7 +21054,7 @@
+ USE_GNAT_LIBRARIES="#"
+ fi
+
+-echo "$as_me:21046: checking for ada-compiler" >&5
++echo "$as_me:21057: 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.
+@@ -21054,12 +21065,12 @@
+ cf_ada_compiler=gnatmake
+ fi;
+
+-echo "$as_me:21057: result: $cf_ada_compiler" >&5
++echo "$as_me:21068: result: $cf_ada_compiler" >&5
+ echo "${ECHO_T}$cf_ada_compiler" >&6
+
+ cf_ada_package=terminal_interface
+
+-echo "$as_me:21062: checking for ada-include" >&5
++echo "$as_me:21073: 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.
+@@ -21095,7 +21106,7 @@
+ withval=`echo $withval | sed -e s%NONE%$cf_path_syntax%`
+ ;;
+ (*)
+- { { echo "$as_me:21098: error: expected a pathname, not \"$withval\"" >&5
++ { { echo "$as_me:21109: error: expected a pathname, not \"$withval\"" >&5
+ echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
+ { (exit 1); exit 1; }; }
+ ;;
+@@ -21104,10 +21115,10 @@
+ fi
+ eval ADA_INCLUDE="$withval"
+
+-echo "$as_me:21107: result: $ADA_INCLUDE" >&5
++echo "$as_me:21118: result: $ADA_INCLUDE" >&5
+ echo "${ECHO_T}$ADA_INCLUDE" >&6
+
+-echo "$as_me:21110: checking for ada-objects" >&5
++echo "$as_me:21121: 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.
+@@ -21143,7 +21154,7 @@
+ withval=`echo $withval | sed -e s%NONE%$cf_path_syntax%`
+ ;;
+ (*)
+- { { echo "$as_me:21146: error: expected a pathname, not \"$withval\"" >&5
++ { { echo "$as_me:21157: error: expected a pathname, not \"$withval\"" >&5
+ echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
+ { (exit 1); exit 1; }; }
+ ;;
+@@ -21152,10 +21163,10 @@
+ fi
+ eval ADA_OBJECTS="$withval"
+
+-echo "$as_me:21155: result: $ADA_OBJECTS" >&5
++echo "$as_me:21166: result: $ADA_OBJECTS" >&5
+ echo "${ECHO_T}$ADA_OBJECTS" >&6
+
+-echo "$as_me:21158: checking if an Ada95 shared-library should be built" >&5
++echo "$as_me:21169: 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.
+@@ -21165,7 +21176,7 @@
+ else
+ with_ada_sharedlib=no
+ fi;
+-echo "$as_me:21168: result: $with_ada_sharedlib" >&5
++echo "$as_me:21179: result: $with_ada_sharedlib" >&5
+ echo "${ECHO_T}$with_ada_sharedlib" >&6
+
+ ADA_SHAREDLIB='lib$(LIB_NAME).so.1'
+@@ -21188,13 +21199,13 @@
+
+ # do this "late" to avoid conflict with header-checks
+ if test "x$with_widec" = xyes ; then
+- echo "$as_me:21191: checking for wchar_t" >&5
++ echo "$as_me:21202: 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 21197 "configure"
++#line 21208 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -21209,16 +21220,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:21212: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:21223: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:21215: \$? = $ac_status" >&5
++ echo "$as_me:21226: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:21218: \"$ac_try\"") >&5
++ { (eval echo "$as_me:21229: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:21221: \$? = $ac_status" >&5
++ echo "$as_me:21232: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ ac_cv_type_wchar_t=yes
+ else
+@@ -21228,10 +21239,10 @@
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ fi
+-echo "$as_me:21231: result: $ac_cv_type_wchar_t" >&5
++echo "$as_me:21242: result: $ac_cv_type_wchar_t" >&5
+ echo "${ECHO_T}$ac_cv_type_wchar_t" >&6
+
+-echo "$as_me:21234: checking size of wchar_t" >&5
++echo "$as_me:21245: 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
+@@ -21240,7 +21251,7 @@
+ if test "$cross_compiling" = yes; then
+ # Depending upon the size, compute the lo and hi bounds.
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 21243 "configure"
++#line 21254 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -21252,21 +21263,21 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:21255: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:21266: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:21258: \$? = $ac_status" >&5
++ echo "$as_me:21269: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:21261: \"$ac_try\"") >&5
++ { (eval echo "$as_me:21272: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:21264: \$? = $ac_status" >&5
++ echo "$as_me:21275: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ ac_lo=0 ac_mid=0
+ while :; do
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 21269 "configure"
++#line 21280 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -21278,16 +21289,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:21281: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:21292: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:21284: \$? = $ac_status" >&5
++ echo "$as_me:21295: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:21287: \"$ac_try\"") >&5
++ { (eval echo "$as_me:21298: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:21290: \$? = $ac_status" >&5
++ echo "$as_me:21301: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ ac_hi=$ac_mid; break
+ else
+@@ -21303,7 +21314,7 @@
+ ac_hi=-1 ac_mid=-1
+ while :; do
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 21306 "configure"
++#line 21317 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -21315,16 +21326,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:21318: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:21329: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:21321: \$? = $ac_status" >&5
++ echo "$as_me:21332: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:21324: \"$ac_try\"") >&5
++ { (eval echo "$as_me:21335: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:21327: \$? = $ac_status" >&5
++ echo "$as_me:21338: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ ac_lo=$ac_mid; break
+ else
+@@ -21340,7 +21351,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 21343 "configure"
++#line 21354 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -21352,16 +21363,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:21355: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:21366: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:21358: \$? = $ac_status" >&5
++ echo "$as_me:21369: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:21361: \"$ac_try\"") >&5
++ { (eval echo "$as_me:21372: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:21364: \$? = $ac_status" >&5
++ echo "$as_me:21375: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ ac_hi=$ac_mid
+ else
+@@ -21374,12 +21385,12 @@
+ ac_cv_sizeof_wchar_t=$ac_lo
+ else
+ if test "$cross_compiling" = yes; then
+- { { echo "$as_me:21377: error: cannot run test program while cross compiling" >&5
++ { { echo "$as_me:21388: 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 21382 "configure"
++#line 21393 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -21395,15 +21406,15 @@
+ }
+ _ACEOF
+ rm -f conftest$ac_exeext
+-if { (eval echo "$as_me:21398: \"$ac_link\"") >&5
++if { (eval echo "$as_me:21409: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:21401: \$? = $ac_status" >&5
++ echo "$as_me:21412: \$? = $ac_status" >&5
+ (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+- { (eval echo "$as_me:21403: \"$ac_try\"") >&5
++ { (eval echo "$as_me:21414: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:21406: \$? = $ac_status" >&5
++ echo "$as_me:21417: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ ac_cv_sizeof_wchar_t=`cat conftest.val`
+ else
+@@ -21419,7 +21430,7 @@
+ ac_cv_sizeof_wchar_t=0
+ fi
+ fi
+-echo "$as_me:21422: result: $ac_cv_sizeof_wchar_t" >&5
++echo "$as_me:21433: 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
+@@ -21437,7 +21448,7 @@
+ ### chooses to split module lists into libraries.
+ ###
+ ### (see CF_LIB_RULES).
+-echo "$as_me:21440: checking for library subsets" >&5
++echo "$as_me:21451: checking for library subsets" >&5
+ echo $ECHO_N "checking for library subsets... $ECHO_C" >&6
+ LIB_SUBSETS=
+
+@@ -21479,7 +21490,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:21482: result: $LIB_SUBSETS" >&5
++echo "$as_me:21493: result: $LIB_SUBSETS" >&5
+ echo "${ECHO_T}$LIB_SUBSETS" >&6
+
+ ### Construct the list of include-directories to be generated
+@@ -21510,7 +21521,7 @@
+ fi
+
+ ### Build up pieces for makefile rules
+-echo "$as_me:21513: checking default library suffix" >&5
++echo "$as_me:21524: checking default library suffix" >&5
+ echo $ECHO_N "checking default library suffix... $ECHO_C" >&6
+
+ case $DFT_LWR_MODEL in
+@@ -21521,10 +21532,10 @@
+ (shared) DFT_ARG_SUFFIX='' ;;
+ esac
+ test -n "$LIB_SUFFIX" && DFT_ARG_SUFFIX="${LIB_SUFFIX}${DFT_ARG_SUFFIX}"
+-echo "$as_me:21524: result: $DFT_ARG_SUFFIX" >&5
++echo "$as_me:21535: result: $DFT_ARG_SUFFIX" >&5
+ echo "${ECHO_T}$DFT_ARG_SUFFIX" >&6
+
+-echo "$as_me:21527: checking default library-dependency suffix" >&5
++echo "$as_me:21538: checking default library-dependency suffix" >&5
+ echo $ECHO_N "checking default library-dependency suffix... $ECHO_C" >&6
+
+ case X$DFT_LWR_MODEL in
+@@ -21582,10 +21593,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:21585: result: $DFT_DEP_SUFFIX" >&5
++echo "$as_me:21596: result: $DFT_DEP_SUFFIX" >&5
+ echo "${ECHO_T}$DFT_DEP_SUFFIX" >&6
+
+-echo "$as_me:21588: checking default object directory" >&5
++echo "$as_me:21599: checking default object directory" >&5
+ echo $ECHO_N "checking default object directory... $ECHO_C" >&6
+
+ case $DFT_LWR_MODEL in
+@@ -21601,11 +21612,11 @@
+ DFT_OBJ_SUBDIR='obj_s' ;;
+ esac
+ esac
+-echo "$as_me:21604: result: $DFT_OBJ_SUBDIR" >&5
++echo "$as_me:21615: result: $DFT_OBJ_SUBDIR" >&5
+ echo "${ECHO_T}$DFT_OBJ_SUBDIR" >&6
+
+ if test "x$cf_with_cxx" = xyes ; then
+-echo "$as_me:21608: checking c++ library-dependency suffix" >&5
++echo "$as_me:21619: 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++)
+@@ -21673,7 +21684,7 @@
+ fi
+
+ fi
+-echo "$as_me:21676: result: $CXX_LIB_SUFFIX" >&5
++echo "$as_me:21687: result: $CXX_LIB_SUFFIX" >&5
+ echo "${ECHO_T}$CXX_LIB_SUFFIX" >&6
+
+ fi
+@@ -21846,19 +21857,19 @@
+
+ if test -n "$LDFLAGS_STATIC" && test -n "$LDFLAGS_SHARED"
+ then
+- echo "$as_me:21849: checking if linker supports switching between static/dynamic" >&5
++ echo "$as_me:21860: 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 21854 "configure"
++#line 21865 "configure"
+ #include <stdio.h>
+ int cf_ldflags_static(FILE *fp) { return fflush(fp); }
+ EOF
+- if { (eval echo "$as_me:21858: \"$ac_compile\"") >&5
++ if { (eval echo "$as_me:21869: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:21861: \$? = $ac_status" >&5
++ echo "$as_me:21872: \$? = $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
+@@ -21869,10 +21880,10 @@
+
+ LIBS="$LDFLAGS_STATIC -L`pwd` -lconftest $LDFLAGS_DYNAMIC $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 21872 "configure"
++#line 21883 "configure"
+ #include "confdefs.h"
+
+-#line 21875 "configure"
++#line 21886 "configure"
+ #include <stdio.h>
+ int cf_ldflags_static(FILE *fp);
+
+@@ -21887,16 +21898,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:21890: \"$ac_link\"") >&5
++if { (eval echo "$as_me:21901: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:21893: \$? = $ac_status" >&5
++ echo "$as_me:21904: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -s conftest$ac_exeext'
+- { (eval echo "$as_me:21896: \"$ac_try\"") >&5
++ { (eval echo "$as_me:21907: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:21899: \$? = $ac_status" >&5
++ echo "$as_me:21910: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+
+ # some linkers simply ignore the -dynamic
+@@ -21919,7 +21930,7 @@
+ rm -f libconftest.*
+ LIBS="$cf_save_LIBS"
+
+- echo "$as_me:21922: result: $cf_ldflags_static" >&5
++ echo "$as_me:21933: result: $cf_ldflags_static" >&5
+ echo "${ECHO_T}$cf_ldflags_static" >&6
+
+ if test $cf_ldflags_static != yes
+@@ -21935,7 +21946,7 @@
+ ;;
+ esac
+
+-echo "$as_me:21938: checking where we will install curses.h" >&5
++echo "$as_me:21949: checking where we will install curses.h" >&5
+ echo $ECHO_N "checking where we will install curses.h... $ECHO_C" >&6
+
+ includesubdir=
+@@ -21945,7 +21956,7 @@
+ then
+ includesubdir="/ncurses${USE_LIB_SUFFIX}"
+ fi
+-echo "$as_me:21948: result: ${includedir}${includesubdir}" >&5
++echo "$as_me:21959: result: ${includedir}${includesubdir}" >&5
+ echo "${ECHO_T}${includedir}${includesubdir}" >&6
+
+ ### Resolve a conflict between normal and wide-curses by forcing applications
+@@ -21953,7 +21964,7 @@
+ if test "$with_overwrite" != no ; then
+ if test "$NCURSES_LIBUTF8" = 1 ; then
+ NCURSES_LIBUTF8='defined(HAVE_LIBUTF8_H)'
+- { echo "$as_me:21956: WARNING: Wide-character applications must define HAVE_LIBUTF8_H to include curses.h" >&5
++ { echo "$as_me:21967: 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
+@@ -21971,7 +21982,7 @@
+ ### Construct the list of subdirectories for which we'll customize makefiles
+ ### with the appropriate compile-rules.
+
+-echo "$as_me:21974: checking for src modules" >&5
++echo "$as_me:21985: checking for src modules" >&5
+ echo $ECHO_N "checking for src modules... $ECHO_C" >&6
+
+ # dependencies and linker-arguments for test-programs
+@@ -22036,7 +22047,7 @@
+ fi
+ fi
+ done
+-echo "$as_me:22039: result: $cf_cv_src_modules" >&5
++echo "$as_me:22050: result: $cf_cv_src_modules" >&5
+ echo "${ECHO_T}$cf_cv_src_modules" >&6
+
+ TEST_ARGS="-L${LIB_DIR} $TEST_ARGS"
+@@ -22256,7 +22267,7 @@
+
+ # Extract the first word of "tic", so it can be a program name with args.
+ set dummy tic; ac_word=$2
+-echo "$as_me:22259: checking for $ac_word" >&5
++echo "$as_me:22270: checking for $ac_word" >&5
+ echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+ if test "${ac_cv_path_TIC_PATH+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -22273,7 +22284,7 @@
+ test -z "$ac_dir" && ac_dir=.
+ if $as_executable_p "$ac_dir/$ac_word"; then
+ ac_cv_path_TIC_PATH="$ac_dir/$ac_word"
+- echo "$as_me:22276: found $ac_dir/$ac_word" >&5
++ echo "$as_me:22287: found $ac_dir/$ac_word" >&5
+ break
+ fi
+ done
+@@ -22285,10 +22296,10 @@
+ TIC_PATH=$ac_cv_path_TIC_PATH
+
+ if test -n "$TIC_PATH"; then
+- echo "$as_me:22288: result: $TIC_PATH" >&5
++ echo "$as_me:22299: result: $TIC_PATH" >&5
+ echo "${ECHO_T}$TIC_PATH" >&6
+ else
+- echo "$as_me:22291: result: no" >&5
++ echo "$as_me:22302: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+
+@@ -22296,7 +22307,7 @@
+ then
+ if test "$TIC_PATH" = unknown
+ then
+- { echo "$as_me:22299: WARNING: no tic program found for fallbacks" >&5
++ { echo "$as_me:22310: WARNING: no tic program found for fallbacks" >&5
+ echo "$as_me: WARNING: no tic program found for fallbacks" >&2;}
+ fi
+ fi
+@@ -22315,6 +22326,16 @@
+ FORM_NAME=form
+ CXX_NAME=ncurses++
+
++# workaround for OS/2 (20151017)
++case $cf_cv_system_name in
++(os2*)
++ LIBTOOL_OPTS_CXX="-os2dllname ncurs++"
++ ;;
++(*)
++ LIBTOOL_OPTS_CXX=
++ ;;
++esac
++
+ # workaround for g++ versus Solaris (20131116)
+ case $cf_cv_system_name in
+ (solaris2*)
+@@ -22322,7 +22343,7 @@
+ (*-D_XOPEN_SOURCE_EXTENDED*)
+ test -n "$verbose" && echo " moving _XOPEN_SOURCE_EXTENDED to work around g++ problem" 1>&6
+
+-echo "${as_me:-configure}:22325: testing moving _XOPEN_SOURCE_EXTENDED to work around g++ problem ..." 1>&5
++echo "${as_me:-configure}:22346: 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//'`
+@@ -22333,7 +22354,7 @@
+
+ # Help to automatically enable the extended curses features when using either
+ # the *-config or the ".pc" files by adding defines.
+-echo "$as_me:22336: checking for defines to add to ncurses${USE_CFG_SUFFIX}-config script" >&5
++echo "$as_me:22357: 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
+@@ -22349,7 +22370,7 @@
+ done
+ test "$cf_found" = no && PKG_CFLAGS="$PKG_CFLAGS $cf_loop1"
+ done
+-echo "$as_me:22352: result: $PKG_CFLAGS" >&5
++echo "$as_me:22373: result: $PKG_CFLAGS" >&5
+ echo "${ECHO_T}$PKG_CFLAGS" >&6
+
+ # AC_CHECK_SIZEOF demands a literal parameter, no variables. So we do this.
+@@ -22406,7 +22427,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}:22409: testing will map symbols to ABI=$cf_cv_abi_version ..." 1>&5
++echo "${as_me:-configure}:22430: testing will map symbols to ABI=$cf_cv_abi_version ..." 1>&5
+
+ fi
+
+@@ -22508,7 +22529,7 @@
+ : ${CONFIG_STATUS=./config.status}
+ ac_clean_files_save=$ac_clean_files
+ ac_clean_files="$ac_clean_files $CONFIG_STATUS"
+-{ echo "$as_me:22511: creating $CONFIG_STATUS" >&5
++{ echo "$as_me:22532: creating $CONFIG_STATUS" >&5
+ echo "$as_me: creating $CONFIG_STATUS" >&6;}
+ cat >$CONFIG_STATUS <<_ACEOF
+ #! $SHELL
+@@ -22684,7 +22705,7 @@
+ echo "$ac_cs_version"; exit 0 ;;
+ --he | --h)
+ # Conflict between --help and --header
+- { { echo "$as_me:22687: error: ambiguous option: $1
++ { { echo "$as_me:22708: 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;}
+@@ -22703,7 +22724,7 @@
+ ac_need_defaults=false;;
+
+ # This is an error.
+- -*) { { echo "$as_me:22706: error: unrecognized option: $1
++ -*) { { echo "$as_me:22727: 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;}
+@@ -22821,7 +22842,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:22824: error: invalid argument: $ac_config_target" >&5
++ *) { { echo "$as_me:22845: error: invalid argument: $ac_config_target" >&5
+ echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
+ { (exit 1); exit 1; }; };;
+ esac
+@@ -23157,6 +23178,7 @@
+ s,@MENU_NAME@,$MENU_NAME,;t t
+ s,@FORM_NAME@,$FORM_NAME,;t t
+ s,@CXX_NAME@,$CXX_NAME,;t t
++s,@LIBTOOL_OPTS_CXX@,$LIBTOOL_OPTS_CXX,;t t
+ s,@PKG_CFLAGS@,$PKG_CFLAGS,;t t
+ s,@MISC_INSTALL_DATA@,$MISC_INSTALL_DATA,;t t
+ s,@MISC_UNINSTALL_DATA@,$MISC_UNINSTALL_DATA,;t t
+@@ -23294,7 +23316,7 @@
+ esac
+
+ if test x"$ac_file" != x-; then
+- { echo "$as_me:23297: creating $ac_file" >&5
++ { echo "$as_me:23319: creating $ac_file" >&5
+ echo "$as_me: creating $ac_file" >&6;}
+ rm -f "$ac_file"
+ fi
+@@ -23312,7 +23334,7 @@
+ -) echo $tmp/stdin ;;
+ [\\/$]*)
+ # Absolute (can't be DOS-style, as IFS=:)
+- test -f "$f" || { { echo "$as_me:23315: error: cannot find input file: $f" >&5
++ test -f "$f" || { { echo "$as_me:23337: error: cannot find input file: $f" >&5
+ echo "$as_me: error: cannot find input file: $f" >&2;}
+ { (exit 1); exit 1; }; }
+ echo $f;;
+@@ -23325,7 +23347,7 @@
+ echo $srcdir/$f
+ else
+ # /dev/null tree
+- { { echo "$as_me:23328: error: cannot find input file: $f" >&5
++ { { echo "$as_me:23350: error: cannot find input file: $f" >&5
+ echo "$as_me: error: cannot find input file: $f" >&2;}
+ { (exit 1); exit 1; }; }
+ fi;;
+@@ -23341,7 +23363,7 @@
+ if test -n "$ac_seen"; then
+ ac_used=`grep '@datarootdir@' $ac_item`
+ if test -z "$ac_used"; then
+- { echo "$as_me:23344: WARNING: datarootdir was used implicitly but not set:
++ { echo "$as_me:23366: 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;}
+@@ -23350,7 +23372,7 @@
+ fi
+ ac_seen=`grep '${datarootdir}' $ac_item`
+ if test -n "$ac_seen"; then
+- { echo "$as_me:23353: WARNING: datarootdir was used explicitly but not set:
++ { echo "$as_me:23375: 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;}
+@@ -23387,7 +23409,7 @@
+ ac_init=`egrep '[ ]*'$ac_name'[ ]*=' $ac_file`
+ if test -z "$ac_init"; then
+ ac_seen=`echo "$ac_seen" |sed -e 's,^,'$ac_file':,'`
+- { echo "$as_me:23390: WARNING: Variable $ac_name is used but was not set:
++ { echo "$as_me:23412: 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;}
+@@ -23398,7 +23420,7 @@
+ egrep -n '@[A-Z_][A-Z_0-9]+@' $ac_file >>$tmp/out
+ if test -s $tmp/out; then
+ ac_seen=`sed -e 's,^,'$ac_file':,' < $tmp/out`
+- { echo "$as_me:23401: WARNING: Some variables may not be substituted:
++ { echo "$as_me:23423: WARNING: Some variables may not be substituted:
+ $ac_seen" >&5
+ echo "$as_me: WARNING: Some variables may not be substituted:
+ $ac_seen" >&2;}
+@@ -23447,7 +23469,7 @@
+ * ) ac_file_in=$ac_file.in ;;
+ esac
+
+- test x"$ac_file" != x- && { echo "$as_me:23450: creating $ac_file" >&5
++ test x"$ac_file" != x- && { echo "$as_me:23472: creating $ac_file" >&5
+ echo "$as_me: creating $ac_file" >&6;}
+
+ # First look for the input files in the build tree, otherwise in the
+@@ -23458,7 +23480,7 @@
+ -) echo $tmp/stdin ;;
+ [\\/$]*)
+ # Absolute (can't be DOS-style, as IFS=:)
+- test -f "$f" || { { echo "$as_me:23461: error: cannot find input file: $f" >&5
++ test -f "$f" || { { echo "$as_me:23483: error: cannot find input file: $f" >&5
+ echo "$as_me: error: cannot find input file: $f" >&2;}
+ { (exit 1); exit 1; }; }
+ echo $f;;
+@@ -23471,7 +23493,7 @@
+ echo $srcdir/$f
+ else
+ # /dev/null tree
+- { { echo "$as_me:23474: error: cannot find input file: $f" >&5
++ { { echo "$as_me:23496: error: cannot find input file: $f" >&5
+ echo "$as_me: error: cannot find input file: $f" >&2;}
+ { (exit 1); exit 1; }; }
+ fi;;
+@@ -23529,7 +23551,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:23532: $ac_file is unchanged" >&5
++ { echo "$as_me:23554: $ac_file is unchanged" >&5
+ echo "$as_me: $ac_file is unchanged" >&6;}
+ else
+ ac_dir=`$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+@@ -23867,7 +23889,7 @@
+ (cygdll|msysdll|mingw)
+ test "x$with_shared_cxx" = xno && test -n "$verbose" && echo " overriding CXX_MODEL to SHARED" 1>&6
+
+-echo "${as_me:-configure}:23870: testing overriding CXX_MODEL to SHARED ..." 1>&5
++echo "${as_me:-configure}:23892: testing overriding CXX_MODEL to SHARED ..." 1>&5
+
+ with_shared_cxx=yes
+ ;;
+Index: configure.in
+Prereq: 1.619
+--- ncurses-6.0-20151010+/configure.in 2015-08-05 23:32:27.000000000 +0000
++++ ncurses-6.0-20151017/configure.in 2015-10-17 23:01:54.000000000 +0000
+@@ -28,14 +28,14 @@
+ dnl
+ dnl Author: Thomas E. Dickey 1995-on
+ dnl
+-dnl $Id: configure.in,v 1.619 2015/08/05 23:32:27 tom Exp $
++dnl $Id: configure.in,v 1.620 2015/10/17 23:01:54 tom Exp $
+ dnl Process this file with autoconf to produce a configure script.
+ dnl
+ dnl See http://invisible-island.net/autoconf/ for additional information.
+ dnl
+ dnl ---------------------------------------------------------------------------
+ AC_PREREQ(2.52.20030208)
+-AC_REVISION($Revision: 1.619 $)
++AC_REVISION($Revision: 1.620 $)
+ AC_INIT(ncurses/base/lib_initscr.c)
+ AC_CONFIG_HEADER(include/ncurses_cfg.h:include/ncurses_cfg.hin)
+
+@@ -2075,6 +2075,17 @@
+ AC_SUBST(FORM_NAME)
+ AC_SUBST(CXX_NAME)
+
++# workaround for OS/2 (20151017)
++case $cf_cv_system_name in
++(os2*)
++ LIBTOOL_OPTS_CXX="-os2dllname ncurs++"
++ ;;
++(*)
++ LIBTOOL_OPTS_CXX=
++ ;;
++esac
++AC_SUBST(LIBTOOL_OPTS_CXX)
++
+ # workaround for g++ versus Solaris (20131116)
+ case $cf_cv_system_name in
+ (solaris2*)
+Index: dist.mk
+Prereq: 1.1073
+--- ncurses-6.0-20151010+/dist.mk 2015-10-10 17:06:12.000000000 +0000
++++ ncurses-6.0-20151017/dist.mk 2015-10-17 20:29:47.000000000 +0000
+@@ -25,7 +25,7 @@
+ # use or other dealings in this Software without prior written #
+ # authorization. #
+ ##############################################################################
+-# $Id: dist.mk,v 1.1073 2015/10/10 17:06:12 tom Exp $
++# $Id: dist.mk,v 1.1074 2015/10/17 20:29:47 tom Exp $
+ # Makefile for creating ncurses distributions.
+ #
+ # This only needs to be used directly as a makefile by developers, but
+@@ -37,7 +37,7 @@
+ # These define the major/minor/patch versions of ncurses.
+ NCURSES_MAJOR = 6
+ NCURSES_MINOR = 0
+-NCURSES_PATCH = 20151010
++NCURSES_PATCH = 20151017
+
+ # We don't append the patch to the version, since this only applies to releases
+ VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR)
+Index: ncurses/Makefile.in
+Prereq: 1.147
+--- ncurses-6.0-20151010+/ncurses/Makefile.in 2015-08-05 23:15:41.000000000 +0000
++++ ncurses-6.0-20151017/ncurses/Makefile.in 2015-10-17 21:48:15.000000000 +0000
+@@ -1,4 +1,4 @@
+-# $Id: Makefile.in,v 1.147 2015/08/05 23:15:41 tom Exp $
++# $Id: Makefile.in,v 1.148 2015/10/17 21:48:15 Esa.Peuha Exp $
+ ##############################################################################
+ # Copyright (c) 1998-2014,2015 Free Software Foundation, Inc. #
+ # #
+@@ -225,7 +225,7 @@
+ ./make_keys$(BUILD_EXEEXT) keys.list > $@
+
+ keys.list : $(tinfo)/MKkeys_list.sh
+- AWK=$(AWK) $(SHELL) $(tinfo)/MKkeys_list.sh $(TERMINFO_CAPS) | sort >$@
++ AWK=$(AWK) $(SHELL) $(tinfo)/MKkeys_list.sh $(TERMINFO_CAPS) | LC_ALL=C sort >$@
+
+ make_keys$(BUILD_EXEEXT) : \
+ $(tinfo)/make_keys.c \
+Index: ncurses/base/lib_color.c
+Prereq: 1.111
+--- ncurses-6.0-20151010+/ncurses/base/lib_color.c 2015-08-22 22:38:58.000000000 +0000
++++ ncurses-6.0-20151017/ncurses/base/lib_color.c 2015-10-17 20:39:18.000000000 +0000
+@@ -45,7 +45,7 @@
+ #define CUR SP_TERMTYPE
+ #endif
+
+-MODULE_ID("$Id: lib_color.c,v 1.111 2015/08/22 22:38:58 tom Exp $")
++MODULE_ID("$Id: lib_color.c,v 1.112 2015/10/17 20:39:18 Denis.Tikhomirov Exp $")
+
+ #ifdef USE_TERM_DRIVER
+ #define CanChange InfoOf(SP_PARM).canchange
+@@ -858,8 +858,6 @@
+ }
+ } else {
+ reset_color_pair(NCURSES_SP_ARG);
+- if (old_pair < 0)
+- return;
+ }
+
+ #if NCURSES_EXT_FUNCS
+Index: ncurses/base/lib_mouse.c
+Prereq: 1.166
+--- ncurses-6.0-20151010+/ncurses/base/lib_mouse.c 2015-07-05 00:28:27.000000000 +0000
++++ ncurses-6.0-20151017/ncurses/base/lib_mouse.c 2015-10-17 22:08:05.000000000 +0000
+@@ -84,7 +84,7 @@
+ #define CUR SP_TERMTYPE
+ #endif
+
+-MODULE_ID("$Id: lib_mouse.c,v 1.166 2015/07/05 00:28:27 tom Exp $")
++MODULE_ID("$Id: lib_mouse.c,v 1.167 2015/10/17 22:08:05 KO.Myung-Hun Exp $")
+
+ #include <tic.h>
+
+@@ -888,7 +888,7 @@
+ do { \
+ eventp->bstate = MASK_PRESS(n); \
+ sp->_mouse_bstate |= MASK_PRESS(n); \
+- if (kbuf[0] & 0x40) { \
++ if (button & 0x40) { \
+ eventp->bstate = MASK_RELEASE(n); \
+ sp->_mouse_bstate &= ~MASK_PRESS(n); \
+ } \
+Index: package/debian-mingw/changelog
+--- ncurses-6.0-20151010+/package/debian-mingw/changelog 2015-10-10 17:06:12.000000000 +0000
++++ ncurses-6.0-20151017/package/debian-mingw/changelog 2015-10-17 20:29:47.000000000 +0000
+@@ -1,8 +1,8 @@
+-ncurses6 (6.0+20151010) unstable; urgency=low
++ncurses6 (6.0+20151017) unstable; urgency=low
+
+ * latest weekly patch
+
+- -- Thomas E. Dickey <dickey@invisible-island.net> Sat, 10 Oct 2015 13:06:12 -0400
++ -- Thomas E. Dickey <dickey@invisible-island.net> Sat, 17 Oct 2015 16:29:47 -0400
+
+ ncurses6 (5.9-20131005) unstable; urgency=low
+
+Index: package/debian-mingw64/changelog
+--- ncurses-6.0-20151010+/package/debian-mingw64/changelog 2015-10-10 17:06:12.000000000 +0000
++++ ncurses-6.0-20151017/package/debian-mingw64/changelog 2015-10-17 20:29:47.000000000 +0000
+@@ -1,8 +1,8 @@
+-ncurses6 (6.0+20151010) unstable; urgency=low
++ncurses6 (6.0+20151017) unstable; urgency=low
+
+ * latest weekly patch
+
+- -- Thomas E. Dickey <dickey@invisible-island.net> Sat, 10 Oct 2015 13:06:12 -0400
++ -- Thomas E. Dickey <dickey@invisible-island.net> Sat, 17 Oct 2015 16:29:47 -0400
+
+ ncurses6 (5.9-20131005) unstable; urgency=low
+
+Index: package/debian/changelog
+--- ncurses-6.0-20151010+/package/debian/changelog 2015-10-10 17:06:12.000000000 +0000
++++ ncurses-6.0-20151017/package/debian/changelog 2015-10-17 20:29:47.000000000 +0000
+@@ -1,8 +1,8 @@
+-ncurses6 (6.0+20151010) unstable; urgency=low
++ncurses6 (6.0+20151017) unstable; urgency=low
+
+ * latest weekly patch
+
+- -- Thomas E. Dickey <dickey@invisible-island.net> Sat, 10 Oct 2015 13:06:12 -0400
++ -- Thomas E. Dickey <dickey@invisible-island.net> Sat, 17 Oct 2015 16:29:47 -0400
+
+ ncurses6 (5.9-20120608) unstable; urgency=low
+
+Index: package/mingw-ncurses.nsi
+Prereq: 1.126
+--- ncurses-6.0-20151010+/package/mingw-ncurses.nsi 2015-10-10 17:06:12.000000000 +0000
++++ ncurses-6.0-20151017/package/mingw-ncurses.nsi 2015-10-17 20:29:47.000000000 +0000
+@@ -1,4 +1,4 @@
+-; $Id: mingw-ncurses.nsi,v 1.126 2015/10/10 17:06:12 tom Exp $
++; $Id: mingw-ncurses.nsi,v 1.127 2015/10/17 20:29:47 tom Exp $
+
+ ; TODO add examples
+ ; TODO bump ABI to 6
+@@ -10,7 +10,7 @@
+ !define VERSION_MAJOR "6"
+ !define VERSION_MINOR "0"
+ !define VERSION_YYYY "2015"
+-!define VERSION_MMDD "1010"
++!define VERSION_MMDD "1017"
+ !define VERSION_PATCH ${VERSION_YYYY}${VERSION_MMDD}
+
+ !define MY_ABI "5"
+Index: package/mingw-ncurses.spec
+--- ncurses-6.0-20151010+/package/mingw-ncurses.spec 2015-10-10 17:06:12.000000000 +0000
++++ ncurses-6.0-20151017/package/mingw-ncurses.spec 2015-10-17 20:29:47.000000000 +0000
+@@ -3,7 +3,7 @@
+ Summary: shared libraries for terminal handling
+ Name: mingw32-ncurses6
+ Version: 6.0
+-Release: 20151010
++Release: 20151017
+ License: X11
+ Group: Development/Libraries
+ Source: ncurses-%{version}-%{release}.tgz
+Index: package/ncurses.spec
+--- ncurses-6.0-20151010+/package/ncurses.spec 2015-10-10 17:06:12.000000000 +0000
++++ ncurses-6.0-20151017/package/ncurses.spec 2015-10-17 20:29:47.000000000 +0000
+@@ -1,7 +1,7 @@
+ Summary: shared libraries for terminal handling
+ Name: ncurses6
+ Version: 6.0
+-Release: 20151010
++Release: 20151017
+ License: X11
+ Group: Development/Libraries
+ Source: ncurses-%{version}-%{release}.tgz
+Index: test/aclocal.m4
+Prereq: 1.121
+--- ncurses-6.0-20151010+/test/aclocal.m4 2015-10-10 20:30:48.000000000 +0000
++++ ncurses-6.0-20151017/test/aclocal.m4 2015-10-17 23:06:10.000000000 +0000
+@@ -26,7 +26,7 @@
+ dnl authorization. *
+ dnl***************************************************************************
+ dnl
+-dnl $Id: aclocal.m4,v 1.121 2015/10/10 20:30:48 tom Exp $
++dnl $Id: aclocal.m4,v 1.122 2015/10/17 23:06:10 tom Exp $
+ dnl
+ dnl Author: Thomas E. Dickey
+ dnl
+@@ -3306,7 +3306,7 @@
+ test $cf_cv_need_xopen_extension = yes && CPPFLAGS="$CPPFLAGS -D_XOPEN_SOURCE_EXTENDED"
+ ])dnl
+ dnl ---------------------------------------------------------------------------
+-dnl CF_XOPEN_SOURCE version: 49 updated: 2015/04/12 15:39:00
++dnl CF_XOPEN_SOURCE version: 50 updated: 2015/10/17 19:03:33
+ dnl ---------------
+ dnl Try to get _XOPEN_SOURCE defined properly that we can use POSIX functions,
+ dnl or adapt to the vendor's definitions to get equivalent functionality,
+@@ -3376,6 +3376,9 @@
+ (openbsd*)
+ # setting _XOPEN_SOURCE breaks xterm on OpenBSD 2.8, is not needed for ncursesw
+ ;;
++(os2*)
++ cf_XOPEN_SOURCE=
++ ;;
+ (osf[[45]]*)
+ cf_xopen_source="-D_OSF_SOURCE"
+ ;;
+Index: test/configure
+--- ncurses-6.0-20151010+/test/configure 2015-10-10 20:30:58.000000000 +0000
++++ ncurses-6.0-20151017/test/configure 2015-10-17 23:06:33.000000000 +0000
+@@ -3173,6 +3173,9 @@
+ (openbsd*)
+ # setting _XOPEN_SOURCE breaks xterm on OpenBSD 2.8, is not needed for ncursesw
+ ;;
++(os2*)
++ cf_XOPEN_SOURCE=
++ ;;
+ (osf[45]*)
+ cf_xopen_source="-D_OSF_SOURCE"
+ ;;
+@@ -3192,14 +3195,14 @@
+ ;;
+ (*)
+
+-echo "$as_me:3195: checking if we should define _XOPEN_SOURCE" >&5
++echo "$as_me:3198: 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 3202 "configure"
++#line 3205 "configure"
+ #include "confdefs.h"
+
+ #include <stdlib.h>
+@@ -3218,16 +3221,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:3221: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:3224: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:3224: \$? = $ac_status" >&5
++ echo "$as_me:3227: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:3227: \"$ac_try\"") >&5
++ { (eval echo "$as_me:3230: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:3230: \$? = $ac_status" >&5
++ echo "$as_me:3233: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ cf_cv_xopen_source=no
+ else
+@@ -3236,7 +3239,7 @@
+ cf_save="$CPPFLAGS"
+ CPPFLAGS="$CPPFLAGS -D_XOPEN_SOURCE=$cf_XOPEN_SOURCE"
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 3239 "configure"
++#line 3242 "configure"
+ #include "confdefs.h"
+
+ #include <stdlib.h>
+@@ -3255,16 +3258,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:3258: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:3261: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:3261: \$? = $ac_status" >&5
++ echo "$as_me:3264: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:3264: \"$ac_try\"") >&5
++ { (eval echo "$as_me:3267: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:3267: \$? = $ac_status" >&5
++ echo "$as_me:3270: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ cf_cv_xopen_source=no
+ else
+@@ -3279,7 +3282,7 @@
+ rm -f conftest.$ac_objext conftest.$ac_ext
+
+ fi
+-echo "$as_me:3282: result: $cf_cv_xopen_source" >&5
++echo "$as_me:3285: result: $cf_cv_xopen_source" >&5
+ echo "${ECHO_T}$cf_cv_xopen_source" >&6
+
+ if test "$cf_cv_xopen_source" != no ; then
+@@ -3387,16 +3390,16 @@
+ sed -e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ ]*\)\?[ ]/ /g' \
+ -e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ ]*\)\?$//g'`
+
+-echo "$as_me:3390: checking if we should define _POSIX_C_SOURCE" >&5
++echo "$as_me:3393: 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}:3396: testing if the symbol is already defined go no further ..." 1>&5
++echo "${as_me:-configure}:3399: testing if the symbol is already defined go no further ..." 1>&5
+
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 3399 "configure"
++#line 3402 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ int
+@@ -3411,16 +3414,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:3414: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:3417: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:3417: \$? = $ac_status" >&5
++ echo "$as_me:3420: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:3420: \"$ac_try\"") >&5
++ { (eval echo "$as_me:3423: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:3423: \$? = $ac_status" >&5
++ echo "$as_me:3426: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ cf_cv_posix_c_source=no
+ else
+@@ -3441,7 +3444,7 @@
+ esac
+ if test "$cf_want_posix_source" = yes ; then
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 3444 "configure"
++#line 3447 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ int
+@@ -3456,16 +3459,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:3459: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:3462: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:3462: \$? = $ac_status" >&5
++ echo "$as_me:3465: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:3465: \"$ac_try\"") >&5
++ { (eval echo "$as_me:3468: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:3468: \$? = $ac_status" >&5
++ echo "$as_me:3471: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ :
+ else
+@@ -3476,15 +3479,15 @@
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ fi
+
+-echo "${as_me:-configure}:3479: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
++echo "${as_me:-configure}:3482: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
+
+ CFLAGS="$cf_trim_CFLAGS"
+ CPPFLAGS="$cf_trim_CPPFLAGS $cf_cv_posix_c_source"
+
+-echo "${as_me:-configure}:3484: testing if the second compile does not leave our definition intact error ..." 1>&5
++echo "${as_me:-configure}:3487: testing if the second compile does not leave our definition intact error ..." 1>&5
+
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 3487 "configure"
++#line 3490 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ int
+@@ -3499,16 +3502,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:3502: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:3505: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:3505: \$? = $ac_status" >&5
++ echo "$as_me:3508: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:3508: \"$ac_try\"") >&5
++ { (eval echo "$as_me:3511: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:3511: \$? = $ac_status" >&5
++ echo "$as_me:3514: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ :
+ else
+@@ -3524,7 +3527,7 @@
+ rm -f conftest.$ac_objext conftest.$ac_ext
+
+ fi
+-echo "$as_me:3527: result: $cf_cv_posix_c_source" >&5
++echo "$as_me:3530: 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
+@@ -3682,7 +3685,7 @@
+ if test -n "$cf_new_cflags" ; then
+ test -n "$verbose" && echo " add to \$CFLAGS $cf_new_cflags" 1>&6
+
+-echo "${as_me:-configure}:3685: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
++echo "${as_me:-configure}:3688: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
+
+ CFLAGS="$CFLAGS $cf_new_cflags"
+ fi
+@@ -3690,7 +3693,7 @@
+ if test -n "$cf_new_cppflags" ; then
+ test -n "$verbose" && echo " add to \$CPPFLAGS $cf_new_cppflags" 1>&6
+
+-echo "${as_me:-configure}:3693: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
++echo "${as_me:-configure}:3696: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
+
+ CPPFLAGS="$CPPFLAGS $cf_new_cppflags"
+ fi
+@@ -3698,7 +3701,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}:3701: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5
++echo "${as_me:-configure}:3704: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5
+
+ EXTRA_CPPFLAGS="$cf_new_extra_cppflags $EXTRA_CPPFLAGS"
+ fi
+@@ -3706,10 +3709,10 @@
+ fi
+
+ if test -n "$cf_XOPEN_SOURCE" && test -z "$cf_cv_xopen_source" ; then
+- echo "$as_me:3709: checking if _XOPEN_SOURCE really is set" >&5
++ echo "$as_me:3712: 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 3712 "configure"
++#line 3715 "configure"
+ #include "confdefs.h"
+ #include <stdlib.h>
+ int
+@@ -3724,16 +3727,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:3727: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:3730: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:3730: \$? = $ac_status" >&5
++ echo "$as_me:3733: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:3733: \"$ac_try\"") >&5
++ { (eval echo "$as_me:3736: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:3736: \$? = $ac_status" >&5
++ echo "$as_me:3739: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ cf_XOPEN_SOURCE_set=yes
+ else
+@@ -3742,12 +3745,12 @@
+ cf_XOPEN_SOURCE_set=no
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+- echo "$as_me:3745: result: $cf_XOPEN_SOURCE_set" >&5
++ echo "$as_me:3748: 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 3750 "configure"
++#line 3753 "configure"
+ #include "confdefs.h"
+ #include <stdlib.h>
+ int
+@@ -3762,16 +3765,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:3765: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:3768: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:3768: \$? = $ac_status" >&5
++ echo "$as_me:3771: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:3771: \"$ac_try\"") >&5
++ { (eval echo "$as_me:3774: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:3774: \$? = $ac_status" >&5
++ echo "$as_me:3777: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ cf_XOPEN_SOURCE_set_ok=yes
+ else
+@@ -3782,19 +3785,19 @@
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ if test $cf_XOPEN_SOURCE_set_ok = no
+ then
+- { echo "$as_me:3785: WARNING: _XOPEN_SOURCE is lower than requested" >&5
++ { echo "$as_me:3788: WARNING: _XOPEN_SOURCE is lower than requested" >&5
+ echo "$as_me: WARNING: _XOPEN_SOURCE is lower than requested" >&2;}
+ fi
+ else
+
+-echo "$as_me:3790: checking if we should define _XOPEN_SOURCE" >&5
++echo "$as_me:3793: 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 3797 "configure"
++#line 3800 "configure"
+ #include "confdefs.h"
+
+ #include <stdlib.h>
+@@ -3813,16 +3816,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:3816: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:3819: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:3819: \$? = $ac_status" >&5
++ echo "$as_me:3822: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:3822: \"$ac_try\"") >&5
++ { (eval echo "$as_me:3825: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:3825: \$? = $ac_status" >&5
++ echo "$as_me:3828: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ cf_cv_xopen_source=no
+ else
+@@ -3831,7 +3834,7 @@
+ cf_save="$CPPFLAGS"
+ CPPFLAGS="$CPPFLAGS -D_XOPEN_SOURCE=$cf_XOPEN_SOURCE"
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 3834 "configure"
++#line 3837 "configure"
+ #include "confdefs.h"
+
+ #include <stdlib.h>
+@@ -3850,16 +3853,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:3853: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:3856: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:3856: \$? = $ac_status" >&5
++ echo "$as_me:3859: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:3859: \"$ac_try\"") >&5
++ { (eval echo "$as_me:3862: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:3862: \$? = $ac_status" >&5
++ echo "$as_me:3865: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ cf_cv_xopen_source=no
+ else
+@@ -3874,7 +3877,7 @@
+ rm -f conftest.$ac_objext conftest.$ac_ext
+
+ fi
+-echo "$as_me:3877: result: $cf_cv_xopen_source" >&5
++echo "$as_me:3880: result: $cf_cv_xopen_source" >&5
+ echo "${ECHO_T}$cf_cv_xopen_source" >&6
+
+ if test "$cf_cv_xopen_source" != no ; then
+@@ -3972,7 +3975,7 @@
+ fi
+ fi
+
+-echo "$as_me:3975: checking for signal global datatype" >&5
++echo "$as_me:3978: 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
+@@ -3984,7 +3987,7 @@
+ "int"
+ do
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 3987 "configure"
++#line 3990 "configure"
+ #include "confdefs.h"
+
+ #include <sys/types.h>
+@@ -4007,16 +4010,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:4010: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:4013: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:4013: \$? = $ac_status" >&5
++ echo "$as_me:4016: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:4016: \"$ac_try\"") >&5
++ { (eval echo "$as_me:4019: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:4019: \$? = $ac_status" >&5
++ echo "$as_me:4022: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ cf_cv_sig_atomic_t=$cf_type
+ else
+@@ -4030,14 +4033,14 @@
+
+ fi
+
+-echo "$as_me:4033: result: $cf_cv_sig_atomic_t" >&5
++echo "$as_me:4036: 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
+ #define SIG_ATOMIC_T $cf_cv_sig_atomic_t
+ EOF
+
+-echo "$as_me:4040: checking if you want to use pkg-config" >&5
++echo "$as_me:4043: checking if you want to use pkg-config" >&5
+ echo $ECHO_N "checking if you want to use pkg-config... $ECHO_C" >&6
+
+ # Check whether --with-pkg-config or --without-pkg-config was given.
+@@ -4047,7 +4050,7 @@
+ else
+ cf_pkg_config=yes
+ fi;
+-echo "$as_me:4050: result: $cf_pkg_config" >&5
++echo "$as_me:4053: result: $cf_pkg_config" >&5
+ echo "${ECHO_T}$cf_pkg_config" >&6
+
+ case $cf_pkg_config in
+@@ -4059,7 +4062,7 @@
+ if test -n "$ac_tool_prefix"; then
+ # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args.
+ set dummy ${ac_tool_prefix}pkg-config; ac_word=$2
+-echo "$as_me:4062: checking for $ac_word" >&5
++echo "$as_me:4065: checking for $ac_word" >&5
+ echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+ if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -4076,7 +4079,7 @@
+ test -z "$ac_dir" && ac_dir=.
+ if $as_executable_p "$ac_dir/$ac_word"; then
+ ac_cv_path_PKG_CONFIG="$ac_dir/$ac_word"
+- echo "$as_me:4079: found $ac_dir/$ac_word" >&5
++ echo "$as_me:4082: found $ac_dir/$ac_word" >&5
+ break
+ fi
+ done
+@@ -4087,10 +4090,10 @@
+ PKG_CONFIG=$ac_cv_path_PKG_CONFIG
+
+ if test -n "$PKG_CONFIG"; then
+- echo "$as_me:4090: result: $PKG_CONFIG" >&5
++ echo "$as_me:4093: result: $PKG_CONFIG" >&5
+ echo "${ECHO_T}$PKG_CONFIG" >&6
+ else
+- echo "$as_me:4093: result: no" >&5
++ echo "$as_me:4096: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+
+@@ -4099,7 +4102,7 @@
+ ac_pt_PKG_CONFIG=$PKG_CONFIG
+ # Extract the first word of "pkg-config", so it can be a program name with args.
+ set dummy pkg-config; ac_word=$2
+-echo "$as_me:4102: checking for $ac_word" >&5
++echo "$as_me:4105: checking for $ac_word" >&5
+ echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+ if test "${ac_cv_path_ac_pt_PKG_CONFIG+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -4116,7 +4119,7 @@
+ test -z "$ac_dir" && ac_dir=.
+ if $as_executable_p "$ac_dir/$ac_word"; then
+ ac_cv_path_ac_pt_PKG_CONFIG="$ac_dir/$ac_word"
+- echo "$as_me:4119: found $ac_dir/$ac_word" >&5
++ echo "$as_me:4122: found $ac_dir/$ac_word" >&5
+ break
+ fi
+ done
+@@ -4128,10 +4131,10 @@
+ ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG
+
+ if test -n "$ac_pt_PKG_CONFIG"; then
+- echo "$as_me:4131: result: $ac_pt_PKG_CONFIG" >&5
++ echo "$as_me:4134: result: $ac_pt_PKG_CONFIG" >&5
+ echo "${ECHO_T}$ac_pt_PKG_CONFIG" >&6
+ else
+- echo "$as_me:4134: result: no" >&5
++ echo "$as_me:4137: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+
+@@ -4174,18 +4177,18 @@
+ PKG_CONFIG=`echo $PKG_CONFIG | sed -e s%NONE%$cf_path_syntax%`
+ ;;
+ (*)
+- { { echo "$as_me:4177: error: expected a pathname, not \"$PKG_CONFIG\"" >&5
++ { { echo "$as_me:4180: error: expected a pathname, not \"$PKG_CONFIG\"" >&5
+ echo "$as_me: error: expected a pathname, not \"$PKG_CONFIG\"" >&2;}
+ { (exit 1); exit 1; }; }
+ ;;
+ esac
+
+ elif test "x$cf_pkg_config" != xno ; then
+- { echo "$as_me:4184: WARNING: pkg-config is not installed" >&5
++ { echo "$as_me:4187: WARNING: pkg-config is not installed" >&5
+ echo "$as_me: WARNING: pkg-config is not installed" >&2;}
+ fi
+
+-echo "$as_me:4188: checking if you want to see long compiling messages" >&5
++echo "$as_me:4191: 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.
+@@ -4219,10 +4222,10 @@
+ ECHO_CC=''
+
+ fi;
+-echo "$as_me:4222: result: $enableval" >&5
++echo "$as_me:4225: result: $enableval" >&5
+ echo "${ECHO_T}$enableval" >&6
+
+-echo "$as_me:4225: checking for ncurses wrap-prefix" >&5
++echo "$as_me:4228: checking for ncurses wrap-prefix" >&5
+ echo $ECHO_N "checking for ncurses wrap-prefix... $ECHO_C" >&6
+
+ # Check whether --with-ncurses-wrap-prefix or --without-ncurses-wrap-prefix was given.
+@@ -4232,10 +4235,10 @@
+ else
+ NCURSES_WRAP_PREFIX=_nc_
+ fi;
+-echo "$as_me:4235: result: $NCURSES_WRAP_PREFIX" >&5
++echo "$as_me:4238: result: $NCURSES_WRAP_PREFIX" >&5
+ echo "${ECHO_T}$NCURSES_WRAP_PREFIX" >&6
+
+-echo "$as_me:4238: checking if you want to check for wide-character functions" >&5
++echo "$as_me:4241: checking if you want to check for wide-character functions" >&5
+ echo $ECHO_N "checking if you want to check for wide-character functions... $ECHO_C" >&6
+
+ # Check whether --enable-widec or --disable-widec was given.
+@@ -4252,10 +4255,10 @@
+ cf_enable_widec=yes
+
+ fi;
+-echo "$as_me:4255: result: $cf_enable_widec" >&5
++echo "$as_me:4258: result: $cf_enable_widec" >&5
+ echo "${ECHO_T}$cf_enable_widec" >&6
+
+-echo "$as_me:4258: checking for specific curses-directory" >&5
++echo "$as_me:4261: 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.
+@@ -4265,7 +4268,7 @@
+ else
+ cf_cv_curses_dir=no
+ fi;
+-echo "$as_me:4268: result: $cf_cv_curses_dir" >&5
++echo "$as_me:4271: 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" )
+@@ -4296,7 +4299,7 @@
+ withval=`echo $withval | sed -e s%NONE%$cf_path_syntax%`
+ ;;
+ (*)
+- { { echo "$as_me:4299: error: expected a pathname, not \"$withval\"" >&5
++ { { echo "$as_me:4302: error: expected a pathname, not \"$withval\"" >&5
+ echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
+ { (exit 1); exit 1; }; }
+ ;;
+@@ -4329,7 +4332,7 @@
+ cf_save_CPPFLAGS=$CPPFLAGS
+ CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 4332 "configure"
++#line 4335 "configure"
+ #include "confdefs.h"
+ #include <stdio.h>
+ int
+@@ -4341,16 +4344,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:4344: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:4347: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:4347: \$? = $ac_status" >&5
++ echo "$as_me:4350: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:4350: \"$ac_try\"") >&5
++ { (eval echo "$as_me:4353: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:4353: \$? = $ac_status" >&5
++ echo "$as_me:4356: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ :
+ else
+@@ -4367,7 +4370,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}:4370: testing adding $cf_add_incdir to include-path ..." 1>&5
++echo "${as_me:-configure}:4373: testing adding $cf_add_incdir to include-path ..." 1>&5
+
+ CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
+
+@@ -4403,7 +4406,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}:4406: testing adding $cf_add_libdir to library-path ..." 1>&5
++echo "${as_me:-configure}:4409: testing adding $cf_add_libdir to library-path ..." 1>&5
+
+ LDFLAGS="-L$cf_add_libdir $LDFLAGS"
+ fi
+@@ -4416,7 +4419,7 @@
+
+ cf_cv_screen=curses
+
+-echo "$as_me:4419: checking for specified curses library type" >&5
++echo "$as_me:4422: checking for specified curses library type" >&5
+ echo $ECHO_N "checking for specified curses library type... $ECHO_C" >&6
+
+ # Check whether --with-screen or --without-screen was given.
+@@ -4460,13 +4463,13 @@
+ fi;
+ fi;
+
+-echo "$as_me:4463: result: $cf_cv_screen" >&5
++echo "$as_me:4466: result: $cf_cv_screen" >&5
+ echo "${ECHO_T}$cf_cv_screen" >&6
+
+ case $cf_cv_screen in
+ (curses|curses_*)
+
+-echo "$as_me:4469: checking for extra include directories" >&5
++echo "$as_me:4472: checking for extra include directories" >&5
+ echo $ECHO_N "checking for extra include directories... $ECHO_C" >&6
+ if test "${cf_cv_curses_incdir+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -4492,11 +4495,11 @@
+ esac
+
+ fi
+-echo "$as_me:4495: result: $cf_cv_curses_incdir" >&5
++echo "$as_me:4498: result: $cf_cv_curses_incdir" >&5
+ echo "${ECHO_T}$cf_cv_curses_incdir" >&6
+ test "$cf_cv_curses_incdir" != no && CPPFLAGS="$CPPFLAGS $cf_cv_curses_incdir"
+
+-echo "$as_me:4499: checking if we have identified curses headers" >&5
++echo "$as_me:4502: 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
+@@ -4508,7 +4511,7 @@
+ curses.h ncurses/ncurses.h ncurses/curses.h
+ do
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 4511 "configure"
++#line 4514 "configure"
+ #include "confdefs.h"
+ #include <${cf_header}>
+ int
+@@ -4520,16 +4523,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:4523: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:4526: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:4526: \$? = $ac_status" >&5
++ echo "$as_me:4529: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:4529: \"$ac_try\"") >&5
++ { (eval echo "$as_me:4532: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:4532: \$? = $ac_status" >&5
++ echo "$as_me:4535: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ cf_cv_ncurses_header=$cf_header; break
+ else
+@@ -4540,11 +4543,11 @@
+ done
+
+ fi
+-echo "$as_me:4543: result: $cf_cv_ncurses_header" >&5
++echo "$as_me:4546: 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:4547: error: No curses header-files found" >&5
++ { { echo "$as_me:4550: error: No curses header-files found" >&5
+ echo "$as_me: error: No curses header-files found" >&2;}
+ { (exit 1); exit 1; }; }
+ fi
+@@ -4554,23 +4557,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:4557: checking for $ac_header" >&5
++echo "$as_me:4560: 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 4563 "configure"
++#line 4566 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:4567: \"$ac_cpp conftest.$ac_ext\"") >&5
++if { (eval echo "$as_me:4570: \"$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:4573: \$? = $ac_status" >&5
++ echo "$as_me:4576: \$? = $ac_status" >&5
+ (exit $ac_status); } >/dev/null; then
+ if test -s conftest.err; then
+ ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -4589,7 +4592,7 @@
+ fi
+ rm -f conftest.err conftest.$ac_ext
+ fi
+-echo "$as_me:4592: result: `eval echo '${'$as_ac_Header'}'`" >&5
++echo "$as_me:4595: 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
+@@ -4599,7 +4602,7 @@
+ fi
+ done
+
+-echo "$as_me:4602: checking for terminfo header" >&5
++echo "$as_me:4605: 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
+@@ -4617,7 +4620,7 @@
+ for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h"
+ do
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 4620 "configure"
++#line 4623 "configure"
+ #include "confdefs.h"
+ #include <stdio.h>
+ #include <${cf_cv_ncurses_header:-curses.h}>
+@@ -4632,16 +4635,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:4635: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:4638: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:4638: \$? = $ac_status" >&5
++ echo "$as_me:4641: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:4641: \"$ac_try\"") >&5
++ { (eval echo "$as_me:4644: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:4644: \$? = $ac_status" >&5
++ echo "$as_me:4647: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+
+ cf_cv_term_header="$cf_test"
+@@ -4657,7 +4660,7 @@
+ done
+
+ fi
+-echo "$as_me:4660: result: $cf_cv_term_header" >&5
++echo "$as_me:4663: result: $cf_cv_term_header" >&5
+ echo "${ECHO_T}$cf_cv_term_header" >&6
+
+ # Set definitions to allow ifdef'ing to accommodate subdirectories
+@@ -4689,7 +4692,7 @@
+ ;;
+ esac
+
+-echo "$as_me:4692: checking for ncurses version" >&5
++echo "$as_me:4695: 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
+@@ -4715,10 +4718,10 @@
+ #endif
+ EOF
+ cf_try="$ac_cpp conftest.$ac_ext 2>&5 | grep '^Autoconf ' >conftest.out"
+- { (eval echo "$as_me:4718: \"$cf_try\"") >&5
++ { (eval echo "$as_me:4721: \"$cf_try\"") >&5
+ (eval $cf_try) 2>&5
+ ac_status=$?
+- echo "$as_me:4721: \$? = $ac_status" >&5
++ echo "$as_me:4724: \$? = $ac_status" >&5
+ (exit $ac_status); }
+ if test -f conftest.out ; then
+ cf_out=`cat conftest.out | sed -e 's%^Autoconf %%' -e 's%^[^"]*"%%' -e 's%".*%%'`
+@@ -4728,7 +4731,7 @@
+
+ else
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 4731 "configure"
++#line 4734 "configure"
+ #include "confdefs.h"
+
+ #include <${cf_cv_ncurses_header:-curses.h}>
+@@ -4753,15 +4756,15 @@
+ }
+ _ACEOF
+ rm -f conftest$ac_exeext
+-if { (eval echo "$as_me:4756: \"$ac_link\"") >&5
++if { (eval echo "$as_me:4759: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:4759: \$? = $ac_status" >&5
++ echo "$as_me:4762: \$? = $ac_status" >&5
+ (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+- { (eval echo "$as_me:4761: \"$ac_try\"") >&5
++ { (eval echo "$as_me:4764: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:4764: \$? = $ac_status" >&5
++ echo "$as_me:4767: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+
+ cf_cv_ncurses_version=`cat $cf_tempfile`
+@@ -4775,17 +4778,17 @@
+ rm -f $cf_tempfile
+
+ fi
+-echo "$as_me:4778: result: $cf_cv_ncurses_version" >&5
++echo "$as_me:4781: result: $cf_cv_ncurses_version" >&5
+ echo "${ECHO_T}$cf_cv_ncurses_version" >&6
+ test "$cf_cv_ncurses_version" = no ||
+ cat >>confdefs.h <<\EOF
+ #define NCURSES 1
+ EOF
+
+-echo "$as_me:4785: checking if we have identified curses libraries" >&5
++echo "$as_me:4788: checking if we have identified curses libraries" >&5
+ echo $ECHO_N "checking if we have identified curses libraries... $ECHO_C" >&6
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 4788 "configure"
++#line 4791 "configure"
+ #include "confdefs.h"
+ #include <${cf_cv_ncurses_header:-curses.h}>
+ int
+@@ -4797,16 +4800,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:4800: \"$ac_link\"") >&5
++if { (eval echo "$as_me:4803: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:4803: \$? = $ac_status" >&5
++ echo "$as_me:4806: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -s conftest$ac_exeext'
+- { (eval echo "$as_me:4806: \"$ac_try\"") >&5
++ { (eval echo "$as_me:4809: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:4809: \$? = $ac_status" >&5
++ echo "$as_me:4812: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ cf_result=yes
+ else
+@@ -4815,13 +4818,13 @@
+ cf_result=no
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+-echo "$as_me:4818: result: $cf_result" >&5
++echo "$as_me:4821: result: $cf_result" >&5
+ echo "${ECHO_T}$cf_result" >&6
+
+ if test "$cf_result" = no ; then
+ case $host_os in
+ (freebsd*)
+- echo "$as_me:4824: checking for tgoto in -lmytinfo" >&5
++ echo "$as_me:4827: 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
+@@ -4829,7 +4832,7 @@
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lmytinfo $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 4832 "configure"
++#line 4835 "configure"
+ #include "confdefs.h"
+
+ /* Override any gcc2 internal prototype to avoid an error. */
+@@ -4848,16 +4851,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:4851: \"$ac_link\"") >&5
++if { (eval echo "$as_me:4854: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:4854: \$? = $ac_status" >&5
++ echo "$as_me:4857: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -s conftest$ac_exeext'
+- { (eval echo "$as_me:4857: \"$ac_try\"") >&5
++ { (eval echo "$as_me:4860: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:4860: \$? = $ac_status" >&5
++ echo "$as_me:4863: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ ac_cv_lib_mytinfo_tgoto=yes
+ else
+@@ -4868,7 +4871,7 @@
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:4871: result: $ac_cv_lib_mytinfo_tgoto" >&5
++echo "$as_me:4874: 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
+
+@@ -4898,7 +4901,7 @@
+ # term.h) for cur_colr
+ if test "x$cf_cv_screen" = "xcurses_colr"
+ then
+- echo "$as_me:4901: checking for initscr in -lcur_colr" >&5
++ echo "$as_me:4904: checking for initscr in -lcur_colr" >&5
+ echo $ECHO_N "checking for initscr in -lcur_colr... $ECHO_C" >&6
+ if test "${ac_cv_lib_cur_colr_initscr+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -4906,7 +4909,7 @@
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lcur_colr $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 4909 "configure"
++#line 4912 "configure"
+ #include "confdefs.h"
+
+ /* Override any gcc2 internal prototype to avoid an error. */
+@@ -4925,16 +4928,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:4928: \"$ac_link\"") >&5
++if { (eval echo "$as_me:4931: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:4931: \$? = $ac_status" >&5
++ echo "$as_me:4934: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -s conftest$ac_exeext'
+- { (eval echo "$as_me:4934: \"$ac_try\"") >&5
++ { (eval echo "$as_me:4937: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:4937: \$? = $ac_status" >&5
++ echo "$as_me:4940: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ ac_cv_lib_cur_colr_initscr=yes
+ else
+@@ -4945,7 +4948,7 @@
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:4948: result: $ac_cv_lib_cur_colr_initscr" >&5
++echo "$as_me:4951: result: $ac_cv_lib_cur_colr_initscr" >&5
+ echo "${ECHO_T}$ac_cv_lib_cur_colr_initscr" >&6
+ if test $ac_cv_lib_cur_colr_initscr = yes; then
+
+@@ -4969,7 +4972,7 @@
+
+ else
+
+- echo "$as_me:4972: checking for initscr in -lHcurses" >&5
++ echo "$as_me:4975: checking for initscr in -lHcurses" >&5
+ echo $ECHO_N "checking for initscr in -lHcurses... $ECHO_C" >&6
+ if test "${ac_cv_lib_Hcurses_initscr+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -4977,7 +4980,7 @@
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lHcurses $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 4980 "configure"
++#line 4983 "configure"
+ #include "confdefs.h"
+
+ /* Override any gcc2 internal prototype to avoid an error. */
+@@ -4996,16 +4999,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:4999: \"$ac_link\"") >&5
++if { (eval echo "$as_me:5002: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:5002: \$? = $ac_status" >&5
++ echo "$as_me:5005: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -s conftest$ac_exeext'
+- { (eval echo "$as_me:5005: \"$ac_try\"") >&5
++ { (eval echo "$as_me:5008: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:5008: \$? = $ac_status" >&5
++ echo "$as_me:5011: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ ac_cv_lib_Hcurses_initscr=yes
+ else
+@@ -5016,7 +5019,7 @@
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:5019: result: $ac_cv_lib_Hcurses_initscr" >&5
++echo "$as_me:5022: result: $ac_cv_lib_Hcurses_initscr" >&5
+ echo "${ECHO_T}$ac_cv_lib_Hcurses_initscr" >&6
+ if test $ac_cv_lib_Hcurses_initscr = yes; then
+
+@@ -5072,7 +5075,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}:5075: testing adding $cf_add_libdir to library-path ..." 1>&5
++echo "${as_me:-configure}:5078: testing adding $cf_add_libdir to library-path ..." 1>&5
+
+ LDFLAGS="-L$cf_add_libdir $LDFLAGS"
+ fi
+@@ -5101,7 +5104,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}:5104: testing adding $cf_add_libdir to library-path ..." 1>&5
++echo "${as_me:-configure}:5107: testing adding $cf_add_libdir to library-path ..." 1>&5
+
+ LDFLAGS="-L$cf_add_libdir $LDFLAGS"
+ fi
+@@ -5132,7 +5135,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}:5135: testing adding $cf_add_libdir to library-path ..." 1>&5
++echo "${as_me:-configure}:5138: testing adding $cf_add_libdir to library-path ..." 1>&5
+
+ LDFLAGS="-L$cf_add_libdir $LDFLAGS"
+ fi
+@@ -5167,7 +5170,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}:5170: testing adding $cf_add_libdir to library-path ..." 1>&5
++echo "${as_me:-configure}:5173: testing adding $cf_add_libdir to library-path ..." 1>&5
+
+ LDFLAGS="-L$cf_add_libdir $LDFLAGS"
+ fi
+@@ -5211,13 +5214,13 @@
+ # because it may be needed to link the test-case for initscr.
+ if test "x$cf_term_lib" = x
+ then
+- echo "$as_me:5214: checking for tgoto" >&5
++ echo "$as_me:5217: checking for tgoto" >&5
+ echo $ECHO_N "checking for tgoto... $ECHO_C" >&6
+ if test "${ac_cv_func_tgoto+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 5220 "configure"
++#line 5223 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+ which can conflict with char tgoto (); below. */
+@@ -5248,16 +5251,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:5251: \"$ac_link\"") >&5
++if { (eval echo "$as_me:5254: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:5254: \$? = $ac_status" >&5
++ echo "$as_me:5257: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -s conftest$ac_exeext'
+- { (eval echo "$as_me:5257: \"$ac_try\"") >&5
++ { (eval echo "$as_me:5260: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:5260: \$? = $ac_status" >&5
++ echo "$as_me:5263: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ ac_cv_func_tgoto=yes
+ else
+@@ -5267,7 +5270,7 @@
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "$as_me:5270: result: $ac_cv_func_tgoto" >&5
++echo "$as_me:5273: result: $ac_cv_func_tgoto" >&5
+ echo "${ECHO_T}$ac_cv_func_tgoto" >&6
+ if test $ac_cv_func_tgoto = yes; then
+ cf_term_lib=predefined
+@@ -5276,7 +5279,7 @@
+ for cf_term_lib in $cf_check_list otermcap termcap tinfo termlib unknown
+ do
+ as_ac_Lib=`echo "ac_cv_lib_$cf_term_lib''_tgoto" | $as_tr_sh`
+-echo "$as_me:5279: checking for tgoto in -l$cf_term_lib" >&5
++echo "$as_me:5282: checking for tgoto in -l$cf_term_lib" >&5
+ echo $ECHO_N "checking for tgoto in -l$cf_term_lib... $ECHO_C" >&6
+ if eval "test \"\${$as_ac_Lib+set}\" = set"; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -5284,7 +5287,7 @@
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-l$cf_term_lib $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 5287 "configure"
++#line 5290 "configure"
+ #include "confdefs.h"
+
+ /* Override any gcc2 internal prototype to avoid an error. */
+@@ -5303,16 +5306,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:5306: \"$ac_link\"") >&5
++if { (eval echo "$as_me:5309: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:5309: \$? = $ac_status" >&5
++ echo "$as_me:5312: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -s conftest$ac_exeext'
+- { (eval echo "$as_me:5312: \"$ac_try\"") >&5
++ { (eval echo "$as_me:5315: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:5315: \$? = $ac_status" >&5
++ echo "$as_me:5318: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ eval "$as_ac_Lib=yes"
+ else
+@@ -5323,7 +5326,7 @@
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:5326: result: `eval echo '${'$as_ac_Lib'}'`" >&5
++echo "$as_me:5329: 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
+ break
+@@ -5342,7 +5345,7 @@
+ for cf_curs_lib in $cf_check_list xcurses jcurses pdcurses unknown
+ do
+ as_ac_Lib=`echo "ac_cv_lib_$cf_curs_lib''_initscr" | $as_tr_sh`
+-echo "$as_me:5345: checking for initscr in -l$cf_curs_lib" >&5
++echo "$as_me:5348: checking for initscr in -l$cf_curs_lib" >&5
+ echo $ECHO_N "checking for initscr in -l$cf_curs_lib... $ECHO_C" >&6
+ if eval "test \"\${$as_ac_Lib+set}\" = set"; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -5350,7 +5353,7 @@
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-l$cf_curs_lib $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 5353 "configure"
++#line 5356 "configure"
+ #include "confdefs.h"
+
+ /* Override any gcc2 internal prototype to avoid an error. */
+@@ -5369,16 +5372,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:5372: \"$ac_link\"") >&5
++if { (eval echo "$as_me:5375: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:5375: \$? = $ac_status" >&5
++ echo "$as_me:5378: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -s conftest$ac_exeext'
+- { (eval echo "$as_me:5378: \"$ac_try\"") >&5
++ { (eval echo "$as_me:5381: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:5381: \$? = $ac_status" >&5
++ echo "$as_me:5384: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ eval "$as_ac_Lib=yes"
+ else
+@@ -5389,7 +5392,7 @@
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:5392: result: `eval echo '${'$as_ac_Lib'}'`" >&5
++echo "$as_me:5395: 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
+ break
+@@ -5397,16 +5400,16 @@
+
+ done
+ fi
+- test $cf_curs_lib = unknown && { { echo "$as_me:5400: error: no curses library found" >&5
++ test $cf_curs_lib = unknown && { { echo "$as_me:5403: error: no curses library found" >&5
+ echo "$as_me: error: no curses library found" >&2;}
+ { (exit 1); exit 1; }; }
+
+ LIBS="-l$cf_curs_lib $cf_save_LIBS"
+ if test "$cf_term_lib" = unknown ; then
+- echo "$as_me:5406: checking if we can link with $cf_curs_lib library" >&5
++ echo "$as_me:5409: checking if we can link with $cf_curs_lib library" >&5
+ echo $ECHO_N "checking if we can link with $cf_curs_lib library... $ECHO_C" >&6
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 5409 "configure"
++#line 5412 "configure"
+ #include "confdefs.h"
+ #include <${cf_cv_ncurses_header:-curses.h}>
+ int
+@@ -5418,16 +5421,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:5421: \"$ac_link\"") >&5
++if { (eval echo "$as_me:5424: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:5424: \$? = $ac_status" >&5
++ echo "$as_me:5427: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -s conftest$ac_exeext'
+- { (eval echo "$as_me:5427: \"$ac_try\"") >&5
++ { (eval echo "$as_me:5430: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:5430: \$? = $ac_status" >&5
++ echo "$as_me:5433: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ cf_result=yes
+ else
+@@ -5436,18 +5439,18 @@
+ cf_result=no
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+- echo "$as_me:5439: result: $cf_result" >&5
++ echo "$as_me:5442: result: $cf_result" >&5
+ echo "${ECHO_T}$cf_result" >&6
+- test $cf_result = no && { { echo "$as_me:5441: error: Cannot link curses library" >&5
++ test $cf_result = no && { { echo "$as_me:5444: error: Cannot link curses library" >&5
+ echo "$as_me: error: Cannot link curses library" >&2;}
+ { (exit 1); exit 1; }; }
+ elif test "$cf_curs_lib" = "$cf_term_lib" ; then
+ :
+ elif test "$cf_term_lib" != predefined ; then
+- echo "$as_me:5447: checking if we need both $cf_curs_lib and $cf_term_lib libraries" >&5
++ echo "$as_me:5450: checking if we need both $cf_curs_lib and $cf_term_lib libraries" >&5
+ echo $ECHO_N "checking if we need both $cf_curs_lib and $cf_term_lib libraries... $ECHO_C" >&6
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 5450 "configure"
++#line 5453 "configure"
+ #include "confdefs.h"
+ #include <${cf_cv_ncurses_header:-curses.h}>
+ int
+@@ -5459,16 +5462,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:5462: \"$ac_link\"") >&5
++if { (eval echo "$as_me:5465: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:5465: \$? = $ac_status" >&5
++ echo "$as_me:5468: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -s conftest$ac_exeext'
+- { (eval echo "$as_me:5468: \"$ac_try\"") >&5
++ { (eval echo "$as_me:5471: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:5471: \$? = $ac_status" >&5
++ echo "$as_me:5474: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ cf_result=no
+ else
+@@ -5477,7 +5480,7 @@
+
+ LIBS="-l$cf_curs_lib -l$cf_term_lib $cf_save_LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 5480 "configure"
++#line 5483 "configure"
+ #include "confdefs.h"
+ #include <${cf_cv_ncurses_header:-curses.h}>
+ int
+@@ -5489,16 +5492,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:5492: \"$ac_link\"") >&5
++if { (eval echo "$as_me:5495: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:5495: \$? = $ac_status" >&5
++ echo "$as_me:5498: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -s conftest$ac_exeext'
+- { (eval echo "$as_me:5498: \"$ac_try\"") >&5
++ { (eval echo "$as_me:5501: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:5501: \$? = $ac_status" >&5
++ echo "$as_me:5504: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ cf_result=yes
+ else
+@@ -5510,7 +5513,7 @@
+
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+- echo "$as_me:5513: result: $cf_result" >&5
++ echo "$as_me:5516: result: $cf_result" >&5
+ echo "${ECHO_T}$cf_result" >&6
+ fi
+ fi
+@@ -5519,7 +5522,7 @@
+ ;;
+ (ncursesw*)
+
+-echo "$as_me:5522: checking for multibyte character support" >&5
++echo "$as_me:5525: 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
+@@ -5527,7 +5530,7 @@
+
+ cf_save_LIBS="$LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 5530 "configure"
++#line 5533 "configure"
+ #include "confdefs.h"
+
+ #include <stdlib.h>
+@@ -5540,16 +5543,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:5543: \"$ac_link\"") >&5
++if { (eval echo "$as_me:5546: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:5546: \$? = $ac_status" >&5
++ echo "$as_me:5549: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -s conftest$ac_exeext'
+- { (eval echo "$as_me:5549: \"$ac_try\"") >&5
++ { (eval echo "$as_me:5552: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:5552: \$? = $ac_status" >&5
++ echo "$as_me:5555: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ cf_cv_utf8_lib=yes
+ else
+@@ -5561,12 +5564,12 @@
+ cf_cv_header_path_utf8=
+ cf_cv_library_path_utf8=
+
+-echo "${as_me:-configure}:5564: testing Starting FIND_LINKAGE(utf8,) ..." 1>&5
++echo "${as_me:-configure}:5567: testing Starting FIND_LINKAGE(utf8,) ..." 1>&5
+
+ cf_save_LIBS="$LIBS"
+
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 5569 "configure"
++#line 5572 "configure"
+ #include "confdefs.h"
+
+ #include <libutf8.h>
+@@ -5579,16 +5582,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:5582: \"$ac_link\"") >&5
++if { (eval echo "$as_me:5585: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:5585: \$? = $ac_status" >&5
++ echo "$as_me:5588: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -s conftest$ac_exeext'
+- { (eval echo "$as_me:5588: \"$ac_try\"") >&5
++ { (eval echo "$as_me:5591: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:5591: \$? = $ac_status" >&5
++ echo "$as_me:5594: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+
+ cf_cv_find_linkage_utf8=yes
+@@ -5602,7 +5605,7 @@
+ LIBS="-lutf8 $cf_save_LIBS"
+
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 5605 "configure"
++#line 5608 "configure"
+ #include "confdefs.h"
+
+ #include <libutf8.h>
+@@ -5615,16 +5618,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:5618: \"$ac_link\"") >&5
++if { (eval echo "$as_me:5621: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:5621: \$? = $ac_status" >&5
++ echo "$as_me:5624: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -s conftest$ac_exeext'
+- { (eval echo "$as_me:5624: \"$ac_try\"") >&5
++ { (eval echo "$as_me:5627: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:5627: \$? = $ac_status" >&5
++ echo "$as_me:5630: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+
+ cf_cv_find_linkage_utf8=yes
+@@ -5641,9 +5644,9 @@
+
+ test -n "$verbose" && echo " find linkage for utf8 library" 1>&6
+
+-echo "${as_me:-configure}:5644: testing find linkage for utf8 library ..." 1>&5
++echo "${as_me:-configure}:5647: testing find linkage for utf8 library ..." 1>&5
+
+-echo "${as_me:-configure}:5646: testing Searching for headers in FIND_LINKAGE(utf8,) ..." 1>&5
++echo "${as_me:-configure}:5649: testing Searching for headers in FIND_LINKAGE(utf8,) ..." 1>&5
+
+ cf_save_CPPFLAGS="$CPPFLAGS"
+ cf_test_CPPFLAGS="$CPPFLAGS"
+@@ -5734,11 +5737,11 @@
+ 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}:5737: testing ... testing $cf_cv_header_path_utf8 ..." 1>&5
++echo "${as_me:-configure}:5740: testing ... testing $cf_cv_header_path_utf8 ..." 1>&5
+
+ CPPFLAGS="$cf_save_CPPFLAGS -I$cf_cv_header_path_utf8"
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 5741 "configure"
++#line 5744 "configure"
+ #include "confdefs.h"
+
+ #include <libutf8.h>
+@@ -5751,21 +5754,21 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:5754: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:5757: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:5757: \$? = $ac_status" >&5
++ echo "$as_me:5760: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:5760: \"$ac_try\"") >&5
++ { (eval echo "$as_me:5763: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:5763: \$? = $ac_status" >&5
++ echo "$as_me:5766: \$? = $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}:5768: testing ... found utf8 headers in $cf_cv_header_path_utf8 ..." 1>&5
++echo "${as_me:-configure}:5771: testing ... found utf8 headers in $cf_cv_header_path_utf8 ..." 1>&5
+
+ cf_cv_find_linkage_utf8=maybe
+ cf_test_CPPFLAGS="$CPPFLAGS"
+@@ -5783,7 +5786,7 @@
+
+ if test "$cf_cv_find_linkage_utf8" = maybe ; then
+
+-echo "${as_me:-configure}:5786: testing Searching for utf8 library in FIND_LINKAGE(utf8,) ..." 1>&5
++echo "${as_me:-configure}:5789: testing Searching for utf8 library in FIND_LINKAGE(utf8,) ..." 1>&5
+
+ cf_save_LIBS="$LIBS"
+ cf_save_LDFLAGS="$LDFLAGS"
+@@ -5858,13 +5861,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}:5861: testing ... testing $cf_cv_library_path_utf8 ..." 1>&5
++echo "${as_me:-configure}:5864: 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 5867 "configure"
++#line 5870 "configure"
+ #include "confdefs.h"
+
+ #include <libutf8.h>
+@@ -5877,21 +5880,21 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:5880: \"$ac_link\"") >&5
++if { (eval echo "$as_me:5883: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:5883: \$? = $ac_status" >&5
++ echo "$as_me:5886: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -s conftest$ac_exeext'
+- { (eval echo "$as_me:5886: \"$ac_try\"") >&5
++ { (eval echo "$as_me:5889: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:5889: \$? = $ac_status" >&5
++ echo "$as_me:5892: \$? = $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}:5894: testing ... found utf8 library in $cf_cv_library_path_utf8 ..." 1>&5
++echo "${as_me:-configure}:5897: testing ... found utf8 library in $cf_cv_library_path_utf8 ..." 1>&5
+
+ cf_cv_find_linkage_utf8=yes
+ cf_cv_library_file_utf8="-lutf8"
+@@ -5933,7 +5936,7 @@
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "$as_me:5936: result: $cf_cv_utf8_lib" >&5
++echo "$as_me:5939: 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
+@@ -5968,7 +5971,7 @@
+ cf_save_CPPFLAGS=$CPPFLAGS
+ CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 5971 "configure"
++#line 5974 "configure"
+ #include "confdefs.h"
+ #include <stdio.h>
+ int
+@@ -5980,16 +5983,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:5983: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:5986: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:5986: \$? = $ac_status" >&5
++ echo "$as_me:5989: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:5989: \"$ac_try\"") >&5
++ { (eval echo "$as_me:5992: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:5992: \$? = $ac_status" >&5
++ echo "$as_me:5995: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ :
+ else
+@@ -6006,7 +6009,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}:6009: testing adding $cf_add_incdir to include-path ..." 1>&5
++echo "${as_me:-configure}:6012: testing adding $cf_add_incdir to include-path ..." 1>&5
+
+ CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
+
+@@ -6042,7 +6045,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}:6045: testing adding $cf_add_libdir to library-path ..." 1>&5
++echo "${as_me:-configure}:6048: testing adding $cf_add_libdir to library-path ..." 1>&5
+
+ LDFLAGS="-L$cf_add_libdir $LDFLAGS"
+ fi
+@@ -6072,13 +6075,13 @@
+ cf_have_ncuconfig=no
+
+ if test "x${PKG_CONFIG:=none}" != xnone; then
+- echo "$as_me:6075: checking pkg-config for $cf_ncuconfig_root" >&5
++ echo "$as_me:6078: 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:6078: result: yes" >&5
++ echo "$as_me:6081: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+
+- echo "$as_me:6081: checking if the $cf_ncuconfig_root package files work" >&5
++ echo "$as_me:6084: 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
+
+@@ -6104,7 +6107,7 @@
+ LIBS="$cf_add_libs"
+
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 6107 "configure"
++#line 6110 "configure"
+ #include "confdefs.h"
+ #include <${cf_cv_ncurses_header:-curses.h}>
+ int
+@@ -6116,37 +6119,37 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:6119: \"$ac_link\"") >&5
++if { (eval echo "$as_me:6122: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:6122: \$? = $ac_status" >&5
++ echo "$as_me:6125: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -s conftest$ac_exeext'
+- { (eval echo "$as_me:6125: \"$ac_try\"") >&5
++ { (eval echo "$as_me:6128: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:6128: \$? = $ac_status" >&5
++ echo "$as_me:6131: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ if test "$cross_compiling" = yes; then
+ cf_have_ncuconfig=maybe
+ else
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 6134 "configure"
++#line 6137 "configure"
+ #include "confdefs.h"
+ #include <${cf_cv_ncurses_header:-curses.h}>
+ int main(void)
+ { char *xx = curses_version(); return (xx == 0); }
+ _ACEOF
+ rm -f conftest$ac_exeext
+-if { (eval echo "$as_me:6141: \"$ac_link\"") >&5
++if { (eval echo "$as_me:6144: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:6144: \$? = $ac_status" >&5
++ echo "$as_me:6147: \$? = $ac_status" >&5
+ (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+- { (eval echo "$as_me:6146: \"$ac_try\"") >&5
++ { (eval echo "$as_me:6149: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:6149: \$? = $ac_status" >&5
++ echo "$as_me:6152: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ cf_have_ncuconfig=yes
+ else
+@@ -6163,7 +6166,7 @@
+ cf_have_ncuconfig=no
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+- echo "$as_me:6166: result: $cf_have_ncuconfig" >&5
++ echo "$as_me:6169: 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"
+@@ -6181,7 +6184,7 @@
+ fi
+
+ else
+- echo "$as_me:6184: result: no" >&5
++ echo "$as_me:6187: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ NCURSES_CONFIG_PKG=none
+ fi
+@@ -6197,7 +6200,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:6200: checking for $ac_word" >&5
++echo "$as_me:6203: 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
+@@ -6212,7 +6215,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:6215: found $ac_dir/$ac_word" >&5
++echo "$as_me:6218: found $ac_dir/$ac_word" >&5
+ break
+ done
+
+@@ -6220,10 +6223,10 @@
+ fi
+ NCURSES_CONFIG=$ac_cv_prog_NCURSES_CONFIG
+ if test -n "$NCURSES_CONFIG"; then
+- echo "$as_me:6223: result: $NCURSES_CONFIG" >&5
++ echo "$as_me:6226: result: $NCURSES_CONFIG" >&5
+ echo "${ECHO_T}$NCURSES_CONFIG" >&6
+ else
+- echo "$as_me:6226: result: no" >&5
++ echo "$as_me:6229: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+
+@@ -6236,7 +6239,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:6239: checking for $ac_word" >&5
++echo "$as_me:6242: 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
+@@ -6251,7 +6254,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:6254: found $ac_dir/$ac_word" >&5
++echo "$as_me:6257: found $ac_dir/$ac_word" >&5
+ break
+ done
+
+@@ -6259,10 +6262,10 @@
+ fi
+ ac_ct_NCURSES_CONFIG=$ac_cv_prog_ac_ct_NCURSES_CONFIG
+ if test -n "$ac_ct_NCURSES_CONFIG"; then
+- echo "$as_me:6262: result: $ac_ct_NCURSES_CONFIG" >&5
++ echo "$as_me:6265: result: $ac_ct_NCURSES_CONFIG" >&5
+ echo "${ECHO_T}$ac_ct_NCURSES_CONFIG" >&6
+ else
+- echo "$as_me:6265: result: no" >&5
++ echo "$as_me:6268: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+
+@@ -6295,7 +6298,7 @@
+
+ # even with config script, some packages use no-override for curses.h
+
+-echo "$as_me:6298: checking if we have identified curses headers" >&5
++echo "$as_me:6301: 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
+@@ -6307,7 +6310,7 @@
+ curses.h $cf_cv_screen/curses.h
+ do
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 6310 "configure"
++#line 6313 "configure"
+ #include "confdefs.h"
+ #include <${cf_header}>
+ int
+@@ -6319,16 +6322,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:6322: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:6325: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:6325: \$? = $ac_status" >&5
++ echo "$as_me:6328: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:6328: \"$ac_try\"") >&5
++ { (eval echo "$as_me:6331: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:6331: \$? = $ac_status" >&5
++ echo "$as_me:6334: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ cf_cv_ncurses_header=$cf_header; break
+ else
+@@ -6339,11 +6342,11 @@
+ done
+
+ fi
+-echo "$as_me:6342: result: $cf_cv_ncurses_header" >&5
++echo "$as_me:6345: 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:6346: error: No curses header-files found" >&5
++ { { echo "$as_me:6349: error: No curses header-files found" >&5
+ echo "$as_me: error: No curses header-files found" >&2;}
+ { (exit 1); exit 1; }; }
+ fi
+@@ -6353,23 +6356,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:6356: checking for $ac_header" >&5
++echo "$as_me:6359: 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 6362 "configure"
++#line 6365 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:6366: \"$ac_cpp conftest.$ac_ext\"") >&5
++if { (eval echo "$as_me:6369: \"$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:6372: \$? = $ac_status" >&5
++ echo "$as_me:6375: \$? = $ac_status" >&5
+ (exit $ac_status); } >/dev/null; then
+ if test -s conftest.err; then
+ ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -6388,7 +6391,7 @@
+ fi
+ rm -f conftest.err conftest.$ac_ext
+ fi
+-echo "$as_me:6391: result: `eval echo '${'$as_ac_Header'}'`" >&5
++echo "$as_me:6394: 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
+@@ -6441,7 +6444,7 @@
+ cf_save_CPPFLAGS=$CPPFLAGS
+ CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 6444 "configure"
++#line 6447 "configure"
+ #include "confdefs.h"
+ #include <stdio.h>
+ int
+@@ -6453,16 +6456,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:6456: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:6459: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:6459: \$? = $ac_status" >&5
++ echo "$as_me:6462: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:6462: \"$ac_try\"") >&5
++ { (eval echo "$as_me:6465: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:6465: \$? = $ac_status" >&5
++ echo "$as_me:6468: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ :
+ else
+@@ -6479,7 +6482,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}:6482: testing adding $cf_add_incdir to include-path ..." 1>&5
++echo "${as_me:-configure}:6485: testing adding $cf_add_incdir to include-path ..." 1>&5
+
+ CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
+
+@@ -6498,7 +6501,7 @@
+
+ }
+
+-echo "$as_me:6501: checking for $cf_ncuhdr_root header in include-path" >&5
++echo "$as_me:6504: 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
+@@ -6510,7 +6513,7 @@
+ do
+
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 6513 "configure"
++#line 6516 "configure"
+ #include "confdefs.h"
+
+ #include <$cf_header>
+@@ -6534,16 +6537,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:6537: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:6540: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:6540: \$? = $ac_status" >&5
++ echo "$as_me:6543: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:6543: \"$ac_try\"") >&5
++ { (eval echo "$as_me:6546: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:6546: \$? = $ac_status" >&5
++ echo "$as_me:6549: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ cf_cv_ncurses_h=$cf_header
+
+@@ -6558,14 +6561,14 @@
+ done
+
+ fi
+-echo "$as_me:6561: result: $cf_cv_ncurses_h" >&5
++echo "$as_me:6564: 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:6568: checking for $cf_ncuhdr_root include-path" >&5
++echo "$as_me:6571: 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
+@@ -6683,7 +6686,7 @@
+ cf_save_CPPFLAGS=$CPPFLAGS
+ CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 6686 "configure"
++#line 6689 "configure"
+ #include "confdefs.h"
+ #include <stdio.h>
+ int
+@@ -6695,16 +6698,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:6698: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:6701: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:6701: \$? = $ac_status" >&5
++ echo "$as_me:6704: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:6704: \"$ac_try\"") >&5
++ { (eval echo "$as_me:6707: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:6707: \$? = $ac_status" >&5
++ echo "$as_me:6710: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ :
+ else
+@@ -6721,7 +6724,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}:6724: testing adding $cf_add_incdir to include-path ..." 1>&5
++echo "${as_me:-configure}:6727: testing adding $cf_add_incdir to include-path ..." 1>&5
+
+ CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
+
+@@ -6744,7 +6747,7 @@
+ do
+
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 6747 "configure"
++#line 6750 "configure"
+ #include "confdefs.h"
+
+ #include <$cf_header>
+@@ -6768,16 +6771,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:6771: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:6774: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:6774: \$? = $ac_status" >&5
++ echo "$as_me:6777: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:6777: \"$ac_try\"") >&5
++ { (eval echo "$as_me:6780: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:6780: \$? = $ac_status" >&5
++ echo "$as_me:6783: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ cf_cv_ncurses_h2=$cf_header
+
+@@ -6798,12 +6801,12 @@
+ CPPFLAGS="$cf_save2_CPPFLAGS"
+ test "$cf_cv_ncurses_h2" != no && break
+ done
+- test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:6801: error: not found" >&5
++ test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:6804: error: not found" >&5
+ echo "$as_me: error: not found" >&2;}
+ { (exit 1); exit 1; }; }
+
+ fi
+-echo "$as_me:6806: result: $cf_cv_ncurses_h2" >&5
++echo "$as_me:6809: 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%/[^/]*$%%'`
+@@ -6836,7 +6839,7 @@
+ cf_save_CPPFLAGS=$CPPFLAGS
+ CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 6839 "configure"
++#line 6842 "configure"
+ #include "confdefs.h"
+ #include <stdio.h>
+ int
+@@ -6848,16 +6851,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:6851: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:6854: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:6854: \$? = $ac_status" >&5
++ echo "$as_me:6857: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:6857: \"$ac_try\"") >&5
++ { (eval echo "$as_me:6860: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:6860: \$? = $ac_status" >&5
++ echo "$as_me:6863: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ :
+ else
+@@ -6874,7 +6877,7 @@
+ if test "$cf_have_incdir" = no ; then
+ test -n "$verbose" && echo " adding $cf_add_incdir to include-path" 1>&6
+
+-echo "${as_me:-configure}:6877: testing adding $cf_add_incdir to include-path ..." 1>&5
++echo "${as_me:-configure}:6880: testing adding $cf_add_incdir to include-path ..." 1>&5
+
+ CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
+
+@@ -6922,7 +6925,7 @@
+ ;;
+ esac
+
+-echo "$as_me:6925: checking for terminfo header" >&5
++echo "$as_me:6928: 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
+@@ -6940,7 +6943,7 @@
+ for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h"
+ do
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 6943 "configure"
++#line 6946 "configure"
+ #include "confdefs.h"
+ #include <stdio.h>
+ #include <${cf_cv_ncurses_header:-curses.h}>
+@@ -6955,16 +6958,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:6958: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:6961: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:6961: \$? = $ac_status" >&5
++ echo "$as_me:6964: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:6964: \"$ac_try\"") >&5
++ { (eval echo "$as_me:6967: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:6967: \$? = $ac_status" >&5
++ echo "$as_me:6970: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+
+ cf_cv_term_header="$cf_test"
+@@ -6980,7 +6983,7 @@
+ done
+
+ fi
+-echo "$as_me:6983: result: $cf_cv_term_header" >&5
++echo "$as_me:6986: result: $cf_cv_term_header" >&5
+ echo "${ECHO_T}$cf_cv_term_header" >&6
+
+ # Set definitions to allow ifdef'ing to accommodate subdirectories
+@@ -7018,7 +7021,7 @@
+ #define NCURSES 1
+ EOF
+
+-echo "$as_me:7021: checking for ncurses version" >&5
++echo "$as_me:7024: 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
+@@ -7044,10 +7047,10 @@
+ #endif
+ EOF
+ cf_try="$ac_cpp conftest.$ac_ext 2>&5 | grep '^Autoconf ' >conftest.out"
+- { (eval echo "$as_me:7047: \"$cf_try\"") >&5
++ { (eval echo "$as_me:7050: \"$cf_try\"") >&5
+ (eval $cf_try) 2>&5
+ ac_status=$?
+- echo "$as_me:7050: \$? = $ac_status" >&5
++ echo "$as_me:7053: \$? = $ac_status" >&5
+ (exit $ac_status); }
+ if test -f conftest.out ; then
+ cf_out=`cat conftest.out | sed -e 's%^Autoconf %%' -e 's%^[^"]*"%%' -e 's%".*%%'`
+@@ -7057,7 +7060,7 @@
+
+ else
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 7060 "configure"
++#line 7063 "configure"
+ #include "confdefs.h"
+
+ #include <${cf_cv_ncurses_header:-curses.h}>
+@@ -7082,15 +7085,15 @@
+ }
+ _ACEOF
+ rm -f conftest$ac_exeext
+-if { (eval echo "$as_me:7085: \"$ac_link\"") >&5
++if { (eval echo "$as_me:7088: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:7088: \$? = $ac_status" >&5
++ echo "$as_me:7091: \$? = $ac_status" >&5
+ (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+- { (eval echo "$as_me:7090: \"$ac_try\"") >&5
++ { (eval echo "$as_me:7093: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:7093: \$? = $ac_status" >&5
++ echo "$as_me:7096: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+
+ cf_cv_ncurses_version=`cat $cf_tempfile`
+@@ -7104,7 +7107,7 @@
+ rm -f $cf_tempfile
+
+ fi
+-echo "$as_me:7107: result: $cf_cv_ncurses_version" >&5
++echo "$as_me:7110: result: $cf_cv_ncurses_version" >&5
+ echo "${ECHO_T}$cf_cv_ncurses_version" >&6
+ test "$cf_cv_ncurses_version" = no ||
+ cat >>confdefs.h <<\EOF
+@@ -7117,7 +7120,7 @@
+ # to link gpm.
+ cf_ncurses_LIBS=""
+ cf_ncurses_SAVE="$LIBS"
+-echo "$as_me:7120: checking for Gpm_Open in -lgpm" >&5
++echo "$as_me:7123: 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
+@@ -7125,7 +7128,7 @@
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lgpm $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 7128 "configure"
++#line 7131 "configure"
+ #include "confdefs.h"
+
+ /* Override any gcc2 internal prototype to avoid an error. */
+@@ -7144,16 +7147,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:7147: \"$ac_link\"") >&5
++if { (eval echo "$as_me:7150: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:7150: \$? = $ac_status" >&5
++ echo "$as_me:7153: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -s conftest$ac_exeext'
+- { (eval echo "$as_me:7153: \"$ac_try\"") >&5
++ { (eval echo "$as_me:7156: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:7156: \$? = $ac_status" >&5
++ echo "$as_me:7159: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ ac_cv_lib_gpm_Gpm_Open=yes
+ else
+@@ -7164,10 +7167,10 @@
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:7167: result: $ac_cv_lib_gpm_Gpm_Open" >&5
++echo "$as_me:7170: 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:7170: checking for initscr in -lgpm" >&5
++ echo "$as_me:7173: 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
+@@ -7175,7 +7178,7 @@
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lgpm $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 7178 "configure"
++#line 7181 "configure"
+ #include "confdefs.h"
+
+ /* Override any gcc2 internal prototype to avoid an error. */
+@@ -7194,16 +7197,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:7197: \"$ac_link\"") >&5
++if { (eval echo "$as_me:7200: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:7200: \$? = $ac_status" >&5
++ echo "$as_me:7203: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -s conftest$ac_exeext'
+- { (eval echo "$as_me:7203: \"$ac_try\"") >&5
++ { (eval echo "$as_me:7206: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:7206: \$? = $ac_status" >&5
++ echo "$as_me:7209: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ ac_cv_lib_gpm_initscr=yes
+ else
+@@ -7214,7 +7217,7 @@
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:7217: result: $ac_cv_lib_gpm_initscr" >&5
++echo "$as_me:7220: 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"
+@@ -7229,7 +7232,7 @@
+ # This is only necessary if you are linking against an obsolete
+ # version of ncurses (but it should do no harm, since it's static).
+ if test "$cf_nculib_root" = ncurses ; then
+- echo "$as_me:7232: checking for tgoto in -lmytinfo" >&5
++ echo "$as_me:7235: 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
+@@ -7237,7 +7240,7 @@
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lmytinfo $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 7240 "configure"
++#line 7243 "configure"
+ #include "confdefs.h"
+
+ /* Override any gcc2 internal prototype to avoid an error. */
+@@ -7256,16 +7259,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:7259: \"$ac_link\"") >&5
++if { (eval echo "$as_me:7262: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:7262: \$? = $ac_status" >&5
++ echo "$as_me:7265: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -s conftest$ac_exeext'
+- { (eval echo "$as_me:7265: \"$ac_try\"") >&5
++ { (eval echo "$as_me:7268: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:7268: \$? = $ac_status" >&5
++ echo "$as_me:7271: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ ac_cv_lib_mytinfo_tgoto=yes
+ else
+@@ -7276,7 +7279,7 @@
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:7279: result: $ac_cv_lib_mytinfo_tgoto" >&5
++echo "$as_me:7282: 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"
+@@ -7325,13 +7328,13 @@
+
+ eval 'cf_cv_have_lib_'$cf_nculib_root'=no'
+ cf_libdir=""
+- echo "$as_me:7328: checking for initscr" >&5
++ echo "$as_me:7331: 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 7334 "configure"
++#line 7337 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+ which can conflict with char initscr (); below. */
+@@ -7362,16 +7365,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:7365: \"$ac_link\"") >&5
++if { (eval echo "$as_me:7368: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:7368: \$? = $ac_status" >&5
++ echo "$as_me:7371: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -s conftest$ac_exeext'
+- { (eval echo "$as_me:7371: \"$ac_try\"") >&5
++ { (eval echo "$as_me:7374: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:7374: \$? = $ac_status" >&5
++ echo "$as_me:7377: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ ac_cv_func_initscr=yes
+ else
+@@ -7381,18 +7384,18 @@
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "$as_me:7384: result: $ac_cv_func_initscr" >&5
++echo "$as_me:7387: 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:7391: checking for initscr in -l$cf_nculib_root" >&5
++ echo "$as_me:7394: 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 7395 "configure"
++#line 7398 "configure"
+ #include "confdefs.h"
+ #include <${cf_cv_ncurses_header:-curses.h}>
+ int
+@@ -7404,25 +7407,25 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:7407: \"$ac_link\"") >&5
++if { (eval echo "$as_me:7410: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:7410: \$? = $ac_status" >&5
++ echo "$as_me:7413: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -s conftest$ac_exeext'
+- { (eval echo "$as_me:7413: \"$ac_try\"") >&5
++ { (eval echo "$as_me:7416: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:7416: \$? = $ac_status" >&5
++ echo "$as_me:7419: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+- echo "$as_me:7418: result: yes" >&5
++ echo "$as_me:7421: 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:7425: result: no" >&5
++echo "$as_me:7428: result: no" >&5
+ echo "${ECHO_T}no" >&6
+
+ cf_search=
+@@ -7490,11 +7493,11 @@
+
+ for cf_libdir in $cf_search
+ do
+- echo "$as_me:7493: checking for -l$cf_nculib_root in $cf_libdir" >&5
++ echo "$as_me:7496: 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 7497 "configure"
++#line 7500 "configure"
+ #include "confdefs.h"
+ #include <${cf_cv_ncurses_header:-curses.h}>
+ int
+@@ -7506,25 +7509,25 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:7509: \"$ac_link\"") >&5
++if { (eval echo "$as_me:7512: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:7512: \$? = $ac_status" >&5
++ echo "$as_me:7515: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -s conftest$ac_exeext'
+- { (eval echo "$as_me:7515: \"$ac_try\"") >&5
++ { (eval echo "$as_me:7518: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:7518: \$? = $ac_status" >&5
++ echo "$as_me:7521: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+- echo "$as_me:7520: result: yes" >&5
++ echo "$as_me:7523: 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:7527: result: no" >&5
++echo "$as_me:7530: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ LIBS="$cf_save_LIBS"
+ fi
+@@ -7539,7 +7542,7 @@
+ eval 'cf_found_library=$cf_cv_have_lib_'$cf_nculib_root
+
+ if test $cf_found_library = no ; then
+- { { echo "$as_me:7542: error: Cannot link $cf_nculib_root library" >&5
++ { { echo "$as_me:7545: error: Cannot link $cf_nculib_root library" >&5
+ echo "$as_me: error: Cannot link $cf_nculib_root library" >&2;}
+ { (exit 1); exit 1; }; }
+ fi
+@@ -7547,7 +7550,7 @@
+ fi
+
+ if test -n "$cf_ncurses_LIBS" ; then
+- echo "$as_me:7550: checking if we can link $cf_nculib_root without $cf_ncurses_LIBS" >&5
++ echo "$as_me:7553: 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
+@@ -7557,7 +7560,7 @@
+ fi
+ done
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 7560 "configure"
++#line 7563 "configure"
+ #include "confdefs.h"
+ #include <${cf_cv_ncurses_header:-curses.h}>
+ int
+@@ -7569,23 +7572,23 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:7572: \"$ac_link\"") >&5
++if { (eval echo "$as_me:7575: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:7575: \$? = $ac_status" >&5
++ echo "$as_me:7578: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -s conftest$ac_exeext'
+- { (eval echo "$as_me:7578: \"$ac_try\"") >&5
++ { (eval echo "$as_me:7581: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:7581: \$? = $ac_status" >&5
++ echo "$as_me:7584: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+- echo "$as_me:7583: result: yes" >&5
++ echo "$as_me:7586: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ else
+ echo "$as_me: failed program was:" >&5
+ cat conftest.$ac_ext >&5
+-echo "$as_me:7588: result: no" >&5
++echo "$as_me:7591: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ LIBS="$cf_ncurses_SAVE"
+ fi
+@@ -7610,13 +7613,13 @@
+ cf_have_ncuconfig=no
+
+ if test "x${PKG_CONFIG:=none}" != xnone; then
+- echo "$as_me:7613: checking pkg-config for $cf_ncuconfig_root" >&5
++ echo "$as_me:7616: 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:7616: result: yes" >&5
++ echo "$as_me:7619: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+
+- echo "$as_me:7619: checking if the $cf_ncuconfig_root package files work" >&5
++ echo "$as_me:7622: 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
+
+@@ -7642,7 +7645,7 @@
+ LIBS="$cf_add_libs"
+
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 7645 "configure"
++#line 7648 "configure"
+ #include "confdefs.h"
+ #include <${cf_cv_ncurses_header:-curses.h}>
+ int
+@@ -7654,37 +7657,37 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:7657: \"$ac_link\"") >&5
++if { (eval echo "$as_me:7660: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:7660: \$? = $ac_status" >&5
++ echo "$as_me:7663: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -s conftest$ac_exeext'
+- { (eval echo "$as_me:7663: \"$ac_try\"") >&5
++ { (eval echo "$as_me:7666: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:7666: \$? = $ac_status" >&5
++ echo "$as_me:7669: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ if test "$cross_compiling" = yes; then
+ cf_have_ncuconfig=maybe
+ else
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 7672 "configure"
++#line 7675 "configure"
+ #include "confdefs.h"
+ #include <${cf_cv_ncurses_header:-curses.h}>
+ int main(void)
+ { char *xx = curses_version(); return (xx == 0); }
+ _ACEOF
+ rm -f conftest$ac_exeext
+-if { (eval echo "$as_me:7679: \"$ac_link\"") >&5
++if { (eval echo "$as_me:7682: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:7682: \$? = $ac_status" >&5
++ echo "$as_me:7685: \$? = $ac_status" >&5
+ (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+- { (eval echo "$as_me:7684: \"$ac_try\"") >&5
++ { (eval echo "$as_me:7687: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:7687: \$? = $ac_status" >&5
++ echo "$as_me:7690: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ cf_have_ncuconfig=yes
+ else
+@@ -7701,7 +7704,7 @@
+ cf_have_ncuconfig=no
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+- echo "$as_me:7704: result: $cf_have_ncuconfig" >&5
++ echo "$as_me:7707: 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"
+@@ -7719,7 +7722,7 @@
+ fi
+
+ else
+- echo "$as_me:7722: result: no" >&5
++ echo "$as_me:7725: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ NCURSES_CONFIG_PKG=none
+ fi
+@@ -7735,7 +7738,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:7738: checking for $ac_word" >&5
++echo "$as_me:7741: 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
+@@ -7750,7 +7753,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:7753: found $ac_dir/$ac_word" >&5
++echo "$as_me:7756: found $ac_dir/$ac_word" >&5
+ break
+ done
+
+@@ -7758,10 +7761,10 @@
+ fi
+ NCURSES_CONFIG=$ac_cv_prog_NCURSES_CONFIG
+ if test -n "$NCURSES_CONFIG"; then
+- echo "$as_me:7761: result: $NCURSES_CONFIG" >&5
++ echo "$as_me:7764: result: $NCURSES_CONFIG" >&5
+ echo "${ECHO_T}$NCURSES_CONFIG" >&6
+ else
+- echo "$as_me:7764: result: no" >&5
++ echo "$as_me:7767: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+
+@@ -7774,7 +7777,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:7777: checking for $ac_word" >&5
++echo "$as_me:7780: 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
+@@ -7789,7 +7792,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:7792: found $ac_dir/$ac_word" >&5
++echo "$as_me:7795: found $ac_dir/$ac_word" >&5
+ break
+ done
+
+@@ -7797,10 +7800,10 @@
+ fi
+ ac_ct_NCURSES_CONFIG=$ac_cv_prog_ac_ct_NCURSES_CONFIG
+ if test -n "$ac_ct_NCURSES_CONFIG"; then
+- echo "$as_me:7800: result: $ac_ct_NCURSES_CONFIG" >&5
++ echo "$as_me:7803: result: $ac_ct_NCURSES_CONFIG" >&5
+ echo "${ECHO_T}$ac_ct_NCURSES_CONFIG" >&6
+ else
+- echo "$as_me:7803: result: no" >&5
++ echo "$as_me:7806: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+
+@@ -7833,7 +7836,7 @@
+
+ # even with config script, some packages use no-override for curses.h
+
+-echo "$as_me:7836: checking if we have identified curses headers" >&5
++echo "$as_me:7839: 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
+@@ -7845,7 +7848,7 @@
+ curses.h $cf_cv_screen/curses.h
+ do
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 7848 "configure"
++#line 7851 "configure"
+ #include "confdefs.h"
+ #include <${cf_header}>
+ int
+@@ -7857,16 +7860,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:7860: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:7863: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:7863: \$? = $ac_status" >&5
++ echo "$as_me:7866: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:7866: \"$ac_try\"") >&5
++ { (eval echo "$as_me:7869: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:7869: \$? = $ac_status" >&5
++ echo "$as_me:7872: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ cf_cv_ncurses_header=$cf_header; break
+ else
+@@ -7877,11 +7880,11 @@
+ done
+
+ fi
+-echo "$as_me:7880: result: $cf_cv_ncurses_header" >&5
++echo "$as_me:7883: 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:7884: error: No curses header-files found" >&5
++ { { echo "$as_me:7887: error: No curses header-files found" >&5
+ echo "$as_me: error: No curses header-files found" >&2;}
+ { (exit 1); exit 1; }; }
+ fi
+@@ -7891,23 +7894,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:7894: checking for $ac_header" >&5
++echo "$as_me:7897: 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 7900 "configure"
++#line 7903 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:7904: \"$ac_cpp conftest.$ac_ext\"") >&5
++if { (eval echo "$as_me:7907: \"$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:7910: \$? = $ac_status" >&5
++ echo "$as_me:7913: \$? = $ac_status" >&5
+ (exit $ac_status); } >/dev/null; then
+ if test -s conftest.err; then
+ ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -7926,7 +7929,7 @@
+ fi
+ rm -f conftest.err conftest.$ac_ext
+ fi
+-echo "$as_me:7929: result: `eval echo '${'$as_ac_Header'}'`" >&5
++echo "$as_me:7932: 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
+@@ -7979,7 +7982,7 @@
+ cf_save_CPPFLAGS=$CPPFLAGS
+ CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 7982 "configure"
++#line 7985 "configure"
+ #include "confdefs.h"
+ #include <stdio.h>
+ int
+@@ -7991,16 +7994,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:7994: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:7997: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:7997: \$? = $ac_status" >&5
++ echo "$as_me:8000: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:8000: \"$ac_try\"") >&5
++ { (eval echo "$as_me:8003: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:8003: \$? = $ac_status" >&5
++ echo "$as_me:8006: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ :
+ else
+@@ -8017,7 +8020,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}:8020: testing adding $cf_add_incdir to include-path ..." 1>&5
++echo "${as_me:-configure}:8023: testing adding $cf_add_incdir to include-path ..." 1>&5
+
+ CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
+
+@@ -8036,7 +8039,7 @@
+
+ }
+
+-echo "$as_me:8039: checking for $cf_ncuhdr_root header in include-path" >&5
++echo "$as_me:8042: 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
+@@ -8048,7 +8051,7 @@
+ do
+
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 8051 "configure"
++#line 8054 "configure"
+ #include "confdefs.h"
+
+ #include <$cf_header>
+@@ -8072,16 +8075,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:8075: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:8078: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:8078: \$? = $ac_status" >&5
++ echo "$as_me:8081: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:8081: \"$ac_try\"") >&5
++ { (eval echo "$as_me:8084: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:8084: \$? = $ac_status" >&5
++ echo "$as_me:8087: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ cf_cv_ncurses_h=$cf_header
+
+@@ -8096,14 +8099,14 @@
+ done
+
+ fi
+-echo "$as_me:8099: result: $cf_cv_ncurses_h" >&5
++echo "$as_me:8102: 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:8106: checking for $cf_ncuhdr_root include-path" >&5
++echo "$as_me:8109: 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
+@@ -8221,7 +8224,7 @@
+ cf_save_CPPFLAGS=$CPPFLAGS
+ CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 8224 "configure"
++#line 8227 "configure"
+ #include "confdefs.h"
+ #include <stdio.h>
+ int
+@@ -8233,16 +8236,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:8236: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:8239: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:8239: \$? = $ac_status" >&5
++ echo "$as_me:8242: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:8242: \"$ac_try\"") >&5
++ { (eval echo "$as_me:8245: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:8245: \$? = $ac_status" >&5
++ echo "$as_me:8248: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ :
+ else
+@@ -8259,7 +8262,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}:8262: testing adding $cf_add_incdir to include-path ..." 1>&5
++echo "${as_me:-configure}:8265: testing adding $cf_add_incdir to include-path ..." 1>&5
+
+ CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
+
+@@ -8282,7 +8285,7 @@
+ do
+
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 8285 "configure"
++#line 8288 "configure"
+ #include "confdefs.h"
+
+ #include <$cf_header>
+@@ -8306,16 +8309,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:8309: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:8312: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:8312: \$? = $ac_status" >&5
++ echo "$as_me:8315: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:8315: \"$ac_try\"") >&5
++ { (eval echo "$as_me:8318: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:8318: \$? = $ac_status" >&5
++ echo "$as_me:8321: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ cf_cv_ncurses_h2=$cf_header
+
+@@ -8336,12 +8339,12 @@
+ CPPFLAGS="$cf_save2_CPPFLAGS"
+ test "$cf_cv_ncurses_h2" != no && break
+ done
+- test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:8339: error: not found" >&5
++ test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:8342: error: not found" >&5
+ echo "$as_me: error: not found" >&2;}
+ { (exit 1); exit 1; }; }
+
+ fi
+-echo "$as_me:8344: result: $cf_cv_ncurses_h2" >&5
++echo "$as_me:8347: 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%/[^/]*$%%'`
+@@ -8374,7 +8377,7 @@
+ cf_save_CPPFLAGS=$CPPFLAGS
+ CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 8377 "configure"
++#line 8380 "configure"
+ #include "confdefs.h"
+ #include <stdio.h>
+ int
+@@ -8386,16 +8389,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:8389: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:8392: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:8392: \$? = $ac_status" >&5
++ echo "$as_me:8395: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:8395: \"$ac_try\"") >&5
++ { (eval echo "$as_me:8398: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:8398: \$? = $ac_status" >&5
++ echo "$as_me:8401: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ :
+ else
+@@ -8412,7 +8415,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}:8415: testing adding $cf_add_incdir to include-path ..." 1>&5
++echo "${as_me:-configure}:8418: testing adding $cf_add_incdir to include-path ..." 1>&5
+
+ CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
+
+@@ -8460,7 +8463,7 @@
+ ;;
+ esac
+
+-echo "$as_me:8463: checking for terminfo header" >&5
++echo "$as_me:8466: 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
+@@ -8478,7 +8481,7 @@
+ for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h"
+ do
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 8481 "configure"
++#line 8484 "configure"
+ #include "confdefs.h"
+ #include <stdio.h>
+ #include <${cf_cv_ncurses_header:-curses.h}>
+@@ -8493,16 +8496,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:8496: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:8499: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:8499: \$? = $ac_status" >&5
++ echo "$as_me:8502: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:8502: \"$ac_try\"") >&5
++ { (eval echo "$as_me:8505: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:8505: \$? = $ac_status" >&5
++ echo "$as_me:8508: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+
+ cf_cv_term_header="$cf_test"
+@@ -8518,7 +8521,7 @@
+ done
+
+ fi
+-echo "$as_me:8521: result: $cf_cv_term_header" >&5
++echo "$as_me:8524: result: $cf_cv_term_header" >&5
+ echo "${ECHO_T}$cf_cv_term_header" >&6
+
+ # Set definitions to allow ifdef'ing to accommodate subdirectories
+@@ -8556,7 +8559,7 @@
+ #define NCURSES 1
+ EOF
+
+-echo "$as_me:8559: checking for ncurses version" >&5
++echo "$as_me:8562: 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
+@@ -8582,10 +8585,10 @@
+ #endif
+ EOF
+ cf_try="$ac_cpp conftest.$ac_ext 2>&5 | grep '^Autoconf ' >conftest.out"
+- { (eval echo "$as_me:8585: \"$cf_try\"") >&5
++ { (eval echo "$as_me:8588: \"$cf_try\"") >&5
+ (eval $cf_try) 2>&5
+ ac_status=$?
+- echo "$as_me:8588: \$? = $ac_status" >&5
++ echo "$as_me:8591: \$? = $ac_status" >&5
+ (exit $ac_status); }
+ if test -f conftest.out ; then
+ cf_out=`cat conftest.out | sed -e 's%^Autoconf %%' -e 's%^[^"]*"%%' -e 's%".*%%'`
+@@ -8595,7 +8598,7 @@
+
+ else
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 8598 "configure"
++#line 8601 "configure"
+ #include "confdefs.h"
+
+ #include <${cf_cv_ncurses_header:-curses.h}>
+@@ -8620,15 +8623,15 @@
+ }
+ _ACEOF
+ rm -f conftest$ac_exeext
+-if { (eval echo "$as_me:8623: \"$ac_link\"") >&5
++if { (eval echo "$as_me:8626: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:8626: \$? = $ac_status" >&5
++ echo "$as_me:8629: \$? = $ac_status" >&5
+ (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+- { (eval echo "$as_me:8628: \"$ac_try\"") >&5
++ { (eval echo "$as_me:8631: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:8631: \$? = $ac_status" >&5
++ echo "$as_me:8634: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+
+ cf_cv_ncurses_version=`cat $cf_tempfile`
+@@ -8642,7 +8645,7 @@
+ rm -f $cf_tempfile
+
+ fi
+-echo "$as_me:8645: result: $cf_cv_ncurses_version" >&5
++echo "$as_me:8648: result: $cf_cv_ncurses_version" >&5
+ echo "${ECHO_T}$cf_cv_ncurses_version" >&6
+ test "$cf_cv_ncurses_version" = no ||
+ cat >>confdefs.h <<\EOF
+@@ -8655,7 +8658,7 @@
+ # to link gpm.
+ cf_ncurses_LIBS=""
+ cf_ncurses_SAVE="$LIBS"
+-echo "$as_me:8658: checking for Gpm_Open in -lgpm" >&5
++echo "$as_me:8661: 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
+@@ -8663,7 +8666,7 @@
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lgpm $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 8666 "configure"
++#line 8669 "configure"
+ #include "confdefs.h"
+
+ /* Override any gcc2 internal prototype to avoid an error. */
+@@ -8682,16 +8685,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:8685: \"$ac_link\"") >&5
++if { (eval echo "$as_me:8688: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:8688: \$? = $ac_status" >&5
++ echo "$as_me:8691: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -s conftest$ac_exeext'
+- { (eval echo "$as_me:8691: \"$ac_try\"") >&5
++ { (eval echo "$as_me:8694: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:8694: \$? = $ac_status" >&5
++ echo "$as_me:8697: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ ac_cv_lib_gpm_Gpm_Open=yes
+ else
+@@ -8702,10 +8705,10 @@
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:8705: result: $ac_cv_lib_gpm_Gpm_Open" >&5
++echo "$as_me:8708: 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:8708: checking for initscr in -lgpm" >&5
++ echo "$as_me:8711: 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
+@@ -8713,7 +8716,7 @@
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lgpm $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 8716 "configure"
++#line 8719 "configure"
+ #include "confdefs.h"
+
+ /* Override any gcc2 internal prototype to avoid an error. */
+@@ -8732,16 +8735,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:8735: \"$ac_link\"") >&5
++if { (eval echo "$as_me:8738: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:8738: \$? = $ac_status" >&5
++ echo "$as_me:8741: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -s conftest$ac_exeext'
+- { (eval echo "$as_me:8741: \"$ac_try\"") >&5
++ { (eval echo "$as_me:8744: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:8744: \$? = $ac_status" >&5
++ echo "$as_me:8747: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ ac_cv_lib_gpm_initscr=yes
+ else
+@@ -8752,7 +8755,7 @@
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:8755: result: $ac_cv_lib_gpm_initscr" >&5
++echo "$as_me:8758: 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"
+@@ -8767,7 +8770,7 @@
+ # This is only necessary if you are linking against an obsolete
+ # version of ncurses (but it should do no harm, since it's static).
+ if test "$cf_nculib_root" = ncurses ; then
+- echo "$as_me:8770: checking for tgoto in -lmytinfo" >&5
++ echo "$as_me:8773: 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
+@@ -8775,7 +8778,7 @@
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lmytinfo $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 8778 "configure"
++#line 8781 "configure"
+ #include "confdefs.h"
+
+ /* Override any gcc2 internal prototype to avoid an error. */
+@@ -8794,16 +8797,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:8797: \"$ac_link\"") >&5
++if { (eval echo "$as_me:8800: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:8800: \$? = $ac_status" >&5
++ echo "$as_me:8803: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -s conftest$ac_exeext'
+- { (eval echo "$as_me:8803: \"$ac_try\"") >&5
++ { (eval echo "$as_me:8806: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:8806: \$? = $ac_status" >&5
++ echo "$as_me:8809: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ ac_cv_lib_mytinfo_tgoto=yes
+ else
+@@ -8814,7 +8817,7 @@
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:8817: result: $ac_cv_lib_mytinfo_tgoto" >&5
++echo "$as_me:8820: 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"
+@@ -8863,13 +8866,13 @@
+
+ eval 'cf_cv_have_lib_'$cf_nculib_root'=no'
+ cf_libdir=""
+- echo "$as_me:8866: checking for initscr" >&5
++ echo "$as_me:8869: 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 8872 "configure"
++#line 8875 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+ which can conflict with char initscr (); below. */
+@@ -8900,16 +8903,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:8903: \"$ac_link\"") >&5
++if { (eval echo "$as_me:8906: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:8906: \$? = $ac_status" >&5
++ echo "$as_me:8909: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -s conftest$ac_exeext'
+- { (eval echo "$as_me:8909: \"$ac_try\"") >&5
++ { (eval echo "$as_me:8912: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:8912: \$? = $ac_status" >&5
++ echo "$as_me:8915: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ ac_cv_func_initscr=yes
+ else
+@@ -8919,18 +8922,18 @@
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "$as_me:8922: result: $ac_cv_func_initscr" >&5
++echo "$as_me:8925: 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:8929: checking for initscr in -l$cf_nculib_root" >&5
++ echo "$as_me:8932: 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 8933 "configure"
++#line 8936 "configure"
+ #include "confdefs.h"
+ #include <${cf_cv_ncurses_header:-curses.h}>
+ int
+@@ -8942,25 +8945,25 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:8945: \"$ac_link\"") >&5
++if { (eval echo "$as_me:8948: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:8948: \$? = $ac_status" >&5
++ echo "$as_me:8951: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -s conftest$ac_exeext'
+- { (eval echo "$as_me:8951: \"$ac_try\"") >&5
++ { (eval echo "$as_me:8954: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:8954: \$? = $ac_status" >&5
++ echo "$as_me:8957: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+- echo "$as_me:8956: result: yes" >&5
++ echo "$as_me:8959: 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:8963: result: no" >&5
++echo "$as_me:8966: result: no" >&5
+ echo "${ECHO_T}no" >&6
+
+ cf_search=
+@@ -9028,11 +9031,11 @@
+
+ for cf_libdir in $cf_search
+ do
+- echo "$as_me:9031: checking for -l$cf_nculib_root in $cf_libdir" >&5
++ echo "$as_me:9034: 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 9035 "configure"
++#line 9038 "configure"
+ #include "confdefs.h"
+ #include <${cf_cv_ncurses_header:-curses.h}>
+ int
+@@ -9044,25 +9047,25 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:9047: \"$ac_link\"") >&5
++if { (eval echo "$as_me:9050: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:9050: \$? = $ac_status" >&5
++ echo "$as_me:9053: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -s conftest$ac_exeext'
+- { (eval echo "$as_me:9053: \"$ac_try\"") >&5
++ { (eval echo "$as_me:9056: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:9056: \$? = $ac_status" >&5
++ echo "$as_me:9059: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+- echo "$as_me:9058: result: yes" >&5
++ echo "$as_me:9061: 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:9065: result: no" >&5
++echo "$as_me:9068: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ LIBS="$cf_save_LIBS"
+ fi
+@@ -9077,7 +9080,7 @@
+ eval 'cf_found_library=$cf_cv_have_lib_'$cf_nculib_root
+
+ if test $cf_found_library = no ; then
+- { { echo "$as_me:9080: error: Cannot link $cf_nculib_root library" >&5
++ { { echo "$as_me:9083: error: Cannot link $cf_nculib_root library" >&5
+ echo "$as_me: error: Cannot link $cf_nculib_root library" >&2;}
+ { (exit 1); exit 1; }; }
+ fi
+@@ -9085,7 +9088,7 @@
+ fi
+
+ if test -n "$cf_ncurses_LIBS" ; then
+- echo "$as_me:9088: checking if we can link $cf_nculib_root without $cf_ncurses_LIBS" >&5
++ echo "$as_me:9091: 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
+@@ -9095,7 +9098,7 @@
+ fi
+ done
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 9098 "configure"
++#line 9101 "configure"
+ #include "confdefs.h"
+ #include <${cf_cv_ncurses_header:-curses.h}>
+ int
+@@ -9107,23 +9110,23 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:9110: \"$ac_link\"") >&5
++if { (eval echo "$as_me:9113: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:9113: \$? = $ac_status" >&5
++ echo "$as_me:9116: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -s conftest$ac_exeext'
+- { (eval echo "$as_me:9116: \"$ac_try\"") >&5
++ { (eval echo "$as_me:9119: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:9119: \$? = $ac_status" >&5
++ echo "$as_me:9122: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+- echo "$as_me:9121: result: yes" >&5
++ echo "$as_me:9124: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ else
+ echo "$as_me: failed program was:" >&5
+ cat conftest.$ac_ext >&5
+-echo "$as_me:9126: result: no" >&5
++echo "$as_me:9129: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ LIBS="$cf_ncurses_SAVE"
+ fi
+@@ -9143,7 +9146,7 @@
+
+ ;;
+ (pdcurses)
+- echo "$as_me:9146: checking for X" >&5
++ echo "$as_me:9149: checking for X" >&5
+ echo $ECHO_N "checking for X... $ECHO_C" >&6
+
+ # Check whether --with-x or --without-x was given.
+@@ -9240,17 +9243,17 @@
+ # Guess where to find include files, by looking for Intrinsic.h.
+ # First, try using that file with no special directory specified.
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 9243 "configure"
++#line 9246 "configure"
+ #include "confdefs.h"
+ #include <X11/Intrinsic.h>
+ _ACEOF
+-if { (eval echo "$as_me:9247: \"$ac_cpp conftest.$ac_ext\"") >&5
++if { (eval echo "$as_me:9250: \"$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:9253: \$? = $ac_status" >&5
++ echo "$as_me:9256: \$? = $ac_status" >&5
+ (exit $ac_status); } >/dev/null; then
+ if test -s conftest.err; then
+ ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -9283,7 +9286,7 @@
+ ac_save_LIBS=$LIBS
+ LIBS="-lXt $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 9286 "configure"
++#line 9289 "configure"
+ #include "confdefs.h"
+ #include <X11/Intrinsic.h>
+ int
+@@ -9295,16 +9298,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:9298: \"$ac_link\"") >&5
++if { (eval echo "$as_me:9301: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:9301: \$? = $ac_status" >&5
++ echo "$as_me:9304: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -s conftest$ac_exeext'
+- { (eval echo "$as_me:9304: \"$ac_try\"") >&5
++ { (eval echo "$as_me:9307: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:9307: \$? = $ac_status" >&5
++ echo "$as_me:9310: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ LIBS=$ac_save_LIBS
+ # We can link X programs with no special library path.
+@@ -9342,7 +9345,7 @@
+ fi # $with_x != no
+
+ if test "$have_x" != yes; then
+- echo "$as_me:9345: result: $have_x" >&5
++ echo "$as_me:9348: result: $have_x" >&5
+ echo "${ECHO_T}$have_x" >&6
+ no_x=yes
+ else
+@@ -9352,7 +9355,7 @@
+ # Update the cache value to reflect the command line values.
+ ac_cv_have_x="have_x=yes \
+ ac_x_includes=$x_includes ac_x_libraries=$x_libraries"
+- echo "$as_me:9355: result: libraries $x_libraries, headers $x_includes" >&5
++ echo "$as_me:9358: result: libraries $x_libraries, headers $x_includes" >&5
+ echo "${ECHO_T}libraries $x_libraries, headers $x_includes" >&6
+ fi
+
+@@ -9376,11 +9379,11 @@
+ # others require no space. Words are not sufficient . . . .
+ case `(uname -sr) 2>/dev/null` in
+ "SunOS 5"*)
+- echo "$as_me:9379: checking whether -R must be followed by a space" >&5
++ echo "$as_me:9382: checking whether -R must be followed by a space" >&5
+ echo $ECHO_N "checking whether -R must be followed by a space... $ECHO_C" >&6
+ ac_xsave_LIBS=$LIBS; LIBS="$LIBS -R$x_libraries"
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 9383 "configure"
++#line 9386 "configure"
+ #include "confdefs.h"
+
+ int
+@@ -9392,16 +9395,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:9395: \"$ac_link\"") >&5
++if { (eval echo "$as_me:9398: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:9398: \$? = $ac_status" >&5
++ echo "$as_me:9401: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -s conftest$ac_exeext'
+- { (eval echo "$as_me:9401: \"$ac_try\"") >&5
++ { (eval echo "$as_me:9404: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:9404: \$? = $ac_status" >&5
++ echo "$as_me:9407: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ ac_R_nospace=yes
+ else
+@@ -9411,13 +9414,13 @@
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ if test $ac_R_nospace = yes; then
+- echo "$as_me:9414: result: no" >&5
++ echo "$as_me:9417: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ X_LIBS="$X_LIBS -R$x_libraries"
+ else
+ LIBS="$ac_xsave_LIBS -R $x_libraries"
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 9420 "configure"
++#line 9423 "configure"
+ #include "confdefs.h"
+
+ int
+@@ -9429,16 +9432,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:9432: \"$ac_link\"") >&5
++if { (eval echo "$as_me:9435: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:9435: \$? = $ac_status" >&5
++ echo "$as_me:9438: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -s conftest$ac_exeext'
+- { (eval echo "$as_me:9438: \"$ac_try\"") >&5
++ { (eval echo "$as_me:9441: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:9441: \$? = $ac_status" >&5
++ echo "$as_me:9444: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ ac_R_space=yes
+ else
+@@ -9448,11 +9451,11 @@
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ if test $ac_R_space = yes; then
+- echo "$as_me:9451: result: yes" >&5
++ echo "$as_me:9454: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ X_LIBS="$X_LIBS -R $x_libraries"
+ else
+- echo "$as_me:9455: result: neither works" >&5
++ echo "$as_me:9458: result: neither works" >&5
+ echo "${ECHO_T}neither works" >&6
+ fi
+ fi
+@@ -9472,7 +9475,7 @@
+ # the Alpha needs dnet_stub (dnet does not exist).
+ ac_xsave_LIBS="$LIBS"; LIBS="$LIBS $X_LIBS -lX11"
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 9475 "configure"
++#line 9478 "configure"
+ #include "confdefs.h"
+
+ /* Override any gcc2 internal prototype to avoid an error. */
+@@ -9491,22 +9494,22 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:9494: \"$ac_link\"") >&5
++if { (eval echo "$as_me:9497: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:9497: \$? = $ac_status" >&5
++ echo "$as_me:9500: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -s conftest$ac_exeext'
+- { (eval echo "$as_me:9500: \"$ac_try\"") >&5
++ { (eval echo "$as_me:9503: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:9503: \$? = $ac_status" >&5
++ echo "$as_me:9506: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ :
+ else
+ echo "$as_me: failed program was:" >&5
+ cat conftest.$ac_ext >&5
+-echo "$as_me:9509: checking for dnet_ntoa in -ldnet" >&5
++echo "$as_me:9512: checking for dnet_ntoa in -ldnet" >&5
+ echo $ECHO_N "checking for dnet_ntoa in -ldnet... $ECHO_C" >&6
+ if test "${ac_cv_lib_dnet_dnet_ntoa+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -9514,7 +9517,7 @@
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-ldnet $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 9517 "configure"
++#line 9520 "configure"
+ #include "confdefs.h"
+
+ /* Override any gcc2 internal prototype to avoid an error. */
+@@ -9533,16 +9536,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:9536: \"$ac_link\"") >&5
++if { (eval echo "$as_me:9539: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:9539: \$? = $ac_status" >&5
++ echo "$as_me:9542: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -s conftest$ac_exeext'
+- { (eval echo "$as_me:9542: \"$ac_try\"") >&5
++ { (eval echo "$as_me:9545: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:9545: \$? = $ac_status" >&5
++ echo "$as_me:9548: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ ac_cv_lib_dnet_dnet_ntoa=yes
+ else
+@@ -9553,14 +9556,14 @@
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:9556: result: $ac_cv_lib_dnet_dnet_ntoa" >&5
++echo "$as_me:9559: result: $ac_cv_lib_dnet_dnet_ntoa" >&5
+ echo "${ECHO_T}$ac_cv_lib_dnet_dnet_ntoa" >&6
+ if test $ac_cv_lib_dnet_dnet_ntoa = yes; then
+ X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet"
+ fi
+
+ if test $ac_cv_lib_dnet_dnet_ntoa = no; then
+- echo "$as_me:9563: checking for dnet_ntoa in -ldnet_stub" >&5
++ echo "$as_me:9566: checking for dnet_ntoa in -ldnet_stub" >&5
+ echo $ECHO_N "checking for dnet_ntoa in -ldnet_stub... $ECHO_C" >&6
+ if test "${ac_cv_lib_dnet_stub_dnet_ntoa+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -9568,7 +9571,7 @@
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-ldnet_stub $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 9571 "configure"
++#line 9574 "configure"
+ #include "confdefs.h"
+
+ /* Override any gcc2 internal prototype to avoid an error. */
+@@ -9587,16 +9590,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:9590: \"$ac_link\"") >&5
++if { (eval echo "$as_me:9593: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:9593: \$? = $ac_status" >&5
++ echo "$as_me:9596: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -s conftest$ac_exeext'
+- { (eval echo "$as_me:9596: \"$ac_try\"") >&5
++ { (eval echo "$as_me:9599: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:9599: \$? = $ac_status" >&5
++ echo "$as_me:9602: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ ac_cv_lib_dnet_stub_dnet_ntoa=yes
+ else
+@@ -9607,7 +9610,7 @@
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:9610: result: $ac_cv_lib_dnet_stub_dnet_ntoa" >&5
++echo "$as_me:9613: result: $ac_cv_lib_dnet_stub_dnet_ntoa" >&5
+ echo "${ECHO_T}$ac_cv_lib_dnet_stub_dnet_ntoa" >&6
+ if test $ac_cv_lib_dnet_stub_dnet_ntoa = yes; then
+ X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet_stub"
+@@ -9626,13 +9629,13 @@
+ # on Irix 5.2, according to T.E. Dickey.
+ # The functions gethostbyname, getservbyname, and inet_addr are
+ # in -lbsd on LynxOS 3.0.1/i386, according to Lars Hecking.
+- echo "$as_me:9629: checking for gethostbyname" >&5
++ echo "$as_me:9632: checking for gethostbyname" >&5
+ echo $ECHO_N "checking for gethostbyname... $ECHO_C" >&6
+ if test "${ac_cv_func_gethostbyname+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 9635 "configure"
++#line 9638 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+ which can conflict with char gethostbyname (); below. */
+@@ -9663,16 +9666,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:9666: \"$ac_link\"") >&5
++if { (eval echo "$as_me:9669: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:9669: \$? = $ac_status" >&5
++ echo "$as_me:9672: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -s conftest$ac_exeext'
+- { (eval echo "$as_me:9672: \"$ac_try\"") >&5
++ { (eval echo "$as_me:9675: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:9675: \$? = $ac_status" >&5
++ echo "$as_me:9678: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ ac_cv_func_gethostbyname=yes
+ else
+@@ -9682,11 +9685,11 @@
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "$as_me:9685: result: $ac_cv_func_gethostbyname" >&5
++echo "$as_me:9688: result: $ac_cv_func_gethostbyname" >&5
+ echo "${ECHO_T}$ac_cv_func_gethostbyname" >&6
+
+ if test $ac_cv_func_gethostbyname = no; then
+- echo "$as_me:9689: checking for gethostbyname in -lnsl" >&5
++ echo "$as_me:9692: checking for gethostbyname in -lnsl" >&5
+ echo $ECHO_N "checking for gethostbyname in -lnsl... $ECHO_C" >&6
+ if test "${ac_cv_lib_nsl_gethostbyname+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -9694,7 +9697,7 @@
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lnsl $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 9697 "configure"
++#line 9700 "configure"
+ #include "confdefs.h"
+
+ /* Override any gcc2 internal prototype to avoid an error. */
+@@ -9713,16 +9716,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:9716: \"$ac_link\"") >&5
++if { (eval echo "$as_me:9719: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:9719: \$? = $ac_status" >&5
++ echo "$as_me:9722: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -s conftest$ac_exeext'
+- { (eval echo "$as_me:9722: \"$ac_try\"") >&5
++ { (eval echo "$as_me:9725: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:9725: \$? = $ac_status" >&5
++ echo "$as_me:9728: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ ac_cv_lib_nsl_gethostbyname=yes
+ else
+@@ -9733,14 +9736,14 @@
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:9736: result: $ac_cv_lib_nsl_gethostbyname" >&5
++echo "$as_me:9739: result: $ac_cv_lib_nsl_gethostbyname" >&5
+ echo "${ECHO_T}$ac_cv_lib_nsl_gethostbyname" >&6
+ if test $ac_cv_lib_nsl_gethostbyname = yes; then
+ X_EXTRA_LIBS="$X_EXTRA_LIBS -lnsl"
+ fi
+
+ if test $ac_cv_lib_nsl_gethostbyname = no; then
+- echo "$as_me:9743: checking for gethostbyname in -lbsd" >&5
++ echo "$as_me:9746: checking for gethostbyname in -lbsd" >&5
+ echo $ECHO_N "checking for gethostbyname in -lbsd... $ECHO_C" >&6
+ if test "${ac_cv_lib_bsd_gethostbyname+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -9748,7 +9751,7 @@
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lbsd $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 9751 "configure"
++#line 9754 "configure"
+ #include "confdefs.h"
+
+ /* Override any gcc2 internal prototype to avoid an error. */
+@@ -9767,16 +9770,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:9770: \"$ac_link\"") >&5
++if { (eval echo "$as_me:9773: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:9773: \$? = $ac_status" >&5
++ echo "$as_me:9776: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -s conftest$ac_exeext'
+- { (eval echo "$as_me:9776: \"$ac_try\"") >&5
++ { (eval echo "$as_me:9779: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:9779: \$? = $ac_status" >&5
++ echo "$as_me:9782: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ ac_cv_lib_bsd_gethostbyname=yes
+ else
+@@ -9787,7 +9790,7 @@
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:9790: result: $ac_cv_lib_bsd_gethostbyname" >&5
++echo "$as_me:9793: result: $ac_cv_lib_bsd_gethostbyname" >&5
+ echo "${ECHO_T}$ac_cv_lib_bsd_gethostbyname" >&6
+ if test $ac_cv_lib_bsd_gethostbyname = yes; then
+ X_EXTRA_LIBS="$X_EXTRA_LIBS -lbsd"
+@@ -9803,13 +9806,13 @@
+ # variants that don't use the nameserver (or something). -lsocket
+ # must be given before -lnsl if both are needed. We assume that
+ # if connect needs -lnsl, so does gethostbyname.
+- echo "$as_me:9806: checking for connect" >&5
++ echo "$as_me:9809: checking for connect" >&5
+ echo $ECHO_N "checking for connect... $ECHO_C" >&6
+ if test "${ac_cv_func_connect+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 9812 "configure"
++#line 9815 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+ which can conflict with char connect (); below. */
+@@ -9840,16 +9843,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:9843: \"$ac_link\"") >&5
++if { (eval echo "$as_me:9846: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:9846: \$? = $ac_status" >&5
++ echo "$as_me:9849: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -s conftest$ac_exeext'
+- { (eval echo "$as_me:9849: \"$ac_try\"") >&5
++ { (eval echo "$as_me:9852: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:9852: \$? = $ac_status" >&5
++ echo "$as_me:9855: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ ac_cv_func_connect=yes
+ else
+@@ -9859,11 +9862,11 @@
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "$as_me:9862: result: $ac_cv_func_connect" >&5
++echo "$as_me:9865: result: $ac_cv_func_connect" >&5
+ echo "${ECHO_T}$ac_cv_func_connect" >&6
+
+ if test $ac_cv_func_connect = no; then
+- echo "$as_me:9866: checking for connect in -lsocket" >&5
++ echo "$as_me:9869: checking for connect in -lsocket" >&5
+ echo $ECHO_N "checking for connect in -lsocket... $ECHO_C" >&6
+ if test "${ac_cv_lib_socket_connect+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -9871,7 +9874,7 @@
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lsocket $X_EXTRA_LIBS $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 9874 "configure"
++#line 9877 "configure"
+ #include "confdefs.h"
+
+ /* Override any gcc2 internal prototype to avoid an error. */
+@@ -9890,16 +9893,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:9893: \"$ac_link\"") >&5
++if { (eval echo "$as_me:9896: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:9896: \$? = $ac_status" >&5
++ echo "$as_me:9899: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -s conftest$ac_exeext'
+- { (eval echo "$as_me:9899: \"$ac_try\"") >&5
++ { (eval echo "$as_me:9902: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:9902: \$? = $ac_status" >&5
++ echo "$as_me:9905: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ ac_cv_lib_socket_connect=yes
+ else
+@@ -9910,7 +9913,7 @@
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:9913: result: $ac_cv_lib_socket_connect" >&5
++echo "$as_me:9916: result: $ac_cv_lib_socket_connect" >&5
+ echo "${ECHO_T}$ac_cv_lib_socket_connect" >&6
+ if test $ac_cv_lib_socket_connect = yes; then
+ X_EXTRA_LIBS="-lsocket $X_EXTRA_LIBS"
+@@ -9919,13 +9922,13 @@
+ fi
+
+ # Guillermo Gomez says -lposix is necessary on A/UX.
+- echo "$as_me:9922: checking for remove" >&5
++ echo "$as_me:9925: checking for remove" >&5
+ echo $ECHO_N "checking for remove... $ECHO_C" >&6
+ if test "${ac_cv_func_remove+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 9928 "configure"
++#line 9931 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+ which can conflict with char remove (); below. */
+@@ -9956,16 +9959,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:9959: \"$ac_link\"") >&5
++if { (eval echo "$as_me:9962: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:9962: \$? = $ac_status" >&5
++ echo "$as_me:9965: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -s conftest$ac_exeext'
+- { (eval echo "$as_me:9965: \"$ac_try\"") >&5
++ { (eval echo "$as_me:9968: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:9968: \$? = $ac_status" >&5
++ echo "$as_me:9971: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ ac_cv_func_remove=yes
+ else
+@@ -9975,11 +9978,11 @@
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "$as_me:9978: result: $ac_cv_func_remove" >&5
++echo "$as_me:9981: result: $ac_cv_func_remove" >&5
+ echo "${ECHO_T}$ac_cv_func_remove" >&6
+
+ if test $ac_cv_func_remove = no; then
+- echo "$as_me:9982: checking for remove in -lposix" >&5
++ echo "$as_me:9985: checking for remove in -lposix" >&5
+ echo $ECHO_N "checking for remove in -lposix... $ECHO_C" >&6
+ if test "${ac_cv_lib_posix_remove+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -9987,7 +9990,7 @@
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lposix $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 9990 "configure"
++#line 9993 "configure"
+ #include "confdefs.h"
+
+ /* Override any gcc2 internal prototype to avoid an error. */
+@@ -10006,16 +10009,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:10009: \"$ac_link\"") >&5
++if { (eval echo "$as_me:10012: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:10012: \$? = $ac_status" >&5
++ echo "$as_me:10015: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -s conftest$ac_exeext'
+- { (eval echo "$as_me:10015: \"$ac_try\"") >&5
++ { (eval echo "$as_me:10018: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:10018: \$? = $ac_status" >&5
++ echo "$as_me:10021: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ ac_cv_lib_posix_remove=yes
+ else
+@@ -10026,7 +10029,7 @@
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:10029: result: $ac_cv_lib_posix_remove" >&5
++echo "$as_me:10032: result: $ac_cv_lib_posix_remove" >&5
+ echo "${ECHO_T}$ac_cv_lib_posix_remove" >&6
+ if test $ac_cv_lib_posix_remove = yes; then
+ X_EXTRA_LIBS="$X_EXTRA_LIBS -lposix"
+@@ -10035,13 +10038,13 @@
+ fi
+
+ # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay.
+- echo "$as_me:10038: checking for shmat" >&5
++ echo "$as_me:10041: checking for shmat" >&5
+ echo $ECHO_N "checking for shmat... $ECHO_C" >&6
+ if test "${ac_cv_func_shmat+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 10044 "configure"
++#line 10047 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+ which can conflict with char shmat (); below. */
+@@ -10072,16 +10075,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:10075: \"$ac_link\"") >&5
++if { (eval echo "$as_me:10078: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:10078: \$? = $ac_status" >&5
++ echo "$as_me:10081: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -s conftest$ac_exeext'
+- { (eval echo "$as_me:10081: \"$ac_try\"") >&5
++ { (eval echo "$as_me:10084: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:10084: \$? = $ac_status" >&5
++ echo "$as_me:10087: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ ac_cv_func_shmat=yes
+ else
+@@ -10091,11 +10094,11 @@
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "$as_me:10094: result: $ac_cv_func_shmat" >&5
++echo "$as_me:10097: result: $ac_cv_func_shmat" >&5
+ echo "${ECHO_T}$ac_cv_func_shmat" >&6
+
+ if test $ac_cv_func_shmat = no; then
+- echo "$as_me:10098: checking for shmat in -lipc" >&5
++ echo "$as_me:10101: checking for shmat in -lipc" >&5
+ echo $ECHO_N "checking for shmat in -lipc... $ECHO_C" >&6
+ if test "${ac_cv_lib_ipc_shmat+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -10103,7 +10106,7 @@
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lipc $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 10106 "configure"
++#line 10109 "configure"
+ #include "confdefs.h"
+
+ /* Override any gcc2 internal prototype to avoid an error. */
+@@ -10122,16 +10125,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:10125: \"$ac_link\"") >&5
++if { (eval echo "$as_me:10128: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:10128: \$? = $ac_status" >&5
++ echo "$as_me:10131: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -s conftest$ac_exeext'
+- { (eval echo "$as_me:10131: \"$ac_try\"") >&5
++ { (eval echo "$as_me:10134: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:10134: \$? = $ac_status" >&5
++ echo "$as_me:10137: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ ac_cv_lib_ipc_shmat=yes
+ else
+@@ -10142,7 +10145,7 @@
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:10145: result: $ac_cv_lib_ipc_shmat" >&5
++echo "$as_me:10148: result: $ac_cv_lib_ipc_shmat" >&5
+ echo "${ECHO_T}$ac_cv_lib_ipc_shmat" >&6
+ if test $ac_cv_lib_ipc_shmat = yes; then
+ X_EXTRA_LIBS="$X_EXTRA_LIBS -lipc"
+@@ -10160,7 +10163,7 @@
+ # These have to be linked with before -lX11, unlike the other
+ # libraries we check for below, so use a different variable.
+ # John Interrante, Karl Berry
+- echo "$as_me:10163: checking for IceConnectionNumber in -lICE" >&5
++ echo "$as_me:10166: checking for IceConnectionNumber in -lICE" >&5
+ echo $ECHO_N "checking for IceConnectionNumber in -lICE... $ECHO_C" >&6
+ if test "${ac_cv_lib_ICE_IceConnectionNumber+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -10168,7 +10171,7 @@
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lICE $X_EXTRA_LIBS $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 10171 "configure"
++#line 10174 "configure"
+ #include "confdefs.h"
+
+ /* Override any gcc2 internal prototype to avoid an error. */
+@@ -10187,16 +10190,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:10190: \"$ac_link\"") >&5
++if { (eval echo "$as_me:10193: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:10193: \$? = $ac_status" >&5
++ echo "$as_me:10196: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -s conftest$ac_exeext'
+- { (eval echo "$as_me:10196: \"$ac_try\"") >&5
++ { (eval echo "$as_me:10199: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:10199: \$? = $ac_status" >&5
++ echo "$as_me:10202: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ ac_cv_lib_ICE_IceConnectionNumber=yes
+ else
+@@ -10207,7 +10210,7 @@
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:10210: result: $ac_cv_lib_ICE_IceConnectionNumber" >&5
++echo "$as_me:10213: result: $ac_cv_lib_ICE_IceConnectionNumber" >&5
+ echo "${ECHO_T}$ac_cv_lib_ICE_IceConnectionNumber" >&6
+ if test $ac_cv_lib_ICE_IceConnectionNumber = yes; then
+ X_PRE_LIBS="$X_PRE_LIBS -lSM -lICE"
+@@ -10219,7 +10222,7 @@
+
+ cf_x_athena=${cf_x_athena:-Xaw}
+
+-echo "$as_me:10222: checking if you want to link with Xaw 3d library" >&5
++echo "$as_me:10225: checking if you want to link with Xaw 3d library" >&5
+ echo $ECHO_N "checking if you want to link with Xaw 3d library... $ECHO_C" >&6
+ withval=
+
+@@ -10230,14 +10233,14 @@
+ fi;
+ if test "$withval" = yes ; then
+ cf_x_athena=Xaw3d
+- echo "$as_me:10233: result: yes" >&5
++ echo "$as_me:10236: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ else
+- echo "$as_me:10236: result: no" >&5
++ echo "$as_me:10239: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+
+-echo "$as_me:10240: checking if you want to link with Xaw 3d xft library" >&5
++echo "$as_me:10243: checking if you want to link with Xaw 3d xft library" >&5
+ echo $ECHO_N "checking if you want to link with Xaw 3d xft library... $ECHO_C" >&6
+ withval=
+
+@@ -10248,14 +10251,14 @@
+ fi;
+ if test "$withval" = yes ; then
+ cf_x_athena=Xaw3dxft
+- echo "$as_me:10251: result: yes" >&5
++ echo "$as_me:10254: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ else
+- echo "$as_me:10254: result: no" >&5
++ echo "$as_me:10257: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+
+-echo "$as_me:10258: checking if you want to link with neXT Athena library" >&5
++echo "$as_me:10261: checking if you want to link with neXT Athena library" >&5
+ echo $ECHO_N "checking if you want to link with neXT Athena library... $ECHO_C" >&6
+ withval=
+
+@@ -10266,14 +10269,14 @@
+ fi;
+ if test "$withval" = yes ; then
+ cf_x_athena=neXtaw
+- echo "$as_me:10269: result: yes" >&5
++ echo "$as_me:10272: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ else
+- echo "$as_me:10272: result: no" >&5
++ echo "$as_me:10275: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+
+-echo "$as_me:10276: checking if you want to link with Athena-Plus library" >&5
++echo "$as_me:10279: checking if you want to link with Athena-Plus library" >&5
+ echo $ECHO_N "checking if you want to link with Athena-Plus library... $ECHO_C" >&6
+ withval=
+
+@@ -10284,10 +10287,10 @@
+ fi;
+ if test "$withval" = yes ; then
+ cf_x_athena=XawPlus
+- echo "$as_me:10287: result: yes" >&5
++ echo "$as_me:10290: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ else
+- echo "$as_me:10290: result: no" >&5
++ echo "$as_me:10293: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+
+@@ -10307,17 +10310,17 @@
+ if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists $cf_athena_pkg; then
+ test -n "$verbose" && echo " found package $cf_athena_pkg" 1>&6
+
+-echo "${as_me:-configure}:10310: testing found package $cf_athena_pkg ..." 1>&5
++echo "${as_me:-configure}:10313: testing found package $cf_athena_pkg ..." 1>&5
+
+ cf_pkgconfig_incs="`$PKG_CONFIG --cflags $cf_athena_pkg 2>/dev/null`"
+ cf_pkgconfig_libs="`$PKG_CONFIG --libs $cf_athena_pkg 2>/dev/null`"
+ test -n "$verbose" && echo " package $cf_athena_pkg CFLAGS: $cf_pkgconfig_incs" 1>&6
+
+-echo "${as_me:-configure}:10316: testing package $cf_athena_pkg CFLAGS: $cf_pkgconfig_incs ..." 1>&5
++echo "${as_me:-configure}:10319: testing package $cf_athena_pkg CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+
+ test -n "$verbose" && echo " package $cf_athena_pkg LIBS: $cf_pkgconfig_libs" 1>&6
+
+-echo "${as_me:-configure}:10320: testing package $cf_athena_pkg LIBS: $cf_pkgconfig_libs ..." 1>&5
++echo "${as_me:-configure}:10323: testing package $cf_athena_pkg LIBS: $cf_pkgconfig_libs ..." 1>&5
+
+ cf_fix_cppflags=no
+ cf_new_cflags=
+@@ -10428,20 +10431,20 @@
+ LIBS=`echo "$LIBS " | sed -e 's/ / /g' -e 's%-l'"$cf_trim_lib"' %%' -e 's/ $//'`
+ test -n "$verbose" && echo " ..trimmed $LIBS" 1>&6
+
+-echo "${as_me:-configure}:10431: testing ..trimmed $LIBS ..." 1>&5
++echo "${as_me:-configure}:10434: testing ..trimmed $LIBS ..." 1>&5
+
+ ;;
+ esac
+ done
+
+-echo "$as_me:10437: checking for usable $cf_x_athena/Xmu package" >&5
++echo "$as_me:10440: checking for usable $cf_x_athena/Xmu package" >&5
+ echo $ECHO_N "checking for usable $cf_x_athena/Xmu package... $ECHO_C" >&6
+ if test "${cf_cv_xaw_compat+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 10444 "configure"
++#line 10447 "configure"
+ #include "confdefs.h"
+
+ #include <X11/Xmu/CharSet.h>
+@@ -10457,16 +10460,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:10460: \"$ac_link\"") >&5
++if { (eval echo "$as_me:10463: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:10463: \$? = $ac_status" >&5
++ echo "$as_me:10466: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -s conftest$ac_exeext'
+- { (eval echo "$as_me:10466: \"$ac_try\"") >&5
++ { (eval echo "$as_me:10469: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:10469: \$? = $ac_status" >&5
++ echo "$as_me:10472: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ cf_cv_xaw_compat=yes
+ else
+@@ -10476,7 +10479,7 @@
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "$as_me:10479: result: $cf_cv_xaw_compat" >&5
++echo "$as_me:10482: result: $cf_cv_xaw_compat" >&5
+ echo "${ECHO_T}$cf_cv_xaw_compat" >&6
+
+ if test "$cf_cv_xaw_compat" = no
+@@ -10488,7 +10491,7 @@
+ (*)
+ test -n "$verbose" && echo " work around broken package" 1>&6
+
+-echo "${as_me:-configure}:10491: testing work around broken package ..." 1>&5
++echo "${as_me:-configure}:10494: testing work around broken package ..." 1>&5
+
+ cf_save_xmu="$LIBS"
+ cf_first_lib=`echo "$cf_save_xmu" | sed -e 's/^ *//' -e 's/ .*//'`
+@@ -10496,17 +10499,17 @@
+ if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists xmu; then
+ test -n "$verbose" && echo " found package xmu" 1>&6
+
+-echo "${as_me:-configure}:10499: testing found package xmu ..." 1>&5
++echo "${as_me:-configure}:10502: testing found package xmu ..." 1>&5
+
+ cf_pkgconfig_incs="`$PKG_CONFIG --cflags xmu 2>/dev/null`"
+ cf_pkgconfig_libs="`$PKG_CONFIG --libs xmu 2>/dev/null`"
+ test -n "$verbose" && echo " package xmu CFLAGS: $cf_pkgconfig_incs" 1>&6
+
+-echo "${as_me:-configure}:10505: testing package xmu CFLAGS: $cf_pkgconfig_incs ..." 1>&5
++echo "${as_me:-configure}:10508: testing package xmu CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+
+ test -n "$verbose" && echo " package xmu LIBS: $cf_pkgconfig_libs" 1>&6
+
+-echo "${as_me:-configure}:10509: testing package xmu LIBS: $cf_pkgconfig_libs ..." 1>&5
++echo "${as_me:-configure}:10512: testing package xmu LIBS: $cf_pkgconfig_libs ..." 1>&5
+
+ cf_fix_cppflags=no
+ cf_new_cflags=
+@@ -10606,12 +10609,12 @@
+
+ test -n "$verbose" && echo " ...before $LIBS" 1>&6
+
+-echo "${as_me:-configure}:10609: testing ...before $LIBS ..." 1>&5
++echo "${as_me:-configure}:10612: testing ...before $LIBS ..." 1>&5
+
+ LIBS=`echo "$LIBS" | sed -e "s/[ ][ ]*/ /g" -e "s%$cf_first_lib %$cf_first_lib $cf_pkgconfig_libs %" -e 's% % %g'`
+ test -n "$verbose" && echo " ...after $LIBS" 1>&6
+
+-echo "${as_me:-configure}:10614: testing ...after $LIBS ..." 1>&5
++echo "${as_me:-configure}:10617: testing ...after $LIBS ..." 1>&5
+
+ else
+ cf_pkgconfig_incs=
+@@ -10619,12 +10622,12 @@
+
+ test -n "$verbose" && echo " ...before $LIBS" 1>&6
+
+-echo "${as_me:-configure}:10622: testing ...before $LIBS ..." 1>&5
++echo "${as_me:-configure}:10625: testing ...before $LIBS ..." 1>&5
+
+ LIBS=`echo "$LIBS" | sed -e "s/[ ][ ]*/ /g" -e "s%$cf_first_lib %$cf_first_lib -lXmu %" -e 's% % %g'`
+ test -n "$verbose" && echo " ...after $LIBS" 1>&6
+
+-echo "${as_me:-configure}:10627: testing ...after $LIBS ..." 1>&5
++echo "${as_me:-configure}:10630: testing ...after $LIBS ..." 1>&5
+
+ fi
+
+@@ -10635,7 +10638,7 @@
+ LIBS=`echo "$LIBS " | sed -e 's/ / /g' -e 's%-l'"$cf_trim_lib"' %%' -e 's/ $//'`
+ test -n "$verbose" && echo " ..trimmed $LIBS" 1>&6
+
+-echo "${as_me:-configure}:10638: testing ..trimmed $LIBS ..." 1>&5
++echo "${as_me:-configure}:10641: testing ..trimmed $LIBS ..." 1>&5
+
+ ;;
+ esac
+@@ -10660,17 +10663,17 @@
+ if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists Xext; then
+ test -n "$verbose" && echo " found package Xext" 1>&6
+
+-echo "${as_me:-configure}:10663: testing found package Xext ..." 1>&5
++echo "${as_me:-configure}:10666: testing found package Xext ..." 1>&5
+
+ cf_pkgconfig_incs="`$PKG_CONFIG --cflags Xext 2>/dev/null`"
+ cf_pkgconfig_libs="`$PKG_CONFIG --libs Xext 2>/dev/null`"
+ test -n "$verbose" && echo " package Xext CFLAGS: $cf_pkgconfig_incs" 1>&6
+
+-echo "${as_me:-configure}:10669: testing package Xext CFLAGS: $cf_pkgconfig_incs ..." 1>&5
++echo "${as_me:-configure}:10672: testing package Xext CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+
+ test -n "$verbose" && echo " package Xext LIBS: $cf_pkgconfig_libs" 1>&6
+
+-echo "${as_me:-configure}:10673: testing package Xext LIBS: $cf_pkgconfig_libs ..." 1>&5
++echo "${as_me:-configure}:10676: testing package Xext LIBS: $cf_pkgconfig_libs ..." 1>&5
+
+ cf_fix_cppflags=no
+ cf_new_cflags=
+@@ -10771,7 +10774,7 @@
+ cf_pkgconfig_incs=
+ cf_pkgconfig_libs=
+
+- echo "$as_me:10774: checking for XextCreateExtension in -lXext" >&5
++ echo "$as_me:10777: checking for XextCreateExtension in -lXext" >&5
+ echo $ECHO_N "checking for XextCreateExtension in -lXext... $ECHO_C" >&6
+ if test "${ac_cv_lib_Xext_XextCreateExtension+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -10779,7 +10782,7 @@
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lXext $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 10782 "configure"
++#line 10785 "configure"
+ #include "confdefs.h"
+
+ /* Override any gcc2 internal prototype to avoid an error. */
+@@ -10798,16 +10801,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:10801: \"$ac_link\"") >&5
++if { (eval echo "$as_me:10804: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:10804: \$? = $ac_status" >&5
++ echo "$as_me:10807: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -s conftest$ac_exeext'
+- { (eval echo "$as_me:10807: \"$ac_try\"") >&5
++ { (eval echo "$as_me:10810: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:10810: \$? = $ac_status" >&5
++ echo "$as_me:10813: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ ac_cv_lib_Xext_XextCreateExtension=yes
+ else
+@@ -10818,7 +10821,7 @@
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:10821: result: $ac_cv_lib_Xext_XextCreateExtension" >&5
++echo "$as_me:10824: result: $ac_cv_lib_Xext_XextCreateExtension" >&5
+ echo "${ECHO_T}$ac_cv_lib_Xext_XextCreateExtension" >&6
+ if test $ac_cv_lib_Xext_XextCreateExtension = yes; then
+
+@@ -10854,17 +10857,17 @@
+ if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists x11; then
+ test -n "$verbose" && echo " found package x11" 1>&6
+
+-echo "${as_me:-configure}:10857: testing found package x11 ..." 1>&5
++echo "${as_me:-configure}:10860: testing found package x11 ..." 1>&5
+
+ cf_pkgconfig_incs="`$PKG_CONFIG --cflags x11 2>/dev/null`"
+ cf_pkgconfig_libs="`$PKG_CONFIG --libs x11 2>/dev/null`"
+ test -n "$verbose" && echo " package x11 CFLAGS: $cf_pkgconfig_incs" 1>&6
+
+-echo "${as_me:-configure}:10863: testing package x11 CFLAGS: $cf_pkgconfig_incs ..." 1>&5
++echo "${as_me:-configure}:10866: testing package x11 CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+
+ test -n "$verbose" && echo " package x11 LIBS: $cf_pkgconfig_libs" 1>&6
+
+-echo "${as_me:-configure}:10867: testing package x11 LIBS: $cf_pkgconfig_libs ..." 1>&5
++echo "${as_me:-configure}:10870: testing package x11 LIBS: $cf_pkgconfig_libs ..." 1>&5
+
+ cf_fix_cppflags=no
+ cf_new_cflags=
+@@ -10964,24 +10967,24 @@
+ else
+ cf_pkgconfig_incs=
+ cf_pkgconfig_libs=
+- { echo "$as_me:10967: WARNING: unable to find X11 library" >&5
++ { echo "$as_me:10970: WARNING: unable to find X11 library" >&5
+ echo "$as_me: WARNING: unable to find X11 library" >&2;}
+ fi
+
+ if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists ice; then
+ test -n "$verbose" && echo " found package ice" 1>&6
+
+-echo "${as_me:-configure}:10974: testing found package ice ..." 1>&5
++echo "${as_me:-configure}:10977: testing found package ice ..." 1>&5
+
+ cf_pkgconfig_incs="`$PKG_CONFIG --cflags ice 2>/dev/null`"
+ cf_pkgconfig_libs="`$PKG_CONFIG --libs ice 2>/dev/null`"
+ test -n "$verbose" && echo " package ice CFLAGS: $cf_pkgconfig_incs" 1>&6
+
+-echo "${as_me:-configure}:10980: testing package ice CFLAGS: $cf_pkgconfig_incs ..." 1>&5
++echo "${as_me:-configure}:10983: testing package ice CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+
+ test -n "$verbose" && echo " package ice LIBS: $cf_pkgconfig_libs" 1>&6
+
+-echo "${as_me:-configure}:10984: testing package ice LIBS: $cf_pkgconfig_libs ..." 1>&5
++echo "${as_me:-configure}:10987: testing package ice LIBS: $cf_pkgconfig_libs ..." 1>&5
+
+ cf_fix_cppflags=no
+ cf_new_cflags=
+@@ -11081,24 +11084,24 @@
+ else
+ cf_pkgconfig_incs=
+ cf_pkgconfig_libs=
+- { echo "$as_me:11084: WARNING: unable to find ICE library" >&5
++ { echo "$as_me:11087: WARNING: unable to find ICE library" >&5
+ echo "$as_me: WARNING: unable to find ICE library" >&2;}
+ fi
+
+ if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists sm; then
+ test -n "$verbose" && echo " found package sm" 1>&6
+
+-echo "${as_me:-configure}:11091: testing found package sm ..." 1>&5
++echo "${as_me:-configure}:11094: testing found package sm ..." 1>&5
+
+ cf_pkgconfig_incs="`$PKG_CONFIG --cflags sm 2>/dev/null`"
+ cf_pkgconfig_libs="`$PKG_CONFIG --libs sm 2>/dev/null`"
+ test -n "$verbose" && echo " package sm CFLAGS: $cf_pkgconfig_incs" 1>&6
+
+-echo "${as_me:-configure}:11097: testing package sm CFLAGS: $cf_pkgconfig_incs ..." 1>&5
++echo "${as_me:-configure}:11100: testing package sm CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+
+ test -n "$verbose" && echo " package sm LIBS: $cf_pkgconfig_libs" 1>&6
+
+-echo "${as_me:-configure}:11101: testing package sm LIBS: $cf_pkgconfig_libs ..." 1>&5
++echo "${as_me:-configure}:11104: testing package sm LIBS: $cf_pkgconfig_libs ..." 1>&5
+
+ cf_fix_cppflags=no
+ cf_new_cflags=
+@@ -11198,24 +11201,24 @@
+ else
+ cf_pkgconfig_incs=
+ cf_pkgconfig_libs=
+- { echo "$as_me:11201: WARNING: unable to find SM library" >&5
++ { echo "$as_me:11204: WARNING: unable to find SM library" >&5
+ echo "$as_me: WARNING: unable to find SM library" >&2;}
+ fi
+
+ if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists xt; then
+ test -n "$verbose" && echo " found package xt" 1>&6
+
+-echo "${as_me:-configure}:11208: testing found package xt ..." 1>&5
++echo "${as_me:-configure}:11211: testing found package xt ..." 1>&5
+
+ cf_pkgconfig_incs="`$PKG_CONFIG --cflags xt 2>/dev/null`"
+ cf_pkgconfig_libs="`$PKG_CONFIG --libs xt 2>/dev/null`"
+ test -n "$verbose" && echo " package xt CFLAGS: $cf_pkgconfig_incs" 1>&6
+
+-echo "${as_me:-configure}:11214: testing package xt CFLAGS: $cf_pkgconfig_incs ..." 1>&5
++echo "${as_me:-configure}:11217: testing package xt CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+
+ test -n "$verbose" && echo " package xt LIBS: $cf_pkgconfig_libs" 1>&6
+
+-echo "${as_me:-configure}:11218: testing package xt LIBS: $cf_pkgconfig_libs ..." 1>&5
++echo "${as_me:-configure}:11221: testing package xt LIBS: $cf_pkgconfig_libs ..." 1>&5
+
+ cf_fix_cppflags=no
+ cf_new_cflags=
+@@ -11315,7 +11318,7 @@
+ else
+ cf_pkgconfig_incs=
+ cf_pkgconfig_libs=
+- { echo "$as_me:11318: WARNING: unable to find Xt library" >&5
++ { echo "$as_me:11321: WARNING: unable to find Xt library" >&5
+ echo "$as_me: WARNING: unable to find Xt library" >&2;}
+ fi
+
+@@ -11326,17 +11329,17 @@
+ if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists xt; then
+ test -n "$verbose" && echo " found package xt" 1>&6
+
+-echo "${as_me:-configure}:11329: testing found package xt ..." 1>&5
++echo "${as_me:-configure}:11332: testing found package xt ..." 1>&5
+
+ cf_pkgconfig_incs="`$PKG_CONFIG --cflags xt 2>/dev/null`"
+ cf_pkgconfig_libs="`$PKG_CONFIG --libs xt 2>/dev/null`"
+ test -n "$verbose" && echo " package xt CFLAGS: $cf_pkgconfig_incs" 1>&6
+
+-echo "${as_me:-configure}:11335: testing package xt CFLAGS: $cf_pkgconfig_incs ..." 1>&5
++echo "${as_me:-configure}:11338: testing package xt CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+
+ test -n "$verbose" && echo " package xt LIBS: $cf_pkgconfig_libs" 1>&6
+
+-echo "${as_me:-configure}:11339: testing package xt LIBS: $cf_pkgconfig_libs ..." 1>&5
++echo "${as_me:-configure}:11342: testing package xt LIBS: $cf_pkgconfig_libs ..." 1>&5
+
+ cf_fix_cppflags=no
+ cf_new_cflags=
+@@ -11437,14 +11440,14 @@
+ ;;
+ (*)
+ # we have an "xt" package, but it may omit Xt's dependency on X11
+-echo "$as_me:11440: checking for usable X dependency" >&5
++echo "$as_me:11443: checking for usable X dependency" >&5
+ echo $ECHO_N "checking for usable X dependency... $ECHO_C" >&6
+ if test "${cf_cv_xt_x11_compat+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 11447 "configure"
++#line 11450 "configure"
+ #include "confdefs.h"
+
+ #include <X11/Xlib.h>
+@@ -11463,16 +11466,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:11466: \"$ac_link\"") >&5
++if { (eval echo "$as_me:11469: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:11469: \$? = $ac_status" >&5
++ echo "$as_me:11472: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -s conftest$ac_exeext'
+- { (eval echo "$as_me:11472: \"$ac_try\"") >&5
++ { (eval echo "$as_me:11475: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:11475: \$? = $ac_status" >&5
++ echo "$as_me:11478: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ cf_cv_xt_x11_compat=yes
+ else
+@@ -11482,30 +11485,30 @@
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "$as_me:11485: result: $cf_cv_xt_x11_compat" >&5
++echo "$as_me:11488: result: $cf_cv_xt_x11_compat" >&5
+ echo "${ECHO_T}$cf_cv_xt_x11_compat" >&6
+ if test "$cf_cv_xt_x11_compat" = no
+ then
+ test -n "$verbose" && echo " work around broken X11 dependency" 1>&6
+
+-echo "${as_me:-configure}:11491: testing work around broken X11 dependency ..." 1>&5
++echo "${as_me:-configure}:11494: testing work around broken X11 dependency ..." 1>&5
+
+ # 2010/11/19 - good enough until a working Xt on Xcb is delivered.
+
+ if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists x11; then
+ test -n "$verbose" && echo " found package x11" 1>&6
+
+-echo "${as_me:-configure}:11498: testing found package x11 ..." 1>&5
++echo "${as_me:-configure}:11501: testing found package x11 ..." 1>&5
+
+ cf_pkgconfig_incs="`$PKG_CONFIG --cflags x11 2>/dev/null`"
+ cf_pkgconfig_libs="`$PKG_CONFIG --libs x11 2>/dev/null`"
+ test -n "$verbose" && echo " package x11 CFLAGS: $cf_pkgconfig_incs" 1>&6
+
+-echo "${as_me:-configure}:11504: testing package x11 CFLAGS: $cf_pkgconfig_incs ..." 1>&5
++echo "${as_me:-configure}:11507: testing package x11 CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+
+ test -n "$verbose" && echo " package x11 LIBS: $cf_pkgconfig_libs" 1>&6
+
+-echo "${as_me:-configure}:11508: testing package x11 LIBS: $cf_pkgconfig_libs ..." 1>&5
++echo "${as_me:-configure}:11511: testing package x11 LIBS: $cf_pkgconfig_libs ..." 1>&5
+
+ cf_fix_cppflags=no
+ cf_new_cflags=
+@@ -11608,12 +11611,12 @@
+
+ test -n "$verbose" && echo " ...before $LIBS" 1>&6
+
+-echo "${as_me:-configure}:11611: testing ...before $LIBS ..." 1>&5
++echo "${as_me:-configure}:11614: testing ...before $LIBS ..." 1>&5
+
+ LIBS=`echo "$LIBS" | sed -e "s/[ ][ ]*/ /g" -e "s%-lXt %-lXt -lX11 %" -e 's% % %g'`
+ test -n "$verbose" && echo " ...after $LIBS" 1>&6
+
+-echo "${as_me:-configure}:11616: testing ...after $LIBS ..." 1>&5
++echo "${as_me:-configure}:11619: testing ...after $LIBS ..." 1>&5
+
+ fi
+
+@@ -11621,14 +11624,14 @@
+ ;;
+ esac
+
+-echo "$as_me:11624: checking for usable X Toolkit package" >&5
++echo "$as_me:11627: checking for usable X Toolkit package" >&5
+ echo $ECHO_N "checking for usable X Toolkit package... $ECHO_C" >&6
+ if test "${cf_cv_xt_ice_compat+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 11631 "configure"
++#line 11634 "configure"
+ #include "confdefs.h"
+
+ #include <X11/Shell.h>
+@@ -11643,16 +11646,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:11646: \"$ac_link\"") >&5
++if { (eval echo "$as_me:11649: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:11649: \$? = $ac_status" >&5
++ echo "$as_me:11652: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -s conftest$ac_exeext'
+- { (eval echo "$as_me:11652: \"$ac_try\"") >&5
++ { (eval echo "$as_me:11655: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:11655: \$? = $ac_status" >&5
++ echo "$as_me:11658: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ cf_cv_xt_ice_compat=yes
+ else
+@@ -11662,7 +11665,7 @@
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "$as_me:11665: result: $cf_cv_xt_ice_compat" >&5
++echo "$as_me:11668: result: $cf_cv_xt_ice_compat" >&5
+ echo "${ECHO_T}$cf_cv_xt_ice_compat" >&6
+
+ if test "$cf_cv_xt_ice_compat" = no
+@@ -11676,22 +11679,22 @@
+ (*)
+ test -n "$verbose" && echo " work around broken ICE dependency" 1>&6
+
+-echo "${as_me:-configure}:11679: testing work around broken ICE dependency ..." 1>&5
++echo "${as_me:-configure}:11682: testing work around broken ICE dependency ..." 1>&5
+
+ if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists ice; then
+ test -n "$verbose" && echo " found package ice" 1>&6
+
+-echo "${as_me:-configure}:11684: testing found package ice ..." 1>&5
++echo "${as_me:-configure}:11687: testing found package ice ..." 1>&5
+
+ cf_pkgconfig_incs="`$PKG_CONFIG --cflags ice 2>/dev/null`"
+ cf_pkgconfig_libs="`$PKG_CONFIG --libs ice 2>/dev/null`"
+ test -n "$verbose" && echo " package ice CFLAGS: $cf_pkgconfig_incs" 1>&6
+
+-echo "${as_me:-configure}:11690: testing package ice CFLAGS: $cf_pkgconfig_incs ..." 1>&5
++echo "${as_me:-configure}:11693: testing package ice CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+
+ test -n "$verbose" && echo " package ice LIBS: $cf_pkgconfig_libs" 1>&6
+
+-echo "${as_me:-configure}:11694: testing package ice LIBS: $cf_pkgconfig_libs ..." 1>&5
++echo "${as_me:-configure}:11697: testing package ice LIBS: $cf_pkgconfig_libs ..." 1>&5
+
+ cf_fix_cppflags=no
+ cf_new_cflags=
+@@ -11790,17 +11793,17 @@
+ if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists sm; then
+ test -n "$verbose" && echo " found package sm" 1>&6
+
+-echo "${as_me:-configure}:11793: testing found package sm ..." 1>&5
++echo "${as_me:-configure}:11796: testing found package sm ..." 1>&5
+
+ cf_pkgconfig_incs="`$PKG_CONFIG --cflags sm 2>/dev/null`"
+ cf_pkgconfig_libs="`$PKG_CONFIG --libs sm 2>/dev/null`"
+ test -n "$verbose" && echo " package sm CFLAGS: $cf_pkgconfig_incs" 1>&6
+
+-echo "${as_me:-configure}:11799: testing package sm CFLAGS: $cf_pkgconfig_incs ..." 1>&5
++echo "${as_me:-configure}:11802: testing package sm CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+
+ test -n "$verbose" && echo " package sm LIBS: $cf_pkgconfig_libs" 1>&6
+
+-echo "${as_me:-configure}:11803: testing package sm LIBS: $cf_pkgconfig_libs ..." 1>&5
++echo "${as_me:-configure}:11806: testing package sm LIBS: $cf_pkgconfig_libs ..." 1>&5
+
+ cf_fix_cppflags=no
+ cf_new_cflags=
+@@ -11909,12 +11912,12 @@
+
+ test -n "$verbose" && echo " ...before $LIBS" 1>&6
+
+-echo "${as_me:-configure}:11912: testing ...before $LIBS ..." 1>&5
++echo "${as_me:-configure}:11915: testing ...before $LIBS ..." 1>&5
+
+ LIBS=`echo "$LIBS" | sed -e "s/[ ][ ]*/ /g" -e "s%-lXt %-lXt $X_PRE_LIBS %" -e 's% % %g'`
+ test -n "$verbose" && echo " ...after $LIBS" 1>&6
+
+-echo "${as_me:-configure}:11917: testing ...after $LIBS ..." 1>&5
++echo "${as_me:-configure}:11920: testing ...after $LIBS ..." 1>&5
+
+ fi
+
+@@ -11934,7 +11937,7 @@
+
+ test -n "$verbose" && echo " checking additions to CFLAGS" 1>&6
+
+-echo "${as_me:-configure}:11937: testing checking additions to CFLAGS ..." 1>&5
++echo "${as_me:-configure}:11940: testing checking additions to CFLAGS ..." 1>&5
+
+ cf_check_cflags="$CFLAGS"
+ cf_check_cppflags="$CPPFLAGS"
+@@ -12005,7 +12008,7 @@
+ if test -n "$cf_new_cflags" ; then
+ test -n "$verbose" && echo " add to \$CFLAGS $cf_new_cflags" 1>&6
+
+-echo "${as_me:-configure}:12008: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
++echo "${as_me:-configure}:12011: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
+
+ CFLAGS="$CFLAGS $cf_new_cflags"
+ fi
+@@ -12013,7 +12016,7 @@
+ if test -n "$cf_new_cppflags" ; then
+ test -n "$verbose" && echo " add to \$CPPFLAGS $cf_new_cppflags" 1>&6
+
+-echo "${as_me:-configure}:12016: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
++echo "${as_me:-configure}:12019: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
+
+ CPPFLAGS="$CPPFLAGS $cf_new_cppflags"
+ fi
+@@ -12021,14 +12024,14 @@
+ 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}:12024: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5
++echo "${as_me:-configure}:12027: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5
+
+ EXTRA_CPPFLAGS="$cf_new_extra_cppflags $EXTRA_CPPFLAGS"
+ fi
+
+ if test "x$cf_check_cflags" != "x$CFLAGS" ; then
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 12031 "configure"
++#line 12034 "configure"
+ #include "confdefs.h"
+ #include <stdio.h>
+ int
+@@ -12040,16 +12043,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:12043: \"$ac_link\"") >&5
++if { (eval echo "$as_me:12046: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:12046: \$? = $ac_status" >&5
++ echo "$as_me:12049: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -s conftest$ac_exeext'
+- { (eval echo "$as_me:12049: \"$ac_try\"") >&5
++ { (eval echo "$as_me:12052: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:12052: \$? = $ac_status" >&5
++ echo "$as_me:12055: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ :
+ else
+@@ -12057,12 +12060,12 @@
+ cat conftest.$ac_ext >&5
+ test -n "$verbose" && echo " test-compile failed. Undoing change to \$CFLAGS" 1>&6
+
+-echo "${as_me:-configure}:12060: testing test-compile failed. Undoing change to \$CFLAGS ..." 1>&5
++echo "${as_me:-configure}:12063: testing test-compile failed. Undoing change to \$CFLAGS ..." 1>&5
+
+ if test "x$cf_check_cppflags" != "x$CPPFLAGS" ; then
+ test -n "$verbose" && echo " but keeping change to \$CPPFLAGS" 1>&6
+
+-echo "${as_me:-configure}:12065: testing but keeping change to \$CPPFLAGS ..." 1>&5
++echo "${as_me:-configure}:12068: testing but keeping change to \$CPPFLAGS ..." 1>&5
+
+ fi
+ CFLAGS="$cf_check_flags"
+@@ -12070,13 +12073,13 @@
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ fi
+
+- echo "$as_me:12073: checking for XOpenDisplay" >&5
++ echo "$as_me:12076: checking for XOpenDisplay" >&5
+ echo $ECHO_N "checking for XOpenDisplay... $ECHO_C" >&6
+ if test "${ac_cv_func_XOpenDisplay+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 12079 "configure"
++#line 12082 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+ which can conflict with char XOpenDisplay (); below. */
+@@ -12107,16 +12110,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:12110: \"$ac_link\"") >&5
++if { (eval echo "$as_me:12113: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:12113: \$? = $ac_status" >&5
++ echo "$as_me:12116: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -s conftest$ac_exeext'
+- { (eval echo "$as_me:12116: \"$ac_try\"") >&5
++ { (eval echo "$as_me:12119: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:12119: \$? = $ac_status" >&5
++ echo "$as_me:12122: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ ac_cv_func_XOpenDisplay=yes
+ else
+@@ -12126,13 +12129,13 @@
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "$as_me:12129: result: $ac_cv_func_XOpenDisplay" >&5
++echo "$as_me:12132: result: $ac_cv_func_XOpenDisplay" >&5
+ echo "${ECHO_T}$ac_cv_func_XOpenDisplay" >&6
+ if test $ac_cv_func_XOpenDisplay = yes; then
+ :
+ else
+
+- echo "$as_me:12135: checking for XOpenDisplay in -lX11" >&5
++ echo "$as_me:12138: checking for XOpenDisplay in -lX11" >&5
+ echo $ECHO_N "checking for XOpenDisplay in -lX11... $ECHO_C" >&6
+ if test "${ac_cv_lib_X11_XOpenDisplay+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -12140,7 +12143,7 @@
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lX11 $X_PRE_LIBS $LIBS $X_EXTRA_LIBS $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 12143 "configure"
++#line 12146 "configure"
+ #include "confdefs.h"
+
+ /* Override any gcc2 internal prototype to avoid an error. */
+@@ -12159,16 +12162,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:12162: \"$ac_link\"") >&5
++if { (eval echo "$as_me:12165: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:12165: \$? = $ac_status" >&5
++ echo "$as_me:12168: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -s conftest$ac_exeext'
+- { (eval echo "$as_me:12168: \"$ac_try\"") >&5
++ { (eval echo "$as_me:12171: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:12171: \$? = $ac_status" >&5
++ echo "$as_me:12174: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ ac_cv_lib_X11_XOpenDisplay=yes
+ else
+@@ -12179,7 +12182,7 @@
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:12182: result: $ac_cv_lib_X11_XOpenDisplay" >&5
++echo "$as_me:12185: result: $ac_cv_lib_X11_XOpenDisplay" >&5
+ echo "${ECHO_T}$ac_cv_lib_X11_XOpenDisplay" >&6
+ if test $ac_cv_lib_X11_XOpenDisplay = yes; then
+
+@@ -12203,13 +12206,13 @@
+
+ fi
+
+- echo "$as_me:12206: checking for XtAppInitialize" >&5
++ echo "$as_me:12209: checking for XtAppInitialize" >&5
+ echo $ECHO_N "checking for XtAppInitialize... $ECHO_C" >&6
+ if test "${ac_cv_func_XtAppInitialize+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 12212 "configure"
++#line 12215 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+ which can conflict with char XtAppInitialize (); below. */
+@@ -12240,16 +12243,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:12243: \"$ac_link\"") >&5
++if { (eval echo "$as_me:12246: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:12246: \$? = $ac_status" >&5
++ echo "$as_me:12249: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -s conftest$ac_exeext'
+- { (eval echo "$as_me:12249: \"$ac_try\"") >&5
++ { (eval echo "$as_me:12252: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:12252: \$? = $ac_status" >&5
++ echo "$as_me:12255: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ ac_cv_func_XtAppInitialize=yes
+ else
+@@ -12259,13 +12262,13 @@
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "$as_me:12262: result: $ac_cv_func_XtAppInitialize" >&5
++echo "$as_me:12265: result: $ac_cv_func_XtAppInitialize" >&5
+ echo "${ECHO_T}$ac_cv_func_XtAppInitialize" >&6
+ if test $ac_cv_func_XtAppInitialize = yes; then
+ :
+ else
+
+- echo "$as_me:12268: checking for XtAppInitialize in -lXt" >&5
++ echo "$as_me:12271: checking for XtAppInitialize in -lXt" >&5
+ echo $ECHO_N "checking for XtAppInitialize in -lXt... $ECHO_C" >&6
+ if test "${ac_cv_lib_Xt_XtAppInitialize+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -12273,7 +12276,7 @@
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lXt $X_PRE_LIBS $LIBS $X_EXTRA_LIBS $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 12276 "configure"
++#line 12279 "configure"
+ #include "confdefs.h"
+
+ /* Override any gcc2 internal prototype to avoid an error. */
+@@ -12292,16 +12295,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:12295: \"$ac_link\"") >&5
++if { (eval echo "$as_me:12298: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:12298: \$? = $ac_status" >&5
++ echo "$as_me:12301: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -s conftest$ac_exeext'
+- { (eval echo "$as_me:12301: \"$ac_try\"") >&5
++ { (eval echo "$as_me:12304: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:12304: \$? = $ac_status" >&5
++ echo "$as_me:12307: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ ac_cv_lib_Xt_XtAppInitialize=yes
+ else
+@@ -12312,7 +12315,7 @@
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:12315: result: $ac_cv_lib_Xt_XtAppInitialize" >&5
++echo "$as_me:12318: result: $ac_cv_lib_Xt_XtAppInitialize" >&5
+ echo "${ECHO_T}$ac_cv_lib_Xt_XtAppInitialize" >&6
+ if test $ac_cv_lib_Xt_XtAppInitialize = yes; then
+
+@@ -12329,7 +12332,7 @@
+ fi
+
+ if test $cf_have_X_LIBS = no ; then
+- { echo "$as_me:12332: WARNING: Unable to successfully link X Toolkit library (-lXt) with
++ { echo "$as_me:12335: WARNING: Unable to successfully link X Toolkit library (-lXt) with
+ test program. You will have to check and add the proper libraries by hand
+ to makefile." >&5
+ echo "$as_me: WARNING: Unable to successfully link X Toolkit library (-lXt) with
+@@ -12351,14 +12354,14 @@
+ cf_test=X11/$cf_x_athena_root/SimpleMenu.h
+ if test $cf_path != default ; then
+ CPPFLAGS="$cf_save -I$cf_path/include"
+- echo "$as_me:12354: checking for $cf_test in $cf_path" >&5
++ echo "$as_me:12357: checking for $cf_test in $cf_path" >&5
+ echo $ECHO_N "checking for $cf_test in $cf_path... $ECHO_C" >&6
+ else
+- echo "$as_me:12357: checking for $cf_test" >&5
++ echo "$as_me:12360: checking for $cf_test" >&5
+ echo $ECHO_N "checking for $cf_test... $ECHO_C" >&6
+ fi
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 12361 "configure"
++#line 12364 "configure"
+ #include "confdefs.h"
+
+ #include <X11/Intrinsic.h>
+@@ -12372,16 +12375,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:12375: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:12378: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:12378: \$? = $ac_status" >&5
++ echo "$as_me:12381: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:12381: \"$ac_try\"") >&5
++ { (eval echo "$as_me:12384: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:12384: \$? = $ac_status" >&5
++ echo "$as_me:12387: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ cf_result=yes
+ else
+@@ -12390,7 +12393,7 @@
+ cf_result=no
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+- echo "$as_me:12393: result: $cf_result" >&5
++ echo "$as_me:12396: result: $cf_result" >&5
+ echo "${ECHO_T}$cf_result" >&6
+ if test "$cf_result" = yes ; then
+ cf_x_athena_inc=$cf_path
+@@ -12402,7 +12405,7 @@
+ done
+
+ if test -z "$cf_x_athena_inc" ; then
+- { echo "$as_me:12405: WARNING: Unable to successfully find Athena header files with test program" >&5
++ { echo "$as_me:12408: WARNING: Unable to successfully find Athena header files with test program" >&5
+ echo "$as_me: WARNING: Unable to successfully find Athena header files with test program" >&2;}
+ elif test "$cf_x_athena_inc" != default ; then
+ CPPFLAGS="$CPPFLAGS -I$cf_x_athena_inc"
+@@ -12448,7 +12451,7 @@
+ done
+ LIBS="$cf_add_libs"
+
+- echo "$as_me:12451: checking for $cf_libs in $cf_path" >&5
++ echo "$as_me:12454: checking for $cf_libs in $cf_path" >&5
+ echo $ECHO_N "checking for $cf_libs in $cf_path... $ECHO_C" >&6
+ else
+
+@@ -12468,11 +12471,11 @@
+ done
+ LIBS="$cf_add_libs"
+
+- echo "$as_me:12471: checking for $cf_test in $cf_libs" >&5
++ echo "$as_me:12474: checking for $cf_test in $cf_libs" >&5
+ echo $ECHO_N "checking for $cf_test in $cf_libs... $ECHO_C" >&6
+ fi
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 12475 "configure"
++#line 12478 "configure"
+ #include "confdefs.h"
+
+ #include <X11/Intrinsic.h>
+@@ -12488,16 +12491,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:12491: \"$ac_link\"") >&5
++if { (eval echo "$as_me:12494: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:12494: \$? = $ac_status" >&5
++ echo "$as_me:12497: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -s conftest$ac_exeext'
+- { (eval echo "$as_me:12497: \"$ac_try\"") >&5
++ { (eval echo "$as_me:12500: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:12500: \$? = $ac_status" >&5
++ echo "$as_me:12503: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ cf_result=yes
+ else
+@@ -12506,7 +12509,7 @@
+ cf_result=no
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+- echo "$as_me:12509: result: $cf_result" >&5
++ echo "$as_me:12512: result: $cf_result" >&5
+ echo "${ECHO_T}$cf_result" >&6
+ if test "$cf_result" = yes ; then
+ cf_x_athena_lib="$cf_libs"
+@@ -12520,7 +12523,7 @@
+ done
+
+ if test -z "$cf_x_athena_lib" ; then
+- { { echo "$as_me:12523: error: Unable to successfully link Athena library (-l$cf_x_athena_root) with test program" >&5
++ { { echo "$as_me:12526: error: Unable to successfully link Athena library (-l$cf_x_athena_root) with test program" >&5
+ echo "$as_me: error: Unable to successfully link Athena library (-l$cf_x_athena_root) with test program" >&2;}
+ { (exit 1); exit 1; }; }
+ fi
+@@ -12538,7 +12541,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:12541: checking for $ac_word" >&5
++echo "$as_me:12544: checking for $ac_word" >&5
+ echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+ if test "${ac_cv_prog_XCURSES_CONFIG+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -12553,7 +12556,7 @@
+ test -z "$ac_dir" && ac_dir=.
+ $as_executable_p "$ac_dir/$ac_word" || continue
+ ac_cv_prog_XCURSES_CONFIG="$ac_tool_prefix$ac_prog"
+-echo "$as_me:12556: found $ac_dir/$ac_word" >&5
++echo "$as_me:12559: found $ac_dir/$ac_word" >&5
+ break
+ done
+
+@@ -12561,10 +12564,10 @@
+ fi
+ XCURSES_CONFIG=$ac_cv_prog_XCURSES_CONFIG
+ if test -n "$XCURSES_CONFIG"; then
+- echo "$as_me:12564: result: $XCURSES_CONFIG" >&5
++ echo "$as_me:12567: result: $XCURSES_CONFIG" >&5
+ echo "${ECHO_T}$XCURSES_CONFIG" >&6
+ else
+- echo "$as_me:12567: result: no" >&5
++ echo "$as_me:12570: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+
+@@ -12577,7 +12580,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:12580: checking for $ac_word" >&5
++echo "$as_me:12583: checking for $ac_word" >&5
+ echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+ if test "${ac_cv_prog_ac_ct_XCURSES_CONFIG+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -12592,7 +12595,7 @@
+ test -z "$ac_dir" && ac_dir=.
+ $as_executable_p "$ac_dir/$ac_word" || continue
+ ac_cv_prog_ac_ct_XCURSES_CONFIG="$ac_prog"
+-echo "$as_me:12595: found $ac_dir/$ac_word" >&5
++echo "$as_me:12598: found $ac_dir/$ac_word" >&5
+ break
+ done
+
+@@ -12600,10 +12603,10 @@
+ fi
+ ac_ct_XCURSES_CONFIG=$ac_cv_prog_ac_ct_XCURSES_CONFIG
+ if test -n "$ac_ct_XCURSES_CONFIG"; then
+- echo "$as_me:12603: result: $ac_ct_XCURSES_CONFIG" >&5
++ echo "$as_me:12606: result: $ac_ct_XCURSES_CONFIG" >&5
+ echo "${ECHO_T}$ac_ct_XCURSES_CONFIG" >&6
+ else
+- echo "$as_me:12606: result: no" >&5
++ echo "$as_me:12609: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+
+@@ -12642,7 +12645,7 @@
+
+ test -n "$verbose" && echo " checking additions to CFLAGS" 1>&6
+
+-echo "${as_me:-configure}:12645: testing checking additions to CFLAGS ..." 1>&5
++echo "${as_me:-configure}:12648: testing checking additions to CFLAGS ..." 1>&5
+
+ cf_check_cflags="$CFLAGS"
+ cf_check_cppflags="$CPPFLAGS"
+@@ -12713,7 +12716,7 @@
+ if test -n "$cf_new_cflags" ; then
+ test -n "$verbose" && echo " add to \$CFLAGS $cf_new_cflags" 1>&6
+
+-echo "${as_me:-configure}:12716: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
++echo "${as_me:-configure}:12719: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
+
+ CFLAGS="$CFLAGS $cf_new_cflags"
+ fi
+@@ -12721,7 +12724,7 @@
+ if test -n "$cf_new_cppflags" ; then
+ test -n "$verbose" && echo " add to \$CPPFLAGS $cf_new_cppflags" 1>&6
+
+-echo "${as_me:-configure}:12724: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
++echo "${as_me:-configure}:12727: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
+
+ CPPFLAGS="$CPPFLAGS $cf_new_cppflags"
+ fi
+@@ -12729,14 +12732,14 @@
+ 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}:12732: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5
++echo "${as_me:-configure}:12735: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5
+
+ EXTRA_CPPFLAGS="$cf_new_extra_cppflags $EXTRA_CPPFLAGS"
+ fi
+
+ if test "x$cf_check_cflags" != "x$CFLAGS" ; then
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 12739 "configure"
++#line 12742 "configure"
+ #include "confdefs.h"
+ #include <stdio.h>
+ int
+@@ -12748,16 +12751,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:12751: \"$ac_link\"") >&5
++if { (eval echo "$as_me:12754: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:12754: \$? = $ac_status" >&5
++ echo "$as_me:12757: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -s conftest$ac_exeext'
+- { (eval echo "$as_me:12757: \"$ac_try\"") >&5
++ { (eval echo "$as_me:12760: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:12760: \$? = $ac_status" >&5
++ echo "$as_me:12763: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ :
+ else
+@@ -12765,12 +12768,12 @@
+ cat conftest.$ac_ext >&5
+ test -n "$verbose" && echo " test-compile failed. Undoing change to \$CFLAGS" 1>&6
+
+-echo "${as_me:-configure}:12768: testing test-compile failed. Undoing change to \$CFLAGS ..." 1>&5
++echo "${as_me:-configure}:12771: testing test-compile failed. Undoing change to \$CFLAGS ..." 1>&5
+
+ if test "x$cf_check_cppflags" != "x$CPPFLAGS" ; then
+ test -n "$verbose" && echo " but keeping change to \$CPPFLAGS" 1>&6
+
+-echo "${as_me:-configure}:12773: testing but keeping change to \$CPPFLAGS ..." 1>&5
++echo "${as_me:-configure}:12776: testing but keeping change to \$CPPFLAGS ..." 1>&5
+
+ fi
+ CFLAGS="$cf_check_flags"
+@@ -12778,7 +12781,7 @@
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ fi
+
+-echo "$as_me:12781: checking for XOpenDisplay in -lX11" >&5
++echo "$as_me:12784: checking for XOpenDisplay in -lX11" >&5
+ echo $ECHO_N "checking for XOpenDisplay in -lX11... $ECHO_C" >&6
+ if test "${ac_cv_lib_X11_XOpenDisplay+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -12786,7 +12789,7 @@
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lX11 $X_PRE_LIBS $LIBS $X_EXTRA_LIBS $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 12789 "configure"
++#line 12792 "configure"
+ #include "confdefs.h"
+
+ /* Override any gcc2 internal prototype to avoid an error. */
+@@ -12805,16 +12808,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:12808: \"$ac_link\"") >&5
++if { (eval echo "$as_me:12811: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:12811: \$? = $ac_status" >&5
++ echo "$as_me:12814: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -s conftest$ac_exeext'
+- { (eval echo "$as_me:12814: \"$ac_try\"") >&5
++ { (eval echo "$as_me:12817: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:12817: \$? = $ac_status" >&5
++ echo "$as_me:12820: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ ac_cv_lib_X11_XOpenDisplay=yes
+ else
+@@ -12825,7 +12828,7 @@
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:12828: result: $ac_cv_lib_X11_XOpenDisplay" >&5
++echo "$as_me:12831: result: $ac_cv_lib_X11_XOpenDisplay" >&5
+ echo "${ECHO_T}$ac_cv_lib_X11_XOpenDisplay" >&6
+ if test $ac_cv_lib_X11_XOpenDisplay = yes; then
+
+@@ -12847,7 +12850,7 @@
+
+ fi
+
+-echo "$as_me:12850: checking for XCurses library" >&5
++echo "$as_me:12853: checking for XCurses library" >&5
+ echo $ECHO_N "checking for XCurses library... $ECHO_C" >&6
+ if test "${cf_cv_lib_XCurses+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -12870,7 +12873,7 @@
+ LIBS="$cf_add_libs"
+
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 12873 "configure"
++#line 12876 "configure"
+ #include "confdefs.h"
+
+ #include <xcurses.h>
+@@ -12885,16 +12888,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:12888: \"$ac_link\"") >&5
++if { (eval echo "$as_me:12891: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:12891: \$? = $ac_status" >&5
++ echo "$as_me:12894: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -s conftest$ac_exeext'
+- { (eval echo "$as_me:12894: \"$ac_try\"") >&5
++ { (eval echo "$as_me:12897: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:12897: \$? = $ac_status" >&5
++ echo "$as_me:12900: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ cf_cv_lib_XCurses=yes
+ else
+@@ -12905,7 +12908,7 @@
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+
+ fi
+-echo "$as_me:12908: result: $cf_cv_lib_XCurses" >&5
++echo "$as_me:12911: result: $cf_cv_lib_XCurses" >&5
+ echo "${ECHO_T}$cf_cv_lib_XCurses" >&6
+
+ fi
+@@ -12920,23 +12923,23 @@
+ #define XCURSES 1
+ EOF
+
+- echo "$as_me:12923: checking for xcurses.h" >&5
++ echo "$as_me:12926: checking for xcurses.h" >&5
+ echo $ECHO_N "checking for xcurses.h... $ECHO_C" >&6
+ if test "${ac_cv_header_xcurses_h+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 12929 "configure"
++#line 12932 "configure"
+ #include "confdefs.h"
+ #include <xcurses.h>
+ _ACEOF
+-if { (eval echo "$as_me:12933: \"$ac_cpp conftest.$ac_ext\"") >&5
++if { (eval echo "$as_me:12936: \"$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:12939: \$? = $ac_status" >&5
++ echo "$as_me:12942: \$? = $ac_status" >&5
+ (exit $ac_status); } >/dev/null; then
+ if test -s conftest.err; then
+ ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -12955,7 +12958,7 @@
+ fi
+ rm -f conftest.err conftest.$ac_ext
+ fi
+-echo "$as_me:12958: result: $ac_cv_header_xcurses_h" >&5
++echo "$as_me:12961: result: $ac_cv_header_xcurses_h" >&5
+ echo "${ECHO_T}$ac_cv_header_xcurses_h" >&6
+ if test $ac_cv_header_xcurses_h = yes; then
+
+@@ -12966,14 +12969,14 @@
+ fi
+
+ else
+- { { echo "$as_me:12969: error: Cannot link with XCurses" >&5
++ { { echo "$as_me:12972: error: Cannot link with XCurses" >&5
+ echo "$as_me: error: Cannot link with XCurses" >&2;}
+ { (exit 1); exit 1; }; }
+ fi
+
+ ;;
+ (*)
+- { { echo "$as_me:12976: error: unexpected screen-value: $cf_cv_screen" >&5
++ { { echo "$as_me:12979: error: unexpected screen-value: $cf_cv_screen" >&5
+ echo "$as_me: error: unexpected screen-value: $cf_cv_screen" >&2;}
+ { (exit 1); exit 1; }; }
+ ;;
+@@ -12985,14 +12988,14 @@
+ ;;
+ (curses|curses_*)
+
+-echo "$as_me:12988: checking for NetBSD form.h" >&5
++echo "$as_me:12991: checking for NetBSD form.h" >&5
+ echo $ECHO_N "checking for NetBSD form.h... $ECHO_C" >&6
+ if test "${cf_cv_netbsd_form_h+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 12995 "configure"
++#line 12998 "configure"
+ #include "confdefs.h"
+
+ #include <${cf_cv_ncurses_header:-curses.h}>
+@@ -13011,16 +13014,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:13014: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:13017: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:13017: \$? = $ac_status" >&5
++ echo "$as_me:13020: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:13020: \"$ac_try\"") >&5
++ { (eval echo "$as_me:13023: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:13023: \$? = $ac_status" >&5
++ echo "$as_me:13026: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ cf_cv_netbsd_form_h=yes
+
+@@ -13032,7 +13035,7 @@
+ rm -f conftest.$ac_objext conftest.$ac_ext
+
+ fi
+-echo "$as_me:13035: result: $cf_cv_netbsd_form_h" >&5
++echo "$as_me:13038: result: $cf_cv_netbsd_form_h" >&5
+ echo "${ECHO_T}$cf_cv_netbsd_form_h" >&6
+
+ test "$cf_cv_netbsd_form_h" = yes &&
+@@ -13040,14 +13043,14 @@
+ #define HAVE_NETBSD_FORM_H 1
+ EOF
+
+-echo "$as_me:13043: checking for NetBSD menu.h" >&5
++echo "$as_me:13046: checking for NetBSD menu.h" >&5
+ echo $ECHO_N "checking for NetBSD menu.h... $ECHO_C" >&6
+ if test "${cf_cv_netbsd_menu_h+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 13050 "configure"
++#line 13053 "configure"
+ #include "confdefs.h"
+
+ #include <${cf_cv_ncurses_header:-curses.h}>
+@@ -13065,16 +13068,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:13068: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:13071: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:13071: \$? = $ac_status" >&5
++ echo "$as_me:13074: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:13074: \"$ac_try\"") >&5
++ { (eval echo "$as_me:13077: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:13077: \$? = $ac_status" >&5
++ echo "$as_me:13080: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ cf_cv_netbsd_menu_h=yes
+
+@@ -13086,7 +13089,7 @@
+ rm -f conftest.$ac_objext conftest.$ac_ext
+
+ fi
+-echo "$as_me:13089: result: $cf_cv_netbsd_menu_h" >&5
++echo "$as_me:13092: result: $cf_cv_netbsd_menu_h" >&5
+ echo "${ECHO_T}$cf_cv_netbsd_menu_h" >&6
+
+ test "$cf_cv_netbsd_menu_h" = yes &&
+@@ -13104,7 +13107,7 @@
+ # look for curses-related libraries
+
+ as_ac_Lib=`echo "ac_cv_lib_panel$cf_cv_libtype''_new_panel" | $as_tr_sh`
+-echo "$as_me:13107: checking for new_panel in -lpanel$cf_cv_libtype" >&5
++echo "$as_me:13110: checking for new_panel in -lpanel$cf_cv_libtype" >&5
+ echo $ECHO_N "checking for new_panel in -lpanel$cf_cv_libtype... $ECHO_C" >&6
+ if eval "test \"\${$as_ac_Lib+set}\" = set"; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -13112,7 +13115,7 @@
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lpanel$cf_cv_libtype $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 13115 "configure"
++#line 13118 "configure"
+ #include "confdefs.h"
+
+ /* Override any gcc2 internal prototype to avoid an error. */
+@@ -13131,16 +13134,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:13134: \"$ac_link\"") >&5
++if { (eval echo "$as_me:13137: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:13137: \$? = $ac_status" >&5
++ echo "$as_me:13140: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -s conftest$ac_exeext'
+- { (eval echo "$as_me:13140: \"$ac_try\"") >&5
++ { (eval echo "$as_me:13143: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:13143: \$? = $ac_status" >&5
++ echo "$as_me:13146: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ eval "$as_ac_Lib=yes"
+ else
+@@ -13151,7 +13154,7 @@
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:13154: result: `eval echo '${'$as_ac_Lib'}'`" >&5
++echo "$as_me:13157: 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
+
+@@ -13180,7 +13183,7 @@
+ fi
+
+ as_ac_Lib=`echo "ac_cv_lib_menu$cf_cv_libtype''_menu_driver" | $as_tr_sh`
+-echo "$as_me:13183: checking for menu_driver in -lmenu$cf_cv_libtype" >&5
++echo "$as_me:13186: checking for menu_driver in -lmenu$cf_cv_libtype" >&5
+ echo $ECHO_N "checking for menu_driver in -lmenu$cf_cv_libtype... $ECHO_C" >&6
+ if eval "test \"\${$as_ac_Lib+set}\" = set"; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -13188,7 +13191,7 @@
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lmenu$cf_cv_libtype $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 13191 "configure"
++#line 13194 "configure"
+ #include "confdefs.h"
+
+ /* Override any gcc2 internal prototype to avoid an error. */
+@@ -13207,16 +13210,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:13210: \"$ac_link\"") >&5
++if { (eval echo "$as_me:13213: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:13213: \$? = $ac_status" >&5
++ echo "$as_me:13216: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -s conftest$ac_exeext'
+- { (eval echo "$as_me:13216: \"$ac_try\"") >&5
++ { (eval echo "$as_me:13219: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:13219: \$? = $ac_status" >&5
++ echo "$as_me:13222: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ eval "$as_ac_Lib=yes"
+ else
+@@ -13227,7 +13230,7 @@
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:13230: result: `eval echo '${'$as_ac_Lib'}'`" >&5
++echo "$as_me:13233: 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
+
+@@ -13256,7 +13259,7 @@
+ fi
+
+ as_ac_Lib=`echo "ac_cv_lib_form$cf_cv_libtype''_form_driver" | $as_tr_sh`
+-echo "$as_me:13259: checking for form_driver in -lform$cf_cv_libtype" >&5
++echo "$as_me:13262: checking for form_driver in -lform$cf_cv_libtype" >&5
+ echo $ECHO_N "checking for form_driver in -lform$cf_cv_libtype... $ECHO_C" >&6
+ if eval "test \"\${$as_ac_Lib+set}\" = set"; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -13264,7 +13267,7 @@
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lform$cf_cv_libtype $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 13267 "configure"
++#line 13270 "configure"
+ #include "confdefs.h"
+
+ /* Override any gcc2 internal prototype to avoid an error. */
+@@ -13283,16 +13286,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:13286: \"$ac_link\"") >&5
++if { (eval echo "$as_me:13289: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:13289: \$? = $ac_status" >&5
++ echo "$as_me:13292: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -s conftest$ac_exeext'
+- { (eval echo "$as_me:13292: \"$ac_try\"") >&5
++ { (eval echo "$as_me:13295: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:13295: \$? = $ac_status" >&5
++ echo "$as_me:13298: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ eval "$as_ac_Lib=yes"
+ else
+@@ -13303,7 +13306,7 @@
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:13306: result: `eval echo '${'$as_ac_Lib'}'`" >&5
++echo "$as_me:13309: 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
+
+@@ -13343,23 +13346,23 @@
+
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-echo "$as_me:13346: checking for $ac_header" >&5
++echo "$as_me:13349: 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 13352 "configure"
++#line 13355 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:13356: \"$ac_cpp conftest.$ac_ext\"") >&5
++if { (eval echo "$as_me:13359: \"$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:13362: \$? = $ac_status" >&5
++ echo "$as_me:13365: \$? = $ac_status" >&5
+ (exit $ac_status); } >/dev/null; then
+ if test -s conftest.err; then
+ ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -13378,7 +13381,7 @@
+ fi
+ rm -f conftest.err conftest.$ac_ext
+ fi
+-echo "$as_me:13381: result: `eval echo '${'$as_ac_Header'}'`" >&5
++echo "$as_me:13384: 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
+@@ -13391,13 +13394,13 @@
+ ;;
+ esac
+
+-echo "$as_me:13394: checking for ANSI C header files" >&5
++echo "$as_me:13397: 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 13400 "configure"
++#line 13403 "configure"
+ #include "confdefs.h"
+ #include <stdlib.h>
+ #include <stdarg.h>
+@@ -13405,13 +13408,13 @@
+ #include <float.h>
+
+ _ACEOF
+-if { (eval echo "$as_me:13408: \"$ac_cpp conftest.$ac_ext\"") >&5
++if { (eval echo "$as_me:13411: \"$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:13414: \$? = $ac_status" >&5
++ echo "$as_me:13417: \$? = $ac_status" >&5
+ (exit $ac_status); } >/dev/null; then
+ if test -s conftest.err; then
+ ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -13433,7 +13436,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 13436 "configure"
++#line 13439 "configure"
+ #include "confdefs.h"
+ #include <string.h>
+
+@@ -13451,7 +13454,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 13454 "configure"
++#line 13457 "configure"
+ #include "confdefs.h"
+ #include <stdlib.h>
+
+@@ -13472,7 +13475,7 @@
+ :
+ else
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 13475 "configure"
++#line 13478 "configure"
+ #include "confdefs.h"
+ #include <ctype.h>
+ #if ((' ' & 0x0FF) == 0x020)
+@@ -13498,15 +13501,15 @@
+ }
+ _ACEOF
+ rm -f conftest$ac_exeext
+-if { (eval echo "$as_me:13501: \"$ac_link\"") >&5
++if { (eval echo "$as_me:13504: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:13504: \$? = $ac_status" >&5
++ echo "$as_me:13507: \$? = $ac_status" >&5
+ (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+- { (eval echo "$as_me:13506: \"$ac_try\"") >&5
++ { (eval echo "$as_me:13509: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:13509: \$? = $ac_status" >&5
++ echo "$as_me:13512: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ :
+ else
+@@ -13519,7 +13522,7 @@
+ fi
+ fi
+ fi
+-echo "$as_me:13522: result: $ac_cv_header_stdc" >&5
++echo "$as_me:13525: result: $ac_cv_header_stdc" >&5
+ echo "${ECHO_T}$ac_cv_header_stdc" >&6
+ if test $ac_cv_header_stdc = yes; then
+
+@@ -13529,13 +13532,13 @@
+
+ fi
+
+-echo "$as_me:13532: checking whether time.h and sys/time.h may both be included" >&5
++echo "$as_me:13535: 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 13538 "configure"
++#line 13541 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ #include <sys/time.h>
+@@ -13551,16 +13554,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:13554: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:13557: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:13557: \$? = $ac_status" >&5
++ echo "$as_me:13560: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:13560: \"$ac_try\"") >&5
++ { (eval echo "$as_me:13563: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:13563: \$? = $ac_status" >&5
++ echo "$as_me:13566: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ ac_cv_header_time=yes
+ else
+@@ -13570,7 +13573,7 @@
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ fi
+-echo "$as_me:13573: result: $ac_cv_header_time" >&5
++echo "$as_me:13576: result: $ac_cv_header_time" >&5
+ echo "${ECHO_T}$ac_cv_header_time" >&6
+ if test $ac_cv_header_time = yes; then
+
+@@ -13593,23 +13596,23 @@
+
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-echo "$as_me:13596: checking for $ac_header" >&5
++echo "$as_me:13599: 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 13602 "configure"
++#line 13605 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:13606: \"$ac_cpp conftest.$ac_ext\"") >&5
++if { (eval echo "$as_me:13609: \"$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:13612: \$? = $ac_status" >&5
++ echo "$as_me:13615: \$? = $ac_status" >&5
+ (exit $ac_status); } >/dev/null; then
+ if test -s conftest.err; then
+ ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -13628,7 +13631,7 @@
+ fi
+ rm -f conftest.err conftest.$ac_ext
+ fi
+-echo "$as_me:13631: result: `eval echo '${'$as_ac_Header'}'`" >&5
++echo "$as_me:13634: 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
+@@ -13641,23 +13644,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:13644: checking for $ac_header" >&5
++echo "$as_me:13647: 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 13650 "configure"
++#line 13653 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:13654: \"$ac_cpp conftest.$ac_ext\"") >&5
++if { (eval echo "$as_me:13657: \"$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:13660: \$? = $ac_status" >&5
++ echo "$as_me:13663: \$? = $ac_status" >&5
+ (exit $ac_status); } >/dev/null; then
+ if test -s conftest.err; then
+ ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -13676,7 +13679,7 @@
+ fi
+ rm -f conftest.err conftest.$ac_ext
+ fi
+-echo "$as_me:13679: result: `eval echo '${'$as_ac_Header'}'`" >&5
++echo "$as_me:13682: 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
+@@ -13686,7 +13689,7 @@
+ fi
+ done
+
+-echo "$as_me:13689: checking for header declaring getopt variables" >&5
++echo "$as_me:13692: 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
+@@ -13696,7 +13699,7 @@
+ for cf_header in stdio.h stdlib.h unistd.h getopt.h
+ do
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 13699 "configure"
++#line 13702 "configure"
+ #include "confdefs.h"
+
+ #include <$cf_header>
+@@ -13709,16 +13712,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:13712: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:13715: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:13715: \$? = $ac_status" >&5
++ echo "$as_me:13718: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:13718: \"$ac_try\"") >&5
++ { (eval echo "$as_me:13721: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:13721: \$? = $ac_status" >&5
++ echo "$as_me:13724: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ cf_cv_getopt_header=$cf_header
+ break
+@@ -13730,7 +13733,7 @@
+ done
+
+ fi
+-echo "$as_me:13733: result: $cf_cv_getopt_header" >&5
++echo "$as_me:13736: result: $cf_cv_getopt_header" >&5
+ echo "${ECHO_T}$cf_cv_getopt_header" >&6
+ if test $cf_cv_getopt_header != none ; then
+
+@@ -13753,13 +13756,13 @@
+
+ do
+ as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+-echo "$as_me:13756: checking for $ac_func" >&5
++echo "$as_me:13759: 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 13762 "configure"
++#line 13765 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+ which can conflict with char $ac_func (); below. */
+@@ -13790,16 +13793,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:13793: \"$ac_link\"") >&5
++if { (eval echo "$as_me:13796: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:13796: \$? = $ac_status" >&5
++ echo "$as_me:13799: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -s conftest$ac_exeext'
+- { (eval echo "$as_me:13799: \"$ac_try\"") >&5
++ { (eval echo "$as_me:13802: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:13802: \$? = $ac_status" >&5
++ echo "$as_me:13805: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ eval "$as_ac_var=yes"
+ else
+@@ -13809,7 +13812,7 @@
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "$as_me:13812: result: `eval echo '${'$as_ac_var'}'`" >&5
++echo "$as_me:13815: 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
+@@ -13820,7 +13823,7 @@
+ done
+
+ if test "x$ac_cv_func_getopt" = xno; then
+- { { echo "$as_me:13823: error: getopt is required for building programs" >&5
++ { { echo "$as_me:13826: error: getopt is required for building programs" >&5
+ echo "$as_me: error: getopt is required for building programs" >&2;}
+ { (exit 1); exit 1; }; }
+ fi
+@@ -13839,13 +13842,13 @@
+
+ do
+ as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+-echo "$as_me:13842: checking for $ac_func" >&5
++echo "$as_me:13845: 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 13848 "configure"
++#line 13851 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+ which can conflict with char $ac_func (); below. */
+@@ -13876,16 +13879,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:13879: \"$ac_link\"") >&5
++if { (eval echo "$as_me:13882: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:13882: \$? = $ac_status" >&5
++ echo "$as_me:13885: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -s conftest$ac_exeext'
+- { (eval echo "$as_me:13885: \"$ac_try\"") >&5
++ { (eval echo "$as_me:13888: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:13888: \$? = $ac_status" >&5
++ echo "$as_me:13891: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ eval "$as_ac_var=yes"
+ else
+@@ -13895,7 +13898,7 @@
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "$as_me:13898: result: `eval echo '${'$as_ac_var'}'`" >&5
++echo "$as_me:13901: 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
+@@ -13907,14 +13910,14 @@
+
+ fi
+
+-echo "$as_me:13910: checking if we must define _XOPEN_SOURCE_EXTENDED" >&5
++echo "$as_me:13913: checking if we must define _XOPEN_SOURCE_EXTENDED" >&5
+ echo $ECHO_N "checking if we must define _XOPEN_SOURCE_EXTENDED... $ECHO_C" >&6
+ if test "${cf_cv_need_xopen_extension+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 13917 "configure"
++#line 13920 "configure"
+ #include "confdefs.h"
+
+ #include <stdlib.h>
+@@ -13936,23 +13939,23 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:13939: \"$ac_link\"") >&5
++if { (eval echo "$as_me:13942: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:13942: \$? = $ac_status" >&5
++ echo "$as_me:13945: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -s conftest$ac_exeext'
+- { (eval echo "$as_me:13945: \"$ac_try\"") >&5
++ { (eval echo "$as_me:13948: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:13948: \$? = $ac_status" >&5
++ echo "$as_me:13951: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ cf_cv_need_xopen_extension=no
+ else
+ echo "$as_me: failed program was:" >&5
+ cat conftest.$ac_ext >&5
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 13955 "configure"
++#line 13958 "configure"
+ #include "confdefs.h"
+
+ #define _XOPEN_SOURCE_EXTENDED
+@@ -13974,16 +13977,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:13977: \"$ac_link\"") >&5
++if { (eval echo "$as_me:13980: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:13980: \$? = $ac_status" >&5
++ echo "$as_me:13983: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -s conftest$ac_exeext'
+- { (eval echo "$as_me:13983: \"$ac_try\"") >&5
++ { (eval echo "$as_me:13986: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:13986: \$? = $ac_status" >&5
++ echo "$as_me:13989: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ cf_cv_need_xopen_extension=yes
+ else
+@@ -13995,11 +13998,11 @@
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "$as_me:13998: result: $cf_cv_need_xopen_extension" >&5
++echo "$as_me:14001: result: $cf_cv_need_xopen_extension" >&5
+ echo "${ECHO_T}$cf_cv_need_xopen_extension" >&6
+ test $cf_cv_need_xopen_extension = yes && CPPFLAGS="$CPPFLAGS -D_XOPEN_SOURCE_EXTENDED"
+
+-echo "$as_me:14002: checking for term.h" >&5
++echo "$as_me:14005: checking for term.h" >&5
+ echo $ECHO_N "checking for term.h... $ECHO_C" >&6
+ if test "${cf_cv_term_header+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -14020,7 +14023,7 @@
+ for cf_header in $cf_header_list
+ do
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 14023 "configure"
++#line 14026 "configure"
+ #include "confdefs.h"
+
+ #include <${cf_cv_ncurses_header:-curses.h}>
+@@ -14034,16 +14037,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:14037: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:14040: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:14040: \$? = $ac_status" >&5
++ echo "$as_me:14043: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:14043: \"$ac_try\"") >&5
++ { (eval echo "$as_me:14046: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:14046: \$? = $ac_status" >&5
++ echo "$as_me:14049: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ cf_cv_term_header=$cf_header
+ break
+@@ -14062,7 +14065,7 @@
+ for cf_header in ncurses/term.h ncursesw/term.h
+ do
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 14065 "configure"
++#line 14068 "configure"
+ #include "confdefs.h"
+
+ #include <${cf_cv_ncurses_header:-curses.h}>
+@@ -14080,16 +14083,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:14083: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:14086: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:14086: \$? = $ac_status" >&5
++ echo "$as_me:14089: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:14089: \"$ac_try\"") >&5
++ { (eval echo "$as_me:14092: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:14092: \$? = $ac_status" >&5
++ echo "$as_me:14095: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ cf_cv_term_header=$cf_header
+ break
+@@ -14104,7 +14107,7 @@
+ esac
+
+ fi
+-echo "$as_me:14107: result: $cf_cv_term_header" >&5
++echo "$as_me:14110: result: $cf_cv_term_header" >&5
+ echo "${ECHO_T}$cf_cv_term_header" >&6
+
+ case $cf_cv_term_header in
+@@ -14131,7 +14134,7 @@
+ ;;
+ esac
+
+-echo "$as_me:14134: checking for unctrl.h" >&5
++echo "$as_me:14137: checking for unctrl.h" >&5
+ echo $ECHO_N "checking for unctrl.h... $ECHO_C" >&6
+ if test "${cf_cv_unctrl_header+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -14152,7 +14155,7 @@
+ for cf_header in $cf_header_list
+ do
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 14155 "configure"
++#line 14158 "configure"
+ #include "confdefs.h"
+
+ #include <${cf_cv_ncurses_header:-curses.h}>
+@@ -14166,16 +14169,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:14169: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:14172: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:14172: \$? = $ac_status" >&5
++ echo "$as_me:14175: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:14175: \"$ac_try\"") >&5
++ { (eval echo "$as_me:14178: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:14178: \$? = $ac_status" >&5
++ echo "$as_me:14181: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ cf_cv_unctrl_header=$cf_header
+ break
+@@ -14188,12 +14191,12 @@
+ done
+
+ fi
+-echo "$as_me:14191: result: $cf_cv_unctrl_header" >&5
++echo "$as_me:14194: result: $cf_cv_unctrl_header" >&5
+ echo "${ECHO_T}$cf_cv_unctrl_header" >&6
+
+ case $cf_cv_unctrl_header in
+ (no)
+- { echo "$as_me:14196: WARNING: unctrl.h header not found" >&5
++ { echo "$as_me:14199: WARNING: unctrl.h header not found" >&5
+ echo "$as_me: WARNING: unctrl.h header not found" >&2;}
+ ;;
+ esac
+@@ -14267,10 +14270,10 @@
+
+ cf_tr_func=`echo "$cf_func" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%`
+
+- echo "$as_me:14270: checking for ${cf_func}" >&5
++ echo "$as_me:14273: checking for ${cf_func}" >&5
+ echo $ECHO_N "checking for ${cf_func}... $ECHO_C" >&6
+
+-echo "${as_me:-configure}:14273: testing ${cf_func} ..." 1>&5
++echo "${as_me:-configure}:14276: testing ${cf_func} ..." 1>&5
+
+ if eval "test \"\${cf_cv_func_$cf_func+set}\" = set"; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -14279,7 +14282,7 @@
+ eval cf_result='$ac_cv_func_'$cf_func
+ if test ".$cf_result" != ".no"; then
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 14282 "configure"
++#line 14285 "configure"
+ #include "confdefs.h"
+
+ #ifdef HAVE_XCURSES
+@@ -14312,16 +14315,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:14315: \"$ac_link\"") >&5
++if { (eval echo "$as_me:14318: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:14318: \$? = $ac_status" >&5
++ echo "$as_me:14321: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -s conftest$ac_exeext'
+- { (eval echo "$as_me:14321: \"$ac_try\"") >&5
++ { (eval echo "$as_me:14324: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:14324: \$? = $ac_status" >&5
++ echo "$as_me:14327: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ cf_result=yes
+ else
+@@ -14337,7 +14340,7 @@
+
+ # use the computed/retrieved cache-value:
+ eval 'cf_result=$cf_cv_func_'$cf_func
+- echo "$as_me:14340: result: $cf_result" >&5
++ echo "$as_me:14343: result: $cf_result" >&5
+ echo "${ECHO_T}$cf_result" >&6
+ if test $cf_result != no; then
+ cat >>confdefs.h <<EOF
+@@ -14352,10 +14355,10 @@
+
+ cf_tr_func=`echo "$cf_func" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%`
+
+- echo "$as_me:14355: checking for ${cf_func}" >&5
++ echo "$as_me:14358: checking for ${cf_func}" >&5
+ echo $ECHO_N "checking for ${cf_func}... $ECHO_C" >&6
+
+-echo "${as_me:-configure}:14358: testing ${cf_func} ..." 1>&5
++echo "${as_me:-configure}:14361: testing ${cf_func} ..." 1>&5
+
+ if eval "test \"\${cf_cv_func_$cf_func+set}\" = set"; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -14364,7 +14367,7 @@
+ eval cf_result='$ac_cv_func_'$cf_func
+ if test ".$cf_result" != ".no"; then
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 14367 "configure"
++#line 14370 "configure"
+ #include "confdefs.h"
+
+ #ifdef HAVE_XCURSES
+@@ -14397,16 +14400,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:14400: \"$ac_link\"") >&5
++if { (eval echo "$as_me:14403: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:14403: \$? = $ac_status" >&5
++ echo "$as_me:14406: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -s conftest$ac_exeext'
+- { (eval echo "$as_me:14406: \"$ac_try\"") >&5
++ { (eval echo "$as_me:14409: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:14409: \$? = $ac_status" >&5
++ echo "$as_me:14412: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ cf_result=yes
+ else
+@@ -14422,7 +14425,7 @@
+
+ # use the computed/retrieved cache-value:
+ eval 'cf_result=$cf_cv_func_'$cf_func
+- echo "$as_me:14425: result: $cf_result" >&5
++ echo "$as_me:14428: result: $cf_result" >&5
+ echo "${ECHO_T}$cf_result" >&6
+ if test $cf_result != no; then
+ cat >>confdefs.h <<EOF
+@@ -14446,7 +14449,7 @@
+ cf_return="return value"
+ fi
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 14449 "configure"
++#line 14452 "configure"
+ #include "confdefs.h"
+
+ #include <${cf_cv_ncurses_header:-curses.h}>
+@@ -14466,21 +14469,21 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:14469: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:14472: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:14472: \$? = $ac_status" >&5
++ echo "$as_me:14475: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:14475: \"$ac_try\"") >&5
++ { (eval echo "$as_me:14478: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:14478: \$? = $ac_status" >&5
++ echo "$as_me:14481: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+
+ test -n "$verbose" && echo " prototype $cf_ret func($cf_arg value)" 1>&6
+
+-echo "${as_me:-configure}:14483: testing prototype $cf_ret func($cf_arg value) ..." 1>&5
++echo "${as_me:-configure}:14486: testing prototype $cf_ret func($cf_arg value) ..." 1>&5
+
+ cat >>confdefs.h <<EOF
+ #define TPUTS_ARG $cf_arg
+@@ -14500,14 +14503,14 @@
+ done
+ fi
+
+-echo "$as_me:14503: checking for ncurses extended functions" >&5
++echo "$as_me:14506: checking for ncurses extended functions" >&5
+ echo $ECHO_N "checking for ncurses extended functions... $ECHO_C" >&6
+ if test "${cf_cv_ncurses_ext_funcs+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 14510 "configure"
++#line 14513 "configure"
+ #include "confdefs.h"
+
+ #include <${cf_cv_ncurses_header:-curses.h}>
+@@ -14522,16 +14525,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:14525: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:14528: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:14528: \$? = $ac_status" >&5
++ echo "$as_me:14531: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:14531: \"$ac_try\"") >&5
++ { (eval echo "$as_me:14534: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:14534: \$? = $ac_status" >&5
++ echo "$as_me:14537: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ cf_cv_ncurses_ext_funcs=defined
+ else
+@@ -14539,7 +14542,7 @@
+ cat conftest.$ac_ext >&5
+
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 14542 "configure"
++#line 14545 "configure"
+ #include "confdefs.h"
+
+ #include <${cf_cv_ncurses_header:-curses.h}>
+@@ -14564,16 +14567,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:14567: \"$ac_link\"") >&5
++if { (eval echo "$as_me:14570: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:14570: \$? = $ac_status" >&5
++ echo "$as_me:14573: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -s conftest$ac_exeext'
+- { (eval echo "$as_me:14573: \"$ac_try\"") >&5
++ { (eval echo "$as_me:14576: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:14576: \$? = $ac_status" >&5
++ echo "$as_me:14579: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ cf_cv_ncurses_ext_funcs=yes
+ else
+@@ -14587,7 +14590,7 @@
+ rm -f conftest.$ac_objext conftest.$ac_ext
+
+ fi
+-echo "$as_me:14590: result: $cf_cv_ncurses_ext_funcs" >&5
++echo "$as_me:14593: result: $cf_cv_ncurses_ext_funcs" >&5
+ echo "${ECHO_T}$cf_cv_ncurses_ext_funcs" >&6
+ test "$cf_cv_ncurses_ext_funcs" = yes &&
+ cat >>confdefs.h <<\EOF
+@@ -14601,11 +14604,11 @@
+ if test -n "$cf_cv_ncurses_version" && test "x$cf_cv_ncurses_version" != xno
+ then
+ cf_define_xpg5=no
+- echo "$as_me:14604: checking if _XPG5 should be defined to enable wide-characters" >&5
++ echo "$as_me:14607: checking if _XPG5 should be defined to enable wide-characters" >&5
+ echo $ECHO_N "checking if _XPG5 should be defined to enable wide-characters... $ECHO_C" >&6
+
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 14608 "configure"
++#line 14611 "configure"
+ #include "confdefs.h"
+
+ #include <${cf_cv_ncurses_header:-curses.h}>
+@@ -14618,16 +14621,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:14621: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:14624: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:14624: \$? = $ac_status" >&5
++ echo "$as_me:14627: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:14627: \"$ac_try\"") >&5
++ { (eval echo "$as_me:14630: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:14630: \$? = $ac_status" >&5
++ echo "$as_me:14633: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ :
+ else
+@@ -14636,7 +14639,7 @@
+ cf_save_cppflags="$CPPFLAGS"
+ CPPFLAGS="$CPPFLAGS -D_XPG5"
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 14639 "configure"
++#line 14642 "configure"
+ #include "confdefs.h"
+
+ #include <${cf_cv_ncurses_header:-curses.h}>
+@@ -14649,16 +14652,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:14652: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:14655: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:14655: \$? = $ac_status" >&5
++ echo "$as_me:14658: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:14658: \"$ac_try\"") >&5
++ { (eval echo "$as_me:14661: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:14661: \$? = $ac_status" >&5
++ echo "$as_me:14664: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ cf_define_xpg5=yes
+ else
+@@ -14669,7 +14672,7 @@
+ CPPFLAGS="$cf_save_cppflags"
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+- echo "$as_me:14672: result: $cf_define_xpg5" >&5
++ echo "$as_me:14675: result: $cf_define_xpg5" >&5
+ echo "${ECHO_T}$cf_define_xpg5" >&6
+
+ if test "$cf_define_xpg5" = yes
+@@ -14678,14 +14681,14 @@
+ fi
+ fi
+
+- echo "$as_me:14681: checking for wide-character functions" >&5
++ echo "$as_me:14684: checking for wide-character functions" >&5
+ echo $ECHO_N "checking for wide-character functions... $ECHO_C" >&6
+ if test "${cf_cv_widechar_funcs+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 14688 "configure"
++#line 14691 "configure"
+ #include "confdefs.h"
+
+ #include <${cf_cv_ncurses_header:-curses.h}>
+@@ -14702,16 +14705,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:14705: \"$ac_link\"") >&5
++if { (eval echo "$as_me:14708: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:14708: \$? = $ac_status" >&5
++ echo "$as_me:14711: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -s conftest$ac_exeext'
+- { (eval echo "$as_me:14711: \"$ac_try\"") >&5
++ { (eval echo "$as_me:14714: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:14714: \$? = $ac_status" >&5
++ echo "$as_me:14717: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ cf_cv_widechar_funcs=yes
+ else
+@@ -14722,7 +14725,7 @@
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+
+ fi
+-echo "$as_me:14725: result: $cf_cv_widechar_funcs" >&5
++echo "$as_me:14728: result: $cf_cv_widechar_funcs" >&5
+ echo "${ECHO_T}$cf_cv_widechar_funcs" >&6
+ if test "$cf_cv_widechar_funcs" != no ; then
+
+@@ -14743,14 +14746,14 @@
+
+ fi
+
+-echo "$as_me:14746: checking if $cf_cv_screen library uses pthreads" >&5
++echo "$as_me:14749: checking if $cf_cv_screen library uses pthreads" >&5
+ echo $ECHO_N "checking if $cf_cv_screen library uses pthreads... $ECHO_C" >&6
+ if test "${cf_cv_use_pthreads+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 14753 "configure"
++#line 14756 "configure"
+ #include "confdefs.h"
+
+ #include <${cf_cv_ncurses_header:-curses.h}>
+@@ -14768,16 +14771,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:14771: \"$ac_link\"") >&5
++if { (eval echo "$as_me:14774: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:14774: \$? = $ac_status" >&5
++ echo "$as_me:14777: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -s conftest$ac_exeext'
+- { (eval echo "$as_me:14777: \"$ac_try\"") >&5
++ { (eval echo "$as_me:14780: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:14780: \$? = $ac_status" >&5
++ echo "$as_me:14783: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ cf_cv_use_pthreads=yes
+ else
+@@ -14788,20 +14791,20 @@
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+
+ fi
+-echo "$as_me:14791: result: $cf_cv_use_pthreads" >&5
++echo "$as_me:14794: result: $cf_cv_use_pthreads" >&5
+ echo "${ECHO_T}$cf_cv_use_pthreads" >&6
+ test $cf_cv_use_pthreads = yes && cat >>confdefs.h <<\EOF
+ #define USE_PTHREADS 1
+ EOF
+
+-echo "$as_me:14797: checking if sys/time.h works with sys/select.h" >&5
++echo "$as_me:14800: 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 14804 "configure"
++#line 14807 "configure"
+ #include "confdefs.h"
+
+ #include <sys/types.h>
+@@ -14821,16 +14824,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:14824: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:14827: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:14827: \$? = $ac_status" >&5
++ echo "$as_me:14830: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:14830: \"$ac_try\"") >&5
++ { (eval echo "$as_me:14833: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:14833: \$? = $ac_status" >&5
++ echo "$as_me:14836: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ cf_cv_sys_time_select=yes
+ else
+@@ -14842,7 +14845,7 @@
+
+ fi
+
+-echo "$as_me:14845: result: $cf_cv_sys_time_select" >&5
++echo "$as_me:14848: 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
+@@ -14851,7 +14854,7 @@
+
+ # special check for test/ditto.c
+
+-echo "$as_me:14854: checking for openpty in -lutil" >&5
++echo "$as_me:14857: 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
+@@ -14859,7 +14862,7 @@
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lutil $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 14862 "configure"
++#line 14865 "configure"
+ #include "confdefs.h"
+
+ /* Override any gcc2 internal prototype to avoid an error. */
+@@ -14878,16 +14881,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:14881: \"$ac_link\"") >&5
++if { (eval echo "$as_me:14884: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:14884: \$? = $ac_status" >&5
++ echo "$as_me:14887: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -s conftest$ac_exeext'
+- { (eval echo "$as_me:14887: \"$ac_try\"") >&5
++ { (eval echo "$as_me:14890: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:14890: \$? = $ac_status" >&5
++ echo "$as_me:14893: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ ac_cv_lib_util_openpty=yes
+ else
+@@ -14898,7 +14901,7 @@
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:14901: result: $ac_cv_lib_util_openpty" >&5
++echo "$as_me:14904: 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
+@@ -14906,7 +14909,7 @@
+ cf_cv_lib_util=no
+ fi
+
+-echo "$as_me:14909: checking for openpty header" >&5
++echo "$as_me:14912: 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
+@@ -14933,7 +14936,7 @@
+ for cf_header in pty.h libutil.h util.h
+ do
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 14936 "configure"
++#line 14939 "configure"
+ #include "confdefs.h"
+
+ #include <$cf_header>
+@@ -14950,16 +14953,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:14953: \"$ac_link\"") >&5
++if { (eval echo "$as_me:14956: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:14956: \$? = $ac_status" >&5
++ echo "$as_me:14959: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -s conftest$ac_exeext'
+- { (eval echo "$as_me:14959: \"$ac_try\"") >&5
++ { (eval echo "$as_me:14962: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:14962: \$? = $ac_status" >&5
++ echo "$as_me:14965: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+
+ cf_cv_func_openpty=$cf_header
+@@ -14977,7 +14980,7 @@
+ LIBS="$cf_save_LIBS"
+
+ fi
+-echo "$as_me:14980: result: $cf_cv_func_openpty" >&5
++echo "$as_me:14983: result: $cf_cv_func_openpty" >&5
+ echo "${ECHO_T}$cf_cv_func_openpty" >&6
+
+ if test "$cf_cv_func_openpty" != no ; then
+@@ -15011,7 +15014,7 @@
+ fi
+ fi
+
+-echo "$as_me:15014: checking for function curses_version" >&5
++echo "$as_me:15017: checking for function curses_version" >&5
+ echo $ECHO_N "checking for function curses_version... $ECHO_C" >&6
+ if test "${cf_cv_func_curses_version+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -15021,7 +15024,7 @@
+ cf_cv_func_curses_version=unknown
+ else
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 15024 "configure"
++#line 15027 "configure"
+ #include "confdefs.h"
+
+ #include <${cf_cv_ncurses_header:-curses.h}>
+@@ -15034,15 +15037,15 @@
+
+ _ACEOF
+ rm -f conftest$ac_exeext
+-if { (eval echo "$as_me:15037: \"$ac_link\"") >&5
++if { (eval echo "$as_me:15040: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:15040: \$? = $ac_status" >&5
++ echo "$as_me:15043: \$? = $ac_status" >&5
+ (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+- { (eval echo "$as_me:15042: \"$ac_try\"") >&5
++ { (eval echo "$as_me:15045: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:15045: \$? = $ac_status" >&5
++ echo "$as_me:15048: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ cf_cv_func_curses_version=yes
+
+@@ -15057,14 +15060,14 @@
+ fi
+ rm -f core
+ fi
+-echo "$as_me:15060: result: $cf_cv_func_curses_version" >&5
++echo "$as_me:15063: result: $cf_cv_func_curses_version" >&5
+ echo "${ECHO_T}$cf_cv_func_curses_version" >&6
+ test "$cf_cv_func_curses_version" = yes &&
+ cat >>confdefs.h <<\EOF
+ #define HAVE_CURSES_VERSION 1
+ EOF
+
+-echo "$as_me:15067: checking for alternate character set array" >&5
++echo "$as_me:15070: checking for alternate character set array" >&5
+ echo $ECHO_N "checking for alternate character set array... $ECHO_C" >&6
+ if test "${cf_cv_curses_acs_map+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -15074,7 +15077,7 @@
+ for name in acs_map _acs_map __acs_map ${NCURSES_WRAP_PREFIX}acs_map
+ do
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 15077 "configure"
++#line 15080 "configure"
+ #include "confdefs.h"
+
+ #include <${cf_cv_ncurses_header:-curses.h}>
+@@ -15090,16 +15093,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:15093: \"$ac_link\"") >&5
++if { (eval echo "$as_me:15096: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:15096: \$? = $ac_status" >&5
++ echo "$as_me:15099: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -s conftest$ac_exeext'
+- { (eval echo "$as_me:15099: \"$ac_try\"") >&5
++ { (eval echo "$as_me:15102: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:15102: \$? = $ac_status" >&5
++ echo "$as_me:15105: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ cf_cv_curses_acs_map=$name; break
+ else
+@@ -15110,7 +15113,7 @@
+ done
+
+ fi
+-echo "$as_me:15113: result: $cf_cv_curses_acs_map" >&5
++echo "$as_me:15116: result: $cf_cv_curses_acs_map" >&5
+ echo "${ECHO_T}$cf_cv_curses_acs_map" >&6
+
+ test "$cf_cv_curses_acs_map" != unknown &&
+@@ -15120,7 +15123,7 @@
+
+ if test "$cf_enable_widec" = yes; then
+
+-echo "$as_me:15123: checking for wide alternate character set array" >&5
++echo "$as_me:15126: checking for wide alternate character set array" >&5
+ echo $ECHO_N "checking for wide alternate character set array... $ECHO_C" >&6
+ if test "${cf_cv_curses_wacs_map+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -15130,7 +15133,7 @@
+ for name in wacs_map _wacs_map __wacs_map _nc_wacs _wacs_char
+ do
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 15133 "configure"
++#line 15136 "configure"
+ #include "confdefs.h"
+
+ #ifndef _XOPEN_SOURCE_EXTENDED
+@@ -15146,16 +15149,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:15149: \"$ac_link\"") >&5
++if { (eval echo "$as_me:15152: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:15152: \$? = $ac_status" >&5
++ echo "$as_me:15155: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -s conftest$ac_exeext'
+- { (eval echo "$as_me:15155: \"$ac_try\"") >&5
++ { (eval echo "$as_me:15158: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:15158: \$? = $ac_status" >&5
++ echo "$as_me:15161: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ cf_cv_curses_wacs_map=$name
+ break
+@@ -15166,7 +15169,7 @@
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ done
+ fi
+-echo "$as_me:15169: result: $cf_cv_curses_wacs_map" >&5
++echo "$as_me:15172: result: $cf_cv_curses_wacs_map" >&5
+ echo "${ECHO_T}$cf_cv_curses_wacs_map" >&6
+
+ test "$cf_cv_curses_wacs_map" != unknown &&
+@@ -15174,7 +15177,7 @@
+ #define CURSES_WACS_ARRAY $cf_cv_curses_wacs_map
+ EOF
+
+-echo "$as_me:15177: checking for wide alternate character constants" >&5
++echo "$as_me:15180: checking for wide alternate character constants" >&5
+ echo $ECHO_N "checking for wide alternate character constants... $ECHO_C" >&6
+ if test "${cf_cv_curses_wacs_symbols+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -15184,7 +15187,7 @@
+ if test "$cf_cv_curses_wacs_map" != unknown
+ then
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 15187 "configure"
++#line 15190 "configure"
+ #include "confdefs.h"
+
+ #ifndef _XOPEN_SOURCE_EXTENDED
+@@ -15201,16 +15204,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:15204: \"$ac_link\"") >&5
++if { (eval echo "$as_me:15207: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:15207: \$? = $ac_status" >&5
++ echo "$as_me:15210: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -s conftest$ac_exeext'
+- { (eval echo "$as_me:15210: \"$ac_try\"") >&5
++ { (eval echo "$as_me:15213: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:15213: \$? = $ac_status" >&5
++ echo "$as_me:15216: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ cf_cv_curses_wacs_symbols=yes
+ else
+@@ -15220,7 +15223,7 @@
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ else
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 15223 "configure"
++#line 15226 "configure"
+ #include "confdefs.h"
+
+ #ifndef _XOPEN_SOURCE_EXTENDED
+@@ -15236,16 +15239,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:15239: \"$ac_link\"") >&5
++if { (eval echo "$as_me:15242: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:15242: \$? = $ac_status" >&5
++ echo "$as_me:15245: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -s conftest$ac_exeext'
+- { (eval echo "$as_me:15245: \"$ac_try\"") >&5
++ { (eval echo "$as_me:15248: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:15248: \$? = $ac_status" >&5
++ echo "$as_me:15251: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ cf_cv_curses_wacs_symbols=yes
+ else
+@@ -15256,7 +15259,7 @@
+ fi
+
+ fi
+-echo "$as_me:15259: result: $cf_cv_curses_wacs_symbols" >&5
++echo "$as_me:15262: result: $cf_cv_curses_wacs_symbols" >&5
+ echo "${ECHO_T}$cf_cv_curses_wacs_symbols" >&6
+
+ test "$cf_cv_curses_wacs_symbols" != no &&
+@@ -15266,10 +15269,10 @@
+
+ fi
+
+-echo "$as_me:15269: checking for type attr_t in ${cf_cv_ncurses_header:-curses.h}" >&5
++echo "$as_me:15272: checking for type attr_t in ${cf_cv_ncurses_header:-curses.h}" >&5
+ echo $ECHO_N "checking for type attr_t in ${cf_cv_ncurses_header:-curses.h}... $ECHO_C" >&6
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 15272 "configure"
++#line 15275 "configure"
+ #include "confdefs.h"
+
+ #ifndef _XOPEN_SOURCE_EXTENDED
+@@ -15287,16 +15290,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:15290: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:15293: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:15293: \$? = $ac_status" >&5
++ echo "$as_me:15296: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:15296: \"$ac_try\"") >&5
++ { (eval echo "$as_me:15299: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:15299: \$? = $ac_status" >&5
++ echo "$as_me:15302: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ cf_result=yes
+ else
+@@ -15305,7 +15308,7 @@
+ cf_result=no
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+-echo "$as_me:15308: result: $cf_result" >&5
++echo "$as_me:15311: result: $cf_result" >&5
+ echo "${ECHO_T}$cf_result" >&6
+ if test $cf_result = yes ; then
+
+@@ -15326,14 +15329,14 @@
+ if test "$cf_enable_widec" = yes; then
+
+ # This is needed on Tru64 5.0 to declare mbstate_t
+-echo "$as_me:15329: checking if we must include wchar.h to declare mbstate_t" >&5
++echo "$as_me:15332: 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 15336 "configure"
++#line 15339 "configure"
+ #include "confdefs.h"
+
+ #include <stdlib.h>
+@@ -15351,23 +15354,23 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:15354: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:15357: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:15357: \$? = $ac_status" >&5
++ echo "$as_me:15360: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:15360: \"$ac_try\"") >&5
++ { (eval echo "$as_me:15363: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:15363: \$? = $ac_status" >&5
++ echo "$as_me:15366: \$? = $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 15370 "configure"
++#line 15373 "configure"
+ #include "confdefs.h"
+
+ #include <stdlib.h>
+@@ -15386,16 +15389,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:15389: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:15392: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:15392: \$? = $ac_status" >&5
++ echo "$as_me:15395: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:15395: \"$ac_try\"") >&5
++ { (eval echo "$as_me:15398: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:15398: \$? = $ac_status" >&5
++ echo "$as_me:15401: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ cf_cv_mbstate_t=yes
+ else
+@@ -15407,7 +15410,7 @@
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ fi
+-echo "$as_me:15410: result: $cf_cv_mbstate_t" >&5
++echo "$as_me:15413: result: $cf_cv_mbstate_t" >&5
+ echo "${ECHO_T}$cf_cv_mbstate_t" >&6
+
+ if test "$cf_cv_mbstate_t" = yes ; then
+@@ -15430,14 +15433,14 @@
+ fi
+
+ # This is needed on Tru64 5.0 to declare wchar_t
+-echo "$as_me:15433: checking if we must include wchar.h to declare wchar_t" >&5
++echo "$as_me:15436: 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 15440 "configure"
++#line 15443 "configure"
+ #include "confdefs.h"
+
+ #include <stdlib.h>
+@@ -15455,23 +15458,23 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:15458: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:15461: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:15461: \$? = $ac_status" >&5
++ echo "$as_me:15464: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:15464: \"$ac_try\"") >&5
++ { (eval echo "$as_me:15467: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:15467: \$? = $ac_status" >&5
++ echo "$as_me:15470: \$? = $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 15474 "configure"
++#line 15477 "configure"
+ #include "confdefs.h"
+
+ #include <stdlib.h>
+@@ -15490,16 +15493,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:15493: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:15496: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:15496: \$? = $ac_status" >&5
++ echo "$as_me:15499: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:15499: \"$ac_try\"") >&5
++ { (eval echo "$as_me:15502: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:15502: \$? = $ac_status" >&5
++ echo "$as_me:15505: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ cf_cv_wchar_t=yes
+ else
+@@ -15511,7 +15514,7 @@
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ fi
+-echo "$as_me:15514: result: $cf_cv_wchar_t" >&5
++echo "$as_me:15517: result: $cf_cv_wchar_t" >&5
+ echo "${ECHO_T}$cf_cv_wchar_t" >&6
+
+ if test "$cf_cv_wchar_t" = yes ; then
+@@ -15534,14 +15537,14 @@
+ fi
+
+ # This is needed on Tru64 5.0 to declare wint_t
+-echo "$as_me:15537: checking if we must include wchar.h to declare wint_t" >&5
++echo "$as_me:15540: 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 15544 "configure"
++#line 15547 "configure"
+ #include "confdefs.h"
+
+ #include <stdlib.h>
+@@ -15559,23 +15562,23 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:15562: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:15565: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:15565: \$? = $ac_status" >&5
++ echo "$as_me:15568: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:15568: \"$ac_try\"") >&5
++ { (eval echo "$as_me:15571: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:15571: \$? = $ac_status" >&5
++ echo "$as_me:15574: \$? = $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 15578 "configure"
++#line 15581 "configure"
+ #include "confdefs.h"
+
+ #include <stdlib.h>
+@@ -15594,16 +15597,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:15597: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:15600: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:15600: \$? = $ac_status" >&5
++ echo "$as_me:15603: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:15603: \"$ac_try\"") >&5
++ { (eval echo "$as_me:15606: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:15606: \$? = $ac_status" >&5
++ echo "$as_me:15609: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ cf_cv_wint_t=yes
+ else
+@@ -15615,7 +15618,7 @@
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ fi
+-echo "$as_me:15618: result: $cf_cv_wint_t" >&5
++echo "$as_me:15621: result: $cf_cv_wint_t" >&5
+ echo "${ECHO_T}$cf_cv_wint_t" >&6
+
+ if test "$cf_cv_wint_t" = yes ; then
+@@ -15639,10 +15642,10 @@
+
+ if test "$NCURSES_OK_MBSTATE_T" = 0 ; then
+
+-echo "$as_me:15642: checking for type mbstate_t in ${cf_cv_ncurses_header:-curses.h}" >&5
++echo "$as_me:15645: checking for type mbstate_t in ${cf_cv_ncurses_header:-curses.h}" >&5
+ echo $ECHO_N "checking for type mbstate_t in ${cf_cv_ncurses_header:-curses.h}... $ECHO_C" >&6
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 15645 "configure"
++#line 15648 "configure"
+ #include "confdefs.h"
+
+ #ifndef _XOPEN_SOURCE_EXTENDED
+@@ -15660,16 +15663,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:15663: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:15666: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:15666: \$? = $ac_status" >&5
++ echo "$as_me:15669: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:15669: \"$ac_try\"") >&5
++ { (eval echo "$as_me:15672: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:15672: \$? = $ac_status" >&5
++ echo "$as_me:15675: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ cf_result=yes
+ else
+@@ -15678,7 +15681,7 @@
+ cf_result=no
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+-echo "$as_me:15681: result: $cf_result" >&5
++echo "$as_me:15684: result: $cf_result" >&5
+ echo "${ECHO_T}$cf_result" >&6
+ if test $cf_result = yes ; then
+
+@@ -15700,10 +15703,10 @@
+
+ if test "$NCURSES_OK_WCHAR_T" = 0 ; then
+
+-echo "$as_me:15703: checking for type wchar_t in ${cf_cv_ncurses_header:-curses.h}" >&5
++echo "$as_me:15706: checking for type wchar_t in ${cf_cv_ncurses_header:-curses.h}" >&5
+ echo $ECHO_N "checking for type wchar_t in ${cf_cv_ncurses_header:-curses.h}... $ECHO_C" >&6
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 15706 "configure"
++#line 15709 "configure"
+ #include "confdefs.h"
+
+ #ifndef _XOPEN_SOURCE_EXTENDED
+@@ -15721,16 +15724,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:15724: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:15727: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:15727: \$? = $ac_status" >&5
++ echo "$as_me:15730: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:15730: \"$ac_try\"") >&5
++ { (eval echo "$as_me:15733: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:15733: \$? = $ac_status" >&5
++ echo "$as_me:15736: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ cf_result=yes
+ else
+@@ -15739,7 +15742,7 @@
+ cf_result=no
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+-echo "$as_me:15742: result: $cf_result" >&5
++echo "$as_me:15745: result: $cf_result" >&5
+ echo "${ECHO_T}$cf_result" >&6
+ if test $cf_result = yes ; then
+
+@@ -15761,10 +15764,10 @@
+
+ if test "$NCURSES_OK_WINT_T" = 0 ; then
+
+-echo "$as_me:15764: checking for type wint_t in ${cf_cv_ncurses_header:-curses.h}" >&5
++echo "$as_me:15767: checking for type wint_t in ${cf_cv_ncurses_header:-curses.h}" >&5
+ echo $ECHO_N "checking for type wint_t in ${cf_cv_ncurses_header:-curses.h}... $ECHO_C" >&6
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 15767 "configure"
++#line 15770 "configure"
+ #include "confdefs.h"
+
+ #ifndef _XOPEN_SOURCE_EXTENDED
+@@ -15782,16 +15785,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:15785: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:15788: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:15788: \$? = $ac_status" >&5
++ echo "$as_me:15791: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:15791: \"$ac_try\"") >&5
++ { (eval echo "$as_me:15794: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:15794: \$? = $ac_status" >&5
++ echo "$as_me:15797: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ cf_result=yes
+ else
+@@ -15800,7 +15803,7 @@
+ cf_result=no
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+-echo "$as_me:15803: result: $cf_result" >&5
++echo "$as_me:15806: result: $cf_result" >&5
+ echo "${ECHO_T}$cf_result" >&6
+ if test $cf_result = yes ; then
+
+@@ -15821,11 +15824,11 @@
+ fi
+ fi
+
+-echo "$as_me:15824: checking for data ospeed declaration in ${cf_cv_ncurses_header:-curses.h}" >&5
++echo "$as_me:15827: checking for data ospeed declaration in ${cf_cv_ncurses_header:-curses.h}" >&5
+ echo $ECHO_N "checking for data ospeed declaration in ${cf_cv_ncurses_header:-curses.h}... $ECHO_C" >&6
+
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 15828 "configure"
++#line 15831 "configure"
+ #include "confdefs.h"
+
+ #ifdef HAVE_XCURSES
+@@ -15853,16 +15856,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:15856: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:15859: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:15859: \$? = $ac_status" >&5
++ echo "$as_me:15862: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:15862: \"$ac_try\"") >&5
++ { (eval echo "$as_me:15865: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:15865: \$? = $ac_status" >&5
++ echo "$as_me:15868: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ cf_result=yes
+ else
+@@ -15871,7 +15874,7 @@
+ cf_result=no
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+-echo "$as_me:15874: result: $cf_result" >&5
++echo "$as_me:15877: result: $cf_result" >&5
+ echo "${ECHO_T}$cf_result" >&6
+
+ if test $cf_result = yes ; then
+@@ -15883,14 +15886,14 @@
+ EOF
+
+ else
+- echo "$as_me:15886: checking for data ospeed in library" >&5
++ echo "$as_me:15889: checking for data ospeed in library" >&5
+ echo $ECHO_N "checking for data ospeed in library... $ECHO_C" >&6
+ # BSD linkers insist on making weak linkage, but resolve at runtime.
+ if test "$cross_compiling" = yes; then
+
+ # cross-compiling
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 15893 "configure"
++#line 15896 "configure"
+ #include "confdefs.h"
+
+ #ifdef HAVE_XCURSES
+@@ -15923,16 +15926,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:15926: \"$ac_link\"") >&5
++if { (eval echo "$as_me:15929: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:15929: \$? = $ac_status" >&5
++ echo "$as_me:15932: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -s conftest$ac_exeext'
+- { (eval echo "$as_me:15932: \"$ac_try\"") >&5
++ { (eval echo "$as_me:15935: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:15935: \$? = $ac_status" >&5
++ echo "$as_me:15938: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ cf_result=yes
+ else
+@@ -15944,7 +15947,7 @@
+
+ else
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 15947 "configure"
++#line 15950 "configure"
+ #include "confdefs.h"
+
+ #ifdef HAVE_XCURSES
+@@ -15970,15 +15973,15 @@
+ }
+ _ACEOF
+ rm -f conftest$ac_exeext
+-if { (eval echo "$as_me:15973: \"$ac_link\"") >&5
++if { (eval echo "$as_me:15976: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:15976: \$? = $ac_status" >&5
++ echo "$as_me:15979: \$? = $ac_status" >&5
+ (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+- { (eval echo "$as_me:15978: \"$ac_try\"") >&5
++ { (eval echo "$as_me:15981: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:15981: \$? = $ac_status" >&5
++ echo "$as_me:15984: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ cf_result=yes
+ else
+@@ -15989,7 +15992,7 @@
+ fi
+ rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+ fi
+- echo "$as_me:15992: result: $cf_result" >&5
++ echo "$as_me:15995: result: $cf_result" >&5
+ echo "${ECHO_T}$cf_result" >&6
+ if test $cf_result = yes ; then
+
+@@ -16002,11 +16005,11 @@
+ fi
+ fi
+
+-echo "$as_me:16005: checking for data boolnames declaration in ${cf_cv_ncurses_header:-curses.h}" >&5
++echo "$as_me:16008: checking for data boolnames declaration in ${cf_cv_ncurses_header:-curses.h}" >&5
+ echo $ECHO_N "checking for data boolnames declaration in ${cf_cv_ncurses_header:-curses.h}... $ECHO_C" >&6
+
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 16009 "configure"
++#line 16012 "configure"
+ #include "confdefs.h"
+
+ #ifdef HAVE_XCURSES
+@@ -16034,16 +16037,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:16037: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:16040: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:16040: \$? = $ac_status" >&5
++ echo "$as_me:16043: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:16043: \"$ac_try\"") >&5
++ { (eval echo "$as_me:16046: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:16046: \$? = $ac_status" >&5
++ echo "$as_me:16049: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ cf_result=yes
+ else
+@@ -16052,7 +16055,7 @@
+ cf_result=no
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+-echo "$as_me:16055: result: $cf_result" >&5
++echo "$as_me:16058: result: $cf_result" >&5
+ echo "${ECHO_T}$cf_result" >&6
+
+ if test $cf_result = yes ; then
+@@ -16064,14 +16067,14 @@
+ EOF
+
+ else
+- echo "$as_me:16067: checking for data boolnames in library" >&5
++ echo "$as_me:16070: checking for data boolnames in library" >&5
+ echo $ECHO_N "checking for data boolnames in library... $ECHO_C" >&6
+ # BSD linkers insist on making weak linkage, but resolve at runtime.
+ if test "$cross_compiling" = yes; then
+
+ # cross-compiling
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 16074 "configure"
++#line 16077 "configure"
+ #include "confdefs.h"
+
+ #ifdef HAVE_XCURSES
+@@ -16104,16 +16107,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:16107: \"$ac_link\"") >&5
++if { (eval echo "$as_me:16110: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:16110: \$? = $ac_status" >&5
++ echo "$as_me:16113: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -s conftest$ac_exeext'
+- { (eval echo "$as_me:16113: \"$ac_try\"") >&5
++ { (eval echo "$as_me:16116: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:16116: \$? = $ac_status" >&5
++ echo "$as_me:16119: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ cf_result=yes
+ else
+@@ -16125,7 +16128,7 @@
+
+ else
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 16128 "configure"
++#line 16131 "configure"
+ #include "confdefs.h"
+
+ #ifdef HAVE_XCURSES
+@@ -16151,15 +16154,15 @@
+ }
+ _ACEOF
+ rm -f conftest$ac_exeext
+-if { (eval echo "$as_me:16154: \"$ac_link\"") >&5
++if { (eval echo "$as_me:16157: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:16157: \$? = $ac_status" >&5
++ echo "$as_me:16160: \$? = $ac_status" >&5
+ (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+- { (eval echo "$as_me:16159: \"$ac_try\"") >&5
++ { (eval echo "$as_me:16162: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:16162: \$? = $ac_status" >&5
++ echo "$as_me:16165: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ cf_result=yes
+ else
+@@ -16170,7 +16173,7 @@
+ fi
+ rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+ fi
+- echo "$as_me:16173: result: $cf_result" >&5
++ echo "$as_me:16176: result: $cf_result" >&5
+ echo "${ECHO_T}$cf_result" >&6
+ if test $cf_result = yes ; then
+
+@@ -16183,11 +16186,11 @@
+ fi
+ fi
+
+-echo "$as_me:16186: checking for data boolfnames declaration in ${cf_cv_ncurses_header:-curses.h}" >&5
++echo "$as_me:16189: checking for data boolfnames declaration in ${cf_cv_ncurses_header:-curses.h}" >&5
+ echo $ECHO_N "checking for data boolfnames declaration in ${cf_cv_ncurses_header:-curses.h}... $ECHO_C" >&6
+
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 16190 "configure"
++#line 16193 "configure"
+ #include "confdefs.h"
+
+ #ifdef HAVE_XCURSES
+@@ -16215,16 +16218,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:16218: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:16221: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:16221: \$? = $ac_status" >&5
++ echo "$as_me:16224: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:16224: \"$ac_try\"") >&5
++ { (eval echo "$as_me:16227: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:16227: \$? = $ac_status" >&5
++ echo "$as_me:16230: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ cf_result=yes
+ else
+@@ -16233,7 +16236,7 @@
+ cf_result=no
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+-echo "$as_me:16236: result: $cf_result" >&5
++echo "$as_me:16239: result: $cf_result" >&5
+ echo "${ECHO_T}$cf_result" >&6
+
+ if test $cf_result = yes ; then
+@@ -16245,14 +16248,14 @@
+ EOF
+
+ else
+- echo "$as_me:16248: checking for data boolfnames in library" >&5
++ echo "$as_me:16251: checking for data boolfnames in library" >&5
+ echo $ECHO_N "checking for data boolfnames in library... $ECHO_C" >&6
+ # BSD linkers insist on making weak linkage, but resolve at runtime.
+ if test "$cross_compiling" = yes; then
+
+ # cross-compiling
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 16255 "configure"
++#line 16258 "configure"
+ #include "confdefs.h"
+
+ #ifdef HAVE_XCURSES
+@@ -16285,16 +16288,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:16288: \"$ac_link\"") >&5
++if { (eval echo "$as_me:16291: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:16291: \$? = $ac_status" >&5
++ echo "$as_me:16294: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -s conftest$ac_exeext'
+- { (eval echo "$as_me:16294: \"$ac_try\"") >&5
++ { (eval echo "$as_me:16297: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:16297: \$? = $ac_status" >&5
++ echo "$as_me:16300: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ cf_result=yes
+ else
+@@ -16306,7 +16309,7 @@
+
+ else
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 16309 "configure"
++#line 16312 "configure"
+ #include "confdefs.h"
+
+ #ifdef HAVE_XCURSES
+@@ -16332,15 +16335,15 @@
+ }
+ _ACEOF
+ rm -f conftest$ac_exeext
+-if { (eval echo "$as_me:16335: \"$ac_link\"") >&5
++if { (eval echo "$as_me:16338: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:16338: \$? = $ac_status" >&5
++ echo "$as_me:16341: \$? = $ac_status" >&5
+ (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+- { (eval echo "$as_me:16340: \"$ac_try\"") >&5
++ { (eval echo "$as_me:16343: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:16343: \$? = $ac_status" >&5
++ echo "$as_me:16346: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ cf_result=yes
+ else
+@@ -16351,7 +16354,7 @@
+ fi
+ rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+ fi
+- echo "$as_me:16354: result: $cf_result" >&5
++ echo "$as_me:16357: result: $cf_result" >&5
+ echo "${ECHO_T}$cf_result" >&6
+ if test $cf_result = yes ; then
+
+@@ -16366,7 +16369,7 @@
+
+ if ( test "$GCC" = yes || test "$GXX" = yes )
+ then
+-echo "$as_me:16369: checking if you want to turn on gcc warnings" >&5
++echo "$as_me:16372: 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.
+@@ -16383,7 +16386,7 @@
+ with_warnings=no
+
+ fi;
+-echo "$as_me:16386: result: $with_warnings" >&5
++echo "$as_me:16389: result: $with_warnings" >&5
+ echo "${ECHO_T}$with_warnings" >&6
+ if test "$with_warnings" = "yes"
+ then
+@@ -16406,10 +16409,10 @@
+ EOF
+ if test "$GCC" = yes
+ then
+- { echo "$as_me:16409: checking for $CC __attribute__ directives..." >&5
++ { echo "$as_me:16412: checking for $CC __attribute__ directives..." >&5
+ echo "$as_me: checking for $CC __attribute__ directives..." >&6;}
+ cat > conftest.$ac_ext <<EOF
+-#line 16412 "${as_me:-configure}"
++#line 16415 "${as_me:-configure}"
+ #include "confdefs.h"
+ #include "conftest.h"
+ #include "conftest.i"
+@@ -16458,12 +16461,12 @@
+ ;;
+ esac
+
+- if { (eval echo "$as_me:16461: \"$ac_compile\"") >&5
++ if { (eval echo "$as_me:16464: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:16464: \$? = $ac_status" >&5
++ echo "$as_me:16467: \$? = $ac_status" >&5
+ (exit $ac_status); }; then
+- test -n "$verbose" && echo "$as_me:16466: result: ... $cf_attribute" >&5
++ test -n "$verbose" && echo "$as_me:16469: result: ... $cf_attribute" >&5
+ echo "${ECHO_T}... $cf_attribute" >&6
+ cat conftest.h >>confdefs.h
+ case $cf_attribute in
+@@ -16527,12 +16530,12 @@
+ if test "$GCC" = yes ; then
+ case $host_os in
+ (linux*|gnu*)
+- echo "$as_me:16530: checking if this is really Intel C compiler" >&5
++ echo "$as_me:16533: checking if this is really Intel C compiler" >&5
+ echo $ECHO_N "checking if this is really Intel C compiler... $ECHO_C" >&6
+ cf_save_CFLAGS="$CFLAGS"
+ CFLAGS="$CFLAGS -no-gcc"
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 16535 "configure"
++#line 16538 "configure"
+ #include "confdefs.h"
+
+ int
+@@ -16549,16 +16552,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:16552: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:16555: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:16555: \$? = $ac_status" >&5
++ echo "$as_me:16558: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:16558: \"$ac_try\"") >&5
++ { (eval echo "$as_me:16561: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:16561: \$? = $ac_status" >&5
++ echo "$as_me:16564: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ INTEL_COMPILER=yes
+ cf_save_CFLAGS="$cf_save_CFLAGS -we147"
+@@ -16569,7 +16572,7 @@
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ CFLAGS="$cf_save_CFLAGS"
+- echo "$as_me:16572: result: $INTEL_COMPILER" >&5
++ echo "$as_me:16575: result: $INTEL_COMPILER" >&5
+ echo "${ECHO_T}$INTEL_COMPILER" >&6
+ ;;
+ esac
+@@ -16578,12 +16581,12 @@
+ CLANG_COMPILER=no
+
+ if test "$GCC" = yes ; then
+- echo "$as_me:16581: checking if this is really Clang C compiler" >&5
++ echo "$as_me:16584: checking if this is really Clang C compiler" >&5
+ echo $ECHO_N "checking if this is really Clang C compiler... $ECHO_C" >&6
+ cf_save_CFLAGS="$CFLAGS"
+ CFLAGS="$CFLAGS -Qunused-arguments"
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 16586 "configure"
++#line 16589 "configure"
+ #include "confdefs.h"
+
+ int
+@@ -16600,16 +16603,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:16603: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:16606: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:16606: \$? = $ac_status" >&5
++ echo "$as_me:16609: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:16609: \"$ac_try\"") >&5
++ { (eval echo "$as_me:16612: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:16612: \$? = $ac_status" >&5
++ echo "$as_me:16615: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ CLANG_COMPILER=yes
+ cf_save_CFLAGS="$cf_save_CFLAGS -Qunused-arguments"
+@@ -16620,12 +16623,12 @@
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ CFLAGS="$cf_save_CFLAGS"
+- echo "$as_me:16623: result: $CLANG_COMPILER" >&5
++ echo "$as_me:16626: result: $CLANG_COMPILER" >&5
+ echo "${ECHO_T}$CLANG_COMPILER" >&6
+ fi
+
+ cat > conftest.$ac_ext <<EOF
+-#line 16628 "${as_me:-configure}"
++#line 16631 "${as_me:-configure}"
+ int main(int argc, char *argv[]) { return (argv[argc-1] == 0) ; }
+ EOF
+
+@@ -16642,7 +16645,7 @@
+ # remark #981: operands are evaluated in unspecified order
+ # warning #279: controlling expression is constant
+
+- { echo "$as_me:16645: checking for $CC warning options..." >&5
++ { echo "$as_me:16648: checking for $CC warning options..." >&5
+ echo "$as_me: checking for $CC warning options..." >&6;}
+ cf_save_CFLAGS="$CFLAGS"
+ EXTRA_CFLAGS="-Wall"
+@@ -16658,12 +16661,12 @@
+ wd981
+ do
+ CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt"
+- if { (eval echo "$as_me:16661: \"$ac_compile\"") >&5
++ if { (eval echo "$as_me:16664: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:16664: \$? = $ac_status" >&5
++ echo "$as_me:16667: \$? = $ac_status" >&5
+ (exit $ac_status); }; then
+- test -n "$verbose" && echo "$as_me:16666: result: ... -$cf_opt" >&5
++ test -n "$verbose" && echo "$as_me:16669: result: ... -$cf_opt" >&5
+ echo "${ECHO_T}... -$cf_opt" >&6
+ EXTRA_CFLAGS="$EXTRA_CFLAGS -$cf_opt"
+ fi
+@@ -16672,7 +16675,7 @@
+
+ elif test "$GCC" = yes
+ then
+- { echo "$as_me:16675: checking for $CC warning options..." >&5
++ { echo "$as_me:16678: checking for $CC warning options..." >&5
+ echo "$as_me: checking for $CC warning options..." >&6;}
+ cf_save_CFLAGS="$CFLAGS"
+ EXTRA_CFLAGS=
+@@ -16696,12 +16699,12 @@
+ Wundef $cf_gcc_warnings $cf_warn_CONST
+ do
+ CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt"
+- if { (eval echo "$as_me:16699: \"$ac_compile\"") >&5
++ if { (eval echo "$as_me:16702: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:16702: \$? = $ac_status" >&5
++ echo "$as_me:16705: \$? = $ac_status" >&5
+ (exit $ac_status); }; then
+- test -n "$verbose" && echo "$as_me:16704: result: ... -$cf_opt" >&5
++ test -n "$verbose" && echo "$as_me:16707: result: ... -$cf_opt" >&5
+ echo "${ECHO_T}... -$cf_opt" >&6
+ case $cf_opt in
+ (Wcast-qual)
+@@ -16712,7 +16715,7 @@
+ ([34].*)
+ test -n "$verbose" && echo " feature is broken in gcc $GCC_VERSION" 1>&6
+
+-echo "${as_me:-configure}:16715: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
++echo "${as_me:-configure}:16718: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
+
+ continue;;
+ esac
+@@ -16722,7 +16725,7 @@
+ ([12].*)
+ test -n "$verbose" && echo " feature is broken in gcc $GCC_VERSION" 1>&6
+
+-echo "${as_me:-configure}:16725: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
++echo "${as_me:-configure}:16728: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
+
+ continue;;
+ esac
+@@ -16738,7 +16741,7 @@
+ fi
+ fi
+
+-echo "$as_me:16741: checking if you want to use dmalloc for testing" >&5
++echo "$as_me:16744: 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.
+@@ -16755,7 +16758,7 @@
+ else
+ with_dmalloc=
+ fi;
+-echo "$as_me:16758: result: ${with_dmalloc:-no}" >&5
++echo "$as_me:16761: result: ${with_dmalloc:-no}" >&5
+ echo "${ECHO_T}${with_dmalloc:-no}" >&6
+
+ case .$with_cflags in
+@@ -16849,23 +16852,23 @@
+ esac
+
+ if test "$with_dmalloc" = yes ; then
+- echo "$as_me:16852: checking for dmalloc.h" >&5
++ echo "$as_me:16855: 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 16858 "configure"
++#line 16861 "configure"
+ #include "confdefs.h"
+ #include <dmalloc.h>
+ _ACEOF
+-if { (eval echo "$as_me:16862: \"$ac_cpp conftest.$ac_ext\"") >&5
++if { (eval echo "$as_me:16865: \"$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:16868: \$? = $ac_status" >&5
++ echo "$as_me:16871: \$? = $ac_status" >&5
+ (exit $ac_status); } >/dev/null; then
+ if test -s conftest.err; then
+ ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -16884,11 +16887,11 @@
+ fi
+ rm -f conftest.err conftest.$ac_ext
+ fi
+-echo "$as_me:16887: result: $ac_cv_header_dmalloc_h" >&5
++echo "$as_me:16890: 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:16891: checking for dmalloc_debug in -ldmalloc" >&5
++echo "$as_me:16894: 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
+@@ -16896,7 +16899,7 @@
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-ldmalloc $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 16899 "configure"
++#line 16902 "configure"
+ #include "confdefs.h"
+
+ /* Override any gcc2 internal prototype to avoid an error. */
+@@ -16915,16 +16918,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:16918: \"$ac_link\"") >&5
++if { (eval echo "$as_me:16921: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:16921: \$? = $ac_status" >&5
++ echo "$as_me:16924: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -s conftest$ac_exeext'
+- { (eval echo "$as_me:16924: \"$ac_try\"") >&5
++ { (eval echo "$as_me:16927: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:16927: \$? = $ac_status" >&5
++ echo "$as_me:16930: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ ac_cv_lib_dmalloc_dmalloc_debug=yes
+ else
+@@ -16935,7 +16938,7 @@
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:16938: result: $ac_cv_lib_dmalloc_dmalloc_debug" >&5
++echo "$as_me:16941: 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
+@@ -16950,7 +16953,7 @@
+
+ fi
+
+-echo "$as_me:16953: checking if you want to use dbmalloc for testing" >&5
++echo "$as_me:16956: 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.
+@@ -16967,7 +16970,7 @@
+ else
+ with_dbmalloc=
+ fi;
+-echo "$as_me:16970: result: ${with_dbmalloc:-no}" >&5
++echo "$as_me:16973: result: ${with_dbmalloc:-no}" >&5
+ echo "${ECHO_T}${with_dbmalloc:-no}" >&6
+
+ case .$with_cflags in
+@@ -17061,23 +17064,23 @@
+ esac
+
+ if test "$with_dbmalloc" = yes ; then
+- echo "$as_me:17064: checking for dbmalloc.h" >&5
++ echo "$as_me:17067: 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 17070 "configure"
++#line 17073 "configure"
+ #include "confdefs.h"
+ #include <dbmalloc.h>
+ _ACEOF
+-if { (eval echo "$as_me:17074: \"$ac_cpp conftest.$ac_ext\"") >&5
++if { (eval echo "$as_me:17077: \"$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:17080: \$? = $ac_status" >&5
++ echo "$as_me:17083: \$? = $ac_status" >&5
+ (exit $ac_status); } >/dev/null; then
+ if test -s conftest.err; then
+ ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -17096,11 +17099,11 @@
+ fi
+ rm -f conftest.err conftest.$ac_ext
+ fi
+-echo "$as_me:17099: result: $ac_cv_header_dbmalloc_h" >&5
++echo "$as_me:17102: 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:17103: checking for debug_malloc in -ldbmalloc" >&5
++echo "$as_me:17106: 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
+@@ -17108,7 +17111,7 @@
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-ldbmalloc $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 17111 "configure"
++#line 17114 "configure"
+ #include "confdefs.h"
+
+ /* Override any gcc2 internal prototype to avoid an error. */
+@@ -17127,16 +17130,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:17130: \"$ac_link\"") >&5
++if { (eval echo "$as_me:17133: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:17133: \$? = $ac_status" >&5
++ echo "$as_me:17136: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -s conftest$ac_exeext'
+- { (eval echo "$as_me:17136: \"$ac_try\"") >&5
++ { (eval echo "$as_me:17139: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:17139: \$? = $ac_status" >&5
++ echo "$as_me:17142: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ ac_cv_lib_dbmalloc_debug_malloc=yes
+ else
+@@ -17147,7 +17150,7 @@
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:17150: result: $ac_cv_lib_dbmalloc_debug_malloc" >&5
++echo "$as_me:17153: 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
+@@ -17162,7 +17165,7 @@
+
+ fi
+
+-echo "$as_me:17165: checking if you want to use valgrind for testing" >&5
++echo "$as_me:17168: 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.
+@@ -17179,7 +17182,7 @@
+ else
+ with_valgrind=
+ fi;
+-echo "$as_me:17182: result: ${with_valgrind:-no}" >&5
++echo "$as_me:17185: result: ${with_valgrind:-no}" >&5
+ echo "${ECHO_T}${with_valgrind:-no}" >&6
+
+ case .$with_cflags in
+@@ -17272,7 +17275,7 @@
+ ;;
+ esac
+
+-echo "$as_me:17275: checking if you want to perform memory-leak testing" >&5
++echo "$as_me:17278: 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.
+@@ -17282,7 +17285,7 @@
+ else
+ : ${with_no_leaks:=no}
+ fi;
+-echo "$as_me:17285: result: $with_no_leaks" >&5
++echo "$as_me:17288: result: $with_no_leaks" >&5
+ echo "${ECHO_T}$with_no_leaks" >&6
+
+ if test "$with_no_leaks" = yes ; then
+@@ -17298,7 +17301,7 @@
+ fi
+
+ LD_RPATH_OPT=
+-echo "$as_me:17301: checking for an rpath option" >&5
++echo "$as_me:17304: checking for an rpath option" >&5
+ echo $ECHO_N "checking for an rpath option... $ECHO_C" >&6
+ case $cf_cv_system_name in
+ (irix*)
+@@ -17329,12 +17332,12 @@
+ (*)
+ ;;
+ esac
+-echo "$as_me:17332: result: $LD_RPATH_OPT" >&5
++echo "$as_me:17335: result: $LD_RPATH_OPT" >&5
+ echo "${ECHO_T}$LD_RPATH_OPT" >&6
+
+ case "x$LD_RPATH_OPT" in
+ (x-R*)
+- echo "$as_me:17337: checking if we need a space after rpath option" >&5
++ echo "$as_me:17340: 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"
+
+@@ -17355,7 +17358,7 @@
+ LIBS="$cf_add_libs"
+
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 17358 "configure"
++#line 17361 "configure"
+ #include "confdefs.h"
+
+ int
+@@ -17367,16 +17370,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:17370: \"$ac_link\"") >&5
++if { (eval echo "$as_me:17373: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:17373: \$? = $ac_status" >&5
++ echo "$as_me:17376: \$? = $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:17379: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:17379: \$? = $ac_status" >&5
++ echo "$as_me:17382: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ cf_rpath_space=no
+ else
+@@ -17386,13 +17389,13 @@
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ LIBS="$cf_save_LIBS"
+- echo "$as_me:17389: result: $cf_rpath_space" >&5
++ echo "$as_me:17392: result: $cf_rpath_space" >&5
+ echo "${ECHO_T}$cf_rpath_space" >&6
+ test "$cf_rpath_space" = yes && LD_RPATH_OPT="$LD_RPATH_OPT "
+ ;;
+ esac
+
+-echo "$as_me:17395: checking if rpath-hack should be disabled" >&5
++echo "$as_me:17398: 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.
+@@ -17409,21 +17412,21 @@
+ cf_disable_rpath_hack=no
+
+ fi;
+-echo "$as_me:17412: result: $cf_disable_rpath_hack" >&5
++echo "$as_me:17415: result: $cf_disable_rpath_hack" >&5
+ echo "${ECHO_T}$cf_disable_rpath_hack" >&6
+ if test "$cf_disable_rpath_hack" = no ; then
+
+-echo "$as_me:17416: checking for updated LDFLAGS" >&5
++echo "$as_me:17419: 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:17419: result: maybe" >&5
++ echo "$as_me:17422: 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:17426: checking for $ac_word" >&5
++echo "$as_me:17429: 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
+@@ -17438,7 +17441,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:17441: found $ac_dir/$ac_word" >&5
++echo "$as_me:17444: found $ac_dir/$ac_word" >&5
+ break
+ done
+
+@@ -17446,10 +17449,10 @@
+ fi
+ cf_ldd_prog=$ac_cv_prog_cf_ldd_prog
+ if test -n "$cf_ldd_prog"; then
+- echo "$as_me:17449: result: $cf_ldd_prog" >&5
++ echo "$as_me:17452: result: $cf_ldd_prog" >&5
+ echo "${ECHO_T}$cf_ldd_prog" >&6
+ else
+- echo "$as_me:17452: result: no" >&5
++ echo "$as_me:17455: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+
+@@ -17463,7 +17466,7 @@
+ cf_rpath_oops=
+
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 17466 "configure"
++#line 17469 "configure"
+ #include "confdefs.h"
+ #include <stdio.h>
+ int
+@@ -17475,16 +17478,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:17478: \"$ac_link\"") >&5
++if { (eval echo "$as_me:17481: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:17481: \$? = $ac_status" >&5
++ echo "$as_me:17484: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -s conftest$ac_exeext'
+- { (eval echo "$as_me:17484: \"$ac_try\"") >&5
++ { (eval echo "$as_me:17487: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:17487: \$? = $ac_status" >&5
++ echo "$as_me:17490: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ cf_rpath_oops=`$cf_ldd_prog conftest$ac_exeext | fgrep ' not found' | sed -e 's% =>.*$%%' |sort | uniq`
+ cf_rpath_list=`$cf_ldd_prog conftest$ac_exeext | fgrep / | sed -e 's%^.*[ ]/%/%' -e 's%/[^/][^/]*$%%' |sort | uniq`
+@@ -17512,7 +17515,7 @@
+ then
+ test -n "$verbose" && echo " ...adding -L$cf_rpath_dir/lib to LDFLAGS for $cf_rpath_src" 1>&6
+
+-echo "${as_me:-configure}:17515: testing ...adding -L$cf_rpath_dir/lib to LDFLAGS for $cf_rpath_src ..." 1>&5
++echo "${as_me:-configure}:17518: testing ...adding -L$cf_rpath_dir/lib to LDFLAGS for $cf_rpath_src ..." 1>&5
+
+ LDFLAGS="$LDFLAGS -L$cf_rpath_dir/lib"
+ break
+@@ -17524,11 +17527,11 @@
+
+ test -n "$verbose" && echo " ...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS" 1>&6
+
+-echo "${as_me:-configure}:17527: testing ...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
++echo "${as_me:-configure}:17530: testing ...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
+
+ test -n "$verbose" && echo " ...checking LDFLAGS $LDFLAGS" 1>&6
+
+-echo "${as_me:-configure}:17531: testing ...checking LDFLAGS $LDFLAGS ..." 1>&5
++echo "${as_me:-configure}:17534: testing ...checking LDFLAGS $LDFLAGS ..." 1>&5
+
+ cf_rpath_dst=
+ for cf_rpath_src in $LDFLAGS
+@@ -17565,7 +17568,7 @@
+ then
+ test -n "$verbose" && echo " ...Filter $cf_rpath_src ->$cf_rpath_tmp" 1>&6
+
+-echo "${as_me:-configure}:17568: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
++echo "${as_me:-configure}:17571: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
+
+ EXTRA_LDFLAGS="$cf_rpath_tmp $EXTRA_LDFLAGS"
+ fi
+@@ -17578,11 +17581,11 @@
+
+ test -n "$verbose" && echo " ...checked LDFLAGS $LDFLAGS" 1>&6
+
+-echo "${as_me:-configure}:17581: testing ...checked LDFLAGS $LDFLAGS ..." 1>&5
++echo "${as_me:-configure}:17584: testing ...checked LDFLAGS $LDFLAGS ..." 1>&5
+
+ test -n "$verbose" && echo " ...checking LIBS $LIBS" 1>&6
+
+-echo "${as_me:-configure}:17585: testing ...checking LIBS $LIBS ..." 1>&5
++echo "${as_me:-configure}:17588: testing ...checking LIBS $LIBS ..." 1>&5
+
+ cf_rpath_dst=
+ for cf_rpath_src in $LIBS
+@@ -17619,7 +17622,7 @@
+ then
+ test -n "$verbose" && echo " ...Filter $cf_rpath_src ->$cf_rpath_tmp" 1>&6
+
+-echo "${as_me:-configure}:17622: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
++echo "${as_me:-configure}:17625: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
+
+ EXTRA_LDFLAGS="$cf_rpath_tmp $EXTRA_LDFLAGS"
+ fi
+@@ -17632,14 +17635,14 @@
+
+ test -n "$verbose" && echo " ...checked LIBS $LIBS" 1>&6
+
+-echo "${as_me:-configure}:17635: testing ...checked LIBS $LIBS ..." 1>&5
++echo "${as_me:-configure}:17638: testing ...checked LIBS $LIBS ..." 1>&5
+
+ test -n "$verbose" && echo " ...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS" 1>&6
+
+-echo "${as_me:-configure}:17639: testing ...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
++echo "${as_me:-configure}:17642: testing ...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
+
+ else
+- echo "$as_me:17642: result: no" >&5
++ echo "$as_me:17645: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+
+@@ -17729,7 +17732,7 @@
+ : ${CONFIG_STATUS=./config.status}
+ ac_clean_files_save=$ac_clean_files
+ ac_clean_files="$ac_clean_files $CONFIG_STATUS"
+-{ echo "$as_me:17732: creating $CONFIG_STATUS" >&5
++{ echo "$as_me:17735: creating $CONFIG_STATUS" >&5
+ echo "$as_me: creating $CONFIG_STATUS" >&6;}
+ cat >$CONFIG_STATUS <<_ACEOF
+ #! $SHELL
+@@ -17905,7 +17908,7 @@
+ echo "$ac_cs_version"; exit 0 ;;
+ --he | --h)
+ # Conflict between --help and --header
+- { { echo "$as_me:17908: error: ambiguous option: $1
++ { { echo "$as_me:17911: 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;}
+@@ -17924,7 +17927,7 @@
+ ac_need_defaults=false;;
+
+ # This is an error.
+- -*) { { echo "$as_me:17927: error: unrecognized option: $1
++ -*) { { echo "$as_me:17930: 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;}
+@@ -17974,7 +17977,7 @@
+ "Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;;
+ "default" ) CONFIG_COMMANDS="$CONFIG_COMMANDS default" ;;
+ "ncurses_cfg.h" ) CONFIG_HEADERS="$CONFIG_HEADERS ncurses_cfg.h:ncurses_tst.hin" ;;
+- *) { { echo "$as_me:17977: error: invalid argument: $ac_config_target" >&5
++ *) { { echo "$as_me:17980: error: invalid argument: $ac_config_target" >&5
+ echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
+ { (exit 1); exit 1; }; };;
+ esac
+@@ -18265,7 +18268,7 @@
+ esac
+
+ if test x"$ac_file" != x-; then
+- { echo "$as_me:18268: creating $ac_file" >&5
++ { echo "$as_me:18271: creating $ac_file" >&5
+ echo "$as_me: creating $ac_file" >&6;}
+ rm -f "$ac_file"
+ fi
+@@ -18283,7 +18286,7 @@
+ -) echo $tmp/stdin ;;
+ [\\/$]*)
+ # Absolute (can't be DOS-style, as IFS=:)
+- test -f "$f" || { { echo "$as_me:18286: error: cannot find input file: $f" >&5
++ test -f "$f" || { { echo "$as_me:18289: error: cannot find input file: $f" >&5
+ echo "$as_me: error: cannot find input file: $f" >&2;}
+ { (exit 1); exit 1; }; }
+ echo $f;;
+@@ -18296,7 +18299,7 @@
+ echo $srcdir/$f
+ else
+ # /dev/null tree
+- { { echo "$as_me:18299: error: cannot find input file: $f" >&5
++ { { echo "$as_me:18302: error: cannot find input file: $f" >&5
+ echo "$as_me: error: cannot find input file: $f" >&2;}
+ { (exit 1); exit 1; }; }
+ fi;;
+@@ -18312,7 +18315,7 @@
+ if test -n "$ac_seen"; then
+ ac_used=`grep '@datarootdir@' $ac_item`
+ if test -z "$ac_used"; then
+- { echo "$as_me:18315: WARNING: datarootdir was used implicitly but not set:
++ { echo "$as_me:18318: 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;}
+@@ -18321,7 +18324,7 @@
+ fi
+ ac_seen=`grep '${datarootdir}' $ac_item`
+ if test -n "$ac_seen"; then
+- { echo "$as_me:18324: WARNING: datarootdir was used explicitly but not set:
++ { echo "$as_me:18327: 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;}
+@@ -18358,7 +18361,7 @@
+ ac_init=`egrep '[ ]*'$ac_name'[ ]*=' $ac_file`
+ if test -z "$ac_init"; then
+ ac_seen=`echo "$ac_seen" |sed -e 's,^,'$ac_file':,'`
+- { echo "$as_me:18361: WARNING: Variable $ac_name is used but was not set:
++ { echo "$as_me:18364: 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;}
+@@ -18369,7 +18372,7 @@
+ egrep -n '@[A-Z_][A-Z_0-9]+@' $ac_file >>$tmp/out
+ if test -s $tmp/out; then
+ ac_seen=`sed -e 's,^,'$ac_file':,' < $tmp/out`
+- { echo "$as_me:18372: WARNING: Some variables may not be substituted:
++ { echo "$as_me:18375: WARNING: Some variables may not be substituted:
+ $ac_seen" >&5
+ echo "$as_me: WARNING: Some variables may not be substituted:
+ $ac_seen" >&2;}
+@@ -18418,7 +18421,7 @@
+ * ) ac_file_in=$ac_file.in ;;
+ esac
+
+- test x"$ac_file" != x- && { echo "$as_me:18421: creating $ac_file" >&5
++ test x"$ac_file" != x- && { echo "$as_me:18424: creating $ac_file" >&5
+ echo "$as_me: creating $ac_file" >&6;}
+
+ # First look for the input files in the build tree, otherwise in the
+@@ -18429,7 +18432,7 @@
+ -) echo $tmp/stdin ;;
+ [\\/$]*)
+ # Absolute (can't be DOS-style, as IFS=:)
+- test -f "$f" || { { echo "$as_me:18432: error: cannot find input file: $f" >&5
++ test -f "$f" || { { echo "$as_me:18435: error: cannot find input file: $f" >&5
+ echo "$as_me: error: cannot find input file: $f" >&2;}
+ { (exit 1); exit 1; }; }
+ echo $f;;
+@@ -18442,7 +18445,7 @@
+ echo $srcdir/$f
+ else
+ # /dev/null tree
+- { { echo "$as_me:18445: error: cannot find input file: $f" >&5
++ { { echo "$as_me:18448: error: cannot find input file: $f" >&5
+ echo "$as_me: error: cannot find input file: $f" >&2;}
+ { (exit 1); exit 1; }; }
+ fi;;
+@@ -18500,7 +18503,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:18503: $ac_file is unchanged" >&5
++ { echo "$as_me:18506: $ac_file is unchanged" >&5
+ echo "$as_me: $ac_file is unchanged" >&6;}
+ else
+ ac_dir=`$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \