ncurses 6.2 - patch 20210522

+ regenerate configure scripts with autoconf 2.52.20210509 to eliminate
  an unnecessary warning in config.log (report by Miroslav Lichvar).
+ add a note in manual page to explain ungetch vs unget_wch (prompted
  by discussion with Peter Farley).
+ add sp-funcs for erasewchar, killwchar.
+ modify wgetnstr, wgetn_wstr to improve compatibility with SVr4 curses
  in its treatment of interrupt and quit characters (prompted by
  report/testcase by Bill Gray)
+ update config.guess, config.sub

diff --git a/Ada95/aclocal.m4 b/Ada95/aclocal.m4
index 7d00bf7131df0cd63df2726ab2adae69e024450d..bf7cca0feedf41b76ebbd274f12038c1ac002e3e 100644 (file)
--- a/Ada95/aclocal.m4
+++ b/Ada95/aclocal.m4
@@ -29,7 +29,7 @@ dnl***************************************************************************
 dnl
 dnl Author: Thomas E. Dickey
 dnl
 dnl
 dnl Author: Thomas E. Dickey
 dnl

-dnl $Id: aclocal.m4,v 1.174 2021/04/03 20:46:10 tom Exp $
+dnl $Id: aclocal.m4,v 1.175 2021/05/19 23:35:25 tom Exp $

 dnl Macros used in NCURSES Ada95 auto-configuration script.
 dnl
 dnl These macros are maintained separately from NCURSES.  The copyright on
 dnl Macros used in NCURSES Ada95 auto-configuration script.
 dnl
 dnl These macros are maintained separately from NCURSES.  The copyright on


@@ -2782,7 +2782,7 @@ printf("old\\n");
        ,[$1=no])
 ])dnl
 dnl ---------------------------------------------------------------------------
        ,[$1=no])
 ])dnl
 dnl ---------------------------------------------------------------------------

-dnl CF_NCURSES_CONFIG version: 26 updated: 2021/01/03 08:05:37
+dnl CF_NCURSES_CONFIG version: 27 updated: 2021/05/19 19:35:25

 dnl -----------------
 dnl Tie together the configure-script macros for ncurses, preferring these in
 dnl order:
 dnl -----------------
 dnl Tie together the configure-script macros for ncurses, preferring these in
 dnl order:


@@ -2824,7 +2824,7 @@ if test "x${PKG_CONFIG:=none}" != xnone; then
                                [initscr(); mousemask(0,0); tigetstr((char *)0);],
                                [AC_TRY_RUN([#include <${cf_cv_ncurses_header:-curses.h}>
                                        int main(void)
                                [initscr(); mousemask(0,0); tigetstr((char *)0);],
                                [AC_TRY_RUN([#include <${cf_cv_ncurses_header:-curses.h}>
                                        int main(void)

-                                       { char *xx = curses_version(); return (xx == 0); }],
+                                       { const char *xx = curses_version(); return (xx == 0); }],

                                        [cf_test_ncuconfig=yes],
                                        [cf_test_ncuconfig=no],
                                        [cf_test_ncuconfig=maybe])],
                                        [cf_test_ncuconfig=yes],
                                        [cf_test_ncuconfig=no],
                                        [cf_test_ncuconfig=maybe])],


@@ -2850,7 +2850,7 @@ if test "x${PKG_CONFIG:=none}" != xnone; then
                        [initscr(); mousemask(0,0); tigetstr((char *)0);],
                        [AC_TRY_RUN([#include <${cf_cv_ncurses_header:-curses.h}>
                                int main(void)
                        [initscr(); mousemask(0,0); tigetstr((char *)0);],
                        [AC_TRY_RUN([#include <${cf_cv_ncurses_header:-curses.h}>
                                int main(void)

-                               { char *xx = curses_version(); return (xx == 0); }],
+                               { const char *xx = curses_version(); return (xx == 0); }],

                                [cf_have_ncuconfig=yes],
                                [cf_have_ncuconfig=no],
                                [cf_have_ncuconfig=maybe])],
                                [cf_have_ncuconfig=yes],
                                [cf_have_ncuconfig=no],
                                [cf_have_ncuconfig=maybe])],


@@ -4408,15 +4408,21 @@ AC_DEFUN([CF_UPPER],
 $1=`echo "$2" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%`
 ])dnl
 dnl ---------------------------------------------------------------------------
 $1=`echo "$2" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%`
 ])dnl
 dnl ---------------------------------------------------------------------------

-dnl CF_UTF8_LIB version: 8 updated: 2012/10/06 08:57:51
+dnl CF_UTF8_LIB version: 9 updated: 2021/05/19 19:35:25

 dnl -----------
 dnl Check for multibyte support, and if not found, utf8 compatibility library
 AC_DEFUN([CF_UTF8_LIB],
 [
 dnl -----------
 dnl Check for multibyte support, and if not found, utf8 compatibility library
 AC_DEFUN([CF_UTF8_LIB],
 [

+AC_HAVE_HEADERS(wchar.h)

 AC_CACHE_CHECK(for multibyte character support,cf_cv_utf8_lib,[
        cf_save_LIBS="$LIBS"
        AC_TRY_LINK([
 AC_CACHE_CHECK(for multibyte character support,cf_cv_utf8_lib,[
        cf_save_LIBS="$LIBS"
        AC_TRY_LINK([

-#include <stdlib.h>],[putwc(0,0);],
+#include <stdlib.h>
+#include <stdio.h>
+#ifdef HAVE_WCHAR_H
+#include <wchar.h>
+#endif
+],[putwc(0,0);],

        [cf_cv_utf8_lib=yes],
        [CF_FIND_LINKAGE([
 #include <libutf8.h>],[putwc(0,0);],utf8,
        [cf_cv_utf8_lib=yes],
        [CF_FIND_LINKAGE([
 #include <libutf8.h>],[putwc(0,0);],utf8,


@@ -4782,7 +4788,7 @@ AC_ARG_WITH(system-type,
 ])
 ])dnl
 dnl ---------------------------------------------------------------------------
 ])
 ])dnl
 dnl ---------------------------------------------------------------------------

-dnl CF_XOPEN_SOURCE version: 57 updated: 2021/01/01 16:53:59
+dnl CF_XOPEN_SOURCE version: 58 updated: 2021/05/01 17:49:36

 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,
 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,


@@ -4847,7 +4853,15 @@ case "$host_os" in
 (netbsd*)
        cf_xopen_source="-D_NETBSD_SOURCE" # setting _XOPEN_SOURCE breaks IPv6 for lynx on NetBSD 1.6, breaks xterm, is not needed for ncursesw
        ;;
 (netbsd*)
        cf_xopen_source="-D_NETBSD_SOURCE" # setting _XOPEN_SOURCE breaks IPv6 for lynx on NetBSD 1.6, breaks xterm, is not needed for ncursesw
        ;;

-(openbsd[[4-9]]*)
+(openbsd[[6-9]]*)
+       # OpenBSD 6.x has broken locale support, both compile-time and runtime.
+       # see https://www.mail-archive.com/bugs@openbsd.org/msg13200.html
+       # Abusing the conformance level is a workaround.
+       AC_MSG_WARN(this system does not provide usable locale support)
+       cf_xopen_source="-D_BSD_SOURCE"
+       cf_XOPEN_SOURCE=700
+       ;;
+(openbsd[[4-5]]*)

        # setting _XOPEN_SOURCE lower than 500 breaks g++ compile with wchar.h, needed for ncursesw
        cf_xopen_source="-D_BSD_SOURCE"
        cf_XOPEN_SOURCE=600
        # setting _XOPEN_SOURCE lower than 500 breaks g++ compile with wchar.h, needed for ncursesw
        cf_xopen_source="-D_BSD_SOURCE"
        cf_XOPEN_SOURCE=600

diff --git a/Ada95/configure b/Ada95/configure
index 5f72dc830523254b5908ba571717912966b5be15..39766b3fcec638a86302dcfd11efe6e62e7b6a1a 100755 (executable)
--- a/Ada95/configure
+++ b/Ada95/configure
@@ -1,7 +1,7 @@
 #! /bin/sh
 # From configure.in Revision: 1.82 .
 # Guess values for system-dependent variables and create Makefiles.
 #! /bin/sh
 # From configure.in Revision: 1.82 .
 # Guess values for system-dependent variables and create Makefiles.

-# Generated by Autoconf 2.52.20210105.
+# Generated by Autoconf 2.52.20210509.

 #
 # Copyright 2003-2020,2021     Thomas E. Dickey
 # Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001
 #
 # Copyright 2003-2020,2021     Thomas E. Dickey
 # Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001


@@ -822,7 +822,7 @@ This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
 It was created by $as_me, which was
 running configure, to aid debugging if configure makes a mistake.
 
 It was created by $as_me, which was

-generated by GNU Autoconf 2.52.20210105.  Invocation command line was
+generated by GNU Autoconf 2.52.20210509.  Invocation command line was

 
   $ $0 $@
 
 
   $ $0 $@
 


@@ -4571,7 +4571,7 @@ else
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
                                        int main(void)
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
                                        int main(void)

-                                       { char *xx = curses_version(); return (xx == 0); }
+                                       { const char *xx = curses_version(); return (xx == 0); }

 _ACEOF
 rm -f "conftest$ac_exeext"
 if { (eval echo "$as_me:4577: \"$ac_link\"") >&5
 _ACEOF
 rm -f "conftest$ac_exeext"
 if { (eval echo "$as_me:4577: \"$ac_link\"") >&5


@@ -4759,7 +4759,7 @@ else
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
                                int main(void)
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
                                int main(void)

-                               { char *xx = curses_version(); return (xx == 0); }
+                               { const char *xx = curses_version(); return (xx == 0); }

 _ACEOF
 rm -f "conftest$ac_exeext"
 if { (eval echo "$as_me:4765: \"$ac_link\"") >&5
 _ACEOF
 rm -f "conftest$ac_exeext"
 if { (eval echo "$as_me:4765: \"$ac_link\"") >&5


@@ -6437,7 +6437,55 @@ echo "$as_me:6436: result: $with_widec" >&5
 echo "${ECHO_T}$with_widec" >&6
 if test "$with_widec" = yes ; then
 
 echo "${ECHO_T}$with_widec" >&6
 if test "$with_widec" = yes ; then
 

-echo "$as_me:6440: checking for multibyte character support" >&5
+for ac_header in wchar.h
+do
+as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+echo "$as_me:6443: 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 6449 "configure"
+#include "confdefs.h"
+#include <$ac_header>
+_ACEOF
+if { (eval echo "$as_me:6453: \"$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:6459: \$? = $ac_status" >&5
+  (exit "$ac_status"); } >/dev/null; then
+  if test -s conftest.err; then
+    ac_cpp_err=$ac_c_preproc_warn_flag
+  else
+    ac_cpp_err=
+  fi
+else
+  ac_cpp_err=yes
+fi
+if test -z "$ac_cpp_err"; then
+  eval "$as_ac_Header=yes"
+else
+  echo "$as_me: failed program was:" >&5
+  cat "conftest.$ac_ext" >&5
+  eval "$as_ac_Header=no"
+fi
+rm -f conftest.err "conftest.$ac_ext"
+fi
+echo "$as_me:6478: 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
+#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+EOF
+
+fi
+done
+
+echo "$as_me:6488: 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
 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


@@ -6445,10 +6493,15 @@ else
 
        cf_save_LIBS="$LIBS"
        cat >"conftest.$ac_ext" <<_ACEOF
 
        cf_save_LIBS="$LIBS"
        cat >"conftest.$ac_ext" <<_ACEOF

-#line 6448 "configure"
+#line 6496 "configure"

 #include "confdefs.h"
 
 #include <stdlib.h>
 #include "confdefs.h"
 
 #include <stdlib.h>

+#include <stdio.h>
+#ifdef HAVE_WCHAR_H
+#include <wchar.h>
+#endif
+

 int
 main (void)
 {
 int
 main (void)
 {


@@ -6458,16 +6511,16 @@ putwc(0,0);
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"

-if { (eval echo "$as_me:6461: \"$ac_link\"") >&5
+if { (eval echo "$as_me:6514: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:6464: \$? = $ac_status" >&5
+  echo "$as_me:6517: \$? = $ac_status" >&5

   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'

-  { (eval echo "$as_me:6467: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6520: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:6470: \$? = $ac_status" >&5
+  echo "$as_me:6523: \$? = $ac_status" >&5

   (exit "$ac_status"); }; }; then
   cf_cv_utf8_lib=yes
 else
   (exit "$ac_status"); }; }; then
   cf_cv_utf8_lib=yes
 else


@@ -6479,12 +6532,12 @@ cat "conftest.$ac_ext" >&5
 cf_cv_header_path_utf8=
 cf_cv_library_path_utf8=
 
 cf_cv_header_path_utf8=
 cf_cv_library_path_utf8=
 

-echo "${as_me:-configure}:6482: testing Starting FIND_LINKAGE(utf8,) ..." 1>&5
+echo "${as_me:-configure}:6535: testing Starting FIND_LINKAGE(utf8,) ..." 1>&5

 
 cf_save_LIBS="$LIBS"
 
 cat >"conftest.$ac_ext" <<_ACEOF
 
 cf_save_LIBS="$LIBS"
 
 cat >"conftest.$ac_ext" <<_ACEOF

-#line 6487 "configure"
+#line 6540 "configure"

 #include "confdefs.h"
 
 #include <libutf8.h>
 #include "confdefs.h"
 
 #include <libutf8.h>


@@ -6497,16 +6550,16 @@ putwc(0,0);
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"

-if { (eval echo "$as_me:6500: \"$ac_link\"") >&5
+if { (eval echo "$as_me:6553: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:6503: \$? = $ac_status" >&5
+  echo "$as_me:6556: \$? = $ac_status" >&5

   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'

-  { (eval echo "$as_me:6506: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6559: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:6509: \$? = $ac_status" >&5
+  echo "$as_me:6562: \$? = $ac_status" >&5

   (exit "$ac_status"); }; }; then
 
        cf_cv_find_linkage_utf8=yes
   (exit "$ac_status"); }; }; then
 
        cf_cv_find_linkage_utf8=yes


@@ -6520,7 +6573,7 @@ cat "conftest.$ac_ext" >&5
 LIBS="-lutf8  $cf_save_LIBS"
 
 cat >"conftest.$ac_ext" <<_ACEOF
 LIBS="-lutf8  $cf_save_LIBS"
 
 cat >"conftest.$ac_ext" <<_ACEOF

-#line 6523 "configure"
+#line 6576 "configure"

 #include "confdefs.h"
 
 #include <libutf8.h>
 #include "confdefs.h"
 
 #include <libutf8.h>


@@ -6533,16 +6586,16 @@ putwc(0,0);
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"

-if { (eval echo "$as_me:6536: \"$ac_link\"") >&5
+if { (eval echo "$as_me:6589: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:6539: \$? = $ac_status" >&5
+  echo "$as_me:6592: \$? = $ac_status" >&5

   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'

-  { (eval echo "$as_me:6542: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6595: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:6545: \$? = $ac_status" >&5
+  echo "$as_me:6598: \$? = $ac_status" >&5

   (exit "$ac_status"); }; }; then
 
        cf_cv_find_linkage_utf8=yes
   (exit "$ac_status"); }; }; then
 
        cf_cv_find_linkage_utf8=yes


@@ -6559,9 +6612,9 @@ cat "conftest.$ac_ext" >&5
 
        test -n "$verbose" && echo "    find linkage for utf8 library" 1>&6
 
 
        test -n "$verbose" && echo "    find linkage for utf8 library" 1>&6
 

-echo "${as_me:-configure}:6562: testing find linkage for utf8 library ..." 1>&5
+echo "${as_me:-configure}:6615: testing find linkage for utf8 library ..." 1>&5

 
 

-echo "${as_me:-configure}:6564: testing Searching for headers in FIND_LINKAGE(utf8,) ..." 1>&5
+echo "${as_me:-configure}:6617: testing Searching for headers in FIND_LINKAGE(utf8,) ..." 1>&5

 
        cf_save_CPPFLAGS="$CPPFLAGS"
        cf_test_CPPFLAGS="$CPPFLAGS"
 
        cf_save_CPPFLAGS="$CPPFLAGS"
        cf_test_CPPFLAGS="$CPPFLAGS"


@@ -6652,7 +6705,7 @@ cf_search="$cf_search $cf_header_path_list"
                if test -d "$cf_cv_header_path_utf8" ; then
                        test -n "$verbose" && echo "    ... testing $cf_cv_header_path_utf8" 1>&6
 
                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}:6655: testing ... testing $cf_cv_header_path_utf8 ..." 1>&5
+echo "${as_me:-configure}:6708: testing ... testing $cf_cv_header_path_utf8 ..." 1>&5

 
                        CPPFLAGS="$cf_save_CPPFLAGS"
 
 
                        CPPFLAGS="$cf_save_CPPFLAGS"
 


@@ -6660,7 +6713,7 @@ echo "${as_me:-configure}:6655: testing ... testing $cf_cv_header_path_utf8 ..."
        CPPFLAGS="${CPPFLAGS}-I$cf_cv_header_path_utf8"
 
                        cat >"conftest.$ac_ext" <<_ACEOF
        CPPFLAGS="${CPPFLAGS}-I$cf_cv_header_path_utf8"
 
                        cat >"conftest.$ac_ext" <<_ACEOF

-#line 6663 "configure"
+#line 6716 "configure"

 #include "confdefs.h"
 
 #include <libutf8.h>
 #include "confdefs.h"
 
 #include <libutf8.h>


@@ -6673,21 +6726,21 @@ putwc(0,0);
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
 }
 _ACEOF
 rm -f "conftest.$ac_objext"

-if { (eval echo "$as_me:6676: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:6729: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:6679: \$? = $ac_status" >&5
+  echo "$as_me:6732: \$? = $ac_status" >&5

   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'

-  { (eval echo "$as_me:6682: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6735: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:6685: \$? = $ac_status" >&5
+  echo "$as_me:6738: \$? = $ac_status" >&5

   (exit "$ac_status"); }; }; then
 
                                test -n "$verbose" && echo "    ... found utf8 headers in $cf_cv_header_path_utf8" 1>&6
 
   (exit "$ac_status"); }; }; then
 
                                test -n "$verbose" && echo "    ... found utf8 headers in $cf_cv_header_path_utf8" 1>&6
 

-echo "${as_me:-configure}:6690: testing ... found utf8 headers in $cf_cv_header_path_utf8 ..." 1>&5
+echo "${as_me:-configure}:6743: testing ... found utf8 headers in $cf_cv_header_path_utf8 ..." 1>&5

 
                                cf_cv_find_linkage_utf8=maybe
                                cf_test_CPPFLAGS="$CPPFLAGS"
 
                                cf_cv_find_linkage_utf8=maybe
                                cf_test_CPPFLAGS="$CPPFLAGS"


@@ -6705,7 +6758,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
        if test "$cf_cv_find_linkage_utf8" = maybe ; then
 
 
        if test "$cf_cv_find_linkage_utf8" = maybe ; then
 

-echo "${as_me:-configure}:6708: testing Searching for utf8 library in FIND_LINKAGE(utf8,) ..." 1>&5
+echo "${as_me:-configure}:6761: testing Searching for utf8 library in FIND_LINKAGE(utf8,) ..." 1>&5

 
                cf_save_LIBS="$LIBS"
                cf_save_LDFLAGS="$LDFLAGS"
 
                cf_save_LIBS="$LIBS"
                cf_save_LDFLAGS="$LDFLAGS"


@@ -6780,13 +6833,13 @@ cf_search="$cf_library_path_list $cf_search"
                                if test -d "$cf_cv_library_path_utf8" ; then
                                        test -n "$verbose" && echo "    ... testing $cf_cv_library_path_utf8" 1>&6
 
                                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}:6783: testing ... testing $cf_cv_library_path_utf8 ..." 1>&5
+echo "${as_me:-configure}:6836: 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
 
                                        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 6789 "configure"
+#line 6842 "configure"

 #include "confdefs.h"
 
 #include <libutf8.h>
 #include "confdefs.h"
 
 #include <libutf8.h>


@@ -6799,21 +6852,21 @@ putwc(0,0);
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"

-if { (eval echo "$as_me:6802: \"$ac_link\"") >&5
+if { (eval echo "$as_me:6855: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:6805: \$? = $ac_status" >&5
+  echo "$as_me:6858: \$? = $ac_status" >&5

   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'

-  { (eval echo "$as_me:6808: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6861: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:6811: \$? = $ac_status" >&5
+  echo "$as_me:6864: \$? = $ac_status" >&5

   (exit "$ac_status"); }; }; then
 
                                        test -n "$verbose" && echo "    ... found utf8 library in $cf_cv_library_path_utf8" 1>&6
 
   (exit "$ac_status"); }; }; then
 
                                        test -n "$verbose" && echo "    ... found utf8 library in $cf_cv_library_path_utf8" 1>&6
 

-echo "${as_me:-configure}:6816: testing ... found utf8 library in $cf_cv_library_path_utf8 ..." 1>&5
+echo "${as_me:-configure}:6869: testing ... found utf8 library in $cf_cv_library_path_utf8 ..." 1>&5

 
                                        cf_cv_find_linkage_utf8=yes
                                        cf_cv_library_file_utf8="-lutf8"
 
                                        cf_cv_find_linkage_utf8=yes
                                        cf_cv_library_file_utf8="-lutf8"


@@ -6855,7 +6908,7 @@ fi
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi

-echo "$as_me:6858: result: $cf_cv_utf8_lib" >&5
+echo "$as_me:6911: 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
 echo "${ECHO_T}$cf_cv_utf8_lib" >&6
 
 # HAVE_LIBUTF8_H is used by ncurses if curses.h is shared between


@@ -6893,7 +6946,7 @@ if test -n "$cf_cv_header_path_utf8" ; then
        CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
 
                          cat >"conftest.$ac_ext" <<_ACEOF
        CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
 
                          cat >"conftest.$ac_ext" <<_ACEOF

-#line 6896 "configure"
+#line 6949 "configure"

 #include "confdefs.h"
 #include <stdio.h>
 int
 #include "confdefs.h"
 #include <stdio.h>
 int


@@ -6905,16 +6958,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
 }
 _ACEOF
 rm -f "conftest.$ac_objext"

-if { (eval echo "$as_me:6908: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:6961: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:6911: \$? = $ac_status" >&5
+  echo "$as_me:6964: \$? = $ac_status" >&5

   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'

-  { (eval echo "$as_me:6914: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6967: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:6917: \$? = $ac_status" >&5
+  echo "$as_me:6970: \$? = $ac_status" >&5

   (exit "$ac_status"); }; }; then
   :
 else
   (exit "$ac_status"); }; }; then
   :
 else


@@ -6931,7 +6984,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
                if test "$cf_have_incdir" = no ; then
                  test -n "$verbose" && echo "  adding $cf_add_incdir to include-path" 1>&6
 
                if test "$cf_have_incdir" = no ; then
                  test -n "$verbose" && echo "  adding $cf_add_incdir to include-path" 1>&6
 

-echo "${as_me:-configure}:6934: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:6987: testing adding $cf_add_incdir to include-path ..." 1>&5

 
                  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
 
                  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 


@@ -6967,7 +7020,7 @@ if test -n "$cf_cv_library_path_utf8" ; then
                        if test "$cf_have_libdir" = no ; then
                                test -n "$verbose" && echo "    adding $cf_add_libdir to library-path" 1>&6
 
                        if test "$cf_have_libdir" = no ; then
                                test -n "$verbose" && echo "    adding $cf_add_libdir to library-path" 1>&6
 

-echo "${as_me:-configure}:6970: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:7023: testing adding $cf_add_libdir to library-path ..." 1>&5

 
                                LDFLAGS="-L$cf_add_libdir $LDFLAGS"
                        fi
 
                                LDFLAGS="-L$cf_add_libdir $LDFLAGS"
                        fi


@@ -6997,13 +7050,13 @@ cf_ncuconfig_root=ncursesw
 cf_have_ncuconfig=no
 
 if test "x${PKG_CONFIG:=none}" != xnone; then
 cf_have_ncuconfig=no
 
 if test "x${PKG_CONFIG:=none}" != xnone; then

-       echo "$as_me:7000: checking pkg-config for $cf_ncuconfig_root" >&5
+       echo "$as_me:7053: 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 $ECHO_N "checking pkg-config for $cf_ncuconfig_root... $ECHO_C" >&6
        if "$PKG_CONFIG" --exists $cf_ncuconfig_root ; then

-               echo "$as_me:7003: result: yes" >&5
+               echo "$as_me:7056: result: yes" >&5

 echo "${ECHO_T}yes" >&6
 
 echo "${ECHO_T}yes" >&6
 

-               echo "$as_me:7006: checking if the $cf_ncuconfig_root package files work" >&5
+               echo "$as_me:7059: 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
 
 echo $ECHO_N "checking if the $cf_ncuconfig_root package files work... $ECHO_C" >&6
                cf_have_ncuconfig=unknown
 


@@ -7136,7 +7189,7 @@ done
 LIBS="$cf_add_libs"
 
                        cat >"conftest.$ac_ext" <<_ACEOF
 LIBS="$cf_add_libs"
 
                        cat >"conftest.$ac_ext" <<_ACEOF

-#line 7139 "configure"
+#line 7192 "configure"

 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int


@@ -7148,37 +7201,37 @@ initscr(); mousemask(0,0); tigetstr((char *)0);
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"

-if { (eval echo "$as_me:7151: \"$ac_link\"") >&5
+if { (eval echo "$as_me:7204: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:7154: \$? = $ac_status" >&5
+  echo "$as_me:7207: \$? = $ac_status" >&5

   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'

-  { (eval echo "$as_me:7157: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7210: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:7160: \$? = $ac_status" >&5
+  echo "$as_me:7213: \$? = $ac_status" >&5

   (exit "$ac_status"); }; }; then
   if test "$cross_compiling" = yes; then
   cf_test_ncuconfig=maybe
 else
   cat >"conftest.$ac_ext" <<_ACEOF
   (exit "$ac_status"); }; }; then
   if test "$cross_compiling" = yes; then
   cf_test_ncuconfig=maybe
 else
   cat >"conftest.$ac_ext" <<_ACEOF

-#line 7166 "configure"
+#line 7219 "configure"

 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
                                        int main(void)
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
                                        int main(void)

-                                       { char *xx = curses_version(); return (xx == 0); }
+                                       { const char *xx = curses_version(); return (xx == 0); }

 _ACEOF
 rm -f "conftest$ac_exeext"
 _ACEOF
 rm -f "conftest$ac_exeext"

-if { (eval echo "$as_me:7173: \"$ac_link\"") >&5
+if { (eval echo "$as_me:7226: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:7176: \$? = $ac_status" >&5
+  echo "$as_me:7229: \$? = $ac_status" >&5

   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'

-  { (eval echo "$as_me:7178: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7231: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:7181: \$? = $ac_status" >&5
+  echo "$as_me:7234: \$? = $ac_status" >&5

   (exit "$ac_status"); }; }; then
   cf_test_ncuconfig=yes
 else
   (exit "$ac_status"); }; }; then
   cf_test_ncuconfig=yes
 else


@@ -7324,7 +7377,7 @@ done
 LIBS="$cf_add_libs"
 
                cat >"conftest.$ac_ext" <<_ACEOF
 LIBS="$cf_add_libs"
 
                cat >"conftest.$ac_ext" <<_ACEOF

-#line 7327 "configure"
+#line 7380 "configure"

 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int


@@ -7336,37 +7389,37 @@ initscr(); mousemask(0,0); tigetstr((char *)0);
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"

-if { (eval echo "$as_me:7339: \"$ac_link\"") >&5
+if { (eval echo "$as_me:7392: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:7342: \$? = $ac_status" >&5
+  echo "$as_me:7395: \$? = $ac_status" >&5

   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'

-  { (eval echo "$as_me:7345: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7398: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:7348: \$? = $ac_status" >&5
+  echo "$as_me:7401: \$? = $ac_status" >&5

   (exit "$ac_status"); }; }; then
   if test "$cross_compiling" = yes; then
   cf_have_ncuconfig=maybe
 else
   cat >"conftest.$ac_ext" <<_ACEOF
   (exit "$ac_status"); }; }; then
   if test "$cross_compiling" = yes; then
   cf_have_ncuconfig=maybe
 else
   cat >"conftest.$ac_ext" <<_ACEOF

-#line 7354 "configure"
+#line 7407 "configure"

 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
                                int main(void)
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
                                int main(void)

-                               { char *xx = curses_version(); return (xx == 0); }
+                               { const char *xx = curses_version(); return (xx == 0); }

 _ACEOF
 rm -f "conftest$ac_exeext"
 _ACEOF
 rm -f "conftest$ac_exeext"

-if { (eval echo "$as_me:7361: \"$ac_link\"") >&5
+if { (eval echo "$as_me:7414: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:7364: \$? = $ac_status" >&5
+  echo "$as_me:7417: \$? = $ac_status" >&5

   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'

-  { (eval echo "$as_me:7366: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7419: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:7369: \$? = $ac_status" >&5
+  echo "$as_me:7422: \$? = $ac_status" >&5

   (exit "$ac_status"); }; }; then
   cf_have_ncuconfig=yes
 else
   (exit "$ac_status"); }; }; then
   cf_have_ncuconfig=yes
 else


@@ -7383,7 +7436,7 @@ cat "conftest.$ac_ext" >&5
 cf_have_ncuconfig=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 cf_have_ncuconfig=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"

-               echo "$as_me:7386: result: $cf_have_ncuconfig" >&5
+               echo "$as_me:7439: 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"
 echo "${ECHO_T}$cf_have_ncuconfig" >&6
                test "$cf_have_ncuconfig" = maybe && cf_have_ncuconfig=yes
                if test "$cf_have_ncuconfig" != "yes"


@@ -7399,7 +7452,7 @@ EOF
 
                        NCURSES_CONFIG_PKG=$cf_ncuconfig_root
 
 
                        NCURSES_CONFIG_PKG=$cf_ncuconfig_root
 

-echo "$as_me:7402: checking for terminfo header" >&5
+echo "$as_me:7455: 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
 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


@@ -7417,7 +7470,7 @@ esac
 for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h"
 do
 cat >"conftest.$ac_ext" <<_ACEOF
 for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h"
 do
 cat >"conftest.$ac_ext" <<_ACEOF

-#line 7420 "configure"
+#line 7473 "configure"

 #include "confdefs.h"
 #include <stdio.h>
 #include <${cf_cv_ncurses_header:-curses.h}>
 #include "confdefs.h"
 #include <stdio.h>
 #include <${cf_cv_ncurses_header:-curses.h}>


@@ -7432,16 +7485,16 @@ int x = auto_left_margin; (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
 }
 _ACEOF
 rm -f "conftest.$ac_objext"

-if { (eval echo "$as_me:7435: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:7488: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:7438: \$? = $ac_status" >&5
+  echo "$as_me:7491: \$? = $ac_status" >&5

   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'

-  { (eval echo "$as_me:7441: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7494: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:7444: \$? = $ac_status" >&5
+  echo "$as_me:7497: \$? = $ac_status" >&5

   (exit "$ac_status"); }; }; then
 
        cf_cv_term_header="$cf_test"
   (exit "$ac_status"); }; }; then
 
        cf_cv_term_header="$cf_test"


@@ -7457,7 +7510,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 done
 
 fi
 done
 
 fi

-echo "$as_me:7460: result: $cf_cv_term_header" >&5
+echo "$as_me:7513: result: $cf_cv_term_header" >&5

 echo "${ECHO_T}$cf_cv_term_header" >&6
 
 # Set definitions to allow ifdef'ing to accommodate subdirectories
 echo "${ECHO_T}$cf_cv_term_header" >&6
 
 # Set definitions to allow ifdef'ing to accommodate subdirectories


@@ -7492,7 +7545,7 @@ esac
                fi
 
        else
                fi
 
        else

-               echo "$as_me:7495: result: no" >&5
+               echo "$as_me:7548: result: no" >&5

 echo "${ECHO_T}no" >&6
                NCURSES_CONFIG_PKG=none
        fi
 echo "${ECHO_T}no" >&6
                NCURSES_CONFIG_PKG=none
        fi


@@ -7508,7 +7561,7 @@ if test -n "$ac_tool_prefix"; then
   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
   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:7511: checking for $ac_word" >&5
+echo "$as_me:7564: 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
 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


@@ -7523,7 +7576,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_NCURSES_CONFIG="$ac_tool_prefix$ac_prog"
   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:7526: found $ac_dir/$ac_word" >&5
+echo "$as_me:7579: found $ac_dir/$ac_word" >&5

 break
 done
 
 break
 done
 


@@ -7531,10 +7584,10 @@ fi
 fi
 NCURSES_CONFIG=$ac_cv_prog_NCURSES_CONFIG
 if test -n "$NCURSES_CONFIG"; then
 fi
 NCURSES_CONFIG=$ac_cv_prog_NCURSES_CONFIG
 if test -n "$NCURSES_CONFIG"; then

-  echo "$as_me:7534: result: $NCURSES_CONFIG" >&5
+  echo "$as_me:7587: result: $NCURSES_CONFIG" >&5

 echo "${ECHO_T}$NCURSES_CONFIG" >&6
 else
 echo "${ECHO_T}$NCURSES_CONFIG" >&6
 else

-  echo "$as_me:7537: result: no" >&5
+  echo "$as_me:7590: result: no" >&5

 echo "${ECHO_T}no" >&6
 fi
 
 echo "${ECHO_T}no" >&6
 fi
 


@@ -7547,7 +7600,7 @@ if test -z "$NCURSES_CONFIG"; then
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
 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:7550: checking for $ac_word" >&5
+echo "$as_me:7603: 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
 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


@@ -7562,7 +7615,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_ac_ct_NCURSES_CONFIG="$ac_prog"
   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:7565: found $ac_dir/$ac_word" >&5
+echo "$as_me:7618: found $ac_dir/$ac_word" >&5

 break
 done
 
 break
 done
 


@@ -7570,10 +7623,10 @@ fi
 fi
 ac_ct_NCURSES_CONFIG=$ac_cv_prog_ac_ct_NCURSES_CONFIG
 if test -n "$ac_ct_NCURSES_CONFIG"; then
 fi
 ac_ct_NCURSES_CONFIG=$ac_cv_prog_ac_ct_NCURSES_CONFIG
 if test -n "$ac_ct_NCURSES_CONFIG"; then

-  echo "$as_me:7573: result: $ac_ct_NCURSES_CONFIG" >&5
+  echo "$as_me:7626: result: $ac_ct_NCURSES_CONFIG" >&5

 echo "${ECHO_T}$ac_ct_NCURSES_CONFIG" >&6
 else
 echo "${ECHO_T}$ac_ct_NCURSES_CONFIG" >&6
 else

-  echo "$as_me:7576: result: no" >&5
+  echo "$as_me:7629: result: no" >&5

 echo "${ECHO_T}no" >&6
 fi
 
 echo "${ECHO_T}no" >&6
 fi
 


@@ -7702,7 +7755,7 @@ LIBS="$cf_add_libs"
 
                # even with config script, some packages use no-override for curses.h
 
 
                # even with config script, some packages use no-override for curses.h
 

-echo "$as_me:7705: checking if we have identified curses headers" >&5
+echo "$as_me:7758: 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
 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


@@ -7714,7 +7767,7 @@ for cf_header in \
        curses.h ncursesw/curses.h
 do
 cat >"conftest.$ac_ext" <<_ACEOF
        curses.h ncursesw/curses.h
 do
 cat >"conftest.$ac_ext" <<_ACEOF

-#line 7717 "configure"
+#line 7770 "configure"

 #include "confdefs.h"
 #include <${cf_header}>
 int
 #include "confdefs.h"
 #include <${cf_header}>
 int


@@ -7726,16 +7779,16 @@ initscr(); tgoto("?", 0,0)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
 }
 _ACEOF
 rm -f "conftest.$ac_objext"

-if { (eval echo "$as_me:7729: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:7782: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:7732: \$? = $ac_status" >&5
+  echo "$as_me:7785: \$? = $ac_status" >&5

   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'

-  { (eval echo "$as_me:7735: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7788: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:7738: \$? = $ac_status" >&5
+  echo "$as_me:7791: \$? = $ac_status" >&5

   (exit "$ac_status"); }; }; then
   cf_cv_ncurses_header=$cf_header; break
 else
   (exit "$ac_status"); }; }; then
   cf_cv_ncurses_header=$cf_header; break
 else


@@ -7746,11 +7799,11 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 done
 
 fi
 done
 
 fi

-echo "$as_me:7749: result: $cf_cv_ncurses_header" >&5
+echo "$as_me:7802: result: $cf_cv_ncurses_header" >&5

 echo "${ECHO_T}$cf_cv_ncurses_header" >&6
 
 if test "$cf_cv_ncurses_header" = none ; then
 echo "${ECHO_T}$cf_cv_ncurses_header" >&6
 
 if test "$cf_cv_ncurses_header" = none ; then

-       { { echo "$as_me:7753: error: No curses header-files found" >&5
+       { { echo "$as_me:7806: error: No curses header-files found" >&5

 echo "$as_me: error: No curses header-files found" >&2;}
    { (exit 1); exit 1; }; }
 fi
 echo "$as_me: error: No curses header-files found" >&2;}
    { (exit 1); exit 1; }; }
 fi


@@ -7760,23 +7813,23 @@ fi
 for ac_header in $cf_cv_ncurses_header
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
 for ac_header in $cf_cv_ncurses_header
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`

-echo "$as_me:7763: checking for $ac_header" >&5
+echo "$as_me:7816: 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
 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 7769 "configure"
+#line 7822 "configure"

 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF

-if { (eval echo "$as_me:7773: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:7826: \"$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
   (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:7779: \$? = $ac_status" >&5
+  echo "$as_me:7832: \$? = $ac_status" >&5

   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag


@@ -7795,7 +7848,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi

-echo "$as_me:7798: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:7851: 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
 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6
 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then
   cat >>confdefs.h <<EOF


@@ -7851,7 +7904,7 @@ if test -n "$cf_cv_curses_dir/include/$cf_ncuhdr_root" ; then
        CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
 
                          cat >"conftest.$ac_ext" <<_ACEOF
        CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
 
                          cat >"conftest.$ac_ext" <<_ACEOF

-#line 7854 "configure"
+#line 7907 "configure"

 #include "confdefs.h"
 #include <stdio.h>
 int
 #include "confdefs.h"
 #include <stdio.h>
 int


@@ -7863,16 +7916,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
 }
 _ACEOF
 rm -f "conftest.$ac_objext"

-if { (eval echo "$as_me:7866: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:7919: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:7869: \$? = $ac_status" >&5
+  echo "$as_me:7922: \$? = $ac_status" >&5

   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'

-  { (eval echo "$as_me:7872: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7925: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:7875: \$? = $ac_status" >&5
+  echo "$as_me:7928: \$? = $ac_status" >&5

   (exit "$ac_status"); }; }; then
   :
 else
   (exit "$ac_status"); }; }; then
   :
 else


@@ -7889,7 +7942,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
                if test "$cf_have_incdir" = no ; then
                  test -n "$verbose" && echo "  adding $cf_add_incdir to include-path" 1>&6
 
                if test "$cf_have_incdir" = no ; then
                  test -n "$verbose" && echo "  adding $cf_add_incdir to include-path" 1>&6
 

-echo "${as_me:-configure}:7892: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:7945: testing adding $cf_add_incdir to include-path ..." 1>&5

 
                  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
 
                  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 


@@ -7908,7 +7961,7 @@ fi
 
 }
 
 
 }
 

-echo "$as_me:7911: checking for $cf_ncuhdr_root header in include-path" >&5
+echo "$as_me:7964: 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
 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


@@ -7920,7 +7973,7 @@ else
        do
 
        cat >"conftest.$ac_ext" <<_ACEOF
        do
 
        cat >"conftest.$ac_ext" <<_ACEOF

-#line 7923 "configure"
+#line 7976 "configure"

 #include "confdefs.h"
 
 #define _XOPEN_SOURCE_EXTENDED
 #include "confdefs.h"
 
 #define _XOPEN_SOURCE_EXTENDED


@@ -7952,16 +8005,16 @@ printf("old\\n");
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
 }
 _ACEOF
 rm -f "conftest.$ac_objext"

-if { (eval echo "$as_me:7955: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:8008: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:7958: \$? = $ac_status" >&5
+  echo "$as_me:8011: \$? = $ac_status" >&5

   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'

-  { (eval echo "$as_me:7961: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8014: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:7964: \$? = $ac_status" >&5
+  echo "$as_me:8017: \$? = $ac_status" >&5

   (exit "$ac_status"); }; }; then
   cf_cv_ncurses_h=$cf_header
 
   (exit "$ac_status"); }; }; then
   cf_cv_ncurses_h=$cf_header
 


@@ -7976,14 +8029,14 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
        done
 
 fi
        done
 
 fi

-echo "$as_me:7979: result: $cf_cv_ncurses_h" >&5
+echo "$as_me:8032: 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 "${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:7986: checking for $cf_ncuhdr_root include-path" >&5
+echo "$as_me:8039: 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
 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


@@ -8104,7 +8157,7 @@ if test -n "$cf_incdir" ; then
        CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
 
                          cat >"conftest.$ac_ext" <<_ACEOF
        CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
 
                          cat >"conftest.$ac_ext" <<_ACEOF

-#line 8107 "configure"
+#line 8160 "configure"

 #include "confdefs.h"
 #include <stdio.h>
 int
 #include "confdefs.h"
 #include <stdio.h>
 int


@@ -8116,16 +8169,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
 }
 _ACEOF
 rm -f "conftest.$ac_objext"

-if { (eval echo "$as_me:8119: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:8172: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:8122: \$? = $ac_status" >&5
+  echo "$as_me:8175: \$? = $ac_status" >&5

   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'

-  { (eval echo "$as_me:8125: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8178: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:8128: \$? = $ac_status" >&5
+  echo "$as_me:8181: \$? = $ac_status" >&5

   (exit "$ac_status"); }; }; then
   :
 else
   (exit "$ac_status"); }; }; then
   :
 else


@@ -8142,7 +8195,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
                if test "$cf_have_incdir" = no ; then
                  test -n "$verbose" && echo "  adding $cf_add_incdir to include-path" 1>&6
 
                if test "$cf_have_incdir" = no ; then
                  test -n "$verbose" && echo "  adding $cf_add_incdir to include-path" 1>&6
 

-echo "${as_me:-configure}:8145: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:8198: testing adding $cf_add_incdir to include-path ..." 1>&5

 
                  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
 
                  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 


@@ -8165,7 +8218,7 @@ fi
                do
 
        cat >"conftest.$ac_ext" <<_ACEOF
                do
 
        cat >"conftest.$ac_ext" <<_ACEOF

-#line 8168 "configure"
+#line 8221 "configure"

 #include "confdefs.h"
 
 #include <$cf_header>
 #include "confdefs.h"
 
 #include <$cf_header>


@@ -8189,16 +8242,16 @@ printf("old\\n");
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
 }
 _ACEOF
 rm -f "conftest.$ac_objext"

-if { (eval echo "$as_me:8192: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:8245: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:8195: \$? = $ac_status" >&5
+  echo "$as_me:8248: \$? = $ac_status" >&5

   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'

-  { (eval echo "$as_me:8198: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8251: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:8201: \$? = $ac_status" >&5
+  echo "$as_me:8254: \$? = $ac_status" >&5

   (exit "$ac_status"); }; }; then
   cf_cv_ncurses_h2=$cf_header
 
   (exit "$ac_status"); }; }; then
   cf_cv_ncurses_h2=$cf_header
 


@@ -8219,12 +8272,12 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
                CPPFLAGS="$cf_save2_CPPFLAGS"
                test "$cf_cv_ncurses_h2" != no && break
        done
                CPPFLAGS="$cf_save2_CPPFLAGS"
                test "$cf_cv_ncurses_h2" != no && break
        done

-       test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:8222: error: not found" >&5
+       test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:8275: error: not found" >&5

 echo "$as_me: error: not found" >&2;}
    { (exit 1); exit 1; }; }
 
 fi
 echo "$as_me: error: not found" >&2;}
    { (exit 1); exit 1; }; }
 
 fi

-echo "$as_me:8227: result: $cf_cv_ncurses_h2" >&5
+echo "$as_me:8280: 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%/[^/]*$%%'`
 echo "${ECHO_T}$cf_cv_ncurses_h2" >&6
 
        cf_1st_incdir=`echo "$cf_cv_ncurses_h2" | sed -e 's%/[^/]*$%%'`


@@ -8260,7 +8313,7 @@ if test -n "$cf_1st_incdir" ; then
        CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
 
                          cat >"conftest.$ac_ext" <<_ACEOF
        CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
 
                          cat >"conftest.$ac_ext" <<_ACEOF

-#line 8263 "configure"
+#line 8316 "configure"

 #include "confdefs.h"
 #include <stdio.h>
 int
 #include "confdefs.h"
 #include <stdio.h>
 int


@@ -8272,16 +8325,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
 }
 _ACEOF
 rm -f "conftest.$ac_objext"

-if { (eval echo "$as_me:8275: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:8328: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:8278: \$? = $ac_status" >&5
+  echo "$as_me:8331: \$? = $ac_status" >&5

   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'

-  { (eval echo "$as_me:8281: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8334: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:8284: \$? = $ac_status" >&5
+  echo "$as_me:8337: \$? = $ac_status" >&5

   (exit "$ac_status"); }; }; then
   :
 else
   (exit "$ac_status"); }; }; then
   :
 else


@@ -8298,7 +8351,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
                if test "$cf_have_incdir" = no ; then
                  test -n "$verbose" && echo "  adding $cf_add_incdir to include-path" 1>&6
 
                if test "$cf_have_incdir" = no ; then
                  test -n "$verbose" && echo "  adding $cf_add_incdir to include-path" 1>&6
 

-echo "${as_me:-configure}:8301: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:8354: testing adding $cf_add_incdir to include-path ..." 1>&5

 
                  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
 
                  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 


@@ -8346,7 +8399,7 @@ EOF
        ;;
 esac
 
        ;;
 esac
 

-echo "$as_me:8349: checking for terminfo header" >&5
+echo "$as_me:8402: 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
 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


@@ -8364,7 +8417,7 @@ esac
 for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h"
 do
 cat >"conftest.$ac_ext" <<_ACEOF
 for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h"
 do
 cat >"conftest.$ac_ext" <<_ACEOF

-#line 8367 "configure"
+#line 8420 "configure"

 #include "confdefs.h"
 #include <stdio.h>
 #include <${cf_cv_ncurses_header:-curses.h}>
 #include "confdefs.h"
 #include <stdio.h>
 #include <${cf_cv_ncurses_header:-curses.h}>


@@ -8379,16 +8432,16 @@ int x = auto_left_margin; (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
 }
 _ACEOF
 rm -f "conftest.$ac_objext"

-if { (eval echo "$as_me:8382: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:8435: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:8385: \$? = $ac_status" >&5
+  echo "$as_me:8438: \$? = $ac_status" >&5

   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'

-  { (eval echo "$as_me:8388: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8441: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:8391: \$? = $ac_status" >&5
+  echo "$as_me:8444: \$? = $ac_status" >&5

   (exit "$ac_status"); }; }; then
 
        cf_cv_term_header="$cf_test"
   (exit "$ac_status"); }; }; then
 
        cf_cv_term_header="$cf_test"


@@ -8404,7 +8457,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 done
 
 fi
 done
 
 fi

-echo "$as_me:8407: result: $cf_cv_term_header" >&5
+echo "$as_me:8460: result: $cf_cv_term_header" >&5

 echo "${ECHO_T}$cf_cv_term_header" >&6
 
 # Set definitions to allow ifdef'ing to accommodate subdirectories
 echo "${ECHO_T}$cf_cv_term_header" >&6
 
 # Set definitions to allow ifdef'ing to accommodate subdirectories


@@ -8442,7 +8495,7 @@ cat >>confdefs.h <<\EOF
 #define NCURSES 1
 EOF
 
 #define NCURSES 1
 EOF
 

-echo "$as_me:8445: checking for ncurses version" >&5
+echo "$as_me:8498: 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
 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


@@ -8468,10 +8521,10 @@ Autoconf "old"
 #endif
 EOF
        cf_try="$ac_cpp conftest.$ac_ext 2>&5 | grep '^Autoconf ' >conftest.out"
 #endif
 EOF
        cf_try="$ac_cpp conftest.$ac_ext 2>&5 | grep '^Autoconf ' >conftest.out"

-       { (eval echo "$as_me:8471: \"$cf_try\"") >&5
+       { (eval echo "$as_me:8524: \"$cf_try\"") >&5

   (eval $cf_try) 2>&5
   ac_status=$?
   (eval $cf_try) 2>&5
   ac_status=$?

-  echo "$as_me:8474: \$? = $ac_status" >&5
+  echo "$as_me:8527: \$? = $ac_status" >&5

   (exit "$ac_status"); }
        if test -f conftest.out ; then
                cf_out=`sed -e 's%^Autoconf %%' -e 's%^[^"]*"%%' -e 's%".*%%' conftest.out`
   (exit "$ac_status"); }
        if test -f conftest.out ; then
                cf_out=`sed -e 's%^Autoconf %%' -e 's%^[^"]*"%%' -e 's%".*%%' conftest.out`


@@ -8481,7 +8534,7 @@ EOF
 
 else
   cat >"conftest.$ac_ext" <<_ACEOF
 
 else
   cat >"conftest.$ac_ext" <<_ACEOF

-#line 8484 "configure"
+#line 8537 "configure"

 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header:-curses.h}>
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header:-curses.h}>


@@ -8506,15 +8559,15 @@ int main(void)
 }
 _ACEOF
 rm -f "conftest$ac_exeext"
 }
 _ACEOF
 rm -f "conftest$ac_exeext"

-if { (eval echo "$as_me:8509: \"$ac_link\"") >&5
+if { (eval echo "$as_me:8562: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:8512: \$? = $ac_status" >&5
+  echo "$as_me:8565: \$? = $ac_status" >&5

   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'

-  { (eval echo "$as_me:8514: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8567: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:8517: \$? = $ac_status" >&5
+  echo "$as_me:8570: \$? = $ac_status" >&5

   (exit "$ac_status"); }; }; then
 
        cf_cv_ncurses_version=`cat $cf_tempfile`
   (exit "$ac_status"); }; }; then
 
        cf_cv_ncurses_version=`cat $cf_tempfile`


@@ -8528,7 +8581,7 @@ fi
        rm -f "$cf_tempfile"
 
 fi
        rm -f "$cf_tempfile"
 
 fi

-echo "$as_me:8531: result: $cf_cv_ncurses_version" >&5
+echo "$as_me:8584: result: $cf_cv_ncurses_version" >&5

 echo "${ECHO_T}$cf_cv_ncurses_version" >&6
 test "$cf_cv_ncurses_version" = no ||
 cat >>confdefs.h <<\EOF
 echo "${ECHO_T}$cf_cv_ncurses_version" >&6
 test "$cf_cv_ncurses_version" = no ||
 cat >>confdefs.h <<\EOF


@@ -8541,7 +8594,7 @@ cf_nculib_root=ncursesw
        # to link gpm.
 cf_ncurses_LIBS=""
 cf_ncurses_SAVE="$LIBS"
        # to link gpm.
 cf_ncurses_LIBS=""
 cf_ncurses_SAVE="$LIBS"

-echo "$as_me:8544: checking for Gpm_Open in -lgpm" >&5
+echo "$as_me:8597: 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
 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


@@ -8549,7 +8602,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lgpm  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lgpm  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF

-#line 8552 "configure"
+#line 8605 "configure"

 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */


@@ -8568,16 +8621,16 @@ Gpm_Open ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"

-if { (eval echo "$as_me:8571: \"$ac_link\"") >&5
+if { (eval echo "$as_me:8624: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:8574: \$? = $ac_status" >&5
+  echo "$as_me:8627: \$? = $ac_status" >&5

   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'

-  { (eval echo "$as_me:8577: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8630: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:8580: \$? = $ac_status" >&5
+  echo "$as_me:8633: \$? = $ac_status" >&5

   (exit "$ac_status"); }; }; then
   ac_cv_lib_gpm_Gpm_Open=yes
 else
   (exit "$ac_status"); }; }; then
   ac_cv_lib_gpm_Gpm_Open=yes
 else


@@ -8588,10 +8641,10 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi

-echo "$as_me:8591: result: $ac_cv_lib_gpm_Gpm_Open" >&5
+echo "$as_me:8644: 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 "${ECHO_T}$ac_cv_lib_gpm_Gpm_Open" >&6
 if test "$ac_cv_lib_gpm_Gpm_Open" = yes; then

-  echo "$as_me:8594: checking for initscr in -lgpm" >&5
+  echo "$as_me:8647: 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
 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


@@ -8599,7 +8652,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lgpm  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lgpm  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF

-#line 8602 "configure"
+#line 8655 "configure"

 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */


@@ -8618,16 +8671,16 @@ initscr ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"

-if { (eval echo "$as_me:8621: \"$ac_link\"") >&5
+if { (eval echo "$as_me:8674: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:8624: \$? = $ac_status" >&5
+  echo "$as_me:8677: \$? = $ac_status" >&5

   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'

-  { (eval echo "$as_me:8627: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8680: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:8630: \$? = $ac_status" >&5
+  echo "$as_me:8683: \$? = $ac_status" >&5

   (exit "$ac_status"); }; }; then
   ac_cv_lib_gpm_initscr=yes
 else
   (exit "$ac_status"); }; }; then
   ac_cv_lib_gpm_initscr=yes
 else


@@ -8638,7 +8691,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi

-echo "$as_me:8641: result: $ac_cv_lib_gpm_initscr" >&5
+echo "$as_me:8694: 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"
 echo "${ECHO_T}$ac_cv_lib_gpm_initscr" >&6
 if test "$ac_cv_lib_gpm_initscr" = yes; then
   LIBS="$cf_ncurses_SAVE"


@@ -8653,7 +8706,7 @@ case "$host_os" in
        # 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
        # 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:8656: checking for tgoto in -lmytinfo" >&5
+               echo "$as_me:8709: 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
 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


@@ -8661,7 +8714,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lmytinfo  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lmytinfo  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF

-#line 8664 "configure"
+#line 8717 "configure"

 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */


@@ -8680,16 +8733,16 @@ tgoto ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"

-if { (eval echo "$as_me:8683: \"$ac_link\"") >&5
+if { (eval echo "$as_me:8736: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:8686: \$? = $ac_status" >&5
+  echo "$as_me:8739: \$? = $ac_status" >&5

   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'

-  { (eval echo "$as_me:8689: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8742: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:8692: \$? = $ac_status" >&5
+  echo "$as_me:8745: \$? = $ac_status" >&5

   (exit "$ac_status"); }; }; then
   ac_cv_lib_mytinfo_tgoto=yes
 else
   (exit "$ac_status"); }; }; then
   ac_cv_lib_mytinfo_tgoto=yes
 else


@@ -8700,7 +8753,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi

-echo "$as_me:8703: result: $ac_cv_lib_mytinfo_tgoto" >&5
+echo "$as_me:8756: 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"
 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"


@@ -8749,13 +8802,13 @@ else
 
        eval 'cf_cv_have_lib_'"$cf_nculib_root"'=no'
        cf_libdir=""
 
        eval 'cf_cv_have_lib_'"$cf_nculib_root"'=no'
        cf_libdir=""

-       echo "$as_me:8752: checking for initscr" >&5
+       echo "$as_me:8805: 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
 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 8758 "configure"
+#line 8811 "configure"

 #include "confdefs.h"
 #define initscr autoconf_temporary
 #include <limits.h>    /* least-intrusive standard header which defines gcc2 __stub macros */
 #include "confdefs.h"
 #define initscr autoconf_temporary
 #include <limits.h>    /* least-intrusive standard header which defines gcc2 __stub macros */


@@ -8786,16 +8839,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"

-if { (eval echo "$as_me:8789: \"$ac_link\"") >&5
+if { (eval echo "$as_me:8842: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:8792: \$? = $ac_status" >&5
+  echo "$as_me:8845: \$? = $ac_status" >&5

   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'

-  { (eval echo "$as_me:8795: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8848: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:8798: \$? = $ac_status" >&5
+  echo "$as_me:8851: \$? = $ac_status" >&5

   (exit "$ac_status"); }; }; then
   ac_cv_func_initscr=yes
 else
   (exit "$ac_status"); }; }; then
   ac_cv_func_initscr=yes
 else


@@ -8805,18 +8858,18 @@ ac_cv_func_initscr=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi

-echo "$as_me:8808: result: $ac_cv_func_initscr" >&5
+echo "$as_me:8861: 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 "${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:8815: checking for initscr in -l$cf_nculib_root" >&5
+               echo "$as_me:8868: 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
 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 8819 "configure"
+#line 8872 "configure"

 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int


@@ -8828,25 +8881,25 @@ initscr()
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"

-if { (eval echo "$as_me:8831: \"$ac_link\"") >&5
+if { (eval echo "$as_me:8884: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:8834: \$? = $ac_status" >&5
+  echo "$as_me:8887: \$? = $ac_status" >&5

   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'

-  { (eval echo "$as_me:8837: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8890: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:8840: \$? = $ac_status" >&5
+  echo "$as_me:8893: \$? = $ac_status" >&5

   (exit "$ac_status"); }; }; then
   (exit "$ac_status"); }; }; then

-  echo "$as_me:8842: result: yes" >&5
+  echo "$as_me:8895: 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 "${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:8849: result: no" >&5
+echo "$as_me:8902: result: no" >&5

 echo "${ECHO_T}no" >&6
 
 cf_search=
 echo "${ECHO_T}no" >&6
 
 cf_search=


@@ -8914,11 +8967,11 @@ cf_search="$cf_library_path_list $cf_search"
 
                        for cf_libdir in $cf_search
                        do
 
                        for cf_libdir in $cf_search
                        do

-                               echo "$as_me:8917: checking for -l$cf_nculib_root in $cf_libdir" >&5
+                               echo "$as_me:8970: 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
 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 8921 "configure"
+#line 8974 "configure"

 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int


@@ -8930,25 +8983,25 @@ initscr()
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"

-if { (eval echo "$as_me:8933: \"$ac_link\"") >&5
+if { (eval echo "$as_me:8986: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:8936: \$? = $ac_status" >&5
+  echo "$as_me:8989: \$? = $ac_status" >&5

   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'

-  { (eval echo "$as_me:8939: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8992: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:8942: \$? = $ac_status" >&5
+  echo "$as_me:8995: \$? = $ac_status" >&5

   (exit "$ac_status"); }; }; then
   (exit "$ac_status"); }; }; then

-  echo "$as_me:8944: result: yes" >&5
+  echo "$as_me:8997: 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 "${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:8951: result: no" >&5
+echo "$as_me:9004: result: no" >&5

 echo "${ECHO_T}no" >&6
                                         LIBS="$cf_save_LIBS"
 fi
 echo "${ECHO_T}no" >&6
                                         LIBS="$cf_save_LIBS"
 fi


@@ -8963,7 +9016,7 @@ fi
 eval 'cf_found_library="$cf_cv_have_lib_'"$cf_nculib_root"\"
 
 if test "$cf_found_library" = no ; then
 eval 'cf_found_library="$cf_cv_have_lib_'"$cf_nculib_root"\"
 
 if test "$cf_found_library" = no ; then

-       { { echo "$as_me:8966: error: Cannot link $cf_nculib_root library" >&5
+       { { echo "$as_me:9019: error: Cannot link $cf_nculib_root library" >&5

 echo "$as_me: error: Cannot link $cf_nculib_root library" >&2;}
    { (exit 1); exit 1; }; }
 fi
 echo "$as_me: error: Cannot link $cf_nculib_root library" >&2;}
    { (exit 1); exit 1; }; }
 fi


@@ -8971,7 +9024,7 @@ fi
 fi
 
 if test -n "$cf_ncurses_LIBS" ; then
 fi
 
 if test -n "$cf_ncurses_LIBS" ; then

-       echo "$as_me:8974: checking if we can link $cf_nculib_root without $cf_ncurses_LIBS" >&5
+       echo "$as_me:9027: 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
 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


@@ -8981,7 +9034,7 @@ echo $ECHO_N "checking if we can link $cf_nculib_root without $cf_ncurses_LIBS..
                fi
        done
        cat >"conftest.$ac_ext" <<_ACEOF
                fi
        done
        cat >"conftest.$ac_ext" <<_ACEOF

-#line 8984 "configure"
+#line 9037 "configure"

 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int


@@ -8993,23 +9046,23 @@ initscr(); mousemask(0,0); tigetstr((char *)0);
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"

-if { (eval echo "$as_me:8996: \"$ac_link\"") >&5
+if { (eval echo "$as_me:9049: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:8999: \$? = $ac_status" >&5
+  echo "$as_me:9052: \$? = $ac_status" >&5

   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'

-  { (eval echo "$as_me:9002: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9055: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:9005: \$? = $ac_status" >&5
+  echo "$as_me:9058: \$? = $ac_status" >&5

   (exit "$ac_status"); }; }; then
   (exit "$ac_status"); }; }; then

-  echo "$as_me:9007: result: yes" >&5
+  echo "$as_me:9060: result: yes" >&5

 echo "${ECHO_T}yes" >&6
 else
   echo "$as_me: failed program was:" >&5
 cat "conftest.$ac_ext" >&5
 echo "${ECHO_T}yes" >&6
 else
   echo "$as_me: failed program was:" >&5
 cat "conftest.$ac_ext" >&5

-echo "$as_me:9012: result: no" >&5
+echo "$as_me:9065: result: no" >&5

 echo "${ECHO_T}no" >&6
                 LIBS="$cf_ncurses_SAVE"
 fi
 echo "${ECHO_T}no" >&6
                 LIBS="$cf_ncurses_SAVE"
 fi


@@ -9033,13 +9086,13 @@ cf_ncuconfig_root=ncurses
 cf_have_ncuconfig=no
 
 if test "x${PKG_CONFIG:=none}" != xnone; then
 cf_have_ncuconfig=no
 
 if test "x${PKG_CONFIG:=none}" != xnone; then

-       echo "$as_me:9036: checking pkg-config for $cf_ncuconfig_root" >&5
+       echo "$as_me:9089: 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 $ECHO_N "checking pkg-config for $cf_ncuconfig_root... $ECHO_C" >&6
        if "$PKG_CONFIG" --exists $cf_ncuconfig_root ; then

-               echo "$as_me:9039: result: yes" >&5
+               echo "$as_me:9092: result: yes" >&5

 echo "${ECHO_T}yes" >&6
 
 echo "${ECHO_T}yes" >&6
 

-               echo "$as_me:9042: checking if the $cf_ncuconfig_root package files work" >&5
+               echo "$as_me:9095: 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
 
 echo $ECHO_N "checking if the $cf_ncuconfig_root package files work... $ECHO_C" >&6
                cf_have_ncuconfig=unknown
 


@@ -9172,7 +9225,7 @@ done
 LIBS="$cf_add_libs"
 
                        cat >"conftest.$ac_ext" <<_ACEOF
 LIBS="$cf_add_libs"
 
                        cat >"conftest.$ac_ext" <<_ACEOF

-#line 9175 "configure"
+#line 9228 "configure"

 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int


@@ -9184,37 +9237,37 @@ initscr(); mousemask(0,0); tigetstr((char *)0);
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"

-if { (eval echo "$as_me:9187: \"$ac_link\"") >&5
+if { (eval echo "$as_me:9240: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:9190: \$? = $ac_status" >&5
+  echo "$as_me:9243: \$? = $ac_status" >&5

   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'

-  { (eval echo "$as_me:9193: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9246: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:9196: \$? = $ac_status" >&5
+  echo "$as_me:9249: \$? = $ac_status" >&5

   (exit "$ac_status"); }; }; then
   if test "$cross_compiling" = yes; then
   cf_test_ncuconfig=maybe
 else
   cat >"conftest.$ac_ext" <<_ACEOF
   (exit "$ac_status"); }; }; then
   if test "$cross_compiling" = yes; then
   cf_test_ncuconfig=maybe
 else
   cat >"conftest.$ac_ext" <<_ACEOF

-#line 9202 "configure"
+#line 9255 "configure"

 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
                                        int main(void)
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
                                        int main(void)

-                                       { char *xx = curses_version(); return (xx == 0); }
+                                       { const char *xx = curses_version(); return (xx == 0); }

 _ACEOF
 rm -f "conftest$ac_exeext"
 _ACEOF
 rm -f "conftest$ac_exeext"

-if { (eval echo "$as_me:9209: \"$ac_link\"") >&5
+if { (eval echo "$as_me:9262: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:9212: \$? = $ac_status" >&5
+  echo "$as_me:9265: \$? = $ac_status" >&5

   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'

-  { (eval echo "$as_me:9214: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9267: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:9217: \$? = $ac_status" >&5
+  echo "$as_me:9270: \$? = $ac_status" >&5

   (exit "$ac_status"); }; }; then
   cf_test_ncuconfig=yes
 else
   (exit "$ac_status"); }; }; then
   cf_test_ncuconfig=yes
 else


@@ -9360,7 +9413,7 @@ done
 LIBS="$cf_add_libs"
 
                cat >"conftest.$ac_ext" <<_ACEOF
 LIBS="$cf_add_libs"
 
                cat >"conftest.$ac_ext" <<_ACEOF

-#line 9363 "configure"
+#line 9416 "configure"

 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int


@@ -9372,37 +9425,37 @@ initscr(); mousemask(0,0); tigetstr((char *)0);
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"

-if { (eval echo "$as_me:9375: \"$ac_link\"") >&5
+if { (eval echo "$as_me:9428: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:9378: \$? = $ac_status" >&5
+  echo "$as_me:9431: \$? = $ac_status" >&5

   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'

-  { (eval echo "$as_me:9381: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9434: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:9384: \$? = $ac_status" >&5
+  echo "$as_me:9437: \$? = $ac_status" >&5

   (exit "$ac_status"); }; }; then
   if test "$cross_compiling" = yes; then
   cf_have_ncuconfig=maybe
 else
   cat >"conftest.$ac_ext" <<_ACEOF
   (exit "$ac_status"); }; }; then
   if test "$cross_compiling" = yes; then
   cf_have_ncuconfig=maybe
 else
   cat >"conftest.$ac_ext" <<_ACEOF

-#line 9390 "configure"
+#line 9443 "configure"

 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
                                int main(void)
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
                                int main(void)

-                               { char *xx = curses_version(); return (xx == 0); }
+                               { const char *xx = curses_version(); return (xx == 0); }

 _ACEOF
 rm -f "conftest$ac_exeext"
 _ACEOF
 rm -f "conftest$ac_exeext"

-if { (eval echo "$as_me:9397: \"$ac_link\"") >&5
+if { (eval echo "$as_me:9450: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:9400: \$? = $ac_status" >&5
+  echo "$as_me:9453: \$? = $ac_status" >&5

   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'

-  { (eval echo "$as_me:9402: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9455: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:9405: \$? = $ac_status" >&5
+  echo "$as_me:9458: \$? = $ac_status" >&5

   (exit "$ac_status"); }; }; then
   cf_have_ncuconfig=yes
 else
   (exit "$ac_status"); }; }; then
   cf_have_ncuconfig=yes
 else


@@ -9419,7 +9472,7 @@ cat "conftest.$ac_ext" >&5
 cf_have_ncuconfig=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 cf_have_ncuconfig=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"

-               echo "$as_me:9422: result: $cf_have_ncuconfig" >&5
+               echo "$as_me:9475: 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"
 echo "${ECHO_T}$cf_have_ncuconfig" >&6
                test "$cf_have_ncuconfig" = maybe && cf_have_ncuconfig=yes
                if test "$cf_have_ncuconfig" != "yes"


@@ -9435,7 +9488,7 @@ EOF
 
                        NCURSES_CONFIG_PKG=$cf_ncuconfig_root
 
 
                        NCURSES_CONFIG_PKG=$cf_ncuconfig_root
 

-echo "$as_me:9438: checking for terminfo header" >&5
+echo "$as_me:9491: 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
 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


@@ -9453,7 +9506,7 @@ esac
 for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h"
 do
 cat >"conftest.$ac_ext" <<_ACEOF
 for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h"
 do
 cat >"conftest.$ac_ext" <<_ACEOF

-#line 9456 "configure"
+#line 9509 "configure"

 #include "confdefs.h"
 #include <stdio.h>
 #include <${cf_cv_ncurses_header:-curses.h}>
 #include "confdefs.h"
 #include <stdio.h>
 #include <${cf_cv_ncurses_header:-curses.h}>


@@ -9468,16 +9521,16 @@ int x = auto_left_margin; (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
 }
 _ACEOF
 rm -f "conftest.$ac_objext"

-if { (eval echo "$as_me:9471: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:9524: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:9474: \$? = $ac_status" >&5
+  echo "$as_me:9527: \$? = $ac_status" >&5

   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'

-  { (eval echo "$as_me:9477: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9530: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:9480: \$? = $ac_status" >&5
+  echo "$as_me:9533: \$? = $ac_status" >&5

   (exit "$ac_status"); }; }; then
 
        cf_cv_term_header="$cf_test"
   (exit "$ac_status"); }; }; then
 
        cf_cv_term_header="$cf_test"


@@ -9493,7 +9546,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 done
 
 fi
 done
 
 fi

-echo "$as_me:9496: result: $cf_cv_term_header" >&5
+echo "$as_me:9549: result: $cf_cv_term_header" >&5

 echo "${ECHO_T}$cf_cv_term_header" >&6
 
 # Set definitions to allow ifdef'ing to accommodate subdirectories
 echo "${ECHO_T}$cf_cv_term_header" >&6
 
 # Set definitions to allow ifdef'ing to accommodate subdirectories


@@ -9528,7 +9581,7 @@ esac
                fi
 
        else
                fi
 
        else

-               echo "$as_me:9531: result: no" >&5
+               echo "$as_me:9584: result: no" >&5

 echo "${ECHO_T}no" >&6
                NCURSES_CONFIG_PKG=none
        fi
 echo "${ECHO_T}no" >&6
                NCURSES_CONFIG_PKG=none
        fi


@@ -9544,7 +9597,7 @@ if test -n "$ac_tool_prefix"; then
   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
   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:9547: checking for $ac_word" >&5
+echo "$as_me:9600: 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
 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


@@ -9559,7 +9612,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_NCURSES_CONFIG="$ac_tool_prefix$ac_prog"
   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:9562: found $ac_dir/$ac_word" >&5
+echo "$as_me:9615: found $ac_dir/$ac_word" >&5

 break
 done
 
 break
 done
 


@@ -9567,10 +9620,10 @@ fi
 fi
 NCURSES_CONFIG=$ac_cv_prog_NCURSES_CONFIG
 if test -n "$NCURSES_CONFIG"; then
 fi
 NCURSES_CONFIG=$ac_cv_prog_NCURSES_CONFIG
 if test -n "$NCURSES_CONFIG"; then

-  echo "$as_me:9570: result: $NCURSES_CONFIG" >&5
+  echo "$as_me:9623: result: $NCURSES_CONFIG" >&5

 echo "${ECHO_T}$NCURSES_CONFIG" >&6
 else
 echo "${ECHO_T}$NCURSES_CONFIG" >&6
 else

-  echo "$as_me:9573: result: no" >&5
+  echo "$as_me:9626: result: no" >&5

 echo "${ECHO_T}no" >&6
 fi
 
 echo "${ECHO_T}no" >&6
 fi
 


@@ -9583,7 +9636,7 @@ if test -z "$NCURSES_CONFIG"; then
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
 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:9586: checking for $ac_word" >&5
+echo "$as_me:9639: 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
 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


@@ -9598,7 +9651,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_ac_ct_NCURSES_CONFIG="$ac_prog"
   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:9601: found $ac_dir/$ac_word" >&5
+echo "$as_me:9654: found $ac_dir/$ac_word" >&5

 break
 done
 
 break
 done
 


@@ -9606,10 +9659,10 @@ fi
 fi
 ac_ct_NCURSES_CONFIG=$ac_cv_prog_ac_ct_NCURSES_CONFIG
 if test -n "$ac_ct_NCURSES_CONFIG"; then
 fi
 ac_ct_NCURSES_CONFIG=$ac_cv_prog_ac_ct_NCURSES_CONFIG
 if test -n "$ac_ct_NCURSES_CONFIG"; then

-  echo "$as_me:9609: result: $ac_ct_NCURSES_CONFIG" >&5
+  echo "$as_me:9662: result: $ac_ct_NCURSES_CONFIG" >&5

 echo "${ECHO_T}$ac_ct_NCURSES_CONFIG" >&6
 else
 echo "${ECHO_T}$ac_ct_NCURSES_CONFIG" >&6
 else

-  echo "$as_me:9612: result: no" >&5
+  echo "$as_me:9665: result: no" >&5

 echo "${ECHO_T}no" >&6
 fi
 
 echo "${ECHO_T}no" >&6
 fi
 


@@ -9738,7 +9791,7 @@ LIBS="$cf_add_libs"
 
                # even with config script, some packages use no-override for curses.h
 
 
                # even with config script, some packages use no-override for curses.h
 

-echo "$as_me:9741: checking if we have identified curses headers" >&5
+echo "$as_me:9794: 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
 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


@@ -9750,7 +9803,7 @@ for cf_header in \
        curses.h ncurses/curses.h
 do
 cat >"conftest.$ac_ext" <<_ACEOF
        curses.h ncurses/curses.h
 do
 cat >"conftest.$ac_ext" <<_ACEOF

-#line 9753 "configure"
+#line 9806 "configure"

 #include "confdefs.h"
 #include <${cf_header}>
 int
 #include "confdefs.h"
 #include <${cf_header}>
 int


@@ -9762,16 +9815,16 @@ initscr(); tgoto("?", 0,0)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
 }
 _ACEOF
 rm -f "conftest.$ac_objext"

-if { (eval echo "$as_me:9765: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:9818: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:9768: \$? = $ac_status" >&5
+  echo "$as_me:9821: \$? = $ac_status" >&5

   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'

-  { (eval echo "$as_me:9771: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9824: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:9774: \$? = $ac_status" >&5
+  echo "$as_me:9827: \$? = $ac_status" >&5

   (exit "$ac_status"); }; }; then
   cf_cv_ncurses_header=$cf_header; break
 else
   (exit "$ac_status"); }; }; then
   cf_cv_ncurses_header=$cf_header; break
 else


@@ -9782,11 +9835,11 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 done
 
 fi
 done
 
 fi

-echo "$as_me:9785: result: $cf_cv_ncurses_header" >&5
+echo "$as_me:9838: result: $cf_cv_ncurses_header" >&5

 echo "${ECHO_T}$cf_cv_ncurses_header" >&6
 
 if test "$cf_cv_ncurses_header" = none ; then
 echo "${ECHO_T}$cf_cv_ncurses_header" >&6
 
 if test "$cf_cv_ncurses_header" = none ; then

-       { { echo "$as_me:9789: error: No curses header-files found" >&5
+       { { echo "$as_me:9842: error: No curses header-files found" >&5

 echo "$as_me: error: No curses header-files found" >&2;}
    { (exit 1); exit 1; }; }
 fi
 echo "$as_me: error: No curses header-files found" >&2;}
    { (exit 1); exit 1; }; }
 fi


@@ -9796,23 +9849,23 @@ fi
 for ac_header in $cf_cv_ncurses_header
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
 for ac_header in $cf_cv_ncurses_header
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`

-echo "$as_me:9799: checking for $ac_header" >&5
+echo "$as_me:9852: 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
 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 9805 "configure"
+#line 9858 "configure"

 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF

-if { (eval echo "$as_me:9809: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:9862: \"$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
   (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:9815: \$? = $ac_status" >&5
+  echo "$as_me:9868: \$? = $ac_status" >&5

   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag


@@ -9831,7 +9884,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi

-echo "$as_me:9834: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:9887: 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
 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6
 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then
   cat >>confdefs.h <<EOF


@@ -9887,7 +9940,7 @@ if test -n "$cf_cv_curses_dir/include/$cf_ncuhdr_root" ; then
        CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
 
                          cat >"conftest.$ac_ext" <<_ACEOF
        CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
 
                          cat >"conftest.$ac_ext" <<_ACEOF

-#line 9890 "configure"
+#line 9943 "configure"

 #include "confdefs.h"
 #include <stdio.h>
 int
 #include "confdefs.h"
 #include <stdio.h>
 int


@@ -9899,16 +9952,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
 }
 _ACEOF
 rm -f "conftest.$ac_objext"

-if { (eval echo "$as_me:9902: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:9955: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:9905: \$? = $ac_status" >&5
+  echo "$as_me:9958: \$? = $ac_status" >&5

   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'

-  { (eval echo "$as_me:9908: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9961: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:9911: \$? = $ac_status" >&5
+  echo "$as_me:9964: \$? = $ac_status" >&5

   (exit "$ac_status"); }; }; then
   :
 else
   (exit "$ac_status"); }; }; then
   :
 else


@@ -9925,7 +9978,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
                if test "$cf_have_incdir" = no ; then
                  test -n "$verbose" && echo "  adding $cf_add_incdir to include-path" 1>&6
 
                if test "$cf_have_incdir" = no ; then
                  test -n "$verbose" && echo "  adding $cf_add_incdir to include-path" 1>&6
 

-echo "${as_me:-configure}:9928: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:9981: testing adding $cf_add_incdir to include-path ..." 1>&5

 
                  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
 
                  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 


@@ -9944,7 +9997,7 @@ fi
 
 }
 
 
 }
 

-echo "$as_me:9947: checking for $cf_ncuhdr_root header in include-path" >&5
+echo "$as_me:10000: 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
 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


@@ -9956,7 +10009,7 @@ else
        do
 
        cat >"conftest.$ac_ext" <<_ACEOF
        do
 
        cat >"conftest.$ac_ext" <<_ACEOF

-#line 9959 "configure"
+#line 10012 "configure"

 #include "confdefs.h"
 
 #include <$cf_header>
 #include "confdefs.h"
 
 #include <$cf_header>


@@ -9980,16 +10033,16 @@ printf("old\\n");
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
 }
 _ACEOF
 rm -f "conftest.$ac_objext"

-if { (eval echo "$as_me:9983: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:10036: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:9986: \$? = $ac_status" >&5
+  echo "$as_me:10039: \$? = $ac_status" >&5

   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'

-  { (eval echo "$as_me:9989: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10042: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:9992: \$? = $ac_status" >&5
+  echo "$as_me:10045: \$? = $ac_status" >&5

   (exit "$ac_status"); }; }; then
   cf_cv_ncurses_h=$cf_header
 
   (exit "$ac_status"); }; }; then
   cf_cv_ncurses_h=$cf_header
 


@@ -10004,14 +10057,14 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
        done
 
 fi
        done
 
 fi

-echo "$as_me:10007: result: $cf_cv_ncurses_h" >&5
+echo "$as_me:10060: 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 "${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:10014: checking for $cf_ncuhdr_root include-path" >&5
+echo "$as_me:10067: 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
 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


@@ -10132,7 +10185,7 @@ if test -n "$cf_incdir" ; then
        CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
 
                          cat >"conftest.$ac_ext" <<_ACEOF
        CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
 
                          cat >"conftest.$ac_ext" <<_ACEOF

-#line 10135 "configure"
+#line 10188 "configure"

 #include "confdefs.h"
 #include <stdio.h>
 int
 #include "confdefs.h"
 #include <stdio.h>
 int


@@ -10144,16 +10197,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
 }
 _ACEOF
 rm -f "conftest.$ac_objext"

-if { (eval echo "$as_me:10147: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:10200: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:10150: \$? = $ac_status" >&5
+  echo "$as_me:10203: \$? = $ac_status" >&5

   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'

-  { (eval echo "$as_me:10153: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10206: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:10156: \$? = $ac_status" >&5
+  echo "$as_me:10209: \$? = $ac_status" >&5

   (exit "$ac_status"); }; }; then
   :
 else
   (exit "$ac_status"); }; }; then
   :
 else


@@ -10170,7 +10223,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
                if test "$cf_have_incdir" = no ; then
                  test -n "$verbose" && echo "  adding $cf_add_incdir to include-path" 1>&6
 
                if test "$cf_have_incdir" = no ; then
                  test -n "$verbose" && echo "  adding $cf_add_incdir to include-path" 1>&6
 

-echo "${as_me:-configure}:10173: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:10226: testing adding $cf_add_incdir to include-path ..." 1>&5

 
                  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
 
                  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 


@@ -10193,7 +10246,7 @@ fi
                do
 
        cat >"conftest.$ac_ext" <<_ACEOF
                do
 
        cat >"conftest.$ac_ext" <<_ACEOF

-#line 10196 "configure"
+#line 10249 "configure"

 #include "confdefs.h"
 
 #include <$cf_header>
 #include "confdefs.h"
 
 #include <$cf_header>


@@ -10217,16 +10270,16 @@ printf("old\\n");
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
 }
 _ACEOF
 rm -f "conftest.$ac_objext"

-if { (eval echo "$as_me:10220: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:10273: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:10223: \$? = $ac_status" >&5
+  echo "$as_me:10276: \$? = $ac_status" >&5

   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'

-  { (eval echo "$as_me:10226: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10279: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:10229: \$? = $ac_status" >&5
+  echo "$as_me:10282: \$? = $ac_status" >&5

   (exit "$ac_status"); }; }; then
   cf_cv_ncurses_h2=$cf_header
 
   (exit "$ac_status"); }; }; then
   cf_cv_ncurses_h2=$cf_header
 


@@ -10247,12 +10300,12 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
                CPPFLAGS="$cf_save2_CPPFLAGS"
                test "$cf_cv_ncurses_h2" != no && break
        done
                CPPFLAGS="$cf_save2_CPPFLAGS"
                test "$cf_cv_ncurses_h2" != no && break
        done

-       test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:10250: error: not found" >&5
+       test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:10303: error: not found" >&5

 echo "$as_me: error: not found" >&2;}
    { (exit 1); exit 1; }; }
 
 fi
 echo "$as_me: error: not found" >&2;}
    { (exit 1); exit 1; }; }
 
 fi

-echo "$as_me:10255: result: $cf_cv_ncurses_h2" >&5
+echo "$as_me:10308: 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%/[^/]*$%%'`
 echo "${ECHO_T}$cf_cv_ncurses_h2" >&6
 
        cf_1st_incdir=`echo "$cf_cv_ncurses_h2" | sed -e 's%/[^/]*$%%'`


@@ -10288,7 +10341,7 @@ if test -n "$cf_1st_incdir" ; then
        CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
 
                          cat >"conftest.$ac_ext" <<_ACEOF
        CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
 
                          cat >"conftest.$ac_ext" <<_ACEOF

-#line 10291 "configure"
+#line 10344 "configure"

 #include "confdefs.h"
 #include <stdio.h>
 int
 #include "confdefs.h"
 #include <stdio.h>
 int


@@ -10300,16 +10353,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
 }
 _ACEOF
 rm -f "conftest.$ac_objext"

-if { (eval echo "$as_me:10303: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:10356: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:10306: \$? = $ac_status" >&5
+  echo "$as_me:10359: \$? = $ac_status" >&5

   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'

-  { (eval echo "$as_me:10309: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10362: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:10312: \$? = $ac_status" >&5
+  echo "$as_me:10365: \$? = $ac_status" >&5

   (exit "$ac_status"); }; }; then
   :
 else
   (exit "$ac_status"); }; }; then
   :
 else


@@ -10326,7 +10379,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
                if test "$cf_have_incdir" = no ; then
                  test -n "$verbose" && echo "  adding $cf_add_incdir to include-path" 1>&6
 
                if test "$cf_have_incdir" = no ; then
                  test -n "$verbose" && echo "  adding $cf_add_incdir to include-path" 1>&6
 

-echo "${as_me:-configure}:10329: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:10382: testing adding $cf_add_incdir to include-path ..." 1>&5

 
                  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
 
                  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 


@@ -10374,7 +10427,7 @@ EOF
        ;;
 esac
 
        ;;
 esac
 

-echo "$as_me:10377: checking for terminfo header" >&5
+echo "$as_me:10430: 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
 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


@@ -10392,7 +10445,7 @@ esac
 for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h"
 do
 cat >"conftest.$ac_ext" <<_ACEOF
 for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h"
 do
 cat >"conftest.$ac_ext" <<_ACEOF

-#line 10395 "configure"
+#line 10448 "configure"

 #include "confdefs.h"
 #include <stdio.h>
 #include <${cf_cv_ncurses_header:-curses.h}>
 #include "confdefs.h"
 #include <stdio.h>
 #include <${cf_cv_ncurses_header:-curses.h}>


@@ -10407,16 +10460,16 @@ int x = auto_left_margin; (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
 }
 _ACEOF
 rm -f "conftest.$ac_objext"

-if { (eval echo "$as_me:10410: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:10463: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:10413: \$? = $ac_status" >&5
+  echo "$as_me:10466: \$? = $ac_status" >&5

   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'

-  { (eval echo "$as_me:10416: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10469: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:10419: \$? = $ac_status" >&5
+  echo "$as_me:10472: \$? = $ac_status" >&5

   (exit "$ac_status"); }; }; then
 
        cf_cv_term_header="$cf_test"
   (exit "$ac_status"); }; }; then
 
        cf_cv_term_header="$cf_test"


@@ -10432,7 +10485,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 done
 
 fi
 done
 
 fi

-echo "$as_me:10435: result: $cf_cv_term_header" >&5
+echo "$as_me:10488: result: $cf_cv_term_header" >&5

 echo "${ECHO_T}$cf_cv_term_header" >&6
 
 # Set definitions to allow ifdef'ing to accommodate subdirectories
 echo "${ECHO_T}$cf_cv_term_header" >&6
 
 # Set definitions to allow ifdef'ing to accommodate subdirectories


@@ -10470,7 +10523,7 @@ cat >>confdefs.h <<\EOF
 #define NCURSES 1
 EOF
 
 #define NCURSES 1
 EOF
 

-echo "$as_me:10473: checking for ncurses version" >&5
+echo "$as_me:10526: 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
 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


@@ -10496,10 +10549,10 @@ Autoconf "old"
 #endif
 EOF
        cf_try="$ac_cpp conftest.$ac_ext 2>&5 | grep '^Autoconf ' >conftest.out"
 #endif
 EOF
        cf_try="$ac_cpp conftest.$ac_ext 2>&5 | grep '^Autoconf ' >conftest.out"

-       { (eval echo "$as_me:10499: \"$cf_try\"") >&5
+       { (eval echo "$as_me:10552: \"$cf_try\"") >&5

   (eval $cf_try) 2>&5
   ac_status=$?
   (eval $cf_try) 2>&5
   ac_status=$?

-  echo "$as_me:10502: \$? = $ac_status" >&5
+  echo "$as_me:10555: \$? = $ac_status" >&5

   (exit "$ac_status"); }
        if test -f conftest.out ; then
                cf_out=`sed -e 's%^Autoconf %%' -e 's%^[^"]*"%%' -e 's%".*%%' conftest.out`
   (exit "$ac_status"); }
        if test -f conftest.out ; then
                cf_out=`sed -e 's%^Autoconf %%' -e 's%^[^"]*"%%' -e 's%".*%%' conftest.out`


@@ -10509,7 +10562,7 @@ EOF
 
 else
   cat >"conftest.$ac_ext" <<_ACEOF
 
 else
   cat >"conftest.$ac_ext" <<_ACEOF

-#line 10512 "configure"
+#line 10565 "configure"

 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header:-curses.h}>
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header:-curses.h}>


@@ -10534,15 +10587,15 @@ int main(void)
 }
 _ACEOF
 rm -f "conftest$ac_exeext"
 }
 _ACEOF
 rm -f "conftest$ac_exeext"

-if { (eval echo "$as_me:10537: \"$ac_link\"") >&5
+if { (eval echo "$as_me:10590: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:10540: \$? = $ac_status" >&5
+  echo "$as_me:10593: \$? = $ac_status" >&5

   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'

-  { (eval echo "$as_me:10542: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10595: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:10545: \$? = $ac_status" >&5
+  echo "$as_me:10598: \$? = $ac_status" >&5

   (exit "$ac_status"); }; }; then
 
        cf_cv_ncurses_version=`cat $cf_tempfile`
   (exit "$ac_status"); }; }; then
 
        cf_cv_ncurses_version=`cat $cf_tempfile`


@@ -10556,7 +10609,7 @@ fi
        rm -f "$cf_tempfile"
 
 fi
        rm -f "$cf_tempfile"
 
 fi

-echo "$as_me:10559: result: $cf_cv_ncurses_version" >&5
+echo "$as_me:10612: result: $cf_cv_ncurses_version" >&5

 echo "${ECHO_T}$cf_cv_ncurses_version" >&6
 test "$cf_cv_ncurses_version" = no ||
 cat >>confdefs.h <<\EOF
 echo "${ECHO_T}$cf_cv_ncurses_version" >&6
 test "$cf_cv_ncurses_version" = no ||
 cat >>confdefs.h <<\EOF


@@ -10569,7 +10622,7 @@ cf_nculib_root=ncurses
        # to link gpm.
 cf_ncurses_LIBS=""
 cf_ncurses_SAVE="$LIBS"
        # to link gpm.
 cf_ncurses_LIBS=""
 cf_ncurses_SAVE="$LIBS"

-echo "$as_me:10572: checking for Gpm_Open in -lgpm" >&5
+echo "$as_me:10625: 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
 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


@@ -10577,7 +10630,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lgpm  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lgpm  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF

-#line 10580 "configure"
+#line 10633 "configure"

 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */


@@ -10596,16 +10649,16 @@ Gpm_Open ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"

-if { (eval echo "$as_me:10599: \"$ac_link\"") >&5
+if { (eval echo "$as_me:10652: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:10602: \$? = $ac_status" >&5
+  echo "$as_me:10655: \$? = $ac_status" >&5

   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'

-  { (eval echo "$as_me:10605: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10658: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:10608: \$? = $ac_status" >&5
+  echo "$as_me:10661: \$? = $ac_status" >&5

   (exit "$ac_status"); }; }; then
   ac_cv_lib_gpm_Gpm_Open=yes
 else
   (exit "$ac_status"); }; }; then
   ac_cv_lib_gpm_Gpm_Open=yes
 else


@@ -10616,10 +10669,10 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi

-echo "$as_me:10619: result: $ac_cv_lib_gpm_Gpm_Open" >&5
+echo "$as_me:10672: 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 "${ECHO_T}$ac_cv_lib_gpm_Gpm_Open" >&6
 if test "$ac_cv_lib_gpm_Gpm_Open" = yes; then

-  echo "$as_me:10622: checking for initscr in -lgpm" >&5
+  echo "$as_me:10675: 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
 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


@@ -10627,7 +10680,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lgpm  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lgpm  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF

-#line 10630 "configure"
+#line 10683 "configure"

 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */


@@ -10646,16 +10699,16 @@ initscr ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"

-if { (eval echo "$as_me:10649: \"$ac_link\"") >&5
+if { (eval echo "$as_me:10702: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:10652: \$? = $ac_status" >&5
+  echo "$as_me:10705: \$? = $ac_status" >&5

   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'

-  { (eval echo "$as_me:10655: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10708: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:10658: \$? = $ac_status" >&5
+  echo "$as_me:10711: \$? = $ac_status" >&5

   (exit "$ac_status"); }; }; then
   ac_cv_lib_gpm_initscr=yes
 else
   (exit "$ac_status"); }; }; then
   ac_cv_lib_gpm_initscr=yes
 else


@@ -10666,7 +10719,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi

-echo "$as_me:10669: result: $ac_cv_lib_gpm_initscr" >&5
+echo "$as_me:10722: 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"
 echo "${ECHO_T}$ac_cv_lib_gpm_initscr" >&6
 if test "$ac_cv_lib_gpm_initscr" = yes; then
   LIBS="$cf_ncurses_SAVE"


@@ -10681,7 +10734,7 @@ case "$host_os" in
        # 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
        # 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:10684: checking for tgoto in -lmytinfo" >&5
+               echo "$as_me:10737: 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
 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


@@ -10689,7 +10742,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lmytinfo  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lmytinfo  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF

-#line 10692 "configure"
+#line 10745 "configure"

 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */


@@ -10708,16 +10761,16 @@ tgoto ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"

-if { (eval echo "$as_me:10711: \"$ac_link\"") >&5
+if { (eval echo "$as_me:10764: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:10714: \$? = $ac_status" >&5
+  echo "$as_me:10767: \$? = $ac_status" >&5

   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'

-  { (eval echo "$as_me:10717: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10770: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:10720: \$? = $ac_status" >&5
+  echo "$as_me:10773: \$? = $ac_status" >&5

   (exit "$ac_status"); }; }; then
   ac_cv_lib_mytinfo_tgoto=yes
 else
   (exit "$ac_status"); }; }; then
   ac_cv_lib_mytinfo_tgoto=yes
 else


@@ -10728,7 +10781,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi

-echo "$as_me:10731: result: $ac_cv_lib_mytinfo_tgoto" >&5
+echo "$as_me:10784: 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"
 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"


@@ -10777,13 +10830,13 @@ else
 
        eval 'cf_cv_have_lib_'"$cf_nculib_root"'=no'
        cf_libdir=""
 
        eval 'cf_cv_have_lib_'"$cf_nculib_root"'=no'
        cf_libdir=""

-       echo "$as_me:10780: checking for initscr" >&5
+       echo "$as_me:10833: 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
 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 10786 "configure"
+#line 10839 "configure"

 #include "confdefs.h"
 #define initscr autoconf_temporary
 #include <limits.h>    /* least-intrusive standard header which defines gcc2 __stub macros */
 #include "confdefs.h"
 #define initscr autoconf_temporary
 #include <limits.h>    /* least-intrusive standard header which defines gcc2 __stub macros */


@@ -10814,16 +10867,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"

-if { (eval echo "$as_me:10817: \"$ac_link\"") >&5
+if { (eval echo "$as_me:10870: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:10820: \$? = $ac_status" >&5
+  echo "$as_me:10873: \$? = $ac_status" >&5

   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'

-  { (eval echo "$as_me:10823: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10876: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:10826: \$? = $ac_status" >&5
+  echo "$as_me:10879: \$? = $ac_status" >&5

   (exit "$ac_status"); }; }; then
   ac_cv_func_initscr=yes
 else
   (exit "$ac_status"); }; }; then
   ac_cv_func_initscr=yes
 else


@@ -10833,18 +10886,18 @@ ac_cv_func_initscr=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi

-echo "$as_me:10836: result: $ac_cv_func_initscr" >&5
+echo "$as_me:10889: 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 "${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:10843: checking for initscr in -l$cf_nculib_root" >&5
+               echo "$as_me:10896: 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
 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 10847 "configure"
+#line 10900 "configure"

 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int


@@ -10856,25 +10909,25 @@ initscr()
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"

-if { (eval echo "$as_me:10859: \"$ac_link\"") >&5
+if { (eval echo "$as_me:10912: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:10862: \$? = $ac_status" >&5
+  echo "$as_me:10915: \$? = $ac_status" >&5

   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'

-  { (eval echo "$as_me:10865: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10918: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:10868: \$? = $ac_status" >&5
+  echo "$as_me:10921: \$? = $ac_status" >&5

   (exit "$ac_status"); }; }; then
   (exit "$ac_status"); }; }; then

-  echo "$as_me:10870: result: yes" >&5
+  echo "$as_me:10923: 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 "${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:10877: result: no" >&5
+echo "$as_me:10930: result: no" >&5

 echo "${ECHO_T}no" >&6
 
 cf_search=
 echo "${ECHO_T}no" >&6
 
 cf_search=


@@ -10942,11 +10995,11 @@ cf_search="$cf_library_path_list $cf_search"
 
                        for cf_libdir in $cf_search
                        do
 
                        for cf_libdir in $cf_search
                        do

-                               echo "$as_me:10945: checking for -l$cf_nculib_root in $cf_libdir" >&5
+                               echo "$as_me:10998: 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
 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 10949 "configure"
+#line 11002 "configure"

 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int


@@ -10958,25 +11011,25 @@ initscr()
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"

-if { (eval echo "$as_me:10961: \"$ac_link\"") >&5
+if { (eval echo "$as_me:11014: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:10964: \$? = $ac_status" >&5
+  echo "$as_me:11017: \$? = $ac_status" >&5

   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'

-  { (eval echo "$as_me:10967: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11020: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:10970: \$? = $ac_status" >&5
+  echo "$as_me:11023: \$? = $ac_status" >&5

   (exit "$ac_status"); }; }; then
   (exit "$ac_status"); }; }; then

-  echo "$as_me:10972: result: yes" >&5
+  echo "$as_me:11025: 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 "${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:10979: result: no" >&5
+echo "$as_me:11032: result: no" >&5

 echo "${ECHO_T}no" >&6
                                         LIBS="$cf_save_LIBS"
 fi
 echo "${ECHO_T}no" >&6
                                         LIBS="$cf_save_LIBS"
 fi


@@ -10991,7 +11044,7 @@ fi
 eval 'cf_found_library="$cf_cv_have_lib_'"$cf_nculib_root"\"
 
 if test "$cf_found_library" = no ; then
 eval 'cf_found_library="$cf_cv_have_lib_'"$cf_nculib_root"\"
 
 if test "$cf_found_library" = no ; then

-       { { echo "$as_me:10994: error: Cannot link $cf_nculib_root library" >&5
+       { { echo "$as_me:11047: error: Cannot link $cf_nculib_root library" >&5

 echo "$as_me: error: Cannot link $cf_nculib_root library" >&2;}
    { (exit 1); exit 1; }; }
 fi
 echo "$as_me: error: Cannot link $cf_nculib_root library" >&2;}
    { (exit 1); exit 1; }; }
 fi


@@ -10999,7 +11052,7 @@ fi
 fi
 
 if test -n "$cf_ncurses_LIBS" ; then
 fi
 
 if test -n "$cf_ncurses_LIBS" ; then

-       echo "$as_me:11002: checking if we can link $cf_nculib_root without $cf_ncurses_LIBS" >&5
+       echo "$as_me:11055: 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
 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


@@ -11009,7 +11062,7 @@ echo $ECHO_N "checking if we can link $cf_nculib_root without $cf_ncurses_LIBS..
                fi
        done
        cat >"conftest.$ac_ext" <<_ACEOF
                fi
        done
        cat >"conftest.$ac_ext" <<_ACEOF

-#line 11012 "configure"
+#line 11065 "configure"

 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int


@@ -11021,23 +11074,23 @@ initscr(); mousemask(0,0); tigetstr((char *)0);
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"

-if { (eval echo "$as_me:11024: \"$ac_link\"") >&5
+if { (eval echo "$as_me:11077: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:11027: \$? = $ac_status" >&5
+  echo "$as_me:11080: \$? = $ac_status" >&5

   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'

-  { (eval echo "$as_me:11030: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11083: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:11033: \$? = $ac_status" >&5
+  echo "$as_me:11086: \$? = $ac_status" >&5

   (exit "$ac_status"); }; }; then
   (exit "$ac_status"); }; }; then

-  echo "$as_me:11035: result: yes" >&5
+  echo "$as_me:11088: result: yes" >&5

 echo "${ECHO_T}yes" >&6
 else
   echo "$as_me: failed program was:" >&5
 cat "conftest.$ac_ext" >&5
 echo "${ECHO_T}yes" >&6
 else
   echo "$as_me: failed program was:" >&5
 cat "conftest.$ac_ext" >&5

-echo "$as_me:11040: result: no" >&5
+echo "$as_me:11093: result: no" >&5

 echo "${ECHO_T}no" >&6
                 LIBS="$cf_ncurses_SAVE"
 fi
 echo "${ECHO_T}no" >&6
                 LIBS="$cf_ncurses_SAVE"
 fi


@@ -11090,10 +11143,10 @@ else
        AUTOCONF_$cf_name NCURSES_VERSION_$cf_name
 CF_EOF
                cf_try="$ac_cpp conftest.$ac_ext 2>&5 | fgrep AUTOCONF_$cf_name >conftest.out"
        AUTOCONF_$cf_name NCURSES_VERSION_$cf_name
 CF_EOF
                cf_try="$ac_cpp conftest.$ac_ext 2>&5 | fgrep AUTOCONF_$cf_name >conftest.out"

-               { (eval echo "$as_me:11093: \"$cf_try\"") >&5
+               { (eval echo "$as_me:11146: \"$cf_try\"") >&5

   (eval $cf_try) 2>&5
   ac_status=$?
   (eval $cf_try) 2>&5
   ac_status=$?

-  echo "$as_me:11096: \$? = $ac_status" >&5
+  echo "$as_me:11149: \$? = $ac_status" >&5

   (exit "$ac_status"); }
                if test -f conftest.out ; then
                        cf_result=`sed -e "s/^.*AUTOCONF_${cf_name}[    ][      ]*//" conftest.out`
   (exit "$ac_status"); }
                if test -f conftest.out ; then
                        cf_result=`sed -e "s/^.*AUTOCONF_${cf_name}[    ][      ]*//" conftest.out`


@@ -11111,10 +11164,10 @@ cf_cv_rel_version=${NCURSES_MAJOR}.${NCURSES_MINOR}
 
 cf_cv_timestamp=`date`
 
 
 cf_cv_timestamp=`date`
 

-echo "$as_me:11114: result: Configuring NCURSES $cf_cv_rel_version ABI $cf_cv_abi_version ($cf_cv_timestamp)" >&5
+echo "$as_me:11167: result: Configuring NCURSES $cf_cv_rel_version ABI $cf_cv_abi_version ($cf_cv_timestamp)" >&5

 echo "${ECHO_T}Configuring NCURSES $cf_cv_rel_version ABI $cf_cv_abi_version ($cf_cv_timestamp)" >&6
 
 echo "${ECHO_T}Configuring NCURSES $cf_cv_rel_version ABI $cf_cv_abi_version ($cf_cv_timestamp)" >&6
 

-echo "$as_me:11117: checking if you want to have a library-prefix" >&5
+echo "$as_me:11170: checking if you want to have a library-prefix" >&5

 echo $ECHO_N "checking if you want to have a library-prefix... $ECHO_C" >&6
 
 # Check whether --with-lib-prefix or --without-lib-prefix was given.
 echo $ECHO_N "checking if you want to have a library-prefix... $ECHO_C" >&6
 
 # Check whether --with-lib-prefix or --without-lib-prefix was given.


@@ -11124,7 +11177,7 @@ if test "${with_lib_prefix+set}" = set; then
 else
   with_lib_prefix=auto
 fi;
 else
   with_lib_prefix=auto
 fi;

-echo "$as_me:11127: result: $with_lib_prefix" >&5
+echo "$as_me:11180: result: $with_lib_prefix" >&5

 echo "${ECHO_T}$with_lib_prefix" >&6
 
 if test "$with_lib_prefix" = auto
 echo "${ECHO_T}$with_lib_prefix" >&6
 
 if test "$with_lib_prefix" = auto


@@ -11162,7 +11215,7 @@ if test X"$CC_G_OPT" = X"" ; then
        test -n "$GCC" && test "${ac_cv_prog_cc_g}" != yes && CC_G_OPT=''
 fi
 
        test -n "$GCC" && test "${ac_cv_prog_cc_g}" != yes && CC_G_OPT=''
 fi
 

-echo "$as_me:11165: checking for default loader flags" >&5
+echo "$as_me:11218: 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=''   ;;
 echo $ECHO_N "checking for default loader flags... $ECHO_C" >&6
 case $DFT_LWR_MODEL in
 (normal)  LD_MODEL=''   ;;


@@ -11170,13 +11223,13 @@ case $DFT_LWR_MODEL in
 (profile) LD_MODEL='-pg';;
 (shared)  LD_MODEL=''   ;;
 esac
 (profile) LD_MODEL='-pg';;
 (shared)  LD_MODEL=''   ;;
 esac

-echo "$as_me:11173: result: $LD_MODEL" >&5
+echo "$as_me:11226: result: $LD_MODEL" >&5

 echo "${ECHO_T}$LD_MODEL" >&6
 
 LD_RPATH_OPT=
 if test "x$cf_cv_enable_rpath" != xno
 then
 echo "${ECHO_T}$LD_MODEL" >&6
 
 LD_RPATH_OPT=
 if test "x$cf_cv_enable_rpath" != xno
 then

-       echo "$as_me:11179: checking for an rpath option" >&5
+       echo "$as_me:11232: checking for an rpath option" >&5

 echo $ECHO_N "checking for an rpath option... $ECHO_C" >&6
        case "$cf_cv_system_name" in
        (irix*)
 echo $ECHO_N "checking for an rpath option... $ECHO_C" >&6
        case "$cf_cv_system_name" in
        (irix*)


@@ -11207,12 +11260,12 @@ echo $ECHO_N "checking for an rpath option... $ECHO_C" >&6
        (*)
                ;;
        esac
        (*)
                ;;
        esac

-       echo "$as_me:11210: result: $LD_RPATH_OPT" >&5
+       echo "$as_me:11263: result: $LD_RPATH_OPT" >&5

 echo "${ECHO_T}$LD_RPATH_OPT" >&6
 
        case "x$LD_RPATH_OPT" in
        (x-R*)
 echo "${ECHO_T}$LD_RPATH_OPT" >&6
 
        case "x$LD_RPATH_OPT" in
        (x-R*)

-               echo "$as_me:11215: checking if we need a space after rpath option" >&5
+               echo "$as_me:11268: 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"
 
 echo $ECHO_N "checking if we need a space after rpath option... $ECHO_C" >&6
                cf_save_LIBS="$LIBS"
 


@@ -11233,7 +11286,7 @@ done
 LIBS="$cf_add_libs"
 
                cat >"conftest.$ac_ext" <<_ACEOF
 LIBS="$cf_add_libs"
 
                cat >"conftest.$ac_ext" <<_ACEOF

-#line 11236 "configure"
+#line 11289 "configure"

 #include "confdefs.h"
 
 int
 #include "confdefs.h"
 
 int


@@ -11245,16 +11298,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"

-if { (eval echo "$as_me:11248: \"$ac_link\"") >&5
+if { (eval echo "$as_me:11301: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:11251: \$? = $ac_status" >&5
+  echo "$as_me:11304: \$? = $ac_status" >&5

   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'

-  { (eval echo "$as_me:11254: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11307: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:11257: \$? = $ac_status" >&5
+  echo "$as_me:11310: \$? = $ac_status" >&5

   (exit "$ac_status"); }; }; then
   cf_rpath_space=no
 else
   (exit "$ac_status"); }; }; then
   cf_rpath_space=no
 else


@@ -11264,7 +11317,7 @@ cf_rpath_space=yes
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
                LIBS="$cf_save_LIBS"
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
                LIBS="$cf_save_LIBS"

-               echo "$as_me:11267: result: $cf_rpath_space" >&5
+               echo "$as_me:11320: result: $cf_rpath_space" >&5

 echo "${ECHO_T}$cf_rpath_space" >&6
                test "$cf_rpath_space" = yes && LD_RPATH_OPT="$LD_RPATH_OPT "
                ;;
 echo "${ECHO_T}$cf_rpath_space" >&6
                test "$cf_rpath_space" = yes && LD_RPATH_OPT="$LD_RPATH_OPT "
                ;;


@@ -11286,7 +11339,7 @@ fi
        cf_ld_rpath_opt=
        test "$cf_cv_enable_rpath" = yes && cf_ld_rpath_opt="$LD_RPATH_OPT"
 
        cf_ld_rpath_opt=
        test "$cf_cv_enable_rpath" = yes && cf_ld_rpath_opt="$LD_RPATH_OPT"
 

-       echo "$as_me:11289: checking if release/abi version should be used for shared libs" >&5
+       echo "$as_me:11342: 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.
 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.


@@ -11301,9 +11354,9 @@ if test "${with_shlib_version+set}" = set; then
                cf_cv_shlib_version=$withval
                ;;
        (*)
                cf_cv_shlib_version=$withval
                ;;
        (*)

-               echo "$as_me:11304: result: $withval" >&5
+               echo "$as_me:11357: result: $withval" >&5

 echo "${ECHO_T}$withval" >&6
 echo "${ECHO_T}$withval" >&6

-               { { echo "$as_me:11306: error: option value must be one of: rel, abi, or auto" >&5
+               { { echo "$as_me:11359: 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; }; }
                ;;
 echo "$as_me: error: option value must be one of: rel, abi, or auto" >&2;}
    { (exit 1); exit 1; }; }
                ;;


@@ -11312,7 +11365,7 @@ echo "$as_me: error: option value must be one of: rel, abi, or auto" >&2;}
 else
   cf_cv_shlib_version=auto
 fi;
 else
   cf_cv_shlib_version=auto
 fi;

-       echo "$as_me:11315: result: $cf_cv_shlib_version" >&5
+       echo "$as_me:11368: result: $cf_cv_shlib_version" >&5

 echo "${ECHO_T}$cf_cv_shlib_version" >&6
 
        cf_cv_rm_so_locs=no
 echo "${ECHO_T}$cf_cv_shlib_version" >&6
 
        cf_cv_rm_so_locs=no


@@ -11335,14 +11388,14 @@ echo "${ECHO_T}$cf_cv_shlib_version" >&6
 
        if test "$cf_try_fPIC" = yes
        then
 
        if test "$cf_try_fPIC" = yes
        then

-               echo "$as_me:11338: checking which $CC option to use" >&5
+               echo "$as_me:11391: 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
 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 11345 "configure"
+#line 11398 "configure"

 #include "confdefs.h"
 #include <stdio.h>
 int
 #include "confdefs.h"
 #include <stdio.h>
 int


@@ -11354,16 +11407,16 @@ int x = 1
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
 }
 _ACEOF
 rm -f "conftest.$ac_objext"

-if { (eval echo "$as_me:11357: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:11410: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:11360: \$? = $ac_status" >&5
+  echo "$as_me:11413: \$? = $ac_status" >&5

   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'

-  { (eval echo "$as_me:11363: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11416: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:11366: \$? = $ac_status" >&5
+  echo "$as_me:11419: \$? = $ac_status" >&5

   (exit "$ac_status"); }; }; then
   break
 else
   (exit "$ac_status"); }; }; then
   break
 else


@@ -11372,7 +11425,7 @@ cat "conftest.$ac_ext" >&5
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
                done
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
                done

-               echo "$as_me:11375: result: $CC_SHARED_OPTS" >&5
+               echo "$as_me:11428: result: $CC_SHARED_OPTS" >&5

 echo "${ECHO_T}$CC_SHARED_OPTS" >&6
                CFLAGS="$cf_save_CFLAGS"
        fi
 echo "${ECHO_T}$CC_SHARED_OPTS" >&6
                CFLAGS="$cf_save_CFLAGS"
        fi


@@ -11443,7 +11496,7 @@ CF_EOF
                MK_SHARED_LIB='${CC} ${LDFLAGS} ${CFLAGS} -dynamiclib -install_name ${libdir}/`basename $@` -compatibility_version ${ABI_VERSION} -current_version ${ABI_VERSION} -o $@'
                test "$cf_cv_shlib_version" = auto && cf_cv_shlib_version=abi
                cf_cv_shlib_version_infix=yes
                MK_SHARED_LIB='${CC} ${LDFLAGS} ${CFLAGS} -dynamiclib -install_name ${libdir}/`basename $@` -compatibility_version ${ABI_VERSION} -current_version ${ABI_VERSION} -o $@'
                test "$cf_cv_shlib_version" = auto && cf_cv_shlib_version=abi
                cf_cv_shlib_version_infix=yes

-               echo "$as_me:11446: checking if ld -search_paths_first works" >&5
+               echo "$as_me:11499: 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
 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


@@ -11452,7 +11505,7 @@ else
                        cf_save_LDFLAGS=$LDFLAGS
                        LDFLAGS="$LDFLAGS -Wl,-search_paths_first"
                        cat >"conftest.$ac_ext" <<_ACEOF
                        cf_save_LDFLAGS=$LDFLAGS
                        LDFLAGS="$LDFLAGS -Wl,-search_paths_first"
                        cat >"conftest.$ac_ext" <<_ACEOF

-#line 11455 "configure"
+#line 11508 "configure"

 #include "confdefs.h"
 
 int
 #include "confdefs.h"
 
 int


@@ -11464,16 +11517,16 @@ int i;
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"

-if { (eval echo "$as_me:11467: \"$ac_link\"") >&5
+if { (eval echo "$as_me:11520: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:11470: \$? = $ac_status" >&5
+  echo "$as_me:11523: \$? = $ac_status" >&5

   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'

-  { (eval echo "$as_me:11473: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11526: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:11476: \$? = $ac_status" >&5
+  echo "$as_me:11529: \$? = $ac_status" >&5

   (exit "$ac_status"); }; }; then
   cf_cv_ldflags_search_paths_first=yes
 else
   (exit "$ac_status"); }; }; then
   cf_cv_ldflags_search_paths_first=yes
 else


@@ -11484,7 +11537,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
                                LDFLAGS=$cf_save_LDFLAGS
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
                                LDFLAGS=$cf_save_LDFLAGS
 fi

-echo "$as_me:11487: result: $cf_cv_ldflags_search_paths_first" >&5
+echo "$as_me:11540: 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"
 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"


@@ -11823,7 +11876,7 @@ CF_EOF
                        do
                                CFLAGS="$cf_shared_opts $cf_save_CFLAGS"
                                cat >"conftest.$ac_ext" <<_ACEOF
                        do
                                CFLAGS="$cf_shared_opts $cf_save_CFLAGS"
                                cat >"conftest.$ac_ext" <<_ACEOF

-#line 11826 "configure"
+#line 11879 "configure"

 #include "confdefs.h"
 #include <stdio.h>
 int
 #include "confdefs.h"
 #include <stdio.h>
 int


@@ -11835,16 +11888,16 @@ printf("Hello\\n");
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
 }
 _ACEOF
 rm -f "conftest.$ac_objext"

-if { (eval echo "$as_me:11838: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:11891: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:11841: \$? = $ac_status" >&5
+  echo "$as_me:11894: \$? = $ac_status" >&5

   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'

-  { (eval echo "$as_me:11844: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11897: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:11847: \$? = $ac_status" >&5
+  echo "$as_me:11900: \$? = $ac_status" >&5

   (exit "$ac_status"); }; }; then
   break
 else
   (exit "$ac_status"); }; }; then
   break
 else


@@ -11881,7 +11934,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
                        test "$cf_cv_do_symlinks" = no && cf_cv_do_symlinks=yes
                        ;;
                (*)
                        test "$cf_cv_do_symlinks" = no && cf_cv_do_symlinks=yes
                        ;;
                (*)

-                       { echo "$as_me:11884: WARNING: ignored --with-shlib-version" >&5
+                       { echo "$as_me:11937: WARNING: ignored --with-shlib-version" >&5

 echo "$as_me: WARNING: ignored --with-shlib-version" >&2;}
                        ;;
                esac
 echo "$as_me: WARNING: ignored --with-shlib-version" >&2;}
                        ;;
                esac


@@ -11891,7 +11944,7 @@ echo "$as_me: WARNING: ignored --with-shlib-version" >&2;}
        if test -n "$cf_try_cflags"
        then
 cat > conftest.$ac_ext <<EOF
        if test -n "$cf_try_cflags"
        then
 cat > conftest.$ac_ext <<EOF

-#line 11894 "${as_me:-configure}"
+#line 11947 "${as_me:-configure}"

 #include <stdio.h>
 int main(int argc, char *argv[])
 {
 #include <stdio.h>
 int main(int argc, char *argv[])
 {


@@ -11903,18 +11956,18 @@ EOF
                for cf_opt in $cf_try_cflags
                do
                        CFLAGS="$cf_save_CFLAGS -$cf_opt"
                for cf_opt in $cf_try_cflags
                do
                        CFLAGS="$cf_save_CFLAGS -$cf_opt"

-                       echo "$as_me:11906: checking if CFLAGS option -$cf_opt works" >&5
+                       echo "$as_me:11959: checking if CFLAGS option -$cf_opt works" >&5

 echo $ECHO_N "checking if CFLAGS option -$cf_opt works... $ECHO_C" >&6
 echo $ECHO_N "checking if CFLAGS option -$cf_opt works... $ECHO_C" >&6

-                       if { (eval echo "$as_me:11908: \"$ac_compile\"") >&5
+                       if { (eval echo "$as_me:11961: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:11911: \$? = $ac_status" >&5
+  echo "$as_me:11964: \$? = $ac_status" >&5

   (exit "$ac_status"); }; then
   (exit "$ac_status"); }; then

-                               echo "$as_me:11913: result: yes" >&5
+                               echo "$as_me:11966: result: yes" >&5

 echo "${ECHO_T}yes" >&6
                                cf_save_CFLAGS="$CFLAGS"
                        else
 echo "${ECHO_T}yes" >&6
                                cf_save_CFLAGS="$CFLAGS"
                        else

-                               echo "$as_me:11917: result: no" >&5
+                               echo "$as_me:11970: result: no" >&5

 echo "${ECHO_T}no" >&6
                        fi
                done
 echo "${ECHO_T}no" >&6
                        fi
                done


@@ -11929,17 +11982,17 @@ echo "${ECHO_T}no" >&6
 
        test -n "$verbose" && echo "    CC_SHARED_OPTS: $CC_SHARED_OPTS" 1>&6
 
 
        test -n "$verbose" && echo "    CC_SHARED_OPTS: $CC_SHARED_OPTS" 1>&6
 

-echo "${as_me:-configure}:11932: testing CC_SHARED_OPTS: $CC_SHARED_OPTS ..." 1>&5
+echo "${as_me:-configure}:11985: testing CC_SHARED_OPTS: $CC_SHARED_OPTS ..." 1>&5

 
        test -n "$verbose" && echo "    MK_SHARED_LIB:  $MK_SHARED_LIB" 1>&6
 
 
        test -n "$verbose" && echo "    MK_SHARED_LIB:  $MK_SHARED_LIB" 1>&6
 

-echo "${as_me:-configure}:11936: testing MK_SHARED_LIB:  $MK_SHARED_LIB ..." 1>&5
+echo "${as_me:-configure}:11989: 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
 
 # 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:11942: checking if you want to link sample programs with rpath option" >&5
+       echo "$as_me:11995: 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.
 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.


@@ -11949,7 +12002,7 @@ if test "${enable_rpath_link+set}" = set; then
 else
   with_rpath_link=yes
 fi;
 else
   with_rpath_link=yes
 fi;

-       echo "$as_me:11952: result: $with_rpath_link" >&5
+       echo "$as_me:12005: result: $with_rpath_link" >&5

 echo "${ECHO_T}$with_rpath_link" >&6
        if test "$with_rpath_link" = no
        then
 echo "${ECHO_T}$with_rpath_link" >&6
        if test "$with_rpath_link" = no
        then


@@ -11962,7 +12015,7 @@ fi
 
 ###   use option --enable-broken-linker to force on use of broken-linker support
 
 
 ###   use option --enable-broken-linker to force on use of broken-linker support
 

-echo "$as_me:11965: checking if you want broken-linker support code" >&5
+echo "$as_me:12018: 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.
 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.


@@ -11972,7 +12025,7 @@ if test "${enable_broken_linker+set}" = set; then
 else
   with_broken_linker=no
 fi;
 else
   with_broken_linker=no
 fi;

-echo "$as_me:11975: result: $with_broken_linker" >&5
+echo "$as_me:12028: result: $with_broken_linker" >&5

 echo "${ECHO_T}$with_broken_linker" >&6
 
 : "${BROKEN_LINKER:=0}"
 echo "${ECHO_T}$with_broken_linker" >&6
 
 : "${BROKEN_LINKER:=0}"


@@ -11987,14 +12040,14 @@ fi
 
 # Check to define _XOPEN_SOURCE "automatically"
 
 
 # Check to define _XOPEN_SOURCE "automatically"
 

-echo "$as_me:11990: checking if the POSIX test-macros are already defined" >&5
+echo "$as_me:12043: checking if the POSIX test-macros are already defined" >&5

 echo $ECHO_N "checking if the POSIX test-macros are already defined... $ECHO_C" >&6
 if test "${cf_cv_posix_visible+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 cat >"conftest.$ac_ext" <<_ACEOF
 echo $ECHO_N "checking if the POSIX test-macros are already defined... $ECHO_C" >&6
 if test "${cf_cv_posix_visible+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 cat >"conftest.$ac_ext" <<_ACEOF

-#line 11997 "configure"
+#line 12050 "configure"

 #include "confdefs.h"
 #include <stdio.h>
 int
 #include "confdefs.h"
 #include <stdio.h>
 int


@@ -12013,16 +12066,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
 }
 _ACEOF
 rm -f "conftest.$ac_objext"

-if { (eval echo "$as_me:12016: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:12069: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:12019: \$? = $ac_status" >&5
+  echo "$as_me:12072: \$? = $ac_status" >&5

   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'

-  { (eval echo "$as_me:12022: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12075: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:12025: \$? = $ac_status" >&5
+  echo "$as_me:12078: \$? = $ac_status" >&5

   (exit "$ac_status"); }; }; then
   cf_cv_posix_visible=no
 else
   (exit "$ac_status"); }; }; then
   cf_cv_posix_visible=no
 else


@@ -12033,7 +12086,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi

-echo "$as_me:12036: result: $cf_cv_posix_visible" >&5
+echo "$as_me:12089: result: $cf_cv_posix_visible" >&5

 echo "${ECHO_T}$cf_cv_posix_visible" >&6
 
 if test "$cf_cv_posix_visible" = no; then
 echo "${ECHO_T}$cf_cv_posix_visible" >&6
 
 if test "$cf_cv_posix_visible" = no; then


@@ -12078,14 +12131,14 @@ case "$host_os" in
 
 cf_gnu_xopen_source=$cf_XOPEN_SOURCE
 
 
 cf_gnu_xopen_source=$cf_XOPEN_SOURCE
 

-echo "$as_me:12081: checking if this is the GNU C library" >&5
+echo "$as_me:12134: checking if this is the GNU C library" >&5

 echo $ECHO_N "checking if this is the GNU C library... $ECHO_C" >&6
 if test "${cf_cv_gnu_library+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 cat >"conftest.$ac_ext" <<_ACEOF
 echo $ECHO_N "checking if this is the GNU C library... $ECHO_C" >&6
 if test "${cf_cv_gnu_library+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 cat >"conftest.$ac_ext" <<_ACEOF

-#line 12088 "configure"
+#line 12141 "configure"

 #include "confdefs.h"
 #include <sys/types.h>
 int
 #include "confdefs.h"
 #include <sys/types.h>
 int


@@ -12104,16 +12157,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
 }
 _ACEOF
 rm -f "conftest.$ac_objext"

-if { (eval echo "$as_me:12107: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:12160: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:12110: \$? = $ac_status" >&5
+  echo "$as_me:12163: \$? = $ac_status" >&5

   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'

-  { (eval echo "$as_me:12113: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12166: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:12116: \$? = $ac_status" >&5
+  echo "$as_me:12169: \$? = $ac_status" >&5

   (exit "$ac_status"); }; }; then
   cf_cv_gnu_library=yes
 else
   (exit "$ac_status"); }; }; then
   cf_cv_gnu_library=yes
 else


@@ -12124,7 +12177,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi

-echo "$as_me:12127: result: $cf_cv_gnu_library" >&5
+echo "$as_me:12180: result: $cf_cv_gnu_library" >&5

 echo "${ECHO_T}$cf_cv_gnu_library" >&6
 
 if test x$cf_cv_gnu_library = xyes; then
 echo "${ECHO_T}$cf_cv_gnu_library" >&6
 
 if test x$cf_cv_gnu_library = xyes; then


@@ -12132,7 +12185,7 @@ if test x$cf_cv_gnu_library = xyes; then
        # With glibc 2.19 (13 years after this check was begun), _DEFAULT_SOURCE
        # was changed to help a little.  newlib incorporated the change about 4
        # years later.
        # With glibc 2.19 (13 years after this check was begun), _DEFAULT_SOURCE
        # was changed to help a little.  newlib incorporated the change about 4
        # years later.

-       echo "$as_me:12135: checking if _DEFAULT_SOURCE can be used as a basis" >&5
+       echo "$as_me:12188: checking if _DEFAULT_SOURCE can be used as a basis" >&5

 echo $ECHO_N "checking if _DEFAULT_SOURCE can be used as a basis... $ECHO_C" >&6
 if test "${cf_cv_gnu_library_219+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 echo $ECHO_N "checking if _DEFAULT_SOURCE can be used as a basis... $ECHO_C" >&6
 if test "${cf_cv_gnu_library_219+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6


@@ -12144,7 +12197,7 @@ else
        CPPFLAGS="${CPPFLAGS}-D_DEFAULT_SOURCE"
 
                cat >"conftest.$ac_ext" <<_ACEOF
        CPPFLAGS="${CPPFLAGS}-D_DEFAULT_SOURCE"
 
                cat >"conftest.$ac_ext" <<_ACEOF

-#line 12147 "configure"
+#line 12200 "configure"

 #include "confdefs.h"
 #include <sys/types.h>
 int
 #include "confdefs.h"
 #include <sys/types.h>
 int


@@ -12163,16 +12216,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
 }
 _ACEOF
 rm -f "conftest.$ac_objext"

-if { (eval echo "$as_me:12166: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:12219: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:12169: \$? = $ac_status" >&5
+  echo "$as_me:12222: \$? = $ac_status" >&5

   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'

-  { (eval echo "$as_me:12172: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12225: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:12175: \$? = $ac_status" >&5
+  echo "$as_me:12228: \$? = $ac_status" >&5

   (exit "$ac_status"); }; }; then
   cf_cv_gnu_library_219=yes
 else
   (exit "$ac_status"); }; }; then
   cf_cv_gnu_library_219=yes
 else


@@ -12184,12 +12237,12 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
                CPPFLAGS="$cf_save"
 
 fi
                CPPFLAGS="$cf_save"
 
 fi

-echo "$as_me:12187: result: $cf_cv_gnu_library_219" >&5
+echo "$as_me:12240: result: $cf_cv_gnu_library_219" >&5

 echo "${ECHO_T}$cf_cv_gnu_library_219" >&6
 
        if test "x$cf_cv_gnu_library_219" = xyes; then
                cf_save="$CPPFLAGS"
 echo "${ECHO_T}$cf_cv_gnu_library_219" >&6
 
        if test "x$cf_cv_gnu_library_219" = xyes; then
                cf_save="$CPPFLAGS"

-               echo "$as_me:12192: checking if _XOPEN_SOURCE=$cf_gnu_xopen_source works with _DEFAULT_SOURCE" >&5
+               echo "$as_me:12245: checking if _XOPEN_SOURCE=$cf_gnu_xopen_source works with _DEFAULT_SOURCE" >&5

 echo $ECHO_N "checking if _XOPEN_SOURCE=$cf_gnu_xopen_source works with _DEFAULT_SOURCE... $ECHO_C" >&6
 if test "${cf_cv_gnu_dftsrc_219+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 echo $ECHO_N "checking if _XOPEN_SOURCE=$cf_gnu_xopen_source works with _DEFAULT_SOURCE... $ECHO_C" >&6
 if test "${cf_cv_gnu_dftsrc_219+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6


@@ -12294,7 +12347,7 @@ if test -n "$cf_new_extra_cppflags" ; then
 fi
 
                        cat >"conftest.$ac_ext" <<_ACEOF
 fi
 
                        cat >"conftest.$ac_ext" <<_ACEOF

-#line 12297 "configure"
+#line 12350 "configure"

 #include "confdefs.h"
 
                                #include <limits.h>
 #include "confdefs.h"
 
                                #include <limits.h>


@@ -12314,16 +12367,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
 }
 _ACEOF
 rm -f "conftest.$ac_objext"

-if { (eval echo "$as_me:12317: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:12370: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:12320: \$? = $ac_status" >&5
+  echo "$as_me:12373: \$? = $ac_status" >&5

   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'

-  { (eval echo "$as_me:12323: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12376: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:12326: \$? = $ac_status" >&5
+  echo "$as_me:12379: \$? = $ac_status" >&5

   (exit "$ac_status"); }; }; then
   cf_cv_gnu_dftsrc_219=yes
 else
   (exit "$ac_status"); }; }; then
   cf_cv_gnu_dftsrc_219=yes
 else


@@ -12334,7 +12387,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi

-echo "$as_me:12337: result: $cf_cv_gnu_dftsrc_219" >&5
+echo "$as_me:12390: result: $cf_cv_gnu_dftsrc_219" >&5

 echo "${ECHO_T}$cf_cv_gnu_dftsrc_219" >&6
                test "x$cf_cv_gnu_dftsrc_219" = "xyes" || CPPFLAGS="$cf_save"
        else
 echo "${ECHO_T}$cf_cv_gnu_dftsrc_219" >&6
                test "x$cf_cv_gnu_dftsrc_219" = "xyes" || CPPFLAGS="$cf_save"
        else


@@ -12343,14 +12396,14 @@ echo "${ECHO_T}$cf_cv_gnu_dftsrc_219" >&6
 
        if test "x$cf_cv_gnu_dftsrc_219" != xyes; then
 
 
        if test "x$cf_cv_gnu_dftsrc_219" != xyes; then
 

-               echo "$as_me:12346: checking if we must define _GNU_SOURCE" >&5
+               echo "$as_me:12399: 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
 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 12353 "configure"
+#line 12406 "configure"

 #include "confdefs.h"
 #include <sys/types.h>
 int
 #include "confdefs.h"
 #include <sys/types.h>
 int


@@ -12365,16 +12418,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
 }
 _ACEOF
 rm -f "conftest.$ac_objext"

-if { (eval echo "$as_me:12368: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:12421: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:12371: \$? = $ac_status" >&5
+  echo "$as_me:12424: \$? = $ac_status" >&5

   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'

-  { (eval echo "$as_me:12374: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12427: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:12377: \$? = $ac_status" >&5
+  echo "$as_me:12430: \$? = $ac_status" >&5

   (exit "$ac_status"); }; }; then
   cf_cv_gnu_source=no
 else
   (exit "$ac_status"); }; }; then
   cf_cv_gnu_source=no
 else


@@ -12481,7 +12534,7 @@ if test -n "$cf_new_extra_cppflags" ; then
 fi
 
                         cat >"conftest.$ac_ext" <<_ACEOF
 fi
 
                         cat >"conftest.$ac_ext" <<_ACEOF

-#line 12484 "configure"
+#line 12537 "configure"

 #include "confdefs.h"
 #include <sys/types.h>
 int
 #include "confdefs.h"
 #include <sys/types.h>
 int


@@ -12496,16 +12549,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
 }
 _ACEOF
 rm -f "conftest.$ac_objext"

-if { (eval echo "$as_me:12499: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:12552: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:12502: \$? = $ac_status" >&5
+  echo "$as_me:12555: \$? = $ac_status" >&5

   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'

-  { (eval echo "$as_me:12505: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12558: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:12508: \$? = $ac_status" >&5
+  echo "$as_me:12561: \$? = $ac_status" >&5

   (exit "$ac_status"); }; }; then
   cf_cv_gnu_source=no
 else
   (exit "$ac_status"); }; }; then
   cf_cv_gnu_source=no
 else


@@ -12520,12 +12573,12 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi

-echo "$as_me:12523: result: $cf_cv_gnu_source" >&5
+echo "$as_me:12576: result: $cf_cv_gnu_source" >&5

 echo "${ECHO_T}$cf_cv_gnu_source" >&6
 
                if test "$cf_cv_gnu_source" = yes
                then
 echo "${ECHO_T}$cf_cv_gnu_source" >&6
 
                if test "$cf_cv_gnu_source" = yes
                then

-               echo "$as_me:12528: checking if we should also define _DEFAULT_SOURCE" >&5
+               echo "$as_me:12581: checking if we should also define _DEFAULT_SOURCE" >&5

 echo $ECHO_N "checking if we should also define _DEFAULT_SOURCE... $ECHO_C" >&6
 if test "${cf_cv_default_source+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 echo $ECHO_N "checking if we should also define _DEFAULT_SOURCE... $ECHO_C" >&6
 if test "${cf_cv_default_source+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6


@@ -12535,7 +12588,7 @@ else
        CPPFLAGS="${CPPFLAGS}-D_GNU_SOURCE"
 
                        cat >"conftest.$ac_ext" <<_ACEOF
        CPPFLAGS="${CPPFLAGS}-D_GNU_SOURCE"
 
                        cat >"conftest.$ac_ext" <<_ACEOF

-#line 12538 "configure"
+#line 12591 "configure"

 #include "confdefs.h"
 #include <sys/types.h>
 int
 #include "confdefs.h"
 #include <sys/types.h>
 int


@@ -12550,16 +12603,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
 }
 _ACEOF
 rm -f "conftest.$ac_objext"

-if { (eval echo "$as_me:12553: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:12606: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:12556: \$? = $ac_status" >&5
+  echo "$as_me:12609: \$? = $ac_status" >&5

   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'

-  { (eval echo "$as_me:12559: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12612: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:12562: \$? = $ac_status" >&5
+  echo "$as_me:12615: \$? = $ac_status" >&5

   (exit "$ac_status"); }; }; then
   cf_cv_default_source=no
 else
   (exit "$ac_status"); }; }; then
   cf_cv_default_source=no
 else


@@ -12570,7 +12623,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi

-echo "$as_me:12573: result: $cf_cv_default_source" >&5
+echo "$as_me:12626: result: $cf_cv_default_source" >&5

 echo "${ECHO_T}$cf_cv_default_source" >&6
                        if test "$cf_cv_default_source" = yes
                        then
 echo "${ECHO_T}$cf_cv_default_source" >&6
                        if test "$cf_cv_default_source" = yes
                        then


@@ -12607,16 +12660,16 @@ cf_trim_CPPFLAGS=`echo "$cf_save_CPPFLAGS" | \
        sed     -e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^     ]*\)\?[         ]/ /g' \
                -e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^     ]*\)\?$//g'`
 
        sed     -e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^     ]*\)\?[         ]/ /g' \
                -e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^     ]*\)\?$//g'`
 

-echo "$as_me:12610: checking if we should define _POSIX_C_SOURCE" >&5
+echo "$as_me:12663: 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 $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}:12616: testing if the symbol is already defined go no further ..." 1>&5
+echo "${as_me:-configure}:12669: testing if the symbol is already defined go no further ..." 1>&5

 
        cat >"conftest.$ac_ext" <<_ACEOF
 
        cat >"conftest.$ac_ext" <<_ACEOF

-#line 12619 "configure"
+#line 12672 "configure"

 #include "confdefs.h"
 #include <sys/types.h>
 int
 #include "confdefs.h"
 #include <sys/types.h>
 int


@@ -12631,16 +12684,16 @@ make an error
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
 }
 _ACEOF
 rm -f "conftest.$ac_objext"

-if { (eval echo "$as_me:12634: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:12687: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:12637: \$? = $ac_status" >&5
+  echo "$as_me:12690: \$? = $ac_status" >&5

   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'

-  { (eval echo "$as_me:12640: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12693: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:12643: \$? = $ac_status" >&5
+  echo "$as_me:12696: \$? = $ac_status" >&5

   (exit "$ac_status"); }; }; then
   cf_cv_posix_c_source=no
 else
   (exit "$ac_status"); }; }; then
   cf_cv_posix_c_source=no
 else


@@ -12661,7 +12714,7 @@ cf_want_posix_source=no
         esac
         if test "$cf_want_posix_source" = yes ; then
                cat >"conftest.$ac_ext" <<_ACEOF
         esac
         if test "$cf_want_posix_source" = yes ; then
                cat >"conftest.$ac_ext" <<_ACEOF

-#line 12664 "configure"
+#line 12717 "configure"

 #include "confdefs.h"
 #include <sys/types.h>
 int
 #include "confdefs.h"
 #include <sys/types.h>
 int


@@ -12676,16 +12729,16 @@ make an error
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
 }
 _ACEOF
 rm -f "conftest.$ac_objext"

-if { (eval echo "$as_me:12679: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:12732: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:12682: \$? = $ac_status" >&5
+  echo "$as_me:12735: \$? = $ac_status" >&5

   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'

-  { (eval echo "$as_me:12685: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12738: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:12688: \$? = $ac_status" >&5
+  echo "$as_me:12741: \$? = $ac_status" >&5

   (exit "$ac_status"); }; }; then
   :
 else
   (exit "$ac_status"); }; }; then
   :
 else


@@ -12696,7 +12749,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
         fi
 
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
         fi
 

-echo "${as_me:-configure}:12699: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
+echo "${as_me:-configure}:12752: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5

 
         CFLAGS="$cf_trim_CFLAGS"
         CPPFLAGS="$cf_trim_CPPFLAGS"
 
         CFLAGS="$cf_trim_CFLAGS"
         CPPFLAGS="$cf_trim_CPPFLAGS"


@@ -12704,10 +12757,10 @@ echo "${as_me:-configure}:12699: testing ifdef from value $cf_POSIX_C_SOURCE ...
        test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
        CPPFLAGS="${CPPFLAGS}$cf_cv_posix_c_source"
 
        test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
        CPPFLAGS="${CPPFLAGS}$cf_cv_posix_c_source"
 

-echo "${as_me:-configure}:12707: testing if the second compile does not leave our definition intact error ..." 1>&5
+echo "${as_me:-configure}:12760: testing if the second compile does not leave our definition intact error ..." 1>&5

 
         cat >"conftest.$ac_ext" <<_ACEOF
 
         cat >"conftest.$ac_ext" <<_ACEOF

-#line 12710 "configure"
+#line 12763 "configure"

 #include "confdefs.h"
 #include <sys/types.h>
 int
 #include "confdefs.h"
 #include <sys/types.h>
 int


@@ -12722,16 +12775,16 @@ make an error
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
 }
 _ACEOF
 rm -f "conftest.$ac_objext"

-if { (eval echo "$as_me:12725: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:12778: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:12728: \$? = $ac_status" >&5
+  echo "$as_me:12781: \$? = $ac_status" >&5

   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'

-  { (eval echo "$as_me:12731: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12784: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:12734: \$? = $ac_status" >&5
+  echo "$as_me:12787: \$? = $ac_status" >&5

   (exit "$ac_status"); }; }; then
   :
 else
   (exit "$ac_status"); }; }; then
   :
 else


@@ -12747,7 +12800,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi

-echo "$as_me:12750: result: $cf_cv_posix_c_source" >&5
+echo "$as_me:12803: 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
 echo "${ECHO_T}$cf_cv_posix_c_source" >&6
 
 if test "$cf_cv_posix_c_source" != no ; then


@@ -12860,7 +12913,16 @@ fi # cf_cv_posix_visible
 (netbsd*)
        cf_xopen_source="-D_NETBSD_SOURCE" # setting _XOPEN_SOURCE breaks IPv6 for lynx on NetBSD 1.6, breaks xterm, is not needed for ncursesw
        ;;
 (netbsd*)
        cf_xopen_source="-D_NETBSD_SOURCE" # setting _XOPEN_SOURCE breaks IPv6 for lynx on NetBSD 1.6, breaks xterm, is not needed for ncursesw
        ;;

-(openbsd[4-9]*)
+(openbsd[6-9]*)
+       # OpenBSD 6.x has broken locale support, both compile-time and runtime.
+       # see https://www.mail-archive.com/bugs@openbsd.org/msg13200.html
+       # Abusing the conformance level is a workaround.
+       { echo "$as_me:12920: WARNING: this system does not provide usable locale support" >&5
+echo "$as_me: WARNING: this system does not provide usable locale support" >&2;}
+       cf_xopen_source="-D_BSD_SOURCE"
+       cf_XOPEN_SOURCE=700
+       ;;
+(openbsd[4-5]*)

        # setting _XOPEN_SOURCE lower than 500 breaks g++ compile with wchar.h, needed for ncursesw
        cf_xopen_source="-D_BSD_SOURCE"
        cf_XOPEN_SOURCE=600
        # setting _XOPEN_SOURCE lower than 500 breaks g++ compile with wchar.h, needed for ncursesw
        cf_xopen_source="-D_BSD_SOURCE"
        cf_XOPEN_SOURCE=600


@@ -12887,14 +12949,14 @@ fi # cf_cv_posix_visible
        ;;
 (*)
 
        ;;
 (*)
 

-echo "$as_me:12890: checking if we should define _XOPEN_SOURCE" >&5
+echo "$as_me:12952: 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
 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 12897 "configure"
+#line 12959 "configure"

 #include "confdefs.h"
 
 #include <stdlib.h>
 #include "confdefs.h"
 
 #include <stdlib.h>


@@ -12913,16 +12975,16 @@ make an error
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
 }
 _ACEOF
 rm -f "conftest.$ac_objext"

-if { (eval echo "$as_me:12916: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:12978: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:12919: \$? = $ac_status" >&5
+  echo "$as_me:12981: \$? = $ac_status" >&5

   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'

-  { (eval echo "$as_me:12922: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12984: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:12925: \$? = $ac_status" >&5
+  echo "$as_me:12987: \$? = $ac_status" >&5

   (exit "$ac_status"); }; }; then
   cf_cv_xopen_source=no
 else
   (exit "$ac_status"); }; }; then
   cf_cv_xopen_source=no
 else


@@ -12934,7 +12996,7 @@ cf_save="$CPPFLAGS"
        CPPFLAGS="${CPPFLAGS}-D_XOPEN_SOURCE=$cf_XOPEN_SOURCE"
 
         cat >"conftest.$ac_ext" <<_ACEOF
        CPPFLAGS="${CPPFLAGS}-D_XOPEN_SOURCE=$cf_XOPEN_SOURCE"
 
         cat >"conftest.$ac_ext" <<_ACEOF

-#line 12937 "configure"
+#line 12999 "configure"

 #include "confdefs.h"
 
 #include <stdlib.h>
 #include "confdefs.h"
 
 #include <stdlib.h>


@@ -12953,16 +13015,16 @@ make an error
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
 }
 _ACEOF
 rm -f "conftest.$ac_objext"

-if { (eval echo "$as_me:12956: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:13018: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:12959: \$? = $ac_status" >&5
+  echo "$as_me:13021: \$? = $ac_status" >&5

   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'

-  { (eval echo "$as_me:12962: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13024: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:12965: \$? = $ac_status" >&5
+  echo "$as_me:13027: \$? = $ac_status" >&5

   (exit "$ac_status"); }; }; then
   cf_cv_xopen_source=no
 else
   (exit "$ac_status"); }; }; then
   cf_cv_xopen_source=no
 else


@@ -12977,7 +13039,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi

-echo "$as_me:12980: result: $cf_cv_xopen_source" >&5
+echo "$as_me:13042: result: $cf_cv_xopen_source" >&5

 echo "${ECHO_T}$cf_cv_xopen_source" >&6
 
 if test "$cf_cv_xopen_source" != no ; then
 echo "${ECHO_T}$cf_cv_xopen_source" >&6
 
 if test "$cf_cv_xopen_source" != no ; then


@@ -13107,16 +13169,16 @@ cf_trim_CPPFLAGS=`echo "$cf_save_CPPFLAGS" | \
        sed     -e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^     ]*\)\?[         ]/ /g' \
                -e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^     ]*\)\?$//g'`
 
        sed     -e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^     ]*\)\?[         ]/ /g' \
                -e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^     ]*\)\?$//g'`
 

-echo "$as_me:13110: checking if we should define _POSIX_C_SOURCE" >&5
+echo "$as_me:13172: 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 $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}:13116: testing if the symbol is already defined go no further ..." 1>&5
+echo "${as_me:-configure}:13178: testing if the symbol is already defined go no further ..." 1>&5

 
        cat >"conftest.$ac_ext" <<_ACEOF
 
        cat >"conftest.$ac_ext" <<_ACEOF

-#line 13119 "configure"
+#line 13181 "configure"

 #include "confdefs.h"
 #include <sys/types.h>
 int
 #include "confdefs.h"
 #include <sys/types.h>
 int


@@ -13131,16 +13193,16 @@ make an error
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
 }
 _ACEOF
 rm -f "conftest.$ac_objext"

-if { (eval echo "$as_me:13134: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:13196: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:13137: \$? = $ac_status" >&5
+  echo "$as_me:13199: \$? = $ac_status" >&5

   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'

-  { (eval echo "$as_me:13140: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13202: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:13143: \$? = $ac_status" >&5
+  echo "$as_me:13205: \$? = $ac_status" >&5

   (exit "$ac_status"); }; }; then
   cf_cv_posix_c_source=no
 else
   (exit "$ac_status"); }; }; then
   cf_cv_posix_c_source=no
 else


@@ -13161,7 +13223,7 @@ cf_want_posix_source=no
         esac
         if test "$cf_want_posix_source" = yes ; then
                cat >"conftest.$ac_ext" <<_ACEOF
         esac
         if test "$cf_want_posix_source" = yes ; then
                cat >"conftest.$ac_ext" <<_ACEOF

-#line 13164 "configure"
+#line 13226 "configure"

 #include "confdefs.h"
 #include <sys/types.h>
 int
 #include "confdefs.h"
 #include <sys/types.h>
 int


@@ -13176,16 +13238,16 @@ make an error
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
 }
 _ACEOF
 rm -f "conftest.$ac_objext"

-if { (eval echo "$as_me:13179: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:13241: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:13182: \$? = $ac_status" >&5
+  echo "$as_me:13244: \$? = $ac_status" >&5

   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'

-  { (eval echo "$as_me:13185: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13247: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:13188: \$? = $ac_status" >&5
+  echo "$as_me:13250: \$? = $ac_status" >&5

   (exit "$ac_status"); }; }; then
   :
 else
   (exit "$ac_status"); }; }; then
   :
 else


@@ -13196,7 +13258,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
         fi
 
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
         fi
 

-echo "${as_me:-configure}:13199: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
+echo "${as_me:-configure}:13261: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5

 
         CFLAGS="$cf_trim_CFLAGS"
         CPPFLAGS="$cf_trim_CPPFLAGS"
 
         CFLAGS="$cf_trim_CFLAGS"
         CPPFLAGS="$cf_trim_CPPFLAGS"


@@ -13204,10 +13266,10 @@ echo "${as_me:-configure}:13199: testing ifdef from value $cf_POSIX_C_SOURCE ...
        test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
        CPPFLAGS="${CPPFLAGS}$cf_cv_posix_c_source"
 
        test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
        CPPFLAGS="${CPPFLAGS}$cf_cv_posix_c_source"
 

-echo "${as_me:-configure}:13207: testing if the second compile does not leave our definition intact error ..." 1>&5
+echo "${as_me:-configure}:13269: testing if the second compile does not leave our definition intact error ..." 1>&5

 
         cat >"conftest.$ac_ext" <<_ACEOF
 
         cat >"conftest.$ac_ext" <<_ACEOF

-#line 13210 "configure"
+#line 13272 "configure"

 #include "confdefs.h"
 #include <sys/types.h>
 int
 #include "confdefs.h"
 #include <sys/types.h>
 int


@@ -13222,16 +13284,16 @@ make an error
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
 }
 _ACEOF
 rm -f "conftest.$ac_objext"

-if { (eval echo "$as_me:13225: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:13287: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:13228: \$? = $ac_status" >&5
+  echo "$as_me:13290: \$? = $ac_status" >&5

   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'

-  { (eval echo "$as_me:13231: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13293: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:13234: \$? = $ac_status" >&5
+  echo "$as_me:13296: \$? = $ac_status" >&5

   (exit "$ac_status"); }; }; then
   :
 else
   (exit "$ac_status"); }; }; then
   :
 else


@@ -13247,7 +13309,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi

-echo "$as_me:13250: result: $cf_cv_posix_c_source" >&5
+echo "$as_me:13312: 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
 echo "${ECHO_T}$cf_cv_posix_c_source" >&6
 
 if test "$cf_cv_posix_c_source" != no ; then


@@ -13441,7 +13503,7 @@ done
 if test -n "$cf_new_cflags" ; then
        test -n "$verbose" && echo "    add to \$CFLAGS $cf_new_cflags" 1>&6
 
 if test -n "$cf_new_cflags" ; then
        test -n "$verbose" && echo "    add to \$CFLAGS $cf_new_cflags" 1>&6
 

-echo "${as_me:-configure}:13444: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
+echo "${as_me:-configure}:13506: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5

 
        test -n "$CFLAGS" && CFLAGS="$CFLAGS "
        CFLAGS="${CFLAGS}$cf_new_cflags"
 
        test -n "$CFLAGS" && CFLAGS="$CFLAGS "
        CFLAGS="${CFLAGS}$cf_new_cflags"


@@ -13451,7 +13513,7 @@ fi
 if test -n "$cf_new_cppflags" ; then
        test -n "$verbose" && echo "    add to \$CPPFLAGS $cf_new_cppflags" 1>&6
 
 if test -n "$cf_new_cppflags" ; then
        test -n "$verbose" && echo "    add to \$CPPFLAGS $cf_new_cppflags" 1>&6
 

-echo "${as_me:-configure}:13454: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
+echo "${as_me:-configure}:13516: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5

 
        test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
        CPPFLAGS="${CPPFLAGS}$cf_new_cppflags"
 
        test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
        CPPFLAGS="${CPPFLAGS}$cf_new_cppflags"


@@ -13461,7 +13523,7 @@ fi
 if test -n "$cf_new_extra_cppflags" ; then
        test -n "$verbose" && echo "    add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags" 1>&6
 
 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}:13464: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5
+echo "${as_me:-configure}:13526: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5

 
        test -n "$EXTRA_CPPFLAGS" && EXTRA_CPPFLAGS="$EXTRA_CPPFLAGS "
        EXTRA_CPPFLAGS="${EXTRA_CPPFLAGS}$cf_new_extra_cppflags"
 
        test -n "$EXTRA_CPPFLAGS" && EXTRA_CPPFLAGS="$EXTRA_CPPFLAGS "
        EXTRA_CPPFLAGS="${EXTRA_CPPFLAGS}$cf_new_extra_cppflags"


@@ -13471,10 +13533,10 @@ fi
 fi
 
 if test -n "$cf_XOPEN_SOURCE" && test -z "$cf_cv_xopen_source" ; then
 fi
 
 if test -n "$cf_XOPEN_SOURCE" && test -z "$cf_cv_xopen_source" ; then

-       echo "$as_me:13474: checking if _XOPEN_SOURCE really is set" >&5
+       echo "$as_me:13536: 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
 echo $ECHO_N "checking if _XOPEN_SOURCE really is set... $ECHO_C" >&6
        cat >"conftest.$ac_ext" <<_ACEOF

-#line 13477 "configure"
+#line 13539 "configure"

 #include "confdefs.h"
 #include <stdlib.h>
 int
 #include "confdefs.h"
 #include <stdlib.h>
 int


@@ -13489,16 +13551,16 @@ make an error
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
 }
 _ACEOF
 rm -f "conftest.$ac_objext"

-if { (eval echo "$as_me:13492: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:13554: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:13495: \$? = $ac_status" >&5
+  echo "$as_me:13557: \$? = $ac_status" >&5

   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'

-  { (eval echo "$as_me:13498: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13560: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:13501: \$? = $ac_status" >&5
+  echo "$as_me:13563: \$? = $ac_status" >&5

   (exit "$ac_status"); }; }; then
   cf_XOPEN_SOURCE_set=yes
 else
   (exit "$ac_status"); }; }; then
   cf_XOPEN_SOURCE_set=yes
 else


@@ -13507,12 +13569,12 @@ cat "conftest.$ac_ext" >&5
 cf_XOPEN_SOURCE_set=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 cf_XOPEN_SOURCE_set=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"

-       echo "$as_me:13510: result: $cf_XOPEN_SOURCE_set" >&5
+       echo "$as_me:13572: 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
 echo "${ECHO_T}$cf_XOPEN_SOURCE_set" >&6
        if test "$cf_XOPEN_SOURCE_set" = yes
        then
                cat >"conftest.$ac_ext" <<_ACEOF

-#line 13515 "configure"
+#line 13577 "configure"

 #include "confdefs.h"
 #include <stdlib.h>
 int
 #include "confdefs.h"
 #include <stdlib.h>
 int


@@ -13527,16 +13589,16 @@ make an error
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
 }
 _ACEOF
 rm -f "conftest.$ac_objext"

-if { (eval echo "$as_me:13530: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:13592: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:13533: \$? = $ac_status" >&5
+  echo "$as_me:13595: \$? = $ac_status" >&5

   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'

-  { (eval echo "$as_me:13536: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13598: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:13539: \$? = $ac_status" >&5
+  echo "$as_me:13601: \$? = $ac_status" >&5

   (exit "$ac_status"); }; }; then
   cf_XOPEN_SOURCE_set_ok=yes
 else
   (exit "$ac_status"); }; }; then
   cf_XOPEN_SOURCE_set_ok=yes
 else


@@ -13547,19 +13609,19 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
                if test "$cf_XOPEN_SOURCE_set_ok" = no
                then
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
                if test "$cf_XOPEN_SOURCE_set_ok" = no
                then

-                       { echo "$as_me:13550: WARNING: _XOPEN_SOURCE is lower than requested" >&5
+                       { echo "$as_me:13612: WARNING: _XOPEN_SOURCE is lower than requested" >&5

 echo "$as_me: WARNING: _XOPEN_SOURCE is lower than requested" >&2;}
                fi
        else
 
 echo "$as_me: WARNING: _XOPEN_SOURCE is lower than requested" >&2;}
                fi
        else
 

-echo "$as_me:13555: checking if we should define _XOPEN_SOURCE" >&5
+echo "$as_me:13617: 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
 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 13562 "configure"
+#line 13624 "configure"

 #include "confdefs.h"
 
 #include <stdlib.h>
 #include "confdefs.h"
 
 #include <stdlib.h>


@@ -13578,16 +13640,16 @@ make an error
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
 }
 _ACEOF
 rm -f "conftest.$ac_objext"

-if { (eval echo "$as_me:13581: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:13643: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:13584: \$? = $ac_status" >&5
+  echo "$as_me:13646: \$? = $ac_status" >&5

   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'

-  { (eval echo "$as_me:13587: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13649: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:13590: \$? = $ac_status" >&5
+  echo "$as_me:13652: \$? = $ac_status" >&5

   (exit "$ac_status"); }; }; then
   cf_cv_xopen_source=no
 else
   (exit "$ac_status"); }; }; then
   cf_cv_xopen_source=no
 else


@@ -13599,7 +13661,7 @@ cf_save="$CPPFLAGS"
        CPPFLAGS="${CPPFLAGS}-D_XOPEN_SOURCE=$cf_XOPEN_SOURCE"
 
         cat >"conftest.$ac_ext" <<_ACEOF
        CPPFLAGS="${CPPFLAGS}-D_XOPEN_SOURCE=$cf_XOPEN_SOURCE"
 
         cat >"conftest.$ac_ext" <<_ACEOF

-#line 13602 "configure"
+#line 13664 "configure"

 #include "confdefs.h"
 
 #include <stdlib.h>
 #include "confdefs.h"
 
 #include <stdlib.h>


@@ -13618,16 +13680,16 @@ make an error
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
 }
 _ACEOF
 rm -f "conftest.$ac_objext"

-if { (eval echo "$as_me:13621: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:13683: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:13624: \$? = $ac_status" >&5
+  echo "$as_me:13686: \$? = $ac_status" >&5

   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'

-  { (eval echo "$as_me:13627: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13689: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:13630: \$? = $ac_status" >&5
+  echo "$as_me:13692: \$? = $ac_status" >&5

   (exit "$ac_status"); }; }; then
   cf_cv_xopen_source=no
 else
   (exit "$ac_status"); }; }; then
   cf_cv_xopen_source=no
 else


@@ -13642,7 +13704,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi

-echo "$as_me:13645: result: $cf_cv_xopen_source" >&5
+echo "$as_me:13707: result: $cf_cv_xopen_source" >&5

 echo "${ECHO_T}$cf_cv_xopen_source" >&6
 
 if test "$cf_cv_xopen_source" != no ; then
 echo "${ECHO_T}$cf_cv_xopen_source" >&6
 
 if test "$cf_cv_xopen_source" != no ; then


@@ -13768,7 +13830,7 @@ if test "${enable_largefile+set}" = set; then
 fi;
 if test "$enable_largefile" != no; then
 
 fi;
 if test "$enable_largefile" != no; then
 

-  echo "$as_me:13771: checking for special C compiler options needed for large files" >&5
+  echo "$as_me:13833: 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
 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


@@ -13780,7 +13842,7 @@ else
         # 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
         # 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 13783 "configure"
+#line 13845 "configure"

 #include "confdefs.h"
 #include <sys/types.h>
  /* Check that off_t can represent 2**63 - 1 correctly.
 #include "confdefs.h"
 #include <sys/types.h>
  /* Check that off_t can represent 2**63 - 1 correctly.


@@ -13800,16 +13862,16 @@ main (void)
 }
 _ACEOF
         rm -f "conftest.$ac_objext"
 }
 _ACEOF
         rm -f "conftest.$ac_objext"

-if { (eval echo "$as_me:13803: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:13865: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:13806: \$? = $ac_status" >&5
+  echo "$as_me:13868: \$? = $ac_status" >&5

   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'

-  { (eval echo "$as_me:13809: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13871: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:13812: \$? = $ac_status" >&5
+  echo "$as_me:13874: \$? = $ac_status" >&5

   (exit "$ac_status"); }; }; then
   break
 else
   (exit "$ac_status"); }; }; then
   break
 else


@@ -13819,16 +13881,16 @@ fi
 rm -f "conftest.$ac_objext"
         CC="$CC -n32"
         rm -f "conftest.$ac_objext"
 rm -f "conftest.$ac_objext"
         CC="$CC -n32"
         rm -f "conftest.$ac_objext"

-if { (eval echo "$as_me:13822: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:13884: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:13825: \$? = $ac_status" >&5
+  echo "$as_me:13887: \$? = $ac_status" >&5

   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'

-  { (eval echo "$as_me:13828: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13890: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:13831: \$? = $ac_status" >&5
+  echo "$as_me:13893: \$? = $ac_status" >&5

   (exit "$ac_status"); }; }; then
   ac_cv_sys_largefile_CC=' -n32'; break
 else
   (exit "$ac_status"); }; }; then
   ac_cv_sys_largefile_CC=' -n32'; break
 else


@@ -13842,13 +13904,13 @@ rm -f "conftest.$ac_objext"
        rm -f "conftest.$ac_ext"
     fi
 fi
        rm -f "conftest.$ac_ext"
     fi
 fi

-echo "$as_me:13845: result: $ac_cv_sys_largefile_CC" >&5
+echo "$as_me:13907: 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 "${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:13851: checking for _FILE_OFFSET_BITS value needed for large files" >&5
+  echo "$as_me:13913: 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
 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


@@ -13856,7 +13918,7 @@ else
   while :; do
   ac_cv_sys_file_offset_bits=no
   cat >"conftest.$ac_ext" <<_ACEOF
   while :; do
   ac_cv_sys_file_offset_bits=no
   cat >"conftest.$ac_ext" <<_ACEOF

-#line 13859 "configure"
+#line 13921 "configure"

 #include "confdefs.h"
 #include <sys/types.h>
  /* Check that off_t can represent 2**63 - 1 correctly.
 #include "confdefs.h"
 #include <sys/types.h>
  /* Check that off_t can represent 2**63 - 1 correctly.


@@ -13876,16 +13938,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
 }
 _ACEOF
 rm -f "conftest.$ac_objext"

-if { (eval echo "$as_me:13879: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:13941: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:13882: \$? = $ac_status" >&5
+  echo "$as_me:13944: \$? = $ac_status" >&5

   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'

-  { (eval echo "$as_me:13885: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13947: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:13888: \$? = $ac_status" >&5
+  echo "$as_me:13950: \$? = $ac_status" >&5

   (exit "$ac_status"); }; }; then
   break
 else
   (exit "$ac_status"); }; }; then
   break
 else


@@ -13894,7 +13956,7 @@ cat "conftest.$ac_ext" >&5
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
   cat >"conftest.$ac_ext" <<_ACEOF
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
   cat >"conftest.$ac_ext" <<_ACEOF

-#line 13897 "configure"
+#line 13959 "configure"

 #include "confdefs.h"
 #define _FILE_OFFSET_BITS 64
 #include <sys/types.h>
 #include "confdefs.h"
 #define _FILE_OFFSET_BITS 64
 #include <sys/types.h>


@@ -13915,16 +13977,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
 }
 _ACEOF
 rm -f "conftest.$ac_objext"

-if { (eval echo "$as_me:13918: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:13980: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:13921: \$? = $ac_status" >&5
+  echo "$as_me:13983: \$? = $ac_status" >&5

   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'

-  { (eval echo "$as_me:13924: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13986: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:13927: \$? = $ac_status" >&5
+  echo "$as_me:13989: \$? = $ac_status" >&5

   (exit "$ac_status"); }; }; then
   ac_cv_sys_file_offset_bits=64; break
 else
   (exit "$ac_status"); }; }; then
   ac_cv_sys_file_offset_bits=64; break
 else


@@ -13935,7 +13997,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
   break
 done
 fi
   break
 done
 fi

-echo "$as_me:13938: result: $ac_cv_sys_file_offset_bits" >&5
+echo "$as_me:14000: 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
 
 echo "${ECHO_T}$ac_cv_sys_file_offset_bits" >&6
 if test "$ac_cv_sys_file_offset_bits" != no; then
 


@@ -13945,7 +14007,7 @@ EOF
 
 fi
 rm -rf conftest*
 
 fi
 rm -rf conftest*

-  echo "$as_me:13948: checking for _LARGE_FILES value needed for large files" >&5
+  echo "$as_me:14010: 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
 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


@@ -13953,7 +14015,7 @@ else
   while :; do
   ac_cv_sys_large_files=no
   cat >"conftest.$ac_ext" <<_ACEOF
   while :; do
   ac_cv_sys_large_files=no
   cat >"conftest.$ac_ext" <<_ACEOF

-#line 13956 "configure"
+#line 14018 "configure"

 #include "confdefs.h"
 #include <sys/types.h>
  /* Check that off_t can represent 2**63 - 1 correctly.
 #include "confdefs.h"
 #include <sys/types.h>
  /* Check that off_t can represent 2**63 - 1 correctly.


@@ -13973,16 +14035,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
 }
 _ACEOF
 rm -f "conftest.$ac_objext"

-if { (eval echo "$as_me:13976: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:14038: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:13979: \$? = $ac_status" >&5
+  echo "$as_me:14041: \$? = $ac_status" >&5

   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'

-  { (eval echo "$as_me:13982: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14044: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:13985: \$? = $ac_status" >&5
+  echo "$as_me:14047: \$? = $ac_status" >&5

   (exit "$ac_status"); }; }; then
   break
 else
   (exit "$ac_status"); }; }; then
   break
 else


@@ -13991,7 +14053,7 @@ cat "conftest.$ac_ext" >&5
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
   cat >"conftest.$ac_ext" <<_ACEOF
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
   cat >"conftest.$ac_ext" <<_ACEOF

-#line 13994 "configure"
+#line 14056 "configure"

 #include "confdefs.h"
 #define _LARGE_FILES 1
 #include <sys/types.h>
 #include "confdefs.h"
 #define _LARGE_FILES 1
 #include <sys/types.h>


@@ -14012,16 +14074,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
 }
 _ACEOF
 rm -f "conftest.$ac_objext"

-if { (eval echo "$as_me:14015: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:14077: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:14018: \$? = $ac_status" >&5
+  echo "$as_me:14080: \$? = $ac_status" >&5

   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'

-  { (eval echo "$as_me:14021: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14083: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:14024: \$? = $ac_status" >&5
+  echo "$as_me:14086: \$? = $ac_status" >&5

   (exit "$ac_status"); }; }; then
   ac_cv_sys_large_files=1; break
 else
   (exit "$ac_status"); }; }; then
   ac_cv_sys_large_files=1; break
 else


@@ -14032,7 +14094,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
   break
 done
 fi
   break
 done
 fi

-echo "$as_me:14035: result: $ac_cv_sys_large_files" >&5
+echo "$as_me:14097: 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
 
 echo "${ECHO_T}$ac_cv_sys_large_files" >&6
 if test "$ac_cv_sys_large_files" != no; then
 


@@ -14045,7 +14107,7 @@ rm -rf conftest*
 fi
 
        if test "$enable_largefile" != no ; then
 fi
 
        if test "$enable_largefile" != no ; then

-       echo "$as_me:14048: checking for _LARGEFILE_SOURCE value needed for large files" >&5
+       echo "$as_me:14110: 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
 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


@@ -14053,7 +14115,7 @@ else
   while :; do
   ac_cv_sys_largefile_source=no
   cat >"conftest.$ac_ext" <<_ACEOF
   while :; do
   ac_cv_sys_largefile_source=no
   cat >"conftest.$ac_ext" <<_ACEOF

-#line 14056 "configure"
+#line 14118 "configure"

 #include "confdefs.h"
 #include <stdio.h>
 int
 #include "confdefs.h"
 #include <stdio.h>
 int


@@ -14065,16 +14127,16 @@ return !fseeko;
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
 }
 _ACEOF
 rm -f "conftest.$ac_objext"

-if { (eval echo "$as_me:14068: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:14130: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:14071: \$? = $ac_status" >&5
+  echo "$as_me:14133: \$? = $ac_status" >&5

   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'

-  { (eval echo "$as_me:14074: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14136: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:14077: \$? = $ac_status" >&5
+  echo "$as_me:14139: \$? = $ac_status" >&5

   (exit "$ac_status"); }; }; then
   break
 else
   (exit "$ac_status"); }; }; then
   break
 else


@@ -14083,7 +14145,7 @@ cat "conftest.$ac_ext" >&5
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
   cat >"conftest.$ac_ext" <<_ACEOF
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
   cat >"conftest.$ac_ext" <<_ACEOF

-#line 14086 "configure"
+#line 14148 "configure"

 #include "confdefs.h"
 #define _LARGEFILE_SOURCE 1
 #include <stdio.h>
 #include "confdefs.h"
 #define _LARGEFILE_SOURCE 1
 #include <stdio.h>


@@ -14096,16 +14158,16 @@ return !fseeko;
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
 }
 _ACEOF
 rm -f "conftest.$ac_objext"

-if { (eval echo "$as_me:14099: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:14161: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:14102: \$? = $ac_status" >&5
+  echo "$as_me:14164: \$? = $ac_status" >&5

   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'

-  { (eval echo "$as_me:14105: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14167: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:14108: \$? = $ac_status" >&5
+  echo "$as_me:14170: \$? = $ac_status" >&5

   (exit "$ac_status"); }; }; then
   ac_cv_sys_largefile_source=1; break
 else
   (exit "$ac_status"); }; }; then
   ac_cv_sys_largefile_source=1; break
 else


@@ -14116,7 +14178,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
   break
 done
 fi
   break
 done
 fi

-echo "$as_me:14119: result: $ac_cv_sys_largefile_source" >&5
+echo "$as_me:14181: 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
 
 echo "${ECHO_T}$ac_cv_sys_largefile_source" >&6
 if test "$ac_cv_sys_largefile_source" != no; then
 


@@ -14130,13 +14192,13 @@ rm -rf conftest*
 # 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.
 # 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:14133: checking for fseeko" >&5
+echo "$as_me:14195: 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
 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 14139 "configure"
+#line 14201 "configure"

 #include "confdefs.h"
 #include <stdio.h>
 int
 #include "confdefs.h"
 #include <stdio.h>
 int


@@ -14148,16 +14210,16 @@ return fseeko && fseeko (stdin, 0, 0);
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"

-if { (eval echo "$as_me:14151: \"$ac_link\"") >&5
+if { (eval echo "$as_me:14213: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:14154: \$? = $ac_status" >&5
+  echo "$as_me:14216: \$? = $ac_status" >&5

   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'

-  { (eval echo "$as_me:14157: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14219: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:14160: \$? = $ac_status" >&5
+  echo "$as_me:14222: \$? = $ac_status" >&5

   (exit "$ac_status"); }; }; then
   ac_cv_func_fseeko=yes
 else
   (exit "$ac_status"); }; }; then
   ac_cv_func_fseeko=yes
 else


@@ -14167,7 +14229,7 @@ ac_cv_func_fseeko=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi

-echo "$as_me:14170: result: $ac_cv_func_fseeko" >&5
+echo "$as_me:14232: result: $ac_cv_func_fseeko" >&5

 echo "${ECHO_T}$ac_cv_func_fseeko" >&6
 if test $ac_cv_func_fseeko = yes; then
 
 echo "${ECHO_T}$ac_cv_func_fseeko" >&6
 if test $ac_cv_func_fseeko = yes; then
 


@@ -14206,14 +14268,14 @@ fi
 
        fi
 
 
        fi
 

-       echo "$as_me:14209: checking whether to use struct dirent64" >&5
+       echo "$as_me:14271: 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
 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 14216 "configure"
+#line 14278 "configure"

 #include "confdefs.h"
 
 #pragma GCC diagnostic error "-Wincompatible-pointer-types"
 #include "confdefs.h"
 
 #pragma GCC diagnostic error "-Wincompatible-pointer-types"


@@ -14236,16 +14298,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
 }
 _ACEOF
 rm -f "conftest.$ac_objext"

-if { (eval echo "$as_me:14239: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:14301: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:14242: \$? = $ac_status" >&5
+  echo "$as_me:14304: \$? = $ac_status" >&5

   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'

-  { (eval echo "$as_me:14245: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14307: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:14248: \$? = $ac_status" >&5
+  echo "$as_me:14310: \$? = $ac_status" >&5

   (exit "$ac_status"); }; }; then
   cf_cv_struct_dirent64=yes
 else
   (exit "$ac_status"); }; }; then
   cf_cv_struct_dirent64=yes
 else


@@ -14256,7 +14318,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi

-echo "$as_me:14259: result: $cf_cv_struct_dirent64" >&5
+echo "$as_me:14321: result: $cf_cv_struct_dirent64" >&5

 echo "${ECHO_T}$cf_cv_struct_dirent64" >&6
        test "$cf_cv_struct_dirent64" = yes &&
 cat >>confdefs.h <<\EOF
 echo "${ECHO_T}$cf_cv_struct_dirent64" >&6
        test "$cf_cv_struct_dirent64" = yes &&
 cat >>confdefs.h <<\EOF


@@ -14266,7 +14328,7 @@ EOF
        fi
 
 ### Enable compiling-in rcs id's
        fi
 
 ### Enable compiling-in rcs id's

-echo "$as_me:14269: checking if RCS identifiers should be compiled-in" >&5
+echo "$as_me:14331: 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.
 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.


@@ -14276,7 +14338,7 @@ if test "${with_rcs_ids+set}" = set; then
 else
   with_rcs_ids=no
 fi;
 else
   with_rcs_ids=no
 fi;

-echo "$as_me:14279: result: $with_rcs_ids" >&5
+echo "$as_me:14341: result: $with_rcs_ids" >&5

 echo "${ECHO_T}$with_rcs_ids" >&6
 test "$with_rcs_ids" = yes &&
 cat >>confdefs.h <<\EOF
 echo "${ECHO_T}$with_rcs_ids" >&6
 test "$with_rcs_ids" = yes &&
 cat >>confdefs.h <<\EOF


@@ -14286,7 +14348,7 @@ EOF
 ###############################################################################
 
 ### Note that some functions (such as const) are normally disabled anyway.
 ###############################################################################
 
 ### Note that some functions (such as const) are normally disabled anyway.

-echo "$as_me:14289: checking if you want to build with function extensions" >&5
+echo "$as_me:14351: 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.
 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.


@@ -14296,7 +14358,7 @@ if test "${enable_ext_funcs+set}" = set; then
 else
   with_ext_funcs=yes
 fi;
 else
   with_ext_funcs=yes
 fi;

-echo "$as_me:14299: result: $with_ext_funcs" >&5
+echo "$as_me:14361: result: $with_ext_funcs" >&5

 echo "${ECHO_T}$with_ext_funcs" >&6
 if test "$with_ext_funcs" = yes ; then
        NCURSES_EXT_FUNCS=1
 echo "${ECHO_T}$with_ext_funcs" >&6
 if test "$with_ext_funcs" = yes ; then
        NCURSES_EXT_FUNCS=1


@@ -14314,7 +14376,7 @@ else
 fi
 
 ###   use option --enable-const to turn on use of const beyond that in XSI.
 fi
 
 ###   use option --enable-const to turn on use of const beyond that in XSI.

-echo "$as_me:14317: checking for extended use of const keyword" >&5
+echo "$as_me:14379: 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.
 echo $ECHO_N "checking for extended use of const keyword... $ECHO_C" >&6
 
 # Check whether --enable-const or --disable-const was given.


@@ -14324,7 +14386,7 @@ if test "${enable_const+set}" = set; then
 else
   with_ext_const=no
 fi;
 else
   with_ext_const=no
 fi;

-echo "$as_me:14327: result: $with_ext_const" >&5
+echo "$as_me:14389: result: $with_ext_const" >&5

 echo "${ECHO_T}$with_ext_const" >&6
 NCURSES_CONST='/*nothing*/'
 if test "$with_ext_const" = yes ; then
 echo "${ECHO_T}$with_ext_const" >&6
 NCURSES_CONST='/*nothing*/'
 if test "$with_ext_const" = yes ; then


@@ -14334,7 +14396,7 @@ fi
 ###############################################################################
 # These options are relatively safe to experiment with.
 
 ###############################################################################
 # These options are relatively safe to experiment with.
 

-echo "$as_me:14337: checking if you want all development code" >&5
+echo "$as_me:14399: 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.
 echo $ECHO_N "checking if you want all development code... $ECHO_C" >&6
 
 # Check whether --with-develop or --without-develop was given.


@@ -14344,7 +14406,7 @@ if test "${with_develop+set}" = set; then
 else
   with_develop=no
 fi;
 else
   with_develop=no
 fi;

-echo "$as_me:14347: result: $with_develop" >&5
+echo "$as_me:14409: result: $with_develop" >&5

 echo "${ECHO_T}$with_develop" >&6
 
 ###############################################################################
 echo "${ECHO_T}$with_develop" >&6
 
 ###############################################################################


@@ -14353,7 +14415,7 @@ echo "${ECHO_T}$with_develop" >&6
 # This is still experimental (20080329), but should ultimately be moved to
 # the script-block --with-normal, etc.
 
 # This is still experimental (20080329), but should ultimately be moved to
 # the script-block --with-normal, etc.
 

-echo "$as_me:14356: checking if you want to link with the pthread library" >&5
+echo "$as_me:14418: 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.
 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.


@@ -14363,27 +14425,27 @@ if test "${with_pthread+set}" = set; then
 else
   with_pthread=no
 fi;
 else
   with_pthread=no
 fi;

-echo "$as_me:14366: result: $with_pthread" >&5
+echo "$as_me:14428: result: $with_pthread" >&5

 echo "${ECHO_T}$with_pthread" >&6
 
 if test "$with_pthread" != no ; then
 echo "${ECHO_T}$with_pthread" >&6
 
 if test "$with_pthread" != no ; then

-       echo "$as_me:14370: checking for pthread.h" >&5
+       echo "$as_me:14432: 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
 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 14376 "configure"
+#line 14438 "configure"

 #include "confdefs.h"
 #include <pthread.h>
 _ACEOF
 #include "confdefs.h"
 #include <pthread.h>
 _ACEOF

-if { (eval echo "$as_me:14380: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:14442: \"$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
   (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:14386: \$? = $ac_status" >&5
+  echo "$as_me:14448: \$? = $ac_status" >&5

   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag


@@ -14402,7 +14464,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi

-echo "$as_me:14405: result: $ac_cv_header_pthread_h" >&5
+echo "$as_me:14467: 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
 
 echo "${ECHO_T}$ac_cv_header_pthread_h" >&6
 if test "$ac_cv_header_pthread_h" = yes; then
 


@@ -14412,7 +14474,7 @@ EOF
 
        for cf_lib_pthread in pthread c_r
        do
 
        for cf_lib_pthread in pthread c_r
        do

-           echo "$as_me:14415: checking if we can link with the $cf_lib_pthread library" >&5
+           echo "$as_me:14477: 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"
 
 echo $ECHO_N "checking if we can link with the $cf_lib_pthread library... $ECHO_C" >&6
            cf_save_LIBS="$LIBS"
 


@@ -14433,7 +14495,7 @@ done
 LIBS="$cf_add_libs"
 
            cat >"conftest.$ac_ext" <<_ACEOF
 LIBS="$cf_add_libs"
 
            cat >"conftest.$ac_ext" <<_ACEOF

-#line 14436 "configure"
+#line 14498 "configure"

 #include "confdefs.h"
 
 #include <pthread.h>
 #include "confdefs.h"
 
 #include <pthread.h>


@@ -14450,16 +14512,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"

-if { (eval echo "$as_me:14453: \"$ac_link\"") >&5
+if { (eval echo "$as_me:14515: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:14456: \$? = $ac_status" >&5
+  echo "$as_me:14518: \$? = $ac_status" >&5

   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'

-  { (eval echo "$as_me:14459: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14521: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:14462: \$? = $ac_status" >&5
+  echo "$as_me:14524: \$? = $ac_status" >&5

   (exit "$ac_status"); }; }; then
   with_pthread=yes
 else
   (exit "$ac_status"); }; }; then
   with_pthread=yes
 else


@@ -14469,7 +14531,7 @@ with_pthread=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
            LIBS="$cf_save_LIBS"
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
            LIBS="$cf_save_LIBS"

-           echo "$as_me:14472: result: $with_pthread" >&5
+           echo "$as_me:14534: result: $with_pthread" >&5

 echo "${ECHO_T}$with_pthread" >&6
            test "$with_pthread" = yes && break
        done
 echo "${ECHO_T}$with_pthread" >&6
            test "$with_pthread" = yes && break
        done


@@ -14497,7 +14559,7 @@ cat >>confdefs.h <<\EOF
 EOF
 
        else
 EOF
 
        else

-           { { echo "$as_me:14500: error: Cannot link with pthread library" >&5
+           { { echo "$as_me:14562: error: Cannot link with pthread library" >&5

 echo "$as_me: error: Cannot link with pthread library" >&2;}
    { (exit 1); exit 1; }; }
        fi
 echo "$as_me: error: Cannot link with pthread library" >&2;}
    { (exit 1); exit 1; }; }
        fi


@@ -14506,7 +14568,7 @@ fi
 
 fi
 
 
 fi
 

-echo "$as_me:14509: checking if you want to use weak-symbols for pthreads" >&5
+echo "$as_me:14571: 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.
 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.


@@ -14516,18 +14578,18 @@ if test "${enable_weak_symbols+set}" = set; then
 else
   use_weak_symbols=no
 fi;
 else
   use_weak_symbols=no
 fi;

-echo "$as_me:14519: result: $use_weak_symbols" >&5
+echo "$as_me:14581: result: $use_weak_symbols" >&5

 echo "${ECHO_T}$use_weak_symbols" >&6
 if test "$use_weak_symbols" = yes ; then
 
 echo "${ECHO_T}$use_weak_symbols" >&6
 if test "$use_weak_symbols" = yes ; then
 

-echo "$as_me:14523: checking if $CC supports weak symbols" >&5
+echo "$as_me:14585: 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
 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 14530 "configure"
+#line 14592 "configure"

 #include "confdefs.h"
 
 #include <stdio.h>
 #include "confdefs.h"
 
 #include <stdio.h>


@@ -14553,16 +14615,16 @@ weak_symbol(fopen);
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
 }
 _ACEOF
 rm -f "conftest.$ac_objext"

-if { (eval echo "$as_me:14556: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:14618: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:14559: \$? = $ac_status" >&5
+  echo "$as_me:14621: \$? = $ac_status" >&5

   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'

-  { (eval echo "$as_me:14562: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14624: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:14565: \$? = $ac_status" >&5
+  echo "$as_me:14627: \$? = $ac_status" >&5

   (exit "$ac_status"); }; }; then
   cf_cv_weak_symbols=yes
 else
   (exit "$ac_status"); }; }; then
   cf_cv_weak_symbols=yes
 else


@@ -14573,7 +14635,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi

-echo "$as_me:14576: result: $cf_cv_weak_symbols" >&5
+echo "$as_me:14638: result: $cf_cv_weak_symbols" >&5

 echo "${ECHO_T}$cf_cv_weak_symbols" >&6
 
 else
 echo "${ECHO_T}$cf_cv_weak_symbols" >&6
 
 else


@@ -14602,13 +14664,13 @@ EOF
 fi
 
 # OpenSUSE is installing ncurses6, using reentrant option.
 fi
 
 # OpenSUSE is installing ncurses6, using reentrant option.

-echo "$as_me:14605: checking for _nc_TABSIZE" >&5
+echo "$as_me:14667: 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
 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 14611 "configure"
+#line 14673 "configure"

 #include "confdefs.h"
 #define _nc_TABSIZE autoconf_temporary
 #include <limits.h>    /* least-intrusive standard header which defines gcc2 __stub macros */
 #include "confdefs.h"
 #define _nc_TABSIZE autoconf_temporary
 #include <limits.h>    /* least-intrusive standard header which defines gcc2 __stub macros */


@@ -14639,16 +14701,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"

-if { (eval echo "$as_me:14642: \"$ac_link\"") >&5
+if { (eval echo "$as_me:14704: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:14645: \$? = $ac_status" >&5
+  echo "$as_me:14707: \$? = $ac_status" >&5

   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'

-  { (eval echo "$as_me:14648: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14710: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:14651: \$? = $ac_status" >&5
+  echo "$as_me:14713: \$? = $ac_status" >&5

   (exit "$ac_status"); }; }; then
   ac_cv_func__nc_TABSIZE=yes
 else
   (exit "$ac_status"); }; }; then
   ac_cv_func__nc_TABSIZE=yes
 else


@@ -14658,7 +14720,7 @@ ac_cv_func__nc_TABSIZE=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi

-echo "$as_me:14661: result: $ac_cv_func__nc_TABSIZE" >&5
+echo "$as_me:14723: 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
 echo "${ECHO_T}$ac_cv_func__nc_TABSIZE" >&6
 if test "$ac_cv_func__nc_TABSIZE" = yes; then
   assume_reentrant=yes


@@ -14670,7 +14732,7 @@ fi
 # 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.
 # 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:14673: checking if you want experimental reentrant code" >&5
+echo "$as_me:14735: 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.
 echo $ECHO_N "checking if you want experimental reentrant code... $ECHO_C" >&6
 
 # Check whether --enable-reentrant or --disable-reentrant was given.


@@ -14680,7 +14742,7 @@ if test "${enable_reentrant+set}" = set; then
 else
   with_reentrant=$assume_reentrant
 fi;
 else
   with_reentrant=$assume_reentrant
 fi;

-echo "$as_me:14683: result: $with_reentrant" >&5
+echo "$as_me:14745: result: $with_reentrant" >&5

 echo "${ECHO_T}$with_reentrant" >&6
 if test "$with_reentrant" = yes ; then
        cf_cv_enable_reentrant=1
 echo "${ECHO_T}$with_reentrant" >&6
 if test "$with_reentrant" = yes ; then
        cf_cv_enable_reentrant=1


@@ -14703,7 +14765,7 @@ fi
 
 ### Allow using a different wrap-prefix
 if test "$cf_cv_enable_reentrant" != 0 || test "$BROKEN_LINKER" = 1 ; then
 
 ### Allow using a different wrap-prefix
 if test "$cf_cv_enable_reentrant" != 0 || test "$BROKEN_LINKER" = 1 ; then

-       echo "$as_me:14706: checking for prefix used to wrap public variables" >&5
+       echo "$as_me:14768: 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.
 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.


@@ -14713,7 +14775,7 @@ if test "${with_wrap_prefix+set}" = set; then
 else
   NCURSES_WRAP_PREFIX=_nc_
 fi;
 else
   NCURSES_WRAP_PREFIX=_nc_
 fi;

-       echo "$as_me:14716: result: $NCURSES_WRAP_PREFIX" >&5
+       echo "$as_me:14778: result: $NCURSES_WRAP_PREFIX" >&5

 echo "${ECHO_T}$NCURSES_WRAP_PREFIX" >&6
 else
        NCURSES_WRAP_PREFIX=_nc_
 echo "${ECHO_T}$NCURSES_WRAP_PREFIX" >&6
 else
        NCURSES_WRAP_PREFIX=_nc_


@@ -14727,7 +14789,7 @@ EOF
 
 ###    use option --disable-echo to suppress full display compiling commands
 
 
 ###    use option --disable-echo to suppress full display compiling commands
 

-echo "$as_me:14730: checking if you want to see long compiling messages" >&5
+echo "$as_me:14792: 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.
 echo $ECHO_N "checking if you want to see long compiling messages... $ECHO_C" >&6
 
 # Check whether --enable-echo or --disable-echo was given.


@@ -14761,10 +14823,10 @@ else
        ECHO_CC=''
 
 fi;
        ECHO_CC=''
 
 fi;

-echo "$as_me:14764: result: $enableval" >&5
+echo "$as_me:14826: result: $enableval" >&5

 echo "${ECHO_T}$enableval" >&6
 
 echo "${ECHO_T}$enableval" >&6
 

-echo "$as_me:14767: checking if you want to use C11 _Noreturn feature" >&5
+echo "$as_me:14829: checking if you want to use C11 _Noreturn feature" >&5

 echo $ECHO_N "checking if you want to use C11 _Noreturn feature... $ECHO_C" >&6
 
 # Check whether --enable-stdnoreturn or --disable-stdnoreturn was given.
 echo $ECHO_N "checking if you want to use C11 _Noreturn feature... $ECHO_C" >&6
 
 # Check whether --enable-stdnoreturn or --disable-stdnoreturn was given.


@@ -14781,17 +14843,17 @@ else
        enable_stdnoreturn=no
 
 fi;
        enable_stdnoreturn=no
 
 fi;

-echo "$as_me:14784: result: $enable_stdnoreturn" >&5
+echo "$as_me:14846: result: $enable_stdnoreturn" >&5

 echo "${ECHO_T}$enable_stdnoreturn" >&6
 
 if test $enable_stdnoreturn = yes; then
 echo "${ECHO_T}$enable_stdnoreturn" >&6
 
 if test $enable_stdnoreturn = yes; then

-echo "$as_me:14788: checking for C11 _Noreturn feature" >&5
+echo "$as_me:14850: checking for C11 _Noreturn feature" >&5

 echo $ECHO_N "checking for C11 _Noreturn feature... $ECHO_C" >&6
 if test "${cf_cv_c11_noreturn+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >"conftest.$ac_ext" <<_ACEOF
 echo $ECHO_N "checking for C11 _Noreturn feature... $ECHO_C" >&6
 if test "${cf_cv_c11_noreturn+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >"conftest.$ac_ext" <<_ACEOF

-#line 14794 "configure"
+#line 14856 "configure"

 #include "confdefs.h"
 
 #include <stdio.h>
 #include "confdefs.h"
 
 #include <stdio.h>


@@ -14808,16 +14870,16 @@ if (feof(stdin)) giveup()
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
 }
 _ACEOF
 rm -f "conftest.$ac_objext"

-if { (eval echo "$as_me:14811: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:14873: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:14814: \$? = $ac_status" >&5
+  echo "$as_me:14876: \$? = $ac_status" >&5

   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'

-  { (eval echo "$as_me:14817: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14879: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:14820: \$? = $ac_status" >&5
+  echo "$as_me:14882: \$? = $ac_status" >&5

   (exit "$ac_status"); }; }; then
   cf_cv_c11_noreturn=yes
 else
   (exit "$ac_status"); }; }; then
   cf_cv_c11_noreturn=yes
 else


@@ -14828,7 +14890,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi

-echo "$as_me:14831: result: $cf_cv_c11_noreturn" >&5
+echo "$as_me:14893: result: $cf_cv_c11_noreturn" >&5

 echo "${ECHO_T}$cf_cv_c11_noreturn" >&6
 else
        cf_cv_c11_noreturn=no,
 echo "${ECHO_T}$cf_cv_c11_noreturn" >&6
 else
        cf_cv_c11_noreturn=no,


@@ -14858,7 +14920,7 @@ then
        (*-Werror=*)
                test -n "$verbose" && echo "    repairing CFLAGS: $CFLAGS" 1>&6
 
        (*-Werror=*)
                test -n "$verbose" && echo "    repairing CFLAGS: $CFLAGS" 1>&6
 

-echo "${as_me:-configure}:14861: testing repairing CFLAGS: $CFLAGS ..." 1>&5
+echo "${as_me:-configure}:14923: testing repairing CFLAGS: $CFLAGS ..." 1>&5

 
                cf_temp_flags=
                for cf_temp_scan in $CFLAGS
 
                cf_temp_flags=
                for cf_temp_scan in $CFLAGS


@@ -14881,11 +14943,11 @@ echo "${as_me:-configure}:14861: testing repairing CFLAGS: $CFLAGS ..." 1>&5
                CFLAGS="$cf_temp_flags"
                test -n "$verbose" && echo "    ... fixed $CFLAGS" 1>&6
 
                CFLAGS="$cf_temp_flags"
                test -n "$verbose" && echo "    ... fixed $CFLAGS" 1>&6
 

-echo "${as_me:-configure}:14884: testing ... fixed $CFLAGS ..." 1>&5
+echo "${as_me:-configure}:14946: testing ... fixed $CFLAGS ..." 1>&5

 
                test -n "$verbose" && echo "    ... extra $EXTRA_CFLAGS" 1>&6
 
 
                test -n "$verbose" && echo "    ... extra $EXTRA_CFLAGS" 1>&6
 

-echo "${as_me:-configure}:14888: testing ... extra $EXTRA_CFLAGS ..." 1>&5
+echo "${as_me:-configure}:14950: testing ... extra $EXTRA_CFLAGS ..." 1>&5

 
                ;;
        esac
 
                ;;
        esac


@@ -14897,7 +14959,7 @@ then
        (*-Werror=*)
                test -n "$verbose" && echo "    repairing CPPFLAGS: $CPPFLAGS" 1>&6
 
        (*-Werror=*)
                test -n "$verbose" && echo "    repairing CPPFLAGS: $CPPFLAGS" 1>&6
 

-echo "${as_me:-configure}:14900: testing repairing CPPFLAGS: $CPPFLAGS ..." 1>&5
+echo "${as_me:-configure}:14962: testing repairing CPPFLAGS: $CPPFLAGS ..." 1>&5

 
                cf_temp_flags=
                for cf_temp_scan in $CPPFLAGS
 
                cf_temp_flags=
                for cf_temp_scan in $CPPFLAGS


@@ -14920,11 +14982,11 @@ echo "${as_me:-configure}:14900: testing repairing CPPFLAGS: $CPPFLAGS ..." 1>&5
                CPPFLAGS="$cf_temp_flags"
                test -n "$verbose" && echo "    ... fixed $CPPFLAGS" 1>&6
 
                CPPFLAGS="$cf_temp_flags"
                test -n "$verbose" && echo "    ... fixed $CPPFLAGS" 1>&6
 

-echo "${as_me:-configure}:14923: testing ... fixed $CPPFLAGS ..." 1>&5
+echo "${as_me:-configure}:14985: testing ... fixed $CPPFLAGS ..." 1>&5

 
                test -n "$verbose" && echo "    ... extra $EXTRA_CFLAGS" 1>&6
 
 
                test -n "$verbose" && echo "    ... extra $EXTRA_CFLAGS" 1>&6
 

-echo "${as_me:-configure}:14927: testing ... extra $EXTRA_CFLAGS ..." 1>&5
+echo "${as_me:-configure}:14989: testing ... extra $EXTRA_CFLAGS ..." 1>&5

 
                ;;
        esac
 
                ;;
        esac


@@ -14936,7 +14998,7 @@ then
        (*-Werror=*)
                test -n "$verbose" && echo "    repairing LDFLAGS: $LDFLAGS" 1>&6
 
        (*-Werror=*)
                test -n "$verbose" && echo "    repairing LDFLAGS: $LDFLAGS" 1>&6
 

-echo "${as_me:-configure}:14939: testing repairing LDFLAGS: $LDFLAGS ..." 1>&5
+echo "${as_me:-configure}:15001: testing repairing LDFLAGS: $LDFLAGS ..." 1>&5

 
                cf_temp_flags=
                for cf_temp_scan in $LDFLAGS
 
                cf_temp_flags=
                for cf_temp_scan in $LDFLAGS


@@ -14959,17 +15021,17 @@ echo "${as_me:-configure}:14939: testing repairing LDFLAGS: $LDFLAGS ..." 1>&5
                LDFLAGS="$cf_temp_flags"
                test -n "$verbose" && echo "    ... fixed $LDFLAGS" 1>&6
 
                LDFLAGS="$cf_temp_flags"
                test -n "$verbose" && echo "    ... fixed $LDFLAGS" 1>&6
 

-echo "${as_me:-configure}:14962: testing ... fixed $LDFLAGS ..." 1>&5
+echo "${as_me:-configure}:15024: testing ... fixed $LDFLAGS ..." 1>&5

 
                test -n "$verbose" && echo "    ... extra $EXTRA_CFLAGS" 1>&6
 
 
                test -n "$verbose" && echo "    ... extra $EXTRA_CFLAGS" 1>&6
 

-echo "${as_me:-configure}:14966: testing ... extra $EXTRA_CFLAGS ..." 1>&5
+echo "${as_me:-configure}:15028: testing ... extra $EXTRA_CFLAGS ..." 1>&5

 
                ;;
        esac
 fi
 
 
                ;;
        esac
 fi
 

-echo "$as_me:14972: checking if you want to turn on gcc warnings" >&5
+echo "$as_me:15034: 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.
 echo $ECHO_N "checking if you want to turn on gcc warnings... $ECHO_C" >&6
 
 # Check whether --enable-warnings or --disable-warnings was given.


@@ -14986,7 +15048,7 @@ else
        enable_warnings=no
 
 fi;
        enable_warnings=no
 
 fi;

-echo "$as_me:14989: result: $enable_warnings" >&5
+echo "$as_me:15051: result: $enable_warnings" >&5

 echo "${ECHO_T}$enable_warnings" >&6
 if test "$enable_warnings" = "yes"
 then
 echo "${ECHO_T}$enable_warnings" >&6
 if test "$enable_warnings" = "yes"
 then


@@ -15010,7 +15072,7 @@ do
 done
 
 cat >"conftest.$ac_ext" <<_ACEOF
 done
 
 cat >"conftest.$ac_ext" <<_ACEOF

-#line 15013 "configure"
+#line 15075 "configure"

 #include "confdefs.h"
 
 #include <stdlib.h>
 #include "confdefs.h"
 
 #include <stdlib.h>


@@ -15025,26 +15087,26 @@ String foo = malloc(1); (void)foo
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
 }
 _ACEOF
 rm -f "conftest.$ac_objext"

-if { (eval echo "$as_me:15028: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:15090: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:15031: \$? = $ac_status" >&5
+  echo "$as_me:15093: \$? = $ac_status" >&5

   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'

-  { (eval echo "$as_me:15034: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15096: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:15037: \$? = $ac_status" >&5
+  echo "$as_me:15099: \$? = $ac_status" >&5

   (exit "$ac_status"); }; }; then
 
   (exit "$ac_status"); }; }; then
 

-echo "$as_me:15040: checking for X11/Xt const-feature" >&5
+echo "$as_me:15102: checking for X11/Xt const-feature" >&5

 echo $ECHO_N "checking for X11/Xt const-feature... $ECHO_C" >&6
 if test "${cf_cv_const_x_string+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
        cat >"conftest.$ac_ext" <<_ACEOF
 echo $ECHO_N "checking for X11/Xt const-feature... $ECHO_C" >&6
 if test "${cf_cv_const_x_string+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
        cat >"conftest.$ac_ext" <<_ACEOF

-#line 15047 "configure"
+#line 15109 "configure"

 #include "confdefs.h"
 
 #define _CONST_X_STRING        /* X11R7.8 (perhaps) */
 #include "confdefs.h"
 
 #define _CONST_X_STRING        /* X11R7.8 (perhaps) */


@@ -15061,16 +15123,16 @@ String foo = malloc(1); *foo = 0
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
 }
 _ACEOF
 rm -f "conftest.$ac_objext"

-if { (eval echo "$as_me:15064: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:15126: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:15067: \$? = $ac_status" >&5
+  echo "$as_me:15129: \$? = $ac_status" >&5

   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'

-  { (eval echo "$as_me:15070: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15132: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:15073: \$? = $ac_status" >&5
+  echo "$as_me:15135: \$? = $ac_status" >&5

   (exit "$ac_status"); }; }; then
 
                        cf_cv_const_x_string=no
   (exit "$ac_status"); }; }; then
 
                        cf_cv_const_x_string=no


@@ -15085,7 +15147,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi

-echo "$as_me:15088: result: $cf_cv_const_x_string" >&5
+echo "$as_me:15150: result: $cf_cv_const_x_string" >&5

 echo "${ECHO_T}$cf_cv_const_x_string" >&6
 
 LIBS="$cf_save_LIBS_CF_CONST_X_STRING"
 echo "${ECHO_T}$cf_cv_const_x_string" >&6
 
 LIBS="$cf_save_LIBS_CF_CONST_X_STRING"


@@ -15114,7 +15176,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
  fi
 cat > "conftest.$ac_ext" <<EOF
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
  fi
 cat > "conftest.$ac_ext" <<EOF

-#line 15117 "${as_me:-configure}"
+#line 15179 "${as_me:-configure}"

 int main(int argc, char *argv[]) { return (argv[argc-1] == 0) ; }
 EOF
 if test "$INTEL_COMPILER" = yes
 int main(int argc, char *argv[]) { return (argv[argc-1] == 0) ; }
 EOF
 if test "$INTEL_COMPILER" = yes


@@ -15130,7 +15192,7 @@ then
 # remark #981: operands are evaluated in unspecified order
 # warning #279: controlling expression is constant
 
 # remark #981: operands are evaluated in unspecified order
 # warning #279: controlling expression is constant
 

-       { echo "$as_me:15133: checking for $CC warning options..." >&5
+       { echo "$as_me:15195: checking for $CC warning options..." >&5

 echo "$as_me: checking for $CC warning options..." >&6;}
        cf_save_CFLAGS="$CFLAGS"
        EXTRA_CFLAGS="$EXTRA_CFLAGS -Wall"
 echo "$as_me: checking for $CC warning options..." >&6;}
        cf_save_CFLAGS="$CFLAGS"
        EXTRA_CFLAGS="$EXTRA_CFLAGS -Wall"


@@ -15146,12 +15208,12 @@ echo "$as_me: checking for $CC warning options..." >&6;}
                wd981
        do
                CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt"
                wd981
        do
                CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt"

-               if { (eval echo "$as_me:15149: \"$ac_compile\"") >&5
+               if { (eval echo "$as_me:15211: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:15152: \$? = $ac_status" >&5
+  echo "$as_me:15214: \$? = $ac_status" >&5

   (exit "$ac_status"); }; then
   (exit "$ac_status"); }; then

-                       test -n "$verbose" && echo "$as_me:15154: result: ... -$cf_opt" >&5
+                       test -n "$verbose" && echo "$as_me:15216: result: ... -$cf_opt" >&5

 echo "${ECHO_T}... -$cf_opt" >&6
                        EXTRA_CFLAGS="$EXTRA_CFLAGS -$cf_opt"
                fi
 echo "${ECHO_T}... -$cf_opt" >&6
                        EXTRA_CFLAGS="$EXTRA_CFLAGS -$cf_opt"
                fi


@@ -15159,7 +15221,7 @@ echo "${ECHO_T}... -$cf_opt" >&6
        CFLAGS="$cf_save_CFLAGS"
 elif test "$GCC" = yes && test "$GCC_VERSION" != "unknown"
 then
        CFLAGS="$cf_save_CFLAGS"
 elif test "$GCC" = yes && test "$GCC_VERSION" != "unknown"
 then

-       { echo "$as_me:15162: checking for $CC warning options..." >&5
+       { echo "$as_me:15224: checking for $CC warning options..." >&5

 echo "$as_me: checking for $CC warning options..." >&6;}
        cf_save_CFLAGS="$CFLAGS"
        cf_warn_CONST=""
 echo "$as_me: checking for $CC warning options..." >&6;}
        cf_save_CFLAGS="$CFLAGS"
        cf_warn_CONST=""


@@ -15182,12 +15244,12 @@ echo "$as_me: checking for $CC warning options..." >&6;}
                Wundef Wno-inline $cf_gcc_warnings $cf_warn_CONST Wno-unknown-pragmas Wswitch-enum
        do
                CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt"
                Wundef Wno-inline $cf_gcc_warnings $cf_warn_CONST Wno-unknown-pragmas Wswitch-enum
        do
                CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt"

-               if { (eval echo "$as_me:15185: \"$ac_compile\"") >&5
+               if { (eval echo "$as_me:15247: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:15188: \$? = $ac_status" >&5
+  echo "$as_me:15250: \$? = $ac_status" >&5

   (exit "$ac_status"); }; then
   (exit "$ac_status"); }; then

-                       test -n "$verbose" && echo "$as_me:15190: result: ... -$cf_opt" >&5
+                       test -n "$verbose" && echo "$as_me:15252: result: ... -$cf_opt" >&5

 echo "${ECHO_T}... -$cf_opt" >&6
                        case "$cf_opt" in
                        (Winline)
 echo "${ECHO_T}... -$cf_opt" >&6
                        case "$cf_opt" in
                        (Winline)


@@ -15195,7 +15257,7 @@ echo "${ECHO_T}... -$cf_opt" >&6
                                ([34].*)
                                        test -n "$verbose" && echo "    feature is broken in gcc $GCC_VERSION" 1>&6
 
                                ([34].*)
                                        test -n "$verbose" && echo "    feature is broken in gcc $GCC_VERSION" 1>&6
 

-echo "${as_me:-configure}:15198: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
+echo "${as_me:-configure}:15260: testing feature is broken in gcc $GCC_VERSION ..." 1>&5

 
                                        continue;;
                                esac
 
                                        continue;;
                                esac


@@ -15205,7 +15267,7 @@ echo "${as_me:-configure}:15198: testing feature is broken in gcc $GCC_VERSION .
                                ([12].*)
                                        test -n "$verbose" && echo "    feature is broken in gcc $GCC_VERSION" 1>&6
 
                                ([12].*)
                                        test -n "$verbose" && echo "    feature is broken in gcc $GCC_VERSION" 1>&6
 

-echo "${as_me:-configure}:15208: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
+echo "${as_me:-configure}:15270: testing feature is broken in gcc $GCC_VERSION ..." 1>&5

 
                                        continue;;
                                esac
 
                                        continue;;
                                esac


@@ -15238,10 +15300,10 @@ cat > conftest.i <<EOF
 EOF
 if test "$GCC" = yes
 then
 EOF
 if test "$GCC" = yes
 then

-       { echo "$as_me:15241: checking for $CC __attribute__ directives..." >&5
+       { echo "$as_me:15303: checking for $CC __attribute__ directives..." >&5

 echo "$as_me: checking for $CC __attribute__ directives..." >&6;}
 cat > "conftest.$ac_ext" <<EOF
 echo "$as_me: checking for $CC __attribute__ directives..." >&6;}
 cat > "conftest.$ac_ext" <<EOF

-#line 15244 "${as_me:-configure}"
+#line 15306 "${as_me:-configure}"

 #include "confdefs.h"
 #include "conftest.h"
 #include "conftest.i"
 #include "confdefs.h"
 #include "conftest.h"
 #include "conftest.i"


@@ -15290,12 +15352,12 @@ EOF
                        ;;
                esac
 
                        ;;
                esac
 

-               if { (eval echo "$as_me:15293: \"$ac_compile\"") >&5
+               if { (eval echo "$as_me:15355: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:15296: \$? = $ac_status" >&5
+  echo "$as_me:15358: \$? = $ac_status" >&5

   (exit "$ac_status"); }; then
   (exit "$ac_status"); }; then

-                       test -n "$verbose" && echo "$as_me:15298: result: ... $cf_attribute" >&5
+                       test -n "$verbose" && echo "$as_me:15360: result: ... $cf_attribute" >&5

 echo "${ECHO_T}... $cf_attribute" >&6
                        cat conftest.h >>confdefs.h
                        case "$cf_attribute" in
 echo "${ECHO_T}... $cf_attribute" >&6
                        cat conftest.h >>confdefs.h
                        case "$cf_attribute" in


@@ -15363,7 +15425,7 @@ if test "x$enable_warnings" = "xyes"; then
 fi
 
 ###    use option --enable-assertions to turn on generation of assertion code
 fi
 
 ###    use option --enable-assertions to turn on generation of assertion code

-echo "$as_me:15366: checking if you want to enable runtime assertions" >&5
+echo "$as_me:15428: 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.
 echo $ECHO_N "checking if you want to enable runtime assertions... $ECHO_C" >&6
 
 # Check whether --enable-assertions or --disable-assertions was given.


@@ -15373,7 +15435,7 @@ if test "${enable_assertions+set}" = set; then
 else
   with_assertions=no
 fi;
 else
   with_assertions=no
 fi;

-echo "$as_me:15376: result: $with_assertions" >&5
+echo "$as_me:15438: result: $with_assertions" >&5

 echo "${ECHO_T}$with_assertions" >&6
 if test -n "$GCC"
 then
 echo "${ECHO_T}$with_assertions" >&6
 if test -n "$GCC"
 then


@@ -15426,7 +15488,7 @@ case "$CFLAGS $CPPFLAGS" in
        ;;
 esac
 
        ;;
 esac
 

-echo "$as_me:15429: checking whether to add trace feature to all models" >&5
+echo "$as_me:15491: 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.
 echo $ECHO_N "checking whether to add trace feature to all models... $ECHO_C" >&6
 
 # Check whether --with-trace or --without-trace was given.


@@ -15436,7 +15498,7 @@ if test "${with_trace+set}" = set; then
 else
   cf_with_trace=$cf_all_traces
 fi;
 else
   cf_with_trace=$cf_all_traces
 fi;

-echo "$as_me:15439: result: $cf_with_trace" >&5
+echo "$as_me:15501: result: $cf_with_trace" >&5

 echo "${ECHO_T}$cf_with_trace" >&6
 
 if test "$cf_with_trace" = yes ; then
 echo "${ECHO_T}$cf_with_trace" >&6
 
 if test "$cf_with_trace" = yes ; then


@@ -15544,7 +15606,7 @@ else
        ADA_TRACE=FALSE
 fi
 
        ADA_TRACE=FALSE
 fi
 

-echo "$as_me:15547: checking if we want to use GNAT projects" >&5
+echo "$as_me:15609: 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.
 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.


@@ -15561,7 +15623,7 @@ else
        enable_gnat_projects=yes
 
 fi;
        enable_gnat_projects=yes
 
 fi;

-echo "$as_me:15564: result: $enable_gnat_projects" >&5
+echo "$as_me:15626: result: $enable_gnat_projects" >&5

 echo "${ECHO_T}$enable_gnat_projects" >&6
 
 ###    Checks for libraries.
 echo "${ECHO_T}$enable_gnat_projects" >&6
 
 ###    Checks for libraries.


@@ -15569,13 +15631,13 @@ case $cf_cv_system_name in
 (*mingw32*)
        ;;
 (*)
 (*mingw32*)
        ;;
 (*)

-echo "$as_me:15572: checking for gettimeofday" >&5
+echo "$as_me:15634: 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
 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 15578 "configure"
+#line 15640 "configure"

 #include "confdefs.h"
 #define gettimeofday autoconf_temporary
 #include <limits.h>    /* least-intrusive standard header which defines gcc2 __stub macros */
 #include "confdefs.h"
 #define gettimeofday autoconf_temporary
 #include <limits.h>    /* least-intrusive standard header which defines gcc2 __stub macros */


@@ -15606,16 +15668,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"

-if { (eval echo "$as_me:15609: \"$ac_link\"") >&5
+if { (eval echo "$as_me:15671: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:15612: \$? = $ac_status" >&5
+  echo "$as_me:15674: \$? = $ac_status" >&5

   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'

-  { (eval echo "$as_me:15615: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15677: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:15618: \$? = $ac_status" >&5
+  echo "$as_me:15680: \$? = $ac_status" >&5

   (exit "$ac_status"); }; }; then
   ac_cv_func_gettimeofday=yes
 else
   (exit "$ac_status"); }; }; then
   ac_cv_func_gettimeofday=yes
 else


@@ -15625,7 +15687,7 @@ ac_cv_func_gettimeofday=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi

-echo "$as_me:15628: result: $ac_cv_func_gettimeofday" >&5
+echo "$as_me:15690: 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
 echo "${ECHO_T}$ac_cv_func_gettimeofday" >&6
 if test "$ac_cv_func_gettimeofday" = yes; then
   cat >>confdefs.h <<\EOF


@@ -15634,7 +15696,7 @@ EOF
 
 else
 
 
 else
 

-echo "$as_me:15637: checking for gettimeofday in -lbsd" >&5
+echo "$as_me:15699: 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
 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


@@ -15642,7 +15704,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lbsd  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lbsd  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF

-#line 15645 "configure"
+#line 15707 "configure"

 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */


@@ -15661,16 +15723,16 @@ gettimeofday ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"

-if { (eval echo "$as_me:15664: \"$ac_link\"") >&5
+if { (eval echo "$as_me:15726: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:15667: \$? = $ac_status" >&5
+  echo "$as_me:15729: \$? = $ac_status" >&5

   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'

-  { (eval echo "$as_me:15670: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15732: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:15673: \$? = $ac_status" >&5
+  echo "$as_me:15735: \$? = $ac_status" >&5

   (exit "$ac_status"); }; }; then
   ac_cv_lib_bsd_gettimeofday=yes
 else
   (exit "$ac_status"); }; }; then
   ac_cv_lib_bsd_gettimeofday=yes
 else


@@ -15681,7 +15743,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi

-echo "$as_me:15684: result: $ac_cv_lib_bsd_gettimeofday" >&5
+echo "$as_me:15746: 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
 
 echo "${ECHO_T}$ac_cv_lib_bsd_gettimeofday" >&6
 if test "$ac_cv_lib_bsd_gettimeofday" = yes; then
 


@@ -15697,13 +15759,13 @@ fi
 esac
 
 ###    Checks for header files.
 esac
 
 ###    Checks for header files.

-echo "$as_me:15700: checking for ANSI C header files" >&5
+echo "$as_me:15762: 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
 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 15706 "configure"
+#line 15768 "configure"

 #include "confdefs.h"
 #include <stdlib.h>
 #include <stdarg.h>
 #include "confdefs.h"
 #include <stdlib.h>
 #include <stdarg.h>


@@ -15711,13 +15773,13 @@ else
 #include <float.h>
 
 _ACEOF
 #include <float.h>
 
 _ACEOF

-if { (eval echo "$as_me:15714: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:15776: \"$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
   (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:15720: \$? = $ac_status" >&5
+  echo "$as_me:15782: \$? = $ac_status" >&5

   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag


@@ -15739,7 +15801,7 @@ rm -f conftest.err "conftest.$ac_ext"
 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
 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 15742 "configure"
+#line 15804 "configure"

 #include "confdefs.h"
 #include <string.h>
 
 #include "confdefs.h"
 #include <string.h>
 


@@ -15757,7 +15819,7 @@ fi
 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
 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 15760 "configure"
+#line 15822 "configure"

 #include "confdefs.h"
 #include <stdlib.h>
 
 #include "confdefs.h"
 #include <stdlib.h>
 


@@ -15778,7 +15840,7 @@ if test $ac_cv_header_stdc = yes; then
   :
 else
   cat >"conftest.$ac_ext" <<_ACEOF
   :
 else
   cat >"conftest.$ac_ext" <<_ACEOF

-#line 15781 "configure"
+#line 15843 "configure"

 #include "confdefs.h"
 #include <ctype.h>
 #if ((' ' & 0x0FF) == 0x020)
 #include "confdefs.h"
 #include <ctype.h>
 #if ((' ' & 0x0FF) == 0x020)


@@ -15804,15 +15866,15 @@ main (void)
 }
 _ACEOF
 rm -f "conftest$ac_exeext"
 }
 _ACEOF
 rm -f "conftest$ac_exeext"

-if { (eval echo "$as_me:15807: \"$ac_link\"") >&5
+if { (eval echo "$as_me:15869: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:15810: \$? = $ac_status" >&5
+  echo "$as_me:15872: \$? = $ac_status" >&5

   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'

-  { (eval echo "$as_me:15812: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15874: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:15815: \$? = $ac_status" >&5
+  echo "$as_me:15877: \$? = $ac_status" >&5

   (exit "$ac_status"); }; }; then
   :
 else
   (exit "$ac_status"); }; }; then
   :
 else


@@ -15825,7 +15887,7 @@ rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftes
 fi
 fi
 fi
 fi
 fi
 fi

-echo "$as_me:15828: result: $ac_cv_header_stdc" >&5
+echo "$as_me:15890: result: $ac_cv_header_stdc" >&5

 echo "${ECHO_T}$ac_cv_header_stdc" >&6
 if test $ac_cv_header_stdc = yes; then
 
 echo "${ECHO_T}$ac_cv_header_stdc" >&6
 if test $ac_cv_header_stdc = yes; then
 


@@ -15841,28 +15903,28 @@ for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \
                   inttypes.h stdint.h unistd.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
                   inttypes.h stdint.h unistd.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`

-echo "$as_me:15844: checking for $ac_header" >&5
+echo "$as_me:15906: 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
 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 15850 "configure"
+#line 15912 "configure"

 #include "confdefs.h"
 $ac_includes_default
 #include <$ac_header>
 _ACEOF
 rm -f "conftest.$ac_objext"
 #include "confdefs.h"
 $ac_includes_default
 #include <$ac_header>
 _ACEOF
 rm -f "conftest.$ac_objext"

-if { (eval echo "$as_me:15856: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:15918: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:15859: \$? = $ac_status" >&5
+  echo "$as_me:15921: \$? = $ac_status" >&5

   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'

-  { (eval echo "$as_me:15862: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15924: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:15865: \$? = $ac_status" >&5
+  echo "$as_me:15927: \$? = $ac_status" >&5

   (exit "$ac_status"); }; }; then
   eval "$as_ac_Header=yes"
 else
   (exit "$ac_status"); }; }; then
   eval "$as_ac_Header=yes"
 else


@@ -15872,7 +15934,7 @@ eval "$as_ac_Header=no"
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi

-echo "$as_me:15875: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:15937: 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
 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6
 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then
   cat >>confdefs.h <<EOF


@@ -15882,13 +15944,13 @@ EOF
 fi
 done
 
 fi
 done
 

-echo "$as_me:15885: checking for signed char" >&5
+echo "$as_me:15947: 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
 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 15891 "configure"
+#line 15953 "configure"

 #include "confdefs.h"
 $ac_includes_default
 int
 #include "confdefs.h"
 $ac_includes_default
 int


@@ -15903,16 +15965,16 @@ if (sizeof (signed char))
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
 }
 _ACEOF
 rm -f "conftest.$ac_objext"

-if { (eval echo "$as_me:15906: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:15968: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:15909: \$? = $ac_status" >&5
+  echo "$as_me:15971: \$? = $ac_status" >&5

   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'

-  { (eval echo "$as_me:15912: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15974: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:15915: \$? = $ac_status" >&5
+  echo "$as_me:15977: \$? = $ac_status" >&5

   (exit "$ac_status"); }; }; then
   ac_cv_type_signed_char=yes
 else
   (exit "$ac_status"); }; }; then
   ac_cv_type_signed_char=yes
 else


@@ -15922,10 +15984,10 @@ ac_cv_type_signed_char=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi

-echo "$as_me:15925: result: $ac_cv_type_signed_char" >&5
+echo "$as_me:15987: result: $ac_cv_type_signed_char" >&5

 echo "${ECHO_T}$ac_cv_type_signed_char" >&6
 
 echo "${ECHO_T}$ac_cv_type_signed_char" >&6
 

-echo "$as_me:15928: checking size of signed char" >&5
+echo "$as_me:15990: 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
 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


@@ -15934,7 +15996,7 @@ else
   if test "$cross_compiling" = yes; then
   # Depending upon the size, compute the lo and hi bounds.
 cat >"conftest.$ac_ext" <<_ACEOF
   if test "$cross_compiling" = yes; then
   # Depending upon the size, compute the lo and hi bounds.
 cat >"conftest.$ac_ext" <<_ACEOF

-#line 15937 "configure"
+#line 15999 "configure"

 #include "confdefs.h"
 $ac_includes_default
 int
 #include "confdefs.h"
 $ac_includes_default
 int


@@ -15946,21 +16008,21 @@ int _array_ [1 - 2 * !((sizeof (signed char)) >= 0)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
 }
 _ACEOF
 rm -f "conftest.$ac_objext"

-if { (eval echo "$as_me:15949: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:16011: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:15952: \$? = $ac_status" >&5
+  echo "$as_me:16014: \$? = $ac_status" >&5

   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'

-  { (eval echo "$as_me:15955: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16017: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:15958: \$? = $ac_status" >&5
+  echo "$as_me:16020: \$? = $ac_status" >&5

   (exit "$ac_status"); }; }; then
   ac_lo=0 ac_mid=0
   while :; do
     cat >"conftest.$ac_ext" <<_ACEOF
   (exit "$ac_status"); }; }; then
   ac_lo=0 ac_mid=0
   while :; do
     cat >"conftest.$ac_ext" <<_ACEOF

-#line 15963 "configure"
+#line 16025 "configure"

 #include "confdefs.h"
 $ac_includes_default
 int
 #include "confdefs.h"
 $ac_includes_default
 int


@@ -15972,16 +16034,16 @@ int _array_ [1 - 2 * !((sizeof (signed char)) <= $ac_mid)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
 }
 _ACEOF
 rm -f "conftest.$ac_objext"

-if { (eval echo "$as_me:15975: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:16037: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:15978: \$? = $ac_status" >&5
+  echo "$as_me:16040: \$? = $ac_status" >&5

   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'

-  { (eval echo "$as_me:15981: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16043: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:15984: \$? = $ac_status" >&5
+  echo "$as_me:16046: \$? = $ac_status" >&5

   (exit "$ac_status"); }; }; then
   ac_hi=$ac_mid; break
 else
   (exit "$ac_status"); }; }; then
   ac_hi=$ac_mid; break
 else


@@ -15997,7 +16059,7 @@ cat "conftest.$ac_ext" >&5
 ac_hi=-1 ac_mid=-1
   while :; do
     cat >"conftest.$ac_ext" <<_ACEOF
 ac_hi=-1 ac_mid=-1
   while :; do
     cat >"conftest.$ac_ext" <<_ACEOF

-#line 16000 "configure"
+#line 16062 "configure"

 #include "confdefs.h"
 $ac_includes_default
 int
 #include "confdefs.h"
 $ac_includes_default
 int


@@ -16009,16 +16071,16 @@ int _array_ [1 - 2 * !((sizeof (signed char)) >= $ac_mid)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
 }
 _ACEOF
 rm -f "conftest.$ac_objext"

-if { (eval echo "$as_me:16012: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:16074: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:16015: \$? = $ac_status" >&5
+  echo "$as_me:16077: \$? = $ac_status" >&5

   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'

-  { (eval echo "$as_me:16018: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16080: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:16021: \$? = $ac_status" >&5
+  echo "$as_me:16083: \$? = $ac_status" >&5

   (exit "$ac_status"); }; }; then
   ac_lo=$ac_mid; break
 else
   (exit "$ac_status"); }; }; then
   ac_lo=$ac_mid; break
 else


@@ -16034,7 +16096,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 while test "x$ac_lo" != "x$ac_hi"; do
   ac_mid=`expr '(' "$ac_hi" - "$ac_lo" ')' / 2 + "$ac_lo"`
   cat >"conftest.$ac_ext" <<_ACEOF
 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 16037 "configure"
+#line 16099 "configure"

 #include "confdefs.h"
 $ac_includes_default
 int
 #include "confdefs.h"
 $ac_includes_default
 int


@@ -16046,16 +16108,16 @@ int _array_ [1 - 2 * !((sizeof (signed char)) <= $ac_mid)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
 }
 _ACEOF
 rm -f "conftest.$ac_objext"

-if { (eval echo "$as_me:16049: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:16111: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:16052: \$? = $ac_status" >&5
+  echo "$as_me:16114: \$? = $ac_status" >&5

   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'

-  { (eval echo "$as_me:16055: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16117: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:16058: \$? = $ac_status" >&5
+  echo "$as_me:16120: \$? = $ac_status" >&5

   (exit "$ac_status"); }; }; then
   ac_hi=$ac_mid
 else
   (exit "$ac_status"); }; }; then
   ac_hi=$ac_mid
 else


@@ -16068,12 +16130,12 @@ done
 ac_cv_sizeof_signed_char=$ac_lo
 else
   if test "$cross_compiling" = yes; then
 ac_cv_sizeof_signed_char=$ac_lo
 else
   if test "$cross_compiling" = yes; then

-  { { echo "$as_me:16071: error: cannot run test program while cross compiling" >&5
+  { { echo "$as_me:16133: 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
 echo "$as_me: error: cannot run test program while cross compiling" >&2;}
    { (exit 1); exit 1; }; }
 else
   cat >"conftest.$ac_ext" <<_ACEOF

-#line 16076 "configure"
+#line 16138 "configure"

 #include "confdefs.h"
 $ac_includes_default
 int
 #include "confdefs.h"
 $ac_includes_default
 int


@@ -16082,22 +16144,22 @@ main (void)
 FILE *f = fopen ("conftest.val", "w");
 if (!f)
   $ac_main_return (1);
 FILE *f = fopen ("conftest.val", "w");
 if (!f)
   $ac_main_return (1);

-fprintf (f, "%d", (sizeof (signed char)));
+fprintf (f, "%ld", (long)(sizeof (signed char)));

 fclose (f);
   ;
   return 0;
 }
 _ACEOF
 rm -f "conftest$ac_exeext"
 fclose (f);
   ;
   return 0;
 }
 _ACEOF
 rm -f "conftest$ac_exeext"

-if { (eval echo "$as_me:16092: \"$ac_link\"") >&5
+if { (eval echo "$as_me:16154: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:16095: \$? = $ac_status" >&5
+  echo "$as_me:16157: \$? = $ac_status" >&5

   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'

-  { (eval echo "$as_me:16097: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16159: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:16100: \$? = $ac_status" >&5
+  echo "$as_me:16162: \$? = $ac_status" >&5

   (exit "$ac_status"); }; }; then
   ac_cv_sizeof_signed_char=`cat conftest.val`
 else
   (exit "$ac_status"); }; }; then
   ac_cv_sizeof_signed_char=`cat conftest.val`
 else


@@ -16113,19 +16175,19 @@ else
   ac_cv_sizeof_signed_char=0
 fi
 fi
   ac_cv_sizeof_signed_char=0
 fi
 fi

-echo "$as_me:16116: result: $ac_cv_sizeof_signed_char" >&5
+echo "$as_me:16178: 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 "${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:16122: checking for ANSI C header files" >&5
+echo "$as_me:16184: 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
 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 16128 "configure"
+#line 16190 "configure"

 #include "confdefs.h"
 #include <stdlib.h>
 #include <stdarg.h>
 #include "confdefs.h"
 #include <stdlib.h>
 #include <stdarg.h>


@@ -16133,13 +16195,13 @@ else
 #include <float.h>
 
 _ACEOF
 #include <float.h>
 
 _ACEOF

-if { (eval echo "$as_me:16136: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:16198: \"$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
   (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:16142: \$? = $ac_status" >&5
+  echo "$as_me:16204: \$? = $ac_status" >&5

   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag


@@ -16161,7 +16223,7 @@ rm -f conftest.err "conftest.$ac_ext"
 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
 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 16164 "configure"
+#line 16226 "configure"

 #include "confdefs.h"
 #include <string.h>
 
 #include "confdefs.h"
 #include <string.h>
 


@@ -16179,7 +16241,7 @@ fi
 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
 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 16182 "configure"
+#line 16244 "configure"

 #include "confdefs.h"
 #include <stdlib.h>
 
 #include "confdefs.h"
 #include <stdlib.h>
 


@@ -16200,7 +16262,7 @@ if test $ac_cv_header_stdc = yes; then
   :
 else
   cat >"conftest.$ac_ext" <<_ACEOF
   :
 else
   cat >"conftest.$ac_ext" <<_ACEOF

-#line 16203 "configure"
+#line 16265 "configure"

 #include "confdefs.h"
 #include <ctype.h>
 #if ((' ' & 0x0FF) == 0x020)
 #include "confdefs.h"
 #include <ctype.h>
 #if ((' ' & 0x0FF) == 0x020)


@@ -16226,15 +16288,15 @@ main (void)
 }
 _ACEOF
 rm -f "conftest$ac_exeext"
 }
 _ACEOF
 rm -f "conftest$ac_exeext"

-if { (eval echo "$as_me:16229: \"$ac_link\"") >&5
+if { (eval echo "$as_me:16291: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:16232: \$? = $ac_status" >&5
+  echo "$as_me:16294: \$? = $ac_status" >&5

   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'

-  { (eval echo "$as_me:16234: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16296: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:16237: \$? = $ac_status" >&5
+  echo "$as_me:16299: \$? = $ac_status" >&5

   (exit "$ac_status"); }; }; then
   :
 else
   (exit "$ac_status"); }; }; then
   :
 else


@@ -16247,7 +16309,7 @@ rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftes
 fi
 fi
 fi
 fi
 fi
 fi

-echo "$as_me:16250: result: $ac_cv_header_stdc" >&5
+echo "$as_me:16312: result: $ac_cv_header_stdc" >&5

 echo "${ECHO_T}$ac_cv_header_stdc" >&6
 if test $ac_cv_header_stdc = yes; then
 
 echo "${ECHO_T}$ac_cv_header_stdc" >&6
 if test $ac_cv_header_stdc = yes; then
 


@@ -16260,13 +16322,13 @@ fi
 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`
 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:16263: checking for $ac_hdr that defines DIR" >&5
+echo "$as_me:16325: 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
 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 16269 "configure"
+#line 16331 "configure"

 #include "confdefs.h"
 #include <sys/types.h>
 #include <$ac_hdr>
 #include "confdefs.h"
 #include <sys/types.h>
 #include <$ac_hdr>


@@ -16281,16 +16343,16 @@ return 0;
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
 }
 _ACEOF
 rm -f "conftest.$ac_objext"

-if { (eval echo "$as_me:16284: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:16346: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:16287: \$? = $ac_status" >&5
+  echo "$as_me:16349: \$? = $ac_status" >&5

   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'

-  { (eval echo "$as_me:16290: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16352: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:16293: \$? = $ac_status" >&5
+  echo "$as_me:16355: \$? = $ac_status" >&5

   (exit "$ac_status"); }; }; then
   eval "$as_ac_Header=yes"
 else
   (exit "$ac_status"); }; }; then
   eval "$as_ac_Header=yes"
 else


@@ -16300,7 +16362,7 @@ eval "$as_ac_Header=no"
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi

-echo "$as_me:16303: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:16365: 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
 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6
 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then
   cat >>confdefs.h <<EOF


@@ -16313,7 +16375,7 @@ fi
 done
 # Two versions of opendir et al. are in -ldir and -lx on SCO Xenix.
 if test $ac_header_dirent = dirent.h; then
 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:16316: checking for opendir in -ldir" >&5
+  echo "$as_me:16378: 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
 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


@@ -16321,7 +16383,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldir  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldir  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF

-#line 16324 "configure"
+#line 16386 "configure"

 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */


@@ -16340,16 +16402,16 @@ opendir ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"

-if { (eval echo "$as_me:16343: \"$ac_link\"") >&5
+if { (eval echo "$as_me:16405: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:16346: \$? = $ac_status" >&5
+  echo "$as_me:16408: \$? = $ac_status" >&5

   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'

-  { (eval echo "$as_me:16349: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16411: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:16352: \$? = $ac_status" >&5
+  echo "$as_me:16414: \$? = $ac_status" >&5

   (exit "$ac_status"); }; }; then
   ac_cv_lib_dir_opendir=yes
 else
   (exit "$ac_status"); }; }; then
   ac_cv_lib_dir_opendir=yes
 else


@@ -16360,14 +16422,14 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi

-echo "$as_me:16363: result: $ac_cv_lib_dir_opendir" >&5
+echo "$as_me:16425: 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 "${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:16370: checking for opendir in -lx" >&5
+  echo "$as_me:16432: 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
 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


@@ -16375,7 +16437,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lx  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lx  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF

-#line 16378 "configure"
+#line 16440 "configure"

 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */


@@ -16394,16 +16456,16 @@ opendir ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"

-if { (eval echo "$as_me:16397: \"$ac_link\"") >&5
+if { (eval echo "$as_me:16459: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:16400: \$? = $ac_status" >&5
+  echo "$as_me:16462: \$? = $ac_status" >&5

   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'

-  { (eval echo "$as_me:16403: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16465: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:16406: \$? = $ac_status" >&5
+  echo "$as_me:16468: \$? = $ac_status" >&5

   (exit "$ac_status"); }; }; then
   ac_cv_lib_x_opendir=yes
 else
   (exit "$ac_status"); }; }; then
   ac_cv_lib_x_opendir=yes
 else


@@ -16414,7 +16476,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi

-echo "$as_me:16417: result: $ac_cv_lib_x_opendir" >&5
+echo "$as_me:16479: 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"
 echo "${ECHO_T}$ac_cv_lib_x_opendir" >&6
 if test "$ac_cv_lib_x_opendir" = yes; then
   LIBS="$LIBS -lx"


@@ -16422,13 +16484,13 @@ fi
 
 fi
 
 
 fi
 

-echo "$as_me:16425: checking whether time.h and sys/time.h may both be included" >&5
+echo "$as_me:16487: 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
 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 16431 "configure"
+#line 16493 "configure"

 #include "confdefs.h"
 #include <sys/types.h>
 #include <sys/time.h>
 #include "confdefs.h"
 #include <sys/types.h>
 #include <sys/time.h>


@@ -16444,16 +16506,16 @@ return 0;
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
 }
 _ACEOF
 rm -f "conftest.$ac_objext"

-if { (eval echo "$as_me:16447: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:16509: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:16450: \$? = $ac_status" >&5
+  echo "$as_me:16512: \$? = $ac_status" >&5

   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'

-  { (eval echo "$as_me:16453: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16515: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:16456: \$? = $ac_status" >&5
+  echo "$as_me:16518: \$? = $ac_status" >&5

   (exit "$ac_status"); }; }; then
   ac_cv_header_time=yes
 else
   (exit "$ac_status"); }; }; then
   ac_cv_header_time=yes
 else


@@ -16463,7 +16525,7 @@ ac_cv_header_time=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi

-echo "$as_me:16466: result: $ac_cv_header_time" >&5
+echo "$as_me:16528: result: $ac_cv_header_time" >&5

 echo "${ECHO_T}$ac_cv_header_time" >&6
 if test $ac_cv_header_time = yes; then
 
 echo "${ECHO_T}$ac_cv_header_time" >&6
 if test $ac_cv_header_time = yes; then
 


@@ -16481,13 +16543,13 @@ ac_link='$CC -o "conftest$ac_exeext" $CFLAGS $CPPFLAGS $LDFLAGS "conftest.$ac_ex
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 ac_main_return="return"
 
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 ac_main_return="return"
 

-echo "$as_me:16484: checking for an ANSI C-conforming const" >&5
+echo "$as_me:16546: 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
 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 16490 "configure"
+#line 16552 "configure"

 #include "confdefs.h"
 
 int
 #include "confdefs.h"
 
 int


@@ -16545,16 +16607,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
 }
 _ACEOF
 rm -f "conftest.$ac_objext"

-if { (eval echo "$as_me:16548: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:16610: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:16551: \$? = $ac_status" >&5
+  echo "$as_me:16613: \$? = $ac_status" >&5

   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'

-  { (eval echo "$as_me:16554: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16616: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:16557: \$? = $ac_status" >&5
+  echo "$as_me:16619: \$? = $ac_status" >&5

   (exit "$ac_status"); }; }; then
   ac_cv_c_const=yes
 else
   (exit "$ac_status"); }; }; then
   ac_cv_c_const=yes
 else


@@ -16564,7 +16626,7 @@ ac_cv_c_const=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi

-echo "$as_me:16567: result: $ac_cv_c_const" >&5
+echo "$as_me:16629: result: $ac_cv_c_const" >&5

 echo "${ECHO_T}$ac_cv_c_const" >&6
 if test $ac_cv_c_const = no; then
 
 echo "${ECHO_T}$ac_cv_c_const" >&6
 if test $ac_cv_c_const = no; then
 


@@ -16576,7 +16638,7 @@ fi
 
 ###    Checks for external-data
 
 
 ###    Checks for external-data
 

-echo "$as_me:16579: checking if data-only library module links" >&5
+echo "$as_me:16641: 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
 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


@@ -16584,20 +16646,20 @@ else
 
        rm -f conftest.a
        cat >conftest.$ac_ext <<EOF
 
        rm -f conftest.a
        cat >conftest.$ac_ext <<EOF

-#line 16587 "configure"
+#line 16649 "configure"

 int    testdata[3] = { 123, 456, 789 };
 EOF
 int    testdata[3] = { 123, 456, 789 };
 EOF

-       if { (eval echo "$as_me:16590: \"$ac_compile\"") >&5
+       if { (eval echo "$as_me:16652: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:16593: \$? = $ac_status" >&5
+  echo "$as_me:16655: \$? = $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
   (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 16600 "configure"
+#line 16662 "configure"

 int    testfunc(void)
 {
 #if defined(NeXT)
 int    testfunc(void)
 {
 #if defined(NeXT)


@@ -16610,10 +16672,10 @@ int   testfunc(void)
 #endif
 }
 EOF
 #endif
 }
 EOF

-       if { (eval echo "$as_me:16613: \"$ac_compile\"") >&5
+       if { (eval echo "$as_me:16675: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:16616: \$? = $ac_status" >&5
+  echo "$as_me:16678: \$? = $ac_status" >&5

   (exit "$ac_status"); }; then
                mv conftest.o func.o && \
                ( $AR $ARFLAGS conftest.a func.o ) 2>&5 1>/dev/null
   (exit "$ac_status"); }; then
                mv conftest.o func.o && \
                ( $AR $ARFLAGS conftest.a func.o ) 2>&5 1>/dev/null


@@ -16626,7 +16688,7 @@ EOF
   cf_cv_link_dataonly=unknown
 else
   cat >"conftest.$ac_ext" <<_ACEOF
   cf_cv_link_dataonly=unknown
 else
   cat >"conftest.$ac_ext" <<_ACEOF

-#line 16629 "configure"
+#line 16691 "configure"

 #include "confdefs.h"
 
        int main(void)
 #include "confdefs.h"
 
        int main(void)


@@ -16637,15 +16699,15 @@ else
 
 _ACEOF
 rm -f "conftest$ac_exeext"
 
 _ACEOF
 rm -f "conftest$ac_exeext"

-if { (eval echo "$as_me:16640: \"$ac_link\"") >&5
+if { (eval echo "$as_me:16702: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:16643: \$? = $ac_status" >&5
+  echo "$as_me:16705: \$? = $ac_status" >&5

   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'

-  { (eval echo "$as_me:16645: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16707: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:16648: \$? = $ac_status" >&5
+  echo "$as_me:16710: \$? = $ac_status" >&5

   (exit "$ac_status"); }; }; then
   cf_cv_link_dataonly=yes
 else
   (exit "$ac_status"); }; }; then
   cf_cv_link_dataonly=yes
 else


@@ -16660,7 +16722,7 @@ fi
 
 fi
 
 
 fi
 

-echo "$as_me:16663: result: $cf_cv_link_dataonly" >&5
+echo "$as_me:16725: result: $cf_cv_link_dataonly" >&5

 echo "${ECHO_T}$cf_cv_link_dataonly" >&6
 
 if test "$cf_cv_link_dataonly" = no ; then
 echo "${ECHO_T}$cf_cv_link_dataonly" >&6
 
 if test "$cf_cv_link_dataonly" = no ; then


@@ -16679,23 +16741,23 @@ unistd.h \
 
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
 
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`

-echo "$as_me:16682: checking for $ac_header" >&5
+echo "$as_me:16744: 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
 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 16688 "configure"
+#line 16750 "configure"

 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF

-if { (eval echo "$as_me:16692: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:16754: \"$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
   (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:16698: \$? = $ac_status" >&5
+  echo "$as_me:16760: \$? = $ac_status" >&5

   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag


@@ -16714,7 +16776,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi

-echo "$as_me:16717: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:16779: 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
 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6
 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then
   cat >>confdefs.h <<EOF


@@ -16724,7 +16786,7 @@ EOF
 fi
 done
 
 fi
 done
 

-echo "$as_me:16727: checking for working mkstemp" >&5
+echo "$as_me:16789: 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
 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


@@ -16735,7 +16797,7 @@ if test "$cross_compiling" = yes; then
   cf_cv_func_mkstemp=maybe
 else
   cat >"conftest.$ac_ext" <<_ACEOF
   cf_cv_func_mkstemp=maybe
 else
   cat >"conftest.$ac_ext" <<_ACEOF

-#line 16738 "configure"
+#line 16800 "configure"

 #include "confdefs.h"
 
 #include <sys/types.h>
 #include "confdefs.h"
 
 #include <sys/types.h>


@@ -16776,15 +16838,15 @@ int main(void)
 
 _ACEOF
 rm -f "conftest$ac_exeext"
 
 _ACEOF
 rm -f "conftest$ac_exeext"

-if { (eval echo "$as_me:16779: \"$ac_link\"") >&5
+if { (eval echo "$as_me:16841: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:16782: \$? = $ac_status" >&5
+  echo "$as_me:16844: \$? = $ac_status" >&5

   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'

-  { (eval echo "$as_me:16784: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16846: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:16787: \$? = $ac_status" >&5
+  echo "$as_me:16849: \$? = $ac_status" >&5

   (exit "$ac_status"); }; }; then
   cf_cv_func_mkstemp=yes
 
   (exit "$ac_status"); }; }; then
   cf_cv_func_mkstemp=yes
 


@@ -16799,16 +16861,16 @@ rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftes
 fi
 
 fi
 fi
 
 fi

-echo "$as_me:16802: result: $cf_cv_func_mkstemp" >&5
+echo "$as_me:16864: result: $cf_cv_func_mkstemp" >&5

 echo "${ECHO_T}$cf_cv_func_mkstemp" >&6
 if test "x$cf_cv_func_mkstemp" = xmaybe ; then
 echo "${ECHO_T}$cf_cv_func_mkstemp" >&6
 if test "x$cf_cv_func_mkstemp" = xmaybe ; then

-       echo "$as_me:16805: checking for mkstemp" >&5
+       echo "$as_me:16867: 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
 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 16811 "configure"
+#line 16873 "configure"

 #include "confdefs.h"
 #define mkstemp autoconf_temporary
 #include <limits.h>    /* least-intrusive standard header which defines gcc2 __stub macros */
 #include "confdefs.h"
 #define mkstemp autoconf_temporary
 #include <limits.h>    /* least-intrusive standard header which defines gcc2 __stub macros */


@@ -16839,16 +16901,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"

-if { (eval echo "$as_me:16842: \"$ac_link\"") >&5
+if { (eval echo "$as_me:16904: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:16845: \$? = $ac_status" >&5
+  echo "$as_me:16907: \$? = $ac_status" >&5

   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'

-  { (eval echo "$as_me:16848: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16910: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:16851: \$? = $ac_status" >&5
+  echo "$as_me:16913: \$? = $ac_status" >&5

   (exit "$ac_status"); }; }; then
   ac_cv_func_mkstemp=yes
 else
   (exit "$ac_status"); }; }; then
   ac_cv_func_mkstemp=yes
 else


@@ -16858,7 +16920,7 @@ ac_cv_func_mkstemp=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi

-echo "$as_me:16861: result: $ac_cv_func_mkstemp" >&5
+echo "$as_me:16923: result: $ac_cv_func_mkstemp" >&5

 echo "${ECHO_T}$ac_cv_func_mkstemp" >&6
 
 fi
 echo "${ECHO_T}$ac_cv_func_mkstemp" >&6
 
 fi


@@ -16887,7 +16949,7 @@ cf_upper_prog_gnat=`echo "${cf_prog_gnat}" | sed y%abcdefghijklmnopqrstuvwxyz./-
        unset cf_TEMP_gnat
        # Extract the first word of "$cf_prog_gnat", so it can be a program name with args.
 set dummy $cf_prog_gnat; ac_word=$2
        unset cf_TEMP_gnat
        # Extract the first word of "$cf_prog_gnat", so it can be a program name with args.
 set dummy $cf_prog_gnat; ac_word=$2

-echo "$as_me:16890: checking for $ac_word" >&5
+echo "$as_me:16952: checking for $ac_word" >&5

 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_path_cf_TEMP_gnat+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_path_cf_TEMP_gnat+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6


@@ -16904,7 +16966,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   if $as_executable_p "$ac_dir/$ac_word"; then
    ac_cv_path_cf_TEMP_gnat="$ac_dir/$ac_word"
   test -z "$ac_dir" && ac_dir=.
   if $as_executable_p "$ac_dir/$ac_word"; then
    ac_cv_path_cf_TEMP_gnat="$ac_dir/$ac_word"

-   echo "$as_me:16907: found $ac_dir/$ac_word" >&5
+   echo "$as_me:16969: found $ac_dir/$ac_word" >&5

    break
 fi
 done
    break
 fi
 done


@@ -16916,10 +16978,10 @@ fi
 cf_TEMP_gnat=$ac_cv_path_cf_TEMP_gnat
 
 if test -n "$cf_TEMP_gnat"; then
 cf_TEMP_gnat=$ac_cv_path_cf_TEMP_gnat
 
 if test -n "$cf_TEMP_gnat"; then

-  echo "$as_me:16919: result: $cf_TEMP_gnat" >&5
+  echo "$as_me:16981: result: $cf_TEMP_gnat" >&5

 echo "${ECHO_T}$cf_TEMP_gnat" >&6
 else
 echo "${ECHO_T}$cf_TEMP_gnat" >&6
 else

-  echo "$as_me:16922: result: no" >&5
+  echo "$as_me:16984: result: no" >&5

 echo "${ECHO_T}no" >&6
 fi
 
 echo "${ECHO_T}no" >&6
 fi
 


@@ -16929,7 +16991,7 @@ fi
                unset cf_cv_gnat_version
                unset cf_TEMP_gnat
 
                unset cf_cv_gnat_version
                unset cf_TEMP_gnat
 

-echo "$as_me:16932: checking for $cf_prog_gnat version" >&5
+echo "$as_me:16994: checking for $cf_prog_gnat version" >&5

 echo $ECHO_N "checking for $cf_prog_gnat version... $ECHO_C" >&6
 if test "${cf_cv_gnat_version+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 echo $ECHO_N "checking for $cf_prog_gnat version... $ECHO_C" >&6
 if test "${cf_cv_gnat_version+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6


@@ -16940,7 +17002,7 @@ cf_cv_gnat_version=`$cf_prog_gnat --version 2>&1 | \
        sed -e '2,$d' -e 's/[^0-9 \.]//g' -e 's/^[ ]*//' -e 's/ .*//'`
 
 fi
        sed -e '2,$d' -e 's/[^0-9 \.]//g' -e 's/^[ ]*//' -e 's/ .*//'`
 
 fi

-echo "$as_me:16943: result: $cf_cv_gnat_version" >&5
+echo "$as_me:17005: result: $cf_cv_gnat_version" >&5

 echo "${ECHO_T}$cf_cv_gnat_version" >&6
 test -z "$cf_cv_gnat_version" && cf_cv_gnat_version=no
 eval cf_TEMP_gnat=$cf_cv_gnat_version; unset cf_cv_gnat_version
 echo "${ECHO_T}$cf_cv_gnat_version" >&6
 test -z "$cf_cv_gnat_version" && cf_cv_gnat_version=no
 eval cf_TEMP_gnat=$cf_cv_gnat_version; unset cf_cv_gnat_version


@@ -16969,7 +17031,7 @@ else
                        cd conftest.src
                        for cf_gprconfig in Ada C
                        do
                        cd conftest.src
                        for cf_gprconfig in Ada C
                        do

-                               echo "$as_me:16972: checking for gprconfig name for $cf_gprconfig" >&5
+                               echo "$as_me:17034: checking for gprconfig name for $cf_gprconfig" >&5

 echo $ECHO_N "checking for gprconfig name for $cf_gprconfig... $ECHO_C" >&6
                                if test "$cf_gprconfig" = C
                                then
 echo $ECHO_N "checking for gprconfig name for $cf_gprconfig... $ECHO_C" >&6
                                if test "$cf_gprconfig" = C
                                then


@@ -16988,10 +17050,10 @@ echo $ECHO_N "checking for gprconfig name for $cf_gprconfig... $ECHO_C" >&6
                                if test -n "$cf_gprconfig_value"
                                then
                                        eval "cf_ada_config_$cf_gprconfig=$cf_gprconfig_value"
                                if test -n "$cf_gprconfig_value"
                                then
                                        eval "cf_ada_config_$cf_gprconfig=$cf_gprconfig_value"

-                                       echo "$as_me:16991: result: $cf_gprconfig_value" >&5
+                                       echo "$as_me:17053: result: $cf_gprconfig_value" >&5

 echo "${ECHO_T}$cf_gprconfig_value" >&6
                                else
 echo "${ECHO_T}$cf_gprconfig_value" >&6
                                else

-                                       echo "$as_me:16994: result: missing" >&5
+                                       echo "$as_me:17056: result: missing" >&5

 echo "${ECHO_T}missing" >&6
                                        cf_ada_config="#"
                                        break
 echo "${ECHO_T}missing" >&6
                                        cf_ada_config="#"
                                        break


@@ -17004,7 +17066,7 @@ echo "${ECHO_T}missing" >&6
        if test "x$cf_ada_config" != "x#"
        then
 
        if test "x$cf_ada_config" != "x#"
        then
 

-echo "$as_me:17007: checking for gnat version" >&5
+echo "$as_me:17069: checking for gnat version" >&5

 echo $ECHO_N "checking for gnat version... $ECHO_C" >&6
 if test "${cf_cv_gnat_version+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 echo $ECHO_N "checking for gnat version... $ECHO_C" >&6
 if test "${cf_cv_gnat_version+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6


@@ -17015,7 +17077,7 @@ cf_cv_gnat_version=`${cf_ada_make:-gnatmake} --version 2>&1 | \
        sed -e '2,$d' -e 's/[^0-9 \.]//g' -e 's/^[ ]*//' -e 's/ .*//'`
 
 fi
        sed -e '2,$d' -e 's/[^0-9 \.]//g' -e 's/^[ ]*//' -e 's/ .*//'`
 
 fi

-echo "$as_me:17018: result: $cf_cv_gnat_version" >&5
+echo "$as_me:17080: result: $cf_cv_gnat_version" >&5

 echo "${ECHO_T}$cf_cv_gnat_version" >&6
 test -z "$cf_cv_gnat_version" && cf_cv_gnat_version=no
 
 echo "${ECHO_T}$cf_cv_gnat_version" >&6
 test -z "$cf_cv_gnat_version" && cf_cv_gnat_version=no
 


@@ -17024,7 +17086,7 @@ case "$cf_cv_gnat_version" in
        cf_cv_prog_gnat_correct=yes
        ;;
 (*)
        cf_cv_prog_gnat_correct=yes
        ;;
 (*)

-       { echo "$as_me:17027: WARNING: Unsupported GNAT version $cf_cv_gnat_version. We require 3.11 or better. Disabling Ada95 binding." >&5
+       { echo "$as_me:17089: WARNING: Unsupported GNAT version $cf_cv_gnat_version. We require 3.11 or better. Disabling Ada95 binding." >&5

 echo "$as_me: WARNING: Unsupported GNAT version $cf_cv_gnat_version. We require 3.11 or better. Disabling Ada95 binding." >&2;}
        cf_cv_prog_gnat_correct=no
        ;;
 echo "$as_me: WARNING: Unsupported GNAT version $cf_cv_gnat_version. We require 3.11 or better. Disabling Ada95 binding." >&2;}
        cf_cv_prog_gnat_correct=no
        ;;


@@ -17032,7 +17094,7 @@ esac
 
                # Extract the first word of "m4", so it can be a program name with args.
 set dummy m4; ac_word=$2
 
                # Extract the first word of "m4", so it can be a program name with args.
 set dummy m4; ac_word=$2

-echo "$as_me:17035: checking for $ac_word" >&5
+echo "$as_me:17097: 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
 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


@@ -17047,7 +17109,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_M4_exists="yes"
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_M4_exists="yes"

-echo "$as_me:17050: found $ac_dir/$ac_word" >&5
+echo "$as_me:17112: found $ac_dir/$ac_word" >&5

 break
 done
 
 break
 done
 


@@ -17056,20 +17118,20 @@ fi
 fi
 M4_exists=$ac_cv_prog_M4_exists
 if test -n "$M4_exists"; then
 fi
 M4_exists=$ac_cv_prog_M4_exists
 if test -n "$M4_exists"; then

-  echo "$as_me:17059: result: $M4_exists" >&5
+  echo "$as_me:17121: result: $M4_exists" >&5

 echo "${ECHO_T}$M4_exists" >&6
 else
 echo "${ECHO_T}$M4_exists" >&6
 else

-  echo "$as_me:17062: result: no" >&5
+  echo "$as_me:17124: result: no" >&5

 echo "${ECHO_T}no" >&6
 fi
 
                if test "$ac_cv_prog_M4_exists" = no; then
                        cf_cv_prog_gnat_correct=no
 echo "${ECHO_T}no" >&6
 fi
 
                if test "$ac_cv_prog_M4_exists" = no; then
                        cf_cv_prog_gnat_correct=no

-                       { echo "$as_me:17068: WARNING: Ada95 binding required program m4 not found. Ada95 binding disabled" >&5
+                       { echo "$as_me:17130: WARNING: Ada95 binding required program m4 not found. Ada95 binding disabled" >&5

 echo "$as_me: WARNING: Ada95 binding required program m4 not found. Ada95 binding disabled" >&2;}
                fi
                if test "$cf_cv_prog_gnat_correct" = yes; then
 echo "$as_me: WARNING: Ada95 binding required program m4 not found. Ada95 binding disabled" >&2;}
                fi
                if test "$cf_cv_prog_gnat_correct" = yes; then

-                       echo "$as_me:17072: checking if GNAT works" >&5
+                       echo "$as_me:17134: checking if GNAT works" >&5

 echo $ECHO_N "checking if GNAT works... $ECHO_C" >&6
 
 rm -rf ./conftest* ./*~conftest*
 echo $ECHO_N "checking if GNAT works... $ECHO_C" >&6
 
 rm -rf ./conftest* ./*~conftest*


@@ -17097,7 +17159,7 @@ else
 fi
 rm -rf ./conftest* ./*~conftest*
 
 fi
 rm -rf ./conftest* ./*~conftest*
 

-                       echo "$as_me:17100: result: $cf_cv_prog_gnat_correct" >&5
+                       echo "$as_me:17162: result: $cf_cv_prog_gnat_correct" >&5

 echo "${ECHO_T}$cf_cv_prog_gnat_correct" >&6
                fi
        else
 echo "${ECHO_T}$cf_cv_prog_gnat_correct" >&6
                fi
        else


@@ -17107,7 +17169,7 @@ fi
 
        if test "$cf_cv_prog_gnat_correct" = yes; then
 
 
        if test "$cf_cv_prog_gnat_correct" = yes; then
 

-       echo "$as_me:17110: checking optimization options for ADAFLAGS" >&5
+       echo "$as_me:17172: checking optimization options for ADAFLAGS" >&5

 echo $ECHO_N "checking optimization options for ADAFLAGS... $ECHO_C" >&6
        case "$CFLAGS" in
        (*-g*)
 echo $ECHO_N "checking optimization options for ADAFLAGS... $ECHO_C" >&6
        case "$CFLAGS" in
        (*-g*)


@@ -17124,10 +17186,10 @@ echo $ECHO_N "checking optimization options for ADAFLAGS... $ECHO_C" >&6
 
                ;;
        esac
 
                ;;
        esac

-       echo "$as_me:17127: result: $ADAFLAGS" >&5
+       echo "$as_me:17189: result: $ADAFLAGS" >&5

 echo "${ECHO_T}$ADAFLAGS" >&6
 
 echo "${ECHO_T}$ADAFLAGS" >&6
 

-echo "$as_me:17130: checking if GNATPREP supports -T option" >&5
+echo "$as_me:17192: 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
 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


@@ -17137,11 +17199,11 @@ cf_cv_gnatprep_opt_t=no
 gnatprep -T 2>/dev/null >/dev/null && cf_cv_gnatprep_opt_t=yes
 
 fi
 gnatprep -T 2>/dev/null >/dev/null && cf_cv_gnatprep_opt_t=yes
 
 fi

-echo "$as_me:17140: result: $cf_cv_gnatprep_opt_t" >&5
+echo "$as_me:17202: 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 "${ECHO_T}$cf_cv_gnatprep_opt_t" >&6
 test "$cf_cv_gnatprep_opt_t" = yes && GNATPREP_OPTS="-T $GNATPREP_OPTS"
 

-echo "$as_me:17144: checking if GNAT supports generics" >&5
+echo "$as_me:17206: checking if GNAT supports generics" >&5

 echo $ECHO_N "checking if GNAT supports generics... $ECHO_C" >&6
 case "$cf_cv_gnat_version" in
 (3.1[1-9]*|3.[2-9]*|[4-9].*|[1-9][0-9].[0-9]*|20[0-9][0-9])
 echo $ECHO_N "checking if GNAT supports generics... $ECHO_C" >&6
 case "$cf_cv_gnat_version" in
 (3.1[1-9]*|3.[2-9]*|[4-9].*|[1-9][0-9].[0-9]*|20[0-9][0-9])


@@ -17151,7 +17213,7 @@ case "$cf_cv_gnat_version" in
        cf_gnat_generics=no
        ;;
 esac
        cf_gnat_generics=no
        ;;
 esac

-echo "$as_me:17154: result: $cf_gnat_generics" >&5
+echo "$as_me:17216: result: $cf_gnat_generics" >&5

 echo "${ECHO_T}$cf_gnat_generics" >&6
 
 if test "$cf_gnat_generics" = yes
 echo "${ECHO_T}$cf_gnat_generics" >&6
 
 if test "$cf_gnat_generics" = yes


@@ -17163,7 +17225,7 @@ else
        cf_generic_objects=
 fi
 
        cf_generic_objects=
 fi
 

-echo "$as_me:17166: checking if GNAT supports SIGINT" >&5
+echo "$as_me:17228: 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
 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


@@ -17211,7 +17273,7 @@ fi
 rm -rf ./conftest* ./*~conftest*
 
 fi
 rm -rf ./conftest* ./*~conftest*
 
 fi

-echo "$as_me:17214: result: $cf_cv_gnat_sigint" >&5
+echo "$as_me:17276: result: $cf_cv_gnat_sigint" >&5

 echo "${ECHO_T}$cf_cv_gnat_sigint" >&6
 
 if test "$cf_cv_gnat_sigint" = yes ; then
 echo "${ECHO_T}$cf_cv_gnat_sigint" >&6
 
 if test "$cf_cv_gnat_sigint" = yes ; then


@@ -17224,7 +17286,7 @@ cf_gnat_libraries=no
 cf_gnat_projects=no
 
 if test "$enable_gnat_projects" != no ; then
 cf_gnat_projects=no
 
 if test "$enable_gnat_projects" != no ; then

-echo "$as_me:17227: checking if GNAT supports project files" >&5
+echo "$as_me:17289: checking if GNAT supports project files" >&5

 echo $ECHO_N "checking if GNAT supports project files... $ECHO_C" >&6
 case "$cf_cv_gnat_version" in
 (3.[0-9]*)
 echo $ECHO_N "checking if GNAT supports project files... $ECHO_C" >&6
 case "$cf_cv_gnat_version" in
 (3.[0-9]*)


@@ -17287,15 +17349,15 @@ CF_EOF
        esac
        ;;
 esac
        esac
        ;;
 esac

-echo "$as_me:17290: result: $cf_gnat_projects" >&5
+echo "$as_me:17352: result: $cf_gnat_projects" >&5

 echo "${ECHO_T}$cf_gnat_projects" >&6
 fi # enable_gnat_projects
 
 if test "$cf_gnat_projects" = yes
 then
 echo "${ECHO_T}$cf_gnat_projects" >&6
 fi # enable_gnat_projects
 
 if test "$cf_gnat_projects" = yes
 then

-       echo "$as_me:17296: checking if GNAT supports libraries" >&5
+       echo "$as_me:17358: checking if GNAT supports libraries" >&5

 echo $ECHO_N "checking if GNAT supports libraries... $ECHO_C" >&6
 echo $ECHO_N "checking if GNAT supports libraries... $ECHO_C" >&6

-       echo "$as_me:17298: result: $cf_gnat_libraries" >&5
+       echo "$as_me:17360: result: $cf_gnat_libraries" >&5

 echo "${ECHO_T}$cf_gnat_libraries" >&6
 fi
 
 echo "${ECHO_T}$cf_gnat_libraries" >&6
 fi
 


@@ -17315,7 +17377,7 @@ then
        then
                USE_GNAT_MAKE_GPR=""
        else
        then
                USE_GNAT_MAKE_GPR=""
        else

-               { echo "$as_me:17318: WARNING: use old makefile rules since tools are missing" >&5
+               { echo "$as_me:17380: WARNING: use old makefile rules since tools are missing" >&5

 echo "$as_me: WARNING: use old makefile rules since tools are missing" >&2;}
        fi
 fi
 echo "$as_me: WARNING: use old makefile rules since tools are missing" >&2;}
        fi
 fi


@@ -17327,7 +17389,7 @@ else
        USE_GNAT_LIBRARIES="#"
 fi
 
        USE_GNAT_LIBRARIES="#"
 fi
 

-echo "$as_me:17330: checking for ada-compiler" >&5
+echo "$as_me:17392: 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.
 echo $ECHO_N "checking for ada-compiler... $ECHO_C" >&6
 
 # Check whether --with-ada-compiler or --without-ada-compiler was given.


@@ -17338,12 +17400,12 @@ else
   cf_ada_compiler=gnatmake
 fi;
 
   cf_ada_compiler=gnatmake
 fi;
 

-echo "$as_me:17341: result: $cf_ada_compiler" >&5
+echo "$as_me:17403: result: $cf_ada_compiler" >&5

 echo "${ECHO_T}$cf_ada_compiler" >&6
 
                cf_ada_package=terminal_interface
 
 echo "${ECHO_T}$cf_ada_compiler" >&6
 
                cf_ada_package=terminal_interface
 

-echo "$as_me:17346: checking for ada-include" >&5
+echo "$as_me:17408: 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.
 echo $ECHO_N "checking for ada-include... $ECHO_C" >&6
 
 # Check whether --with-ada-include or --without-ada-include was given.


@@ -17379,7 +17441,7 @@ case ".$withval" in
        withval=`echo "$withval" | sed -e s%NONE%$cf_path_syntax%`
        ;;
 (*)
        withval=`echo "$withval" | sed -e s%NONE%$cf_path_syntax%`
        ;;
 (*)

-       { { echo "$as_me:17382: error: expected a pathname, not \"$withval\"" >&5
+       { { echo "$as_me:17444: error: expected a pathname, not \"$withval\"" >&5

 echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
    { (exit 1); exit 1; }; }
        ;;
 echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
    { (exit 1); exit 1; }; }
        ;;


@@ -17388,10 +17450,10 @@ esac
 fi
 eval ADA_INCLUDE="$withval"
 
 fi
 eval ADA_INCLUDE="$withval"
 

-echo "$as_me:17391: result: $ADA_INCLUDE" >&5
+echo "$as_me:17453: result: $ADA_INCLUDE" >&5

 echo "${ECHO_T}$ADA_INCLUDE" >&6
 
 echo "${ECHO_T}$ADA_INCLUDE" >&6
 

-echo "$as_me:17394: checking for ada-objects" >&5
+echo "$as_me:17456: 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.
 echo $ECHO_N "checking for ada-objects... $ECHO_C" >&6
 
 # Check whether --with-ada-objects or --without-ada-objects was given.


@@ -17427,7 +17489,7 @@ case ".$withval" in
        withval=`echo "$withval" | sed -e s%NONE%$cf_path_syntax%`
        ;;
 (*)
        withval=`echo "$withval" | sed -e s%NONE%$cf_path_syntax%`
        ;;
 (*)

-       { { echo "$as_me:17430: error: expected a pathname, not \"$withval\"" >&5
+       { { echo "$as_me:17492: error: expected a pathname, not \"$withval\"" >&5

 echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
    { (exit 1); exit 1; }; }
        ;;
 echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
    { (exit 1); exit 1; }; }
        ;;


@@ -17436,10 +17498,10 @@ esac
 fi
 eval ADA_OBJECTS="$withval"
 
 fi
 eval ADA_OBJECTS="$withval"
 

-echo "$as_me:17439: result: $ADA_OBJECTS" >&5
+echo "$as_me:17501: result: $ADA_OBJECTS" >&5

 echo "${ECHO_T}$ADA_OBJECTS" >&6
 
 echo "${ECHO_T}$ADA_OBJECTS" >&6
 

-echo "$as_me:17442: checking if an Ada95 shared-library should be built" >&5
+echo "$as_me:17504: 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.
 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.


@@ -17449,14 +17511,14 @@ if test "${with_ada_sharedlib+set}" = set; then
 else
   with_ada_sharedlib=no
 fi;
 else
   with_ada_sharedlib=no
 fi;

-echo "$as_me:17452: result: $with_ada_sharedlib" >&5
+echo "$as_me:17514: result: $with_ada_sharedlib" >&5

 echo "${ECHO_T}$with_ada_sharedlib" >&6
 
 if test "x$with_ada_sharedlib" != xno
 then
        if test "x$cf_gnat_projects" != xyes
        then
 echo "${ECHO_T}$with_ada_sharedlib" >&6
 
 if test "x$with_ada_sharedlib" != xno
 then
        if test "x$cf_gnat_projects" != xyes
        then

-               { echo "$as_me:17459: WARNING: disabling shared-library since GNAT projects are not supported" >&5
+               { echo "$as_me:17521: WARNING: disabling shared-library since GNAT projects are not supported" >&5

 echo "$as_me: WARNING: disabling shared-library since GNAT projects are not supported" >&2;}
                with_ada_sharedlib=no
        fi
 echo "$as_me: WARNING: disabling shared-library since GNAT projects are not supported" >&2;}
                with_ada_sharedlib=no
        fi


@@ -17476,7 +17538,7 @@ fi
 
                # allow the Ada binding to be renamed
 
 
                # allow the Ada binding to be renamed
 

-echo "$as_me:17479: checking for ada-libname" >&5
+echo "$as_me:17541: checking for ada-libname" >&5

 echo $ECHO_N "checking for ada-libname... $ECHO_C" >&6
 
 # Check whether --with-ada-libname or --without-ada-libname was given.
 echo $ECHO_N "checking for ada-libname... $ECHO_C" >&6
 
 # Check whether --with-ada-libname or --without-ada-libname was given.


@@ -17492,16 +17554,16 @@ case "x$ADA_LIBNAME" in
        ;;
 esac
 
        ;;
 esac
 

-echo "$as_me:17495: result: $ADA_LIBNAME" >&5
+echo "$as_me:17557: result: $ADA_LIBNAME" >&5

 echo "${ECHO_T}$ADA_LIBNAME" >&6
 
        else
 echo "${ECHO_T}$ADA_LIBNAME" >&6
 
        else

-               { { echo "$as_me:17499: error: No usable Ada compiler found" >&5
+               { { echo "$as_me:17561: 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: error: No usable Ada compiler found" >&2;}
    { (exit 1); exit 1; }; }
        fi
 else

-       { { echo "$as_me:17504: error: The Ada compiler is needed for this package" >&5
+       { { echo "$as_me:17566: 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
 echo "$as_me: error: The Ada compiler is needed for this package" >&2;}
    { (exit 1); exit 1; }; }
 fi


@@ -17541,7 +17603,7 @@ elif test "$includedir" != "/usr/include"; then
 fi
 
 ### Build up pieces for makefile rules
 fi
 
 ### Build up pieces for makefile rules

-echo "$as_me:17544: checking default library suffix" >&5
+echo "$as_me:17606: checking default library suffix" >&5

 echo $ECHO_N "checking default library suffix... $ECHO_C" >&6
 
        case $DFT_LWR_MODEL in
 echo $ECHO_N "checking default library suffix... $ECHO_C" >&6
 
        case $DFT_LWR_MODEL in


@@ -17552,10 +17614,10 @@ echo $ECHO_N "checking default library suffix... $ECHO_C" >&6
        (shared)  DFT_ARG_SUFFIX=''   ;;
        esac
        test -n "$LIB_SUFFIX" && DFT_ARG_SUFFIX="${LIB_SUFFIX}${DFT_ARG_SUFFIX}"
        (shared)  DFT_ARG_SUFFIX=''   ;;
        esac
        test -n "$LIB_SUFFIX" && DFT_ARG_SUFFIX="${LIB_SUFFIX}${DFT_ARG_SUFFIX}"

-echo "$as_me:17555: result: $DFT_ARG_SUFFIX" >&5
+echo "$as_me:17617: result: $DFT_ARG_SUFFIX" >&5

 echo "${ECHO_T}$DFT_ARG_SUFFIX" >&6
 
 echo "${ECHO_T}$DFT_ARG_SUFFIX" >&6
 

-echo "$as_me:17558: checking default library-dependency suffix" >&5
+echo "$as_me:17620: checking default library-dependency suffix" >&5

 echo $ECHO_N "checking default library-dependency suffix... $ECHO_C" >&6
 
        case X$DFT_LWR_MODEL in
 echo $ECHO_N "checking default library-dependency suffix... $ECHO_C" >&6
 
        case X$DFT_LWR_MODEL in


@@ -17638,10 +17700,10 @@ echo $ECHO_N "checking default library-dependency suffix... $ECHO_C" >&6
                DFT_LIB_SUFFIX="${LIB_SUFFIX}${EXTRA_SUFFIX}${DFT_LIB_SUFFIX}"
                DFT_DEP_SUFFIX="${LIB_SUFFIX}${EXTRA_SUFFIX}${DFT_DEP_SUFFIX}"
        fi
                DFT_LIB_SUFFIX="${LIB_SUFFIX}${EXTRA_SUFFIX}${DFT_LIB_SUFFIX}"
                DFT_DEP_SUFFIX="${LIB_SUFFIX}${EXTRA_SUFFIX}${DFT_DEP_SUFFIX}"
        fi

-echo "$as_me:17641: result: $DFT_DEP_SUFFIX" >&5
+echo "$as_me:17703: result: $DFT_DEP_SUFFIX" >&5

 echo "${ECHO_T}$DFT_DEP_SUFFIX" >&6
 
 echo "${ECHO_T}$DFT_DEP_SUFFIX" >&6
 

-echo "$as_me:17644: checking default object directory" >&5
+echo "$as_me:17706: checking default object directory" >&5

 echo $ECHO_N "checking default object directory... $ECHO_C" >&6
 
        case $DFT_LWR_MODEL in
 echo $ECHO_N "checking default object directory... $ECHO_C" >&6
 
        case $DFT_LWR_MODEL in


@@ -17657,7 +17719,7 @@ echo $ECHO_N "checking default object directory... $ECHO_C" >&6
                        DFT_OBJ_SUBDIR='obj_s' ;;
                esac
        esac
                        DFT_OBJ_SUBDIR='obj_s' ;;
                esac
        esac

-echo "$as_me:17660: result: $DFT_OBJ_SUBDIR" >&5
+echo "$as_me:17722: result: $DFT_OBJ_SUBDIR" >&5

 echo "${ECHO_T}$DFT_OBJ_SUBDIR" >&6
 
 ### Set up low-level terminfo dependencies for makefiles.
 echo "${ECHO_T}$DFT_OBJ_SUBDIR" >&6
 
 ### Set up low-level terminfo dependencies for makefiles.


@@ -17799,7 +17861,7 @@ DEFS=-DHAVE_CONFIG_H
 : "${CONFIG_STATUS=./config.status}"
 ac_clean_files_save=$ac_clean_files
 ac_clean_files="$ac_clean_files $CONFIG_STATUS"
 : "${CONFIG_STATUS=./config.status}"
 ac_clean_files_save=$ac_clean_files
 ac_clean_files="$ac_clean_files $CONFIG_STATUS"

-{ echo "$as_me:17802: creating $CONFIG_STATUS" >&5
+{ echo "$as_me:17864: creating $CONFIG_STATUS" >&5

 echo "$as_me: creating $CONFIG_STATUS" >&6;}
 cat >"$CONFIG_STATUS" <<_ACEOF
 #! $SHELL
 echo "$as_me: creating $CONFIG_STATUS" >&6;}
 cat >"$CONFIG_STATUS" <<_ACEOF
 #! $SHELL


@@ -17933,7 +17995,7 @@ EOF
 cat >>"$CONFIG_STATUS" <<EOF
 ac_cs_version="\\
 config.status
 cat >>"$CONFIG_STATUS" <<EOF
 ac_cs_version="\\
 config.status

-configured by $0, generated by GNU Autoconf 2.52.20210105,
+configured by $0, generated by GNU Autoconf 2.52.20210509,

   with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
 
 Copyright 2003-2020,2021       Thomas E. Dickey
   with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
 
 Copyright 2003-2020,2021       Thomas E. Dickey


@@ -17978,7 +18040,7 @@ cat >>"$CONFIG_STATUS" <<\EOF
     echo "$ac_cs_version"; exit 0 ;;
   --he | --h)
     # Conflict between --help and --header
     echo "$ac_cs_version"; exit 0 ;;
   --he | --h)
     # Conflict between --help and --header

-    { { echo "$as_me:17981: error: ambiguous option: $1
+    { { echo "$as_me:18043: 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;}
 Try \`$0 --help' for more information." >&5
 echo "$as_me: error: ambiguous option: $1
 Try \`$0 --help' for more information." >&2;}


@@ -17997,7 +18059,7 @@ Try \`$0 --help' for more information." >&2;}
     ac_need_defaults=false;;
 
   # This is an error.
     ac_need_defaults=false;;
 
   # This is an error.

-  -*) { { echo "$as_me:18000: error: unrecognized option: $1
+  -*) { { echo "$as_me:18062: 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;}
 Try \`$0 --help' for more information." >&5
 echo "$as_me: error: unrecognized option: $1
 Try \`$0 --help' for more information." >&2;}


@@ -18016,7 +18078,7 @@ cat >&5 << _ACEOF
 ## Running config.status.  ##
 ## ----------------------- ##
 
 ## Running config.status.  ##
 ## ----------------------- ##
 

-This file was extended by $as_me 2.52.20210105, executed with
+This file was extended by $as_me 2.52.20210509, executed with

   CONFIG_FILES    = $CONFIG_FILES
   CONFIG_HEADERS  = $CONFIG_HEADERS
   CONFIG_LINKS    = $CONFIG_LINKS
   CONFIG_FILES    = $CONFIG_FILES
   CONFIG_HEADERS  = $CONFIG_HEADERS
   CONFIG_LINKS    = $CONFIG_LINKS


@@ -18071,7 +18133,7 @@ do
   "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" ;;
   "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:18074: error: invalid argument: $ac_config_target" >&5
+  *) { { echo "$as_me:18136: error: invalid argument: $ac_config_target" >&5

 echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
    { (exit 1); exit 1; }; };;
   esac
 echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
    { (exit 1); exit 1; }; };;
   esac


@@ -18429,7 +18491,7 @@ done; }
   esac
 
   if test x"$ac_file" != x-; then
   esac
 
   if test x"$ac_file" != x-; then

-    { echo "$as_me:18432: creating $ac_file" >&5
+    { echo "$as_me:18494: creating $ac_file" >&5

 echo "$as_me: creating $ac_file" >&6;}
     rm -f "$ac_file"
   fi
 echo "$as_me: creating $ac_file" >&6;}
     rm -f "$ac_file"
   fi


@@ -18447,7 +18509,7 @@ echo "$as_me: creating $ac_file" >&6;}
       -) echo $tmp/stdin ;;
       [\\/$]*)
          # Absolute (can't be DOS-style, as IFS=:)
       -) echo $tmp/stdin ;;
       [\\/$]*)
          # Absolute (can't be DOS-style, as IFS=:)

-         test -f "$f" || { { echo "$as_me:18450: error: cannot find input file: $f" >&5
+         test -f "$f" || { { echo "$as_me:18512: error: cannot find input file: $f" >&5

 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          echo $f;;
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          echo $f;;


@@ -18460,7 +18522,7 @@ echo "$as_me: error: cannot find input file: $f" >&2;}
            echo "$srcdir/$f"
          else
            # /dev/null tree
            echo "$srcdir/$f"
          else
            # /dev/null tree

-           { { echo "$as_me:18463: error: cannot find input file: $f" >&5
+           { { echo "$as_me:18525: error: cannot find input file: $f" >&5

 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          fi;;
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          fi;;


@@ -18476,7 +18538,7 @@ cat >>"$CONFIG_STATUS" <<\EOF
       if test -n "$ac_seen"; then
         ac_used=`grep '@datarootdir@' "$ac_item"`
         if test -z "$ac_used"; then
       if test -n "$ac_seen"; then
         ac_used=`grep '@datarootdir@' "$ac_item"`
         if test -z "$ac_used"; then

-          { echo "$as_me:18479: WARNING: datarootdir was used implicitly but not set:
+          { echo "$as_me:18541: 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;}
 $ac_seen" >&5
 echo "$as_me: WARNING: datarootdir was used implicitly but not set:
 $ac_seen" >&2;}


@@ -18485,7 +18547,7 @@ $ac_seen" >&2;}
       fi
       ac_seen=`grep '${datarootdir}' "$ac_item"`
       if test -n "$ac_seen"; then
       fi
       ac_seen=`grep '${datarootdir}' "$ac_item"`
       if test -n "$ac_seen"; then

-        { echo "$as_me:18488: WARNING: datarootdir was used explicitly but not set:
+        { echo "$as_me:18550: 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;}
 $ac_seen" >&5
 echo "$as_me: WARNING: datarootdir was used explicitly but not set:
 $ac_seen" >&2;}


@@ -18522,7 +18584,7 @@ s,@INSTALL@,$ac_INSTALL,;t t
             ac_init=`${EGREP-egrep} '[         ]*'$ac_name'[   ]*=' "$ac_file"`
             if test -z "$ac_init"; then
               ac_seen=`echo "$ac_seen" |sed -e 's,^,'$ac_file':,'`
             ac_init=`${EGREP-egrep} '[         ]*'$ac_name'[   ]*=' "$ac_file"`
             if test -z "$ac_init"; then
               ac_seen=`echo "$ac_seen" |sed -e 's,^,'$ac_file':,'`

-              { echo "$as_me:18525: WARNING: Variable $ac_name is used but was not set:
+              { echo "$as_me:18587: 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;}
 $ac_seen" >&5
 echo "$as_me: WARNING: Variable $ac_name is used but was not set:
 $ac_seen" >&2;}


@@ -18533,7 +18595,7 @@ $ac_seen" >&2;}
     ${EGREP-egrep} -n '@[A-Z_][A-Z_0-9]+@' "$ac_file" >>$tmp/out
     if test -s $tmp/out; then
       ac_seen=`sed -e 's,^,'$ac_file':,' < $tmp/out`
     ${EGREP-egrep} -n '@[A-Z_][A-Z_0-9]+@' "$ac_file" >>$tmp/out
     if test -s $tmp/out; then
       ac_seen=`sed -e 's,^,'$ac_file':,' < $tmp/out`

-      { echo "$as_me:18536: WARNING: Some variables may not be substituted:
+      { echo "$as_me:18598: WARNING: Some variables may not be substituted:

 $ac_seen" >&5
 echo "$as_me: WARNING: Some variables may not be substituted:
 $ac_seen" >&2;}
 $ac_seen" >&5
 echo "$as_me: WARNING: Some variables may not be substituted:
 $ac_seen" >&2;}


@@ -18582,7 +18644,7 @@ for ac_file in : $CONFIG_HEADERS; do test "x$ac_file" = x: && continue
   * )   ac_file_in=$ac_file.in ;;
   esac
 
   * )   ac_file_in=$ac_file.in ;;
   esac
 

-  test x"$ac_file" != x- && { echo "$as_me:18585: creating $ac_file" >&5
+  test x"$ac_file" != x- && { echo "$as_me:18647: creating $ac_file" >&5

 echo "$as_me: creating $ac_file" >&6;}
 
   # First look for the input files in the build tree, otherwise in the
 echo "$as_me: creating $ac_file" >&6;}
 
   # First look for the input files in the build tree, otherwise in the


@@ -18593,7 +18655,7 @@ echo "$as_me: creating $ac_file" >&6;}
       -) echo $tmp/stdin ;;
       [\\/$]*)
          # Absolute (can't be DOS-style, as IFS=:)
       -) echo $tmp/stdin ;;
       [\\/$]*)
          # Absolute (can't be DOS-style, as IFS=:)

-         test -f "$f" || { { echo "$as_me:18596: error: cannot find input file: $f" >&5
+         test -f "$f" || { { echo "$as_me:18658: error: cannot find input file: $f" >&5

 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          echo $f;;
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          echo $f;;


@@ -18606,7 +18668,7 @@ echo "$as_me: error: cannot find input file: $f" >&2;}
            echo "$srcdir/$f"
          else
            # /dev/null tree
            echo "$srcdir/$f"
          else
            # /dev/null tree

-           { { echo "$as_me:18609: error: cannot find input file: $f" >&5
+           { { echo "$as_me:18671: error: cannot find input file: $f" >&5

 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          fi;;
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          fi;;


@@ -18664,7 +18726,7 @@ cat >>"$CONFIG_STATUS" <<\EOF
   rm -f $tmp/in
   if test x"$ac_file" != x-; then
     if cmp -s "$ac_file" "$tmp/config.h" 2>/dev/null; then
   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:18667: $ac_file is unchanged" >&5
+      { echo "$as_me:18729: $ac_file is unchanged" >&5

 echo "$as_me: $ac_file is unchanged" >&6;}
     else
       ac_dir=`$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
 echo "$as_me: $ac_file is unchanged" >&6;}
     else
       ac_dir=`$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \

diff --git a/NEWS b/NEWS
index 33efc1eb5bb7e70831486a8cb11f087bcf0da7b2..3c1d58abe851b579889b817adce6c80cdae433f4 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -26,7 +26,7 @@
 -- sale, use or other dealings in this Software without prior written        --
 -- authorization.                                                            --
 -------------------------------------------------------------------------------
 -- sale, use or other dealings in this Software without prior written        --
 -- authorization.                                                            --
 -------------------------------------------------------------------------------

--- $Id: NEWS,v 1.3665 2021/05/15 23:59:31 tom Exp $
+-- $Id: NEWS,v 1.3669 2021/05/22 23:06:34 tom Exp $

 -------------------------------------------------------------------------------
 
 This is a log of changes that ncurses has gone through since Zeyd started
 -------------------------------------------------------------------------------
 
 This is a log of changes that ncurses has gone through since Zeyd started


@@ -46,6 +46,17 @@ See the AUTHORS file for the corresponding full names.
 Changes through 1.9.9e did not credit all contributions;
 it is not possible to add this information.
 
 Changes through 1.9.9e did not credit all contributions;
 it is not possible to add this information.
 

+20210522
+       + regenerate configure scripts with autoconf 2.52.20210509 to eliminate
+         an unnecessary warning in config.log (report by Miroslav Lichvar).
+       + add a note in manual page to explain ungetch vs unget_wch (prompted
+         by discussion with Peter Farley).
+       + add sp-funcs for erasewchar, killwchar.
+       + modify wgetnstr, wgetn_wstr to improve compatibility with SVr4 curses
+         in its treatment of interrupt and quit characters (prompted by
+         report/testcase by Bill Gray)
+       + update config.guess, config.sub
+

 20210515
        + improve manual pages for wgetnstr, newwin (prompted by
          report/testcase by Bill Gray).
 20210515
        + improve manual pages for wgetnstr, newwin (prompted by
          report/testcase by Bill Gray).

diff --git a/VERSION b/VERSION
index e425a978353645b368ccc81d2d4ef8b11ec88354..6a8f2c0aa6d0ade4b811d62008700bb8330a4fc9 100644 (file)
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-5:0:10 6.2     20210515
+5:0:10 6.2     20210522

diff --git a/aclocal.m4 b/aclocal.m4
index 30127c5ed43ca4476024fa08dba886e917df7e7b..d48cde0cb286353455c854e8f5da394a3f3f2dc2 100644 (file)
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -29,7 +29,7 @@ dnl***************************************************************************
 dnl
 dnl Author: Thomas E. Dickey 1995-on
 dnl
 dnl
 dnl Author: Thomas E. Dickey 1995-on
 dnl

-dnl $Id: aclocal.m4,v 1.960 2021/05/01 21:51:55 tom Exp $
+dnl $Id: aclocal.m4,v 1.961 2021/05/19 23:35:25 tom Exp $

 dnl Macros used in NCURSES auto-configuration script.
 dnl
 dnl These macros are maintained separately from NCURSES.  The copyright on
 dnl Macros used in NCURSES auto-configuration script.
 dnl
 dnl These macros are maintained separately from NCURSES.  The copyright on


@@ -8141,15 +8141,21 @@ AC_DEFUN([CF_UPPER],
 $1=`echo "$2" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%`
 ])dnl
 dnl ---------------------------------------------------------------------------
 $1=`echo "$2" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%`
 ])dnl
 dnl ---------------------------------------------------------------------------

-dnl CF_UTF8_LIB version: 8 updated: 2012/10/06 08:57:51
+dnl CF_UTF8_LIB version: 9 updated: 2021/05/19 19:35:25

 dnl -----------
 dnl Check for multibyte support, and if not found, utf8 compatibility library
 AC_DEFUN([CF_UTF8_LIB],
 [
 dnl -----------
 dnl Check for multibyte support, and if not found, utf8 compatibility library
 AC_DEFUN([CF_UTF8_LIB],
 [

+AC_HAVE_HEADERS(wchar.h)

 AC_CACHE_CHECK(for multibyte character support,cf_cv_utf8_lib,[
        cf_save_LIBS="$LIBS"
        AC_TRY_LINK([
 AC_CACHE_CHECK(for multibyte character support,cf_cv_utf8_lib,[
        cf_save_LIBS="$LIBS"
        AC_TRY_LINK([

-#include <stdlib.h>],[putwc(0,0);],
+#include <stdlib.h>
+#include <stdio.h>
+#ifdef HAVE_WCHAR_H
+#include <wchar.h>
+#endif
+],[putwc(0,0);],

        [cf_cv_utf8_lib=yes],
        [CF_FIND_LINKAGE([
 #include <libutf8.h>],[putwc(0,0);],utf8,
        [cf_cv_utf8_lib=yes],
        [CF_FIND_LINKAGE([
 #include <libutf8.h>],[putwc(0,0);],utf8,

diff --git a/c++/etip.h.in b/c++/etip.h.in
index 3ce19e8e0f3732e29be1794635877b57e63b102a..ce05d75bd98dc5bd4a8a8d7402098453fac8405c 100644 (file)
--- a/c++/etip.h.in
+++ b/c++/etip.h.in
@@ -32,7 +32,7 @@
  *   Author: Juergen Pfeifer, 1997                                          *
  ****************************************************************************/
 
  *   Author: Juergen Pfeifer, 1997                                          *
  ****************************************************************************/
 

-// $Id: etip.h.in,v 1.46 2021/04/17 17:59:57 tom Exp $
+// $Id: etip.h.in,v 1.47 2021/05/22 23:01:46 tom Exp $

 
 #ifndef NCURSES_ETIP_H_incl
 #define NCURSES_ETIP_H_incl 1
 
 #ifndef NCURSES_ETIP_H_incl
 #define NCURSES_ETIP_H_incl 1


@@ -139,6 +139,10 @@ extern "C" {
 #define STATIC_CAST(s) (s)
 #endif
 
 #define STATIC_CAST(s) (s)
 #endif
 

+#ifndef NCURSES_CXX_IMPEXP 
+#define NCURSES_CXX_IMPEXP  /* nothing */
+#endif
+

 // Forward Declarations
 class NCURSES_CXX_IMPEXP NCursesPanel;
 class NCURSES_CXX_IMPEXP NCursesMenu;
 // Forward Declarations
 class NCURSES_CXX_IMPEXP NCursesPanel;
 class NCURSES_CXX_IMPEXP NCursesMenu;

diff --git a/config.guess b/config.guess
index e0ed0e00d83bff6e9da3c9163cda84ed48057089..ec94a102b01662496cd1cd4907c16f8999f55bfa 100755 (executable)
--- a/config.guess
+++ b/config.guess
@@ -3,7 +3,7 @@
 #   Copyright 2021 Thomas E. Dickey
 #   Copyright 1992-2021 Free Software Foundation, Inc.
 
 #   Copyright 2021 Thomas E. Dickey
 #   Copyright 1992-2021 Free Software Foundation, Inc.
 

-timestamp='2021-01-25'
+timestamp='2021-04-21'

 
 # This file is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
 
 # This file is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by


@@ -262,6 +262,10 @@ case "$UNAME_MACHINE:$UNAME_SYSTEM:$UNAME_RELEASE:$UNAME_VERSION" in
        UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'`
        echo "$UNAME_MACHINE_ARCH"-unknown-openbsd"$UNAME_RELEASE"
        exit ;;
        UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'`
        echo "$UNAME_MACHINE_ARCH"-unknown-openbsd"$UNAME_RELEASE"
        exit ;;

+    *:SecBSD:*:*)
+       UNAME_MACHINE_ARCH=`arch | sed 's/SecBSD.//'`
+       echo "$UNAME_MACHINE_ARCH"-unknown-secbsd"$UNAME_RELEASE"
+       exit ;;

     *:LibertyBSD:*:*)
        UNAME_MACHINE_ARCH=`arch | sed 's/^.*BSD\.//'`
        echo "$UNAME_MACHINE_ARCH"-unknown-libertybsd"$UNAME_RELEASE"
     *:LibertyBSD:*:*)
        UNAME_MACHINE_ARCH=`arch | sed 's/^.*BSD\.//'`
        echo "$UNAME_MACHINE_ARCH"-unknown-libertybsd"$UNAME_RELEASE"


@@ -950,7 +954,7 @@ EOF
        if test "$?" = 0 ; then LIBC=gnulibc1 ; fi
        echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
        exit ;;
        if test "$?" = 0 ; then LIBC=gnulibc1 ; fi
        echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
        exit ;;

-    arc:Linux:*:* | arceb:Linux:*:*)
+    arc:Linux:*:* | arceb:Linux:*:* | arc64:Linux:*:*)

        echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
        exit ;;
     arm*:Linux:*:*)
        echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
        exit ;;
     arm*:Linux:*:*)

diff --git a/config.sub b/config.sub
index 907630301ba399561c6c3316e609234267ea2b76..3eda71f232c18be5585794bd49efefc2d16dd74d 100755 (executable)
--- a/config.sub
+++ b/config.sub
@@ -3,7 +3,7 @@
 #   Copyright 2021 Thomas E. Dickey
 #   Copyright 1992-2021 Free Software Foundation, Inc.
 
 #   Copyright 2021 Thomas E. Dickey
 #   Copyright 1992-2021 Free Software Foundation, Inc.
 

-timestamp='2021-03-10'
+timestamp='2021-04-30'

 
 # This file is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
 
 # This file is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by


@@ -1166,7 +1166,7 @@ case $cpu-$vendor in
                        | alphapca5[67] | alpha64pca5[67] \
                        | am33_2.0 \
                        | amdgcn \
                        | alphapca5[67] | alpha64pca5[67] \
                        | am33_2.0 \
                        | amdgcn \

-                       | arc | arceb \
+                       | arc | arceb | arc64 \

                        | arm | arm[lb]e | arme[lb] | armv* \
                        | avr | avr32 \
                        | asmjs \
                        | arm | arm[lb]e | arme[lb] | armv* \
                        | avr | avr32 \
                        | asmjs \


@@ -1205,9 +1205,13 @@ case $cpu-$vendor in
                        | mips64vr5900 | mips64vr5900el \
                        | mipsisa32 | mipsisa32el \
                        | mipsisa32r2 | mipsisa32r2el \
                        | mips64vr5900 | mips64vr5900el \
                        | mipsisa32 | mipsisa32el \
                        | mipsisa32r2 | mipsisa32r2el \

+                       | mipsisa32r3 | mipsisa32r3el \
+                       | mipsisa32r5 | mipsisa32r5el \

                        | mipsisa32r6 | mipsisa32r6el \
                        | mipsisa64 | mipsisa64el \
                        | mipsisa64r2 | mipsisa64r2el \
                        | mipsisa32r6 | mipsisa32r6el \
                        | mipsisa64 | mipsisa64el \
                        | mipsisa64r2 | mipsisa64r2el \

+                       | mipsisa64r3 | mipsisa64r3el \
+                       | mipsisa64r5 | mipsisa64r5el \

                        | mipsisa64r6 | mipsisa64r6el \
                        | mipsisa64sb1 | mipsisa64sb1el \
                        | mipsisa64sr71k | mipsisa64sr71kel \
                        | mipsisa64r6 | mipsisa64r6el \
                        | mipsisa64sb1 | mipsisa64sb1el \
                        | mipsisa64sr71k | mipsisa64sr71kel \


@@ -1708,7 +1712,7 @@ case $os in
             | nindy* | vxsim* | vxworks* | ebmon* | hms* | mvs* \
             | clix* | riscos* | uniplus* | iris* | isc* | rtu* | xenix* \
             | mirbsd* | netbsd* | dicos* | openedition* | ose* \
             | nindy* | vxsim* | vxworks* | ebmon* | hms* | mvs* \
             | clix* | riscos* | uniplus* | iris* | isc* | rtu* | xenix* \
             | mirbsd* | netbsd* | dicos* | openedition* | ose* \

-            | bitrig* | openbsd* | solidbsd* | libertybsd* | os108* \
+            | bitrig* | openbsd* | secbsd* | solidbsd* | libertybsd* | os108* \

             | ekkobsd* | freebsd* | riscix* | lynxos* | os400* \
             | bosx* | nextstep* | cxux* | aout* | elf* | oabi* \
             | ptx* | coff* | ecoff* | winnt* | domain* | vsta* \
             | ekkobsd* | freebsd* | riscix* | lynxos* | os400* \
             | bosx* | nextstep* | cxux* | aout* | elf* | oabi* \
             | ptx* | coff* | ecoff* | winnt* | domain* | vsta* \

diff --git a/configure b/configure
index ab6d02a64a8a8a7253e2463ec121f7370c9dad78..417adcb3104797ec7c64a4bdb92c7c4b3ceff38e 100755 (executable)
--- a/configure
+++ b/configure
@@ -1,7 +1,7 @@
 #! /bin/sh
 # From configure.in Revision: 1.730 .
 # Guess values for system-dependent variables and create Makefiles.
 #! /bin/sh
 # From configure.in Revision: 1.730 .
 # Guess values for system-dependent variables and create Makefiles.

-# Generated by Autoconf 2.52.20210105.
+# Generated by Autoconf 2.52.20210509.

 #
 # Copyright 2003-2020,2021     Thomas E. Dickey
 # Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001
 #
 # Copyright 2003-2020,2021     Thomas E. Dickey
 # Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001


@@ -943,7 +943,7 @@ This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
 It was created by $as_me, which was
 running configure, to aid debugging if configure makes a mistake.
 
 It was created by $as_me, which was

-generated by GNU Autoconf 2.52.20210105.  Invocation command line was
+generated by GNU Autoconf 2.52.20210509.  Invocation command line was

 
   $ $0 $@
 
 
   $ $0 $@
 


@@ -12038,7 +12038,55 @@ done
 
        if test "x$ac_cv_func_putwc" != xyes ; then
 
 
        if test "x$ac_cv_func_putwc" != xyes ; then
 

-echo "$as_me:12041: checking for multibyte character support" >&5
+for ac_header in wchar.h
+do
+as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+echo "$as_me:12044: 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 12050 "configure"
+#include "confdefs.h"
+#include <$ac_header>
+_ACEOF
+if { (eval echo "$as_me:12054: \"$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:12060: \$? = $ac_status" >&5
+  (exit "$ac_status"); } >/dev/null; then
+  if test -s conftest.err; then
+    ac_cpp_err=$ac_c_preproc_warn_flag
+  else
+    ac_cpp_err=
+  fi
+else
+  ac_cpp_err=yes
+fi
+if test -z "$ac_cpp_err"; then
+  eval "$as_ac_Header=yes"
+else
+  echo "$as_me: failed program was:" >&5
+  cat "conftest.$ac_ext" >&5
+  eval "$as_ac_Header=no"
+fi
+rm -f conftest.err "conftest.$ac_ext"
+fi
+echo "$as_me:12079: 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
+#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+EOF
+
+fi
+done
+
+echo "$as_me:12089: 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
 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


@@ -12046,10 +12094,15 @@ else
 
        cf_save_LIBS="$LIBS"
        cat >"conftest.$ac_ext" <<_ACEOF
 
        cf_save_LIBS="$LIBS"
        cat >"conftest.$ac_ext" <<_ACEOF

-#line 12049 "configure"
+#line 12097 "configure"

 #include "confdefs.h"
 
 #include <stdlib.h>
 #include "confdefs.h"
 
 #include <stdlib.h>

+#include <stdio.h>
+#ifdef HAVE_WCHAR_H
+#include <wchar.h>
+#endif
+

 int
 main (void)
 {
 int
 main (void)
 {


@@ -12059,16 +12112,16 @@ putwc(0,0);
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"

-if { (eval echo "$as_me:12062: \"$ac_link\"") >&5
+if { (eval echo "$as_me:12115: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:12065: \$? = $ac_status" >&5
+  echo "$as_me:12118: \$? = $ac_status" >&5

   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'

-  { (eval echo "$as_me:12068: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12121: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:12071: \$? = $ac_status" >&5
+  echo "$as_me:12124: \$? = $ac_status" >&5

   (exit "$ac_status"); }; }; then
   cf_cv_utf8_lib=yes
 else
   (exit "$ac_status"); }; }; then
   cf_cv_utf8_lib=yes
 else


@@ -12080,12 +12133,12 @@ cat "conftest.$ac_ext" >&5
 cf_cv_header_path_utf8=
 cf_cv_library_path_utf8=
 
 cf_cv_header_path_utf8=
 cf_cv_library_path_utf8=
 

-echo "${as_me:-configure}:12083: testing Starting FIND_LINKAGE(utf8,) ..." 1>&5
+echo "${as_me:-configure}:12136: testing Starting FIND_LINKAGE(utf8,) ..." 1>&5

 
 cf_save_LIBS="$LIBS"
 
 cat >"conftest.$ac_ext" <<_ACEOF
 
 cf_save_LIBS="$LIBS"
 
 cat >"conftest.$ac_ext" <<_ACEOF

-#line 12088 "configure"
+#line 12141 "configure"

 #include "confdefs.h"
 
 #include <libutf8.h>
 #include "confdefs.h"
 
 #include <libutf8.h>


@@ -12098,16 +12151,16 @@ putwc(0,0);
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"

-if { (eval echo "$as_me:12101: \"$ac_link\"") >&5
+if { (eval echo "$as_me:12154: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:12104: \$? = $ac_status" >&5
+  echo "$as_me:12157: \$? = $ac_status" >&5

   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'

-  { (eval echo "$as_me:12107: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12160: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:12110: \$? = $ac_status" >&5
+  echo "$as_me:12163: \$? = $ac_status" >&5

   (exit "$ac_status"); }; }; then
 
        cf_cv_find_linkage_utf8=yes
   (exit "$ac_status"); }; }; then
 
        cf_cv_find_linkage_utf8=yes


@@ -12121,7 +12174,7 @@ cat "conftest.$ac_ext" >&5
 LIBS="-lutf8  $cf_save_LIBS"
 
 cat >"conftest.$ac_ext" <<_ACEOF
 LIBS="-lutf8  $cf_save_LIBS"
 
 cat >"conftest.$ac_ext" <<_ACEOF

-#line 12124 "configure"
+#line 12177 "configure"

 #include "confdefs.h"
 
 #include <libutf8.h>
 #include "confdefs.h"
 
 #include <libutf8.h>


@@ -12134,16 +12187,16 @@ putwc(0,0);
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"

-if { (eval echo "$as_me:12137: \"$ac_link\"") >&5
+if { (eval echo "$as_me:12190: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:12140: \$? = $ac_status" >&5
+  echo "$as_me:12193: \$? = $ac_status" >&5

   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'

-  { (eval echo "$as_me:12143: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12196: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:12146: \$? = $ac_status" >&5
+  echo "$as_me:12199: \$? = $ac_status" >&5

   (exit "$ac_status"); }; }; then
 
        cf_cv_find_linkage_utf8=yes
   (exit "$ac_status"); }; }; then
 
        cf_cv_find_linkage_utf8=yes


@@ -12160,9 +12213,9 @@ cat "conftest.$ac_ext" >&5
 
        test -n "$verbose" && echo "    find linkage for utf8 library" 1>&6
 
 
        test -n "$verbose" && echo "    find linkage for utf8 library" 1>&6
 

-echo "${as_me:-configure}:12163: testing find linkage for utf8 library ..." 1>&5
+echo "${as_me:-configure}:12216: testing find linkage for utf8 library ..." 1>&5

 
 

-echo "${as_me:-configure}:12165: testing Searching for headers in FIND_LINKAGE(utf8,) ..." 1>&5
+echo "${as_me:-configure}:12218: testing Searching for headers in FIND_LINKAGE(utf8,) ..." 1>&5

 
        cf_save_CPPFLAGS="$CPPFLAGS"
        cf_test_CPPFLAGS="$CPPFLAGS"
 
        cf_save_CPPFLAGS="$CPPFLAGS"
        cf_test_CPPFLAGS="$CPPFLAGS"


@@ -12253,7 +12306,7 @@ cf_search="$cf_search $cf_header_path_list"
                if test -d "$cf_cv_header_path_utf8" ; then
                        test -n "$verbose" && echo "    ... testing $cf_cv_header_path_utf8" 1>&6
 
                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}:12256: testing ... testing $cf_cv_header_path_utf8 ..." 1>&5
+echo "${as_me:-configure}:12309: testing ... testing $cf_cv_header_path_utf8 ..." 1>&5

 
                        CPPFLAGS="$cf_save_CPPFLAGS"
 
 
                        CPPFLAGS="$cf_save_CPPFLAGS"
 


@@ -12261,7 +12314,7 @@ echo "${as_me:-configure}:12256: testing ... testing $cf_cv_header_path_utf8 ...
        CPPFLAGS="${CPPFLAGS}-I$cf_cv_header_path_utf8"
 
                        cat >"conftest.$ac_ext" <<_ACEOF
        CPPFLAGS="${CPPFLAGS}-I$cf_cv_header_path_utf8"
 
                        cat >"conftest.$ac_ext" <<_ACEOF

-#line 12264 "configure"
+#line 12317 "configure"

 #include "confdefs.h"
 
 #include <libutf8.h>
 #include "confdefs.h"
 
 #include <libutf8.h>


@@ -12274,21 +12327,21 @@ putwc(0,0);
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
 }
 _ACEOF
 rm -f "conftest.$ac_objext"

-if { (eval echo "$as_me:12277: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:12330: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:12280: \$? = $ac_status" >&5
+  echo "$as_me:12333: \$? = $ac_status" >&5

   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'

-  { (eval echo "$as_me:12283: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12336: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:12286: \$? = $ac_status" >&5
+  echo "$as_me:12339: \$? = $ac_status" >&5

   (exit "$ac_status"); }; }; then
 
                                test -n "$verbose" && echo "    ... found utf8 headers in $cf_cv_header_path_utf8" 1>&6
 
   (exit "$ac_status"); }; }; then
 
                                test -n "$verbose" && echo "    ... found utf8 headers in $cf_cv_header_path_utf8" 1>&6
 

-echo "${as_me:-configure}:12291: testing ... found utf8 headers in $cf_cv_header_path_utf8 ..." 1>&5
+echo "${as_me:-configure}:12344: testing ... found utf8 headers in $cf_cv_header_path_utf8 ..." 1>&5

 
                                cf_cv_find_linkage_utf8=maybe
                                cf_test_CPPFLAGS="$CPPFLAGS"
 
                                cf_cv_find_linkage_utf8=maybe
                                cf_test_CPPFLAGS="$CPPFLAGS"


@@ -12306,7 +12359,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
        if test "$cf_cv_find_linkage_utf8" = maybe ; then
 
 
        if test "$cf_cv_find_linkage_utf8" = maybe ; then
 

-echo "${as_me:-configure}:12309: testing Searching for utf8 library in FIND_LINKAGE(utf8,) ..." 1>&5
+echo "${as_me:-configure}:12362: testing Searching for utf8 library in FIND_LINKAGE(utf8,) ..." 1>&5

 
                cf_save_LIBS="$LIBS"
                cf_save_LDFLAGS="$LDFLAGS"
 
                cf_save_LIBS="$LIBS"
                cf_save_LDFLAGS="$LDFLAGS"


@@ -12381,13 +12434,13 @@ cf_search="$cf_library_path_list $cf_search"
                                if test -d "$cf_cv_library_path_utf8" ; then
                                        test -n "$verbose" && echo "    ... testing $cf_cv_library_path_utf8" 1>&6
 
                                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}:12384: testing ... testing $cf_cv_library_path_utf8 ..." 1>&5
+echo "${as_me:-configure}:12437: 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
 
                                        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 12390 "configure"
+#line 12443 "configure"

 #include "confdefs.h"
 
 #include <libutf8.h>
 #include "confdefs.h"
 
 #include <libutf8.h>


@@ -12400,21 +12453,21 @@ putwc(0,0);
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"

-if { (eval echo "$as_me:12403: \"$ac_link\"") >&5
+if { (eval echo "$as_me:12456: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:12406: \$? = $ac_status" >&5
+  echo "$as_me:12459: \$? = $ac_status" >&5

   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'

-  { (eval echo "$as_me:12409: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12462: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:12412: \$? = $ac_status" >&5
+  echo "$as_me:12465: \$? = $ac_status" >&5

   (exit "$ac_status"); }; }; then
 
                                        test -n "$verbose" && echo "    ... found utf8 library in $cf_cv_library_path_utf8" 1>&6
 
   (exit "$ac_status"); }; }; then
 
                                        test -n "$verbose" && echo "    ... found utf8 library in $cf_cv_library_path_utf8" 1>&6
 

-echo "${as_me:-configure}:12417: testing ... found utf8 library in $cf_cv_library_path_utf8 ..." 1>&5
+echo "${as_me:-configure}:12470: testing ... found utf8 library in $cf_cv_library_path_utf8 ..." 1>&5

 
                                        cf_cv_find_linkage_utf8=yes
                                        cf_cv_library_file_utf8="-lutf8"
 
                                        cf_cv_find_linkage_utf8=yes
                                        cf_cv_library_file_utf8="-lutf8"


@@ -12456,7 +12509,7 @@ fi
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi

-echo "$as_me:12459: result: $cf_cv_utf8_lib" >&5
+echo "$as_me:12512: 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
 echo "${ECHO_T}$cf_cv_utf8_lib" >&6
 
 # HAVE_LIBUTF8_H is used by ncurses if curses.h is shared between


@@ -12494,7 +12547,7 @@ if test -n "$cf_cv_header_path_utf8" ; then
        CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
 
                          cat >"conftest.$ac_ext" <<_ACEOF
        CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
 
                          cat >"conftest.$ac_ext" <<_ACEOF

-#line 12497 "configure"
+#line 12550 "configure"

 #include "confdefs.h"
 #include <stdio.h>
 int
 #include "confdefs.h"
 #include <stdio.h>
 int


@@ -12506,16 +12559,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
 }
 _ACEOF
 rm -f "conftest.$ac_objext"

-if { (eval echo "$as_me:12509: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:12562: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:12512: \$? = $ac_status" >&5
+  echo "$as_me:12565: \$? = $ac_status" >&5

   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'

-  { (eval echo "$as_me:12515: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12568: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:12518: \$? = $ac_status" >&5
+  echo "$as_me:12571: \$? = $ac_status" >&5

   (exit "$ac_status"); }; }; then
   :
 else
   (exit "$ac_status"); }; }; then
   :
 else


@@ -12532,7 +12585,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
                if test "$cf_have_incdir" = no ; then
                  test -n "$verbose" && echo "  adding $cf_add_incdir to include-path" 1>&6
 
                if test "$cf_have_incdir" = no ; then
                  test -n "$verbose" && echo "  adding $cf_add_incdir to include-path" 1>&6
 

-echo "${as_me:-configure}:12535: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:12588: testing adding $cf_add_incdir to include-path ..." 1>&5

 
                  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
 
                  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 


@@ -12568,7 +12621,7 @@ if test -n "$cf_cv_library_path_utf8" ; then
                        if test "$cf_have_libdir" = no ; then
                                test -n "$verbose" && echo "    adding $cf_add_libdir to library-path" 1>&6
 
                        if test "$cf_have_libdir" = no ; then
                                test -n "$verbose" && echo "    adding $cf_add_libdir to library-path" 1>&6
 

-echo "${as_me:-configure}:12571: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:12624: testing adding $cf_add_libdir to library-path ..." 1>&5

 
                                LDFLAGS="-L$cf_add_libdir $LDFLAGS"
                        fi
 
                                LDFLAGS="-L$cf_add_libdir $LDFLAGS"
                        fi


@@ -12600,14 +12653,14 @@ fi
        fi
 
 # This is needed on Tru64 5.0 to declare mbstate_t
        fi
 
 # This is needed on Tru64 5.0 to declare mbstate_t

-echo "$as_me:12603: checking if we must include wchar.h to declare mbstate_t" >&5
+echo "$as_me:12656: 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
 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 12610 "configure"
+#line 12663 "configure"

 #include "confdefs.h"
 
 #include <stdlib.h>
 #include "confdefs.h"
 
 #include <stdlib.h>


@@ -12625,23 +12678,23 @@ mbstate_t state
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
 }
 _ACEOF
 rm -f "conftest.$ac_objext"

-if { (eval echo "$as_me:12628: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:12681: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:12631: \$? = $ac_status" >&5
+  echo "$as_me:12684: \$? = $ac_status" >&5

   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'

-  { (eval echo "$as_me:12634: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12687: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:12637: \$? = $ac_status" >&5
+  echo "$as_me:12690: \$? = $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
   (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 12644 "configure"
+#line 12697 "configure"

 #include "confdefs.h"
 
 #include <stdlib.h>
 #include "confdefs.h"
 
 #include <stdlib.h>


@@ -12660,16 +12713,16 @@ mbstate_t value
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
 }
 _ACEOF
 rm -f "conftest.$ac_objext"

-if { (eval echo "$as_me:12663: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:12716: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:12666: \$? = $ac_status" >&5
+  echo "$as_me:12719: \$? = $ac_status" >&5

   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'

-  { (eval echo "$as_me:12669: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12722: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:12672: \$? = $ac_status" >&5
+  echo "$as_me:12725: \$? = $ac_status" >&5

   (exit "$ac_status"); }; }; then
   cf_cv_mbstate_t=yes
 else
   (exit "$ac_status"); }; }; then
   cf_cv_mbstate_t=yes
 else


@@ -12681,7 +12734,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi

-echo "$as_me:12684: result: $cf_cv_mbstate_t" >&5
+echo "$as_me:12737: result: $cf_cv_mbstate_t" >&5

 echo "${ECHO_T}$cf_cv_mbstate_t" >&6
 
 if test "$cf_cv_mbstate_t" = yes ; then
 echo "${ECHO_T}$cf_cv_mbstate_t" >&6
 
 if test "$cf_cv_mbstate_t" = yes ; then


@@ -12699,14 +12752,14 @@ if test "$cf_cv_mbstate_t" = unknown ; then
 fi
 
 # This is needed on Tru64 5.0 to declare wchar_t
 fi
 
 # This is needed on Tru64 5.0 to declare wchar_t

-echo "$as_me:12702: checking if we must include wchar.h to declare wchar_t" >&5
+echo "$as_me:12755: 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
 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 12709 "configure"
+#line 12762 "configure"

 #include "confdefs.h"
 
 #include <stdlib.h>
 #include "confdefs.h"
 
 #include <stdlib.h>


@@ -12724,23 +12777,23 @@ wchar_t state
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
 }
 _ACEOF
 rm -f "conftest.$ac_objext"

-if { (eval echo "$as_me:12727: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:12780: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:12730: \$? = $ac_status" >&5
+  echo "$as_me:12783: \$? = $ac_status" >&5

   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'

-  { (eval echo "$as_me:12733: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12786: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:12736: \$? = $ac_status" >&5
+  echo "$as_me:12789: \$? = $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
   (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 12743 "configure"
+#line 12796 "configure"

 #include "confdefs.h"
 
 #include <stdlib.h>
 #include "confdefs.h"
 
 #include <stdlib.h>


@@ -12759,16 +12812,16 @@ wchar_t value
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
 }
 _ACEOF
 rm -f "conftest.$ac_objext"

-if { (eval echo "$as_me:12762: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:12815: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:12765: \$? = $ac_status" >&5
+  echo "$as_me:12818: \$? = $ac_status" >&5

   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'

-  { (eval echo "$as_me:12768: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12821: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:12771: \$? = $ac_status" >&5
+  echo "$as_me:12824: \$? = $ac_status" >&5

   (exit "$ac_status"); }; }; then
   cf_cv_wchar_t=yes
 else
   (exit "$ac_status"); }; }; then
   cf_cv_wchar_t=yes
 else


@@ -12780,7 +12833,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi

-echo "$as_me:12783: result: $cf_cv_wchar_t" >&5
+echo "$as_me:12836: result: $cf_cv_wchar_t" >&5

 echo "${ECHO_T}$cf_cv_wchar_t" >&6
 
 if test "$cf_cv_wchar_t" = yes ; then
 echo "${ECHO_T}$cf_cv_wchar_t" >&6
 
 if test "$cf_cv_wchar_t" = yes ; then


@@ -12803,14 +12856,14 @@ if test "$cf_cv_wchar_t" != unknown ; then
 fi
 
 # This is needed on Tru64 5.0 to declare wint_t
 fi
 
 # This is needed on Tru64 5.0 to declare wint_t

-echo "$as_me:12806: checking if we must include wchar.h to declare wint_t" >&5
+echo "$as_me:12859: 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
 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 12813 "configure"
+#line 12866 "configure"

 #include "confdefs.h"
 
 #include <stdlib.h>
 #include "confdefs.h"
 
 #include <stdlib.h>


@@ -12828,23 +12881,23 @@ wint_t state
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
 }
 _ACEOF
 rm -f "conftest.$ac_objext"

-if { (eval echo "$as_me:12831: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:12884: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:12834: \$? = $ac_status" >&5
+  echo "$as_me:12887: \$? = $ac_status" >&5

   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'

-  { (eval echo "$as_me:12837: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12890: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:12840: \$? = $ac_status" >&5
+  echo "$as_me:12893: \$? = $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
   (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 12847 "configure"
+#line 12900 "configure"

 #include "confdefs.h"
 
 #include <stdlib.h>
 #include "confdefs.h"
 
 #include <stdlib.h>


@@ -12863,16 +12916,16 @@ wint_t value
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
 }
 _ACEOF
 rm -f "conftest.$ac_objext"

-if { (eval echo "$as_me:12866: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:12919: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:12869: \$? = $ac_status" >&5
+  echo "$as_me:12922: \$? = $ac_status" >&5

   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'

-  { (eval echo "$as_me:12872: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12925: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:12875: \$? = $ac_status" >&5
+  echo "$as_me:12928: \$? = $ac_status" >&5

   (exit "$ac_status"); }; }; then
   cf_cv_wint_t=yes
 else
   (exit "$ac_status"); }; }; then
   cf_cv_wint_t=yes
 else


@@ -12884,7 +12937,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi

-echo "$as_me:12887: result: $cf_cv_wint_t" >&5
+echo "$as_me:12940: result: $cf_cv_wint_t" >&5

 echo "${ECHO_T}$cf_cv_wint_t" >&6
 
 if test "$cf_cv_wint_t" = yes ; then
 echo "${ECHO_T}$cf_cv_wint_t" >&6
 
 if test "$cf_cv_wint_t" = yes ; then


@@ -12916,7 +12969,7 @@ EOF
 fi
 
 ###   use option --disable-lp64 to allow long chtype
 fi
 
 ###   use option --disable-lp64 to allow long chtype

-echo "$as_me:12919: checking whether to enable _LP64 definition in curses.h" >&5
+echo "$as_me:12972: 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.
 echo $ECHO_N "checking whether to enable _LP64 definition in curses.h... $ECHO_C" >&6
 
 # Check whether --enable-lp64 or --disable-lp64 was given.


@@ -12926,7 +12979,7 @@ if test "${enable_lp64+set}" = set; then
 else
   with_lp64=$cf_dft_with_lp64
 fi;
 else
   with_lp64=$cf_dft_with_lp64
 fi;

-echo "$as_me:12929: result: $with_lp64" >&5
+echo "$as_me:12982: result: $with_lp64" >&5

 echo "${ECHO_T}$with_lp64" >&6
 
 if test "x$with_lp64" = xyes ; then
 echo "${ECHO_T}$with_lp64" >&6
 
 if test "x$with_lp64" = xyes ; then


@@ -12942,7 +12995,7 @@ if test "${enable_largefile+set}" = set; then
 fi;
 if test "$enable_largefile" != no; then
 
 fi;
 if test "$enable_largefile" != no; then
 

-  echo "$as_me:12945: checking for special C compiler options needed for large files" >&5
+  echo "$as_me:12998: 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
 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


@@ -12954,7 +13007,7 @@ else
         # 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
         # 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 12957 "configure"
+#line 13010 "configure"

 #include "confdefs.h"
 #include <sys/types.h>
  /* Check that off_t can represent 2**63 - 1 correctly.
 #include "confdefs.h"
 #include <sys/types.h>
  /* Check that off_t can represent 2**63 - 1 correctly.


@@ -12974,16 +13027,16 @@ main (void)
 }
 _ACEOF
         rm -f "conftest.$ac_objext"
 }
 _ACEOF
         rm -f "conftest.$ac_objext"

-if { (eval echo "$as_me:12977: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:13030: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:12980: \$? = $ac_status" >&5
+  echo "$as_me:13033: \$? = $ac_status" >&5

   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'

-  { (eval echo "$as_me:12983: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13036: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:12986: \$? = $ac_status" >&5
+  echo "$as_me:13039: \$? = $ac_status" >&5

   (exit "$ac_status"); }; }; then
   break
 else
   (exit "$ac_status"); }; }; then
   break
 else


@@ -12993,16 +13046,16 @@ fi
 rm -f "conftest.$ac_objext"
         CC="$CC -n32"
         rm -f "conftest.$ac_objext"
 rm -f "conftest.$ac_objext"
         CC="$CC -n32"
         rm -f "conftest.$ac_objext"

-if { (eval echo "$as_me:12996: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:13049: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:12999: \$? = $ac_status" >&5
+  echo "$as_me:13052: \$? = $ac_status" >&5

   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'

-  { (eval echo "$as_me:13002: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13055: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:13005: \$? = $ac_status" >&5
+  echo "$as_me:13058: \$? = $ac_status" >&5

   (exit "$ac_status"); }; }; then
   ac_cv_sys_largefile_CC=' -n32'; break
 else
   (exit "$ac_status"); }; }; then
   ac_cv_sys_largefile_CC=' -n32'; break
 else


@@ -13016,13 +13069,13 @@ rm -f "conftest.$ac_objext"
        rm -f "conftest.$ac_ext"
     fi
 fi
        rm -f "conftest.$ac_ext"
     fi
 fi

-echo "$as_me:13019: result: $ac_cv_sys_largefile_CC" >&5
+echo "$as_me:13072: 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 "${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:13025: checking for _FILE_OFFSET_BITS value needed for large files" >&5
+  echo "$as_me:13078: 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
 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


@@ -13030,7 +13083,7 @@ else
   while :; do
   ac_cv_sys_file_offset_bits=no
   cat >"conftest.$ac_ext" <<_ACEOF
   while :; do
   ac_cv_sys_file_offset_bits=no
   cat >"conftest.$ac_ext" <<_ACEOF

-#line 13033 "configure"
+#line 13086 "configure"

 #include "confdefs.h"
 #include <sys/types.h>
  /* Check that off_t can represent 2**63 - 1 correctly.
 #include "confdefs.h"
 #include <sys/types.h>
  /* Check that off_t can represent 2**63 - 1 correctly.


@@ -13050,16 +13103,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
 }
 _ACEOF
 rm -f "conftest.$ac_objext"

-if { (eval echo "$as_me:13053: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:13106: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:13056: \$? = $ac_status" >&5
+  echo "$as_me:13109: \$? = $ac_status" >&5

   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'

-  { (eval echo "$as_me:13059: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13112: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:13062: \$? = $ac_status" >&5
+  echo "$as_me:13115: \$? = $ac_status" >&5

   (exit "$ac_status"); }; }; then
   break
 else
   (exit "$ac_status"); }; }; then
   break
 else


@@ -13068,7 +13121,7 @@ cat "conftest.$ac_ext" >&5
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
   cat >"conftest.$ac_ext" <<_ACEOF
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
   cat >"conftest.$ac_ext" <<_ACEOF

-#line 13071 "configure"
+#line 13124 "configure"

 #include "confdefs.h"
 #define _FILE_OFFSET_BITS 64
 #include <sys/types.h>
 #include "confdefs.h"
 #define _FILE_OFFSET_BITS 64
 #include <sys/types.h>


@@ -13089,16 +13142,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
 }
 _ACEOF
 rm -f "conftest.$ac_objext"

-if { (eval echo "$as_me:13092: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:13145: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:13095: \$? = $ac_status" >&5
+  echo "$as_me:13148: \$? = $ac_status" >&5

   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'

-  { (eval echo "$as_me:13098: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13151: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:13101: \$? = $ac_status" >&5
+  echo "$as_me:13154: \$? = $ac_status" >&5

   (exit "$ac_status"); }; }; then
   ac_cv_sys_file_offset_bits=64; break
 else
   (exit "$ac_status"); }; }; then
   ac_cv_sys_file_offset_bits=64; break
 else


@@ -13109,7 +13162,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
   break
 done
 fi
   break
 done
 fi

-echo "$as_me:13112: result: $ac_cv_sys_file_offset_bits" >&5
+echo "$as_me:13165: 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
 
 echo "${ECHO_T}$ac_cv_sys_file_offset_bits" >&6
 if test "$ac_cv_sys_file_offset_bits" != no; then
 


@@ -13119,7 +13172,7 @@ EOF
 
 fi
 rm -rf conftest*
 
 fi
 rm -rf conftest*

-  echo "$as_me:13122: checking for _LARGE_FILES value needed for large files" >&5
+  echo "$as_me:13175: 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
 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


@@ -13127,7 +13180,7 @@ else
   while :; do
   ac_cv_sys_large_files=no
   cat >"conftest.$ac_ext" <<_ACEOF
   while :; do
   ac_cv_sys_large_files=no
   cat >"conftest.$ac_ext" <<_ACEOF

-#line 13130 "configure"
+#line 13183 "configure"

 #include "confdefs.h"
 #include <sys/types.h>
  /* Check that off_t can represent 2**63 - 1 correctly.
 #include "confdefs.h"
 #include <sys/types.h>
  /* Check that off_t can represent 2**63 - 1 correctly.


@@ -13147,16 +13200,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
 }
 _ACEOF
 rm -f "conftest.$ac_objext"

-if { (eval echo "$as_me:13150: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:13203: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:13153: \$? = $ac_status" >&5
+  echo "$as_me:13206: \$? = $ac_status" >&5

   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'

-  { (eval echo "$as_me:13156: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13209: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:13159: \$? = $ac_status" >&5
+  echo "$as_me:13212: \$? = $ac_status" >&5

   (exit "$ac_status"); }; }; then
   break
 else
   (exit "$ac_status"); }; }; then
   break
 else


@@ -13165,7 +13218,7 @@ cat "conftest.$ac_ext" >&5
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
   cat >"conftest.$ac_ext" <<_ACEOF
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
   cat >"conftest.$ac_ext" <<_ACEOF

-#line 13168 "configure"
+#line 13221 "configure"

 #include "confdefs.h"
 #define _LARGE_FILES 1
 #include <sys/types.h>
 #include "confdefs.h"
 #define _LARGE_FILES 1
 #include <sys/types.h>


@@ -13186,16 +13239,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
 }
 _ACEOF
 rm -f "conftest.$ac_objext"

-if { (eval echo "$as_me:13189: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:13242: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:13192: \$? = $ac_status" >&5
+  echo "$as_me:13245: \$? = $ac_status" >&5

   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'

-  { (eval echo "$as_me:13195: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13248: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:13198: \$? = $ac_status" >&5
+  echo "$as_me:13251: \$? = $ac_status" >&5

   (exit "$ac_status"); }; }; then
   ac_cv_sys_large_files=1; break
 else
   (exit "$ac_status"); }; }; then
   ac_cv_sys_large_files=1; break
 else


@@ -13206,7 +13259,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
   break
 done
 fi
   break
 done
 fi

-echo "$as_me:13209: result: $ac_cv_sys_large_files" >&5
+echo "$as_me:13262: 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
 
 echo "${ECHO_T}$ac_cv_sys_large_files" >&6
 if test "$ac_cv_sys_large_files" != no; then
 


@@ -13219,7 +13272,7 @@ rm -rf conftest*
 fi
 
        if test "$enable_largefile" != no ; then
 fi
 
        if test "$enable_largefile" != no ; then

-       echo "$as_me:13222: checking for _LARGEFILE_SOURCE value needed for large files" >&5
+       echo "$as_me:13275: 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
 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


@@ -13227,7 +13280,7 @@ else
   while :; do
   ac_cv_sys_largefile_source=no
   cat >"conftest.$ac_ext" <<_ACEOF
   while :; do
   ac_cv_sys_largefile_source=no
   cat >"conftest.$ac_ext" <<_ACEOF

-#line 13230 "configure"
+#line 13283 "configure"

 #include "confdefs.h"
 #include <stdio.h>
 int
 #include "confdefs.h"
 #include <stdio.h>
 int


@@ -13239,16 +13292,16 @@ return !fseeko;
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
 }
 _ACEOF
 rm -f "conftest.$ac_objext"

-if { (eval echo "$as_me:13242: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:13295: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:13245: \$? = $ac_status" >&5
+  echo "$as_me:13298: \$? = $ac_status" >&5

   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'

-  { (eval echo "$as_me:13248: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13301: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:13251: \$? = $ac_status" >&5
+  echo "$as_me:13304: \$? = $ac_status" >&5

   (exit "$ac_status"); }; }; then
   break
 else
   (exit "$ac_status"); }; }; then
   break
 else


@@ -13257,7 +13310,7 @@ cat "conftest.$ac_ext" >&5
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
   cat >"conftest.$ac_ext" <<_ACEOF
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
   cat >"conftest.$ac_ext" <<_ACEOF

-#line 13260 "configure"
+#line 13313 "configure"

 #include "confdefs.h"
 #define _LARGEFILE_SOURCE 1
 #include <stdio.h>
 #include "confdefs.h"
 #define _LARGEFILE_SOURCE 1
 #include <stdio.h>


@@ -13270,16 +13323,16 @@ return !fseeko;
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
 }
 _ACEOF
 rm -f "conftest.$ac_objext"

-if { (eval echo "$as_me:13273: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:13326: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:13276: \$? = $ac_status" >&5
+  echo "$as_me:13329: \$? = $ac_status" >&5

   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'

-  { (eval echo "$as_me:13279: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13332: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:13282: \$? = $ac_status" >&5
+  echo "$as_me:13335: \$? = $ac_status" >&5

   (exit "$ac_status"); }; }; then
   ac_cv_sys_largefile_source=1; break
 else
   (exit "$ac_status"); }; }; then
   ac_cv_sys_largefile_source=1; break
 else


@@ -13290,7 +13343,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
   break
 done
 fi
   break
 done
 fi

-echo "$as_me:13293: result: $ac_cv_sys_largefile_source" >&5
+echo "$as_me:13346: 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
 
 echo "${ECHO_T}$ac_cv_sys_largefile_source" >&6
 if test "$ac_cv_sys_largefile_source" != no; then
 


@@ -13304,13 +13357,13 @@ rm -rf conftest*
 # 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.
 # 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:13307: checking for fseeko" >&5
+echo "$as_me:13360: 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
 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 13313 "configure"
+#line 13366 "configure"

 #include "confdefs.h"
 #include <stdio.h>
 int
 #include "confdefs.h"
 #include <stdio.h>
 int


@@ -13322,16 +13375,16 @@ return fseeko && fseeko (stdin, 0, 0);
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"

-if { (eval echo "$as_me:13325: \"$ac_link\"") >&5
+if { (eval echo "$as_me:13378: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:13328: \$? = $ac_status" >&5
+  echo "$as_me:13381: \$? = $ac_status" >&5

   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'

-  { (eval echo "$as_me:13331: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13384: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:13334: \$? = $ac_status" >&5
+  echo "$as_me:13387: \$? = $ac_status" >&5

   (exit "$ac_status"); }; }; then
   ac_cv_func_fseeko=yes
 else
   (exit "$ac_status"); }; }; then
   ac_cv_func_fseeko=yes
 else


@@ -13341,7 +13394,7 @@ ac_cv_func_fseeko=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi

-echo "$as_me:13344: result: $ac_cv_func_fseeko" >&5
+echo "$as_me:13397: result: $ac_cv_func_fseeko" >&5

 echo "${ECHO_T}$ac_cv_func_fseeko" >&6
 if test $ac_cv_func_fseeko = yes; then
 
 echo "${ECHO_T}$ac_cv_func_fseeko" >&6
 if test $ac_cv_func_fseeko = yes; then
 


@@ -13380,14 +13433,14 @@ fi
 
        fi
 
 
        fi
 

-       echo "$as_me:13383: checking whether to use struct dirent64" >&5
+       echo "$as_me:13436: 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
 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 13390 "configure"
+#line 13443 "configure"

 #include "confdefs.h"
 
 #pragma GCC diagnostic error "-Wincompatible-pointer-types"
 #include "confdefs.h"
 
 #pragma GCC diagnostic error "-Wincompatible-pointer-types"


@@ -13410,16 +13463,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
 }
 _ACEOF
 rm -f "conftest.$ac_objext"

-if { (eval echo "$as_me:13413: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:13466: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:13416: \$? = $ac_status" >&5
+  echo "$as_me:13469: \$? = $ac_status" >&5

   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'

-  { (eval echo "$as_me:13419: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13472: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:13422: \$? = $ac_status" >&5
+  echo "$as_me:13475: \$? = $ac_status" >&5

   (exit "$ac_status"); }; }; then
   cf_cv_struct_dirent64=yes
 else
   (exit "$ac_status"); }; }; then
   cf_cv_struct_dirent64=yes
 else


@@ -13430,7 +13483,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi

-echo "$as_me:13433: result: $cf_cv_struct_dirent64" >&5
+echo "$as_me:13486: result: $cf_cv_struct_dirent64" >&5

 echo "${ECHO_T}$cf_cv_struct_dirent64" >&6
        test "$cf_cv_struct_dirent64" = yes &&
 cat >>confdefs.h <<\EOF
 echo "${ECHO_T}$cf_cv_struct_dirent64" >&6
        test "$cf_cv_struct_dirent64" = yes &&
 cat >>confdefs.h <<\EOF


@@ -13440,7 +13493,7 @@ EOF
        fi
 
 ###   use option --disable-tparm-varargs to make tparm() conform to X/Open
        fi
 
 ###   use option --disable-tparm-varargs to make tparm() conform to X/Open

-echo "$as_me:13443: checking if you want tparm not to use X/Open fixed-parameter list" >&5
+echo "$as_me:13496: 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.
 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.


@@ -13450,14 +13503,14 @@ if test "${enable_tparm_varargs+set}" = set; then
 else
   with_tparm_varargs=yes
 fi;
 else
   with_tparm_varargs=yes
 fi;

-echo "$as_me:13453: result: $with_tparm_varargs" >&5
+echo "$as_me:13506: 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 "${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:13460: checking if you want tic library to use explicit dependency on ncurses$LIB_SUFFIX library" >&5
+echo "$as_me:13513: 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.
 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.


@@ -13467,14 +13520,14 @@ if test "${enable_tic_depends+set}" = set; then
 else
   with_tic_depends=yes
 fi;
 else
   with_tic_depends=yes
 fi;

-echo "$as_me:13470: result: $with_tic_depends" >&5
+echo "$as_me:13523: result: $with_tic_depends" >&5

 echo "${ECHO_T}$with_tic_depends" >&6
 else
        with_tic_depends=no
 fi
 
 ###   use option --disable-wattr-macros to suppress wattr* macros from curses.h
 echo "${ECHO_T}$with_tic_depends" >&6
 else
        with_tic_depends=no
 fi
 
 ###   use option --disable-wattr-macros to suppress wattr* macros from curses.h

-echo "$as_me:13477: checking if you want to suppress wattr* macros to help with ncurses5/ncurses6 transition" >&5
+echo "$as_me:13530: checking if you want to suppress wattr* macros to help with ncurses5/ncurses6 transition" >&5

 echo $ECHO_N "checking if you want to suppress wattr* macros to help with ncurses5/ncurses6 transition... $ECHO_C" >&6
 
 # Check whether --enable-wattr-macros or --disable-wattr-macros was given.
 echo $ECHO_N "checking if you want to suppress wattr* macros to help with ncurses5/ncurses6 transition... $ECHO_C" >&6
 
 # Check whether --enable-wattr-macros or --disable-wattr-macros was given.


@@ -13486,15 +13539,15 @@ else
 fi;
 if [ "x$with_wattr_macros" != xyes ]; then
        NCURSES_WATTR_MACROS=0
 fi;
 if [ "x$with_wattr_macros" != xyes ]; then
        NCURSES_WATTR_MACROS=0

-       echo "$as_me:13489: result: yes" >&5
+       echo "$as_me:13542: result: yes" >&5

 echo "${ECHO_T}yes" >&6
 else
        NCURSES_WATTR_MACROS=1
 echo "${ECHO_T}yes" >&6
 else
        NCURSES_WATTR_MACROS=1

-       echo "$as_me:13493: result: no" >&5
+       echo "$as_me:13546: result: no" >&5

 echo "${ECHO_T}no" >&6
 fi
 
 echo "${ECHO_T}no" >&6
 fi
 

-echo "$as_me:13497: checking for X11 rgb file" >&5
+echo "$as_me:13550: checking for X11 rgb file" >&5

 echo $ECHO_N "checking for X11 rgb file... $ECHO_C" >&6
 
 # Check whether --with-x11-rgb or --without-x11-rgb was given.
 echo $ECHO_N "checking for X11 rgb file... $ECHO_C" >&6
 
 # Check whether --with-x11-rgb or --without-x11-rgb was given.


@@ -13558,7 +13611,7 @@ case ".$cf_path" in
        cf_path=`echo "$cf_path" | sed -e s%NONE%$cf_path_syntax%`
        ;;
 (*)
        cf_path=`echo "$cf_path" | sed -e s%NONE%$cf_path_syntax%`
        ;;
 (*)

-       { { echo "$as_me:13561: error: expected a pathname, not \"$cf_path\"" >&5
+       { { echo "$as_me:13614: error: expected a pathname, not \"$cf_path\"" >&5

 echo "$as_me: error: expected a pathname, not \"$cf_path\"" >&2;}
    { (exit 1); exit 1; }; }
        ;;
 echo "$as_me: error: expected a pathname, not \"$cf_path\"" >&2;}
    { (exit 1); exit 1; }; }
        ;;


@@ -13566,7 +13619,7 @@ esac
 
 fi
 
 
 fi
 

-echo "$as_me:13569: result: $RGB_PATH" >&5
+echo "$as_me:13622: result: $RGB_PATH" >&5

 echo "${ECHO_T}$RGB_PATH" >&6
 
 cat >>confdefs.h <<EOF
 echo "${ECHO_T}$RGB_PATH" >&6
 
 cat >>confdefs.h <<EOF


@@ -13580,7 +13633,7 @@ then
 fi
 
 ###   use option --with-bool to override bool's type
 fi
 
 ###   use option --with-bool to override bool's type

-echo "$as_me:13583: checking for type of bool" >&5
+echo "$as_me:13636: 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.
 echo $ECHO_N "checking for type of bool... $ECHO_C" >&6
 
 # Check whether --with-bool or --without-bool was given.


@@ -13590,10 +13643,10 @@ if test "${with_bool+set}" = set; then
 else
   NCURSES_BOOL=auto
 fi;
 else
   NCURSES_BOOL=auto
 fi;

-echo "$as_me:13593: result: $NCURSES_BOOL" >&5
+echo "$as_me:13646: result: $NCURSES_BOOL" >&5

 echo "${ECHO_T}$NCURSES_BOOL" >&6
 
 echo "${ECHO_T}$NCURSES_BOOL" >&6
 

-echo "$as_me:13596: checking for alternate terminal capabilities file" >&5
+echo "$as_me:13649: 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.
 echo $ECHO_N "checking for alternate terminal capabilities file... $ECHO_C" >&6
 
 # Check whether --with-caps or --without-caps was given.


@@ -13604,11 +13657,11 @@ else
   TERMINFO_CAPS=Caps
 fi;
 test -f "${srcdir}/include/${TERMINFO_CAPS}" || TERMINFO_CAPS=Caps
   TERMINFO_CAPS=Caps
 fi;
 test -f "${srcdir}/include/${TERMINFO_CAPS}" || TERMINFO_CAPS=Caps

-echo "$as_me:13607: result: $TERMINFO_CAPS" >&5
+echo "$as_me:13660: result: $TERMINFO_CAPS" >&5

 echo "${ECHO_T}$TERMINFO_CAPS" >&6
 
 ###   use option --with-chtype to override chtype's type
 echo "${ECHO_T}$TERMINFO_CAPS" >&6
 
 ###   use option --with-chtype to override chtype's type

-echo "$as_me:13611: checking for type of chtype" >&5
+echo "$as_me:13664: 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.
 echo $ECHO_N "checking for type of chtype... $ECHO_C" >&6
 
 # Check whether --with-chtype or --without-chtype was given.


@@ -13618,11 +13671,11 @@ if test "${with_chtype+set}" = set; then
 else
   NCURSES_CHTYPE=$cf_dft_chtype
 fi;
 else
   NCURSES_CHTYPE=$cf_dft_chtype
 fi;

-echo "$as_me:13621: result: $NCURSES_CHTYPE" >&5
+echo "$as_me:13674: result: $NCURSES_CHTYPE" >&5

 echo "${ECHO_T}$NCURSES_CHTYPE" >&6
 
 ###   use option --with-ospeed to override ospeed's type
 echo "${ECHO_T}$NCURSES_CHTYPE" >&6
 
 ###   use option --with-ospeed to override ospeed's type

-echo "$as_me:13625: checking for type of ospeed" >&5
+echo "$as_me:13678: 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.
 echo $ECHO_N "checking for type of ospeed... $ECHO_C" >&6
 
 # Check whether --with-ospeed or --without-ospeed was given.


@@ -13632,11 +13685,11 @@ if test "${with_ospeed+set}" = set; then
 else
   NCURSES_OSPEED=short
 fi;
 else
   NCURSES_OSPEED=short
 fi;

-echo "$as_me:13635: result: $NCURSES_OSPEED" >&5
+echo "$as_me:13688: result: $NCURSES_OSPEED" >&5

 echo "${ECHO_T}$NCURSES_OSPEED" >&6
 
 ###   use option --with-mmask-t to override mmask_t's type
 echo "${ECHO_T}$NCURSES_OSPEED" >&6
 
 ###   use option --with-mmask-t to override mmask_t's type

-echo "$as_me:13639: checking for type of mmask_t" >&5
+echo "$as_me:13692: 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.
 echo $ECHO_N "checking for type of mmask_t... $ECHO_C" >&6
 
 # Check whether --with-mmask-t or --without-mmask-t was given.


@@ -13646,11 +13699,11 @@ if test "${with_mmask_t+set}" = set; then
 else
   NCURSES_MMASK_T=$cf_dft_mmask_t
 fi;
 else
   NCURSES_MMASK_T=$cf_dft_mmask_t
 fi;

-echo "$as_me:13649: result: $NCURSES_MMASK_T" >&5
+echo "$as_me:13702: result: $NCURSES_MMASK_T" >&5

 echo "${ECHO_T}$NCURSES_MMASK_T" >&6
 
 ###   use option --with-ccharw-max to override CCHARW_MAX size
 echo "${ECHO_T}$NCURSES_MMASK_T" >&6
 
 ###   use option --with-ccharw-max to override CCHARW_MAX size

-echo "$as_me:13653: checking for size CCHARW_MAX" >&5
+echo "$as_me:13706: 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.
 echo $ECHO_N "checking for size CCHARW_MAX... $ECHO_C" >&6
 
 # Check whether --with-ccharw-max or --without-ccharw-max was given.


@@ -13660,16 +13713,16 @@ if test "${with_ccharw_max+set}" = set; then
 else
   NCURSES_CCHARW_MAX=5
 fi;
 else
   NCURSES_CCHARW_MAX=5
 fi;

-echo "$as_me:13663: result: $NCURSES_CCHARW_MAX" >&5
+echo "$as_me:13716: result: $NCURSES_CCHARW_MAX" >&5

 echo "${ECHO_T}$NCURSES_CCHARW_MAX" >&6
 
 echo "${ECHO_T}$NCURSES_CCHARW_MAX" >&6
 

-echo "$as_me:13666: checking for ANSI C header files" >&5
+echo "$as_me:13719: 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
 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 13672 "configure"
+#line 13725 "configure"

 #include "confdefs.h"
 #include <stdlib.h>
 #include <stdarg.h>
 #include "confdefs.h"
 #include <stdlib.h>
 #include <stdarg.h>


@@ -13677,13 +13730,13 @@ else
 #include <float.h>
 
 _ACEOF
 #include <float.h>
 
 _ACEOF

-if { (eval echo "$as_me:13680: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:13733: \"$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
   (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:13686: \$? = $ac_status" >&5
+  echo "$as_me:13739: \$? = $ac_status" >&5

   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag


@@ -13705,7 +13758,7 @@ rm -f conftest.err "conftest.$ac_ext"
 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
 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 13708 "configure"
+#line 13761 "configure"

 #include "confdefs.h"
 #include <string.h>
 
 #include "confdefs.h"
 #include <string.h>
 


@@ -13723,7 +13776,7 @@ fi
 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
 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 13726 "configure"
+#line 13779 "configure"

 #include "confdefs.h"
 #include <stdlib.h>
 
 #include "confdefs.h"
 #include <stdlib.h>
 


@@ -13744,7 +13797,7 @@ if test $ac_cv_header_stdc = yes; then
   :
 else
   cat >"conftest.$ac_ext" <<_ACEOF
   :
 else
   cat >"conftest.$ac_ext" <<_ACEOF

-#line 13747 "configure"
+#line 13800 "configure"

 #include "confdefs.h"
 #include <ctype.h>
 #if ((' ' & 0x0FF) == 0x020)
 #include "confdefs.h"
 #include <ctype.h>
 #if ((' ' & 0x0FF) == 0x020)


@@ -13770,15 +13823,15 @@ main (void)
 }
 _ACEOF
 rm -f "conftest$ac_exeext"
 }
 _ACEOF
 rm -f "conftest$ac_exeext"

-if { (eval echo "$as_me:13773: \"$ac_link\"") >&5
+if { (eval echo "$as_me:13826: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:13776: \$? = $ac_status" >&5
+  echo "$as_me:13829: \$? = $ac_status" >&5

   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'

-  { (eval echo "$as_me:13778: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13831: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:13781: \$? = $ac_status" >&5
+  echo "$as_me:13834: \$? = $ac_status" >&5

   (exit "$ac_status"); }; }; then
   :
 else
   (exit "$ac_status"); }; }; then
   :
 else


@@ -13791,7 +13844,7 @@ rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftes
 fi
 fi
 fi
 fi
 fi
 fi

-echo "$as_me:13794: result: $ac_cv_header_stdc" >&5
+echo "$as_me:13847: result: $ac_cv_header_stdc" >&5

 echo "${ECHO_T}$ac_cv_header_stdc" >&6
 if test $ac_cv_header_stdc = yes; then
 
 echo "${ECHO_T}$ac_cv_header_stdc" >&6
 if test $ac_cv_header_stdc = yes; then
 


@@ -13807,28 +13860,28 @@ for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \
                   inttypes.h stdint.h unistd.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
                   inttypes.h stdint.h unistd.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`

-echo "$as_me:13810: checking for $ac_header" >&5
+echo "$as_me:13863: 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
 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 13816 "configure"
+#line 13869 "configure"

 #include "confdefs.h"
 $ac_includes_default
 #include <$ac_header>
 _ACEOF
 rm -f "conftest.$ac_objext"
 #include "confdefs.h"
 $ac_includes_default
 #include <$ac_header>
 _ACEOF
 rm -f "conftest.$ac_objext"

-if { (eval echo "$as_me:13822: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:13875: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:13825: \$? = $ac_status" >&5
+  echo "$as_me:13878: \$? = $ac_status" >&5

   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'

-  { (eval echo "$as_me:13828: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13881: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:13831: \$? = $ac_status" >&5
+  echo "$as_me:13884: \$? = $ac_status" >&5

   (exit "$ac_status"); }; }; then
   eval "$as_ac_Header=yes"
 else
   (exit "$ac_status"); }; }; then
   eval "$as_ac_Header=yes"
 else


@@ -13838,7 +13891,7 @@ eval "$as_ac_Header=no"
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi

-echo "$as_me:13841: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:13894: 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
 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6
 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then
   cat >>confdefs.h <<EOF


@@ -13848,13 +13901,13 @@ EOF
 fi
 done
 
 fi
 done
 

-echo "$as_me:13851: checking for signed char" >&5
+echo "$as_me:13904: 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
 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 13857 "configure"
+#line 13910 "configure"

 #include "confdefs.h"
 $ac_includes_default
 int
 #include "confdefs.h"
 $ac_includes_default
 int


@@ -13869,16 +13922,16 @@ if (sizeof (signed char))
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
 }
 _ACEOF
 rm -f "conftest.$ac_objext"

-if { (eval echo "$as_me:13872: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:13925: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:13875: \$? = $ac_status" >&5
+  echo "$as_me:13928: \$? = $ac_status" >&5

   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'

-  { (eval echo "$as_me:13878: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13931: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:13881: \$? = $ac_status" >&5
+  echo "$as_me:13934: \$? = $ac_status" >&5

   (exit "$ac_status"); }; }; then
   ac_cv_type_signed_char=yes
 else
   (exit "$ac_status"); }; }; then
   ac_cv_type_signed_char=yes
 else


@@ -13888,10 +13941,10 @@ ac_cv_type_signed_char=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi

-echo "$as_me:13891: result: $ac_cv_type_signed_char" >&5
+echo "$as_me:13944: result: $ac_cv_type_signed_char" >&5

 echo "${ECHO_T}$ac_cv_type_signed_char" >&6
 
 echo "${ECHO_T}$ac_cv_type_signed_char" >&6
 

-echo "$as_me:13894: checking size of signed char" >&5
+echo "$as_me:13947: 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
 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


@@ -13900,7 +13953,7 @@ else
   if test "$cross_compiling" = yes; then
   # Depending upon the size, compute the lo and hi bounds.
 cat >"conftest.$ac_ext" <<_ACEOF
   if test "$cross_compiling" = yes; then
   # Depending upon the size, compute the lo and hi bounds.
 cat >"conftest.$ac_ext" <<_ACEOF

-#line 13903 "configure"
+#line 13956 "configure"

 #include "confdefs.h"
 $ac_includes_default
 int
 #include "confdefs.h"
 $ac_includes_default
 int


@@ -13912,21 +13965,21 @@ int _array_ [1 - 2 * !((sizeof (signed char)) >= 0)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
 }
 _ACEOF
 rm -f "conftest.$ac_objext"

-if { (eval echo "$as_me:13915: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:13968: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:13918: \$? = $ac_status" >&5
+  echo "$as_me:13971: \$? = $ac_status" >&5

   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'

-  { (eval echo "$as_me:13921: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13974: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:13924: \$? = $ac_status" >&5
+  echo "$as_me:13977: \$? = $ac_status" >&5

   (exit "$ac_status"); }; }; then
   ac_lo=0 ac_mid=0
   while :; do
     cat >"conftest.$ac_ext" <<_ACEOF
   (exit "$ac_status"); }; }; then
   ac_lo=0 ac_mid=0
   while :; do
     cat >"conftest.$ac_ext" <<_ACEOF

-#line 13929 "configure"
+#line 13982 "configure"

 #include "confdefs.h"
 $ac_includes_default
 int
 #include "confdefs.h"
 $ac_includes_default
 int


@@ -13938,16 +13991,16 @@ int _array_ [1 - 2 * !((sizeof (signed char)) <= $ac_mid)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
 }
 _ACEOF
 rm -f "conftest.$ac_objext"

-if { (eval echo "$as_me:13941: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:13994: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:13944: \$? = $ac_status" >&5
+  echo "$as_me:13997: \$? = $ac_status" >&5

   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'

-  { (eval echo "$as_me:13947: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14000: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:13950: \$? = $ac_status" >&5
+  echo "$as_me:14003: \$? = $ac_status" >&5

   (exit "$ac_status"); }; }; then
   ac_hi=$ac_mid; break
 else
   (exit "$ac_status"); }; }; then
   ac_hi=$ac_mid; break
 else


@@ -13963,7 +14016,7 @@ cat "conftest.$ac_ext" >&5
 ac_hi=-1 ac_mid=-1
   while :; do
     cat >"conftest.$ac_ext" <<_ACEOF
 ac_hi=-1 ac_mid=-1
   while :; do
     cat >"conftest.$ac_ext" <<_ACEOF

-#line 13966 "configure"
+#line 14019 "configure"

 #include "confdefs.h"
 $ac_includes_default
 int
 #include "confdefs.h"
 $ac_includes_default
 int


@@ -13975,16 +14028,16 @@ int _array_ [1 - 2 * !((sizeof (signed char)) >= $ac_mid)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
 }
 _ACEOF
 rm -f "conftest.$ac_objext"

-if { (eval echo "$as_me:13978: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:14031: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:13981: \$? = $ac_status" >&5
+  echo "$as_me:14034: \$? = $ac_status" >&5

   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'

-  { (eval echo "$as_me:13984: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14037: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:13987: \$? = $ac_status" >&5
+  echo "$as_me:14040: \$? = $ac_status" >&5

   (exit "$ac_status"); }; }; then
   ac_lo=$ac_mid; break
 else
   (exit "$ac_status"); }; }; then
   ac_lo=$ac_mid; break
 else


@@ -14000,7 +14053,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 while test "x$ac_lo" != "x$ac_hi"; do
   ac_mid=`expr '(' "$ac_hi" - "$ac_lo" ')' / 2 + "$ac_lo"`
   cat >"conftest.$ac_ext" <<_ACEOF
 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 14003 "configure"
+#line 14056 "configure"

 #include "confdefs.h"
 $ac_includes_default
 int
 #include "confdefs.h"
 $ac_includes_default
 int


@@ -14012,16 +14065,16 @@ int _array_ [1 - 2 * !((sizeof (signed char)) <= $ac_mid)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
 }
 _ACEOF
 rm -f "conftest.$ac_objext"

-if { (eval echo "$as_me:14015: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:14068: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:14018: \$? = $ac_status" >&5
+  echo "$as_me:14071: \$? = $ac_status" >&5

   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'

-  { (eval echo "$as_me:14021: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14074: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:14024: \$? = $ac_status" >&5
+  echo "$as_me:14077: \$? = $ac_status" >&5

   (exit "$ac_status"); }; }; then
   ac_hi=$ac_mid
 else
   (exit "$ac_status"); }; }; then
   ac_hi=$ac_mid
 else


@@ -14034,12 +14087,12 @@ done
 ac_cv_sizeof_signed_char=$ac_lo
 else
   if test "$cross_compiling" = yes; then
 ac_cv_sizeof_signed_char=$ac_lo
 else
   if test "$cross_compiling" = yes; then

-  { { echo "$as_me:14037: error: cannot run test program while cross compiling" >&5
+  { { echo "$as_me:14090: 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
 echo "$as_me: error: cannot run test program while cross compiling" >&2;}
    { (exit 1); exit 1; }; }
 else
   cat >"conftest.$ac_ext" <<_ACEOF

-#line 14042 "configure"
+#line 14095 "configure"

 #include "confdefs.h"
 $ac_includes_default
 int
 #include "confdefs.h"
 $ac_includes_default
 int


@@ -14048,22 +14101,22 @@ main (void)
 FILE *f = fopen ("conftest.val", "w");
 if (!f)
   $ac_main_return (1);
 FILE *f = fopen ("conftest.val", "w");
 if (!f)
   $ac_main_return (1);

-fprintf (f, "%d", (sizeof (signed char)));
+fprintf (f, "%ld", (long)(sizeof (signed char)));

 fclose (f);
   ;
   return 0;
 }
 _ACEOF
 rm -f "conftest$ac_exeext"
 fclose (f);
   ;
   return 0;
 }
 _ACEOF
 rm -f "conftest$ac_exeext"

-if { (eval echo "$as_me:14058: \"$ac_link\"") >&5
+if { (eval echo "$as_me:14111: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:14061: \$? = $ac_status" >&5
+  echo "$as_me:14114: \$? = $ac_status" >&5

   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'

-  { (eval echo "$as_me:14063: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14116: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:14066: \$? = $ac_status" >&5
+  echo "$as_me:14119: \$? = $ac_status" >&5

   (exit "$ac_status"); }; }; then
   ac_cv_sizeof_signed_char=`cat conftest.val`
 else
   (exit "$ac_status"); }; }; then
   ac_cv_sizeof_signed_char=`cat conftest.val`
 else


@@ -14079,7 +14132,7 @@ else
   ac_cv_sizeof_signed_char=0
 fi
 fi
   ac_cv_sizeof_signed_char=0
 fi
 fi

-echo "$as_me:14082: result: $ac_cv_sizeof_signed_char" >&5
+echo "$as_me:14135: 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
 echo "${ECHO_T}$ac_cv_sizeof_signed_char" >&6
 cat >>confdefs.h <<EOF
 #define SIZEOF_SIGNED_CHAR $ac_cv_sizeof_signed_char


@@ -14090,7 +14143,7 @@ if test "$ac_cv_sizeof_signed_char" = 1 ; then
 else
        NCURSES_SBOOL="char"
 fi
 else
        NCURSES_SBOOL="char"
 fi

-echo "$as_me:14093: checking if you want to use signed Boolean array in term.h" >&5
+echo "$as_me:14146: 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.
 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.


@@ -14100,12 +14153,12 @@ if test "${enable_signed_char+set}" = set; then
 else
   with_signed_char=no
 fi;
 else
   with_signed_char=no
 fi;

-echo "$as_me:14103: result: $with_signed_char" >&5
+echo "$as_me:14156: result: $with_signed_char" >&5

 echo "${ECHO_T}$with_signed_char" >&6
 test "x$with_signed_char" != xyes && NCURSES_SBOOL="char"
 
 ###   use option --with-tparm-arg to override tparm's argument type
 echo "${ECHO_T}$with_signed_char" >&6
 test "x$with_signed_char" != xyes && NCURSES_SBOOL="char"
 
 ###   use option --with-tparm-arg to override tparm's argument type

-echo "$as_me:14108: checking for type of tparm args" >&5
+echo "$as_me:14161: 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.
 echo $ECHO_N "checking for type of tparm args... $ECHO_C" >&6
 
 # Check whether --with-tparm-arg or --without-tparm-arg was given.


@@ -14115,11 +14168,11 @@ if test "${with_tparm_arg+set}" = set; then
 else
   NCURSES_TPARM_ARG=$cf_dft_tparm_arg
 fi;
 else
   NCURSES_TPARM_ARG=$cf_dft_tparm_arg
 fi;

-echo "$as_me:14118: result: $NCURSES_TPARM_ARG" >&5
+echo "$as_me:14171: result: $NCURSES_TPARM_ARG" >&5

 echo "${ECHO_T}$NCURSES_TPARM_ARG" >&6
 
 ### Enable compiling-in rcs id's
 echo "${ECHO_T}$NCURSES_TPARM_ARG" >&6
 
 ### Enable compiling-in rcs id's

-echo "$as_me:14122: checking if RCS identifiers should be compiled-in" >&5
+echo "$as_me:14175: 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.
 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.


@@ -14129,7 +14182,7 @@ if test "${with_rcs_ids+set}" = set; then
 else
   with_rcs_ids=no
 fi;
 else
   with_rcs_ids=no
 fi;

-echo "$as_me:14132: result: $with_rcs_ids" >&5
+echo "$as_me:14185: result: $with_rcs_ids" >&5

 echo "${ECHO_T}$with_rcs_ids" >&6
 test "x$with_rcs_ids" = xyes &&
 cat >>confdefs.h <<\EOF
 echo "${ECHO_T}$with_rcs_ids" >&6
 test "x$with_rcs_ids" = xyes &&
 cat >>confdefs.h <<\EOF


@@ -14138,7 +14191,7 @@ EOF
 
 ###############################################################################
 
 
 ###############################################################################
 

-echo "$as_me:14141: checking format of man-pages" >&5
+echo "$as_me:14194: 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.
 echo $ECHO_N "checking format of man-pages... $ECHO_C" >&6
 
 # Check whether --with-manpage-format or --without-manpage-format was given.


@@ -14227,14 +14280,14 @@ case "$MANPAGE_FORMAT" in
        ;;
 esac
 
        ;;
 esac
 

-echo "$as_me:14230: result: $MANPAGE_FORMAT" >&5
+echo "$as_me:14283: result: $MANPAGE_FORMAT" >&5

 echo "${ECHO_T}$MANPAGE_FORMAT" >&6
 if test -n "$cf_unknown" ; then
 echo "${ECHO_T}$MANPAGE_FORMAT" >&6
 if test -n "$cf_unknown" ; then

-       { echo "$as_me:14233: WARNING: Unexpected manpage-format $cf_unknown" >&5
+       { echo "$as_me:14286: WARNING: Unexpected manpage-format $cf_unknown" >&5

 echo "$as_me: WARNING: Unexpected manpage-format $cf_unknown" >&2;}
 fi
 
 echo "$as_me: WARNING: Unexpected manpage-format $cf_unknown" >&2;}
 fi
 

-echo "$as_me:14237: checking for manpage renaming" >&5
+echo "$as_me:14290: 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.
 echo $ECHO_N "checking for manpage renaming... $ECHO_C" >&6
 
 # Check whether --with-manpage-renames or --without-manpage-renames was given.


@@ -14262,7 +14315,7 @@ if test "$MANPAGE_RENAMES" != no ; then
        if test -f "$srcdir/man/$MANPAGE_RENAMES" ; then
                MANPAGE_RENAMES=`cd "$srcdir/man" && pwd`/$MANPAGE_RENAMES
        elif test ! -f "$MANPAGE_RENAMES" ; then
        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:14265: error: not a filename: $MANPAGE_RENAMES" >&5
+               { { echo "$as_me:14318: error: not a filename: $MANPAGE_RENAMES" >&5

 echo "$as_me: error: not a filename: $MANPAGE_RENAMES" >&2;}
    { (exit 1); exit 1; }; }
        fi
 echo "$as_me: error: not a filename: $MANPAGE_RENAMES" >&2;}
    { (exit 1); exit 1; }; }
        fi


@@ -14276,10 +14329,10 @@ echo "$as_me: error: not a filename: $MANPAGE_RENAMES" >&2;}
        fi
 fi
 
        fi
 fi
 

-echo "$as_me:14279: result: $MANPAGE_RENAMES" >&5
+echo "$as_me:14332: result: $MANPAGE_RENAMES" >&5

 echo "${ECHO_T}$MANPAGE_RENAMES" >&6
 
 echo "${ECHO_T}$MANPAGE_RENAMES" >&6
 

-echo "$as_me:14282: checking if manpage aliases will be installed" >&5
+echo "$as_me:14335: 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.
 echo $ECHO_N "checking if manpage aliases will be installed... $ECHO_C" >&6
 
 # Check whether --with-manpage-aliases or --without-manpage-aliases was given.


@@ -14290,7 +14343,7 @@ else
   MANPAGE_ALIASES=yes
 fi;
 
   MANPAGE_ALIASES=yes
 fi;
 

-echo "$as_me:14293: result: $MANPAGE_ALIASES" >&5
+echo "$as_me:14346: result: $MANPAGE_ALIASES" >&5

 echo "${ECHO_T}$MANPAGE_ALIASES" >&6
 
 case "x$LN_S" in
 echo "${ECHO_T}$MANPAGE_ALIASES" >&6
 
 case "x$LN_S" in


@@ -14304,7 +14357,7 @@ esac
 
 MANPAGE_SYMLINKS=no
 if test "$MANPAGE_ALIASES" = yes ; then
 
 MANPAGE_SYMLINKS=no
 if test "$MANPAGE_ALIASES" = yes ; then

-echo "$as_me:14307: checking if manpage symlinks should be used" >&5
+echo "$as_me:14360: 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.
 echo $ECHO_N "checking if manpage symlinks should be used... $ECHO_C" >&6
 
 # Check whether --with-manpage-symlinks or --without-manpage-symlinks was given.


@@ -14317,17 +14370,17 @@ fi;
 
 if test "$$cf_use_symlinks" = no; then
 if test "$MANPAGE_SYMLINKS" = yes ; then
 
 if test "$$cf_use_symlinks" = no; then
 if test "$MANPAGE_SYMLINKS" = yes ; then

-       { echo "$as_me:14320: WARNING: cannot make symlinks" >&5
+       { echo "$as_me:14373: WARNING: cannot make symlinks" >&5

 echo "$as_me: WARNING: cannot make symlinks" >&2;}
        MANPAGE_SYMLINKS=no
 fi
 fi
 
 echo "$as_me: WARNING: cannot make symlinks" >&2;}
        MANPAGE_SYMLINKS=no
 fi
 fi
 

-echo "$as_me:14326: result: $MANPAGE_SYMLINKS" >&5
+echo "$as_me:14379: result: $MANPAGE_SYMLINKS" >&5

 echo "${ECHO_T}$MANPAGE_SYMLINKS" >&6
 fi
 
 echo "${ECHO_T}$MANPAGE_SYMLINKS" >&6
 fi
 

-echo "$as_me:14330: checking for manpage tbl" >&5
+echo "$as_me:14383: 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.
 echo $ECHO_N "checking for manpage tbl... $ECHO_C" >&6
 
 # Check whether --with-manpage-tbl or --without-manpage-tbl was given.


@@ -14338,7 +14391,7 @@ else
   MANPAGE_TBL=no
 fi;
 
   MANPAGE_TBL=no
 fi;
 

-echo "$as_me:14341: result: $MANPAGE_TBL" >&5
+echo "$as_me:14394: result: $MANPAGE_TBL" >&5

 echo "${ECHO_T}$MANPAGE_TBL" >&6
 
 if test "$prefix" = "NONE" ; then
 echo "${ECHO_T}$MANPAGE_TBL" >&6
 
 if test "$prefix" = "NONE" ; then


@@ -14671,7 +14724,7 @@ chmod 755 "$cf_edit_man"
 ###############################################################################
 
 ### Note that some functions (such as const) are normally disabled anyway.
 ###############################################################################
 
 ### Note that some functions (such as const) are normally disabled anyway.

-echo "$as_me:14674: checking if you want to build with function extensions" >&5
+echo "$as_me:14727: checking if you want to build with function extensions" >&5

 echo $ECHO_N "checking if you want to build with function extensions... $ECHO_C" >&6
 
 # Check whether --enable-ext-funcs or --disable-ext-funcs was given.
 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.


@@ -14681,7 +14734,7 @@ if test "${enable_ext_funcs+set}" = set; then
 else
   with_ext_funcs=yes
 fi;
 else
   with_ext_funcs=yes
 fi;

-echo "$as_me:14684: result: $with_ext_funcs" >&5
+echo "$as_me:14737: result: $with_ext_funcs" >&5

 echo "${ECHO_T}$with_ext_funcs" >&6
 if test "x$with_ext_funcs" = xyes ; then
        NCURSES_EXT_FUNCS=1
 echo "${ECHO_T}$with_ext_funcs" >&6
 if test "x$with_ext_funcs" = xyes ; then
        NCURSES_EXT_FUNCS=1


@@ -14741,7 +14794,7 @@ else
        GENERATED_EXT_FUNCS=
 fi
 
        GENERATED_EXT_FUNCS=
 fi
 

-echo "$as_me:14744: checking if you want to build with SCREEN extensions" >&5
+echo "$as_me:14797: 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.
 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.


@@ -14751,7 +14804,7 @@ if test "${enable_sp_funcs+set}" = set; then
 else
   with_sp_funcs=$cf_dft_ext_spfuncs
 fi;
 else
   with_sp_funcs=$cf_dft_ext_spfuncs
 fi;

-echo "$as_me:14754: result: $with_sp_funcs" >&5
+echo "$as_me:14807: result: $with_sp_funcs" >&5

 echo "${ECHO_T}$with_sp_funcs" >&6
 if test "x$with_sp_funcs" = xyes ; then
        NCURSES_SP_FUNCS=1
 echo "${ECHO_T}$with_sp_funcs" >&6
 if test "x$with_sp_funcs" = xyes ; then
        NCURSES_SP_FUNCS=1


@@ -14770,7 +14823,7 @@ else
        GENERATED_SP_FUNCS=
 fi
 
        GENERATED_SP_FUNCS=
 fi
 

-echo "$as_me:14773: checking if you want to build with terminal-driver" >&5
+echo "$as_me:14826: 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.
 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.


@@ -14780,7 +14833,7 @@ if test "${enable_term_driver+set}" = set; then
 else
   with_term_driver=no
 fi;
 else
   with_term_driver=no
 fi;

-echo "$as_me:14783: result: $with_term_driver" >&5
+echo "$as_me:14836: result: $with_term_driver" >&5

 echo "${ECHO_T}$with_term_driver" >&6
 if test "x$with_term_driver" = xyes ; then
 
 echo "${ECHO_T}$with_term_driver" >&6
 if test "x$with_term_driver" = xyes ; then
 


@@ -14789,19 +14842,19 @@ cat >>confdefs.h <<\EOF
 EOF
 
        if test "x$with_termlib" != xno ; then
 EOF
 
        if test "x$with_termlib" != xno ; then

-               { { echo "$as_me:14792: error: The term-driver option conflicts with the termlib option" >&5
+               { { echo "$as_me:14845: 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: 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:14797: error: The term-driver option relies upon sp-funcs" >&5
+               { { echo "$as_me:14850: 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: 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:14804: checking for extended use of const keyword" >&5
+echo "$as_me:14857: 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.
 echo $ECHO_N "checking for extended use of const keyword... $ECHO_C" >&6
 
 # Check whether --enable-const or --disable-const was given.


@@ -14811,7 +14864,7 @@ if test "${enable_const+set}" = set; then
 else
   with_ext_const=$cf_dft_ext_const
 fi;
 else
   with_ext_const=$cf_dft_ext_const
 fi;

-echo "$as_me:14814: result: $with_ext_const" >&5
+echo "$as_me:14867: result: $with_ext_const" >&5

 echo "${ECHO_T}$with_ext_const" >&6
 NCURSES_CONST='/*nothing*/'
 if test "x$with_ext_const" = xyes ; then
 echo "${ECHO_T}$with_ext_const" >&6
 NCURSES_CONST='/*nothing*/'
 if test "x$with_ext_const" = xyes ; then


@@ -14819,7 +14872,7 @@ if test "x$with_ext_const" = xyes ; then
 fi
 
 ###   use option --enable-ext-colors to turn on use of colors beyond 16.
 fi
 
 ###   use option --enable-ext-colors to turn on use of colors beyond 16.

-echo "$as_me:14822: checking if you want to use extended colors" >&5
+echo "$as_me:14875: 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.
 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.


@@ -14829,12 +14882,12 @@ if test "${enable_ext_colors+set}" = set; then
 else
   with_ext_colors=$cf_dft_ext_colors
 fi;
 else
   with_ext_colors=$cf_dft_ext_colors
 fi;

-echo "$as_me:14832: result: $with_ext_colors" >&5
+echo "$as_me:14885: 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 "${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:14837: WARNING: This option applies only to wide-character library" >&5
+               { echo "$as_me:14890: 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)
 echo "$as_me: WARNING: This option applies only to wide-character library" >&2;}
        else
                # cannot be ABI 5 since it changes sizeof(cchar_t)


@@ -14844,7 +14897,7 @@ if test "${with_abi_version+set}" != set; then
        (5.*)
                cf_cv_rel_version=6.0
                cf_cv_abi_version=6
        (5.*)
                cf_cv_rel_version=6.0
                cf_cv_abi_version=6

-               { echo "$as_me:14847: WARNING: overriding ABI version to $cf_cv_abi_version" >&5
+               { echo "$as_me:14900: WARNING: overriding ABI version to $cf_cv_abi_version" >&5

 echo "$as_me: WARNING: overriding ABI version to $cf_cv_abi_version" >&2;}
                ;;
        esac
 echo "$as_me: WARNING: overriding ABI version to $cf_cv_abi_version" >&2;}
                ;;
        esac


@@ -14872,7 +14925,7 @@ EOF
 fi
 
 ###   use option --enable-ext-mouse to modify coding to support 5-button mice
 fi
 
 ###   use option --enable-ext-mouse to modify coding to support 5-button mice

-echo "$as_me:14875: checking if you want to use extended mouse encoding" >&5
+echo "$as_me:14928: 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.
 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.


@@ -14882,7 +14935,7 @@ if test "${enable_ext_mouse+set}" = set; then
 else
   with_ext_mouse=$cf_dft_ext_mouse
 fi;
 else
   with_ext_mouse=$cf_dft_ext_mouse
 fi;

-echo "$as_me:14885: result: $with_ext_mouse" >&5
+echo "$as_me:14938: result: $with_ext_mouse" >&5

 echo "${ECHO_T}$with_ext_mouse" >&6
 NCURSES_MOUSE_VERSION=1
 if test "x$with_ext_mouse" = xyes ; then
 echo "${ECHO_T}$with_ext_mouse" >&6
 NCURSES_MOUSE_VERSION=1
 if test "x$with_ext_mouse" = xyes ; then


@@ -14893,7 +14946,7 @@ if test "${with_abi_version+set}" != set; then
        (5.*)
                cf_cv_rel_version=6.0
                cf_cv_abi_version=6
        (5.*)
                cf_cv_rel_version=6.0
                cf_cv_abi_version=6

-               { echo "$as_me:14896: WARNING: overriding ABI version to $cf_cv_abi_version" >&5
+               { echo "$as_me:14949: WARNING: overriding ABI version to $cf_cv_abi_version" >&5

 echo "$as_me: WARNING: overriding ABI version to $cf_cv_abi_version" >&2;}
                ;;
        esac
 echo "$as_me: WARNING: overriding ABI version to $cf_cv_abi_version" >&2;}
                ;;
        esac


@@ -14902,7 +14955,7 @@ fi
 fi
 
 ###   use option --enable-ext-putwin to turn on extended screendumps
 fi
 
 ###   use option --enable-ext-putwin to turn on extended screendumps

-echo "$as_me:14905: checking if you want to use extended putwin/screendump" >&5
+echo "$as_me:14958: 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.
 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.


@@ -14912,7 +14965,7 @@ if test "${enable_ext_putwin+set}" = set; then
 else
   with_ext_putwin=$cf_dft_ext_putwin
 fi;
 else
   with_ext_putwin=$cf_dft_ext_putwin
 fi;

-echo "$as_me:14915: result: $with_ext_putwin" >&5
+echo "$as_me:14968: result: $with_ext_putwin" >&5

 echo "${ECHO_T}$with_ext_putwin" >&6
 if test "x$with_ext_putwin" = xyes ; then
 
 echo "${ECHO_T}$with_ext_putwin" >&6
 if test "x$with_ext_putwin" = xyes ; then
 


@@ -14922,7 +14975,7 @@ EOF
 
 fi
 
 
 fi
 

-echo "$as_me:14925: checking if you want \$NCURSES_NO_PADDING code" >&5
+echo "$as_me:14978: 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.
 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.


@@ -14932,7 +14985,7 @@ if test "${enable_no_padding+set}" = set; then
 else
   with_no_padding=$with_ext_funcs
 fi;
 else
   with_no_padding=$with_ext_funcs
 fi;

-echo "$as_me:14935: result: $with_no_padding" >&5
+echo "$as_me:14988: result: $with_no_padding" >&5

 echo "${ECHO_T}$with_no_padding" >&6
 test "x$with_no_padding" = xyes &&
 cat >>confdefs.h <<\EOF
 echo "${ECHO_T}$with_no_padding" >&6
 test "x$with_no_padding" = xyes &&
 cat >>confdefs.h <<\EOF


@@ -14940,7 +14993,7 @@ cat >>confdefs.h <<\EOF
 EOF
 
 ###   use option --enable-sigwinch to turn on use of SIGWINCH logic
 EOF
 
 ###   use option --enable-sigwinch to turn on use of SIGWINCH logic

-echo "$as_me:14943: checking if you want SIGWINCH handler" >&5
+echo "$as_me:14996: 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.
 echo $ECHO_N "checking if you want SIGWINCH handler... $ECHO_C" >&6
 
 # Check whether --enable-sigwinch or --disable-sigwinch was given.


@@ -14950,7 +15003,7 @@ if test "${enable_sigwinch+set}" = set; then
 else
   with_sigwinch=$with_ext_funcs
 fi;
 else
   with_sigwinch=$with_ext_funcs
 fi;

-echo "$as_me:14953: result: $with_sigwinch" >&5
+echo "$as_me:15006: result: $with_sigwinch" >&5

 echo "${ECHO_T}$with_sigwinch" >&6
 test "x$with_sigwinch" = xyes &&
 cat >>confdefs.h <<\EOF
 echo "${ECHO_T}$with_sigwinch" >&6
 test "x$with_sigwinch" = xyes &&
 cat >>confdefs.h <<\EOF


@@ -14958,7 +15011,7 @@ cat >>confdefs.h <<\EOF
 EOF
 
 ###   use option --enable-tcap-names to allow user to define new capabilities
 EOF
 
 ###   use option --enable-tcap-names to allow user to define new capabilities

-echo "$as_me:14961: checking if you want user-definable terminal capabilities like termcap" >&5
+echo "$as_me:15014: 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.
 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.


@@ -14968,14 +15021,14 @@ if test "${enable_tcap_names+set}" = set; then
 else
   with_tcap_names=$with_ext_funcs
 fi;
 else
   with_tcap_names=$with_ext_funcs
 fi;

-echo "$as_me:14971: result: $with_tcap_names" >&5
+echo "$as_me:15024: result: $with_tcap_names" >&5

 echo "${ECHO_T}$with_tcap_names" >&6
 NCURSES_XNAMES=0
 test "x$with_tcap_names" = xyes && NCURSES_XNAMES=1
 
 ##############################################################################
 
 echo "${ECHO_T}$with_tcap_names" >&6
 NCURSES_XNAMES=0
 test "x$with_tcap_names" = xyes && NCURSES_XNAMES=1
 
 ##############################################################################
 

-echo "$as_me:14978: checking if you want to link with the pthread library" >&5
+echo "$as_me:15031: 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.
 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.


@@ -14985,27 +15038,27 @@ if test "${with_pthread+set}" = set; then
 else
   with_pthread=no
 fi;
 else
   with_pthread=no
 fi;

-echo "$as_me:14988: result: $with_pthread" >&5
+echo "$as_me:15041: result: $with_pthread" >&5

 echo "${ECHO_T}$with_pthread" >&6
 
 if test "$with_pthread" != no ; then
 echo "${ECHO_T}$with_pthread" >&6
 
 if test "$with_pthread" != no ; then

-       echo "$as_me:14992: checking for pthread.h" >&5
+       echo "$as_me:15045: 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
 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 14998 "configure"
+#line 15051 "configure"

 #include "confdefs.h"
 #include <pthread.h>
 _ACEOF
 #include "confdefs.h"
 #include <pthread.h>
 _ACEOF

-if { (eval echo "$as_me:15002: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:15055: \"$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
   (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:15008: \$? = $ac_status" >&5
+  echo "$as_me:15061: \$? = $ac_status" >&5

   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag


@@ -15024,7 +15077,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi

-echo "$as_me:15027: result: $ac_cv_header_pthread_h" >&5
+echo "$as_me:15080: 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
 
 echo "${ECHO_T}$ac_cv_header_pthread_h" >&6
 if test "$ac_cv_header_pthread_h" = yes; then
 


@@ -15034,7 +15087,7 @@ EOF
 
        for cf_lib_pthread in pthread c_r
        do
 
        for cf_lib_pthread in pthread c_r
        do

-           echo "$as_me:15037: checking if we can link with the $cf_lib_pthread library" >&5
+           echo "$as_me:15090: 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"
 
 echo $ECHO_N "checking if we can link with the $cf_lib_pthread library... $ECHO_C" >&6
            cf_save_LIBS="$LIBS"
 


@@ -15055,7 +15108,7 @@ done
 LIBS="$cf_add_libs"
 
            cat >"conftest.$ac_ext" <<_ACEOF
 LIBS="$cf_add_libs"
 
            cat >"conftest.$ac_ext" <<_ACEOF

-#line 15058 "configure"
+#line 15111 "configure"

 #include "confdefs.h"
 
 #include <pthread.h>
 #include "confdefs.h"
 
 #include <pthread.h>


@@ -15072,16 +15125,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"

-if { (eval echo "$as_me:15075: \"$ac_link\"") >&5
+if { (eval echo "$as_me:15128: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:15078: \$? = $ac_status" >&5
+  echo "$as_me:15131: \$? = $ac_status" >&5

   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'

-  { (eval echo "$as_me:15081: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15134: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:15084: \$? = $ac_status" >&5
+  echo "$as_me:15137: \$? = $ac_status" >&5

   (exit "$ac_status"); }; }; then
   with_pthread=yes
 else
   (exit "$ac_status"); }; }; then
   with_pthread=yes
 else


@@ -15091,7 +15144,7 @@ with_pthread=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
            LIBS="$cf_save_LIBS"
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
            LIBS="$cf_save_LIBS"

-           echo "$as_me:15094: result: $with_pthread" >&5
+           echo "$as_me:15147: result: $with_pthread" >&5

 echo "${ECHO_T}$with_pthread" >&6
            test "$with_pthread" = yes && break
        done
 echo "${ECHO_T}$with_pthread" >&6
            test "$with_pthread" = yes && break
        done


@@ -15119,7 +15172,7 @@ cat >>confdefs.h <<\EOF
 EOF
 
        else
 EOF
 
        else

-           { { echo "$as_me:15122: error: Cannot link with pthread library" >&5
+           { { echo "$as_me:15175: error: Cannot link with pthread library" >&5

 echo "$as_me: error: Cannot link with pthread library" >&2;}
    { (exit 1); exit 1; }; }
        fi
 echo "$as_me: error: Cannot link with pthread library" >&2;}
    { (exit 1); exit 1; }; }
        fi


@@ -15129,13 +15182,13 @@ fi
 fi
 
 if test "x$with_pthread" != xno; then
 fi
 
 if test "x$with_pthread" != xno; then

-       echo "$as_me:15132: checking for pthread_kill" >&5
+       echo "$as_me:15185: 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
 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 15138 "configure"
+#line 15191 "configure"

 #include "confdefs.h"
 #define pthread_kill autoconf_temporary
 #include <limits.h>    /* least-intrusive standard header which defines gcc2 __stub macros */
 #include "confdefs.h"
 #define pthread_kill autoconf_temporary
 #include <limits.h>    /* least-intrusive standard header which defines gcc2 __stub macros */


@@ -15166,16 +15219,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"

-if { (eval echo "$as_me:15169: \"$ac_link\"") >&5
+if { (eval echo "$as_me:15222: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:15172: \$? = $ac_status" >&5
+  echo "$as_me:15225: \$? = $ac_status" >&5

   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'

-  { (eval echo "$as_me:15175: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15228: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:15178: \$? = $ac_status" >&5
+  echo "$as_me:15231: \$? = $ac_status" >&5

   (exit "$ac_status"); }; }; then
   ac_cv_func_pthread_kill=yes
 else
   (exit "$ac_status"); }; }; then
   ac_cv_func_pthread_kill=yes
 else


@@ -15185,11 +15238,11 @@ ac_cv_func_pthread_kill=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi

-echo "$as_me:15188: result: $ac_cv_func_pthread_kill" >&5
+echo "$as_me:15241: 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 "${ECHO_T}$ac_cv_func_pthread_kill" >&6
 if test "$ac_cv_func_pthread_kill" = yes; then
 

-               echo "$as_me:15192: checking if you want to allow EINTR in wgetch with pthreads" >&5
+               echo "$as_me:15245: 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.
 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.


@@ -15199,7 +15252,7 @@ if test "${enable_pthreads_eintr+set}" = set; then
 else
   use_pthreads_eintr=no
 fi;
 else
   use_pthreads_eintr=no
 fi;

-               echo "$as_me:15202: result: $use_pthreads_eintr" >&5
+               echo "$as_me:15255: result: $use_pthreads_eintr" >&5

 echo "${ECHO_T}$use_pthreads_eintr" >&6
                if test "x$use_pthreads_eintr" = xyes ; then
 
 echo "${ECHO_T}$use_pthreads_eintr" >&6
                if test "x$use_pthreads_eintr" = xyes ; then
 


@@ -15210,7 +15263,7 @@ EOF
                fi
 fi
 
                fi
 fi
 

-       echo "$as_me:15213: checking if you want to use weak-symbols for pthreads" >&5
+       echo "$as_me:15266: 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.
 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.


@@ -15220,18 +15273,18 @@ if test "${enable_weak_symbols+set}" = set; then
 else
   use_weak_symbols=no
 fi;
 else
   use_weak_symbols=no
 fi;

-       echo "$as_me:15223: result: $use_weak_symbols" >&5
+       echo "$as_me:15276: result: $use_weak_symbols" >&5

 echo "${ECHO_T}$use_weak_symbols" >&6
        if test "x$use_weak_symbols" = xyes ; then
 
 echo "${ECHO_T}$use_weak_symbols" >&6
        if test "x$use_weak_symbols" = xyes ; then
 

-echo "$as_me:15227: checking if $CC supports weak symbols" >&5
+echo "$as_me:15280: 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
 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 15234 "configure"
+#line 15287 "configure"

 #include "confdefs.h"
 
 #include <stdio.h>
 #include "confdefs.h"
 
 #include <stdio.h>


@@ -15257,16 +15310,16 @@ weak_symbol(fopen);
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
 }
 _ACEOF
 rm -f "conftest.$ac_objext"

-if { (eval echo "$as_me:15260: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:15313: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:15263: \$? = $ac_status" >&5
+  echo "$as_me:15316: \$? = $ac_status" >&5

   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'

-  { (eval echo "$as_me:15266: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15319: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:15269: \$? = $ac_status" >&5
+  echo "$as_me:15322: \$? = $ac_status" >&5

   (exit "$ac_status"); }; }; then
   cf_cv_weak_symbols=yes
 else
   (exit "$ac_status"); }; }; then
   cf_cv_weak_symbols=yes
 else


@@ -15277,7 +15330,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi

-echo "$as_me:15280: result: $cf_cv_weak_symbols" >&5
+echo "$as_me:15333: result: $cf_cv_weak_symbols" >&5

 echo "${ECHO_T}$cf_cv_weak_symbols" >&6
 
        else
 echo "${ECHO_T}$cf_cv_weak_symbols" >&6
 
        else


@@ -15327,7 +15380,7 @@ fi
 # 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.
 # 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:15330: checking if you want reentrant code" >&5
+echo "$as_me:15383: 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.
 echo $ECHO_N "checking if you want reentrant code... $ECHO_C" >&6
 
 # Check whether --enable-reentrant or --disable-reentrant was given.


@@ -15337,7 +15390,7 @@ if test "${enable_reentrant+set}" = set; then
 else
   with_reentrant=no
 fi;
 else
   with_reentrant=no
 fi;

-echo "$as_me:15340: result: $with_reentrant" >&5
+echo "$as_me:15393: result: $with_reentrant" >&5

 echo "${ECHO_T}$with_reentrant" >&6
 if test "x$with_reentrant" = xyes ; then
        cf_cv_enable_reentrant=1
 echo "${ECHO_T}$with_reentrant" >&6
 if test "x$with_reentrant" = xyes ; then
        cf_cv_enable_reentrant=1


@@ -15425,7 +15478,7 @@ if test "${with_abi_version+set}" != set; then
        (5.*)
                cf_cv_rel_version=6.0
                cf_cv_abi_version=6
        (5.*)
                cf_cv_rel_version=6.0
                cf_cv_abi_version=6

-               { echo "$as_me:15428: WARNING: overriding ABI version to $cf_cv_abi_version" >&5
+               { echo "$as_me:15481: WARNING: overriding ABI version to $cf_cv_abi_version" >&5

 echo "$as_me: WARNING: overriding ABI version to $cf_cv_abi_version" >&2;}
                ;;
        esac
 echo "$as_me: WARNING: overriding ABI version to $cf_cv_abi_version" >&2;}
                ;;
        esac


@@ -15437,7 +15490,7 @@ else
        NCURSES_SIZE_T=short
 fi
 
        NCURSES_SIZE_T=short
 fi
 

-echo "$as_me:15440: checking if you want opaque curses-library structures" >&5
+echo "$as_me:15493: checking if you want opaque curses-library structures" >&5

 echo $ECHO_N "checking if you want opaque curses-library structures... $ECHO_C" >&6
 
 # Check whether --enable-opaque-curses or --disable-opaque-curses was given.
 echo $ECHO_N "checking if you want opaque curses-library structures... $ECHO_C" >&6
 
 # Check whether --enable-opaque-curses or --disable-opaque-curses was given.


@@ -15459,16 +15512,16 @@ else
         test "$cf_cv_enable_reentrant" = 1 || enable_opaque_curses=no
 
 fi;
         test "$cf_cv_enable_reentrant" = 1 || enable_opaque_curses=no
 
 fi;

-echo "$as_me:15462: result: $enable_opaque_curses" >&5
+echo "$as_me:15515: result: $enable_opaque_curses" >&5

 echo "${ECHO_T}$enable_opaque_curses" >&6
 
 test "$cf_cv_enable_reentrant" = 1 && \
 test "$enable_opaque_curses" = no && \
 echo "${ECHO_T}$enable_opaque_curses" >&6
 
 test "$cf_cv_enable_reentrant" = 1 && \
 test "$enable_opaque_curses" = no && \

-{ { echo "$as_me:15467: error: reentrant configuration requires opaque library" >&5
+{ { echo "$as_me:15520: error: reentrant configuration requires opaque library" >&5

 echo "$as_me: error: reentrant configuration requires opaque library" >&2;}
    { (exit 1); exit 1; }; }
 
 echo "$as_me: error: reentrant configuration requires opaque library" >&2;}
    { (exit 1); exit 1; }; }
 

-echo "$as_me:15471: checking if you want opaque form-library structures" >&5
+echo "$as_me:15524: checking if you want opaque form-library structures" >&5

 echo $ECHO_N "checking if you want opaque form-library structures... $ECHO_C" >&6
 
 # Check whether --enable-opaque-form or --disable-opaque-form was given.
 echo $ECHO_N "checking if you want opaque form-library structures... $ECHO_C" >&6
 
 # Check whether --enable-opaque-form or --disable-opaque-form was given.


@@ -15478,10 +15531,10 @@ if test "${enable_opaque_form+set}" = set; then
 else
   enable_opaque_form=no
 fi;
 else
   enable_opaque_form=no
 fi;

-echo "$as_me:15481: result: $enable_opaque_form" >&5
+echo "$as_me:15534: result: $enable_opaque_form" >&5

 echo "${ECHO_T}$enable_opaque_form" >&6
 
 echo "${ECHO_T}$enable_opaque_form" >&6
 

-echo "$as_me:15484: checking if you want opaque menu-library structures" >&5
+echo "$as_me:15537: checking if you want opaque menu-library structures" >&5

 echo $ECHO_N "checking if you want opaque menu-library structures... $ECHO_C" >&6
 
 # Check whether --enable-opaque-menu or --disable-opaque-menu was given.
 echo $ECHO_N "checking if you want opaque menu-library structures... $ECHO_C" >&6
 
 # Check whether --enable-opaque-menu or --disable-opaque-menu was given.


@@ -15491,10 +15544,10 @@ if test "${enable_opaque_menu+set}" = set; then
 else
   enable_opaque_menu=no
 fi;
 else
   enable_opaque_menu=no
 fi;

-echo "$as_me:15494: result: $enable_opaque_menu" >&5
+echo "$as_me:15547: result: $enable_opaque_menu" >&5

 echo "${ECHO_T}$enable_opaque_menu" >&6
 
 echo "${ECHO_T}$enable_opaque_menu" >&6
 

-echo "$as_me:15497: checking if you want opaque panel-library structures" >&5
+echo "$as_me:15550: checking if you want opaque panel-library structures" >&5

 echo $ECHO_N "checking if you want opaque panel-library structures... $ECHO_C" >&6
 
 # Check whether --enable-opaque-panel or --disable-opaque-panel was given.
 echo $ECHO_N "checking if you want opaque panel-library structures... $ECHO_C" >&6
 
 # Check whether --enable-opaque-panel or --disable-opaque-panel was given.


@@ -15504,7 +15557,7 @@ if test "${enable_opaque_panel+set}" = set; then
 else
   enable_opaque_panel=no
 fi;
 else
   enable_opaque_panel=no
 fi;

-echo "$as_me:15507: result: $enable_opaque_panel" >&5
+echo "$as_me:15560: result: $enable_opaque_panel" >&5

 echo "${ECHO_T}$enable_opaque_panel" >&6
 
 NCURSES_OPAQUE=0;              test "$enable_opaque_curses" = yes && NCURSES_OPAQUE=1
 echo "${ECHO_T}$enable_opaque_panel" >&6
 
 NCURSES_OPAQUE=0;              test "$enable_opaque_curses" = yes && NCURSES_OPAQUE=1


@@ -15514,7 +15567,7 @@ NCURSES_OPAQUE_PANEL=0; test "$enable_opaque_panel"  = yes && NCURSES_OPAQUE_PAN
 
 ### Allow using a different wrap-prefix
 if test "$cf_cv_enable_reentrant" != 0 || test "$BROKEN_LINKER" = 1 ; then
 
 ### Allow using a different wrap-prefix
 if test "$cf_cv_enable_reentrant" != 0 || test "$BROKEN_LINKER" = 1 ; then

-       echo "$as_me:15517: checking for prefix used to wrap public variables" >&5
+       echo "$as_me:15570: 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.
 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.


@@ -15524,7 +15577,7 @@ if test "${with_wrap_prefix+set}" = set; then
 else
   NCURSES_WRAP_PREFIX=_nc_
 fi;
 else
   NCURSES_WRAP_PREFIX=_nc_
 fi;

-       echo "$as_me:15527: result: $NCURSES_WRAP_PREFIX" >&5
+       echo "$as_me:15580: result: $NCURSES_WRAP_PREFIX" >&5

 echo "${ECHO_T}$NCURSES_WRAP_PREFIX" >&6
 else
        NCURSES_WRAP_PREFIX=_nc_
 echo "${ECHO_T}$NCURSES_WRAP_PREFIX" >&6
 else
        NCURSES_WRAP_PREFIX=_nc_


@@ -15537,7 +15590,7 @@ EOF
 ###############################################################################
 # These options are relatively safe to experiment with.
 
 ###############################################################################
 # These options are relatively safe to experiment with.
 

-echo "$as_me:15540: checking if you want all development code" >&5
+echo "$as_me:15593: 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.
 echo $ECHO_N "checking if you want all development code... $ECHO_C" >&6
 
 # Check whether --with-develop or --without-develop was given.


@@ -15547,11 +15600,11 @@ if test "${with_develop+set}" = set; then
 else
   with_develop=no
 fi;
 else
   with_develop=no
 fi;

-echo "$as_me:15550: result: $with_develop" >&5
+echo "$as_me:15603: result: $with_develop" >&5

 echo "${ECHO_T}$with_develop" >&6
 
 ###   use option --enable-hard-tabs to turn on use of hard-tabs optimize
 echo "${ECHO_T}$with_develop" >&6
 
 ###   use option --enable-hard-tabs to turn on use of hard-tabs optimize

-echo "$as_me:15554: checking if you want hard-tabs code" >&5
+echo "$as_me:15607: 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.
 echo $ECHO_N "checking if you want hard-tabs code... $ECHO_C" >&6
 
 # Check whether --enable-hard-tabs or --disable-hard-tabs was given.


@@ -15561,7 +15614,7 @@ if test "${enable_hard_tabs+set}" = set; then
 else
   enable_hard_tabs=$with_develop
 fi;
 else
   enable_hard_tabs=$with_develop
 fi;

-echo "$as_me:15564: result: $enable_hard_tabs" >&5
+echo "$as_me:15617: result: $enable_hard_tabs" >&5

 echo "${ECHO_T}$enable_hard_tabs" >&6
 test "x$enable_hard_tabs" = xyes &&
 cat >>confdefs.h <<\EOF
 echo "${ECHO_T}$enable_hard_tabs" >&6
 test "x$enable_hard_tabs" = xyes &&
 cat >>confdefs.h <<\EOF


@@ -15569,7 +15622,7 @@ cat >>confdefs.h <<\EOF
 EOF
 
 ###   use option --enable-xmc-glitch to turn on use of magic-cookie optimize
 EOF
 
 ###   use option --enable-xmc-glitch to turn on use of magic-cookie optimize

-echo "$as_me:15572: checking if you want limited support for xmc" >&5
+echo "$as_me:15625: 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.
 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.


@@ -15579,7 +15632,7 @@ if test "${enable_xmc_glitch+set}" = set; then
 else
   enable_xmc_glitch=$with_develop
 fi;
 else
   enable_xmc_glitch=$with_develop
 fi;

-echo "$as_me:15582: result: $enable_xmc_glitch" >&5
+echo "$as_me:15635: result: $enable_xmc_glitch" >&5

 echo "${ECHO_T}$enable_xmc_glitch" >&6
 test "x$enable_xmc_glitch" = xyes &&
 cat >>confdefs.h <<\EOF
 echo "${ECHO_T}$enable_xmc_glitch" >&6
 test "x$enable_xmc_glitch" = xyes &&
 cat >>confdefs.h <<\EOF


@@ -15589,7 +15642,7 @@ EOF
 ###############################################################################
 # These are just experimental, probably should not be in a package:
 
 ###############################################################################
 # These are just experimental, probably should not be in a package:
 

-echo "$as_me:15592: checking if you do not want to assume colors are white-on-black" >&5
+echo "$as_me:15645: 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.
 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.


@@ -15599,7 +15652,7 @@ if test "${enable_assumed_color+set}" = set; then
 else
   with_assumed_color=yes
 fi;
 else
   with_assumed_color=yes
 fi;

-echo "$as_me:15602: result: $with_assumed_color" >&5
+echo "$as_me:15655: result: $with_assumed_color" >&5

 echo "${ECHO_T}$with_assumed_color" >&6
 test "x$with_assumed_color" = xyes &&
 cat >>confdefs.h <<\EOF
 echo "${ECHO_T}$with_assumed_color" >&6
 test "x$with_assumed_color" = xyes &&
 cat >>confdefs.h <<\EOF


@@ -15607,7 +15660,7 @@ cat >>confdefs.h <<\EOF
 EOF
 
 ###   use option --enable-hashmap to turn on use of hashmap scrolling logic
 EOF
 
 ###   use option --enable-hashmap to turn on use of hashmap scrolling logic

-echo "$as_me:15610: checking if you want hashmap scrolling-optimization code" >&5
+echo "$as_me:15663: 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.
 echo $ECHO_N "checking if you want hashmap scrolling-optimization code... $ECHO_C" >&6
 
 # Check whether --enable-hashmap or --disable-hashmap was given.


@@ -15617,7 +15670,7 @@ if test "${enable_hashmap+set}" = set; then
 else
   with_hashmap=yes
 fi;
 else
   with_hashmap=yes
 fi;

-echo "$as_me:15620: result: $with_hashmap" >&5
+echo "$as_me:15673: result: $with_hashmap" >&5

 echo "${ECHO_T}$with_hashmap" >&6
 test "x$with_hashmap" = xyes &&
 cat >>confdefs.h <<\EOF
 echo "${ECHO_T}$with_hashmap" >&6
 test "x$with_hashmap" = xyes &&
 cat >>confdefs.h <<\EOF


@@ -15625,7 +15678,7 @@ cat >>confdefs.h <<\EOF
 EOF
 
 ###   use option --enable-colorfgbg to turn on use of $COLORFGBG environment
 EOF
 
 ###   use option --enable-colorfgbg to turn on use of $COLORFGBG environment

-echo "$as_me:15628: checking if you want colorfgbg code" >&5
+echo "$as_me:15681: 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.
 echo $ECHO_N "checking if you want colorfgbg code... $ECHO_C" >&6
 
 # Check whether --enable-colorfgbg or --disable-colorfgbg was given.


@@ -15635,7 +15688,7 @@ if test "${enable_colorfgbg+set}" = set; then
 else
   with_colorfgbg=no
 fi;
 else
   with_colorfgbg=no
 fi;

-echo "$as_me:15638: result: $with_colorfgbg" >&5
+echo "$as_me:15691: result: $with_colorfgbg" >&5

 echo "${ECHO_T}$with_colorfgbg" >&6
 test "x$with_colorfgbg" = xyes &&
 cat >>confdefs.h <<\EOF
 echo "${ECHO_T}$with_colorfgbg" >&6
 test "x$with_colorfgbg" = xyes &&
 cat >>confdefs.h <<\EOF


@@ -15643,7 +15696,7 @@ cat >>confdefs.h <<\EOF
 EOF
 
 ###   use option --enable-fvisibility to turn on use of gcc-specific feature
 EOF
 
 ###   use option --enable-fvisibility to turn on use of gcc-specific feature

-echo "$as_me:15646: checking if you want to use gcc -fvisibility option" >&5
+echo "$as_me:15699: checking if you want to use gcc -fvisibility option" >&5

 echo $ECHO_N "checking if you want to use gcc -fvisibility option... $ECHO_C" >&6
 
 # Check whether --enable-fvisibility or --disable-fvisibility was given.
 echo $ECHO_N "checking if you want to use gcc -fvisibility option... $ECHO_C" >&6
 
 # Check whether --enable-fvisibility or --disable-fvisibility was given.


@@ -15653,14 +15706,14 @@ if test "${enable_fvisibility+set}" = set; then
 else
   cf_with_fvisibility=no
 fi;
 else
   cf_with_fvisibility=no
 fi;

-echo "$as_me:15656: result: $cf_with_fvisibility" >&5
+echo "$as_me:15709: result: $cf_with_fvisibility" >&5

 echo "${ECHO_T}$cf_with_fvisibility" >&6
 
 NCURSES_IMPEXP=
 NCURSES_CXX_IMPEXP=
 if test "x$cf_with_fvisibility" = xyes; then
 
 echo "${ECHO_T}$cf_with_fvisibility" >&6
 
 NCURSES_IMPEXP=
 NCURSES_CXX_IMPEXP=
 if test "x$cf_with_fvisibility" = xyes; then
 

-echo "$as_me:15663: checking if $CC -fvisibility=hidden option works" >&5
+echo "$as_me:15716: checking if $CC -fvisibility=hidden option works" >&5

 echo $ECHO_N "checking if $CC -fvisibility=hidden option works... $ECHO_C" >&6
 if test "${cf_cv_fvisibility_hidden+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 echo $ECHO_N "checking if $CC -fvisibility=hidden option works... $ECHO_C" >&6
 if test "${cf_cv_fvisibility_hidden+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6


@@ -15669,7 +15722,7 @@ else
     cf_save_cflags="$CFLAGS"
     CFLAGS="$CFLAGS -fvisibility=hidden"
     cat >"conftest.$ac_ext" <<_ACEOF
     cf_save_cflags="$CFLAGS"
     CFLAGS="$CFLAGS -fvisibility=hidden"
     cat >"conftest.$ac_ext" <<_ACEOF

-#line 15672 "configure"
+#line 15725 "configure"

 #include "confdefs.h"
 
 __attribute__ ((visibility("default"))) int somefunc() {return 42;}
 #include "confdefs.h"
 
 __attribute__ ((visibility("default"))) int somefunc() {return 42;}


@@ -15685,16 +15738,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"

-if { (eval echo "$as_me:15688: \"$ac_link\"") >&5
+if { (eval echo "$as_me:15741: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:15691: \$? = $ac_status" >&5
+  echo "$as_me:15744: \$? = $ac_status" >&5

   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'

-  { (eval echo "$as_me:15694: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15747: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:15697: \$? = $ac_status" >&5
+  echo "$as_me:15750: \$? = $ac_status" >&5

   (exit "$ac_status"); }; }; then
   cf_cv_fvisibility_hidden=yes
 else
   (exit "$ac_status"); }; }; then
   cf_cv_fvisibility_hidden=yes
 else


@@ -15706,7 +15759,7 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
     CFLAGS=$cf_save_cflags
 
 fi
     CFLAGS=$cf_save_cflags
 
 fi

-echo "$as_me:15709: result: $cf_cv_fvisibility_hidden" >&5
+echo "$as_me:15762: result: $cf_cv_fvisibility_hidden" >&5

 echo "${ECHO_T}$cf_cv_fvisibility_hidden" >&6
 
        if test "x$cf_cv_fvisibility_hidden" = xyes
 echo "${ECHO_T}$cf_cv_fvisibility_hidden" >&6
 
        if test "x$cf_cv_fvisibility_hidden" = xyes


@@ -15821,7 +15874,7 @@ ac_link='$CXX -o "conftest$ac_exeext" $CXXFLAGS $CPPFLAGS $LDFLAGS "conftest.$ac
 ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
 ac_main_return="return"
 
 ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
 ac_main_return="return"
 

-echo "$as_me:15824: checking if $CXX -fvisibility=hidden option works" >&5
+echo "$as_me:15877: checking if $CXX -fvisibility=hidden option works" >&5

 echo $ECHO_N "checking if $CXX -fvisibility=hidden option works... $ECHO_C" >&6
 if test "${cf_cv_fvisibility_hidden2+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 echo $ECHO_N "checking if $CXX -fvisibility=hidden option works... $ECHO_C" >&6
 if test "${cf_cv_fvisibility_hidden2+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6


@@ -15830,7 +15883,7 @@ else
     cf_save_cflags="$CXXFLAGS"
     CXXFLAGS="$CXXFLAGS -fvisibility=hidden"
     cat >"conftest.$ac_ext" <<_ACEOF
     cf_save_cflags="$CXXFLAGS"
     CXXFLAGS="$CXXFLAGS -fvisibility=hidden"
     cat >"conftest.$ac_ext" <<_ACEOF

-#line 15833 "configure"
+#line 15886 "configure"

 #include "confdefs.h"
 
 __attribute__ ((visibility("default"))) int somefunc() {return 42;}
 #include "confdefs.h"
 
 __attribute__ ((visibility("default"))) int somefunc() {return 42;}


@@ -15846,16 +15899,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"

-if { (eval echo "$as_me:15849: \"$ac_link\"") >&5
+if { (eval echo "$as_me:15902: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:15852: \$? = $ac_status" >&5
+  echo "$as_me:15905: \$? = $ac_status" >&5

   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'

-  { (eval echo "$as_me:15855: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15908: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:15858: \$? = $ac_status" >&5
+  echo "$as_me:15911: \$? = $ac_status" >&5

   (exit "$ac_status"); }; }; then
   cf_cv_fvisibility_hidden2=yes
 else
   (exit "$ac_status"); }; }; then
   cf_cv_fvisibility_hidden2=yes
 else


@@ -15867,7 +15920,7 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
     CXXFLAGS=$cf_save_cflags
 
 fi
     CXXFLAGS=$cf_save_cflags
 
 fi

-echo "$as_me:15870: result: $cf_cv_fvisibility_hidden2" >&5
+echo "$as_me:15923: result: $cf_cv_fvisibility_hidden2" >&5

 echo "${ECHO_T}$cf_cv_fvisibility_hidden2" >&6
 
                if test "x$cf_cv_fvisibility_hidden2" = xyes
 echo "${ECHO_T}$cf_cv_fvisibility_hidden2" >&6
 
                if test "x$cf_cv_fvisibility_hidden2" = xyes


@@ -15990,7 +16043,7 @@ ac_main_return="return"
 fi
 
 ###   use option --enable-interop to turn on use of bindings used for interop
 fi
 
 ###   use option --enable-interop to turn on use of bindings used for interop

-echo "$as_me:15993: checking if you want interop bindings" >&5
+echo "$as_me:16046: 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.
 echo $ECHO_N "checking if you want interop bindings... $ECHO_C" >&6
 
 # Check whether --enable-interop or --disable-interop was given.


@@ -16000,13 +16053,13 @@ if test "${enable_interop+set}" = set; then
 else
   with_exp_interop=$cf_dft_interop
 fi;
 else
   with_exp_interop=$cf_dft_interop
 fi;

-echo "$as_me:16003: result: $with_exp_interop" >&5
+echo "$as_me:16056: result: $with_exp_interop" >&5

 echo "${ECHO_T}$with_exp_interop" >&6
 
 NCURSES_INTEROP_FUNCS=0
 test "x$with_exp_interop" = xyes && NCURSES_INTEROP_FUNCS=1
 
 echo "${ECHO_T}$with_exp_interop" >&6
 
 NCURSES_INTEROP_FUNCS=0
 test "x$with_exp_interop" = xyes && NCURSES_INTEROP_FUNCS=1
 

-echo "$as_me:16009: checking if you want experimental safe-sprintf code" >&5
+echo "$as_me:16062: 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.
 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.


@@ -16016,13 +16069,13 @@ if test "${enable_safe_sprintf+set}" = set; then
 else
   with_safe_sprintf=no
 fi;
 else
   with_safe_sprintf=no
 fi;

-echo "$as_me:16019: result: $with_safe_sprintf" >&5
+echo "$as_me:16072: result: $with_safe_sprintf" >&5

 echo "${ECHO_T}$with_safe_sprintf" >&6
 
 ###   use option --disable-scroll-hints to turn off use of scroll-hints scrolling logic
 # when hashmap is used scroll hints are useless
 if test "$with_hashmap" = no ; then
 echo "${ECHO_T}$with_safe_sprintf" >&6
 
 ###   use option --disable-scroll-hints to turn off use of scroll-hints scrolling logic
 # when hashmap is used scroll hints are useless
 if test "$with_hashmap" = no ; then

-echo "$as_me:16025: checking if you want to experiment without scrolling-hints code" >&5
+echo "$as_me:16078: 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.
 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.


@@ -16032,7 +16085,7 @@ if test "${enable_scroll_hints+set}" = set; then
 else
   with_scroll_hints=yes
 fi;
 else
   with_scroll_hints=yes
 fi;

-echo "$as_me:16035: result: $with_scroll_hints" >&5
+echo "$as_me:16088: result: $with_scroll_hints" >&5

 echo "${ECHO_T}$with_scroll_hints" >&6
 test "x$with_scroll_hints" = xyes &&
 cat >>confdefs.h <<\EOF
 echo "${ECHO_T}$with_scroll_hints" >&6
 test "x$with_scroll_hints" = xyes &&
 cat >>confdefs.h <<\EOF


@@ -16041,7 +16094,7 @@ EOF
 
 fi
 
 
 fi
 

-echo "$as_me:16044: checking if you want wgetch-events code" >&5
+echo "$as_me:16097: 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.
 echo $ECHO_N "checking if you want wgetch-events code... $ECHO_C" >&6
 
 # Check whether --enable-wgetch-events or --disable-wgetch-events was given.


@@ -16051,7 +16104,7 @@ if test "${enable_wgetch_events+set}" = set; then
 else
   with_wgetch_events=no
 fi;
 else
   with_wgetch_events=no
 fi;

-echo "$as_me:16054: result: $with_wgetch_events" >&5
+echo "$as_me:16107: result: $with_wgetch_events" >&5

 echo "${ECHO_T}$with_wgetch_events" >&6
 if test "x$with_wgetch_events" = xyes ; then
 
 echo "${ECHO_T}$with_wgetch_events" >&6
 if test "x$with_wgetch_events" = xyes ; then
 


@@ -16066,7 +16119,7 @@ fi
 
 case "$cf_cv_system_name" in
 (*mingw32*|*mingw64*|*-msvc*)
 
 case "$cf_cv_system_name" in
 (*mingw32*|*mingw64*|*-msvc*)

-       echo "$as_me:16069: checking if you want experimental-Windows driver" >&5
+       echo "$as_me:16122: checking if you want experimental-Windows driver" >&5

 echo $ECHO_N "checking if you want experimental-Windows driver... $ECHO_C" >&6
 
 # Check whether --enable-exp-win32 or --disable-exp-win32 was given.
 echo $ECHO_N "checking if you want experimental-Windows driver... $ECHO_C" >&6
 
 # Check whether --enable-exp-win32 or --disable-exp-win32 was given.


@@ -16076,7 +16129,7 @@ if test "${enable_exp_win32+set}" = set; then
 else
   with_exp_win32=no
 fi;
 else
   with_exp_win32=no
 fi;

-       echo "$as_me:16079: result: $with_exp_win32" >&5
+       echo "$as_me:16132: result: $with_exp_win32" >&5

 echo "${ECHO_T}$with_exp_win32" >&6
        if test "x$with_exp_win32" = xyes
        then
 echo "${ECHO_T}$with_exp_win32" >&6
        if test "x$with_exp_win32" = xyes
        then


@@ -16102,7 +16155,7 @@ esac
 
 ###    use option --disable-echo to suppress full display compiling commands
 
 
 ###    use option --disable-echo to suppress full display compiling commands
 

-echo "$as_me:16105: checking if you want to see long compiling messages" >&5
+echo "$as_me:16158: 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.
 echo $ECHO_N "checking if you want to see long compiling messages... $ECHO_C" >&6
 
 # Check whether --enable-echo or --disable-echo was given.


@@ -16136,7 +16189,7 @@ else
        ECHO_CC=''
 
 fi;
        ECHO_CC=''
 
 fi;

-echo "$as_me:16139: result: $enableval" >&5
+echo "$as_me:16192: result: $enableval" >&5

 echo "${ECHO_T}$enableval" >&6
 
 if test "x$enable_echo" = xyes; then
 echo "${ECHO_T}$enableval" >&6
 
 if test "x$enable_echo" = xyes; then


@@ -16149,7 +16202,7 @@ fi
 
 # --disable-stripping is used for debugging
 
 
 # --disable-stripping is used for debugging
 

-echo "$as_me:16152: checking if you want to install stripped executables" >&5
+echo "$as_me:16205: checking if you want to install stripped executables" >&5

 echo $ECHO_N "checking if you want to install stripped executables... $ECHO_C" >&6
 
 # Check whether --enable-stripping or --disable-stripping was given.
 echo $ECHO_N "checking if you want to install stripped executables... $ECHO_C" >&6
 
 # Check whether --enable-stripping or --disable-stripping was given.


@@ -16166,7 +16219,7 @@ else
        enable_stripping=yes
 
 fi;
        enable_stripping=yes
 
 fi;

-echo "$as_me:16169: result: $enable_stripping" >&5
+echo "$as_me:16222: result: $enable_stripping" >&5

 echo "${ECHO_T}$enable_stripping" >&6
 
 if test "$enable_stripping" = yes
 echo "${ECHO_T}$enable_stripping" >&6
 
 if test "$enable_stripping" = yes


@@ -16177,7 +16230,7 @@ else
 fi
 
 : "${INSTALL:=install}"
 fi
 
 : "${INSTALL:=install}"

-echo "$as_me:16180: checking if install accepts -p option" >&5
+echo "$as_me:16233: checking if install accepts -p option" >&5

 echo $ECHO_N "checking if install accepts -p option... $ECHO_C" >&6
 if test "${cf_cv_install_p+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 echo $ECHO_N "checking if install accepts -p option... $ECHO_C" >&6
 if test "${cf_cv_install_p+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6


@@ -16208,10 +16261,10 @@ else
        rm -rf ./conftest*
 
 fi
        rm -rf ./conftest*
 
 fi

-echo "$as_me:16211: result: $cf_cv_install_p" >&5
+echo "$as_me:16264: result: $cf_cv_install_p" >&5

 echo "${ECHO_T}$cf_cv_install_p" >&6
 
 echo "${ECHO_T}$cf_cv_install_p" >&6
 

-echo "$as_me:16214: checking if install needs to be told about ownership" >&5
+echo "$as_me:16267: checking if install needs to be told about ownership" >&5

 echo $ECHO_N "checking if install needs to be told about ownership... $ECHO_C" >&6
 case `$ac_config_guess` in
 (*minix)
 echo $ECHO_N "checking if install needs to be told about ownership... $ECHO_C" >&6
 case `$ac_config_guess` in
 (*minix)


@@ -16222,7 +16275,7 @@ case `$ac_config_guess` in
        ;;
 esac
 
        ;;
 esac
 

-echo "$as_me:16225: result: $with_install_o" >&5
+echo "$as_me:16278: result: $with_install_o" >&5

 echo "${ECHO_T}$with_install_o" >&6
 if test "x$with_install_o" = xyes
 then
 echo "${ECHO_T}$with_install_o" >&6
 if test "x$with_install_o" = xyes
 then


@@ -16247,7 +16300,7 @@ fi
 
 ###    use option --enable-warnings to turn on all gcc warnings
 
 
 ###    use option --enable-warnings to turn on all gcc warnings
 

-echo "$as_me:16250: checking if you want to use C11 _Noreturn feature" >&5
+echo "$as_me:16303: checking if you want to use C11 _Noreturn feature" >&5

 echo $ECHO_N "checking if you want to use C11 _Noreturn feature... $ECHO_C" >&6
 
 # Check whether --enable-stdnoreturn or --disable-stdnoreturn was given.
 echo $ECHO_N "checking if you want to use C11 _Noreturn feature... $ECHO_C" >&6
 
 # Check whether --enable-stdnoreturn or --disable-stdnoreturn was given.


@@ -16264,17 +16317,17 @@ else
        enable_stdnoreturn=no
 
 fi;
        enable_stdnoreturn=no
 
 fi;

-echo "$as_me:16267: result: $enable_stdnoreturn" >&5
+echo "$as_me:16320: result: $enable_stdnoreturn" >&5

 echo "${ECHO_T}$enable_stdnoreturn" >&6
 
 if test $enable_stdnoreturn = yes; then
 echo "${ECHO_T}$enable_stdnoreturn" >&6
 
 if test $enable_stdnoreturn = yes; then

-echo "$as_me:16271: checking for C11 _Noreturn feature" >&5
+echo "$as_me:16324: checking for C11 _Noreturn feature" >&5

 echo $ECHO_N "checking for C11 _Noreturn feature... $ECHO_C" >&6
 if test "${cf_cv_c11_noreturn+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >"conftest.$ac_ext" <<_ACEOF
 echo $ECHO_N "checking for C11 _Noreturn feature... $ECHO_C" >&6
 if test "${cf_cv_c11_noreturn+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >"conftest.$ac_ext" <<_ACEOF

-#line 16277 "configure"
+#line 16330 "configure"

 #include "confdefs.h"
 
 #include <stdio.h>
 #include "confdefs.h"
 
 #include <stdio.h>


@@ -16291,16 +16344,16 @@ if (feof(stdin)) giveup()
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
 }
 _ACEOF
 rm -f "conftest.$ac_objext"

-if { (eval echo "$as_me:16294: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:16347: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:16297: \$? = $ac_status" >&5
+  echo "$as_me:16350: \$? = $ac_status" >&5

   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'

-  { (eval echo "$as_me:16300: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16353: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:16303: \$? = $ac_status" >&5
+  echo "$as_me:16356: \$? = $ac_status" >&5

   (exit "$ac_status"); }; }; then
   cf_cv_c11_noreturn=yes
 else
   (exit "$ac_status"); }; }; then
   cf_cv_c11_noreturn=yes
 else


@@ -16311,7 +16364,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi

-echo "$as_me:16314: result: $cf_cv_c11_noreturn" >&5
+echo "$as_me:16367: result: $cf_cv_c11_noreturn" >&5

 echo "${ECHO_T}$cf_cv_c11_noreturn" >&6
 else
        cf_cv_c11_noreturn=no,
 echo "${ECHO_T}$cf_cv_c11_noreturn" >&6
 else
        cf_cv_c11_noreturn=no,


@@ -16341,7 +16394,7 @@ then
        (*-Werror=*)
                test -n "$verbose" && echo "    repairing CFLAGS: $CFLAGS" 1>&6
 
        (*-Werror=*)
                test -n "$verbose" && echo "    repairing CFLAGS: $CFLAGS" 1>&6
 

-echo "${as_me:-configure}:16344: testing repairing CFLAGS: $CFLAGS ..." 1>&5
+echo "${as_me:-configure}:16397: testing repairing CFLAGS: $CFLAGS ..." 1>&5

 
                cf_temp_flags=
                for cf_temp_scan in $CFLAGS
 
                cf_temp_flags=
                for cf_temp_scan in $CFLAGS


@@ -16364,11 +16417,11 @@ echo "${as_me:-configure}:16344: testing repairing CFLAGS: $CFLAGS ..." 1>&5
                CFLAGS="$cf_temp_flags"
                test -n "$verbose" && echo "    ... fixed $CFLAGS" 1>&6
 
                CFLAGS="$cf_temp_flags"
                test -n "$verbose" && echo "    ... fixed $CFLAGS" 1>&6
 

-echo "${as_me:-configure}:16367: testing ... fixed $CFLAGS ..." 1>&5
+echo "${as_me:-configure}:16420: testing ... fixed $CFLAGS ..." 1>&5

 
                test -n "$verbose" && echo "    ... extra $EXTRA_CFLAGS" 1>&6
 
 
                test -n "$verbose" && echo "    ... extra $EXTRA_CFLAGS" 1>&6
 

-echo "${as_me:-configure}:16371: testing ... extra $EXTRA_CFLAGS ..." 1>&5
+echo "${as_me:-configure}:16424: testing ... extra $EXTRA_CFLAGS ..." 1>&5

 
                ;;
        esac
 
                ;;
        esac


@@ -16380,7 +16433,7 @@ then
        (*-Werror=*)
                test -n "$verbose" && echo "    repairing CPPFLAGS: $CPPFLAGS" 1>&6
 
        (*-Werror=*)
                test -n "$verbose" && echo "    repairing CPPFLAGS: $CPPFLAGS" 1>&6
 

-echo "${as_me:-configure}:16383: testing repairing CPPFLAGS: $CPPFLAGS ..." 1>&5
+echo "${as_me:-configure}:16436: testing repairing CPPFLAGS: $CPPFLAGS ..." 1>&5

 
                cf_temp_flags=
                for cf_temp_scan in $CPPFLAGS
 
                cf_temp_flags=
                for cf_temp_scan in $CPPFLAGS


@@ -16403,11 +16456,11 @@ echo "${as_me:-configure}:16383: testing repairing CPPFLAGS: $CPPFLAGS ..." 1>&5
                CPPFLAGS="$cf_temp_flags"
                test -n "$verbose" && echo "    ... fixed $CPPFLAGS" 1>&6
 
                CPPFLAGS="$cf_temp_flags"
                test -n "$verbose" && echo "    ... fixed $CPPFLAGS" 1>&6
 

-echo "${as_me:-configure}:16406: testing ... fixed $CPPFLAGS ..." 1>&5
+echo "${as_me:-configure}:16459: testing ... fixed $CPPFLAGS ..." 1>&5

 
                test -n "$verbose" && echo "    ... extra $EXTRA_CFLAGS" 1>&6
 
 
                test -n "$verbose" && echo "    ... extra $EXTRA_CFLAGS" 1>&6
 

-echo "${as_me:-configure}:16410: testing ... extra $EXTRA_CFLAGS ..." 1>&5
+echo "${as_me:-configure}:16463: testing ... extra $EXTRA_CFLAGS ..." 1>&5

 
                ;;
        esac
 
                ;;
        esac


@@ -16419,7 +16472,7 @@ then
        (*-Werror=*)
                test -n "$verbose" && echo "    repairing LDFLAGS: $LDFLAGS" 1>&6
 
        (*-Werror=*)
                test -n "$verbose" && echo "    repairing LDFLAGS: $LDFLAGS" 1>&6
 

-echo "${as_me:-configure}:16422: testing repairing LDFLAGS: $LDFLAGS ..." 1>&5
+echo "${as_me:-configure}:16475: testing repairing LDFLAGS: $LDFLAGS ..." 1>&5

 
                cf_temp_flags=
                for cf_temp_scan in $LDFLAGS
 
                cf_temp_flags=
                for cf_temp_scan in $LDFLAGS


@@ -16442,17 +16495,17 @@ echo "${as_me:-configure}:16422: testing repairing LDFLAGS: $LDFLAGS ..." 1>&5
                LDFLAGS="$cf_temp_flags"
                test -n "$verbose" && echo "    ... fixed $LDFLAGS" 1>&6
 
                LDFLAGS="$cf_temp_flags"
                test -n "$verbose" && echo "    ... fixed $LDFLAGS" 1>&6
 

-echo "${as_me:-configure}:16445: testing ... fixed $LDFLAGS ..." 1>&5
+echo "${as_me:-configure}:16498: testing ... fixed $LDFLAGS ..." 1>&5

 
                test -n "$verbose" && echo "    ... extra $EXTRA_CFLAGS" 1>&6
 
 
                test -n "$verbose" && echo "    ... extra $EXTRA_CFLAGS" 1>&6
 

-echo "${as_me:-configure}:16449: testing ... extra $EXTRA_CFLAGS ..." 1>&5
+echo "${as_me:-configure}:16502: testing ... extra $EXTRA_CFLAGS ..." 1>&5

 
                ;;
        esac
 fi
 
 
                ;;
        esac
 fi
 

-echo "$as_me:16455: checking if you want to turn on gcc warnings" >&5
+echo "$as_me:16508: 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.
 echo $ECHO_N "checking if you want to turn on gcc warnings... $ECHO_C" >&6
 
 # Check whether --enable-warnings or --disable-warnings was given.


@@ -16469,7 +16522,7 @@ else
        enable_warnings=no
 
 fi;
        enable_warnings=no
 
 fi;

-echo "$as_me:16472: result: $enable_warnings" >&5
+echo "$as_me:16525: result: $enable_warnings" >&5

 echo "${ECHO_T}$enable_warnings" >&6
 if test "$enable_warnings" = "yes"
 then
 echo "${ECHO_T}$enable_warnings" >&6
 if test "$enable_warnings" = "yes"
 then


@@ -16493,7 +16546,7 @@ do
 done
 
 cat >"conftest.$ac_ext" <<_ACEOF
 done
 
 cat >"conftest.$ac_ext" <<_ACEOF

-#line 16496 "configure"
+#line 16549 "configure"

 #include "confdefs.h"
 
 #include <stdlib.h>
 #include "confdefs.h"
 
 #include <stdlib.h>


@@ -16508,26 +16561,26 @@ String foo = malloc(1); (void)foo
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
 }
 _ACEOF
 rm -f "conftest.$ac_objext"

-if { (eval echo "$as_me:16511: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:16564: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:16514: \$? = $ac_status" >&5
+  echo "$as_me:16567: \$? = $ac_status" >&5

   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'

-  { (eval echo "$as_me:16517: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16570: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:16520: \$? = $ac_status" >&5
+  echo "$as_me:16573: \$? = $ac_status" >&5

   (exit "$ac_status"); }; }; then
 
   (exit "$ac_status"); }; }; then
 

-echo "$as_me:16523: checking for X11/Xt const-feature" >&5
+echo "$as_me:16576: checking for X11/Xt const-feature" >&5

 echo $ECHO_N "checking for X11/Xt const-feature... $ECHO_C" >&6
 if test "${cf_cv_const_x_string+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
        cat >"conftest.$ac_ext" <<_ACEOF
 echo $ECHO_N "checking for X11/Xt const-feature... $ECHO_C" >&6
 if test "${cf_cv_const_x_string+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
        cat >"conftest.$ac_ext" <<_ACEOF

-#line 16530 "configure"
+#line 16583 "configure"

 #include "confdefs.h"
 
 #define _CONST_X_STRING        /* X11R7.8 (perhaps) */
 #include "confdefs.h"
 
 #define _CONST_X_STRING        /* X11R7.8 (perhaps) */


@@ -16544,16 +16597,16 @@ String foo = malloc(1); *foo = 0
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
 }
 _ACEOF
 rm -f "conftest.$ac_objext"

-if { (eval echo "$as_me:16547: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:16600: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:16550: \$? = $ac_status" >&5
+  echo "$as_me:16603: \$? = $ac_status" >&5

   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'

-  { (eval echo "$as_me:16553: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16606: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:16556: \$? = $ac_status" >&5
+  echo "$as_me:16609: \$? = $ac_status" >&5

   (exit "$ac_status"); }; }; then
 
                        cf_cv_const_x_string=no
   (exit "$ac_status"); }; }; then
 
                        cf_cv_const_x_string=no


@@ -16568,7 +16621,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi

-echo "$as_me:16571: result: $cf_cv_const_x_string" >&5
+echo "$as_me:16624: result: $cf_cv_const_x_string" >&5

 echo "${ECHO_T}$cf_cv_const_x_string" >&6
 
 LIBS="$cf_save_LIBS_CF_CONST_X_STRING"
 echo "${ECHO_T}$cf_cv_const_x_string" >&6
 
 LIBS="$cf_save_LIBS_CF_CONST_X_STRING"


@@ -16597,7 +16650,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
  fi
 cat > "conftest.$ac_ext" <<EOF
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
  fi
 cat > "conftest.$ac_ext" <<EOF

-#line 16600 "${as_me:-configure}"
+#line 16653 "${as_me:-configure}"

 int main(int argc, char *argv[]) { return (argv[argc-1] == 0) ; }
 EOF
 if test "$INTEL_COMPILER" = yes
 int main(int argc, char *argv[]) { return (argv[argc-1] == 0) ; }
 EOF
 if test "$INTEL_COMPILER" = yes


@@ -16613,7 +16666,7 @@ then
 # remark #981: operands are evaluated in unspecified order
 # warning #279: controlling expression is constant
 
 # remark #981: operands are evaluated in unspecified order
 # warning #279: controlling expression is constant
 

-       { echo "$as_me:16616: checking for $CC warning options..." >&5
+       { echo "$as_me:16669: checking for $CC warning options..." >&5

 echo "$as_me: checking for $CC warning options..." >&6;}
        cf_save_CFLAGS="$CFLAGS"
        EXTRA_CFLAGS="$EXTRA_CFLAGS -Wall"
 echo "$as_me: checking for $CC warning options..." >&6;}
        cf_save_CFLAGS="$CFLAGS"
        EXTRA_CFLAGS="$EXTRA_CFLAGS -Wall"


@@ -16629,12 +16682,12 @@ echo "$as_me: checking for $CC warning options..." >&6;}
                wd981
        do
                CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt"
                wd981
        do
                CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt"

-               if { (eval echo "$as_me:16632: \"$ac_compile\"") >&5
+               if { (eval echo "$as_me:16685: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:16635: \$? = $ac_status" >&5
+  echo "$as_me:16688: \$? = $ac_status" >&5

   (exit "$ac_status"); }; then
   (exit "$ac_status"); }; then

-                       test -n "$verbose" && echo "$as_me:16637: result: ... -$cf_opt" >&5
+                       test -n "$verbose" && echo "$as_me:16690: result: ... -$cf_opt" >&5

 echo "${ECHO_T}... -$cf_opt" >&6
                        EXTRA_CFLAGS="$EXTRA_CFLAGS -$cf_opt"
                fi
 echo "${ECHO_T}... -$cf_opt" >&6
                        EXTRA_CFLAGS="$EXTRA_CFLAGS -$cf_opt"
                fi


@@ -16642,7 +16695,7 @@ echo "${ECHO_T}... -$cf_opt" >&6
        CFLAGS="$cf_save_CFLAGS"
 elif test "$GCC" = yes && test "$GCC_VERSION" != "unknown"
 then
        CFLAGS="$cf_save_CFLAGS"
 elif test "$GCC" = yes && test "$GCC_VERSION" != "unknown"
 then

-       { echo "$as_me:16645: checking for $CC warning options..." >&5
+       { echo "$as_me:16698: checking for $CC warning options..." >&5

 echo "$as_me: checking for $CC warning options..." >&6;}
        cf_save_CFLAGS="$CFLAGS"
        cf_warn_CONST=""
 echo "$as_me: checking for $CC warning options..." >&6;}
        cf_save_CFLAGS="$CFLAGS"
        cf_warn_CONST=""


@@ -16665,12 +16718,12 @@ echo "$as_me: checking for $CC warning options..." >&6;}
                Wundef Wno-inline $cf_gcc_warnings $cf_warn_CONST Wno-unknown-pragmas Wswitch-enum
        do
                CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt"
                Wundef Wno-inline $cf_gcc_warnings $cf_warn_CONST Wno-unknown-pragmas Wswitch-enum
        do
                CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt"

-               if { (eval echo "$as_me:16668: \"$ac_compile\"") >&5
+               if { (eval echo "$as_me:16721: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:16671: \$? = $ac_status" >&5
+  echo "$as_me:16724: \$? = $ac_status" >&5

   (exit "$ac_status"); }; then
   (exit "$ac_status"); }; then

-                       test -n "$verbose" && echo "$as_me:16673: result: ... -$cf_opt" >&5
+                       test -n "$verbose" && echo "$as_me:16726: result: ... -$cf_opt" >&5

 echo "${ECHO_T}... -$cf_opt" >&6
                        case "$cf_opt" in
                        (Winline)
 echo "${ECHO_T}... -$cf_opt" >&6
                        case "$cf_opt" in
                        (Winline)


@@ -16678,7 +16731,7 @@ echo "${ECHO_T}... -$cf_opt" >&6
                                ([34].*)
                                        test -n "$verbose" && echo "    feature is broken in gcc $GCC_VERSION" 1>&6
 
                                ([34].*)
                                        test -n "$verbose" && echo "    feature is broken in gcc $GCC_VERSION" 1>&6
 

-echo "${as_me:-configure}:16681: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
+echo "${as_me:-configure}:16734: testing feature is broken in gcc $GCC_VERSION ..." 1>&5

 
                                        continue;;
                                esac
 
                                        continue;;
                                esac


@@ -16688,7 +16741,7 @@ echo "${as_me:-configure}:16681: testing feature is broken in gcc $GCC_VERSION .
                                ([12].*)
                                        test -n "$verbose" && echo "    feature is broken in gcc $GCC_VERSION" 1>&6
 
                                ([12].*)
                                        test -n "$verbose" && echo "    feature is broken in gcc $GCC_VERSION" 1>&6
 

-echo "${as_me:-configure}:16691: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
+echo "${as_me:-configure}:16744: testing feature is broken in gcc $GCC_VERSION ..." 1>&5

 
                                        continue;;
                                esac
 
                                        continue;;
                                esac


@@ -16721,10 +16774,10 @@ cat > conftest.i <<EOF
 EOF
 if test "$GCC" = yes
 then
 EOF
 if test "$GCC" = yes
 then

-       { echo "$as_me:16724: checking for $CC __attribute__ directives..." >&5
+       { echo "$as_me:16777: checking for $CC __attribute__ directives..." >&5

 echo "$as_me: checking for $CC __attribute__ directives..." >&6;}
 cat > "conftest.$ac_ext" <<EOF
 echo "$as_me: checking for $CC __attribute__ directives..." >&6;}
 cat > "conftest.$ac_ext" <<EOF

-#line 16727 "${as_me:-configure}"
+#line 16780 "${as_me:-configure}"

 #include "confdefs.h"
 #include "conftest.h"
 #include "conftest.i"
 #include "confdefs.h"
 #include "conftest.h"
 #include "conftest.i"


@@ -16773,12 +16826,12 @@ EOF
                        ;;
                esac
 
                        ;;
                esac
 

-               if { (eval echo "$as_me:16776: \"$ac_compile\"") >&5
+               if { (eval echo "$as_me:16829: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:16779: \$? = $ac_status" >&5
+  echo "$as_me:16832: \$? = $ac_status" >&5

   (exit "$ac_status"); }; then
   (exit "$ac_status"); }; then

-                       test -n "$verbose" && echo "$as_me:16781: result: ... $cf_attribute" >&5
+                       test -n "$verbose" && echo "$as_me:16834: result: ... $cf_attribute" >&5

 echo "${ECHO_T}... $cf_attribute" >&6
                        cat conftest.h >>confdefs.h
                        case "$cf_attribute" in
 echo "${ECHO_T}... $cf_attribute" >&6
                        cat conftest.h >>confdefs.h
                        case "$cf_attribute" in


@@ -16850,12 +16903,12 @@ INTEL_CPLUSPLUS=no
 if test "$GCC" = yes ; then
        case "$host_os" in
        (linux*|gnu*)
 if test "$GCC" = yes ; then
        case "$host_os" in
        (linux*|gnu*)

-               echo "$as_me:16853: checking if this is really Intel C++ compiler" >&5
+               echo "$as_me:16906: 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
 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 16858 "configure"
+#line 16911 "configure"

 #include "confdefs.h"
 
 int
 #include "confdefs.h"
 
 int


@@ -16872,16 +16925,16 @@ make an error
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
 }
 _ACEOF
 rm -f "conftest.$ac_objext"

-if { (eval echo "$as_me:16875: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:16928: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:16878: \$? = $ac_status" >&5
+  echo "$as_me:16931: \$? = $ac_status" >&5

   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'

-  { (eval echo "$as_me:16881: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16934: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:16884: \$? = $ac_status" >&5
+  echo "$as_me:16937: \$? = $ac_status" >&5

   (exit "$ac_status"); }; }; then
   INTEL_CPLUSPLUS=yes
 cf_save_CFLAGS="$cf_save_CFLAGS -we147"
   (exit "$ac_status"); }; }; then
   INTEL_CPLUSPLUS=yes
 cf_save_CFLAGS="$cf_save_CFLAGS -we147"


@@ -16892,7 +16945,7 @@ cat "conftest.$ac_ext" >&5
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
                CXXFLAGS="$cf_save_CFLAGS"
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
                CXXFLAGS="$cf_save_CFLAGS"

-               echo "$as_me:16895: result: $INTEL_CPLUSPLUS" >&5
+               echo "$as_me:16948: result: $INTEL_CPLUSPLUS" >&5

 echo "${ECHO_T}$INTEL_CPLUSPLUS" >&6
                ;;
        esac
 echo "${ECHO_T}$INTEL_CPLUSPLUS" >&6
                ;;
        esac


@@ -16901,11 +16954,11 @@ fi
 CLANG_CPLUSPLUS=no
 
 if test "$GCC" = yes ; then
 CLANG_CPLUSPLUS=no
 
 if test "$GCC" = yes ; then

-       echo "$as_me:16904: checking if this is really Clang C++ compiler" >&5
+       echo "$as_me:16957: checking if this is really Clang C++ compiler" >&5

 echo $ECHO_N "checking if this is really Clang C++ compiler... $ECHO_C" >&6
        cf_save_CFLAGS="$CXXFLAGS"
        cat >"conftest.$ac_ext" <<_ACEOF
 echo $ECHO_N "checking if this is really Clang C++ compiler... $ECHO_C" >&6
        cf_save_CFLAGS="$CXXFLAGS"
        cat >"conftest.$ac_ext" <<_ACEOF

-#line 16908 "configure"
+#line 16961 "configure"

 #include "confdefs.h"
 
 int
 #include "confdefs.h"
 
 int


@@ -16922,16 +16975,16 @@ make an error
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
 }
 _ACEOF
 rm -f "conftest.$ac_objext"

-if { (eval echo "$as_me:16925: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:16978: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:16928: \$? = $ac_status" >&5
+  echo "$as_me:16981: \$? = $ac_status" >&5

   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'

-  { (eval echo "$as_me:16931: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16984: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:16934: \$? = $ac_status" >&5
+  echo "$as_me:16987: \$? = $ac_status" >&5

   (exit "$ac_status"); }; }; then
   CLANG_CPLUSPLUS=yes
 
   (exit "$ac_status"); }; }; then
   CLANG_CPLUSPLUS=yes
 


@@ -16941,7 +16994,7 @@ cat "conftest.$ac_ext" >&5
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
        CXXFLAGS="$cf_save_CFLAGS"
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
        CXXFLAGS="$cf_save_CFLAGS"

-       echo "$as_me:16944: result: $CLANG_CPLUSPLUS" >&5
+       echo "$as_me:16997: result: $CLANG_CPLUSPLUS" >&5

 echo "${ECHO_T}$CLANG_CPLUSPLUS" >&6
 fi
 
 echo "${ECHO_T}$CLANG_CPLUSPLUS" >&6
 fi
 


@@ -16950,30 +17003,30 @@ CLANG_VERSION=none
 if test "x$CLANG_CPLUSPLUS" = "xyes" ; then
        case "$CC" in
        (c[1-9][0-9]|*/c[1-9][0-9])
 if test "x$CLANG_CPLUSPLUS" = "xyes" ; then
        case "$CC" in
        (c[1-9][0-9]|*/c[1-9][0-9])

-               { echo "$as_me:16953: WARNING: replacing broken compiler alias $CC" >&5
+               { echo "$as_me:17006: WARNING: replacing broken compiler alias $CC" >&5

 echo "$as_me: WARNING: replacing broken compiler alias $CC" >&2;}
                CFLAGS="$CFLAGS -std=`echo "$CC" | sed -e 's%.*/%%'`"
                CC=clang
                ;;
        esac
 
 echo "$as_me: WARNING: replacing broken compiler alias $CC" >&2;}
                CFLAGS="$CFLAGS -std=`echo "$CC" | sed -e 's%.*/%%'`"
                CC=clang
                ;;
        esac
 

-       echo "$as_me:16960: checking version of $CC" >&5
+       echo "$as_me:17013: checking version of $CC" >&5

 echo $ECHO_N "checking version of $CC... $ECHO_C" >&6
        CLANG_VERSION="`$CC --version 2>/dev/null | sed -e '2,$d' -e 's/^.*(CLANG[^)]*) //' -e 's/^.*(Debian[^)]*) //' -e 's/^[^0-9.]*//' -e 's/[^0-9.].*//'`"
        test -z "$CLANG_VERSION" && CLANG_VERSION=unknown
 echo $ECHO_N "checking version of $CC... $ECHO_C" >&6
        CLANG_VERSION="`$CC --version 2>/dev/null | sed -e '2,$d' -e 's/^.*(CLANG[^)]*) //' -e 's/^.*(Debian[^)]*) //' -e 's/^[^0-9.]*//' -e 's/[^0-9.].*//'`"
        test -z "$CLANG_VERSION" && CLANG_VERSION=unknown

-       echo "$as_me:16964: result: $CLANG_VERSION" >&5
+       echo "$as_me:17017: result: $CLANG_VERSION" >&5

 echo "${ECHO_T}$CLANG_VERSION" >&6
 
        for cf_clang_opt in \
                -Qunused-arguments \
                -Wno-error=implicit-function-declaration
        do
 echo "${ECHO_T}$CLANG_VERSION" >&6
 
        for cf_clang_opt in \
                -Qunused-arguments \
                -Wno-error=implicit-function-declaration
        do

-               echo "$as_me:16971: checking if option $cf_clang_opt works" >&5
+               echo "$as_me:17024: checking if option $cf_clang_opt works" >&5

 echo $ECHO_N "checking if option $cf_clang_opt works... $ECHO_C" >&6
                cf_save_CFLAGS="$CFLAGS"
                CFLAGS="$CFLAGS $cf_clang_opt"
                cat >"conftest.$ac_ext" <<_ACEOF
 echo $ECHO_N "checking if option $cf_clang_opt works... $ECHO_C" >&6
                cf_save_CFLAGS="$CFLAGS"
                CFLAGS="$CFLAGS $cf_clang_opt"
                cat >"conftest.$ac_ext" <<_ACEOF

-#line 16976 "configure"
+#line 17029 "configure"

 #include "confdefs.h"
 
                        #include <stdio.h>
 #include "confdefs.h"
 
                        #include <stdio.h>


@@ -16987,16 +17040,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"

-if { (eval echo "$as_me:16990: \"$ac_link\"") >&5
+if { (eval echo "$as_me:17043: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:16993: \$? = $ac_status" >&5
+  echo "$as_me:17046: \$? = $ac_status" >&5

   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'

-  { (eval echo "$as_me:16996: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17049: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:16999: \$? = $ac_status" >&5
+  echo "$as_me:17052: \$? = $ac_status" >&5

   (exit "$ac_status"); }; }; then
 
                        cf_clang_optok=yes
   (exit "$ac_status"); }; }; then
 
                        cf_clang_optok=yes


@@ -17007,13 +17060,13 @@ cat "conftest.$ac_ext" >&5
                        cf_clang_optok=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
                        cf_clang_optok=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"

-               echo "$as_me:17010: result: $cf_clang_optok" >&5
+               echo "$as_me:17063: result: $cf_clang_optok" >&5

 echo "${ECHO_T}$cf_clang_optok" >&6
                CFLAGS="$cf_save_CFLAGS"
                if test "$cf_clang_optok" = yes; then
                        test -n "$verbose" && echo "    adding option $cf_clang_opt" 1>&6
 
 echo "${ECHO_T}$cf_clang_optok" >&6
                CFLAGS="$cf_save_CFLAGS"
                if test "$cf_clang_optok" = yes; then
                        test -n "$verbose" && echo "    adding option $cf_clang_opt" 1>&6
 

-echo "${as_me:-configure}:17016: testing adding option $cf_clang_opt ..." 1>&5
+echo "${as_me:-configure}:17069: testing adding option $cf_clang_opt ..." 1>&5

 
        test -n "$CFLAGS" && CFLAGS="$CFLAGS "
        CFLAGS="${CFLAGS}$cf_clang_opt"
 
        test -n "$CFLAGS" && CFLAGS="$CFLAGS "
        CFLAGS="${CFLAGS}$cf_clang_opt"


@@ -17030,7 +17083,7 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
 ac_main_return="return"
 
 cat > conftest.$ac_ext <<EOF
 ac_main_return="return"
 
 cat > conftest.$ac_ext <<EOF

-#line 17033 "configure"
+#line 17086 "configure"

 int main(int argc, char *argv[]) { return (argv[argc-1] == 0) ; }
 EOF
 
 int main(int argc, char *argv[]) { return (argv[argc-1] == 0) ; }
 EOF
 


@@ -17048,7 +17101,7 @@ then
 # remark #981: operands are evaluated in unspecified order
 # warning #269: invalid format string conversion
 
 # remark #981: operands are evaluated in unspecified order
 # warning #269: invalid format string conversion
 

-       { echo "$as_me:17051: checking for $CC warning options..." >&5
+       { echo "$as_me:17104: checking for $CC warning options..." >&5

 echo "$as_me: checking for $CC warning options..." >&6;}
        cf_save_CXXFLAGS="$CXXFLAGS"
        EXTRA_CXXFLAGS="-Wall"
 echo "$as_me: checking for $CC warning options..." >&6;}
        cf_save_CXXFLAGS="$CXXFLAGS"
        EXTRA_CXXFLAGS="-Wall"


@@ -17065,12 +17118,12 @@ echo "$as_me: checking for $CC warning options..." >&6;}
                wd981
        do
                CXXFLAGS="$cf_save_CXXFLAGS $EXTRA_CXXFLAGS -$cf_opt"
                wd981
        do
                CXXFLAGS="$cf_save_CXXFLAGS $EXTRA_CXXFLAGS -$cf_opt"

-               if { (eval echo "$as_me:17068: \"$ac_compile\"") >&5
+               if { (eval echo "$as_me:17121: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:17071: \$? = $ac_status" >&5
+  echo "$as_me:17124: \$? = $ac_status" >&5

   (exit "$ac_status"); }; then
   (exit "$ac_status"); }; then

-                       test -n "$verbose" && echo "$as_me:17073: result: ... -$cf_opt" >&5
+                       test -n "$verbose" && echo "$as_me:17126: result: ... -$cf_opt" >&5

 echo "${ECHO_T}... -$cf_opt" >&6
                        EXTRA_CXXFLAGS="$EXTRA_CXXFLAGS -$cf_opt"
                fi
 echo "${ECHO_T}... -$cf_opt" >&6
                        EXTRA_CXXFLAGS="$EXTRA_CXXFLAGS -$cf_opt"
                fi


@@ -17079,7 +17132,7 @@ echo "${ECHO_T}... -$cf_opt" >&6
 
 elif test "$GXX" = yes
 then
 
 elif test "$GXX" = yes
 then

-       { echo "$as_me:17082: checking for $CXX warning options..." >&5
+       { echo "$as_me:17135: checking for $CXX warning options..." >&5

 echo "$as_me: checking for $CXX warning options..." >&6;}
        cf_save_CXXFLAGS="$CXXFLAGS"
        EXTRA_CXXFLAGS="-W -Wall"
 echo "$as_me: checking for $CXX warning options..." >&6;}
        cf_save_CXXFLAGS="$CXXFLAGS"
        EXTRA_CXXFLAGS="-W -Wall"


@@ -17109,16 +17162,16 @@ echo "$as_me: checking for $CXX warning options..." >&6;}
                Wundef $cf_gxx_extra_warnings Wno-unused
        do
                CXXFLAGS="$cf_save_CXXFLAGS $EXTRA_CXXFLAGS -Werror -$cf_opt"
                Wundef $cf_gxx_extra_warnings Wno-unused
        do
                CXXFLAGS="$cf_save_CXXFLAGS $EXTRA_CXXFLAGS -Werror -$cf_opt"

-               if { (eval echo "$as_me:17112: \"$ac_compile\"") >&5
+               if { (eval echo "$as_me:17165: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:17115: \$? = $ac_status" >&5
+  echo "$as_me:17168: \$? = $ac_status" >&5

   (exit "$ac_status"); }; then
   (exit "$ac_status"); }; then

-                       test -n "$verbose" && echo "$as_me:17117: result: ... -$cf_opt" >&5
+                       test -n "$verbose" && echo "$as_me:17170: result: ... -$cf_opt" >&5

 echo "${ECHO_T}... -$cf_opt" >&6
                        EXTRA_CXXFLAGS="$EXTRA_CXXFLAGS -$cf_opt"
                else
 echo "${ECHO_T}... -$cf_opt" >&6
                        EXTRA_CXXFLAGS="$EXTRA_CXXFLAGS -$cf_opt"
                else

-                       test -n "$verbose" && echo "$as_me:17121: result: ... no -$cf_opt" >&5
+                       test -n "$verbose" && echo "$as_me:17174: result: ... no -$cf_opt" >&5

 echo "${ECHO_T}... no -$cf_opt" >&6
                fi
        done
 echo "${ECHO_T}... no -$cf_opt" >&6
                fi
        done


@@ -17136,7 +17189,7 @@ ac_main_return="return"
        fi
 fi
 
        fi
 fi
 

-echo "$as_me:17139: checking if you want to work around bogus compiler/loader warnings" >&5
+echo "$as_me:17192: 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.
 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.


@@ -17146,7 +17199,7 @@ if test "${enable_string_hacks+set}" = set; then
 else
   enable_string_hacks=no
 fi;
 else
   enable_string_hacks=no
 fi;

-echo "$as_me:17149: result: $enable_string_hacks" >&5
+echo "$as_me:17202: result: $enable_string_hacks" >&5

 echo "${ECHO_T}$enable_string_hacks" >&6
 
 if test "x$enable_string_hacks" = "xyes"; then
 echo "${ECHO_T}$enable_string_hacks" >&6
 
 if test "x$enable_string_hacks" = "xyes"; then


@@ -17155,15 +17208,15 @@ cat >>confdefs.h <<\EOF
 #define USE_STRING_HACKS 1
 EOF
 
 #define USE_STRING_HACKS 1
 EOF
 

-       { echo "$as_me:17158: WARNING: enabling string-hacks to work around bogus compiler/loader warnings" >&5
+       { echo "$as_me:17211: WARNING: enabling string-hacks to work around bogus compiler/loader warnings" >&5

 echo "$as_me: WARNING: enabling string-hacks to work around bogus compiler/loader warnings" >&2;}
 echo "$as_me: WARNING: enabling string-hacks to work around bogus compiler/loader warnings" >&2;}

-       echo "$as_me:17160: checking for strlcat" >&5
+       echo "$as_me:17213: checking for strlcat" >&5

 echo $ECHO_N "checking for strlcat... $ECHO_C" >&6
 if test "${ac_cv_func_strlcat+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >"conftest.$ac_ext" <<_ACEOF
 echo $ECHO_N "checking for strlcat... $ECHO_C" >&6
 if test "${ac_cv_func_strlcat+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >"conftest.$ac_ext" <<_ACEOF

-#line 17166 "configure"
+#line 17219 "configure"

 #include "confdefs.h"
 #define strlcat autoconf_temporary
 #include <limits.h>    /* least-intrusive standard header which defines gcc2 __stub macros */
 #include "confdefs.h"
 #define strlcat autoconf_temporary
 #include <limits.h>    /* least-intrusive standard header which defines gcc2 __stub macros */


@@ -17194,16 +17247,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"

-if { (eval echo "$as_me:17197: \"$ac_link\"") >&5
+if { (eval echo "$as_me:17250: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:17200: \$? = $ac_status" >&5
+  echo "$as_me:17253: \$? = $ac_status" >&5

   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'

-  { (eval echo "$as_me:17203: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17256: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:17206: \$? = $ac_status" >&5
+  echo "$as_me:17259: \$? = $ac_status" >&5

   (exit "$ac_status"); }; }; then
   ac_cv_func_strlcat=yes
 else
   (exit "$ac_status"); }; }; then
   ac_cv_func_strlcat=yes
 else


@@ -17213,7 +17266,7 @@ ac_cv_func_strlcat=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi

-echo "$as_me:17216: result: $ac_cv_func_strlcat" >&5
+echo "$as_me:17269: result: $ac_cv_func_strlcat" >&5

 echo "${ECHO_T}$ac_cv_func_strlcat" >&6
 if test "$ac_cv_func_strlcat" = yes; then
 
 echo "${ECHO_T}$ac_cv_func_strlcat" >&6
 if test "$ac_cv_func_strlcat" = yes; then
 


@@ -17223,7 +17276,7 @@ EOF
 
 else
 
 
 else
 

-               echo "$as_me:17226: checking for strlcat in -lbsd" >&5
+               echo "$as_me:17279: checking for strlcat in -lbsd" >&5

 echo $ECHO_N "checking for strlcat in -lbsd... $ECHO_C" >&6
 if test "${ac_cv_lib_bsd_strlcat+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 echo $ECHO_N "checking for strlcat in -lbsd... $ECHO_C" >&6
 if test "${ac_cv_lib_bsd_strlcat+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6


@@ -17231,7 +17284,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lbsd  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lbsd  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF

-#line 17234 "configure"
+#line 17287 "configure"

 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */


@@ -17250,16 +17303,16 @@ strlcat ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"

-if { (eval echo "$as_me:17253: \"$ac_link\"") >&5
+if { (eval echo "$as_me:17306: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:17256: \$? = $ac_status" >&5
+  echo "$as_me:17309: \$? = $ac_status" >&5

   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'

-  { (eval echo "$as_me:17259: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17312: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:17262: \$? = $ac_status" >&5
+  echo "$as_me:17315: \$? = $ac_status" >&5

   (exit "$ac_status"); }; }; then
   ac_cv_lib_bsd_strlcat=yes
 else
   (exit "$ac_status"); }; }; then
   ac_cv_lib_bsd_strlcat=yes
 else


@@ -17270,7 +17323,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi

-echo "$as_me:17273: result: $ac_cv_lib_bsd_strlcat" >&5
+echo "$as_me:17326: result: $ac_cv_lib_bsd_strlcat" >&5

 echo "${ECHO_T}$ac_cv_lib_bsd_strlcat" >&6
 if test "$ac_cv_lib_bsd_strlcat" = yes; then
 
 echo "${ECHO_T}$ac_cv_lib_bsd_strlcat" >&6
 if test "$ac_cv_lib_bsd_strlcat" = yes; then
 


@@ -17293,23 +17346,23 @@ LIBS="$cf_add_libs"
 for ac_header in bsd/string.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
 for ac_header in bsd/string.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`

-echo "$as_me:17296: checking for $ac_header" >&5
+echo "$as_me:17349: 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
 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 17302 "configure"
+#line 17355 "configure"

 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF

-if { (eval echo "$as_me:17306: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:17359: \"$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
   (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:17312: \$? = $ac_status" >&5
+  echo "$as_me:17365: \$? = $ac_status" >&5

   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag


@@ -17328,7 +17381,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi

-echo "$as_me:17331: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:17384: 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
 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6
 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then
   cat >>confdefs.h <<EOF


@@ -17349,13 +17402,13 @@ fi
 for ac_func in strlcpy snprintf
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
 for ac_func in strlcpy snprintf
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`

-echo "$as_me:17352: checking for $ac_func" >&5
+echo "$as_me:17405: 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
 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 17358 "configure"
+#line 17411 "configure"

 #include "confdefs.h"
 #define $ac_func autoconf_temporary
 #include <limits.h>    /* least-intrusive standard header which defines gcc2 __stub macros */
 #include "confdefs.h"
 #define $ac_func autoconf_temporary
 #include <limits.h>    /* least-intrusive standard header which defines gcc2 __stub macros */


@@ -17386,16 +17439,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"

-if { (eval echo "$as_me:17389: \"$ac_link\"") >&5
+if { (eval echo "$as_me:17442: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:17392: \$? = $ac_status" >&5
+  echo "$as_me:17445: \$? = $ac_status" >&5

   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'

-  { (eval echo "$as_me:17395: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17448: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:17398: \$? = $ac_status" >&5
+  echo "$as_me:17451: \$? = $ac_status" >&5

   (exit "$ac_status"); }; }; then
   eval "$as_ac_var=yes"
 else
   (exit "$ac_status"); }; }; then
   eval "$as_ac_var=yes"
 else


@@ -17405,7 +17458,7 @@ eval "$as_ac_var=no"
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi

-echo "$as_me:17408: result: `eval echo '${'"$as_ac_var"'}'`" >&5
+echo "$as_me:17461: 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
 echo "${ECHO_T}`eval echo '${'"$as_ac_var"'}'`" >&6
 if test "`eval echo '${'"$as_ac_var"'}'`" = yes; then
   cat >>confdefs.h <<EOF


@@ -17418,7 +17471,7 @@ done
 fi
 
 ###    use option --enable-assertions to turn on generation of assertion code
 fi
 
 ###    use option --enable-assertions to turn on generation of assertion code

-echo "$as_me:17421: checking if you want to enable runtime assertions" >&5
+echo "$as_me:17474: 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.
 echo $ECHO_N "checking if you want to enable runtime assertions... $ECHO_C" >&6
 
 # Check whether --enable-assertions or --disable-assertions was given.


@@ -17428,7 +17481,7 @@ if test "${enable_assertions+set}" = set; then
 else
   with_assertions=no
 fi;
 else
   with_assertions=no
 fi;

-echo "$as_me:17431: result: $with_assertions" >&5
+echo "$as_me:17484: result: $with_assertions" >&5

 echo "${ECHO_T}$with_assertions" >&6
 if test -n "$GCC"
 then
 echo "${ECHO_T}$with_assertions" >&6
 if test -n "$GCC"
 then


@@ -17444,7 +17497,7 @@ fi
 
 ###    use option --disable-leaks to suppress "permanent" leaks, for testing
 
 
 ###    use option --disable-leaks to suppress "permanent" leaks, for testing
 

-echo "$as_me:17447: checking if you want to use dmalloc for testing" >&5
+echo "$as_me:17500: 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.
 echo $ECHO_N "checking if you want to use dmalloc for testing... $ECHO_C" >&6
 
 # Check whether --with-dmalloc or --without-dmalloc was given.


@@ -17461,7 +17514,7 @@ EOF
 else
   with_dmalloc=
 fi;
 else
   with_dmalloc=
 fi;

-echo "$as_me:17464: result: ${with_dmalloc:-no}" >&5
+echo "$as_me:17517: result: ${with_dmalloc:-no}" >&5

 echo "${ECHO_T}${with_dmalloc:-no}" >&6
 
 case ".$with_cflags" in
 echo "${ECHO_T}${with_dmalloc:-no}" >&6
 
 case ".$with_cflags" in


@@ -17575,23 +17628,23 @@ fi
 esac
 
 if test "$with_dmalloc" = yes ; then
 esac
 
 if test "$with_dmalloc" = yes ; then

-       echo "$as_me:17578: checking for dmalloc.h" >&5
+       echo "$as_me:17631: 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
 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 17584 "configure"
+#line 17637 "configure"

 #include "confdefs.h"
 #include <dmalloc.h>
 _ACEOF
 #include "confdefs.h"
 #include <dmalloc.h>
 _ACEOF

-if { (eval echo "$as_me:17588: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:17641: \"$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
   (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:17594: \$? = $ac_status" >&5
+  echo "$as_me:17647: \$? = $ac_status" >&5

   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag


@@ -17610,11 +17663,11 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi

-echo "$as_me:17613: result: $ac_cv_header_dmalloc_h" >&5
+echo "$as_me:17666: 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 "${ECHO_T}$ac_cv_header_dmalloc_h" >&6
 if test "$ac_cv_header_dmalloc_h" = yes; then
 

-echo "$as_me:17617: checking for dmalloc_debug in -ldmalloc" >&5
+echo "$as_me:17670: 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
 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


@@ -17622,7 +17675,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldmalloc  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldmalloc  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF

-#line 17625 "configure"
+#line 17678 "configure"

 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */


@@ -17641,16 +17694,16 @@ dmalloc_debug ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"

-if { (eval echo "$as_me:17644: \"$ac_link\"") >&5
+if { (eval echo "$as_me:17697: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:17647: \$? = $ac_status" >&5
+  echo "$as_me:17700: \$? = $ac_status" >&5

   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'

-  { (eval echo "$as_me:17650: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17703: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:17653: \$? = $ac_status" >&5
+  echo "$as_me:17706: \$? = $ac_status" >&5

   (exit "$ac_status"); }; }; then
   ac_cv_lib_dmalloc_dmalloc_debug=yes
 else
   (exit "$ac_status"); }; }; then
   ac_cv_lib_dmalloc_dmalloc_debug=yes
 else


@@ -17661,7 +17714,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi

-echo "$as_me:17664: result: $ac_cv_lib_dmalloc_dmalloc_debug" >&5
+echo "$as_me:17717: 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
 echo "${ECHO_T}$ac_cv_lib_dmalloc_dmalloc_debug" >&6
 if test "$ac_cv_lib_dmalloc_dmalloc_debug" = yes; then
   cat >>confdefs.h <<EOF


@@ -17676,7 +17729,7 @@ fi
 
 fi
 
 
 fi
 

-echo "$as_me:17679: checking if you want to use dbmalloc for testing" >&5
+echo "$as_me:17732: 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.
 echo $ECHO_N "checking if you want to use dbmalloc for testing... $ECHO_C" >&6
 
 # Check whether --with-dbmalloc or --without-dbmalloc was given.


@@ -17693,7 +17746,7 @@ EOF
 else
   with_dbmalloc=
 fi;
 else
   with_dbmalloc=
 fi;

-echo "$as_me:17696: result: ${with_dbmalloc:-no}" >&5
+echo "$as_me:17749: result: ${with_dbmalloc:-no}" >&5

 echo "${ECHO_T}${with_dbmalloc:-no}" >&6
 
 case ".$with_cflags" in
 echo "${ECHO_T}${with_dbmalloc:-no}" >&6
 
 case ".$with_cflags" in


@@ -17807,23 +17860,23 @@ fi
 esac
 
 if test "$with_dbmalloc" = yes ; then
 esac
 
 if test "$with_dbmalloc" = yes ; then

-       echo "$as_me:17810: checking for dbmalloc.h" >&5
+       echo "$as_me:17863: 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
 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 17816 "configure"
+#line 17869 "configure"

 #include "confdefs.h"
 #include <dbmalloc.h>
 _ACEOF
 #include "confdefs.h"
 #include <dbmalloc.h>
 _ACEOF

-if { (eval echo "$as_me:17820: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:17873: \"$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
   (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:17826: \$? = $ac_status" >&5
+  echo "$as_me:17879: \$? = $ac_status" >&5

   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag


@@ -17842,11 +17895,11 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi

-echo "$as_me:17845: result: $ac_cv_header_dbmalloc_h" >&5
+echo "$as_me:17898: 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 "${ECHO_T}$ac_cv_header_dbmalloc_h" >&6
 if test "$ac_cv_header_dbmalloc_h" = yes; then
 

-echo "$as_me:17849: checking for debug_malloc in -ldbmalloc" >&5
+echo "$as_me:17902: 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
 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


@@ -17854,7 +17907,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldbmalloc  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldbmalloc  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF

-#line 17857 "configure"
+#line 17910 "configure"

 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */


@@ -17873,16 +17926,16 @@ debug_malloc ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"

-if { (eval echo "$as_me:17876: \"$ac_link\"") >&5
+if { (eval echo "$as_me:17929: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:17879: \$? = $ac_status" >&5
+  echo "$as_me:17932: \$? = $ac_status" >&5

   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'

-  { (eval echo "$as_me:17882: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17935: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:17885: \$? = $ac_status" >&5
+  echo "$as_me:17938: \$? = $ac_status" >&5

   (exit "$ac_status"); }; }; then
   ac_cv_lib_dbmalloc_debug_malloc=yes
 else
   (exit "$ac_status"); }; }; then
   ac_cv_lib_dbmalloc_debug_malloc=yes
 else


@@ -17893,7 +17946,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi

-echo "$as_me:17896: result: $ac_cv_lib_dbmalloc_debug_malloc" >&5
+echo "$as_me:17949: 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
 echo "${ECHO_T}$ac_cv_lib_dbmalloc_debug_malloc" >&6
 if test "$ac_cv_lib_dbmalloc_debug_malloc" = yes; then
   cat >>confdefs.h <<EOF


@@ -17908,7 +17961,7 @@ fi
 
 fi
 
 
 fi
 

-echo "$as_me:17911: checking if you want to use valgrind for testing" >&5
+echo "$as_me:17964: 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.
 echo $ECHO_N "checking if you want to use valgrind for testing... $ECHO_C" >&6
 
 # Check whether --with-valgrind or --without-valgrind was given.


@@ -17925,7 +17978,7 @@ EOF
 else
   with_valgrind=
 fi;
 else
   with_valgrind=
 fi;

-echo "$as_me:17928: result: ${with_valgrind:-no}" >&5
+echo "$as_me:17981: result: ${with_valgrind:-no}" >&5

 echo "${ECHO_T}${with_valgrind:-no}" >&6
 
 case ".$with_cflags" in
 echo "${ECHO_T}${with_valgrind:-no}" >&6
 
 case ".$with_cflags" in


@@ -18038,7 +18091,7 @@ fi
        ;;
 esac
 
        ;;
 esac
 

-echo "$as_me:18041: checking if you want to perform memory-leak testing" >&5
+echo "$as_me:18094: 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.
 echo $ECHO_N "checking if you want to perform memory-leak testing... $ECHO_C" >&6
 
 # Check whether --enable-leaks or --disable-leaks was given.


@@ -18049,7 +18102,7 @@ else
   enable_leaks=yes
 fi;
 if test "x$enable_leaks" = xno; then with_no_leaks=yes; else with_no_leaks=no; fi
   enable_leaks=yes
 fi;
 if test "x$enable_leaks" = xno; then with_no_leaks=yes; else with_no_leaks=no; fi

-echo "$as_me:18052: result: $with_no_leaks" >&5
+echo "$as_me:18105: result: $with_no_leaks" >&5

 echo "${ECHO_T}$with_no_leaks" >&6
 
 if test "$enable_leaks" = no ; then
 echo "${ECHO_T}$with_no_leaks" >&6
 
 if test "$enable_leaks" = no ; then


@@ -18101,7 +18154,7 @@ case "$CFLAGS $CPPFLAGS" in
        ;;
 esac
 
        ;;
 esac
 

-echo "$as_me:18104: checking whether to add trace feature to all models" >&5
+echo "$as_me:18157: 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.
 echo $ECHO_N "checking whether to add trace feature to all models... $ECHO_C" >&6
 
 # Check whether --with-trace or --without-trace was given.


@@ -18111,7 +18164,7 @@ if test "${with_trace+set}" = set; then
 else
   cf_with_trace=$cf_all_traces
 fi;
 else
   cf_with_trace=$cf_all_traces
 fi;

-echo "$as_me:18114: result: $cf_with_trace" >&5
+echo "$as_me:18167: result: $cf_with_trace" >&5

 echo "${ECHO_T}$cf_with_trace" >&6
 
 if test "x$cf_with_trace" = xyes ; then
 echo "${ECHO_T}$cf_with_trace" >&6
 
 if test "x$cf_with_trace" = xyes ; then


@@ -18225,7 +18278,7 @@ else
        ADA_TRACE=FALSE
 fi
 
        ADA_TRACE=FALSE
 fi
 

-echo "$as_me:18228: checking if we want to use GNAT projects" >&5
+echo "$as_me:18281: 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.
 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.


@@ -18242,7 +18295,7 @@ else
        enable_gnat_projects=yes
 
 fi;
        enable_gnat_projects=yes
 
 fi;

-echo "$as_me:18245: result: $enable_gnat_projects" >&5
+echo "$as_me:18298: result: $enable_gnat_projects" >&5

 echo "${ECHO_T}$enable_gnat_projects" >&6
 
 ###    Checks for libraries.
 echo "${ECHO_T}$enable_gnat_projects" >&6
 
 ###    Checks for libraries.


@@ -18256,13 +18309,13 @@ case "$cf_cv_system_name" in
        # Note: WINVER may be a problem with Windows 10
        ;;
 (*)
        # Note: WINVER may be a problem with Windows 10
        ;;
 (*)

-echo "$as_me:18259: checking for gettimeofday" >&5
+echo "$as_me:18312: 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
 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 18265 "configure"
+#line 18318 "configure"

 #include "confdefs.h"
 #define gettimeofday autoconf_temporary
 #include <limits.h>    /* least-intrusive standard header which defines gcc2 __stub macros */
 #include "confdefs.h"
 #define gettimeofday autoconf_temporary
 #include <limits.h>    /* least-intrusive standard header which defines gcc2 __stub macros */


@@ -18293,16 +18346,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"

-if { (eval echo "$as_me:18296: \"$ac_link\"") >&5
+if { (eval echo "$as_me:18349: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:18299: \$? = $ac_status" >&5
+  echo "$as_me:18352: \$? = $ac_status" >&5

   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'

-  { (eval echo "$as_me:18302: \"$ac_try\"") >&5
+  { (eval echo "$as_me:18355: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:18305: \$? = $ac_status" >&5
+  echo "$as_me:18358: \$? = $ac_status" >&5

   (exit "$ac_status"); }; }; then
   ac_cv_func_gettimeofday=yes
 else
   (exit "$ac_status"); }; }; then
   ac_cv_func_gettimeofday=yes
 else


@@ -18312,7 +18365,7 @@ ac_cv_func_gettimeofday=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi

-echo "$as_me:18315: result: $ac_cv_func_gettimeofday" >&5
+echo "$as_me:18368: result: $ac_cv_func_gettimeofday" >&5

 echo "${ECHO_T}$ac_cv_func_gettimeofday" >&6
 if test "$ac_cv_func_gettimeofday" = yes; then
 
 echo "${ECHO_T}$ac_cv_func_gettimeofday" >&6
 if test "$ac_cv_func_gettimeofday" = yes; then
 


@@ -18322,7 +18375,7 @@ EOF
 
 else
 
 
 else
 

-echo "$as_me:18325: checking for gettimeofday in -lbsd" >&5
+echo "$as_me:18378: 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
 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


@@ -18330,7 +18383,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lbsd  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lbsd  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF

-#line 18333 "configure"
+#line 18386 "configure"

 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */


@@ -18349,16 +18402,16 @@ gettimeofday ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"

-if { (eval echo "$as_me:18352: \"$ac_link\"") >&5
+if { (eval echo "$as_me:18405: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:18355: \$? = $ac_status" >&5
+  echo "$as_me:18408: \$? = $ac_status" >&5

   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'

-  { (eval echo "$as_me:18358: \"$ac_try\"") >&5
+  { (eval echo "$as_me:18411: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:18361: \$? = $ac_status" >&5
+  echo "$as_me:18414: \$? = $ac_status" >&5

   (exit "$ac_status"); }; }; then
   ac_cv_lib_bsd_gettimeofday=yes
 else
   (exit "$ac_status"); }; }; then
   ac_cv_lib_bsd_gettimeofday=yes
 else


@@ -18369,7 +18422,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi

-echo "$as_me:18372: result: $ac_cv_lib_bsd_gettimeofday" >&5
+echo "$as_me:18425: 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
 
 echo "${ECHO_T}$ac_cv_lib_bsd_gettimeofday" >&6
 if test "$ac_cv_lib_bsd_gettimeofday" = yes; then
 


@@ -18399,14 +18452,14 @@ fi
        ;;
 esac
 
        ;;
 esac
 

-echo "$as_me:18402: checking if -lm needed for math functions" >&5
+echo "$as_me:18455: 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
 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 18409 "configure"
+#line 18462 "configure"

 #include "confdefs.h"
 
        #include <stdio.h>
 #include "confdefs.h"
 
        #include <stdio.h>


@@ -18422,16 +18475,16 @@ double x = rand(); printf("result = %g\\n", pow(sin(x),x))
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"

-if { (eval echo "$as_me:18425: \"$ac_link\"") >&5
+if { (eval echo "$as_me:18478: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:18428: \$? = $ac_status" >&5
+  echo "$as_me:18481: \$? = $ac_status" >&5

   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'

-  { (eval echo "$as_me:18431: \"$ac_try\"") >&5
+  { (eval echo "$as_me:18484: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:18434: \$? = $ac_status" >&5
+  echo "$as_me:18487: \$? = $ac_status" >&5

   (exit "$ac_status"); }; }; then
   cf_cv_need_libm=no
 else
   (exit "$ac_status"); }; }; then
   cf_cv_need_libm=no
 else


@@ -18441,7 +18494,7 @@ cf_cv_need_libm=yes
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi

-echo "$as_me:18444: result: $cf_cv_need_libm" >&5
+echo "$as_me:18497: result: $cf_cv_need_libm" >&5

 echo "${ECHO_T}$cf_cv_need_libm" >&6
 if test "$cf_cv_need_libm" = yes
 then
 echo "${ECHO_T}$cf_cv_need_libm" >&6
 if test "$cf_cv_need_libm" = yes
 then


@@ -18449,13 +18502,13 @@ MATH_LIB=-lm
 fi
 
 ###    Checks for header files.
 fi
 
 ###    Checks for header files.

-echo "$as_me:18452: checking for ANSI C header files" >&5
+echo "$as_me:18505: 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
 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 18458 "configure"
+#line 18511 "configure"

 #include "confdefs.h"
 #include <stdlib.h>
 #include <stdarg.h>
 #include "confdefs.h"
 #include <stdlib.h>
 #include <stdarg.h>


@@ -18463,13 +18516,13 @@ else
 #include <float.h>
 
 _ACEOF
 #include <float.h>
 
 _ACEOF

-if { (eval echo "$as_me:18466: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:18519: \"$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
   (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:18472: \$? = $ac_status" >&5
+  echo "$as_me:18525: \$? = $ac_status" >&5

   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag


@@ -18491,7 +18544,7 @@ rm -f conftest.err "conftest.$ac_ext"
 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
 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 18494 "configure"
+#line 18547 "configure"

 #include "confdefs.h"
 #include <string.h>
 
 #include "confdefs.h"
 #include <string.h>
 


@@ -18509,7 +18562,7 @@ fi
 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
 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 18512 "configure"
+#line 18565 "configure"

 #include "confdefs.h"
 #include <stdlib.h>
 
 #include "confdefs.h"
 #include <stdlib.h>
 


@@ -18530,7 +18583,7 @@ if test $ac_cv_header_stdc = yes; then
   :
 else
   cat >"conftest.$ac_ext" <<_ACEOF
   :
 else
   cat >"conftest.$ac_ext" <<_ACEOF

-#line 18533 "configure"
+#line 18586 "configure"

 #include "confdefs.h"
 #include <ctype.h>
 #if ((' ' & 0x0FF) == 0x020)
 #include "confdefs.h"
 #include <ctype.h>
 #if ((' ' & 0x0FF) == 0x020)


@@ -18556,15 +18609,15 @@ main (void)
 }
 _ACEOF
 rm -f "conftest$ac_exeext"
 }
 _ACEOF
 rm -f "conftest$ac_exeext"

-if { (eval echo "$as_me:18559: \"$ac_link\"") >&5
+if { (eval echo "$as_me:18612: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:18562: \$? = $ac_status" >&5
+  echo "$as_me:18615: \$? = $ac_status" >&5

   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'

-  { (eval echo "$as_me:18564: \"$ac_try\"") >&5
+  { (eval echo "$as_me:18617: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:18567: \$? = $ac_status" >&5
+  echo "$as_me:18620: \$? = $ac_status" >&5

   (exit "$ac_status"); }; }; then
   :
 else
   (exit "$ac_status"); }; }; then
   :
 else


@@ -18577,7 +18630,7 @@ rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftes
 fi
 fi
 fi
 fi
 fi
 fi

-echo "$as_me:18580: result: $ac_cv_header_stdc" >&5
+echo "$as_me:18633: result: $ac_cv_header_stdc" >&5

 echo "${ECHO_T}$ac_cv_header_stdc" >&6
 if test $ac_cv_header_stdc = yes; then
 
 echo "${ECHO_T}$ac_cv_header_stdc" >&6
 if test $ac_cv_header_stdc = yes; then
 


@@ -18590,13 +18643,13 @@ fi
 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`
 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:18593: checking for $ac_hdr that defines DIR" >&5
+echo "$as_me:18646: 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
 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 18599 "configure"
+#line 18652 "configure"

 #include "confdefs.h"
 #include <sys/types.h>
 #include <$ac_hdr>
 #include "confdefs.h"
 #include <sys/types.h>
 #include <$ac_hdr>


@@ -18611,16 +18664,16 @@ return 0;
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
 }
 _ACEOF
 rm -f "conftest.$ac_objext"

-if { (eval echo "$as_me:18614: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:18667: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:18617: \$? = $ac_status" >&5
+  echo "$as_me:18670: \$? = $ac_status" >&5

   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'

-  { (eval echo "$as_me:18620: \"$ac_try\"") >&5
+  { (eval echo "$as_me:18673: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:18623: \$? = $ac_status" >&5
+  echo "$as_me:18676: \$? = $ac_status" >&5

   (exit "$ac_status"); }; }; then
   eval "$as_ac_Header=yes"
 else
   (exit "$ac_status"); }; }; then
   eval "$as_ac_Header=yes"
 else


@@ -18630,7 +18683,7 @@ eval "$as_ac_Header=no"
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi

-echo "$as_me:18633: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:18686: 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
 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6
 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then
   cat >>confdefs.h <<EOF


@@ -18643,7 +18696,7 @@ fi
 done
 # Two versions of opendir et al. are in -ldir and -lx on SCO Xenix.
 if test $ac_header_dirent = dirent.h; then
 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:18646: checking for opendir in -ldir" >&5
+  echo "$as_me:18699: 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
 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


@@ -18651,7 +18704,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldir  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldir  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF

-#line 18654 "configure"
+#line 18707 "configure"

 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */


@@ -18670,16 +18723,16 @@ opendir ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"

-if { (eval echo "$as_me:18673: \"$ac_link\"") >&5
+if { (eval echo "$as_me:18726: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:18676: \$? = $ac_status" >&5
+  echo "$as_me:18729: \$? = $ac_status" >&5

   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'

-  { (eval echo "$as_me:18679: \"$ac_try\"") >&5
+  { (eval echo "$as_me:18732: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:18682: \$? = $ac_status" >&5
+  echo "$as_me:18735: \$? = $ac_status" >&5

   (exit "$ac_status"); }; }; then
   ac_cv_lib_dir_opendir=yes
 else
   (exit "$ac_status"); }; }; then
   ac_cv_lib_dir_opendir=yes
 else


@@ -18690,14 +18743,14 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi

-echo "$as_me:18693: result: $ac_cv_lib_dir_opendir" >&5
+echo "$as_me:18746: 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 "${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:18700: checking for opendir in -lx" >&5
+  echo "$as_me:18753: 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
 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


@@ -18705,7 +18758,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lx  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lx  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF

-#line 18708 "configure"
+#line 18761 "configure"

 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */


@@ -18724,16 +18777,16 @@ opendir ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"

-if { (eval echo "$as_me:18727: \"$ac_link\"") >&5
+if { (eval echo "$as_me:18780: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:18730: \$? = $ac_status" >&5
+  echo "$as_me:18783: \$? = $ac_status" >&5

   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'

-  { (eval echo "$as_me:18733: \"$ac_try\"") >&5
+  { (eval echo "$as_me:18786: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:18736: \$? = $ac_status" >&5
+  echo "$as_me:18789: \$? = $ac_status" >&5

   (exit "$ac_status"); }; }; then
   ac_cv_lib_x_opendir=yes
 else
   (exit "$ac_status"); }; }; then
   ac_cv_lib_x_opendir=yes
 else


@@ -18744,7 +18797,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi

-echo "$as_me:18747: result: $ac_cv_lib_x_opendir" >&5
+echo "$as_me:18800: 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"
 echo "${ECHO_T}$ac_cv_lib_x_opendir" >&6
 if test "$ac_cv_lib_x_opendir" = yes; then
   LIBS="$LIBS -lx"


@@ -18752,13 +18805,13 @@ fi
 
 fi
 
 
 fi
 

-echo "$as_me:18755: checking whether time.h and sys/time.h may both be included" >&5
+echo "$as_me:18808: 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
 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 18761 "configure"
+#line 18814 "configure"

 #include "confdefs.h"
 #include <sys/types.h>
 #include <sys/time.h>
 #include "confdefs.h"
 #include <sys/types.h>
 #include <sys/time.h>


@@ -18774,16 +18827,16 @@ return 0;
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
 }
 _ACEOF
 rm -f "conftest.$ac_objext"

-if { (eval echo "$as_me:18777: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:18830: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:18780: \$? = $ac_status" >&5
+  echo "$as_me:18833: \$? = $ac_status" >&5

   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'

-  { (eval echo "$as_me:18783: \"$ac_try\"") >&5
+  { (eval echo "$as_me:18836: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:18786: \$? = $ac_status" >&5
+  echo "$as_me:18839: \$? = $ac_status" >&5

   (exit "$ac_status"); }; }; then
   ac_cv_header_time=yes
 else
   (exit "$ac_status"); }; }; then
   ac_cv_header_time=yes
 else


@@ -18793,7 +18846,7 @@ ac_cv_header_time=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi

-echo "$as_me:18796: result: $ac_cv_header_time" >&5
+echo "$as_me:18849: result: $ac_cv_header_time" >&5

 echo "${ECHO_T}$ac_cv_header_time" >&6
 if test $ac_cv_header_time = yes; then
 
 echo "${ECHO_T}$ac_cv_header_time" >&6
 if test $ac_cv_header_time = yes; then
 


@@ -18808,7 +18861,7 @@ cf_regex_libs=
 case "$host_os" in
 (mingw*)
        # -lsystre -ltre -lintl -liconv
 case "$host_os" in
 (mingw*)
        # -lsystre -ltre -lintl -liconv

-       echo "$as_me:18811: checking for regcomp in -lsystre" >&5
+       echo "$as_me:18864: checking for regcomp in -lsystre" >&5

 echo $ECHO_N "checking for regcomp in -lsystre... $ECHO_C" >&6
 if test "${ac_cv_lib_systre_regcomp+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 echo $ECHO_N "checking for regcomp in -lsystre... $ECHO_C" >&6
 if test "${ac_cv_lib_systre_regcomp+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6


@@ -18816,7 +18869,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lsystre  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lsystre  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF

-#line 18819 "configure"
+#line 18872 "configure"

 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */


@@ -18835,16 +18888,16 @@ regcomp ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"

-if { (eval echo "$as_me:18838: \"$ac_link\"") >&5
+if { (eval echo "$as_me:18891: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:18841: \$? = $ac_status" >&5
+  echo "$as_me:18894: \$? = $ac_status" >&5

   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'

-  { (eval echo "$as_me:18844: \"$ac_try\"") >&5
+  { (eval echo "$as_me:18897: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:18847: \$? = $ac_status" >&5
+  echo "$as_me:18900: \$? = $ac_status" >&5

   (exit "$ac_status"); }; }; then
   ac_cv_lib_systre_regcomp=yes
 else
   (exit "$ac_status"); }; }; then
   ac_cv_lib_systre_regcomp=yes
 else


@@ -18855,11 +18908,11 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi

-echo "$as_me:18858: result: $ac_cv_lib_systre_regcomp" >&5
+echo "$as_me:18911: result: $ac_cv_lib_systre_regcomp" >&5

 echo "${ECHO_T}$ac_cv_lib_systre_regcomp" >&6
 if test "$ac_cv_lib_systre_regcomp" = yes; then
 
 echo "${ECHO_T}$ac_cv_lib_systre_regcomp" >&6
 if test "$ac_cv_lib_systre_regcomp" = yes; then
 

-               echo "$as_me:18862: checking for libiconv_open in -liconv" >&5
+               echo "$as_me:18915: checking for libiconv_open in -liconv" >&5

 echo $ECHO_N "checking for libiconv_open in -liconv... $ECHO_C" >&6
 if test "${ac_cv_lib_iconv_libiconv_open+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 echo $ECHO_N "checking for libiconv_open in -liconv... $ECHO_C" >&6
 if test "${ac_cv_lib_iconv_libiconv_open+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6


@@ -18867,7 +18920,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-liconv  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-liconv  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF

-#line 18870 "configure"
+#line 18923 "configure"

 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */


@@ -18886,16 +18939,16 @@ libiconv_open ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"

-if { (eval echo "$as_me:18889: \"$ac_link\"") >&5
+if { (eval echo "$as_me:18942: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:18892: \$? = $ac_status" >&5
+  echo "$as_me:18945: \$? = $ac_status" >&5

   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'

-  { (eval echo "$as_me:18895: \"$ac_try\"") >&5
+  { (eval echo "$as_me:18948: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:18898: \$? = $ac_status" >&5
+  echo "$as_me:18951: \$? = $ac_status" >&5

   (exit "$ac_status"); }; }; then
   ac_cv_lib_iconv_libiconv_open=yes
 else
   (exit "$ac_status"); }; }; then
   ac_cv_lib_iconv_libiconv_open=yes
 else


@@ -18906,7 +18959,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi

-echo "$as_me:18909: result: $ac_cv_lib_iconv_libiconv_open" >&5
+echo "$as_me:18962: result: $ac_cv_lib_iconv_libiconv_open" >&5

 echo "${ECHO_T}$ac_cv_lib_iconv_libiconv_open" >&6
 if test "$ac_cv_lib_iconv_libiconv_open" = yes; then
 
 echo "${ECHO_T}$ac_cv_lib_iconv_libiconv_open" >&6
 if test "$ac_cv_lib_iconv_libiconv_open" = yes; then
 


@@ -18928,7 +18981,7 @@ LIBS="$cf_add_libs"
 
 fi
 
 
 fi
 

-               echo "$as_me:18931: checking for libintl_gettext in -lintl" >&5
+               echo "$as_me:18984: checking for libintl_gettext in -lintl" >&5

 echo $ECHO_N "checking for libintl_gettext in -lintl... $ECHO_C" >&6
 if test "${ac_cv_lib_intl_libintl_gettext+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 echo $ECHO_N "checking for libintl_gettext in -lintl... $ECHO_C" >&6
 if test "${ac_cv_lib_intl_libintl_gettext+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6


@@ -18936,7 +18989,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lintl  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lintl  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF

-#line 18939 "configure"
+#line 18992 "configure"

 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */


@@ -18955,16 +19008,16 @@ libintl_gettext ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"

-if { (eval echo "$as_me:18958: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19011: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:18961: \$? = $ac_status" >&5
+  echo "$as_me:19014: \$? = $ac_status" >&5

   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'

-  { (eval echo "$as_me:18964: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19017: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:18967: \$? = $ac_status" >&5
+  echo "$as_me:19020: \$? = $ac_status" >&5

   (exit "$ac_status"); }; }; then
   ac_cv_lib_intl_libintl_gettext=yes
 else
   (exit "$ac_status"); }; }; then
   ac_cv_lib_intl_libintl_gettext=yes
 else


@@ -18975,7 +19028,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi

-echo "$as_me:18978: result: $ac_cv_lib_intl_libintl_gettext" >&5
+echo "$as_me:19031: result: $ac_cv_lib_intl_libintl_gettext" >&5

 echo "${ECHO_T}$ac_cv_lib_intl_libintl_gettext" >&6
 if test "$ac_cv_lib_intl_libintl_gettext" = yes; then
 
 echo "${ECHO_T}$ac_cv_lib_intl_libintl_gettext" >&6
 if test "$ac_cv_lib_intl_libintl_gettext" = yes; then
 


@@ -18997,7 +19050,7 @@ LIBS="$cf_add_libs"
 
 fi
 
 
 fi
 

-               echo "$as_me:19000: checking for tre_regcomp in -ltre" >&5
+               echo "$as_me:19053: checking for tre_regcomp in -ltre" >&5

 echo $ECHO_N "checking for tre_regcomp in -ltre... $ECHO_C" >&6
 if test "${ac_cv_lib_tre_tre_regcomp+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 echo $ECHO_N "checking for tre_regcomp in -ltre... $ECHO_C" >&6
 if test "${ac_cv_lib_tre_tre_regcomp+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6


@@ -19005,7 +19058,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ltre  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ltre  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF

-#line 19008 "configure"
+#line 19061 "configure"

 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */


@@ -19024,16 +19077,16 @@ tre_regcomp ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"

-if { (eval echo "$as_me:19027: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19080: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:19030: \$? = $ac_status" >&5
+  echo "$as_me:19083: \$? = $ac_status" >&5

   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'

-  { (eval echo "$as_me:19033: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19086: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:19036: \$? = $ac_status" >&5
+  echo "$as_me:19089: \$? = $ac_status" >&5

   (exit "$ac_status"); }; }; then
   ac_cv_lib_tre_tre_regcomp=yes
 else
   (exit "$ac_status"); }; }; then
   ac_cv_lib_tre_tre_regcomp=yes
 else


@@ -19044,7 +19097,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi

-echo "$as_me:19047: result: $ac_cv_lib_tre_tre_regcomp" >&5
+echo "$as_me:19100: result: $ac_cv_lib_tre_tre_regcomp" >&5

 echo "${ECHO_T}$ac_cv_lib_tre_tre_regcomp" >&6
 if test "$ac_cv_lib_tre_tre_regcomp" = yes; then
 
 echo "${ECHO_T}$ac_cv_lib_tre_tre_regcomp" >&6
 if test "$ac_cv_lib_tre_tre_regcomp" = yes; then
 


@@ -19086,7 +19139,7 @@ LIBS="$cf_add_libs"
 
 else
 
 
 else
 

-               echo "$as_me:19089: checking for regcomp in -lgnurx" >&5
+               echo "$as_me:19142: checking for regcomp in -lgnurx" >&5

 echo $ECHO_N "checking for regcomp in -lgnurx... $ECHO_C" >&6
 if test "${ac_cv_lib_gnurx_regcomp+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 echo $ECHO_N "checking for regcomp in -lgnurx... $ECHO_C" >&6
 if test "${ac_cv_lib_gnurx_regcomp+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6


@@ -19094,7 +19147,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lgnurx  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lgnurx  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF

-#line 19097 "configure"
+#line 19150 "configure"

 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */


@@ -19113,16 +19166,16 @@ regcomp ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"

-if { (eval echo "$as_me:19116: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19169: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:19119: \$? = $ac_status" >&5
+  echo "$as_me:19172: \$? = $ac_status" >&5

   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'

-  { (eval echo "$as_me:19122: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19175: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:19125: \$? = $ac_status" >&5
+  echo "$as_me:19178: \$? = $ac_status" >&5

   (exit "$ac_status"); }; }; then
   ac_cv_lib_gnurx_regcomp=yes
 else
   (exit "$ac_status"); }; }; then
   ac_cv_lib_gnurx_regcomp=yes
 else


@@ -19133,7 +19186,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi

-echo "$as_me:19136: result: $ac_cv_lib_gnurx_regcomp" >&5
+echo "$as_me:19189: result: $ac_cv_lib_gnurx_regcomp" >&5

 echo "${ECHO_T}$ac_cv_lib_gnurx_regcomp" >&6
 if test "$ac_cv_lib_gnurx_regcomp" = yes; then
 
 echo "${ECHO_T}$ac_cv_lib_gnurx_regcomp" >&6
 if test "$ac_cv_lib_gnurx_regcomp" = yes; then
 


@@ -19161,13 +19214,13 @@ fi
        ;;
 (*)
        cf_regex_libs="regex re"
        ;;
 (*)
        cf_regex_libs="regex re"

-       echo "$as_me:19164: checking for regcomp" >&5
+       echo "$as_me:19217: 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
 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 19170 "configure"
+#line 19223 "configure"

 #include "confdefs.h"
 #define regcomp autoconf_temporary
 #include <limits.h>    /* least-intrusive standard header which defines gcc2 __stub macros */
 #include "confdefs.h"
 #define regcomp autoconf_temporary
 #include <limits.h>    /* least-intrusive standard header which defines gcc2 __stub macros */


@@ -19198,16 +19251,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"

-if { (eval echo "$as_me:19201: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19254: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:19204: \$? = $ac_status" >&5
+  echo "$as_me:19257: \$? = $ac_status" >&5

   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'

-  { (eval echo "$as_me:19207: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19260: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:19210: \$? = $ac_status" >&5
+  echo "$as_me:19263: \$? = $ac_status" >&5

   (exit "$ac_status"); }; }; then
   ac_cv_func_regcomp=yes
 else
   (exit "$ac_status"); }; }; then
   ac_cv_func_regcomp=yes
 else


@@ -19217,7 +19270,7 @@ ac_cv_func_regcomp=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi

-echo "$as_me:19220: result: $ac_cv_func_regcomp" >&5
+echo "$as_me:19273: 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
 echo "${ECHO_T}$ac_cv_func_regcomp" >&6
 if test "$ac_cv_func_regcomp" = yes; then
   cf_regex_func=regcomp


@@ -19226,7 +19279,7 @@ else
                for cf_regex_lib in $cf_regex_libs
                do
                        as_ac_Lib=`echo "ac_cv_lib_$cf_regex_lib''_regcomp" | $as_tr_sh`
                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:19229: checking for regcomp in -l$cf_regex_lib" >&5
+echo "$as_me:19282: 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
 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


@@ -19234,7 +19287,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-l$cf_regex_lib  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-l$cf_regex_lib  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF

-#line 19237 "configure"
+#line 19290 "configure"

 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */


@@ -19253,16 +19306,16 @@ regcomp ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"

-if { (eval echo "$as_me:19256: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19309: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:19259: \$? = $ac_status" >&5
+  echo "$as_me:19312: \$? = $ac_status" >&5

   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'

-  { (eval echo "$as_me:19262: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19315: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:19265: \$? = $ac_status" >&5
+  echo "$as_me:19318: \$? = $ac_status" >&5

   (exit "$ac_status"); }; }; then
   eval "$as_ac_Lib=yes"
 else
   (exit "$ac_status"); }; }; then
   eval "$as_ac_Lib=yes"
 else


@@ -19273,7 +19326,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi

-echo "$as_me:19276: result: `eval echo '${'"$as_ac_Lib"'}'`" >&5
+echo "$as_me:19329: result: `eval echo '${'"$as_ac_Lib"'}'`" >&5

 echo "${ECHO_T}`eval echo '${'"$as_ac_Lib"'}'`" >&6
 if test "`eval echo '${'"$as_ac_Lib"'}'`" = yes; then
 
 echo "${ECHO_T}`eval echo '${'"$as_ac_Lib"'}'`" >&6
 if test "`eval echo '${'"$as_ac_Lib"'}'`" = yes; then
 


@@ -19305,13 +19358,13 @@ fi
 esac
 
 if test "$cf_regex_func" = no ; then
 esac
 
 if test "$cf_regex_func" = no ; then

-       echo "$as_me:19308: checking for compile" >&5
+       echo "$as_me:19361: 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
 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 19314 "configure"
+#line 19367 "configure"

 #include "confdefs.h"
 #define compile autoconf_temporary
 #include <limits.h>    /* least-intrusive standard header which defines gcc2 __stub macros */
 #include "confdefs.h"
 #define compile autoconf_temporary
 #include <limits.h>    /* least-intrusive standard header which defines gcc2 __stub macros */


@@ -19342,16 +19395,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"

-if { (eval echo "$as_me:19345: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19398: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:19348: \$? = $ac_status" >&5
+  echo "$as_me:19401: \$? = $ac_status" >&5

   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'

-  { (eval echo "$as_me:19351: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19404: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:19354: \$? = $ac_status" >&5
+  echo "$as_me:19407: \$? = $ac_status" >&5

   (exit "$ac_status"); }; }; then
   ac_cv_func_compile=yes
 else
   (exit "$ac_status"); }; }; then
   ac_cv_func_compile=yes
 else


@@ -19361,13 +19414,13 @@ ac_cv_func_compile=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi

-echo "$as_me:19364: result: $ac_cv_func_compile" >&5
+echo "$as_me:19417: 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 "${ECHO_T}$ac_cv_func_compile" >&6
 if test "$ac_cv_func_compile" = yes; then
   cf_regex_func=compile
 else
 

-               echo "$as_me:19370: checking for compile in -lgen" >&5
+               echo "$as_me:19423: 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
 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


@@ -19375,7 +19428,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lgen  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lgen  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF

-#line 19378 "configure"
+#line 19431 "configure"

 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */


@@ -19394,16 +19447,16 @@ compile ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"

-if { (eval echo "$as_me:19397: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19450: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:19400: \$? = $ac_status" >&5
+  echo "$as_me:19453: \$? = $ac_status" >&5

   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'

-  { (eval echo "$as_me:19403: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19456: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:19406: \$? = $ac_status" >&5
+  echo "$as_me:19459: \$? = $ac_status" >&5

   (exit "$ac_status"); }; }; then
   ac_cv_lib_gen_compile=yes
 else
   (exit "$ac_status"); }; }; then
   ac_cv_lib_gen_compile=yes
 else


@@ -19414,7 +19467,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi

-echo "$as_me:19417: result: $ac_cv_lib_gen_compile" >&5
+echo "$as_me:19470: 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
 
 echo "${ECHO_T}$ac_cv_lib_gen_compile" >&6
 if test "$ac_cv_lib_gen_compile" = yes; then
 


@@ -19442,11 +19495,11 @@ fi
 fi
 
 if test "$cf_regex_func" = no ; then
 fi
 
 if test "$cf_regex_func" = no ; then

-       { echo "$as_me:19445: WARNING: cannot find regular expression library" >&5
+       { echo "$as_me:19498: WARNING: cannot find regular expression library" >&5

 echo "$as_me: WARNING: cannot find regular expression library" >&2;}
 fi
 
 echo "$as_me: WARNING: cannot find regular expression library" >&2;}
 fi
 

-echo "$as_me:19449: checking for regular-expression headers" >&5
+echo "$as_me:19502: 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
 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


@@ -19458,7 +19511,7 @@ case "$cf_regex_func" in
        for cf_regex_hdr in regexp.h regexpr.h
        do
                cat >"conftest.$ac_ext" <<_ACEOF
        for cf_regex_hdr in regexp.h regexpr.h
        do
                cat >"conftest.$ac_ext" <<_ACEOF

-#line 19461 "configure"
+#line 19514 "configure"

 #include "confdefs.h"
 #include <$cf_regex_hdr>
 int
 #include "confdefs.h"
 #include <$cf_regex_hdr>
 int


@@ -19475,16 +19528,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"

-if { (eval echo "$as_me:19478: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19531: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:19481: \$? = $ac_status" >&5
+  echo "$as_me:19534: \$? = $ac_status" >&5

   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'

-  { (eval echo "$as_me:19484: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19537: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:19487: \$? = $ac_status" >&5
+  echo "$as_me:19540: \$? = $ac_status" >&5

   (exit "$ac_status"); }; }; then
 
                        cf_cv_regex_hdrs=$cf_regex_hdr
   (exit "$ac_status"); }; }; then
 
                        cf_cv_regex_hdrs=$cf_regex_hdr


@@ -19501,7 +19554,7 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
        for cf_regex_hdr in regex.h
        do
                cat >"conftest.$ac_ext" <<_ACEOF
        for cf_regex_hdr in regex.h
        do
                cat >"conftest.$ac_ext" <<_ACEOF

-#line 19504 "configure"
+#line 19557 "configure"

 #include "confdefs.h"
 #include <sys/types.h>
 #include <$cf_regex_hdr>
 #include "confdefs.h"
 #include <sys/types.h>
 #include <$cf_regex_hdr>


@@ -19521,16 +19574,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"

-if { (eval echo "$as_me:19524: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19577: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:19527: \$? = $ac_status" >&5
+  echo "$as_me:19580: \$? = $ac_status" >&5

   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'

-  { (eval echo "$as_me:19530: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19583: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:19533: \$? = $ac_status" >&5
+  echo "$as_me:19586: \$? = $ac_status" >&5

   (exit "$ac_status"); }; }; then
 
                        cf_cv_regex_hdrs=$cf_regex_hdr
   (exit "$ac_status"); }; }; then
 
                        cf_cv_regex_hdrs=$cf_regex_hdr


@@ -19546,11 +19599,11 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 esac
 
 fi
 esac
 
 fi

-echo "$as_me:19549: result: $cf_cv_regex_hdrs" >&5
+echo "$as_me:19602: result: $cf_cv_regex_hdrs" >&5

 echo "${ECHO_T}$cf_cv_regex_hdrs" >&6
 
 case "$cf_cv_regex_hdrs" in
 echo "${ECHO_T}$cf_cv_regex_hdrs" >&6
 
 case "$cf_cv_regex_hdrs" in

-       (no)            { echo "$as_me:19553: WARNING: no regular expression header found" >&5
+       (no)            { echo "$as_me:19606: WARNING: no regular expression header found" >&5

 echo "$as_me: WARNING: no regular expression header found" >&2;} ;;
        (regex.h)
 cat >>confdefs.h <<\EOF
 echo "$as_me: WARNING: no regular expression header found" >&2;} ;;
        (regex.h)
 cat >>confdefs.h <<\EOF


@@ -19588,23 +19641,23 @@ wctype.h \
 
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
 
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`

-echo "$as_me:19591: checking for $ac_header" >&5
+echo "$as_me:19644: 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
 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 19597 "configure"
+#line 19650 "configure"

 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF

-if { (eval echo "$as_me:19601: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:19654: \"$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
   (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:19607: \$? = $ac_status" >&5
+  echo "$as_me:19660: \$? = $ac_status" >&5

   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag


@@ -19623,7 +19676,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi

-echo "$as_me:19626: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:19679: 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
 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6
 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then
   cat >>confdefs.h <<EOF


@@ -19636,23 +19689,23 @@ done
 for ac_header in unistd.h getopt.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
 for ac_header in unistd.h getopt.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`

-echo "$as_me:19639: checking for $ac_header" >&5
+echo "$as_me:19692: 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
 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 19645 "configure"
+#line 19698 "configure"

 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF

-if { (eval echo "$as_me:19649: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:19702: \"$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
   (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:19655: \$? = $ac_status" >&5
+  echo "$as_me:19708: \$? = $ac_status" >&5

   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag


@@ -19671,7 +19724,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi

-echo "$as_me:19674: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:19727: 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
 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6
 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then
   cat >>confdefs.h <<EOF


@@ -19681,7 +19734,7 @@ EOF
 fi
 done
 
 fi
 done
 

-echo "$as_me:19684: checking for header declaring getopt variables" >&5
+echo "$as_me:19737: 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
 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


@@ -19691,7 +19744,7 @@ cf_cv_getopt_header=none
 for cf_header in stdio.h stdlib.h unistd.h getopt.h
 do
 cat >"conftest.$ac_ext" <<_ACEOF
 for cf_header in stdio.h stdlib.h unistd.h getopt.h
 do
 cat >"conftest.$ac_ext" <<_ACEOF

-#line 19694 "configure"
+#line 19747 "configure"

 #include "confdefs.h"
 
 #include <$cf_header>
 #include "confdefs.h"
 
 #include <$cf_header>


@@ -19704,16 +19757,16 @@ int x = optind; char *y = optarg
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
 }
 _ACEOF
 rm -f "conftest.$ac_objext"

-if { (eval echo "$as_me:19707: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:19760: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:19710: \$? = $ac_status" >&5
+  echo "$as_me:19763: \$? = $ac_status" >&5

   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'

-  { (eval echo "$as_me:19713: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19766: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:19716: \$? = $ac_status" >&5
+  echo "$as_me:19769: \$? = $ac_status" >&5

   (exit "$ac_status"); }; }; then
   cf_cv_getopt_header=$cf_header
  break
   (exit "$ac_status"); }; }; then
   cf_cv_getopt_header=$cf_header
  break


@@ -19725,7 +19778,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 done
 
 fi
 done
 
 fi

-echo "$as_me:19728: result: $cf_cv_getopt_header" >&5
+echo "$as_me:19781: result: $cf_cv_getopt_header" >&5

 echo "${ECHO_T}$cf_cv_getopt_header" >&6
 if test "$cf_cv_getopt_header" != none ; then
 
 echo "${ECHO_T}$cf_cv_getopt_header" >&6
 if test "$cf_cv_getopt_header" != none ; then
 


@@ -19742,14 +19795,14 @@ EOF
 
 fi
 
 
 fi
 

-echo "$as_me:19745: checking if external environ is declared" >&5
+echo "$as_me:19798: checking if external environ is declared" >&5

 echo $ECHO_N "checking if external environ is declared... $ECHO_C" >&6
 if test "${cf_cv_dcl_environ+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
     cat >"conftest.$ac_ext" <<_ACEOF
 echo $ECHO_N "checking if external environ is declared... $ECHO_C" >&6
 if test "${cf_cv_dcl_environ+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
     cat >"conftest.$ac_ext" <<_ACEOF

-#line 19752 "configure"
+#line 19805 "configure"

 #include "confdefs.h"
 
 #ifdef HAVE_STDLIB_H
 #include "confdefs.h"
 
 #ifdef HAVE_STDLIB_H


@@ -19765,16 +19818,16 @@ int x = (int) environ
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
 }
 _ACEOF
 rm -f "conftest.$ac_objext"

-if { (eval echo "$as_me:19768: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:19821: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:19771: \$? = $ac_status" >&5
+  echo "$as_me:19824: \$? = $ac_status" >&5

   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'

-  { (eval echo "$as_me:19774: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19827: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:19777: \$? = $ac_status" >&5
+  echo "$as_me:19830: \$? = $ac_status" >&5

   (exit "$ac_status"); }; }; then
   cf_cv_dcl_environ=yes
 else
   (exit "$ac_status"); }; }; then
   cf_cv_dcl_environ=yes
 else


@@ -19785,7 +19838,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi

-echo "$as_me:19788: result: $cf_cv_dcl_environ" >&5
+echo "$as_me:19841: result: $cf_cv_dcl_environ" >&5

 echo "${ECHO_T}$cf_cv_dcl_environ" >&6
 
 if test "$cf_cv_dcl_environ" = no ; then
 echo "${ECHO_T}$cf_cv_dcl_environ" >&6
 
 if test "$cf_cv_dcl_environ" = no ; then


@@ -19800,14 +19853,14 @@ fi
 
 # It's possible (for near-UNIX clones) that the data doesn't exist
 
 
 # It's possible (for near-UNIX clones) that the data doesn't exist
 

-echo "$as_me:19803: checking if external environ exists" >&5
+echo "$as_me:19856: checking if external environ exists" >&5

 echo $ECHO_N "checking if external environ exists... $ECHO_C" >&6
 if test "${cf_cv_have_environ+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
        cat >"conftest.$ac_ext" <<_ACEOF
 echo $ECHO_N "checking if external environ exists... $ECHO_C" >&6
 if test "${cf_cv_have_environ+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
        cat >"conftest.$ac_ext" <<_ACEOF

-#line 19810 "configure"
+#line 19863 "configure"

 #include "confdefs.h"
 
 #undef environ
 #include "confdefs.h"
 
 #undef environ


@@ -19822,16 +19875,16 @@ environ = 2
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"

-if { (eval echo "$as_me:19825: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19878: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:19828: \$? = $ac_status" >&5
+  echo "$as_me:19881: \$? = $ac_status" >&5

   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'

-  { (eval echo "$as_me:19831: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19884: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:19834: \$? = $ac_status" >&5
+  echo "$as_me:19887: \$? = $ac_status" >&5

   (exit "$ac_status"); }; }; then
   cf_cv_have_environ=yes
 else
   (exit "$ac_status"); }; }; then
   cf_cv_have_environ=yes
 else


@@ -19842,7 +19895,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 
 fi

-echo "$as_me:19845: result: $cf_cv_have_environ" >&5
+echo "$as_me:19898: result: $cf_cv_have_environ" >&5

 echo "${ECHO_T}$cf_cv_have_environ" >&6
 
 if test "$cf_cv_have_environ" = yes ; then
 echo "${ECHO_T}$cf_cv_have_environ" >&6
 
 if test "$cf_cv_have_environ" = yes ; then


@@ -19855,13 +19908,13 @@ EOF
 
 fi
 
 
 fi
 

-echo "$as_me:19858: checking for getenv" >&5
+echo "$as_me:19911: checking for getenv" >&5

 echo $ECHO_N "checking for getenv... $ECHO_C" >&6
 if test "${ac_cv_func_getenv+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >"conftest.$ac_ext" <<_ACEOF
 echo $ECHO_N "checking for getenv... $ECHO_C" >&6
 if test "${ac_cv_func_getenv+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >"conftest.$ac_ext" <<_ACEOF

-#line 19864 "configure"
+#line 19917 "configure"

 #include "confdefs.h"
 #define getenv autoconf_temporary
 #include <limits.h>    /* least-intrusive standard header which defines gcc2 __stub macros */
 #include "confdefs.h"
 #define getenv autoconf_temporary
 #include <limits.h>    /* least-intrusive standard header which defines gcc2 __stub macros */


@@ -19892,16 +19945,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"

-if { (eval echo "$as_me:19895: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19948: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:19898: \$? = $ac_status" >&5
+  echo "$as_me:19951: \$? = $ac_status" >&5

   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'

-  { (eval echo "$as_me:19901: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19954: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:19904: \$? = $ac_status" >&5
+  echo "$as_me:19957: \$? = $ac_status" >&5

   (exit "$ac_status"); }; }; then
   ac_cv_func_getenv=yes
 else
   (exit "$ac_status"); }; }; then
   ac_cv_func_getenv=yes
 else


@@ -19911,19 +19964,19 @@ ac_cv_func_getenv=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi

-echo "$as_me:19914: result: $ac_cv_func_getenv" >&5
+echo "$as_me:19967: result: $ac_cv_func_getenv" >&5

 echo "${ECHO_T}$ac_cv_func_getenv" >&6
 
 for ac_func in putenv setenv strdup
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
 echo "${ECHO_T}$ac_cv_func_getenv" >&6
 
 for ac_func in putenv setenv strdup
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`

-echo "$as_me:19920: checking for $ac_func" >&5
+echo "$as_me:19973: 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
 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 19926 "configure"
+#line 19979 "configure"

 #include "confdefs.h"
 #define $ac_func autoconf_temporary
 #include <limits.h>    /* least-intrusive standard header which defines gcc2 __stub macros */
 #include "confdefs.h"
 #define $ac_func autoconf_temporary
 #include <limits.h>    /* least-intrusive standard header which defines gcc2 __stub macros */


@@ -19954,16 +20007,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"

-if { (eval echo "$as_me:19957: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20010: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:19960: \$? = $ac_status" >&5
+  echo "$as_me:20013: \$? = $ac_status" >&5

   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'

-  { (eval echo "$as_me:19963: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20016: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:19966: \$? = $ac_status" >&5
+  echo "$as_me:20019: \$? = $ac_status" >&5

   (exit "$ac_status"); }; }; then
   eval "$as_ac_var=yes"
 else
   (exit "$ac_status"); }; }; then
   eval "$as_ac_var=yes"
 else


@@ -19973,7 +20026,7 @@ eval "$as_ac_var=no"
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi

-echo "$as_me:19976: result: `eval echo '${'"$as_ac_var"'}'`" >&5
+echo "$as_me:20029: 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
 echo "${ECHO_T}`eval echo '${'"$as_ac_var"'}'`" >&6
 if test "`eval echo '${'"$as_ac_var"'}'`" = yes; then
   cat >>confdefs.h <<EOF


@@ -19983,7 +20036,7 @@ EOF
 fi
 done
 
 fi
 done
 

-echo "$as_me:19986: checking if getenv returns consistent values" >&5
+echo "$as_me:20039: checking if getenv returns consistent values" >&5

 echo $ECHO_N "checking if getenv returns consistent values... $ECHO_C" >&6
 if test "${cf_cv_consistent_getenv+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 echo $ECHO_N "checking if getenv returns consistent values... $ECHO_C" >&6
 if test "${cf_cv_consistent_getenv+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6


@@ -19993,7 +20046,7 @@ if test "$cross_compiling" = yes; then
   cf_cv_consistent_getenv=unknown
 else
   cat >"conftest.$ac_ext" <<_ACEOF
   cf_cv_consistent_getenv=unknown
 else
   cat >"conftest.$ac_ext" <<_ACEOF

-#line 19996 "configure"
+#line 20049 "configure"

 #include "confdefs.h"
 
 #include <stdlib.h>
 #include "confdefs.h"
 
 #include <stdlib.h>


@@ -20102,15 +20155,15 @@ int main(void)
 
 _ACEOF
 rm -f "conftest$ac_exeext"
 
 _ACEOF
 rm -f "conftest$ac_exeext"

-if { (eval echo "$as_me:20105: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20158: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:20108: \$? = $ac_status" >&5
+  echo "$as_me:20161: \$? = $ac_status" >&5

   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'

-  { (eval echo "$as_me:20110: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20163: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:20113: \$? = $ac_status" >&5
+  echo "$as_me:20166: \$? = $ac_status" >&5

   (exit "$ac_status"); }; }; then
   cf_cv_consistent_getenv=yes
 else
   (exit "$ac_status"); }; }; then
   cf_cv_consistent_getenv=yes
 else


@@ -20123,7 +20176,7 @@ rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftes
 fi
 
 fi
 fi
 
 fi

-echo "$as_me:20126: result: $cf_cv_consistent_getenv" >&5
+echo "$as_me:20179: result: $cf_cv_consistent_getenv" >&5

 echo "${ECHO_T}$cf_cv_consistent_getenv" >&6
 
 if test "x$cf_cv_consistent_getenv" = xno
 echo "${ECHO_T}$cf_cv_consistent_getenv" >&6
 
 if test "x$cf_cv_consistent_getenv" = xno


@@ -20138,18 +20191,18 @@ fi
 if test "x$cf_cv_consistent_getenv" = xno && \
        test "x$cf_with_trace" = xyes
 then
 if test "x$cf_cv_consistent_getenv" = xno && \
        test "x$cf_with_trace" = xyes
 then

-       { echo "$as_me:20141: WARNING: The NCURSES_TRACE environment variable is not supported with this configuration" >&5
+       { echo "$as_me:20194: WARNING: The NCURSES_TRACE environment variable is not supported with this configuration" >&5

 echo "$as_me: WARNING: The NCURSES_TRACE environment variable is not supported with this configuration" >&2;}
 fi
 
 echo "$as_me: WARNING: The NCURSES_TRACE environment variable is not supported with this configuration" >&2;}
 fi
 

-echo "$as_me:20145: checking if sys/time.h works with sys/select.h" >&5
+echo "$as_me:20198: 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
 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 20152 "configure"
+#line 20205 "configure"

 #include "confdefs.h"
 
 #include <sys/types.h>
 #include "confdefs.h"
 
 #include <sys/types.h>


@@ -20169,16 +20222,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
 }
 _ACEOF
 rm -f "conftest.$ac_objext"

-if { (eval echo "$as_me:20172: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:20225: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:20175: \$? = $ac_status" >&5
+  echo "$as_me:20228: \$? = $ac_status" >&5

   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'

-  { (eval echo "$as_me:20178: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20231: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:20181: \$? = $ac_status" >&5
+  echo "$as_me:20234: \$? = $ac_status" >&5

   (exit "$ac_status"); }; }; then
   cf_cv_sys_time_select=yes
 else
   (exit "$ac_status"); }; }; then
   cf_cv_sys_time_select=yes
 else


@@ -20190,7 +20243,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
 
 
 fi
 

-echo "$as_me:20193: result: $cf_cv_sys_time_select" >&5
+echo "$as_me:20246: 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
 echo "${ECHO_T}$cf_cv_sys_time_select" >&6
 test "$cf_cv_sys_time_select" = yes &&
 cat >>confdefs.h <<\EOF


@@ -20205,13 +20258,13 @@ ac_link='$CC -o "conftest$ac_exeext" $CFLAGS $CPPFLAGS $LDFLAGS "conftest.$ac_ex
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 ac_main_return="return"
 
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 ac_main_return="return"
 

-echo "$as_me:20208: checking for an ANSI C-conforming const" >&5
+echo "$as_me:20261: 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
 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 20214 "configure"
+#line 20267 "configure"

 #include "confdefs.h"
 
 int
 #include "confdefs.h"
 
 int


@@ -20269,16 +20322,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
 }
 _ACEOF
 rm -f "conftest.$ac_objext"

-if { (eval echo "$as_me:20272: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:20325: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:20275: \$? = $ac_status" >&5
+  echo "$as_me:20328: \$? = $ac_status" >&5

   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'

-  { (eval echo "$as_me:20278: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20331: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:20281: \$? = $ac_status" >&5
+  echo "$as_me:20334: \$? = $ac_status" >&5

   (exit "$ac_status"); }; }; then
   ac_cv_c_const=yes
 else
   (exit "$ac_status"); }; }; then
   ac_cv_c_const=yes
 else


@@ -20288,7 +20341,7 @@ ac_cv_c_const=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi

-echo "$as_me:20291: result: $ac_cv_c_const" >&5
+echo "$as_me:20344: result: $ac_cv_c_const" >&5

 echo "${ECHO_T}$ac_cv_c_const" >&6
 if test $ac_cv_c_const = no; then
 
 echo "${ECHO_T}$ac_cv_c_const" >&6
 if test $ac_cv_c_const = no; then
 


@@ -20298,7 +20351,7 @@ EOF
 
 fi
 
 
 fi
 

-echo "$as_me:20301: checking for inline" >&5
+echo "$as_me:20354: 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
 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


@@ -20306,7 +20359,7 @@ else
   ac_cv_c_inline=no
 for ac_kw in inline __inline__ __inline; do
   cat >"conftest.$ac_ext" <<_ACEOF
   ac_cv_c_inline=no
 for ac_kw in inline __inline__ __inline; do
   cat >"conftest.$ac_ext" <<_ACEOF

-#line 20309 "configure"
+#line 20362 "configure"

 #include "confdefs.h"
 #ifndef __cplusplus
 static $ac_kw int static_foo () {return 0; }
 #include "confdefs.h"
 #ifndef __cplusplus
 static $ac_kw int static_foo () {return 0; }


@@ -20315,16 +20368,16 @@ $ac_kw int foo () {return 0; }
 
 _ACEOF
 rm -f "conftest.$ac_objext"
 
 _ACEOF
 rm -f "conftest.$ac_objext"

-if { (eval echo "$as_me:20318: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:20371: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:20321: \$? = $ac_status" >&5
+  echo "$as_me:20374: \$? = $ac_status" >&5

   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'

-  { (eval echo "$as_me:20324: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20377: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:20327: \$? = $ac_status" >&5
+  echo "$as_me:20380: \$? = $ac_status" >&5

   (exit "$ac_status"); }; }; then
   ac_cv_c_inline=$ac_kw; break
 else
   (exit "$ac_status"); }; }; then
   ac_cv_c_inline=$ac_kw; break
 else


@@ -20335,7 +20388,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 done
 
 fi
 done
 
 fi

-echo "$as_me:20338: result: $ac_cv_c_inline" >&5
+echo "$as_me:20391: result: $ac_cv_c_inline" >&5

 echo "${ECHO_T}$ac_cv_c_inline" >&6
 case $ac_cv_c_inline in
   inline | yes) ;;
 echo "${ECHO_T}$ac_cv_c_inline" >&6
 case $ac_cv_c_inline in
   inline | yes) ;;


@@ -20361,7 +20414,7 @@ if test "$ac_cv_c_inline" != no ; then
                :
        elif test "$GCC" = yes
        then
                :
        elif test "$GCC" = yes
        then

-               echo "$as_me:20364: checking if $CC supports options to tune inlining" >&5
+               echo "$as_me:20417: 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
 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


@@ -20370,7 +20423,7 @@ else
                cf_save_CFLAGS=$CFLAGS
                CFLAGS="$CFLAGS --param max-inline-insns-single=1200"
                cat >"conftest.$ac_ext" <<_ACEOF
                cf_save_CFLAGS=$CFLAGS
                CFLAGS="$CFLAGS --param max-inline-insns-single=1200"
                cat >"conftest.$ac_ext" <<_ACEOF

-#line 20373 "configure"
+#line 20426 "configure"

 #include "confdefs.h"
 inline int foo(void) { return 1; }
 int
 #include "confdefs.h"
 inline int foo(void) { return 1; }
 int


@@ -20382,16 +20435,16 @@ ${cf_cv_main_return:-return} foo()
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
 }
 _ACEOF
 rm -f "conftest.$ac_objext"

-if { (eval echo "$as_me:20385: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:20438: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:20388: \$? = $ac_status" >&5
+  echo "$as_me:20441: \$? = $ac_status" >&5

   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'

-  { (eval echo "$as_me:20391: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20444: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:20394: \$? = $ac_status" >&5
+  echo "$as_me:20447: \$? = $ac_status" >&5

   (exit "$ac_status"); }; }; then
   cf_cv_gcc_inline=yes
 else
   (exit "$ac_status"); }; }; then
   cf_cv_gcc_inline=yes
 else


@@ -20403,7 +20456,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
                CFLAGS=$cf_save_CFLAGS
 
 fi
                CFLAGS=$cf_save_CFLAGS
 
 fi

-echo "$as_me:20406: result: $cf_cv_gcc_inline" >&5
+echo "$as_me:20459: result: $cf_cv_gcc_inline" >&5

 echo "${ECHO_T}$cf_cv_gcc_inline" >&6
                if test "$cf_cv_gcc_inline" = yes ; then
 
 echo "${ECHO_T}$cf_cv_gcc_inline" >&6
                if test "$cf_cv_gcc_inline" = yes ; then
 


@@ -20509,7 +20562,7 @@ fi
        fi
 fi
 
        fi
 fi
 

-echo "$as_me:20512: checking for signal global datatype" >&5
+echo "$as_me:20565: 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
 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


@@ -20521,7 +20574,7 @@ else
                "int"
        do
        cat >"conftest.$ac_ext" <<_ACEOF
                "int"
        do
        cat >"conftest.$ac_ext" <<_ACEOF

-#line 20524 "configure"
+#line 20577 "configure"

 #include "confdefs.h"
 
 #include <sys/types.h>
 #include "confdefs.h"
 
 #include <sys/types.h>


@@ -20545,16 +20598,16 @@ signal(SIGINT, handler);
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
 }
 _ACEOF
 rm -f "conftest.$ac_objext"

-if { (eval echo "$as_me:20548: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:20601: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:20551: \$? = $ac_status" >&5
+  echo "$as_me:20604: \$? = $ac_status" >&5

   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'

-  { (eval echo "$as_me:20554: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20607: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:20557: \$? = $ac_status" >&5
+  echo "$as_me:20610: \$? = $ac_status" >&5

   (exit "$ac_status"); }; }; then
   cf_cv_sig_atomic_t=$cf_type
 else
   (exit "$ac_status"); }; }; then
   cf_cv_sig_atomic_t=$cf_type
 else


@@ -20568,7 +20621,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
 
 
 fi
 

-echo "$as_me:20571: result: $cf_cv_sig_atomic_t" >&5
+echo "$as_me:20624: 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
 echo "${ECHO_T}$cf_cv_sig_atomic_t" >&6
 test "$cf_cv_sig_atomic_t" != no &&
 cat >>confdefs.h <<EOF


@@ -20577,7 +20630,7 @@ EOF
 
 if test "$NCURSES_CHTYPE" = auto ; then
 
 
 if test "$NCURSES_CHTYPE" = auto ; then
 

-echo "$as_me:20580: checking for type of chtype" >&5
+echo "$as_me:20633: 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
 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


@@ -20587,7 +20640,7 @@ else
   cf_cv_typeof_chtype=long
 else
   cat >"conftest.$ac_ext" <<_ACEOF
   cf_cv_typeof_chtype=long
 else
   cat >"conftest.$ac_ext" <<_ACEOF

-#line 20590 "configure"
+#line 20643 "configure"

 #include "confdefs.h"
 
 #define WANT_BITS 31
 #include "confdefs.h"
 
 #define WANT_BITS 31


@@ -20622,15 +20675,15 @@ int main(void)
 
 _ACEOF
 rm -f "conftest$ac_exeext"
 
 _ACEOF
 rm -f "conftest$ac_exeext"

-if { (eval echo "$as_me:20625: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20678: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:20628: \$? = $ac_status" >&5
+  echo "$as_me:20681: \$? = $ac_status" >&5

   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'

-  { (eval echo "$as_me:20630: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20683: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:20633: \$? = $ac_status" >&5
+  echo "$as_me:20686: \$? = $ac_status" >&5

   (exit "$ac_status"); }; }; then
   cf_cv_typeof_chtype=`cat cf_test.out`
 else
   (exit "$ac_status"); }; }; then
   cf_cv_typeof_chtype=`cat cf_test.out`
 else


@@ -20645,7 +20698,7 @@ fi
 
 fi
 
 
 fi
 

-echo "$as_me:20648: result: $cf_cv_typeof_chtype" >&5
+echo "$as_me:20701: result: $cf_cv_typeof_chtype" >&5

 echo "${ECHO_T}$cf_cv_typeof_chtype" >&6
 
 cat >>confdefs.h <<EOF
 echo "${ECHO_T}$cf_cv_typeof_chtype" >&6
 
 cat >>confdefs.h <<EOF


@@ -20657,14 +20710,14 @@ else
 fi
 test "$cf_cv_typeof_chtype" = unsigned && cf_cv_typeof_chtype=""
 
 fi
 test "$cf_cv_typeof_chtype" = unsigned && cf_cv_typeof_chtype=""
 

-echo "$as_me:20660: checking if unsigned literals are legal" >&5
+echo "$as_me:20713: 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
 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 20667 "configure"
+#line 20720 "configure"

 #include "confdefs.h"
 
 int
 #include "confdefs.h"
 
 int


@@ -20676,16 +20729,16 @@ long x = 1L + 1UL + 1U + 1
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
 }
 _ACEOF
 rm -f "conftest.$ac_objext"

-if { (eval echo "$as_me:20679: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:20732: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:20682: \$? = $ac_status" >&5
+  echo "$as_me:20735: \$? = $ac_status" >&5

   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'

-  { (eval echo "$as_me:20685: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20738: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:20688: \$? = $ac_status" >&5
+  echo "$as_me:20741: \$? = $ac_status" >&5

   (exit "$ac_status"); }; }; then
   cf_cv_unsigned_literals=yes
 else
   (exit "$ac_status"); }; }; then
   cf_cv_unsigned_literals=yes
 else


@@ -20697,7 +20750,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
 
 
 fi
 

-echo "$as_me:20700: result: $cf_cv_unsigned_literals" >&5
+echo "$as_me:20753: result: $cf_cv_unsigned_literals" >&5

 echo "${ECHO_T}$cf_cv_unsigned_literals" >&6
 
 cf_cv_1UL="1"
 echo "${ECHO_T}$cf_cv_unsigned_literals" >&6
 
 cf_cv_1UL="1"


@@ -20713,14 +20766,14 @@ test "$cf_cv_typeof_mmask_t" = unsigned && cf_cv_typeof_mmask_t=""
 
 ###    Checks for external-data
 
 
 ###    Checks for external-data
 

-echo "$as_me:20716: checking if external errno is declared" >&5
+echo "$as_me:20769: 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
 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 20723 "configure"
+#line 20776 "configure"

 #include "confdefs.h"
 
 #ifdef HAVE_STDLIB_H
 #include "confdefs.h"
 
 #ifdef HAVE_STDLIB_H


@@ -20738,16 +20791,16 @@ int x = (int) errno; (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
 }
 _ACEOF
 rm -f "conftest.$ac_objext"

-if { (eval echo "$as_me:20741: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:20794: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:20744: \$? = $ac_status" >&5
+  echo "$as_me:20797: \$? = $ac_status" >&5

   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'

-  { (eval echo "$as_me:20747: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20800: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:20750: \$? = $ac_status" >&5
+  echo "$as_me:20803: \$? = $ac_status" >&5

   (exit "$ac_status"); }; }; then
   cf_cv_dcl_errno=yes
 else
   (exit "$ac_status"); }; }; then
   cf_cv_dcl_errno=yes
 else


@@ -20758,7 +20811,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi

-echo "$as_me:20761: result: $cf_cv_dcl_errno" >&5
+echo "$as_me:20814: result: $cf_cv_dcl_errno" >&5

 echo "${ECHO_T}$cf_cv_dcl_errno" >&6
 
 if test "$cf_cv_dcl_errno" = no ; then
 echo "${ECHO_T}$cf_cv_dcl_errno" >&6
 
 if test "$cf_cv_dcl_errno" = no ; then


@@ -20773,14 +20826,14 @@ fi
 
 # It's possible (for near-UNIX clones) that the data doesn't exist
 
 
 # It's possible (for near-UNIX clones) that the data doesn't exist
 

-echo "$as_me:20776: checking if external errno exists" >&5
+echo "$as_me:20829: 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
 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 20783 "configure"
+#line 20836 "configure"

 #include "confdefs.h"
 
 #undef errno
 #include "confdefs.h"
 
 #undef errno


@@ -20795,16 +20848,16 @@ errno = 2
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"

-if { (eval echo "$as_me:20798: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20851: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:20801: \$? = $ac_status" >&5
+  echo "$as_me:20854: \$? = $ac_status" >&5

   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'

-  { (eval echo "$as_me:20804: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20857: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:20807: \$? = $ac_status" >&5
+  echo "$as_me:20860: \$? = $ac_status" >&5

   (exit "$ac_status"); }; }; then
   cf_cv_have_errno=yes
 else
   (exit "$ac_status"); }; }; then
   cf_cv_have_errno=yes
 else


@@ -20815,7 +20868,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 
 fi

-echo "$as_me:20818: result: $cf_cv_have_errno" >&5
+echo "$as_me:20871: result: $cf_cv_have_errno" >&5

 echo "${ECHO_T}$cf_cv_have_errno" >&6
 
 if test "$cf_cv_have_errno" = yes ; then
 echo "${ECHO_T}$cf_cv_have_errno" >&6
 
 if test "$cf_cv_have_errno" = yes ; then


@@ -20828,7 +20881,7 @@ EOF
 
 fi
 
 
 fi
 

-echo "$as_me:20831: checking if data-only library module links" >&5
+echo "$as_me:20884: 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
 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


@@ -20836,20 +20889,20 @@ else
 
        rm -f conftest.a
        cat >conftest.$ac_ext <<EOF
 
        rm -f conftest.a
        cat >conftest.$ac_ext <<EOF

-#line 20839 "configure"
+#line 20892 "configure"

 int    testdata[3] = { 123, 456, 789 };
 EOF
 int    testdata[3] = { 123, 456, 789 };
 EOF

-       if { (eval echo "$as_me:20842: \"$ac_compile\"") >&5
+       if { (eval echo "$as_me:20895: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:20845: \$? = $ac_status" >&5
+  echo "$as_me:20898: \$? = $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
   (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 20852 "configure"
+#line 20905 "configure"

 int    testfunc(void)
 {
 #if defined(NeXT)
 int    testfunc(void)
 {
 #if defined(NeXT)


@@ -20862,10 +20915,10 @@ int   testfunc(void)
 #endif
 }
 EOF
 #endif
 }
 EOF

-       if { (eval echo "$as_me:20865: \"$ac_compile\"") >&5
+       if { (eval echo "$as_me:20918: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:20868: \$? = $ac_status" >&5
+  echo "$as_me:20921: \$? = $ac_status" >&5

   (exit "$ac_status"); }; then
                mv conftest.o func.o && \
                ( $AR $ARFLAGS conftest.a func.o ) 2>&5 1>/dev/null
   (exit "$ac_status"); }; then
                mv conftest.o func.o && \
                ( $AR $ARFLAGS conftest.a func.o ) 2>&5 1>/dev/null


@@ -20878,7 +20931,7 @@ EOF
   cf_cv_link_dataonly=unknown
 else
   cat >"conftest.$ac_ext" <<_ACEOF
   cf_cv_link_dataonly=unknown
 else
   cat >"conftest.$ac_ext" <<_ACEOF

-#line 20881 "configure"
+#line 20934 "configure"

 #include "confdefs.h"
 
        int main(void)
 #include "confdefs.h"
 
        int main(void)


@@ -20889,15 +20942,15 @@ else
 
 _ACEOF
 rm -f "conftest$ac_exeext"
 
 _ACEOF
 rm -f "conftest$ac_exeext"

-if { (eval echo "$as_me:20892: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20945: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:20895: \$? = $ac_status" >&5
+  echo "$as_me:20948: \$? = $ac_status" >&5

   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'

-  { (eval echo "$as_me:20897: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20950: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:20900: \$? = $ac_status" >&5
+  echo "$as_me:20953: \$? = $ac_status" >&5

   (exit "$ac_status"); }; }; then
   cf_cv_link_dataonly=yes
 else
   (exit "$ac_status"); }; }; then
   cf_cv_link_dataonly=yes
 else


@@ -20912,7 +20965,7 @@ fi
 
 fi
 
 
 fi
 

-echo "$as_me:20915: result: $cf_cv_link_dataonly" >&5
+echo "$as_me:20968: result: $cf_cv_link_dataonly" >&5

 echo "${ECHO_T}$cf_cv_link_dataonly" >&6
 
 if test "$cf_cv_link_dataonly" = no ; then
 echo "${ECHO_T}$cf_cv_link_dataonly" >&6
 
 if test "$cf_cv_link_dataonly" = no ; then


@@ -20955,13 +21008,13 @@ vsnprintf \
 
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
 
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`

-echo "$as_me:20958: checking for $ac_func" >&5
+echo "$as_me:21011: 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
 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 20964 "configure"
+#line 21017 "configure"

 #include "confdefs.h"
 #define $ac_func autoconf_temporary
 #include <limits.h>    /* least-intrusive standard header which defines gcc2 __stub macros */
 #include "confdefs.h"
 #define $ac_func autoconf_temporary
 #include <limits.h>    /* least-intrusive standard header which defines gcc2 __stub macros */


@@ -20992,16 +21045,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"

-if { (eval echo "$as_me:20995: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21048: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:20998: \$? = $ac_status" >&5
+  echo "$as_me:21051: \$? = $ac_status" >&5

   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'

-  { (eval echo "$as_me:21001: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21054: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:21004: \$? = $ac_status" >&5
+  echo "$as_me:21057: \$? = $ac_status" >&5

   (exit "$ac_status"); }; }; then
   eval "$as_ac_var=yes"
 else
   (exit "$ac_status"); }; }; then
   eval "$as_ac_var=yes"
 else


@@ -21011,7 +21064,7 @@ eval "$as_ac_var=no"
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi

-echo "$as_me:21014: result: `eval echo '${'"$as_ac_var"'}'`" >&5
+echo "$as_me:21067: 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
 echo "${ECHO_T}`eval echo '${'"$as_ac_var"'}'`" >&6
 if test "`eval echo '${'"$as_ac_var"'}'`" = yes; then
   cat >>confdefs.h <<EOF


@@ -21023,7 +21076,7 @@ done
 
 if test "x$ac_cv_func_getopt" = xno && \
    test "x$cf_with_progs$cf_with_tests" != xnono; then
 
 if test "x$ac_cv_func_getopt" = xno && \
    test "x$cf_with_progs$cf_with_tests" != xnono; then

-       { { echo "$as_me:21026: error: getopt is required for building programs" >&5
+       { { echo "$as_me:21079: error: getopt is required for building programs" >&5

 echo "$as_me: error: getopt is required for building programs" >&2;}
    { (exit 1); exit 1; }; }
 fi
 echo "$as_me: error: getopt is required for building programs" >&2;}
    { (exit 1); exit 1; }; }
 fi


@@ -21032,7 +21085,7 @@ if test "x$with_safe_sprintf" = xyes
 then
        if test "x$ac_cv_func_vsnprintf" = xyes
        then
 then
        if test "x$ac_cv_func_vsnprintf" = xyes
        then

-               { echo "$as_me:21035: WARNING: will use vsnprintf instead of safe-sprintf option" >&5
+               { echo "$as_me:21088: WARNING: will use vsnprintf instead of safe-sprintf option" >&5

 echo "$as_me: WARNING: will use vsnprintf instead of safe-sprintf option" >&2;}
        else
 
 echo "$as_me: WARNING: will use vsnprintf instead of safe-sprintf option" >&2;}
        else
 


@@ -21045,14 +21098,14 @@ fi
 
 if test "x$with_getcap" = "xyes" ; then
 
 
 if test "x$with_getcap" = "xyes" ; then
 

-echo "$as_me:21048: checking for terminal-capability database functions" >&5
+echo "$as_me:21101: 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
 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 21055 "configure"
+#line 21108 "configure"

 #include "confdefs.h"
 
 #include <stdlib.h>
 #include "confdefs.h"
 
 #include <stdlib.h>


@@ -21072,16 +21125,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"

-if { (eval echo "$as_me:21075: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21128: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:21078: \$? = $ac_status" >&5
+  echo "$as_me:21131: \$? = $ac_status" >&5

   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'

-  { (eval echo "$as_me:21081: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21134: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:21084: \$? = $ac_status" >&5
+  echo "$as_me:21137: \$? = $ac_status" >&5

   (exit "$ac_status"); }; }; then
   cf_cv_cgetent=yes
 else
   (exit "$ac_status"); }; }; then
   cf_cv_cgetent=yes
 else


@@ -21092,7 +21145,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 
 fi

-echo "$as_me:21095: result: $cf_cv_cgetent" >&5
+echo "$as_me:21148: result: $cf_cv_cgetent" >&5

 echo "${ECHO_T}$cf_cv_cgetent" >&6
 
 if test "$cf_cv_cgetent" = yes
 echo "${ECHO_T}$cf_cv_cgetent" >&6
 
 if test "$cf_cv_cgetent" = yes


@@ -21102,14 +21155,14 @@ cat >>confdefs.h <<\EOF
 #define HAVE_BSD_CGETENT 1
 EOF
 
 #define HAVE_BSD_CGETENT 1
 EOF
 

-echo "$as_me:21105: checking if cgetent uses const parameter" >&5
+echo "$as_me:21158: 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
 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 21112 "configure"
+#line 21165 "configure"

 #include "confdefs.h"
 
 #pragma GCC diagnostic error "-Wincompatible-pointer-types-discards-qualifiers"
 #include "confdefs.h"
 
 #pragma GCC diagnostic error "-Wincompatible-pointer-types-discards-qualifiers"


@@ -21132,16 +21185,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"

-if { (eval echo "$as_me:21135: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21188: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:21138: \$? = $ac_status" >&5
+  echo "$as_me:21191: \$? = $ac_status" >&5

   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'

-  { (eval echo "$as_me:21141: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21194: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:21144: \$? = $ac_status" >&5
+  echo "$as_me:21197: \$? = $ac_status" >&5

   (exit "$ac_status"); }; }; then
   cf_cv_cgetent_const=yes
 else
   (exit "$ac_status"); }; }; then
   cf_cv_cgetent_const=yes
 else


@@ -21152,7 +21205,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 
 fi

-echo "$as_me:21155: result: $cf_cv_cgetent_const" >&5
+echo "$as_me:21208: result: $cf_cv_cgetent_const" >&5

 echo "${ECHO_T}$cf_cv_cgetent_const" >&6
        if test "$cf_cv_cgetent_const" = yes
        then
 echo "${ECHO_T}$cf_cv_cgetent_const" >&6
        if test "$cf_cv_cgetent_const" = yes
        then


@@ -21166,14 +21219,14 @@ fi
 
 fi
 
 
 fi
 

-echo "$as_me:21169: checking for isascii" >&5
+echo "$as_me:21222: 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
 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 21176 "configure"
+#line 21229 "configure"

 #include "confdefs.h"
 #include <ctype.h>
 int
 #include "confdefs.h"
 #include <ctype.h>
 int


@@ -21185,16 +21238,16 @@ int x = isascii(' ')
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"

-if { (eval echo "$as_me:21188: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21241: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:21191: \$? = $ac_status" >&5
+  echo "$as_me:21244: \$? = $ac_status" >&5

   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'

-  { (eval echo "$as_me:21194: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21247: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:21197: \$? = $ac_status" >&5
+  echo "$as_me:21250: \$? = $ac_status" >&5

   (exit "$ac_status"); }; }; then
   cf_cv_have_isascii=yes
 else
   (exit "$ac_status"); }; }; then
   cf_cv_have_isascii=yes
 else


@@ -21205,7 +21258,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 
 fi

-echo "$as_me:21208: result: $cf_cv_have_isascii" >&5
+echo "$as_me:21261: result: $cf_cv_have_isascii" >&5

 echo "${ECHO_T}$cf_cv_have_isascii" >&6
 test "$cf_cv_have_isascii" = yes &&
 cat >>confdefs.h <<\EOF
 echo "${ECHO_T}$cf_cv_have_isascii" >&6
 test "$cf_cv_have_isascii" = yes &&
 cat >>confdefs.h <<\EOF


@@ -21213,10 +21266,10 @@ cat >>confdefs.h <<\EOF
 EOF
 
 if test "$ac_cv_func_sigaction" = yes; then
 EOF
 
 if test "$ac_cv_func_sigaction" = yes; then

-echo "$as_me:21216: checking whether sigaction needs _POSIX_SOURCE" >&5
+echo "$as_me:21269: checking whether sigaction needs _POSIX_SOURCE" >&5

 echo $ECHO_N "checking whether sigaction needs _POSIX_SOURCE... $ECHO_C" >&6
 cat >"conftest.$ac_ext" <<_ACEOF
 echo $ECHO_N "checking whether sigaction needs _POSIX_SOURCE... $ECHO_C" >&6
 cat >"conftest.$ac_ext" <<_ACEOF

-#line 21219 "configure"
+#line 21272 "configure"

 #include "confdefs.h"
 
 #include <sys/types.h>
 #include "confdefs.h"
 
 #include <sys/types.h>


@@ -21230,16 +21283,16 @@ struct sigaction act
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
 }
 _ACEOF
 rm -f "conftest.$ac_objext"

-if { (eval echo "$as_me:21233: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:21286: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:21236: \$? = $ac_status" >&5
+  echo "$as_me:21289: \$? = $ac_status" >&5

   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'

-  { (eval echo "$as_me:21239: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21292: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:21242: \$? = $ac_status" >&5
+  echo "$as_me:21295: \$? = $ac_status" >&5

   (exit "$ac_status"); }; }; then
   sigact_bad=no
 else
   (exit "$ac_status"); }; }; then
   sigact_bad=no
 else


@@ -21247,7 +21300,7 @@ else
 cat "conftest.$ac_ext" >&5
 
 cat >"conftest.$ac_ext" <<_ACEOF
 cat "conftest.$ac_ext" >&5
 
 cat >"conftest.$ac_ext" <<_ACEOF

-#line 21250 "configure"
+#line 21303 "configure"

 #include "confdefs.h"
 
 #define _POSIX_SOURCE
 #include "confdefs.h"
 
 #define _POSIX_SOURCE


@@ -21262,16 +21315,16 @@ struct sigaction act
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
 }
 _ACEOF
 rm -f "conftest.$ac_objext"

-if { (eval echo "$as_me:21265: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:21318: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:21268: \$? = $ac_status" >&5
+  echo "$as_me:21321: \$? = $ac_status" >&5

   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'

-  { (eval echo "$as_me:21271: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21324: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:21274: \$? = $ac_status" >&5
+  echo "$as_me:21327: \$? = $ac_status" >&5

   (exit "$ac_status"); }; }; then
   sigact_bad=yes
 
   (exit "$ac_status"); }; }; then
   sigact_bad=yes
 


@@ -21287,11 +21340,11 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"

-echo "$as_me:21290: result: $sigact_bad" >&5
+echo "$as_me:21343: result: $sigact_bad" >&5

 echo "${ECHO_T}$sigact_bad" >&6
 fi
 
 echo "${ECHO_T}$sigact_bad" >&6
 fi
 

-echo "$as_me:21294: checking if nanosleep really works" >&5
+echo "$as_me:21347: 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
 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


@@ -21301,7 +21354,7 @@ if test "$cross_compiling" = yes; then
   cf_cv_func_nanosleep=unknown
 else
   cat >"conftest.$ac_ext" <<_ACEOF
   cf_cv_func_nanosleep=unknown
 else
   cat >"conftest.$ac_ext" <<_ACEOF

-#line 21304 "configure"
+#line 21357 "configure"

 #include "confdefs.h"
 
 #include <stdio.h>
 #include "confdefs.h"
 
 #include <stdio.h>


@@ -21326,15 +21379,15 @@ int main(void) {
 
 _ACEOF
 rm -f "conftest$ac_exeext"
 
 _ACEOF
 rm -f "conftest$ac_exeext"

-if { (eval echo "$as_me:21329: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21382: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:21332: \$? = $ac_status" >&5
+  echo "$as_me:21385: \$? = $ac_status" >&5

   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'

-  { (eval echo "$as_me:21334: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21387: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:21337: \$? = $ac_status" >&5
+  echo "$as_me:21390: \$? = $ac_status" >&5

   (exit "$ac_status"); }; }; then
   cf_cv_func_nanosleep=yes
 else
   (exit "$ac_status"); }; }; then
   cf_cv_func_nanosleep=yes
 else


@@ -21346,7 +21399,7 @@ fi
 rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 fi
 rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 fi

-echo "$as_me:21349: result: $cf_cv_func_nanosleep" >&5
+echo "$as_me:21402: result: $cf_cv_func_nanosleep" >&5

 echo "${ECHO_T}$cf_cv_func_nanosleep" >&6
 
 test "$cf_cv_func_nanosleep" = "yes" &&
 echo "${ECHO_T}$cf_cv_func_nanosleep" >&6
 
 test "$cf_cv_func_nanosleep" = "yes" &&


@@ -21363,23 +21416,23 @@ sys/termio.h \
 
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
 
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`

-echo "$as_me:21366: checking for $ac_header" >&5
+echo "$as_me:21419: 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
 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 21372 "configure"
+#line 21425 "configure"

 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF

-if { (eval echo "$as_me:21376: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:21429: \"$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
   (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:21382: \$? = $ac_status" >&5
+  echo "$as_me:21435: \$? = $ac_status" >&5

   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag


@@ -21398,7 +21451,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi

-echo "$as_me:21401: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:21454: 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
 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6
 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then
   cat >>confdefs.h <<EOF


@@ -21415,10 +21468,10 @@ if test "$ac_cv_header_termios_h" = yes ; then
        (*)     termios_bad=maybe ;;
        esac
        if test "$termios_bad" = maybe ; then
        (*)     termios_bad=maybe ;;
        esac
        if test "$termios_bad" = maybe ; then

-       echo "$as_me:21418: checking whether termios.h needs _POSIX_SOURCE" >&5
+       echo "$as_me:21471: 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
 echo $ECHO_N "checking whether termios.h needs _POSIX_SOURCE... $ECHO_C" >&6
        cat >"conftest.$ac_ext" <<_ACEOF

-#line 21421 "configure"
+#line 21474 "configure"

 #include "confdefs.h"
 #include <termios.h>
 int
 #include "confdefs.h"
 #include <termios.h>
 int


@@ -21430,16 +21483,16 @@ struct termios foo; int x = foo.c_iflag = 1; (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
 }
 _ACEOF
 rm -f "conftest.$ac_objext"

-if { (eval echo "$as_me:21433: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:21486: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:21436: \$? = $ac_status" >&5
+  echo "$as_me:21489: \$? = $ac_status" >&5

   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'

-  { (eval echo "$as_me:21439: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21492: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:21442: \$? = $ac_status" >&5
+  echo "$as_me:21495: \$? = $ac_status" >&5

   (exit "$ac_status"); }; }; then
   termios_bad=no
 else
   (exit "$ac_status"); }; }; then
   termios_bad=no
 else


@@ -21447,7 +21500,7 @@ else
 cat "conftest.$ac_ext" >&5
 
                cat >"conftest.$ac_ext" <<_ACEOF
 cat "conftest.$ac_ext" >&5
 
                cat >"conftest.$ac_ext" <<_ACEOF

-#line 21450 "configure"
+#line 21503 "configure"

 #include "confdefs.h"
 
 #define _POSIX_SOURCE
 #include "confdefs.h"
 
 #define _POSIX_SOURCE


@@ -21461,16 +21514,16 @@ struct termios foo; int x = foo.c_iflag = 2; (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
 }
 _ACEOF
 rm -f "conftest.$ac_objext"

-if { (eval echo "$as_me:21464: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:21517: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:21467: \$? = $ac_status" >&5
+  echo "$as_me:21520: \$? = $ac_status" >&5

   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'

-  { (eval echo "$as_me:21470: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21523: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:21473: \$? = $ac_status" >&5
+  echo "$as_me:21526: \$? = $ac_status" >&5

   (exit "$ac_status"); }; }; then
   termios_bad=unknown
 else
   (exit "$ac_status"); }; }; then
   termios_bad=unknown
 else


@@ -21486,19 +21539,19 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"

-       echo "$as_me:21489: result: $termios_bad" >&5
+       echo "$as_me:21542: result: $termios_bad" >&5

 echo "${ECHO_T}$termios_bad" >&6
        fi
 fi
 
 echo "${ECHO_T}$termios_bad" >&6
        fi
 fi
 

-echo "$as_me:21494: checking for tcgetattr" >&5
+echo "$as_me:21547: 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
 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 21501 "configure"
+#line 21554 "configure"

 #include "confdefs.h"
 
 #include <sys/types.h>
 #include "confdefs.h"
 
 #include <sys/types.h>


@@ -21526,16 +21579,16 @@ tcgetattr(1, &foo);
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"

-if { (eval echo "$as_me:21529: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21582: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:21532: \$? = $ac_status" >&5
+  echo "$as_me:21585: \$? = $ac_status" >&5

   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'

-  { (eval echo "$as_me:21535: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21588: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:21538: \$? = $ac_status" >&5
+  echo "$as_me:21591: \$? = $ac_status" >&5

   (exit "$ac_status"); }; }; then
   cf_cv_have_tcgetattr=yes
 else
   (exit "$ac_status"); }; }; then
   cf_cv_have_tcgetattr=yes
 else


@@ -21545,21 +21598,21 @@ cf_cv_have_tcgetattr=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi

-echo "$as_me:21548: result: $cf_cv_have_tcgetattr" >&5
+echo "$as_me:21601: 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 "${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:21555: checking for vsscanf function or workaround" >&5
+echo "$as_me:21608: 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
 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 21562 "configure"
+#line 21615 "configure"

 #include "confdefs.h"
 
 #include <stdarg.h>
 #include "confdefs.h"
 
 #include <stdarg.h>


@@ -21575,16 +21628,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"

-if { (eval echo "$as_me:21578: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21631: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:21581: \$? = $ac_status" >&5
+  echo "$as_me:21634: \$? = $ac_status" >&5

   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'

-  { (eval echo "$as_me:21584: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21637: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:21587: \$? = $ac_status" >&5
+  echo "$as_me:21640: \$? = $ac_status" >&5

   (exit "$ac_status"); }; }; then
   cf_cv_func_vsscanf=vsscanf
 else
   (exit "$ac_status"); }; }; then
   cf_cv_func_vsscanf=vsscanf
 else


@@ -21592,7 +21645,7 @@ else
 cat "conftest.$ac_ext" >&5
 
 cat >"conftest.$ac_ext" <<_ACEOF
 cat "conftest.$ac_ext" >&5
 
 cat >"conftest.$ac_ext" <<_ACEOF

-#line 21595 "configure"
+#line 21648 "configure"

 #include "confdefs.h"
 
 #include <stdarg.h>
 #include "confdefs.h"
 
 #include <stdarg.h>


@@ -21614,16 +21667,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"

-if { (eval echo "$as_me:21617: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21670: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:21620: \$? = $ac_status" >&5
+  echo "$as_me:21673: \$? = $ac_status" >&5

   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'

-  { (eval echo "$as_me:21623: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21676: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:21626: \$? = $ac_status" >&5
+  echo "$as_me:21679: \$? = $ac_status" >&5

   (exit "$ac_status"); }; }; then
   cf_cv_func_vsscanf=vfscanf
 else
   (exit "$ac_status"); }; }; then
   cf_cv_func_vsscanf=vfscanf
 else


@@ -21631,7 +21684,7 @@ else
 cat "conftest.$ac_ext" >&5
 
 cat >"conftest.$ac_ext" <<_ACEOF
 cat "conftest.$ac_ext" >&5
 
 cat >"conftest.$ac_ext" <<_ACEOF

-#line 21634 "configure"
+#line 21687 "configure"

 #include "confdefs.h"
 
 #include <stdarg.h>
 #include "confdefs.h"
 
 #include <stdarg.h>


@@ -21653,16 +21706,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"

-if { (eval echo "$as_me:21656: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21709: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:21659: \$? = $ac_status" >&5
+  echo "$as_me:21712: \$? = $ac_status" >&5

   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'

-  { (eval echo "$as_me:21662: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21715: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:21665: \$? = $ac_status" >&5
+  echo "$as_me:21718: \$? = $ac_status" >&5

   (exit "$ac_status"); }; }; then
   cf_cv_func_vsscanf=_doscan
 else
   (exit "$ac_status"); }; }; then
   cf_cv_func_vsscanf=_doscan
 else


@@ -21677,7 +21730,7 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi

-echo "$as_me:21680: result: $cf_cv_func_vsscanf" >&5
+echo "$as_me:21733: result: $cf_cv_func_vsscanf" >&5

 echo "${ECHO_T}$cf_cv_func_vsscanf" >&6
 
 case "$cf_cv_func_vsscanf" in
 echo "${ECHO_T}$cf_cv_func_vsscanf" >&6
 
 case "$cf_cv_func_vsscanf" in


@@ -21703,23 +21756,23 @@ unistd.h \
 
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
 
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`

-echo "$as_me:21706: checking for $ac_header" >&5
+echo "$as_me:21759: 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
 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 21712 "configure"
+#line 21765 "configure"

 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF

-if { (eval echo "$as_me:21716: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:21769: \"$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
   (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:21722: \$? = $ac_status" >&5
+  echo "$as_me:21775: \$? = $ac_status" >&5

   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag


@@ -21738,7 +21791,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi

-echo "$as_me:21741: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:21794: 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
 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6
 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then
   cat >>confdefs.h <<EOF


@@ -21748,7 +21801,7 @@ EOF
 fi
 done
 
 fi
 done
 

-echo "$as_me:21751: checking for working mkstemp" >&5
+echo "$as_me:21804: 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
 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


@@ -21759,7 +21812,7 @@ if test "$cross_compiling" = yes; then
   cf_cv_func_mkstemp=maybe
 else
   cat >"conftest.$ac_ext" <<_ACEOF
   cf_cv_func_mkstemp=maybe
 else
   cat >"conftest.$ac_ext" <<_ACEOF

-#line 21762 "configure"
+#line 21815 "configure"

 #include "confdefs.h"
 
 #include <sys/types.h>
 #include "confdefs.h"
 
 #include <sys/types.h>


@@ -21800,15 +21853,15 @@ int main(void)
 
 _ACEOF
 rm -f "conftest$ac_exeext"
 
 _ACEOF
 rm -f "conftest$ac_exeext"

-if { (eval echo "$as_me:21803: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21856: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:21806: \$? = $ac_status" >&5
+  echo "$as_me:21859: \$? = $ac_status" >&5

   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'

-  { (eval echo "$as_me:21808: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21861: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:21811: \$? = $ac_status" >&5
+  echo "$as_me:21864: \$? = $ac_status" >&5

   (exit "$ac_status"); }; }; then
   cf_cv_func_mkstemp=yes
 
   (exit "$ac_status"); }; }; then
   cf_cv_func_mkstemp=yes
 


@@ -21823,16 +21876,16 @@ rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftes
 fi
 
 fi
 fi
 
 fi

-echo "$as_me:21826: result: $cf_cv_func_mkstemp" >&5
+echo "$as_me:21879: result: $cf_cv_func_mkstemp" >&5

 echo "${ECHO_T}$cf_cv_func_mkstemp" >&6
 if test "x$cf_cv_func_mkstemp" = xmaybe ; then
 echo "${ECHO_T}$cf_cv_func_mkstemp" >&6
 if test "x$cf_cv_func_mkstemp" = xmaybe ; then

-       echo "$as_me:21829: checking for mkstemp" >&5
+       echo "$as_me:21882: 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
 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 21835 "configure"
+#line 21888 "configure"

 #include "confdefs.h"
 #define mkstemp autoconf_temporary
 #include <limits.h>    /* least-intrusive standard header which defines gcc2 __stub macros */
 #include "confdefs.h"
 #define mkstemp autoconf_temporary
 #include <limits.h>    /* least-intrusive standard header which defines gcc2 __stub macros */


@@ -21863,16 +21916,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"

-if { (eval echo "$as_me:21866: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21919: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:21869: \$? = $ac_status" >&5
+  echo "$as_me:21922: \$? = $ac_status" >&5

   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'

-  { (eval echo "$as_me:21872: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21925: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:21875: \$? = $ac_status" >&5
+  echo "$as_me:21928: \$? = $ac_status" >&5

   (exit "$ac_status"); }; }; then
   ac_cv_func_mkstemp=yes
 else
   (exit "$ac_status"); }; }; then
   ac_cv_func_mkstemp=yes
 else


@@ -21882,7 +21935,7 @@ ac_cv_func_mkstemp=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi

-echo "$as_me:21885: result: $ac_cv_func_mkstemp" >&5
+echo "$as_me:21938: result: $ac_cv_func_mkstemp" >&5

 echo "${ECHO_T}$ac_cv_func_mkstemp" >&6
 
 fi
 echo "${ECHO_T}$ac_cv_func_mkstemp" >&6
 
 fi


@@ -21903,21 +21956,21 @@ else
 fi
 
 if test "x$cross_compiling" = xyes ; then
 fi
 
 if test "x$cross_compiling" = xyes ; then

-       { echo "$as_me:21906: WARNING: cross compiling: assume setvbuf params not reversed" >&5
+       { echo "$as_me:21959: 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: WARNING: cross compiling: assume setvbuf params not reversed" >&2;}
 else

-       echo "$as_me:21909: checking whether setvbuf arguments are reversed" >&5
+       echo "$as_me:21962: 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 $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:21915: error: cannot run test program while cross compiling" >&5
+  { { echo "$as_me:21968: 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
 echo "$as_me: error: cannot run test program while cross compiling" >&2;}
    { (exit 1); exit 1; }; }
 else
   cat >"conftest.$ac_ext" <<_ACEOF

-#line 21920 "configure"
+#line 21973 "configure"

 #include "confdefs.h"
 #include <stdio.h>
 /* If setvbuf has the reversed format, exit 0. */
 #include "confdefs.h"
 #include <stdio.h>
 /* If setvbuf has the reversed format, exit 0. */


@@ -21934,15 +21987,15 @@ main (void)
 }
 _ACEOF
 rm -f "conftest$ac_exeext"
 }
 _ACEOF
 rm -f "conftest$ac_exeext"

-if { (eval echo "$as_me:21937: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21990: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:21940: \$? = $ac_status" >&5
+  echo "$as_me:21993: \$? = $ac_status" >&5

   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'

-  { (eval echo "$as_me:21942: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21995: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:21945: \$? = $ac_status" >&5
+  echo "$as_me:21998: \$? = $ac_status" >&5

   (exit "$ac_status"); }; }; then
   ac_cv_func_setvbuf_reversed=yes
 else
   (exit "$ac_status"); }; }; then
   ac_cv_func_setvbuf_reversed=yes
 else


@@ -21955,7 +22008,7 @@ rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftes
 fi
 rm -f core ./core.* ./*.core
 fi
 fi
 rm -f core ./core.* ./*.core
 fi

-echo "$as_me:21958: result: $ac_cv_func_setvbuf_reversed" >&5
+echo "$as_me:22011: 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
 
 echo "${ECHO_T}$ac_cv_func_setvbuf_reversed" >&6
 if test $ac_cv_func_setvbuf_reversed = yes; then
 


@@ -21966,13 +22019,13 @@ EOF
 fi
 
 fi
 fi
 
 fi

-echo "$as_me:21969: checking for intptr_t" >&5
+echo "$as_me:22022: 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
 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 21975 "configure"
+#line 22028 "configure"

 #include "confdefs.h"
 $ac_includes_default
 int
 #include "confdefs.h"
 $ac_includes_default
 int


@@ -21987,16 +22040,16 @@ if (sizeof (intptr_t))
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
 }
 _ACEOF
 rm -f "conftest.$ac_objext"

-if { (eval echo "$as_me:21990: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:22043: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:21993: \$? = $ac_status" >&5
+  echo "$as_me:22046: \$? = $ac_status" >&5

   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'

-  { (eval echo "$as_me:21996: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22049: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:21999: \$? = $ac_status" >&5
+  echo "$as_me:22052: \$? = $ac_status" >&5

   (exit "$ac_status"); }; }; then
   ac_cv_type_intptr_t=yes
 else
   (exit "$ac_status"); }; }; then
   ac_cv_type_intptr_t=yes
 else


@@ -22006,7 +22059,7 @@ ac_cv_type_intptr_t=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi

-echo "$as_me:22009: result: $ac_cv_type_intptr_t" >&5
+echo "$as_me:22062: 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
   :
 echo "${ECHO_T}$ac_cv_type_intptr_t" >&6
 if test "$ac_cv_type_intptr_t" = yes; then
   :


@@ -22018,13 +22071,13 @@ EOF
 
 fi
 
 
 fi
 

-echo "$as_me:22021: checking for ssize_t" >&5
+echo "$as_me:22074: 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
 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 22027 "configure"
+#line 22080 "configure"

 #include "confdefs.h"
 $ac_includes_default
 int
 #include "confdefs.h"
 $ac_includes_default
 int


@@ -22039,16 +22092,16 @@ if (sizeof (ssize_t))
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
 }
 _ACEOF
 rm -f "conftest.$ac_objext"

-if { (eval echo "$as_me:22042: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:22095: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:22045: \$? = $ac_status" >&5
+  echo "$as_me:22098: \$? = $ac_status" >&5

   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'

-  { (eval echo "$as_me:22048: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22101: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:22051: \$? = $ac_status" >&5
+  echo "$as_me:22104: \$? = $ac_status" >&5

   (exit "$ac_status"); }; }; then
   ac_cv_type_ssize_t=yes
 else
   (exit "$ac_status"); }; }; then
   ac_cv_type_ssize_t=yes
 else


@@ -22058,7 +22111,7 @@ ac_cv_type_ssize_t=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi

-echo "$as_me:22061: result: $ac_cv_type_ssize_t" >&5
+echo "$as_me:22114: 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
   :
 echo "${ECHO_T}$ac_cv_type_ssize_t" >&6
 if test "$ac_cv_type_ssize_t" = yes; then
   :


@@ -22070,14 +22123,14 @@ EOF
 
 fi
 
 
 fi
 

-echo "$as_me:22073: checking for type sigaction_t" >&5
+echo "$as_me:22126: 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
 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 22080 "configure"
+#line 22133 "configure"

 #include "confdefs.h"
 
 #include <signal.h>
 #include "confdefs.h"
 
 #include <signal.h>


@@ -22090,16 +22143,16 @@ sigaction_t x
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
 }
 _ACEOF
 rm -f "conftest.$ac_objext"

-if { (eval echo "$as_me:22093: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:22146: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:22096: \$? = $ac_status" >&5
+  echo "$as_me:22149: \$? = $ac_status" >&5

   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'

-  { (eval echo "$as_me:22099: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22152: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:22102: \$? = $ac_status" >&5
+  echo "$as_me:22155: \$? = $ac_status" >&5

   (exit "$ac_status"); }; }; then
   cf_cv_type_sigaction=yes
 else
   (exit "$ac_status"); }; }; then
   cf_cv_type_sigaction=yes
 else


@@ -22110,14 +22163,14 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 

-echo "$as_me:22113: result: $cf_cv_type_sigaction" >&5
+echo "$as_me:22166: 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 "${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:22120: checking declaration of size-change" >&5
+echo "$as_me:22173: 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
 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


@@ -22138,7 +22191,7 @@ do
 
        fi
        cat >"conftest.$ac_ext" <<_ACEOF
 
        fi
        cat >"conftest.$ac_ext" <<_ACEOF

-#line 22141 "configure"
+#line 22194 "configure"

 #include "confdefs.h"
 #include <sys/types.h>
 #ifdef HAVE_TERMIOS_H
 #include "confdefs.h"
 #include <sys/types.h>
 #ifdef HAVE_TERMIOS_H


@@ -22188,16 +22241,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
 }
 _ACEOF
 rm -f "conftest.$ac_objext"

-if { (eval echo "$as_me:22191: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:22244: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:22194: \$? = $ac_status" >&5
+  echo "$as_me:22247: \$? = $ac_status" >&5

   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'

-  { (eval echo "$as_me:22197: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22250: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:22200: \$? = $ac_status" >&5
+  echo "$as_me:22253: \$? = $ac_status" >&5

   (exit "$ac_status"); }; }; then
   cf_cv_sizechange=yes
 else
   (exit "$ac_status"); }; }; then
   cf_cv_sizechange=yes
 else


@@ -22216,7 +22269,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 done
 
 fi
 done
 
 fi

-echo "$as_me:22219: result: $cf_cv_sizechange" >&5
+echo "$as_me:22272: result: $cf_cv_sizechange" >&5

 echo "${ECHO_T}$cf_cv_sizechange" >&6
 if test "$cf_cv_sizechange" != no ; then
 
 echo "${ECHO_T}$cf_cv_sizechange" >&6
 if test "$cf_cv_sizechange" != no ; then
 


@@ -22234,13 +22287,13 @@ EOF
        esac
 fi
 
        esac
 fi
 

-echo "$as_me:22237: checking for memmove" >&5
+echo "$as_me:22290: 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
 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 22243 "configure"
+#line 22296 "configure"

 #include "confdefs.h"
 #define memmove autoconf_temporary
 #include <limits.h>    /* least-intrusive standard header which defines gcc2 __stub macros */
 #include "confdefs.h"
 #define memmove autoconf_temporary
 #include <limits.h>    /* least-intrusive standard header which defines gcc2 __stub macros */


@@ -22271,16 +22324,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"

-if { (eval echo "$as_me:22274: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22327: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:22277: \$? = $ac_status" >&5
+  echo "$as_me:22330: \$? = $ac_status" >&5

   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'

-  { (eval echo "$as_me:22280: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22333: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:22283: \$? = $ac_status" >&5
+  echo "$as_me:22336: \$? = $ac_status" >&5

   (exit "$ac_status"); }; }; then
   ac_cv_func_memmove=yes
 else
   (exit "$ac_status"); }; }; then
   ac_cv_func_memmove=yes
 else


@@ -22290,19 +22343,19 @@ ac_cv_func_memmove=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi

-echo "$as_me:22293: result: $ac_cv_func_memmove" >&5
+echo "$as_me:22346: result: $ac_cv_func_memmove" >&5

 echo "${ECHO_T}$ac_cv_func_memmove" >&6
 if test "$ac_cv_func_memmove" = yes; then
   :
 else
 
 echo "${ECHO_T}$ac_cv_func_memmove" >&6
 if test "$ac_cv_func_memmove" = yes; then
   :
 else
 

-echo "$as_me:22299: checking for bcopy" >&5
+echo "$as_me:22352: 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
 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 22305 "configure"
+#line 22358 "configure"

 #include "confdefs.h"
 #define bcopy autoconf_temporary
 #include <limits.h>    /* least-intrusive standard header which defines gcc2 __stub macros */
 #include "confdefs.h"
 #define bcopy autoconf_temporary
 #include <limits.h>    /* least-intrusive standard header which defines gcc2 __stub macros */


@@ -22333,16 +22386,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"

-if { (eval echo "$as_me:22336: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22389: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:22339: \$? = $ac_status" >&5
+  echo "$as_me:22392: \$? = $ac_status" >&5

   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'

-  { (eval echo "$as_me:22342: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22395: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:22345: \$? = $ac_status" >&5
+  echo "$as_me:22398: \$? = $ac_status" >&5

   (exit "$ac_status"); }; }; then
   ac_cv_func_bcopy=yes
 else
   (exit "$ac_status"); }; }; then
   ac_cv_func_bcopy=yes
 else


@@ -22352,11 +22405,11 @@ ac_cv_func_bcopy=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi

-echo "$as_me:22355: result: $ac_cv_func_bcopy" >&5
+echo "$as_me:22408: result: $ac_cv_func_bcopy" >&5

 echo "${ECHO_T}$ac_cv_func_bcopy" >&6
 if test "$ac_cv_func_bcopy" = yes; then
 
 echo "${ECHO_T}$ac_cv_func_bcopy" >&6
 if test "$ac_cv_func_bcopy" = yes; then
 

-       echo "$as_me:22359: checking if bcopy does overlapping moves" >&5
+       echo "$as_me:22412: 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
 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


@@ -22366,7 +22419,7 @@ else
   cf_cv_good_bcopy=unknown
 else
   cat >"conftest.$ac_ext" <<_ACEOF
   cf_cv_good_bcopy=unknown
 else
   cat >"conftest.$ac_ext" <<_ACEOF

-#line 22369 "configure"
+#line 22422 "configure"

 #include "confdefs.h"
 
 int main(void) {
 #include "confdefs.h"
 
 int main(void) {


@@ -22380,15 +22433,15 @@ int main(void) {
 
 _ACEOF
 rm -f "conftest$ac_exeext"
 
 _ACEOF
 rm -f "conftest$ac_exeext"

-if { (eval echo "$as_me:22383: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22436: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:22386: \$? = $ac_status" >&5
+  echo "$as_me:22439: \$? = $ac_status" >&5

   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'

-  { (eval echo "$as_me:22388: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22441: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:22391: \$? = $ac_status" >&5
+  echo "$as_me:22444: \$? = $ac_status" >&5

   (exit "$ac_status"); }; }; then
   cf_cv_good_bcopy=yes
 else
   (exit "$ac_status"); }; }; then
   cf_cv_good_bcopy=yes
 else


@@ -22401,7 +22454,7 @@ rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftes
 fi
 
 fi
 fi
 
 fi

-echo "$as_me:22404: result: $cf_cv_good_bcopy" >&5
+echo "$as_me:22457: result: $cf_cv_good_bcopy" >&5

 echo "${ECHO_T}$cf_cv_good_bcopy" >&6
 
 else
 echo "${ECHO_T}$cf_cv_good_bcopy" >&6
 
 else


@@ -22428,13 +22481,13 @@ tty >/dev/null 2>&1 || {
 for ac_func in posix_openpt
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
 for ac_func in posix_openpt
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`

-echo "$as_me:22431: checking for $ac_func" >&5
+echo "$as_me:22484: 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
 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 22437 "configure"
+#line 22490 "configure"

 #include "confdefs.h"
 #define $ac_func autoconf_temporary
 #include <limits.h>    /* least-intrusive standard header which defines gcc2 __stub macros */
 #include "confdefs.h"
 #define $ac_func autoconf_temporary
 #include <limits.h>    /* least-intrusive standard header which defines gcc2 __stub macros */


@@ -22465,16 +22518,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"

-if { (eval echo "$as_me:22468: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22521: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:22471: \$? = $ac_status" >&5
+  echo "$as_me:22524: \$? = $ac_status" >&5

   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'

-  { (eval echo "$as_me:22474: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22527: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:22477: \$? = $ac_status" >&5
+  echo "$as_me:22530: \$? = $ac_status" >&5

   (exit "$ac_status"); }; }; then
   eval "$as_ac_var=yes"
 else
   (exit "$ac_status"); }; }; then
   eval "$as_ac_var=yes"
 else


@@ -22484,7 +22537,7 @@ eval "$as_ac_var=no"
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi

-echo "$as_me:22487: result: `eval echo '${'"$as_ac_var"'}'`" >&5
+echo "$as_me:22540: 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
 echo "${ECHO_T}`eval echo '${'"$as_ac_var"'}'`" >&6
 if test "`eval echo '${'"$as_ac_var"'}'`" = yes; then
   cat >>confdefs.h <<EOF


@@ -22494,7 +22547,7 @@ EOF
 fi
 done
  }
 fi
 done
  }

-echo "$as_me:22497: checking if poll really works" >&5
+echo "$as_me:22550: 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
 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


@@ -22504,7 +22557,7 @@ if test "$cross_compiling" = yes; then
   cf_cv_working_poll=unknown
 else
   cat >"conftest.$ac_ext" <<_ACEOF
   cf_cv_working_poll=unknown
 else
   cat >"conftest.$ac_ext" <<_ACEOF

-#line 22507 "configure"
+#line 22560 "configure"

 #include "confdefs.h"
 
 #include <stdlib.h>
 #include "confdefs.h"
 
 #include <stdlib.h>


@@ -22556,15 +22609,15 @@ int main(void) {
 }
 _ACEOF
 rm -f "conftest$ac_exeext"
 }
 _ACEOF
 rm -f "conftest$ac_exeext"

-if { (eval echo "$as_me:22559: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22612: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:22562: \$? = $ac_status" >&5
+  echo "$as_me:22615: \$? = $ac_status" >&5

   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'

-  { (eval echo "$as_me:22564: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22617: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:22567: \$? = $ac_status" >&5
+  echo "$as_me:22620: \$? = $ac_status" >&5

   (exit "$ac_status"); }; }; then
   cf_cv_working_poll=yes
 else
   (exit "$ac_status"); }; }; then
   cf_cv_working_poll=yes
 else


@@ -22576,21 +22629,21 @@ fi
 rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 fi
 rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 fi

-echo "$as_me:22579: result: $cf_cv_working_poll" >&5
+echo "$as_me:22632: 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 "${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:22586: checking for va_copy" >&5
+echo "$as_me:22639: 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
 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 22593 "configure"
+#line 22646 "configure"

 #include "confdefs.h"
 
 #include <stdarg.h>
 #include "confdefs.h"
 
 #include <stdarg.h>


@@ -22607,16 +22660,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"

-if { (eval echo "$as_me:22610: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22663: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:22613: \$? = $ac_status" >&5
+  echo "$as_me:22666: \$? = $ac_status" >&5

   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'

-  { (eval echo "$as_me:22616: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22669: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:22619: \$? = $ac_status" >&5
+  echo "$as_me:22672: \$? = $ac_status" >&5

   (exit "$ac_status"); }; }; then
   cf_cv_have_va_copy=yes
 else
   (exit "$ac_status"); }; }; then
   cf_cv_have_va_copy=yes
 else


@@ -22626,7 +22679,7 @@ cf_cv_have_va_copy=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi

-echo "$as_me:22629: result: $cf_cv_have_va_copy" >&5
+echo "$as_me:22682: result: $cf_cv_have_va_copy" >&5

 echo "${ECHO_T}$cf_cv_have_va_copy" >&6
 
 if test "$cf_cv_have_va_copy" = yes;
 echo "${ECHO_T}$cf_cv_have_va_copy" >&6
 
 if test "$cf_cv_have_va_copy" = yes;


@@ -22638,14 +22691,14 @@ EOF
 
 else # !cf_cv_have_va_copy
 
 
 else # !cf_cv_have_va_copy
 

-echo "$as_me:22641: checking for __va_copy" >&5
+echo "$as_me:22694: 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
 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 22648 "configure"
+#line 22701 "configure"

 #include "confdefs.h"
 
 #include <stdarg.h>
 #include "confdefs.h"
 
 #include <stdarg.h>


@@ -22662,16 +22715,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"

-if { (eval echo "$as_me:22665: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22718: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:22668: \$? = $ac_status" >&5
+  echo "$as_me:22721: \$? = $ac_status" >&5

   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'

-  { (eval echo "$as_me:22671: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22724: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:22674: \$? = $ac_status" >&5
+  echo "$as_me:22727: \$? = $ac_status" >&5

   (exit "$ac_status"); }; }; then
   cf_cv_have___va_copy=yes
 else
   (exit "$ac_status"); }; }; then
   cf_cv_have___va_copy=yes
 else


@@ -22681,7 +22734,7 @@ cf_cv_have___va_copy=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi

-echo "$as_me:22684: result: $cf_cv_have___va_copy" >&5
+echo "$as_me:22737: result: $cf_cv_have___va_copy" >&5

 echo "${ECHO_T}$cf_cv_have___va_copy" >&6
 
 if test "$cf_cv_have___va_copy" = yes
 echo "${ECHO_T}$cf_cv_have___va_copy" >&6
 
 if test "$cf_cv_have___va_copy" = yes


@@ -22693,14 +22746,14 @@ EOF
 
 else # !cf_cv_have___va_copy
 
 
 else # !cf_cv_have___va_copy
 

-echo "$as_me:22696: checking for __builtin_va_copy" >&5
+echo "$as_me:22749: checking for __builtin_va_copy" >&5

 echo $ECHO_N "checking for __builtin_va_copy... $ECHO_C" >&6
 if test "${cf_cv_have___builtin_va_copy+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 cat >"conftest.$ac_ext" <<_ACEOF
 echo $ECHO_N "checking for __builtin_va_copy... $ECHO_C" >&6
 if test "${cf_cv_have___builtin_va_copy+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 cat >"conftest.$ac_ext" <<_ACEOF

-#line 22703 "configure"
+#line 22756 "configure"

 #include "confdefs.h"
 
 #include <stdarg.h>
 #include "confdefs.h"
 
 #include <stdarg.h>


@@ -22717,16 +22770,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"

-if { (eval echo "$as_me:22720: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22773: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:22723: \$? = $ac_status" >&5
+  echo "$as_me:22776: \$? = $ac_status" >&5

   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'

-  { (eval echo "$as_me:22726: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22779: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:22729: \$? = $ac_status" >&5
+  echo "$as_me:22782: \$? = $ac_status" >&5

   (exit "$ac_status"); }; }; then
   cf_cv_have___builtin_va_copy=yes
 else
   (exit "$ac_status"); }; }; then
   cf_cv_have___builtin_va_copy=yes
 else


@@ -22736,7 +22789,7 @@ cf_cv_have___builtin_va_copy=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi

-echo "$as_me:22739: result: $cf_cv_have___builtin_va_copy" >&5
+echo "$as_me:22792: result: $cf_cv_have___builtin_va_copy" >&5

 echo "${ECHO_T}$cf_cv_have___builtin_va_copy" >&6
 
 test "$cf_cv_have___builtin_va_copy" = yes &&
 echo "${ECHO_T}$cf_cv_have___builtin_va_copy" >&6
 
 test "$cf_cv_have___builtin_va_copy" = yes &&


@@ -22754,14 +22807,14 @@ case "${cf_cv_have_va_copy}${cf_cv_have___va_copy}${cf_cv_have___builtin_va_copy
        ;;
 
 (*)
        ;;
 
 (*)

-       echo "$as_me:22757: checking if we can simply copy va_list" >&5
+       echo "$as_me:22810: checking if we can simply copy va_list" >&5

 echo $ECHO_N "checking if we can simply copy va_list... $ECHO_C" >&6
 if test "${cf_cv_pointer_va_list+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 cat >"conftest.$ac_ext" <<_ACEOF
 echo $ECHO_N "checking if we can simply copy va_list... $ECHO_C" >&6
 if test "${cf_cv_pointer_va_list+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 cat >"conftest.$ac_ext" <<_ACEOF

-#line 22764 "configure"
+#line 22817 "configure"

 #include "confdefs.h"
 
 #include <stdarg.h>
 #include "confdefs.h"
 
 #include <stdarg.h>


@@ -22778,16 +22831,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"

-if { (eval echo "$as_me:22781: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22834: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:22784: \$? = $ac_status" >&5
+  echo "$as_me:22837: \$? = $ac_status" >&5

   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'

-  { (eval echo "$as_me:22787: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22840: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:22790: \$? = $ac_status" >&5
+  echo "$as_me:22843: \$? = $ac_status" >&5

   (exit "$ac_status"); }; }; then
   cf_cv_pointer_va_list=yes
 else
   (exit "$ac_status"); }; }; then
   cf_cv_pointer_va_list=yes
 else


@@ -22797,19 +22850,19 @@ cf_cv_pointer_va_list=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi

-echo "$as_me:22800: result: $cf_cv_pointer_va_list" >&5
+echo "$as_me:22853: result: $cf_cv_pointer_va_list" >&5

 echo "${ECHO_T}$cf_cv_pointer_va_list" >&6
 
        if test "$cf_cv_pointer_va_list" = no
        then
 echo "${ECHO_T}$cf_cv_pointer_va_list" >&6
 
        if test "$cf_cv_pointer_va_list" = no
        then

-               echo "$as_me:22805: checking if we can copy va_list indirectly" >&5
+               echo "$as_me:22858: checking if we can copy va_list indirectly" >&5

 echo $ECHO_N "checking if we can copy va_list indirectly... $ECHO_C" >&6
 if test "${cf_cv_array_va_list+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 cat >"conftest.$ac_ext" <<_ACEOF
 echo $ECHO_N "checking if we can copy va_list indirectly... $ECHO_C" >&6
 if test "${cf_cv_array_va_list+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 cat >"conftest.$ac_ext" <<_ACEOF

-#line 22812 "configure"
+#line 22865 "configure"

 #include "confdefs.h"
 
 #include <stdarg.h>
 #include "confdefs.h"
 
 #include <stdarg.h>


@@ -22826,16 +22879,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"

-if { (eval echo "$as_me:22829: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22882: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:22832: \$? = $ac_status" >&5
+  echo "$as_me:22885: \$? = $ac_status" >&5

   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'

-  { (eval echo "$as_me:22835: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22888: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:22838: \$? = $ac_status" >&5
+  echo "$as_me:22891: \$? = $ac_status" >&5

   (exit "$ac_status"); }; }; then
   cf_cv_array_va_list=yes
 else
   (exit "$ac_status"); }; }; then
   cf_cv_array_va_list=yes
 else


@@ -22845,7 +22898,7 @@ cf_cv_array_va_list=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi

-echo "$as_me:22848: result: $cf_cv_array_va_list" >&5
+echo "$as_me:22901: result: $cf_cv_array_va_list" >&5

 echo "${ECHO_T}$cf_cv_array_va_list" >&6
                test "$cf_cv_array_va_list" = yes &&
 cat >>confdefs.h <<\EOF
 echo "${ECHO_T}$cf_cv_array_va_list" >&6
                test "$cf_cv_array_va_list" = yes &&
 cat >>confdefs.h <<\EOF


@@ -22856,13 +22909,13 @@ EOF
        ;;
 esac
 
        ;;
 esac
 

-echo "$as_me:22859: checking for pid_t" >&5
+echo "$as_me:22912: 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
 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 22865 "configure"
+#line 22918 "configure"

 #include "confdefs.h"
 $ac_includes_default
 int
 #include "confdefs.h"
 $ac_includes_default
 int


@@ -22877,16 +22930,16 @@ if (sizeof (pid_t))
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
 }
 _ACEOF
 rm -f "conftest.$ac_objext"

-if { (eval echo "$as_me:22880: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:22933: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:22883: \$? = $ac_status" >&5
+  echo "$as_me:22936: \$? = $ac_status" >&5

   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'

-  { (eval echo "$as_me:22886: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22939: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:22889: \$? = $ac_status" >&5
+  echo "$as_me:22942: \$? = $ac_status" >&5

   (exit "$ac_status"); }; }; then
   ac_cv_type_pid_t=yes
 else
   (exit "$ac_status"); }; }; then
   ac_cv_type_pid_t=yes
 else


@@ -22896,7 +22949,7 @@ ac_cv_type_pid_t=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi

-echo "$as_me:22899: result: $ac_cv_type_pid_t" >&5
+echo "$as_me:22952: 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
   :
 echo "${ECHO_T}$ac_cv_type_pid_t" >&6
 if test "$ac_cv_type_pid_t" = yes; then
   :


@@ -22911,23 +22964,23 @@ fi
 for ac_header in unistd.h vfork.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
 for ac_header in unistd.h vfork.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`

-echo "$as_me:22914: checking for $ac_header" >&5
+echo "$as_me:22967: 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
 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 22920 "configure"
+#line 22973 "configure"

 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF

-if { (eval echo "$as_me:22924: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:22977: \"$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
   (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:22930: \$? = $ac_status" >&5
+  echo "$as_me:22983: \$? = $ac_status" >&5

   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag


@@ -22946,7 +22999,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi

-echo "$as_me:22949: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:23002: 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
 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6
 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then
   cat >>confdefs.h <<EOF


@@ -22959,13 +23012,13 @@ done
 for ac_func in fork vfork
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
 for ac_func in fork vfork
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`

-echo "$as_me:22962: checking for $ac_func" >&5
+echo "$as_me:23015: 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
 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 22968 "configure"
+#line 23021 "configure"

 #include "confdefs.h"
 #define $ac_func autoconf_temporary
 #include <limits.h>    /* least-intrusive standard header which defines gcc2 __stub macros */
 #include "confdefs.h"
 #define $ac_func autoconf_temporary
 #include <limits.h>    /* least-intrusive standard header which defines gcc2 __stub macros */


@@ -22996,16 +23049,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"

-if { (eval echo "$as_me:22999: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23052: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:23002: \$? = $ac_status" >&5
+  echo "$as_me:23055: \$? = $ac_status" >&5

   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'

-  { (eval echo "$as_me:23005: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23058: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:23008: \$? = $ac_status" >&5
+  echo "$as_me:23061: \$? = $ac_status" >&5

   (exit "$ac_status"); }; }; then
   eval "$as_ac_var=yes"
 else
   (exit "$ac_status"); }; }; then
   eval "$as_ac_var=yes"
 else


@@ -23015,7 +23068,7 @@ eval "$as_ac_var=no"
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi

-echo "$as_me:23018: result: `eval echo '${'"$as_ac_var"'}'`" >&5
+echo "$as_me:23071: 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
 echo "${ECHO_T}`eval echo '${'"$as_ac_var"'}'`" >&6
 if test "`eval echo '${'"$as_ac_var"'}'`" = yes; then
   cat >>confdefs.h <<EOF


@@ -23027,7 +23080,7 @@ done
 
 ac_cv_func_fork_works=$ac_cv_func_fork
 if test "x$ac_cv_func_fork" = xyes; then
 
 ac_cv_func_fork_works=$ac_cv_func_fork
 if test "x$ac_cv_func_fork" = xyes; then

-  echo "$as_me:23030: checking for working fork" >&5
+  echo "$as_me:23083: 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
 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


@@ -23050,15 +23103,15 @@ else
       }
 _ACEOF
 rm -f "conftest$ac_exeext"
       }
 _ACEOF
 rm -f "conftest$ac_exeext"

-if { (eval echo "$as_me:23053: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23106: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:23056: \$? = $ac_status" >&5
+  echo "$as_me:23109: \$? = $ac_status" >&5

   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'

-  { (eval echo "$as_me:23058: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23111: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:23061: \$? = $ac_status" >&5
+  echo "$as_me:23114: \$? = $ac_status" >&5

   (exit "$ac_status"); }; }; then
   ac_cv_func_fork_works=yes
 else
   (exit "$ac_status"); }; }; then
   ac_cv_func_fork_works=yes
 else


@@ -23070,7 +23123,7 @@ fi
 rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 fi
 rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 fi

-echo "$as_me:23073: result: $ac_cv_func_fork_works" >&5
+echo "$as_me:23126: result: $ac_cv_func_fork_works" >&5

 echo "${ECHO_T}$ac_cv_func_fork_works" >&6
 
 fi
 echo "${ECHO_T}$ac_cv_func_fork_works" >&6
 
 fi


@@ -23084,12 +23137,12 @@ if test "x$ac_cv_func_fork_works" = xcross; then
       ac_cv_func_fork_works=yes
       ;;
   esac
       ac_cv_func_fork_works=yes
       ;;
   esac

-  { echo "$as_me:23087: WARNING: CROSS: Result $ac_cv_func_fork_works guessed due to cross-compiling." >&5
+  { echo "$as_me:23140: 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: 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:23092: checking for working vfork" >&5
+  echo "$as_me:23145: 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
 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


@@ -23098,7 +23151,7 @@ else
   ac_cv_func_vfork_works=cross
 else
   cat >"conftest.$ac_ext" <<_ACEOF
   ac_cv_func_vfork_works=cross
 else
   cat >"conftest.$ac_ext" <<_ACEOF

-#line 23101 "configure"
+#line 23154 "configure"

 #include "confdefs.h"
 /* Thanks to Paul Eggert for this test.  */
 #include <stdio.h>
 #include "confdefs.h"
 /* Thanks to Paul Eggert for this test.  */
 #include <stdio.h>


@@ -23195,15 +23248,15 @@ main (void)
 }
 _ACEOF
 rm -f "conftest$ac_exeext"
 }
 _ACEOF
 rm -f "conftest$ac_exeext"

-if { (eval echo "$as_me:23198: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23251: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:23201: \$? = $ac_status" >&5
+  echo "$as_me:23254: \$? = $ac_status" >&5

   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'

-  { (eval echo "$as_me:23203: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23256: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:23206: \$? = $ac_status" >&5
+  echo "$as_me:23259: \$? = $ac_status" >&5

   (exit "$ac_status"); }; }; then
   ac_cv_func_vfork_works=yes
 else
   (exit "$ac_status"); }; }; then
   ac_cv_func_vfork_works=yes
 else


@@ -23215,13 +23268,13 @@ fi
 rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 fi
 rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 fi

-echo "$as_me:23218: result: $ac_cv_func_vfork_works" >&5
+echo "$as_me:23271: 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 "${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:23224: WARNING: CROSS: Result $ac_cv_func_vfork_works guessed due to cross-compiling." >&5
+  { echo "$as_me:23277: 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
 
 echo "$as_me: WARNING: CROSS: Result $ac_cv_func_vfork_works guessed due to cross-compiling." >&2;}
 fi
 


@@ -23246,7 +23299,7 @@ EOF
 
 fi
 
 
 fi
 

-echo "$as_me:23249: checking if fopen accepts explicit binary mode" >&5
+echo "$as_me:23302: checking if fopen accepts explicit binary mode" >&5

 echo $ECHO_N "checking if fopen accepts explicit binary mode... $ECHO_C" >&6
 if test "${cf_cv_fopen_bin_r+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 echo $ECHO_N "checking if fopen accepts explicit binary mode... $ECHO_C" >&6
 if test "${cf_cv_fopen_bin_r+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6


@@ -23256,7 +23309,7 @@ else
   cf_cv_fopen_bin_r=unknown
 else
   cat >"conftest.$ac_ext" <<_ACEOF
   cf_cv_fopen_bin_r=unknown
 else
   cat >"conftest.$ac_ext" <<_ACEOF

-#line 23259 "configure"
+#line 23312 "configure"

 #include "confdefs.h"
 
 #include <stdio.h>
 #include "confdefs.h"
 
 #include <stdio.h>


@@ -23289,15 +23342,15 @@ int main(void) {
 
 _ACEOF
 rm -f "conftest$ac_exeext"
 
 _ACEOF
 rm -f "conftest$ac_exeext"

-if { (eval echo "$as_me:23292: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23345: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:23295: \$? = $ac_status" >&5
+  echo "$as_me:23348: \$? = $ac_status" >&5

   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'

-  { (eval echo "$as_me:23297: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23350: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:23300: \$? = $ac_status" >&5
+  echo "$as_me:23353: \$? = $ac_status" >&5

   (exit "$ac_status"); }; }; then
   cf_cv_fopen_bin_r=yes
 else
   (exit "$ac_status"); }; }; then
   cf_cv_fopen_bin_r=yes
 else


@@ -23310,7 +23363,7 @@ rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftes
 fi
 
 fi
 fi
 
 fi

-echo "$as_me:23313: result: $cf_cv_fopen_bin_r" >&5
+echo "$as_me:23366: result: $cf_cv_fopen_bin_r" >&5

 echo "${ECHO_T}$cf_cv_fopen_bin_r" >&6
 test "x$cf_cv_fopen_bin_r" != xno &&
 cat >>confdefs.h <<\EOF
 echo "${ECHO_T}$cf_cv_fopen_bin_r" >&6
 test "x$cf_cv_fopen_bin_r" != xno &&
 cat >>confdefs.h <<\EOF


@@ -23319,7 +23372,7 @@ EOF
 
 # special check for test/ditto.c
 
 
 # special check for test/ditto.c
 

-echo "$as_me:23322: checking for openpty in -lutil" >&5
+echo "$as_me:23375: 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
 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


@@ -23327,7 +23380,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lutil  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lutil  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF

-#line 23330 "configure"
+#line 23383 "configure"

 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */


@@ -23346,16 +23399,16 @@ openpty ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"

-if { (eval echo "$as_me:23349: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23402: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:23352: \$? = $ac_status" >&5
+  echo "$as_me:23405: \$? = $ac_status" >&5

   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'

-  { (eval echo "$as_me:23355: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23408: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:23358: \$? = $ac_status" >&5
+  echo "$as_me:23411: \$? = $ac_status" >&5

   (exit "$ac_status"); }; }; then
   ac_cv_lib_util_openpty=yes
 else
   (exit "$ac_status"); }; }; then
   ac_cv_lib_util_openpty=yes
 else


@@ -23366,7 +23419,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi

-echo "$as_me:23369: result: $ac_cv_lib_util_openpty" >&5
+echo "$as_me:23422: 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
 echo "${ECHO_T}$ac_cv_lib_util_openpty" >&6
 if test "$ac_cv_lib_util_openpty" = yes; then
   cf_cv_lib_util=yes


@@ -23374,7 +23427,7 @@ else
   cf_cv_lib_util=no
 fi
 
   cf_cv_lib_util=no
 fi
 

-echo "$as_me:23377: checking for openpty header" >&5
+echo "$as_me:23430: 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
 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


@@ -23401,7 +23454,7 @@ LIBS="$cf_add_libs"
        for cf_header in pty.h libutil.h util.h
        do
        cat >"conftest.$ac_ext" <<_ACEOF
        for cf_header in pty.h libutil.h util.h
        do
        cat >"conftest.$ac_ext" <<_ACEOF

-#line 23404 "configure"
+#line 23457 "configure"

 #include "confdefs.h"
 
 #include <$cf_header>
 #include "confdefs.h"
 
 #include <$cf_header>


@@ -23418,16 +23471,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"

-if { (eval echo "$as_me:23421: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23474: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:23424: \$? = $ac_status" >&5
+  echo "$as_me:23477: \$? = $ac_status" >&5

   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'

-  { (eval echo "$as_me:23427: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23480: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:23430: \$? = $ac_status" >&5
+  echo "$as_me:23483: \$? = $ac_status" >&5

   (exit "$ac_status"); }; }; then
 
                cf_cv_func_openpty=$cf_header
   (exit "$ac_status"); }; }; then
 
                cf_cv_func_openpty=$cf_header


@@ -23445,7 +23498,7 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
        LIBS="$cf_save_LIBS"
 
 fi
        LIBS="$cf_save_LIBS"
 
 fi

-echo "$as_me:23448: result: $cf_cv_func_openpty" >&5
+echo "$as_me:23501: result: $cf_cv_func_openpty" >&5

 echo "${ECHO_T}$cf_cv_func_openpty" >&6
 
 if test "$cf_cv_func_openpty" != no ; then
 echo "${ECHO_T}$cf_cv_func_openpty" >&6
 
 if test "$cf_cv_func_openpty" != no ; then


@@ -23518,7 +23571,7 @@ if test -n "$with_hashed_db/include" ; then
        CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
 
                          cat >"conftest.$ac_ext" <<_ACEOF
        CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
 
                          cat >"conftest.$ac_ext" <<_ACEOF

-#line 23521 "configure"
+#line 23574 "configure"

 #include "confdefs.h"
 #include <stdio.h>
 int
 #include "confdefs.h"
 #include <stdio.h>
 int


@@ -23530,16 +23583,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
 }
 _ACEOF
 rm -f "conftest.$ac_objext"

-if { (eval echo "$as_me:23533: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:23586: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:23536: \$? = $ac_status" >&5
+  echo "$as_me:23589: \$? = $ac_status" >&5

   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'

-  { (eval echo "$as_me:23539: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23592: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:23542: \$? = $ac_status" >&5
+  echo "$as_me:23595: \$? = $ac_status" >&5

   (exit "$ac_status"); }; }; then
   :
 else
   (exit "$ac_status"); }; }; then
   :
 else


@@ -23556,7 +23609,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
                if test "$cf_have_incdir" = no ; then
                  test -n "$verbose" && echo "  adding $cf_add_incdir to include-path" 1>&6
 
                if test "$cf_have_incdir" = no ; then
                  test -n "$verbose" && echo "  adding $cf_add_incdir to include-path" 1>&6
 

-echo "${as_me:-configure}:23559: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:23612: testing adding $cf_add_incdir to include-path ..." 1>&5

 
                  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
 
                  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 


@@ -23592,7 +23645,7 @@ if test -n "$with_hashed_db/lib" ; then
                        if test "$cf_have_libdir" = no ; then
                                test -n "$verbose" && echo "    adding $cf_add_libdir to library-path" 1>&6
 
                        if test "$cf_have_libdir" = no ; then
                                test -n "$verbose" && echo "    adding $cf_add_libdir to library-path" 1>&6
 

-echo "${as_me:-configure}:23595: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:23648: testing adding $cf_add_libdir to library-path ..." 1>&5

 
                                LDFLAGS="-L$cf_add_libdir $LDFLAGS"
                        fi
 
                                LDFLAGS="-L$cf_add_libdir $LDFLAGS"
                        fi


@@ -23603,7 +23656,7 @@ fi
        else
                case "$with_hashed_db" in
                (./*|../*|/*)
        else
                case "$with_hashed_db" in
                (./*|../*|/*)

-                       { echo "$as_me:23606: WARNING: no such directory $with_hashed_db" >&5
+                       { echo "$as_me:23659: WARNING: no such directory $with_hashed_db" >&5

 echo "$as_me: WARNING: no such directory $with_hashed_db" >&2;}
                        ;;
                (*)
 echo "$as_me: WARNING: no such directory $with_hashed_db" >&2;}
                        ;;
                (*)


@@ -23675,7 +23728,7 @@ if test -n "$cf_item" ; then
        CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
 
                          cat >"conftest.$ac_ext" <<_ACEOF
        CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
 
                          cat >"conftest.$ac_ext" <<_ACEOF

-#line 23678 "configure"
+#line 23731 "configure"

 #include "confdefs.h"
 #include <stdio.h>
 int
 #include "confdefs.h"
 #include <stdio.h>
 int


@@ -23687,16 +23740,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
 }
 _ACEOF
 rm -f "conftest.$ac_objext"

-if { (eval echo "$as_me:23690: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:23743: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:23693: \$? = $ac_status" >&5
+  echo "$as_me:23746: \$? = $ac_status" >&5

   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'

-  { (eval echo "$as_me:23696: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23749: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:23699: \$? = $ac_status" >&5
+  echo "$as_me:23752: \$? = $ac_status" >&5

   (exit "$ac_status"); }; }; then
   :
 else
   (exit "$ac_status"); }; }; then
   :
 else


@@ -23713,7 +23766,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
                if test "$cf_have_incdir" = no ; then
                  test -n "$verbose" && echo "  adding $cf_add_incdir to include-path" 1>&6
 
                if test "$cf_have_incdir" = no ; then
                  test -n "$verbose" && echo "  adding $cf_add_incdir to include-path" 1>&6
 

-echo "${as_me:-configure}:23716: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:23769: testing adding $cf_add_incdir to include-path ..." 1>&5

 
                  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
 
                  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 


@@ -23793,7 +23846,7 @@ if test -n "$cf_item" ; then
                        if test "$cf_have_libdir" = no ; then
                                test -n "$verbose" && echo "    adding $cf_add_libdir to library-path" 1>&6
 
                        if test "$cf_have_libdir" = no ; then
                                test -n "$verbose" && echo "    adding $cf_add_libdir to library-path" 1>&6
 

-echo "${as_me:-configure}:23796: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:23849: testing adding $cf_add_libdir to library-path ..." 1>&5

 
                                LDFLAGS="-L$cf_add_libdir $LDFLAGS"
                        fi
 
                                LDFLAGS="-L$cf_add_libdir $LDFLAGS"
                        fi


@@ -23810,23 +23863,23 @@ fi
        fi
 esac
 
        fi
 esac
 

-echo "$as_me:23813: checking for db.h" >&5
+echo "$as_me:23866: 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
 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 23819 "configure"
+#line 23872 "configure"

 #include "confdefs.h"
 #include <db.h>
 _ACEOF
 #include "confdefs.h"
 #include <db.h>
 _ACEOF

-if { (eval echo "$as_me:23823: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:23876: \"$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
   (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:23829: \$? = $ac_status" >&5
+  echo "$as_me:23882: \$? = $ac_status" >&5

   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag


@@ -23845,11 +23898,11 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi

-echo "$as_me:23848: result: $ac_cv_header_db_h" >&5
+echo "$as_me:23901: 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 "${ECHO_T}$ac_cv_header_db_h" >&6
 if test "$ac_cv_header_db_h" = yes; then
 

-echo "$as_me:23852: checking for version of db" >&5
+echo "$as_me:23905: 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
 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


@@ -23860,10 +23913,10 @@ cf_cv_hashed_db_version=unknown
 for cf_db_version in 1 2 3 4 5 6
 do
 
 for cf_db_version in 1 2 3 4 5 6
 do
 

-echo "${as_me:-configure}:23863: testing checking for db version $cf_db_version ..." 1>&5
+echo "${as_me:-configure}:23916: testing checking for db version $cf_db_version ..." 1>&5

 
        cat >"conftest.$ac_ext" <<_ACEOF
 
        cat >"conftest.$ac_ext" <<_ACEOF

-#line 23866 "configure"
+#line 23919 "configure"

 #include "confdefs.h"
 
 $ac_includes_default
 #include "confdefs.h"
 
 $ac_includes_default


@@ -23893,16 +23946,16 @@ DBT *foo = 0
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
 }
 _ACEOF
 rm -f "conftest.$ac_objext"

-if { (eval echo "$as_me:23896: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:23949: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:23899: \$? = $ac_status" >&5
+  echo "$as_me:23952: \$? = $ac_status" >&5

   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'

-  { (eval echo "$as_me:23902: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23955: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:23905: \$? = $ac_status" >&5
+  echo "$as_me:23958: \$? = $ac_status" >&5

   (exit "$ac_status"); }; }; then
 
        cf_cv_hashed_db_version=$cf_db_version
   (exit "$ac_status"); }; }; then
 
        cf_cv_hashed_db_version=$cf_db_version


@@ -23916,16 +23969,16 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 done
 
 fi
 done
 
 fi

-echo "$as_me:23919: result: $cf_cv_hashed_db_version" >&5
+echo "$as_me:23972: 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 "${ECHO_T}$cf_cv_hashed_db_version" >&6
 
 if test "$cf_cv_hashed_db_version" = unknown ; then

-       { { echo "$as_me:23923: error: Cannot determine version of db" >&5
+       { { echo "$as_me:23976: 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: error: Cannot determine version of db" >&2;}
    { (exit 1); exit 1; }; }
 else
 

-echo "$as_me:23928: checking for db libraries" >&5
+echo "$as_me:23981: 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
 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


@@ -23955,10 +24008,10 @@ LIBS="$cf_add_libs"
 
        fi
 
 
        fi
 

-echo "${as_me:-configure}:23958: testing checking for library $cf_db_libs ..." 1>&5
+echo "${as_me:-configure}:24011: testing checking for library $cf_db_libs ..." 1>&5

 
        cat >"conftest.$ac_ext" <<_ACEOF
 
        cat >"conftest.$ac_ext" <<_ACEOF

-#line 23961 "configure"
+#line 24014 "configure"

 #include "confdefs.h"
 
 $ac_includes_default
 #include "confdefs.h"
 
 $ac_includes_default


@@ -24013,16 +24066,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"

-if { (eval echo "$as_me:24016: \"$ac_link\"") >&5
+if { (eval echo "$as_me:24069: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:24019: \$? = $ac_status" >&5
+  echo "$as_me:24072: \$? = $ac_status" >&5

   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'

-  { (eval echo "$as_me:24022: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24075: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:24025: \$? = $ac_status" >&5
+  echo "$as_me:24078: \$? = $ac_status" >&5

   (exit "$ac_status"); }; }; then
 
        if test -n "$cf_db_libs" ; then
   (exit "$ac_status"); }; }; then
 
        if test -n "$cf_db_libs" ; then


@@ -24042,11 +24095,11 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 done
 
 fi
 done
 
 fi

-echo "$as_me:24045: result: $cf_cv_hashed_db_libs" >&5
+echo "$as_me:24098: 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 "${ECHO_T}$cf_cv_hashed_db_libs" >&6
 
        if test "$cf_cv_hashed_db_libs" = unknown ; then

-               { { echo "$as_me:24049: error: Cannot determine library for db" >&5
+               { { echo "$as_me:24102: 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
 echo "$as_me: error: Cannot determine library for db" >&2;}
    { (exit 1); exit 1; }; }
        elif test "$cf_cv_hashed_db_libs" != default ; then


@@ -24072,7 +24125,7 @@ fi
 
 else
 
 
 else
 

-       { { echo "$as_me:24075: error: Cannot find db.h" >&5
+       { { echo "$as_me:24128: error: Cannot find db.h" >&5

 echo "$as_me: error: Cannot find db.h" >&2;}
    { (exit 1); exit 1; }; }
 
 echo "$as_me: error: Cannot find db.h" >&2;}
    { (exit 1); exit 1; }; }
 


@@ -24087,7 +24140,7 @@ fi
 
 # Just in case, check if the C compiler has a bool type.
 
 
 # Just in case, check if the C compiler has a bool type.
 

-echo "$as_me:24090: checking if we should include stdbool.h" >&5
+echo "$as_me:24143: 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
 echo $ECHO_N "checking if we should include stdbool.h... $ECHO_C" >&6
 
 if test "${cf_cv_header_stdbool_h+set}" = set; then


@@ -24095,7 +24148,7 @@ if test "${cf_cv_header_stdbool_h+set}" = set; then
 else
 
        cat >"conftest.$ac_ext" <<_ACEOF
 else
 
        cat >"conftest.$ac_ext" <<_ACEOF

-#line 24098 "configure"
+#line 24151 "configure"

 #include "confdefs.h"
 
 int
 #include "confdefs.h"
 
 int


@@ -24107,23 +24160,23 @@ bool foo = false
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
 }
 _ACEOF
 rm -f "conftest.$ac_objext"

-if { (eval echo "$as_me:24110: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:24163: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:24113: \$? = $ac_status" >&5
+  echo "$as_me:24166: \$? = $ac_status" >&5

   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'

-  { (eval echo "$as_me:24116: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24169: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:24119: \$? = $ac_status" >&5
+  echo "$as_me:24172: \$? = $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
   (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 24126 "configure"
+#line 24179 "configure"

 #include "confdefs.h"
 
 #ifndef __BEOS__
 #include "confdefs.h"
 
 #ifndef __BEOS__


@@ -24139,16 +24192,16 @@ bool foo = false
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
 }
 _ACEOF
 rm -f "conftest.$ac_objext"

-if { (eval echo "$as_me:24142: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:24195: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:24145: \$? = $ac_status" >&5
+  echo "$as_me:24198: \$? = $ac_status" >&5

   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'

-  { (eval echo "$as_me:24148: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24201: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:24151: \$? = $ac_status" >&5
+  echo "$as_me:24204: \$? = $ac_status" >&5

   (exit "$ac_status"); }; }; then
   cf_cv_header_stdbool_h=1
 else
   (exit "$ac_status"); }; }; then
   cf_cv_header_stdbool_h=1
 else


@@ -24162,13 +24215,13 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 
 if test "$cf_cv_header_stdbool_h" = 1
 fi
 
 if test "$cf_cv_header_stdbool_h" = 1

-then   echo "$as_me:24165: result: yes" >&5
+then   echo "$as_me:24218: result: yes" >&5

 echo "${ECHO_T}yes" >&6
 echo "${ECHO_T}yes" >&6

-else   echo "$as_me:24167: result: no" >&5
+else   echo "$as_me:24220: result: no" >&5

 echo "${ECHO_T}no" >&6
 fi
 
 echo "${ECHO_T}no" >&6
 fi
 

-echo "$as_me:24171: checking for builtin bool type" >&5
+echo "$as_me:24224: 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
 echo $ECHO_N "checking for builtin bool type... $ECHO_C" >&6
 
 if test "${cf_cv_cc_bool_type+set}" = set; then


@@ -24176,7 +24229,7 @@ if test "${cf_cv_cc_bool_type+set}" = set; then
 else
 
        cat >"conftest.$ac_ext" <<_ACEOF
 else
 
        cat >"conftest.$ac_ext" <<_ACEOF

-#line 24179 "configure"
+#line 24232 "configure"

 #include "confdefs.h"
 
 #include <stdio.h>
 #include "confdefs.h"
 
 #include <stdio.h>


@@ -24191,16 +24244,16 @@ bool x = false
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
 }
 _ACEOF
 rm -f "conftest.$ac_objext"

-if { (eval echo "$as_me:24194: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:24247: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:24197: \$? = $ac_status" >&5
+  echo "$as_me:24250: \$? = $ac_status" >&5

   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'

-  { (eval echo "$as_me:24200: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24253: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:24203: \$? = $ac_status" >&5
+  echo "$as_me:24256: \$? = $ac_status" >&5

   (exit "$ac_status"); }; }; then
   cf_cv_cc_bool_type=1
 else
   (exit "$ac_status"); }; }; then
   cf_cv_cc_bool_type=1
 else


@@ -24213,9 +24266,9 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 
 if test "$cf_cv_cc_bool_type" = 1
 fi
 
 if test "$cf_cv_cc_bool_type" = 1

-then   echo "$as_me:24216: result: yes" >&5
+then   echo "$as_me:24269: result: yes" >&5

 echo "${ECHO_T}yes" >&6
 echo "${ECHO_T}yes" >&6

-else   echo "$as_me:24218: result: no" >&5
+else   echo "$as_me:24271: result: no" >&5

 echo "${ECHO_T}no" >&6
 fi
 
 echo "${ECHO_T}no" >&6
 fi
 


@@ -24232,10 +24285,10 @@ if test -n "$GXX" ; then
 
        cf_save="$LIBS"
        LIBS="$LIBS $CXXLIBS"
 
        cf_save="$LIBS"
        LIBS="$LIBS $CXXLIBS"

-       echo "$as_me:24235: checking if we already have C++ library" >&5
+       echo "$as_me:24288: 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
 echo $ECHO_N "checking if we already have C++ library... $ECHO_C" >&6
        cat >"conftest.$ac_ext" <<_ACEOF

-#line 24238 "configure"
+#line 24291 "configure"

 #include "confdefs.h"
 
                        #include <iostream>
 #include "confdefs.h"
 
                        #include <iostream>


@@ -24249,16 +24302,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"

-if { (eval echo "$as_me:24252: \"$ac_link\"") >&5
+if { (eval echo "$as_me:24305: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:24255: \$? = $ac_status" >&5
+  echo "$as_me:24308: \$? = $ac_status" >&5

   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'

-  { (eval echo "$as_me:24258: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24311: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:24261: \$? = $ac_status" >&5
+  echo "$as_me:24314: \$? = $ac_status" >&5

   (exit "$ac_status"); }; }; then
   cf_have_libstdcpp=yes
 else
   (exit "$ac_status"); }; }; then
   cf_have_libstdcpp=yes
 else


@@ -24267,7 +24320,7 @@ cat "conftest.$ac_ext" >&5
 cf_have_libstdcpp=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 cf_have_libstdcpp=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"

-       echo "$as_me:24270: result: $cf_have_libstdcpp" >&5
+       echo "$as_me:24323: result: $cf_have_libstdcpp" >&5

 echo "${ECHO_T}$cf_have_libstdcpp" >&6
        LIBS="$cf_save"
 
 echo "${ECHO_T}$cf_have_libstdcpp" >&6
        LIBS="$cf_save"
 


@@ -24286,7 +24339,7 @@ echo "${ECHO_T}$cf_have_libstdcpp" >&6
                        ;;
                esac
 
                        ;;
                esac
 

-               echo "$as_me:24289: checking for library $cf_stdcpp_libname" >&5
+               echo "$as_me:24342: 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
 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


@@ -24312,7 +24365,7 @@ done
 LIBS="$cf_add_libs"
 
                cat >"conftest.$ac_ext" <<_ACEOF
 LIBS="$cf_add_libs"
 
                cat >"conftest.$ac_ext" <<_ACEOF

-#line 24315 "configure"
+#line 24368 "configure"

 #include "confdefs.h"
 
                                #include <iostream>
 #include "confdefs.h"
 
                                #include <iostream>


@@ -24326,16 +24379,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"

-if { (eval echo "$as_me:24329: \"$ac_link\"") >&5
+if { (eval echo "$as_me:24382: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:24332: \$? = $ac_status" >&5
+  echo "$as_me:24385: \$? = $ac_status" >&5

   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'

-  { (eval echo "$as_me:24335: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24388: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:24338: \$? = $ac_status" >&5
+  echo "$as_me:24391: \$? = $ac_status" >&5

   (exit "$ac_status"); }; }; then
   cf_cv_libstdcpp=yes
 else
   (exit "$ac_status"); }; }; then
   cf_cv_libstdcpp=yes
 else


@@ -24347,7 +24400,7 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
                        LIBS="$cf_save"
 
 fi
                        LIBS="$cf_save"
 
 fi

-echo "$as_me:24350: result: $cf_cv_libstdcpp" >&5
+echo "$as_me:24403: result: $cf_cv_libstdcpp" >&5

 echo "${ECHO_T}$cf_cv_libstdcpp" >&6
                test "$cf_cv_libstdcpp" = yes && {
 cf_add_libs="$CXXLIBS"
 echo "${ECHO_T}$cf_cv_libstdcpp" >&6
                test "$cf_cv_libstdcpp" = yes && {
 cf_add_libs="$CXXLIBS"


@@ -24369,7 +24422,7 @@ CXXLIBS="$cf_add_libs"
        fi
 fi
 
        fi
 fi
 

-       echo "$as_me:24372: checking whether $CXX understands -c and -o together" >&5
+       echo "$as_me:24425: 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
 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


@@ -24384,15 +24437,15 @@ CF_EOF
 # We do the test twice because some compilers refuse to overwrite an
 # existing .o file with -o, though they will create one.
 ac_try='$CXX $CXXFLAGS $CPPFLAGS -c conftest.$ac_ext -o conftest2.$ac_objext >&5'
 # We do the test twice because some compilers refuse to overwrite an
 # existing .o file with -o, though they will create one.
 ac_try='$CXX $CXXFLAGS $CPPFLAGS -c conftest.$ac_ext -o conftest2.$ac_objext >&5'

-if { (eval echo "$as_me:24387: \"$ac_try\"") >&5
+if { (eval echo "$as_me:24440: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:24390: \$? = $ac_status" >&5
+  echo "$as_me:24443: \$? = $ac_status" >&5

   (exit "$ac_status"); } &&
   (exit "$ac_status"); } &&

-  test -f conftest2.$ac_objext && { (eval echo "$as_me:24392: \"$ac_try\"") >&5
+  test -f conftest2.$ac_objext && { (eval echo "$as_me:24445: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:24395: \$? = $ac_status" >&5
+  echo "$as_me:24448: \$? = $ac_status" >&5

   (exit "$ac_status"); };
 then
   eval cf_cv_prog_CXX_c_o=yes
   (exit "$ac_status"); };
 then
   eval cf_cv_prog_CXX_c_o=yes


@@ -24403,10 +24456,10 @@ rm -rf ./conftest*
 
 fi
 if test "$cf_cv_prog_CXX_c_o" = yes; then
 
 fi
 if test "$cf_cv_prog_CXX_c_o" = yes; then

-  echo "$as_me:24406: result: yes" >&5
+  echo "$as_me:24459: result: yes" >&5

 echo "${ECHO_T}yes" >&6
 else
 echo "${ECHO_T}yes" >&6
 else

-  echo "$as_me:24409: result: no" >&5
+  echo "$as_me:24462: result: no" >&5

 echo "${ECHO_T}no" >&6
 fi
 
 echo "${ECHO_T}no" >&6
 fi
 


@@ -24426,7 +24479,7 @@ case "$cf_cv_system_name" in
        ;;
 esac
 if test "$GXX" = yes; then
        ;;
 esac
 if test "$GXX" = yes; then

-       echo "$as_me:24429: checking for lib$cf_gpp_libname" >&5
+       echo "$as_me:24482: checking for lib$cf_gpp_libname" >&5

 echo $ECHO_N "checking for lib$cf_gpp_libname... $ECHO_C" >&6
        cf_save="$LIBS"
 
 echo $ECHO_N "checking for lib$cf_gpp_libname... $ECHO_C" >&6
        cf_save="$LIBS"
 


@@ -24447,7 +24500,7 @@ done
 LIBS="$cf_add_libs"
 
        cat >"conftest.$ac_ext" <<_ACEOF
 LIBS="$cf_add_libs"
 
        cat >"conftest.$ac_ext" <<_ACEOF

-#line 24450 "configure"
+#line 24503 "configure"

 #include "confdefs.h"
 
 #include <$cf_gpp_libname/builtin.h>
 #include "confdefs.h"
 
 #include <$cf_gpp_libname/builtin.h>


@@ -24461,16 +24514,16 @@ two_arg_error_handler_t foo2 = lib_error_handler
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"

-if { (eval echo "$as_me:24464: \"$ac_link\"") >&5
+if { (eval echo "$as_me:24517: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:24467: \$? = $ac_status" >&5
+  echo "$as_me:24520: \$? = $ac_status" >&5

   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'

-  { (eval echo "$as_me:24470: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24523: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:24473: \$? = $ac_status" >&5
+  echo "$as_me:24526: \$? = $ac_status" >&5

   (exit "$ac_status"); }; }; then
   cf_cxx_library=yes
 
   (exit "$ac_status"); }; }; then
   cf_cxx_library=yes
 


@@ -24507,7 +24560,7 @@ else
   echo "$as_me: failed program was:" >&5
 cat "conftest.$ac_ext" >&5
 cat >"conftest.$ac_ext" <<_ACEOF
   echo "$as_me: failed program was:" >&5
 cat "conftest.$ac_ext" >&5
 cat >"conftest.$ac_ext" <<_ACEOF

-#line 24510 "configure"
+#line 24563 "configure"

 #include "confdefs.h"
 
 #include <builtin.h>
 #include "confdefs.h"
 
 #include <builtin.h>


@@ -24521,16 +24574,16 @@ two_arg_error_handler_t foo2 = lib_error_handler
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"

-if { (eval echo "$as_me:24524: \"$ac_link\"") >&5
+if { (eval echo "$as_me:24577: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:24527: \$? = $ac_status" >&5
+  echo "$as_me:24580: \$? = $ac_status" >&5

   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'

-  { (eval echo "$as_me:24530: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24583: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:24533: \$? = $ac_status" >&5
+  echo "$as_me:24586: \$? = $ac_status" >&5

   (exit "$ac_status"); }; }; then
   cf_cxx_library=yes
 
   (exit "$ac_status"); }; }; then
   cf_cxx_library=yes
 


@@ -24563,7 +24616,7 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
        LIBS="$cf_save"
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
        LIBS="$cf_save"

-       echo "$as_me:24566: result: $cf_cxx_library" >&5
+       echo "$as_me:24619: result: $cf_cxx_library" >&5

 echo "${ECHO_T}$cf_cxx_library" >&6
 fi
 
 echo "${ECHO_T}$cf_cxx_library" >&6
 fi
 


@@ -24579,7 +24632,7 @@ ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS "conftest.$ac_ext" >&5'
 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"
 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:24582: checking how to run the C++ preprocessor" >&5
+echo "$as_me:24635: 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
 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


@@ -24596,18 +24649,18 @@ do
   # 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
   # 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 24599 "configure"
+#line 24652 "configure"

 #include "confdefs.h"
 #include <assert.h>
                      Syntax error
 _ACEOF
 #include "confdefs.h"
 #include <assert.h>
                      Syntax error
 _ACEOF

-if { (eval echo "$as_me:24604: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:24657: \"$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
   (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:24610: \$? = $ac_status" >&5
+  echo "$as_me:24663: \$? = $ac_status" >&5

   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_cxx_preproc_warn_flag
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_cxx_preproc_warn_flag


@@ -24630,17 +24683,17 @@ rm -f conftest.err "conftest.$ac_ext"
   # OK, works on sane cases.  Now check whether non-existent headers
   # can be detected and how.
   cat >"conftest.$ac_ext" <<_ACEOF
   # OK, works on sane cases.  Now check whether non-existent headers
   # can be detected and how.
   cat >"conftest.$ac_ext" <<_ACEOF

-#line 24633 "configure"
+#line 24686 "configure"

 #include "confdefs.h"
 #include <ac_nonexistent.h>
 _ACEOF
 #include "confdefs.h"
 #include <ac_nonexistent.h>
 _ACEOF

-if { (eval echo "$as_me:24637: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:24690: \"$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
   (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:24643: \$? = $ac_status" >&5
+  echo "$as_me:24696: \$? = $ac_status" >&5

   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_cxx_preproc_warn_flag
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_cxx_preproc_warn_flag


@@ -24677,7 +24730,7 @@ fi
 else
   ac_cv_prog_CXXCPP=$CXXCPP
 fi
 else
   ac_cv_prog_CXXCPP=$CXXCPP
 fi

-echo "$as_me:24680: result: $CXXCPP" >&5
+echo "$as_me:24733: result: $CXXCPP" >&5

 echo "${ECHO_T}$CXXCPP" >&6
 ac_preproc_ok=false
 for ac_cxx_preproc_warn_flag in '' yes
 echo "${ECHO_T}$CXXCPP" >&6
 ac_preproc_ok=false
 for ac_cxx_preproc_warn_flag in '' yes


@@ -24687,18 +24740,18 @@ do
   # 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
   # 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 24690 "configure"
+#line 24743 "configure"

 #include "confdefs.h"
 #include <assert.h>
                      Syntax error
 _ACEOF
 #include "confdefs.h"
 #include <assert.h>
                      Syntax error
 _ACEOF

-if { (eval echo "$as_me:24695: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:24748: \"$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
   (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:24701: \$? = $ac_status" >&5
+  echo "$as_me:24754: \$? = $ac_status" >&5

   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_cxx_preproc_warn_flag
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_cxx_preproc_warn_flag


@@ -24721,17 +24774,17 @@ rm -f conftest.err "conftest.$ac_ext"
   # OK, works on sane cases.  Now check whether non-existent headers
   # can be detected and how.
   cat >"conftest.$ac_ext" <<_ACEOF
   # OK, works on sane cases.  Now check whether non-existent headers
   # can be detected and how.
   cat >"conftest.$ac_ext" <<_ACEOF

-#line 24724 "configure"
+#line 24777 "configure"

 #include "confdefs.h"
 #include <ac_nonexistent.h>
 _ACEOF
 #include "confdefs.h"
 #include <ac_nonexistent.h>
 _ACEOF

-if { (eval echo "$as_me:24728: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:24781: \"$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
   (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:24734: \$? = $ac_status" >&5
+  echo "$as_me:24787: \$? = $ac_status" >&5

   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_cxx_preproc_warn_flag
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_cxx_preproc_warn_flag


@@ -24759,7 +24812,7 @@ rm -f conftest.err "conftest.$ac_ext"
 if $ac_preproc_ok; then
   :
 else
 if $ac_preproc_ok; then
   :
 else

-  { { echo "$as_me:24762: error: C++ preprocessor \"$CXXCPP\" fails sanity check" >&5
+  { { echo "$as_me:24815: error: C++ preprocessor \"$CXXCPP\" fails sanity check" >&5

 echo "$as_me: error: C++ preprocessor \"$CXXCPP\" fails sanity check" >&2;}
    { (exit 1); exit 1; }; }
 fi
 echo "$as_me: error: C++ preprocessor \"$CXXCPP\" fails sanity check" >&2;}
    { (exit 1); exit 1; }; }
 fi


@@ -24774,23 +24827,23 @@ ac_main_return="return"
 for ac_header in typeinfo
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
 for ac_header in typeinfo
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`

-echo "$as_me:24777: checking for $ac_header" >&5
+echo "$as_me:24830: 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
 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 24783 "configure"
+#line 24836 "configure"

 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF

-if { (eval echo "$as_me:24787: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:24840: \"$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
   (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:24793: \$? = $ac_status" >&5
+  echo "$as_me:24846: \$? = $ac_status" >&5

   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_cxx_preproc_warn_flag
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_cxx_preproc_warn_flag


@@ -24809,7 +24862,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi

-echo "$as_me:24812: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:24865: 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
 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6
 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then
   cat >>confdefs.h <<EOF


@@ -24822,23 +24875,23 @@ done
 for ac_header in iostream
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
 for ac_header in iostream
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`

-echo "$as_me:24825: checking for $ac_header" >&5
+echo "$as_me:24878: 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
 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 24831 "configure"
+#line 24884 "configure"

 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF

-if { (eval echo "$as_me:24835: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:24888: \"$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
   (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:24841: \$? = $ac_status" >&5
+  echo "$as_me:24894: \$? = $ac_status" >&5

   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_cxx_preproc_warn_flag
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_cxx_preproc_warn_flag


@@ -24857,7 +24910,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi

-echo "$as_me:24860: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:24913: 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
 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6
 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then
   cat >>confdefs.h <<EOF


@@ -24868,10 +24921,10 @@ fi
 done
 
 if test x"$ac_cv_header_iostream" = xyes ; then
 done
 
 if test x"$ac_cv_header_iostream" = xyes ; then

-       echo "$as_me:24871: checking if iostream uses std-namespace" >&5
+       echo "$as_me:24924: checking if iostream uses std-namespace" >&5

 echo $ECHO_N "checking if iostream uses std-namespace... $ECHO_C" >&6
        cat >"conftest.$ac_ext" <<_ACEOF
 echo $ECHO_N "checking if iostream uses std-namespace... $ECHO_C" >&6
        cat >"conftest.$ac_ext" <<_ACEOF

-#line 24874 "configure"
+#line 24927 "configure"

 #include "confdefs.h"
 
 #include <iostream>
 #include "confdefs.h"
 
 #include <iostream>


@@ -24888,16 +24941,16 @@ cerr << "testing" << endl;
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
 }
 _ACEOF
 rm -f "conftest.$ac_objext"

-if { (eval echo "$as_me:24891: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:24944: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:24894: \$? = $ac_status" >&5
+  echo "$as_me:24947: \$? = $ac_status" >&5

   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'

-  { (eval echo "$as_me:24897: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24950: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:24900: \$? = $ac_status" >&5
+  echo "$as_me:24953: \$? = $ac_status" >&5

   (exit "$ac_status"); }; }; then
   cf_iostream_namespace=yes
 else
   (exit "$ac_status"); }; }; then
   cf_iostream_namespace=yes
 else


@@ -24906,7 +24959,7 @@ cat "conftest.$ac_ext" >&5
 cf_iostream_namespace=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 cf_iostream_namespace=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"

-       echo "$as_me:24909: result: $cf_iostream_namespace" >&5
+       echo "$as_me:24962: result: $cf_iostream_namespace" >&5

 echo "${ECHO_T}$cf_iostream_namespace" >&6
        if test "$cf_iostream_namespace" = yes ; then
 
 echo "${ECHO_T}$cf_iostream_namespace" >&6
        if test "$cf_iostream_namespace" = yes ; then
 


@@ -24917,7 +24970,7 @@ EOF
        fi
 fi
 
        fi
 fi
 

-echo "$as_me:24920: checking if we should include stdbool.h" >&5
+echo "$as_me:24973: 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
 echo $ECHO_N "checking if we should include stdbool.h... $ECHO_C" >&6
 
 if test "${cf_cv_header_stdbool_h+set}" = set; then


@@ -24925,7 +24978,7 @@ if test "${cf_cv_header_stdbool_h+set}" = set; then
 else
 
        cat >"conftest.$ac_ext" <<_ACEOF
 else
 
        cat >"conftest.$ac_ext" <<_ACEOF

-#line 24928 "configure"
+#line 24981 "configure"

 #include "confdefs.h"
 
 int
 #include "confdefs.h"
 
 int


@@ -24937,23 +24990,23 @@ bool foo = false
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
 }
 _ACEOF
 rm -f "conftest.$ac_objext"

-if { (eval echo "$as_me:24940: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:24993: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:24943: \$? = $ac_status" >&5
+  echo "$as_me:24996: \$? = $ac_status" >&5

   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'

-  { (eval echo "$as_me:24946: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24999: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:24949: \$? = $ac_status" >&5
+  echo "$as_me:25002: \$? = $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
   (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 24956 "configure"
+#line 25009 "configure"

 #include "confdefs.h"
 
 #ifndef __BEOS__
 #include "confdefs.h"
 
 #ifndef __BEOS__


@@ -24969,16 +25022,16 @@ bool foo = false
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
 }
 _ACEOF
 rm -f "conftest.$ac_objext"

-if { (eval echo "$as_me:24972: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:25025: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:24975: \$? = $ac_status" >&5
+  echo "$as_me:25028: \$? = $ac_status" >&5

   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'

-  { (eval echo "$as_me:24978: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25031: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:24981: \$? = $ac_status" >&5
+  echo "$as_me:25034: \$? = $ac_status" >&5

   (exit "$ac_status"); }; }; then
   cf_cv_header_stdbool_h=1
 else
   (exit "$ac_status"); }; }; then
   cf_cv_header_stdbool_h=1
 else


@@ -24992,13 +25045,13 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 
 if test "$cf_cv_header_stdbool_h" = 1
 fi
 
 if test "$cf_cv_header_stdbool_h" = 1

-then   echo "$as_me:24995: result: yes" >&5
+then   echo "$as_me:25048: result: yes" >&5

 echo "${ECHO_T}yes" >&6
 echo "${ECHO_T}yes" >&6

-else   echo "$as_me:24997: result: no" >&5
+else   echo "$as_me:25050: result: no" >&5

 echo "${ECHO_T}no" >&6
 fi
 
 echo "${ECHO_T}no" >&6
 fi
 

-echo "$as_me:25001: checking for builtin bool type" >&5
+echo "$as_me:25054: 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
 echo $ECHO_N "checking for builtin bool type... $ECHO_C" >&6
 
 if test "${cf_cv_builtin_bool+set}" = set; then


@@ -25006,7 +25059,7 @@ if test "${cf_cv_builtin_bool+set}" = set; then
 else
 
        cat >"conftest.$ac_ext" <<_ACEOF
 else
 
        cat >"conftest.$ac_ext" <<_ACEOF

-#line 25009 "configure"
+#line 25062 "configure"

 #include "confdefs.h"
 
 #include <stdio.h>
 #include "confdefs.h"
 
 #include <stdio.h>


@@ -25021,16 +25074,16 @@ bool x = false
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
 }
 _ACEOF
 rm -f "conftest.$ac_objext"

-if { (eval echo "$as_me:25024: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:25077: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:25027: \$? = $ac_status" >&5
+  echo "$as_me:25080: \$? = $ac_status" >&5

   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'

-  { (eval echo "$as_me:25030: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25083: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:25033: \$? = $ac_status" >&5
+  echo "$as_me:25086: \$? = $ac_status" >&5

   (exit "$ac_status"); }; }; then
   cf_cv_builtin_bool=1
 else
   (exit "$ac_status"); }; }; then
   cf_cv_builtin_bool=1
 else


@@ -25043,19 +25096,19 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 
 if test "$cf_cv_builtin_bool" = 1
 fi
 
 if test "$cf_cv_builtin_bool" = 1

-then   echo "$as_me:25046: result: yes" >&5
+then   echo "$as_me:25099: result: yes" >&5

 echo "${ECHO_T}yes" >&6
 echo "${ECHO_T}yes" >&6

-else   echo "$as_me:25048: result: no" >&5
+else   echo "$as_me:25101: result: no" >&5

 echo "${ECHO_T}no" >&6
 fi
 
 echo "${ECHO_T}no" >&6
 fi
 

-echo "$as_me:25052: checking for bool" >&5
+echo "$as_me:25105: checking for bool" >&5

 echo $ECHO_N "checking for bool... $ECHO_C" >&6
 if test "${ac_cv_type_bool+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >"conftest.$ac_ext" <<_ACEOF
 echo $ECHO_N "checking for bool... $ECHO_C" >&6
 if test "${ac_cv_type_bool+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >"conftest.$ac_ext" <<_ACEOF

-#line 25058 "configure"
+#line 25111 "configure"

 #include "confdefs.h"
 
 #include <stdlib.h>
 #include "confdefs.h"
 
 #include <stdlib.h>


@@ -25091,16 +25144,16 @@ if (sizeof (bool))
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
 }
 _ACEOF
 rm -f "conftest.$ac_objext"

-if { (eval echo "$as_me:25094: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:25147: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:25097: \$? = $ac_status" >&5
+  echo "$as_me:25150: \$? = $ac_status" >&5

   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'

-  { (eval echo "$as_me:25100: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25153: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:25103: \$? = $ac_status" >&5
+  echo "$as_me:25156: \$? = $ac_status" >&5

   (exit "$ac_status"); }; }; then
   ac_cv_type_bool=yes
 else
   (exit "$ac_status"); }; }; then
   ac_cv_type_bool=yes
 else


@@ -25110,10 +25163,10 @@ ac_cv_type_bool=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi

-echo "$as_me:25113: result: $ac_cv_type_bool" >&5
+echo "$as_me:25166: result: $ac_cv_type_bool" >&5

 echo "${ECHO_T}$ac_cv_type_bool" >&6
 
 echo "${ECHO_T}$ac_cv_type_bool" >&6
 

-echo "$as_me:25116: checking size of bool" >&5
+echo "$as_me:25169: checking size of bool" >&5

 echo $ECHO_N "checking size of bool... $ECHO_C" >&6
 if test "${ac_cv_sizeof_bool+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 echo $ECHO_N "checking size of bool... $ECHO_C" >&6
 if test "${ac_cv_sizeof_bool+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6


@@ -25122,7 +25175,7 @@ else
   if test "$cross_compiling" = yes; then
   # Depending upon the size, compute the lo and hi bounds.
 cat >"conftest.$ac_ext" <<_ACEOF
   if test "$cross_compiling" = yes; then
   # Depending upon the size, compute the lo and hi bounds.
 cat >"conftest.$ac_ext" <<_ACEOF

-#line 25125 "configure"
+#line 25178 "configure"

 #include "confdefs.h"
 
 #include <stdlib.h>
 #include "confdefs.h"
 
 #include <stdlib.h>


@@ -25155,21 +25208,21 @@ int _array_ [1 - 2 * !((sizeof (bool)) >= 0)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
 }
 _ACEOF
 rm -f "conftest.$ac_objext"

-if { (eval echo "$as_me:25158: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:25211: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:25161: \$? = $ac_status" >&5
+  echo "$as_me:25214: \$? = $ac_status" >&5

   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'

-  { (eval echo "$as_me:25164: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25217: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:25167: \$? = $ac_status" >&5
+  echo "$as_me:25220: \$? = $ac_status" >&5

   (exit "$ac_status"); }; }; then
   ac_lo=0 ac_mid=0
   while :; do
     cat >"conftest.$ac_ext" <<_ACEOF
   (exit "$ac_status"); }; }; then
   ac_lo=0 ac_mid=0
   while :; do
     cat >"conftest.$ac_ext" <<_ACEOF

-#line 25172 "configure"
+#line 25225 "configure"

 #include "confdefs.h"
 
 #include <stdlib.h>
 #include "confdefs.h"
 
 #include <stdlib.h>


@@ -25202,16 +25255,16 @@ int _array_ [1 - 2 * !((sizeof (bool)) <= $ac_mid)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
 }
 _ACEOF
 rm -f "conftest.$ac_objext"

-if { (eval echo "$as_me:25205: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:25258: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:25208: \$? = $ac_status" >&5
+  echo "$as_me:25261: \$? = $ac_status" >&5

   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'

-  { (eval echo "$as_me:25211: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25264: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:25214: \$? = $ac_status" >&5
+  echo "$as_me:25267: \$? = $ac_status" >&5

   (exit "$ac_status"); }; }; then
   ac_hi=$ac_mid; break
 else
   (exit "$ac_status"); }; }; then
   ac_hi=$ac_mid; break
 else


@@ -25227,7 +25280,7 @@ cat "conftest.$ac_ext" >&5
 ac_hi=-1 ac_mid=-1
   while :; do
     cat >"conftest.$ac_ext" <<_ACEOF
 ac_hi=-1 ac_mid=-1
   while :; do
     cat >"conftest.$ac_ext" <<_ACEOF

-#line 25230 "configure"
+#line 25283 "configure"

 #include "confdefs.h"
 
 #include <stdlib.h>
 #include "confdefs.h"
 
 #include <stdlib.h>


@@ -25260,16 +25313,16 @@ int _array_ [1 - 2 * !((sizeof (bool)) >= $ac_mid)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
 }
 _ACEOF
 rm -f "conftest.$ac_objext"

-if { (eval echo "$as_me:25263: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:25316: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:25266: \$? = $ac_status" >&5
+  echo "$as_me:25319: \$? = $ac_status" >&5

   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'

-  { (eval echo "$as_me:25269: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25322: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:25272: \$? = $ac_status" >&5
+  echo "$as_me:25325: \$? = $ac_status" >&5

   (exit "$ac_status"); }; }; then
   ac_lo=$ac_mid; break
 else
   (exit "$ac_status"); }; }; then
   ac_lo=$ac_mid; break
 else


@@ -25285,7 +25338,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 while test "x$ac_lo" != "x$ac_hi"; do
   ac_mid=`expr '(' "$ac_hi" - "$ac_lo" ')' / 2 + "$ac_lo"`
   cat >"conftest.$ac_ext" <<_ACEOF
 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 25288 "configure"
+#line 25341 "configure"

 #include "confdefs.h"
 
 #include <stdlib.h>
 #include "confdefs.h"
 
 #include <stdlib.h>


@@ -25318,16 +25371,16 @@ int _array_ [1 - 2 * !((sizeof (bool)) <= $ac_mid)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
 }
 _ACEOF
 rm -f "conftest.$ac_objext"

-if { (eval echo "$as_me:25321: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:25374: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:25324: \$? = $ac_status" >&5
+  echo "$as_me:25377: \$? = $ac_status" >&5

   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'

-  { (eval echo "$as_me:25327: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25380: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:25330: \$? = $ac_status" >&5
+  echo "$as_me:25383: \$? = $ac_status" >&5

   (exit "$ac_status"); }; }; then
   ac_hi=$ac_mid
 else
   (exit "$ac_status"); }; }; then
   ac_hi=$ac_mid
 else


@@ -25340,12 +25393,12 @@ done
 ac_cv_sizeof_bool=$ac_lo
 else
   if test "$cross_compiling" = yes; then
 ac_cv_sizeof_bool=$ac_lo
 else
   if test "$cross_compiling" = yes; then

-  { { echo "$as_me:25343: error: cannot run test program while cross compiling" >&5
+  { { echo "$as_me:25396: 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
 echo "$as_me: error: cannot run test program while cross compiling" >&2;}
    { (exit 1); exit 1; }; }
 else
   cat >"conftest.$ac_ext" <<_ACEOF

-#line 25348 "configure"
+#line 25401 "configure"

 #include "confdefs.h"
 
 #include <stdlib.h>
 #include "confdefs.h"
 
 #include <stdlib.h>


@@ -25375,22 +25428,22 @@ main (void)
 FILE *f = fopen ("conftest.val", "w");
 if (!f)
   $ac_main_return (1);
 FILE *f = fopen ("conftest.val", "w");
 if (!f)
   $ac_main_return (1);

-fprintf (f, "%d", (sizeof (bool)));
+fprintf (f, "%ld", (long)(sizeof (bool)));

 fclose (f);
   ;
   return 0;
 }
 _ACEOF
 rm -f "conftest$ac_exeext"
 fclose (f);
   ;
   return 0;
 }
 _ACEOF
 rm -f "conftest$ac_exeext"

-if { (eval echo "$as_me:25385: \"$ac_link\"") >&5
+if { (eval echo "$as_me:25438: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:25388: \$? = $ac_status" >&5
+  echo "$as_me:25441: \$? = $ac_status" >&5

   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'

-  { (eval echo "$as_me:25390: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25443: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:25393: \$? = $ac_status" >&5
+  echo "$as_me:25446: \$? = $ac_status" >&5

   (exit "$ac_status"); }; }; then
   ac_cv_sizeof_bool=`cat conftest.val`
 else
   (exit "$ac_status"); }; }; then
   ac_cv_sizeof_bool=`cat conftest.val`
 else


@@ -25406,13 +25459,13 @@ else
   ac_cv_sizeof_bool=0
 fi
 fi
   ac_cv_sizeof_bool=0
 fi
 fi

-echo "$as_me:25409: result: $ac_cv_sizeof_bool" >&5
+echo "$as_me:25462: result: $ac_cv_sizeof_bool" >&5

 echo "${ECHO_T}$ac_cv_sizeof_bool" >&6
 cat >>confdefs.h <<EOF
 #define SIZEOF_BOOL $ac_cv_sizeof_bool
 EOF
 
 echo "${ECHO_T}$ac_cv_sizeof_bool" >&6
 cat >>confdefs.h <<EOF
 #define SIZEOF_BOOL $ac_cv_sizeof_bool
 EOF
 

-echo "$as_me:25415: checking for type of bool" >&5
+echo "$as_me:25468: checking for type of bool" >&5

 echo $ECHO_N "checking for type of bool... $ECHO_C" >&6
 if test "${cf_cv_type_of_bool+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 echo $ECHO_N "checking for type of bool... $ECHO_C" >&6
 if test "${cf_cv_type_of_bool+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6


@@ -25431,7 +25484,7 @@ else
 
 else
   cat >"conftest.$ac_ext" <<_ACEOF
 
 else
   cat >"conftest.$ac_ext" <<_ACEOF

-#line 25434 "configure"
+#line 25487 "configure"

 #include "confdefs.h"
 
 #include <stdlib.h>
 #include "confdefs.h"
 
 #include <stdlib.h>


@@ -25473,15 +25526,15 @@ int main(void)
 
 _ACEOF
 rm -f "conftest$ac_exeext"
 
 _ACEOF
 rm -f "conftest$ac_exeext"

-if { (eval echo "$as_me:25476: \"$ac_link\"") >&5
+if { (eval echo "$as_me:25529: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:25479: \$? = $ac_status" >&5
+  echo "$as_me:25532: \$? = $ac_status" >&5

   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'

-  { (eval echo "$as_me:25481: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25534: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:25484: \$? = $ac_status" >&5
+  echo "$as_me:25537: \$? = $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
   (exit "$ac_status"); }; }; then
   cf_cv_type_of_bool=`cat cf_test.out`
                 if test -z "$cf_cv_type_of_bool"; then


@@ -25498,19 +25551,19 @@ fi
        rm -f cf_test.out
 
 fi
        rm -f cf_test.out
 
 fi

-echo "$as_me:25501: result: $cf_cv_type_of_bool" >&5
+echo "$as_me:25554: 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 "${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:25508: WARNING: Assuming $NCURSES_BOOL for type of bool" >&5
+       { echo "$as_me:25561: 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: WARNING: Assuming $NCURSES_BOOL for type of bool" >&2;}
        cf_cv_type_of_bool=$NCURSES_BOOL
 fi
 

-echo "$as_me:25513: checking for special defines needed for etip.h" >&5
+echo "$as_me:25566: 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"
 echo $ECHO_N "checking for special defines needed for etip.h... $ECHO_C" >&6
 cf_save_CXXFLAGS="$CXXFLAGS"
 cf_result="none"


@@ -25528,7 +25581,7 @@ do
        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
        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 25531 "configure"
+#line 25584 "configure"

 #include "confdefs.h"
 
 #include <etip.h.in>
 #include "confdefs.h"
 
 #include <etip.h.in>


@@ -25542,16 +25595,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
 }
 _ACEOF
 rm -f "conftest.$ac_objext"

-if { (eval echo "$as_me:25545: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:25598: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:25548: \$? = $ac_status" >&5
+  echo "$as_me:25601: \$? = $ac_status" >&5

   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'

-  { (eval echo "$as_me:25551: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25604: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:25554: \$? = $ac_status" >&5
+  echo "$as_me:25607: \$? = $ac_status" >&5

   (exit "$ac_status"); }; }; then
 
        test -n "$cf_math" && cat >>confdefs.h <<EOF
   (exit "$ac_status"); }; }; then
 
        test -n "$cf_math" && cat >>confdefs.h <<EOF


@@ -25572,12 +25625,12 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 done
 done
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 done
 done

-echo "$as_me:25575: result: $cf_result" >&5
+echo "$as_me:25628: result: $cf_result" >&5

 echo "${ECHO_T}$cf_result" >&6
 CXXFLAGS="$cf_save_CXXFLAGS"
 
 if test -n "$CXX"; then
 echo "${ECHO_T}$cf_result" >&6
 CXXFLAGS="$cf_save_CXXFLAGS"
 
 if test -n "$CXX"; then

-echo "$as_me:25580: checking if $CXX accepts parameter initialization" >&5
+echo "$as_me:25633: 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
 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


@@ -25594,7 +25647,7 @@ ac_main_return="return"
   cf_cv_cpp_param_init=unknown
 else
   cat >"conftest.$ac_ext" <<_ACEOF
   cf_cv_cpp_param_init=unknown
 else
   cat >"conftest.$ac_ext" <<_ACEOF

-#line 25597 "configure"
+#line 25650 "configure"

 #include "confdefs.h"
 
 class TEST {
 #include "confdefs.h"
 
 class TEST {


@@ -25613,15 +25666,15 @@ int main(void) { }
 
 _ACEOF
 rm -f "conftest$ac_exeext"
 
 _ACEOF
 rm -f "conftest$ac_exeext"

-if { (eval echo "$as_me:25616: \"$ac_link\"") >&5
+if { (eval echo "$as_me:25669: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:25619: \$? = $ac_status" >&5
+  echo "$as_me:25672: \$? = $ac_status" >&5

   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'

-  { (eval echo "$as_me:25621: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25674: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:25624: \$? = $ac_status" >&5
+  echo "$as_me:25677: \$? = $ac_status" >&5

   (exit "$ac_status"); }; }; then
   cf_cv_cpp_param_init=yes
 else
   (exit "$ac_status"); }; }; then
   cf_cv_cpp_param_init=yes
 else


@@ -25640,7 +25693,7 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
 ac_main_return="return"
 
 fi
 ac_main_return="return"
 
 fi

-echo "$as_me:25643: result: $cf_cv_cpp_param_init" >&5
+echo "$as_me:25696: result: $cf_cv_cpp_param_init" >&5

 echo "${ECHO_T}$cf_cv_cpp_param_init" >&6
 fi
 test "$cf_cv_cpp_param_init" = yes &&
 echo "${ECHO_T}$cf_cv_cpp_param_init" >&6
 fi
 test "$cf_cv_cpp_param_init" = yes &&


@@ -25650,7 +25703,7 @@ EOF
 
 if test -n "$CXX"; then
 
 
 if test -n "$CXX"; then
 

-echo "$as_me:25653: checking if $CXX accepts static_cast" >&5
+echo "$as_me:25706: 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
 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


@@ -25664,7 +25717,7 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
 ac_main_return="return"
 
        cat >"conftest.$ac_ext" <<_ACEOF
 ac_main_return="return"
 
        cat >"conftest.$ac_ext" <<_ACEOF

-#line 25667 "configure"
+#line 25720 "configure"

 #include "confdefs.h"
 
 class NCursesPanel
 #include "confdefs.h"
 
 class NCursesPanel


@@ -25708,16 +25761,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
 }
 _ACEOF
 rm -f "conftest.$ac_objext"

-if { (eval echo "$as_me:25711: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:25764: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:25714: \$? = $ac_status" >&5
+  echo "$as_me:25767: \$? = $ac_status" >&5

   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'

-  { (eval echo "$as_me:25717: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25770: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:25720: \$? = $ac_status" >&5
+  echo "$as_me:25773: \$? = $ac_status" >&5

   (exit "$ac_status"); }; }; then
   cf_cv_cpp_static_cast=yes
 else
   (exit "$ac_status"); }; }; then
   cf_cv_cpp_static_cast=yes
 else


@@ -25735,7 +25788,7 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
 ac_main_return="return"
 
 fi
 ac_main_return="return"
 
 fi

-echo "$as_me:25738: result: $cf_cv_cpp_static_cast" >&5
+echo "$as_me:25791: result: $cf_cv_cpp_static_cast" >&5

 echo "${ECHO_T}$cf_cv_cpp_static_cast" >&6
 
 fi
 echo "${ECHO_T}$cf_cv_cpp_static_cast" >&6
 
 fi


@@ -25784,13 +25837,13 @@ else
        else
                if test "$cf_cv_header_stdbool_h" = 1 ; then
 
        else
                if test "$cf_cv_header_stdbool_h" = 1 ; then
 

-echo "$as_me:25787: checking for bool" >&5
+echo "$as_me:25840: checking for bool" >&5

 echo $ECHO_N "checking for bool... $ECHO_C" >&6
 if test "${ac_cv_type_bool+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >"conftest.$ac_ext" <<_ACEOF
 echo $ECHO_N "checking for bool... $ECHO_C" >&6
 if test "${ac_cv_type_bool+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >"conftest.$ac_ext" <<_ACEOF

-#line 25793 "configure"
+#line 25846 "configure"

 #include "confdefs.h"
 
 #include <stdlib.h>
 #include "confdefs.h"
 
 #include <stdlib.h>


@@ -25826,16 +25879,16 @@ if (sizeof (bool))
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
 }
 _ACEOF
 rm -f "conftest.$ac_objext"

-if { (eval echo "$as_me:25829: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:25882: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:25832: \$? = $ac_status" >&5
+  echo "$as_me:25885: \$? = $ac_status" >&5

   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'

-  { (eval echo "$as_me:25835: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25888: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:25838: \$? = $ac_status" >&5
+  echo "$as_me:25891: \$? = $ac_status" >&5

   (exit "$ac_status"); }; }; then
   ac_cv_type_bool=yes
 else
   (exit "$ac_status"); }; }; then
   ac_cv_type_bool=yes
 else


@@ -25845,10 +25898,10 @@ ac_cv_type_bool=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi

-echo "$as_me:25848: result: $ac_cv_type_bool" >&5
+echo "$as_me:25901: result: $ac_cv_type_bool" >&5

 echo "${ECHO_T}$ac_cv_type_bool" >&6
 
 echo "${ECHO_T}$ac_cv_type_bool" >&6
 

-echo "$as_me:25851: checking size of bool" >&5
+echo "$as_me:25904: checking size of bool" >&5

 echo $ECHO_N "checking size of bool... $ECHO_C" >&6
 if test "${ac_cv_sizeof_bool+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 echo $ECHO_N "checking size of bool... $ECHO_C" >&6
 if test "${ac_cv_sizeof_bool+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6


@@ -25857,7 +25910,7 @@ else
   if test "$cross_compiling" = yes; then
   # Depending upon the size, compute the lo and hi bounds.
 cat >"conftest.$ac_ext" <<_ACEOF
   if test "$cross_compiling" = yes; then
   # Depending upon the size, compute the lo and hi bounds.
 cat >"conftest.$ac_ext" <<_ACEOF

-#line 25860 "configure"
+#line 25913 "configure"

 #include "confdefs.h"
 
 #include <stdlib.h>
 #include "confdefs.h"
 
 #include <stdlib.h>


@@ -25890,21 +25943,21 @@ int _array_ [1 - 2 * !((sizeof (bool)) >= 0)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
 }
 _ACEOF
 rm -f "conftest.$ac_objext"

-if { (eval echo "$as_me:25893: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:25946: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:25896: \$? = $ac_status" >&5
+  echo "$as_me:25949: \$? = $ac_status" >&5

   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'

-  { (eval echo "$as_me:25899: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25952: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:25902: \$? = $ac_status" >&5
+  echo "$as_me:25955: \$? = $ac_status" >&5

   (exit "$ac_status"); }; }; then
   ac_lo=0 ac_mid=0
   while :; do
     cat >"conftest.$ac_ext" <<_ACEOF
   (exit "$ac_status"); }; }; then
   ac_lo=0 ac_mid=0
   while :; do
     cat >"conftest.$ac_ext" <<_ACEOF

-#line 25907 "configure"
+#line 25960 "configure"

 #include "confdefs.h"
 
 #include <stdlib.h>
 #include "confdefs.h"
 
 #include <stdlib.h>


@@ -25937,16 +25990,16 @@ int _array_ [1 - 2 * !((sizeof (bool)) <= $ac_mid)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
 }
 _ACEOF
 rm -f "conftest.$ac_objext"

-if { (eval echo "$as_me:25940: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:25993: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:25943: \$? = $ac_status" >&5
+  echo "$as_me:25996: \$? = $ac_status" >&5

   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'

-  { (eval echo "$as_me:25946: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25999: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:25949: \$? = $ac_status" >&5
+  echo "$as_me:26002: \$? = $ac_status" >&5

   (exit "$ac_status"); }; }; then
   ac_hi=$ac_mid; break
 else
   (exit "$ac_status"); }; }; then
   ac_hi=$ac_mid; break
 else


@@ -25962,7 +26015,7 @@ cat "conftest.$ac_ext" >&5
 ac_hi=-1 ac_mid=-1
   while :; do
     cat >"conftest.$ac_ext" <<_ACEOF
 ac_hi=-1 ac_mid=-1
   while :; do
     cat >"conftest.$ac_ext" <<_ACEOF

-#line 25965 "configure"
+#line 26018 "configure"

 #include "confdefs.h"
 
 #include <stdlib.h>
 #include "confdefs.h"
 
 #include <stdlib.h>


@@ -25995,16 +26048,16 @@ int _array_ [1 - 2 * !((sizeof (bool)) >= $ac_mid)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
 }
 _ACEOF
 rm -f "conftest.$ac_objext"

-if { (eval echo "$as_me:25998: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:26051: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:26001: \$? = $ac_status" >&5
+  echo "$as_me:26054: \$? = $ac_status" >&5

   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'

-  { (eval echo "$as_me:26004: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26057: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:26007: \$? = $ac_status" >&5
+  echo "$as_me:26060: \$? = $ac_status" >&5

   (exit "$ac_status"); }; }; then
   ac_lo=$ac_mid; break
 else
   (exit "$ac_status"); }; }; then
   ac_lo=$ac_mid; break
 else


@@ -26020,7 +26073,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 while test "x$ac_lo" != "x$ac_hi"; do
   ac_mid=`expr '(' "$ac_hi" - "$ac_lo" ')' / 2 + "$ac_lo"`
   cat >"conftest.$ac_ext" <<_ACEOF
 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 26023 "configure"
+#line 26076 "configure"

 #include "confdefs.h"
 
 #include <stdlib.h>
 #include "confdefs.h"
 
 #include <stdlib.h>


@@ -26053,16 +26106,16 @@ int _array_ [1 - 2 * !((sizeof (bool)) <= $ac_mid)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
 }
 _ACEOF
 rm -f "conftest.$ac_objext"

-if { (eval echo "$as_me:26056: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:26109: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:26059: \$? = $ac_status" >&5
+  echo "$as_me:26112: \$? = $ac_status" >&5

   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'

-  { (eval echo "$as_me:26062: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26115: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:26065: \$? = $ac_status" >&5
+  echo "$as_me:26118: \$? = $ac_status" >&5

   (exit "$ac_status"); }; }; then
   ac_hi=$ac_mid
 else
   (exit "$ac_status"); }; }; then
   ac_hi=$ac_mid
 else


@@ -26075,12 +26128,12 @@ done
 ac_cv_sizeof_bool=$ac_lo
 else
   if test "$cross_compiling" = yes; then
 ac_cv_sizeof_bool=$ac_lo
 else
   if test "$cross_compiling" = yes; then

-  { { echo "$as_me:26078: error: cannot run test program while cross compiling" >&5
+  { { echo "$as_me:26131: 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
 echo "$as_me: error: cannot run test program while cross compiling" >&2;}
    { (exit 1); exit 1; }; }
 else
   cat >"conftest.$ac_ext" <<_ACEOF

-#line 26083 "configure"
+#line 26136 "configure"

 #include "confdefs.h"
 
 #include <stdlib.h>
 #include "confdefs.h"
 
 #include <stdlib.h>


@@ -26110,22 +26163,22 @@ main (void)
 FILE *f = fopen ("conftest.val", "w");
 if (!f)
   $ac_main_return (1);
 FILE *f = fopen ("conftest.val", "w");
 if (!f)
   $ac_main_return (1);

-fprintf (f, "%d", (sizeof (bool)));
+fprintf (f, "%ld", (long)(sizeof (bool)));

 fclose (f);
   ;
   return 0;
 }
 _ACEOF
 rm -f "conftest$ac_exeext"
 fclose (f);
   ;
   return 0;
 }
 _ACEOF
 rm -f "conftest$ac_exeext"

-if { (eval echo "$as_me:26120: \"$ac_link\"") >&5
+if { (eval echo "$as_me:26173: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:26123: \$? = $ac_status" >&5
+  echo "$as_me:26176: \$? = $ac_status" >&5

   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'

-  { (eval echo "$as_me:26125: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26178: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:26128: \$? = $ac_status" >&5
+  echo "$as_me:26181: \$? = $ac_status" >&5

   (exit "$ac_status"); }; }; then
   ac_cv_sizeof_bool=`cat conftest.val`
 else
   (exit "$ac_status"); }; }; then
   ac_cv_sizeof_bool=`cat conftest.val`
 else


@@ -26141,13 +26194,13 @@ else
   ac_cv_sizeof_bool=0
 fi
 fi
   ac_cv_sizeof_bool=0
 fi
 fi

-echo "$as_me:26144: result: $ac_cv_sizeof_bool" >&5
+echo "$as_me:26197: result: $ac_cv_sizeof_bool" >&5

 echo "${ECHO_T}$ac_cv_sizeof_bool" >&6
 cat >>confdefs.h <<EOF
 #define SIZEOF_BOOL $ac_cv_sizeof_bool
 EOF
 
 echo "${ECHO_T}$ac_cv_sizeof_bool" >&6
 cat >>confdefs.h <<EOF
 #define SIZEOF_BOOL $ac_cv_sizeof_bool
 EOF
 

-echo "$as_me:26150: checking for type of bool" >&5
+echo "$as_me:26203: checking for type of bool" >&5

 echo $ECHO_N "checking for type of bool... $ECHO_C" >&6
 if test "${cf_cv_type_of_bool+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 echo $ECHO_N "checking for type of bool... $ECHO_C" >&6
 if test "${cf_cv_type_of_bool+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6


@@ -26166,7 +26219,7 @@ else
 
 else
   cat >"conftest.$ac_ext" <<_ACEOF
 
 else
   cat >"conftest.$ac_ext" <<_ACEOF

-#line 26169 "configure"
+#line 26222 "configure"

 #include "confdefs.h"
 
 #include <stdlib.h>
 #include "confdefs.h"
 
 #include <stdlib.h>


@@ -26208,15 +26261,15 @@ int main(void)
 
 _ACEOF
 rm -f "conftest$ac_exeext"
 
 _ACEOF
 rm -f "conftest$ac_exeext"

-if { (eval echo "$as_me:26211: \"$ac_link\"") >&5
+if { (eval echo "$as_me:26264: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:26214: \$? = $ac_status" >&5
+  echo "$as_me:26267: \$? = $ac_status" >&5

   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'

-  { (eval echo "$as_me:26216: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26269: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:26219: \$? = $ac_status" >&5
+  echo "$as_me:26272: \$? = $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
   (exit "$ac_status"); }; }; then
   cf_cv_type_of_bool=`cat cf_test.out`
                 if test -z "$cf_cv_type_of_bool"; then


@@ -26233,26 +26286,26 @@ fi
        rm -f cf_test.out
 
 fi
        rm -f cf_test.out
 
 fi

-echo "$as_me:26236: result: $cf_cv_type_of_bool" >&5
+echo "$as_me:26289: 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 "${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:26243: WARNING: Assuming $NCURSES_BOOL for type of bool" >&5
+       { echo "$as_me:26296: 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: WARNING: Assuming $NCURSES_BOOL for type of bool" >&2;}
        cf_cv_type_of_bool=$NCURSES_BOOL
 fi
 
                else

-                       echo "$as_me:26249: checking for fallback type of bool" >&5
+                       echo "$as_me:26302: 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 $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:26255: result: $cf_cv_type_of_bool" >&5
+                       echo "$as_me:26308: result: $cf_cv_type_of_bool" >&5

 echo "${ECHO_T}$cf_cv_type_of_bool" >&6
                fi
        fi
 echo "${ECHO_T}$cf_cv_type_of_bool" >&6
                fi
        fi


@@ -26281,7 +26334,7 @@ if test -f "${srcdir}/Ada95/Makefile.in" ; then
 
        if test "$cf_with_ada" != "no" ; then
                if test "$with_libtool" != "no"; then
 
        if test "$cf_with_ada" != "no" ; then
                if test "$with_libtool" != "no"; then

-                       { echo "$as_me:26284: WARNING: libtool does not support Ada - disabling feature" >&5
+                       { echo "$as_me:26337: 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
 echo "$as_me: WARNING: libtool does not support Ada - disabling feature" >&2;}
                        cf_with_ada=no
                fi


@@ -26298,7 +26351,7 @@ cf_upper_prog_gnat=`echo "${cf_prog_gnat}" | sed y%abcdefghijklmnopqrstuvwxyz./-
        unset cf_TEMP_gnat
        # Extract the first word of "$cf_prog_gnat", so it can be a program name with args.
 set dummy $cf_prog_gnat; ac_word=$2
        unset cf_TEMP_gnat
        # Extract the first word of "$cf_prog_gnat", so it can be a program name with args.
 set dummy $cf_prog_gnat; ac_word=$2

-echo "$as_me:26301: checking for $ac_word" >&5
+echo "$as_me:26354: checking for $ac_word" >&5

 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_path_cf_TEMP_gnat+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_path_cf_TEMP_gnat+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6


@@ -26315,7 +26368,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   if $as_executable_p "$ac_dir/$ac_word"; then
    ac_cv_path_cf_TEMP_gnat="$ac_dir/$ac_word"
   test -z "$ac_dir" && ac_dir=.
   if $as_executable_p "$ac_dir/$ac_word"; then
    ac_cv_path_cf_TEMP_gnat="$ac_dir/$ac_word"

-   echo "$as_me:26318: found $ac_dir/$ac_word" >&5
+   echo "$as_me:26371: found $ac_dir/$ac_word" >&5

    break
 fi
 done
    break
 fi
 done


@@ -26327,10 +26380,10 @@ fi
 cf_TEMP_gnat=$ac_cv_path_cf_TEMP_gnat
 
 if test -n "$cf_TEMP_gnat"; then
 cf_TEMP_gnat=$ac_cv_path_cf_TEMP_gnat
 
 if test -n "$cf_TEMP_gnat"; then

-  echo "$as_me:26330: result: $cf_TEMP_gnat" >&5
+  echo "$as_me:26383: result: $cf_TEMP_gnat" >&5

 echo "${ECHO_T}$cf_TEMP_gnat" >&6
 else
 echo "${ECHO_T}$cf_TEMP_gnat" >&6
 else

-  echo "$as_me:26333: result: no" >&5
+  echo "$as_me:26386: result: no" >&5

 echo "${ECHO_T}no" >&6
 fi
 
 echo "${ECHO_T}no" >&6
 fi
 


@@ -26340,7 +26393,7 @@ fi
                unset cf_cv_gnat_version
                unset cf_TEMP_gnat
 
                unset cf_cv_gnat_version
                unset cf_TEMP_gnat
 

-echo "$as_me:26343: checking for $cf_prog_gnat version" >&5
+echo "$as_me:26396: checking for $cf_prog_gnat version" >&5

 echo $ECHO_N "checking for $cf_prog_gnat version... $ECHO_C" >&6
 if test "${cf_cv_gnat_version+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 echo $ECHO_N "checking for $cf_prog_gnat version... $ECHO_C" >&6
 if test "${cf_cv_gnat_version+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6


@@ -26351,7 +26404,7 @@ cf_cv_gnat_version=`$cf_prog_gnat --version 2>&1 | \
        sed -e '2,$d' -e 's/[^0-9 \.]//g' -e 's/^[ ]*//' -e 's/ .*//'`
 
 fi
        sed -e '2,$d' -e 's/[^0-9 \.]//g' -e 's/^[ ]*//' -e 's/ .*//'`
 
 fi

-echo "$as_me:26354: result: $cf_cv_gnat_version" >&5
+echo "$as_me:26407: result: $cf_cv_gnat_version" >&5

 echo "${ECHO_T}$cf_cv_gnat_version" >&6
 test -z "$cf_cv_gnat_version" && cf_cv_gnat_version=no
 eval cf_TEMP_gnat=$cf_cv_gnat_version; unset cf_cv_gnat_version
 echo "${ECHO_T}$cf_cv_gnat_version" >&6
 test -z "$cf_cv_gnat_version" && cf_cv_gnat_version=no
 eval cf_TEMP_gnat=$cf_cv_gnat_version; unset cf_cv_gnat_version


@@ -26380,7 +26433,7 @@ else
                        cd conftest.src
                        for cf_gprconfig in Ada C
                        do
                        cd conftest.src
                        for cf_gprconfig in Ada C
                        do

-                               echo "$as_me:26383: checking for gprconfig name for $cf_gprconfig" >&5
+                               echo "$as_me:26436: checking for gprconfig name for $cf_gprconfig" >&5

 echo $ECHO_N "checking for gprconfig name for $cf_gprconfig... $ECHO_C" >&6
                                if test "$cf_gprconfig" = C
                                then
 echo $ECHO_N "checking for gprconfig name for $cf_gprconfig... $ECHO_C" >&6
                                if test "$cf_gprconfig" = C
                                then


@@ -26399,10 +26452,10 @@ echo $ECHO_N "checking for gprconfig name for $cf_gprconfig... $ECHO_C" >&6
                                if test -n "$cf_gprconfig_value"
                                then
                                        eval "cf_ada_config_$cf_gprconfig=$cf_gprconfig_value"
                                if test -n "$cf_gprconfig_value"
                                then
                                        eval "cf_ada_config_$cf_gprconfig=$cf_gprconfig_value"

-                                       echo "$as_me:26402: result: $cf_gprconfig_value" >&5
+                                       echo "$as_me:26455: result: $cf_gprconfig_value" >&5

 echo "${ECHO_T}$cf_gprconfig_value" >&6
                                else
 echo "${ECHO_T}$cf_gprconfig_value" >&6
                                else

-                                       echo "$as_me:26405: result: missing" >&5
+                                       echo "$as_me:26458: result: missing" >&5

 echo "${ECHO_T}missing" >&6
                                        cf_ada_config="#"
                                        break
 echo "${ECHO_T}missing" >&6
                                        cf_ada_config="#"
                                        break


@@ -26415,7 +26468,7 @@ echo "${ECHO_T}missing" >&6
        if test "x$cf_ada_config" != "x#"
        then
 
        if test "x$cf_ada_config" != "x#"
        then
 

-echo "$as_me:26418: checking for gnat version" >&5
+echo "$as_me:26471: checking for gnat version" >&5

 echo $ECHO_N "checking for gnat version... $ECHO_C" >&6
 if test "${cf_cv_gnat_version+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 echo $ECHO_N "checking for gnat version... $ECHO_C" >&6
 if test "${cf_cv_gnat_version+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6


@@ -26426,7 +26479,7 @@ cf_cv_gnat_version=`${cf_ada_make:-gnatmake} --version 2>&1 | \
        sed -e '2,$d' -e 's/[^0-9 \.]//g' -e 's/^[ ]*//' -e 's/ .*//'`
 
 fi
        sed -e '2,$d' -e 's/[^0-9 \.]//g' -e 's/^[ ]*//' -e 's/ .*//'`
 
 fi

-echo "$as_me:26429: result: $cf_cv_gnat_version" >&5
+echo "$as_me:26482: result: $cf_cv_gnat_version" >&5

 echo "${ECHO_T}$cf_cv_gnat_version" >&6
 test -z "$cf_cv_gnat_version" && cf_cv_gnat_version=no
 
 echo "${ECHO_T}$cf_cv_gnat_version" >&6
 test -z "$cf_cv_gnat_version" && cf_cv_gnat_version=no
 


@@ -26435,7 +26488,7 @@ case "$cf_cv_gnat_version" in
        cf_cv_prog_gnat_correct=yes
        ;;
 (*)
        cf_cv_prog_gnat_correct=yes
        ;;
 (*)

-       { echo "$as_me:26438: WARNING: Unsupported GNAT version $cf_cv_gnat_version. We require 3.11 or better. Disabling Ada95 binding." >&5
+       { echo "$as_me:26491: WARNING: Unsupported GNAT version $cf_cv_gnat_version. We require 3.11 or better. Disabling Ada95 binding." >&5

 echo "$as_me: WARNING: Unsupported GNAT version $cf_cv_gnat_version. We require 3.11 or better. Disabling Ada95 binding." >&2;}
        cf_cv_prog_gnat_correct=no
        ;;
 echo "$as_me: WARNING: Unsupported GNAT version $cf_cv_gnat_version. We require 3.11 or better. Disabling Ada95 binding." >&2;}
        cf_cv_prog_gnat_correct=no
        ;;


@@ -26443,7 +26496,7 @@ esac
 
                # Extract the first word of "m4", so it can be a program name with args.
 set dummy m4; ac_word=$2
 
                # Extract the first word of "m4", so it can be a program name with args.
 set dummy m4; ac_word=$2

-echo "$as_me:26446: checking for $ac_word" >&5
+echo "$as_me:26499: 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
 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


@@ -26458,7 +26511,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_M4_exists="yes"
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_M4_exists="yes"

-echo "$as_me:26461: found $ac_dir/$ac_word" >&5
+echo "$as_me:26514: found $ac_dir/$ac_word" >&5

 break
 done
 
 break
 done
 


@@ -26467,20 +26520,20 @@ fi
 fi
 M4_exists=$ac_cv_prog_M4_exists
 if test -n "$M4_exists"; then
 fi
 M4_exists=$ac_cv_prog_M4_exists
 if test -n "$M4_exists"; then

-  echo "$as_me:26470: result: $M4_exists" >&5
+  echo "$as_me:26523: result: $M4_exists" >&5

 echo "${ECHO_T}$M4_exists" >&6
 else
 echo "${ECHO_T}$M4_exists" >&6
 else

-  echo "$as_me:26473: result: no" >&5
+  echo "$as_me:26526: result: no" >&5

 echo "${ECHO_T}no" >&6
 fi
 
                if test "$ac_cv_prog_M4_exists" = no; then
                        cf_cv_prog_gnat_correct=no
 echo "${ECHO_T}no" >&6
 fi
 
                if test "$ac_cv_prog_M4_exists" = no; then
                        cf_cv_prog_gnat_correct=no

-                       { echo "$as_me:26479: WARNING: Ada95 binding required program m4 not found. Ada95 binding disabled" >&5
+                       { echo "$as_me:26532: WARNING: Ada95 binding required program m4 not found. Ada95 binding disabled" >&5

 echo "$as_me: WARNING: Ada95 binding required program m4 not found. Ada95 binding disabled" >&2;}
                fi
                if test "$cf_cv_prog_gnat_correct" = yes; then
 echo "$as_me: WARNING: Ada95 binding required program m4 not found. Ada95 binding disabled" >&2;}
                fi
                if test "$cf_cv_prog_gnat_correct" = yes; then

-                       echo "$as_me:26483: checking if GNAT works" >&5
+                       echo "$as_me:26536: checking if GNAT works" >&5

 echo $ECHO_N "checking if GNAT works... $ECHO_C" >&6
 
 rm -rf ./conftest* ./*~conftest*
 echo $ECHO_N "checking if GNAT works... $ECHO_C" >&6
 
 rm -rf ./conftest* ./*~conftest*


@@ -26508,7 +26561,7 @@ else
 fi
 rm -rf ./conftest* ./*~conftest*
 
 fi
 rm -rf ./conftest* ./*~conftest*
 

-                       echo "$as_me:26511: result: $cf_cv_prog_gnat_correct" >&5
+                       echo "$as_me:26564: result: $cf_cv_prog_gnat_correct" >&5

 echo "${ECHO_T}$cf_cv_prog_gnat_correct" >&6
                fi
        else
 echo "${ECHO_T}$cf_cv_prog_gnat_correct" >&6
                fi
        else


@@ -26520,7 +26573,7 @@ fi
 
        ADAFLAGS="$ADAFLAGS -gnatpn"
 
 
        ADAFLAGS="$ADAFLAGS -gnatpn"
 

-       echo "$as_me:26523: checking optimization options for ADAFLAGS" >&5
+       echo "$as_me:26576: checking optimization options for ADAFLAGS" >&5

 echo $ECHO_N "checking optimization options for ADAFLAGS... $ECHO_C" >&6
        case "$CFLAGS" in
        (*-g*)
 echo $ECHO_N "checking optimization options for ADAFLAGS... $ECHO_C" >&6
        case "$CFLAGS" in
        (*-g*)


@@ -26537,10 +26590,10 @@ echo $ECHO_N "checking optimization options for ADAFLAGS... $ECHO_C" >&6
 
                ;;
        esac
 
                ;;
        esac

-       echo "$as_me:26540: result: $ADAFLAGS" >&5
+       echo "$as_me:26593: result: $ADAFLAGS" >&5

 echo "${ECHO_T}$ADAFLAGS" >&6
 
 echo "${ECHO_T}$ADAFLAGS" >&6
 

-echo "$as_me:26543: checking if GNATPREP supports -T option" >&5
+echo "$as_me:26596: 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
 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


@@ -26550,11 +26603,11 @@ cf_cv_gnatprep_opt_t=no
 gnatprep -T 2>/dev/null >/dev/null && cf_cv_gnatprep_opt_t=yes
 
 fi
 gnatprep -T 2>/dev/null >/dev/null && cf_cv_gnatprep_opt_t=yes
 
 fi

-echo "$as_me:26553: result: $cf_cv_gnatprep_opt_t" >&5
+echo "$as_me:26606: 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 "${ECHO_T}$cf_cv_gnatprep_opt_t" >&6
 test "$cf_cv_gnatprep_opt_t" = yes && GNATPREP_OPTS="-T $GNATPREP_OPTS"
 

-echo "$as_me:26557: checking if GNAT supports generics" >&5
+echo "$as_me:26610: checking if GNAT supports generics" >&5

 echo $ECHO_N "checking if GNAT supports generics... $ECHO_C" >&6
 case "$cf_cv_gnat_version" in
 (3.1[1-9]*|3.[2-9]*|[4-9].*|[1-9][0-9].[0-9]*|20[0-9][0-9])
 echo $ECHO_N "checking if GNAT supports generics... $ECHO_C" >&6
 case "$cf_cv_gnat_version" in
 (3.1[1-9]*|3.[2-9]*|[4-9].*|[1-9][0-9].[0-9]*|20[0-9][0-9])


@@ -26564,7 +26617,7 @@ case "$cf_cv_gnat_version" in
        cf_gnat_generics=no
        ;;
 esac
        cf_gnat_generics=no
        ;;
 esac

-echo "$as_me:26567: result: $cf_gnat_generics" >&5
+echo "$as_me:26620: result: $cf_gnat_generics" >&5

 echo "${ECHO_T}$cf_gnat_generics" >&6
 
 if test "$cf_gnat_generics" = yes
 echo "${ECHO_T}$cf_gnat_generics" >&6
 
 if test "$cf_gnat_generics" = yes


@@ -26576,7 +26629,7 @@ else
        cf_generic_objects=
 fi
 
        cf_generic_objects=
 fi
 

-echo "$as_me:26579: checking if GNAT supports SIGINT" >&5
+echo "$as_me:26632: 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
 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


@@ -26624,7 +26677,7 @@ fi
 rm -rf ./conftest* ./*~conftest*
 
 fi
 rm -rf ./conftest* ./*~conftest*
 
 fi

-echo "$as_me:26627: result: $cf_cv_gnat_sigint" >&5
+echo "$as_me:26680: result: $cf_cv_gnat_sigint" >&5

 echo "${ECHO_T}$cf_cv_gnat_sigint" >&6
 
 if test "$cf_cv_gnat_sigint" = yes ; then
 echo "${ECHO_T}$cf_cv_gnat_sigint" >&6
 
 if test "$cf_cv_gnat_sigint" = yes ; then


@@ -26637,7 +26690,7 @@ cf_gnat_libraries=no
 cf_gnat_projects=no
 
 if test "$enable_gnat_projects" != no ; then
 cf_gnat_projects=no
 
 if test "$enable_gnat_projects" != no ; then

-echo "$as_me:26640: checking if GNAT supports project files" >&5
+echo "$as_me:26693: checking if GNAT supports project files" >&5

 echo $ECHO_N "checking if GNAT supports project files... $ECHO_C" >&6
 case "$cf_cv_gnat_version" in
 (3.[0-9]*)
 echo $ECHO_N "checking if GNAT supports project files... $ECHO_C" >&6
 case "$cf_cv_gnat_version" in
 (3.[0-9]*)


@@ -26700,15 +26753,15 @@ CF_EOF
        esac
        ;;
 esac
        esac
        ;;
 esac

-echo "$as_me:26703: result: $cf_gnat_projects" >&5
+echo "$as_me:26756: result: $cf_gnat_projects" >&5

 echo "${ECHO_T}$cf_gnat_projects" >&6
 fi # enable_gnat_projects
 
 if test "$cf_gnat_projects" = yes
 then
 echo "${ECHO_T}$cf_gnat_projects" >&6
 fi # enable_gnat_projects
 
 if test "$cf_gnat_projects" = yes
 then

-       echo "$as_me:26709: checking if GNAT supports libraries" >&5
+       echo "$as_me:26762: checking if GNAT supports libraries" >&5

 echo $ECHO_N "checking if GNAT supports libraries... $ECHO_C" >&6
 echo $ECHO_N "checking if GNAT supports libraries... $ECHO_C" >&6

-       echo "$as_me:26711: result: $cf_gnat_libraries" >&5
+       echo "$as_me:26764: result: $cf_gnat_libraries" >&5

 echo "${ECHO_T}$cf_gnat_libraries" >&6
 fi
 
 echo "${ECHO_T}$cf_gnat_libraries" >&6
 fi
 


@@ -26728,7 +26781,7 @@ then
        then
                USE_GNAT_MAKE_GPR=""
        else
        then
                USE_GNAT_MAKE_GPR=""
        else

-               { echo "$as_me:26731: WARNING: use old makefile rules since tools are missing" >&5
+               { echo "$as_me:26784: WARNING: use old makefile rules since tools are missing" >&5

 echo "$as_me: WARNING: use old makefile rules since tools are missing" >&2;}
        fi
 fi
 echo "$as_me: WARNING: use old makefile rules since tools are missing" >&2;}
        fi
 fi


@@ -26740,7 +26793,7 @@ else
        USE_GNAT_LIBRARIES="#"
 fi
 
        USE_GNAT_LIBRARIES="#"
 fi
 

-echo "$as_me:26743: checking for ada-compiler" >&5
+echo "$as_me:26796: 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.
 echo $ECHO_N "checking for ada-compiler... $ECHO_C" >&6
 
 # Check whether --with-ada-compiler or --without-ada-compiler was given.


@@ -26751,12 +26804,12 @@ else
   cf_ada_compiler=gnatmake
 fi;
 
   cf_ada_compiler=gnatmake
 fi;
 

-echo "$as_me:26754: result: $cf_ada_compiler" >&5
+echo "$as_me:26807: result: $cf_ada_compiler" >&5

 echo "${ECHO_T}$cf_ada_compiler" >&6
 
                        cf_ada_package=terminal_interface
 
 echo "${ECHO_T}$cf_ada_compiler" >&6
 
                        cf_ada_package=terminal_interface
 

-echo "$as_me:26759: checking for ada-include" >&5
+echo "$as_me:26812: 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.
 echo $ECHO_N "checking for ada-include... $ECHO_C" >&6
 
 # Check whether --with-ada-include or --without-ada-include was given.


@@ -26792,7 +26845,7 @@ case ".$withval" in
        withval=`echo "$withval" | sed -e s%NONE%$cf_path_syntax%`
        ;;
 (*)
        withval=`echo "$withval" | sed -e s%NONE%$cf_path_syntax%`
        ;;
 (*)

-       { { echo "$as_me:26795: error: expected a pathname, not \"$withval\"" >&5
+       { { echo "$as_me:26848: error: expected a pathname, not \"$withval\"" >&5

 echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
    { (exit 1); exit 1; }; }
        ;;
 echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
    { (exit 1); exit 1; }; }
        ;;


@@ -26801,10 +26854,10 @@ esac
 fi
 eval ADA_INCLUDE="$withval"
 
 fi
 eval ADA_INCLUDE="$withval"
 

-echo "$as_me:26804: result: $ADA_INCLUDE" >&5
+echo "$as_me:26857: result: $ADA_INCLUDE" >&5

 echo "${ECHO_T}$ADA_INCLUDE" >&6
 
 echo "${ECHO_T}$ADA_INCLUDE" >&6
 

-echo "$as_me:26807: checking for ada-objects" >&5
+echo "$as_me:26860: 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.
 echo $ECHO_N "checking for ada-objects... $ECHO_C" >&6
 
 # Check whether --with-ada-objects or --without-ada-objects was given.


@@ -26840,7 +26893,7 @@ case ".$withval" in
        withval=`echo "$withval" | sed -e s%NONE%$cf_path_syntax%`
        ;;
 (*)
        withval=`echo "$withval" | sed -e s%NONE%$cf_path_syntax%`
        ;;
 (*)

-       { { echo "$as_me:26843: error: expected a pathname, not \"$withval\"" >&5
+       { { echo "$as_me:26896: error: expected a pathname, not \"$withval\"" >&5

 echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
    { (exit 1); exit 1; }; }
        ;;
 echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
    { (exit 1); exit 1; }; }
        ;;


@@ -26849,10 +26902,10 @@ esac
 fi
 eval ADA_OBJECTS="$withval"
 
 fi
 eval ADA_OBJECTS="$withval"
 

-echo "$as_me:26852: result: $ADA_OBJECTS" >&5
+echo "$as_me:26905: result: $ADA_OBJECTS" >&5

 echo "${ECHO_T}$ADA_OBJECTS" >&6
 
 echo "${ECHO_T}$ADA_OBJECTS" >&6
 

-echo "$as_me:26855: checking if an Ada95 shared-library should be built" >&5
+echo "$as_me:26908: 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.
 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.


@@ -26862,14 +26915,14 @@ if test "${with_ada_sharedlib+set}" = set; then
 else
   with_ada_sharedlib=no
 fi;
 else
   with_ada_sharedlib=no
 fi;

-echo "$as_me:26865: result: $with_ada_sharedlib" >&5
+echo "$as_me:26918: result: $with_ada_sharedlib" >&5

 echo "${ECHO_T}$with_ada_sharedlib" >&6
 
 if test "x$with_ada_sharedlib" != xno
 then
        if test "x$cf_gnat_projects" != xyes
        then
 echo "${ECHO_T}$with_ada_sharedlib" >&6
 
 if test "x$with_ada_sharedlib" != xno
 then
        if test "x$cf_gnat_projects" != xyes
        then

-               { echo "$as_me:26872: WARNING: disabling shared-library since GNAT projects are not supported" >&5
+               { echo "$as_me:26925: WARNING: disabling shared-library since GNAT projects are not supported" >&5

 echo "$as_me: WARNING: disabling shared-library since GNAT projects are not supported" >&2;}
                with_ada_sharedlib=no
        fi
 echo "$as_me: WARNING: disabling shared-library since GNAT projects are not supported" >&2;}
                with_ada_sharedlib=no
        fi


@@ -26889,7 +26942,7 @@ fi
 
                        # allow the Ada binding to be renamed
 
 
                        # allow the Ada binding to be renamed
 

-echo "$as_me:26892: checking for ada-libname" >&5
+echo "$as_me:26945: checking for ada-libname" >&5

 echo $ECHO_N "checking for ada-libname... $ECHO_C" >&6
 
 # Check whether --with-ada-libname or --without-ada-libname was given.
 echo $ECHO_N "checking for ada-libname... $ECHO_C" >&6
 
 # Check whether --with-ada-libname or --without-ada-libname was given.


@@ -26905,7 +26958,7 @@ case "x$ADA_LIBNAME" in
        ;;
 esac
 
        ;;
 esac
 

-echo "$as_me:26908: result: $ADA_LIBNAME" >&5
+echo "$as_me:26961: result: $ADA_LIBNAME" >&5

 echo "${ECHO_T}$ADA_LIBNAME" >&6
 
                fi
 echo "${ECHO_T}$ADA_LIBNAME" >&6
 
                fi


@@ -26916,13 +26969,13 @@ fi
 
 # do this "late" to avoid conflict with header-checks
 if test "x$with_widec" = xyes ; then
 
 # do this "late" to avoid conflict with header-checks
 if test "x$with_widec" = xyes ; then

-       echo "$as_me:26919: checking for wchar_t" >&5
+       echo "$as_me:26972: 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
 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 26925 "configure"
+#line 26978 "configure"

 #include "confdefs.h"
 $ac_includes_default
 int
 #include "confdefs.h"
 $ac_includes_default
 int


@@ -26937,16 +26990,16 @@ if (sizeof (wchar_t))
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
 }
 _ACEOF
 rm -f "conftest.$ac_objext"

-if { (eval echo "$as_me:26940: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:26993: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:26943: \$? = $ac_status" >&5
+  echo "$as_me:26996: \$? = $ac_status" >&5

   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'

-  { (eval echo "$as_me:26946: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26999: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:26949: \$? = $ac_status" >&5
+  echo "$as_me:27002: \$? = $ac_status" >&5

   (exit "$ac_status"); }; }; then
   ac_cv_type_wchar_t=yes
 else
   (exit "$ac_status"); }; }; then
   ac_cv_type_wchar_t=yes
 else


@@ -26956,10 +27009,10 @@ ac_cv_type_wchar_t=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi

-echo "$as_me:26959: result: $ac_cv_type_wchar_t" >&5
+echo "$as_me:27012: result: $ac_cv_type_wchar_t" >&5

 echo "${ECHO_T}$ac_cv_type_wchar_t" >&6
 
 echo "${ECHO_T}$ac_cv_type_wchar_t" >&6
 

-echo "$as_me:26962: checking size of wchar_t" >&5
+echo "$as_me:27015: 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
 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


@@ -26968,7 +27021,7 @@ else
   if test "$cross_compiling" = yes; then
   # Depending upon the size, compute the lo and hi bounds.
 cat >"conftest.$ac_ext" <<_ACEOF
   if test "$cross_compiling" = yes; then
   # Depending upon the size, compute the lo and hi bounds.
 cat >"conftest.$ac_ext" <<_ACEOF

-#line 26971 "configure"
+#line 27024 "configure"

 #include "confdefs.h"
 $ac_includes_default
 int
 #include "confdefs.h"
 $ac_includes_default
 int


@@ -26980,21 +27033,21 @@ int _array_ [1 - 2 * !((sizeof (wchar_t)) >= 0)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
 }
 _ACEOF
 rm -f "conftest.$ac_objext"

-if { (eval echo "$as_me:26983: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:27036: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:26986: \$? = $ac_status" >&5
+  echo "$as_me:27039: \$? = $ac_status" >&5

   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'

-  { (eval echo "$as_me:26989: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27042: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:26992: \$? = $ac_status" >&5
+  echo "$as_me:27045: \$? = $ac_status" >&5

   (exit "$ac_status"); }; }; then
   ac_lo=0 ac_mid=0
   while :; do
     cat >"conftest.$ac_ext" <<_ACEOF
   (exit "$ac_status"); }; }; then
   ac_lo=0 ac_mid=0
   while :; do
     cat >"conftest.$ac_ext" <<_ACEOF

-#line 26997 "configure"
+#line 27050 "configure"

 #include "confdefs.h"
 $ac_includes_default
 int
 #include "confdefs.h"
 $ac_includes_default
 int


@@ -27006,16 +27059,16 @@ int _array_ [1 - 2 * !((sizeof (wchar_t)) <= $ac_mid)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
 }
 _ACEOF
 rm -f "conftest.$ac_objext"

-if { (eval echo "$as_me:27009: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:27062: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:27012: \$? = $ac_status" >&5
+  echo "$as_me:27065: \$? = $ac_status" >&5

   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'

-  { (eval echo "$as_me:27015: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27068: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:27018: \$? = $ac_status" >&5
+  echo "$as_me:27071: \$? = $ac_status" >&5

   (exit "$ac_status"); }; }; then
   ac_hi=$ac_mid; break
 else
   (exit "$ac_status"); }; }; then
   ac_hi=$ac_mid; break
 else


@@ -27031,7 +27084,7 @@ cat "conftest.$ac_ext" >&5
 ac_hi=-1 ac_mid=-1
   while :; do
     cat >"conftest.$ac_ext" <<_ACEOF
 ac_hi=-1 ac_mid=-1
   while :; do
     cat >"conftest.$ac_ext" <<_ACEOF

-#line 27034 "configure"
+#line 27087 "configure"

 #include "confdefs.h"
 $ac_includes_default
 int
 #include "confdefs.h"
 $ac_includes_default
 int


@@ -27043,16 +27096,16 @@ int _array_ [1 - 2 * !((sizeof (wchar_t)) >= $ac_mid)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
 }
 _ACEOF
 rm -f "conftest.$ac_objext"

-if { (eval echo "$as_me:27046: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:27099: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:27049: \$? = $ac_status" >&5
+  echo "$as_me:27102: \$? = $ac_status" >&5

   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'

-  { (eval echo "$as_me:27052: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27105: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:27055: \$? = $ac_status" >&5
+  echo "$as_me:27108: \$? = $ac_status" >&5

   (exit "$ac_status"); }; }; then
   ac_lo=$ac_mid; break
 else
   (exit "$ac_status"); }; }; then
   ac_lo=$ac_mid; break
 else


@@ -27068,7 +27121,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 while test "x$ac_lo" != "x$ac_hi"; do
   ac_mid=`expr '(' "$ac_hi" - "$ac_lo" ')' / 2 + "$ac_lo"`
   cat >"conftest.$ac_ext" <<_ACEOF
 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 27071 "configure"
+#line 27124 "configure"

 #include "confdefs.h"
 $ac_includes_default
 int
 #include "confdefs.h"
 $ac_includes_default
 int


@@ -27080,16 +27133,16 @@ int _array_ [1 - 2 * !((sizeof (wchar_t)) <= $ac_mid)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
 }
 _ACEOF
 rm -f "conftest.$ac_objext"

-if { (eval echo "$as_me:27083: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:27136: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:27086: \$? = $ac_status" >&5
+  echo "$as_me:27139: \$? = $ac_status" >&5

   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'

-  { (eval echo "$as_me:27089: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27142: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:27092: \$? = $ac_status" >&5
+  echo "$as_me:27145: \$? = $ac_status" >&5

   (exit "$ac_status"); }; }; then
   ac_hi=$ac_mid
 else
   (exit "$ac_status"); }; }; then
   ac_hi=$ac_mid
 else


@@ -27102,12 +27155,12 @@ done
 ac_cv_sizeof_wchar_t=$ac_lo
 else
   if test "$cross_compiling" = yes; then
 ac_cv_sizeof_wchar_t=$ac_lo
 else
   if test "$cross_compiling" = yes; then

-  { { echo "$as_me:27105: error: cannot run test program while cross compiling" >&5
+  { { echo "$as_me:27158: 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
 echo "$as_me: error: cannot run test program while cross compiling" >&2;}
    { (exit 1); exit 1; }; }
 else
   cat >"conftest.$ac_ext" <<_ACEOF

-#line 27110 "configure"
+#line 27163 "configure"

 #include "confdefs.h"
 $ac_includes_default
 int
 #include "confdefs.h"
 $ac_includes_default
 int


@@ -27116,22 +27169,22 @@ main (void)
 FILE *f = fopen ("conftest.val", "w");
 if (!f)
   $ac_main_return (1);
 FILE *f = fopen ("conftest.val", "w");
 if (!f)
   $ac_main_return (1);

-fprintf (f, "%d", (sizeof (wchar_t)));
+fprintf (f, "%ld", (long)(sizeof (wchar_t)));

 fclose (f);
   ;
   return 0;
 }
 _ACEOF
 rm -f "conftest$ac_exeext"
 fclose (f);
   ;
   return 0;
 }
 _ACEOF
 rm -f "conftest$ac_exeext"

-if { (eval echo "$as_me:27126: \"$ac_link\"") >&5
+if { (eval echo "$as_me:27179: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:27129: \$? = $ac_status" >&5
+  echo "$as_me:27182: \$? = $ac_status" >&5

   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'

-  { (eval echo "$as_me:27131: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27184: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:27134: \$? = $ac_status" >&5
+  echo "$as_me:27187: \$? = $ac_status" >&5

   (exit "$ac_status"); }; }; then
   ac_cv_sizeof_wchar_t=`cat conftest.val`
 else
   (exit "$ac_status"); }; }; then
   ac_cv_sizeof_wchar_t=`cat conftest.val`
 else


@@ -27147,7 +27200,7 @@ else
   ac_cv_sizeof_wchar_t=0
 fi
 fi
   ac_cv_sizeof_wchar_t=0
 fi
 fi

-echo "$as_me:27150: result: $ac_cv_sizeof_wchar_t" >&5
+echo "$as_me:27203: 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
 echo "${ECHO_T}$ac_cv_sizeof_wchar_t" >&6
 cat >>confdefs.h <<EOF
 #define SIZEOF_WCHAR_T $ac_cv_sizeof_wchar_t


@@ -27160,7 +27213,7 @@ EOF
        then
                test -n "$verbose" && echo "    test failed (assume 2)" 1>&6
 
        then
                test -n "$verbose" && echo "    test failed (assume 2)" 1>&6
 

-echo "${as_me:-configure}:27163: testing test failed (assume 2) ..." 1>&5
+echo "${as_me:-configure}:27216: testing test failed (assume 2) ..." 1>&5

 
                sed /SIZEOF_WCHAR_T/d confdefs.h >confdefs.tmp
                mv confdefs.tmp confdefs.h
 
                sed /SIZEOF_WCHAR_T/d confdefs.h >confdefs.tmp
                mv confdefs.tmp confdefs.h


@@ -27178,7 +27231,7 @@ fi
 ### chooses to split module lists into libraries.
 ###
 ### (see CF_LIB_RULES).
 ### chooses to split module lists into libraries.
 ###
 ### (see CF_LIB_RULES).

-echo "$as_me:27181: checking for library subsets" >&5
+echo "$as_me:27234: checking for library subsets" >&5

 echo $ECHO_N "checking for library subsets... $ECHO_C" >&6
 LIB_SUBSETS=
 
 echo $ECHO_N "checking for library subsets... $ECHO_C" >&6
 LIB_SUBSETS=
 


@@ -27232,7 +27285,7 @@ fi
 test "x$with_widec"     = xyes && LIB_SUBSETS="${LIB_SUBSETS}+widechar"
 test "x$with_ext_funcs" = xyes && LIB_SUBSETS="${LIB_SUBSETS}+ext_funcs"
 
 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:27235: result: $LIB_SUBSETS" >&5
+echo "$as_me:27288: result: $LIB_SUBSETS" >&5

 echo "${ECHO_T}$LIB_SUBSETS" >&6
 
 ### Construct the list of include-directories to be generated
 echo "${ECHO_T}$LIB_SUBSETS" >&6
 
 ### Construct the list of include-directories to be generated


@@ -27263,7 +27316,7 @@ elif test "$includedir" != "/usr/include"; then
 fi
 
 ### Build up pieces for makefile rules
 fi
 
 ### Build up pieces for makefile rules

-echo "$as_me:27266: checking default library suffix" >&5
+echo "$as_me:27319: checking default library suffix" >&5

 echo $ECHO_N "checking default library suffix... $ECHO_C" >&6
 
        case $DFT_LWR_MODEL in
 echo $ECHO_N "checking default library suffix... $ECHO_C" >&6
 
        case $DFT_LWR_MODEL in


@@ -27274,10 +27327,10 @@ echo $ECHO_N "checking default library suffix... $ECHO_C" >&6
        (shared)  DFT_ARG_SUFFIX=''   ;;
        esac
        test -n "$LIB_SUFFIX" && DFT_ARG_SUFFIX="${LIB_SUFFIX}${DFT_ARG_SUFFIX}"
        (shared)  DFT_ARG_SUFFIX=''   ;;
        esac
        test -n "$LIB_SUFFIX" && DFT_ARG_SUFFIX="${LIB_SUFFIX}${DFT_ARG_SUFFIX}"

-echo "$as_me:27277: result: $DFT_ARG_SUFFIX" >&5
+echo "$as_me:27330: result: $DFT_ARG_SUFFIX" >&5

 echo "${ECHO_T}$DFT_ARG_SUFFIX" >&6
 
 echo "${ECHO_T}$DFT_ARG_SUFFIX" >&6
 

-echo "$as_me:27280: checking default library-dependency suffix" >&5
+echo "$as_me:27333: checking default library-dependency suffix" >&5

 echo $ECHO_N "checking default library-dependency suffix... $ECHO_C" >&6
 
        case X$DFT_LWR_MODEL in
 echo $ECHO_N "checking default library-dependency suffix... $ECHO_C" >&6
 
        case X$DFT_LWR_MODEL in


@@ -27360,10 +27413,10 @@ echo $ECHO_N "checking default library-dependency suffix... $ECHO_C" >&6
                DFT_LIB_SUFFIX="${LIB_SUFFIX}${EXTRA_SUFFIX}${DFT_LIB_SUFFIX}"
                DFT_DEP_SUFFIX="${LIB_SUFFIX}${EXTRA_SUFFIX}${DFT_DEP_SUFFIX}"
        fi
                DFT_LIB_SUFFIX="${LIB_SUFFIX}${EXTRA_SUFFIX}${DFT_LIB_SUFFIX}"
                DFT_DEP_SUFFIX="${LIB_SUFFIX}${EXTRA_SUFFIX}${DFT_DEP_SUFFIX}"
        fi

-echo "$as_me:27363: result: $DFT_DEP_SUFFIX" >&5
+echo "$as_me:27416: result: $DFT_DEP_SUFFIX" >&5

 echo "${ECHO_T}$DFT_DEP_SUFFIX" >&6
 
 echo "${ECHO_T}$DFT_DEP_SUFFIX" >&6
 

-echo "$as_me:27366: checking default object directory" >&5
+echo "$as_me:27419: checking default object directory" >&5

 echo $ECHO_N "checking default object directory... $ECHO_C" >&6
 
        case $DFT_LWR_MODEL in
 echo $ECHO_N "checking default object directory... $ECHO_C" >&6
 
        case $DFT_LWR_MODEL in


@@ -27379,11 +27432,11 @@ echo $ECHO_N "checking default object directory... $ECHO_C" >&6
                        DFT_OBJ_SUBDIR='obj_s' ;;
                esac
        esac
                        DFT_OBJ_SUBDIR='obj_s' ;;
                esac
        esac

-echo "$as_me:27382: result: $DFT_OBJ_SUBDIR" >&5
+echo "$as_me:27435: result: $DFT_OBJ_SUBDIR" >&5

 echo "${ECHO_T}$DFT_OBJ_SUBDIR" >&6
 
 if test "x$cf_with_cxx" = xyes ; then
 echo "${ECHO_T}$DFT_OBJ_SUBDIR" >&6
 
 if test "x$cf_with_cxx" = xyes ; then

-echo "$as_me:27386: checking c++ library-dependency suffix" >&5
+echo "$as_me:27439: 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++)
 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++)


@@ -27476,7 +27529,7 @@ else
        fi
 
 fi
        fi
 
 fi

-echo "$as_me:27479: result: $CXX_LIB_SUFFIX" >&5
+echo "$as_me:27532: result: $CXX_LIB_SUFFIX" >&5

 echo "${ECHO_T}$CXX_LIB_SUFFIX" >&6
 
 fi
 echo "${ECHO_T}$CXX_LIB_SUFFIX" >&6
 
 fi


@@ -27652,19 +27705,19 @@ fi
 
 if test -n "$LDFLAGS_STATIC" && test -n "$LDFLAGS_SHARED"
 then
 
 if test -n "$LDFLAGS_STATIC" && test -n "$LDFLAGS_SHARED"
 then

-       echo "$as_me:27655: checking if linker supports switching between static/dynamic" >&5
+       echo "$as_me:27708: 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
 echo $ECHO_N "checking if linker supports switching between static/dynamic... $ECHO_C" >&6
 
        rm -f libconftest.a
        cat >conftest.$ac_ext <<EOF

-#line 27660 "configure"
+#line 27713 "configure"

 #include <stdio.h>
 int cf_ldflags_static(FILE *fp) { return fflush(fp); }
 EOF
 #include <stdio.h>
 int cf_ldflags_static(FILE *fp) { return fflush(fp); }
 EOF

-       if { (eval echo "$as_me:27664: \"$ac_compile\"") >&5
+       if { (eval echo "$as_me:27717: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:27667: \$? = $ac_status" >&5
+  echo "$as_me:27720: \$? = $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
   (exit "$ac_status"); } ; then
                ( $AR $ARFLAGS libconftest.a conftest.o ) 2>&5 1>/dev/null
                ( eval $RANLIB libconftest.a ) 2>&5 >/dev/null


@@ -27675,10 +27728,10 @@ EOF
 
        LIBS="$LDFLAGS_STATIC -L`pwd` -lconftest $LDFLAGS_DYNAMIC $LIBS"
        cat >"conftest.$ac_ext" <<_ACEOF
 
        LIBS="$LDFLAGS_STATIC -L`pwd` -lconftest $LDFLAGS_DYNAMIC $LIBS"
        cat >"conftest.$ac_ext" <<_ACEOF

-#line 27678 "configure"
+#line 27731 "configure"

 #include "confdefs.h"
 
 #include "confdefs.h"
 

-#line 27681 "configure"
+#line 27734 "configure"

 #include <stdio.h>
 int cf_ldflags_static(FILE *fp);
 
 #include <stdio.h>
 int cf_ldflags_static(FILE *fp);
 


@@ -27693,16 +27746,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"

-if { (eval echo "$as_me:27696: \"$ac_link\"") >&5
+if { (eval echo "$as_me:27749: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:27699: \$? = $ac_status" >&5
+  echo "$as_me:27752: \$? = $ac_status" >&5

   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'

-  { (eval echo "$as_me:27702: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27755: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:27705: \$? = $ac_status" >&5
+  echo "$as_me:27758: \$? = $ac_status" >&5

   (exit "$ac_status"); }; }; then
 
        # some linkers simply ignore the -dynamic
   (exit "$ac_status"); }; }; then
 
        # some linkers simply ignore the -dynamic


@@ -27725,7 +27778,7 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
        rm -f libconftest.*
        LIBS="$cf_save_LIBS"
 
        rm -f libconftest.*
        LIBS="$cf_save_LIBS"
 

-       echo "$as_me:27728: result: $cf_ldflags_static" >&5
+       echo "$as_me:27781: result: $cf_ldflags_static" >&5

 echo "${ECHO_T}$cf_ldflags_static" >&6
 
        if test "$cf_ldflags_static" != yes
 echo "${ECHO_T}$cf_ldflags_static" >&6
 
        if test "$cf_ldflags_static" != yes


@@ -27741,7 +27794,7 @@ fi
        ;;
 esac
 
        ;;
 esac
 

-echo "$as_me:27744: checking where we will install curses.h" >&5
+echo "$as_me:27797: checking where we will install curses.h" >&5

 echo $ECHO_N "checking where we will install curses.h... $ECHO_C" >&6
 
 includesubdir=
 echo $ECHO_N "checking where we will install curses.h... $ECHO_C" >&6
 
 includesubdir=


@@ -27751,7 +27804,7 @@ if test "$with_overwrite" = no && \
 then
        includesubdir="/ncurses${USE_LIB_SUFFIX}"
 fi
 then
        includesubdir="/ncurses${USE_LIB_SUFFIX}"
 fi

-echo "$as_me:27754: result: ${includedir}${includesubdir}" >&5
+echo "$as_me:27807: result: ${includedir}${includesubdir}" >&5

 echo "${ECHO_T}${includedir}${includesubdir}" >&6
 
 ### Resolve a conflict between normal and wide-curses by forcing applications
 echo "${ECHO_T}${includedir}${includesubdir}" >&6
 
 ### Resolve a conflict between normal and wide-curses by forcing applications


@@ -27759,7 +27812,7 @@ echo "${ECHO_T}${includedir}${includesubdir}" >&6
 if test "$with_overwrite" != no ; then
 if test "$NCURSES_LIBUTF8" = 1 ; then
        NCURSES_LIBUTF8='defined(HAVE_LIBUTF8_H)'
 if test "$with_overwrite" != no ; then
 if test "$NCURSES_LIBUTF8" = 1 ; then
        NCURSES_LIBUTF8='defined(HAVE_LIBUTF8_H)'

-       { echo "$as_me:27762: WARNING: Wide-character applications must define HAVE_LIBUTF8_H to include curses.h" >&5
+       { echo "$as_me:27815: 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
 echo "$as_me: WARNING: Wide-character applications must define HAVE_LIBUTF8_H to include curses.h" >&2;}
 fi
 fi


@@ -27787,7 +27840,7 @@ EOF
 
 # pkgsrc uses these
 
 
 # pkgsrc uses these
 

-echo "$as_me:27790: checking for desired basename for form library" >&5
+echo "$as_me:27843: checking for desired basename for form library" >&5

 echo $ECHO_N "checking for desired basename for form library... $ECHO_C" >&6
 
 # Check whether --with-form-libname or --without-form-libname was given.
 echo $ECHO_N "checking for desired basename for form library... $ECHO_C" >&6
 
 # Check whether --with-form-libname or --without-form-libname was given.


@@ -27807,10 +27860,10 @@ case "x$FORM_NAME" in
        ;;
 esac
 
        ;;
 esac
 

-echo "$as_me:27810: result: $FORM_NAME" >&5
+echo "$as_me:27863: result: $FORM_NAME" >&5

 echo "${ECHO_T}$FORM_NAME" >&6
 
 echo "${ECHO_T}$FORM_NAME" >&6
 

-echo "$as_me:27813: checking for desired basename for menu library" >&5
+echo "$as_me:27866: checking for desired basename for menu library" >&5

 echo $ECHO_N "checking for desired basename for menu library... $ECHO_C" >&6
 
 # Check whether --with-menu-libname or --without-menu-libname was given.
 echo $ECHO_N "checking for desired basename for menu library... $ECHO_C" >&6
 
 # Check whether --with-menu-libname or --without-menu-libname was given.


@@ -27830,10 +27883,10 @@ case "x$MENU_NAME" in
        ;;
 esac
 
        ;;
 esac
 

-echo "$as_me:27833: result: $MENU_NAME" >&5
+echo "$as_me:27886: result: $MENU_NAME" >&5

 echo "${ECHO_T}$MENU_NAME" >&6
 
 echo "${ECHO_T}$MENU_NAME" >&6
 

-echo "$as_me:27836: checking for desired basename for panel library" >&5
+echo "$as_me:27889: checking for desired basename for panel library" >&5

 echo $ECHO_N "checking for desired basename for panel library... $ECHO_C" >&6
 
 # Check whether --with-panel-libname or --without-panel-libname was given.
 echo $ECHO_N "checking for desired basename for panel library... $ECHO_C" >&6
 
 # Check whether --with-panel-libname or --without-panel-libname was given.


@@ -27853,10 +27906,10 @@ case "x$PANEL_NAME" in
        ;;
 esac
 
        ;;
 esac
 

-echo "$as_me:27856: result: $PANEL_NAME" >&5
+echo "$as_me:27909: result: $PANEL_NAME" >&5

 echo "${ECHO_T}$PANEL_NAME" >&6
 
 echo "${ECHO_T}$PANEL_NAME" >&6
 

-echo "$as_me:27859: checking for desired basename for cxx library" >&5
+echo "$as_me:27912: checking for desired basename for cxx library" >&5

 echo $ECHO_N "checking for desired basename for cxx library... $ECHO_C" >&6
 
 # Check whether --with-cxx-libname or --without-cxx-libname was given.
 echo $ECHO_N "checking for desired basename for cxx library... $ECHO_C" >&6
 
 # Check whether --with-cxx-libname or --without-cxx-libname was given.


@@ -27876,13 +27929,13 @@ case "x$CXX_NAME" in
        ;;
 esac
 
        ;;
 esac
 

-echo "$as_me:27879: result: $CXX_NAME" >&5
+echo "$as_me:27932: result: $CXX_NAME" >&5

 echo "${ECHO_T}$CXX_NAME" >&6
 
 ### Construct the list of subdirectories for which we'll customize makefiles
 ### with the appropriate compile-rules.
 
 echo "${ECHO_T}$CXX_NAME" >&6
 
 ### Construct the list of subdirectories for which we'll customize makefiles
 ### with the appropriate compile-rules.
 

-echo "$as_me:27885: checking for src modules" >&5
+echo "$as_me:27938: checking for src modules" >&5

 echo $ECHO_N "checking for src modules... $ECHO_C" >&6
 
 # dependencies and linker-arguments for test-programs
 echo $ECHO_N "checking for src modules... $ECHO_C" >&6
 
 # dependencies and linker-arguments for test-programs


@@ -27951,7 +28004,7 @@ eval TEST_ROOT="\$${cf_map_lib_basename}_NAME"
                fi
        fi
 done
                fi
        fi
 done

-echo "$as_me:27954: result: $cf_cv_src_modules" >&5
+echo "$as_me:28007: result: $cf_cv_src_modules" >&5

 echo "${ECHO_T}$cf_cv_src_modules" >&6
 
 TEST_ARGS="-L${LIB_DIR} $TEST_ARGS"
 echo "${ECHO_T}$cf_cv_src_modules" >&6
 
 TEST_ARGS="-L${LIB_DIR} $TEST_ARGS"


@@ -28112,7 +28165,7 @@ case "$cf_cv_system_name" in
        (*-D_XOPEN_SOURCE_EXTENDED*)
                test -n "$verbose" && echo "    moving _XOPEN_SOURCE_EXTENDED to work around g++ problem" 1>&6
 
        (*-D_XOPEN_SOURCE_EXTENDED*)
                test -n "$verbose" && echo "    moving _XOPEN_SOURCE_EXTENDED to work around g++ problem" 1>&6
 

-echo "${as_me:-configure}:28115: testing moving _XOPEN_SOURCE_EXTENDED to work around g++ problem ..." 1>&5
+echo "${as_me:-configure}:28168: 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//'`
 
                CFLAGS="$CFLAGS -D_XOPEN_SOURCE_EXTENDED"
                CPPFLAGS=`echo "x$CPPFLAGS" | sed -e  's/^.//' -e 's/-D_XOPEN_SOURCE_EXTENDED//'`


@@ -28123,7 +28176,7 @@ esac
 
 # Help to automatically enable the extended curses features when using either
 # the *-config or the ".pc" files by adding defines.
 
 # Help to automatically enable the extended curses features when using either
 # the *-config or the ".pc" files by adding defines.

-echo "$as_me:28126: checking for defines to add to ncurses${USE_CFG_SUFFIX}-config script" >&5
+echo "$as_me:28179: 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
 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


@@ -28139,7 +28192,7 @@ do
        done
        test "$cf_found" = no && PKG_CFLAGS="$PKG_CFLAGS $cf_loop1"
 done
        done
        test "$cf_found" = no && PKG_CFLAGS="$PKG_CFLAGS $cf_loop1"
 done

-echo "$as_me:28142: result: $PKG_CFLAGS" >&5
+echo "$as_me:28195: result: $PKG_CFLAGS" >&5

 echo "${ECHO_T}$PKG_CFLAGS" >&6
 
 # AC_CHECK_SIZEOF demands a literal parameter, no variables.  So we do this.
 echo "${ECHO_T}$PKG_CFLAGS" >&6
 
 # AC_CHECK_SIZEOF demands a literal parameter, no variables.  So we do this.


@@ -28200,7 +28253,7 @@ then
        cf_filter_syms=$cf_dft_filter_syms
        test -n "$verbose" && echo "    will map symbols to ABI=$cf_cv_abi_version" 1>&6
 
        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}:28203: testing will map symbols to ABI=$cf_cv_abi_version ..." 1>&5
+echo "${as_me:-configure}:28256: testing will map symbols to ABI=$cf_cv_abi_version ..." 1>&5

 
 fi
 
 
 fi
 


@@ -28227,7 +28280,7 @@ fi
 
 # This is used for the *-config script and *.pc data files.
 
 
 # This is used for the *-config script and *.pc data files.
 

-echo "$as_me:28230: checking for linker search path" >&5
+echo "$as_me:28283: checking for linker search path" >&5

 echo $ECHO_N "checking for linker search path... $ECHO_C" >&6
 if test "${cf_cv_ld_searchpath+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 echo $ECHO_N "checking for linker search path... $ECHO_C" >&6
 if test "${cf_cv_ld_searchpath+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6


@@ -28275,7 +28328,7 @@ then
                        cf_pathlist="$cf_pathlist /lib /usr/lib"
                        ;;
                (*)
                        cf_pathlist="$cf_pathlist /lib /usr/lib"
                        ;;
                (*)

-                       { echo "$as_me:28278: WARNING: problem with Solaris architecture" >&5
+                       { echo "$as_me:28331: WARNING: problem with Solaris architecture" >&5

 echo "$as_me: WARNING: problem with Solaris architecture" >&2;}
                        ;;
                esac
 echo "$as_me: WARNING: problem with Solaris architecture" >&2;}
                        ;;
                esac


@@ -28316,7 +28369,7 @@ done
 test -z "$cf_cv_ld_searchpath" && cf_cv_ld_searchpath=/usr/lib
 
 fi
 test -z "$cf_cv_ld_searchpath" && cf_cv_ld_searchpath=/usr/lib
 
 fi

-echo "$as_me:28319: result: $cf_cv_ld_searchpath" >&5
+echo "$as_me:28372: result: $cf_cv_ld_searchpath" >&5

 echo "${ECHO_T}$cf_cv_ld_searchpath" >&6
 
 LD_SEARCHPATH=`echo "$cf_cv_ld_searchpath"|sed -e 's/ /|/g'`
 echo "${ECHO_T}$cf_cv_ld_searchpath" >&6
 
 LD_SEARCHPATH=`echo "$cf_cv_ld_searchpath"|sed -e 's/ /|/g'`


@@ -28406,7 +28459,7 @@ DEFS=-DHAVE_CONFIG_H
 : "${CONFIG_STATUS=./config.status}"
 ac_clean_files_save=$ac_clean_files
 ac_clean_files="$ac_clean_files $CONFIG_STATUS"
 : "${CONFIG_STATUS=./config.status}"
 ac_clean_files_save=$ac_clean_files
 ac_clean_files="$ac_clean_files $CONFIG_STATUS"

-{ echo "$as_me:28409: creating $CONFIG_STATUS" >&5
+{ echo "$as_me:28462: creating $CONFIG_STATUS" >&5

 echo "$as_me: creating $CONFIG_STATUS" >&6;}
 cat >"$CONFIG_STATUS" <<_ACEOF
 #! $SHELL
 echo "$as_me: creating $CONFIG_STATUS" >&6;}
 cat >"$CONFIG_STATUS" <<_ACEOF
 #! $SHELL


@@ -28540,7 +28593,7 @@ EOF
 cat >>"$CONFIG_STATUS" <<EOF
 ac_cs_version="\\
 config.status
 cat >>"$CONFIG_STATUS" <<EOF
 ac_cs_version="\\
 config.status

-configured by $0, generated by GNU Autoconf 2.52.20210105,
+configured by $0, generated by GNU Autoconf 2.52.20210509,

   with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
 
 Copyright 2003-2020,2021       Thomas E. Dickey
   with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
 
 Copyright 2003-2020,2021       Thomas E. Dickey


@@ -28585,7 +28638,7 @@ cat >>"$CONFIG_STATUS" <<\EOF
     echo "$ac_cs_version"; exit 0 ;;
   --he | --h)
     # Conflict between --help and --header
     echo "$ac_cs_version"; exit 0 ;;
   --he | --h)
     # Conflict between --help and --header

-    { { echo "$as_me:28588: error: ambiguous option: $1
+    { { echo "$as_me:28641: 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;}
 Try \`$0 --help' for more information." >&5
 echo "$as_me: error: ambiguous option: $1
 Try \`$0 --help' for more information." >&2;}


@@ -28604,7 +28657,7 @@ Try \`$0 --help' for more information." >&2;}
     ac_need_defaults=false;;
 
   # This is an error.
     ac_need_defaults=false;;
 
   # This is an error.

-  -*) { { echo "$as_me:28607: error: unrecognized option: $1
+  -*) { { echo "$as_me:28660: 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;}
 Try \`$0 --help' for more information." >&5
 echo "$as_me: error: unrecognized option: $1
 Try \`$0 --help' for more information." >&2;}


@@ -28623,7 +28676,7 @@ cat >&5 << _ACEOF
 ## Running config.status.  ##
 ## ----------------------- ##
 
 ## Running config.status.  ##
 ## ----------------------- ##
 

-This file was extended by $as_me 2.52.20210105, executed with
+This file was extended by $as_me 2.52.20210509, executed with

   CONFIG_FILES    = $CONFIG_FILES
   CONFIG_HEADERS  = $CONFIG_HEADERS
   CONFIG_LINKS    = $CONFIG_LINKS
   CONFIG_FILES    = $CONFIG_FILES
   CONFIG_HEADERS  = $CONFIG_HEADERS
   CONFIG_LINKS    = $CONFIG_LINKS


@@ -28729,7 +28782,7 @@ do
   "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" ;;
   "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:28732: error: invalid argument: $ac_config_target" >&5
+  *) { { echo "$as_me:28785: error: invalid argument: $ac_config_target" >&5

 echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
    { (exit 1); exit 1; }; };;
   esac
 echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
    { (exit 1); exit 1; }; };;
   esac


@@ -29239,7 +29292,7 @@ done; }
   esac
 
   if test x"$ac_file" != x-; then
   esac
 
   if test x"$ac_file" != x-; then

-    { echo "$as_me:29242: creating $ac_file" >&5
+    { echo "$as_me:29295: creating $ac_file" >&5

 echo "$as_me: creating $ac_file" >&6;}
     rm -f "$ac_file"
   fi
 echo "$as_me: creating $ac_file" >&6;}
     rm -f "$ac_file"
   fi


@@ -29257,7 +29310,7 @@ echo "$as_me: creating $ac_file" >&6;}
       -) echo $tmp/stdin ;;
       [\\/$]*)
          # Absolute (can't be DOS-style, as IFS=:)
       -) echo $tmp/stdin ;;
       [\\/$]*)
          # Absolute (can't be DOS-style, as IFS=:)

-         test -f "$f" || { { echo "$as_me:29260: error: cannot find input file: $f" >&5
+         test -f "$f" || { { echo "$as_me:29313: error: cannot find input file: $f" >&5

 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          echo $f;;
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          echo $f;;


@@ -29270,7 +29323,7 @@ echo "$as_me: error: cannot find input file: $f" >&2;}
            echo "$srcdir/$f"
          else
            # /dev/null tree
            echo "$srcdir/$f"
          else
            # /dev/null tree

-           { { echo "$as_me:29273: error: cannot find input file: $f" >&5
+           { { echo "$as_me:29326: error: cannot find input file: $f" >&5

 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          fi;;
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          fi;;


@@ -29286,7 +29339,7 @@ cat >>"$CONFIG_STATUS" <<\EOF
       if test -n "$ac_seen"; then
         ac_used=`grep '@datarootdir@' "$ac_item"`
         if test -z "$ac_used"; then
       if test -n "$ac_seen"; then
         ac_used=`grep '@datarootdir@' "$ac_item"`
         if test -z "$ac_used"; then

-          { echo "$as_me:29289: WARNING: datarootdir was used implicitly but not set:
+          { echo "$as_me:29342: 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;}
 $ac_seen" >&5
 echo "$as_me: WARNING: datarootdir was used implicitly but not set:
 $ac_seen" >&2;}


@@ -29295,7 +29348,7 @@ $ac_seen" >&2;}
       fi
       ac_seen=`grep '${datarootdir}' "$ac_item"`
       if test -n "$ac_seen"; then
       fi
       ac_seen=`grep '${datarootdir}' "$ac_item"`
       if test -n "$ac_seen"; then

-        { echo "$as_me:29298: WARNING: datarootdir was used explicitly but not set:
+        { echo "$as_me:29351: 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;}
 $ac_seen" >&5
 echo "$as_me: WARNING: datarootdir was used explicitly but not set:
 $ac_seen" >&2;}


@@ -29332,7 +29385,7 @@ s,@INSTALL@,$ac_INSTALL,;t t
             ac_init=`${EGREP-egrep} '[         ]*'$ac_name'[   ]*=' "$ac_file"`
             if test -z "$ac_init"; then
               ac_seen=`echo "$ac_seen" |sed -e 's,^,'$ac_file':,'`
             ac_init=`${EGREP-egrep} '[         ]*'$ac_name'[   ]*=' "$ac_file"`
             if test -z "$ac_init"; then
               ac_seen=`echo "$ac_seen" |sed -e 's,^,'$ac_file':,'`

-              { echo "$as_me:29335: WARNING: Variable $ac_name is used but was not set:
+              { echo "$as_me:29388: 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;}
 $ac_seen" >&5
 echo "$as_me: WARNING: Variable $ac_name is used but was not set:
 $ac_seen" >&2;}


@@ -29343,7 +29396,7 @@ $ac_seen" >&2;}
     ${EGREP-egrep} -n '@[A-Z_][A-Z_0-9]+@' "$ac_file" >>$tmp/out
     if test -s $tmp/out; then
       ac_seen=`sed -e 's,^,'$ac_file':,' < $tmp/out`
     ${EGREP-egrep} -n '@[A-Z_][A-Z_0-9]+@' "$ac_file" >>$tmp/out
     if test -s $tmp/out; then
       ac_seen=`sed -e 's,^,'$ac_file':,' < $tmp/out`

-      { echo "$as_me:29346: WARNING: Some variables may not be substituted:
+      { echo "$as_me:29399: WARNING: Some variables may not be substituted:

 $ac_seen" >&5
 echo "$as_me: WARNING: Some variables may not be substituted:
 $ac_seen" >&2;}
 $ac_seen" >&5
 echo "$as_me: WARNING: Some variables may not be substituted:
 $ac_seen" >&2;}


@@ -29392,7 +29445,7 @@ for ac_file in : $CONFIG_HEADERS; do test "x$ac_file" = x: && continue
   * )   ac_file_in=$ac_file.in ;;
   esac
 
   * )   ac_file_in=$ac_file.in ;;
   esac
 

-  test x"$ac_file" != x- && { echo "$as_me:29395: creating $ac_file" >&5
+  test x"$ac_file" != x- && { echo "$as_me:29448: creating $ac_file" >&5

 echo "$as_me: creating $ac_file" >&6;}
 
   # First look for the input files in the build tree, otherwise in the
 echo "$as_me: creating $ac_file" >&6;}
 
   # First look for the input files in the build tree, otherwise in the


@@ -29403,7 +29456,7 @@ echo "$as_me: creating $ac_file" >&6;}
       -) echo $tmp/stdin ;;
       [\\/$]*)
          # Absolute (can't be DOS-style, as IFS=:)
       -) echo $tmp/stdin ;;
       [\\/$]*)
          # Absolute (can't be DOS-style, as IFS=:)

-         test -f "$f" || { { echo "$as_me:29406: error: cannot find input file: $f" >&5
+         test -f "$f" || { { echo "$as_me:29459: error: cannot find input file: $f" >&5

 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          echo $f;;
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          echo $f;;


@@ -29416,7 +29469,7 @@ echo "$as_me: error: cannot find input file: $f" >&2;}
            echo "$srcdir/$f"
          else
            # /dev/null tree
            echo "$srcdir/$f"
          else
            # /dev/null tree

-           { { echo "$as_me:29419: error: cannot find input file: $f" >&5
+           { { echo "$as_me:29472: error: cannot find input file: $f" >&5

 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          fi;;
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          fi;;


@@ -29474,7 +29527,7 @@ cat >>"$CONFIG_STATUS" <<\EOF
   rm -f $tmp/in
   if test x"$ac_file" != x-; then
     if cmp -s "$ac_file" "$tmp/config.h" 2>/dev/null; then
   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:29477: $ac_file is unchanged" >&5
+      { echo "$as_me:29530: $ac_file is unchanged" >&5

 echo "$as_me: $ac_file is unchanged" >&6;}
     else
       ac_dir=`$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
 echo "$as_me: $ac_file is unchanged" >&6;}
     else
       ac_dir=`$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \


@@ -29861,7 +29914,7 @@ cf_ITEM=`echo "$cf_item" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQ
                                (cygdll|msysdll|mingw|msvcdll)
                                        test "x$with_shared_cxx" = xno && test -n "$verbose" && echo "  overriding CXX_MODEL to SHARED" 1>&6
 
                                (cygdll|msysdll|mingw|msvcdll)
                                        test "x$with_shared_cxx" = xno && test -n "$verbose" && echo "  overriding CXX_MODEL to SHARED" 1>&6
 

-echo "${as_me:-configure}:29864: testing overriding CXX_MODEL to SHARED ..." 1>&5
+echo "${as_me:-configure}:29917: testing overriding CXX_MODEL to SHARED ..." 1>&5

 
                                        with_shared_cxx=yes
                                        ;;
 
                                        with_shared_cxx=yes
                                        ;;

diff --git a/dist.mk b/dist.mk
index dd0fcf478c5ffc538c7a4433649a9760057605ba..e97a59c69dbecd61569f0d96a6eb8b3ab8087235 100644 (file)
--- a/dist.mk
+++ b/dist.mk
@@ -26,7 +26,7 @@
 # use or other dealings in this Software without prior written               #
 # authorization.                                                             #
 ##############################################################################
 # use or other dealings in this Software without prior written               #
 # authorization.                                                             #
 ##############################################################################

-# $Id: dist.mk,v 1.1415 2021/05/15 09:37:23 tom Exp $
+# $Id: dist.mk,v 1.1416 2021/05/22 13:01:12 tom Exp $

 # Makefile for creating ncurses distributions.
 #
 # This only needs to be used directly as a makefile by developers, but
 # Makefile for creating ncurses distributions.
 #
 # This only needs to be used directly as a makefile by developers, but


@@ -38,7 +38,7 @@ SHELL = /bin/sh
 # These define the major/minor/patch versions of ncurses.
 NCURSES_MAJOR = 6
 NCURSES_MINOR = 2
 # These define the major/minor/patch versions of ncurses.
 NCURSES_MAJOR = 6
 NCURSES_MINOR = 2

-NCURSES_PATCH = 20210515
+NCURSES_PATCH = 20210522

 
 # We don't append the patch to the version, since this only applies to releases
 VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR)
 
 # We don't append the patch to the version, since this only applies to releases
 VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR)

diff --git a/doc/html/man/adacurses6-config.1.html b/doc/html/man/adacurses6-config.1.html
index 64d556b8b1a8a6829bbcaebcfb5dd41de39ec120..cd27809f03d37844143676847d729e8dc6e3905f 100644 (file)
--- a/doc/html/man/adacurses6-config.1.html
+++ b/doc/html/man/adacurses6-config.1.html
@@ -126,7 +126,7 @@
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
        <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>
 
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
        <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>
 

-       This describes <STRONG>ncurses</STRONG> version 6.2 (patch 20210515).
+       This describes <STRONG>ncurses</STRONG> version 6.2 (patch 20210522).

 
 
 
 
 
 

diff --git a/doc/html/man/captoinfo.1m.html b/doc/html/man/captoinfo.1m.html
index bcbc758236f8be786f91f035277cd0dc2968345c..010332cdba8c9c0cdb4322816d4e96bd4c334b78 100644 (file)
--- a/doc/html/man/captoinfo.1m.html
+++ b/doc/html/man/captoinfo.1m.html
@@ -199,7 +199,7 @@
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
        <STRONG><A HREF="infocmp.1m.html">infocmp(1m)</A></STRONG>, <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>, <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>
 
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
        <STRONG><A HREF="infocmp.1m.html">infocmp(1m)</A></STRONG>, <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>, <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>
 

-       This describes <STRONG>ncurses</STRONG> version 6.2 (patch 20210515).
+       This describes <STRONG>ncurses</STRONG> version 6.2 (patch 20210522).

 
 
 </PRE><H2><a name="h2-AUTHOR">AUTHOR</a></H2><PRE>
 
 
 </PRE><H2><a name="h2-AUTHOR">AUTHOR</a></H2><PRE>

diff --git a/doc/html/man/clear.1.html b/doc/html/man/clear.1.html
index c08bcaf86a2b6f4766b27d2b39cb26f1fdff128e..bb9db68923860f0451a19ef7892cb1b74c422cd5 100644 (file)
--- a/doc/html/man/clear.1.html
+++ b/doc/html/man/clear.1.html
@@ -150,7 +150,7 @@
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
        <STRONG><A HREF="tput.1.html">tput(1)</A></STRONG>, <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>
 
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
        <STRONG><A HREF="tput.1.html">tput(1)</A></STRONG>, <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>
 

-       This describes <STRONG>ncurses</STRONG> version 6.2 (patch 20210515).
+       This describes <STRONG>ncurses</STRONG> version 6.2 (patch 20210522).

 
 
 
 
 
 

diff --git a/doc/html/man/curs_get_wch.3x.html b/doc/html/man/curs_get_wch.3x.html
index ad6619f2d77e9256b3183e40ccebfd6782beb081..cbd69fc3de8fbaede68126ffe67a88df9a3879e5 100644 (file)
--- a/doc/html/man/curs_get_wch.3x.html
+++ b/doc/html/man/curs_get_wch.3x.html
@@ -1,6 +1,6 @@
 <!-- 
   ****************************************************************************
 <!-- 
   ****************************************************************************

-  * Copyright 2018-2019,2020 Thomas E. Dickey                                *
+  * Copyright 2018-2020,2021 Thomas E. Dickey                                *

   * Copyright 2002-2016,2017 Free Software Foundation, Inc.                  *
   *                                                                          *
   * Permission is hereby granted, free of charge, to any person obtaining a  *
   * Copyright 2002-2016,2017 Free Software Foundation, Inc.                  *
   *                                                                          *
   * Permission is hereby granted, free of charge, to any person obtaining a  *


@@ -27,7 +27,7 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************

-  * @Id: curs_get_wch.3x,v 1.14 2020/10/17 23:17:05 tom Exp @
+  * @Id: curs_get_wch.3x,v 1.15 2021/05/22 22:33:19 tom Exp @

 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>


@@ -63,6 +63,8 @@
 
 
 </PRE><H2><a name="h2-DESCRIPTION">DESCRIPTION</a></H2><PRE>
 
 
 </PRE><H2><a name="h2-DESCRIPTION">DESCRIPTION</a></H2><PRE>

+
+</PRE><H3><a name="h3-wget_wch">wget_wch</a></H3><PRE>

        The <STRONG>get_wch</STRONG>, <STRONG>wget_wch</STRONG>, <STRONG>mvget_wch</STRONG>, and <STRONG>mvwget_wch</STRONG> functions read a char-
        acter  from  the terminal associated with the current or specified win-
        dow.  In no-delay mode, if no input is waiting, the value  <STRONG>ERR</STRONG>  is  re-
        The <STRONG>get_wch</STRONG>, <STRONG>wget_wch</STRONG>, <STRONG>mvget_wch</STRONG>, and <STRONG>mvwget_wch</STRONG> functions read a char-
        acter  from  the terminal associated with the current or specified win-
        dow.  In no-delay mode, if no input is waiting, the value  <STRONG>ERR</STRONG>  is  re-


@@ -100,23 +102,30 @@
            <STRONG><A HREF="define_key.3x.html">fine_key(3x)</A></STRONG> have no names, but also are expected  to  have  values
            outside the range of 8-bit characters.
 
            <STRONG><A HREF="define_key.3x.html">fine_key(3x)</A></STRONG> have no names, but also are expected  to  have  values
            outside the range of 8-bit characters.
 

+
+</PRE><H3><a name="h3-unget_wch">unget_wch</a></H3><PRE>

        The <STRONG>unget_wch</STRONG> function pushes the wide character <EM>wch</EM> back onto the head
        of the input queue, so the wide character is returned by the next  call
        to  <STRONG>get_wch</STRONG>.  The pushback of one character is guaranteed.  If the pro-
        gram calls <STRONG>unget_wch</STRONG> too many times  without  an  intervening  call  to
        <STRONG>get_wch</STRONG>, the operation may fail.
 
        The <STRONG>unget_wch</STRONG> function pushes the wide character <EM>wch</EM> back onto the head
        of the input queue, so the wide character is returned by the next  call
        to  <STRONG>get_wch</STRONG>.  The pushback of one character is guaranteed.  If the pro-
        gram calls <STRONG>unget_wch</STRONG> too many times  without  an  intervening  call  to
        <STRONG>get_wch</STRONG>, the operation may fail.
 

+       Unlike <STRONG>ungetch</STRONG> and <STRONG>wgetch</STRONG>, <STRONG>unget_wch</STRONG> cannot distinguish special charac-
+       ters returned by <STRONG>wget_wch</STRONG> from ordinary characters.  An application can
+       push  special  keys  which it may read via <STRONG>wget_wch</STRONG> by checking for the
+       <STRONG>KEY_CODE_YES</STRONG> result, and using <STRONG>ungetch</STRONG> for those special keys.
+

 
 </PRE><H2><a name="h2-NOTES">NOTES</a></H2><PRE>
 
 </PRE><H2><a name="h2-NOTES">NOTES</a></H2><PRE>

-       The  header  file  <STRONG>&lt;curses.h&gt;</STRONG>  automatically  includes  the header file
+       The header file  <STRONG>&lt;curses.h&gt;</STRONG>  automatically  includes  the  header  file

        <STRONG>&lt;stdio.h&gt;</STRONG>.
 
        <STRONG>&lt;stdio.h&gt;</STRONG>.
 

-       Applications should not define the escape key by itself  as  a  single-
+       Applications  should  not  define the escape key by itself as a single-

        character function.
 
        character function.
 

-       When  using  <STRONG>get_wch</STRONG>,  <STRONG>wget_wch</STRONG>, <STRONG>mvget_wch</STRONG>, or <STRONG>mvwget_wch</STRONG>, applications
+       When using <STRONG>get_wch</STRONG>, <STRONG>wget_wch</STRONG>, <STRONG>mvget_wch</STRONG>,  or  <STRONG>mvwget_wch</STRONG>,  applications

        should not use <STRONG>nocbreak</STRONG> mode and <STRONG>echo</STRONG> mode at the same time.  Depending
        should not use <STRONG>nocbreak</STRONG> mode and <STRONG>echo</STRONG> mode at the same time.  Depending

-       on  the  state of the tty driver when each character is typed, the pro-
+       on the state of the tty driver when each character is typed,  the  pro-

        gram may produce undesirable results.
 
        All functions except <STRONG>wget_wch</STRONG> and <STRONG>unget_wch</STRONG> may be macros.
        gram may produce undesirable results.
 
        All functions except <STRONG>wget_wch</STRONG> and <STRONG>unget_wch</STRONG> may be macros.


@@ -124,14 +133,14 @@
 
 </PRE><H2><a name="h2-RETURN-VALUE">RETURN VALUE</a></H2><PRE>
        When <STRONG>get_wch</STRONG>, <STRONG>wget_wch</STRONG>, <STRONG>mvget_wch</STRONG>, and <STRONG>mvwget_wch</STRONG> functions successful-
 
 </PRE><H2><a name="h2-RETURN-VALUE">RETURN VALUE</a></H2><PRE>
        When <STRONG>get_wch</STRONG>, <STRONG>wget_wch</STRONG>, <STRONG>mvget_wch</STRONG>, and <STRONG>mvwget_wch</STRONG> functions successful-

-       ly  report  the  pressing  of a function key, they return <STRONG>KEY_CODE_YES</STRONG>.
+       ly report the pressing of a function  key,  they  return  <STRONG>KEY_CODE_YES</STRONG>.

        When they successfully report a wide character, they return <STRONG>OK</STRONG>.  Other-
        wise, they return <STRONG>ERR</STRONG>.
 
        Upon successful completion, <STRONG>unget_wch</STRONG> returns <STRONG>OK</STRONG>.  Otherwise, the func-
        tion returns <STRONG>ERR</STRONG>.
 
        When they successfully report a wide character, they return <STRONG>OK</STRONG>.  Other-
        wise, they return <STRONG>ERR</STRONG>.
 
        Upon successful completion, <STRONG>unget_wch</STRONG> returns <STRONG>OK</STRONG>.  Otherwise, the func-
        tion returns <STRONG>ERR</STRONG>.
 

-       Functions with a "mv" prefix first  perform  a  cursor  movement  using
+       Functions  with  a  "mv"  prefix  first perform a cursor movement using

        <STRONG>wmove</STRONG>, and return an error if the position is outside the window, or if
        the window pointer is null.
 
        <STRONG>wmove</STRONG>, and return an error if the position is outside the window, or if
        the window pointer is null.
 


@@ -148,7 +157,12 @@
 <ul>
 <li><a href="#h2-NAME">NAME</a></li>
 <li><a href="#h2-SYNOPSIS">SYNOPSIS</a></li>
 <ul>
 <li><a href="#h2-NAME">NAME</a></li>
 <li><a href="#h2-SYNOPSIS">SYNOPSIS</a></li>

-<li><a href="#h2-DESCRIPTION">DESCRIPTION</a></li>
+<li><a href="#h2-DESCRIPTION">DESCRIPTION</a>
+<ul>
+<li><a href="#h3-wget_wch">wget_wch</a></li>
+<li><a href="#h3-unget_wch">unget_wch</a></li>
+</ul>
+</li>

 <li><a href="#h2-NOTES">NOTES</a></li>
 <li><a href="#h2-RETURN-VALUE">RETURN VALUE</a></li>
 <li><a href="#h2-SEE-ALSO">SEE ALSO</a></li>
 <li><a href="#h2-NOTES">NOTES</a></li>
 <li><a href="#h2-RETURN-VALUE">RETURN VALUE</a></li>
 <li><a href="#h2-SEE-ALSO">SEE ALSO</a></li>

diff --git a/doc/html/man/curs_getstr.3x.html b/doc/html/man/curs_getstr.3x.html
index efca02f3275892b255437ebbb82375f05cd6d632..76b23fa80c4a0686e992dc7e217a78d3a638fec9 100644 (file)
--- a/doc/html/man/curs_getstr.3x.html
+++ b/doc/html/man/curs_getstr.3x.html
@@ -27,7 +27,7 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************

-  * @Id: curs_getstr.3x,v 1.32 2021/05/15 23:37:18 tom Exp @
+  * @Id: curs_getstr.3x,v 1.33 2021/05/22 21:36:35 tom Exp @

   * X/Open says also until EOf
   * X/Open says then an EOS is added to the result
   * X/Open doesn't mention n<0
   * X/Open says also until EOf
   * X/Open says then an EOS is added to the result
   * X/Open doesn't mention n<0


@@ -193,13 +193,25 @@
 
        <STRONG>o</STRONG>   On return, <STRONG>getnstr</STRONG> restores the modes to their previous values.
 
 
        <STRONG>o</STRONG>   On return, <STRONG>getnstr</STRONG> restores the modes to their previous values.
 

-       Other implementations differ.  While they may set the <EM>echo</EM>  mode,  they
-       do  not  modify  the  <EM>raw</EM> mode, and may take the <EM>cbreak</EM> mode set by the
-       caller into account when deciding  whether  to  handle  echoing  within
-       <STRONG>getnstr</STRONG>  or  as a side-effect of the <STRONG>getch</STRONG> calls.  Because ncurses sets
-       these modes, its signal handlers for INTR and QUIT (e.g., <STRONG>^C</STRONG> or <STRONG>^\</STRONG>) may
-       catch  a signal and stop the program, where other implementations allow
-       one to enter those characters in the buffer.
+       Other implementations differ in their treatment of special characters:
+
+       <STRONG>o</STRONG>   While they may set the <EM>echo</EM> mode, other implementations do not mod-
+           ify  the  <EM>raw</EM> mode, They may take the <EM>cbreak</EM> mode set by the caller
+           into account when deciding whether to handle echoing within <STRONG>getnstr</STRONG>
+           or as a side-effect of the <STRONG>getch</STRONG> calls.
+
+       <STRONG>o</STRONG>   The original ncurses (as pcurses in 1986) set <STRONG>noraw</STRONG> and <STRONG>cbreak</STRONG> when
+           accepting input for <STRONG>getnstr</STRONG>.  That may have been done to make func-
+           tion- and cursor-keys work; it is not necessary with ncurses.
+
+           Since  1995, ncurses has provided signal handlers for INTR and QUIT
+           (e.g., <STRONG>^C</STRONG> or <STRONG>^\</STRONG>).  With the <STRONG>noraw</STRONG> and <STRONG>cbreak</STRONG>  settings,  those  may
+           catch  a  signal  and stop the program, where other implementations
+           allow one to enter those characters in the buffer.
+
+       <STRONG>o</STRONG>   Starting in 2021 (ncurses 6.3), <STRONG>getnstr</STRONG> sets <STRONG>raw</STRONG>, rather than <STRONG>noraw</STRONG>
+           and  <STRONG>cbreak</STRONG> for better compatibility with SVr4-curses, e.g., allow-
+           ing one to enter a <STRONG>^C</STRONG> into the buffer.

 
 
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
 
 
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>

diff --git a/doc/html/man/curs_sp_funcs.3x.html b/doc/html/man/curs_sp_funcs.3x.html
index c934b28ff63955757946566bc9764b3ee49742f2..17bf52474c6e7ece40524caa689b3fa9604b737c 100644 (file)
--- a/doc/html/man/curs_sp_funcs.3x.html
+++ b/doc/html/man/curs_sp_funcs.3x.html
@@ -27,7 +27,7 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************

-  * @Id: curs_sp_funcs.3x,v 1.24 2021/01/02 23:53:22 tom Exp @
+  * @Id: curs_sp_funcs.3x,v 1.25 2021/05/22 22:12:46 tom Exp @

   * ***************************************************************************
   * ***************************************************************************
   * ***************************************************************************
   * ***************************************************************************
   * ***************************************************************************
   * ***************************************************************************


@@ -73,11 +73,12 @@
        <STRONG>int</STRONG> <STRONG>echo_sp(SCREEN*</STRONG> <EM>sp</EM><STRONG>);</STRONG>
        <STRONG>int</STRONG> <STRONG>endwin_sp(SCREEN*</STRONG> <EM>sp</EM><STRONG>);</STRONG>
        <STRONG>char</STRONG> <STRONG>erasechar_sp(SCREEN*</STRONG> <EM>sp</EM><STRONG>);</STRONG>
        <STRONG>int</STRONG> <STRONG>echo_sp(SCREEN*</STRONG> <EM>sp</EM><STRONG>);</STRONG>
        <STRONG>int</STRONG> <STRONG>endwin_sp(SCREEN*</STRONG> <EM>sp</EM><STRONG>);</STRONG>
        <STRONG>char</STRONG> <STRONG>erasechar_sp(SCREEN*</STRONG> <EM>sp</EM><STRONG>);</STRONG>

+       <STRONG>int</STRONG> <STRONG>erasewchar_sp(SCREEN*</STRONG> <EM>sp</EM><STRONG>,</STRONG> <STRONG>wchar_t</STRONG> <STRONG>*</STRONG><EM>ch</EM><STRONG>);</STRONG>

        <STRONG>int</STRONG> <STRONG>extended_color_content_sp(SCREEN</STRONG> <STRONG>*</STRONG> <EM>sp</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>color</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <STRONG>*</STRONG> <EM>r</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <STRONG>*</STRONG> <EM>g</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <STRONG>*</STRONG> <EM>b</EM><STRONG>);</STRONG>
        <STRONG>int</STRONG> <STRONG>extended_pair_content_sp(SCREEN*</STRONG> <EM>sp</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>pair</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <STRONG>*</STRONG> <EM>fg</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <STRONG>*</STRONG> <EM>bg</EM><STRONG>);</STRONG>
        <STRONG>int</STRONG> <STRONG>extended_slk_color_sp(SCREEN*</STRONG> <EM>sp</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>pair</EM><STRONG>);</STRONG>
        <STRONG>int</STRONG> <STRONG>extended_color_content_sp(SCREEN</STRONG> <STRONG>*</STRONG> <EM>sp</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>color</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <STRONG>*</STRONG> <EM>r</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <STRONG>*</STRONG> <EM>g</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <STRONG>*</STRONG> <EM>b</EM><STRONG>);</STRONG>
        <STRONG>int</STRONG> <STRONG>extended_pair_content_sp(SCREEN*</STRONG> <EM>sp</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>pair</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <STRONG>*</STRONG> <EM>fg</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <STRONG>*</STRONG> <EM>bg</EM><STRONG>);</STRONG>
        <STRONG>int</STRONG> <STRONG>extended_slk_color_sp(SCREEN*</STRONG> <EM>sp</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>pair</EM><STRONG>);</STRONG>

-       <STRONG>void</STRONG> <STRONG>filter_sp(SCREEN*</STRONG> <EM>sp</EM><STRONG>);</STRONG>

 
 

+       <STRONG>void</STRONG> <STRONG>filter_sp(SCREEN*</STRONG> <EM>sp</EM><STRONG>);</STRONG>

        <STRONG>int</STRONG> <STRONG>find_pair_sp(SCREEN*</STRONG> <EM>sp</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>fg</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>bg</EM><STRONG>);</STRONG>
        <STRONG>int</STRONG> <STRONG>flash_sp(SCREEN*</STRONG> <EM>sp</EM><STRONG>);</STRONG>
        <STRONG>int</STRONG> <STRONG>flushinp_sp(SCREEN*</STRONG> <EM>sp</EM><STRONG>);</STRONG>
        <STRONG>int</STRONG> <STRONG>find_pair_sp(SCREEN*</STRONG> <EM>sp</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>fg</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>bg</EM><STRONG>);</STRONG>
        <STRONG>int</STRONG> <STRONG>flash_sp(SCREEN*</STRONG> <EM>sp</EM><STRONG>);</STRONG>
        <STRONG>int</STRONG> <STRONG>flushinp_sp(SCREEN*</STRONG> <EM>sp</EM><STRONG>);</STRONG>


@@ -87,8 +88,8 @@
        <STRONG>WINDOW*</STRONG> <STRONG>getwin_sp(SCREEN*</STRONG> <EM>sp</EM><STRONG>,</STRONG> <STRONG>FILE*</STRONG> <EM>filep</EM><STRONG>);</STRONG>
        <STRONG>int</STRONG> <STRONG>halfdelay_sp(SCREEN*</STRONG> <EM>sp</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>tenths</EM><STRONG>);</STRONG>
        <STRONG>bool</STRONG> <STRONG>has_colors_sp(SCREEN*</STRONG> <EM>sp</EM><STRONG>);</STRONG>
        <STRONG>WINDOW*</STRONG> <STRONG>getwin_sp(SCREEN*</STRONG> <EM>sp</EM><STRONG>,</STRONG> <STRONG>FILE*</STRONG> <EM>filep</EM><STRONG>);</STRONG>
        <STRONG>int</STRONG> <STRONG>halfdelay_sp(SCREEN*</STRONG> <EM>sp</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>tenths</EM><STRONG>);</STRONG>
        <STRONG>bool</STRONG> <STRONG>has_colors_sp(SCREEN*</STRONG> <EM>sp</EM><STRONG>);</STRONG>

-       <STRONG>bool</STRONG> <STRONG>has_ic_sp(SCREEN*</STRONG> <EM>sp</EM><STRONG>);</STRONG>

 
 

+       <STRONG>bool</STRONG> <STRONG>has_ic_sp(SCREEN*</STRONG> <EM>sp</EM><STRONG>);</STRONG>

        <STRONG>bool</STRONG> <STRONG>has_il_sp(SCREEN*</STRONG> <EM>sp</EM><STRONG>);</STRONG>
        <STRONG>int</STRONG> <STRONG>has_key_sp(SCREEN*</STRONG> <EM>sp</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>ch</EM><STRONG>);</STRONG>
        <STRONG>bool</STRONG> <STRONG>has_mouse_sp(SCREEN*</STRONG> <EM>sp</EM><STRONG>);</STRONG>
        <STRONG>bool</STRONG> <STRONG>has_il_sp(SCREEN*</STRONG> <EM>sp</EM><STRONG>);</STRONG>
        <STRONG>int</STRONG> <STRONG>has_key_sp(SCREEN*</STRONG> <EM>sp</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>ch</EM><STRONG>);</STRONG>
        <STRONG>bool</STRONG> <STRONG>has_mouse_sp(SCREEN*</STRONG> <EM>sp</EM><STRONG>);</STRONG>


@@ -98,19 +99,20 @@
        <STRONG>int</STRONG> <STRONG>init_pair_sp(SCREEN*</STRONG> <EM>sp</EM><STRONG>,</STRONG> <STRONG>short</STRONG> <EM>pair</EM><STRONG>,</STRONG> <STRONG>short</STRONG> <EM>fg</EM><STRONG>,</STRONG> <STRONG>short</STRONG> <EM>bg</EM><STRONG>);</STRONG>
        <STRONG>int</STRONG> <STRONG>intrflush_sp(SCREEN*</STRONG> <EM>sp</EM><STRONG>,</STRONG> <STRONG>WINDOW*</STRONG> <EM>win</EM><STRONG>,</STRONG> <STRONG>bool</STRONG> <EM>bf</EM><STRONG>);</STRONG>
        <STRONG>bool</STRONG> <STRONG>is_term_resized_sp(SCREEN*</STRONG> <EM>sp</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>lines</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>columns</EM><STRONG>);</STRONG>
        <STRONG>int</STRONG> <STRONG>init_pair_sp(SCREEN*</STRONG> <EM>sp</EM><STRONG>,</STRONG> <STRONG>short</STRONG> <EM>pair</EM><STRONG>,</STRONG> <STRONG>short</STRONG> <EM>fg</EM><STRONG>,</STRONG> <STRONG>short</STRONG> <EM>bg</EM><STRONG>);</STRONG>
        <STRONG>int</STRONG> <STRONG>intrflush_sp(SCREEN*</STRONG> <EM>sp</EM><STRONG>,</STRONG> <STRONG>WINDOW*</STRONG> <EM>win</EM><STRONG>,</STRONG> <STRONG>bool</STRONG> <EM>bf</EM><STRONG>);</STRONG>
        <STRONG>bool</STRONG> <STRONG>is_term_resized_sp(SCREEN*</STRONG> <EM>sp</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>lines</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>columns</EM><STRONG>);</STRONG>

-       <STRONG>bool</STRONG> <STRONG>isendwin_sp(SCREEN*</STRONG> <EM>sp</EM><STRONG>);</STRONG>

 
 

+       <STRONG>bool</STRONG> <STRONG>isendwin_sp(SCREEN*</STRONG> <EM>sp</EM><STRONG>);</STRONG>

        <STRONG>int</STRONG> <STRONG>key_defined_sp(SCREEN*</STRONG> <EM>sp</EM><STRONG>,</STRONG> <STRONG>const</STRONG> <STRONG>char</STRONG> <STRONG>*</STRONG><EM>definition</EM><STRONG>);</STRONG>
        <STRONG>char*</STRONG> <STRONG>keybound_sp(SCREEN*</STRONG> <EM>sp</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>keycode</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>count</EM><STRONG>);</STRONG>
        <STRONG>NCURSES_CONST</STRONG> <STRONG>char</STRONG> <STRONG>*</STRONG> <STRONG>keyname_sp(SCREEN*</STRONG> <EM>sp</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>c</EM><STRONG>);</STRONG>
        <STRONG>int</STRONG> <STRONG>keyok_sp(SCREEN*</STRONG> <EM>sp</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>keycode</EM><STRONG>,</STRONG> <STRONG>bool</STRONG> <EM>enable</EM><STRONG>);</STRONG>
        <STRONG>char</STRONG> <STRONG>killchar_sp(SCREEN*</STRONG> <EM>sp</EM><STRONG>);</STRONG>
        <STRONG>int</STRONG> <STRONG>key_defined_sp(SCREEN*</STRONG> <EM>sp</EM><STRONG>,</STRONG> <STRONG>const</STRONG> <STRONG>char</STRONG> <STRONG>*</STRONG><EM>definition</EM><STRONG>);</STRONG>
        <STRONG>char*</STRONG> <STRONG>keybound_sp(SCREEN*</STRONG> <EM>sp</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>keycode</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>count</EM><STRONG>);</STRONG>
        <STRONG>NCURSES_CONST</STRONG> <STRONG>char</STRONG> <STRONG>*</STRONG> <STRONG>keyname_sp(SCREEN*</STRONG> <EM>sp</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>c</EM><STRONG>);</STRONG>
        <STRONG>int</STRONG> <STRONG>keyok_sp(SCREEN*</STRONG> <EM>sp</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>keycode</EM><STRONG>,</STRONG> <STRONG>bool</STRONG> <EM>enable</EM><STRONG>);</STRONG>
        <STRONG>char</STRONG> <STRONG>killchar_sp(SCREEN*</STRONG> <EM>sp</EM><STRONG>);</STRONG>

+       <STRONG>int</STRONG> <STRONG>killwchar_sp(SCREEN*</STRONG> <EM>sp</EM><STRONG>,</STRONG> <STRONG>wchar_t</STRONG> <STRONG>*</STRONG><EM>ch</EM><STRONG>);</STRONG>

        <STRONG>char*</STRONG> <STRONG>longname_sp(SCREEN*</STRONG> <EM>sp</EM><STRONG>);</STRONG>
        <STRONG>int</STRONG> <STRONG>mcprint_sp(SCREEN*</STRONG> <EM>sp</EM><STRONG>,</STRONG> <STRONG>char</STRONG> <STRONG>*</STRONG><EM>data</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>len</EM><STRONG>);</STRONG>
        <STRONG>int</STRONG> <STRONG>mouseinterval_sp(SCREEN*</STRONG> <EM>sp</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>erval</EM><STRONG>);</STRONG>
        <STRONG>char*</STRONG> <STRONG>longname_sp(SCREEN*</STRONG> <EM>sp</EM><STRONG>);</STRONG>
        <STRONG>int</STRONG> <STRONG>mcprint_sp(SCREEN*</STRONG> <EM>sp</EM><STRONG>,</STRONG> <STRONG>char</STRONG> <STRONG>*</STRONG><EM>data</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>len</EM><STRONG>);</STRONG>
        <STRONG>int</STRONG> <STRONG>mouseinterval_sp(SCREEN*</STRONG> <EM>sp</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>erval</EM><STRONG>);</STRONG>

+

        <STRONG>mmask_t</STRONG> <STRONG>mousemask_sp(SCREEN*</STRONG> <EM>sp</EM><STRONG>,</STRONG> <STRONG>mmask_t</STRONG> <EM>newmask</EM><STRONG>,</STRONG> <STRONG>mmask_t</STRONG> <STRONG>*</STRONG><EM>oldmask</EM><STRONG>);</STRONG>
        <STRONG>int</STRONG> <STRONG>mvcur_sp(SCREEN*</STRONG> <EM>sp</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>oldrow</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>oldcol</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>newrow</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>newcol</EM><STRONG>);</STRONG>
        <STRONG>mmask_t</STRONG> <STRONG>mousemask_sp(SCREEN*</STRONG> <EM>sp</EM><STRONG>,</STRONG> <STRONG>mmask_t</STRONG> <EM>newmask</EM><STRONG>,</STRONG> <STRONG>mmask_t</STRONG> <STRONG>*</STRONG><EM>oldmask</EM><STRONG>);</STRONG>
        <STRONG>int</STRONG> <STRONG>mvcur_sp(SCREEN*</STRONG> <EM>sp</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>oldrow</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>oldcol</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>newrow</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>newcol</EM><STRONG>);</STRONG>

-

        <STRONG>int</STRONG> <STRONG>napms_sp(SCREEN*</STRONG> <EM>sp</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>ms</EM><STRONG>);</STRONG>
        <STRONG>WINDOW*</STRONG> <STRONG>newpad_sp(SCREEN*</STRONG> <EM>sp</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>nrows</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>ncols</EM><STRONG>);</STRONG>
        <STRONG>SCREEN*</STRONG> <STRONG>new_prescr(void);</STRONG>
        <STRONG>int</STRONG> <STRONG>napms_sp(SCREEN*</STRONG> <EM>sp</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>ms</EM><STRONG>);</STRONG>
        <STRONG>WINDOW*</STRONG> <STRONG>newpad_sp(SCREEN*</STRONG> <EM>sp</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>nrows</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>ncols</EM><STRONG>);</STRONG>
        <STRONG>SCREEN*</STRONG> <STRONG>new_prescr(void);</STRONG>


@@ -119,9 +121,9 @@
        <STRONG>int</STRONG> <STRONG>nl_sp(SCREEN*</STRONG> <EM>sp</EM><STRONG>);</STRONG>
        <STRONG>int</STRONG> <STRONG>nocbreak_sp(SCREEN*</STRONG> <EM>sp</EM><STRONG>);</STRONG>
        <STRONG>int</STRONG> <STRONG>noecho_sp(SCREEN*</STRONG> <EM>sp</EM><STRONG>);</STRONG>
        <STRONG>int</STRONG> <STRONG>nl_sp(SCREEN*</STRONG> <EM>sp</EM><STRONG>);</STRONG>
        <STRONG>int</STRONG> <STRONG>nocbreak_sp(SCREEN*</STRONG> <EM>sp</EM><STRONG>);</STRONG>
        <STRONG>int</STRONG> <STRONG>noecho_sp(SCREEN*</STRONG> <EM>sp</EM><STRONG>);</STRONG>

+

        <STRONG>void</STRONG> <STRONG>nofilter_sp(SCREEN*</STRONG> <EM>sp</EM><STRONG>);</STRONG>
        <STRONG>int</STRONG> <STRONG>nonl_sp(SCREEN*</STRONG> <EM>sp</EM><STRONG>);</STRONG>
        <STRONG>void</STRONG> <STRONG>nofilter_sp(SCREEN*</STRONG> <EM>sp</EM><STRONG>);</STRONG>
        <STRONG>int</STRONG> <STRONG>nonl_sp(SCREEN*</STRONG> <EM>sp</EM><STRONG>);</STRONG>

-

        <STRONG>void</STRONG> <STRONG>noqiflush_sp(SCREEN*</STRONG> <EM>sp</EM><STRONG>);</STRONG>
        <STRONG>int</STRONG> <STRONG>noraw_sp(SCREEN*</STRONG> <EM>sp</EM><STRONG>);</STRONG>
        <STRONG>int</STRONG> <STRONG>pair_content_sp(SCREEN*</STRONG> <EM>sp</EM><STRONG>,</STRONG> <STRONG>short</STRONG> <EM>pair</EM><STRONG>,</STRONG> <STRONG>short*</STRONG> <EM>fg</EM><STRONG>,</STRONG> <STRONG>short*</STRONG> <EM>bg</EM><STRONG>);</STRONG>
        <STRONG>void</STRONG> <STRONG>noqiflush_sp(SCREEN*</STRONG> <EM>sp</EM><STRONG>);</STRONG>
        <STRONG>int</STRONG> <STRONG>noraw_sp(SCREEN*</STRONG> <EM>sp</EM><STRONG>);</STRONG>
        <STRONG>int</STRONG> <STRONG>pair_content_sp(SCREEN*</STRONG> <EM>sp</EM><STRONG>,</STRONG> <STRONG>short</STRONG> <EM>pair</EM><STRONG>,</STRONG> <STRONG>short*</STRONG> <EM>fg</EM><STRONG>,</STRONG> <STRONG>short*</STRONG> <EM>bg</EM><STRONG>);</STRONG>


@@ -130,9 +132,9 @@
        <STRONG>int</STRONG> <STRONG>reset_prog_mode_sp(SCREEN*</STRONG> <EM>sp</EM><STRONG>);</STRONG>
        <STRONG>void</STRONG> <STRONG>reset_color_pairs_sp(SCREEN*</STRONG> <EM>sp</EM><STRONG>);</STRONG>
        <STRONG>int</STRONG> <STRONG>reset_shell_mode_sp(SCREEN*</STRONG> <EM>sp</EM><STRONG>);</STRONG>
        <STRONG>int</STRONG> <STRONG>reset_prog_mode_sp(SCREEN*</STRONG> <EM>sp</EM><STRONG>);</STRONG>
        <STRONG>void</STRONG> <STRONG>reset_color_pairs_sp(SCREEN*</STRONG> <EM>sp</EM><STRONG>);</STRONG>
        <STRONG>int</STRONG> <STRONG>reset_shell_mode_sp(SCREEN*</STRONG> <EM>sp</EM><STRONG>);</STRONG>

+

        <STRONG>int</STRONG> <STRONG>resetty_sp(SCREEN*</STRONG> <EM>sp</EM><STRONG>);</STRONG>
        <STRONG>int</STRONG> <STRONG>resize_term_sp(SCREEN*</STRONG> <EM>sp</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>lines</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>columns</EM><STRONG>);</STRONG>
        <STRONG>int</STRONG> <STRONG>resetty_sp(SCREEN*</STRONG> <EM>sp</EM><STRONG>);</STRONG>
        <STRONG>int</STRONG> <STRONG>resize_term_sp(SCREEN*</STRONG> <EM>sp</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>lines</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>columns</EM><STRONG>);</STRONG>

-

        <STRONG>int</STRONG> <STRONG>resizeterm_sp(SCREEN*</STRONG> <EM>sp</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>lines</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>columns</EM><STRONG>);</STRONG>
        <STRONG>int</STRONG> <STRONG>ripoffline_sp(SCREEN*</STRONG> <EM>sp</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>line</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <STRONG>(*</STRONG><EM>init</EM><STRONG>)(WINDOW*</STRONG> <EM>win</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>fmt</EM><STRONG>));</STRONG>
        <STRONG>int</STRONG> <STRONG>savetty_sp(SCREEN*</STRONG> <EM>sp</EM><STRONG>);</STRONG>
        <STRONG>int</STRONG> <STRONG>resizeterm_sp(SCREEN*</STRONG> <EM>sp</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>lines</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>columns</EM><STRONG>);</STRONG>
        <STRONG>int</STRONG> <STRONG>ripoffline_sp(SCREEN*</STRONG> <EM>sp</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>line</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <STRONG>(*</STRONG><EM>init</EM><STRONG>)(WINDOW*</STRONG> <EM>win</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>fmt</EM><STRONG>));</STRONG>
        <STRONG>int</STRONG> <STRONG>savetty_sp(SCREEN*</STRONG> <EM>sp</EM><STRONG>);</STRONG>


@@ -141,8 +143,8 @@
        <STRONG>int</STRONG> <STRONG>scr_set_sp(SCREEN*</STRONG> <EM>sp</EM><STRONG>,</STRONG> <STRONG>const</STRONG> <STRONG>char</STRONG> <STRONG>*</STRONG><EM>filename</EM><STRONG>);</STRONG>
        <STRONG>int</STRONG> <STRONG>set_escdelay_sp(SCREEN*</STRONG> <EM>sp</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>ms</EM><STRONG>);</STRONG>
        <STRONG>int</STRONG> <STRONG>set_tabsize_sp(SCREEN*</STRONG> <EM>sp</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>cols</EM><STRONG>);</STRONG>
        <STRONG>int</STRONG> <STRONG>scr_set_sp(SCREEN*</STRONG> <EM>sp</EM><STRONG>,</STRONG> <STRONG>const</STRONG> <STRONG>char</STRONG> <STRONG>*</STRONG><EM>filename</EM><STRONG>);</STRONG>
        <STRONG>int</STRONG> <STRONG>set_escdelay_sp(SCREEN*</STRONG> <EM>sp</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>ms</EM><STRONG>);</STRONG>
        <STRONG>int</STRONG> <STRONG>set_tabsize_sp(SCREEN*</STRONG> <EM>sp</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>cols</EM><STRONG>);</STRONG>

-       <STRONG>int</STRONG> <STRONG>slk_attr_set_sp(SCREEN*</STRONG> <EM>sp</EM><STRONG>,</STRONG> <STRONG>const</STRONG> <STRONG>attr_t</STRONG> <EM>attrs</EM><STRONG>,</STRONG> <STRONG>short</STRONG> <EM>pair</EM><STRONG>,</STRONG> <STRONG>void*</STRONG><EM>opts</EM><STRONG>);</STRONG>

 
 

+       <STRONG>int</STRONG> <STRONG>slk_attr_set_sp(SCREEN*</STRONG> <EM>sp</EM><STRONG>,</STRONG> <STRONG>const</STRONG> <STRONG>attr_t</STRONG> <EM>attrs</EM><STRONG>,</STRONG> <STRONG>short</STRONG> <EM>pair</EM><STRONG>,</STRONG> <STRONG>void*</STRONG><EM>opts</EM><STRONG>);</STRONG>

        <STRONG>int</STRONG> <STRONG>slk_attrset_sp(SCREEN*</STRONG> <EM>sp</EM><STRONG>,</STRONG> <STRONG>const</STRONG> <STRONG>chtype</STRONG> <EM>a</EM><STRONG>);</STRONG>
        <STRONG>int</STRONG> <STRONG>slk_attroff_sp(SCREEN*</STRONG> <EM>sp</EM><STRONG>,</STRONG> <STRONG>const</STRONG> <STRONG>chtype</STRONG> <EM>a</EM><STRONG>);</STRONG>
        <STRONG>int</STRONG> <STRONG>slk_attron_sp(SCREEN*</STRONG> <EM>sp</EM><STRONG>,</STRONG> <STRONG>const</STRONG> <STRONG>chtype</STRONG> <EM>a</EM><STRONG>);</STRONG>
        <STRONG>int</STRONG> <STRONG>slk_attrset_sp(SCREEN*</STRONG> <EM>sp</EM><STRONG>,</STRONG> <STRONG>const</STRONG> <STRONG>chtype</STRONG> <EM>a</EM><STRONG>);</STRONG>
        <STRONG>int</STRONG> <STRONG>slk_attroff_sp(SCREEN*</STRONG> <EM>sp</EM><STRONG>,</STRONG> <STRONG>const</STRONG> <STRONG>chtype</STRONG> <EM>a</EM><STRONG>);</STRONG>
        <STRONG>int</STRONG> <STRONG>slk_attron_sp(SCREEN*</STRONG> <EM>sp</EM><STRONG>,</STRONG> <STRONG>const</STRONG> <STRONG>chtype</STRONG> <EM>a</EM><STRONG>);</STRONG>


@@ -152,8 +154,8 @@
        <STRONG>int</STRONG> <STRONG>slk_init_sp(SCREEN*</STRONG> <EM>sp</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>fmt</EM><STRONG>);</STRONG>
        <STRONG>char*</STRONG> <STRONG>slk_label_sp(SCREEN*</STRONG> <EM>sp</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>labnum</EM><STRONG>);</STRONG>
        <STRONG>int</STRONG> <STRONG>slk_noutrefresh_sp(SCREEN*</STRONG> <EM>sp</EM><STRONG>);</STRONG>
        <STRONG>int</STRONG> <STRONG>slk_init_sp(SCREEN*</STRONG> <EM>sp</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>fmt</EM><STRONG>);</STRONG>
        <STRONG>char*</STRONG> <STRONG>slk_label_sp(SCREEN*</STRONG> <EM>sp</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>labnum</EM><STRONG>);</STRONG>
        <STRONG>int</STRONG> <STRONG>slk_noutrefresh_sp(SCREEN*</STRONG> <EM>sp</EM><STRONG>);</STRONG>

-       <STRONG>int</STRONG> <STRONG>slk_refresh_sp(SCREEN*</STRONG> <EM>sp</EM><STRONG>);</STRONG>

 
 

+       <STRONG>int</STRONG> <STRONG>slk_refresh_sp(SCREEN*</STRONG> <EM>sp</EM><STRONG>);</STRONG>

        <STRONG>int</STRONG> <STRONG>slk_restore_sp(SCREEN*</STRONG> <EM>sp</EM><STRONG>);</STRONG>
        <STRONG>int</STRONG> <STRONG>slk_set_sp(SCREEN*</STRONG> <EM>sp</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>labnum</EM><STRONG>,</STRONG> <STRONG>const</STRONG> <STRONG>char</STRONG> <STRONG>*</STRONG> <EM>label</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>fmt</EM><STRONG>);</STRONG>
        <STRONG>int</STRONG> <STRONG>slk_touch_sp(SCREEN*</STRONG> <EM>sp</EM><STRONG>);</STRONG>
        <STRONG>int</STRONG> <STRONG>slk_restore_sp(SCREEN*</STRONG> <EM>sp</EM><STRONG>);</STRONG>
        <STRONG>int</STRONG> <STRONG>slk_set_sp(SCREEN*</STRONG> <EM>sp</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>labnum</EM><STRONG>,</STRONG> <STRONG>const</STRONG> <STRONG>char</STRONG> <STRONG>*</STRONG> <EM>label</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>fmt</EM><STRONG>);</STRONG>
        <STRONG>int</STRONG> <STRONG>slk_touch_sp(SCREEN*</STRONG> <EM>sp</EM><STRONG>);</STRONG>


@@ -163,8 +165,8 @@
        <STRONG>char*</STRONG> <STRONG>termname_sp(SCREEN*</STRONG> <EM>sp</EM><STRONG>);</STRONG>
        <STRONG>int</STRONG> <STRONG>typeahead_sp(SCREEN*</STRONG> <EM>sp</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>fd</EM><STRONG>);</STRONG>
        <STRONG>int</STRONG> <STRONG>unget_wch_sp(SCREEN*</STRONG> <EM>sp</EM><STRONG>,</STRONG> <STRONG>const</STRONG> <STRONG>wchar_t</STRONG> <EM>wch</EM><STRONG>);</STRONG>
        <STRONG>char*</STRONG> <STRONG>termname_sp(SCREEN*</STRONG> <EM>sp</EM><STRONG>);</STRONG>
        <STRONG>int</STRONG> <STRONG>typeahead_sp(SCREEN*</STRONG> <EM>sp</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>fd</EM><STRONG>);</STRONG>
        <STRONG>int</STRONG> <STRONG>unget_wch_sp(SCREEN*</STRONG> <EM>sp</EM><STRONG>,</STRONG> <STRONG>const</STRONG> <STRONG>wchar_t</STRONG> <EM>wch</EM><STRONG>);</STRONG>

-       <STRONG>int</STRONG> <STRONG>ungetch_sp(SCREEN*</STRONG> <EM>sp</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>ch</EM><STRONG>);</STRONG>

 
 

+       <STRONG>int</STRONG> <STRONG>ungetch_sp(SCREEN*</STRONG> <EM>sp</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>ch</EM><STRONG>);</STRONG>

        <STRONG>int</STRONG> <STRONG>ungetmouse_sp(SCREEN*</STRONG> <EM>sp</EM><STRONG>,MEVENT</STRONG> <STRONG>*</STRONG> <STRONG>event);</STRONG>
        <STRONG>int</STRONG> <STRONG>use_default_colors_sp(SCREEN*</STRONG> <EM>sp</EM><STRONG>);</STRONG>
        <STRONG>void</STRONG> <STRONG>use_env_sp(SCREEN*</STRONG> <EM>sp</EM><STRONG>,</STRONG> <STRONG>bool</STRONG> <EM>bf</EM><STRONG>);</STRONG>
        <STRONG>int</STRONG> <STRONG>ungetmouse_sp(SCREEN*</STRONG> <EM>sp</EM><STRONG>,MEVENT</STRONG> <STRONG>*</STRONG> <STRONG>event);</STRONG>
        <STRONG>int</STRONG> <STRONG>use_default_colors_sp(SCREEN*</STRONG> <EM>sp</EM><STRONG>);</STRONG>
        <STRONG>void</STRONG> <STRONG>use_env_sp(SCREEN*</STRONG> <EM>sp</EM><STRONG>,</STRONG> <STRONG>bool</STRONG> <EM>bf</EM><STRONG>);</STRONG>

diff --git a/doc/html/man/form.3x.html b/doc/html/man/form.3x.html
index df81cd50800c2bbe4f3ef36997351add22a153d9..82cf4e20d7e2ea334af84dd01897969470f98193 100644 (file)
--- a/doc/html/man/form.3x.html
+++ b/doc/html/man/form.3x.html
@@ -248,7 +248,7 @@
        <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG> and related pages whose names  begin  "form_"  for  detailed
        descriptions of the entry points.
 
        <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG> and related pages whose names  begin  "form_"  for  detailed
        descriptions of the entry points.
 

-       This describes <STRONG>ncurses</STRONG> version 6.2 (patch 20210515).
+       This describes <STRONG>ncurses</STRONG> version 6.2 (patch 20210522).

 
 
 
 
 
 

diff --git a/doc/html/man/infocmp.1m.html b/doc/html/man/infocmp.1m.html
index 4ecba86d5a26272f55b2993c2702311e858932c7..038886f9b7c8c328bbb9227e32332e95377397f6 100644 (file)
--- a/doc/html/man/infocmp.1m.html
+++ b/doc/html/man/infocmp.1m.html
@@ -514,7 +514,7 @@
 
        https://invisible-island.net/ncurses/tctest.html
 
 
        https://invisible-island.net/ncurses/tctest.html
 

-       This describes <STRONG>ncurses</STRONG> version 6.2 (patch 20210515).
+       This describes <STRONG>ncurses</STRONG> version 6.2 (patch 20210522).

 
 
 </PRE><H2><a name="h2-AUTHOR">AUTHOR</a></H2><PRE>
 
 
 </PRE><H2><a name="h2-AUTHOR">AUTHOR</a></H2><PRE>

diff --git a/doc/html/man/infotocap.1m.html b/doc/html/man/infotocap.1m.html
index 2542d9f7a1b64aeb6dfc38add08f2ba36619d30b..c2d1a397c03e6fe2a98b004b54acb69963da9bc5 100644 (file)
--- a/doc/html/man/infotocap.1m.html
+++ b/doc/html/man/infotocap.1m.html
@@ -91,7 +91,7 @@
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
        <STRONG><A HREF="infocmp.1m.html">infocmp(1m)</A></STRONG>, <STRONG><A HREF="tic.1m.html">tic(1m)</A></STRONG>, <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>, <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>
 
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
        <STRONG><A HREF="infocmp.1m.html">infocmp(1m)</A></STRONG>, <STRONG><A HREF="tic.1m.html">tic(1m)</A></STRONG>, <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>, <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>
 

-       This describes <STRONG>ncurses</STRONG> version 6.2 (patch 20210515).
+       This describes <STRONG>ncurses</STRONG> version 6.2 (patch 20210522).

 
 
 </PRE><H2><a name="h2-AUTHOR">AUTHOR</a></H2><PRE>
 
 
 </PRE><H2><a name="h2-AUTHOR">AUTHOR</a></H2><PRE>

diff --git a/doc/html/man/menu.3x.html b/doc/html/man/menu.3x.html
index f68443e2037d4410915932a30954515d89c0cc81..47fcc50789b62281078a9ccea0810395c2b8e35a 100644 (file)
--- a/doc/html/man/menu.3x.html
+++ b/doc/html/man/menu.3x.html
@@ -223,7 +223,7 @@
        <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG> and related pages whose names  begin  "menu_"  for  detailed
        descriptions of the entry points.
 
        <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG> and related pages whose names  begin  "menu_"  for  detailed
        descriptions of the entry points.
 

-       This describes <STRONG>ncurses</STRONG> version 6.2 (patch 20210515).
+       This describes <STRONG>ncurses</STRONG> version 6.2 (patch 20210522).

 
 
 
 
 
 

diff --git a/doc/html/man/ncurses.3x.html b/doc/html/man/ncurses.3x.html
index bfb84f38a31a1e99a321c90a42460746418eeca1..c4fbf112a5cfc00994745aa5da7bd75c259ef6e8 100644 (file)
--- a/doc/html/man/ncurses.3x.html
+++ b/doc/html/man/ncurses.3x.html
@@ -60,7 +60,7 @@
        method of updating  character  screens  with  reasonable  optimization.
        This  implementation  is  "new  curses"  (ncurses)  and is the approved
        replacement for 4.4BSD classic curses,  which  has  been  discontinued.
        method of updating  character  screens  with  reasonable  optimization.
        This  implementation  is  "new  curses"  (ncurses)  and is the approved
        replacement for 4.4BSD classic curses,  which  has  been  discontinued.

-       This describes <STRONG>ncurses</STRONG> version 6.2 (patch 20210515).
+       This describes <STRONG>ncurses</STRONG> version 6.2 (patch 20210522).

 
        The  <STRONG>ncurses</STRONG>  library emulates the curses library of System V Release 4
        UNIX, and XPG4 (X/Open Portability Guide) curses  (also  known  as  XSI
 
        The  <STRONG>ncurses</STRONG>  library emulates the curses library of System V Release 4
        UNIX, and XPG4 (X/Open Portability Guide) curses  (also  known  as  XSI

diff --git a/doc/html/man/ncurses6-config.1.html b/doc/html/man/ncurses6-config.1.html
index 428959e4d952a5cc2b8da2690193a61874a9eeec..532690fa186e7b06df0b0455e0961dd5b688122a 100644 (file)
--- a/doc/html/man/ncurses6-config.1.html
+++ b/doc/html/man/ncurses6-config.1.html
@@ -113,7 +113,7 @@
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
        <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>
 
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
        <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>
 

-       This describes <STRONG>ncurses</STRONG> version 6.2 (patch 20210515).
+       This describes <STRONG>ncurses</STRONG> version 6.2 (patch 20210522).

 
 
 
 
 
 

diff --git a/doc/html/man/panel.3x.html b/doc/html/man/panel.3x.html
index f69e23b4c336729868d824b4869139fb1f7b702a..f369f104eb15174b9f12d0e9365c2e1e75ac5090 100644 (file)
--- a/doc/html/man/panel.3x.html
+++ b/doc/html/man/panel.3x.html
@@ -281,7 +281,7 @@
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
        <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>, <STRONG><A HREF="curs_variables.3x.html">curs_variables(3x)</A></STRONG>,
 
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
        <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>, <STRONG><A HREF="curs_variables.3x.html">curs_variables(3x)</A></STRONG>,
 

-       This describes <STRONG>ncurses</STRONG> version 6.2 (patch 20210515).
+       This describes <STRONG>ncurses</STRONG> version 6.2 (patch 20210522).

 
 
 </PRE><H2><a name="h2-AUTHOR">AUTHOR</a></H2><PRE>
 
 
 </PRE><H2><a name="h2-AUTHOR">AUTHOR</a></H2><PRE>

diff --git a/doc/html/man/tabs.1.html b/doc/html/man/tabs.1.html
index f49d6d1cdb4f5a79f060dec4c1372f2e97ac14c4..7a824d959fb1e3b99cf5600efadac98e9166879d 100644 (file)
--- a/doc/html/man/tabs.1.html
+++ b/doc/html/man/tabs.1.html
@@ -207,7 +207,7 @@
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
        <STRONG><A HREF="infocmp.1m.html">infocmp(1m)</A></STRONG>, <STRONG><A HREF="tset.1.html">tset(1)</A></STRONG>, <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>, <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>.
 
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
        <STRONG><A HREF="infocmp.1m.html">infocmp(1m)</A></STRONG>, <STRONG><A HREF="tset.1.html">tset(1)</A></STRONG>, <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>, <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>.
 

-       This describes <STRONG>ncurses</STRONG> version 6.2 (patch 20210515).
+       This describes <STRONG>ncurses</STRONG> version 6.2 (patch 20210522).

 
 
 
 
 
 

diff --git a/doc/html/man/terminfo.5.html b/doc/html/man/terminfo.5.html
index a10ea2f2f1ed2291907b7e427f3e8358cff81b22..51862238df8844d578507cb1f3554a2869a52793 100644 (file)
--- a/doc/html/man/terminfo.5.html
+++ b/doc/html/man/terminfo.5.html
@@ -106,7 +106,7 @@
        have, by specifying how to perform screen operations, and by specifying
        padding requirements and initialization sequences.
 
        have, by specifying how to perform screen operations, and by specifying
        padding requirements and initialization sequences.
 

-       This manual describes <STRONG>ncurses</STRONG> version 6.2 (patch 20210515).
+       This manual describes <STRONG>ncurses</STRONG> version 6.2 (patch 20210522).

 
 
 </PRE><H3><a name="h3-Terminfo-Entry-Syntax">Terminfo Entry Syntax</a></H3><PRE>
 
 
 </PRE><H3><a name="h3-Terminfo-Entry-Syntax">Terminfo Entry Syntax</a></H3><PRE>

diff --git a/doc/html/man/tic.1m.html b/doc/html/man/tic.1m.html
index 2bf4f51a26a8aba9782d6ebdb7c19de4ad39b1b9..c42f43a3416134bfc5ad3862bde1ba3d5b6393f4 100644 (file)
--- a/doc/html/man/tic.1m.html
+++ b/doc/html/man/tic.1m.html
@@ -461,7 +461,7 @@
        <STRONG><A HREF="captoinfo.1m.html">captoinfo(1m)</A></STRONG>,   <STRONG><A HREF="infocmp.1m.html">infocmp(1m)</A></STRONG>,   <STRONG><A HREF="infotocap.1m.html">infotocap(1m)</A></STRONG>,   <STRONG><A HREF="toe.1m.html">toe(1m)</A></STRONG>,   <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>,
        <STRONG><A HREF="term.5.html">term(5)</A></STRONG>.  <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>.  <STRONG><A HREF="user_caps.5.html">user_caps(5)</A></STRONG>.
 
        <STRONG><A HREF="captoinfo.1m.html">captoinfo(1m)</A></STRONG>,   <STRONG><A HREF="infocmp.1m.html">infocmp(1m)</A></STRONG>,   <STRONG><A HREF="infotocap.1m.html">infotocap(1m)</A></STRONG>,   <STRONG><A HREF="toe.1m.html">toe(1m)</A></STRONG>,   <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>,
        <STRONG><A HREF="term.5.html">term(5)</A></STRONG>.  <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>.  <STRONG><A HREF="user_caps.5.html">user_caps(5)</A></STRONG>.
 

-       This describes <STRONG>ncurses</STRONG> version 6.2 (patch 20210515).
+       This describes <STRONG>ncurses</STRONG> version 6.2 (patch 20210522).

 
 
 </PRE><H2><a name="h2-AUTHOR">AUTHOR</a></H2><PRE>
 
 
 </PRE><H2><a name="h2-AUTHOR">AUTHOR</a></H2><PRE>

diff --git a/doc/html/man/toe.1m.html b/doc/html/man/toe.1m.html
index 8edd0ce3b8a888f77f0e5f0e22bdaec65334d4f9..7b0247331504d5f37c90db50dc8f58a12dafe39e 100644 (file)
--- a/doc/html/man/toe.1m.html
+++ b/doc/html/man/toe.1m.html
@@ -171,7 +171,7 @@
        <STRONG><A HREF="captoinfo.1m.html">captoinfo(1m)</A></STRONG>,   <STRONG><A HREF="infocmp.1m.html">infocmp(1m)</A></STRONG>,   <STRONG><A HREF="infotocap.1m.html">infotocap(1m)</A></STRONG>,   <STRONG><A HREF="tic.1m.html">tic(1m)</A></STRONG>,   <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>,
        <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>.
 
        <STRONG><A HREF="captoinfo.1m.html">captoinfo(1m)</A></STRONG>,   <STRONG><A HREF="infocmp.1m.html">infocmp(1m)</A></STRONG>,   <STRONG><A HREF="infotocap.1m.html">infotocap(1m)</A></STRONG>,   <STRONG><A HREF="tic.1m.html">tic(1m)</A></STRONG>,   <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>,
        <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>.
 

-       This describes <STRONG>ncurses</STRONG> version 6.2 (patch 20210515).
+       This describes <STRONG>ncurses</STRONG> version 6.2 (patch 20210522).

 
 
 
 
 
 

diff --git a/doc/html/man/tput.1.html b/doc/html/man/tput.1.html
index 98234a9ccbae0ac68d869327aa9b8e558e22f8d0..b0e49b1afed2840ac8aa961a0ec244dec62c7c32 100644 (file)
--- a/doc/html/man/tput.1.html
+++ b/doc/html/man/tput.1.html
@@ -526,7 +526,7 @@
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
        <STRONG><A HREF="clear.1.html">clear(1)</A></STRONG>, <STRONG>stty(1)</STRONG>, <STRONG><A HREF="tabs.1.html">tabs(1)</A></STRONG>, <STRONG><A HREF="tset.1.html">tset(1)</A></STRONG>, <STRONG><A HREF="curs_termcap.3x.html">curs_termcap(3x)</A></STRONG>, <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>.
 
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
        <STRONG><A HREF="clear.1.html">clear(1)</A></STRONG>, <STRONG>stty(1)</STRONG>, <STRONG><A HREF="tabs.1.html">tabs(1)</A></STRONG>, <STRONG><A HREF="tset.1.html">tset(1)</A></STRONG>, <STRONG><A HREF="curs_termcap.3x.html">curs_termcap(3x)</A></STRONG>, <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>.
 

-       This describes <STRONG>ncurses</STRONG> version 6.2 (patch 20210515).
+       This describes <STRONG>ncurses</STRONG> version 6.2 (patch 20210522).

 
 
 
 
 
 

diff --git a/doc/html/man/tset.1.html b/doc/html/man/tset.1.html
index db6272e13ce1257734e73b0be07d263d7c4cf471..a9526433883b43d1874832ce2ee6183dde2b8bdc 100644 (file)
--- a/doc/html/man/tset.1.html
+++ b/doc/html/man/tset.1.html
@@ -391,7 +391,7 @@
        <STRONG>csh(1)</STRONG>,   <STRONG>sh(1)</STRONG>,   <STRONG>stty(1)</STRONG>,   <STRONG><A HREF="curs_terminfo.3x.html">curs_terminfo(3x)</A></STRONG>,  <STRONG>tty(4)</STRONG>,  <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>,
        <STRONG>ttys(5)</STRONG>, <STRONG>environ(7)</STRONG>
 
        <STRONG>csh(1)</STRONG>,   <STRONG>sh(1)</STRONG>,   <STRONG>stty(1)</STRONG>,   <STRONG><A HREF="curs_terminfo.3x.html">curs_terminfo(3x)</A></STRONG>,  <STRONG>tty(4)</STRONG>,  <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>,
        <STRONG>ttys(5)</STRONG>, <STRONG>environ(7)</STRONG>
 

-       This describes <STRONG>ncurses</STRONG> version 6.2 (patch 20210515).
+       This describes <STRONG>ncurses</STRONG> version 6.2 (patch 20210522).

 
 
 
 
 
 

diff --git a/include/curses.wide b/include/curses.wide
index 7a8ae7d5fa13d8e7e7360ddecde28d2b01c67ded..33adb070d7b16c18602478595d9e4e314d75e5ed 100644 (file)
--- a/include/curses.wide
+++ b/include/curses.wide
@@ -1,4 +1,4 @@
-/* $Id: curses.wide,v 1.50 2017/03/26 16:05:21 tom Exp $ */
+/* $Id: curses.wide,v 1.51 2021/05/22 20:28:29 tom Exp $ */

 /*
  * vile:cmode:
  * This file is part of ncurses, designed to be appended after curses.h.in
 /*
  * vile:cmode:
  * This file is part of ncurses, designed to be appended after curses.h.in


@@ -219,10 +219,12 @@ extern NCURSES_EXPORT(int) wvline_set (WINDOW *, const cchar_t *, int);   /* imple
 
 #if NCURSES_SP_FUNCS
 extern NCURSES_EXPORT(attr_t) NCURSES_SP_NAME(term_attrs) (SCREEN*);           /* implemented:SP_FUNC */
 
 #if NCURSES_SP_FUNCS
 extern NCURSES_EXPORT(attr_t) NCURSES_SP_NAME(term_attrs) (SCREEN*);           /* implemented:SP_FUNC */

+extern NCURSES_EXPORT(int) NCURSES_SP_NAME(erasewchar) (SCREEN*, wchar_t *);   /* implemented:SP_FUNC */
+extern NCURSES_EXPORT(int) NCURSES_SP_NAME(killwchar) (SCREEN*, wchar_t *);    /* implemented:SP_FUNC */

 extern NCURSES_EXPORT(int) NCURSES_SP_NAME(unget_wch) (SCREEN*, const wchar_t);        /* implemented:SP_FUNC */
 extern NCURSES_EXPORT(int) NCURSES_SP_NAME(unget_wch) (SCREEN*, const wchar_t);        /* implemented:SP_FUNC */

-extern NCURSES_EXPORT(wchar_t*) NCURSES_SP_NAME(wunctrl) (SCREEN*, cchar_t *); /* implemented:SP_FUNC */

 extern NCURSES_EXPORT(int) NCURSES_SP_NAME(vid_attr) (SCREEN*, attr_t, NCURSES_PAIRS_T, void *);       /* implemented:SP_FUNC */
 extern NCURSES_EXPORT(int) NCURSES_SP_NAME(vid_puts) (SCREEN*, attr_t, NCURSES_PAIRS_T, void *, NCURSES_SP_OUTC);      /* implemented:SP_FUNC */
 extern NCURSES_EXPORT(int) NCURSES_SP_NAME(vid_attr) (SCREEN*, attr_t, NCURSES_PAIRS_T, void *);       /* implemented:SP_FUNC */
 extern NCURSES_EXPORT(int) NCURSES_SP_NAME(vid_puts) (SCREEN*, attr_t, NCURSES_PAIRS_T, void *, NCURSES_SP_OUTC);      /* implemented:SP_FUNC */

+extern NCURSES_EXPORT(wchar_t*) NCURSES_SP_NAME(wunctrl) (SCREEN*, cchar_t *); /* implemented:SP_FUNC */

 #endif
 
 #ifndef NCURSES_NOMACROS
 #endif
 
 #ifndef NCURSES_NOMACROS

diff --git a/man/curs_get_wch.3x b/man/curs_get_wch.3x
index dfa5c7e914dea5778edd784d40c2acdb241c1bde..115f068d9b3339f963ad0d1c9abb06bc024f6653 100644 (file)
--- a/man/curs_get_wch.3x
+++ b/man/curs_get_wch.3x
@@ -1,5 +1,5 @@
 .\"***************************************************************************
 .\"***************************************************************************

-.\" Copyright 2018-2019,2020 Thomas E. Dickey                                *
+.\" Copyright 2018-2020,2021 Thomas E. Dickey                                *

 .\" Copyright 2002-2016,2017 Free Software Foundation, Inc.                  *
 .\"                                                                          *
 .\" Permission is hereby granted, free of charge, to any person obtaining a  *
 .\" Copyright 2002-2016,2017 Free Software Foundation, Inc.                  *
 .\"                                                                          *
 .\" Permission is hereby granted, free of charge, to any person obtaining a  *


@@ -27,7 +27,7 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"

-.\" $Id: curs_get_wch.3x,v 1.14 2020/10/17 23:17:05 tom Exp $
+.\" $Id: curs_get_wch.3x,v 1.15 2021/05/22 22:33:19 tom Exp $

 .TH curs_get_wch 3X ""
 .na
 .hy 0
 .TH curs_get_wch 3X ""
 .na
 .hy 0


@@ -60,6 +60,7 @@
 .sp
 \fBint unget_wch(const wchar_t \fR\fIwch\fR\fB);\fR
 .SH DESCRIPTION
 .sp
 \fBint unget_wch(const wchar_t \fR\fIwch\fR\fB);\fR
 .SH DESCRIPTION

+.SS wget_wch

 The
 \fBget_wch\fR,
 \fBwget_wch\fR,
 The
 \fBget_wch\fR,
 \fBwget_wch\fR,


@@ -111,7 +112,7 @@ Their names begin with \fBKEY_\fR.
 Other (user-defined) function keys
 which may be defined using \fBdefine_key\fP(3X) have no names,
 but also are expected to have values outside the range of 8-bit characters.
 Other (user-defined) function keys
 which may be defined using \fBdefine_key\fP(3X) have no names,
 but also are expected to have values outside the range of 8-bit characters.

-.PP
+.SS unget_wch

 The
 \fBunget_wch\fR
 function pushes the wide character
 The
 \fBunget_wch\fR
 function pushes the wide character


@@ -126,6 +127,14 @@ If the program calls
 too many times without an intervening call to
 \fBget_wch\fR,
 the operation may fail.
 too many times without an intervening call to
 \fBget_wch\fR,
 the operation may fail.

+.PP
+Unlike \fBungetch\fP and \fBwgetch\fP,
+\fBunget_wch\fP cannot distinguish special characters
+returned by \fBwget_wch\fP from ordinary characters.
+An application can push special keys
+which it may read via \fBwget_wch\fP
+by checking for the \fBKEY_CODE_YES\fR result,
+and using \fBungetch\fP for those special keys.

 .SH NOTES
 The header file
 \fB<curses.h>\fR
 .SH NOTES
 The header file
 \fB<curses.h>\fR

diff --git a/man/curs_getstr.3x b/man/curs_getstr.3x
index 1579449522232d23b241d99e8057e512905cc477..4a1cc89173f77ef38b7826c93cac90ea6171c091 100644 (file)
--- a/man/curs_getstr.3x
+++ b/man/curs_getstr.3x
@@ -27,7 +27,7 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"

-.\" $Id: curs_getstr.3x,v 1.32 2021/05/15 23:37:18 tom Exp $
+.\" $Id: curs_getstr.3x,v 1.33 2021/05/22 21:36:35 tom Exp $

 .TH curs_getstr 3X ""
 .ie \n(.g .ds `` \(lq
 .el       .ds `` ``
 .TH curs_getstr 3X ""
 .ie \n(.g .ds `` \(lq
 .el       .ds `` ``


@@ -217,15 +217,28 @@ from \fBerasechar\fP and \fBkillchar\fP, respectively.
 .bP
 On return, \fBgetnstr\fP restores the modes to their previous values.
 .PP
 .bP
 On return, \fBgetnstr\fP restores the modes to their previous values.
 .PP

-Other implementations differ.
+Other implementations differ in their treatment of special characters:
+.bP

 While they may set the \fIecho\fP mode,
 While they may set the \fIecho\fP mode,

-they do not modify the \fIraw\fP mode, and may take the \fIcbreak\fP
+other implementations do not modify the \fIraw\fP mode,
+They may take the \fIcbreak\fP

 mode set by the caller into account when deciding whether to handle
 echoing within \fBgetnstr\fP or as a side-effect of the \fBgetch\fP calls.
 mode set by the caller into account when deciding whether to handle
 echoing within \fBgetnstr\fP or as a side-effect of the \fBgetch\fP calls.

-Because ncurses sets these modes,
-its signal handlers for INTR and QUIT
-(e.g., \fB^C\fP or \fB^\\\fP) may catch a signal and stop the program,
+.bP
+The original ncurses (as pcurses in 1986) set \fBnoraw\fP and \fBcbreak\fP
+when accepting input for \fBgetnstr\fP.
+That may have been done to make function- and cursor-keys work;
+it is not necessary with ncurses.
+.IP
+Since 1995, ncurses has provided signal handlers for INTR and QUIT
+(e.g., \fB^C\fP or \fB^\\\fP).
+With the \fBnoraw\fP and \fBcbreak\fP settings,
+those may catch a signal and stop the program,

 where other implementations allow one to enter those characters in the buffer.
 where other implementations allow one to enter those characters in the buffer.

+.bP
+Starting in 2021 (ncurses 6.3), \fBgetnstr\fP sets \fBraw\fP,
+rather than \fBnoraw\fP and \fBcbreak\fP for better compatibility with
+SVr4-curses, e.g., allowing one to enter a \fB^C\fP into the buffer.

 .SH SEE ALSO
 \fBcurses\fR(3X),
 \fBcurs_getch\fR(3X),
 .SH SEE ALSO
 \fBcurses\fR(3X),
 \fBcurs_getch\fR(3X),

diff --git a/man/curs_sp_funcs.3x b/man/curs_sp_funcs.3x
index fd1c9b46bd3179806f99bd9756baf6eb1c35eeca..c192e022badafadd08c509279d5cdee81202cf45 100644 (file)
--- a/man/curs_sp_funcs.3x
+++ b/man/curs_sp_funcs.3x
@@ -27,7 +27,7 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"

-.\" $Id: curs_sp_funcs.3x,v 1.24 2021/01/02 23:53:22 tom Exp $
+.\" $Id: curs_sp_funcs.3x,v 1.25 2021/05/22 22:12:46 tom Exp $

 .TH curs_sp_funcs 3X ""
 .ie \n(.g .ds `` \(lq
 .el       .ds `` ``
 .TH curs_sp_funcs 3X ""
 .ie \n(.g .ds `` \(lq
 .el       .ds `` ``


@@ -75,14 +75,16 @@ curs_sp_funcs \- \fBcurses\fR screen-pointer extension
 .br
 \fBchar erasechar_sp(SCREEN* \fP\fIsp\fP\fB);\fR
 .br
 .br
 \fBchar erasechar_sp(SCREEN* \fP\fIsp\fP\fB);\fR
 .br

+\fBint erasewchar_sp(SCREEN* \fP\fIsp\fP\fB, wchar_t *\fP\fIch\fP\fB);\fR
+.br

 \fBint extended_color_content_sp(SCREEN * \fP\fIsp\fP\fB, int \fP\fIcolor\fP\fB, int * \fP\fIr\fP\fB, int * \fP\fIg\fP\fB, int * \fP\fIb\fP\fB);\fR
 .br
 \fBint extended_pair_content_sp(SCREEN* \fP\fIsp\fP\fB, int \fP\fIpair\fP\fB, int * \fP\fIfg\fP\fB, int * \fP\fIbg\fP\fB);\fR
 .br
 \fBint extended_slk_color_sp(SCREEN* \fP\fIsp\fP\fB, int \fP\fIpair\fP\fB);\fR
 \fBint extended_color_content_sp(SCREEN * \fP\fIsp\fP\fB, int \fP\fIcolor\fP\fB, int * \fP\fIr\fP\fB, int * \fP\fIg\fP\fB, int * \fP\fIb\fP\fB);\fR
 .br
 \fBint extended_pair_content_sp(SCREEN* \fP\fIsp\fP\fB, int \fP\fIpair\fP\fB, int * \fP\fIfg\fP\fB, int * \fP\fIbg\fP\fB);\fR
 .br
 \fBint extended_slk_color_sp(SCREEN* \fP\fIsp\fP\fB, int \fP\fIpair\fP\fB);\fR

-.br
-\fBvoid filter_sp(SCREEN* \fP\fIsp\fP\fB);\fR

 .sp
 .sp

+\fBvoid filter_sp(SCREEN* \fP\fIsp\fP\fB);\fR
+.br

 \fBint find_pair_sp(SCREEN* \fP\fIsp\fP\fB, int \fP\fIfg\fP\fB, int \fP\fIbg\fP\fB);\fR
 .br
 \fBint flash_sp(SCREEN* \fP\fIsp\fP\fB);\fR
 \fBint find_pair_sp(SCREEN* \fP\fIsp\fP\fB, int \fP\fIfg\fP\fB, int \fP\fIbg\fP\fB);\fR
 .br
 \fBint flash_sp(SCREEN* \fP\fIsp\fP\fB);\fR


@@ -100,9 +102,9 @@ curs_sp_funcs \- \fBcurses\fR screen-pointer extension
 \fBint halfdelay_sp(SCREEN* \fP\fIsp\fP\fB, int \fP\fItenths\fP\fB);\fR
 .br
 \fBbool has_colors_sp(SCREEN* \fP\fIsp\fP\fB);\fR
 \fBint halfdelay_sp(SCREEN* \fP\fIsp\fP\fB, int \fP\fItenths\fP\fB);\fR
 .br
 \fBbool has_colors_sp(SCREEN* \fP\fIsp\fP\fB);\fR

-.br
-\fBbool has_ic_sp(SCREEN* \fP\fIsp\fP\fB);\fR

 .sp
 .sp

+\fBbool has_ic_sp(SCREEN* \fP\fIsp\fP\fB);\fR
+.br

 \fBbool has_il_sp(SCREEN* \fP\fIsp\fP\fB);\fR
 .br
 \fBint has_key_sp(SCREEN* \fP\fIsp\fP\fB, int \fP\fIch\fP\fB);\fR
 \fBbool has_il_sp(SCREEN* \fP\fIsp\fP\fB);\fR
 .br
 \fBint has_key_sp(SCREEN* \fP\fIsp\fP\fB, int \fP\fIch\fP\fB);\fR


@@ -120,9 +122,9 @@ curs_sp_funcs \- \fBcurses\fR screen-pointer extension
 \fBint intrflush_sp(SCREEN* \fP\fIsp\fP\fB, WINDOW* \fP\fIwin\fP\fB, bool \fP\fIbf\fP\fB);\fR
 .br
 \fBbool is_term_resized_sp(SCREEN* \fP\fIsp\fP\fB, int \fP\fIlines\fP\fB, int \fP\fIcolumns\fP\fB);\fR
 \fBint intrflush_sp(SCREEN* \fP\fIsp\fP\fB, WINDOW* \fP\fIwin\fP\fB, bool \fP\fIbf\fP\fB);\fR
 .br
 \fBbool is_term_resized_sp(SCREEN* \fP\fIsp\fP\fB, int \fP\fIlines\fP\fB, int \fP\fIcolumns\fP\fB);\fR

-.br
-\fBbool isendwin_sp(SCREEN* \fP\fIsp\fP\fB);\fR

 .sp
 .sp

+\fBbool isendwin_sp(SCREEN* \fP\fIsp\fP\fB);\fR
+.br

 \fBint key_defined_sp(SCREEN* \fP\fIsp\fP\fB, const char *\fP\fIdefinition\fP\fB);\fR
 .br
 \fBchar* keybound_sp(SCREEN* \fP\fIsp\fP\fB, int \fP\fIkeycode\fP\fB, int \fP\fIcount\fP\fB);\fR
 \fBint key_defined_sp(SCREEN* \fP\fIsp\fP\fB, const char *\fP\fIdefinition\fP\fB);\fR
 .br
 \fBchar* keybound_sp(SCREEN* \fP\fIsp\fP\fB, int \fP\fIkeycode\fP\fB, int \fP\fIcount\fP\fB);\fR


@@ -133,16 +135,18 @@ curs_sp_funcs \- \fBcurses\fR screen-pointer extension
 .br
 \fBchar killchar_sp(SCREEN* \fP\fIsp\fP\fB);\fR
 .br
 .br
 \fBchar killchar_sp(SCREEN* \fP\fIsp\fP\fB);\fR
 .br

+\fBint killwchar_sp(SCREEN* \fP\fIsp\fP\fB, wchar_t *\fP\fIch\fP\fB);\fR
+.br

 \fBchar* longname_sp(SCREEN* \fP\fIsp\fP\fB);\fR
 .br
 \fBint mcprint_sp(SCREEN* \fP\fIsp\fP\fB, char *\fP\fIdata\fP\fB, int \fP\fIlen\fP\fB);\fR
 .br
 \fBint mouseinterval_sp(SCREEN* \fP\fIsp\fP\fB, int \fP\fIerval\fP\fB);\fR
 \fBchar* longname_sp(SCREEN* \fP\fIsp\fP\fB);\fR
 .br
 \fBint mcprint_sp(SCREEN* \fP\fIsp\fP\fB, char *\fP\fIdata\fP\fB, int \fP\fIlen\fP\fB);\fR
 .br
 \fBint mouseinterval_sp(SCREEN* \fP\fIsp\fP\fB, int \fP\fIerval\fP\fB);\fR

-.br
+.sp

 \fBmmask_t mousemask_sp(SCREEN* \fP\fIsp\fP\fB, mmask_t \fP\fInewmask\fP\fB, mmask_t *\fP\fIoldmask\fP\fB);\fR
 .br
 \fBint mvcur_sp(SCREEN* \fP\fIsp\fP\fB, int \fP\fIoldrow\fP\fB, int \fP\fIoldcol\fP\fB, int \fP\fInewrow\fP\fB, int \fP\fInewcol\fP\fB);\fR
 \fBmmask_t mousemask_sp(SCREEN* \fP\fIsp\fP\fB, mmask_t \fP\fInewmask\fP\fB, mmask_t *\fP\fIoldmask\fP\fB);\fR
 .br
 \fBint mvcur_sp(SCREEN* \fP\fIsp\fP\fB, int \fP\fIoldrow\fP\fB, int \fP\fIoldcol\fP\fB, int \fP\fInewrow\fP\fB, int \fP\fInewcol\fP\fB);\fR

-.sp
+.br

 \fBint napms_sp(SCREEN* \fP\fIsp\fP\fB, int \fP\fIms\fP\fB);\fR
 .br
 \fBWINDOW* newpad_sp(SCREEN* \fP\fIsp\fP\fB, int \fP\fInrows\fP\fB, int \fP\fIncols\fP\fB);\fR
 \fBint napms_sp(SCREEN* \fP\fIsp\fP\fB, int \fP\fIms\fP\fB);\fR
 .br
 \fBWINDOW* newpad_sp(SCREEN* \fP\fIsp\fP\fB, int \fP\fInrows\fP\fB, int \fP\fIncols\fP\fB);\fR


@@ -158,11 +162,11 @@ curs_sp_funcs \- \fBcurses\fR screen-pointer extension
 \fBint nocbreak_sp(SCREEN* \fP\fIsp\fP\fB);\fR
 .br
 \fBint noecho_sp(SCREEN* \fP\fIsp\fP\fB);\fR
 \fBint nocbreak_sp(SCREEN* \fP\fIsp\fP\fB);\fR
 .br
 \fBint noecho_sp(SCREEN* \fP\fIsp\fP\fB);\fR

-.br
+.sp

 \fBvoid nofilter_sp(SCREEN* \fP\fIsp\fP\fB);\fR
 .br
 \fBint nonl_sp(SCREEN* \fP\fIsp\fP\fB);\fR
 \fBvoid nofilter_sp(SCREEN* \fP\fIsp\fP\fB);\fR
 .br
 \fBint nonl_sp(SCREEN* \fP\fIsp\fP\fB);\fR

-.sp
+.br

 \fBvoid noqiflush_sp(SCREEN* \fP\fIsp\fP\fB);\fR
 .br
 \fBint noraw_sp(SCREEN* \fP\fIsp\fP\fB);\fR
 \fBvoid noqiflush_sp(SCREEN* \fP\fIsp\fP\fB);\fR
 .br
 \fBint noraw_sp(SCREEN* \fP\fIsp\fP\fB);\fR


@@ -178,11 +182,11 @@ curs_sp_funcs \- \fBcurses\fR screen-pointer extension
 \fBvoid reset_color_pairs_sp(SCREEN* \fP\fIsp\fP\fB);\fR
 .br
 \fBint reset_shell_mode_sp(SCREEN* \fP\fIsp\fP\fB);\fR
 \fBvoid reset_color_pairs_sp(SCREEN* \fP\fIsp\fP\fB);\fR
 .br
 \fBint reset_shell_mode_sp(SCREEN* \fP\fIsp\fP\fB);\fR

-.br
+.sp

 \fBint resetty_sp(SCREEN* \fP\fIsp\fP\fB);\fR
 .br
 \fBint resize_term_sp(SCREEN* \fP\fIsp\fP\fB, int \fP\fIlines\fP\fB, int \fP\fIcolumns\fP\fB);\fR
 \fBint resetty_sp(SCREEN* \fP\fIsp\fP\fB);\fR
 .br
 \fBint resize_term_sp(SCREEN* \fP\fIsp\fP\fB, int \fP\fIlines\fP\fB, int \fP\fIcolumns\fP\fB);\fR

-.sp
+.br

 \fBint resizeterm_sp(SCREEN* \fP\fIsp\fP\fB, int \fP\fIlines\fP\fB, int \fP\fIcolumns\fP\fB);\fR
 .br
 \fBint ripoffline_sp(SCREEN* \fP\fIsp\fP\fB, int \fP\fIline\fP\fB, int (*\fP\fIinit\fP\fB)(WINDOW* \fP\fIwin\fP\fB, int \fP\fIfmt\fP\fB));\fR
 \fBint resizeterm_sp(SCREEN* \fP\fIsp\fP\fB, int \fP\fIlines\fP\fB, int \fP\fIcolumns\fP\fB);\fR
 .br
 \fBint ripoffline_sp(SCREEN* \fP\fIsp\fP\fB, int \fP\fIline\fP\fB, int (*\fP\fIinit\fP\fB)(WINDOW* \fP\fIwin\fP\fB, int \fP\fIfmt\fP\fB));\fR


@@ -198,9 +202,9 @@ curs_sp_funcs \- \fBcurses\fR screen-pointer extension
 \fBint set_escdelay_sp(SCREEN* \fP\fIsp\fP\fB, int \fP\fIms\fP\fB);\fR
 .br
 \fBint set_tabsize_sp(SCREEN* \fP\fIsp\fP\fB, int \fP\fIcols\fP\fB);\fR
 \fBint set_escdelay_sp(SCREEN* \fP\fIsp\fP\fB, int \fP\fIms\fP\fB);\fR
 .br
 \fBint set_tabsize_sp(SCREEN* \fP\fIsp\fP\fB, int \fP\fIcols\fP\fB);\fR

-.br
-\fBint slk_attr_set_sp(SCREEN* \fP\fIsp\fP\fB, const attr_t \fP\fIattrs\fP\fB, short \fP\fIpair\fP\fB, void*\fP\fIopts\fP\fB);\fR

 .sp
 .sp

+\fBint slk_attr_set_sp(SCREEN* \fP\fIsp\fP\fB, const attr_t \fP\fIattrs\fP\fB, short \fP\fIpair\fP\fB, void*\fP\fIopts\fP\fB);\fR
+.br

 \fBint slk_attrset_sp(SCREEN* \fP\fIsp\fP\fB, const chtype \fP\fIa\fP\fB);\fR
 .br
 \fBint slk_attroff_sp(SCREEN* \fP\fIsp\fP\fB, const chtype \fP\fIa\fP\fB);\fR
 \fBint slk_attrset_sp(SCREEN* \fP\fIsp\fP\fB, const chtype \fP\fIa\fP\fB);\fR
 .br
 \fBint slk_attroff_sp(SCREEN* \fP\fIsp\fP\fB, const chtype \fP\fIa\fP\fB);\fR


@@ -218,9 +222,9 @@ curs_sp_funcs \- \fBcurses\fR screen-pointer extension
 \fBchar* slk_label_sp(SCREEN* \fP\fIsp\fP\fB, int \fP\fIlabnum\fP\fB);\fR
 .br
 \fBint slk_noutrefresh_sp(SCREEN* \fP\fIsp\fP\fB);\fR
 \fBchar* slk_label_sp(SCREEN* \fP\fIsp\fP\fB, int \fP\fIlabnum\fP\fB);\fR
 .br
 \fBint slk_noutrefresh_sp(SCREEN* \fP\fIsp\fP\fB);\fR

-.br
-\fBint slk_refresh_sp(SCREEN* \fP\fIsp\fP\fB);\fR

 .sp
 .sp

+\fBint slk_refresh_sp(SCREEN* \fP\fIsp\fP\fB);\fR
+.br

 \fBint slk_restore_sp(SCREEN* \fP\fIsp\fP\fB);\fR
 .br
 \fBint slk_set_sp(SCREEN* \fP\fIsp\fP\fB, int \fP\fIlabnum\fP\fB, const char * \fP\fIlabel\fP\fB, int \fP\fIfmt\fP\fB);\fR
 \fBint slk_restore_sp(SCREEN* \fP\fIsp\fP\fB);\fR
 .br
 \fBint slk_set_sp(SCREEN* \fP\fIsp\fP\fB, int \fP\fIlabnum\fP\fB, const char * \fP\fIlabel\fP\fB, int \fP\fIfmt\fP\fB);\fR


@@ -238,9 +242,9 @@ curs_sp_funcs \- \fBcurses\fR screen-pointer extension
 \fBint typeahead_sp(SCREEN* \fP\fIsp\fP\fB, int \fP\fIfd\fP\fB);\fR
 .br
 \fBint unget_wch_sp(SCREEN* \fP\fIsp\fP\fB, const wchar_t \fP\fIwch\fP\fB);\fR
 \fBint typeahead_sp(SCREEN* \fP\fIsp\fP\fB, int \fP\fIfd\fP\fB);\fR
 .br
 \fBint unget_wch_sp(SCREEN* \fP\fIsp\fP\fB, const wchar_t \fP\fIwch\fP\fB);\fR

-.br
-\fBint ungetch_sp(SCREEN* \fP\fIsp\fP\fB, int \fP\fIch\fP\fB);\fR

 .sp
 .sp

+\fBint ungetch_sp(SCREEN* \fP\fIsp\fP\fB, int \fP\fIch\fP\fB);\fR
+.br

 \fBint ungetmouse_sp(SCREEN* \fP\fIsp\fP\fB,MEVENT * \fP\fBevent\fP\fB);\fR
 .br
 \fBint use_default_colors_sp(SCREEN* \fP\fIsp\fP\fB);\fR
 \fBint ungetmouse_sp(SCREEN* \fP\fIsp\fP\fB,MEVENT * \fP\fBevent\fP\fB);\fR
 .br
 \fBint use_default_colors_sp(SCREEN* \fP\fIsp\fP\fB);\fR

diff --git a/ncurses/base/lib_getstr.c b/ncurses/base/lib_getstr.c
index 7871fb357a62a6d75388fa71127050a4a81c476b..57a94d7526056523f1a48d5fff47aaf4772862d3 100644 (file)
--- a/ncurses/base/lib_getstr.c
+++ b/ncurses/base/lib_getstr.c
@@ -1,5 +1,5 @@
 /****************************************************************************
 /****************************************************************************

- * Copyright 2018,2020 Thomas E. Dickey                                     *
+ * Copyright 2018-2020,2021 Thomas E. Dickey                                *

  * Copyright 1998-2011,2017 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
  * Copyright 1998-2011,2017 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *


@@ -42,7 +42,7 @@
 #define NEED_KEY_EVENT
 #include <curses.priv.h>
 
 #define NEED_KEY_EVENT
 #include <curses.priv.h>
 

-MODULE_ID("$Id: lib_getstr.c,v 1.35 2020/07/18 20:02:24 tom Exp $")
+MODULE_ID("$Id: lib_getstr.c,v 1.36 2021/05/22 19:57:21 tom Exp $")

 
 /*
  * This wipes out the last character, no matter whether it was a tab, control
 
 /*
  * This wipes out the last character, no matter whether it was a tab, control


@@ -100,8 +100,7 @@ wgetnstr_events(WINDOW *win,
     oldcbreak = sp->_cbreak;
     NCURSES_SP_NAME(nl) (NCURSES_SP_ARG);
     NCURSES_SP_NAME(noecho) (NCURSES_SP_ARG);
     oldcbreak = sp->_cbreak;
     NCURSES_SP_NAME(nl) (NCURSES_SP_ARG);
     NCURSES_SP_NAME(noecho) (NCURSES_SP_ARG);

-    NCURSES_SP_NAME(noraw) (NCURSES_SP_ARG);
-    NCURSES_SP_NAME(cbreak) (NCURSES_SP_ARG);
+    NCURSES_SP_NAME(raw) (NCURSES_SP_ARG);

 
     erasec = NCURSES_SP_NAME(erasechar) (NCURSES_SP_ARG);
     killc = NCURSES_SP_NAME(killchar) (NCURSES_SP_ARG);
 
     erasec = NCURSES_SP_NAME(erasechar) (NCURSES_SP_ARG);
     killc = NCURSES_SP_NAME(killchar) (NCURSES_SP_ARG);

diff --git a/ncurses/llib-lncurses b/ncurses/llib-lncurses
index 3033100792bfdda9aec858dda4ccaaae278c1ed4..321155a65f6f813b1abc173a9e5c7f0cd2486427 100644 (file)
--- a/ncurses/llib-lncurses
+++ b/ncurses/llib-lncurses
@@ -1,5 +1,5 @@
 /****************************************************************************
 /****************************************************************************

- * Copyright 2019,2020 Thomas E. Dickey                                     *
+ * Copyright 2019,2020,2021 Thomas E. Dickey                                *

  * Copyright 1998-2016,2017 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
  * Copyright 1998-2016,2017 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *


@@ -3616,7 +3616,7 @@ int       _nc_tparm_err;
 #undef _nc_tparm_analyze
 int    _nc_tparm_analyze(
                const char *string, 
 #undef _nc_tparm_analyze
 int    _nc_tparm_analyze(
                const char *string, 

-               char    *p_is_s[9], 
+               char    **p_is_s, 

                int     *_nc_popcount)
                { return(*(int *)0); }
 
                int     *_nc_popcount)
                { return(*(int *)0); }
 


@@ -3872,7 +3872,7 @@ chtype    _nc_retrace_chtype(
 
 #undef _nc_trace_ttymode
 char   *_nc_trace_ttymode(
 
 #undef _nc_trace_ttymode
 char   *_nc_trace_ttymode(

-               struct termios *tty)
+               const struct termios *tty)

                { return(*(char **)0); }
 
 #undef _nc_tracebits
                { return(*(char **)0); }
 
 #undef _nc_tracebits

diff --git a/ncurses/llib-lncursest b/ncurses/llib-lncursest
index 36a94b57297e5d0be7730577a1dd7e1bda6a06d6..a769141e29aa69e2ad1bbd98591065e12e67fb0c 100644 (file)
--- a/ncurses/llib-lncursest
+++ b/ncurses/llib-lncursest
@@ -1,5 +1,5 @@
 /****************************************************************************
 /****************************************************************************

- * Copyright 2019,2020 Thomas E. Dickey                                     *
+ * Copyright 2019,2020,2021 Thomas E. Dickey                                *

  * Copyright 2008-2016,2017 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
  * Copyright 2008-2016,2017 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *


@@ -3701,7 +3701,7 @@ int       _nc_tparm_err;
 #undef _nc_tparm_analyze
 int    _nc_tparm_analyze(
                const char *string, 
 #undef _nc_tparm_analyze
 int    _nc_tparm_analyze(
                const char *string, 

-               char    *p_is_s[9], 
+               char    **p_is_s, 

                int     *_nc_popcount)
                { return(*(int *)0); }
 
                int     *_nc_popcount)
                { return(*(int *)0); }
 


@@ -3982,7 +3982,7 @@ chtype    _nc_retrace_chtype(
 
 #undef _nc_trace_ttymode
 char   *_nc_trace_ttymode(
 
 #undef _nc_trace_ttymode
 char   *_nc_trace_ttymode(

-               struct termios *tty)
+               const struct termios *tty)

                { return(*(char **)0); }
 
 #undef _nc_tracebits
                { return(*(char **)0); }
 
 #undef _nc_tracebits

diff --git a/ncurses/llib-lncursestw b/ncurses/llib-lncursestw
index 3c1aab97bc6587480d3d9bbe2b2a737f7fa8ecd6..2e06aaac024def0259d7ccd620b7ed77a05403ef 100644 (file)
--- a/ncurses/llib-lncursestw
+++ b/ncurses/llib-lncursestw
@@ -1,5 +1,5 @@
 /****************************************************************************
 /****************************************************************************

- * Copyright 2018-2019,2020 Thomas E. Dickey                                *
+ * Copyright 2018-2020,2021 Thomas E. Dickey                                *

  * Copyright 2009-2016,2017 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
  * Copyright 2009-2016,2017 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *


@@ -3252,11 +3252,23 @@ int     getcchar(
 
 /* ./widechar/lib_erasewchar.c */
 
 
 /* ./widechar/lib_erasewchar.c */
 

+#undef erasewchar_sp
+int    erasewchar_sp(
+               SCREEN  *sp, 
+               wchar_t *wch)
+               { return(*(int *)0); }
+

 #undef erasewchar
 int    erasewchar(
                wchar_t *wch)
                { return(*(int *)0); }
 
 #undef erasewchar
 int    erasewchar(
                wchar_t *wch)
                { return(*(int *)0); }
 

+#undef killwchar_sp
+int    killwchar_sp(
+               SCREEN  *sp, 
+               wchar_t *wch)
+               { return(*(int *)0); }
+

 #undef killwchar
 int    killwchar(
                wchar_t *wch)
 #undef killwchar
 int    killwchar(
                wchar_t *wch)


@@ -4650,7 +4662,7 @@ int       _nc_tparm_err;
 #undef _nc_tparm_analyze
 int    _nc_tparm_analyze(
                const char *string, 
 #undef _nc_tparm_analyze
 int    _nc_tparm_analyze(
                const char *string, 

-               char    *p_is_s[9], 
+               char    **p_is_s, 

                int     *_nc_popcount)
                { return(*(int *)0); }
 
                int     *_nc_popcount)
                { return(*(int *)0); }
 


@@ -4942,7 +4954,7 @@ char      *_tracecchar_t(
 
 #undef _nc_trace_ttymode
 char   *_nc_trace_ttymode(
 
 #undef _nc_trace_ttymode
 char   *_nc_trace_ttymode(

-               struct termios *tty)
+               const struct termios *tty)

                { return(*(char **)0); }
 
 #undef _nc_tracebits
                { return(*(char **)0); }
 
 #undef _nc_tracebits

diff --git a/ncurses/llib-lncursesw b/ncurses/llib-lncursesw
index 794d4929254a227a2f74258bad72e87cff449284..12a57d34d71c0049384ad48542e59de6c4c027a3 100644 (file)
--- a/ncurses/llib-lncursesw
+++ b/ncurses/llib-lncursesw
@@ -1,5 +1,5 @@
 /****************************************************************************
 /****************************************************************************

- * Copyright 2018-2019,2020 Thomas E. Dickey                                *
+ * Copyright 2018-2020,2021 Thomas E. Dickey                                *

  * Copyright 2001-2016,2017 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
  * Copyright 2001-2016,2017 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *


@@ -3243,11 +3243,23 @@ int     getcchar(
 
 /* ./widechar/lib_erasewchar.c */
 
 
 /* ./widechar/lib_erasewchar.c */
 

+#undef erasewchar_sp
+int    erasewchar_sp(
+               SCREEN  *sp, 
+               wchar_t *wch)
+               { return(*(int *)0); }
+

 #undef erasewchar
 int    erasewchar(
                wchar_t *wch)
                { return(*(int *)0); }
 
 #undef erasewchar
 int    erasewchar(
                wchar_t *wch)
                { return(*(int *)0); }
 

+#undef killwchar_sp
+int    killwchar_sp(
+               SCREEN  *sp, 
+               wchar_t *wch)
+               { return(*(int *)0); }
+

 #undef killwchar
 int    killwchar(
                wchar_t *wch)
 #undef killwchar
 int    killwchar(
                wchar_t *wch)


@@ -4565,7 +4577,7 @@ int       _nc_tparm_err;
 #undef _nc_tparm_analyze
 int    _nc_tparm_analyze(
                const char *string, 
 #undef _nc_tparm_analyze
 int    _nc_tparm_analyze(
                const char *string, 

-               char    *p_is_s[9], 
+               char    **p_is_s, 

                int     *_nc_popcount)
                { return(*(int *)0); }
 
                int     *_nc_popcount)
                { return(*(int *)0); }
 


@@ -4832,7 +4844,7 @@ char      *_tracecchar_t(
 
 #undef _nc_trace_ttymode
 char   *_nc_trace_ttymode(
 
 #undef _nc_trace_ttymode
 char   *_nc_trace_ttymode(

-               struct termios *tty)
+               const struct termios *tty)

                { return(*(char **)0); }
 
 #undef _nc_tracebits
                { return(*(char **)0); }
 
 #undef _nc_tracebits

diff --git a/ncurses/llib-ltinfo b/ncurses/llib-ltinfo
index b2160d4f66b7da59433b84e8c886227b364b3d3e..12926b65df8d1637405fe315f9135a503c45e753 100644 (file)
--- a/ncurses/llib-ltinfo
+++ b/ncurses/llib-ltinfo
@@ -1,5 +1,5 @@
 /****************************************************************************
 /****************************************************************************

- * Copyright 2019,2020 Thomas E. Dickey                                     *
+ * Copyright 2019-2020,2021 Thomas E. Dickey                                *

  * Copyright 2012-2016,2017 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
  * Copyright 2012-2016,2017 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *


@@ -887,7 +887,7 @@ int _nc_tparm_err;
 #undef _nc_tparm_analyze
 int    _nc_tparm_analyze(
                const char *string, 
 #undef _nc_tparm_analyze
 int    _nc_tparm_analyze(
                const char *string, 

-               char    *p_is_s[9], 
+               char    **p_is_s, 

                int     *_nc_popcount)
                { return(*(int *)0); }
 
                int     *_nc_popcount)
                { return(*(int *)0); }
 


@@ -1143,7 +1143,7 @@ chtype    _nc_retrace_chtype(
 
 #undef _nc_trace_ttymode
 char   *_nc_trace_ttymode(
 
 #undef _nc_trace_ttymode
 char   *_nc_trace_ttymode(

-               struct termios *tty)
+               const struct termios *tty)

                { return(*(char **)0); }
 
 #undef _nc_tracebits
                { return(*(char **)0); }
 
 #undef _nc_tracebits

diff --git a/ncurses/llib-ltinfot b/ncurses/llib-ltinfot
index 18780beb96b174bdb694fb7f53d34aff4732f9eb..3fda731ffa74e0ea28f887784064e2ef83facc01 100644 (file)
--- a/ncurses/llib-ltinfot
+++ b/ncurses/llib-ltinfot
@@ -1,5 +1,5 @@
 /****************************************************************************
 /****************************************************************************

- * Copyright 2019,2020 Thomas E. Dickey                                     *
+ * Copyright 2019-2020,2021 Thomas E. Dickey                                *

  * Copyright 2013-2016,2017 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
  * Copyright 2013-2016,2017 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *


@@ -963,7 +963,7 @@ int _nc_tparm_err;
 #undef _nc_tparm_analyze
 int    _nc_tparm_analyze(
                const char *string, 
 #undef _nc_tparm_analyze
 int    _nc_tparm_analyze(
                const char *string, 

-               char    *p_is_s[9], 
+               char    **p_is_s, 

                int     *_nc_popcount)
                { return(*(int *)0); }
 
                int     *_nc_popcount)
                { return(*(int *)0); }
 


@@ -1244,7 +1244,7 @@ chtype    _nc_retrace_chtype(
 
 #undef _nc_trace_ttymode
 char   *_nc_trace_ttymode(
 
 #undef _nc_trace_ttymode
 char   *_nc_trace_ttymode(

-               struct termios *tty)
+               const struct termios *tty)

                { return(*(char **)0); }
 
 #undef _nc_tracebits
                { return(*(char **)0); }
 
 #undef _nc_tracebits

diff --git a/ncurses/llib-ltinfotw b/ncurses/llib-ltinfotw
index 0e7e76275885e8048770a91561236dca0aa52201..23218c3ab064e45be446e531d6f89f516d644b91 100644 (file)
--- a/ncurses/llib-ltinfotw
+++ b/ncurses/llib-ltinfotw
@@ -1,5 +1,5 @@
 /****************************************************************************
 /****************************************************************************

- * Copyright 2018-2019,2020 Thomas E. Dickey                                *
+ * Copyright 2018-2020,2021 Thomas E. Dickey                                *

  * Copyright 2012-2016,2017 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
  * Copyright 2012-2016,2017 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *


@@ -985,7 +985,7 @@ int _nc_tparm_err;
 #undef _nc_tparm_analyze
 int    _nc_tparm_analyze(
                const char *string, 
 #undef _nc_tparm_analyze
 int    _nc_tparm_analyze(
                const char *string, 

-               char    *p_is_s[9], 
+               char    **p_is_s, 

                int     *_nc_popcount)
                { return(*(int *)0); }
 
                int     *_nc_popcount)
                { return(*(int *)0); }
 


@@ -1277,7 +1277,7 @@ char      *_tracecchar_t(
 
 #undef _nc_trace_ttymode
 char   *_nc_trace_ttymode(
 
 #undef _nc_trace_ttymode
 char   *_nc_trace_ttymode(

-               struct termios *tty)
+               const struct termios *tty)

                { return(*(char **)0); }
 
 #undef _nc_tracebits
                { return(*(char **)0); }
 
 #undef _nc_tracebits

diff --git a/ncurses/llib-ltinfow b/ncurses/llib-ltinfow
index 815e6b3e3c3e5de0958ad65a2f460ec6c68948bc..5775ac198db638f5cbbe7f1166fee9067a803a9c 100644 (file)
--- a/ncurses/llib-ltinfow
+++ b/ncurses/llib-ltinfow
@@ -1,5 +1,5 @@
 /****************************************************************************
 /****************************************************************************

- * Copyright 2018-2019,2020 Thomas E. Dickey                                *
+ * Copyright 2018-2020,2021 Thomas E. Dickey                                *

  * Copyright 2012-2016,2017 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
  * Copyright 2012-2016,2017 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *


@@ -909,7 +909,7 @@ int _nc_tparm_err;
 #undef _nc_tparm_analyze
 int    _nc_tparm_analyze(
                const char *string, 
 #undef _nc_tparm_analyze
 int    _nc_tparm_analyze(
                const char *string, 

-               char    *p_is_s[9], 
+               char    **p_is_s, 

                int     *_nc_popcount)
                { return(*(int *)0); }
 
                int     *_nc_popcount)
                { return(*(int *)0); }
 


@@ -1176,7 +1176,7 @@ char      *_tracecchar_t(
 
 #undef _nc_trace_ttymode
 char   *_nc_trace_ttymode(
 
 #undef _nc_trace_ttymode
 char   *_nc_trace_ttymode(

-               struct termios *tty)
+               const struct termios *tty)

                { return(*(char **)0); }
 
 #undef _nc_tracebits
                { return(*(char **)0); }
 
 #undef _nc_tracebits

diff --git a/ncurses/widechar/lib_erasewchar.c b/ncurses/widechar/lib_erasewchar.c
index f49d6413bd02541f6725832838e7ab756a90b7e8..197f80b59b797bac90a4c6b8aff5fce115347061 100644 (file)
--- a/ncurses/widechar/lib_erasewchar.c
+++ b/ncurses/widechar/lib_erasewchar.c
@@ -1,5 +1,5 @@
 /****************************************************************************
 /****************************************************************************

- * Copyright 2020 Thomas E. Dickey                                          *
+ * Copyright 2020,2021 Thomas E. Dickey                                     *

  * Copyright 2002-2010,2014 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
  * Copyright 2002-2010,2014 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *


@@ -33,46 +33,64 @@
 
 #include <curses.priv.h>
 
 
 #include <curses.priv.h>
 

-MODULE_ID("$Id: lib_erasewchar.c,v 1.4 2020/02/02 23:34:34 tom Exp $")
+MODULE_ID("$Id: lib_erasewchar.c,v 1.5 2021/05/22 23:51:14 tom Exp $")

 
 /*
  *     erasewchar()
  *
  *     Return erase character as given in cur_term->Ottyb.
 
 /*
  *     erasewchar()
  *
  *     Return erase character as given in cur_term->Ottyb.

- *

  */
 
 NCURSES_EXPORT(int)
  */
 
 NCURSES_EXPORT(int)

-erasewchar(wchar_t *wch)
+NCURSES_SP_NAME(erasewchar) (NCURSES_SP_DCLx wchar_t *wch);
+NCURSES_EXPORT(int)
+NCURSES_SP_NAME(erasewchar) (NCURSES_SP_DCLx wchar_t *wch)

 {
     int value;
     int result = ERR;
 
     T((T_CALLED("erasewchar()")));
 {
     int value;
     int result = ERR;
 
     T((T_CALLED("erasewchar()")));

-    if ((value = erasechar()) != ERR) {
+    if ((value = NCURSES_SP_NAME(erasechar) (NCURSES_SP_ARG)) != ERR) {

        *wch = (wchar_t) value;
        result = OK;
     }
     returnCode(result);
 }
 
        *wch = (wchar_t) value;
        result = OK;
     }
     returnCode(result);
 }
 

+#if NCURSES_SP_FUNCS
+NCURSES_EXPORT(int)
+erasewchar(wchar_t *wch)
+{
+    return NCURSES_SP_NAME(erasewchar) (CURRENT_SCREEN, wch);
+}
+#endif
+

 /*
  *     killwchar()
  *
  *     Return kill character as given in cur_term->Ottyb.
 /*
  *     killwchar()
  *
  *     Return kill character as given in cur_term->Ottyb.

- *

  */
 
 NCURSES_EXPORT(int)
  */
 
 NCURSES_EXPORT(int)

-killwchar(wchar_t *wch)
+NCURSES_SP_NAME(killwchar) (NCURSES_SP_DCLx wchar_t *wch);
+NCURSES_EXPORT(int)
+NCURSES_SP_NAME(killwchar) (NCURSES_SP_DCLx wchar_t *wch)

 {
     int value;
     int result = ERR;
 
     T((T_CALLED("killwchar()")));
 {
     int value;
     int result = ERR;
 
     T((T_CALLED("killwchar()")));

-    if ((value = killchar()) != ERR) {
+    if ((value = NCURSES_SP_NAME(killchar) (NCURSES_SP_ARG)) != ERR) {

        *wch = (wchar_t) value;
        result = OK;
     }
     returnCode(result);
 }
        *wch = (wchar_t) value;
        result = OK;
     }
     returnCode(result);
 }

+
+#if NCURSES_SP_FUNCS
+NCURSES_EXPORT(int)
+killwchar(wchar_t *wch)
+{
+    return NCURSES_SP_NAME(killwchar) (CURRENT_SCREEN, wch);
+}
+#endif

diff --git a/ncurses/widechar/lib_get_wstr.c b/ncurses/widechar/lib_get_wstr.c
index 695b5263946ab32569e2e76bae8a189fdf3ab474..f09f87f3833f65da75c67ee979943ce12ce67bd2 100644 (file)
--- a/ncurses/widechar/lib_get_wstr.c
+++ b/ncurses/widechar/lib_get_wstr.c
@@ -1,5 +1,5 @@
 /****************************************************************************
 /****************************************************************************

- * Copyright 2018,2020 Thomas E. Dickey                                     *
+ * Copyright 2018-2020,2021 Thomas E. Dickey                                *

  * Copyright 2002-2009,2011 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
  * Copyright 2002-2009,2011 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *


@@ -40,7 +40,7 @@
 
 #include <curses.priv.h>
 
 
 #include <curses.priv.h>
 

-MODULE_ID("$Id: lib_get_wstr.c,v 1.16 2020/02/02 23:34:34 tom Exp $")
+MODULE_ID("$Id: lib_get_wstr.c,v 1.18 2021/05/22 23:49:33 tom Exp $")

 
 static int
 wadd_wint(WINDOW *win, wint_t *src)
 
 static int
 wadd_wint(WINDOW *win, wint_t *src)


@@ -89,8 +89,8 @@ wgetn_wstr(WINDOW *win, wint_t *str, int maxlen)
     SCREEN *sp = _nc_screen_of(win);
     TTY buf;
     bool oldnl, oldecho, oldraw, oldcbreak;
     SCREEN *sp = _nc_screen_of(win);
     TTY buf;
     bool oldnl, oldecho, oldraw, oldcbreak;

-    wint_t erasec;
-    wint_t killc;
+    wchar_t erasec = 0;
+    wchar_t killc = 0;

     wint_t *oldstr = str;
     wint_t *tmpstr = str;
     wint_t ch;
     wint_t *oldstr = str;
     wint_t *tmpstr = str;
     wint_t ch;


@@ -109,13 +109,12 @@ wgetn_wstr(WINDOW *win, wint_t *str, int maxlen)
     oldecho = sp->_echo;
     oldraw = sp->_raw;
     oldcbreak = sp->_cbreak;
     oldecho = sp->_echo;
     oldraw = sp->_raw;
     oldcbreak = sp->_cbreak;

-    nl();
-    noecho();
-    noraw();
-    cbreak();
+    NCURSES_SP_NAME(nl) (NCURSES_SP_ARG);
+    NCURSES_SP_NAME(noecho) (NCURSES_SP_ARG);
+    NCURSES_SP_NAME(raw) (NCURSES_SP_ARG);

 
 

-    erasec = (wint_t) erasechar();
-    killc = (wint_t) killchar();
+    NCURSES_SP_NAME(erasewchar) (NCURSES_SP_ARGx &erasec);
+    NCURSES_SP_NAME(killwchar) (NCURSES_SP_ARGx &killc);

 
     getyx(win, y, x);
 
 
     getyx(win, y, x);
 


@@ -132,12 +131,12 @@ wgetn_wstr(WINDOW *win, wint_t *str, int maxlen)
            code = KEY_CODE_YES;
            ch = KEY_ENTER;
        }
            code = KEY_CODE_YES;
            ch = KEY_ENTER;
        }

-       if (ch < KEY_MIN) {
-           if (ch == erasec) {
+       if (ch != 0 && ch < KEY_MIN) {
+           if (ch == (wint_t) erasec) {

                ch = KEY_BACKSPACE;
                code = KEY_CODE_YES;
            }
                ch = KEY_BACKSPACE;
                code = KEY_CODE_YES;
            }

-           if (ch == killc) {
+           if (ch == (wint_t) killc) {

                ch = KEY_EOL;
                code = KEY_CODE_YES;
            }
                ch = KEY_EOL;
                code = KEY_CODE_YES;
            }

diff --git a/package/debian-mingw/changelog b/package/debian-mingw/changelog
index 58b6e102d5e6783175b2194c1587d9b901fbfda1..aff8df78274b69a7e658a779b2baf96bb58f22f9 100644 (file)
--- a/package/debian-mingw/changelog
+++ b/package/debian-mingw/changelog
@@ -1,8 +1,8 @@
-ncurses6 (6.2+20210515) unstable; urgency=low
+ncurses6 (6.2+20210522) unstable; urgency=low

 
   * latest weekly patch
 
 
   * latest weekly patch
 

- -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 15 May 2021 05:37:23 -0400
+ -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 22 May 2021 09:01:12 -0400

 
 ncurses6 (5.9-20131005) unstable; urgency=low
 
 
 ncurses6 (5.9-20131005) unstable; urgency=low
 

diff --git a/package/debian-mingw64/changelog b/package/debian-mingw64/changelog
index 58b6e102d5e6783175b2194c1587d9b901fbfda1..aff8df78274b69a7e658a779b2baf96bb58f22f9 100644 (file)
--- a/package/debian-mingw64/changelog
+++ b/package/debian-mingw64/changelog
@@ -1,8 +1,8 @@
-ncurses6 (6.2+20210515) unstable; urgency=low
+ncurses6 (6.2+20210522) unstable; urgency=low

 
   * latest weekly patch
 
 
   * latest weekly patch
 

- -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 15 May 2021 05:37:23 -0400
+ -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 22 May 2021 09:01:12 -0400

 
 ncurses6 (5.9-20131005) unstable; urgency=low
 
 
 ncurses6 (5.9-20131005) unstable; urgency=low
 

diff --git a/package/debian/changelog b/package/debian/changelog
index c8d8acd98316b444321bebe7ea1ad293591ba0a3..90a6b3c73f5097c672e12da0b8a5ba1d67dcbd92 100644 (file)
--- a/package/debian/changelog
+++ b/package/debian/changelog
@@ -1,8 +1,8 @@
-ncurses6 (6.2+20210515) unstable; urgency=low
+ncurses6 (6.2+20210522) unstable; urgency=low

 
   * latest weekly patch
 
 
   * latest weekly patch
 

- -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 15 May 2021 05:37:23 -0400
+ -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 22 May 2021 09:01:12 -0400

 
 ncurses6 (5.9-20120608) unstable; urgency=low
 
 
 ncurses6 (5.9-20120608) unstable; urgency=low
 

diff --git a/package/mingw-ncurses.nsi b/package/mingw-ncurses.nsi
index 27228adfe6e5f4234c57cc2402ce24857dfec616..33ce9002b655695cf5566e3739affe204a1ed04d 100644 (file)
--- a/package/mingw-ncurses.nsi
+++ b/package/mingw-ncurses.nsi
@@ -1,4 +1,4 @@
-; $Id: mingw-ncurses.nsi,v 1.458 2021/05/15 09:37:23 tom Exp $\r
+; $Id: mingw-ncurses.nsi,v 1.459 2021/05/22 13:01:12 tom Exp $\r

 \r
 ; TODO add examples\r
 ; TODO bump ABI to 6\r
 \r
 ; TODO add examples\r
 ; TODO bump ABI to 6\r


@@ -10,7 +10,7 @@
 !define VERSION_MAJOR "6"\r
 !define VERSION_MINOR "2"\r
 !define VERSION_YYYY  "2021"\r
 !define VERSION_MAJOR "6"\r
 !define VERSION_MINOR "2"\r
 !define VERSION_YYYY  "2021"\r

-!define VERSION_MMDD  "0515"\r
+!define VERSION_MMDD  "0522"\r

 !define VERSION_PATCH ${VERSION_YYYY}${VERSION_MMDD}\r
 \r
 !define MY_ABI   "5"\r
 !define VERSION_PATCH ${VERSION_YYYY}${VERSION_MMDD}\r
 \r
 !define MY_ABI   "5"\r

diff --git a/package/mingw-ncurses.spec b/package/mingw-ncurses.spec
index 1c31248bcbdbcc5a38653c1c086592e6383830b5..ae44fc09160f318d3bdcb5692142a8895fa58e0a 100644 (file)
--- a/package/mingw-ncurses.spec
+++ b/package/mingw-ncurses.spec
@@ -3,7 +3,7 @@
 Summary: shared libraries for terminal handling
 Name: mingw32-ncurses6
 Version: 6.2
 Summary: shared libraries for terminal handling
 Name: mingw32-ncurses6
 Version: 6.2

-Release: 20210515
+Release: 20210522

 License: X11
 Group: Development/Libraries
 Source: ncurses-%{version}-%{release}.tgz
 License: X11
 Group: Development/Libraries
 Source: ncurses-%{version}-%{release}.tgz

diff --git a/package/ncurses.spec b/package/ncurses.spec
index 57b0bca355714c471ccf894a72ac03dc4048aa9c..f9bdc91a58686fd95830d2789bedb907bf3f5369 100644 (file)
--- a/package/ncurses.spec
+++ b/package/ncurses.spec
@@ -1,7 +1,7 @@
 Summary: shared libraries for terminal handling
 Name: ncurses6
 Version: 6.2
 Summary: shared libraries for terminal handling
 Name: ncurses6
 Version: 6.2

-Release: 20210515
+Release: 20210522

 License: X11
 Group: Development/Libraries
 Source: ncurses-%{version}-%{release}.tgz
 License: X11
 Group: Development/Libraries
 Source: ncurses-%{version}-%{release}.tgz

diff --git a/package/ncursest.spec b/package/ncursest.spec
index 7a09666bb73df6e841bc5c43de1ee27d9f3c4f7f..16071d0f70bce70fac196197d25233588e98173c 100644 (file)
--- a/package/ncursest.spec
+++ b/package/ncursest.spec
@@ -1,7 +1,7 @@
 Summary: Curses library with POSIX thread support.
 Name: ncursest6
 Version: 6.2
 Summary: Curses library with POSIX thread support.
 Name: ncursest6
 Version: 6.2

-Release: 20210515
+Release: 20210522

 License: X11
 Group: Development/Libraries
 Source: ncurses-%{version}-%{release}.tgz
 License: X11
 Group: Development/Libraries
 Source: ncurses-%{version}-%{release}.tgz

diff --git a/package/ncursestw.map b/package/ncursestw.map
index ff857389ee66bf19e5b67fa7cd914771265e9843..611047044b3fd3c22d278d8ea80747e7d6cfee67 100644 (file)
--- a/package/ncursestw.map
+++ b/package/ncursestw.map
@@ -1,4 +1,4 @@
-# $Id: ncursestw.map,v 1.52 2020/05/27 19:29:32 tom Exp $
+# $Id: ncursestw.map,v 1.53 2021/05/22 20:41:12 tom Exp $

 # script for shared library symbol-versioning using ld
 #
 # This file was generated by ncu-mapsyms
 # script for shared library symbol-versioning using ld
 #
 # This file was generated by ncu-mapsyms


@@ -496,6 +496,8 @@ NCURSES_TINFO_6.2.20200212 {
 NCURSES_TINFO_6.2.current {
        global:
                _nc_tiparm;
 NCURSES_TINFO_6.2.current {
        global:
                _nc_tiparm;

+               erasewchar_sp;
+               killwchar_sp;

        local:
                _*;
 } NCURSES_TINFO_6.2.20200212;
        local:
                _*;
 } NCURSES_TINFO_6.2.20200212;

diff --git a/package/ncursestw.sym b/package/ncursestw.sym
index 5d12a533b88b34f500a31f2542ddc652e5c46649..899c60dc75f7cb3a2cec542b1b8c75cc93567835 100644 (file)
--- a/package/ncursestw.sym
+++ b/package/ncursestw.sym
@@ -1,4 +1,4 @@
-# $Id: ncursestw.sym,v 1.38 2019/12/14 22:44:31 tom Exp $
+# $Id: ncursestw.sym,v 1.39 2021/05/22 20:43:17 tom Exp $

 # script for shared library symbol-visibility using libtool
 #
 # This file was generated by ncu-mapsyms
 # script for shared library symbol-visibility using libtool
 #
 # This file was generated by ncu-mapsyms


@@ -355,6 +355,7 @@ erase
 erasechar
 erasechar_sp
 erasewchar
 erasechar
 erasechar_sp
 erasewchar

+erasewchar_sp

 exit_curses
 exit_terminfo
 extended_color_content
 exit_curses
 exit_terminfo
 extended_color_content


@@ -524,6 +525,7 @@ keypad
 killchar
 killchar_sp
 killwchar
 killchar
 killchar_sp
 killwchar

+killwchar_sp

 leaveok
 link_field
 link_fieldtype
 leaveok
 link_field
 link_fieldtype

diff --git a/package/ncursesw.map b/package/ncursesw.map
index 021cd57760d3d7a0ae6562d59f33659fb99639bc..efcfbea269d1958a7a778229cfb329428a0645ab 100644 (file)
--- a/package/ncursesw.map
+++ b/package/ncursesw.map
@@ -1,4 +1,4 @@
-# $Id: ncursesw.map,v 1.55 2020/05/27 19:27:45 tom Exp $
+# $Id: ncursesw.map,v 1.56 2021/05/22 20:41:21 tom Exp $

 # script for shared library symbol-versioning using ld
 #
 # This file was generated by ncu-mapsyms
 # script for shared library symbol-versioning using ld
 #
 # This file was generated by ncu-mapsyms


@@ -490,6 +490,8 @@ NCURSES_TINFO_6.2.20200212 {
 NCURSES_TINFO_6.2.current {
        global:
                _nc_tiparm;
 NCURSES_TINFO_6.2.current {
        global:
                _nc_tiparm;

+               erasewchar_sp;
+               killwchar_sp;

        local:
                _*;
 } NCURSES_TINFO_6.2.20200212;
        local:
                _*;
 } NCURSES_TINFO_6.2.20200212;

diff --git a/package/ncursesw.sym b/package/ncursesw.sym
index d8d3fd8f11b8e37883ed492dd5008daad04cedc8..694e458bf75908f6d459685791ab38c2d017d8f9 100644 (file)
--- a/package/ncursesw.sym
+++ b/package/ncursesw.sym
@@ -1,4 +1,4 @@
-# $Id: ncursesw.sym,v 1.37 2019/12/14 22:45:41 tom Exp $
+# $Id: ncursesw.sym,v 1.38 2021/05/22 20:42:46 tom Exp $

 # script for shared library symbol-visibility using libtool
 #
 # This file was generated by ncu-mapsyms
 # script for shared library symbol-visibility using libtool
 #
 # This file was generated by ncu-mapsyms


@@ -232,11 +232,11 @@ _nc_visbuf
 _nc_visbuf2
 _nc_visbufn
 _nc_viscbuf
 _nc_visbuf2
 _nc_visbufn
 _nc_viscbuf

-_nc_wacs_width

 _nc_viswbuf
 _nc_viswbufn
 _nc_viswibuf
 _nc_wacs
 _nc_viswbuf
 _nc_viswbufn
 _nc_viswibuf
 _nc_wacs

+_nc_wacs_width

 _nc_warning
 _nc_wchstrlen
 _nc_wcrtomb
 _nc_warning
 _nc_wchstrlen
 _nc_wcrtomb


@@ -343,6 +343,7 @@ erase
 erasechar
 erasechar_sp
 erasewchar
 erasechar
 erasechar_sp
 erasewchar

+erasewchar_sp

 exit_curses
 exit_terminfo
 extended_color_content
 exit_curses
 exit_terminfo
 extended_color_content


@@ -512,6 +513,7 @@ keypad
 killchar
 killchar_sp
 killwchar
 killchar
 killchar_sp
 killwchar

+killwchar_sp

 leaveok
 link_field
 link_fieldtype
 leaveok
 link_field
 link_fieldtype

diff --git a/test/aclocal.m4 b/test/aclocal.m4
index eef6e1905e8fcca562bd09629795ee26b9f981d9..9ee0418319c4bfa1fd708f00d948d8d130169ed1 100644 (file)
--- a/test/aclocal.m4
+++ b/test/aclocal.m4
@@ -27,7 +27,7 @@ dnl sale, use or other dealings in this Software without prior written       *
 dnl authorization.                                                           *
 dnl***************************************************************************
 dnl
 dnl authorization.                                                           *
 dnl***************************************************************************
 dnl

-dnl $Id: aclocal.m4,v 1.193 2021/04/03 20:48:45 tom Exp $
+dnl $Id: aclocal.m4,v 1.194 2021/05/19 23:35:25 tom Exp $

 dnl
 dnl Author: Thomas E. Dickey
 dnl
 dnl
 dnl Author: Thomas E. Dickey
 dnl


@@ -2474,7 +2474,7 @@ printf("old\\n");
        ,[$1=no])
 ])dnl
 dnl ---------------------------------------------------------------------------
        ,[$1=no])
 ])dnl
 dnl ---------------------------------------------------------------------------

-dnl CF_NCURSES_CONFIG version: 26 updated: 2021/01/03 08:05:37
+dnl CF_NCURSES_CONFIG version: 27 updated: 2021/05/19 19:35:25

 dnl -----------------
 dnl Tie together the configure-script macros for ncurses, preferring these in
 dnl order:
 dnl -----------------
 dnl Tie together the configure-script macros for ncurses, preferring these in
 dnl order:


@@ -2516,7 +2516,7 @@ if test "x${PKG_CONFIG:=none}" != xnone; then
                                [initscr(); mousemask(0,0); tigetstr((char *)0);],
                                [AC_TRY_RUN([#include <${cf_cv_ncurses_header:-curses.h}>
                                        int main(void)
                                [initscr(); mousemask(0,0); tigetstr((char *)0);],
                                [AC_TRY_RUN([#include <${cf_cv_ncurses_header:-curses.h}>
                                        int main(void)

-                                       { char *xx = curses_version(); return (xx == 0); }],
+                                       { const char *xx = curses_version(); return (xx == 0); }],

                                        [cf_test_ncuconfig=yes],
                                        [cf_test_ncuconfig=no],
                                        [cf_test_ncuconfig=maybe])],
                                        [cf_test_ncuconfig=yes],
                                        [cf_test_ncuconfig=no],
                                        [cf_test_ncuconfig=maybe])],


@@ -2542,7 +2542,7 @@ if test "x${PKG_CONFIG:=none}" != xnone; then
                        [initscr(); mousemask(0,0); tigetstr((char *)0);],
                        [AC_TRY_RUN([#include <${cf_cv_ncurses_header:-curses.h}>
                                int main(void)
                        [initscr(); mousemask(0,0); tigetstr((char *)0);],
                        [AC_TRY_RUN([#include <${cf_cv_ncurses_header:-curses.h}>
                                int main(void)

-                               { char *xx = curses_version(); return (xx == 0); }],
+                               { const char *xx = curses_version(); return (xx == 0); }],

                                [cf_have_ncuconfig=yes],
                                [cf_have_ncuconfig=no],
                                [cf_have_ncuconfig=maybe])],
                                [cf_have_ncuconfig=yes],
                                [cf_have_ncuconfig=no],
                                [cf_have_ncuconfig=maybe])],


@@ -3785,15 +3785,21 @@ AC_DEFUN([CF_UPPER],
 $1=`echo "$2" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%`
 ])dnl
 dnl ---------------------------------------------------------------------------
 $1=`echo "$2" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%`
 ])dnl
 dnl ---------------------------------------------------------------------------

-dnl CF_UTF8_LIB version: 8 updated: 2012/10/06 08:57:51
+dnl CF_UTF8_LIB version: 9 updated: 2021/05/19 19:35:25

 dnl -----------
 dnl Check for multibyte support, and if not found, utf8 compatibility library
 AC_DEFUN([CF_UTF8_LIB],
 [
 dnl -----------
 dnl Check for multibyte support, and if not found, utf8 compatibility library
 AC_DEFUN([CF_UTF8_LIB],
 [

+AC_HAVE_HEADERS(wchar.h)

 AC_CACHE_CHECK(for multibyte character support,cf_cv_utf8_lib,[
        cf_save_LIBS="$LIBS"
        AC_TRY_LINK([
 AC_CACHE_CHECK(for multibyte character support,cf_cv_utf8_lib,[
        cf_save_LIBS="$LIBS"
        AC_TRY_LINK([

-#include <stdlib.h>],[putwc(0,0);],
+#include <stdlib.h>
+#include <stdio.h>
+#ifdef HAVE_WCHAR_H
+#include <wchar.h>
+#endif
+],[putwc(0,0);],

        [cf_cv_utf8_lib=yes],
        [CF_FIND_LINKAGE([
 #include <libutf8.h>],[putwc(0,0);],utf8,
        [cf_cv_utf8_lib=yes],
        [CF_FIND_LINKAGE([
 #include <libutf8.h>],[putwc(0,0);],utf8,


@@ -4195,7 +4201,7 @@ esac
 
 ])dnl
 dnl ---------------------------------------------------------------------------
 
 ])dnl
 dnl ---------------------------------------------------------------------------

-dnl CF_XOPEN_SOURCE version: 57 updated: 2021/01/01 16:53:59
+dnl CF_XOPEN_SOURCE version: 58 updated: 2021/05/01 17:49:36

 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,
 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,


@@ -4260,7 +4266,15 @@ case "$host_os" in
 (netbsd*)
        cf_xopen_source="-D_NETBSD_SOURCE" # setting _XOPEN_SOURCE breaks IPv6 for lynx on NetBSD 1.6, breaks xterm, is not needed for ncursesw
        ;;
 (netbsd*)
        cf_xopen_source="-D_NETBSD_SOURCE" # setting _XOPEN_SOURCE breaks IPv6 for lynx on NetBSD 1.6, breaks xterm, is not needed for ncursesw
        ;;

-(openbsd[[4-9]]*)
+(openbsd[[6-9]]*)
+       # OpenBSD 6.x has broken locale support, both compile-time and runtime.
+       # see https://www.mail-archive.com/bugs@openbsd.org/msg13200.html
+       # Abusing the conformance level is a workaround.
+       AC_MSG_WARN(this system does not provide usable locale support)
+       cf_xopen_source="-D_BSD_SOURCE"
+       cf_XOPEN_SOURCE=700
+       ;;
+(openbsd[[4-5]]*)

        # setting _XOPEN_SOURCE lower than 500 breaks g++ compile with wchar.h, needed for ncursesw
        cf_xopen_source="-D_BSD_SOURCE"
        cf_XOPEN_SOURCE=600
        # setting _XOPEN_SOURCE lower than 500 breaks g++ compile with wchar.h, needed for ncursesw
        cf_xopen_source="-D_BSD_SOURCE"
        cf_XOPEN_SOURCE=600

diff --git a/test/configure b/test/configure
index 483742411ebaa53835317f1bdd0de6e54e53635a..b8b0dd8ff03c275c094cc28534e175af27a5f198 100755 (executable)
--- a/test/configure
+++ b/test/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.

-# Generated by Autoconf 2.52.20210105.
+# Generated by Autoconf 2.52.20210509.

 #
 # Copyright 2003-2020,2021     Thomas E. Dickey
 # Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001
 #
 # Copyright 2003-2020,2021     Thomas E. Dickey
 # Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001


@@ -772,7 +772,7 @@ This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
 It was created by $as_me, which was
 running configure, to aid debugging if configure makes a mistake.
 
 It was created by $as_me, which was

-generated by GNU Autoconf 2.52.20210105.  Invocation command line was
+generated by GNU Autoconf 2.52.20210509.  Invocation command line was

 
   $ $0 $@
 
 
   $ $0 $@
 


@@ -4704,7 +4704,16 @@ fi # cf_cv_posix_visible
 (netbsd*)
        cf_xopen_source="-D_NETBSD_SOURCE" # setting _XOPEN_SOURCE breaks IPv6 for lynx on NetBSD 1.6, breaks xterm, is not needed for ncursesw
        ;;
 (netbsd*)
        cf_xopen_source="-D_NETBSD_SOURCE" # setting _XOPEN_SOURCE breaks IPv6 for lynx on NetBSD 1.6, breaks xterm, is not needed for ncursesw
        ;;

-(openbsd[4-9]*)
+(openbsd[6-9]*)
+       # OpenBSD 6.x has broken locale support, both compile-time and runtime.
+       # see https://www.mail-archive.com/bugs@openbsd.org/msg13200.html
+       # Abusing the conformance level is a workaround.
+       { echo "$as_me:4711: WARNING: this system does not provide usable locale support" >&5
+echo "$as_me: WARNING: this system does not provide usable locale support" >&2;}
+       cf_xopen_source="-D_BSD_SOURCE"
+       cf_XOPEN_SOURCE=700
+       ;;
+(openbsd[4-5]*)

        # setting _XOPEN_SOURCE lower than 500 breaks g++ compile with wchar.h, needed for ncursesw
        cf_xopen_source="-D_BSD_SOURCE"
        cf_XOPEN_SOURCE=600
        # setting _XOPEN_SOURCE lower than 500 breaks g++ compile with wchar.h, needed for ncursesw
        cf_xopen_source="-D_BSD_SOURCE"
        cf_XOPEN_SOURCE=600


@@ -4731,14 +4740,14 @@ fi # cf_cv_posix_visible
        ;;
 (*)
 
        ;;
 (*)
 

-echo "$as_me:4734: checking if we should define _XOPEN_SOURCE" >&5
+echo "$as_me:4743: 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
 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 4741 "configure"
+#line 4750 "configure"

 #include "confdefs.h"
 
 #include <stdlib.h>
 #include "confdefs.h"
 
 #include <stdlib.h>


@@ -4757,16 +4766,16 @@ make an error
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
 }
 _ACEOF
 rm -f "conftest.$ac_objext"

-if { (eval echo "$as_me:4760: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:4769: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:4763: \$? = $ac_status" >&5
+  echo "$as_me:4772: \$? = $ac_status" >&5

   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'

-  { (eval echo "$as_me:4766: \"$ac_try\"") >&5
+  { (eval echo "$as_me:4775: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:4769: \$? = $ac_status" >&5
+  echo "$as_me:4778: \$? = $ac_status" >&5

   (exit "$ac_status"); }; }; then
   cf_cv_xopen_source=no
 else
   (exit "$ac_status"); }; }; then
   cf_cv_xopen_source=no
 else


@@ -4778,7 +4787,7 @@ cf_save="$CPPFLAGS"
        CPPFLAGS="${CPPFLAGS}-D_XOPEN_SOURCE=$cf_XOPEN_SOURCE"
 
         cat >"conftest.$ac_ext" <<_ACEOF
        CPPFLAGS="${CPPFLAGS}-D_XOPEN_SOURCE=$cf_XOPEN_SOURCE"
 
         cat >"conftest.$ac_ext" <<_ACEOF

-#line 4781 "configure"
+#line 4790 "configure"

 #include "confdefs.h"
 
 #include <stdlib.h>
 #include "confdefs.h"
 
 #include <stdlib.h>


@@ -4797,16 +4806,16 @@ make an error
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
 }
 _ACEOF
 rm -f "conftest.$ac_objext"

-if { (eval echo "$as_me:4800: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:4809: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:4803: \$? = $ac_status" >&5
+  echo "$as_me:4812: \$? = $ac_status" >&5

   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'

-  { (eval echo "$as_me:4806: \"$ac_try\"") >&5
+  { (eval echo "$as_me:4815: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:4809: \$? = $ac_status" >&5
+  echo "$as_me:4818: \$? = $ac_status" >&5

   (exit "$ac_status"); }; }; then
   cf_cv_xopen_source=no
 else
   (exit "$ac_status"); }; }; then
   cf_cv_xopen_source=no
 else


@@ -4821,7 +4830,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi

-echo "$as_me:4824: result: $cf_cv_xopen_source" >&5
+echo "$as_me:4833: result: $cf_cv_xopen_source" >&5

 echo "${ECHO_T}$cf_cv_xopen_source" >&6
 
 if test "$cf_cv_xopen_source" != no ; then
 echo "${ECHO_T}$cf_cv_xopen_source" >&6
 
 if test "$cf_cv_xopen_source" != no ; then


@@ -4951,16 +4960,16 @@ cf_trim_CPPFLAGS=`echo "$cf_save_CPPFLAGS" | \
        sed     -e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^     ]*\)\?[         ]/ /g' \
                -e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^     ]*\)\?$//g'`
 
        sed     -e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^     ]*\)\?[         ]/ /g' \
                -e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^     ]*\)\?$//g'`
 

-echo "$as_me:4954: checking if we should define _POSIX_C_SOURCE" >&5
+echo "$as_me:4963: 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 $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}:4960: testing if the symbol is already defined go no further ..." 1>&5
+echo "${as_me:-configure}:4969: testing if the symbol is already defined go no further ..." 1>&5

 
        cat >"conftest.$ac_ext" <<_ACEOF
 
        cat >"conftest.$ac_ext" <<_ACEOF

-#line 4963 "configure"
+#line 4972 "configure"

 #include "confdefs.h"
 #include <sys/types.h>
 int
 #include "confdefs.h"
 #include <sys/types.h>
 int


@@ -4975,16 +4984,16 @@ make an error
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
 }
 _ACEOF
 rm -f "conftest.$ac_objext"

-if { (eval echo "$as_me:4978: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:4987: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:4981: \$? = $ac_status" >&5
+  echo "$as_me:4990: \$? = $ac_status" >&5

   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'

-  { (eval echo "$as_me:4984: \"$ac_try\"") >&5
+  { (eval echo "$as_me:4993: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:4987: \$? = $ac_status" >&5
+  echo "$as_me:4996: \$? = $ac_status" >&5

   (exit "$ac_status"); }; }; then
   cf_cv_posix_c_source=no
 else
   (exit "$ac_status"); }; }; then
   cf_cv_posix_c_source=no
 else


@@ -5005,7 +5014,7 @@ cf_want_posix_source=no
         esac
         if test "$cf_want_posix_source" = yes ; then
                cat >"conftest.$ac_ext" <<_ACEOF
         esac
         if test "$cf_want_posix_source" = yes ; then
                cat >"conftest.$ac_ext" <<_ACEOF

-#line 5008 "configure"
+#line 5017 "configure"

 #include "confdefs.h"
 #include <sys/types.h>
 int
 #include "confdefs.h"
 #include <sys/types.h>
 int


@@ -5020,16 +5029,16 @@ make an error
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
 }
 _ACEOF
 rm -f "conftest.$ac_objext"

-if { (eval echo "$as_me:5023: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:5032: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:5026: \$? = $ac_status" >&5
+  echo "$as_me:5035: \$? = $ac_status" >&5

   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'

-  { (eval echo "$as_me:5029: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5038: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:5032: \$? = $ac_status" >&5
+  echo "$as_me:5041: \$? = $ac_status" >&5

   (exit "$ac_status"); }; }; then
   :
 else
   (exit "$ac_status"); }; }; then
   :
 else


@@ -5040,7 +5049,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
         fi
 
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
         fi
 

-echo "${as_me:-configure}:5043: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
+echo "${as_me:-configure}:5052: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5

 
         CFLAGS="$cf_trim_CFLAGS"
         CPPFLAGS="$cf_trim_CPPFLAGS"
 
         CFLAGS="$cf_trim_CFLAGS"
         CPPFLAGS="$cf_trim_CPPFLAGS"


@@ -5048,10 +5057,10 @@ echo "${as_me:-configure}:5043: testing ifdef from value $cf_POSIX_C_SOURCE ..."
        test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
        CPPFLAGS="${CPPFLAGS}$cf_cv_posix_c_source"
 
        test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
        CPPFLAGS="${CPPFLAGS}$cf_cv_posix_c_source"
 

-echo "${as_me:-configure}:5051: testing if the second compile does not leave our definition intact error ..." 1>&5
+echo "${as_me:-configure}:5060: testing if the second compile does not leave our definition intact error ..." 1>&5

 
         cat >"conftest.$ac_ext" <<_ACEOF
 
         cat >"conftest.$ac_ext" <<_ACEOF

-#line 5054 "configure"
+#line 5063 "configure"

 #include "confdefs.h"
 #include <sys/types.h>
 int
 #include "confdefs.h"
 #include <sys/types.h>
 int


@@ -5066,16 +5075,16 @@ make an error
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
 }
 _ACEOF
 rm -f "conftest.$ac_objext"

-if { (eval echo "$as_me:5069: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:5078: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:5072: \$? = $ac_status" >&5
+  echo "$as_me:5081: \$? = $ac_status" >&5

   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'

-  { (eval echo "$as_me:5075: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5084: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:5078: \$? = $ac_status" >&5
+  echo "$as_me:5087: \$? = $ac_status" >&5

   (exit "$ac_status"); }; }; then
   :
 else
   (exit "$ac_status"); }; }; then
   :
 else


@@ -5091,7 +5100,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi

-echo "$as_me:5094: result: $cf_cv_posix_c_source" >&5
+echo "$as_me:5103: 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
 echo "${ECHO_T}$cf_cv_posix_c_source" >&6
 
 if test "$cf_cv_posix_c_source" != no ; then


@@ -5285,7 +5294,7 @@ done
 if test -n "$cf_new_cflags" ; then
        test -n "$verbose" && echo "    add to \$CFLAGS $cf_new_cflags" 1>&6
 
 if test -n "$cf_new_cflags" ; then
        test -n "$verbose" && echo "    add to \$CFLAGS $cf_new_cflags" 1>&6
 

-echo "${as_me:-configure}:5288: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
+echo "${as_me:-configure}:5297: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5

 
        test -n "$CFLAGS" && CFLAGS="$CFLAGS "
        CFLAGS="${CFLAGS}$cf_new_cflags"
 
        test -n "$CFLAGS" && CFLAGS="$CFLAGS "
        CFLAGS="${CFLAGS}$cf_new_cflags"


@@ -5295,7 +5304,7 @@ fi
 if test -n "$cf_new_cppflags" ; then
        test -n "$verbose" && echo "    add to \$CPPFLAGS $cf_new_cppflags" 1>&6
 
 if test -n "$cf_new_cppflags" ; then
        test -n "$verbose" && echo "    add to \$CPPFLAGS $cf_new_cppflags" 1>&6
 

-echo "${as_me:-configure}:5298: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
+echo "${as_me:-configure}:5307: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5

 
        test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
        CPPFLAGS="${CPPFLAGS}$cf_new_cppflags"
 
        test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
        CPPFLAGS="${CPPFLAGS}$cf_new_cppflags"


@@ -5305,7 +5314,7 @@ fi
 if test -n "$cf_new_extra_cppflags" ; then
        test -n "$verbose" && echo "    add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags" 1>&6
 
 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}:5308: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5
+echo "${as_me:-configure}:5317: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5

 
        test -n "$EXTRA_CPPFLAGS" && EXTRA_CPPFLAGS="$EXTRA_CPPFLAGS "
        EXTRA_CPPFLAGS="${EXTRA_CPPFLAGS}$cf_new_extra_cppflags"
 
        test -n "$EXTRA_CPPFLAGS" && EXTRA_CPPFLAGS="$EXTRA_CPPFLAGS "
        EXTRA_CPPFLAGS="${EXTRA_CPPFLAGS}$cf_new_extra_cppflags"


@@ -5315,10 +5324,10 @@ fi
 fi
 
 if test -n "$cf_XOPEN_SOURCE" && test -z "$cf_cv_xopen_source" ; then
 fi
 
 if test -n "$cf_XOPEN_SOURCE" && test -z "$cf_cv_xopen_source" ; then

-       echo "$as_me:5318: checking if _XOPEN_SOURCE really is set" >&5
+       echo "$as_me:5327: 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
 echo $ECHO_N "checking if _XOPEN_SOURCE really is set... $ECHO_C" >&6
        cat >"conftest.$ac_ext" <<_ACEOF

-#line 5321 "configure"
+#line 5330 "configure"

 #include "confdefs.h"
 #include <stdlib.h>
 int
 #include "confdefs.h"
 #include <stdlib.h>
 int


@@ -5333,16 +5342,16 @@ make an error
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
 }
 _ACEOF
 rm -f "conftest.$ac_objext"

-if { (eval echo "$as_me:5336: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:5345: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:5339: \$? = $ac_status" >&5
+  echo "$as_me:5348: \$? = $ac_status" >&5

   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'

-  { (eval echo "$as_me:5342: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5351: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:5345: \$? = $ac_status" >&5
+  echo "$as_me:5354: \$? = $ac_status" >&5

   (exit "$ac_status"); }; }; then
   cf_XOPEN_SOURCE_set=yes
 else
   (exit "$ac_status"); }; }; then
   cf_XOPEN_SOURCE_set=yes
 else


@@ -5351,12 +5360,12 @@ cat "conftest.$ac_ext" >&5
 cf_XOPEN_SOURCE_set=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 cf_XOPEN_SOURCE_set=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"

-       echo "$as_me:5354: result: $cf_XOPEN_SOURCE_set" >&5
+       echo "$as_me:5363: 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
 echo "${ECHO_T}$cf_XOPEN_SOURCE_set" >&6
        if test "$cf_XOPEN_SOURCE_set" = yes
        then
                cat >"conftest.$ac_ext" <<_ACEOF

-#line 5359 "configure"
+#line 5368 "configure"

 #include "confdefs.h"
 #include <stdlib.h>
 int
 #include "confdefs.h"
 #include <stdlib.h>
 int


@@ -5371,16 +5380,16 @@ make an error
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
 }
 _ACEOF
 rm -f "conftest.$ac_objext"

-if { (eval echo "$as_me:5374: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:5383: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:5377: \$? = $ac_status" >&5
+  echo "$as_me:5386: \$? = $ac_status" >&5

   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'

-  { (eval echo "$as_me:5380: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5389: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:5383: \$? = $ac_status" >&5
+  echo "$as_me:5392: \$? = $ac_status" >&5

   (exit "$ac_status"); }; }; then
   cf_XOPEN_SOURCE_set_ok=yes
 else
   (exit "$ac_status"); }; }; then
   cf_XOPEN_SOURCE_set_ok=yes
 else


@@ -5391,19 +5400,19 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
                if test "$cf_XOPEN_SOURCE_set_ok" = no
                then
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
                if test "$cf_XOPEN_SOURCE_set_ok" = no
                then

-                       { echo "$as_me:5394: WARNING: _XOPEN_SOURCE is lower than requested" >&5
+                       { echo "$as_me:5403: WARNING: _XOPEN_SOURCE is lower than requested" >&5

 echo "$as_me: WARNING: _XOPEN_SOURCE is lower than requested" >&2;}
                fi
        else
 
 echo "$as_me: WARNING: _XOPEN_SOURCE is lower than requested" >&2;}
                fi
        else
 

-echo "$as_me:5399: checking if we should define _XOPEN_SOURCE" >&5
+echo "$as_me:5408: 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
 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 5406 "configure"
+#line 5415 "configure"

 #include "confdefs.h"
 
 #include <stdlib.h>
 #include "confdefs.h"
 
 #include <stdlib.h>


@@ -5422,16 +5431,16 @@ make an error
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
 }
 _ACEOF
 rm -f "conftest.$ac_objext"

-if { (eval echo "$as_me:5425: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:5434: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:5428: \$? = $ac_status" >&5
+  echo "$as_me:5437: \$? = $ac_status" >&5

   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'

-  { (eval echo "$as_me:5431: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5440: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:5434: \$? = $ac_status" >&5
+  echo "$as_me:5443: \$? = $ac_status" >&5

   (exit "$ac_status"); }; }; then
   cf_cv_xopen_source=no
 else
   (exit "$ac_status"); }; }; then
   cf_cv_xopen_source=no
 else


@@ -5443,7 +5452,7 @@ cf_save="$CPPFLAGS"
        CPPFLAGS="${CPPFLAGS}-D_XOPEN_SOURCE=$cf_XOPEN_SOURCE"
 
         cat >"conftest.$ac_ext" <<_ACEOF
        CPPFLAGS="${CPPFLAGS}-D_XOPEN_SOURCE=$cf_XOPEN_SOURCE"
 
         cat >"conftest.$ac_ext" <<_ACEOF

-#line 5446 "configure"
+#line 5455 "configure"

 #include "confdefs.h"
 
 #include <stdlib.h>
 #include "confdefs.h"
 
 #include <stdlib.h>


@@ -5462,16 +5471,16 @@ make an error
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
 }
 _ACEOF
 rm -f "conftest.$ac_objext"

-if { (eval echo "$as_me:5465: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:5474: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:5468: \$? = $ac_status" >&5
+  echo "$as_me:5477: \$? = $ac_status" >&5

   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'

-  { (eval echo "$as_me:5471: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5480: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:5474: \$? = $ac_status" >&5
+  echo "$as_me:5483: \$? = $ac_status" >&5

   (exit "$ac_status"); }; }; then
   cf_cv_xopen_source=no
 else
   (exit "$ac_status"); }; }; then
   cf_cv_xopen_source=no
 else


@@ -5486,7 +5495,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi

-echo "$as_me:5489: result: $cf_cv_xopen_source" >&5
+echo "$as_me:5498: result: $cf_cv_xopen_source" >&5

 echo "${ECHO_T}$cf_cv_xopen_source" >&6
 
 if test "$cf_cv_xopen_source" != no ; then
 echo "${ECHO_T}$cf_cv_xopen_source" >&6
 
 if test "$cf_cv_xopen_source" != no ; then


@@ -5605,7 +5614,7 @@ fi
 fi
 fi # cf_cv_posix_visible
 
 fi
 fi # cf_cv_posix_visible
 

-echo "$as_me:5608: checking for signal global datatype" >&5
+echo "$as_me:5617: 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
 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


@@ -5617,7 +5626,7 @@ else
                "int"
        do
        cat >"conftest.$ac_ext" <<_ACEOF
                "int"
        do
        cat >"conftest.$ac_ext" <<_ACEOF

-#line 5620 "configure"
+#line 5629 "configure"

 #include "confdefs.h"
 
 #include <sys/types.h>
 #include "confdefs.h"
 
 #include <sys/types.h>


@@ -5641,16 +5650,16 @@ signal(SIGINT, handler);
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
 }
 _ACEOF
 rm -f "conftest.$ac_objext"

-if { (eval echo "$as_me:5644: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:5653: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:5647: \$? = $ac_status" >&5
+  echo "$as_me:5656: \$? = $ac_status" >&5

   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'

-  { (eval echo "$as_me:5650: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5659: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:5653: \$? = $ac_status" >&5
+  echo "$as_me:5662: \$? = $ac_status" >&5

   (exit "$ac_status"); }; }; then
   cf_cv_sig_atomic_t=$cf_type
 else
   (exit "$ac_status"); }; }; then
   cf_cv_sig_atomic_t=$cf_type
 else


@@ -5664,7 +5673,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
 
 
 fi
 

-echo "$as_me:5667: result: $cf_cv_sig_atomic_t" >&5
+echo "$as_me:5676: 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
 echo "${ECHO_T}$cf_cv_sig_atomic_t" >&6
 test "$cf_cv_sig_atomic_t" != no &&
 cat >>confdefs.h <<EOF


@@ -5673,14 +5682,14 @@ EOF
 
 # Work around breakage on OS X
 
 
 # Work around breakage on OS X
 

-echo "$as_me:5676: checking if SIGWINCH is defined" >&5
+echo "$as_me:5685: 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
 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 5683 "configure"
+#line 5692 "configure"

 #include "confdefs.h"
 
 #include <sys/types.h>
 #include "confdefs.h"
 
 #include <sys/types.h>


@@ -5695,23 +5704,23 @@ int x = SIGWINCH; (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
 }
 _ACEOF
 rm -f "conftest.$ac_objext"

-if { (eval echo "$as_me:5698: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:5707: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:5701: \$? = $ac_status" >&5
+  echo "$as_me:5710: \$? = $ac_status" >&5

   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'

-  { (eval echo "$as_me:5704: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5713: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:5707: \$? = $ac_status" >&5
+  echo "$as_me:5716: \$? = $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
   (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 5714 "configure"
+#line 5723 "configure"

 #include "confdefs.h"
 
 #undef _XOPEN_SOURCE
 #include "confdefs.h"
 
 #undef _XOPEN_SOURCE


@@ -5729,16 +5738,16 @@ int x = SIGWINCH; (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
 }
 _ACEOF
 rm -f "conftest.$ac_objext"

-if { (eval echo "$as_me:5732: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:5741: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:5735: \$? = $ac_status" >&5
+  echo "$as_me:5744: \$? = $ac_status" >&5

   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'

-  { (eval echo "$as_me:5738: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5747: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:5741: \$? = $ac_status" >&5
+  echo "$as_me:5750: \$? = $ac_status" >&5

   (exit "$ac_status"); }; }; then
   cf_cv_define_sigwinch=maybe
 else
   (exit "$ac_status"); }; }; then
   cf_cv_define_sigwinch=maybe
 else


@@ -5752,11 +5761,11 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi

-echo "$as_me:5755: result: $cf_cv_define_sigwinch" >&5
+echo "$as_me:5764: result: $cf_cv_define_sigwinch" >&5

 echo "${ECHO_T}$cf_cv_define_sigwinch" >&6
 
 if test "$cf_cv_define_sigwinch" = maybe ; then
 echo "${ECHO_T}$cf_cv_define_sigwinch" >&6
 
 if test "$cf_cv_define_sigwinch" = maybe ; then

-echo "$as_me:5759: checking for actual SIGWINCH definition" >&5
+echo "$as_me:5768: 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
 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


@@ -5767,7 +5776,7 @@ cf_sigwinch=32
 while test "$cf_sigwinch" != 1
 do
        cat >"conftest.$ac_ext" <<_ACEOF
 while test "$cf_sigwinch" != 1
 do
        cat >"conftest.$ac_ext" <<_ACEOF

-#line 5770 "configure"
+#line 5779 "configure"

 #include "confdefs.h"
 
 #undef _XOPEN_SOURCE
 #include "confdefs.h"
 
 #undef _XOPEN_SOURCE


@@ -5789,16 +5798,16 @@ int x = SIGWINCH; (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
 }
 _ACEOF
 rm -f "conftest.$ac_objext"

-if { (eval echo "$as_me:5792: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:5801: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:5795: \$? = $ac_status" >&5
+  echo "$as_me:5804: \$? = $ac_status" >&5

   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'

-  { (eval echo "$as_me:5798: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5807: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:5801: \$? = $ac_status" >&5
+  echo "$as_me:5810: \$? = $ac_status" >&5

   (exit "$ac_status"); }; }; then
   cf_cv_fixup_sigwinch=$cf_sigwinch
         break
   (exit "$ac_status"); }; }; then
   cf_cv_fixup_sigwinch=$cf_sigwinch
         break


@@ -5812,7 +5821,7 @@ cf_sigwinch="`expr "$cf_sigwinch" - 1`"
 done
 
 fi
 done
 
 fi

-echo "$as_me:5815: result: $cf_cv_fixup_sigwinch" >&5
+echo "$as_me:5824: result: $cf_cv_fixup_sigwinch" >&5

 echo "${ECHO_T}$cf_cv_fixup_sigwinch" >&6
 
        if test "$cf_cv_fixup_sigwinch" != unknown ; then
 echo "${ECHO_T}$cf_cv_fixup_sigwinch" >&6
 
        if test "$cf_cv_fixup_sigwinch" != unknown ; then


@@ -5822,13 +5831,13 @@ fi
 
 # Checks for CODESET support.
 
 
 # Checks for CODESET support.
 

-echo "$as_me:5825: checking for nl_langinfo and CODESET" >&5
+echo "$as_me:5834: 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
 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 5831 "configure"
+#line 5840 "configure"

 #include "confdefs.h"
 #include <langinfo.h>
 int
 #include "confdefs.h"
 #include <langinfo.h>
 int


@@ -5840,16 +5849,16 @@ char* cs = nl_langinfo(CODESET); (void)cs
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"

-if { (eval echo "$as_me:5843: \"$ac_link\"") >&5
+if { (eval echo "$as_me:5852: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:5846: \$? = $ac_status" >&5
+  echo "$as_me:5855: \$? = $ac_status" >&5

   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'

-  { (eval echo "$as_me:5849: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5858: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:5852: \$? = $ac_status" >&5
+  echo "$as_me:5861: \$? = $ac_status" >&5

   (exit "$ac_status"); }; }; then
   am_cv_langinfo_codeset=yes
 else
   (exit "$ac_status"); }; }; then
   am_cv_langinfo_codeset=yes
 else


@@ -5860,7 +5869,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 
 fi

-echo "$as_me:5863: result: $am_cv_langinfo_codeset" >&5
+echo "$as_me:5872: result: $am_cv_langinfo_codeset" >&5

 echo "${ECHO_T}$am_cv_langinfo_codeset" >&6
        if test "$am_cv_langinfo_codeset" = yes; then
 
 echo "${ECHO_T}$am_cv_langinfo_codeset" >&6
        if test "$am_cv_langinfo_codeset" = yes; then
 


@@ -5870,7 +5879,7 @@ EOF
 
        fi
 
 
        fi
 

-echo "$as_me:5873: checking if you want to use pkg-config" >&5
+echo "$as_me:5882: 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.
 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.


@@ -5880,7 +5889,7 @@ if test "${with_pkg_config+set}" = set; then
 else
   cf_pkg_config=yes
 fi;
 else
   cf_pkg_config=yes
 fi;

-echo "$as_me:5883: result: $cf_pkg_config" >&5
+echo "$as_me:5892: result: $cf_pkg_config" >&5

 echo "${ECHO_T}$cf_pkg_config" >&6
 
 case "$cf_pkg_config" in
 echo "${ECHO_T}$cf_pkg_config" >&6
 
 case "$cf_pkg_config" in


@@ -5892,7 +5901,7 @@ case "$cf_pkg_config" in
 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
 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:5895: checking for $ac_word" >&5
+echo "$as_me:5904: 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
 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


@@ -5909,7 +5918,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   if $as_executable_p "$ac_dir/$ac_word"; then
    ac_cv_path_PKG_CONFIG="$ac_dir/$ac_word"
   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:5912: found $ac_dir/$ac_word" >&5
+   echo "$as_me:5921: found $ac_dir/$ac_word" >&5

    break
 fi
 done
    break
 fi
 done


@@ -5920,10 +5929,10 @@ fi
 PKG_CONFIG=$ac_cv_path_PKG_CONFIG
 
 if test -n "$PKG_CONFIG"; then
 PKG_CONFIG=$ac_cv_path_PKG_CONFIG
 
 if test -n "$PKG_CONFIG"; then

-  echo "$as_me:5923: result: $PKG_CONFIG" >&5
+  echo "$as_me:5932: result: $PKG_CONFIG" >&5

 echo "${ECHO_T}$PKG_CONFIG" >&6
 else
 echo "${ECHO_T}$PKG_CONFIG" >&6
 else

-  echo "$as_me:5926: result: no" >&5
+  echo "$as_me:5935: result: no" >&5

 echo "${ECHO_T}no" >&6
 fi
 
 echo "${ECHO_T}no" >&6
 fi
 


@@ -5932,7 +5941,7 @@ if test -z "$ac_cv_path_PKG_CONFIG"; then
   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
   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:5935: checking for $ac_word" >&5
+echo "$as_me:5944: 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
 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


@@ -5949,7 +5958,7 @@ for ac_dir in $ac_dummy; do
   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"
   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:5952: found $ac_dir/$ac_word" >&5
+   echo "$as_me:5961: found $ac_dir/$ac_word" >&5

    break
 fi
 done
    break
 fi
 done


@@ -5961,10 +5970,10 @@ fi
 ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG
 
 if test -n "$ac_pt_PKG_CONFIG"; then
 ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG
 
 if test -n "$ac_pt_PKG_CONFIG"; then

-  echo "$as_me:5964: result: $ac_pt_PKG_CONFIG" >&5
+  echo "$as_me:5973: result: $ac_pt_PKG_CONFIG" >&5

 echo "${ECHO_T}$ac_pt_PKG_CONFIG" >&6
 else
 echo "${ECHO_T}$ac_pt_PKG_CONFIG" >&6
 else

-  echo "$as_me:5967: result: no" >&5
+  echo "$as_me:5976: result: no" >&5

 echo "${ECHO_T}no" >&6
 fi
 
 echo "${ECHO_T}no" >&6
 fi
 


@@ -6007,18 +6016,18 @@ case ".$PKG_CONFIG" in
        PKG_CONFIG=`echo "$PKG_CONFIG" | sed -e s%NONE%$cf_path_syntax%`
        ;;
 (*)
        PKG_CONFIG=`echo "$PKG_CONFIG" | sed -e s%NONE%$cf_path_syntax%`
        ;;
 (*)

-       { { echo "$as_me:6010: error: expected a pathname, not \"$PKG_CONFIG\"" >&5
+       { { echo "$as_me:6019: 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: error: expected a pathname, not \"$PKG_CONFIG\"" >&2;}
    { (exit 1); exit 1; }; }
        ;;
 esac
 
 elif test "x$cf_pkg_config" != xno ; then

-       { echo "$as_me:6017: WARNING: pkg-config is not installed" >&5
+       { echo "$as_me:6026: WARNING: pkg-config is not installed" >&5

 echo "$as_me: WARNING: pkg-config is not installed" >&2;}
 fi
 
 echo "$as_me: WARNING: pkg-config is not installed" >&2;}
 fi
 

-echo "$as_me:6021: checking if you want to see long compiling messages" >&5
+echo "$as_me:6030: 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.
 echo $ECHO_N "checking if you want to see long compiling messages... $ECHO_C" >&6
 
 # Check whether --enable-echo or --disable-echo was given.


@@ -6052,10 +6061,10 @@ else
        ECHO_CC=''
 
 fi;
        ECHO_CC=''
 
 fi;

-echo "$as_me:6055: result: $enableval" >&5
+echo "$as_me:6064: result: $enableval" >&5

 echo "${ECHO_T}$enableval" >&6
 
 echo "${ECHO_T}$enableval" >&6
 

-echo "$as_me:6058: checking for ncurses wrap-prefix" >&5
+echo "$as_me:6067: 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.
 echo $ECHO_N "checking for ncurses wrap-prefix... $ECHO_C" >&6
 
 # Check whether --with-ncurses-wrap-prefix or --without-ncurses-wrap-prefix was given.


@@ -6065,10 +6074,10 @@ if test "${with_ncurses_wrap_prefix+set}" = set; then
 else
   NCURSES_WRAP_PREFIX=_nc_
 fi;
 else
   NCURSES_WRAP_PREFIX=_nc_
 fi;

-echo "$as_me:6068: result: $NCURSES_WRAP_PREFIX" >&5
+echo "$as_me:6077: result: $NCURSES_WRAP_PREFIX" >&5

 echo "${ECHO_T}$NCURSES_WRAP_PREFIX" >&6
 
 echo "${ECHO_T}$NCURSES_WRAP_PREFIX" >&6
 

-echo "$as_me:6071: checking if you want to check for wide-character functions" >&5
+echo "$as_me:6080: 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.
 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.


@@ -6085,10 +6094,10 @@ else
        cf_enable_widec=yes
 
 fi;
        cf_enable_widec=yes
 
 fi;

-echo "$as_me:6088: result: $cf_enable_widec" >&5
+echo "$as_me:6097: result: $cf_enable_widec" >&5

 echo "${ECHO_T}$cf_enable_widec" >&6
 
 echo "${ECHO_T}$cf_enable_widec" >&6
 

-echo "$as_me:6091: checking for specific curses-directory" >&5
+echo "$as_me:6100: 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.
 echo $ECHO_N "checking for specific curses-directory... $ECHO_C" >&6
 
 # Check whether --with-curses-dir or --without-curses-dir was given.


@@ -6098,7 +6107,7 @@ if test "${with_curses_dir+set}" = set; then
 else
   cf_cv_curses_dir=no
 fi;
 else
   cf_cv_curses_dir=no
 fi;

-echo "$as_me:6101: result: $cf_cv_curses_dir" >&5
+echo "$as_me:6110: 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"
 echo "${ECHO_T}$cf_cv_curses_dir" >&6
 
 if test -n "$cf_cv_curses_dir" && test "$cf_cv_curses_dir" != "no"


@@ -6129,7 +6138,7 @@ case ".$withval" in
        withval=`echo "$withval" | sed -e s%NONE%$cf_path_syntax%`
        ;;
 (*)
        withval=`echo "$withval" | sed -e s%NONE%$cf_path_syntax%`
        ;;
 (*)

-       { { echo "$as_me:6132: error: expected a pathname, not \"$withval\"" >&5
+       { { echo "$as_me:6141: error: expected a pathname, not \"$withval\"" >&5

 echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
    { (exit 1); exit 1; }; }
        ;;
 echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
    { (exit 1); exit 1; }; }
        ;;


@@ -6165,7 +6174,7 @@ if test -n "$cf_cv_curses_dir/include" ; then
        CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
 
                          cat >"conftest.$ac_ext" <<_ACEOF
        CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
 
                          cat >"conftest.$ac_ext" <<_ACEOF

-#line 6168 "configure"
+#line 6177 "configure"

 #include "confdefs.h"
 #include <stdio.h>
 int
 #include "confdefs.h"
 #include <stdio.h>
 int


@@ -6177,16 +6186,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
 }
 _ACEOF
 rm -f "conftest.$ac_objext"

-if { (eval echo "$as_me:6180: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:6189: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:6183: \$? = $ac_status" >&5
+  echo "$as_me:6192: \$? = $ac_status" >&5

   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'

-  { (eval echo "$as_me:6186: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6195: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:6189: \$? = $ac_status" >&5
+  echo "$as_me:6198: \$? = $ac_status" >&5

   (exit "$ac_status"); }; }; then
   :
 else
   (exit "$ac_status"); }; }; then
   :
 else


@@ -6203,7 +6212,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
                if test "$cf_have_incdir" = no ; then
                  test -n "$verbose" && echo "  adding $cf_add_incdir to include-path" 1>&6
 
                if test "$cf_have_incdir" = no ; then
                  test -n "$verbose" && echo "  adding $cf_add_incdir to include-path" 1>&6
 

-echo "${as_me:-configure}:6206: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:6215: testing adding $cf_add_incdir to include-path ..." 1>&5

 
                  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
 
                  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 


@@ -6239,7 +6248,7 @@ if test -n "$cf_cv_curses_dir/lib" ; then
                        if test "$cf_have_libdir" = no ; then
                                test -n "$verbose" && echo "    adding $cf_add_libdir to library-path" 1>&6
 
                        if test "$cf_have_libdir" = no ; then
                                test -n "$verbose" && echo "    adding $cf_add_libdir to library-path" 1>&6
 

-echo "${as_me:-configure}:6242: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:6251: testing adding $cf_add_libdir to library-path ..." 1>&5

 
                                LDFLAGS="-L$cf_add_libdir $LDFLAGS"
                        fi
 
                                LDFLAGS="-L$cf_add_libdir $LDFLAGS"
                        fi


@@ -6252,7 +6261,7 @@ fi
 
 cf_cv_screen=curses
 
 
 cf_cv_screen=curses
 

-echo "$as_me:6255: checking for specified curses library type" >&5
+echo "$as_me:6264: 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.
 echo $ECHO_N "checking for specified curses library type... $ECHO_C" >&6
 
 # Check whether --with-screen or --without-screen was given.


@@ -6296,13 +6305,13 @@ fi;
 fi;
 fi;
 
 fi;
 fi;
 

-echo "$as_me:6299: result: $cf_cv_screen" >&5
+echo "$as_me:6308: result: $cf_cv_screen" >&5

 echo "${ECHO_T}$cf_cv_screen" >&6
 
 case $cf_cv_screen in
 (curses|curses_*)
 
 echo "${ECHO_T}$cf_cv_screen" >&6
 
 case $cf_cv_screen in
 (curses|curses_*)
 

-echo "$as_me:6305: checking for extra include directories" >&5
+echo "$as_me:6314: 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
 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


@@ -6328,7 +6337,7 @@ case "$host_os" in
 esac
 
 fi
 esac
 
 fi

-echo "$as_me:6331: result: $cf_cv_curses_incdir" >&5
+echo "$as_me:6340: result: $cf_cv_curses_incdir" >&5

 echo "${ECHO_T}$cf_cv_curses_incdir" >&6
 if test "$cf_cv_curses_incdir" != no
 then
 echo "${ECHO_T}$cf_cv_curses_incdir" >&6
 if test "$cf_cv_curses_incdir" != no
 then


@@ -6338,7 +6347,7 @@ then
 
 fi
 
 
 fi
 

-echo "$as_me:6341: checking if we have identified curses headers" >&5
+echo "$as_me:6350: 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
 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


@@ -6350,7 +6359,7 @@ for cf_header in \
        curses.h  ncurses/ncurses.h ncurses/curses.h
 do
 cat >"conftest.$ac_ext" <<_ACEOF
        curses.h  ncurses/ncurses.h ncurses/curses.h
 do
 cat >"conftest.$ac_ext" <<_ACEOF

-#line 6353 "configure"
+#line 6362 "configure"

 #include "confdefs.h"
 #include <${cf_header}>
 int
 #include "confdefs.h"
 #include <${cf_header}>
 int


@@ -6362,16 +6371,16 @@ initscr(); tgoto("?", 0,0)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
 }
 _ACEOF
 rm -f "conftest.$ac_objext"

-if { (eval echo "$as_me:6365: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:6374: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:6368: \$? = $ac_status" >&5
+  echo "$as_me:6377: \$? = $ac_status" >&5

   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'

-  { (eval echo "$as_me:6371: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6380: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:6374: \$? = $ac_status" >&5
+  echo "$as_me:6383: \$? = $ac_status" >&5

   (exit "$ac_status"); }; }; then
   cf_cv_ncurses_header=$cf_header; break
 else
   (exit "$ac_status"); }; }; then
   cf_cv_ncurses_header=$cf_header; break
 else


@@ -6382,11 +6391,11 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 done
 
 fi
 done
 
 fi

-echo "$as_me:6385: result: $cf_cv_ncurses_header" >&5
+echo "$as_me:6394: result: $cf_cv_ncurses_header" >&5

 echo "${ECHO_T}$cf_cv_ncurses_header" >&6
 
 if test "$cf_cv_ncurses_header" = none ; then
 echo "${ECHO_T}$cf_cv_ncurses_header" >&6
 
 if test "$cf_cv_ncurses_header" = none ; then

-       { { echo "$as_me:6389: error: No curses header-files found" >&5
+       { { echo "$as_me:6398: error: No curses header-files found" >&5

 echo "$as_me: error: No curses header-files found" >&2;}
    { (exit 1); exit 1; }; }
 fi
 echo "$as_me: error: No curses header-files found" >&2;}
    { (exit 1); exit 1; }; }
 fi


@@ -6396,23 +6405,23 @@ fi
 for ac_header in $cf_cv_ncurses_header
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
 for ac_header in $cf_cv_ncurses_header
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`

-echo "$as_me:6399: checking for $ac_header" >&5
+echo "$as_me:6408: 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
 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 6405 "configure"
+#line 6414 "configure"

 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF

-if { (eval echo "$as_me:6409: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:6418: \"$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
   (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:6415: \$? = $ac_status" >&5
+  echo "$as_me:6424: \$? = $ac_status" >&5

   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag


@@ -6431,7 +6440,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi

-echo "$as_me:6434: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:6443: 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
 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6
 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then
   cat >>confdefs.h <<EOF


@@ -6441,7 +6450,7 @@ EOF
 fi
 done
 
 fi
 done
 

-echo "$as_me:6444: checking for terminfo header" >&5
+echo "$as_me:6453: 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
 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


@@ -6459,7 +6468,7 @@ esac
 for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h"
 do
 cat >"conftest.$ac_ext" <<_ACEOF
 for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h"
 do
 cat >"conftest.$ac_ext" <<_ACEOF

-#line 6462 "configure"
+#line 6471 "configure"

 #include "confdefs.h"
 #include <stdio.h>
 #include <${cf_cv_ncurses_header:-curses.h}>
 #include "confdefs.h"
 #include <stdio.h>
 #include <${cf_cv_ncurses_header:-curses.h}>


@@ -6474,16 +6483,16 @@ int x = auto_left_margin; (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
 }
 _ACEOF
 rm -f "conftest.$ac_objext"

-if { (eval echo "$as_me:6477: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:6486: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:6480: \$? = $ac_status" >&5
+  echo "$as_me:6489: \$? = $ac_status" >&5

   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'

-  { (eval echo "$as_me:6483: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6492: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:6486: \$? = $ac_status" >&5
+  echo "$as_me:6495: \$? = $ac_status" >&5

   (exit "$ac_status"); }; }; then
 
        cf_cv_term_header="$cf_test"
   (exit "$ac_status"); }; }; then
 
        cf_cv_term_header="$cf_test"


@@ -6499,7 +6508,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 done
 
 fi
 done
 
 fi

-echo "$as_me:6502: result: $cf_cv_term_header" >&5
+echo "$as_me:6511: result: $cf_cv_term_header" >&5

 echo "${ECHO_T}$cf_cv_term_header" >&6
 
 # Set definitions to allow ifdef'ing to accommodate subdirectories
 echo "${ECHO_T}$cf_cv_term_header" >&6
 
 # Set definitions to allow ifdef'ing to accommodate subdirectories


@@ -6531,7 +6540,7 @@ EOF
        ;;
 esac
 
        ;;
 esac
 

-echo "$as_me:6534: checking for ncurses version" >&5
+echo "$as_me:6543: 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
 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


@@ -6557,10 +6566,10 @@ Autoconf "old"
 #endif
 EOF
        cf_try="$ac_cpp conftest.$ac_ext 2>&5 | grep '^Autoconf ' >conftest.out"
 #endif
 EOF
        cf_try="$ac_cpp conftest.$ac_ext 2>&5 | grep '^Autoconf ' >conftest.out"

-       { (eval echo "$as_me:6560: \"$cf_try\"") >&5
+       { (eval echo "$as_me:6569: \"$cf_try\"") >&5

   (eval $cf_try) 2>&5
   ac_status=$?
   (eval $cf_try) 2>&5
   ac_status=$?

-  echo "$as_me:6563: \$? = $ac_status" >&5
+  echo "$as_me:6572: \$? = $ac_status" >&5

   (exit "$ac_status"); }
        if test -f conftest.out ; then
                cf_out=`sed -e 's%^Autoconf %%' -e 's%^[^"]*"%%' -e 's%".*%%' conftest.out`
   (exit "$ac_status"); }
        if test -f conftest.out ; then
                cf_out=`sed -e 's%^Autoconf %%' -e 's%^[^"]*"%%' -e 's%".*%%' conftest.out`


@@ -6570,7 +6579,7 @@ EOF
 
 else
   cat >"conftest.$ac_ext" <<_ACEOF
 
 else
   cat >"conftest.$ac_ext" <<_ACEOF

-#line 6573 "configure"
+#line 6582 "configure"

 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header:-curses.h}>
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header:-curses.h}>


@@ -6595,15 +6604,15 @@ int main(void)
 }
 _ACEOF
 rm -f "conftest$ac_exeext"
 }
 _ACEOF
 rm -f "conftest$ac_exeext"

-if { (eval echo "$as_me:6598: \"$ac_link\"") >&5
+if { (eval echo "$as_me:6607: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:6601: \$? = $ac_status" >&5
+  echo "$as_me:6610: \$? = $ac_status" >&5

   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'

-  { (eval echo "$as_me:6603: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6612: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:6606: \$? = $ac_status" >&5
+  echo "$as_me:6615: \$? = $ac_status" >&5

   (exit "$ac_status"); }; }; then
 
        cf_cv_ncurses_version=`cat $cf_tempfile`
   (exit "$ac_status"); }; }; then
 
        cf_cv_ncurses_version=`cat $cf_tempfile`


@@ -6617,17 +6626,17 @@ fi
        rm -f "$cf_tempfile"
 
 fi
        rm -f "$cf_tempfile"
 
 fi

-echo "$as_me:6620: result: $cf_cv_ncurses_version" >&5
+echo "$as_me:6629: 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 "${ECHO_T}$cf_cv_ncurses_version" >&6
 test "$cf_cv_ncurses_version" = no ||
 cat >>confdefs.h <<\EOF
 #define NCURSES 1
 EOF
 

-echo "$as_me:6627: checking if we have identified curses libraries" >&5
+echo "$as_me:6636: 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
 echo $ECHO_N "checking if we have identified curses libraries... $ECHO_C" >&6
 cat >"conftest.$ac_ext" <<_ACEOF

-#line 6630 "configure"
+#line 6639 "configure"

 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int


@@ -6639,16 +6648,16 @@ initscr(); tgoto("?", 0,0)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"

-if { (eval echo "$as_me:6642: \"$ac_link\"") >&5
+if { (eval echo "$as_me:6651: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:6645: \$? = $ac_status" >&5
+  echo "$as_me:6654: \$? = $ac_status" >&5

   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'

-  { (eval echo "$as_me:6648: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6657: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:6651: \$? = $ac_status" >&5
+  echo "$as_me:6660: \$? = $ac_status" >&5

   (exit "$ac_status"); }; }; then
   cf_result=yes
 else
   (exit "$ac_status"); }; }; then
   cf_result=yes
 else


@@ -6657,13 +6666,13 @@ cat "conftest.$ac_ext" >&5
 cf_result=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 cf_result=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"

-echo "$as_me:6660: result: $cf_result" >&5
+echo "$as_me:6669: result: $cf_result" >&5

 echo "${ECHO_T}$cf_result" >&6
 
 if test "$cf_result" = no ; then
 case "$host_os" in
 (freebsd*)
 echo "${ECHO_T}$cf_result" >&6
 
 if test "$cf_result" = no ; then
 case "$host_os" in
 (freebsd*)

-       echo "$as_me:6666: checking for tgoto in -lmytinfo" >&5
+       echo "$as_me:6675: 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
 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


@@ -6671,7 +6680,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lmytinfo  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lmytinfo  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF

-#line 6674 "configure"
+#line 6683 "configure"

 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */


@@ -6690,16 +6699,16 @@ tgoto ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"

-if { (eval echo "$as_me:6693: \"$ac_link\"") >&5
+if { (eval echo "$as_me:6702: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:6696: \$? = $ac_status" >&5
+  echo "$as_me:6705: \$? = $ac_status" >&5

   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'

-  { (eval echo "$as_me:6699: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6708: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:6702: \$? = $ac_status" >&5
+  echo "$as_me:6711: \$? = $ac_status" >&5

   (exit "$ac_status"); }; }; then
   ac_cv_lib_mytinfo_tgoto=yes
 else
   (exit "$ac_status"); }; }; then
   ac_cv_lib_mytinfo_tgoto=yes
 else


@@ -6710,7 +6719,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi

-echo "$as_me:6713: result: $ac_cv_lib_mytinfo_tgoto" >&5
+echo "$as_me:6722: 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
 
 echo "${ECHO_T}$ac_cv_lib_mytinfo_tgoto" >&6
 if test "$ac_cv_lib_mytinfo_tgoto" = yes; then
 


@@ -6740,7 +6749,7 @@ fi
        # term.h) for cur_colr
        if test "x$cf_cv_screen" = "xcurses_colr"
        then
        # term.h) for cur_colr
        if test "x$cf_cv_screen" = "xcurses_colr"
        then

-               echo "$as_me:6743: checking for initscr in -lcur_colr" >&5
+               echo "$as_me:6752: 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
 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


@@ -6748,7 +6757,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lcur_colr  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lcur_colr  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF

-#line 6751 "configure"
+#line 6760 "configure"

 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */


@@ -6767,16 +6776,16 @@ initscr ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"

-if { (eval echo "$as_me:6770: \"$ac_link\"") >&5
+if { (eval echo "$as_me:6779: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:6773: \$? = $ac_status" >&5
+  echo "$as_me:6782: \$? = $ac_status" >&5

   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'

-  { (eval echo "$as_me:6776: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6785: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:6779: \$? = $ac_status" >&5
+  echo "$as_me:6788: \$? = $ac_status" >&5

   (exit "$ac_status"); }; }; then
   ac_cv_lib_cur_colr_initscr=yes
 else
   (exit "$ac_status"); }; }; then
   ac_cv_lib_cur_colr_initscr=yes
 else


@@ -6787,7 +6796,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi

-echo "$as_me:6790: result: $ac_cv_lib_cur_colr_initscr" >&5
+echo "$as_me:6799: 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
 
 echo "${ECHO_T}$ac_cv_lib_cur_colr_initscr" >&6
 if test "$ac_cv_lib_cur_colr_initscr" = yes; then
 


@@ -6811,7 +6820,7 @@ LIBS="$cf_add_libs"
 
 else
 
 
 else
 

-               echo "$as_me:6814: checking for initscr in -lHcurses" >&5
+               echo "$as_me:6823: 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
 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


@@ -6819,7 +6828,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lHcurses  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lHcurses  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF

-#line 6822 "configure"
+#line 6831 "configure"

 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */


@@ -6838,16 +6847,16 @@ initscr ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"

-if { (eval echo "$as_me:6841: \"$ac_link\"") >&5
+if { (eval echo "$as_me:6850: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:6844: \$? = $ac_status" >&5
+  echo "$as_me:6853: \$? = $ac_status" >&5

   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'

-  { (eval echo "$as_me:6847: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6856: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:6850: \$? = $ac_status" >&5
+  echo "$as_me:6859: \$? = $ac_status" >&5

   (exit "$ac_status"); }; }; then
   ac_cv_lib_Hcurses_initscr=yes
 else
   (exit "$ac_status"); }; }; then
   ac_cv_lib_Hcurses_initscr=yes
 else


@@ -6858,7 +6867,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi

-echo "$as_me:6861: result: $ac_cv_lib_Hcurses_initscr" >&5
+echo "$as_me:6870: 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
 
 echo "${ECHO_T}$ac_cv_lib_Hcurses_initscr" >&6
 if test "$ac_cv_lib_Hcurses_initscr" = yes; then
 


@@ -6916,7 +6925,7 @@ if test -n "/lib64" ; then
                        if test "$cf_have_libdir" = no ; then
                                test -n "$verbose" && echo "    adding $cf_add_libdir to library-path" 1>&6
 
                        if test "$cf_have_libdir" = no ; then
                                test -n "$verbose" && echo "    adding $cf_add_libdir to library-path" 1>&6
 

-echo "${as_me:-configure}:6919: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:6928: testing adding $cf_add_libdir to library-path ..." 1>&5

 
                                LDFLAGS="-L$cf_add_libdir $LDFLAGS"
                        fi
 
                                LDFLAGS="-L$cf_add_libdir $LDFLAGS"
                        fi


@@ -6945,7 +6954,7 @@ if test -n "/lib" ; then
                        if test "$cf_have_libdir" = no ; then
                                test -n "$verbose" && echo "    adding $cf_add_libdir to library-path" 1>&6
 
                        if test "$cf_have_libdir" = no ; then
                                test -n "$verbose" && echo "    adding $cf_add_libdir to library-path" 1>&6
 

-echo "${as_me:-configure}:6948: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:6957: testing adding $cf_add_libdir to library-path ..." 1>&5

 
                                LDFLAGS="-L$cf_add_libdir $LDFLAGS"
                        fi
 
                                LDFLAGS="-L$cf_add_libdir $LDFLAGS"
                        fi


@@ -6976,7 +6985,7 @@ if test -n "/lib" ; then
                        if test "$cf_have_libdir" = no ; then
                                test -n "$verbose" && echo "    adding $cf_add_libdir to library-path" 1>&6
 
                        if test "$cf_have_libdir" = no ; then
                                test -n "$verbose" && echo "    adding $cf_add_libdir to library-path" 1>&6
 

-echo "${as_me:-configure}:6979: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:6988: testing adding $cf_add_libdir to library-path ..." 1>&5

 
                                LDFLAGS="-L$cf_add_libdir $LDFLAGS"
                        fi
 
                                LDFLAGS="-L$cf_add_libdir $LDFLAGS"
                        fi


@@ -7011,7 +7020,7 @@ if test -n "/usr/5lib" ; then
                        if test "$cf_have_libdir" = no ; then
                                test -n "$verbose" && echo "    adding $cf_add_libdir to library-path" 1>&6
 
                        if test "$cf_have_libdir" = no ; then
                                test -n "$verbose" && echo "    adding $cf_add_libdir to library-path" 1>&6
 

-echo "${as_me:-configure}:7014: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:7023: testing adding $cf_add_libdir to library-path ..." 1>&5

 
                                LDFLAGS="-L$cf_add_libdir $LDFLAGS"
                        fi
 
                                LDFLAGS="-L$cf_add_libdir $LDFLAGS"
                        fi


@@ -7055,13 +7064,13 @@ if test ".$ac_cv_func_initscr" != .yes ; then
        # because it may be needed to link the test-case for initscr.
        if test "x$cf_term_lib" = x
        then
        # because it may be needed to link the test-case for initscr.
        if test "x$cf_term_lib" = x
        then

-               echo "$as_me:7058: checking for tgoto" >&5
+               echo "$as_me:7067: 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
 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 7064 "configure"
+#line 7073 "configure"

 #include "confdefs.h"
 #define tgoto autoconf_temporary
 #include <limits.h>    /* least-intrusive standard header which defines gcc2 __stub macros */
 #include "confdefs.h"
 #define tgoto autoconf_temporary
 #include <limits.h>    /* least-intrusive standard header which defines gcc2 __stub macros */


@@ -7092,16 +7101,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"

-if { (eval echo "$as_me:7095: \"$ac_link\"") >&5
+if { (eval echo "$as_me:7104: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:7098: \$? = $ac_status" >&5
+  echo "$as_me:7107: \$? = $ac_status" >&5

   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'

-  { (eval echo "$as_me:7101: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7110: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:7104: \$? = $ac_status" >&5
+  echo "$as_me:7113: \$? = $ac_status" >&5

   (exit "$ac_status"); }; }; then
   ac_cv_func_tgoto=yes
 else
   (exit "$ac_status"); }; }; then
   ac_cv_func_tgoto=yes
 else


@@ -7111,7 +7120,7 @@ ac_cv_func_tgoto=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi

-echo "$as_me:7114: result: $ac_cv_func_tgoto" >&5
+echo "$as_me:7123: 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
 echo "${ECHO_T}$ac_cv_func_tgoto" >&6
 if test "$ac_cv_func_tgoto" = yes; then
   cf_term_lib=predefined


@@ -7120,7 +7129,7 @@ else
                        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`
                        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:7123: checking for tgoto in -l$cf_term_lib" >&5
+echo "$as_me:7132: 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
 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


@@ -7128,7 +7137,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-l$cf_term_lib  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-l$cf_term_lib  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF

-#line 7131 "configure"
+#line 7140 "configure"

 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */


@@ -7147,16 +7156,16 @@ tgoto ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"

-if { (eval echo "$as_me:7150: \"$ac_link\"") >&5
+if { (eval echo "$as_me:7159: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:7153: \$? = $ac_status" >&5
+  echo "$as_me:7162: \$? = $ac_status" >&5

   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'

-  { (eval echo "$as_me:7156: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7165: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:7159: \$? = $ac_status" >&5
+  echo "$as_me:7168: \$? = $ac_status" >&5

   (exit "$ac_status"); }; }; then
   eval "$as_ac_Lib=yes"
 else
   (exit "$ac_status"); }; }; then
   eval "$as_ac_Lib=yes"
 else


@@ -7167,7 +7176,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi

-echo "$as_me:7170: result: `eval echo '${'"$as_ac_Lib"'}'`" >&5
+echo "$as_me:7179: result: `eval echo '${'"$as_ac_Lib"'}'`" >&5

 echo "${ECHO_T}`eval echo '${'"$as_ac_Lib"'}'`" >&6
 if test "`eval echo '${'"$as_ac_Lib"'}'`" = yes; then
 
 echo "${ECHO_T}`eval echo '${'"$as_ac_Lib"'}'`" >&6
 if test "`eval echo '${'"$as_ac_Lib"'}'`" = yes; then
 


@@ -7190,10 +7199,10 @@ fi
                do
                        LIBS="-l$cf_curs_lib $cf_save_LIBS"
                        if test "$cf_term_lib" = unknown || test "$cf_term_lib" = "$cf_curs_lib" ; then
                do
                        LIBS="-l$cf_curs_lib $cf_save_LIBS"
                        if test "$cf_term_lib" = unknown || test "$cf_term_lib" = "$cf_curs_lib" ; then

-                               echo "$as_me:7193: checking if we can link with $cf_curs_lib library" >&5
+                               echo "$as_me:7202: 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
 echo $ECHO_N "checking if we can link with $cf_curs_lib library... $ECHO_C" >&6
                                cat >"conftest.$ac_ext" <<_ACEOF

-#line 7196 "configure"
+#line 7205 "configure"

 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int


@@ -7205,16 +7214,16 @@ initscr()
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"

-if { (eval echo "$as_me:7208: \"$ac_link\"") >&5
+if { (eval echo "$as_me:7217: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:7211: \$? = $ac_status" >&5
+  echo "$as_me:7220: \$? = $ac_status" >&5

   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'

-  { (eval echo "$as_me:7214: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7223: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:7217: \$? = $ac_status" >&5
+  echo "$as_me:7226: \$? = $ac_status" >&5

   (exit "$ac_status"); }; }; then
   cf_result=yes
 else
   (exit "$ac_status"); }; }; then
   cf_result=yes
 else


@@ -7223,16 +7232,16 @@ cat "conftest.$ac_ext" >&5
 cf_result=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 cf_result=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"

-                               echo "$as_me:7226: result: $cf_result" >&5
+                               echo "$as_me:7235: result: $cf_result" >&5

 echo "${ECHO_T}$cf_result" >&6
                                test "$cf_result" = yes && break
                        elif test "$cf_curs_lib" = "$cf_term_lib" ; then
                                cf_result=no
                        elif test "$cf_term_lib" != predefined ; then
 echo "${ECHO_T}$cf_result" >&6
                                test "$cf_result" = yes && break
                        elif test "$cf_curs_lib" = "$cf_term_lib" ; then
                                cf_result=no
                        elif test "$cf_term_lib" != predefined ; then

-                               echo "$as_me:7232: checking if we need both $cf_curs_lib and $cf_term_lib libraries" >&5
+                               echo "$as_me:7241: 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
 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 7235 "configure"
+#line 7244 "configure"

 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int


@@ -7244,16 +7253,16 @@ initscr(); tgoto((char *)0, 0, 0);
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"

-if { (eval echo "$as_me:7247: \"$ac_link\"") >&5
+if { (eval echo "$as_me:7256: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:7250: \$? = $ac_status" >&5
+  echo "$as_me:7259: \$? = $ac_status" >&5

   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'

-  { (eval echo "$as_me:7253: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7262: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:7256: \$? = $ac_status" >&5
+  echo "$as_me:7265: \$? = $ac_status" >&5

   (exit "$ac_status"); }; }; then
   cf_result=no
 else
   (exit "$ac_status"); }; }; then
   cf_result=no
 else


@@ -7262,7 +7271,7 @@ cat "conftest.$ac_ext" >&5
 
                                        LIBS="-l$cf_curs_lib -l$cf_term_lib $cf_save_LIBS"
                                        cat >"conftest.$ac_ext" <<_ACEOF
 
                                        LIBS="-l$cf_curs_lib -l$cf_term_lib $cf_save_LIBS"
                                        cat >"conftest.$ac_ext" <<_ACEOF

-#line 7265 "configure"
+#line 7274 "configure"

 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int


@@ -7274,16 +7283,16 @@ initscr()
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"

-if { (eval echo "$as_me:7277: \"$ac_link\"") >&5
+if { (eval echo "$as_me:7286: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:7280: \$? = $ac_status" >&5
+  echo "$as_me:7289: \$? = $ac_status" >&5

   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'

-  { (eval echo "$as_me:7283: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7292: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:7286: \$? = $ac_status" >&5
+  echo "$as_me:7295: \$? = $ac_status" >&5

   (exit "$ac_status"); }; }; then
   cf_result=yes
 else
   (exit "$ac_status"); }; }; then
   cf_result=yes
 else


@@ -7295,13 +7304,13 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"

-                               echo "$as_me:7298: result: $cf_result" >&5
+                               echo "$as_me:7307: result: $cf_result" >&5

 echo "${ECHO_T}$cf_result" >&6
                                test "$cf_result" != error && break
                        fi
                done
        fi
 echo "${ECHO_T}$cf_result" >&6
                                test "$cf_result" != error && break
                        fi
                done
        fi

-       test "$cf_curs_lib" = unknown && { { echo "$as_me:7304: error: no curses library found" >&5
+       test "$cf_curs_lib" = unknown && { { echo "$as_me:7313: error: no curses library found" >&5

 echo "$as_me: error: no curses library found" >&2;}
    { (exit 1); exit 1; }; }
 fi
 echo "$as_me: error: no curses library found" >&2;}
    { (exit 1); exit 1; }; }
 fi


@@ -7310,7 +7319,55 @@ fi
        ;;
 (ncursesw*)
 
        ;;
 (ncursesw*)
 

-echo "$as_me:7313: checking for multibyte character support" >&5
+for ac_header in wchar.h
+do
+as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+echo "$as_me:7325: 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 7331 "configure"
+#include "confdefs.h"
+#include <$ac_header>
+_ACEOF
+if { (eval echo "$as_me:7335: \"$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:7341: \$? = $ac_status" >&5
+  (exit "$ac_status"); } >/dev/null; then
+  if test -s conftest.err; then
+    ac_cpp_err=$ac_c_preproc_warn_flag
+  else
+    ac_cpp_err=
+  fi
+else
+  ac_cpp_err=yes
+fi
+if test -z "$ac_cpp_err"; then
+  eval "$as_ac_Header=yes"
+else
+  echo "$as_me: failed program was:" >&5
+  cat "conftest.$ac_ext" >&5
+  eval "$as_ac_Header=no"
+fi
+rm -f conftest.err "conftest.$ac_ext"
+fi
+echo "$as_me:7360: 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
+#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+EOF
+
+fi
+done
+
+echo "$as_me:7370: 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
 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


@@ -7318,10 +7375,15 @@ else
 
        cf_save_LIBS="$LIBS"
        cat >"conftest.$ac_ext" <<_ACEOF
 
        cf_save_LIBS="$LIBS"
        cat >"conftest.$ac_ext" <<_ACEOF

-#line 7321 "configure"
+#line 7378 "configure"

 #include "confdefs.h"
 
 #include <stdlib.h>
 #include "confdefs.h"
 
 #include <stdlib.h>

+#include <stdio.h>
+#ifdef HAVE_WCHAR_H
+#include <wchar.h>
+#endif
+

 int
 main (void)
 {
 int
 main (void)
 {


@@ -7331,16 +7393,16 @@ putwc(0,0);
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"

-if { (eval echo "$as_me:7334: \"$ac_link\"") >&5
+if { (eval echo "$as_me:7396: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:7337: \$? = $ac_status" >&5
+  echo "$as_me:7399: \$? = $ac_status" >&5

   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'

-  { (eval echo "$as_me:7340: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7402: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:7343: \$? = $ac_status" >&5
+  echo "$as_me:7405: \$? = $ac_status" >&5

   (exit "$ac_status"); }; }; then
   cf_cv_utf8_lib=yes
 else
   (exit "$ac_status"); }; }; then
   cf_cv_utf8_lib=yes
 else


@@ -7352,12 +7414,12 @@ cat "conftest.$ac_ext" >&5
 cf_cv_header_path_utf8=
 cf_cv_library_path_utf8=
 
 cf_cv_header_path_utf8=
 cf_cv_library_path_utf8=
 

-echo "${as_me:-configure}:7355: testing Starting FIND_LINKAGE(utf8,) ..." 1>&5
+echo "${as_me:-configure}:7417: testing Starting FIND_LINKAGE(utf8,) ..." 1>&5

 
 cf_save_LIBS="$LIBS"
 
 cat >"conftest.$ac_ext" <<_ACEOF
 
 cf_save_LIBS="$LIBS"
 
 cat >"conftest.$ac_ext" <<_ACEOF

-#line 7360 "configure"
+#line 7422 "configure"

 #include "confdefs.h"
 
 #include <libutf8.h>
 #include "confdefs.h"
 
 #include <libutf8.h>


@@ -7370,16 +7432,16 @@ putwc(0,0);
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"

-if { (eval echo "$as_me:7373: \"$ac_link\"") >&5
+if { (eval echo "$as_me:7435: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:7376: \$? = $ac_status" >&5
+  echo "$as_me:7438: \$? = $ac_status" >&5

   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'

-  { (eval echo "$as_me:7379: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7441: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:7382: \$? = $ac_status" >&5
+  echo "$as_me:7444: \$? = $ac_status" >&5

   (exit "$ac_status"); }; }; then
 
        cf_cv_find_linkage_utf8=yes
   (exit "$ac_status"); }; }; then
 
        cf_cv_find_linkage_utf8=yes


@@ -7393,7 +7455,7 @@ cat "conftest.$ac_ext" >&5
 LIBS="-lutf8  $cf_save_LIBS"
 
 cat >"conftest.$ac_ext" <<_ACEOF
 LIBS="-lutf8  $cf_save_LIBS"
 
 cat >"conftest.$ac_ext" <<_ACEOF

-#line 7396 "configure"
+#line 7458 "configure"

 #include "confdefs.h"
 
 #include <libutf8.h>
 #include "confdefs.h"
 
 #include <libutf8.h>


@@ -7406,16 +7468,16 @@ putwc(0,0);
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"

-if { (eval echo "$as_me:7409: \"$ac_link\"") >&5
+if { (eval echo "$as_me:7471: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:7412: \$? = $ac_status" >&5
+  echo "$as_me:7474: \$? = $ac_status" >&5

   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'

-  { (eval echo "$as_me:7415: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7477: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:7418: \$? = $ac_status" >&5
+  echo "$as_me:7480: \$? = $ac_status" >&5

   (exit "$ac_status"); }; }; then
 
        cf_cv_find_linkage_utf8=yes
   (exit "$ac_status"); }; }; then
 
        cf_cv_find_linkage_utf8=yes


@@ -7432,9 +7494,9 @@ cat "conftest.$ac_ext" >&5
 
        test -n "$verbose" && echo "    find linkage for utf8 library" 1>&6
 
 
        test -n "$verbose" && echo "    find linkage for utf8 library" 1>&6
 

-echo "${as_me:-configure}:7435: testing find linkage for utf8 library ..." 1>&5
+echo "${as_me:-configure}:7497: testing find linkage for utf8 library ..." 1>&5

 
 

-echo "${as_me:-configure}:7437: testing Searching for headers in FIND_LINKAGE(utf8,) ..." 1>&5
+echo "${as_me:-configure}:7499: testing Searching for headers in FIND_LINKAGE(utf8,) ..." 1>&5

 
        cf_save_CPPFLAGS="$CPPFLAGS"
        cf_test_CPPFLAGS="$CPPFLAGS"
 
        cf_save_CPPFLAGS="$CPPFLAGS"
        cf_test_CPPFLAGS="$CPPFLAGS"


@@ -7525,7 +7587,7 @@ cf_search="$cf_search $cf_header_path_list"
                if test -d "$cf_cv_header_path_utf8" ; then
                        test -n "$verbose" && echo "    ... testing $cf_cv_header_path_utf8" 1>&6
 
                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}:7528: testing ... testing $cf_cv_header_path_utf8 ..." 1>&5
+echo "${as_me:-configure}:7590: testing ... testing $cf_cv_header_path_utf8 ..." 1>&5

 
                        CPPFLAGS="$cf_save_CPPFLAGS"
 
 
                        CPPFLAGS="$cf_save_CPPFLAGS"
 


@@ -7533,7 +7595,7 @@ echo "${as_me:-configure}:7528: testing ... testing $cf_cv_header_path_utf8 ..."
        CPPFLAGS="${CPPFLAGS}-I$cf_cv_header_path_utf8"
 
                        cat >"conftest.$ac_ext" <<_ACEOF
        CPPFLAGS="${CPPFLAGS}-I$cf_cv_header_path_utf8"
 
                        cat >"conftest.$ac_ext" <<_ACEOF

-#line 7536 "configure"
+#line 7598 "configure"

 #include "confdefs.h"
 
 #include <libutf8.h>
 #include "confdefs.h"
 
 #include <libutf8.h>


@@ -7546,21 +7608,21 @@ putwc(0,0);
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
 }
 _ACEOF
 rm -f "conftest.$ac_objext"

-if { (eval echo "$as_me:7549: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:7611: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:7552: \$? = $ac_status" >&5
+  echo "$as_me:7614: \$? = $ac_status" >&5

   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'

-  { (eval echo "$as_me:7555: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7617: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:7558: \$? = $ac_status" >&5
+  echo "$as_me:7620: \$? = $ac_status" >&5

   (exit "$ac_status"); }; }; then
 
                                test -n "$verbose" && echo "    ... found utf8 headers in $cf_cv_header_path_utf8" 1>&6
 
   (exit "$ac_status"); }; }; then
 
                                test -n "$verbose" && echo "    ... found utf8 headers in $cf_cv_header_path_utf8" 1>&6
 

-echo "${as_me:-configure}:7563: testing ... found utf8 headers in $cf_cv_header_path_utf8 ..." 1>&5
+echo "${as_me:-configure}:7625: testing ... found utf8 headers in $cf_cv_header_path_utf8 ..." 1>&5

 
                                cf_cv_find_linkage_utf8=maybe
                                cf_test_CPPFLAGS="$CPPFLAGS"
 
                                cf_cv_find_linkage_utf8=maybe
                                cf_test_CPPFLAGS="$CPPFLAGS"


@@ -7578,7 +7640,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
        if test "$cf_cv_find_linkage_utf8" = maybe ; then
 
 
        if test "$cf_cv_find_linkage_utf8" = maybe ; then
 

-echo "${as_me:-configure}:7581: testing Searching for utf8 library in FIND_LINKAGE(utf8,) ..." 1>&5
+echo "${as_me:-configure}:7643: testing Searching for utf8 library in FIND_LINKAGE(utf8,) ..." 1>&5

 
                cf_save_LIBS="$LIBS"
                cf_save_LDFLAGS="$LDFLAGS"
 
                cf_save_LIBS="$LIBS"
                cf_save_LDFLAGS="$LDFLAGS"


@@ -7653,13 +7715,13 @@ cf_search="$cf_library_path_list $cf_search"
                                if test -d "$cf_cv_library_path_utf8" ; then
                                        test -n "$verbose" && echo "    ... testing $cf_cv_library_path_utf8" 1>&6
 
                                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}:7656: testing ... testing $cf_cv_library_path_utf8 ..." 1>&5
+echo "${as_me:-configure}:7718: 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
 
                                        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 7662 "configure"
+#line 7724 "configure"

 #include "confdefs.h"
 
 #include <libutf8.h>
 #include "confdefs.h"
 
 #include <libutf8.h>


@@ -7672,21 +7734,21 @@ putwc(0,0);
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"

-if { (eval echo "$as_me:7675: \"$ac_link\"") >&5
+if { (eval echo "$as_me:7737: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:7678: \$? = $ac_status" >&5
+  echo "$as_me:7740: \$? = $ac_status" >&5

   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'

-  { (eval echo "$as_me:7681: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7743: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:7684: \$? = $ac_status" >&5
+  echo "$as_me:7746: \$? = $ac_status" >&5

   (exit "$ac_status"); }; }; then
 
                                        test -n "$verbose" && echo "    ... found utf8 library in $cf_cv_library_path_utf8" 1>&6
 
   (exit "$ac_status"); }; }; then
 
                                        test -n "$verbose" && echo "    ... found utf8 library in $cf_cv_library_path_utf8" 1>&6
 

-echo "${as_me:-configure}:7689: testing ... found utf8 library in $cf_cv_library_path_utf8 ..." 1>&5
+echo "${as_me:-configure}:7751: testing ... found utf8 library in $cf_cv_library_path_utf8 ..." 1>&5

 
                                        cf_cv_find_linkage_utf8=yes
                                        cf_cv_library_file_utf8="-lutf8"
 
                                        cf_cv_find_linkage_utf8=yes
                                        cf_cv_library_file_utf8="-lutf8"


@@ -7728,7 +7790,7 @@ fi
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi

-echo "$as_me:7731: result: $cf_cv_utf8_lib" >&5
+echo "$as_me:7793: 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
 echo "${ECHO_T}$cf_cv_utf8_lib" >&6
 
 # HAVE_LIBUTF8_H is used by ncurses if curses.h is shared between


@@ -7766,7 +7828,7 @@ if test -n "$cf_cv_header_path_utf8" ; then
        CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
 
                          cat >"conftest.$ac_ext" <<_ACEOF
        CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
 
                          cat >"conftest.$ac_ext" <<_ACEOF

-#line 7769 "configure"
+#line 7831 "configure"

 #include "confdefs.h"
 #include <stdio.h>
 int
 #include "confdefs.h"
 #include <stdio.h>
 int


@@ -7778,16 +7840,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
 }
 _ACEOF
 rm -f "conftest.$ac_objext"

-if { (eval echo "$as_me:7781: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:7843: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:7784: \$? = $ac_status" >&5
+  echo "$as_me:7846: \$? = $ac_status" >&5

   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'

-  { (eval echo "$as_me:7787: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7849: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:7790: \$? = $ac_status" >&5
+  echo "$as_me:7852: \$? = $ac_status" >&5

   (exit "$ac_status"); }; }; then
   :
 else
   (exit "$ac_status"); }; }; then
   :
 else


@@ -7804,7 +7866,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
                if test "$cf_have_incdir" = no ; then
                  test -n "$verbose" && echo "  adding $cf_add_incdir to include-path" 1>&6
 
                if test "$cf_have_incdir" = no ; then
                  test -n "$verbose" && echo "  adding $cf_add_incdir to include-path" 1>&6
 

-echo "${as_me:-configure}:7807: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:7869: testing adding $cf_add_incdir to include-path ..." 1>&5

 
                  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
 
                  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 


@@ -7840,7 +7902,7 @@ if test -n "$cf_cv_library_path_utf8" ; then
                        if test "$cf_have_libdir" = no ; then
                                test -n "$verbose" && echo "    adding $cf_add_libdir to library-path" 1>&6
 
                        if test "$cf_have_libdir" = no ; then
                                test -n "$verbose" && echo "    adding $cf_add_libdir to library-path" 1>&6
 

-echo "${as_me:-configure}:7843: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:7905: testing adding $cf_add_libdir to library-path ..." 1>&5

 
                                LDFLAGS="-L$cf_add_libdir $LDFLAGS"
                        fi
 
                                LDFLAGS="-L$cf_add_libdir $LDFLAGS"
                        fi


@@ -7870,13 +7932,13 @@ cf_ncuconfig_root=$cf_cv_screen
 cf_have_ncuconfig=no
 
 if test "x${PKG_CONFIG:=none}" != xnone; then
 cf_have_ncuconfig=no
 
 if test "x${PKG_CONFIG:=none}" != xnone; then

-       echo "$as_me:7873: checking pkg-config for $cf_ncuconfig_root" >&5
+       echo "$as_me:7935: 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 $ECHO_N "checking pkg-config for $cf_ncuconfig_root... $ECHO_C" >&6
        if "$PKG_CONFIG" --exists $cf_ncuconfig_root ; then

-               echo "$as_me:7876: result: yes" >&5
+               echo "$as_me:7938: result: yes" >&5

 echo "${ECHO_T}yes" >&6
 
 echo "${ECHO_T}yes" >&6
 

-               echo "$as_me:7879: checking if the $cf_ncuconfig_root package files work" >&5
+               echo "$as_me:7941: 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
 
 echo $ECHO_N "checking if the $cf_ncuconfig_root package files work... $ECHO_C" >&6
                cf_have_ncuconfig=unknown
 


@@ -8009,7 +8071,7 @@ done
 LIBS="$cf_add_libs"
 
                        cat >"conftest.$ac_ext" <<_ACEOF
 LIBS="$cf_add_libs"
 
                        cat >"conftest.$ac_ext" <<_ACEOF

-#line 8012 "configure"
+#line 8074 "configure"

 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int


@@ -8021,37 +8083,37 @@ initscr(); mousemask(0,0); tigetstr((char *)0);
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"

-if { (eval echo "$as_me:8024: \"$ac_link\"") >&5
+if { (eval echo "$as_me:8086: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:8027: \$? = $ac_status" >&5
+  echo "$as_me:8089: \$? = $ac_status" >&5

   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'

-  { (eval echo "$as_me:8030: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8092: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:8033: \$? = $ac_status" >&5
+  echo "$as_me:8095: \$? = $ac_status" >&5

   (exit "$ac_status"); }; }; then
   if test "$cross_compiling" = yes; then
   cf_test_ncuconfig=maybe
 else
   cat >"conftest.$ac_ext" <<_ACEOF
   (exit "$ac_status"); }; }; then
   if test "$cross_compiling" = yes; then
   cf_test_ncuconfig=maybe
 else
   cat >"conftest.$ac_ext" <<_ACEOF

-#line 8039 "configure"
+#line 8101 "configure"

 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
                                        int main(void)
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
                                        int main(void)

-                                       { char *xx = curses_version(); return (xx == 0); }
+                                       { const char *xx = curses_version(); return (xx == 0); }

 _ACEOF
 rm -f "conftest$ac_exeext"
 _ACEOF
 rm -f "conftest$ac_exeext"

-if { (eval echo "$as_me:8046: \"$ac_link\"") >&5
+if { (eval echo "$as_me:8108: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:8049: \$? = $ac_status" >&5
+  echo "$as_me:8111: \$? = $ac_status" >&5

   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'

-  { (eval echo "$as_me:8051: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8113: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:8054: \$? = $ac_status" >&5
+  echo "$as_me:8116: \$? = $ac_status" >&5

   (exit "$ac_status"); }; }; then
   cf_test_ncuconfig=yes
 else
   (exit "$ac_status"); }; }; then
   cf_test_ncuconfig=yes
 else


@@ -8197,7 +8259,7 @@ done
 LIBS="$cf_add_libs"
 
                cat >"conftest.$ac_ext" <<_ACEOF
 LIBS="$cf_add_libs"
 
                cat >"conftest.$ac_ext" <<_ACEOF

-#line 8200 "configure"
+#line 8262 "configure"

 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int


@@ -8209,37 +8271,37 @@ initscr(); mousemask(0,0); tigetstr((char *)0);
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"

-if { (eval echo "$as_me:8212: \"$ac_link\"") >&5
+if { (eval echo "$as_me:8274: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:8215: \$? = $ac_status" >&5
+  echo "$as_me:8277: \$? = $ac_status" >&5

   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'

-  { (eval echo "$as_me:8218: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8280: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:8221: \$? = $ac_status" >&5
+  echo "$as_me:8283: \$? = $ac_status" >&5

   (exit "$ac_status"); }; }; then
   if test "$cross_compiling" = yes; then
   cf_have_ncuconfig=maybe
 else
   cat >"conftest.$ac_ext" <<_ACEOF
   (exit "$ac_status"); }; }; then
   if test "$cross_compiling" = yes; then
   cf_have_ncuconfig=maybe
 else
   cat >"conftest.$ac_ext" <<_ACEOF

-#line 8227 "configure"
+#line 8289 "configure"

 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
                                int main(void)
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
                                int main(void)

-                               { char *xx = curses_version(); return (xx == 0); }
+                               { const char *xx = curses_version(); return (xx == 0); }

 _ACEOF
 rm -f "conftest$ac_exeext"
 _ACEOF
 rm -f "conftest$ac_exeext"

-if { (eval echo "$as_me:8234: \"$ac_link\"") >&5
+if { (eval echo "$as_me:8296: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:8237: \$? = $ac_status" >&5
+  echo "$as_me:8299: \$? = $ac_status" >&5

   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'

-  { (eval echo "$as_me:8239: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8301: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:8242: \$? = $ac_status" >&5
+  echo "$as_me:8304: \$? = $ac_status" >&5

   (exit "$ac_status"); }; }; then
   cf_have_ncuconfig=yes
 else
   (exit "$ac_status"); }; }; then
   cf_have_ncuconfig=yes
 else


@@ -8256,7 +8318,7 @@ cat "conftest.$ac_ext" >&5
 cf_have_ncuconfig=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 cf_have_ncuconfig=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"

-               echo "$as_me:8259: result: $cf_have_ncuconfig" >&5
+               echo "$as_me:8321: 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"
 echo "${ECHO_T}$cf_have_ncuconfig" >&6
                test "$cf_have_ncuconfig" = maybe && cf_have_ncuconfig=yes
                if test "$cf_have_ncuconfig" != "yes"


@@ -8272,7 +8334,7 @@ EOF
 
                        NCURSES_CONFIG_PKG=$cf_ncuconfig_root
 
 
                        NCURSES_CONFIG_PKG=$cf_ncuconfig_root
 

-echo "$as_me:8275: checking for terminfo header" >&5
+echo "$as_me:8337: 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
 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


@@ -8290,7 +8352,7 @@ esac
 for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h"
 do
 cat >"conftest.$ac_ext" <<_ACEOF
 for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h"
 do
 cat >"conftest.$ac_ext" <<_ACEOF

-#line 8293 "configure"
+#line 8355 "configure"

 #include "confdefs.h"
 #include <stdio.h>
 #include <${cf_cv_ncurses_header:-curses.h}>
 #include "confdefs.h"
 #include <stdio.h>
 #include <${cf_cv_ncurses_header:-curses.h}>


@@ -8305,16 +8367,16 @@ int x = auto_left_margin; (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
 }
 _ACEOF
 rm -f "conftest.$ac_objext"

-if { (eval echo "$as_me:8308: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:8370: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:8311: \$? = $ac_status" >&5
+  echo "$as_me:8373: \$? = $ac_status" >&5

   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'

-  { (eval echo "$as_me:8314: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8376: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:8317: \$? = $ac_status" >&5
+  echo "$as_me:8379: \$? = $ac_status" >&5

   (exit "$ac_status"); }; }; then
 
        cf_cv_term_header="$cf_test"
   (exit "$ac_status"); }; }; then
 
        cf_cv_term_header="$cf_test"


@@ -8330,7 +8392,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 done
 
 fi
 done
 
 fi

-echo "$as_me:8333: result: $cf_cv_term_header" >&5
+echo "$as_me:8395: result: $cf_cv_term_header" >&5

 echo "${ECHO_T}$cf_cv_term_header" >&6
 
 # Set definitions to allow ifdef'ing to accommodate subdirectories
 echo "${ECHO_T}$cf_cv_term_header" >&6
 
 # Set definitions to allow ifdef'ing to accommodate subdirectories


@@ -8365,7 +8427,7 @@ esac
                fi
 
        else
                fi
 
        else

-               echo "$as_me:8368: result: no" >&5
+               echo "$as_me:8430: result: no" >&5

 echo "${ECHO_T}no" >&6
                NCURSES_CONFIG_PKG=none
        fi
 echo "${ECHO_T}no" >&6
                NCURSES_CONFIG_PKG=none
        fi


@@ -8381,7 +8443,7 @@ if test -n "$ac_tool_prefix"; then
   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
   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:8384: checking for $ac_word" >&5
+echo "$as_me:8446: 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
 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


@@ -8396,7 +8458,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_NCURSES_CONFIG="$ac_tool_prefix$ac_prog"
   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:8399: found $ac_dir/$ac_word" >&5
+echo "$as_me:8461: found $ac_dir/$ac_word" >&5

 break
 done
 
 break
 done
 


@@ -8404,10 +8466,10 @@ fi
 fi
 NCURSES_CONFIG=$ac_cv_prog_NCURSES_CONFIG
 if test -n "$NCURSES_CONFIG"; then
 fi
 NCURSES_CONFIG=$ac_cv_prog_NCURSES_CONFIG
 if test -n "$NCURSES_CONFIG"; then

-  echo "$as_me:8407: result: $NCURSES_CONFIG" >&5
+  echo "$as_me:8469: result: $NCURSES_CONFIG" >&5

 echo "${ECHO_T}$NCURSES_CONFIG" >&6
 else
 echo "${ECHO_T}$NCURSES_CONFIG" >&6
 else

-  echo "$as_me:8410: result: no" >&5
+  echo "$as_me:8472: result: no" >&5

 echo "${ECHO_T}no" >&6
 fi
 
 echo "${ECHO_T}no" >&6
 fi
 


@@ -8420,7 +8482,7 @@ if test -z "$NCURSES_CONFIG"; then
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
 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:8423: checking for $ac_word" >&5
+echo "$as_me:8485: 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
 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


@@ -8435,7 +8497,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_ac_ct_NCURSES_CONFIG="$ac_prog"
   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:8438: found $ac_dir/$ac_word" >&5
+echo "$as_me:8500: found $ac_dir/$ac_word" >&5

 break
 done
 
 break
 done
 


@@ -8443,10 +8505,10 @@ fi
 fi
 ac_ct_NCURSES_CONFIG=$ac_cv_prog_ac_ct_NCURSES_CONFIG
 if test -n "$ac_ct_NCURSES_CONFIG"; then
 fi
 ac_ct_NCURSES_CONFIG=$ac_cv_prog_ac_ct_NCURSES_CONFIG
 if test -n "$ac_ct_NCURSES_CONFIG"; then

-  echo "$as_me:8446: result: $ac_ct_NCURSES_CONFIG" >&5
+  echo "$as_me:8508: result: $ac_ct_NCURSES_CONFIG" >&5

 echo "${ECHO_T}$ac_ct_NCURSES_CONFIG" >&6
 else
 echo "${ECHO_T}$ac_ct_NCURSES_CONFIG" >&6
 else

-  echo "$as_me:8449: result: no" >&5
+  echo "$as_me:8511: result: no" >&5

 echo "${ECHO_T}no" >&6
 fi
 
 echo "${ECHO_T}no" >&6
 fi
 


@@ -8575,7 +8637,7 @@ LIBS="$cf_add_libs"
 
                # even with config script, some packages use no-override for curses.h
 
 
                # even with config script, some packages use no-override for curses.h
 

-echo "$as_me:8578: checking if we have identified curses headers" >&5
+echo "$as_me:8640: 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
 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


@@ -8587,7 +8649,7 @@ for cf_header in \
        curses.h $cf_cv_screen/curses.h
 do
 cat >"conftest.$ac_ext" <<_ACEOF
        curses.h $cf_cv_screen/curses.h
 do
 cat >"conftest.$ac_ext" <<_ACEOF

-#line 8590 "configure"
+#line 8652 "configure"

 #include "confdefs.h"
 #include <${cf_header}>
 int
 #include "confdefs.h"
 #include <${cf_header}>
 int


@@ -8599,16 +8661,16 @@ initscr(); tgoto("?", 0,0)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
 }
 _ACEOF
 rm -f "conftest.$ac_objext"

-if { (eval echo "$as_me:8602: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:8664: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:8605: \$? = $ac_status" >&5
+  echo "$as_me:8667: \$? = $ac_status" >&5

   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'

-  { (eval echo "$as_me:8608: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8670: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:8611: \$? = $ac_status" >&5
+  echo "$as_me:8673: \$? = $ac_status" >&5

   (exit "$ac_status"); }; }; then
   cf_cv_ncurses_header=$cf_header; break
 else
   (exit "$ac_status"); }; }; then
   cf_cv_ncurses_header=$cf_header; break
 else


@@ -8619,11 +8681,11 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 done
 
 fi
 done
 
 fi

-echo "$as_me:8622: result: $cf_cv_ncurses_header" >&5
+echo "$as_me:8684: result: $cf_cv_ncurses_header" >&5

 echo "${ECHO_T}$cf_cv_ncurses_header" >&6
 
 if test "$cf_cv_ncurses_header" = none ; then
 echo "${ECHO_T}$cf_cv_ncurses_header" >&6
 
 if test "$cf_cv_ncurses_header" = none ; then

-       { { echo "$as_me:8626: error: No curses header-files found" >&5
+       { { echo "$as_me:8688: error: No curses header-files found" >&5

 echo "$as_me: error: No curses header-files found" >&2;}
    { (exit 1); exit 1; }; }
 fi
 echo "$as_me: error: No curses header-files found" >&2;}
    { (exit 1); exit 1; }; }
 fi


@@ -8633,23 +8695,23 @@ fi
 for ac_header in $cf_cv_ncurses_header
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
 for ac_header in $cf_cv_ncurses_header
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`

-echo "$as_me:8636: checking for $ac_header" >&5
+echo "$as_me:8698: 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
 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 8642 "configure"
+#line 8704 "configure"

 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF

-if { (eval echo "$as_me:8646: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:8708: \"$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
   (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:8652: \$? = $ac_status" >&5
+  echo "$as_me:8714: \$? = $ac_status" >&5

   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag


@@ -8668,7 +8730,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi

-echo "$as_me:8671: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:8733: 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
 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6
 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then
   cat >>confdefs.h <<EOF


@@ -8724,7 +8786,7 @@ if test -n "$cf_cv_curses_dir/include/$cf_ncuhdr_root" ; then
        CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
 
                          cat >"conftest.$ac_ext" <<_ACEOF
        CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
 
                          cat >"conftest.$ac_ext" <<_ACEOF

-#line 8727 "configure"
+#line 8789 "configure"

 #include "confdefs.h"
 #include <stdio.h>
 int
 #include "confdefs.h"
 #include <stdio.h>
 int


@@ -8736,16 +8798,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
 }
 _ACEOF
 rm -f "conftest.$ac_objext"

-if { (eval echo "$as_me:8739: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:8801: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:8742: \$? = $ac_status" >&5
+  echo "$as_me:8804: \$? = $ac_status" >&5

   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'

-  { (eval echo "$as_me:8745: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8807: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:8748: \$? = $ac_status" >&5
+  echo "$as_me:8810: \$? = $ac_status" >&5

   (exit "$ac_status"); }; }; then
   :
 else
   (exit "$ac_status"); }; }; then
   :
 else


@@ -8762,7 +8824,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
                if test "$cf_have_incdir" = no ; then
                  test -n "$verbose" && echo "  adding $cf_add_incdir to include-path" 1>&6
 
                if test "$cf_have_incdir" = no ; then
                  test -n "$verbose" && echo "  adding $cf_add_incdir to include-path" 1>&6
 

-echo "${as_me:-configure}:8765: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:8827: testing adding $cf_add_incdir to include-path ..." 1>&5

 
                  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
 
                  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 


@@ -8781,7 +8843,7 @@ fi
 
 }
 
 
 }
 

-echo "$as_me:8784: checking for $cf_ncuhdr_root header in include-path" >&5
+echo "$as_me:8846: 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
 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


@@ -8793,7 +8855,7 @@ else
        do
 
        cat >"conftest.$ac_ext" <<_ACEOF
        do
 
        cat >"conftest.$ac_ext" <<_ACEOF

-#line 8796 "configure"
+#line 8858 "configure"

 #include "confdefs.h"
 
 #include <$cf_header>
 #include "confdefs.h"
 
 #include <$cf_header>


@@ -8817,16 +8879,16 @@ printf("old\\n");
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
 }
 _ACEOF
 rm -f "conftest.$ac_objext"

-if { (eval echo "$as_me:8820: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:8882: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:8823: \$? = $ac_status" >&5
+  echo "$as_me:8885: \$? = $ac_status" >&5

   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'

-  { (eval echo "$as_me:8826: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8888: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:8829: \$? = $ac_status" >&5
+  echo "$as_me:8891: \$? = $ac_status" >&5

   (exit "$ac_status"); }; }; then
   cf_cv_ncurses_h=$cf_header
 
   (exit "$ac_status"); }; }; then
   cf_cv_ncurses_h=$cf_header
 


@@ -8841,14 +8903,14 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
        done
 
 fi
        done
 
 fi

-echo "$as_me:8844: result: $cf_cv_ncurses_h" >&5
+echo "$as_me:8906: 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 "${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:8851: checking for $cf_ncuhdr_root include-path" >&5
+echo "$as_me:8913: 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
 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


@@ -8969,7 +9031,7 @@ if test -n "$cf_incdir" ; then
        CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
 
                          cat >"conftest.$ac_ext" <<_ACEOF
        CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
 
                          cat >"conftest.$ac_ext" <<_ACEOF

-#line 8972 "configure"
+#line 9034 "configure"

 #include "confdefs.h"
 #include <stdio.h>
 int
 #include "confdefs.h"
 #include <stdio.h>
 int


@@ -8981,16 +9043,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
 }
 _ACEOF
 rm -f "conftest.$ac_objext"

-if { (eval echo "$as_me:8984: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:9046: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:8987: \$? = $ac_status" >&5
+  echo "$as_me:9049: \$? = $ac_status" >&5

   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'

-  { (eval echo "$as_me:8990: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9052: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:8993: \$? = $ac_status" >&5
+  echo "$as_me:9055: \$? = $ac_status" >&5

   (exit "$ac_status"); }; }; then
   :
 else
   (exit "$ac_status"); }; }; then
   :
 else


@@ -9007,7 +9069,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
                if test "$cf_have_incdir" = no ; then
                  test -n "$verbose" && echo "  adding $cf_add_incdir to include-path" 1>&6
 
                if test "$cf_have_incdir" = no ; then
                  test -n "$verbose" && echo "  adding $cf_add_incdir to include-path" 1>&6
 

-echo "${as_me:-configure}:9010: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:9072: testing adding $cf_add_incdir to include-path ..." 1>&5

 
                  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
 
                  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 


@@ -9030,7 +9092,7 @@ fi
                do
 
        cat >"conftest.$ac_ext" <<_ACEOF
                do
 
        cat >"conftest.$ac_ext" <<_ACEOF

-#line 9033 "configure"
+#line 9095 "configure"

 #include "confdefs.h"
 
 #include <$cf_header>
 #include "confdefs.h"
 
 #include <$cf_header>


@@ -9054,16 +9116,16 @@ printf("old\\n");
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
 }
 _ACEOF
 rm -f "conftest.$ac_objext"

-if { (eval echo "$as_me:9057: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:9119: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:9060: \$? = $ac_status" >&5
+  echo "$as_me:9122: \$? = $ac_status" >&5

   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'

-  { (eval echo "$as_me:9063: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9125: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:9066: \$? = $ac_status" >&5
+  echo "$as_me:9128: \$? = $ac_status" >&5

   (exit "$ac_status"); }; }; then
   cf_cv_ncurses_h2=$cf_header
 
   (exit "$ac_status"); }; }; then
   cf_cv_ncurses_h2=$cf_header
 


@@ -9084,12 +9146,12 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
                CPPFLAGS="$cf_save2_CPPFLAGS"
                test "$cf_cv_ncurses_h2" != no && break
        done
                CPPFLAGS="$cf_save2_CPPFLAGS"
                test "$cf_cv_ncurses_h2" != no && break
        done

-       test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:9087: error: not found" >&5
+       test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:9149: error: not found" >&5

 echo "$as_me: error: not found" >&2;}
    { (exit 1); exit 1; }; }
 
 fi
 echo "$as_me: error: not found" >&2;}
    { (exit 1); exit 1; }; }
 
 fi

-echo "$as_me:9092: result: $cf_cv_ncurses_h2" >&5
+echo "$as_me:9154: 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%/[^/]*$%%'`
 echo "${ECHO_T}$cf_cv_ncurses_h2" >&6
 
        cf_1st_incdir=`echo "$cf_cv_ncurses_h2" | sed -e 's%/[^/]*$%%'`


@@ -9125,7 +9187,7 @@ if test -n "$cf_1st_incdir" ; then
        CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
 
                          cat >"conftest.$ac_ext" <<_ACEOF
        CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
 
                          cat >"conftest.$ac_ext" <<_ACEOF

-#line 9128 "configure"
+#line 9190 "configure"

 #include "confdefs.h"
 #include <stdio.h>
 int
 #include "confdefs.h"
 #include <stdio.h>
 int


@@ -9137,16 +9199,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
 }
 _ACEOF
 rm -f "conftest.$ac_objext"

-if { (eval echo "$as_me:9140: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:9202: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:9143: \$? = $ac_status" >&5
+  echo "$as_me:9205: \$? = $ac_status" >&5

   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'

-  { (eval echo "$as_me:9146: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9208: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:9149: \$? = $ac_status" >&5
+  echo "$as_me:9211: \$? = $ac_status" >&5

   (exit "$ac_status"); }; }; then
   :
 else
   (exit "$ac_status"); }; }; then
   :
 else


@@ -9163,7 +9225,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
                if test "$cf_have_incdir" = no ; then
                  test -n "$verbose" && echo "  adding $cf_add_incdir to include-path" 1>&6
 
                if test "$cf_have_incdir" = no ; then
                  test -n "$verbose" && echo "  adding $cf_add_incdir to include-path" 1>&6
 

-echo "${as_me:-configure}:9166: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:9228: testing adding $cf_add_incdir to include-path ..." 1>&5

 
                  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
 
                  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 


@@ -9211,7 +9273,7 @@ EOF
        ;;
 esac
 
        ;;
 esac
 

-echo "$as_me:9214: checking for terminfo header" >&5
+echo "$as_me:9276: 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
 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


@@ -9229,7 +9291,7 @@ esac
 for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h"
 do
 cat >"conftest.$ac_ext" <<_ACEOF
 for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h"
 do
 cat >"conftest.$ac_ext" <<_ACEOF

-#line 9232 "configure"
+#line 9294 "configure"

 #include "confdefs.h"
 #include <stdio.h>
 #include <${cf_cv_ncurses_header:-curses.h}>
 #include "confdefs.h"
 #include <stdio.h>
 #include <${cf_cv_ncurses_header:-curses.h}>


@@ -9244,16 +9306,16 @@ int x = auto_left_margin; (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
 }
 _ACEOF
 rm -f "conftest.$ac_objext"

-if { (eval echo "$as_me:9247: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:9309: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:9250: \$? = $ac_status" >&5
+  echo "$as_me:9312: \$? = $ac_status" >&5

   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'

-  { (eval echo "$as_me:9253: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9315: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:9256: \$? = $ac_status" >&5
+  echo "$as_me:9318: \$? = $ac_status" >&5

   (exit "$ac_status"); }; }; then
 
        cf_cv_term_header="$cf_test"
   (exit "$ac_status"); }; }; then
 
        cf_cv_term_header="$cf_test"


@@ -9269,7 +9331,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 done
 
 fi
 done
 
 fi

-echo "$as_me:9272: result: $cf_cv_term_header" >&5
+echo "$as_me:9334: result: $cf_cv_term_header" >&5

 echo "${ECHO_T}$cf_cv_term_header" >&6
 
 # Set definitions to allow ifdef'ing to accommodate subdirectories
 echo "${ECHO_T}$cf_cv_term_header" >&6
 
 # Set definitions to allow ifdef'ing to accommodate subdirectories


@@ -9307,7 +9369,7 @@ cat >>confdefs.h <<\EOF
 #define NCURSES 1
 EOF
 
 #define NCURSES 1
 EOF
 

-echo "$as_me:9310: checking for ncurses version" >&5
+echo "$as_me:9372: 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
 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


@@ -9333,10 +9395,10 @@ Autoconf "old"
 #endif
 EOF
        cf_try="$ac_cpp conftest.$ac_ext 2>&5 | grep '^Autoconf ' >conftest.out"
 #endif
 EOF
        cf_try="$ac_cpp conftest.$ac_ext 2>&5 | grep '^Autoconf ' >conftest.out"

-       { (eval echo "$as_me:9336: \"$cf_try\"") >&5
+       { (eval echo "$as_me:9398: \"$cf_try\"") >&5

   (eval $cf_try) 2>&5
   ac_status=$?
   (eval $cf_try) 2>&5
   ac_status=$?

-  echo "$as_me:9339: \$? = $ac_status" >&5
+  echo "$as_me:9401: \$? = $ac_status" >&5

   (exit "$ac_status"); }
        if test -f conftest.out ; then
                cf_out=`sed -e 's%^Autoconf %%' -e 's%^[^"]*"%%' -e 's%".*%%' conftest.out`
   (exit "$ac_status"); }
        if test -f conftest.out ; then
                cf_out=`sed -e 's%^Autoconf %%' -e 's%^[^"]*"%%' -e 's%".*%%' conftest.out`


@@ -9346,7 +9408,7 @@ EOF
 
 else
   cat >"conftest.$ac_ext" <<_ACEOF
 
 else
   cat >"conftest.$ac_ext" <<_ACEOF

-#line 9349 "configure"
+#line 9411 "configure"

 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header:-curses.h}>
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header:-curses.h}>


@@ -9371,15 +9433,15 @@ int main(void)
 }
 _ACEOF
 rm -f "conftest$ac_exeext"
 }
 _ACEOF
 rm -f "conftest$ac_exeext"

-if { (eval echo "$as_me:9374: \"$ac_link\"") >&5
+if { (eval echo "$as_me:9436: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:9377: \$? = $ac_status" >&5
+  echo "$as_me:9439: \$? = $ac_status" >&5

   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'

-  { (eval echo "$as_me:9379: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9441: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:9382: \$? = $ac_status" >&5
+  echo "$as_me:9444: \$? = $ac_status" >&5

   (exit "$ac_status"); }; }; then
 
        cf_cv_ncurses_version=`cat $cf_tempfile`
   (exit "$ac_status"); }; }; then
 
        cf_cv_ncurses_version=`cat $cf_tempfile`


@@ -9393,7 +9455,7 @@ fi
        rm -f "$cf_tempfile"
 
 fi
        rm -f "$cf_tempfile"
 
 fi

-echo "$as_me:9396: result: $cf_cv_ncurses_version" >&5
+echo "$as_me:9458: result: $cf_cv_ncurses_version" >&5

 echo "${ECHO_T}$cf_cv_ncurses_version" >&6
 test "$cf_cv_ncurses_version" = no ||
 cat >>confdefs.h <<\EOF
 echo "${ECHO_T}$cf_cv_ncurses_version" >&6
 test "$cf_cv_ncurses_version" = no ||
 cat >>confdefs.h <<\EOF


@@ -9406,7 +9468,7 @@ cf_nculib_root=$cf_cv_screen
        # to link gpm.
 cf_ncurses_LIBS=""
 cf_ncurses_SAVE="$LIBS"
        # to link gpm.
 cf_ncurses_LIBS=""
 cf_ncurses_SAVE="$LIBS"

-echo "$as_me:9409: checking for Gpm_Open in -lgpm" >&5
+echo "$as_me:9471: 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
 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


@@ -9414,7 +9476,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lgpm  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lgpm  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF

-#line 9417 "configure"
+#line 9479 "configure"

 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */


@@ -9433,16 +9495,16 @@ Gpm_Open ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"

-if { (eval echo "$as_me:9436: \"$ac_link\"") >&5
+if { (eval echo "$as_me:9498: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:9439: \$? = $ac_status" >&5
+  echo "$as_me:9501: \$? = $ac_status" >&5

   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'

-  { (eval echo "$as_me:9442: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9504: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:9445: \$? = $ac_status" >&5
+  echo "$as_me:9507: \$? = $ac_status" >&5

   (exit "$ac_status"); }; }; then
   ac_cv_lib_gpm_Gpm_Open=yes
 else
   (exit "$ac_status"); }; }; then
   ac_cv_lib_gpm_Gpm_Open=yes
 else


@@ -9453,10 +9515,10 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi

-echo "$as_me:9456: result: $ac_cv_lib_gpm_Gpm_Open" >&5
+echo "$as_me:9518: 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 "${ECHO_T}$ac_cv_lib_gpm_Gpm_Open" >&6
 if test "$ac_cv_lib_gpm_Gpm_Open" = yes; then

-  echo "$as_me:9459: checking for initscr in -lgpm" >&5
+  echo "$as_me:9521: 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
 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


@@ -9464,7 +9526,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lgpm  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lgpm  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF

-#line 9467 "configure"
+#line 9529 "configure"

 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */


@@ -9483,16 +9545,16 @@ initscr ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"

-if { (eval echo "$as_me:9486: \"$ac_link\"") >&5
+if { (eval echo "$as_me:9548: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:9489: \$? = $ac_status" >&5
+  echo "$as_me:9551: \$? = $ac_status" >&5

   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'

-  { (eval echo "$as_me:9492: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9554: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:9495: \$? = $ac_status" >&5
+  echo "$as_me:9557: \$? = $ac_status" >&5

   (exit "$ac_status"); }; }; then
   ac_cv_lib_gpm_initscr=yes
 else
   (exit "$ac_status"); }; }; then
   ac_cv_lib_gpm_initscr=yes
 else


@@ -9503,7 +9565,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi

-echo "$as_me:9506: result: $ac_cv_lib_gpm_initscr" >&5
+echo "$as_me:9568: 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"
 echo "${ECHO_T}$ac_cv_lib_gpm_initscr" >&6
 if test "$ac_cv_lib_gpm_initscr" = yes; then
   LIBS="$cf_ncurses_SAVE"


@@ -9518,7 +9580,7 @@ case "$host_os" in
        # 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
        # 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:9521: checking for tgoto in -lmytinfo" >&5
+               echo "$as_me:9583: 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
 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


@@ -9526,7 +9588,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lmytinfo  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lmytinfo  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF

-#line 9529 "configure"
+#line 9591 "configure"

 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */


@@ -9545,16 +9607,16 @@ tgoto ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"

-if { (eval echo "$as_me:9548: \"$ac_link\"") >&5
+if { (eval echo "$as_me:9610: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:9551: \$? = $ac_status" >&5
+  echo "$as_me:9613: \$? = $ac_status" >&5

   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'

-  { (eval echo "$as_me:9554: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9616: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:9557: \$? = $ac_status" >&5
+  echo "$as_me:9619: \$? = $ac_status" >&5

   (exit "$ac_status"); }; }; then
   ac_cv_lib_mytinfo_tgoto=yes
 else
   (exit "$ac_status"); }; }; then
   ac_cv_lib_mytinfo_tgoto=yes
 else


@@ -9565,7 +9627,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi

-echo "$as_me:9568: result: $ac_cv_lib_mytinfo_tgoto" >&5
+echo "$as_me:9630: 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"
 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"


@@ -9614,13 +9676,13 @@ else
 
        eval 'cf_cv_have_lib_'"$cf_nculib_root"'=no'
        cf_libdir=""
 
        eval 'cf_cv_have_lib_'"$cf_nculib_root"'=no'
        cf_libdir=""

-       echo "$as_me:9617: checking for initscr" >&5
+       echo "$as_me:9679: 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
 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 9623 "configure"
+#line 9685 "configure"

 #include "confdefs.h"
 #define initscr autoconf_temporary
 #include <limits.h>    /* least-intrusive standard header which defines gcc2 __stub macros */
 #include "confdefs.h"
 #define initscr autoconf_temporary
 #include <limits.h>    /* least-intrusive standard header which defines gcc2 __stub macros */


@@ -9651,16 +9713,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"

-if { (eval echo "$as_me:9654: \"$ac_link\"") >&5
+if { (eval echo "$as_me:9716: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:9657: \$? = $ac_status" >&5
+  echo "$as_me:9719: \$? = $ac_status" >&5

   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'

-  { (eval echo "$as_me:9660: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9722: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:9663: \$? = $ac_status" >&5
+  echo "$as_me:9725: \$? = $ac_status" >&5

   (exit "$ac_status"); }; }; then
   ac_cv_func_initscr=yes
 else
   (exit "$ac_status"); }; }; then
   ac_cv_func_initscr=yes
 else


@@ -9670,18 +9732,18 @@ ac_cv_func_initscr=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi

-echo "$as_me:9673: result: $ac_cv_func_initscr" >&5
+echo "$as_me:9735: 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 "${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:9680: checking for initscr in -l$cf_nculib_root" >&5
+               echo "$as_me:9742: 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
 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 9684 "configure"
+#line 9746 "configure"

 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int


@@ -9693,25 +9755,25 @@ initscr()
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"

-if { (eval echo "$as_me:9696: \"$ac_link\"") >&5
+if { (eval echo "$as_me:9758: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:9699: \$? = $ac_status" >&5
+  echo "$as_me:9761: \$? = $ac_status" >&5

   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'

-  { (eval echo "$as_me:9702: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9764: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:9705: \$? = $ac_status" >&5
+  echo "$as_me:9767: \$? = $ac_status" >&5

   (exit "$ac_status"); }; }; then
   (exit "$ac_status"); }; }; then

-  echo "$as_me:9707: result: yes" >&5
+  echo "$as_me:9769: 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 "${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:9714: result: no" >&5
+echo "$as_me:9776: result: no" >&5

 echo "${ECHO_T}no" >&6
 
 cf_search=
 echo "${ECHO_T}no" >&6
 
 cf_search=


@@ -9779,11 +9841,11 @@ cf_search="$cf_library_path_list $cf_search"
 
                        for cf_libdir in $cf_search
                        do
 
                        for cf_libdir in $cf_search
                        do

-                               echo "$as_me:9782: checking for -l$cf_nculib_root in $cf_libdir" >&5
+                               echo "$as_me:9844: 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
 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 9786 "configure"
+#line 9848 "configure"

 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int


@@ -9795,25 +9857,25 @@ initscr()
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"

-if { (eval echo "$as_me:9798: \"$ac_link\"") >&5
+if { (eval echo "$as_me:9860: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:9801: \$? = $ac_status" >&5
+  echo "$as_me:9863: \$? = $ac_status" >&5

   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'

-  { (eval echo "$as_me:9804: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9866: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:9807: \$? = $ac_status" >&5
+  echo "$as_me:9869: \$? = $ac_status" >&5

   (exit "$ac_status"); }; }; then
   (exit "$ac_status"); }; }; then

-  echo "$as_me:9809: result: yes" >&5
+  echo "$as_me:9871: 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 "${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:9816: result: no" >&5
+echo "$as_me:9878: result: no" >&5

 echo "${ECHO_T}no" >&6
                                         LIBS="$cf_save_LIBS"
 fi
 echo "${ECHO_T}no" >&6
                                         LIBS="$cf_save_LIBS"
 fi


@@ -9828,7 +9890,7 @@ fi
 eval 'cf_found_library="$cf_cv_have_lib_'"$cf_nculib_root"\"
 
 if test "$cf_found_library" = no ; then
 eval 'cf_found_library="$cf_cv_have_lib_'"$cf_nculib_root"\"
 
 if test "$cf_found_library" = no ; then

-       { { echo "$as_me:9831: error: Cannot link $cf_nculib_root library" >&5
+       { { echo "$as_me:9893: error: Cannot link $cf_nculib_root library" >&5

 echo "$as_me: error: Cannot link $cf_nculib_root library" >&2;}
    { (exit 1); exit 1; }; }
 fi
 echo "$as_me: error: Cannot link $cf_nculib_root library" >&2;}
    { (exit 1); exit 1; }; }
 fi


@@ -9836,7 +9898,7 @@ fi
 fi
 
 if test -n "$cf_ncurses_LIBS" ; then
 fi
 
 if test -n "$cf_ncurses_LIBS" ; then

-       echo "$as_me:9839: checking if we can link $cf_nculib_root without $cf_ncurses_LIBS" >&5
+       echo "$as_me:9901: 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
 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


@@ -9846,7 +9908,7 @@ echo $ECHO_N "checking if we can link $cf_nculib_root without $cf_ncurses_LIBS..
                fi
        done
        cat >"conftest.$ac_ext" <<_ACEOF
                fi
        done
        cat >"conftest.$ac_ext" <<_ACEOF

-#line 9849 "configure"
+#line 9911 "configure"

 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int


@@ -9858,23 +9920,23 @@ initscr(); mousemask(0,0); tigetstr((char *)0);
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"

-if { (eval echo "$as_me:9861: \"$ac_link\"") >&5
+if { (eval echo "$as_me:9923: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:9864: \$? = $ac_status" >&5
+  echo "$as_me:9926: \$? = $ac_status" >&5

   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'

-  { (eval echo "$as_me:9867: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9929: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:9870: \$? = $ac_status" >&5
+  echo "$as_me:9932: \$? = $ac_status" >&5

   (exit "$ac_status"); }; }; then
   (exit "$ac_status"); }; }; then

-  echo "$as_me:9872: result: yes" >&5
+  echo "$as_me:9934: result: yes" >&5

 echo "${ECHO_T}yes" >&6
 else
   echo "$as_me: failed program was:" >&5
 cat "conftest.$ac_ext" >&5
 echo "${ECHO_T}yes" >&6
 else
   echo "$as_me: failed program was:" >&5
 cat "conftest.$ac_ext" >&5

-echo "$as_me:9877: result: no" >&5
+echo "$as_me:9939: result: no" >&5

 echo "${ECHO_T}no" >&6
                 LIBS="$cf_ncurses_SAVE"
 fi
 echo "${ECHO_T}no" >&6
                 LIBS="$cf_ncurses_SAVE"
 fi


@@ -9899,13 +9961,13 @@ cf_ncuconfig_root=$cf_cv_screen
 cf_have_ncuconfig=no
 
 if test "x${PKG_CONFIG:=none}" != xnone; then
 cf_have_ncuconfig=no
 
 if test "x${PKG_CONFIG:=none}" != xnone; then

-       echo "$as_me:9902: checking pkg-config for $cf_ncuconfig_root" >&5
+       echo "$as_me:9964: 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 $ECHO_N "checking pkg-config for $cf_ncuconfig_root... $ECHO_C" >&6
        if "$PKG_CONFIG" --exists $cf_ncuconfig_root ; then

-               echo "$as_me:9905: result: yes" >&5
+               echo "$as_me:9967: result: yes" >&5

 echo "${ECHO_T}yes" >&6
 
 echo "${ECHO_T}yes" >&6
 

-               echo "$as_me:9908: checking if the $cf_ncuconfig_root package files work" >&5
+               echo "$as_me:9970: 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
 
 echo $ECHO_N "checking if the $cf_ncuconfig_root package files work... $ECHO_C" >&6
                cf_have_ncuconfig=unknown
 


@@ -10038,7 +10100,7 @@ done
 LIBS="$cf_add_libs"
 
                        cat >"conftest.$ac_ext" <<_ACEOF
 LIBS="$cf_add_libs"
 
                        cat >"conftest.$ac_ext" <<_ACEOF

-#line 10041 "configure"
+#line 10103 "configure"

 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int


@@ -10050,37 +10112,37 @@ initscr(); mousemask(0,0); tigetstr((char *)0);
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"

-if { (eval echo "$as_me:10053: \"$ac_link\"") >&5
+if { (eval echo "$as_me:10115: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:10056: \$? = $ac_status" >&5
+  echo "$as_me:10118: \$? = $ac_status" >&5

   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'

-  { (eval echo "$as_me:10059: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10121: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:10062: \$? = $ac_status" >&5
+  echo "$as_me:10124: \$? = $ac_status" >&5

   (exit "$ac_status"); }; }; then
   if test "$cross_compiling" = yes; then
   cf_test_ncuconfig=maybe
 else
   cat >"conftest.$ac_ext" <<_ACEOF
   (exit "$ac_status"); }; }; then
   if test "$cross_compiling" = yes; then
   cf_test_ncuconfig=maybe
 else
   cat >"conftest.$ac_ext" <<_ACEOF

-#line 10068 "configure"
+#line 10130 "configure"

 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
                                        int main(void)
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
                                        int main(void)

-                                       { char *xx = curses_version(); return (xx == 0); }
+                                       { const char *xx = curses_version(); return (xx == 0); }

 _ACEOF
 rm -f "conftest$ac_exeext"
 _ACEOF
 rm -f "conftest$ac_exeext"

-if { (eval echo "$as_me:10075: \"$ac_link\"") >&5
+if { (eval echo "$as_me:10137: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:10078: \$? = $ac_status" >&5
+  echo "$as_me:10140: \$? = $ac_status" >&5

   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'

-  { (eval echo "$as_me:10080: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10142: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:10083: \$? = $ac_status" >&5
+  echo "$as_me:10145: \$? = $ac_status" >&5

   (exit "$ac_status"); }; }; then
   cf_test_ncuconfig=yes
 else
   (exit "$ac_status"); }; }; then
   cf_test_ncuconfig=yes
 else


@@ -10226,7 +10288,7 @@ done
 LIBS="$cf_add_libs"
 
                cat >"conftest.$ac_ext" <<_ACEOF
 LIBS="$cf_add_libs"
 
                cat >"conftest.$ac_ext" <<_ACEOF

-#line 10229 "configure"
+#line 10291 "configure"

 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int


@@ -10238,37 +10300,37 @@ initscr(); mousemask(0,0); tigetstr((char *)0);
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"

-if { (eval echo "$as_me:10241: \"$ac_link\"") >&5
+if { (eval echo "$as_me:10303: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:10244: \$? = $ac_status" >&5
+  echo "$as_me:10306: \$? = $ac_status" >&5

   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'

-  { (eval echo "$as_me:10247: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10309: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:10250: \$? = $ac_status" >&5
+  echo "$as_me:10312: \$? = $ac_status" >&5

   (exit "$ac_status"); }; }; then
   if test "$cross_compiling" = yes; then
   cf_have_ncuconfig=maybe
 else
   cat >"conftest.$ac_ext" <<_ACEOF
   (exit "$ac_status"); }; }; then
   if test "$cross_compiling" = yes; then
   cf_have_ncuconfig=maybe
 else
   cat >"conftest.$ac_ext" <<_ACEOF

-#line 10256 "configure"
+#line 10318 "configure"

 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
                                int main(void)
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
                                int main(void)

-                               { char *xx = curses_version(); return (xx == 0); }
+                               { const char *xx = curses_version(); return (xx == 0); }

 _ACEOF
 rm -f "conftest$ac_exeext"
 _ACEOF
 rm -f "conftest$ac_exeext"

-if { (eval echo "$as_me:10263: \"$ac_link\"") >&5
+if { (eval echo "$as_me:10325: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:10266: \$? = $ac_status" >&5
+  echo "$as_me:10328: \$? = $ac_status" >&5

   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'

-  { (eval echo "$as_me:10268: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10330: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:10271: \$? = $ac_status" >&5
+  echo "$as_me:10333: \$? = $ac_status" >&5

   (exit "$ac_status"); }; }; then
   cf_have_ncuconfig=yes
 else
   (exit "$ac_status"); }; }; then
   cf_have_ncuconfig=yes
 else


@@ -10285,7 +10347,7 @@ cat "conftest.$ac_ext" >&5
 cf_have_ncuconfig=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 cf_have_ncuconfig=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"

-               echo "$as_me:10288: result: $cf_have_ncuconfig" >&5
+               echo "$as_me:10350: 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"
 echo "${ECHO_T}$cf_have_ncuconfig" >&6
                test "$cf_have_ncuconfig" = maybe && cf_have_ncuconfig=yes
                if test "$cf_have_ncuconfig" != "yes"


@@ -10301,7 +10363,7 @@ EOF
 
                        NCURSES_CONFIG_PKG=$cf_ncuconfig_root
 
 
                        NCURSES_CONFIG_PKG=$cf_ncuconfig_root
 

-echo "$as_me:10304: checking for terminfo header" >&5
+echo "$as_me:10366: 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
 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


@@ -10319,7 +10381,7 @@ esac
 for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h"
 do
 cat >"conftest.$ac_ext" <<_ACEOF
 for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h"
 do
 cat >"conftest.$ac_ext" <<_ACEOF

-#line 10322 "configure"
+#line 10384 "configure"

 #include "confdefs.h"
 #include <stdio.h>
 #include <${cf_cv_ncurses_header:-curses.h}>
 #include "confdefs.h"
 #include <stdio.h>
 #include <${cf_cv_ncurses_header:-curses.h}>


@@ -10334,16 +10396,16 @@ int x = auto_left_margin; (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
 }
 _ACEOF
 rm -f "conftest.$ac_objext"

-if { (eval echo "$as_me:10337: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:10399: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:10340: \$? = $ac_status" >&5
+  echo "$as_me:10402: \$? = $ac_status" >&5

   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'

-  { (eval echo "$as_me:10343: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10405: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:10346: \$? = $ac_status" >&5
+  echo "$as_me:10408: \$? = $ac_status" >&5

   (exit "$ac_status"); }; }; then
 
        cf_cv_term_header="$cf_test"
   (exit "$ac_status"); }; }; then
 
        cf_cv_term_header="$cf_test"


@@ -10359,7 +10421,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 done
 
 fi
 done
 
 fi

-echo "$as_me:10362: result: $cf_cv_term_header" >&5
+echo "$as_me:10424: result: $cf_cv_term_header" >&5

 echo "${ECHO_T}$cf_cv_term_header" >&6
 
 # Set definitions to allow ifdef'ing to accommodate subdirectories
 echo "${ECHO_T}$cf_cv_term_header" >&6
 
 # Set definitions to allow ifdef'ing to accommodate subdirectories


@@ -10394,7 +10456,7 @@ esac
                fi
 
        else
                fi
 
        else

-               echo "$as_me:10397: result: no" >&5
+               echo "$as_me:10459: result: no" >&5

 echo "${ECHO_T}no" >&6
                NCURSES_CONFIG_PKG=none
        fi
 echo "${ECHO_T}no" >&6
                NCURSES_CONFIG_PKG=none
        fi


@@ -10410,7 +10472,7 @@ if test -n "$ac_tool_prefix"; then
   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
   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:10413: checking for $ac_word" >&5
+echo "$as_me:10475: 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
 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


@@ -10425,7 +10487,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_NCURSES_CONFIG="$ac_tool_prefix$ac_prog"
   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:10428: found $ac_dir/$ac_word" >&5
+echo "$as_me:10490: found $ac_dir/$ac_word" >&5

 break
 done
 
 break
 done
 


@@ -10433,10 +10495,10 @@ fi
 fi
 NCURSES_CONFIG=$ac_cv_prog_NCURSES_CONFIG
 if test -n "$NCURSES_CONFIG"; then
 fi
 NCURSES_CONFIG=$ac_cv_prog_NCURSES_CONFIG
 if test -n "$NCURSES_CONFIG"; then

-  echo "$as_me:10436: result: $NCURSES_CONFIG" >&5
+  echo "$as_me:10498: result: $NCURSES_CONFIG" >&5

 echo "${ECHO_T}$NCURSES_CONFIG" >&6
 else
 echo "${ECHO_T}$NCURSES_CONFIG" >&6
 else

-  echo "$as_me:10439: result: no" >&5
+  echo "$as_me:10501: result: no" >&5

 echo "${ECHO_T}no" >&6
 fi
 
 echo "${ECHO_T}no" >&6
 fi
 


@@ -10449,7 +10511,7 @@ if test -z "$NCURSES_CONFIG"; then
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
 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:10452: checking for $ac_word" >&5
+echo "$as_me:10514: 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
 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


@@ -10464,7 +10526,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_ac_ct_NCURSES_CONFIG="$ac_prog"
   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:10467: found $ac_dir/$ac_word" >&5
+echo "$as_me:10529: found $ac_dir/$ac_word" >&5

 break
 done
 
 break
 done
 


@@ -10472,10 +10534,10 @@ fi
 fi
 ac_ct_NCURSES_CONFIG=$ac_cv_prog_ac_ct_NCURSES_CONFIG
 if test -n "$ac_ct_NCURSES_CONFIG"; then
 fi
 ac_ct_NCURSES_CONFIG=$ac_cv_prog_ac_ct_NCURSES_CONFIG
 if test -n "$ac_ct_NCURSES_CONFIG"; then

-  echo "$as_me:10475: result: $ac_ct_NCURSES_CONFIG" >&5
+  echo "$as_me:10537: result: $ac_ct_NCURSES_CONFIG" >&5

 echo "${ECHO_T}$ac_ct_NCURSES_CONFIG" >&6
 else
 echo "${ECHO_T}$ac_ct_NCURSES_CONFIG" >&6
 else

-  echo "$as_me:10478: result: no" >&5
+  echo "$as_me:10540: result: no" >&5

 echo "${ECHO_T}no" >&6
 fi
 
 echo "${ECHO_T}no" >&6
 fi
 


@@ -10604,7 +10666,7 @@ LIBS="$cf_add_libs"
 
                # even with config script, some packages use no-override for curses.h
 
 
                # even with config script, some packages use no-override for curses.h
 

-echo "$as_me:10607: checking if we have identified curses headers" >&5
+echo "$as_me:10669: 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
 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


@@ -10616,7 +10678,7 @@ for cf_header in \
        curses.h $cf_cv_screen/curses.h
 do
 cat >"conftest.$ac_ext" <<_ACEOF
        curses.h $cf_cv_screen/curses.h
 do
 cat >"conftest.$ac_ext" <<_ACEOF

-#line 10619 "configure"
+#line 10681 "configure"

 #include "confdefs.h"
 #include <${cf_header}>
 int
 #include "confdefs.h"
 #include <${cf_header}>
 int


@@ -10628,16 +10690,16 @@ initscr(); tgoto("?", 0,0)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
 }
 _ACEOF
 rm -f "conftest.$ac_objext"

-if { (eval echo "$as_me:10631: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:10693: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:10634: \$? = $ac_status" >&5
+  echo "$as_me:10696: \$? = $ac_status" >&5

   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'

-  { (eval echo "$as_me:10637: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10699: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:10640: \$? = $ac_status" >&5
+  echo "$as_me:10702: \$? = $ac_status" >&5

   (exit "$ac_status"); }; }; then
   cf_cv_ncurses_header=$cf_header; break
 else
   (exit "$ac_status"); }; }; then
   cf_cv_ncurses_header=$cf_header; break
 else


@@ -10648,11 +10710,11 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 done
 
 fi
 done
 
 fi

-echo "$as_me:10651: result: $cf_cv_ncurses_header" >&5
+echo "$as_me:10713: result: $cf_cv_ncurses_header" >&5

 echo "${ECHO_T}$cf_cv_ncurses_header" >&6
 
 if test "$cf_cv_ncurses_header" = none ; then
 echo "${ECHO_T}$cf_cv_ncurses_header" >&6
 
 if test "$cf_cv_ncurses_header" = none ; then

-       { { echo "$as_me:10655: error: No curses header-files found" >&5
+       { { echo "$as_me:10717: error: No curses header-files found" >&5

 echo "$as_me: error: No curses header-files found" >&2;}
    { (exit 1); exit 1; }; }
 fi
 echo "$as_me: error: No curses header-files found" >&2;}
    { (exit 1); exit 1; }; }
 fi


@@ -10662,23 +10724,23 @@ fi
 for ac_header in $cf_cv_ncurses_header
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
 for ac_header in $cf_cv_ncurses_header
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`

-echo "$as_me:10665: checking for $ac_header" >&5
+echo "$as_me:10727: 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
 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 10671 "configure"
+#line 10733 "configure"

 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF

-if { (eval echo "$as_me:10675: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:10737: \"$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
   (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:10681: \$? = $ac_status" >&5
+  echo "$as_me:10743: \$? = $ac_status" >&5

   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag


@@ -10697,7 +10759,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi

-echo "$as_me:10700: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:10762: 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
 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6
 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then
   cat >>confdefs.h <<EOF


@@ -10753,7 +10815,7 @@ if test -n "$cf_cv_curses_dir/include/$cf_ncuhdr_root" ; then
        CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
 
                          cat >"conftest.$ac_ext" <<_ACEOF
        CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
 
                          cat >"conftest.$ac_ext" <<_ACEOF

-#line 10756 "configure"
+#line 10818 "configure"

 #include "confdefs.h"
 #include <stdio.h>
 int
 #include "confdefs.h"
 #include <stdio.h>
 int


@@ -10765,16 +10827,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
 }
 _ACEOF
 rm -f "conftest.$ac_objext"

-if { (eval echo "$as_me:10768: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:10830: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:10771: \$? = $ac_status" >&5
+  echo "$as_me:10833: \$? = $ac_status" >&5

   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'

-  { (eval echo "$as_me:10774: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10836: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:10777: \$? = $ac_status" >&5
+  echo "$as_me:10839: \$? = $ac_status" >&5

   (exit "$ac_status"); }; }; then
   :
 else
   (exit "$ac_status"); }; }; then
   :
 else


@@ -10791,7 +10853,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
                if test "$cf_have_incdir" = no ; then
                  test -n "$verbose" && echo "  adding $cf_add_incdir to include-path" 1>&6
 
                if test "$cf_have_incdir" = no ; then
                  test -n "$verbose" && echo "  adding $cf_add_incdir to include-path" 1>&6
 

-echo "${as_me:-configure}:10794: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:10856: testing adding $cf_add_incdir to include-path ..." 1>&5

 
                  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
 
                  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 


@@ -10810,7 +10872,7 @@ fi
 
 }
 
 
 }
 

-echo "$as_me:10813: checking for $cf_ncuhdr_root header in include-path" >&5
+echo "$as_me:10875: 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
 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


@@ -10822,7 +10884,7 @@ else
        do
 
        cat >"conftest.$ac_ext" <<_ACEOF
        do
 
        cat >"conftest.$ac_ext" <<_ACEOF

-#line 10825 "configure"
+#line 10887 "configure"

 #include "confdefs.h"
 
 #include <$cf_header>
 #include "confdefs.h"
 
 #include <$cf_header>


@@ -10846,16 +10908,16 @@ printf("old\\n");
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
 }
 _ACEOF
 rm -f "conftest.$ac_objext"

-if { (eval echo "$as_me:10849: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:10911: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:10852: \$? = $ac_status" >&5
+  echo "$as_me:10914: \$? = $ac_status" >&5

   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'

-  { (eval echo "$as_me:10855: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10917: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:10858: \$? = $ac_status" >&5
+  echo "$as_me:10920: \$? = $ac_status" >&5

   (exit "$ac_status"); }; }; then
   cf_cv_ncurses_h=$cf_header
 
   (exit "$ac_status"); }; }; then
   cf_cv_ncurses_h=$cf_header
 


@@ -10870,14 +10932,14 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
        done
 
 fi
        done
 
 fi

-echo "$as_me:10873: result: $cf_cv_ncurses_h" >&5
+echo "$as_me:10935: 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 "${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:10880: checking for $cf_ncuhdr_root include-path" >&5
+echo "$as_me:10942: 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
 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


@@ -10998,7 +11060,7 @@ if test -n "$cf_incdir" ; then
        CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
 
                          cat >"conftest.$ac_ext" <<_ACEOF
        CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
 
                          cat >"conftest.$ac_ext" <<_ACEOF

-#line 11001 "configure"
+#line 11063 "configure"

 #include "confdefs.h"
 #include <stdio.h>
 int
 #include "confdefs.h"
 #include <stdio.h>
 int


@@ -11010,16 +11072,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
 }
 _ACEOF
 rm -f "conftest.$ac_objext"

-if { (eval echo "$as_me:11013: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:11075: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:11016: \$? = $ac_status" >&5
+  echo "$as_me:11078: \$? = $ac_status" >&5

   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'

-  { (eval echo "$as_me:11019: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11081: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:11022: \$? = $ac_status" >&5
+  echo "$as_me:11084: \$? = $ac_status" >&5

   (exit "$ac_status"); }; }; then
   :
 else
   (exit "$ac_status"); }; }; then
   :
 else


@@ -11036,7 +11098,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
                if test "$cf_have_incdir" = no ; then
                  test -n "$verbose" && echo "  adding $cf_add_incdir to include-path" 1>&6
 
                if test "$cf_have_incdir" = no ; then
                  test -n "$verbose" && echo "  adding $cf_add_incdir to include-path" 1>&6
 

-echo "${as_me:-configure}:11039: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:11101: testing adding $cf_add_incdir to include-path ..." 1>&5

 
                  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
 
                  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 


@@ -11059,7 +11121,7 @@ fi
                do
 
        cat >"conftest.$ac_ext" <<_ACEOF
                do
 
        cat >"conftest.$ac_ext" <<_ACEOF

-#line 11062 "configure"
+#line 11124 "configure"

 #include "confdefs.h"
 
 #include <$cf_header>
 #include "confdefs.h"
 
 #include <$cf_header>


@@ -11083,16 +11145,16 @@ printf("old\\n");
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
 }
 _ACEOF
 rm -f "conftest.$ac_objext"

-if { (eval echo "$as_me:11086: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:11148: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:11089: \$? = $ac_status" >&5
+  echo "$as_me:11151: \$? = $ac_status" >&5

   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'

-  { (eval echo "$as_me:11092: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11154: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:11095: \$? = $ac_status" >&5
+  echo "$as_me:11157: \$? = $ac_status" >&5

   (exit "$ac_status"); }; }; then
   cf_cv_ncurses_h2=$cf_header
 
   (exit "$ac_status"); }; }; then
   cf_cv_ncurses_h2=$cf_header
 


@@ -11113,12 +11175,12 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
                CPPFLAGS="$cf_save2_CPPFLAGS"
                test "$cf_cv_ncurses_h2" != no && break
        done
                CPPFLAGS="$cf_save2_CPPFLAGS"
                test "$cf_cv_ncurses_h2" != no && break
        done

-       test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:11116: error: not found" >&5
+       test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:11178: error: not found" >&5

 echo "$as_me: error: not found" >&2;}
    { (exit 1); exit 1; }; }
 
 fi
 echo "$as_me: error: not found" >&2;}
    { (exit 1); exit 1; }; }
 
 fi

-echo "$as_me:11121: result: $cf_cv_ncurses_h2" >&5
+echo "$as_me:11183: 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%/[^/]*$%%'`
 echo "${ECHO_T}$cf_cv_ncurses_h2" >&6
 
        cf_1st_incdir=`echo "$cf_cv_ncurses_h2" | sed -e 's%/[^/]*$%%'`


@@ -11154,7 +11216,7 @@ if test -n "$cf_1st_incdir" ; then
        CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
 
                          cat >"conftest.$ac_ext" <<_ACEOF
        CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
 
                          cat >"conftest.$ac_ext" <<_ACEOF

-#line 11157 "configure"
+#line 11219 "configure"

 #include "confdefs.h"
 #include <stdio.h>
 int
 #include "confdefs.h"
 #include <stdio.h>
 int


@@ -11166,16 +11228,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
 }
 _ACEOF
 rm -f "conftest.$ac_objext"

-if { (eval echo "$as_me:11169: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:11231: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:11172: \$? = $ac_status" >&5
+  echo "$as_me:11234: \$? = $ac_status" >&5

   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'

-  { (eval echo "$as_me:11175: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11237: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:11178: \$? = $ac_status" >&5
+  echo "$as_me:11240: \$? = $ac_status" >&5

   (exit "$ac_status"); }; }; then
   :
 else
   (exit "$ac_status"); }; }; then
   :
 else


@@ -11192,7 +11254,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
                if test "$cf_have_incdir" = no ; then
                  test -n "$verbose" && echo "  adding $cf_add_incdir to include-path" 1>&6
 
                if test "$cf_have_incdir" = no ; then
                  test -n "$verbose" && echo "  adding $cf_add_incdir to include-path" 1>&6
 

-echo "${as_me:-configure}:11195: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:11257: testing adding $cf_add_incdir to include-path ..." 1>&5

 
                  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
 
                  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 


@@ -11240,7 +11302,7 @@ EOF
        ;;
 esac
 
        ;;
 esac
 

-echo "$as_me:11243: checking for terminfo header" >&5
+echo "$as_me:11305: 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
 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


@@ -11258,7 +11320,7 @@ esac
 for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h"
 do
 cat >"conftest.$ac_ext" <<_ACEOF
 for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h"
 do
 cat >"conftest.$ac_ext" <<_ACEOF

-#line 11261 "configure"
+#line 11323 "configure"

 #include "confdefs.h"
 #include <stdio.h>
 #include <${cf_cv_ncurses_header:-curses.h}>
 #include "confdefs.h"
 #include <stdio.h>
 #include <${cf_cv_ncurses_header:-curses.h}>


@@ -11273,16 +11335,16 @@ int x = auto_left_margin; (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
 }
 _ACEOF
 rm -f "conftest.$ac_objext"

-if { (eval echo "$as_me:11276: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:11338: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:11279: \$? = $ac_status" >&5
+  echo "$as_me:11341: \$? = $ac_status" >&5

   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'

-  { (eval echo "$as_me:11282: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11344: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:11285: \$? = $ac_status" >&5
+  echo "$as_me:11347: \$? = $ac_status" >&5

   (exit "$ac_status"); }; }; then
 
        cf_cv_term_header="$cf_test"
   (exit "$ac_status"); }; }; then
 
        cf_cv_term_header="$cf_test"


@@ -11298,7 +11360,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 done
 
 fi
 done
 
 fi

-echo "$as_me:11301: result: $cf_cv_term_header" >&5
+echo "$as_me:11363: result: $cf_cv_term_header" >&5

 echo "${ECHO_T}$cf_cv_term_header" >&6
 
 # Set definitions to allow ifdef'ing to accommodate subdirectories
 echo "${ECHO_T}$cf_cv_term_header" >&6
 
 # Set definitions to allow ifdef'ing to accommodate subdirectories


@@ -11336,7 +11398,7 @@ cat >>confdefs.h <<\EOF
 #define NCURSES 1
 EOF
 
 #define NCURSES 1
 EOF
 

-echo "$as_me:11339: checking for ncurses version" >&5
+echo "$as_me:11401: 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
 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


@@ -11362,10 +11424,10 @@ Autoconf "old"
 #endif
 EOF
        cf_try="$ac_cpp conftest.$ac_ext 2>&5 | grep '^Autoconf ' >conftest.out"
 #endif
 EOF
        cf_try="$ac_cpp conftest.$ac_ext 2>&5 | grep '^Autoconf ' >conftest.out"

-       { (eval echo "$as_me:11365: \"$cf_try\"") >&5
+       { (eval echo "$as_me:11427: \"$cf_try\"") >&5

   (eval $cf_try) 2>&5
   ac_status=$?
   (eval $cf_try) 2>&5
   ac_status=$?

-  echo "$as_me:11368: \$? = $ac_status" >&5
+  echo "$as_me:11430: \$? = $ac_status" >&5

   (exit "$ac_status"); }
        if test -f conftest.out ; then
                cf_out=`sed -e 's%^Autoconf %%' -e 's%^[^"]*"%%' -e 's%".*%%' conftest.out`
   (exit "$ac_status"); }
        if test -f conftest.out ; then
                cf_out=`sed -e 's%^Autoconf %%' -e 's%^[^"]*"%%' -e 's%".*%%' conftest.out`


@@ -11375,7 +11437,7 @@ EOF
 
 else
   cat >"conftest.$ac_ext" <<_ACEOF
 
 else
   cat >"conftest.$ac_ext" <<_ACEOF

-#line 11378 "configure"
+#line 11440 "configure"

 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header:-curses.h}>
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header:-curses.h}>


@@ -11400,15 +11462,15 @@ int main(void)
 }
 _ACEOF
 rm -f "conftest$ac_exeext"
 }
 _ACEOF
 rm -f "conftest$ac_exeext"

-if { (eval echo "$as_me:11403: \"$ac_link\"") >&5
+if { (eval echo "$as_me:11465: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:11406: \$? = $ac_status" >&5
+  echo "$as_me:11468: \$? = $ac_status" >&5

   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'

-  { (eval echo "$as_me:11408: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11470: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:11411: \$? = $ac_status" >&5
+  echo "$as_me:11473: \$? = $ac_status" >&5

   (exit "$ac_status"); }; }; then
 
        cf_cv_ncurses_version=`cat $cf_tempfile`
   (exit "$ac_status"); }; }; then
 
        cf_cv_ncurses_version=`cat $cf_tempfile`


@@ -11422,7 +11484,7 @@ fi
        rm -f "$cf_tempfile"
 
 fi
        rm -f "$cf_tempfile"
 
 fi

-echo "$as_me:11425: result: $cf_cv_ncurses_version" >&5
+echo "$as_me:11487: result: $cf_cv_ncurses_version" >&5

 echo "${ECHO_T}$cf_cv_ncurses_version" >&6
 test "$cf_cv_ncurses_version" = no ||
 cat >>confdefs.h <<\EOF
 echo "${ECHO_T}$cf_cv_ncurses_version" >&6
 test "$cf_cv_ncurses_version" = no ||
 cat >>confdefs.h <<\EOF


@@ -11435,7 +11497,7 @@ cf_nculib_root=$cf_cv_screen
        # to link gpm.
 cf_ncurses_LIBS=""
 cf_ncurses_SAVE="$LIBS"
        # to link gpm.
 cf_ncurses_LIBS=""
 cf_ncurses_SAVE="$LIBS"

-echo "$as_me:11438: checking for Gpm_Open in -lgpm" >&5
+echo "$as_me:11500: 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
 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


@@ -11443,7 +11505,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lgpm  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lgpm  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF

-#line 11446 "configure"
+#line 11508 "configure"

 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */


@@ -11462,16 +11524,16 @@ Gpm_Open ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"

-if { (eval echo "$as_me:11465: \"$ac_link\"") >&5
+if { (eval echo "$as_me:11527: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:11468: \$? = $ac_status" >&5
+  echo "$as_me:11530: \$? = $ac_status" >&5

   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'

-  { (eval echo "$as_me:11471: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11533: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:11474: \$? = $ac_status" >&5
+  echo "$as_me:11536: \$? = $ac_status" >&5

   (exit "$ac_status"); }; }; then
   ac_cv_lib_gpm_Gpm_Open=yes
 else
   (exit "$ac_status"); }; }; then
   ac_cv_lib_gpm_Gpm_Open=yes
 else


@@ -11482,10 +11544,10 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi

-echo "$as_me:11485: result: $ac_cv_lib_gpm_Gpm_Open" >&5
+echo "$as_me:11547: 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 "${ECHO_T}$ac_cv_lib_gpm_Gpm_Open" >&6
 if test "$ac_cv_lib_gpm_Gpm_Open" = yes; then

-  echo "$as_me:11488: checking for initscr in -lgpm" >&5
+  echo "$as_me:11550: 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
 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


@@ -11493,7 +11555,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lgpm  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lgpm  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF

-#line 11496 "configure"
+#line 11558 "configure"

 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */


@@ -11512,16 +11574,16 @@ initscr ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"

-if { (eval echo "$as_me:11515: \"$ac_link\"") >&5
+if { (eval echo "$as_me:11577: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:11518: \$? = $ac_status" >&5
+  echo "$as_me:11580: \$? = $ac_status" >&5

   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'

-  { (eval echo "$as_me:11521: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11583: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:11524: \$? = $ac_status" >&5
+  echo "$as_me:11586: \$? = $ac_status" >&5

   (exit "$ac_status"); }; }; then
   ac_cv_lib_gpm_initscr=yes
 else
   (exit "$ac_status"); }; }; then
   ac_cv_lib_gpm_initscr=yes
 else


@@ -11532,7 +11594,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi

-echo "$as_me:11535: result: $ac_cv_lib_gpm_initscr" >&5
+echo "$as_me:11597: 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"
 echo "${ECHO_T}$ac_cv_lib_gpm_initscr" >&6
 if test "$ac_cv_lib_gpm_initscr" = yes; then
   LIBS="$cf_ncurses_SAVE"


@@ -11547,7 +11609,7 @@ case "$host_os" in
        # 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
        # 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:11550: checking for tgoto in -lmytinfo" >&5
+               echo "$as_me:11612: 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
 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


@@ -11555,7 +11617,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lmytinfo  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lmytinfo  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF

-#line 11558 "configure"
+#line 11620 "configure"

 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */


@@ -11574,16 +11636,16 @@ tgoto ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"

-if { (eval echo "$as_me:11577: \"$ac_link\"") >&5
+if { (eval echo "$as_me:11639: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:11580: \$? = $ac_status" >&5
+  echo "$as_me:11642: \$? = $ac_status" >&5

   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'

-  { (eval echo "$as_me:11583: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11645: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:11586: \$? = $ac_status" >&5
+  echo "$as_me:11648: \$? = $ac_status" >&5

   (exit "$ac_status"); }; }; then
   ac_cv_lib_mytinfo_tgoto=yes
 else
   (exit "$ac_status"); }; }; then
   ac_cv_lib_mytinfo_tgoto=yes
 else


@@ -11594,7 +11656,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi

-echo "$as_me:11597: result: $ac_cv_lib_mytinfo_tgoto" >&5
+echo "$as_me:11659: 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"
 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"


@@ -11643,13 +11705,13 @@ else
 
        eval 'cf_cv_have_lib_'"$cf_nculib_root"'=no'
        cf_libdir=""
 
        eval 'cf_cv_have_lib_'"$cf_nculib_root"'=no'
        cf_libdir=""

-       echo "$as_me:11646: checking for initscr" >&5
+       echo "$as_me:11708: 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
 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 11652 "configure"
+#line 11714 "configure"

 #include "confdefs.h"
 #define initscr autoconf_temporary
 #include <limits.h>    /* least-intrusive standard header which defines gcc2 __stub macros */
 #include "confdefs.h"
 #define initscr autoconf_temporary
 #include <limits.h>    /* least-intrusive standard header which defines gcc2 __stub macros */


@@ -11680,16 +11742,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"

-if { (eval echo "$as_me:11683: \"$ac_link\"") >&5
+if { (eval echo "$as_me:11745: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:11686: \$? = $ac_status" >&5
+  echo "$as_me:11748: \$? = $ac_status" >&5

   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'

-  { (eval echo "$as_me:11689: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11751: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:11692: \$? = $ac_status" >&5
+  echo "$as_me:11754: \$? = $ac_status" >&5

   (exit "$ac_status"); }; }; then
   ac_cv_func_initscr=yes
 else
   (exit "$ac_status"); }; }; then
   ac_cv_func_initscr=yes
 else


@@ -11699,18 +11761,18 @@ ac_cv_func_initscr=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi

-echo "$as_me:11702: result: $ac_cv_func_initscr" >&5
+echo "$as_me:11764: 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 "${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:11709: checking for initscr in -l$cf_nculib_root" >&5
+               echo "$as_me:11771: 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
 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 11713 "configure"
+#line 11775 "configure"

 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int


@@ -11722,25 +11784,25 @@ initscr()
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"

-if { (eval echo "$as_me:11725: \"$ac_link\"") >&5
+if { (eval echo "$as_me:11787: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:11728: \$? = $ac_status" >&5
+  echo "$as_me:11790: \$? = $ac_status" >&5

   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'

-  { (eval echo "$as_me:11731: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11793: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:11734: \$? = $ac_status" >&5
+  echo "$as_me:11796: \$? = $ac_status" >&5

   (exit "$ac_status"); }; }; then
   (exit "$ac_status"); }; }; then

-  echo "$as_me:11736: result: yes" >&5
+  echo "$as_me:11798: 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 "${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:11743: result: no" >&5
+echo "$as_me:11805: result: no" >&5

 echo "${ECHO_T}no" >&6
 
 cf_search=
 echo "${ECHO_T}no" >&6
 
 cf_search=


@@ -11808,11 +11870,11 @@ cf_search="$cf_library_path_list $cf_search"
 
                        for cf_libdir in $cf_search
                        do
 
                        for cf_libdir in $cf_search
                        do

-                               echo "$as_me:11811: checking for -l$cf_nculib_root in $cf_libdir" >&5
+                               echo "$as_me:11873: 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
 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 11815 "configure"
+#line 11877 "configure"

 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int


@@ -11824,25 +11886,25 @@ initscr()
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"

-if { (eval echo "$as_me:11827: \"$ac_link\"") >&5
+if { (eval echo "$as_me:11889: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:11830: \$? = $ac_status" >&5
+  echo "$as_me:11892: \$? = $ac_status" >&5

   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'

-  { (eval echo "$as_me:11833: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11895: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:11836: \$? = $ac_status" >&5
+  echo "$as_me:11898: \$? = $ac_status" >&5

   (exit "$ac_status"); }; }; then
   (exit "$ac_status"); }; }; then

-  echo "$as_me:11838: result: yes" >&5
+  echo "$as_me:11900: 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 "${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:11845: result: no" >&5
+echo "$as_me:11907: result: no" >&5

 echo "${ECHO_T}no" >&6
                                         LIBS="$cf_save_LIBS"
 fi
 echo "${ECHO_T}no" >&6
                                         LIBS="$cf_save_LIBS"
 fi


@@ -11857,7 +11919,7 @@ fi
 eval 'cf_found_library="$cf_cv_have_lib_'"$cf_nculib_root"\"
 
 if test "$cf_found_library" = no ; then
 eval 'cf_found_library="$cf_cv_have_lib_'"$cf_nculib_root"\"
 
 if test "$cf_found_library" = no ; then

-       { { echo "$as_me:11860: error: Cannot link $cf_nculib_root library" >&5
+       { { echo "$as_me:11922: error: Cannot link $cf_nculib_root library" >&5

 echo "$as_me: error: Cannot link $cf_nculib_root library" >&2;}
    { (exit 1); exit 1; }; }
 fi
 echo "$as_me: error: Cannot link $cf_nculib_root library" >&2;}
    { (exit 1); exit 1; }; }
 fi


@@ -11865,7 +11927,7 @@ fi
 fi
 
 if test -n "$cf_ncurses_LIBS" ; then
 fi
 
 if test -n "$cf_ncurses_LIBS" ; then

-       echo "$as_me:11868: checking if we can link $cf_nculib_root without $cf_ncurses_LIBS" >&5
+       echo "$as_me:11930: 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
 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


@@ -11875,7 +11937,7 @@ echo $ECHO_N "checking if we can link $cf_nculib_root without $cf_ncurses_LIBS..
                fi
        done
        cat >"conftest.$ac_ext" <<_ACEOF
                fi
        done
        cat >"conftest.$ac_ext" <<_ACEOF

-#line 11878 "configure"
+#line 11940 "configure"

 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int


@@ -11887,23 +11949,23 @@ initscr(); mousemask(0,0); tigetstr((char *)0);
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"

-if { (eval echo "$as_me:11890: \"$ac_link\"") >&5
+if { (eval echo "$as_me:11952: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:11893: \$? = $ac_status" >&5
+  echo "$as_me:11955: \$? = $ac_status" >&5

   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'

-  { (eval echo "$as_me:11896: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11958: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:11899: \$? = $ac_status" >&5
+  echo "$as_me:11961: \$? = $ac_status" >&5

   (exit "$ac_status"); }; }; then
   (exit "$ac_status"); }; }; then

-  echo "$as_me:11901: result: yes" >&5
+  echo "$as_me:11963: result: yes" >&5

 echo "${ECHO_T}yes" >&6
 else
   echo "$as_me: failed program was:" >&5
 cat "conftest.$ac_ext" >&5
 echo "${ECHO_T}yes" >&6
 else
   echo "$as_me: failed program was:" >&5
 cat "conftest.$ac_ext" >&5

-echo "$as_me:11906: result: no" >&5
+echo "$as_me:11968: result: no" >&5

 echo "${ECHO_T}no" >&6
                 LIBS="$cf_ncurses_SAVE"
 fi
 echo "${ECHO_T}no" >&6
                 LIBS="$cf_ncurses_SAVE"
 fi


@@ -11923,7 +11985,7 @@ fi
 
        ;;
 (pdcurses)
 
        ;;
 (pdcurses)

-       echo "$as_me:11926: checking for X" >&5
+       echo "$as_me:11988: checking for X" >&5

 echo $ECHO_N "checking for X... $ECHO_C" >&6
 
 # Check whether --with-x or --without-x was given.
 echo $ECHO_N "checking for X... $ECHO_C" >&6
 
 # Check whether --with-x or --without-x was given.


@@ -12027,17 +12089,17 @@ if test "$ac_x_includes" = no; then
   # 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
   # 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 12030 "configure"
+#line 12092 "configure"

 #include "confdefs.h"
 #include <X11/Intrinsic.h>
 _ACEOF
 #include "confdefs.h"
 #include <X11/Intrinsic.h>
 _ACEOF

-if { (eval echo "$as_me:12034: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:12096: \"$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
   (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:12040: \$? = $ac_status" >&5
+  echo "$as_me:12102: \$? = $ac_status" >&5

   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag


@@ -12070,7 +12132,7 @@ if test "$ac_x_libraries" = no; then
   ac_save_LIBS=$LIBS
   LIBS="-lXt $LIBS"
   cat >"conftest.$ac_ext" <<_ACEOF
   ac_save_LIBS=$LIBS
   LIBS="-lXt $LIBS"
   cat >"conftest.$ac_ext" <<_ACEOF

-#line 12073 "configure"
+#line 12135 "configure"

 #include "confdefs.h"
 #include <X11/Intrinsic.h>
 int
 #include "confdefs.h"
 #include <X11/Intrinsic.h>
 int


@@ -12082,16 +12144,16 @@ XtMalloc (0)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"

-if { (eval echo "$as_me:12085: \"$ac_link\"") >&5
+if { (eval echo "$as_me:12147: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:12088: \$? = $ac_status" >&5
+  echo "$as_me:12150: \$? = $ac_status" >&5

   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'

-  { (eval echo "$as_me:12091: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12153: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:12094: \$? = $ac_status" >&5
+  echo "$as_me:12156: \$? = $ac_status" >&5

   (exit "$ac_status"); }; }; then
   LIBS=$ac_save_LIBS
 # We can link X programs with no special library path.
   (exit "$ac_status"); }; }; then
   LIBS=$ac_save_LIBS
 # We can link X programs with no special library path.


@@ -12129,7 +12191,7 @@ fi
 fi # $with_x != no
 
 if test "$have_x" != yes; then
 fi # $with_x != no
 
 if test "$have_x" != yes; then

-  echo "$as_me:12132: result: $have_x" >&5
+  echo "$as_me:12194: result: $have_x" >&5

 echo "${ECHO_T}$have_x" >&6
   no_x=yes
 else
 echo "${ECHO_T}$have_x" >&6
   no_x=yes
 else


@@ -12139,7 +12201,7 @@ else
   # 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"
   # 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:12142: result: libraries $x_libraries, headers $x_includes" >&5
+  echo "$as_me:12204: result: libraries $x_libraries, headers $x_includes" >&5

 echo "${ECHO_T}libraries $x_libraries, headers $x_includes" >&6
 fi
 
 echo "${ECHO_T}libraries $x_libraries, headers $x_includes" >&6
 fi
 


@@ -12166,11 +12228,11 @@ else
     # others require no space.  Words are not sufficient . . . .
     case `(uname -sr) 2>/dev/null` in
     "SunOS 5"*)
     # others require no space.  Words are not sufficient . . . .
     case `(uname -sr) 2>/dev/null` in
     "SunOS 5"*)

-      echo "$as_me:12169: checking whether -R must be followed by a space" >&5
+      echo "$as_me:12231: 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
 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 12173 "configure"
+#line 12235 "configure"

 #include "confdefs.h"
 
 int
 #include "confdefs.h"
 
 int


@@ -12182,16 +12244,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"

-if { (eval echo "$as_me:12185: \"$ac_link\"") >&5
+if { (eval echo "$as_me:12247: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:12188: \$? = $ac_status" >&5
+  echo "$as_me:12250: \$? = $ac_status" >&5

   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'

-  { (eval echo "$as_me:12191: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12253: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:12194: \$? = $ac_status" >&5
+  echo "$as_me:12256: \$? = $ac_status" >&5

   (exit "$ac_status"); }; }; then
   ac_R_nospace=yes
 else
   (exit "$ac_status"); }; }; then
   ac_R_nospace=yes
 else


@@ -12201,13 +12263,13 @@ ac_R_nospace=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
       if test $ac_R_nospace = yes; then
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
       if test $ac_R_nospace = yes; then

-       echo "$as_me:12204: result: no" >&5
+       echo "$as_me:12266: 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
 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 12210 "configure"
+#line 12272 "configure"

 #include "confdefs.h"
 
 int
 #include "confdefs.h"
 
 int


@@ -12219,16 +12281,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"

-if { (eval echo "$as_me:12222: \"$ac_link\"") >&5
+if { (eval echo "$as_me:12284: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:12225: \$? = $ac_status" >&5
+  echo "$as_me:12287: \$? = $ac_status" >&5

   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'

-  { (eval echo "$as_me:12228: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12290: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:12231: \$? = $ac_status" >&5
+  echo "$as_me:12293: \$? = $ac_status" >&5

   (exit "$ac_status"); }; }; then
   ac_R_space=yes
 else
   (exit "$ac_status"); }; }; then
   ac_R_space=yes
 else


@@ -12238,11 +12300,11 @@ ac_R_space=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
        if test $ac_R_space = yes; then
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
        if test $ac_R_space = yes; then

-         echo "$as_me:12241: result: yes" >&5
+         echo "$as_me:12303: result: yes" >&5

 echo "${ECHO_T}yes" >&6
          X_LIBS="$X_LIBS -R $x_libraries"
        else
 echo "${ECHO_T}yes" >&6
          X_LIBS="$X_LIBS -R $x_libraries"
        else

-         echo "$as_me:12245: result: neither works" >&5
+         echo "$as_me:12307: result: neither works" >&5

 echo "${ECHO_T}neither works" >&6
        fi
       fi
 echo "${ECHO_T}neither works" >&6
        fi
       fi


@@ -12262,7 +12324,7 @@ echo "${ECHO_T}neither works" >&6
     # the Alpha needs dnet_stub (dnet does not exist).
     ac_xsave_LIBS="$LIBS"; LIBS="$LIBS $X_LIBS -lX11"
     cat >"conftest.$ac_ext" <<_ACEOF
     # the Alpha needs dnet_stub (dnet does not exist).
     ac_xsave_LIBS="$LIBS"; LIBS="$LIBS $X_LIBS -lX11"
     cat >"conftest.$ac_ext" <<_ACEOF

-#line 12265 "configure"
+#line 12327 "configure"

 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */


@@ -12281,22 +12343,22 @@ XOpenDisplay ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"

-if { (eval echo "$as_me:12284: \"$ac_link\"") >&5
+if { (eval echo "$as_me:12346: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:12287: \$? = $ac_status" >&5
+  echo "$as_me:12349: \$? = $ac_status" >&5

   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'

-  { (eval echo "$as_me:12290: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12352: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:12293: \$? = $ac_status" >&5
+  echo "$as_me:12355: \$? = $ac_status" >&5

   (exit "$ac_status"); }; }; then
   :
 else
   echo "$as_me: failed program was:" >&5
 cat "conftest.$ac_ext" >&5
   (exit "$ac_status"); }; }; then
   :
 else
   echo "$as_me: failed program was:" >&5
 cat "conftest.$ac_ext" >&5

-echo "$as_me:12299: checking for dnet_ntoa in -ldnet" >&5
+echo "$as_me:12361: 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
 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


@@ -12304,7 +12366,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldnet  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldnet  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF

-#line 12307 "configure"
+#line 12369 "configure"

 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */


@@ -12323,16 +12385,16 @@ dnet_ntoa ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"

-if { (eval echo "$as_me:12326: \"$ac_link\"") >&5
+if { (eval echo "$as_me:12388: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:12329: \$? = $ac_status" >&5
+  echo "$as_me:12391: \$? = $ac_status" >&5

   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'

-  { (eval echo "$as_me:12332: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12394: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:12335: \$? = $ac_status" >&5
+  echo "$as_me:12397: \$? = $ac_status" >&5

   (exit "$ac_status"); }; }; then
   ac_cv_lib_dnet_dnet_ntoa=yes
 else
   (exit "$ac_status"); }; }; then
   ac_cv_lib_dnet_dnet_ntoa=yes
 else


@@ -12343,14 +12405,14 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi

-echo "$as_me:12346: result: $ac_cv_lib_dnet_dnet_ntoa" >&5
+echo "$as_me:12408: 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 "${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:12353: checking for dnet_ntoa in -ldnet_stub" >&5
+      echo "$as_me:12415: 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
 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


@@ -12358,7 +12420,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldnet_stub  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldnet_stub  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF

-#line 12361 "configure"
+#line 12423 "configure"

 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */


@@ -12377,16 +12439,16 @@ dnet_ntoa ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"

-if { (eval echo "$as_me:12380: \"$ac_link\"") >&5
+if { (eval echo "$as_me:12442: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:12383: \$? = $ac_status" >&5
+  echo "$as_me:12445: \$? = $ac_status" >&5

   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'

-  { (eval echo "$as_me:12386: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12448: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:12389: \$? = $ac_status" >&5
+  echo "$as_me:12451: \$? = $ac_status" >&5

   (exit "$ac_status"); }; }; then
   ac_cv_lib_dnet_stub_dnet_ntoa=yes
 else
   (exit "$ac_status"); }; }; then
   ac_cv_lib_dnet_stub_dnet_ntoa=yes
 else


@@ -12397,7 +12459,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi

-echo "$as_me:12400: result: $ac_cv_lib_dnet_stub_dnet_ntoa" >&5
+echo "$as_me:12462: 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"
 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"


@@ -12416,13 +12478,13 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
     # 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.
     # 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:12419: checking for gethostbyname" >&5
+    echo "$as_me:12481: 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
 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 12425 "configure"
+#line 12487 "configure"

 #include "confdefs.h"
 #define gethostbyname autoconf_temporary
 #include <limits.h>    /* least-intrusive standard header which defines gcc2 __stub macros */
 #include "confdefs.h"
 #define gethostbyname autoconf_temporary
 #include <limits.h>    /* least-intrusive standard header which defines gcc2 __stub macros */


@@ -12453,16 +12515,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"

-if { (eval echo "$as_me:12456: \"$ac_link\"") >&5
+if { (eval echo "$as_me:12518: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:12459: \$? = $ac_status" >&5
+  echo "$as_me:12521: \$? = $ac_status" >&5

   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'

-  { (eval echo "$as_me:12462: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12524: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:12465: \$? = $ac_status" >&5
+  echo "$as_me:12527: \$? = $ac_status" >&5

   (exit "$ac_status"); }; }; then
   ac_cv_func_gethostbyname=yes
 else
   (exit "$ac_status"); }; }; then
   ac_cv_func_gethostbyname=yes
 else


@@ -12472,11 +12534,11 @@ ac_cv_func_gethostbyname=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi

-echo "$as_me:12475: result: $ac_cv_func_gethostbyname" >&5
+echo "$as_me:12537: result: $ac_cv_func_gethostbyname" >&5

 echo "${ECHO_T}$ac_cv_func_gethostbyname" >&6
 
     if test $ac_cv_func_gethostbyname = no; then
 echo "${ECHO_T}$ac_cv_func_gethostbyname" >&6
 
     if test $ac_cv_func_gethostbyname = no; then

-      echo "$as_me:12479: checking for gethostbyname in -lnsl" >&5
+      echo "$as_me:12541: 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
 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


@@ -12484,7 +12546,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lnsl  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lnsl  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF

-#line 12487 "configure"
+#line 12549 "configure"

 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */


@@ -12503,16 +12565,16 @@ gethostbyname ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"

-if { (eval echo "$as_me:12506: \"$ac_link\"") >&5
+if { (eval echo "$as_me:12568: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:12509: \$? = $ac_status" >&5
+  echo "$as_me:12571: \$? = $ac_status" >&5

   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'

-  { (eval echo "$as_me:12512: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12574: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:12515: \$? = $ac_status" >&5
+  echo "$as_me:12577: \$? = $ac_status" >&5

   (exit "$ac_status"); }; }; then
   ac_cv_lib_nsl_gethostbyname=yes
 else
   (exit "$ac_status"); }; }; then
   ac_cv_lib_nsl_gethostbyname=yes
 else


@@ -12523,14 +12585,14 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi

-echo "$as_me:12526: result: $ac_cv_lib_nsl_gethostbyname" >&5
+echo "$as_me:12588: 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 "${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:12533: checking for gethostbyname in -lbsd" >&5
+        echo "$as_me:12595: 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
 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


@@ -12538,7 +12600,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lbsd  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lbsd  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF

-#line 12541 "configure"
+#line 12603 "configure"

 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */


@@ -12557,16 +12619,16 @@ gethostbyname ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"

-if { (eval echo "$as_me:12560: \"$ac_link\"") >&5
+if { (eval echo "$as_me:12622: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:12563: \$? = $ac_status" >&5
+  echo "$as_me:12625: \$? = $ac_status" >&5

   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'

-  { (eval echo "$as_me:12566: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12628: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:12569: \$? = $ac_status" >&5
+  echo "$as_me:12631: \$? = $ac_status" >&5

   (exit "$ac_status"); }; }; then
   ac_cv_lib_bsd_gethostbyname=yes
 else
   (exit "$ac_status"); }; }; then
   ac_cv_lib_bsd_gethostbyname=yes
 else


@@ -12577,7 +12639,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi

-echo "$as_me:12580: result: $ac_cv_lib_bsd_gethostbyname" >&5
+echo "$as_me:12642: 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"
 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"


@@ -12593,13 +12655,13 @@ fi
     # 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.
     # 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:12596: checking for connect" >&5
+    echo "$as_me:12658: 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
 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 12602 "configure"
+#line 12664 "configure"

 #include "confdefs.h"
 #define connect autoconf_temporary
 #include <limits.h>    /* least-intrusive standard header which defines gcc2 __stub macros */
 #include "confdefs.h"
 #define connect autoconf_temporary
 #include <limits.h>    /* least-intrusive standard header which defines gcc2 __stub macros */


@@ -12630,16 +12692,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"

-if { (eval echo "$as_me:12633: \"$ac_link\"") >&5
+if { (eval echo "$as_me:12695: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:12636: \$? = $ac_status" >&5
+  echo "$as_me:12698: \$? = $ac_status" >&5

   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'

-  { (eval echo "$as_me:12639: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12701: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:12642: \$? = $ac_status" >&5
+  echo "$as_me:12704: \$? = $ac_status" >&5

   (exit "$ac_status"); }; }; then
   ac_cv_func_connect=yes
 else
   (exit "$ac_status"); }; }; then
   ac_cv_func_connect=yes
 else


@@ -12649,11 +12711,11 @@ ac_cv_func_connect=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi

-echo "$as_me:12652: result: $ac_cv_func_connect" >&5
+echo "$as_me:12714: result: $ac_cv_func_connect" >&5

 echo "${ECHO_T}$ac_cv_func_connect" >&6
 
     if test $ac_cv_func_connect = no; then
 echo "${ECHO_T}$ac_cv_func_connect" >&6
 
     if test $ac_cv_func_connect = no; then

-      echo "$as_me:12656: checking for connect in -lsocket" >&5
+      echo "$as_me:12718: 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
 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


@@ -12661,7 +12723,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lsocket $X_EXTRA_LIBS $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lsocket $X_EXTRA_LIBS $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF

-#line 12664 "configure"
+#line 12726 "configure"

 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */


@@ -12680,16 +12742,16 @@ connect ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"

-if { (eval echo "$as_me:12683: \"$ac_link\"") >&5
+if { (eval echo "$as_me:12745: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:12686: \$? = $ac_status" >&5
+  echo "$as_me:12748: \$? = $ac_status" >&5

   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'

-  { (eval echo "$as_me:12689: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12751: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:12692: \$? = $ac_status" >&5
+  echo "$as_me:12754: \$? = $ac_status" >&5

   (exit "$ac_status"); }; }; then
   ac_cv_lib_socket_connect=yes
 else
   (exit "$ac_status"); }; }; then
   ac_cv_lib_socket_connect=yes
 else


@@ -12700,7 +12762,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi

-echo "$as_me:12703: result: $ac_cv_lib_socket_connect" >&5
+echo "$as_me:12765: 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"
 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"


@@ -12709,13 +12771,13 @@ fi
     fi
 
     # Guillermo Gomez says -lposix is necessary on A/UX.
     fi
 
     # Guillermo Gomez says -lposix is necessary on A/UX.

-    echo "$as_me:12712: checking for remove" >&5
+    echo "$as_me:12774: 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
 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 12718 "configure"
+#line 12780 "configure"

 #include "confdefs.h"
 #define remove autoconf_temporary
 #include <limits.h>    /* least-intrusive standard header which defines gcc2 __stub macros */
 #include "confdefs.h"
 #define remove autoconf_temporary
 #include <limits.h>    /* least-intrusive standard header which defines gcc2 __stub macros */


@@ -12746,16 +12808,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"

-if { (eval echo "$as_me:12749: \"$ac_link\"") >&5
+if { (eval echo "$as_me:12811: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:12752: \$? = $ac_status" >&5
+  echo "$as_me:12814: \$? = $ac_status" >&5

   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'

-  { (eval echo "$as_me:12755: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12817: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:12758: \$? = $ac_status" >&5
+  echo "$as_me:12820: \$? = $ac_status" >&5

   (exit "$ac_status"); }; }; then
   ac_cv_func_remove=yes
 else
   (exit "$ac_status"); }; }; then
   ac_cv_func_remove=yes
 else


@@ -12765,11 +12827,11 @@ ac_cv_func_remove=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi

-echo "$as_me:12768: result: $ac_cv_func_remove" >&5
+echo "$as_me:12830: result: $ac_cv_func_remove" >&5

 echo "${ECHO_T}$ac_cv_func_remove" >&6
 
     if test $ac_cv_func_remove = no; then
 echo "${ECHO_T}$ac_cv_func_remove" >&6
 
     if test $ac_cv_func_remove = no; then

-      echo "$as_me:12772: checking for remove in -lposix" >&5
+      echo "$as_me:12834: 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
 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


@@ -12777,7 +12839,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lposix  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lposix  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF

-#line 12780 "configure"
+#line 12842 "configure"

 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */


@@ -12796,16 +12858,16 @@ remove ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"

-if { (eval echo "$as_me:12799: \"$ac_link\"") >&5
+if { (eval echo "$as_me:12861: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:12802: \$? = $ac_status" >&5
+  echo "$as_me:12864: \$? = $ac_status" >&5

   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'

-  { (eval echo "$as_me:12805: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12867: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:12808: \$? = $ac_status" >&5
+  echo "$as_me:12870: \$? = $ac_status" >&5

   (exit "$ac_status"); }; }; then
   ac_cv_lib_posix_remove=yes
 else
   (exit "$ac_status"); }; }; then
   ac_cv_lib_posix_remove=yes
 else


@@ -12816,7 +12878,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi

-echo "$as_me:12819: result: $ac_cv_lib_posix_remove" >&5
+echo "$as_me:12881: 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"
 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"


@@ -12825,13 +12887,13 @@ fi
     fi
 
     # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay.
     fi
 
     # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay.

-    echo "$as_me:12828: checking for shmat" >&5
+    echo "$as_me:12890: 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
 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 12834 "configure"
+#line 12896 "configure"

 #include "confdefs.h"
 #define shmat autoconf_temporary
 #include <limits.h>    /* least-intrusive standard header which defines gcc2 __stub macros */
 #include "confdefs.h"
 #define shmat autoconf_temporary
 #include <limits.h>    /* least-intrusive standard header which defines gcc2 __stub macros */


@@ -12862,16 +12924,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"

-if { (eval echo "$as_me:12865: \"$ac_link\"") >&5
+if { (eval echo "$as_me:12927: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:12868: \$? = $ac_status" >&5
+  echo "$as_me:12930: \$? = $ac_status" >&5

   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'

-  { (eval echo "$as_me:12871: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12933: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:12874: \$? = $ac_status" >&5
+  echo "$as_me:12936: \$? = $ac_status" >&5

   (exit "$ac_status"); }; }; then
   ac_cv_func_shmat=yes
 else
   (exit "$ac_status"); }; }; then
   ac_cv_func_shmat=yes
 else


@@ -12881,11 +12943,11 @@ ac_cv_func_shmat=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi

-echo "$as_me:12884: result: $ac_cv_func_shmat" >&5
+echo "$as_me:12946: result: $ac_cv_func_shmat" >&5

 echo "${ECHO_T}$ac_cv_func_shmat" >&6
 
     if test $ac_cv_func_shmat = no; then
 echo "${ECHO_T}$ac_cv_func_shmat" >&6
 
     if test $ac_cv_func_shmat = no; then

-      echo "$as_me:12888: checking for shmat in -lipc" >&5
+      echo "$as_me:12950: 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
 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


@@ -12893,7 +12955,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lipc  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lipc  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF

-#line 12896 "configure"
+#line 12958 "configure"

 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */


@@ -12912,16 +12974,16 @@ shmat ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"

-if { (eval echo "$as_me:12915: \"$ac_link\"") >&5
+if { (eval echo "$as_me:12977: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:12918: \$? = $ac_status" >&5
+  echo "$as_me:12980: \$? = $ac_status" >&5

   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'

-  { (eval echo "$as_me:12921: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12983: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:12924: \$? = $ac_status" >&5
+  echo "$as_me:12986: \$? = $ac_status" >&5

   (exit "$ac_status"); }; }; then
   ac_cv_lib_ipc_shmat=yes
 else
   (exit "$ac_status"); }; }; then
   ac_cv_lib_ipc_shmat=yes
 else


@@ -12932,7 +12994,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi

-echo "$as_me:12935: result: $ac_cv_lib_ipc_shmat" >&5
+echo "$as_me:12997: 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"
 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"


@@ -12950,7 +13012,7 @@ fi
   # 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
   # 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:12953: checking for IceConnectionNumber in -lICE" >&5
+  echo "$as_me:13015: 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
 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


@@ -12958,7 +13020,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lICE $X_EXTRA_LIBS $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lICE $X_EXTRA_LIBS $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF

-#line 12961 "configure"
+#line 13023 "configure"

 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */


@@ -12977,16 +13039,16 @@ IceConnectionNumber ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"

-if { (eval echo "$as_me:12980: \"$ac_link\"") >&5
+if { (eval echo "$as_me:13042: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:12983: \$? = $ac_status" >&5
+  echo "$as_me:13045: \$? = $ac_status" >&5

   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'

-  { (eval echo "$as_me:12986: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13048: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:12989: \$? = $ac_status" >&5
+  echo "$as_me:13051: \$? = $ac_status" >&5

   (exit "$ac_status"); }; }; then
   ac_cv_lib_ICE_IceConnectionNumber=yes
 else
   (exit "$ac_status"); }; }; then
   ac_cv_lib_ICE_IceConnectionNumber=yes
 else


@@ -12997,7 +13059,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi

-echo "$as_me:13000: result: $ac_cv_lib_ICE_IceConnectionNumber" >&5
+echo "$as_me:13062: 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"
 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"


@@ -13009,7 +13071,7 @@ fi
 
 cf_x_athena=${cf_x_athena:-Xaw}
 
 
 cf_x_athena=${cf_x_athena:-Xaw}
 

-echo "$as_me:13012: checking if you want to link with Xaw 3d library" >&5
+echo "$as_me:13074: 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=
 
 echo $ECHO_N "checking if you want to link with Xaw 3d library... $ECHO_C" >&6
 withval=
 


@@ -13020,14 +13082,14 @@ if test "${with_Xaw3d+set}" = set; then
 fi;
 if test "$withval" = yes ; then
        cf_x_athena=Xaw3d
 fi;
 if test "$withval" = yes ; then
        cf_x_athena=Xaw3d

-       echo "$as_me:13023: result: yes" >&5
+       echo "$as_me:13085: result: yes" >&5

 echo "${ECHO_T}yes" >&6
 else
 echo "${ECHO_T}yes" >&6
 else

-       echo "$as_me:13026: result: no" >&5
+       echo "$as_me:13088: result: no" >&5

 echo "${ECHO_T}no" >&6
 fi
 
 echo "${ECHO_T}no" >&6
 fi
 

-echo "$as_me:13030: checking if you want to link with Xaw 3d xft library" >&5
+echo "$as_me:13092: 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=
 
 echo $ECHO_N "checking if you want to link with Xaw 3d xft library... $ECHO_C" >&6
 withval=
 


@@ -13038,14 +13100,14 @@ if test "${with_Xaw3dxft+set}" = set; then
 fi;
 if test "$withval" = yes ; then
        cf_x_athena=Xaw3dxft
 fi;
 if test "$withval" = yes ; then
        cf_x_athena=Xaw3dxft

-       echo "$as_me:13041: result: yes" >&5
+       echo "$as_me:13103: result: yes" >&5

 echo "${ECHO_T}yes" >&6
 else
 echo "${ECHO_T}yes" >&6
 else

-       echo "$as_me:13044: result: no" >&5
+       echo "$as_me:13106: result: no" >&5

 echo "${ECHO_T}no" >&6
 fi
 
 echo "${ECHO_T}no" >&6
 fi
 

-echo "$as_me:13048: checking if you want to link with neXT Athena library" >&5
+echo "$as_me:13110: 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=
 
 echo $ECHO_N "checking if you want to link with neXT Athena library... $ECHO_C" >&6
 withval=
 


@@ -13056,14 +13118,14 @@ if test "${with_neXtaw+set}" = set; then
 fi;
 if test "$withval" = yes ; then
        cf_x_athena=neXtaw
 fi;
 if test "$withval" = yes ; then
        cf_x_athena=neXtaw

-       echo "$as_me:13059: result: yes" >&5
+       echo "$as_me:13121: result: yes" >&5

 echo "${ECHO_T}yes" >&6
 else
 echo "${ECHO_T}yes" >&6
 else

-       echo "$as_me:13062: result: no" >&5
+       echo "$as_me:13124: result: no" >&5

 echo "${ECHO_T}no" >&6
 fi
 
 echo "${ECHO_T}no" >&6
 fi
 

-echo "$as_me:13066: checking if you want to link with Athena-Plus library" >&5
+echo "$as_me:13128: 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=
 
 echo $ECHO_N "checking if you want to link with Athena-Plus library... $ECHO_C" >&6
 withval=
 


@@ -13074,10 +13136,10 @@ if test "${with_XawPlus+set}" = set; then
 fi;
 if test "$withval" = yes ; then
        cf_x_athena=XawPlus
 fi;
 if test "$withval" = yes ; then
        cf_x_athena=XawPlus

-       echo "$as_me:13077: result: yes" >&5
+       echo "$as_me:13139: result: yes" >&5

 echo "${ECHO_T}yes" >&6
 else
 echo "${ECHO_T}yes" >&6
 else

-       echo "$as_me:13080: result: no" >&5
+       echo "$as_me:13142: result: no" >&5

 echo "${ECHO_T}no" >&6
 fi
 
 echo "${ECHO_T}no" >&6
 fi
 


@@ -13097,17 +13159,17 @@ if test "$PKG_CONFIG" != none ; then
 if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists "$cf_athena_pkg"; then
        test -n "$verbose" && echo "    found package $cf_athena_pkg" 1>&6
 
 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}:13100: testing found package $cf_athena_pkg ..." 1>&5
+echo "${as_me:-configure}:13162: 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
 
 
        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}:13106: testing package $cf_athena_pkg CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+echo "${as_me:-configure}:13168: 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
 
 
        test -n "$verbose" && echo "    package $cf_athena_pkg LIBS: $cf_pkgconfig_libs" 1>&6
 

-echo "${as_me:-configure}:13110: testing package $cf_athena_pkg LIBS: $cf_pkgconfig_libs ..." 1>&5
+echo "${as_me:-configure}:13172: testing package $cf_athena_pkg LIBS: $cf_pkgconfig_libs ..." 1>&5

 
 cf_fix_cppflags=no
 cf_new_cflags=
 
 cf_fix_cppflags=no
 cf_new_cflags=


@@ -13238,20 +13300,20 @@ EOF
                        LIBS=`echo "$LIBS " | sed -e 's/  / /g' -e 's%-l'"$cf_trim_lib"' %%' -e 's/ $//'`
                        test -n "$verbose" && echo "    ..trimmed $LIBS" 1>&6
 
                        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}:13241: testing ..trimmed $LIBS ..." 1>&5
+echo "${as_me:-configure}:13303: testing ..trimmed $LIBS ..." 1>&5

 
                        ;;
                esac
        done
 
 
                        ;;
                esac
        done
 

-echo "$as_me:13247: checking for usable $cf_x_athena/Xmu package" >&5
+echo "$as_me:13309: 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
 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 13254 "configure"
+#line 13316 "configure"

 #include "confdefs.h"
 
 #include <X11/Xmu/CharSet.h>
 #include "confdefs.h"
 
 #include <X11/Xmu/CharSet.h>


@@ -13268,16 +13330,16 @@ int check = XmuCompareISOLatin1("big", "small");
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"

-if { (eval echo "$as_me:13271: \"$ac_link\"") >&5
+if { (eval echo "$as_me:13333: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:13274: \$? = $ac_status" >&5
+  echo "$as_me:13336: \$? = $ac_status" >&5

   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'

-  { (eval echo "$as_me:13277: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13339: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:13280: \$? = $ac_status" >&5
+  echo "$as_me:13342: \$? = $ac_status" >&5

   (exit "$ac_status"); }; }; then
   cf_cv_xaw_compat=yes
 else
   (exit "$ac_status"); }; }; then
   cf_cv_xaw_compat=yes
 else


@@ -13287,7 +13349,7 @@ cf_cv_xaw_compat=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi

-echo "$as_me:13290: result: $cf_cv_xaw_compat" >&5
+echo "$as_me:13352: result: $cf_cv_xaw_compat" >&5

 echo "${ECHO_T}$cf_cv_xaw_compat" >&6
 
                        if test "$cf_cv_xaw_compat" = no
 echo "${ECHO_T}$cf_cv_xaw_compat" >&6
 
                        if test "$cf_cv_xaw_compat" = no


@@ -13299,7 +13361,7 @@ echo "${ECHO_T}$cf_cv_xaw_compat" >&6
                                (*)
                                        test -n "$verbose" && echo "    work around broken package" 1>&6
 
                                (*)
                                        test -n "$verbose" && echo "    work around broken package" 1>&6
 

-echo "${as_me:-configure}:13302: testing work around broken package ..." 1>&5
+echo "${as_me:-configure}:13364: testing work around broken package ..." 1>&5

 
                                        cf_save_xmu="$LIBS"
                                        cf_first_lib=`echo "$cf_save_xmu" | sed -e 's/^  *//' -e 's/ .*//'`
 
                                        cf_save_xmu="$LIBS"
                                        cf_first_lib=`echo "$cf_save_xmu" | sed -e 's/^  *//' -e 's/ .*//'`


@@ -13307,17 +13369,17 @@ echo "${as_me:-configure}:13302: testing work around broken package ..." 1>&5
 if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists "xmu"; then
        test -n "$verbose" && echo "    found package xmu" 1>&6
 
 if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists "xmu"; then
        test -n "$verbose" && echo "    found package xmu" 1>&6
 

-echo "${as_me:-configure}:13310: testing found package xmu ..." 1>&5
+echo "${as_me:-configure}:13372: 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
 
 
        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}:13316: testing package xmu CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+echo "${as_me:-configure}:13378: testing package xmu CFLAGS: $cf_pkgconfig_incs ..." 1>&5

 
        test -n "$verbose" && echo "    package xmu LIBS: $cf_pkgconfig_libs" 1>&6
 
 
        test -n "$verbose" && echo "    package xmu LIBS: $cf_pkgconfig_libs" 1>&6
 

-echo "${as_me:-configure}:13320: testing package xmu LIBS: $cf_pkgconfig_libs ..." 1>&5
+echo "${as_me:-configure}:13382: testing package xmu LIBS: $cf_pkgconfig_libs ..." 1>&5

 
 cf_fix_cppflags=no
 cf_new_cflags=
 
 cf_fix_cppflags=no
 cf_new_cflags=


@@ -13437,12 +13499,12 @@ LIBS="$cf_add_libs"
 
 test -n "$verbose" && echo "   ...before $LIBS" 1>&6
 
 
 test -n "$verbose" && echo "   ...before $LIBS" 1>&6
 

-echo "${as_me:-configure}:13440: testing ...before $LIBS ..." 1>&5
+echo "${as_me:-configure}:13502: 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
 
 
 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}:13445: testing ...after  $LIBS ..." 1>&5
+echo "${as_me:-configure}:13507: testing ...after  $LIBS ..." 1>&5

 
 else
        cf_pkgconfig_incs=
 
 else
        cf_pkgconfig_incs=


@@ -13450,12 +13512,12 @@ else
 
 test -n "$verbose" && echo "   ...before $LIBS" 1>&6
 
 
 test -n "$verbose" && echo "   ...before $LIBS" 1>&6
 

-echo "${as_me:-configure}:13453: testing ...before $LIBS ..." 1>&5
+echo "${as_me:-configure}:13515: 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
 
 
 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}:13458: testing ...after  $LIBS ..." 1>&5
+echo "${as_me:-configure}:13520: testing ...after  $LIBS ..." 1>&5

 
 fi
 
 
 fi
 


@@ -13466,7 +13528,7 @@ fi
                        LIBS=`echo "$LIBS " | sed -e 's/  / /g' -e 's%-l'"$cf_trim_lib"' %%' -e 's/ $//'`
                        test -n "$verbose" && echo "    ..trimmed $LIBS" 1>&6
 
                        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}:13469: testing ..trimmed $LIBS ..." 1>&5
+echo "${as_me:-configure}:13531: testing ..trimmed $LIBS ..." 1>&5

 
                        ;;
                esac
 
                        ;;
                esac


@@ -13491,17 +13553,17 @@ if test -z "$cf_x_athena_lib" ; then
 if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists "Xext"; then
        test -n "$verbose" && echo "    found package Xext" 1>&6
 
 if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists "Xext"; then
        test -n "$verbose" && echo "    found package Xext" 1>&6
 

-echo "${as_me:-configure}:13494: testing found package Xext ..." 1>&5
+echo "${as_me:-configure}:13556: 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
 
 
        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}:13500: testing package Xext CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+echo "${as_me:-configure}:13562: testing package Xext CFLAGS: $cf_pkgconfig_incs ..." 1>&5

 
        test -n "$verbose" && echo "    package Xext LIBS: $cf_pkgconfig_libs" 1>&6
 
 
        test -n "$verbose" && echo "    package Xext LIBS: $cf_pkgconfig_libs" 1>&6
 

-echo "${as_me:-configure}:13504: testing package Xext LIBS: $cf_pkgconfig_libs ..." 1>&5
+echo "${as_me:-configure}:13566: testing package Xext LIBS: $cf_pkgconfig_libs ..." 1>&5

 
 cf_fix_cppflags=no
 cf_new_cflags=
 
 cf_fix_cppflags=no
 cf_new_cflags=


@@ -13622,7 +13684,7 @@ else
        cf_pkgconfig_incs=
        cf_pkgconfig_libs=
 
        cf_pkgconfig_incs=
        cf_pkgconfig_libs=
 

-       echo "$as_me:13625: checking for XextCreateExtension in -lXext" >&5
+       echo "$as_me:13687: 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
 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


@@ -13630,7 +13692,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lXext  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lXext  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF

-#line 13633 "configure"
+#line 13695 "configure"

 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */


@@ -13649,16 +13711,16 @@ XextCreateExtension ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"

-if { (eval echo "$as_me:13652: \"$ac_link\"") >&5
+if { (eval echo "$as_me:13714: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:13655: \$? = $ac_status" >&5
+  echo "$as_me:13717: \$? = $ac_status" >&5

   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'

-  { (eval echo "$as_me:13658: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13720: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:13661: \$? = $ac_status" >&5
+  echo "$as_me:13723: \$? = $ac_status" >&5

   (exit "$ac_status"); }; }; then
   ac_cv_lib_Xext_XextCreateExtension=yes
 else
   (exit "$ac_status"); }; }; then
   ac_cv_lib_Xext_XextCreateExtension=yes
 else


@@ -13669,7 +13731,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi

-echo "$as_me:13672: result: $ac_cv_lib_Xext_XextCreateExtension" >&5
+echo "$as_me:13734: 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
 
 echo "${ECHO_T}$ac_cv_lib_Xext_XextCreateExtension" >&6
 if test "$ac_cv_lib_Xext_XextCreateExtension" = yes; then
 


@@ -13705,17 +13767,17 @@ then
 if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists "x11"; then
        test -n "$verbose" && echo "    found package x11" 1>&6
 
 if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists "x11"; then
        test -n "$verbose" && echo "    found package x11" 1>&6
 

-echo "${as_me:-configure}:13708: testing found package x11 ..." 1>&5
+echo "${as_me:-configure}:13770: 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
 
 
        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}:13714: testing package x11 CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+echo "${as_me:-configure}:13776: testing package x11 CFLAGS: $cf_pkgconfig_incs ..." 1>&5

 
        test -n "$verbose" && echo "    package x11 LIBS: $cf_pkgconfig_libs" 1>&6
 
 
        test -n "$verbose" && echo "    package x11 LIBS: $cf_pkgconfig_libs" 1>&6
 

-echo "${as_me:-configure}:13718: testing package x11 LIBS: $cf_pkgconfig_libs ..." 1>&5
+echo "${as_me:-configure}:13780: testing package x11 LIBS: $cf_pkgconfig_libs ..." 1>&5

 
 cf_fix_cppflags=no
 cf_new_cflags=
 
 cf_fix_cppflags=no
 cf_new_cflags=


@@ -13835,24 +13897,24 @@ LIBS="$cf_add_libs"
 else
        cf_pkgconfig_incs=
        cf_pkgconfig_libs=
 else
        cf_pkgconfig_incs=
        cf_pkgconfig_libs=

-       { echo "$as_me:13838: WARNING: unable to find X11 library" >&5
+       { echo "$as_me:13900: 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: 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}:13845: testing found package ice ..." 1>&5
+echo "${as_me:-configure}:13907: 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
 
 
        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}:13851: testing package ice CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+echo "${as_me:-configure}:13913: testing package ice CFLAGS: $cf_pkgconfig_incs ..." 1>&5

 
        test -n "$verbose" && echo "    package ice LIBS: $cf_pkgconfig_libs" 1>&6
 
 
        test -n "$verbose" && echo "    package ice LIBS: $cf_pkgconfig_libs" 1>&6
 

-echo "${as_me:-configure}:13855: testing package ice LIBS: $cf_pkgconfig_libs ..." 1>&5
+echo "${as_me:-configure}:13917: testing package ice LIBS: $cf_pkgconfig_libs ..." 1>&5

 
 cf_fix_cppflags=no
 cf_new_cflags=
 
 cf_fix_cppflags=no
 cf_new_cflags=


@@ -13972,24 +14034,24 @@ LIBS="$cf_add_libs"
 else
        cf_pkgconfig_incs=
        cf_pkgconfig_libs=
 else
        cf_pkgconfig_incs=
        cf_pkgconfig_libs=

-       { echo "$as_me:13975: WARNING: unable to find ICE library" >&5
+       { echo "$as_me:14037: 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: 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}:13982: testing found package sm ..." 1>&5
+echo "${as_me:-configure}:14044: 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
 
 
        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}:13988: testing package sm CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+echo "${as_me:-configure}:14050: testing package sm CFLAGS: $cf_pkgconfig_incs ..." 1>&5

 
        test -n "$verbose" && echo "    package sm LIBS: $cf_pkgconfig_libs" 1>&6
 
 
        test -n "$verbose" && echo "    package sm LIBS: $cf_pkgconfig_libs" 1>&6
 

-echo "${as_me:-configure}:13992: testing package sm LIBS: $cf_pkgconfig_libs ..." 1>&5
+echo "${as_me:-configure}:14054: testing package sm LIBS: $cf_pkgconfig_libs ..." 1>&5

 
 cf_fix_cppflags=no
 cf_new_cflags=
 
 cf_fix_cppflags=no
 cf_new_cflags=


@@ -14109,24 +14171,24 @@ LIBS="$cf_add_libs"
 else
        cf_pkgconfig_incs=
        cf_pkgconfig_libs=
 else
        cf_pkgconfig_incs=
        cf_pkgconfig_libs=

-       { echo "$as_me:14112: WARNING: unable to find SM library" >&5
+       { echo "$as_me:14174: 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: 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}:14119: testing found package xt ..." 1>&5
+echo "${as_me:-configure}:14181: 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
 
 
        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}:14125: testing package xt CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+echo "${as_me:-configure}:14187: testing package xt CFLAGS: $cf_pkgconfig_incs ..." 1>&5

 
        test -n "$verbose" && echo "    package xt LIBS: $cf_pkgconfig_libs" 1>&6
 
 
        test -n "$verbose" && echo "    package xt LIBS: $cf_pkgconfig_libs" 1>&6
 

-echo "${as_me:-configure}:14129: testing package xt LIBS: $cf_pkgconfig_libs ..." 1>&5
+echo "${as_me:-configure}:14191: testing package xt LIBS: $cf_pkgconfig_libs ..." 1>&5

 
 cf_fix_cppflags=no
 cf_new_cflags=
 
 cf_fix_cppflags=no
 cf_new_cflags=


@@ -14246,7 +14308,7 @@ LIBS="$cf_add_libs"
 else
        cf_pkgconfig_incs=
        cf_pkgconfig_libs=
 else
        cf_pkgconfig_incs=
        cf_pkgconfig_libs=

-       { echo "$as_me:14249: WARNING: unable to find Xt library" >&5
+       { echo "$as_me:14311: WARNING: unable to find Xt library" >&5

 echo "$as_me: WARNING: unable to find Xt library" >&2;}
 fi
 
 echo "$as_me: WARNING: unable to find Xt library" >&2;}
 fi
 


@@ -14259,17 +14321,17 @@ cf_have_X_LIBS=no
 if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists "xt"; then
        test -n "$verbose" && echo "    found package xt" 1>&6
 
 if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists "xt"; then
        test -n "$verbose" && echo "    found package xt" 1>&6
 

-echo "${as_me:-configure}:14262: testing found package xt ..." 1>&5
+echo "${as_me:-configure}:14324: 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
 
 
        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}:14268: testing package xt CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+echo "${as_me:-configure}:14330: testing package xt CFLAGS: $cf_pkgconfig_incs ..." 1>&5

 
        test -n "$verbose" && echo "    package xt LIBS: $cf_pkgconfig_libs" 1>&6
 
 
        test -n "$verbose" && echo "    package xt LIBS: $cf_pkgconfig_libs" 1>&6
 

-echo "${as_me:-configure}:14272: testing package xt LIBS: $cf_pkgconfig_libs ..." 1>&5
+echo "${as_me:-configure}:14334: testing package xt LIBS: $cf_pkgconfig_libs ..." 1>&5

 
 cf_fix_cppflags=no
 cf_new_cflags=
 
 cf_fix_cppflags=no
 cf_new_cflags=


@@ -14390,14 +14452,14 @@ LIBS="$cf_add_libs"
                ;;
        (*)
 # we have an "xt" package, but it may omit Xt's dependency on X11
                ;;
        (*)
 # we have an "xt" package, but it may omit Xt's dependency on X11

-echo "$as_me:14393: checking for usable X dependency" >&5
+echo "$as_me:14455: 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
 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 14400 "configure"
+#line 14462 "configure"

 #include "confdefs.h"
 
 #include <X11/Xlib.h>
 #include "confdefs.h"
 
 #include <X11/Xlib.h>


@@ -14416,16 +14478,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"

-if { (eval echo "$as_me:14419: \"$ac_link\"") >&5
+if { (eval echo "$as_me:14481: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:14422: \$? = $ac_status" >&5
+  echo "$as_me:14484: \$? = $ac_status" >&5

   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'

-  { (eval echo "$as_me:14425: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14487: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:14428: \$? = $ac_status" >&5
+  echo "$as_me:14490: \$? = $ac_status" >&5

   (exit "$ac_status"); }; }; then
   cf_cv_xt_x11_compat=yes
 else
   (exit "$ac_status"); }; }; then
   cf_cv_xt_x11_compat=yes
 else


@@ -14435,30 +14497,30 @@ cf_cv_xt_x11_compat=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi

-echo "$as_me:14438: result: $cf_cv_xt_x11_compat" >&5
+echo "$as_me:14500: 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 "${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}:14444: testing work around broken X11 dependency ..." 1>&5
+echo "${as_me:-configure}:14506: 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
 
 
                        # 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}:14451: testing found package x11 ..." 1>&5
+echo "${as_me:-configure}:14513: 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
 
 
        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}:14457: testing package x11 CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+echo "${as_me:-configure}:14519: testing package x11 CFLAGS: $cf_pkgconfig_incs ..." 1>&5

 
        test -n "$verbose" && echo "    package x11 LIBS: $cf_pkgconfig_libs" 1>&6
 
 
        test -n "$verbose" && echo "    package x11 LIBS: $cf_pkgconfig_libs" 1>&6
 

-echo "${as_me:-configure}:14461: testing package x11 LIBS: $cf_pkgconfig_libs ..." 1>&5
+echo "${as_me:-configure}:14523: testing package x11 LIBS: $cf_pkgconfig_libs ..." 1>&5

 
 cf_fix_cppflags=no
 cf_new_cflags=
 
 cf_fix_cppflags=no
 cf_new_cflags=


@@ -14581,12 +14643,12 @@ else
 
 test -n "$verbose" && echo "   ...before $LIBS" 1>&6
 
 
 test -n "$verbose" && echo "   ...before $LIBS" 1>&6
 

-echo "${as_me:-configure}:14584: testing ...before $LIBS ..." 1>&5
+echo "${as_me:-configure}:14646: 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
 
 
 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}:14589: testing ...after  $LIBS ..." 1>&5
+echo "${as_me:-configure}:14651: testing ...after  $LIBS ..." 1>&5

 
 fi
 
 
 fi
 


@@ -14594,14 +14656,14 @@ fi
                ;;
        esac
 
                ;;
        esac
 

-echo "$as_me:14597: checking for usable X Toolkit package" >&5
+echo "$as_me:14659: 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
 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 14604 "configure"
+#line 14666 "configure"

 #include "confdefs.h"
 
 #include <X11/Shell.h>
 #include "confdefs.h"
 
 #include <X11/Shell.h>


@@ -14616,16 +14678,16 @@ int num = IceConnectionNumber(0); (void) num
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"

-if { (eval echo "$as_me:14619: \"$ac_link\"") >&5
+if { (eval echo "$as_me:14681: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:14622: \$? = $ac_status" >&5
+  echo "$as_me:14684: \$? = $ac_status" >&5

   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'

-  { (eval echo "$as_me:14625: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14687: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:14628: \$? = $ac_status" >&5
+  echo "$as_me:14690: \$? = $ac_status" >&5

   (exit "$ac_status"); }; }; then
   cf_cv_xt_ice_compat=yes
 else
   (exit "$ac_status"); }; }; then
   cf_cv_xt_ice_compat=yes
 else


@@ -14635,7 +14697,7 @@ cf_cv_xt_ice_compat=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi

-echo "$as_me:14638: result: $cf_cv_xt_ice_compat" >&5
+echo "$as_me:14700: result: $cf_cv_xt_ice_compat" >&5

 echo "${ECHO_T}$cf_cv_xt_ice_compat" >&6
 
        if test "$cf_cv_xt_ice_compat" = no
 echo "${ECHO_T}$cf_cv_xt_ice_compat" >&6
 
        if test "$cf_cv_xt_ice_compat" = no


@@ -14649,22 +14711,22 @@ echo "${ECHO_T}$cf_cv_xt_ice_compat" >&6
                        (*)
                                test -n "$verbose" && echo "    work around broken ICE dependency" 1>&6
 
                        (*)
                                test -n "$verbose" && echo "    work around broken ICE dependency" 1>&6
 

-echo "${as_me:-configure}:14652: testing work around broken ICE dependency ..." 1>&5
+echo "${as_me:-configure}:14714: 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
 
 
 if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists "ice"; then
        test -n "$verbose" && echo "    found package ice" 1>&6
 

-echo "${as_me:-configure}:14657: testing found package ice ..." 1>&5
+echo "${as_me:-configure}:14719: 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
 
 
        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}:14663: testing package ice CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+echo "${as_me:-configure}:14725: testing package ice CFLAGS: $cf_pkgconfig_incs ..." 1>&5

 
        test -n "$verbose" && echo "    package ice LIBS: $cf_pkgconfig_libs" 1>&6
 
 
        test -n "$verbose" && echo "    package ice LIBS: $cf_pkgconfig_libs" 1>&6
 

-echo "${as_me:-configure}:14667: testing package ice LIBS: $cf_pkgconfig_libs ..." 1>&5
+echo "${as_me:-configure}:14729: testing package ice LIBS: $cf_pkgconfig_libs ..." 1>&5

 
 cf_fix_cppflags=no
 cf_new_cflags=
 
 cf_fix_cppflags=no
 cf_new_cflags=


@@ -14783,17 +14845,17 @@ LIBS="$cf_add_libs"
 if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists "sm"; then
        test -n "$verbose" && echo "    found package sm" 1>&6
 
 if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists "sm"; then
        test -n "$verbose" && echo "    found package sm" 1>&6
 

-echo "${as_me:-configure}:14786: testing found package sm ..." 1>&5
+echo "${as_me:-configure}:14848: 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
 
 
        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}:14792: testing package sm CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+echo "${as_me:-configure}:14854: testing package sm CFLAGS: $cf_pkgconfig_incs ..." 1>&5

 
        test -n "$verbose" && echo "    package sm LIBS: $cf_pkgconfig_libs" 1>&6
 
 
        test -n "$verbose" && echo "    package sm LIBS: $cf_pkgconfig_libs" 1>&6
 

-echo "${as_me:-configure}:14796: testing package sm LIBS: $cf_pkgconfig_libs ..." 1>&5
+echo "${as_me:-configure}:14858: testing package sm LIBS: $cf_pkgconfig_libs ..." 1>&5

 
 cf_fix_cppflags=no
 cf_new_cflags=
 
 cf_fix_cppflags=no
 cf_new_cflags=


@@ -14922,12 +14984,12 @@ else
 
 test -n "$verbose" && echo "   ...before $LIBS" 1>&6
 
 
 test -n "$verbose" && echo "   ...before $LIBS" 1>&6
 

-echo "${as_me:-configure}:14925: testing ...before $LIBS ..." 1>&5
+echo "${as_me:-configure}:14987: 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
 
 
 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}:14930: testing ...after  $LIBS ..." 1>&5
+echo "${as_me:-configure}:14992: testing ...after  $LIBS ..." 1>&5

 
 fi
 
 
 fi
 


@@ -14947,7 +15009,7 @@ else
 
 test -n "$verbose" && echo "   checking additions to CFLAGS" 1>&6
 
 
 test -n "$verbose" && echo "   checking additions to CFLAGS" 1>&6
 

-echo "${as_me:-configure}:14950: testing checking additions to CFLAGS ..." 1>&5
+echo "${as_me:-configure}:15012: testing checking additions to CFLAGS ..." 1>&5

 
 cf_check_cflags="$CFLAGS"
 cf_check_cppflags="$CPPFLAGS"
 
 cf_check_cflags="$CFLAGS"
 cf_check_cppflags="$CPPFLAGS"


@@ -15032,7 +15094,7 @@ done
 if test -n "$cf_new_cflags" ; then
        test -n "$verbose" && echo "    add to \$CFLAGS $cf_new_cflags" 1>&6
 
 if test -n "$cf_new_cflags" ; then
        test -n "$verbose" && echo "    add to \$CFLAGS $cf_new_cflags" 1>&6
 

-echo "${as_me:-configure}:15035: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
+echo "${as_me:-configure}:15097: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5

 
        test -n "$CFLAGS" && CFLAGS="$CFLAGS "
        CFLAGS="${CFLAGS}$cf_new_cflags"
 
        test -n "$CFLAGS" && CFLAGS="$CFLAGS "
        CFLAGS="${CFLAGS}$cf_new_cflags"


@@ -15042,7 +15104,7 @@ fi
 if test -n "$cf_new_cppflags" ; then
        test -n "$verbose" && echo "    add to \$CPPFLAGS $cf_new_cppflags" 1>&6
 
 if test -n "$cf_new_cppflags" ; then
        test -n "$verbose" && echo "    add to \$CPPFLAGS $cf_new_cppflags" 1>&6
 

-echo "${as_me:-configure}:15045: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
+echo "${as_me:-configure}:15107: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5

 
        test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
        CPPFLAGS="${CPPFLAGS}$cf_new_cppflags"
 
        test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
        CPPFLAGS="${CPPFLAGS}$cf_new_cppflags"


@@ -15052,7 +15114,7 @@ fi
 if test -n "$cf_new_extra_cppflags" ; then
        test -n "$verbose" && echo "    add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags" 1>&6
 
 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}:15055: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5
+echo "${as_me:-configure}:15117: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5

 
        test -n "$EXTRA_CPPFLAGS" && EXTRA_CPPFLAGS="$EXTRA_CPPFLAGS "
        EXTRA_CPPFLAGS="${EXTRA_CPPFLAGS}$cf_new_extra_cppflags"
 
        test -n "$EXTRA_CPPFLAGS" && EXTRA_CPPFLAGS="$EXTRA_CPPFLAGS "
        EXTRA_CPPFLAGS="${EXTRA_CPPFLAGS}$cf_new_extra_cppflags"


@@ -15061,7 +15123,7 @@ fi
 
 if test "x$cf_check_cflags" != "x$CFLAGS" ; then
 cat >"conftest.$ac_ext" <<_ACEOF
 
 if test "x$cf_check_cflags" != "x$CFLAGS" ; then
 cat >"conftest.$ac_ext" <<_ACEOF

-#line 15064 "configure"
+#line 15126 "configure"

 #include "confdefs.h"
 #include <stdio.h>
 int
 #include "confdefs.h"
 #include <stdio.h>
 int


@@ -15073,16 +15135,16 @@ printf("Hello world");
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"

-if { (eval echo "$as_me:15076: \"$ac_link\"") >&5
+if { (eval echo "$as_me:15138: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:15079: \$? = $ac_status" >&5
+  echo "$as_me:15141: \$? = $ac_status" >&5

   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'

-  { (eval echo "$as_me:15082: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15144: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:15085: \$? = $ac_status" >&5
+  echo "$as_me:15147: \$? = $ac_status" >&5

   (exit "$ac_status"); }; }; then
   :
 else
   (exit "$ac_status"); }; }; then
   :
 else


@@ -15090,12 +15152,12 @@ else
 cat "conftest.$ac_ext" >&5
 test -n "$verbose" && echo "   test-compile failed.  Undoing change to \$CFLAGS" 1>&6
 
 cat "conftest.$ac_ext" >&5
 test -n "$verbose" && echo "   test-compile failed.  Undoing change to \$CFLAGS" 1>&6
 

-echo "${as_me:-configure}:15093: testing test-compile failed.  Undoing change to \$CFLAGS ..." 1>&5
+echo "${as_me:-configure}:15155: 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
 
 
         if test "x$cf_check_cppflags" != "x$CPPFLAGS" ; then
                 test -n "$verbose" && echo "   but keeping change to \$CPPFLAGS" 1>&6
 

-echo "${as_me:-configure}:15098: testing but keeping change to \$CPPFLAGS ..." 1>&5
+echo "${as_me:-configure}:15160: testing but keeping change to \$CPPFLAGS ..." 1>&5

 
         fi
         CFLAGS="$cf_check_cflags"
 
         fi
         CFLAGS="$cf_check_cflags"


@@ -15103,13 +15165,13 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
 
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
 

-       echo "$as_me:15106: checking for XOpenDisplay" >&5
+       echo "$as_me:15168: 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
 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 15112 "configure"
+#line 15174 "configure"

 #include "confdefs.h"
 #define XOpenDisplay autoconf_temporary
 #include <limits.h>    /* least-intrusive standard header which defines gcc2 __stub macros */
 #include "confdefs.h"
 #define XOpenDisplay autoconf_temporary
 #include <limits.h>    /* least-intrusive standard header which defines gcc2 __stub macros */


@@ -15140,16 +15202,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"

-if { (eval echo "$as_me:15143: \"$ac_link\"") >&5
+if { (eval echo "$as_me:15205: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:15146: \$? = $ac_status" >&5
+  echo "$as_me:15208: \$? = $ac_status" >&5

   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'

-  { (eval echo "$as_me:15149: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15211: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:15152: \$? = $ac_status" >&5
+  echo "$as_me:15214: \$? = $ac_status" >&5

   (exit "$ac_status"); }; }; then
   ac_cv_func_XOpenDisplay=yes
 else
   (exit "$ac_status"); }; }; then
   ac_cv_func_XOpenDisplay=yes
 else


@@ -15159,13 +15221,13 @@ ac_cv_func_XOpenDisplay=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi

-echo "$as_me:15162: result: $ac_cv_func_XOpenDisplay" >&5
+echo "$as_me:15224: result: $ac_cv_func_XOpenDisplay" >&5

 echo "${ECHO_T}$ac_cv_func_XOpenDisplay" >&6
 if test "$ac_cv_func_XOpenDisplay" = yes; then
   :
 else
 
 echo "${ECHO_T}$ac_cv_func_XOpenDisplay" >&6
 if test "$ac_cv_func_XOpenDisplay" = yes; then
   :
 else
 

-       echo "$as_me:15168: checking for XOpenDisplay in -lX11" >&5
+       echo "$as_me:15230: 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
 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


@@ -15173,7 +15235,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lX11  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lX11  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF

-#line 15176 "configure"
+#line 15238 "configure"

 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */


@@ -15192,16 +15254,16 @@ XOpenDisplay ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"

-if { (eval echo "$as_me:15195: \"$ac_link\"") >&5
+if { (eval echo "$as_me:15257: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:15198: \$? = $ac_status" >&5
+  echo "$as_me:15260: \$? = $ac_status" >&5

   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'

-  { (eval echo "$as_me:15201: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15263: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:15204: \$? = $ac_status" >&5
+  echo "$as_me:15266: \$? = $ac_status" >&5

   (exit "$ac_status"); }; }; then
   ac_cv_lib_X11_XOpenDisplay=yes
 else
   (exit "$ac_status"); }; }; then
   ac_cv_lib_X11_XOpenDisplay=yes
 else


@@ -15212,7 +15274,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi

-echo "$as_me:15215: result: $ac_cv_lib_X11_XOpenDisplay" >&5
+echo "$as_me:15277: 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
 
 echo "${ECHO_T}$ac_cv_lib_X11_XOpenDisplay" >&6
 if test "$ac_cv_lib_X11_XOpenDisplay" = yes; then
 


@@ -15236,13 +15298,13 @@ fi
 
 fi
 
 
 fi
 

-       echo "$as_me:15239: checking for XtAppInitialize" >&5
+       echo "$as_me:15301: 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
 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 15245 "configure"
+#line 15307 "configure"

 #include "confdefs.h"
 #define XtAppInitialize autoconf_temporary
 #include <limits.h>    /* least-intrusive standard header which defines gcc2 __stub macros */
 #include "confdefs.h"
 #define XtAppInitialize autoconf_temporary
 #include <limits.h>    /* least-intrusive standard header which defines gcc2 __stub macros */


@@ -15273,16 +15335,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"

-if { (eval echo "$as_me:15276: \"$ac_link\"") >&5
+if { (eval echo "$as_me:15338: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:15279: \$? = $ac_status" >&5
+  echo "$as_me:15341: \$? = $ac_status" >&5

   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'

-  { (eval echo "$as_me:15282: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15344: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:15285: \$? = $ac_status" >&5
+  echo "$as_me:15347: \$? = $ac_status" >&5

   (exit "$ac_status"); }; }; then
   ac_cv_func_XtAppInitialize=yes
 else
   (exit "$ac_status"); }; }; then
   ac_cv_func_XtAppInitialize=yes
 else


@@ -15292,13 +15354,13 @@ ac_cv_func_XtAppInitialize=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi

-echo "$as_me:15295: result: $ac_cv_func_XtAppInitialize" >&5
+echo "$as_me:15357: result: $ac_cv_func_XtAppInitialize" >&5

 echo "${ECHO_T}$ac_cv_func_XtAppInitialize" >&6
 if test "$ac_cv_func_XtAppInitialize" = yes; then
   :
 else
 
 echo "${ECHO_T}$ac_cv_func_XtAppInitialize" >&6
 if test "$ac_cv_func_XtAppInitialize" = yes; then
   :
 else
 

-       echo "$as_me:15301: checking for XtAppInitialize in -lXt" >&5
+       echo "$as_me:15363: 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
 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


@@ -15306,7 +15368,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lXt  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lXt  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF

-#line 15309 "configure"
+#line 15371 "configure"

 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */


@@ -15325,16 +15387,16 @@ XtAppInitialize ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"

-if { (eval echo "$as_me:15328: \"$ac_link\"") >&5
+if { (eval echo "$as_me:15390: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:15331: \$? = $ac_status" >&5
+  echo "$as_me:15393: \$? = $ac_status" >&5

   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'

-  { (eval echo "$as_me:15334: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15396: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:15337: \$? = $ac_status" >&5
+  echo "$as_me:15399: \$? = $ac_status" >&5

   (exit "$ac_status"); }; }; then
   ac_cv_lib_Xt_XtAppInitialize=yes
 else
   (exit "$ac_status"); }; }; then
   ac_cv_lib_Xt_XtAppInitialize=yes
 else


@@ -15345,7 +15407,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi

-echo "$as_me:15348: result: $ac_cv_lib_Xt_XtAppInitialize" >&5
+echo "$as_me:15410: 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
 
 echo "${ECHO_T}$ac_cv_lib_Xt_XtAppInitialize" >&6
 if test "$ac_cv_lib_Xt_XtAppInitialize" = yes; then
 


@@ -15362,7 +15424,7 @@ fi
 fi
 
 if test "$cf_have_X_LIBS" = no ; then
 fi
 
 if test "$cf_have_X_LIBS" = no ; then

-       { echo "$as_me:15365: WARNING: Unable to successfully link X Toolkit library (-lXt) with
+       { echo "$as_me:15427: 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
 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


@@ -15403,14 +15465,14 @@ done
        test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
        CPPFLAGS="${CPPFLAGS}-I$cf_path/include"
 
        test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
        CPPFLAGS="${CPPFLAGS}-I$cf_path/include"
 

-                       echo "$as_me:15406: checking for $cf_test in $cf_path" >&5
+                       echo "$as_me:15468: checking for $cf_test in $cf_path" >&5

 echo $ECHO_N "checking for $cf_test in $cf_path... $ECHO_C" >&6
                else
 echo $ECHO_N "checking for $cf_test in $cf_path... $ECHO_C" >&6
                else

-                       echo "$as_me:15409: checking for $cf_test" >&5
+                       echo "$as_me:15471: checking for $cf_test" >&5

 echo $ECHO_N "checking for $cf_test... $ECHO_C" >&6
                fi
                cat >"conftest.$ac_ext" <<_ACEOF
 echo $ECHO_N "checking for $cf_test... $ECHO_C" >&6
                fi
                cat >"conftest.$ac_ext" <<_ACEOF

-#line 15413 "configure"
+#line 15475 "configure"

 #include "confdefs.h"
 
 #include <X11/Intrinsic.h>
 #include "confdefs.h"
 
 #include <X11/Intrinsic.h>


@@ -15424,16 +15486,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
 }
 _ACEOF
 rm -f "conftest.$ac_objext"

-if { (eval echo "$as_me:15427: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:15489: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:15430: \$? = $ac_status" >&5
+  echo "$as_me:15492: \$? = $ac_status" >&5

   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'

-  { (eval echo "$as_me:15433: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15495: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:15436: \$? = $ac_status" >&5
+  echo "$as_me:15498: \$? = $ac_status" >&5

   (exit "$ac_status"); }; }; then
   cf_result=yes
 else
   (exit "$ac_status"); }; }; then
   cf_result=yes
 else


@@ -15442,7 +15504,7 @@ cat "conftest.$ac_ext" >&5
 cf_result=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 cf_result=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"

-               echo "$as_me:15445: result: $cf_result" >&5
+               echo "$as_me:15507: result: $cf_result" >&5

 echo "${ECHO_T}$cf_result" >&6
 
 LIBS="$cf_save_LIBS_CF_X_ATHENA_CPPFLAGS"
 echo "${ECHO_T}$cf_result" >&6
 
 LIBS="$cf_save_LIBS_CF_X_ATHENA_CPPFLAGS"


@@ -15458,7 +15520,7 @@ CPPFLAGS="$cf_save_CPPFLAGS_CF_X_ATHENA_CPPFLAGS"
 done
 
 if test -z "$cf_x_athena_inc" ; then
 done
 
 if test -z "$cf_x_athena_inc" ; then

-       { echo "$as_me:15461: WARNING: Unable to find Athena header files" >&5
+       { echo "$as_me:15523: WARNING: Unable to find Athena header files" >&5

 echo "$as_me: WARNING: Unable to find Athena header files" >&2;}
 elif test "$cf_x_athena_inc" != default ; then
 
 echo "$as_me: WARNING: Unable to find Athena header files" >&2;}
 elif test "$cf_x_athena_inc" != default ; then
 


@@ -15523,10 +15585,10 @@ for cf_add_1lib in $cf_add_0lib; do
 done
 LIBS="$cf_add_libs"
 
 done
 LIBS="$cf_add_libs"
 

-               echo "$as_me:15526: checking for $cf_test in $cf_libs" >&5
+               echo "$as_me:15588: checking for $cf_test in $cf_libs" >&5

 echo $ECHO_N "checking for $cf_test in $cf_libs... $ECHO_C" >&6
                cat >"conftest.$ac_ext" <<_ACEOF
 echo $ECHO_N "checking for $cf_test in $cf_libs... $ECHO_C" >&6
                cat >"conftest.$ac_ext" <<_ACEOF

-#line 15529 "configure"
+#line 15591 "configure"

 #include "confdefs.h"
 
 #include <X11/Intrinsic.h>
 #include "confdefs.h"
 
 #include <X11/Intrinsic.h>


@@ -15542,16 +15604,16 @@ $cf_test((XtAppContext) 0)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"

-if { (eval echo "$as_me:15545: \"$ac_link\"") >&5
+if { (eval echo "$as_me:15607: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:15548: \$? = $ac_status" >&5
+  echo "$as_me:15610: \$? = $ac_status" >&5

   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'

-  { (eval echo "$as_me:15551: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15613: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:15554: \$? = $ac_status" >&5
+  echo "$as_me:15616: \$? = $ac_status" >&5

   (exit "$ac_status"); }; }; then
   cf_result=yes
 else
   (exit "$ac_status"); }; }; then
   cf_result=yes
 else


@@ -15560,7 +15622,7 @@ cat "conftest.$ac_ext" >&5
 cf_result=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 cf_result=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"

-               echo "$as_me:15563: result: $cf_result" >&5
+               echo "$as_me:15625: result: $cf_result" >&5

 echo "${ECHO_T}$cf_result" >&6
 
 LIBS="$cf_save_LIBS_CF_X_ATHENA_LIBS"
 echo "${ECHO_T}$cf_result" >&6
 
 LIBS="$cf_save_LIBS_CF_X_ATHENA_LIBS"


@@ -15577,7 +15639,7 @@ CPPFLAGS="$cf_save_CPPFLAGS_CF_X_ATHENA_LIBS"
 done
 
 if test -z "$cf_x_athena_lib" ; then
 done
 
 if test -z "$cf_x_athena_lib" ; then

-       { { echo "$as_me:15580: error: Unable to successfully link Athena library (-l$cf_x_athena_root) with test program" >&5
+       { { echo "$as_me:15642: 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
 echo "$as_me: error: Unable to successfully link Athena library (-l$cf_x_athena_root) with test program" >&2;}
    { (exit 1); exit 1; }; }
 fi


@@ -15611,7 +15673,7 @@ if test -n "$ac_tool_prefix"; then
   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
   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:15614: checking for $ac_word" >&5
+echo "$as_me:15676: 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
 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


@@ -15626,7 +15688,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_XCURSES_CONFIG="$ac_tool_prefix$ac_prog"
   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:15629: found $ac_dir/$ac_word" >&5
+echo "$as_me:15691: found $ac_dir/$ac_word" >&5

 break
 done
 
 break
 done
 


@@ -15634,10 +15696,10 @@ fi
 fi
 XCURSES_CONFIG=$ac_cv_prog_XCURSES_CONFIG
 if test -n "$XCURSES_CONFIG"; then
 fi
 XCURSES_CONFIG=$ac_cv_prog_XCURSES_CONFIG
 if test -n "$XCURSES_CONFIG"; then

-  echo "$as_me:15637: result: $XCURSES_CONFIG" >&5
+  echo "$as_me:15699: result: $XCURSES_CONFIG" >&5

 echo "${ECHO_T}$XCURSES_CONFIG" >&6
 else
 echo "${ECHO_T}$XCURSES_CONFIG" >&6
 else

-  echo "$as_me:15640: result: no" >&5
+  echo "$as_me:15702: result: no" >&5

 echo "${ECHO_T}no" >&6
 fi
 
 echo "${ECHO_T}no" >&6
 fi
 


@@ -15650,7 +15712,7 @@ if test -z "$XCURSES_CONFIG"; then
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
 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:15653: checking for $ac_word" >&5
+echo "$as_me:15715: 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
 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


@@ -15665,7 +15727,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_ac_ct_XCURSES_CONFIG="$ac_prog"
   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:15668: found $ac_dir/$ac_word" >&5
+echo "$as_me:15730: found $ac_dir/$ac_word" >&5

 break
 done
 
 break
 done
 


@@ -15673,10 +15735,10 @@ fi
 fi
 ac_ct_XCURSES_CONFIG=$ac_cv_prog_ac_ct_XCURSES_CONFIG
 if test -n "$ac_ct_XCURSES_CONFIG"; then
 fi
 ac_ct_XCURSES_CONFIG=$ac_cv_prog_ac_ct_XCURSES_CONFIG
 if test -n "$ac_ct_XCURSES_CONFIG"; then

-  echo "$as_me:15676: result: $ac_ct_XCURSES_CONFIG" >&5
+  echo "$as_me:15738: result: $ac_ct_XCURSES_CONFIG" >&5

 echo "${ECHO_T}$ac_ct_XCURSES_CONFIG" >&6
 else
 echo "${ECHO_T}$ac_ct_XCURSES_CONFIG" >&6
 else

-  echo "$as_me:15679: result: no" >&5
+  echo "$as_me:15741: result: no" >&5

 echo "${ECHO_T}no" >&6
 fi
 
 echo "${ECHO_T}no" >&6
 fi
 


@@ -15811,7 +15873,7 @@ LDFLAGS="$LDFLAGS $X_LIBS"
 
 test -n "$verbose" && echo "   checking additions to CFLAGS" 1>&6
 
 
 test -n "$verbose" && echo "   checking additions to CFLAGS" 1>&6
 

-echo "${as_me:-configure}:15814: testing checking additions to CFLAGS ..." 1>&5
+echo "${as_me:-configure}:15876: testing checking additions to CFLAGS ..." 1>&5

 
 cf_check_cflags="$CFLAGS"
 cf_check_cppflags="$CPPFLAGS"
 
 cf_check_cflags="$CFLAGS"
 cf_check_cppflags="$CPPFLAGS"


@@ -15896,7 +15958,7 @@ done
 if test -n "$cf_new_cflags" ; then
        test -n "$verbose" && echo "    add to \$CFLAGS $cf_new_cflags" 1>&6
 
 if test -n "$cf_new_cflags" ; then
        test -n "$verbose" && echo "    add to \$CFLAGS $cf_new_cflags" 1>&6
 

-echo "${as_me:-configure}:15899: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
+echo "${as_me:-configure}:15961: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5

 
        test -n "$CFLAGS" && CFLAGS="$CFLAGS "
        CFLAGS="${CFLAGS}$cf_new_cflags"
 
        test -n "$CFLAGS" && CFLAGS="$CFLAGS "
        CFLAGS="${CFLAGS}$cf_new_cflags"


@@ -15906,7 +15968,7 @@ fi
 if test -n "$cf_new_cppflags" ; then
        test -n "$verbose" && echo "    add to \$CPPFLAGS $cf_new_cppflags" 1>&6
 
 if test -n "$cf_new_cppflags" ; then
        test -n "$verbose" && echo "    add to \$CPPFLAGS $cf_new_cppflags" 1>&6
 

-echo "${as_me:-configure}:15909: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
+echo "${as_me:-configure}:15971: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5

 
        test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
        CPPFLAGS="${CPPFLAGS}$cf_new_cppflags"
 
        test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
        CPPFLAGS="${CPPFLAGS}$cf_new_cppflags"


@@ -15916,7 +15978,7 @@ fi
 if test -n "$cf_new_extra_cppflags" ; then
        test -n "$verbose" && echo "    add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags" 1>&6
 
 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}:15919: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5
+echo "${as_me:-configure}:15981: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5

 
        test -n "$EXTRA_CPPFLAGS" && EXTRA_CPPFLAGS="$EXTRA_CPPFLAGS "
        EXTRA_CPPFLAGS="${EXTRA_CPPFLAGS}$cf_new_extra_cppflags"
 
        test -n "$EXTRA_CPPFLAGS" && EXTRA_CPPFLAGS="$EXTRA_CPPFLAGS "
        EXTRA_CPPFLAGS="${EXTRA_CPPFLAGS}$cf_new_extra_cppflags"


@@ -15925,7 +15987,7 @@ fi
 
 if test "x$cf_check_cflags" != "x$CFLAGS" ; then
 cat >"conftest.$ac_ext" <<_ACEOF
 
 if test "x$cf_check_cflags" != "x$CFLAGS" ; then
 cat >"conftest.$ac_ext" <<_ACEOF

-#line 15928 "configure"
+#line 15990 "configure"

 #include "confdefs.h"
 #include <stdio.h>
 int
 #include "confdefs.h"
 #include <stdio.h>
 int


@@ -15937,16 +15999,16 @@ printf("Hello world");
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"

-if { (eval echo "$as_me:15940: \"$ac_link\"") >&5
+if { (eval echo "$as_me:16002: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:15943: \$? = $ac_status" >&5
+  echo "$as_me:16005: \$? = $ac_status" >&5

   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'

-  { (eval echo "$as_me:15946: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16008: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:15949: \$? = $ac_status" >&5
+  echo "$as_me:16011: \$? = $ac_status" >&5

   (exit "$ac_status"); }; }; then
   :
 else
   (exit "$ac_status"); }; }; then
   :
 else


@@ -15954,12 +16016,12 @@ else
 cat "conftest.$ac_ext" >&5
 test -n "$verbose" && echo "   test-compile failed.  Undoing change to \$CFLAGS" 1>&6
 
 cat "conftest.$ac_ext" >&5
 test -n "$verbose" && echo "   test-compile failed.  Undoing change to \$CFLAGS" 1>&6
 

-echo "${as_me:-configure}:15957: testing test-compile failed.  Undoing change to \$CFLAGS ..." 1>&5
+echo "${as_me:-configure}:16019: 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
 
 
         if test "x$cf_check_cppflags" != "x$CPPFLAGS" ; then
                 test -n "$verbose" && echo "   but keeping change to \$CPPFLAGS" 1>&6
 

-echo "${as_me:-configure}:15962: testing but keeping change to \$CPPFLAGS ..." 1>&5
+echo "${as_me:-configure}:16024: testing but keeping change to \$CPPFLAGS ..." 1>&5

 
         fi
         CFLAGS="$cf_check_cflags"
 
         fi
         CFLAGS="$cf_check_cflags"


@@ -15967,7 +16029,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
 
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
 

-echo "$as_me:15970: checking for XOpenDisplay in -lX11" >&5
+echo "$as_me:16032: 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
 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


@@ -15975,7 +16037,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lX11 $X_PRE_LIBS $LIBS $X_EXTRA_LIBS $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lX11 $X_PRE_LIBS $LIBS $X_EXTRA_LIBS $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF

-#line 15978 "configure"
+#line 16040 "configure"

 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */


@@ -15994,16 +16056,16 @@ XOpenDisplay ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"

-if { (eval echo "$as_me:15997: \"$ac_link\"") >&5
+if { (eval echo "$as_me:16059: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:16000: \$? = $ac_status" >&5
+  echo "$as_me:16062: \$? = $ac_status" >&5

   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'

-  { (eval echo "$as_me:16003: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16065: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:16006: \$? = $ac_status" >&5
+  echo "$as_me:16068: \$? = $ac_status" >&5

   (exit "$ac_status"); }; }; then
   ac_cv_lib_X11_XOpenDisplay=yes
 else
   (exit "$ac_status"); }; }; then
   ac_cv_lib_X11_XOpenDisplay=yes
 else


@@ -16014,7 +16076,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi

-echo "$as_me:16017: result: $ac_cv_lib_X11_XOpenDisplay" >&5
+echo "$as_me:16079: 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
 
 echo "${ECHO_T}$ac_cv_lib_X11_XOpenDisplay" >&6
 if test "$ac_cv_lib_X11_XOpenDisplay" = yes; then
 


@@ -16036,7 +16098,7 @@ LIBS="$cf_add_libs"
 
 fi
 
 
 fi
 

-echo "$as_me:16039: checking for XCurses library" >&5
+echo "$as_me:16101: 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
 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


@@ -16059,7 +16121,7 @@ done
 LIBS="$cf_add_libs"
 
 cat >"conftest.$ac_ext" <<_ACEOF
 LIBS="$cf_add_libs"
 
 cat >"conftest.$ac_ext" <<_ACEOF

-#line 16062 "configure"
+#line 16124 "configure"

 #include "confdefs.h"
 
 #include <xcurses.h>
 #include "confdefs.h"
 
 #include <xcurses.h>


@@ -16074,16 +16136,16 @@ XCursesExit();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"

-if { (eval echo "$as_me:16077: \"$ac_link\"") >&5
+if { (eval echo "$as_me:16139: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:16080: \$? = $ac_status" >&5
+  echo "$as_me:16142: \$? = $ac_status" >&5

   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'

-  { (eval echo "$as_me:16083: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16145: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:16086: \$? = $ac_status" >&5
+  echo "$as_me:16148: \$? = $ac_status" >&5

   (exit "$ac_status"); }; }; then
   cf_cv_lib_XCurses=yes
 else
   (exit "$ac_status"); }; }; then
   cf_cv_lib_XCurses=yes
 else


@@ -16094,7 +16156,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 
 fi

-echo "$as_me:16097: result: $cf_cv_lib_XCurses" >&5
+echo "$as_me:16159: result: $cf_cv_lib_XCurses" >&5

 echo "${ECHO_T}$cf_cv_lib_XCurses" >&6
 
 fi
 echo "${ECHO_T}$cf_cv_lib_XCurses" >&6
 
 fi


@@ -16109,23 +16171,23 @@ cat >>confdefs.h <<\EOF
 #define XCURSES 1
 EOF
 
 #define XCURSES 1
 EOF
 

-       echo "$as_me:16112: checking for xcurses.h" >&5
+       echo "$as_me:16174: 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
 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 16118 "configure"
+#line 16180 "configure"

 #include "confdefs.h"
 #include <xcurses.h>
 _ACEOF
 #include "confdefs.h"
 #include <xcurses.h>
 _ACEOF

-if { (eval echo "$as_me:16122: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:16184: \"$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
   (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:16128: \$? = $ac_status" >&5
+  echo "$as_me:16190: \$? = $ac_status" >&5

   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag


@@ -16144,7 +16206,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi

-echo "$as_me:16147: result: $ac_cv_header_xcurses_h" >&5
+echo "$as_me:16209: 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
 
 echo "${ECHO_T}$ac_cv_header_xcurses_h" >&6
 if test "$ac_cv_header_xcurses_h" = yes; then
 


@@ -16155,14 +16217,14 @@ EOF
 fi
 
 else
 fi
 
 else

-       { { echo "$as_me:16158: error: Cannot link with XCurses" >&5
+       { { echo "$as_me:16220: error: Cannot link with XCurses" >&5

 echo "$as_me: error: Cannot link with XCurses" >&2;}
    { (exit 1); exit 1; }; }
 fi
 
        ;;
 (*)
 echo "$as_me: error: Cannot link with XCurses" >&2;}
    { (exit 1); exit 1; }; }
 fi
 
        ;;
 (*)

-       { { echo "$as_me:16165: error: unexpected screen-value: $cf_cv_screen" >&5
+       { { echo "$as_me:16227: error: unexpected screen-value: $cf_cv_screen" >&5

 echo "$as_me: error: unexpected screen-value: $cf_cv_screen" >&2;}
    { (exit 1); exit 1; }; }
        ;;
 echo "$as_me: error: unexpected screen-value: $cf_cv_screen" >&2;}
    { (exit 1); exit 1; }; }
        ;;


@@ -16170,7 +16232,7 @@ esac
 
 : ${cf_nculib_root:=$cf_cv_screen}
 as_ac_Lib=`echo "ac_cv_lib_$cf_nculib_root''__nc_init_pthreads" | $as_tr_sh`
 
 : ${cf_nculib_root:=$cf_cv_screen}
 as_ac_Lib=`echo "ac_cv_lib_$cf_nculib_root''__nc_init_pthreads" | $as_tr_sh`

-echo "$as_me:16173: checking for _nc_init_pthreads in -l$cf_nculib_root" >&5
+echo "$as_me:16235: checking for _nc_init_pthreads in -l$cf_nculib_root" >&5

 echo $ECHO_N "checking for _nc_init_pthreads in -l$cf_nculib_root... $ECHO_C" >&6
 if eval "test \"\${$as_ac_Lib+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 echo $ECHO_N "checking for _nc_init_pthreads in -l$cf_nculib_root... $ECHO_C" >&6
 if eval "test \"\${$as_ac_Lib+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6


@@ -16178,7 +16240,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-l$cf_nculib_root  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-l$cf_nculib_root  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF

-#line 16181 "configure"
+#line 16243 "configure"

 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */


@@ -16197,16 +16259,16 @@ _nc_init_pthreads ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"

-if { (eval echo "$as_me:16200: \"$ac_link\"") >&5
+if { (eval echo "$as_me:16262: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:16203: \$? = $ac_status" >&5
+  echo "$as_me:16265: \$? = $ac_status" >&5

   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'

-  { (eval echo "$as_me:16206: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16268: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:16209: \$? = $ac_status" >&5
+  echo "$as_me:16271: \$? = $ac_status" >&5

   (exit "$ac_status"); }; }; then
   eval "$as_ac_Lib=yes"
 else
   (exit "$ac_status"); }; }; then
   eval "$as_ac_Lib=yes"
 else


@@ -16217,7 +16279,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi

-echo "$as_me:16220: result: `eval echo '${'"$as_ac_Lib"'}'`" >&5
+echo "$as_me:16282: 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
   cf_cv_ncurses_pthreads=yes
 echo "${ECHO_T}`eval echo '${'"$as_ac_Lib"'}'`" >&6
 if test "`eval echo '${'"$as_ac_Lib"'}'`" = yes; then
   cf_cv_ncurses_pthreads=yes


@@ -16252,7 +16314,7 @@ case $cf_cv_screen in
        ;;
 esac
 
        ;;
 esac
 

-echo "$as_me:16255: checking for X11 rgb file" >&5
+echo "$as_me:16317: checking for X11 rgb file" >&5

 echo $ECHO_N "checking for X11 rgb file... $ECHO_C" >&6
 
 # Check whether --with-x11-rgb or --without-x11-rgb was given.
 echo $ECHO_N "checking for X11 rgb file... $ECHO_C" >&6
 
 # Check whether --with-x11-rgb or --without-x11-rgb was given.


@@ -16316,7 +16378,7 @@ case ".$cf_path" in
        cf_path=`echo "$cf_path" | sed -e s%NONE%$cf_path_syntax%`
        ;;
 (*)
        cf_path=`echo "$cf_path" | sed -e s%NONE%$cf_path_syntax%`
        ;;
 (*)

-       { { echo "$as_me:16319: error: expected a pathname, not \"$cf_path\"" >&5
+       { { echo "$as_me:16381: error: expected a pathname, not \"$cf_path\"" >&5

 echo "$as_me: error: expected a pathname, not \"$cf_path\"" >&2;}
    { (exit 1); exit 1; }; }
        ;;
 echo "$as_me: error: expected a pathname, not \"$cf_path\"" >&2;}
    { (exit 1); exit 1; }; }
        ;;


@@ -16324,7 +16386,7 @@ esac
 
 fi
 
 
 fi
 

-echo "$as_me:16327: result: $RGB_PATH" >&5
+echo "$as_me:16389: result: $RGB_PATH" >&5

 echo "${ECHO_T}$RGB_PATH" >&6
 
 cat >>confdefs.h <<EOF
 echo "${ECHO_T}$RGB_PATH" >&6
 
 cat >>confdefs.h <<EOF


@@ -16365,7 +16427,7 @@ case $cf_cv_screen in
        ;;
 esac
 
        ;;
 esac
 

-echo "$as_me:16368: checking for desired basename for form library" >&5
+echo "$as_me:16430: checking for desired basename for form library" >&5

 echo $ECHO_N "checking for desired basename for form library... $ECHO_C" >&6
 
 # Check whether --with-form-libname or --without-form-libname was given.
 echo $ECHO_N "checking for desired basename for form library... $ECHO_C" >&6
 
 # Check whether --with-form-libname or --without-form-libname was given.


@@ -16385,10 +16447,10 @@ case "x$FORM_NAME" in
        ;;
 esac
 
        ;;
 esac
 

-echo "$as_me:16388: result: $FORM_NAME" >&5
+echo "$as_me:16450: result: $FORM_NAME" >&5

 echo "${ECHO_T}$FORM_NAME" >&6
 
 echo "${ECHO_T}$FORM_NAME" >&6
 

-echo "$as_me:16391: checking for desired basename for menu library" >&5
+echo "$as_me:16453: checking for desired basename for menu library" >&5

 echo $ECHO_N "checking for desired basename for menu library... $ECHO_C" >&6
 
 # Check whether --with-menu-libname or --without-menu-libname was given.
 echo $ECHO_N "checking for desired basename for menu library... $ECHO_C" >&6
 
 # Check whether --with-menu-libname or --without-menu-libname was given.


@@ -16408,10 +16470,10 @@ case "x$MENU_NAME" in
        ;;
 esac
 
        ;;
 esac
 

-echo "$as_me:16411: result: $MENU_NAME" >&5
+echo "$as_me:16473: result: $MENU_NAME" >&5

 echo "${ECHO_T}$MENU_NAME" >&6
 
 echo "${ECHO_T}$MENU_NAME" >&6
 

-echo "$as_me:16414: checking for desired basename for panel library" >&5
+echo "$as_me:16476: checking for desired basename for panel library" >&5

 echo $ECHO_N "checking for desired basename for panel library... $ECHO_C" >&6
 
 # Check whether --with-panel-libname or --without-panel-libname was given.
 echo $ECHO_N "checking for desired basename for panel library... $ECHO_C" >&6
 
 # Check whether --with-panel-libname or --without-panel-libname was given.


@@ -16431,10 +16493,10 @@ case "x$PANEL_NAME" in
        ;;
 esac
 
        ;;
 esac
 

-echo "$as_me:16434: result: $PANEL_NAME" >&5
+echo "$as_me:16496: result: $PANEL_NAME" >&5

 echo "${ECHO_T}$PANEL_NAME" >&6
 
 echo "${ECHO_T}$PANEL_NAME" >&6
 

-echo "$as_me:16437: checking if you want to check for panel functions" >&5
+echo "$as_me:16499: checking if you want to check for panel functions" >&5

 echo $ECHO_N "checking if you want to check for panel functions... $ECHO_C" >&6
 
 # Check whether --enable-panel or --disable-panel was given.
 echo $ECHO_N "checking if you want to check for panel functions... $ECHO_C" >&6
 
 # Check whether --enable-panel or --disable-panel was given.


@@ -16451,7 +16513,7 @@ else
        cf_enable_panel=$cf_default_panel
 
 fi;
        cf_enable_panel=$cf_default_panel
 
 fi;

-echo "$as_me:16454: result: $cf_enable_panel" >&5
+echo "$as_me:16516: result: $cf_enable_panel" >&5

 echo "${ECHO_T}$cf_enable_panel" >&6
 if test $cf_enable_panel = yes
 then
 echo "${ECHO_T}$cf_enable_panel" >&6
 if test $cf_enable_panel = yes
 then


@@ -16462,13 +16524,13 @@ cf_have_curses_lib=no
 if test "x${NCURSES_CONFIG_PKG}" = xnone; then
        :
 elif test "x${PKG_CONFIG:=none}" != xnone; then
 if test "x${NCURSES_CONFIG_PKG}" = xnone; then
        :
 elif test "x${PKG_CONFIG:=none}" != xnone; then

-       echo "$as_me:16465: checking pkg-config for $PANEL_NAME$cf_cv_libtype" >&5
+       echo "$as_me:16527: checking pkg-config for $PANEL_NAME$cf_cv_libtype" >&5

 echo $ECHO_N "checking pkg-config for $PANEL_NAME$cf_cv_libtype... $ECHO_C" >&6
        if "$PKG_CONFIG" --exists "$PANEL_NAME$cf_cv_libtype" ; then
 echo $ECHO_N "checking pkg-config for $PANEL_NAME$cf_cv_libtype... $ECHO_C" >&6
        if "$PKG_CONFIG" --exists "$PANEL_NAME$cf_cv_libtype" ; then

-               echo "$as_me:16468: result: yes" >&5
+               echo "$as_me:16530: result: yes" >&5

 echo "${ECHO_T}yes" >&6
 
 echo "${ECHO_T}yes" >&6
 

-               echo "$as_me:16471: checking if the $PANEL_NAME$cf_cv_libtype package files work" >&5
+               echo "$as_me:16533: checking if the $PANEL_NAME$cf_cv_libtype package files work" >&5

 echo $ECHO_N "checking if the $PANEL_NAME$cf_cv_libtype package files work... $ECHO_C" >&6
 
                cf_save_CPPFLAGS="$CPPFLAGS"
 echo $ECHO_N "checking if the $PANEL_NAME$cf_cv_libtype package files work... $ECHO_C" >&6
 
                cf_save_CPPFLAGS="$CPPFLAGS"


@@ -16589,7 +16651,7 @@ done
 LIBS="$cf_add_libs"
 
                cat >"conftest.$ac_ext" <<_ACEOF
 LIBS="$cf_add_libs"
 
                cat >"conftest.$ac_ext" <<_ACEOF

-#line 16592 "configure"
+#line 16654 "configure"

 #include "confdefs.h"
 #include <$PANEL_NAME.h>
 int
 #include "confdefs.h"
 #include <$PANEL_NAME.h>
 int


@@ -16601,37 +16663,37 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"

-if { (eval echo "$as_me:16604: \"$ac_link\"") >&5
+if { (eval echo "$as_me:16666: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:16607: \$? = $ac_status" >&5
+  echo "$as_me:16669: \$? = $ac_status" >&5

   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'

-  { (eval echo "$as_me:16610: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16672: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:16613: \$? = $ac_status" >&5
+  echo "$as_me:16675: \$? = $ac_status" >&5

   (exit "$ac_status"); }; }; then
   if test "$cross_compiling" = yes; then
   cf_have_curses_lib=maybe
 else
   cat >"conftest.$ac_ext" <<_ACEOF
   (exit "$ac_status"); }; }; then
   if test "$cross_compiling" = yes; then
   cf_have_curses_lib=maybe
 else
   cat >"conftest.$ac_ext" <<_ACEOF

-#line 16619 "configure"
+#line 16681 "configure"

 #include "confdefs.h"
 #include <$PANEL_NAME.h>
                                int main(void)
                                { (void) new_panel ( 0 ); return 0; }
 _ACEOF
 rm -f "conftest$ac_exeext"
 #include "confdefs.h"
 #include <$PANEL_NAME.h>
                                int main(void)
                                { (void) new_panel ( 0 ); return 0; }
 _ACEOF
 rm -f "conftest$ac_exeext"

-if { (eval echo "$as_me:16626: \"$ac_link\"") >&5
+if { (eval echo "$as_me:16688: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:16629: \$? = $ac_status" >&5
+  echo "$as_me:16691: \$? = $ac_status" >&5

   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'

-  { (eval echo "$as_me:16631: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16693: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:16634: \$? = $ac_status" >&5
+  echo "$as_me:16696: \$? = $ac_status" >&5

   (exit "$ac_status"); }; }; then
   cf_have_curses_lib=yes
 else
   (exit "$ac_status"); }; }; then
   cf_have_curses_lib=yes
 else


@@ -16648,7 +16710,7 @@ cat "conftest.$ac_ext" >&5
 cf_have_curses_lib=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 cf_have_curses_lib=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"

-               echo "$as_me:16651: result: $cf_have_curses_lib" >&5
+               echo "$as_me:16713: result: $cf_have_curses_lib" >&5

 echo "${ECHO_T}$cf_have_curses_lib" >&6
                test "$cf_have_curses_lib" = maybe && cf_have_curses_lib=yes
                if test "$cf_have_curses_lib" != "yes"
 echo "${ECHO_T}$cf_have_curses_lib" >&6
                test "$cf_have_curses_lib" = maybe && cf_have_curses_lib=yes
                if test "$cf_have_curses_lib" != "yes"


@@ -16668,7 +16730,7 @@ EOF
 fi
 if test "$cf_have_curses_lib" = no; then
        as_ac_Lib=`echo "ac_cv_lib_$PANEL_NAME$cf_cv_libtype''_new_panel" | $as_tr_sh`
 fi
 if test "$cf_have_curses_lib" = no; then
        as_ac_Lib=`echo "ac_cv_lib_$PANEL_NAME$cf_cv_libtype''_new_panel" | $as_tr_sh`

-echo "$as_me:16671: checking for new_panel in -l$PANEL_NAME$cf_cv_libtype" >&5
+echo "$as_me:16733: checking for new_panel in -l$PANEL_NAME$cf_cv_libtype" >&5

 echo $ECHO_N "checking for new_panel in -l$PANEL_NAME$cf_cv_libtype... $ECHO_C" >&6
 if eval "test \"\${$as_ac_Lib+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 echo $ECHO_N "checking for new_panel in -l$PANEL_NAME$cf_cv_libtype... $ECHO_C" >&6
 if eval "test \"\${$as_ac_Lib+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6


@@ -16676,7 +16738,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-l$PANEL_NAME$cf_cv_libtype  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-l$PANEL_NAME$cf_cv_libtype  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF

-#line 16679 "configure"
+#line 16741 "configure"

 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */


@@ -16695,16 +16757,16 @@ new_panel ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"

-if { (eval echo "$as_me:16698: \"$ac_link\"") >&5
+if { (eval echo "$as_me:16760: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:16701: \$? = $ac_status" >&5
+  echo "$as_me:16763: \$? = $ac_status" >&5

   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'

-  { (eval echo "$as_me:16704: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16766: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:16707: \$? = $ac_status" >&5
+  echo "$as_me:16769: \$? = $ac_status" >&5

   (exit "$ac_status"); }; }; then
   eval "$as_ac_Lib=yes"
 else
   (exit "$ac_status"); }; }; then
   eval "$as_ac_Lib=yes"
 else


@@ -16715,7 +16777,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi

-echo "$as_me:16718: result: `eval echo '${'"$as_ac_Lib"'}'`" >&5
+echo "$as_me:16780: result: `eval echo '${'"$as_ac_Lib"'}'`" >&5

 echo "${ECHO_T}`eval echo '${'"$as_ac_Lib"'}'`" >&6
 if test "`eval echo '${'"$as_ac_Lib"'}'`" = yes; then
 
 echo "${ECHO_T}`eval echo '${'"$as_ac_Lib"'}'`" >&6
 if test "`eval echo '${'"$as_ac_Lib"'}'`" = yes; then
 


@@ -16748,7 +16810,7 @@ fi
        cf_curses_headers="$cf_curses_headers panel.h"
 fi
 
        cf_curses_headers="$cf_curses_headers panel.h"
 fi
 

-echo "$as_me:16751: checking if you want to check for menu functions" >&5
+echo "$as_me:16813: checking if you want to check for menu functions" >&5

 echo $ECHO_N "checking if you want to check for menu functions... $ECHO_C" >&6
 
 # Check whether --enable-menu or --disable-menu was given.
 echo $ECHO_N "checking if you want to check for menu functions... $ECHO_C" >&6
 
 # Check whether --enable-menu or --disable-menu was given.


@@ -16765,7 +16827,7 @@ else
        cf_enable_menu=$cf_default_menu
 
 fi;
        cf_enable_menu=$cf_default_menu
 
 fi;

-echo "$as_me:16768: result: $cf_enable_menu" >&5
+echo "$as_me:16830: result: $cf_enable_menu" >&5

 echo "${ECHO_T}$cf_enable_menu" >&6
 if test $cf_enable_menu = yes
 then
 echo "${ECHO_T}$cf_enable_menu" >&6
 if test $cf_enable_menu = yes
 then


@@ -16774,14 +16836,14 @@ then
                ;;
        (curses*)
 
                ;;
        (curses*)
 

-echo "$as_me:16777: checking for NetBSD menu.h" >&5
+echo "$as_me:16839: 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
 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 16784 "configure"
+#line 16846 "configure"

 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header:-curses.h}>
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header:-curses.h}>


@@ -16799,16 +16861,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
 }
 _ACEOF
 rm -f "conftest.$ac_objext"

-if { (eval echo "$as_me:16802: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:16864: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:16805: \$? = $ac_status" >&5
+  echo "$as_me:16867: \$? = $ac_status" >&5

   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'

-  { (eval echo "$as_me:16808: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16870: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:16811: \$? = $ac_status" >&5
+  echo "$as_me:16873: \$? = $ac_status" >&5

   (exit "$ac_status"); }; }; then
   cf_cv_netbsd_menu_h=yes
 
   (exit "$ac_status"); }; }; then
   cf_cv_netbsd_menu_h=yes
 


@@ -16820,7 +16882,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi

-echo "$as_me:16823: result: $cf_cv_netbsd_menu_h" >&5
+echo "$as_me:16885: result: $cf_cv_netbsd_menu_h" >&5

 echo "${ECHO_T}$cf_cv_netbsd_menu_h" >&6
 
 test "$cf_cv_netbsd_menu_h" = yes &&
 echo "${ECHO_T}$cf_cv_netbsd_menu_h" >&6
 
 test "$cf_cv_netbsd_menu_h" = yes &&


@@ -16837,13 +16899,13 @@ cf_have_curses_lib=no
 if test "x${NCURSES_CONFIG_PKG}" = xnone; then
        :
 elif test "x${PKG_CONFIG:=none}" != xnone; then
 if test "x${NCURSES_CONFIG_PKG}" = xnone; then
        :
 elif test "x${PKG_CONFIG:=none}" != xnone; then

-       echo "$as_me:16840: checking pkg-config for $MENU_NAME$cf_cv_libtype" >&5
+       echo "$as_me:16902: checking pkg-config for $MENU_NAME$cf_cv_libtype" >&5

 echo $ECHO_N "checking pkg-config for $MENU_NAME$cf_cv_libtype... $ECHO_C" >&6
        if "$PKG_CONFIG" --exists "$MENU_NAME$cf_cv_libtype" ; then
 echo $ECHO_N "checking pkg-config for $MENU_NAME$cf_cv_libtype... $ECHO_C" >&6
        if "$PKG_CONFIG" --exists "$MENU_NAME$cf_cv_libtype" ; then

-               echo "$as_me:16843: result: yes" >&5
+               echo "$as_me:16905: result: yes" >&5

 echo "${ECHO_T}yes" >&6
 
 echo "${ECHO_T}yes" >&6
 

-               echo "$as_me:16846: checking if the $MENU_NAME$cf_cv_libtype package files work" >&5
+               echo "$as_me:16908: checking if the $MENU_NAME$cf_cv_libtype package files work" >&5

 echo $ECHO_N "checking if the $MENU_NAME$cf_cv_libtype package files work... $ECHO_C" >&6
 
                cf_save_CPPFLAGS="$CPPFLAGS"
 echo $ECHO_N "checking if the $MENU_NAME$cf_cv_libtype package files work... $ECHO_C" >&6
 
                cf_save_CPPFLAGS="$CPPFLAGS"


@@ -16964,7 +17026,7 @@ done
 LIBS="$cf_add_libs"
 
                cat >"conftest.$ac_ext" <<_ACEOF
 LIBS="$cf_add_libs"
 
                cat >"conftest.$ac_ext" <<_ACEOF

-#line 16967 "configure"
+#line 17029 "configure"

 #include "confdefs.h"
 #include <$MENU_NAME.h>
 int
 #include "confdefs.h"
 #include <$MENU_NAME.h>
 int


@@ -16976,37 +17038,37 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"

-if { (eval echo "$as_me:16979: \"$ac_link\"") >&5
+if { (eval echo "$as_me:17041: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:16982: \$? = $ac_status" >&5
+  echo "$as_me:17044: \$? = $ac_status" >&5

   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'

-  { (eval echo "$as_me:16985: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17047: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:16988: \$? = $ac_status" >&5
+  echo "$as_me:17050: \$? = $ac_status" >&5

   (exit "$ac_status"); }; }; then
   if test "$cross_compiling" = yes; then
   cf_have_curses_lib=maybe
 else
   cat >"conftest.$ac_ext" <<_ACEOF
   (exit "$ac_status"); }; }; then
   if test "$cross_compiling" = yes; then
   cf_have_curses_lib=maybe
 else
   cat >"conftest.$ac_ext" <<_ACEOF

-#line 16994 "configure"
+#line 17056 "configure"

 #include "confdefs.h"
 #include <$MENU_NAME.h>
                                int main(void)
                                { (void) menu_driver ( 0,0 ); return 0; }
 _ACEOF
 rm -f "conftest$ac_exeext"
 #include "confdefs.h"
 #include <$MENU_NAME.h>
                                int main(void)
                                { (void) menu_driver ( 0,0 ); return 0; }
 _ACEOF
 rm -f "conftest$ac_exeext"

-if { (eval echo "$as_me:17001: \"$ac_link\"") >&5
+if { (eval echo "$as_me:17063: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:17004: \$? = $ac_status" >&5
+  echo "$as_me:17066: \$? = $ac_status" >&5

   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'

-  { (eval echo "$as_me:17006: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17068: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:17009: \$? = $ac_status" >&5
+  echo "$as_me:17071: \$? = $ac_status" >&5

   (exit "$ac_status"); }; }; then
   cf_have_curses_lib=yes
 else
   (exit "$ac_status"); }; }; then
   cf_have_curses_lib=yes
 else


@@ -17023,7 +17085,7 @@ cat "conftest.$ac_ext" >&5
 cf_have_curses_lib=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 cf_have_curses_lib=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"

-               echo "$as_me:17026: result: $cf_have_curses_lib" >&5
+               echo "$as_me:17088: result: $cf_have_curses_lib" >&5

 echo "${ECHO_T}$cf_have_curses_lib" >&6
                test "$cf_have_curses_lib" = maybe && cf_have_curses_lib=yes
                if test "$cf_have_curses_lib" != "yes"
 echo "${ECHO_T}$cf_have_curses_lib" >&6
                test "$cf_have_curses_lib" = maybe && cf_have_curses_lib=yes
                if test "$cf_have_curses_lib" != "yes"


@@ -17043,7 +17105,7 @@ EOF
 fi
 if test "$cf_have_curses_lib" = no; then
        as_ac_Lib=`echo "ac_cv_lib_$MENU_NAME$cf_cv_libtype''_menu_driver" | $as_tr_sh`
 fi
 if test "$cf_have_curses_lib" = no; then
        as_ac_Lib=`echo "ac_cv_lib_$MENU_NAME$cf_cv_libtype''_menu_driver" | $as_tr_sh`

-echo "$as_me:17046: checking for menu_driver in -l$MENU_NAME$cf_cv_libtype" >&5
+echo "$as_me:17108: checking for menu_driver in -l$MENU_NAME$cf_cv_libtype" >&5

 echo $ECHO_N "checking for menu_driver in -l$MENU_NAME$cf_cv_libtype... $ECHO_C" >&6
 if eval "test \"\${$as_ac_Lib+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 echo $ECHO_N "checking for menu_driver in -l$MENU_NAME$cf_cv_libtype... $ECHO_C" >&6
 if eval "test \"\${$as_ac_Lib+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6


@@ -17051,7 +17113,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-l$MENU_NAME$cf_cv_libtype  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-l$MENU_NAME$cf_cv_libtype  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF

-#line 17054 "configure"
+#line 17116 "configure"

 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */


@@ -17070,16 +17132,16 @@ menu_driver ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"

-if { (eval echo "$as_me:17073: \"$ac_link\"") >&5
+if { (eval echo "$as_me:17135: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:17076: \$? = $ac_status" >&5
+  echo "$as_me:17138: \$? = $ac_status" >&5

   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'

-  { (eval echo "$as_me:17079: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17141: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:17082: \$? = $ac_status" >&5
+  echo "$as_me:17144: \$? = $ac_status" >&5

   (exit "$ac_status"); }; }; then
   eval "$as_ac_Lib=yes"
 else
   (exit "$ac_status"); }; }; then
   eval "$as_ac_Lib=yes"
 else


@@ -17090,7 +17152,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi

-echo "$as_me:17093: result: `eval echo '${'"$as_ac_Lib"'}'`" >&5
+echo "$as_me:17155: result: `eval echo '${'"$as_ac_Lib"'}'`" >&5

 echo "${ECHO_T}`eval echo '${'"$as_ac_Lib"'}'`" >&6
 if test "`eval echo '${'"$as_ac_Lib"'}'`" = yes; then
 
 echo "${ECHO_T}`eval echo '${'"$as_ac_Lib"'}'`" >&6
 if test "`eval echo '${'"$as_ac_Lib"'}'`" = yes; then
 


@@ -17123,7 +17185,7 @@ fi
        cf_curses_headers="$cf_curses_headers menu.h"
 fi
 
        cf_curses_headers="$cf_curses_headers menu.h"
 fi
 

-echo "$as_me:17126: checking if you want to check for form functions" >&5
+echo "$as_me:17188: checking if you want to check for form functions" >&5

 echo $ECHO_N "checking if you want to check for form functions... $ECHO_C" >&6
 
 # Check whether --enable-form or --disable-form was given.
 echo $ECHO_N "checking if you want to check for form functions... $ECHO_C" >&6
 
 # Check whether --enable-form or --disable-form was given.


@@ -17140,7 +17202,7 @@ else
        cf_enable_form=$cf_default_form
 
 fi;
        cf_enable_form=$cf_default_form
 
 fi;

-echo "$as_me:17143: result: $cf_enable_form" >&5
+echo "$as_me:17205: result: $cf_enable_form" >&5

 echo "${ECHO_T}$cf_enable_form" >&6
 if test $cf_enable_form = yes
 then
 echo "${ECHO_T}$cf_enable_form" >&6
 if test $cf_enable_form = yes
 then


@@ -17149,14 +17211,14 @@ then
                ;;
        (curses*)
 
                ;;
        (curses*)
 

-echo "$as_me:17152: checking for NetBSD form.h" >&5
+echo "$as_me:17214: 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
 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 17159 "configure"
+#line 17221 "configure"

 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header:-curses.h}>
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header:-curses.h}>


@@ -17175,16 +17237,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
 }
 _ACEOF
 rm -f "conftest.$ac_objext"

-if { (eval echo "$as_me:17178: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:17240: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:17181: \$? = $ac_status" >&5
+  echo "$as_me:17243: \$? = $ac_status" >&5

   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'

-  { (eval echo "$as_me:17184: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17246: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:17187: \$? = $ac_status" >&5
+  echo "$as_me:17249: \$? = $ac_status" >&5

   (exit "$ac_status"); }; }; then
   cf_cv_netbsd_form_h=yes
 
   (exit "$ac_status"); }; }; then
   cf_cv_netbsd_form_h=yes
 


@@ -17196,7 +17258,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi

-echo "$as_me:17199: result: $cf_cv_netbsd_form_h" >&5
+echo "$as_me:17261: result: $cf_cv_netbsd_form_h" >&5

 echo "${ECHO_T}$cf_cv_netbsd_form_h" >&6
 
 test "$cf_cv_netbsd_form_h" = yes &&
 echo "${ECHO_T}$cf_cv_netbsd_form_h" >&6
 
 test "$cf_cv_netbsd_form_h" = yes &&


@@ -17213,13 +17275,13 @@ cf_have_curses_lib=no
 if test "x${NCURSES_CONFIG_PKG}" = xnone; then
        :
 elif test "x${PKG_CONFIG:=none}" != xnone; then
 if test "x${NCURSES_CONFIG_PKG}" = xnone; then
        :
 elif test "x${PKG_CONFIG:=none}" != xnone; then

-       echo "$as_me:17216: checking pkg-config for $FORM_NAME$cf_cv_libtype" >&5
+       echo "$as_me:17278: checking pkg-config for $FORM_NAME$cf_cv_libtype" >&5

 echo $ECHO_N "checking pkg-config for $FORM_NAME$cf_cv_libtype... $ECHO_C" >&6
        if "$PKG_CONFIG" --exists "$FORM_NAME$cf_cv_libtype" ; then
 echo $ECHO_N "checking pkg-config for $FORM_NAME$cf_cv_libtype... $ECHO_C" >&6
        if "$PKG_CONFIG" --exists "$FORM_NAME$cf_cv_libtype" ; then

-               echo "$as_me:17219: result: yes" >&5
+               echo "$as_me:17281: result: yes" >&5

 echo "${ECHO_T}yes" >&6
 
 echo "${ECHO_T}yes" >&6
 

-               echo "$as_me:17222: checking if the $FORM_NAME$cf_cv_libtype package files work" >&5
+               echo "$as_me:17284: checking if the $FORM_NAME$cf_cv_libtype package files work" >&5

 echo $ECHO_N "checking if the $FORM_NAME$cf_cv_libtype package files work... $ECHO_C" >&6
 
                cf_save_CPPFLAGS="$CPPFLAGS"
 echo $ECHO_N "checking if the $FORM_NAME$cf_cv_libtype package files work... $ECHO_C" >&6
 
                cf_save_CPPFLAGS="$CPPFLAGS"


@@ -17340,7 +17402,7 @@ done
 LIBS="$cf_add_libs"
 
                cat >"conftest.$ac_ext" <<_ACEOF
 LIBS="$cf_add_libs"
 
                cat >"conftest.$ac_ext" <<_ACEOF

-#line 17343 "configure"
+#line 17405 "configure"

 #include "confdefs.h"
 #include <$FORM_NAME.h>
 int
 #include "confdefs.h"
 #include <$FORM_NAME.h>
 int


@@ -17352,37 +17414,37 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"

-if { (eval echo "$as_me:17355: \"$ac_link\"") >&5
+if { (eval echo "$as_me:17417: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:17358: \$? = $ac_status" >&5
+  echo "$as_me:17420: \$? = $ac_status" >&5

   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'

-  { (eval echo "$as_me:17361: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17423: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:17364: \$? = $ac_status" >&5
+  echo "$as_me:17426: \$? = $ac_status" >&5

   (exit "$ac_status"); }; }; then
   if test "$cross_compiling" = yes; then
   cf_have_curses_lib=maybe
 else
   cat >"conftest.$ac_ext" <<_ACEOF
   (exit "$ac_status"); }; }; then
   if test "$cross_compiling" = yes; then
   cf_have_curses_lib=maybe
 else
   cat >"conftest.$ac_ext" <<_ACEOF

-#line 17370 "configure"
+#line 17432 "configure"

 #include "confdefs.h"
 #include <$FORM_NAME.h>
                                int main(void)
                                { (void) form_driver ( 0,0 ); return 0; }
 _ACEOF
 rm -f "conftest$ac_exeext"
 #include "confdefs.h"
 #include <$FORM_NAME.h>
                                int main(void)
                                { (void) form_driver ( 0,0 ); return 0; }
 _ACEOF
 rm -f "conftest$ac_exeext"

-if { (eval echo "$as_me:17377: \"$ac_link\"") >&5
+if { (eval echo "$as_me:17439: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:17380: \$? = $ac_status" >&5
+  echo "$as_me:17442: \$? = $ac_status" >&5

   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'

-  { (eval echo "$as_me:17382: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17444: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:17385: \$? = $ac_status" >&5
+  echo "$as_me:17447: \$? = $ac_status" >&5

   (exit "$ac_status"); }; }; then
   cf_have_curses_lib=yes
 else
   (exit "$ac_status"); }; }; then
   cf_have_curses_lib=yes
 else


@@ -17399,7 +17461,7 @@ cat "conftest.$ac_ext" >&5
 cf_have_curses_lib=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 cf_have_curses_lib=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"

-               echo "$as_me:17402: result: $cf_have_curses_lib" >&5
+               echo "$as_me:17464: result: $cf_have_curses_lib" >&5

 echo "${ECHO_T}$cf_have_curses_lib" >&6
                test "$cf_have_curses_lib" = maybe && cf_have_curses_lib=yes
                if test "$cf_have_curses_lib" != "yes"
 echo "${ECHO_T}$cf_have_curses_lib" >&6
                test "$cf_have_curses_lib" = maybe && cf_have_curses_lib=yes
                if test "$cf_have_curses_lib" != "yes"


@@ -17419,7 +17481,7 @@ EOF
 fi
 if test "$cf_have_curses_lib" = no; then
        as_ac_Lib=`echo "ac_cv_lib_$FORM_NAME$cf_cv_libtype''_form_driver" | $as_tr_sh`
 fi
 if test "$cf_have_curses_lib" = no; then
        as_ac_Lib=`echo "ac_cv_lib_$FORM_NAME$cf_cv_libtype''_form_driver" | $as_tr_sh`

-echo "$as_me:17422: checking for form_driver in -l$FORM_NAME$cf_cv_libtype" >&5
+echo "$as_me:17484: checking for form_driver in -l$FORM_NAME$cf_cv_libtype" >&5

 echo $ECHO_N "checking for form_driver in -l$FORM_NAME$cf_cv_libtype... $ECHO_C" >&6
 if eval "test \"\${$as_ac_Lib+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 echo $ECHO_N "checking for form_driver in -l$FORM_NAME$cf_cv_libtype... $ECHO_C" >&6
 if eval "test \"\${$as_ac_Lib+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6


@@ -17427,7 +17489,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-l$FORM_NAME$cf_cv_libtype  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-l$FORM_NAME$cf_cv_libtype  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF

-#line 17430 "configure"
+#line 17492 "configure"

 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */


@@ -17446,16 +17508,16 @@ form_driver ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"

-if { (eval echo "$as_me:17449: \"$ac_link\"") >&5
+if { (eval echo "$as_me:17511: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:17452: \$? = $ac_status" >&5
+  echo "$as_me:17514: \$? = $ac_status" >&5

   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'

-  { (eval echo "$as_me:17455: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17517: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:17458: \$? = $ac_status" >&5
+  echo "$as_me:17520: \$? = $ac_status" >&5

   (exit "$ac_status"); }; }; then
   eval "$as_ac_Lib=yes"
 else
   (exit "$ac_status"); }; }; then
   eval "$as_ac_Lib=yes"
 else


@@ -17466,7 +17528,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi

-echo "$as_me:17469: result: `eval echo '${'"$as_ac_Lib"'}'`" >&5
+echo "$as_me:17531: result: `eval echo '${'"$as_ac_Lib"'}'`" >&5

 echo "${ECHO_T}`eval echo '${'"$as_ac_Lib"'}'`" >&6
 if test "`eval echo '${'"$as_ac_Lib"'}'`" = yes; then
 
 echo "${ECHO_T}`eval echo '${'"$as_ac_Lib"'}'`" >&6
 if test "`eval echo '${'"$as_ac_Lib"'}'`" = yes; then
 


@@ -17504,23 +17566,23 @@ fi
 for ac_header in $cf_curses_headers
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
 for ac_header in $cf_curses_headers
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`

-echo "$as_me:17507: checking for $ac_header" >&5
+echo "$as_me:17569: 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
 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 17513 "configure"
+#line 17575 "configure"

 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF

-if { (eval echo "$as_me:17517: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:17579: \"$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
   (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:17523: \$? = $ac_status" >&5
+  echo "$as_me:17585: \$? = $ac_status" >&5

   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag


@@ -17539,7 +17601,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi

-echo "$as_me:17542: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:17604: 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
 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6
 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then
   cat >>confdefs.h <<EOF


@@ -17549,13 +17611,13 @@ EOF
 fi
 done
 
 fi
 done
 

-echo "$as_me:17552: checking for ANSI C header files" >&5
+echo "$as_me:17614: 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
 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 17558 "configure"
+#line 17620 "configure"

 #include "confdefs.h"
 #include <stdlib.h>
 #include <stdarg.h>
 #include "confdefs.h"
 #include <stdlib.h>
 #include <stdarg.h>


@@ -17563,13 +17625,13 @@ else
 #include <float.h>
 
 _ACEOF
 #include <float.h>
 
 _ACEOF

-if { (eval echo "$as_me:17566: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:17628: \"$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
   (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:17572: \$? = $ac_status" >&5
+  echo "$as_me:17634: \$? = $ac_status" >&5

   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag


@@ -17591,7 +17653,7 @@ rm -f conftest.err "conftest.$ac_ext"
 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
 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 17594 "configure"
+#line 17656 "configure"

 #include "confdefs.h"
 #include <string.h>
 
 #include "confdefs.h"
 #include <string.h>
 


@@ -17609,7 +17671,7 @@ fi
 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
 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 17612 "configure"
+#line 17674 "configure"

 #include "confdefs.h"
 #include <stdlib.h>
 
 #include "confdefs.h"
 #include <stdlib.h>
 


@@ -17630,7 +17692,7 @@ if test $ac_cv_header_stdc = yes; then
   :
 else
   cat >"conftest.$ac_ext" <<_ACEOF
   :
 else
   cat >"conftest.$ac_ext" <<_ACEOF

-#line 17633 "configure"
+#line 17695 "configure"

 #include "confdefs.h"
 #include <ctype.h>
 #if ((' ' & 0x0FF) == 0x020)
 #include "confdefs.h"
 #include <ctype.h>
 #if ((' ' & 0x0FF) == 0x020)


@@ -17656,15 +17718,15 @@ main (void)
 }
 _ACEOF
 rm -f "conftest$ac_exeext"
 }
 _ACEOF
 rm -f "conftest$ac_exeext"

-if { (eval echo "$as_me:17659: \"$ac_link\"") >&5
+if { (eval echo "$as_me:17721: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:17662: \$? = $ac_status" >&5
+  echo "$as_me:17724: \$? = $ac_status" >&5

   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'

-  { (eval echo "$as_me:17664: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17726: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:17667: \$? = $ac_status" >&5
+  echo "$as_me:17729: \$? = $ac_status" >&5

   (exit "$ac_status"); }; }; then
   :
 else
   (exit "$ac_status"); }; }; then
   :
 else


@@ -17677,7 +17739,7 @@ rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftes
 fi
 fi
 fi
 fi
 fi
 fi

-echo "$as_me:17680: result: $ac_cv_header_stdc" >&5
+echo "$as_me:17742: result: $ac_cv_header_stdc" >&5

 echo "${ECHO_T}$ac_cv_header_stdc" >&6
 if test $ac_cv_header_stdc = yes; then
 
 echo "${ECHO_T}$ac_cv_header_stdc" >&6
 if test $ac_cv_header_stdc = yes; then
 


@@ -17687,13 +17749,13 @@ EOF
 
 fi
 
 
 fi
 

-echo "$as_me:17690: checking whether time.h and sys/time.h may both be included" >&5
+echo "$as_me:17752: 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
 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 17696 "configure"
+#line 17758 "configure"

 #include "confdefs.h"
 #include <sys/types.h>
 #include <sys/time.h>
 #include "confdefs.h"
 #include <sys/types.h>
 #include <sys/time.h>


@@ -17709,16 +17771,16 @@ return 0;
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
 }
 _ACEOF
 rm -f "conftest.$ac_objext"

-if { (eval echo "$as_me:17712: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:17774: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:17715: \$? = $ac_status" >&5
+  echo "$as_me:17777: \$? = $ac_status" >&5

   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'

-  { (eval echo "$as_me:17718: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17780: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:17721: \$? = $ac_status" >&5
+  echo "$as_me:17783: \$? = $ac_status" >&5

   (exit "$ac_status"); }; }; then
   ac_cv_header_time=yes
 else
   (exit "$ac_status"); }; }; then
   ac_cv_header_time=yes
 else


@@ -17728,7 +17790,7 @@ ac_cv_header_time=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi

-echo "$as_me:17731: result: $ac_cv_header_time" >&5
+echo "$as_me:17793: result: $ac_cv_header_time" >&5

 echo "${ECHO_T}$ac_cv_header_time" >&6
 if test $ac_cv_header_time = yes; then
 
 echo "${ECHO_T}$ac_cv_header_time" >&6
 if test $ac_cv_header_time = yes; then
 


@@ -17752,23 +17814,23 @@ unistd.h \
 
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
 
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`

-echo "$as_me:17755: checking for $ac_header" >&5
+echo "$as_me:17817: 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
 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 17761 "configure"
+#line 17823 "configure"

 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF

-if { (eval echo "$as_me:17765: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:17827: \"$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
   (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:17771: \$? = $ac_status" >&5
+  echo "$as_me:17833: \$? = $ac_status" >&5

   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag


@@ -17787,7 +17849,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi

-echo "$as_me:17790: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:17852: 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
 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6
 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then
   cat >>confdefs.h <<EOF


@@ -17800,23 +17862,23 @@ done
 for ac_header in unistd.h getopt.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
 for ac_header in unistd.h getopt.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`

-echo "$as_me:17803: checking for $ac_header" >&5
+echo "$as_me:17865: 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
 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 17809 "configure"
+#line 17871 "configure"

 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF

-if { (eval echo "$as_me:17813: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:17875: \"$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
   (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:17819: \$? = $ac_status" >&5
+  echo "$as_me:17881: \$? = $ac_status" >&5

   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag


@@ -17835,7 +17897,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi

-echo "$as_me:17838: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:17900: 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
 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6
 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then
   cat >>confdefs.h <<EOF


@@ -17845,7 +17907,7 @@ EOF
 fi
 done
 
 fi
 done
 

-echo "$as_me:17848: checking for header declaring getopt variables" >&5
+echo "$as_me:17910: 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
 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


@@ -17855,7 +17917,7 @@ cf_cv_getopt_header=none
 for cf_header in stdio.h stdlib.h unistd.h getopt.h
 do
 cat >"conftest.$ac_ext" <<_ACEOF
 for cf_header in stdio.h stdlib.h unistd.h getopt.h
 do
 cat >"conftest.$ac_ext" <<_ACEOF

-#line 17858 "configure"
+#line 17920 "configure"

 #include "confdefs.h"
 
 #include <$cf_header>
 #include "confdefs.h"
 
 #include <$cf_header>


@@ -17868,16 +17930,16 @@ int x = optind; char *y = optarg
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
 }
 _ACEOF
 rm -f "conftest.$ac_objext"

-if { (eval echo "$as_me:17871: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:17933: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:17874: \$? = $ac_status" >&5
+  echo "$as_me:17936: \$? = $ac_status" >&5

   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'

-  { (eval echo "$as_me:17877: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17939: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:17880: \$? = $ac_status" >&5
+  echo "$as_me:17942: \$? = $ac_status" >&5

   (exit "$ac_status"); }; }; then
   cf_cv_getopt_header=$cf_header
  break
   (exit "$ac_status"); }; }; then
   cf_cv_getopt_header=$cf_header
  break


@@ -17889,7 +17951,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 done
 
 fi
 done
 
 fi

-echo "$as_me:17892: result: $cf_cv_getopt_header" >&5
+echo "$as_me:17954: result: $cf_cv_getopt_header" >&5

 echo "${ECHO_T}$cf_cv_getopt_header" >&6
 if test "$cf_cv_getopt_header" != none ; then
 
 echo "${ECHO_T}$cf_cv_getopt_header" >&6
 if test "$cf_cv_getopt_header" != none ; then
 


@@ -17916,13 +17978,13 @@ tsearch \
 
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
 
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`

-echo "$as_me:17919: checking for $ac_func" >&5
+echo "$as_me:17981: 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
 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 17925 "configure"
+#line 17987 "configure"

 #include "confdefs.h"
 #define $ac_func autoconf_temporary
 #include <limits.h>    /* least-intrusive standard header which defines gcc2 __stub macros */
 #include "confdefs.h"
 #define $ac_func autoconf_temporary
 #include <limits.h>    /* least-intrusive standard header which defines gcc2 __stub macros */


@@ -17953,16 +18015,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"

-if { (eval echo "$as_me:17956: \"$ac_link\"") >&5
+if { (eval echo "$as_me:18018: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:17959: \$? = $ac_status" >&5
+  echo "$as_me:18021: \$? = $ac_status" >&5

   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'

-  { (eval echo "$as_me:17962: \"$ac_try\"") >&5
+  { (eval echo "$as_me:18024: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:17965: \$? = $ac_status" >&5
+  echo "$as_me:18027: \$? = $ac_status" >&5

   (exit "$ac_status"); }; }; then
   eval "$as_ac_var=yes"
 else
   (exit "$ac_status"); }; }; then
   eval "$as_ac_var=yes"
 else


@@ -17972,7 +18034,7 @@ eval "$as_ac_var=no"
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi

-echo "$as_me:17975: result: `eval echo '${'"$as_ac_var"'}'`" >&5
+echo "$as_me:18037: 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
 echo "${ECHO_T}`eval echo '${'"$as_ac_var"'}'`" >&6
 if test "`eval echo '${'"$as_ac_var"'}'`" = yes; then
   cat >>confdefs.h <<EOF


@@ -17983,14 +18045,14 @@ fi
 done
 
 # use a compile-check to work with ncurses*-config and subdirectory includes
 done
 
 # use a compile-check to work with ncurses*-config and subdirectory includes

-echo "$as_me:17986: checking if we can use termcap.h" >&5
+echo "$as_me:18048: checking if we can use termcap.h" >&5

 echo $ECHO_N "checking if we can use termcap.h... $ECHO_C" >&6
 if test "${cf_cv_have_termcap_h+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
        cat >"conftest.$ac_ext" <<_ACEOF
 echo $ECHO_N "checking if we can use termcap.h... $ECHO_C" >&6
 if test "${cf_cv_have_termcap_h+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
        cat >"conftest.$ac_ext" <<_ACEOF

-#line 17993 "configure"
+#line 18055 "configure"

 #include "confdefs.h"
 
 #include <curses.h>
 #include "confdefs.h"
 
 #include <curses.h>


@@ -18011,16 +18073,16 @@ return 0;
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
 }
 _ACEOF
 rm -f "conftest.$ac_objext"

-if { (eval echo "$as_me:18014: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:18076: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:18017: \$? = $ac_status" >&5
+  echo "$as_me:18079: \$? = $ac_status" >&5

   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'

-  { (eval echo "$as_me:18020: \"$ac_try\"") >&5
+  { (eval echo "$as_me:18082: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:18023: \$? = $ac_status" >&5
+  echo "$as_me:18085: \$? = $ac_status" >&5

   (exit "$ac_status"); }; }; then
   cf_cv_have_termcap_h=yes
 else
   (exit "$ac_status"); }; }; then
   cf_cv_have_termcap_h=yes
 else


@@ -18030,7 +18092,7 @@ cf_cv_have_termcap_h=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi

-echo "$as_me:18033: result: $cf_cv_have_termcap_h" >&5
+echo "$as_me:18095: result: $cf_cv_have_termcap_h" >&5

 echo "${ECHO_T}$cf_cv_have_termcap_h" >&6
 if test "x$cf_cv_have_termcap_h" = xyes
 then
 echo "${ECHO_T}$cf_cv_have_termcap_h" >&6
 if test "x$cf_cv_have_termcap_h" = xyes
 then


@@ -18040,14 +18102,14 @@ cat >>confdefs.h <<\EOF
 EOF
 
 else
 EOF
 
 else

-echo "$as_me:18043: checking if we can use ncurses/termcap.h" >&5
+echo "$as_me:18105: checking if we can use ncurses/termcap.h" >&5

 echo $ECHO_N "checking if we can use ncurses/termcap.h... $ECHO_C" >&6
 if test "${cf_cv_have_ncurses_termcap_h+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
        cat >"conftest.$ac_ext" <<_ACEOF
 echo $ECHO_N "checking if we can use ncurses/termcap.h... $ECHO_C" >&6
 if test "${cf_cv_have_ncurses_termcap_h+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
        cat >"conftest.$ac_ext" <<_ACEOF

-#line 18050 "configure"
+#line 18112 "configure"

 #include "confdefs.h"
 
 #include <ncurses/curses.h>
 #include "confdefs.h"
 
 #include <ncurses/curses.h>


@@ -18068,16 +18130,16 @@ return 0;
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
 }
 _ACEOF
 rm -f "conftest.$ac_objext"

-if { (eval echo "$as_me:18071: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:18133: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:18074: \$? = $ac_status" >&5
+  echo "$as_me:18136: \$? = $ac_status" >&5

   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'

-  { (eval echo "$as_me:18077: \"$ac_try\"") >&5
+  { (eval echo "$as_me:18139: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:18080: \$? = $ac_status" >&5
+  echo "$as_me:18142: \$? = $ac_status" >&5

   (exit "$ac_status"); }; }; then
   cf_cv_have_ncurses_termcap_h=yes
 else
   (exit "$ac_status"); }; }; then
   cf_cv_have_ncurses_termcap_h=yes
 else


@@ -18087,7 +18149,7 @@ cf_cv_have_ncurses_termcap_h=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi

-echo "$as_me:18090: result: $cf_cv_have_ncurses_termcap_h" >&5
+echo "$as_me:18152: result: $cf_cv_have_ncurses_termcap_h" >&5

 echo "${ECHO_T}$cf_cv_have_ncurses_termcap_h" >&6
 test "x$cf_cv_have_ncurses_termcap_h" = xyes &&
 cat >>confdefs.h <<\EOF
 echo "${ECHO_T}$cf_cv_have_ncurses_termcap_h" >&6
 test "x$cf_cv_have_ncurses_termcap_h" = xyes &&
 cat >>confdefs.h <<\EOF


@@ -18097,7 +18159,7 @@ EOF
 fi
 
 if test "x$ac_cv_func_getopt" = xno; then
 fi
 
 if test "x$ac_cv_func_getopt" = xno; then

-       { { echo "$as_me:18100: error: getopt is required for building programs" >&5
+       { { echo "$as_me:18162: error: getopt is required for building programs" >&5

 echo "$as_me: error: getopt is required for building programs" >&2;}
    { (exit 1); exit 1; }; }
 fi
 echo "$as_me: error: getopt is required for building programs" >&2;}
    { (exit 1); exit 1; }; }
 fi


@@ -18116,13 +18178,13 @@ wcstombs \
 
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
 
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`

-echo "$as_me:18119: checking for $ac_func" >&5
+echo "$as_me:18181: 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
 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 18125 "configure"
+#line 18187 "configure"

 #include "confdefs.h"
 #define $ac_func autoconf_temporary
 #include <limits.h>    /* least-intrusive standard header which defines gcc2 __stub macros */
 #include "confdefs.h"
 #define $ac_func autoconf_temporary
 #include <limits.h>    /* least-intrusive standard header which defines gcc2 __stub macros */


@@ -18153,16 +18215,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"

-if { (eval echo "$as_me:18156: \"$ac_link\"") >&5
+if { (eval echo "$as_me:18218: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:18159: \$? = $ac_status" >&5
+  echo "$as_me:18221: \$? = $ac_status" >&5

   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'

-  { (eval echo "$as_me:18162: \"$ac_try\"") >&5
+  { (eval echo "$as_me:18224: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:18165: \$? = $ac_status" >&5
+  echo "$as_me:18227: \$? = $ac_status" >&5

   (exit "$ac_status"); }; }; then
   eval "$as_ac_var=yes"
 else
   (exit "$ac_status"); }; }; then
   eval "$as_ac_var=yes"
 else


@@ -18172,7 +18234,7 @@ eval "$as_ac_var=no"
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi

-echo "$as_me:18175: result: `eval echo '${'"$as_ac_var"'}'`" >&5
+echo "$as_me:18237: 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
 echo "${ECHO_T}`eval echo '${'"$as_ac_var"'}'`" >&6
 if test "`eval echo '${'"$as_ac_var"'}'`" = yes; then
   cat >>confdefs.h <<EOF


@@ -18184,7 +18246,7 @@ done
 
 fi
 
 
 fi
 

-echo "$as_me:18187: checking definition to turn on extended curses functions" >&5
+echo "$as_me:18249: checking definition to turn on extended curses functions" >&5

 echo $ECHO_N "checking definition to turn on extended curses functions... $ECHO_C" >&6
 if test "${cf_cv_need_xopen_extension+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 echo $ECHO_N "checking definition to turn on extended curses functions... $ECHO_C" >&6
 if test "${cf_cv_need_xopen_extension+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6


@@ -18192,7 +18254,7 @@ else
 
 cf_cv_need_xopen_extension=unknown
 cat >"conftest.$ac_ext" <<_ACEOF
 
 cf_cv_need_xopen_extension=unknown
 cat >"conftest.$ac_ext" <<_ACEOF

-#line 18195 "configure"
+#line 18257 "configure"

 #include "confdefs.h"
 
 #include <stdlib.h>
 #include "confdefs.h"
 
 #include <stdlib.h>


@@ -18225,16 +18287,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"

-if { (eval echo "$as_me:18228: \"$ac_link\"") >&5
+if { (eval echo "$as_me:18290: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:18231: \$? = $ac_status" >&5
+  echo "$as_me:18293: \$? = $ac_status" >&5

   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'

-  { (eval echo "$as_me:18234: \"$ac_try\"") >&5
+  { (eval echo "$as_me:18296: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:18237: \$? = $ac_status" >&5
+  echo "$as_me:18299: \$? = $ac_status" >&5

   (exit "$ac_status"); }; }; then
   cf_cv_need_xopen_extension=none
 else
   (exit "$ac_status"); }; }; then
   cf_cv_need_xopen_extension=none
 else


@@ -18244,7 +18306,7 @@ cat "conftest.$ac_ext" >&5
        for cf_try_xopen_extension in _XOPEN_SOURCE_EXTENDED NCURSES_WIDECHAR
        do
                cat >"conftest.$ac_ext" <<_ACEOF
        for cf_try_xopen_extension in _XOPEN_SOURCE_EXTENDED NCURSES_WIDECHAR
        do
                cat >"conftest.$ac_ext" <<_ACEOF

-#line 18247 "configure"
+#line 18309 "configure"

 #include "confdefs.h"
 
 #define $cf_try_xopen_extension 1
 #include "confdefs.h"
 
 #define $cf_try_xopen_extension 1


@@ -18273,16 +18335,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"

-if { (eval echo "$as_me:18276: \"$ac_link\"") >&5
+if { (eval echo "$as_me:18338: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:18279: \$? = $ac_status" >&5
+  echo "$as_me:18341: \$? = $ac_status" >&5

   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'

-  { (eval echo "$as_me:18282: \"$ac_try\"") >&5
+  { (eval echo "$as_me:18344: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:18285: \$? = $ac_status" >&5
+  echo "$as_me:18347: \$? = $ac_status" >&5

   (exit "$ac_status"); }; }; then
   cf_cv_need_xopen_extension=$cf_try_xopen_extension; break
 else
   (exit "$ac_status"); }; }; then
   cf_cv_need_xopen_extension=$cf_try_xopen_extension; break
 else


@@ -18296,7 +18358,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 
 fi

-echo "$as_me:18299: result: $cf_cv_need_xopen_extension" >&5
+echo "$as_me:18361: result: $cf_cv_need_xopen_extension" >&5

 echo "${ECHO_T}$cf_cv_need_xopen_extension" >&6
 
 case "$cf_cv_need_xopen_extension" in
 echo "${ECHO_T}$cf_cv_need_xopen_extension" >&6
 
 case "$cf_cv_need_xopen_extension" in


@@ -18308,7 +18370,7 @@ case "$cf_cv_need_xopen_extension" in
        ;;
 esac
 
        ;;
 esac
 

-echo "$as_me:18311: checking for term.h" >&5
+echo "$as_me:18373: 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
 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


@@ -18329,7 +18391,7 @@ esac
 for cf_header in $cf_header_list
 do
        cat >"conftest.$ac_ext" <<_ACEOF
 for cf_header in $cf_header_list
 do
        cat >"conftest.$ac_ext" <<_ACEOF

-#line 18332 "configure"
+#line 18394 "configure"

 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header:-curses.h}>
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header:-curses.h}>


@@ -18343,16 +18405,16 @@ WINDOW *x; (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
 }
 _ACEOF
 rm -f "conftest.$ac_objext"

-if { (eval echo "$as_me:18346: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:18408: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:18349: \$? = $ac_status" >&5
+  echo "$as_me:18411: \$? = $ac_status" >&5

   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'

-  { (eval echo "$as_me:18352: \"$ac_try\"") >&5
+  { (eval echo "$as_me:18414: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:18355: \$? = $ac_status" >&5
+  echo "$as_me:18417: \$? = $ac_status" >&5

   (exit "$ac_status"); }; }; then
   cf_cv_term_header=$cf_header
         break
   (exit "$ac_status"); }; }; then
   cf_cv_term_header=$cf_header
         break


@@ -18371,7 +18433,7 @@ case "$cf_cv_term_header" in
        for cf_header in ncurses/term.h ncursesw/term.h
        do
                cat >"conftest.$ac_ext" <<_ACEOF
        for cf_header in ncurses/term.h ncursesw/term.h
        do
                cat >"conftest.$ac_ext" <<_ACEOF

-#line 18374 "configure"
+#line 18436 "configure"

 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header:-curses.h}>
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header:-curses.h}>


@@ -18389,16 +18451,16 @@ WINDOW *x; (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
 }
 _ACEOF
 rm -f "conftest.$ac_objext"

-if { (eval echo "$as_me:18392: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:18454: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:18395: \$? = $ac_status" >&5
+  echo "$as_me:18457: \$? = $ac_status" >&5

   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'

-  { (eval echo "$as_me:18398: \"$ac_try\"") >&5
+  { (eval echo "$as_me:18460: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:18401: \$? = $ac_status" >&5
+  echo "$as_me:18463: \$? = $ac_status" >&5

   (exit "$ac_status"); }; }; then
   cf_cv_term_header=$cf_header
                         break
   (exit "$ac_status"); }; }; then
   cf_cv_term_header=$cf_header
                         break


@@ -18413,7 +18475,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 esac
 
 fi
 esac
 
 fi

-echo "$as_me:18416: result: $cf_cv_term_header" >&5
+echo "$as_me:18478: result: $cf_cv_term_header" >&5

 echo "${ECHO_T}$cf_cv_term_header" >&6
 
 case "$cf_cv_term_header" in
 echo "${ECHO_T}$cf_cv_term_header" >&6
 
 case "$cf_cv_term_header" in


@@ -18440,7 +18502,7 @@ EOF
        ;;
 esac
 
        ;;
 esac
 

-echo "$as_me:18443: checking for unctrl.h" >&5
+echo "$as_me:18505: 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
 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


@@ -18461,7 +18523,7 @@ esac
 for cf_header in $cf_header_list
 do
        cat >"conftest.$ac_ext" <<_ACEOF
 for cf_header in $cf_header_list
 do
        cat >"conftest.$ac_ext" <<_ACEOF

-#line 18464 "configure"
+#line 18526 "configure"

 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header:-curses.h}>
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header:-curses.h}>


@@ -18475,16 +18537,16 @@ WINDOW *x; (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
 }
 _ACEOF
 rm -f "conftest.$ac_objext"

-if { (eval echo "$as_me:18478: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:18540: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:18481: \$? = $ac_status" >&5
+  echo "$as_me:18543: \$? = $ac_status" >&5

   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'

-  { (eval echo "$as_me:18484: \"$ac_try\"") >&5
+  { (eval echo "$as_me:18546: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:18487: \$? = $ac_status" >&5
+  echo "$as_me:18549: \$? = $ac_status" >&5

   (exit "$ac_status"); }; }; then
   cf_cv_unctrl_header=$cf_header
         break
   (exit "$ac_status"); }; }; then
   cf_cv_unctrl_header=$cf_header
         break


@@ -18497,12 +18559,12 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 done
 
 fi
 done
 
 fi

-echo "$as_me:18500: result: $cf_cv_unctrl_header" >&5
+echo "$as_me:18562: result: $cf_cv_unctrl_header" >&5

 echo "${ECHO_T}$cf_cv_unctrl_header" >&6
 
 case "$cf_cv_unctrl_header" in
 (no)
 echo "${ECHO_T}$cf_cv_unctrl_header" >&6
 
 case "$cf_cv_unctrl_header" in
 (no)

-       { echo "$as_me:18505: WARNING: unctrl.h header not found" >&5
+       { echo "$as_me:18567: WARNING: unctrl.h header not found" >&5

 echo "$as_me: WARNING: unctrl.h header not found" >&2;}
        ;;
 esac
 echo "$as_me: WARNING: unctrl.h header not found" >&2;}
        ;;
 esac


@@ -18594,10 +18656,10 @@ do
 
 cf_tr_func=`echo "$cf_func" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%`
 
 
 cf_tr_func=`echo "$cf_func" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%`
 

-       echo "$as_me:18597: checking for ${cf_func}" >&5
+       echo "$as_me:18659: checking for ${cf_func}" >&5

 echo $ECHO_N "checking for ${cf_func}... $ECHO_C" >&6
 
 echo $ECHO_N "checking for ${cf_func}... $ECHO_C" >&6
 

-echo "${as_me:-configure}:18600: testing ${cf_func} ..." 1>&5
+echo "${as_me:-configure}:18662: testing ${cf_func} ..." 1>&5

 
        if eval "test \"\${cf_cv_func_$cf_func+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 
        if eval "test \"\${cf_cv_func_$cf_func+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6


@@ -18606,7 +18668,7 @@ else
                eval cf_result='$ac_cv_func_'$cf_func
                if test ".$cf_result" != ".no"; then
                        cat >"conftest.$ac_ext" <<_ACEOF
                eval cf_result='$ac_cv_func_'$cf_func
                if test ".$cf_result" != ".no"; then
                        cat >"conftest.$ac_ext" <<_ACEOF

-#line 18609 "configure"
+#line 18671 "configure"

 #include "confdefs.h"
 
 #ifdef HAVE_XCURSES
 #include "confdefs.h"
 
 #ifdef HAVE_XCURSES


@@ -18639,16 +18701,16 @@ if (foo + 1234L > 5678L)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"

-if { (eval echo "$as_me:18642: \"$ac_link\"") >&5
+if { (eval echo "$as_me:18704: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:18645: \$? = $ac_status" >&5
+  echo "$as_me:18707: \$? = $ac_status" >&5

   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'

-  { (eval echo "$as_me:18648: \"$ac_try\"") >&5
+  { (eval echo "$as_me:18710: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:18651: \$? = $ac_status" >&5
+  echo "$as_me:18713: \$? = $ac_status" >&5

   (exit "$ac_status"); }; }; then
   cf_result=yes
 else
   (exit "$ac_status"); }; }; then
   cf_result=yes
 else


@@ -18664,7 +18726,7 @@ fi
 
        # use the computed/retrieved cache-value:
        eval 'cf_result=$cf_cv_func_'$cf_func
 
        # use the computed/retrieved cache-value:
        eval 'cf_result=$cf_cv_func_'$cf_func

-       echo "$as_me:18667: result: $cf_result" >&5
+       echo "$as_me:18729: result: $cf_result" >&5

 echo "${ECHO_T}$cf_result" >&6
        if test "$cf_result" != no; then
                cat >>confdefs.h <<EOF
 echo "${ECHO_T}$cf_result" >&6
        if test "$cf_result" != no; then
                cat >>confdefs.h <<EOF


@@ -18679,10 +18741,10 @@ do
 
 cf_tr_func=`echo "$cf_func" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%`
 
 
 cf_tr_func=`echo "$cf_func" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%`
 

-       echo "$as_me:18682: checking for ${cf_func}" >&5
+       echo "$as_me:18744: checking for ${cf_func}" >&5

 echo $ECHO_N "checking for ${cf_func}... $ECHO_C" >&6
 
 echo $ECHO_N "checking for ${cf_func}... $ECHO_C" >&6
 

-echo "${as_me:-configure}:18685: testing ${cf_func} ..." 1>&5
+echo "${as_me:-configure}:18747: testing ${cf_func} ..." 1>&5

 
        if eval "test \"\${cf_cv_func_$cf_func+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 
        if eval "test \"\${cf_cv_func_$cf_func+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6


@@ -18691,7 +18753,7 @@ else
                eval cf_result='$ac_cv_func_'$cf_func
                if test ".$cf_result" != ".no"; then
                        cat >"conftest.$ac_ext" <<_ACEOF
                eval cf_result='$ac_cv_func_'$cf_func
                if test ".$cf_result" != ".no"; then
                        cat >"conftest.$ac_ext" <<_ACEOF

-#line 18694 "configure"
+#line 18756 "configure"

 #include "confdefs.h"
 
 #ifdef HAVE_XCURSES
 #include "confdefs.h"
 
 #ifdef HAVE_XCURSES


@@ -18724,16 +18786,16 @@ if (foo + 1234L > 5678L)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"

-if { (eval echo "$as_me:18727: \"$ac_link\"") >&5
+if { (eval echo "$as_me:18789: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:18730: \$? = $ac_status" >&5
+  echo "$as_me:18792: \$? = $ac_status" >&5

   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'

-  { (eval echo "$as_me:18733: \"$ac_try\"") >&5
+  { (eval echo "$as_me:18795: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:18736: \$? = $ac_status" >&5
+  echo "$as_me:18798: \$? = $ac_status" >&5

   (exit "$ac_status"); }; }; then
   cf_result=yes
 else
   (exit "$ac_status"); }; }; then
   cf_result=yes
 else


@@ -18749,7 +18811,7 @@ fi
 
        # use the computed/retrieved cache-value:
        eval 'cf_result=$cf_cv_func_'$cf_func
 
        # use the computed/retrieved cache-value:
        eval 'cf_result=$cf_cv_func_'$cf_func

-       echo "$as_me:18752: result: $cf_result" >&5
+       echo "$as_me:18814: result: $cf_result" >&5

 echo "${ECHO_T}$cf_result" >&6
        if test "$cf_result" != no; then
                cat >>confdefs.h <<EOF
 echo "${ECHO_T}$cf_result" >&6
        if test "$cf_result" != no; then
                cat >>confdefs.h <<EOF


@@ -18773,7 +18835,7 @@ then
                                cf_return="return value"
                        fi
                        cat >"conftest.$ac_ext" <<_ACEOF
                                cf_return="return value"
                        fi
                        cat >"conftest.$ac_ext" <<_ACEOF

-#line 18776 "configure"
+#line 18838 "configure"

 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header:-curses.h}>
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header:-curses.h}>


@@ -18793,21 +18855,21 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
 }
 _ACEOF
 rm -f "conftest.$ac_objext"

-if { (eval echo "$as_me:18796: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:18858: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:18799: \$? = $ac_status" >&5
+  echo "$as_me:18861: \$? = $ac_status" >&5

   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'

-  { (eval echo "$as_me:18802: \"$ac_try\"") >&5
+  { (eval echo "$as_me:18864: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:18805: \$? = $ac_status" >&5
+  echo "$as_me:18867: \$? = $ac_status" >&5

   (exit "$ac_status"); }; }; then
 
                test -n "$verbose" && echo "    prototype $cf_ret func($cf_arg value)" 1>&6
 
   (exit "$ac_status"); }; }; then
 
                test -n "$verbose" && echo "    prototype $cf_ret func($cf_arg value)" 1>&6
 

-echo "${as_me:-configure}:18810: testing prototype $cf_ret func($cf_arg value) ..." 1>&5
+echo "${as_me:-configure}:18872: testing prototype $cf_ret func($cf_arg value) ..." 1>&5

 
                cat >>confdefs.h <<EOF
 #define TPUTS_ARG               $cf_arg
 
                cat >>confdefs.h <<EOF
 #define TPUTS_ARG               $cf_arg


@@ -18827,14 +18889,14 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
        done
 fi
 
        done
 fi
 

-echo "$as_me:18830: checking for ncurses extended functions" >&5
+echo "$as_me:18892: 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
 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 18837 "configure"
+#line 18899 "configure"

 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header:-curses.h}>
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header:-curses.h}>


@@ -18849,16 +18911,16 @@ int x = NCURSES_EXT_FUNCS
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
 }
 _ACEOF
 rm -f "conftest.$ac_objext"

-if { (eval echo "$as_me:18852: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:18914: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:18855: \$? = $ac_status" >&5
+  echo "$as_me:18917: \$? = $ac_status" >&5

   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'

-  { (eval echo "$as_me:18858: \"$ac_try\"") >&5
+  { (eval echo "$as_me:18920: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:18861: \$? = $ac_status" >&5
+  echo "$as_me:18923: \$? = $ac_status" >&5

   (exit "$ac_status"); }; }; then
   cf_cv_ncurses_ext_funcs=defined
 else
   (exit "$ac_status"); }; }; then
   cf_cv_ncurses_ext_funcs=defined
 else


@@ -18866,7 +18928,7 @@ else
 cat "conftest.$ac_ext" >&5
 
 cat >"conftest.$ac_ext" <<_ACEOF
 cat "conftest.$ac_ext" >&5
 
 cat >"conftest.$ac_ext" <<_ACEOF

-#line 18869 "configure"
+#line 18931 "configure"

 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header:-curses.h}>
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header:-curses.h}>


@@ -18891,16 +18953,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"

-if { (eval echo "$as_me:18894: \"$ac_link\"") >&5
+if { (eval echo "$as_me:18956: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:18897: \$? = $ac_status" >&5
+  echo "$as_me:18959: \$? = $ac_status" >&5

   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'

-  { (eval echo "$as_me:18900: \"$ac_try\"") >&5
+  { (eval echo "$as_me:18962: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:18903: \$? = $ac_status" >&5
+  echo "$as_me:18965: \$? = $ac_status" >&5

   (exit "$ac_status"); }; }; then
   cf_cv_ncurses_ext_funcs=yes
 else
   (exit "$ac_status"); }; }; then
   cf_cv_ncurses_ext_funcs=yes
 else


@@ -18914,7 +18976,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi

-echo "$as_me:18917: result: $cf_cv_ncurses_ext_funcs" >&5
+echo "$as_me:18979: 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
 echo "${ECHO_T}$cf_cv_ncurses_ext_funcs" >&6
 test "$cf_cv_ncurses_ext_funcs" = yes &&
 cat >>confdefs.h <<\EOF


@@ -18928,11 +18990,11 @@ then
        if test -n "$cf_cv_ncurses_version" && test "x$cf_cv_ncurses_version" != xno
        then
                cf_define_xpg5=no
        if test -n "$cf_cv_ncurses_version" && test "x$cf_cv_ncurses_version" != xno
        then
                cf_define_xpg5=no

-               echo "$as_me:18931: checking if _XPG5 should be defined to enable wide-characters" >&5
+               echo "$as_me:18993: 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
 echo $ECHO_N "checking if _XPG5 should be defined to enable wide-characters... $ECHO_C" >&6
 
                cat >"conftest.$ac_ext" <<_ACEOF

-#line 18935 "configure"
+#line 18997 "configure"

 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header:-curses.h}>
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header:-curses.h}>


@@ -18945,16 +19007,16 @@ int x = _XPG5
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
 }
 _ACEOF
 rm -f "conftest.$ac_objext"

-if { (eval echo "$as_me:18948: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:19010: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:18951: \$? = $ac_status" >&5
+  echo "$as_me:19013: \$? = $ac_status" >&5

   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'

-  { (eval echo "$as_me:18954: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19016: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:18957: \$? = $ac_status" >&5
+  echo "$as_me:19019: \$? = $ac_status" >&5

   (exit "$ac_status"); }; }; then
   :
 else
   (exit "$ac_status"); }; }; then
   :
 else


@@ -18963,7 +19025,7 @@ cat "conftest.$ac_ext" >&5
 cf_save_cppflags="$CPPFLAGS"
                         CPPFLAGS="$CPPFLAGS -D_XPG5"
                         cat >"conftest.$ac_ext" <<_ACEOF
 cf_save_cppflags="$CPPFLAGS"
                         CPPFLAGS="$CPPFLAGS -D_XPG5"
                         cat >"conftest.$ac_ext" <<_ACEOF

-#line 18966 "configure"
+#line 19028 "configure"

 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header:-curses.h}>
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header:-curses.h}>


@@ -18976,16 +19038,16 @@ int x = _XPG5
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
 }
 _ACEOF
 rm -f "conftest.$ac_objext"

-if { (eval echo "$as_me:18979: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:19041: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:18982: \$? = $ac_status" >&5
+  echo "$as_me:19044: \$? = $ac_status" >&5

   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'

-  { (eval echo "$as_me:18985: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19047: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:18988: \$? = $ac_status" >&5
+  echo "$as_me:19050: \$? = $ac_status" >&5

   (exit "$ac_status"); }; }; then
   cf_define_xpg5=yes
 else
   (exit "$ac_status"); }; }; then
   cf_define_xpg5=yes
 else


@@ -18996,7 +19058,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
                         CPPFLAGS="$cf_save_cppflags"
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
                         CPPFLAGS="$cf_save_cppflags"
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"

-               echo "$as_me:18999: result: $cf_define_xpg5" >&5
+               echo "$as_me:19061: result: $cf_define_xpg5" >&5

 echo "${ECHO_T}$cf_define_xpg5" >&6
 
                if test "$cf_define_xpg5" = yes
 echo "${ECHO_T}$cf_define_xpg5" >&6
 
                if test "$cf_define_xpg5" = yes


@@ -19005,14 +19067,14 @@ echo "${ECHO_T}$cf_define_xpg5" >&6
                fi
        fi
 
                fi
        fi
 

-       echo "$as_me:19008: checking for wide-character functions" >&5
+       echo "$as_me:19070: 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
 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 19015 "configure"
+#line 19077 "configure"

 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header:-curses.h}>
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header:-curses.h}>


@@ -19029,16 +19091,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"

-if { (eval echo "$as_me:19032: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19094: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:19035: \$? = $ac_status" >&5
+  echo "$as_me:19097: \$? = $ac_status" >&5

   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'

-  { (eval echo "$as_me:19038: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19100: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:19041: \$? = $ac_status" >&5
+  echo "$as_me:19103: \$? = $ac_status" >&5

   (exit "$ac_status"); }; }; then
   cf_cv_widechar_funcs=yes
 else
   (exit "$ac_status"); }; }; then
   cf_cv_widechar_funcs=yes
 else


@@ -19049,7 +19111,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 
 fi

-echo "$as_me:19052: result: $cf_cv_widechar_funcs" >&5
+echo "$as_me:19114: result: $cf_cv_widechar_funcs" >&5

 echo "${ECHO_T}$cf_cv_widechar_funcs" >&6
        if test "$cf_cv_widechar_funcs" != no ; then
 
 echo "${ECHO_T}$cf_cv_widechar_funcs" >&6
        if test "$cf_cv_widechar_funcs" != no ; then
 


@@ -19070,14 +19132,14 @@ EOF
 
 fi
 
 
 fi
 

-echo "$as_me:19073: checking if $cf_cv_screen library uses pthreads" >&5
+echo "$as_me:19135: 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
 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 19080 "configure"
+#line 19142 "configure"

 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header:-curses.h}>
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header:-curses.h}>


@@ -19095,16 +19157,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"

-if { (eval echo "$as_me:19098: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19160: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:19101: \$? = $ac_status" >&5
+  echo "$as_me:19163: \$? = $ac_status" >&5

   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'

-  { (eval echo "$as_me:19104: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19166: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:19107: \$? = $ac_status" >&5
+  echo "$as_me:19169: \$? = $ac_status" >&5

   (exit "$ac_status"); }; }; then
   cf_cv_use_pthreads=yes
 else
   (exit "$ac_status"); }; }; then
   cf_cv_use_pthreads=yes
 else


@@ -19115,21 +19177,21 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 
 fi

-echo "$as_me:19118: result: $cf_cv_use_pthreads" >&5
+echo "$as_me:19180: 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 "${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:19125: checking if sys/time.h works with sys/select.h" >&5
+echo "$as_me:19187: 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
 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 19132 "configure"
+#line 19194 "configure"

 #include "confdefs.h"
 
 #include <sys/types.h>
 #include "confdefs.h"
 
 #include <sys/types.h>


@@ -19149,16 +19211,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
 }
 _ACEOF
 rm -f "conftest.$ac_objext"

-if { (eval echo "$as_me:19152: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:19214: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:19155: \$? = $ac_status" >&5
+  echo "$as_me:19217: \$? = $ac_status" >&5

   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'

-  { (eval echo "$as_me:19158: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19220: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:19161: \$? = $ac_status" >&5
+  echo "$as_me:19223: \$? = $ac_status" >&5

   (exit "$ac_status"); }; }; then
   cf_cv_sys_time_select=yes
 else
   (exit "$ac_status"); }; }; then
   cf_cv_sys_time_select=yes
 else


@@ -19170,7 +19232,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
 
 
 fi
 

-echo "$as_me:19173: result: $cf_cv_sys_time_select" >&5
+echo "$as_me:19235: 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
 echo "${ECHO_T}$cf_cv_sys_time_select" >&6
 test "$cf_cv_sys_time_select" = yes &&
 cat >>confdefs.h <<\EOF


@@ -19179,7 +19241,7 @@ EOF
 
 # special check for test/ditto.c
 
 
 # special check for test/ditto.c
 

-echo "$as_me:19182: checking for openpty in -lutil" >&5
+echo "$as_me:19244: 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
 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


@@ -19187,7 +19249,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lutil  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lutil  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF

-#line 19190 "configure"
+#line 19252 "configure"

 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */


@@ -19206,16 +19268,16 @@ openpty ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"

-if { (eval echo "$as_me:19209: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19271: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:19212: \$? = $ac_status" >&5
+  echo "$as_me:19274: \$? = $ac_status" >&5

   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'

-  { (eval echo "$as_me:19215: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19277: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:19218: \$? = $ac_status" >&5
+  echo "$as_me:19280: \$? = $ac_status" >&5

   (exit "$ac_status"); }; }; then
   ac_cv_lib_util_openpty=yes
 else
   (exit "$ac_status"); }; }; then
   ac_cv_lib_util_openpty=yes
 else


@@ -19226,7 +19288,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi

-echo "$as_me:19229: result: $ac_cv_lib_util_openpty" >&5
+echo "$as_me:19291: 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
 echo "${ECHO_T}$ac_cv_lib_util_openpty" >&6
 if test "$ac_cv_lib_util_openpty" = yes; then
   cf_cv_lib_util=yes


@@ -19234,7 +19296,7 @@ else
   cf_cv_lib_util=no
 fi
 
   cf_cv_lib_util=no
 fi
 

-echo "$as_me:19237: checking for openpty header" >&5
+echo "$as_me:19299: 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
 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


@@ -19261,7 +19323,7 @@ LIBS="$cf_add_libs"
        for cf_header in pty.h libutil.h util.h
        do
        cat >"conftest.$ac_ext" <<_ACEOF
        for cf_header in pty.h libutil.h util.h
        do
        cat >"conftest.$ac_ext" <<_ACEOF

-#line 19264 "configure"
+#line 19326 "configure"

 #include "confdefs.h"
 
 #include <$cf_header>
 #include "confdefs.h"
 
 #include <$cf_header>


@@ -19278,16 +19340,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"

-if { (eval echo "$as_me:19281: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19343: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:19284: \$? = $ac_status" >&5
+  echo "$as_me:19346: \$? = $ac_status" >&5

   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'

-  { (eval echo "$as_me:19287: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19349: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:19290: \$? = $ac_status" >&5
+  echo "$as_me:19352: \$? = $ac_status" >&5

   (exit "$ac_status"); }; }; then
 
                cf_cv_func_openpty=$cf_header
   (exit "$ac_status"); }; }; then
 
                cf_cv_func_openpty=$cf_header


@@ -19305,7 +19367,7 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
        LIBS="$cf_save_LIBS"
 
 fi
        LIBS="$cf_save_LIBS"
 
 fi

-echo "$as_me:19308: result: $cf_cv_func_openpty" >&5
+echo "$as_me:19370: result: $cf_cv_func_openpty" >&5

 echo "${ECHO_T}$cf_cv_func_openpty" >&6
 
 if test "$cf_cv_func_openpty" != no ; then
 echo "${ECHO_T}$cf_cv_func_openpty" >&6
 
 if test "$cf_cv_func_openpty" != no ; then


@@ -19339,7 +19401,7 @@ TEST_LIBS="$cf_add_libs"
        fi
 fi
 
        fi
 fi
 

-echo "$as_me:19342: checking for function curses_version" >&5
+echo "$as_me:19404: 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
 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


@@ -19349,7 +19411,7 @@ if test "$cross_compiling" = yes; then
   cf_cv_func_curses_version=unknown
 else
   cat >"conftest.$ac_ext" <<_ACEOF
   cf_cv_func_curses_version=unknown
 else
   cat >"conftest.$ac_ext" <<_ACEOF

-#line 19352 "configure"
+#line 19414 "configure"

 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header:-curses.h}>
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header:-curses.h}>


@@ -19362,15 +19424,15 @@ int main(void)
 
 _ACEOF
 rm -f "conftest$ac_exeext"
 
 _ACEOF
 rm -f "conftest$ac_exeext"

-if { (eval echo "$as_me:19365: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19427: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:19368: \$? = $ac_status" >&5
+  echo "$as_me:19430: \$? = $ac_status" >&5

   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'

-  { (eval echo "$as_me:19370: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19432: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:19373: \$? = $ac_status" >&5
+  echo "$as_me:19435: \$? = $ac_status" >&5

   (exit "$ac_status"); }; }; then
   cf_cv_func_curses_version=yes
 
   (exit "$ac_status"); }; }; then
   cf_cv_func_curses_version=yes
 


@@ -19385,14 +19447,14 @@ rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftes
 fi
 rm -f core
 fi
 fi
 rm -f core
 fi

-echo "$as_me:19388: result: $cf_cv_func_curses_version" >&5
+echo "$as_me:19450: 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 "${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:19395: checking for alternate character set array" >&5
+echo "$as_me:19457: 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
 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


@@ -19402,7 +19464,7 @@ cf_cv_curses_acs_map=unknown
 for name in acs_map _acs_map __acs_map ${NCURSES_WRAP_PREFIX}acs_map
 do
 cat >"conftest.$ac_ext" <<_ACEOF
 for name in acs_map _acs_map __acs_map ${NCURSES_WRAP_PREFIX}acs_map
 do
 cat >"conftest.$ac_ext" <<_ACEOF

-#line 19405 "configure"
+#line 19467 "configure"

 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header:-curses.h}>
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header:-curses.h}>


@@ -19418,16 +19480,16 @@ ${name}['k'] = ACS_PLUS
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"

-if { (eval echo "$as_me:19421: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19483: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:19424: \$? = $ac_status" >&5
+  echo "$as_me:19486: \$? = $ac_status" >&5

   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'

-  { (eval echo "$as_me:19427: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19489: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:19430: \$? = $ac_status" >&5
+  echo "$as_me:19492: \$? = $ac_status" >&5

   (exit "$ac_status"); }; }; then
   cf_cv_curses_acs_map=$name; break
 else
   (exit "$ac_status"); }; }; then
   cf_cv_curses_acs_map=$name; break
 else


@@ -19438,7 +19500,7 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 done
 
 fi
 done
 
 fi

-echo "$as_me:19441: result: $cf_cv_curses_acs_map" >&5
+echo "$as_me:19503: result: $cf_cv_curses_acs_map" >&5

 echo "${ECHO_T}$cf_cv_curses_acs_map" >&6
 
 test "$cf_cv_curses_acs_map" != unknown &&
 echo "${ECHO_T}$cf_cv_curses_acs_map" >&6
 
 test "$cf_cv_curses_acs_map" != unknown &&


@@ -19448,7 +19510,7 @@ EOF
 
 if test "$cf_enable_widec" = yes; then
 
 
 if test "$cf_enable_widec" = yes; then
 

-echo "$as_me:19451: checking for wide alternate character set array" >&5
+echo "$as_me:19513: 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
 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


@@ -19458,7 +19520,7 @@ else
        for name in wacs_map _wacs_map __wacs_map _nc_wacs _wacs_char
        do
        cat >"conftest.$ac_ext" <<_ACEOF
        for name in wacs_map _wacs_map __wacs_map _nc_wacs _wacs_char
        do
        cat >"conftest.$ac_ext" <<_ACEOF

-#line 19461 "configure"
+#line 19523 "configure"

 #include "confdefs.h"
 
 #ifndef _XOPEN_SOURCE_EXTENDED
 #include "confdefs.h"
 
 #ifndef _XOPEN_SOURCE_EXTENDED


@@ -19474,16 +19536,16 @@ void *foo = &(${name}['k']); (void)foo
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"

-if { (eval echo "$as_me:19477: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19539: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:19480: \$? = $ac_status" >&5
+  echo "$as_me:19542: \$? = $ac_status" >&5

   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'

-  { (eval echo "$as_me:19483: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19545: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:19486: \$? = $ac_status" >&5
+  echo "$as_me:19548: \$? = $ac_status" >&5

   (exit "$ac_status"); }; }; then
   cf_cv_curses_wacs_map=$name
         break
   (exit "$ac_status"); }; }; then
   cf_cv_curses_wacs_map=$name
         break


@@ -19494,7 +19556,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
        done
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
        done
 fi

-echo "$as_me:19497: result: $cf_cv_curses_wacs_map" >&5
+echo "$as_me:19559: result: $cf_cv_curses_wacs_map" >&5

 echo "${ECHO_T}$cf_cv_curses_wacs_map" >&6
 
 test "$cf_cv_curses_wacs_map" != unknown &&
 echo "${ECHO_T}$cf_cv_curses_wacs_map" >&6
 
 test "$cf_cv_curses_wacs_map" != unknown &&


@@ -19502,7 +19564,7 @@ cat >>confdefs.h <<EOF
 #define CURSES_WACS_ARRAY $cf_cv_curses_wacs_map
 EOF
 
 #define CURSES_WACS_ARRAY $cf_cv_curses_wacs_map
 EOF
 

-echo "$as_me:19505: checking for wide alternate character constants" >&5
+echo "$as_me:19567: 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
 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


@@ -19512,7 +19574,7 @@ cf_cv_curses_wacs_symbols=no
 if test "$cf_cv_curses_wacs_map" != unknown
 then
        cat >"conftest.$ac_ext" <<_ACEOF
 if test "$cf_cv_curses_wacs_map" != unknown
 then
        cat >"conftest.$ac_ext" <<_ACEOF

-#line 19515 "configure"
+#line 19577 "configure"

 #include "confdefs.h"
 
 #ifndef _XOPEN_SOURCE_EXTENDED
 #include "confdefs.h"
 
 #ifndef _XOPEN_SOURCE_EXTENDED


@@ -19529,16 +19591,16 @@ cchar_t *foo = WACS_PLUS;
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"

-if { (eval echo "$as_me:19532: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19594: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:19535: \$? = $ac_status" >&5
+  echo "$as_me:19597: \$? = $ac_status" >&5

   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'

-  { (eval echo "$as_me:19538: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19600: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:19541: \$? = $ac_status" >&5
+  echo "$as_me:19603: \$? = $ac_status" >&5

   (exit "$ac_status"); }; }; then
   cf_cv_curses_wacs_symbols=yes
 else
   (exit "$ac_status"); }; }; then
   cf_cv_curses_wacs_symbols=yes
 else


@@ -19548,7 +19610,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 else
        cat >"conftest.$ac_ext" <<_ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 else
        cat >"conftest.$ac_ext" <<_ACEOF

-#line 19551 "configure"
+#line 19613 "configure"

 #include "confdefs.h"
 
 #ifndef _XOPEN_SOURCE_EXTENDED
 #include "confdefs.h"
 
 #ifndef _XOPEN_SOURCE_EXTENDED


@@ -19564,16 +19626,16 @@ cchar_t *foo = WACS_PLUS; (void)foo
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"

-if { (eval echo "$as_me:19567: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19629: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:19570: \$? = $ac_status" >&5
+  echo "$as_me:19632: \$? = $ac_status" >&5

   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'

-  { (eval echo "$as_me:19573: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19635: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:19576: \$? = $ac_status" >&5
+  echo "$as_me:19638: \$? = $ac_status" >&5

   (exit "$ac_status"); }; }; then
   cf_cv_curses_wacs_symbols=yes
 else
   (exit "$ac_status"); }; }; then
   cf_cv_curses_wacs_symbols=yes
 else


@@ -19584,7 +19646,7 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
 
 fi
 fi
 
 fi

-echo "$as_me:19587: result: $cf_cv_curses_wacs_symbols" >&5
+echo "$as_me:19649: result: $cf_cv_curses_wacs_symbols" >&5

 echo "${ECHO_T}$cf_cv_curses_wacs_symbols" >&6
 
 test "$cf_cv_curses_wacs_symbols" != no &&
 echo "${ECHO_T}$cf_cv_curses_wacs_symbols" >&6
 
 test "$cf_cv_curses_wacs_symbols" != no &&


@@ -19594,10 +19656,10 @@ EOF
 
 fi
 
 
 fi
 

-echo "$as_me:19597: checking for type attr_t in ${cf_cv_ncurses_header:-curses.h}" >&5
+echo "$as_me:19659: 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
 echo $ECHO_N "checking for type attr_t in ${cf_cv_ncurses_header:-curses.h}... $ECHO_C" >&6
 cat >"conftest.$ac_ext" <<_ACEOF

-#line 19600 "configure"
+#line 19662 "configure"

 #include "confdefs.h"
 
 #ifndef _XOPEN_SOURCE_EXTENDED
 #include "confdefs.h"
 
 #ifndef _XOPEN_SOURCE_EXTENDED


@@ -19615,16 +19677,16 @@ attr_t foo
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
 }
 _ACEOF
 rm -f "conftest.$ac_objext"

-if { (eval echo "$as_me:19618: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:19680: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:19621: \$? = $ac_status" >&5
+  echo "$as_me:19683: \$? = $ac_status" >&5

   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'

-  { (eval echo "$as_me:19624: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19686: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:19627: \$? = $ac_status" >&5
+  echo "$as_me:19689: \$? = $ac_status" >&5

   (exit "$ac_status"); }; }; then
   cf_result=yes
 else
   (exit "$ac_status"); }; }; then
   cf_result=yes
 else


@@ -19633,7 +19695,7 @@ cat "conftest.$ac_ext" >&5
 cf_result=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 cf_result=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"

-echo "$as_me:19636: result: $cf_result" >&5
+echo "$as_me:19698: result: $cf_result" >&5

 echo "${ECHO_T}$cf_result" >&6
 if test "$cf_result" = yes ; then
 
 echo "${ECHO_T}$cf_result" >&6
 if test "$cf_result" = yes ; then
 


@@ -19654,14 +19716,14 @@ fi
 if test "$cf_enable_widec" = yes; then
 
 # This is needed on Tru64 5.0 to declare mbstate_t
 if test "$cf_enable_widec" = yes; then
 
 # This is needed on Tru64 5.0 to declare mbstate_t

-echo "$as_me:19657: checking if we must include wchar.h to declare mbstate_t" >&5
+echo "$as_me:19719: 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
 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 19664 "configure"
+#line 19726 "configure"

 #include "confdefs.h"
 
 #include <stdlib.h>
 #include "confdefs.h"
 
 #include <stdlib.h>


@@ -19679,23 +19741,23 @@ mbstate_t state
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
 }
 _ACEOF
 rm -f "conftest.$ac_objext"

-if { (eval echo "$as_me:19682: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:19744: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:19685: \$? = $ac_status" >&5
+  echo "$as_me:19747: \$? = $ac_status" >&5

   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'

-  { (eval echo "$as_me:19688: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19750: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:19691: \$? = $ac_status" >&5
+  echo "$as_me:19753: \$? = $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
   (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 19698 "configure"
+#line 19760 "configure"

 #include "confdefs.h"
 
 #include <stdlib.h>
 #include "confdefs.h"
 
 #include <stdlib.h>


@@ -19714,16 +19776,16 @@ mbstate_t value
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
 }
 _ACEOF
 rm -f "conftest.$ac_objext"

-if { (eval echo "$as_me:19717: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:19779: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:19720: \$? = $ac_status" >&5
+  echo "$as_me:19782: \$? = $ac_status" >&5

   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'

-  { (eval echo "$as_me:19723: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19785: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:19726: \$? = $ac_status" >&5
+  echo "$as_me:19788: \$? = $ac_status" >&5

   (exit "$ac_status"); }; }; then
   cf_cv_mbstate_t=yes
 else
   (exit "$ac_status"); }; }; then
   cf_cv_mbstate_t=yes
 else


@@ -19735,7 +19797,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi

-echo "$as_me:19738: result: $cf_cv_mbstate_t" >&5
+echo "$as_me:19800: result: $cf_cv_mbstate_t" >&5

 echo "${ECHO_T}$cf_cv_mbstate_t" >&6
 
 if test "$cf_cv_mbstate_t" = yes ; then
 echo "${ECHO_T}$cf_cv_mbstate_t" >&6
 
 if test "$cf_cv_mbstate_t" = yes ; then


@@ -19758,14 +19820,14 @@ if test "$cf_cv_mbstate_t" != unknown ; then
 fi
 
 # This is needed on Tru64 5.0 to declare wchar_t
 fi
 
 # This is needed on Tru64 5.0 to declare wchar_t

-echo "$as_me:19761: checking if we must include wchar.h to declare wchar_t" >&5
+echo "$as_me:19823: 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
 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 19768 "configure"
+#line 19830 "configure"

 #include "confdefs.h"
 
 #include <stdlib.h>
 #include "confdefs.h"
 
 #include <stdlib.h>


@@ -19783,23 +19845,23 @@ wchar_t state
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
 }
 _ACEOF
 rm -f "conftest.$ac_objext"

-if { (eval echo "$as_me:19786: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:19848: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:19789: \$? = $ac_status" >&5
+  echo "$as_me:19851: \$? = $ac_status" >&5

   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'

-  { (eval echo "$as_me:19792: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19854: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:19795: \$? = $ac_status" >&5
+  echo "$as_me:19857: \$? = $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
   (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 19802 "configure"
+#line 19864 "configure"

 #include "confdefs.h"
 
 #include <stdlib.h>
 #include "confdefs.h"
 
 #include <stdlib.h>


@@ -19818,16 +19880,16 @@ wchar_t value
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
 }
 _ACEOF
 rm -f "conftest.$ac_objext"

-if { (eval echo "$as_me:19821: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:19883: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:19824: \$? = $ac_status" >&5
+  echo "$as_me:19886: \$? = $ac_status" >&5

   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'

-  { (eval echo "$as_me:19827: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19889: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:19830: \$? = $ac_status" >&5
+  echo "$as_me:19892: \$? = $ac_status" >&5

   (exit "$ac_status"); }; }; then
   cf_cv_wchar_t=yes
 else
   (exit "$ac_status"); }; }; then
   cf_cv_wchar_t=yes
 else


@@ -19839,7 +19901,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi

-echo "$as_me:19842: result: $cf_cv_wchar_t" >&5
+echo "$as_me:19904: result: $cf_cv_wchar_t" >&5

 echo "${ECHO_T}$cf_cv_wchar_t" >&6
 
 if test "$cf_cv_wchar_t" = yes ; then
 echo "${ECHO_T}$cf_cv_wchar_t" >&6
 
 if test "$cf_cv_wchar_t" = yes ; then


@@ -19862,14 +19924,14 @@ if test "$cf_cv_wchar_t" != unknown ; then
 fi
 
 # This is needed on Tru64 5.0 to declare wint_t
 fi
 
 # This is needed on Tru64 5.0 to declare wint_t

-echo "$as_me:19865: checking if we must include wchar.h to declare wint_t" >&5
+echo "$as_me:19927: 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
 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 19872 "configure"
+#line 19934 "configure"

 #include "confdefs.h"
 
 #include <stdlib.h>
 #include "confdefs.h"
 
 #include <stdlib.h>


@@ -19887,23 +19949,23 @@ wint_t state
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
 }
 _ACEOF
 rm -f "conftest.$ac_objext"

-if { (eval echo "$as_me:19890: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:19952: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:19893: \$? = $ac_status" >&5
+  echo "$as_me:19955: \$? = $ac_status" >&5

   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'

-  { (eval echo "$as_me:19896: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19958: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:19899: \$? = $ac_status" >&5
+  echo "$as_me:19961: \$? = $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
   (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 19906 "configure"
+#line 19968 "configure"

 #include "confdefs.h"
 
 #include <stdlib.h>
 #include "confdefs.h"
 
 #include <stdlib.h>


@@ -19922,16 +19984,16 @@ wint_t value
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
 }
 _ACEOF
 rm -f "conftest.$ac_objext"

-if { (eval echo "$as_me:19925: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:19987: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:19928: \$? = $ac_status" >&5
+  echo "$as_me:19990: \$? = $ac_status" >&5

   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'

-  { (eval echo "$as_me:19931: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19993: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:19934: \$? = $ac_status" >&5
+  echo "$as_me:19996: \$? = $ac_status" >&5

   (exit "$ac_status"); }; }; then
   cf_cv_wint_t=yes
 else
   (exit "$ac_status"); }; }; then
   cf_cv_wint_t=yes
 else


@@ -19943,7 +20005,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi

-echo "$as_me:19946: result: $cf_cv_wint_t" >&5
+echo "$as_me:20008: result: $cf_cv_wint_t" >&5

 echo "${ECHO_T}$cf_cv_wint_t" >&6
 
 if test "$cf_cv_wint_t" = yes ; then
 echo "${ECHO_T}$cf_cv_wint_t" >&6
 
 if test "$cf_cv_wint_t" = yes ; then


@@ -19967,10 +20029,10 @@ fi
 
        if test "$NCURSES_OK_MBSTATE_T" = 0 ; then
 
 
        if test "$NCURSES_OK_MBSTATE_T" = 0 ; then
 

-echo "$as_me:19970: checking for type mbstate_t in ${cf_cv_ncurses_header:-curses.h}" >&5
+echo "$as_me:20032: 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
 echo $ECHO_N "checking for type mbstate_t in ${cf_cv_ncurses_header:-curses.h}... $ECHO_C" >&6
 cat >"conftest.$ac_ext" <<_ACEOF

-#line 19973 "configure"
+#line 20035 "configure"

 #include "confdefs.h"
 
 #ifndef _XOPEN_SOURCE_EXTENDED
 #include "confdefs.h"
 
 #ifndef _XOPEN_SOURCE_EXTENDED


@@ -19988,16 +20050,16 @@ mbstate_t foo
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
 }
 _ACEOF
 rm -f "conftest.$ac_objext"

-if { (eval echo "$as_me:19991: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:20053: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:19994: \$? = $ac_status" >&5
+  echo "$as_me:20056: \$? = $ac_status" >&5

   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'

-  { (eval echo "$as_me:19997: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20059: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:20000: \$? = $ac_status" >&5
+  echo "$as_me:20062: \$? = $ac_status" >&5

   (exit "$ac_status"); }; }; then
   cf_result=yes
 else
   (exit "$ac_status"); }; }; then
   cf_result=yes
 else


@@ -20006,7 +20068,7 @@ cat "conftest.$ac_ext" >&5
 cf_result=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 cf_result=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"

-echo "$as_me:20009: result: $cf_result" >&5
+echo "$as_me:20071: result: $cf_result" >&5

 echo "${ECHO_T}$cf_result" >&6
 if test "$cf_result" = yes ; then
 
 echo "${ECHO_T}$cf_result" >&6
 if test "$cf_result" = yes ; then
 


@@ -20028,10 +20090,10 @@ fi
 
        if test "$NCURSES_OK_WCHAR_T" = 0 ; then
 
 
        if test "$NCURSES_OK_WCHAR_T" = 0 ; then
 

-echo "$as_me:20031: checking for type wchar_t in ${cf_cv_ncurses_header:-curses.h}" >&5
+echo "$as_me:20093: 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
 echo $ECHO_N "checking for type wchar_t in ${cf_cv_ncurses_header:-curses.h}... $ECHO_C" >&6
 cat >"conftest.$ac_ext" <<_ACEOF

-#line 20034 "configure"
+#line 20096 "configure"

 #include "confdefs.h"
 
 #ifndef _XOPEN_SOURCE_EXTENDED
 #include "confdefs.h"
 
 #ifndef _XOPEN_SOURCE_EXTENDED


@@ -20049,16 +20111,16 @@ wchar_t foo
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
 }
 _ACEOF
 rm -f "conftest.$ac_objext"

-if { (eval echo "$as_me:20052: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:20114: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:20055: \$? = $ac_status" >&5
+  echo "$as_me:20117: \$? = $ac_status" >&5

   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'

-  { (eval echo "$as_me:20058: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20120: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:20061: \$? = $ac_status" >&5
+  echo "$as_me:20123: \$? = $ac_status" >&5

   (exit "$ac_status"); }; }; then
   cf_result=yes
 else
   (exit "$ac_status"); }; }; then
   cf_result=yes
 else


@@ -20067,7 +20129,7 @@ cat "conftest.$ac_ext" >&5
 cf_result=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 cf_result=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"

-echo "$as_me:20070: result: $cf_result" >&5
+echo "$as_me:20132: result: $cf_result" >&5

 echo "${ECHO_T}$cf_result" >&6
 if test "$cf_result" = yes ; then
 
 echo "${ECHO_T}$cf_result" >&6
 if test "$cf_result" = yes ; then
 


@@ -20089,10 +20151,10 @@ fi
 
        if test "$NCURSES_OK_WINT_T" = 0 ; then
 
 
        if test "$NCURSES_OK_WINT_T" = 0 ; then
 

-echo "$as_me:20092: checking for type wint_t in ${cf_cv_ncurses_header:-curses.h}" >&5
+echo "$as_me:20154: 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
 echo $ECHO_N "checking for type wint_t in ${cf_cv_ncurses_header:-curses.h}... $ECHO_C" >&6
 cat >"conftest.$ac_ext" <<_ACEOF

-#line 20095 "configure"
+#line 20157 "configure"

 #include "confdefs.h"
 
 #ifndef _XOPEN_SOURCE_EXTENDED
 #include "confdefs.h"
 
 #ifndef _XOPEN_SOURCE_EXTENDED


@@ -20110,16 +20172,16 @@ wint_t foo
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
 }
 _ACEOF
 rm -f "conftest.$ac_objext"

-if { (eval echo "$as_me:20113: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:20175: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:20116: \$? = $ac_status" >&5
+  echo "$as_me:20178: \$? = $ac_status" >&5

   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'

-  { (eval echo "$as_me:20119: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20181: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:20122: \$? = $ac_status" >&5
+  echo "$as_me:20184: \$? = $ac_status" >&5

   (exit "$ac_status"); }; }; then
   cf_result=yes
 else
   (exit "$ac_status"); }; }; then
   cf_result=yes
 else


@@ -20128,7 +20190,7 @@ cat "conftest.$ac_ext" >&5
 cf_result=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 cf_result=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"

-echo "$as_me:20131: result: $cf_result" >&5
+echo "$as_me:20193: result: $cf_result" >&5

 echo "${ECHO_T}$cf_result" >&6
 if test "$cf_result" = yes ; then
 
 echo "${ECHO_T}$cf_result" >&6
 if test "$cf_result" = yes ; then
 


@@ -20157,11 +20219,11 @@ boolnames \
 boolfnames \
 ttytype
 do
 boolfnames \
 ttytype
 do

-echo "$as_me:20160: checking for data $cf_data declaration in ${cf_cv_ncurses_header:-curses.h}" >&5
+echo "$as_me:20222: checking for data $cf_data declaration in ${cf_cv_ncurses_header:-curses.h}" >&5

 echo $ECHO_N "checking for data $cf_data declaration in ${cf_cv_ncurses_header:-curses.h}... $ECHO_C" >&6
 
 cat >"conftest.$ac_ext" <<_ACEOF
 echo $ECHO_N "checking for data $cf_data declaration in ${cf_cv_ncurses_header:-curses.h}... $ECHO_C" >&6
 
 cat >"conftest.$ac_ext" <<_ACEOF

-#line 20164 "configure"
+#line 20226 "configure"

 #include "confdefs.h"
 
 #ifdef HAVE_XCURSES
 #include "confdefs.h"
 
 #ifdef HAVE_XCURSES


@@ -20194,16 +20256,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
 }
 _ACEOF
 rm -f "conftest.$ac_objext"

-if { (eval echo "$as_me:20197: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:20259: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:20200: \$? = $ac_status" >&5
+  echo "$as_me:20262: \$? = $ac_status" >&5

   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'

-  { (eval echo "$as_me:20203: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20265: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:20206: \$? = $ac_status" >&5
+  echo "$as_me:20268: \$? = $ac_status" >&5

   (exit "$ac_status"); }; }; then
   cf_result=yes
 
   (exit "$ac_status"); }; }; then
   cf_result=yes
 


@@ -20213,7 +20275,7 @@ cat "conftest.$ac_ext" >&5
 cf_result=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 cf_result=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"

-echo "$as_me:20216: result: $cf_result" >&5
+echo "$as_me:20278: result: $cf_result" >&5

 echo "${ECHO_T}$cf_result" >&6
 
 if test "$cf_result" = yes ; then
 echo "${ECHO_T}$cf_result" >&6
 
 if test "$cf_result" = yes ; then


@@ -20225,14 +20287,14 @@ cf_result=`echo "have_curses_data_$cf_data" | sed y%abcdefghijklmnopqrstuvwxyz./
 EOF
 
 else
 EOF
 
 else

-       echo "$as_me:20228: checking for data $cf_data in library" >&5
+       echo "$as_me:20290: checking for data $cf_data in library" >&5

 echo $ECHO_N "checking for data $cf_data in library... $ECHO_C" >&6
        # BSD linkers insist on making weak linkage, but resolve at runtime.
        if test "$cross_compiling" = yes; then
 
        # cross-compiling
        cat >"conftest.$ac_ext" <<_ACEOF
 echo $ECHO_N "checking for data $cf_data in library... $ECHO_C" >&6
        # BSD linkers insist on making weak linkage, but resolve at runtime.
        if test "$cross_compiling" = yes; then
 
        # cross-compiling
        cat >"conftest.$ac_ext" <<_ACEOF

-#line 20235 "configure"
+#line 20297 "configure"

 #include "confdefs.h"
 
 #ifdef HAVE_XCURSES
 #include "confdefs.h"
 
 #ifdef HAVE_XCURSES


@@ -20271,16 +20333,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"

-if { (eval echo "$as_me:20274: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20336: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:20277: \$? = $ac_status" >&5
+  echo "$as_me:20339: \$? = $ac_status" >&5

   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'

-  { (eval echo "$as_me:20280: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20342: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:20283: \$? = $ac_status" >&5
+  echo "$as_me:20345: \$? = $ac_status" >&5

   (exit "$ac_status"); }; }; then
   cf_result=yes
 else
   (exit "$ac_status"); }; }; then
   cf_result=yes
 else


@@ -20292,7 +20354,7 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 
 else
   cat >"conftest.$ac_ext" <<_ACEOF
 
 else
   cat >"conftest.$ac_ext" <<_ACEOF

-#line 20295 "configure"
+#line 20357 "configure"

 #include "confdefs.h"
 
 #ifdef HAVE_XCURSES
 #include "confdefs.h"
 
 #ifdef HAVE_XCURSES


@@ -20324,15 +20386,15 @@ int main(void)
 }
 _ACEOF
 rm -f "conftest$ac_exeext"
 }
 _ACEOF
 rm -f "conftest$ac_exeext"

-if { (eval echo "$as_me:20327: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20389: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:20330: \$? = $ac_status" >&5
+  echo "$as_me:20392: \$? = $ac_status" >&5

   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'

-  { (eval echo "$as_me:20332: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20394: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:20335: \$? = $ac_status" >&5
+  echo "$as_me:20397: \$? = $ac_status" >&5

   (exit "$ac_status"); }; }; then
   cf_result=yes
 
   (exit "$ac_status"); }; }; then
   cf_result=yes
 


@@ -20344,7 +20406,7 @@ cf_result=no
 fi
 rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 fi
 rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftest.$ac_ext"
 fi

-       echo "$as_me:20347: result: $cf_result" >&5
+       echo "$as_me:20409: result: $cf_result" >&5

 echo "${ECHO_T}$cf_result" >&6
        if test "$cf_result" = yes ; then
 
 echo "${ECHO_T}$cf_result" >&6
        if test "$cf_result" = yes ; then
 


@@ -20361,7 +20423,7 @@ done
 
 if test -n "$with_screen" && test "x$with_screen" = "xpdcurses"
 then
 
 if test -n "$with_screen" && test "x$with_screen" = "xpdcurses"
 then

-       echo "$as_me:20364: checking for X" >&5
+       echo "$as_me:20426: checking for X" >&5

 echo $ECHO_N "checking for X... $ECHO_C" >&6
 
 # Check whether --with-x or --without-x was given.
 echo $ECHO_N "checking for X... $ECHO_C" >&6
 
 # Check whether --with-x or --without-x was given.


@@ -20465,17 +20527,17 @@ if test "$ac_x_includes" = no; then
   # 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
   # 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 20468 "configure"
+#line 20530 "configure"

 #include "confdefs.h"
 #include <X11/Intrinsic.h>
 _ACEOF
 #include "confdefs.h"
 #include <X11/Intrinsic.h>
 _ACEOF

-if { (eval echo "$as_me:20472: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:20534: \"$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
   (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:20478: \$? = $ac_status" >&5
+  echo "$as_me:20540: \$? = $ac_status" >&5

   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag


@@ -20508,7 +20570,7 @@ if test "$ac_x_libraries" = no; then
   ac_save_LIBS=$LIBS
   LIBS="-lXt $LIBS"
   cat >"conftest.$ac_ext" <<_ACEOF
   ac_save_LIBS=$LIBS
   LIBS="-lXt $LIBS"
   cat >"conftest.$ac_ext" <<_ACEOF

-#line 20511 "configure"
+#line 20573 "configure"

 #include "confdefs.h"
 #include <X11/Intrinsic.h>
 int
 #include "confdefs.h"
 #include <X11/Intrinsic.h>
 int


@@ -20520,16 +20582,16 @@ XtMalloc (0)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"

-if { (eval echo "$as_me:20523: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20585: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:20526: \$? = $ac_status" >&5
+  echo "$as_me:20588: \$? = $ac_status" >&5

   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'

-  { (eval echo "$as_me:20529: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20591: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:20532: \$? = $ac_status" >&5
+  echo "$as_me:20594: \$? = $ac_status" >&5

   (exit "$ac_status"); }; }; then
   LIBS=$ac_save_LIBS
 # We can link X programs with no special library path.
   (exit "$ac_status"); }; }; then
   LIBS=$ac_save_LIBS
 # We can link X programs with no special library path.


@@ -20567,7 +20629,7 @@ fi
 fi # $with_x != no
 
 if test "$have_x" != yes; then
 fi # $with_x != no
 
 if test "$have_x" != yes; then

-  echo "$as_me:20570: result: $have_x" >&5
+  echo "$as_me:20632: result: $have_x" >&5

 echo "${ECHO_T}$have_x" >&6
   no_x=yes
 else
 echo "${ECHO_T}$have_x" >&6
   no_x=yes
 else


@@ -20577,7 +20639,7 @@ else
   # 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"
   # 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:20580: result: libraries $x_libraries, headers $x_includes" >&5
+  echo "$as_me:20642: result: libraries $x_libraries, headers $x_includes" >&5

 echo "${ECHO_T}libraries $x_libraries, headers $x_includes" >&6
 fi
 
 echo "${ECHO_T}libraries $x_libraries, headers $x_includes" >&6
 fi
 


@@ -20604,11 +20666,11 @@ else
     # others require no space.  Words are not sufficient . . . .
     case `(uname -sr) 2>/dev/null` in
     "SunOS 5"*)
     # others require no space.  Words are not sufficient . . . .
     case `(uname -sr) 2>/dev/null` in
     "SunOS 5"*)

-      echo "$as_me:20607: checking whether -R must be followed by a space" >&5
+      echo "$as_me:20669: 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
 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 20611 "configure"
+#line 20673 "configure"

 #include "confdefs.h"
 
 int
 #include "confdefs.h"
 
 int


@@ -20620,16 +20682,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"

-if { (eval echo "$as_me:20623: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20685: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:20626: \$? = $ac_status" >&5
+  echo "$as_me:20688: \$? = $ac_status" >&5

   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'

-  { (eval echo "$as_me:20629: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20691: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:20632: \$? = $ac_status" >&5
+  echo "$as_me:20694: \$? = $ac_status" >&5

   (exit "$ac_status"); }; }; then
   ac_R_nospace=yes
 else
   (exit "$ac_status"); }; }; then
   ac_R_nospace=yes
 else


@@ -20639,13 +20701,13 @@ ac_R_nospace=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
       if test $ac_R_nospace = yes; then
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
       if test $ac_R_nospace = yes; then

-       echo "$as_me:20642: result: no" >&5
+       echo "$as_me:20704: 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
 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 20648 "configure"
+#line 20710 "configure"

 #include "confdefs.h"
 
 int
 #include "confdefs.h"
 
 int


@@ -20657,16 +20719,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"

-if { (eval echo "$as_me:20660: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20722: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:20663: \$? = $ac_status" >&5
+  echo "$as_me:20725: \$? = $ac_status" >&5

   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'

-  { (eval echo "$as_me:20666: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20728: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:20669: \$? = $ac_status" >&5
+  echo "$as_me:20731: \$? = $ac_status" >&5

   (exit "$ac_status"); }; }; then
   ac_R_space=yes
 else
   (exit "$ac_status"); }; }; then
   ac_R_space=yes
 else


@@ -20676,11 +20738,11 @@ ac_R_space=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
        if test $ac_R_space = yes; then
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
        if test $ac_R_space = yes; then

-         echo "$as_me:20679: result: yes" >&5
+         echo "$as_me:20741: result: yes" >&5

 echo "${ECHO_T}yes" >&6
          X_LIBS="$X_LIBS -R $x_libraries"
        else
 echo "${ECHO_T}yes" >&6
          X_LIBS="$X_LIBS -R $x_libraries"
        else

-         echo "$as_me:20683: result: neither works" >&5
+         echo "$as_me:20745: result: neither works" >&5

 echo "${ECHO_T}neither works" >&6
        fi
       fi
 echo "${ECHO_T}neither works" >&6
        fi
       fi


@@ -20700,7 +20762,7 @@ echo "${ECHO_T}neither works" >&6
     # the Alpha needs dnet_stub (dnet does not exist).
     ac_xsave_LIBS="$LIBS"; LIBS="$LIBS $X_LIBS -lX11"
     cat >"conftest.$ac_ext" <<_ACEOF
     # the Alpha needs dnet_stub (dnet does not exist).
     ac_xsave_LIBS="$LIBS"; LIBS="$LIBS $X_LIBS -lX11"
     cat >"conftest.$ac_ext" <<_ACEOF

-#line 20703 "configure"
+#line 20765 "configure"

 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */


@@ -20719,22 +20781,22 @@ XOpenDisplay ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"

-if { (eval echo "$as_me:20722: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20784: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:20725: \$? = $ac_status" >&5
+  echo "$as_me:20787: \$? = $ac_status" >&5

   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'

-  { (eval echo "$as_me:20728: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20790: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:20731: \$? = $ac_status" >&5
+  echo "$as_me:20793: \$? = $ac_status" >&5

   (exit "$ac_status"); }; }; then
   :
 else
   echo "$as_me: failed program was:" >&5
 cat "conftest.$ac_ext" >&5
   (exit "$ac_status"); }; }; then
   :
 else
   echo "$as_me: failed program was:" >&5
 cat "conftest.$ac_ext" >&5

-echo "$as_me:20737: checking for dnet_ntoa in -ldnet" >&5
+echo "$as_me:20799: 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
 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


@@ -20742,7 +20804,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldnet  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldnet  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF

-#line 20745 "configure"
+#line 20807 "configure"

 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */


@@ -20761,16 +20823,16 @@ dnet_ntoa ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"

-if { (eval echo "$as_me:20764: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20826: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:20767: \$? = $ac_status" >&5
+  echo "$as_me:20829: \$? = $ac_status" >&5

   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'

-  { (eval echo "$as_me:20770: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20832: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:20773: \$? = $ac_status" >&5
+  echo "$as_me:20835: \$? = $ac_status" >&5

   (exit "$ac_status"); }; }; then
   ac_cv_lib_dnet_dnet_ntoa=yes
 else
   (exit "$ac_status"); }; }; then
   ac_cv_lib_dnet_dnet_ntoa=yes
 else


@@ -20781,14 +20843,14 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi

-echo "$as_me:20784: result: $ac_cv_lib_dnet_dnet_ntoa" >&5
+echo "$as_me:20846: 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 "${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:20791: checking for dnet_ntoa in -ldnet_stub" >&5
+      echo "$as_me:20853: 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
 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


@@ -20796,7 +20858,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldnet_stub  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldnet_stub  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF

-#line 20799 "configure"
+#line 20861 "configure"

 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */


@@ -20815,16 +20877,16 @@ dnet_ntoa ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"

-if { (eval echo "$as_me:20818: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20880: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:20821: \$? = $ac_status" >&5
+  echo "$as_me:20883: \$? = $ac_status" >&5

   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'

-  { (eval echo "$as_me:20824: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20886: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:20827: \$? = $ac_status" >&5
+  echo "$as_me:20889: \$? = $ac_status" >&5

   (exit "$ac_status"); }; }; then
   ac_cv_lib_dnet_stub_dnet_ntoa=yes
 else
   (exit "$ac_status"); }; }; then
   ac_cv_lib_dnet_stub_dnet_ntoa=yes
 else


@@ -20835,7 +20897,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi

-echo "$as_me:20838: result: $ac_cv_lib_dnet_stub_dnet_ntoa" >&5
+echo "$as_me:20900: 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"
 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"


@@ -20854,13 +20916,13 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
     # 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.
     # 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:20857: checking for gethostbyname" >&5
+    echo "$as_me:20919: 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
 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 20863 "configure"
+#line 20925 "configure"

 #include "confdefs.h"
 #define gethostbyname autoconf_temporary
 #include <limits.h>    /* least-intrusive standard header which defines gcc2 __stub macros */
 #include "confdefs.h"
 #define gethostbyname autoconf_temporary
 #include <limits.h>    /* least-intrusive standard header which defines gcc2 __stub macros */


@@ -20891,16 +20953,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"

-if { (eval echo "$as_me:20894: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20956: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:20897: \$? = $ac_status" >&5
+  echo "$as_me:20959: \$? = $ac_status" >&5

   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'

-  { (eval echo "$as_me:20900: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20962: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:20903: \$? = $ac_status" >&5
+  echo "$as_me:20965: \$? = $ac_status" >&5

   (exit "$ac_status"); }; }; then
   ac_cv_func_gethostbyname=yes
 else
   (exit "$ac_status"); }; }; then
   ac_cv_func_gethostbyname=yes
 else


@@ -20910,11 +20972,11 @@ ac_cv_func_gethostbyname=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi

-echo "$as_me:20913: result: $ac_cv_func_gethostbyname" >&5
+echo "$as_me:20975: result: $ac_cv_func_gethostbyname" >&5

 echo "${ECHO_T}$ac_cv_func_gethostbyname" >&6
 
     if test $ac_cv_func_gethostbyname = no; then
 echo "${ECHO_T}$ac_cv_func_gethostbyname" >&6
 
     if test $ac_cv_func_gethostbyname = no; then

-      echo "$as_me:20917: checking for gethostbyname in -lnsl" >&5
+      echo "$as_me:20979: 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
 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


@@ -20922,7 +20984,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lnsl  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lnsl  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF

-#line 20925 "configure"
+#line 20987 "configure"

 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */


@@ -20941,16 +21003,16 @@ gethostbyname ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"

-if { (eval echo "$as_me:20944: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21006: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:20947: \$? = $ac_status" >&5
+  echo "$as_me:21009: \$? = $ac_status" >&5

   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'

-  { (eval echo "$as_me:20950: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21012: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:20953: \$? = $ac_status" >&5
+  echo "$as_me:21015: \$? = $ac_status" >&5

   (exit "$ac_status"); }; }; then
   ac_cv_lib_nsl_gethostbyname=yes
 else
   (exit "$ac_status"); }; }; then
   ac_cv_lib_nsl_gethostbyname=yes
 else


@@ -20961,14 +21023,14 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi

-echo "$as_me:20964: result: $ac_cv_lib_nsl_gethostbyname" >&5
+echo "$as_me:21026: 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 "${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:20971: checking for gethostbyname in -lbsd" >&5
+        echo "$as_me:21033: 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
 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


@@ -20976,7 +21038,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lbsd  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lbsd  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF

-#line 20979 "configure"
+#line 21041 "configure"

 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */


@@ -20995,16 +21057,16 @@ gethostbyname ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"

-if { (eval echo "$as_me:20998: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21060: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:21001: \$? = $ac_status" >&5
+  echo "$as_me:21063: \$? = $ac_status" >&5

   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'

-  { (eval echo "$as_me:21004: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21066: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:21007: \$? = $ac_status" >&5
+  echo "$as_me:21069: \$? = $ac_status" >&5

   (exit "$ac_status"); }; }; then
   ac_cv_lib_bsd_gethostbyname=yes
 else
   (exit "$ac_status"); }; }; then
   ac_cv_lib_bsd_gethostbyname=yes
 else


@@ -21015,7 +21077,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi

-echo "$as_me:21018: result: $ac_cv_lib_bsd_gethostbyname" >&5
+echo "$as_me:21080: 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"
 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"


@@ -21031,13 +21093,13 @@ fi
     # 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.
     # 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:21034: checking for connect" >&5
+    echo "$as_me:21096: 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
 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 21040 "configure"
+#line 21102 "configure"

 #include "confdefs.h"
 #define connect autoconf_temporary
 #include <limits.h>    /* least-intrusive standard header which defines gcc2 __stub macros */
 #include "confdefs.h"
 #define connect autoconf_temporary
 #include <limits.h>    /* least-intrusive standard header which defines gcc2 __stub macros */


@@ -21068,16 +21130,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"

-if { (eval echo "$as_me:21071: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21133: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:21074: \$? = $ac_status" >&5
+  echo "$as_me:21136: \$? = $ac_status" >&5

   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'

-  { (eval echo "$as_me:21077: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21139: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:21080: \$? = $ac_status" >&5
+  echo "$as_me:21142: \$? = $ac_status" >&5

   (exit "$ac_status"); }; }; then
   ac_cv_func_connect=yes
 else
   (exit "$ac_status"); }; }; then
   ac_cv_func_connect=yes
 else


@@ -21087,11 +21149,11 @@ ac_cv_func_connect=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi

-echo "$as_me:21090: result: $ac_cv_func_connect" >&5
+echo "$as_me:21152: result: $ac_cv_func_connect" >&5

 echo "${ECHO_T}$ac_cv_func_connect" >&6
 
     if test $ac_cv_func_connect = no; then
 echo "${ECHO_T}$ac_cv_func_connect" >&6
 
     if test $ac_cv_func_connect = no; then

-      echo "$as_me:21094: checking for connect in -lsocket" >&5
+      echo "$as_me:21156: 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
 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


@@ -21099,7 +21161,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lsocket $X_EXTRA_LIBS $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lsocket $X_EXTRA_LIBS $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF

-#line 21102 "configure"
+#line 21164 "configure"

 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */


@@ -21118,16 +21180,16 @@ connect ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"

-if { (eval echo "$as_me:21121: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21183: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:21124: \$? = $ac_status" >&5
+  echo "$as_me:21186: \$? = $ac_status" >&5

   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'

-  { (eval echo "$as_me:21127: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21189: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:21130: \$? = $ac_status" >&5
+  echo "$as_me:21192: \$? = $ac_status" >&5

   (exit "$ac_status"); }; }; then
   ac_cv_lib_socket_connect=yes
 else
   (exit "$ac_status"); }; }; then
   ac_cv_lib_socket_connect=yes
 else


@@ -21138,7 +21200,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi

-echo "$as_me:21141: result: $ac_cv_lib_socket_connect" >&5
+echo "$as_me:21203: 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"
 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"


@@ -21147,13 +21209,13 @@ fi
     fi
 
     # Guillermo Gomez says -lposix is necessary on A/UX.
     fi
 
     # Guillermo Gomez says -lposix is necessary on A/UX.

-    echo "$as_me:21150: checking for remove" >&5
+    echo "$as_me:21212: 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
 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 21156 "configure"
+#line 21218 "configure"

 #include "confdefs.h"
 #define remove autoconf_temporary
 #include <limits.h>    /* least-intrusive standard header which defines gcc2 __stub macros */
 #include "confdefs.h"
 #define remove autoconf_temporary
 #include <limits.h>    /* least-intrusive standard header which defines gcc2 __stub macros */


@@ -21184,16 +21246,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"

-if { (eval echo "$as_me:21187: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21249: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:21190: \$? = $ac_status" >&5
+  echo "$as_me:21252: \$? = $ac_status" >&5

   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'

-  { (eval echo "$as_me:21193: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21255: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:21196: \$? = $ac_status" >&5
+  echo "$as_me:21258: \$? = $ac_status" >&5

   (exit "$ac_status"); }; }; then
   ac_cv_func_remove=yes
 else
   (exit "$ac_status"); }; }; then
   ac_cv_func_remove=yes
 else


@@ -21203,11 +21265,11 @@ ac_cv_func_remove=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi

-echo "$as_me:21206: result: $ac_cv_func_remove" >&5
+echo "$as_me:21268: result: $ac_cv_func_remove" >&5

 echo "${ECHO_T}$ac_cv_func_remove" >&6
 
     if test $ac_cv_func_remove = no; then
 echo "${ECHO_T}$ac_cv_func_remove" >&6
 
     if test $ac_cv_func_remove = no; then

-      echo "$as_me:21210: checking for remove in -lposix" >&5
+      echo "$as_me:21272: 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
 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


@@ -21215,7 +21277,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lposix  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lposix  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF

-#line 21218 "configure"
+#line 21280 "configure"

 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */


@@ -21234,16 +21296,16 @@ remove ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"

-if { (eval echo "$as_me:21237: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21299: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:21240: \$? = $ac_status" >&5
+  echo "$as_me:21302: \$? = $ac_status" >&5

   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'

-  { (eval echo "$as_me:21243: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21305: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:21246: \$? = $ac_status" >&5
+  echo "$as_me:21308: \$? = $ac_status" >&5

   (exit "$ac_status"); }; }; then
   ac_cv_lib_posix_remove=yes
 else
   (exit "$ac_status"); }; }; then
   ac_cv_lib_posix_remove=yes
 else


@@ -21254,7 +21316,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi

-echo "$as_me:21257: result: $ac_cv_lib_posix_remove" >&5
+echo "$as_me:21319: 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"
 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"


@@ -21263,13 +21325,13 @@ fi
     fi
 
     # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay.
     fi
 
     # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay.

-    echo "$as_me:21266: checking for shmat" >&5
+    echo "$as_me:21328: 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
 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 21272 "configure"
+#line 21334 "configure"

 #include "confdefs.h"
 #define shmat autoconf_temporary
 #include <limits.h>    /* least-intrusive standard header which defines gcc2 __stub macros */
 #include "confdefs.h"
 #define shmat autoconf_temporary
 #include <limits.h>    /* least-intrusive standard header which defines gcc2 __stub macros */


@@ -21300,16 +21362,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"

-if { (eval echo "$as_me:21303: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21365: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:21306: \$? = $ac_status" >&5
+  echo "$as_me:21368: \$? = $ac_status" >&5

   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'

-  { (eval echo "$as_me:21309: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21371: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:21312: \$? = $ac_status" >&5
+  echo "$as_me:21374: \$? = $ac_status" >&5

   (exit "$ac_status"); }; }; then
   ac_cv_func_shmat=yes
 else
   (exit "$ac_status"); }; }; then
   ac_cv_func_shmat=yes
 else


@@ -21319,11 +21381,11 @@ ac_cv_func_shmat=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi

-echo "$as_me:21322: result: $ac_cv_func_shmat" >&5
+echo "$as_me:21384: result: $ac_cv_func_shmat" >&5

 echo "${ECHO_T}$ac_cv_func_shmat" >&6
 
     if test $ac_cv_func_shmat = no; then
 echo "${ECHO_T}$ac_cv_func_shmat" >&6
 
     if test $ac_cv_func_shmat = no; then

-      echo "$as_me:21326: checking for shmat in -lipc" >&5
+      echo "$as_me:21388: 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
 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


@@ -21331,7 +21393,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lipc  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lipc  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF

-#line 21334 "configure"
+#line 21396 "configure"

 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */


@@ -21350,16 +21412,16 @@ shmat ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"

-if { (eval echo "$as_me:21353: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21415: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:21356: \$? = $ac_status" >&5
+  echo "$as_me:21418: \$? = $ac_status" >&5

   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'

-  { (eval echo "$as_me:21359: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21421: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:21362: \$? = $ac_status" >&5
+  echo "$as_me:21424: \$? = $ac_status" >&5

   (exit "$ac_status"); }; }; then
   ac_cv_lib_ipc_shmat=yes
 else
   (exit "$ac_status"); }; }; then
   ac_cv_lib_ipc_shmat=yes
 else


@@ -21370,7 +21432,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi

-echo "$as_me:21373: result: $ac_cv_lib_ipc_shmat" >&5
+echo "$as_me:21435: 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"
 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"


@@ -21388,7 +21450,7 @@ fi
   # 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
   # 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:21391: checking for IceConnectionNumber in -lICE" >&5
+  echo "$as_me:21453: 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
 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


@@ -21396,7 +21458,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lICE $X_EXTRA_LIBS $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lICE $X_EXTRA_LIBS $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF

-#line 21399 "configure"
+#line 21461 "configure"

 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */


@@ -21415,16 +21477,16 @@ IceConnectionNumber ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"

-if { (eval echo "$as_me:21418: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21480: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:21421: \$? = $ac_status" >&5
+  echo "$as_me:21483: \$? = $ac_status" >&5

   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'

-  { (eval echo "$as_me:21424: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21486: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:21427: \$? = $ac_status" >&5
+  echo "$as_me:21489: \$? = $ac_status" >&5

   (exit "$ac_status"); }; }; then
   ac_cv_lib_ICE_IceConnectionNumber=yes
 else
   (exit "$ac_status"); }; }; then
   ac_cv_lib_ICE_IceConnectionNumber=yes
 else


@@ -21435,7 +21497,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi

-echo "$as_me:21438: result: $ac_cv_lib_ICE_IceConnectionNumber" >&5
+echo "$as_me:21500: 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"
 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"


@@ -21456,7 +21518,7 @@ then
        (*-Werror=*)
                test -n "$verbose" && echo "    repairing CFLAGS: $CFLAGS" 1>&6
 
        (*-Werror=*)
                test -n "$verbose" && echo "    repairing CFLAGS: $CFLAGS" 1>&6
 

-echo "${as_me:-configure}:21459: testing repairing CFLAGS: $CFLAGS ..." 1>&5
+echo "${as_me:-configure}:21521: testing repairing CFLAGS: $CFLAGS ..." 1>&5

 
                cf_temp_flags=
                for cf_temp_scan in $CFLAGS
 
                cf_temp_flags=
                for cf_temp_scan in $CFLAGS


@@ -21479,11 +21541,11 @@ echo "${as_me:-configure}:21459: testing repairing CFLAGS: $CFLAGS ..." 1>&5
                CFLAGS="$cf_temp_flags"
                test -n "$verbose" && echo "    ... fixed $CFLAGS" 1>&6
 
                CFLAGS="$cf_temp_flags"
                test -n "$verbose" && echo "    ... fixed $CFLAGS" 1>&6
 

-echo "${as_me:-configure}:21482: testing ... fixed $CFLAGS ..." 1>&5
+echo "${as_me:-configure}:21544: testing ... fixed $CFLAGS ..." 1>&5

 
                test -n "$verbose" && echo "    ... extra $EXTRA_CFLAGS" 1>&6
 
 
                test -n "$verbose" && echo "    ... extra $EXTRA_CFLAGS" 1>&6
 

-echo "${as_me:-configure}:21486: testing ... extra $EXTRA_CFLAGS ..." 1>&5
+echo "${as_me:-configure}:21548: testing ... extra $EXTRA_CFLAGS ..." 1>&5

 
                ;;
        esac
 
                ;;
        esac


@@ -21495,7 +21557,7 @@ then
        (*-Werror=*)
                test -n "$verbose" && echo "    repairing CPPFLAGS: $CPPFLAGS" 1>&6
 
        (*-Werror=*)
                test -n "$verbose" && echo "    repairing CPPFLAGS: $CPPFLAGS" 1>&6
 

-echo "${as_me:-configure}:21498: testing repairing CPPFLAGS: $CPPFLAGS ..." 1>&5
+echo "${as_me:-configure}:21560: testing repairing CPPFLAGS: $CPPFLAGS ..." 1>&5

 
                cf_temp_flags=
                for cf_temp_scan in $CPPFLAGS
 
                cf_temp_flags=
                for cf_temp_scan in $CPPFLAGS


@@ -21518,11 +21580,11 @@ echo "${as_me:-configure}:21498: testing repairing CPPFLAGS: $CPPFLAGS ..." 1>&5
                CPPFLAGS="$cf_temp_flags"
                test -n "$verbose" && echo "    ... fixed $CPPFLAGS" 1>&6
 
                CPPFLAGS="$cf_temp_flags"
                test -n "$verbose" && echo "    ... fixed $CPPFLAGS" 1>&6
 

-echo "${as_me:-configure}:21521: testing ... fixed $CPPFLAGS ..." 1>&5
+echo "${as_me:-configure}:21583: testing ... fixed $CPPFLAGS ..." 1>&5

 
                test -n "$verbose" && echo "    ... extra $EXTRA_CFLAGS" 1>&6
 
 
                test -n "$verbose" && echo "    ... extra $EXTRA_CFLAGS" 1>&6
 

-echo "${as_me:-configure}:21525: testing ... extra $EXTRA_CFLAGS ..." 1>&5
+echo "${as_me:-configure}:21587: testing ... extra $EXTRA_CFLAGS ..." 1>&5

 
                ;;
        esac
 
                ;;
        esac


@@ -21534,7 +21596,7 @@ then
        (*-Werror=*)
                test -n "$verbose" && echo "    repairing LDFLAGS: $LDFLAGS" 1>&6
 
        (*-Werror=*)
                test -n "$verbose" && echo "    repairing LDFLAGS: $LDFLAGS" 1>&6
 

-echo "${as_me:-configure}:21537: testing repairing LDFLAGS: $LDFLAGS ..." 1>&5
+echo "${as_me:-configure}:21599: testing repairing LDFLAGS: $LDFLAGS ..." 1>&5

 
                cf_temp_flags=
                for cf_temp_scan in $LDFLAGS
 
                cf_temp_flags=
                for cf_temp_scan in $LDFLAGS


@@ -21557,17 +21619,17 @@ echo "${as_me:-configure}:21537: testing repairing LDFLAGS: $LDFLAGS ..." 1>&5
                LDFLAGS="$cf_temp_flags"
                test -n "$verbose" && echo "    ... fixed $LDFLAGS" 1>&6
 
                LDFLAGS="$cf_temp_flags"
                test -n "$verbose" && echo "    ... fixed $LDFLAGS" 1>&6
 

-echo "${as_me:-configure}:21560: testing ... fixed $LDFLAGS ..." 1>&5
+echo "${as_me:-configure}:21622: testing ... fixed $LDFLAGS ..." 1>&5

 
                test -n "$verbose" && echo "    ... extra $EXTRA_CFLAGS" 1>&6
 
 
                test -n "$verbose" && echo "    ... extra $EXTRA_CFLAGS" 1>&6
 

-echo "${as_me:-configure}:21564: testing ... extra $EXTRA_CFLAGS ..." 1>&5
+echo "${as_me:-configure}:21626: testing ... extra $EXTRA_CFLAGS ..." 1>&5

 
                ;;
        esac
 fi
 
 
                ;;
        esac
 fi
 

-echo "$as_me:21570: checking if you want to turn on gcc warnings" >&5
+echo "$as_me:21632: 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.
 echo $ECHO_N "checking if you want to turn on gcc warnings... $ECHO_C" >&6
 
 # Check whether --enable-warnings or --disable-warnings was given.


@@ -21584,7 +21646,7 @@ else
        enable_warnings=no
 
 fi;
        enable_warnings=no
 
 fi;

-echo "$as_me:21587: result: $enable_warnings" >&5
+echo "$as_me:21649: result: $enable_warnings" >&5

 echo "${ECHO_T}$enable_warnings" >&6
 if test "$enable_warnings" = "yes"
 then
 echo "${ECHO_T}$enable_warnings" >&6
 if test "$enable_warnings" = "yes"
 then


@@ -21607,10 +21669,10 @@ cat > conftest.i <<EOF
 EOF
 if test "$GCC" = yes
 then
 EOF
 if test "$GCC" = yes
 then

-       { echo "$as_me:21610: checking for $CC __attribute__ directives..." >&5
+       { echo "$as_me:21672: checking for $CC __attribute__ directives..." >&5

 echo "$as_me: checking for $CC __attribute__ directives..." >&6;}
 cat > "conftest.$ac_ext" <<EOF
 echo "$as_me: checking for $CC __attribute__ directives..." >&6;}
 cat > "conftest.$ac_ext" <<EOF

-#line 21613 "${as_me:-configure}"
+#line 21675 "${as_me:-configure}"

 #include "confdefs.h"
 #include "conftest.h"
 #include "conftest.i"
 #include "confdefs.h"
 #include "conftest.h"
 #include "conftest.i"


@@ -21659,12 +21721,12 @@ EOF
                        ;;
                esac
 
                        ;;
                esac
 

-               if { (eval echo "$as_me:21662: \"$ac_compile\"") >&5
+               if { (eval echo "$as_me:21724: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:21665: \$? = $ac_status" >&5
+  echo "$as_me:21727: \$? = $ac_status" >&5

   (exit "$ac_status"); }; then
   (exit "$ac_status"); }; then

-                       test -n "$verbose" && echo "$as_me:21667: result: ... $cf_attribute" >&5
+                       test -n "$verbose" && echo "$as_me:21729: result: ... $cf_attribute" >&5

 echo "${ECHO_T}... $cf_attribute" >&6
                        cat conftest.h >>confdefs.h
                        case "$cf_attribute" in
 echo "${ECHO_T}... $cf_attribute" >&6
                        cat conftest.h >>confdefs.h
                        case "$cf_attribute" in


@@ -21742,7 +21804,7 @@ do
 done
 
 cat >"conftest.$ac_ext" <<_ACEOF
 done
 
 cat >"conftest.$ac_ext" <<_ACEOF

-#line 21745 "configure"
+#line 21807 "configure"

 #include "confdefs.h"
 
 #include <stdlib.h>
 #include "confdefs.h"
 
 #include <stdlib.h>


@@ -21757,26 +21819,26 @@ String foo = malloc(1); (void)foo
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
 }
 _ACEOF
 rm -f "conftest.$ac_objext"

-if { (eval echo "$as_me:21760: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:21822: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:21763: \$? = $ac_status" >&5
+  echo "$as_me:21825: \$? = $ac_status" >&5

   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'

-  { (eval echo "$as_me:21766: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21828: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:21769: \$? = $ac_status" >&5
+  echo "$as_me:21831: \$? = $ac_status" >&5

   (exit "$ac_status"); }; }; then
 
   (exit "$ac_status"); }; }; then
 

-echo "$as_me:21772: checking for X11/Xt const-feature" >&5
+echo "$as_me:21834: checking for X11/Xt const-feature" >&5

 echo $ECHO_N "checking for X11/Xt const-feature... $ECHO_C" >&6
 if test "${cf_cv_const_x_string+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
        cat >"conftest.$ac_ext" <<_ACEOF
 echo $ECHO_N "checking for X11/Xt const-feature... $ECHO_C" >&6
 if test "${cf_cv_const_x_string+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
        cat >"conftest.$ac_ext" <<_ACEOF

-#line 21779 "configure"
+#line 21841 "configure"

 #include "confdefs.h"
 
 #define _CONST_X_STRING        /* X11R7.8 (perhaps) */
 #include "confdefs.h"
 
 #define _CONST_X_STRING        /* X11R7.8 (perhaps) */


@@ -21793,16 +21855,16 @@ String foo = malloc(1); *foo = 0
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
 }
 _ACEOF
 rm -f "conftest.$ac_objext"

-if { (eval echo "$as_me:21796: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:21858: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:21799: \$? = $ac_status" >&5
+  echo "$as_me:21861: \$? = $ac_status" >&5

   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'

-  { (eval echo "$as_me:21802: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21864: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:21805: \$? = $ac_status" >&5
+  echo "$as_me:21867: \$? = $ac_status" >&5

   (exit "$ac_status"); }; }; then
 
                        cf_cv_const_x_string=no
   (exit "$ac_status"); }; }; then
 
                        cf_cv_const_x_string=no


@@ -21817,7 +21879,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi

-echo "$as_me:21820: result: $cf_cv_const_x_string" >&5
+echo "$as_me:21882: result: $cf_cv_const_x_string" >&5

 echo "${ECHO_T}$cf_cv_const_x_string" >&6
 
 LIBS="$cf_save_LIBS_CF_CONST_X_STRING"
 echo "${ECHO_T}$cf_cv_const_x_string" >&6
 
 LIBS="$cf_save_LIBS_CF_CONST_X_STRING"


@@ -21846,7 +21908,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
  fi
 cat > "conftest.$ac_ext" <<EOF
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
  fi
 cat > "conftest.$ac_ext" <<EOF

-#line 21849 "${as_me:-configure}"
+#line 21911 "${as_me:-configure}"

 int main(int argc, char *argv[]) { return (argv[argc-1] == 0) ; }
 EOF
 if test "$INTEL_COMPILER" = yes
 int main(int argc, char *argv[]) { return (argv[argc-1] == 0) ; }
 EOF
 if test "$INTEL_COMPILER" = yes


@@ -21862,7 +21924,7 @@ then
 # remark #981: operands are evaluated in unspecified order
 # warning #279: controlling expression is constant
 
 # remark #981: operands are evaluated in unspecified order
 # warning #279: controlling expression is constant
 

-       { echo "$as_me:21865: checking for $CC warning options..." >&5
+       { echo "$as_me:21927: checking for $CC warning options..." >&5

 echo "$as_me: checking for $CC warning options..." >&6;}
        cf_save_CFLAGS="$CFLAGS"
        EXTRA_CFLAGS="$EXTRA_CFLAGS -Wall"
 echo "$as_me: checking for $CC warning options..." >&6;}
        cf_save_CFLAGS="$CFLAGS"
        EXTRA_CFLAGS="$EXTRA_CFLAGS -Wall"


@@ -21878,12 +21940,12 @@ echo "$as_me: checking for $CC warning options..." >&6;}
                wd981
        do
                CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt"
                wd981
        do
                CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt"

-               if { (eval echo "$as_me:21881: \"$ac_compile\"") >&5
+               if { (eval echo "$as_me:21943: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:21884: \$? = $ac_status" >&5
+  echo "$as_me:21946: \$? = $ac_status" >&5

   (exit "$ac_status"); }; then
   (exit "$ac_status"); }; then

-                       test -n "$verbose" && echo "$as_me:21886: result: ... -$cf_opt" >&5
+                       test -n "$verbose" && echo "$as_me:21948: result: ... -$cf_opt" >&5

 echo "${ECHO_T}... -$cf_opt" >&6
                        EXTRA_CFLAGS="$EXTRA_CFLAGS -$cf_opt"
                fi
 echo "${ECHO_T}... -$cf_opt" >&6
                        EXTRA_CFLAGS="$EXTRA_CFLAGS -$cf_opt"
                fi


@@ -21891,7 +21953,7 @@ echo "${ECHO_T}... -$cf_opt" >&6
        CFLAGS="$cf_save_CFLAGS"
 elif test "$GCC" = yes && test "$GCC_VERSION" != "unknown"
 then
        CFLAGS="$cf_save_CFLAGS"
 elif test "$GCC" = yes && test "$GCC_VERSION" != "unknown"
 then

-       { echo "$as_me:21894: checking for $CC warning options..." >&5
+       { echo "$as_me:21956: checking for $CC warning options..." >&5

 echo "$as_me: checking for $CC warning options..." >&6;}
        cf_save_CFLAGS="$CFLAGS"
        cf_warn_CONST=""
 echo "$as_me: checking for $CC warning options..." >&6;}
        cf_save_CFLAGS="$CFLAGS"
        cf_warn_CONST=""


@@ -21914,12 +21976,12 @@ echo "$as_me: checking for $CC warning options..." >&6;}
                Wundef Wno-inline $cf_gcc_warnings $cf_warn_CONST Wno-unknown-pragmas
        do
                CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt"
                Wundef Wno-inline $cf_gcc_warnings $cf_warn_CONST Wno-unknown-pragmas
        do
                CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt"

-               if { (eval echo "$as_me:21917: \"$ac_compile\"") >&5
+               if { (eval echo "$as_me:21979: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:21920: \$? = $ac_status" >&5
+  echo "$as_me:21982: \$? = $ac_status" >&5

   (exit "$ac_status"); }; then
   (exit "$ac_status"); }; then

-                       test -n "$verbose" && echo "$as_me:21922: result: ... -$cf_opt" >&5
+                       test -n "$verbose" && echo "$as_me:21984: result: ... -$cf_opt" >&5

 echo "${ECHO_T}... -$cf_opt" >&6
                        case "$cf_opt" in
                        (Winline)
 echo "${ECHO_T}... -$cf_opt" >&6
                        case "$cf_opt" in
                        (Winline)


@@ -21927,7 +21989,7 @@ echo "${ECHO_T}... -$cf_opt" >&6
                                ([34].*)
                                        test -n "$verbose" && echo "    feature is broken in gcc $GCC_VERSION" 1>&6
 
                                ([34].*)
                                        test -n "$verbose" && echo "    feature is broken in gcc $GCC_VERSION" 1>&6
 

-echo "${as_me:-configure}:21930: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
+echo "${as_me:-configure}:21992: testing feature is broken in gcc $GCC_VERSION ..." 1>&5

 
                                        continue;;
                                esac
 
                                        continue;;
                                esac


@@ -21937,7 +21999,7 @@ echo "${as_me:-configure}:21930: testing feature is broken in gcc $GCC_VERSION .
                                ([12].*)
                                        test -n "$verbose" && echo "    feature is broken in gcc $GCC_VERSION" 1>&6
 
                                ([12].*)
                                        test -n "$verbose" && echo "    feature is broken in gcc $GCC_VERSION" 1>&6
 

-echo "${as_me:-configure}:21940: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
+echo "${as_me:-configure}:22002: testing feature is broken in gcc $GCC_VERSION ..." 1>&5

 
                                        continue;;
                                esac
 
                                        continue;;
                                esac


@@ -21954,7 +22016,7 @@ fi
 
 fi
 
 
 fi
 

-echo "$as_me:21957: checking if you want to use dmalloc for testing" >&5
+echo "$as_me:22019: 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.
 echo $ECHO_N "checking if you want to use dmalloc for testing... $ECHO_C" >&6
 
 # Check whether --with-dmalloc or --without-dmalloc was given.


@@ -21971,7 +22033,7 @@ EOF
 else
   with_dmalloc=
 fi;
 else
   with_dmalloc=
 fi;

-echo "$as_me:21974: result: ${with_dmalloc:-no}" >&5
+echo "$as_me:22036: result: ${with_dmalloc:-no}" >&5

 echo "${ECHO_T}${with_dmalloc:-no}" >&6
 
 case ".$with_cflags" in
 echo "${ECHO_T}${with_dmalloc:-no}" >&6
 
 case ".$with_cflags" in


@@ -22085,23 +22147,23 @@ fi
 esac
 
 if test "$with_dmalloc" = yes ; then
 esac
 
 if test "$with_dmalloc" = yes ; then

-       echo "$as_me:22088: checking for dmalloc.h" >&5
+       echo "$as_me:22150: 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
 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 22094 "configure"
+#line 22156 "configure"

 #include "confdefs.h"
 #include <dmalloc.h>
 _ACEOF
 #include "confdefs.h"
 #include <dmalloc.h>
 _ACEOF

-if { (eval echo "$as_me:22098: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:22160: \"$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
   (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:22104: \$? = $ac_status" >&5
+  echo "$as_me:22166: \$? = $ac_status" >&5

   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag


@@ -22120,11 +22182,11 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi

-echo "$as_me:22123: result: $ac_cv_header_dmalloc_h" >&5
+echo "$as_me:22185: 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 "${ECHO_T}$ac_cv_header_dmalloc_h" >&6
 if test "$ac_cv_header_dmalloc_h" = yes; then
 

-echo "$as_me:22127: checking for dmalloc_debug in -ldmalloc" >&5
+echo "$as_me:22189: 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
 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


@@ -22132,7 +22194,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldmalloc  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldmalloc  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF

-#line 22135 "configure"
+#line 22197 "configure"

 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */


@@ -22151,16 +22213,16 @@ dmalloc_debug ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"

-if { (eval echo "$as_me:22154: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22216: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:22157: \$? = $ac_status" >&5
+  echo "$as_me:22219: \$? = $ac_status" >&5

   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'

-  { (eval echo "$as_me:22160: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22222: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:22163: \$? = $ac_status" >&5
+  echo "$as_me:22225: \$? = $ac_status" >&5

   (exit "$ac_status"); }; }; then
   ac_cv_lib_dmalloc_dmalloc_debug=yes
 else
   (exit "$ac_status"); }; }; then
   ac_cv_lib_dmalloc_dmalloc_debug=yes
 else


@@ -22171,7 +22233,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi

-echo "$as_me:22174: result: $ac_cv_lib_dmalloc_dmalloc_debug" >&5
+echo "$as_me:22236: 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
 echo "${ECHO_T}$ac_cv_lib_dmalloc_dmalloc_debug" >&6
 if test "$ac_cv_lib_dmalloc_dmalloc_debug" = yes; then
   cat >>confdefs.h <<EOF


@@ -22186,7 +22248,7 @@ fi
 
 fi
 
 
 fi
 

-echo "$as_me:22189: checking if you want to use dbmalloc for testing" >&5
+echo "$as_me:22251: 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.
 echo $ECHO_N "checking if you want to use dbmalloc for testing... $ECHO_C" >&6
 
 # Check whether --with-dbmalloc or --without-dbmalloc was given.


@@ -22203,7 +22265,7 @@ EOF
 else
   with_dbmalloc=
 fi;
 else
   with_dbmalloc=
 fi;

-echo "$as_me:22206: result: ${with_dbmalloc:-no}" >&5
+echo "$as_me:22268: result: ${with_dbmalloc:-no}" >&5

 echo "${ECHO_T}${with_dbmalloc:-no}" >&6
 
 case ".$with_cflags" in
 echo "${ECHO_T}${with_dbmalloc:-no}" >&6
 
 case ".$with_cflags" in


@@ -22317,23 +22379,23 @@ fi
 esac
 
 if test "$with_dbmalloc" = yes ; then
 esac
 
 if test "$with_dbmalloc" = yes ; then

-       echo "$as_me:22320: checking for dbmalloc.h" >&5
+       echo "$as_me:22382: 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
 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 22326 "configure"
+#line 22388 "configure"

 #include "confdefs.h"
 #include <dbmalloc.h>
 _ACEOF
 #include "confdefs.h"
 #include <dbmalloc.h>
 _ACEOF

-if { (eval echo "$as_me:22330: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:22392: \"$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
   (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:22336: \$? = $ac_status" >&5
+  echo "$as_me:22398: \$? = $ac_status" >&5

   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag


@@ -22352,11 +22414,11 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi

-echo "$as_me:22355: result: $ac_cv_header_dbmalloc_h" >&5
+echo "$as_me:22417: 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 "${ECHO_T}$ac_cv_header_dbmalloc_h" >&6
 if test "$ac_cv_header_dbmalloc_h" = yes; then
 

-echo "$as_me:22359: checking for debug_malloc in -ldbmalloc" >&5
+echo "$as_me:22421: 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
 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


@@ -22364,7 +22426,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldbmalloc  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldbmalloc  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF

-#line 22367 "configure"
+#line 22429 "configure"

 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */


@@ -22383,16 +22445,16 @@ debug_malloc ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"

-if { (eval echo "$as_me:22386: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22448: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:22389: \$? = $ac_status" >&5
+  echo "$as_me:22451: \$? = $ac_status" >&5

   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'

-  { (eval echo "$as_me:22392: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22454: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:22395: \$? = $ac_status" >&5
+  echo "$as_me:22457: \$? = $ac_status" >&5

   (exit "$ac_status"); }; }; then
   ac_cv_lib_dbmalloc_debug_malloc=yes
 else
   (exit "$ac_status"); }; }; then
   ac_cv_lib_dbmalloc_debug_malloc=yes
 else


@@ -22403,7 +22465,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi

-echo "$as_me:22406: result: $ac_cv_lib_dbmalloc_debug_malloc" >&5
+echo "$as_me:22468: 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
 echo "${ECHO_T}$ac_cv_lib_dbmalloc_debug_malloc" >&6
 if test "$ac_cv_lib_dbmalloc_debug_malloc" = yes; then
   cat >>confdefs.h <<EOF


@@ -22418,7 +22480,7 @@ fi
 
 fi
 
 
 fi
 

-echo "$as_me:22421: checking if you want to use valgrind for testing" >&5
+echo "$as_me:22483: 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.
 echo $ECHO_N "checking if you want to use valgrind for testing... $ECHO_C" >&6
 
 # Check whether --with-valgrind or --without-valgrind was given.


@@ -22435,7 +22497,7 @@ EOF
 else
   with_valgrind=
 fi;
 else
   with_valgrind=
 fi;

-echo "$as_me:22438: result: ${with_valgrind:-no}" >&5
+echo "$as_me:22500: result: ${with_valgrind:-no}" >&5

 echo "${ECHO_T}${with_valgrind:-no}" >&6
 
 case ".$with_cflags" in
 echo "${ECHO_T}${with_valgrind:-no}" >&6
 
 case ".$with_cflags" in


@@ -22548,7 +22610,7 @@ fi
        ;;
 esac
 
        ;;
 esac
 

-echo "$as_me:22551: checking if you want to perform memory-leak testing" >&5
+echo "$as_me:22613: 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.
 echo $ECHO_N "checking if you want to perform memory-leak testing... $ECHO_C" >&6
 
 # Check whether --enable-leaks or --disable-leaks was given.


@@ -22559,7 +22621,7 @@ else
   enable_leaks=yes
 fi;
 if test "x$enable_leaks" = xno; then with_no_leaks=yes; else with_no_leaks=no; fi
   enable_leaks=yes
 fi;
 if test "x$enable_leaks" = xno; then with_no_leaks=yes; else with_no_leaks=no; fi

-echo "$as_me:22562: result: $with_no_leaks" >&5
+echo "$as_me:22624: result: $with_no_leaks" >&5

 echo "${ECHO_T}$with_no_leaks" >&6
 
 if test "$enable_leaks" = no ; then
 echo "${ECHO_T}$with_no_leaks" >&6
 
 if test "$enable_leaks" = no ; then


@@ -22577,7 +22639,7 @@ fi
 LD_RPATH_OPT=
 if test "x$cf_cv_enable_rpath" != xno
 then
 LD_RPATH_OPT=
 if test "x$cf_cv_enable_rpath" != xno
 then

-       echo "$as_me:22580: checking for an rpath option" >&5
+       echo "$as_me:22642: checking for an rpath option" >&5

 echo $ECHO_N "checking for an rpath option... $ECHO_C" >&6
        case "$cf_cv_system_name" in
        (irix*)
 echo $ECHO_N "checking for an rpath option... $ECHO_C" >&6
        case "$cf_cv_system_name" in
        (irix*)


@@ -22608,12 +22670,12 @@ echo $ECHO_N "checking for an rpath option... $ECHO_C" >&6
        (*)
                ;;
        esac
        (*)
                ;;
        esac

-       echo "$as_me:22611: result: $LD_RPATH_OPT" >&5
+       echo "$as_me:22673: result: $LD_RPATH_OPT" >&5

 echo "${ECHO_T}$LD_RPATH_OPT" >&6
 
        case "x$LD_RPATH_OPT" in
        (x-R*)
 echo "${ECHO_T}$LD_RPATH_OPT" >&6
 
        case "x$LD_RPATH_OPT" in
        (x-R*)

-               echo "$as_me:22616: checking if we need a space after rpath option" >&5
+               echo "$as_me:22678: 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"
 
 echo $ECHO_N "checking if we need a space after rpath option... $ECHO_C" >&6
                cf_save_LIBS="$LIBS"
 


@@ -22634,7 +22696,7 @@ done
 LIBS="$cf_add_libs"
 
                cat >"conftest.$ac_ext" <<_ACEOF
 LIBS="$cf_add_libs"
 
                cat >"conftest.$ac_ext" <<_ACEOF

-#line 22637 "configure"
+#line 22699 "configure"

 #include "confdefs.h"
 
 int
 #include "confdefs.h"
 
 int


@@ -22646,16 +22708,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"

-if { (eval echo "$as_me:22649: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22711: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:22652: \$? = $ac_status" >&5
+  echo "$as_me:22714: \$? = $ac_status" >&5

   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'

-  { (eval echo "$as_me:22655: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22717: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:22658: \$? = $ac_status" >&5
+  echo "$as_me:22720: \$? = $ac_status" >&5

   (exit "$ac_status"); }; }; then
   cf_rpath_space=no
 else
   (exit "$ac_status"); }; }; then
   cf_rpath_space=no
 else


@@ -22665,14 +22727,14 @@ cf_rpath_space=yes
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
                LIBS="$cf_save_LIBS"
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
                LIBS="$cf_save_LIBS"

-               echo "$as_me:22668: result: $cf_rpath_space" >&5
+               echo "$as_me:22730: result: $cf_rpath_space" >&5

 echo "${ECHO_T}$cf_rpath_space" >&6
                test "$cf_rpath_space" = yes && LD_RPATH_OPT="$LD_RPATH_OPT "
                ;;
        esac
 fi
 
 echo "${ECHO_T}$cf_rpath_space" >&6
                test "$cf_rpath_space" = yes && LD_RPATH_OPT="$LD_RPATH_OPT "
                ;;
        esac
 fi
 

-echo "$as_me:22675: checking if rpath-hack should be disabled" >&5
+echo "$as_me:22737: 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.
 echo $ECHO_N "checking if rpath-hack should be disabled... $ECHO_C" >&6
 
 # Check whether --enable-rpath-hack or --disable-rpath-hack was given.


@@ -22690,22 +22752,22 @@ else
 
 fi;
 if test "x$enable_rpath_hack" = xno; then cf_disable_rpath_hack=yes; else cf_disable_rpath_hack=no; fi
 
 fi;
 if test "x$enable_rpath_hack" = xno; then cf_disable_rpath_hack=yes; else cf_disable_rpath_hack=no; fi

-echo "$as_me:22693: result: $cf_disable_rpath_hack" >&5
+echo "$as_me:22755: result: $cf_disable_rpath_hack" >&5

 echo "${ECHO_T}$cf_disable_rpath_hack" >&6
 
 if test "$enable_rpath_hack" = yes ; then
 
 echo "${ECHO_T}$cf_disable_rpath_hack" >&6
 
 if test "$enable_rpath_hack" = yes ; then
 

-echo "$as_me:22698: checking for updated LDFLAGS" >&5
+echo "$as_me:22760: checking for updated LDFLAGS" >&5

 echo $ECHO_N "checking for updated LDFLAGS... $ECHO_C" >&6
 if test -n "$LD_RPATH_OPT" ; then
 echo $ECHO_N "checking for updated LDFLAGS... $ECHO_C" >&6
 if test -n "$LD_RPATH_OPT" ; then

-       echo "$as_me:22701: result: maybe" >&5
+       echo "$as_me:22763: 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 "${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:22708: checking for $ac_word" >&5
+echo "$as_me:22770: 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
 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


@@ -22720,7 +22782,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_cf_ldd_prog="$ac_prog"
   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:22723: found $ac_dir/$ac_word" >&5
+echo "$as_me:22785: found $ac_dir/$ac_word" >&5

 break
 done
 
 break
 done
 


@@ -22728,10 +22790,10 @@ fi
 fi
 cf_ldd_prog=$ac_cv_prog_cf_ldd_prog
 if test -n "$cf_ldd_prog"; then
 fi
 cf_ldd_prog=$ac_cv_prog_cf_ldd_prog
 if test -n "$cf_ldd_prog"; then

-  echo "$as_me:22731: result: $cf_ldd_prog" >&5
+  echo "$as_me:22793: result: $cf_ldd_prog" >&5

 echo "${ECHO_T}$cf_ldd_prog" >&6
 else
 echo "${ECHO_T}$cf_ldd_prog" >&6
 else

-  echo "$as_me:22734: result: no" >&5
+  echo "$as_me:22796: result: no" >&5

 echo "${ECHO_T}no" >&6
 fi
 
 echo "${ECHO_T}no" >&6
 fi
 


@@ -22745,7 +22807,7 @@ test -n "$cf_ldd_prog" || cf_ldd_prog="no"
                cf_rpath_oops=
 
 cat >"conftest.$ac_ext" <<_ACEOF
                cf_rpath_oops=
 
 cat >"conftest.$ac_ext" <<_ACEOF

-#line 22748 "configure"
+#line 22810 "configure"

 #include "confdefs.h"
 #include <stdio.h>
 int
 #include "confdefs.h"
 #include <stdio.h>
 int


@@ -22757,16 +22819,16 @@ printf("Hello");
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"

-if { (eval echo "$as_me:22760: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22822: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:22763: \$? = $ac_status" >&5
+  echo "$as_me:22825: \$? = $ac_status" >&5

   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'

-  { (eval echo "$as_me:22766: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22828: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:22769: \$? = $ac_status" >&5
+  echo "$as_me:22831: \$? = $ac_status" >&5

   (exit "$ac_status"); }; }; then
   cf_rpath_oops=`"$cf_ldd_prog" "conftest$ac_exeext" | ${FGREP-fgrep} ' not found' | sed -e 's% =>.*$%%' |sort | uniq`
                 cf_rpath_list=`"$cf_ldd_prog" "conftest$ac_exeext" | ${FGREP-fgrep} / | sed -e 's%^.*[         ]/%/%' -e 's%/[^/][^/]*$%%' |sort | uniq`
   (exit "$ac_status"); }; }; then
   cf_rpath_oops=`"$cf_ldd_prog" "conftest$ac_exeext" | ${FGREP-fgrep} ' not found' | sed -e 's% =>.*$%%' |sort | uniq`
                 cf_rpath_list=`"$cf_ldd_prog" "conftest$ac_exeext" | ${FGREP-fgrep} / | sed -e 's%^.*[         ]/%/%' -e 's%/[^/][^/]*$%%' |sort | uniq`


@@ -22794,7 +22856,7 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
                                        then
                                                test -n "$verbose" && echo "    ...adding -L$cf_rpath_dir/lib to LDFLAGS for $cf_rpath_src" 1>&6
 
                                        then
                                                test -n "$verbose" && echo "    ...adding -L$cf_rpath_dir/lib to LDFLAGS for $cf_rpath_src" 1>&6
 

-echo "${as_me:-configure}:22797: testing ...adding -L$cf_rpath_dir/lib to LDFLAGS for $cf_rpath_src ..." 1>&5
+echo "${as_me:-configure}:22859: testing ...adding -L$cf_rpath_dir/lib to LDFLAGS for $cf_rpath_src ..." 1>&5

 
                                                LDFLAGS="$LDFLAGS -L$cf_rpath_dir/lib"
                                                break
 
                                                LDFLAGS="$LDFLAGS -L$cf_rpath_dir/lib"
                                                break


@@ -22806,11 +22868,11 @@ echo "${as_me:-configure}:22797: testing ...adding -L$cf_rpath_dir/lib to LDFLAG
 
        test -n "$verbose" && echo "    ...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS" 1>&6
 
 
        test -n "$verbose" && echo "    ...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS" 1>&6
 

-echo "${as_me:-configure}:22809: testing ...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
+echo "${as_me:-configure}:22871: testing ...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5

 
 test -n "$verbose" && echo "   ...checking LDFLAGS $LDFLAGS" 1>&6
 
 
 test -n "$verbose" && echo "   ...checking LDFLAGS $LDFLAGS" 1>&6
 

-echo "${as_me:-configure}:22813: testing ...checking LDFLAGS $LDFLAGS ..." 1>&5
+echo "${as_me:-configure}:22875: testing ...checking LDFLAGS $LDFLAGS ..." 1>&5

 
 cf_rpath_dst=
 for cf_rpath_src in $LDFLAGS
 
 cf_rpath_dst=
 for cf_rpath_src in $LDFLAGS


@@ -22847,7 +22909,7 @@ do
                        then
                                test -n "$verbose" && echo "    ...Filter $cf_rpath_src ->$cf_rpath_tmp" 1>&6
 
                        then
                                test -n "$verbose" && echo "    ...Filter $cf_rpath_src ->$cf_rpath_tmp" 1>&6
 

-echo "${as_me:-configure}:22850: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
+echo "${as_me:-configure}:22912: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5

 
                                EXTRA_LDFLAGS="$cf_rpath_tmp $EXTRA_LDFLAGS"
                        fi
 
                                EXTRA_LDFLAGS="$cf_rpath_tmp $EXTRA_LDFLAGS"
                        fi


@@ -22860,11 +22922,11 @@ LDFLAGS=$cf_rpath_dst
 
 test -n "$verbose" && echo "   ...checked LDFLAGS $LDFLAGS" 1>&6
 
 
 test -n "$verbose" && echo "   ...checked LDFLAGS $LDFLAGS" 1>&6
 

-echo "${as_me:-configure}:22863: testing ...checked LDFLAGS $LDFLAGS ..." 1>&5
+echo "${as_me:-configure}:22925: testing ...checked LDFLAGS $LDFLAGS ..." 1>&5

 
 test -n "$verbose" && echo "   ...checking LIBS $LIBS" 1>&6
 
 
 test -n "$verbose" && echo "   ...checking LIBS $LIBS" 1>&6
 

-echo "${as_me:-configure}:22867: testing ...checking LIBS $LIBS ..." 1>&5
+echo "${as_me:-configure}:22929: testing ...checking LIBS $LIBS ..." 1>&5

 
 cf_rpath_dst=
 for cf_rpath_src in $LIBS
 
 cf_rpath_dst=
 for cf_rpath_src in $LIBS


@@ -22901,7 +22963,7 @@ do
                        then
                                test -n "$verbose" && echo "    ...Filter $cf_rpath_src ->$cf_rpath_tmp" 1>&6
 
                        then
                                test -n "$verbose" && echo "    ...Filter $cf_rpath_src ->$cf_rpath_tmp" 1>&6
 

-echo "${as_me:-configure}:22904: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
+echo "${as_me:-configure}:22966: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5

 
                                EXTRA_LDFLAGS="$cf_rpath_tmp $EXTRA_LDFLAGS"
                        fi
 
                                EXTRA_LDFLAGS="$cf_rpath_tmp $EXTRA_LDFLAGS"
                        fi


@@ -22914,14 +22976,14 @@ LIBS=$cf_rpath_dst
 
 test -n "$verbose" && echo "   ...checked LIBS $LIBS" 1>&6
 
 
 test -n "$verbose" && echo "   ...checked LIBS $LIBS" 1>&6
 

-echo "${as_me:-configure}:22917: testing ...checked LIBS $LIBS ..." 1>&5
+echo "${as_me:-configure}:22979: testing ...checked LIBS $LIBS ..." 1>&5

 
        test -n "$verbose" && echo "    ...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS" 1>&6
 
 
        test -n "$verbose" && echo "    ...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS" 1>&6
 

-echo "${as_me:-configure}:22921: testing ...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
+echo "${as_me:-configure}:22983: testing ...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5

 
 else
 
 else

-       echo "$as_me:22924: result: no" >&5
+       echo "$as_me:22986: result: no" >&5

 echo "${ECHO_T}no" >&6
 fi
 
 echo "${ECHO_T}no" >&6
 fi
 


@@ -23011,7 +23073,7 @@ DEFS=-DHAVE_CONFIG_H
 : "${CONFIG_STATUS=./config.status}"
 ac_clean_files_save=$ac_clean_files
 ac_clean_files="$ac_clean_files $CONFIG_STATUS"
 : "${CONFIG_STATUS=./config.status}"
 ac_clean_files_save=$ac_clean_files
 ac_clean_files="$ac_clean_files $CONFIG_STATUS"

-{ echo "$as_me:23014: creating $CONFIG_STATUS" >&5
+{ echo "$as_me:23076: creating $CONFIG_STATUS" >&5

 echo "$as_me: creating $CONFIG_STATUS" >&6;}
 cat >"$CONFIG_STATUS" <<_ACEOF
 #! $SHELL
 echo "$as_me: creating $CONFIG_STATUS" >&6;}
 cat >"$CONFIG_STATUS" <<_ACEOF
 #! $SHELL


@@ -23145,7 +23207,7 @@ EOF
 cat >>"$CONFIG_STATUS" <<EOF
 ac_cs_version="\\
 config.status
 cat >>"$CONFIG_STATUS" <<EOF
 ac_cs_version="\\
 config.status

-configured by $0, generated by GNU Autoconf 2.52.20210105,
+configured by $0, generated by GNU Autoconf 2.52.20210509,

   with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
 
 Copyright 2003-2020,2021       Thomas E. Dickey
   with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
 
 Copyright 2003-2020,2021       Thomas E. Dickey


@@ -23190,7 +23252,7 @@ cat >>"$CONFIG_STATUS" <<\EOF
     echo "$ac_cs_version"; exit 0 ;;
   --he | --h)
     # Conflict between --help and --header
     echo "$ac_cs_version"; exit 0 ;;
   --he | --h)
     # Conflict between --help and --header

-    { { echo "$as_me:23193: error: ambiguous option: $1
+    { { echo "$as_me:23255: 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;}
 Try \`$0 --help' for more information." >&5
 echo "$as_me: error: ambiguous option: $1
 Try \`$0 --help' for more information." >&2;}


@@ -23209,7 +23271,7 @@ Try \`$0 --help' for more information." >&2;}
     ac_need_defaults=false;;
 
   # This is an error.
     ac_need_defaults=false;;
 
   # This is an error.

-  -*) { { echo "$as_me:23212: error: unrecognized option: $1
+  -*) { { echo "$as_me:23274: 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;}
 Try \`$0 --help' for more information." >&5
 echo "$as_me: error: unrecognized option: $1
 Try \`$0 --help' for more information." >&2;}


@@ -23228,7 +23290,7 @@ cat >&5 << _ACEOF
 ## Running config.status.  ##
 ## ----------------------- ##
 
 ## Running config.status.  ##
 ## ----------------------- ##
 

-This file was extended by $as_me 2.52.20210105, executed with
+This file was extended by $as_me 2.52.20210509, executed with

   CONFIG_FILES    = $CONFIG_FILES
   CONFIG_HEADERS  = $CONFIG_HEADERS
   CONFIG_LINKS    = $CONFIG_LINKS
   CONFIG_FILES    = $CONFIG_FILES
   CONFIG_HEADERS  = $CONFIG_HEADERS
   CONFIG_LINKS    = $CONFIG_LINKS


@@ -23259,7 +23321,7 @@ do
   "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" ;;
   "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:23262: error: invalid argument: $ac_config_target" >&5
+  *) { { echo "$as_me:23324: error: invalid argument: $ac_config_target" >&5

 echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
    { (exit 1); exit 1; }; };;
   esac
 echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
    { (exit 1); exit 1; }; };;
   esac


@@ -23563,7 +23625,7 @@ done; }
   esac
 
   if test x"$ac_file" != x-; then
   esac
 
   if test x"$ac_file" != x-; then

-    { echo "$as_me:23566: creating $ac_file" >&5
+    { echo "$as_me:23628: creating $ac_file" >&5

 echo "$as_me: creating $ac_file" >&6;}
     rm -f "$ac_file"
   fi
 echo "$as_me: creating $ac_file" >&6;}
     rm -f "$ac_file"
   fi


@@ -23581,7 +23643,7 @@ echo "$as_me: creating $ac_file" >&6;}
       -) echo $tmp/stdin ;;
       [\\/$]*)
          # Absolute (can't be DOS-style, as IFS=:)
       -) echo $tmp/stdin ;;
       [\\/$]*)
          # Absolute (can't be DOS-style, as IFS=:)

-         test -f "$f" || { { echo "$as_me:23584: error: cannot find input file: $f" >&5
+         test -f "$f" || { { echo "$as_me:23646: error: cannot find input file: $f" >&5

 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          echo $f;;
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          echo $f;;


@@ -23594,7 +23656,7 @@ echo "$as_me: error: cannot find input file: $f" >&2;}
            echo "$srcdir/$f"
          else
            # /dev/null tree
            echo "$srcdir/$f"
          else
            # /dev/null tree

-           { { echo "$as_me:23597: error: cannot find input file: $f" >&5
+           { { echo "$as_me:23659: error: cannot find input file: $f" >&5

 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          fi;;
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          fi;;


@@ -23610,7 +23672,7 @@ cat >>"$CONFIG_STATUS" <<\EOF
       if test -n "$ac_seen"; then
         ac_used=`grep '@datarootdir@' "$ac_item"`
         if test -z "$ac_used"; then
       if test -n "$ac_seen"; then
         ac_used=`grep '@datarootdir@' "$ac_item"`
         if test -z "$ac_used"; then

-          { echo "$as_me:23613: WARNING: datarootdir was used implicitly but not set:
+          { echo "$as_me:23675: 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;}
 $ac_seen" >&5
 echo "$as_me: WARNING: datarootdir was used implicitly but not set:
 $ac_seen" >&2;}


@@ -23619,7 +23681,7 @@ $ac_seen" >&2;}
       fi
       ac_seen=`grep '${datarootdir}' "$ac_item"`
       if test -n "$ac_seen"; then
       fi
       ac_seen=`grep '${datarootdir}' "$ac_item"`
       if test -n "$ac_seen"; then

-        { echo "$as_me:23622: WARNING: datarootdir was used explicitly but not set:
+        { echo "$as_me:23684: 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;}
 $ac_seen" >&5
 echo "$as_me: WARNING: datarootdir was used explicitly but not set:
 $ac_seen" >&2;}


@@ -23656,7 +23718,7 @@ s,@INSTALL@,$ac_INSTALL,;t t
             ac_init=`${EGREP-egrep} '[         ]*'$ac_name'[   ]*=' "$ac_file"`
             if test -z "$ac_init"; then
               ac_seen=`echo "$ac_seen" |sed -e 's,^,'$ac_file':,'`
             ac_init=`${EGREP-egrep} '[         ]*'$ac_name'[   ]*=' "$ac_file"`
             if test -z "$ac_init"; then
               ac_seen=`echo "$ac_seen" |sed -e 's,^,'$ac_file':,'`

-              { echo "$as_me:23659: WARNING: Variable $ac_name is used but was not set:
+              { echo "$as_me:23721: 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;}
 $ac_seen" >&5
 echo "$as_me: WARNING: Variable $ac_name is used but was not set:
 $ac_seen" >&2;}


@@ -23667,7 +23729,7 @@ $ac_seen" >&2;}
     ${EGREP-egrep} -n '@[A-Z_][A-Z_0-9]+@' "$ac_file" >>$tmp/out
     if test -s $tmp/out; then
       ac_seen=`sed -e 's,^,'$ac_file':,' < $tmp/out`
     ${EGREP-egrep} -n '@[A-Z_][A-Z_0-9]+@' "$ac_file" >>$tmp/out
     if test -s $tmp/out; then
       ac_seen=`sed -e 's,^,'$ac_file':,' < $tmp/out`

-      { echo "$as_me:23670: WARNING: Some variables may not be substituted:
+      { echo "$as_me:23732: WARNING: Some variables may not be substituted:

 $ac_seen" >&5
 echo "$as_me: WARNING: Some variables may not be substituted:
 $ac_seen" >&2;}
 $ac_seen" >&5
 echo "$as_me: WARNING: Some variables may not be substituted:
 $ac_seen" >&2;}


@@ -23716,7 +23778,7 @@ for ac_file in : $CONFIG_HEADERS; do test "x$ac_file" = x: && continue
   * )   ac_file_in=$ac_file.in ;;
   esac
 
   * )   ac_file_in=$ac_file.in ;;
   esac
 

-  test x"$ac_file" != x- && { echo "$as_me:23719: creating $ac_file" >&5
+  test x"$ac_file" != x- && { echo "$as_me:23781: creating $ac_file" >&5

 echo "$as_me: creating $ac_file" >&6;}
 
   # First look for the input files in the build tree, otherwise in the
 echo "$as_me: creating $ac_file" >&6;}
 
   # First look for the input files in the build tree, otherwise in the


@@ -23727,7 +23789,7 @@ echo "$as_me: creating $ac_file" >&6;}
       -) echo $tmp/stdin ;;
       [\\/$]*)
          # Absolute (can't be DOS-style, as IFS=:)
       -) echo $tmp/stdin ;;
       [\\/$]*)
          # Absolute (can't be DOS-style, as IFS=:)

-         test -f "$f" || { { echo "$as_me:23730: error: cannot find input file: $f" >&5
+         test -f "$f" || { { echo "$as_me:23792: error: cannot find input file: $f" >&5

 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          echo $f;;
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          echo $f;;


@@ -23740,7 +23802,7 @@ echo "$as_me: error: cannot find input file: $f" >&2;}
            echo "$srcdir/$f"
          else
            # /dev/null tree
            echo "$srcdir/$f"
          else
            # /dev/null tree

-           { { echo "$as_me:23743: error: cannot find input file: $f" >&5
+           { { echo "$as_me:23805: error: cannot find input file: $f" >&5

 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          fi;;
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          fi;;


@@ -23798,7 +23860,7 @@ cat >>"$CONFIG_STATUS" <<\EOF
   rm -f $tmp/in
   if test x"$ac_file" != x-; then
     if cmp -s "$ac_file" "$tmp/config.h" 2>/dev/null; then
   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:23801: $ac_file is unchanged" >&5
+      { echo "$as_me:23863: $ac_file is unchanged" >&5

 echo "$as_me: $ac_file is unchanged" >&6;}
     else
       ac_dir=`$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
 echo "$as_me: $ac_file is unchanged" >&6;}
     else
       ac_dir=`$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \

diff --git a/test/ncurses.c b/test/ncurses.c
index 966c76afa3b5ab81bd3a82fba833eee13c497513..fd1dcd3b35fe8f555be5b832e629c880074a8cbf 100644 (file)
--- a/test/ncurses.c
+++ b/test/ncurses.c
@@ -41,7 +41,7 @@ AUTHOR
    Author: Eric S. Raymond <esr@snark.thyrsus.com> 1993
            Thomas E. Dickey (beginning revision 1.27 in 1996).
 
    Author: Eric S. Raymond <esr@snark.thyrsus.com> 1993
            Thomas E. Dickey (beginning revision 1.27 in 1996).
 

-$Id: ncurses.c,v 1.525 2021/05/08 19:44:31 tom Exp $
+$Id: ncurses.c,v 1.526 2021/05/22 19:45:57 tom Exp $

 
 ***************************************************************************/
 
 
 ***************************************************************************/
 


@@ -855,7 +855,7 @@ wgetch_test(unsigned level, WINDOW *win, int delay)
            setup_getch(win, flags);
            wgetch_help(win, flags);
        } else if (c == 'g') {
            setup_getch(win, flags);
            wgetch_help(win, flags);
        } else if (c == 'g') {

-           waddstr(win, "getstr test: ");
+           waddstr(win, "wgetnstr test: ");

            echo();
            c = wgetnstr(win, buf, sizeof(buf) - 1);
            noecho();
            echo();
            c = wgetnstr(win, buf, sizeof(buf) - 1);
            noecho();


@@ -1113,7 +1113,7 @@ wget_wch_test(unsigned level, WINDOW *win, int delay)
            setup_getch(win, flags);
            wgetch_help(win, flags);
        } else if (c == 'g') {
            setup_getch(win, flags);
            wgetch_help(win, flags);
        } else if (c == 'g') {

-           waddstr(win, "getstr test: ");
+           waddstr(win, "wgetn_str test: ");

            echo();
            code = wgetn_wstr(win, wint_buf, BUFSIZ - 1);
            noecho();
            echo();
            code = wgetn_wstr(win, wint_buf, BUFSIZ - 1);
            noecho();