ncurses 5.9 - patch 20110807

+ improve rpath fix from 20110730 by ensuring that the new $RPATH_LIST
  variable is defined in the makefiles which use it.
+ build-fix for DragonFlyBSD's pkgsrc in test/configure script.
+ build-fixes for NetBSD 5.1 with termcap support enabled.
+ corrected k9 in dg460-ansi, add other features based on manuals -TD
+ improve trimming of whitespace at the end of terminfo/termcap output
  from tic/infocmp.
+ when writing termcap source, ensure that colons in the description
  field are translated to a non-delimiter, i.e., "=".
+ add "-0" option to tic/infocmp, to make the termcap/terminfo source
  use a single line.
+ add a null-pointer check when handling the $CC variable.

diff --git a/Ada95/aclocal.m4 b/Ada95/aclocal.m4
index 6be9319f3fe1aaeb99800d5340d56ff87df557af..1897730a169258c4479dab504c293a434aad09cb 100644 (file)
--- a/Ada95/aclocal.m4
+++ b/Ada95/aclocal.m4
@@ -28,7 +28,7 @@ dnl***************************************************************************
 dnl
 dnl Author: Thomas E. Dickey
 dnl
 dnl
 dnl Author: Thomas E. Dickey
 dnl

-dnl $Id: aclocal.m4,v 1.35 2011/07/30 23:33:10 tom Exp $
+dnl $Id: aclocal.m4,v 1.36 2011/08/07 00:41:53 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


@@ -673,7 +673,7 @@ dnl ----------
 dnl "dirname" is not portable, so we fake it with a shell script.
 AC_DEFUN([CF_DIRNAME],[$1=`echo $2 | sed -e 's%/[[^/]]*$%%'`])dnl
 dnl ---------------------------------------------------------------------------
 dnl "dirname" is not portable, so we fake it with a shell script.
 AC_DEFUN([CF_DIRNAME],[$1=`echo $2 | sed -e 's%/[[^/]]*$%%'`])dnl
 dnl ---------------------------------------------------------------------------

-dnl CF_ENABLE_PC_FILES version: 3 updated: 2011/07/16 20:37:23
+dnl CF_ENABLE_PC_FILES version: 4 updated: 2011/08/06 20:32:05

 dnl ------------------
 dnl This is the "--enable-pc-files" option, which is available if there is a
 dnl pkg-config configuration on the local machine.
 dnl ------------------
 dnl This is the "--enable-pc-files" option, which is available if there is a
 dnl pkg-config configuration on the local machine.


@@ -701,7 +701,7 @@ if test "$PKG_CONFIG" != no ; then
                fi
                if test -z "$PKG_CONFIG_LIBDIR" ; then
                        cf_path=`echo "$PKG_CONFIG" | sed -e 's,/[[^/]]*/[[^/]]*$,,'`
                fi
                if test -z "$PKG_CONFIG_LIBDIR" ; then
                        cf_path=`echo "$PKG_CONFIG" | sed -e 's,/[[^/]]*/[[^/]]*$,,'`

-                       case x`arch 2>/dev/null` in #(vi
+                       case x`(arch) 2>/dev/null` in #(vi

                        *64) #(vi
                                for cf_config in $cf_path/lib64 $cf_path/lib32 $cf_path/lib
                                do
                        *64) #(vi
                                for cf_config in $cf_path/lib64 $cf_path/lib32 $cf_path/lib
                                do


@@ -3599,7 +3599,7 @@ if test "$with_pthread" != no ; then
 fi
 ])
 dnl ---------------------------------------------------------------------------
 fi
 ])
 dnl ---------------------------------------------------------------------------

-dnl CF_XOPEN_SOURCE version: 36 updated: 2011/07/02 15:36:04
+dnl CF_XOPEN_SOURCE version: 37 updated: 2011/08/06 20:32:05

 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,


@@ -3651,7 +3651,7 @@ mirbsd*) #(vi
        # setting _XOPEN_SOURCE or _POSIX_SOURCE breaks <arpa/inet.h>
        ;;
 netbsd*) #(vi
        # setting _XOPEN_SOURCE or _POSIX_SOURCE breaks <arpa/inet.h>
        ;;
 netbsd*) #(vi

-       # setting _XOPEN_SOURCE breaks IPv6 for lynx on NetBSD 1.6, breaks xterm, is not needed for ncursesw
+       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*) #(vi
        # setting _XOPEN_SOURCE breaks xterm on OpenBSD 2.8, is not needed for ncursesw
        ;;
 openbsd*) #(vi
        # setting _XOPEN_SOURCE breaks xterm on OpenBSD 2.8, is not needed for ncursesw

diff --git a/Ada95/configure b/Ada95/configure
index 3d9dd78cfe2d935c22e6cb2396878170ba97e865..517896ced54f4f969476344084eda19c5e36c5e5 100644 (file)
--- a/Ada95/configure
+++ b/Ada95/configure
@@ -2962,7 +2962,7 @@ echo $ECHO_N "checking if we should install .pc files for $PKG_CONFIG... $ECHO_C
                fi
                if test -z "$PKG_CONFIG_LIBDIR" ; then
                        cf_path=`echo "$PKG_CONFIG" | sed -e 's,/[^/]*/[^/]*$,,'`
                fi
                if test -z "$PKG_CONFIG_LIBDIR" ; then
                        cf_path=`echo "$PKG_CONFIG" | sed -e 's,/[^/]*/[^/]*$,,'`

-                       case x`arch 2>/dev/null` in #(vi
+                       case x`(arch) 2>/dev/null` in #(vi

                        *64) #(vi
                                for cf_config in $cf_path/lib64 $cf_path/lib32 $cf_path/lib
                                do
                        *64) #(vi
                                for cf_config in $cf_path/lib64 $cf_path/lib32 $cf_path/lib
                                do


@@ -8098,7 +8098,7 @@ mirbsd*) #(vi
        # setting _XOPEN_SOURCE or _POSIX_SOURCE breaks <arpa/inet.h>
        ;;
 netbsd*) #(vi
        # setting _XOPEN_SOURCE or _POSIX_SOURCE breaks <arpa/inet.h>
        ;;
 netbsd*) #(vi

-       # setting _XOPEN_SOURCE breaks IPv6 for lynx on NetBSD 1.6, breaks xterm, is not needed for ncursesw
+       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*) #(vi
        # setting _XOPEN_SOURCE breaks xterm on OpenBSD 2.8, is not needed for ncursesw
        ;;
 openbsd*) #(vi
        # setting _XOPEN_SOURCE breaks xterm on OpenBSD 2.8, is not needed for ncursesw

diff --git a/Makefile.in b/Makefile.in
index d891e002fd83729b066090e685fb6762db01a7ea..b99d35e55d94733bcb2703316cee6c53561f4d5b 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,4 +1,4 @@
-# $Id: Makefile.in,v 1.30 2010/11/27 21:45:27 tom Exp $
+# $Id: Makefile.in,v 1.31 2011/08/07 15:36:52 tom Exp $

 ##############################################################################
 # Copyright (c) 1998-2008,2010 Free Software Foundation, Inc.                #
 #                                                                            #
 ##############################################################################
 # Copyright (c) 1998-2008,2010 Free Software Foundation, Inc.                #
 #                                                                            #


@@ -35,7 +35,8 @@ SHELL = /bin/sh
 VPATH          = @srcdir@
 
 DESTDIR=@DESTDIR@
 VPATH          = @srcdir@
 
 DESTDIR=@DESTDIR@

-CF_MFLAGS = @cf_cv_makeflags@ DESTDIR="$(DESTDIR)"
+RPATH_LIST=@RPATH_LIST@
+CF_MFLAGS = @cf_cv_makeflags@ DESTDIR="$(DESTDIR)" RPATH_LIST="$(RPATH_LIST)"

 
 @SET_MAKE@
 
 
 @SET_MAKE@
 

diff --git a/NEWS b/NEWS
index a054641523923bc7a7c8576247e601bd2ff8d834..694352d3a417dedc08ec76af185ce6ca45c9d4f7 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -25,7 +25,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.1755 2011/07/30 22:57:54 tom Exp $
+-- $Id: NEWS,v 1.1762 2011/08/07 15:45:26 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


@@ -45,6 +45,20 @@ 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.
 

+20110807
+       + improve rpath fix from 20110730 by ensuring that the new $RPATH_LIST
+         variable is defined in the makefiles which use it.
+       + build-fix for DragonFlyBSD's pkgsrc in test/configure script.
+       + build-fixes for NetBSD 5.1 with termcap support enabled.
+       + corrected k9 in dg460-ansi, add other features based on manuals -TD
+       + improve trimming of whitespace at the end of terminfo/termcap output
+         from tic/infocmp.
+       + when writing termcap source, ensure that colons in the description
+         field are translated to a non-delimiter, i.e., "=".
+       + add "-0" option to tic/infocmp, to make the termcap/terminfo source
+         use a single line.
+       + add a null-pointer check when handling the $CC variable.
+

 20110730
        + modify configure script and makefiles in c++ and progs to allow the
          directory used for rpath option to be overridden, e.g., to work
 20110730
        + modify configure script and makefiles in c++ and progs to allow the
          directory used for rpath option to be overridden, e.g., to work

diff --git a/aclocal.m4 b/aclocal.m4
index ce5aa01b617e966d94511468ad667172a1e69537..682d180b9e69194913eb7042b36c8324347430a6 100644 (file)
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -28,7 +28,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.564 2011/07/30 23:32:32 tom Exp $
+dnl $Id: aclocal.m4,v 1.566 2011/08/07 18:55:48 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


@@ -795,27 +795,48 @@ AC_MSG_RESULT($includedir)
 fi
 ])dnl
 dnl ---------------------------------------------------------------------------
 fi
 ])dnl
 dnl ---------------------------------------------------------------------------

-dnl CF_CGETENT version: 3 updated: 2000/08/12 23:18:52
+dnl CF_CGETENT version: 4 updated: 2011/08/07 14:54:41

 dnl ----------
 dnl Check if the terminal-capability database functions are available.  If not,
 dnl ncurses has a much-reduced version.
 AC_DEFUN([CF_CGETENT],[
 dnl ----------
 dnl Check if the terminal-capability database functions are available.  If not,
 dnl ncurses has a much-reduced version.
 AC_DEFUN([CF_CGETENT],[

-AC_MSG_CHECKING(for terminal-capability database functions)
-AC_CACHE_VAL(cf_cv_cgetent,[
+AC_CACHE_CHECK(for terminal-capability database functions,cf_cv_cgetent,[

 AC_TRY_LINK([
 #include <stdlib.h>],[
        char temp[128];
        char *buf = temp;
        char *db_array = temp;
 AC_TRY_LINK([
 #include <stdlib.h>],[
        char temp[128];
        char *buf = temp;
        char *db_array = temp;

-       cgetent(&buf, /* int *, */ &db_array, "vt100");
+       cgetent(&buf, &db_array, "vt100");

        cgetcap(buf, "tc", '=');
        cgetmatch(buf, "tc");
        ],
        [cf_cv_cgetent=yes],
        [cf_cv_cgetent=no])
 ])
        cgetcap(buf, "tc", '=');
        cgetmatch(buf, "tc");
        ],
        [cf_cv_cgetent=yes],
        [cf_cv_cgetent=no])
 ])

-AC_MSG_RESULT($cf_cv_cgetent)
-test "$cf_cv_cgetent" = yes && AC_DEFINE(HAVE_BSD_CGETENT)
+
+if test "$cf_cv_cgetent" = yes
+then
+       AC_DEFINE(HAVE_BSD_CGETENT)
+AC_CACHE_CHECK(if cgetent uses const parameter,cf_cv_cgetent_const,[
+AC_TRY_LINK([
+#include <stdlib.h>],[
+       char temp[128];
+       char *buf = temp;
+#ifndef _NETBSD_SOURCE                 /* given, since April 2004 in stdlib.h */
+       const char *db_array = temp;
+       cgetent(&buf, &db_array, "vt100");
+#endif
+       cgetcap(buf, "tc", '=');
+       cgetmatch(buf, "tc");
+       ],
+       [cf_cv_cgetent_const=yes],
+       [cf_cv_cgetent_const=no])
+])
+       if test "$cf_cv_cgetent_const" = yes
+       then
+               AC_DEFINE_UNQUOTED(CGETENT_CONST,const)
+       fi
+fi

 ])dnl
 dnl ---------------------------------------------------------------------------
 dnl CF_CHECK_CACHE version: 11 updated: 2008/03/23 14:45:59
 ])dnl
 dnl ---------------------------------------------------------------------------
 dnl CF_CHECK_CACHE version: 11 updated: 2008/03/23 14:45:59


@@ -1169,7 +1190,7 @@ if test "$cf_disable_rpath_hack" = no ; then
 fi
 ])
 dnl ---------------------------------------------------------------------------
 fi
 ])
 dnl ---------------------------------------------------------------------------

-dnl CF_ENABLE_PC_FILES version: 3 updated: 2011/07/16 20:37:23
+dnl CF_ENABLE_PC_FILES version: 4 updated: 2011/08/06 20:32:05

 dnl ------------------
 dnl This is the "--enable-pc-files" option, which is available if there is a
 dnl pkg-config configuration on the local machine.
 dnl ------------------
 dnl This is the "--enable-pc-files" option, which is available if there is a
 dnl pkg-config configuration on the local machine.


@@ -1197,7 +1218,7 @@ if test "$PKG_CONFIG" != no ; then
                fi
                if test -z "$PKG_CONFIG_LIBDIR" ; then
                        cf_path=`echo "$PKG_CONFIG" | sed -e 's,/[[^/]]*/[[^/]]*$,,'`
                fi
                if test -z "$PKG_CONFIG_LIBDIR" ; then
                        cf_path=`echo "$PKG_CONFIG" | sed -e 's,/[[^/]]*/[[^/]]*$,,'`

-                       case x`arch 2>/dev/null` in #(vi
+                       case x`(arch) 2>/dev/null` in #(vi

                        *64) #(vi
                                for cf_config in $cf_path/lib64 $cf_path/lib32 $cf_path/lib
                                do
                        *64) #(vi
                                for cf_config in $cf_path/lib64 $cf_path/lib32 $cf_path/lib
                                do


@@ -6637,7 +6658,7 @@ CF_NO_LEAKS_OPTION(valgrind,
        [USE_VALGRIND])
 ])dnl
 dnl ---------------------------------------------------------------------------
        [USE_VALGRIND])
 ])dnl
 dnl ---------------------------------------------------------------------------

-dnl CF_XOPEN_SOURCE version: 36 updated: 2011/07/02 15:36:04
+dnl CF_XOPEN_SOURCE version: 37 updated: 2011/08/06 20:32:05

 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,


@@ -6689,7 +6710,7 @@ mirbsd*) #(vi
        # setting _XOPEN_SOURCE or _POSIX_SOURCE breaks <arpa/inet.h>
        ;;
 netbsd*) #(vi
        # setting _XOPEN_SOURCE or _POSIX_SOURCE breaks <arpa/inet.h>
        ;;
 netbsd*) #(vi

-       # setting _XOPEN_SOURCE breaks IPv6 for lynx on NetBSD 1.6, breaks xterm, is not needed for ncursesw
+       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*) #(vi
        # setting _XOPEN_SOURCE breaks xterm on OpenBSD 2.8, is not needed for ncursesw
        ;;
 openbsd*) #(vi
        # setting _XOPEN_SOURCE breaks xterm on OpenBSD 2.8, is not needed for ncursesw

diff --git a/configure b/configure
index 6c2197b0d3a46836ce66bfc886ed5e19070636ed..9083c71227b84edf0a8609b3be44ea5c62d27b74 100755 (executable)
--- a/configure
+++ b/configure
@@ -3744,7 +3744,7 @@ echo $ECHO_N "checking if we should install .pc files for $PKG_CONFIG... $ECHO_C
                fi
                if test -z "$PKG_CONFIG_LIBDIR" ; then
                        cf_path=`echo "$PKG_CONFIG" | sed -e 's,/[^/]*/[^/]*$,,'`
                fi
                if test -z "$PKG_CONFIG_LIBDIR" ; then
                        cf_path=`echo "$PKG_CONFIG" | sed -e 's,/[^/]*/[^/]*$,,'`

-                       case x`arch 2>/dev/null` in #(vi
+                       case x`(arch) 2>/dev/null` in #(vi

                        *64) #(vi
                                for cf_config in $cf_path/lib64 $cf_path/lib32 $cf_path/lib
                                do
                        *64) #(vi
                                for cf_config in $cf_path/lib64 $cf_path/lib32 $cf_path/lib
                                do


@@ -7231,7 +7231,7 @@ mirbsd*) #(vi
        # setting _XOPEN_SOURCE or _POSIX_SOURCE breaks <arpa/inet.h>
        ;;
 netbsd*) #(vi
        # setting _XOPEN_SOURCE or _POSIX_SOURCE breaks <arpa/inet.h>
        ;;
 netbsd*) #(vi

-       # setting _XOPEN_SOURCE breaks IPv6 for lynx on NetBSD 1.6, breaks xterm, is not needed for ncursesw
+       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*) #(vi
        # setting _XOPEN_SOURCE breaks xterm on OpenBSD 2.8, is not needed for ncursesw
        ;;
 openbsd*) #(vi
        # setting _XOPEN_SOURCE breaks xterm on OpenBSD 2.8, is not needed for ncursesw


@@ -14764,7 +14764,7 @@ main ()
        char temp[128];
        char *buf = temp;
        char *db_array = temp;
        char temp[128];
        char *buf = temp;
        char *db_array = temp;

-       cgetent(&buf, /* int *, */ &db_array, "vt100");
+       cgetent(&buf, &db_array, "vt100");

        cgetcap(buf, "tc", '=');
        cgetmatch(buf, "tc");
 
        cgetcap(buf, "tc", '=');
        cgetmatch(buf, "tc");
 


@@ -14793,23 +14793,85 @@ 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:14797: result: $cf_cv_cgetent" >&5
+echo "$as_me:14796: result: $cf_cv_cgetent" >&5

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

-test "$cf_cv_cgetent" = yes && cat >>confdefs.h <<\EOF
+
+if test "$cf_cv_cgetent" = yes
+then
+       cat >>confdefs.h <<\EOF

 #define HAVE_BSD_CGETENT 1
 EOF
 
 #define HAVE_BSD_CGETENT 1
 EOF
 

+echo "$as_me:14805: checking if cgetent uses const parameter" >&5
+echo $ECHO_N "checking if cgetent uses const parameter... $ECHO_C" >&6
+if test "${cf_cv_cgetent_const+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+
+cat >conftest.$ac_ext <<_ACEOF
+#line 14812 "configure"
+#include "confdefs.h"
+
+#include <stdlib.h>
+int
+main ()
+{
+
+       char temp[128];
+       char *buf = temp;
+#ifndef _NETBSD_SOURCE                 /* given, since April 2004 in stdlib.h */
+       const char *db_array = temp;
+       cgetent(&buf, &db_array, "vt100");
+#endif
+       cgetcap(buf, "tc", '=');
+       cgetmatch(buf, "tc");
+
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:14834: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:14837: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:14840: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:14843: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  cf_cv_cgetent_const=yes
+else
+  echo "$as_me: failed program was:" >&5
+cat conftest.$ac_ext >&5
+cf_cv_cgetent_const=no
+fi
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+
+fi
+echo "$as_me:14854: result: $cf_cv_cgetent_const" >&5
+echo "${ECHO_T}$cf_cv_cgetent_const" >&6
+       if test "$cf_cv_cgetent_const" = yes
+       then
+               cat >>confdefs.h <<EOF
+#define CGETENT_CONST const
+EOF
+
+       fi
+fi
+

 fi
 
 fi
 

-echo "$as_me:14805: checking for isascii" >&5
+echo "$as_me:14867: 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 14812 "configure"
+#line 14874 "configure"

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


@@ -14821,16 +14883,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:14824: \"$ac_link\"") >&5
+if { (eval echo "$as_me:14886: \"$ac_link\"") >&5

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

-  echo "$as_me:14827: \$? = $ac_status" >&5
+  echo "$as_me:14889: \$? = $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:14830: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14892: \"$ac_try\"") >&5

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

-  echo "$as_me:14833: \$? = $ac_status" >&5
+  echo "$as_me:14895: \$? = $ac_status" >&5

   (exit $ac_status); }; }; then
   cf_cv_have_isascii=yes
 else
   (exit $ac_status); }; }; then
   cf_cv_have_isascii=yes
 else


@@ -14841,17 +14903,17 @@ 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:14844: result: $cf_cv_have_isascii" >&5
+echo "$as_me:14906: result: $cf_cv_have_isascii" >&5

 echo "${ECHO_T}$cf_cv_have_isascii" >&6
 test "$cf_cv_have_isascii" = yes && cat >>confdefs.h <<\EOF
 #define HAVE_ISASCII 1
 EOF
 
 if test "$ac_cv_func_sigaction" = yes; then
 echo "${ECHO_T}$cf_cv_have_isascii" >&6
 test "$cf_cv_have_isascii" = yes && cat >>confdefs.h <<\EOF
 #define HAVE_ISASCII 1
 EOF
 
 if test "$ac_cv_func_sigaction" = yes; then

-echo "$as_me:14851: checking whether sigaction needs _POSIX_SOURCE" >&5
+echo "$as_me:14913: 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 14854 "configure"
+#line 14916 "configure"

 #include "confdefs.h"
 
 #include <sys/types.h>
 #include "confdefs.h"
 
 #include <sys/types.h>


@@ -14865,16 +14927,16 @@ struct sigaction act
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

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

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

-  echo "$as_me:14871: \$? = $ac_status" >&5
+  echo "$as_me:14933: \$? = $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:14874: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14936: \"$ac_try\"") >&5

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

-  echo "$as_me:14877: \$? = $ac_status" >&5
+  echo "$as_me:14939: \$? = $ac_status" >&5

   (exit $ac_status); }; }; then
   sigact_bad=no
 else
   (exit $ac_status); }; }; then
   sigact_bad=no
 else


@@ -14882,7 +14944,7 @@ else
 cat conftest.$ac_ext >&5
 
 cat >conftest.$ac_ext <<_ACEOF
 cat conftest.$ac_ext >&5
 
 cat >conftest.$ac_ext <<_ACEOF

-#line 14885 "configure"
+#line 14947 "configure"

 #include "confdefs.h"
 
 #define _POSIX_SOURCE
 #include "confdefs.h"
 
 #define _POSIX_SOURCE


@@ -14897,16 +14959,16 @@ struct sigaction act
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

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

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

-  echo "$as_me:14903: \$? = $ac_status" >&5
+  echo "$as_me:14965: \$? = $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:14906: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14968: \"$ac_try\"") >&5

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

-  echo "$as_me:14909: \$? = $ac_status" >&5
+  echo "$as_me:14971: \$? = $ac_status" >&5

   (exit $ac_status); }; }; then
   sigact_bad=yes
         cat >>confdefs.h <<\EOF
   (exit $ac_status); }; }; then
   sigact_bad=yes
         cat >>confdefs.h <<\EOF


@@ -14921,11 +14983,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:14924: result: $sigact_bad" >&5
+echo "$as_me:14986: result: $sigact_bad" >&5

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

-echo "$as_me:14928: checking if nanosleep really works" >&5
+echo "$as_me:14990: 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


@@ -14935,7 +14997,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 14938 "configure"
+#line 15000 "configure"

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


@@ -14960,15 +15022,15 @@ int main() {
 
 _ACEOF
 rm -f conftest$ac_exeext
 
 _ACEOF
 rm -f conftest$ac_exeext

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

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

-  echo "$as_me:14966: \$? = $ac_status" >&5
+  echo "$as_me:15028: \$? = $ac_status" >&5

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

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

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

-  echo "$as_me:14971: \$? = $ac_status" >&5
+  echo "$as_me:15033: \$? = $ac_status" >&5

   (exit $ac_status); }; }; then
   cf_cv_func_nanosleep=yes
 else
   (exit $ac_status); }; }; then
   cf_cv_func_nanosleep=yes
 else


@@ -14980,7 +15042,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:14983: result: $cf_cv_func_nanosleep" >&5
+echo "$as_me:15045: result: $cf_cv_func_nanosleep" >&5

 echo "${ECHO_T}$cf_cv_func_nanosleep" >&6
 
 test "$cf_cv_func_nanosleep" = "yes" && cat >>confdefs.h <<\EOF
 echo "${ECHO_T}$cf_cv_func_nanosleep" >&6
 
 test "$cf_cv_func_nanosleep" = "yes" && cat >>confdefs.h <<\EOF


@@ -14994,23 +15056,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:14997: checking for $ac_header" >&5
+echo "$as_me:15059: 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 15003 "configure"
+#line 15065 "configure"

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

-if { (eval echo "$as_me:15007: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:15069: \"$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:15013: \$? = $ac_status" >&5
+  echo "$as_me:15075: \$? = $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


@@ -15029,7 +15091,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
 fi
 rm -f conftest.err conftest.$ac_ext
 fi

-echo "$as_me:15032: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:15094: 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


@@ -15044,23 +15106,23 @@ if test "$ISC" = yes ; then
 for ac_header in sys/termio.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
 for ac_header in sys/termio.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`

-echo "$as_me:15047: checking for $ac_header" >&5
+echo "$as_me:15109: 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 15053 "configure"
+#line 15115 "configure"

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

-if { (eval echo "$as_me:15057: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:15119: \"$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:15063: \$? = $ac_status" >&5
+  echo "$as_me:15125: \$? = $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


@@ -15079,7 +15141,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
 fi
 rm -f conftest.err conftest.$ac_ext
 fi

-echo "$as_me:15082: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:15144: 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


@@ -15097,10 +15159,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:15100: checking whether termios.h needs _POSIX_SOURCE" >&5
+       echo "$as_me:15162: 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 15103 "configure"
+#line 15165 "configure"

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


@@ -15112,16 +15174,16 @@ struct termios foo; int x = foo.c_iflag
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

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

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

-  echo "$as_me:15118: \$? = $ac_status" >&5
+  echo "$as_me:15180: \$? = $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:15121: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15183: \"$ac_try\"") >&5

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

-  echo "$as_me:15124: \$? = $ac_status" >&5
+  echo "$as_me:15186: \$? = $ac_status" >&5

   (exit $ac_status); }; }; then
   termios_bad=no
 else
   (exit $ac_status); }; }; then
   termios_bad=no
 else


@@ -15129,7 +15191,7 @@ else
 cat conftest.$ac_ext >&5
 
                cat >conftest.$ac_ext <<_ACEOF
 cat conftest.$ac_ext >&5
 
                cat >conftest.$ac_ext <<_ACEOF

-#line 15132 "configure"
+#line 15194 "configure"

 #include "confdefs.h"
 
 #define _POSIX_SOURCE
 #include "confdefs.h"
 
 #define _POSIX_SOURCE


@@ -15143,16 +15205,16 @@ struct termios foo; int x = foo.c_iflag
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

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

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

-  echo "$as_me:15149: \$? = $ac_status" >&5
+  echo "$as_me:15211: \$? = $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:15152: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15214: \"$ac_try\"") >&5

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

-  echo "$as_me:15155: \$? = $ac_status" >&5
+  echo "$as_me:15217: \$? = $ac_status" >&5

   (exit $ac_status); }; }; then
   termios_bad=unknown
 else
   (exit $ac_status); }; }; then
   termios_bad=unknown
 else


@@ -15167,19 +15229,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:15170: result: $termios_bad" >&5
+       echo "$as_me:15232: result: $termios_bad" >&5

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

-echo "$as_me:15175: checking for tcgetattr" >&5
+echo "$as_me:15237: 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 15182 "configure"
+#line 15244 "configure"

 #include "confdefs.h"
 
 #include <sys/types.h>
 #include "confdefs.h"
 
 #include <sys/types.h>


@@ -15207,16 +15269,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:15210: \"$ac_link\"") >&5
+if { (eval echo "$as_me:15272: \"$ac_link\"") >&5

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

-  echo "$as_me:15213: \$? = $ac_status" >&5
+  echo "$as_me:15275: \$? = $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:15216: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15278: \"$ac_try\"") >&5

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

-  echo "$as_me:15219: \$? = $ac_status" >&5
+  echo "$as_me:15281: \$? = $ac_status" >&5

   (exit $ac_status); }; }; then
   cf_cv_have_tcgetattr=yes
 else
   (exit $ac_status); }; }; then
   cf_cv_have_tcgetattr=yes
 else


@@ -15226,20 +15288,20 @@ 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:15229: result: $cf_cv_have_tcgetattr" >&5
+echo "$as_me:15291: 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:15235: checking for vsscanf function or workaround" >&5
+echo "$as_me:15297: 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 15242 "configure"
+#line 15304 "configure"

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


@@ -15255,16 +15317,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext

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

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

-  echo "$as_me:15261: \$? = $ac_status" >&5
+  echo "$as_me:15323: \$? = $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:15264: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15326: \"$ac_try\"") >&5

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

-  echo "$as_me:15267: \$? = $ac_status" >&5
+  echo "$as_me:15329: \$? = $ac_status" >&5

   (exit $ac_status); }; }; then
   cf_cv_func_vsscanf=vsscanf
 else
   (exit $ac_status); }; }; then
   cf_cv_func_vsscanf=vsscanf
 else


@@ -15272,7 +15334,7 @@ else
 cat conftest.$ac_ext >&5
 
 cat >conftest.$ac_ext <<_ACEOF
 cat conftest.$ac_ext >&5
 
 cat >conftest.$ac_ext <<_ACEOF

-#line 15275 "configure"
+#line 15337 "configure"

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


@@ -15294,16 +15356,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext

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

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

-  echo "$as_me:15300: \$? = $ac_status" >&5
+  echo "$as_me:15362: \$? = $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:15303: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15365: \"$ac_try\"") >&5

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

-  echo "$as_me:15306: \$? = $ac_status" >&5
+  echo "$as_me:15368: \$? = $ac_status" >&5

   (exit $ac_status); }; }; then
   cf_cv_func_vsscanf=vfscanf
 else
   (exit $ac_status); }; }; then
   cf_cv_func_vsscanf=vfscanf
 else


@@ -15311,7 +15373,7 @@ else
 cat conftest.$ac_ext >&5
 
 cat >conftest.$ac_ext <<_ACEOF
 cat conftest.$ac_ext >&5
 
 cat >conftest.$ac_ext <<_ACEOF

-#line 15314 "configure"
+#line 15376 "configure"

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


@@ -15333,16 +15395,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext

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

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

-  echo "$as_me:15339: \$? = $ac_status" >&5
+  echo "$as_me:15401: \$? = $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:15342: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15404: \"$ac_try\"") >&5

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

-  echo "$as_me:15345: \$? = $ac_status" >&5
+  echo "$as_me:15407: \$? = $ac_status" >&5

   (exit $ac_status); }; }; then
   cf_cv_func_vsscanf=_doscan
 else
   (exit $ac_status); }; }; then
   cf_cv_func_vsscanf=_doscan
 else


@@ -15357,7 +15419,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:15360: result: $cf_cv_func_vsscanf" >&5
+echo "$as_me:15422: result: $cf_cv_func_vsscanf" >&5

 echo "${ECHO_T}$cf_cv_func_vsscanf" >&6
 
 case $cf_cv_func_vsscanf in #(vi
 echo "${ECHO_T}$cf_cv_func_vsscanf" >&6
 
 case $cf_cv_func_vsscanf in #(vi


@@ -15375,7 +15437,7 @@ EOF
 ;;
 esac
 
 ;;
 esac
 

-echo "$as_me:15378: checking for working mkstemp" >&5
+echo "$as_me:15440: 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


@@ -15383,13 +15445,13 @@ else
 
 rm -rf conftest*
 if test "$cross_compiling" = yes; then
 
 rm -rf conftest*
 if test "$cross_compiling" = yes; then

-  echo "$as_me:15386: checking for mkstemp" >&5
+  echo "$as_me:15448: 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 15392 "configure"
+#line 15454 "configure"

 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char mkstemp (); below.  */
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char mkstemp (); below.  */


@@ -15420,16 +15482,16 @@ f = mkstemp;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext

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

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

-  echo "$as_me:15426: \$? = $ac_status" >&5
+  echo "$as_me:15488: \$? = $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:15429: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15491: \"$ac_try\"") >&5

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

-  echo "$as_me:15432: \$? = $ac_status" >&5
+  echo "$as_me:15494: \$? = $ac_status" >&5

   (exit $ac_status); }; }; then
   ac_cv_func_mkstemp=yes
 else
   (exit $ac_status); }; }; then
   ac_cv_func_mkstemp=yes
 else


@@ -15439,12 +15501,12 @@ 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:15442: result: $ac_cv_func_mkstemp" >&5
+echo "$as_me:15504: result: $ac_cv_func_mkstemp" >&5

 echo "${ECHO_T}$ac_cv_func_mkstemp" >&6
 
 else
   cat >conftest.$ac_ext <<_ACEOF
 echo "${ECHO_T}$ac_cv_func_mkstemp" >&6
 
 else
   cat >conftest.$ac_ext <<_ACEOF

-#line 15447 "configure"
+#line 15509 "configure"

 #include "confdefs.h"
 
 #include <sys/types.h>
 #include "confdefs.h"
 
 #include <sys/types.h>


@@ -15482,15 +15544,15 @@ int main()
 
 _ACEOF
 rm -f conftest$ac_exeext
 
 _ACEOF
 rm -f conftest$ac_exeext

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

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

-  echo "$as_me:15488: \$? = $ac_status" >&5
+  echo "$as_me:15550: \$? = $ac_status" >&5

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

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

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

-  echo "$as_me:15493: \$? = $ac_status" >&5
+  echo "$as_me:15555: \$? = $ac_status" >&5

   (exit $ac_status); }; }; then
   cf_cv_func_mkstemp=yes
 
   (exit $ac_status); }; }; then
   cf_cv_func_mkstemp=yes
 


@@ -15505,7 +15567,7 @@ rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 
 fi
 fi
 
 fi

-echo "$as_me:15508: result: $cf_cv_func_mkstemp" >&5
+echo "$as_me:15570: result: $cf_cv_func_mkstemp" >&5

 echo "${ECHO_T}$cf_cv_func_mkstemp" >&6
 if test "x$cf_cv_func_mkstemp" = xyes || test "x$ac_cv_func_mkstemp" = xyes ; then
        cat >>confdefs.h <<\EOF
 echo "${ECHO_T}$cf_cv_func_mkstemp" >&6
 if test "x$cf_cv_func_mkstemp" = xyes || test "x$ac_cv_func_mkstemp" = xyes ; then
        cat >>confdefs.h <<\EOF


@@ -15523,21 +15585,21 @@ else
 fi
 
 if test "$cross_compiling" = yes ; then
 fi
 
 if test "$cross_compiling" = yes ; then

-       { echo "$as_me:15526: WARNING: cross compiling: assume setvbuf params not reversed" >&5
+       { echo "$as_me:15588: 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:15529: checking whether setvbuf arguments are reversed" >&5
+       echo "$as_me:15591: 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:15535: error: cannot run test program while cross compiling" >&5
+  { { echo "$as_me:15597: 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 15540 "configure"
+#line 15602 "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. */


@@ -15554,15 +15616,15 @@ main ()
 }
 _ACEOF
 rm -f conftest$ac_exeext
 }
 _ACEOF
 rm -f conftest$ac_exeext

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

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

-  echo "$as_me:15560: \$? = $ac_status" >&5
+  echo "$as_me:15622: \$? = $ac_status" >&5

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

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

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

-  echo "$as_me:15565: \$? = $ac_status" >&5
+  echo "$as_me:15627: \$? = $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


@@ -15575,7 +15637,7 @@ rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 rm -f core core.* *.core
 fi
 fi
 rm -f core core.* *.core
 fi

-echo "$as_me:15578: result: $ac_cv_func_setvbuf_reversed" >&5
+echo "$as_me:15640: 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
 


@@ -15586,13 +15648,13 @@ EOF
 fi
 
 fi
 fi
 
 fi

-echo "$as_me:15589: checking return type of signal handlers" >&5
+echo "$as_me:15651: checking return type of signal handlers" >&5

 echo $ECHO_N "checking return type of signal handlers... $ECHO_C" >&6
 if test "${ac_cv_type_signal+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 echo $ECHO_N "checking return type of signal handlers... $ECHO_C" >&6
 if test "${ac_cv_type_signal+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF

-#line 15595 "configure"
+#line 15657 "configure"

 #include "confdefs.h"
 #include <sys/types.h>
 #include <signal.h>
 #include "confdefs.h"
 #include <sys/types.h>
 #include <signal.h>


@@ -15614,16 +15676,16 @@ int i;
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

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

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

-  echo "$as_me:15620: \$? = $ac_status" >&5
+  echo "$as_me:15682: \$? = $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:15623: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15685: \"$ac_try\"") >&5

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

-  echo "$as_me:15626: \$? = $ac_status" >&5
+  echo "$as_me:15688: \$? = $ac_status" >&5

   (exit $ac_status); }; }; then
   ac_cv_type_signal=void
 else
   (exit $ac_status); }; }; then
   ac_cv_type_signal=void
 else


@@ -15633,21 +15695,21 @@ ac_cv_type_signal=int
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi

-echo "$as_me:15636: result: $ac_cv_type_signal" >&5
+echo "$as_me:15698: result: $ac_cv_type_signal" >&5

 echo "${ECHO_T}$ac_cv_type_signal" >&6
 
 cat >>confdefs.h <<EOF
 #define RETSIGTYPE $ac_cv_type_signal
 EOF
 
 echo "${ECHO_T}$ac_cv_type_signal" >&6
 
 cat >>confdefs.h <<EOF
 #define RETSIGTYPE $ac_cv_type_signal
 EOF
 

-echo "$as_me:15643: checking for type sigaction_t" >&5
+echo "$as_me:15705: 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 15650 "configure"
+#line 15712 "configure"

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


@@ -15660,16 +15722,16 @@ sigaction_t x
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

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

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

-  echo "$as_me:15666: \$? = $ac_status" >&5
+  echo "$as_me:15728: \$? = $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:15669: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15731: \"$ac_try\"") >&5

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

-  echo "$as_me:15672: \$? = $ac_status" >&5
+  echo "$as_me:15734: \$? = $ac_status" >&5

   (exit $ac_status); }; }; then
   cf_cv_type_sigaction=yes
 else
   (exit $ac_status); }; }; then
   cf_cv_type_sigaction=yes
 else


@@ -15680,13 +15742,13 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
 
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
 

-echo "$as_me:15683: result: $cf_cv_type_sigaction" >&5
+echo "$as_me:15745: 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:15689: checking declaration of size-change" >&5
+echo "$as_me:15751: 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


@@ -15701,7 +15763,7 @@ do
     CPPFLAGS="$cf_save_CPPFLAGS"
     test -n "$cf_opts" && CPPFLAGS="$CPPFLAGS -D$cf_opts"
     cat >conftest.$ac_ext <<_ACEOF
     CPPFLAGS="$cf_save_CPPFLAGS"
     test -n "$cf_opts" && CPPFLAGS="$CPPFLAGS -D$cf_opts"
     cat >conftest.$ac_ext <<_ACEOF

-#line 15704 "configure"
+#line 15766 "configure"

 #include "confdefs.h"
 #include <sys/types.h>
 #ifdef HAVE_TERMIOS_H
 #include "confdefs.h"
 #include <sys/types.h>
 #ifdef HAVE_TERMIOS_H


@@ -15745,16 +15807,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

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

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

-  echo "$as_me:15751: \$? = $ac_status" >&5
+  echo "$as_me:15813: \$? = $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:15754: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15816: \"$ac_try\"") >&5

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

-  echo "$as_me:15757: \$? = $ac_status" >&5
+  echo "$as_me:15819: \$? = $ac_status" >&5

   (exit $ac_status); }; }; then
   cf_cv_sizechange=yes
 else
   (exit $ac_status); }; }; then
   cf_cv_sizechange=yes
 else


@@ -15773,7 +15835,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 done
 
 fi
 done
 
 fi

-echo "$as_me:15776: result: $cf_cv_sizechange" >&5
+echo "$as_me:15838: result: $cf_cv_sizechange" >&5

 echo "${ECHO_T}$cf_cv_sizechange" >&6
 if test "$cf_cv_sizechange" != no ; then
        cat >>confdefs.h <<\EOF
 echo "${ECHO_T}$cf_cv_sizechange" >&6
 if test "$cf_cv_sizechange" != no ; then
        cat >>confdefs.h <<\EOF


@@ -15790,13 +15852,13 @@ EOF
        esac
 fi
 
        esac
 fi
 

-echo "$as_me:15793: checking for memmove" >&5
+echo "$as_me:15855: 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 15799 "configure"
+#line 15861 "configure"

 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char memmove (); below.  */
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char memmove (); below.  */


@@ -15827,16 +15889,16 @@ f = memmove;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext

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

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

-  echo "$as_me:15833: \$? = $ac_status" >&5
+  echo "$as_me:15895: \$? = $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:15836: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15898: \"$ac_try\"") >&5

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

-  echo "$as_me:15839: \$? = $ac_status" >&5
+  echo "$as_me:15901: \$? = $ac_status" >&5

   (exit $ac_status); }; }; then
   ac_cv_func_memmove=yes
 else
   (exit $ac_status); }; }; then
   ac_cv_func_memmove=yes
 else


@@ -15846,19 +15908,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:15849: result: $ac_cv_func_memmove" >&5
+echo "$as_me:15911: 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:15855: checking for bcopy" >&5
+echo "$as_me:15917: 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 15861 "configure"
+#line 15923 "configure"

 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char bcopy (); below.  */
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char bcopy (); below.  */


@@ -15889,16 +15951,16 @@ f = bcopy;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext

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

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

-  echo "$as_me:15895: \$? = $ac_status" >&5
+  echo "$as_me:15957: \$? = $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:15898: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15960: \"$ac_try\"") >&5

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

-  echo "$as_me:15901: \$? = $ac_status" >&5
+  echo "$as_me:15963: \$? = $ac_status" >&5

   (exit $ac_status); }; }; then
   ac_cv_func_bcopy=yes
 else
   (exit $ac_status); }; }; then
   ac_cv_func_bcopy=yes
 else


@@ -15908,11 +15970,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:15911: result: $ac_cv_func_bcopy" >&5
+echo "$as_me:15973: 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:15915: checking if bcopy does overlapping moves" >&5
+       echo "$as_me:15977: 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


@@ -15922,7 +15984,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 15925 "configure"
+#line 15987 "configure"

 #include "confdefs.h"
 
 int main() {
 #include "confdefs.h"
 
 int main() {


@@ -15936,15 +15998,15 @@ int main() {
 
 _ACEOF
 rm -f conftest$ac_exeext
 
 _ACEOF
 rm -f conftest$ac_exeext

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

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

-  echo "$as_me:15942: \$? = $ac_status" >&5
+  echo "$as_me:16004: \$? = $ac_status" >&5

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

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

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

-  echo "$as_me:15947: \$? = $ac_status" >&5
+  echo "$as_me:16009: \$? = $ac_status" >&5

   (exit $ac_status); }; }; then
   cf_cv_good_bcopy=yes
 else
   (exit $ac_status); }; }; then
   cf_cv_good_bcopy=yes
 else


@@ -15957,7 +16019,7 @@ rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 
 fi
 fi
 
 fi

-echo "$as_me:15960: result: $cf_cv_good_bcopy" >&5
+echo "$as_me:16022: result: $cf_cv_good_bcopy" >&5

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


@@ -15978,7 +16040,7 @@ EOF
 
 fi
 
 
 fi
 

-echo "$as_me:15981: checking if poll really works" >&5
+echo "$as_me:16043: 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


@@ -15988,7 +16050,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 15991 "configure"
+#line 16053 "configure"

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


@@ -16009,15 +16071,15 @@ int main() {
 }
 _ACEOF
 rm -f conftest$ac_exeext
 }
 _ACEOF
 rm -f conftest$ac_exeext

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

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

-  echo "$as_me:16015: \$? = $ac_status" >&5
+  echo "$as_me:16077: \$? = $ac_status" >&5

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

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

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

-  echo "$as_me:16020: \$? = $ac_status" >&5
+  echo "$as_me:16082: \$? = $ac_status" >&5

   (exit $ac_status); }; }; then
   cf_cv_working_poll=yes
 else
   (exit $ac_status); }; }; then
   cf_cv_working_poll=yes
 else


@@ -16029,20 +16091,20 @@ 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:16032: result: $cf_cv_working_poll" >&5
+echo "$as_me:16094: 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:16038: checking for va_copy" >&5
+echo "$as_me:16100: 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 16045 "configure"
+#line 16107 "configure"

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


@@ -16059,16 +16121,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext

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

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

-  echo "$as_me:16065: \$? = $ac_status" >&5
+  echo "$as_me:16127: \$? = $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:16068: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16130: \"$ac_try\"") >&5

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

-  echo "$as_me:16071: \$? = $ac_status" >&5
+  echo "$as_me:16133: \$? = $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


@@ -16078,21 +16140,21 @@ 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:16081: result: $cf_cv_have_va_copy" >&5
+echo "$as_me:16143: result: $cf_cv_have_va_copy" >&5

 echo "${ECHO_T}$cf_cv_have_va_copy" >&6
 
 test "$cf_cv_have_va_copy" = yes && cat >>confdefs.h <<\EOF
 #define HAVE_VA_COPY 1
 EOF
 
 echo "${ECHO_T}$cf_cv_have_va_copy" >&6
 
 test "$cf_cv_have_va_copy" = yes && cat >>confdefs.h <<\EOF
 #define HAVE_VA_COPY 1
 EOF
 

-echo "$as_me:16088: checking for __va_copy" >&5
+echo "$as_me:16150: 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 16095 "configure"
+#line 16157 "configure"

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


@@ -16109,16 +16171,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext

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

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

-  echo "$as_me:16115: \$? = $ac_status" >&5
+  echo "$as_me:16177: \$? = $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:16118: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16180: \"$ac_try\"") >&5

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

-  echo "$as_me:16121: \$? = $ac_status" >&5
+  echo "$as_me:16183: \$? = $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


@@ -16128,20 +16190,20 @@ 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:16131: result: $cf_cv_have___va_copy" >&5
+echo "$as_me:16193: result: $cf_cv_have___va_copy" >&5

 echo "${ECHO_T}$cf_cv_have___va_copy" >&6
 
 test "$cf_cv_have___va_copy" = yes && cat >>confdefs.h <<\EOF
 #define HAVE___VA_COPY 1
 EOF
 
 echo "${ECHO_T}$cf_cv_have___va_copy" >&6
 
 test "$cf_cv_have___va_copy" = yes && cat >>confdefs.h <<\EOF
 #define HAVE___VA_COPY 1
 EOF
 

-echo "$as_me:16138: checking for pid_t" >&5
+echo "$as_me:16200: 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 16144 "configure"
+#line 16206 "configure"

 #include "confdefs.h"
 $ac_includes_default
 int
 #include "confdefs.h"
 $ac_includes_default
 int


@@ -16156,16 +16218,16 @@ if (sizeof (pid_t))
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

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

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

-  echo "$as_me:16162: \$? = $ac_status" >&5
+  echo "$as_me:16224: \$? = $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:16165: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16227: \"$ac_try\"") >&5

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

-  echo "$as_me:16168: \$? = $ac_status" >&5
+  echo "$as_me:16230: \$? = $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


@@ -16175,7 +16237,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:16178: result: $ac_cv_type_pid_t" >&5
+echo "$as_me:16240: 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
   :


@@ -16190,23 +16252,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:16193: checking for $ac_header" >&5
+echo "$as_me:16255: 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 16199 "configure"
+#line 16261 "configure"

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

-if { (eval echo "$as_me:16203: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:16265: \"$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:16209: \$? = $ac_status" >&5
+  echo "$as_me:16271: \$? = $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


@@ -16225,7 +16287,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
 fi
 rm -f conftest.err conftest.$ac_ext
 fi

-echo "$as_me:16228: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:16290: 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


@@ -16238,13 +16300,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:16241: checking for $ac_func" >&5
+echo "$as_me:16303: 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 16247 "configure"
+#line 16309 "configure"

 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */


@@ -16275,16 +16337,16 @@ f = $ac_func;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext

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

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

-  echo "$as_me:16281: \$? = $ac_status" >&5
+  echo "$as_me:16343: \$? = $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:16284: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16346: \"$ac_try\"") >&5

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

-  echo "$as_me:16287: \$? = $ac_status" >&5
+  echo "$as_me:16349: \$? = $ac_status" >&5

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


@@ -16294,7 +16356,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:16297: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "$as_me:16359: 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


@@ -16306,7 +16368,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:16309: checking for working fork" >&5
+  echo "$as_me:16371: 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


@@ -16329,15 +16391,15 @@ else
       }
 _ACEOF
 rm -f conftest$ac_exeext
       }
 _ACEOF
 rm -f conftest$ac_exeext

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

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

-  echo "$as_me:16335: \$? = $ac_status" >&5
+  echo "$as_me:16397: \$? = $ac_status" >&5

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

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

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

-  echo "$as_me:16340: \$? = $ac_status" >&5
+  echo "$as_me:16402: \$? = $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


@@ -16349,7 +16411,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:16352: result: $ac_cv_func_fork_works" >&5
+echo "$as_me:16414: 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


@@ -16363,12 +16425,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:16366: WARNING: CROSS: Result $ac_cv_func_fork_works guessed due to cross-compiling." >&5
+  { echo "$as_me:16428: 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:16371: checking for working vfork" >&5
+  echo "$as_me:16433: 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


@@ -16377,7 +16439,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 16380 "configure"
+#line 16442 "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>


@@ -16474,15 +16536,15 @@ main ()
 }
 _ACEOF
 rm -f conftest$ac_exeext
 }
 _ACEOF
 rm -f conftest$ac_exeext

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

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

-  echo "$as_me:16480: \$? = $ac_status" >&5
+  echo "$as_me:16542: \$? = $ac_status" >&5

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

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

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

-  echo "$as_me:16485: \$? = $ac_status" >&5
+  echo "$as_me:16547: \$? = $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


@@ -16494,13 +16556,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:16497: result: $ac_cv_func_vfork_works" >&5
+echo "$as_me:16559: 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:16503: WARNING: CROSS: Result $ac_cv_func_vfork_works guessed due to cross-compiling." >&5
+  { echo "$as_me:16565: 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
 


@@ -16527,7 +16589,7 @@ fi
 
 # special check for test/ditto.c
 
 
 # special check for test/ditto.c
 

-echo "$as_me:16530: checking for openpty in -lutil" >&5
+echo "$as_me:16592: 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


@@ -16535,7 +16597,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 16538 "configure"
+#line 16600 "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.  */


@@ -16554,16 +16616,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:16557: \"$ac_link\"") >&5
+if { (eval echo "$as_me:16619: \"$ac_link\"") >&5

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

-  echo "$as_me:16560: \$? = $ac_status" >&5
+  echo "$as_me:16622: \$? = $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:16563: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16625: \"$ac_try\"") >&5

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

-  echo "$as_me:16566: \$? = $ac_status" >&5
+  echo "$as_me:16628: \$? = $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


@@ -16574,7 +16636,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:16577: result: $ac_cv_lib_util_openpty" >&5
+echo "$as_me:16639: 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


@@ -16582,7 +16644,7 @@ else
   cf_cv_lib_util=no
 fi
 
   cf_cv_lib_util=no
 fi
 

-echo "$as_me:16585: checking for openpty header" >&5
+echo "$as_me:16647: 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


@@ -16593,7 +16655,7 @@ else
     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 16596 "configure"
+#line 16658 "configure"

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


@@ -16610,16 +16672,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext

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

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

-  echo "$as_me:16616: \$? = $ac_status" >&5
+  echo "$as_me:16678: \$? = $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:16619: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16681: \"$ac_try\"") >&5

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

-  echo "$as_me:16622: \$? = $ac_status" >&5
+  echo "$as_me:16684: \$? = $ac_status" >&5

   (exit $ac_status); }; }; then
 
         cf_cv_func_openpty=$cf_header
   (exit $ac_status); }; }; then
 
         cf_cv_func_openpty=$cf_header


@@ -16637,7 +16699,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:16640: result: $cf_cv_func_openpty" >&5
+echo "$as_me:16702: 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


@@ -16689,7 +16751,7 @@ if test -n "$with_hashed_db/include" ; then
                          cf_save_CPPFLAGS=$CPPFLAGS
                          CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
                          cat >conftest.$ac_ext <<_ACEOF
                          cf_save_CPPFLAGS=$CPPFLAGS
                          CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
                          cat >conftest.$ac_ext <<_ACEOF

-#line 16692 "configure"
+#line 16754 "configure"

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


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

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

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

-  echo "$as_me:16707: \$? = $ac_status" >&5
+  echo "$as_me:16769: \$? = $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:16710: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16772: \"$ac_try\"") >&5

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

-  echo "$as_me:16713: \$? = $ac_status" >&5
+  echo "$as_me:16775: \$? = $ac_status" >&5

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


@@ -16727,7 +16789,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}:16730: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:16792: testing adding $cf_add_incdir to include-path ..." 1>&5

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


@@ -16761,7 +16823,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}:16764: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:16826: testing adding $cf_add_libdir to library-path ..." 1>&5

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


@@ -16772,23 +16834,23 @@ fi
     fi
 esac
 
     fi
 esac
 

-echo "$as_me:16775: checking for db.h" >&5
+echo "$as_me:16837: 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 16781 "configure"
+#line 16843 "configure"

 #include "confdefs.h"
 #include <db.h>
 _ACEOF
 #include "confdefs.h"
 #include <db.h>
 _ACEOF

-if { (eval echo "$as_me:16785: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:16847: \"$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:16791: \$? = $ac_status" >&5
+  echo "$as_me:16853: \$? = $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


@@ -16807,11 +16869,11 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
 fi
 rm -f conftest.err conftest.$ac_ext
 fi

-echo "$as_me:16810: result: $ac_cv_header_db_h" >&5
+echo "$as_me:16872: 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:16814: checking for version of db" >&5
+echo "$as_me:16876: 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


@@ -16822,10 +16884,10 @@ cf_cv_hashed_db_version=unknown
 for cf_db_version in 1 2 3 4 5
 do
 
 for cf_db_version in 1 2 3 4 5
 do
 

-echo "${as_me:-configure}:16825: testing checking for db version $cf_db_version ..." 1>&5
+echo "${as_me:-configure}:16887: testing checking for db version $cf_db_version ..." 1>&5

 
        cat >conftest.$ac_ext <<_ACEOF
 
        cat >conftest.$ac_ext <<_ACEOF

-#line 16828 "configure"
+#line 16890 "configure"

 #include "confdefs.h"
 
 $ac_includes_default
 #include "confdefs.h"
 
 $ac_includes_default


@@ -16855,16 +16917,16 @@ DBT *foo = 0
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

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

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

-  echo "$as_me:16861: \$? = $ac_status" >&5
+  echo "$as_me:16923: \$? = $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:16864: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16926: \"$ac_try\"") >&5

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

-  echo "$as_me:16867: \$? = $ac_status" >&5
+  echo "$as_me:16929: \$? = $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


@@ -16878,16 +16940,16 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 done
 
 fi
 done
 
 fi

-echo "$as_me:16881: result: $cf_cv_hashed_db_version" >&5
+echo "$as_me:16943: 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:16885: error: Cannot determine version of db" >&5
+       { { echo "$as_me:16947: 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:16890: checking for db libraries" >&5
+echo "$as_me:16952: 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


@@ -16901,10 +16963,10 @@ do
                LIBS="-l$cf_db_libs $LIBS"
        fi
 
                LIBS="-l$cf_db_libs $LIBS"
        fi
 

-echo "${as_me:-configure}:16904: testing checking for library "$cf_db_libs" ..." 1>&5
+echo "${as_me:-configure}:16966: testing checking for library "$cf_db_libs" ..." 1>&5

 
        cat >conftest.$ac_ext <<_ACEOF
 
        cat >conftest.$ac_ext <<_ACEOF

-#line 16907 "configure"
+#line 16969 "configure"

 #include "confdefs.h"
 
 $ac_includes_default
 #include "confdefs.h"
 
 $ac_includes_default


@@ -16959,16 +17021,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext

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

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

-  echo "$as_me:16965: \$? = $ac_status" >&5
+  echo "$as_me:17027: \$? = $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:16968: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17030: \"$ac_try\"") >&5

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

-  echo "$as_me:16971: \$? = $ac_status" >&5
+  echo "$as_me:17033: \$? = $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


@@ -16988,11 +17050,11 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 done
 
 fi
 done
 
 fi

-echo "$as_me:16991: result: $cf_cv_hashed_db_libs" >&5
+echo "$as_me:17053: 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:16995: error: Cannot determine library for db" >&5
+               { { echo "$as_me:17057: 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


@@ -17002,7 +17064,7 @@ fi
 
 else
 
 
 else
 

-       { { echo "$as_me:17005: error: Cannot find db.h" >&5
+       { { echo "$as_me:17067: 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; }; }
 


@@ -17017,7 +17079,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:17020: checking if we should include stdbool.h" >&5
+echo "$as_me:17082: 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


@@ -17025,7 +17087,7 @@ if test "${cf_cv_header_stdbool_h+set}" = set; then
 else
 
        cat >conftest.$ac_ext <<_ACEOF
 else
 
        cat >conftest.$ac_ext <<_ACEOF

-#line 17028 "configure"
+#line 17090 "configure"

 #include "confdefs.h"
 
 int
 #include "confdefs.h"
 
 int


@@ -17037,23 +17099,23 @@ bool foo = false
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

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

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

-  echo "$as_me:17043: \$? = $ac_status" >&5
+  echo "$as_me:17105: \$? = $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:17046: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17108: \"$ac_try\"") >&5

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

-  echo "$as_me:17049: \$? = $ac_status" >&5
+  echo "$as_me:17111: \$? = $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 17056 "configure"
+#line 17118 "configure"

 #include "confdefs.h"
 
 #ifndef __BEOS__
 #include "confdefs.h"
 
 #ifndef __BEOS__


@@ -17069,16 +17131,16 @@ bool foo = false
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

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

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

-  echo "$as_me:17075: \$? = $ac_status" >&5
+  echo "$as_me:17137: \$? = $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:17078: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17140: \"$ac_try\"") >&5

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

-  echo "$as_me:17081: \$? = $ac_status" >&5
+  echo "$as_me:17143: \$? = $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


@@ -17092,13 +17154,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:17095: result: yes" >&5
+then   echo "$as_me:17157: result: yes" >&5

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

-else   echo "$as_me:17097: result: no" >&5
+else   echo "$as_me:17159: result: no" >&5

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

-echo "$as_me:17101: checking for builtin bool type" >&5
+echo "$as_me:17163: 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


@@ -17106,7 +17168,7 @@ if test "${cf_cv_cc_bool_type+set}" = set; then
 else
 
        cat >conftest.$ac_ext <<_ACEOF
 else
 
        cat >conftest.$ac_ext <<_ACEOF

-#line 17109 "configure"
+#line 17171 "configure"

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


@@ -17121,16 +17183,16 @@ bool x = false
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

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

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

-  echo "$as_me:17127: \$? = $ac_status" >&5
+  echo "$as_me:17189: \$? = $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:17130: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17192: \"$ac_try\"") >&5

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

-  echo "$as_me:17133: \$? = $ac_status" >&5
+  echo "$as_me:17195: \$? = $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


@@ -17143,9 +17205,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:17146: result: yes" >&5
+then   echo "$as_me:17208: result: yes" >&5

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

-else   echo "$as_me:17148: result: no" >&5
+else   echo "$as_me:17210: result: no" >&5

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


@@ -17167,7 +17229,7 @@ os2*) #(vi
        cf_stdcpp_libname=stdc++
        ;;
 esac
        cf_stdcpp_libname=stdc++
        ;;
 esac

-echo "$as_me:17170: checking for library $cf_stdcpp_libname" >&5
+echo "$as_me:17232: 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


@@ -17176,7 +17238,7 @@ else
        cf_save="$LIBS"
        LIBS="-l$cf_stdcpp_libname $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
        cf_save="$LIBS"
        LIBS="-l$cf_stdcpp_libname $LIBS"
 cat >conftest.$ac_ext <<_ACEOF

-#line 17179 "configure"
+#line 17241 "configure"

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


@@ -17192,16 +17254,16 @@ strstreambuf foo(buf, sizeof(buf))
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext

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

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

-  echo "$as_me:17198: \$? = $ac_status" >&5
+  echo "$as_me:17260: \$? = $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:17201: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17263: \"$ac_try\"") >&5

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

-  echo "$as_me:17204: \$? = $ac_status" >&5
+  echo "$as_me:17266: \$? = $ac_status" >&5

   (exit $ac_status); }; }; then
   cf_cv_libstdcpp=yes
 else
   (exit $ac_status); }; }; then
   cf_cv_libstdcpp=yes
 else


@@ -17213,12 +17275,12 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
        LIBS="$cf_save"
 
 fi
        LIBS="$cf_save"
 
 fi

-echo "$as_me:17216: result: $cf_cv_libstdcpp" >&5
+echo "$as_me:17278: result: $cf_cv_libstdcpp" >&5

 echo "${ECHO_T}$cf_cv_libstdcpp" >&6
 test "$cf_cv_libstdcpp" = yes && CXXLIBS="-l$cf_stdcpp_libname $CXXLIBS"
 fi
 
 echo "${ECHO_T}$cf_cv_libstdcpp" >&6
 test "$cf_cv_libstdcpp" = yes && CXXLIBS="-l$cf_stdcpp_libname $CXXLIBS"
 fi
 

-       echo "$as_me:17221: checking whether $CXX understands -c and -o together" >&5
+       echo "$as_me:17283: 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


@@ -17234,15 +17296,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 -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 -c conftest.$ac_ext -o conftest2.$ac_objext >&5'

-if { (eval echo "$as_me:17237: \"$ac_try\"") >&5
+if { (eval echo "$as_me:17299: \"$ac_try\"") >&5

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

-  echo "$as_me:17240: \$? = $ac_status" >&5
+  echo "$as_me:17302: \$? = $ac_status" >&5

   (exit $ac_status); } &&
   (exit $ac_status); } &&

-  test -f conftest2.$ac_objext && { (eval echo "$as_me:17242: \"$ac_try\"") >&5
+  test -f conftest2.$ac_objext && { (eval echo "$as_me:17304: \"$ac_try\"") >&5

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

-  echo "$as_me:17245: \$? = $ac_status" >&5
+  echo "$as_me:17307: \$? = $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


@@ -17253,10 +17315,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:17256: result: yes" >&5
+  echo "$as_me:17318: result: yes" >&5

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

-  echo "$as_me:17259: result: no" >&5
+  echo "$as_me:17321: result: no" >&5

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


@@ -17276,12 +17338,12 @@ os2*) #(vi
        ;;
 esac
 if test "$GXX" = yes; then
        ;;
 esac
 if test "$GXX" = yes; then

-       echo "$as_me:17279: checking for lib$cf_gpp_libname" >&5
+       echo "$as_me:17341: checking for lib$cf_gpp_libname" >&5

 echo $ECHO_N "checking for lib$cf_gpp_libname... $ECHO_C" >&6
        cf_save="$LIBS"
        LIBS="-l$cf_gpp_libname $LIBS"
        cat >conftest.$ac_ext <<_ACEOF
 echo $ECHO_N "checking for lib$cf_gpp_libname... $ECHO_C" >&6
        cf_save="$LIBS"
        LIBS="-l$cf_gpp_libname $LIBS"
        cat >conftest.$ac_ext <<_ACEOF

-#line 17284 "configure"
+#line 17346 "configure"

 #include "confdefs.h"
 
 #include <$cf_gpp_libname/builtin.h>
 #include "confdefs.h"
 
 #include <$cf_gpp_libname/builtin.h>


@@ -17295,16 +17357,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:17298: \"$ac_link\"") >&5
+if { (eval echo "$as_me:17360: \"$ac_link\"") >&5

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

-  echo "$as_me:17301: \$? = $ac_status" >&5
+  echo "$as_me:17363: \$? = $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:17304: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17366: \"$ac_try\"") >&5

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

-  echo "$as_me:17307: \$? = $ac_status" >&5
+  echo "$as_me:17369: \$? = $ac_status" >&5

   (exit $ac_status); }; }; then
   cf_cxx_library=yes
         CXXLIBS="-l$cf_gpp_libname $CXXLIBS"
   (exit $ac_status); }; }; then
   cf_cxx_library=yes
         CXXLIBS="-l$cf_gpp_libname $CXXLIBS"


@@ -17323,7 +17385,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 17326 "configure"
+#line 17388 "configure"

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


@@ -17337,16 +17399,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:17340: \"$ac_link\"") >&5
+if { (eval echo "$as_me:17402: \"$ac_link\"") >&5

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

-  echo "$as_me:17343: \$? = $ac_status" >&5
+  echo "$as_me:17405: \$? = $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:17346: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17408: \"$ac_try\"") >&5

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

-  echo "$as_me:17349: \$? = $ac_status" >&5
+  echo "$as_me:17411: \$? = $ac_status" >&5

   (exit $ac_status); }; }; then
   cf_cxx_library=yes
         CXXLIBS="-l$cf_gpp_libname $CXXLIBS"
   (exit $ac_status); }; }; then
   cf_cxx_library=yes
         CXXLIBS="-l$cf_gpp_libname $CXXLIBS"


@@ -17363,7 +17425,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:17366: result: $cf_cxx_library" >&5
+       echo "$as_me:17428: result: $cf_cxx_library" >&5

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


@@ -17379,7 +17441,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:17382: checking how to run the C++ preprocessor" >&5
+echo "$as_me:17444: 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


@@ -17396,18 +17458,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 17399 "configure"
+#line 17461 "configure"

 #include "confdefs.h"
 #include <assert.h>
                      Syntax error
 _ACEOF
 #include "confdefs.h"
 #include <assert.h>
                      Syntax error
 _ACEOF

-if { (eval echo "$as_me:17404: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:17466: \"$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:17410: \$? = $ac_status" >&5
+  echo "$as_me:17472: \$? = $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


@@ -17430,17 +17492,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 17433 "configure"
+#line 17495 "configure"

 #include "confdefs.h"
 #include <ac_nonexistent.h>
 _ACEOF
 #include "confdefs.h"
 #include <ac_nonexistent.h>
 _ACEOF

-if { (eval echo "$as_me:17437: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:17499: \"$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:17443: \$? = $ac_status" >&5
+  echo "$as_me:17505: \$? = $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


@@ -17477,7 +17539,7 @@ fi
 else
   ac_cv_prog_CXXCPP=$CXXCPP
 fi
 else
   ac_cv_prog_CXXCPP=$CXXCPP
 fi

-echo "$as_me:17480: result: $CXXCPP" >&5
+echo "$as_me:17542: 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


@@ -17487,18 +17549,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 17490 "configure"
+#line 17552 "configure"

 #include "confdefs.h"
 #include <assert.h>
                      Syntax error
 _ACEOF
 #include "confdefs.h"
 #include <assert.h>
                      Syntax error
 _ACEOF

-if { (eval echo "$as_me:17495: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:17557: \"$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:17501: \$? = $ac_status" >&5
+  echo "$as_me:17563: \$? = $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


@@ -17521,17 +17583,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 17524 "configure"
+#line 17586 "configure"

 #include "confdefs.h"
 #include <ac_nonexistent.h>
 _ACEOF
 #include "confdefs.h"
 #include <ac_nonexistent.h>
 _ACEOF

-if { (eval echo "$as_me:17528: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:17590: \"$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:17534: \$? = $ac_status" >&5
+  echo "$as_me:17596: \$? = $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


@@ -17559,7 +17621,7 @@ rm -f conftest.err conftest.$ac_ext
 if $ac_preproc_ok; then
   :
 else
 if $ac_preproc_ok; then
   :
 else

-  { { echo "$as_me:17562: error: C++ preprocessor \"$CXXCPP\" fails sanity check" >&5
+  { { echo "$as_me:17624: 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


@@ -17574,23 +17636,23 @@ ac_main_return=return
 for ac_header in iostream typeinfo
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
 for ac_header in iostream typeinfo
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`

-echo "$as_me:17577: checking for $ac_header" >&5
+echo "$as_me:17639: 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 17583 "configure"
+#line 17645 "configure"

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

-if { (eval echo "$as_me:17587: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:17649: \"$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:17593: \$? = $ac_status" >&5
+  echo "$as_me:17655: \$? = $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


@@ -17609,7 +17671,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
 fi
 rm -f conftest.err conftest.$ac_ext
 fi

-echo "$as_me:17612: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:17674: 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


@@ -17620,10 +17682,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:17623: checking if iostream uses std-namespace" >&5
+        echo "$as_me:17685: 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 17626 "configure"
+#line 17688 "configure"

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


@@ -17640,16 +17702,16 @@ cerr << "testing" << endl;
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

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

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

-  echo "$as_me:17646: \$? = $ac_status" >&5
+  echo "$as_me:17708: \$? = $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:17649: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17711: \"$ac_try\"") >&5

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

-  echo "$as_me:17652: \$? = $ac_status" >&5
+  echo "$as_me:17714: \$? = $ac_status" >&5

   (exit $ac_status); }; }; then
   cf_iostream_namespace=yes
 else
   (exit $ac_status); }; }; then
   cf_iostream_namespace=yes
 else


@@ -17658,7 +17720,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:17661: result: $cf_iostream_namespace" >&5
+        echo "$as_me:17723: result: $cf_iostream_namespace" >&5

 echo "${ECHO_T}$cf_iostream_namespace" >&6
         if test "$cf_iostream_namespace" = yes ; then
             cat >>confdefs.h <<\EOF
 echo "${ECHO_T}$cf_iostream_namespace" >&6
         if test "$cf_iostream_namespace" = yes ; then
             cat >>confdefs.h <<\EOF


@@ -17668,7 +17730,7 @@ EOF
         fi
     fi
 
         fi
     fi
 

-echo "$as_me:17671: checking if we should include stdbool.h" >&5
+echo "$as_me:17733: 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


@@ -17676,7 +17738,7 @@ if test "${cf_cv_header_stdbool_h+set}" = set; then
 else
 
        cat >conftest.$ac_ext <<_ACEOF
 else
 
        cat >conftest.$ac_ext <<_ACEOF

-#line 17679 "configure"
+#line 17741 "configure"

 #include "confdefs.h"
 
 int
 #include "confdefs.h"
 
 int


@@ -17688,23 +17750,23 @@ bool foo = false
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

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

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

-  echo "$as_me:17694: \$? = $ac_status" >&5
+  echo "$as_me:17756: \$? = $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:17697: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17759: \"$ac_try\"") >&5

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

-  echo "$as_me:17700: \$? = $ac_status" >&5
+  echo "$as_me:17762: \$? = $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 17707 "configure"
+#line 17769 "configure"

 #include "confdefs.h"
 
 #ifndef __BEOS__
 #include "confdefs.h"
 
 #ifndef __BEOS__


@@ -17720,16 +17782,16 @@ bool foo = false
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

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

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

-  echo "$as_me:17726: \$? = $ac_status" >&5
+  echo "$as_me:17788: \$? = $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:17729: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17791: \"$ac_try\"") >&5

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

-  echo "$as_me:17732: \$? = $ac_status" >&5
+  echo "$as_me:17794: \$? = $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


@@ -17743,13 +17805,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:17746: result: yes" >&5
+then   echo "$as_me:17808: result: yes" >&5

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

-else   echo "$as_me:17748: result: no" >&5
+else   echo "$as_me:17810: result: no" >&5

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

-echo "$as_me:17752: checking for builtin bool type" >&5
+echo "$as_me:17814: 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


@@ -17757,7 +17819,7 @@ if test "${cf_cv_builtin_bool+set}" = set; then
 else
 
        cat >conftest.$ac_ext <<_ACEOF
 else
 
        cat >conftest.$ac_ext <<_ACEOF

-#line 17760 "configure"
+#line 17822 "configure"

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


@@ -17772,16 +17834,16 @@ bool x = false
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

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

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

-  echo "$as_me:17778: \$? = $ac_status" >&5
+  echo "$as_me:17840: \$? = $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:17781: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17843: \"$ac_try\"") >&5

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

-  echo "$as_me:17784: \$? = $ac_status" >&5
+  echo "$as_me:17846: \$? = $ac_status" >&5

   (exit $ac_status); }; }; then
   cf_cv_builtin_bool=1
 else
   (exit $ac_status); }; }; then
   cf_cv_builtin_bool=1
 else


@@ -17794,13 +17856,13 @@ 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:17797: result: yes" >&5
+then   echo "$as_me:17859: result: yes" >&5

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

-else   echo "$as_me:17799: result: no" >&5
+else   echo "$as_me:17861: result: no" >&5

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

-echo "$as_me:17803: checking for size of bool" >&5
+echo "$as_me:17865: checking for size of bool" >&5

 echo $ECHO_N "checking for size of bool... $ECHO_C" >&6
 if test "${cf_cv_type_of_bool+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 echo $ECHO_N "checking for size of bool... $ECHO_C" >&6
 if test "${cf_cv_type_of_bool+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6


@@ -17811,7 +17873,7 @@ else
   cf_cv_type_of_bool=unknown
 else
   cat >conftest.$ac_ext <<_ACEOF
   cf_cv_type_of_bool=unknown
 else
   cat >conftest.$ac_ext <<_ACEOF

-#line 17814 "configure"
+#line 17876 "configure"

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


@@ -17853,15 +17915,15 @@ main()
 
 _ACEOF
 rm -f conftest$ac_exeext
 
 _ACEOF
 rm -f conftest$ac_exeext

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

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

-  echo "$as_me:17859: \$? = $ac_status" >&5
+  echo "$as_me:17921: \$? = $ac_status" >&5

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

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

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

-  echo "$as_me:17864: \$? = $ac_status" >&5
+  echo "$as_me:17926: \$? = $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


@@ -17879,18 +17941,18 @@ fi
 fi
 
        rm -f cf_test.out
 fi
 
        rm -f cf_test.out

-echo "$as_me:17882: result: $cf_cv_type_of_bool" >&5
+echo "$as_me:17944: 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 #(vi
        .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 #(vi
        .auto|.) NCURSES_BOOL=unsigned;;
        esac

-       { echo "$as_me:17888: WARNING: Assuming $NCURSES_BOOL for type of bool" >&5
+       { echo "$as_me:17950: 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:17893: checking for special defines needed for etip.h" >&5
+echo "$as_me:17955: 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"


@@ -17902,7 +17964,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 17905 "configure"
+#line 17967 "configure"

 #include "confdefs.h"
 
 #include <etip.h.in>
 #include "confdefs.h"
 
 #include <etip.h.in>


@@ -17916,16 +17978,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

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

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

-  echo "$as_me:17922: \$? = $ac_status" >&5
+  echo "$as_me:17984: \$? = $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:17925: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17987: \"$ac_try\"") >&5

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

-  echo "$as_me:17928: \$? = $ac_status" >&5
+  echo "$as_me:17990: \$? = $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


@@ -17946,12 +18008,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:17949: result: $cf_result" >&5
+echo "$as_me:18011: 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:17954: checking if $CXX accepts parameter initialization" >&5
+echo "$as_me:18016: 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


@@ -17968,7 +18030,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 17971 "configure"
+#line 18033 "configure"

 #include "confdefs.h"
 
 class TEST {
 #include "confdefs.h"
 
 class TEST {


@@ -17987,15 +18049,15 @@ void main() { }
 
 _ACEOF
 rm -f conftest$ac_exeext
 
 _ACEOF
 rm -f conftest$ac_exeext

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

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

-  echo "$as_me:17993: \$? = $ac_status" >&5
+  echo "$as_me:18055: \$? = $ac_status" >&5

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

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

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

-  echo "$as_me:17998: \$? = $ac_status" >&5
+  echo "$as_me:18060: \$? = $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


@@ -18014,7 +18076,7 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
 ac_main_return=return
 
 fi
 ac_main_return=return
 
 fi

-echo "$as_me:18017: result: $cf_cv_cpp_param_init" >&5
+echo "$as_me:18079: result: $cf_cv_cpp_param_init" >&5

 echo "${ECHO_T}$cf_cv_cpp_param_init" >&6
 fi
 test "$cf_cv_cpp_param_init" = yes && cat >>confdefs.h <<\EOF
 echo "${ECHO_T}$cf_cv_cpp_param_init" >&6
 fi
 test "$cf_cv_cpp_param_init" = yes && cat >>confdefs.h <<\EOF


@@ -18023,7 +18085,7 @@ EOF
 
 if test -n "$CXX"; then
 
 
 if test -n "$CXX"; then
 

-echo "$as_me:18026: checking if $CXX accepts static_cast" >&5
+echo "$as_me:18088: 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


@@ -18037,7 +18099,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 18040 "configure"
+#line 18102 "configure"

 #include "confdefs.h"
 
 class NCursesPanel
 #include "confdefs.h"
 
 class NCursesPanel


@@ -18081,16 +18143,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

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

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

-  echo "$as_me:18087: \$? = $ac_status" >&5
+  echo "$as_me:18149: \$? = $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:18090: \"$ac_try\"") >&5
+  { (eval echo "$as_me:18152: \"$ac_try\"") >&5

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

-  echo "$as_me:18093: \$? = $ac_status" >&5
+  echo "$as_me:18155: \$? = $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


@@ -18108,7 +18170,7 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
 ac_main_return=return
 
 fi
 ac_main_return=return
 
 fi

-echo "$as_me:18111: result: $cf_cv_cpp_static_cast" >&5
+echo "$as_me:18173: 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


@@ -18156,7 +18218,7 @@ else
        else
                if test "$cf_cv_header_stdbool_h" = 1 ; then
 
        else
                if test "$cf_cv_header_stdbool_h" = 1 ; then
 

-echo "$as_me:18159: checking for size of bool" >&5
+echo "$as_me:18221: checking for size of bool" >&5

 echo $ECHO_N "checking for size of bool... $ECHO_C" >&6
 if test "${cf_cv_type_of_bool+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 echo $ECHO_N "checking for size of bool... $ECHO_C" >&6
 if test "${cf_cv_type_of_bool+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6


@@ -18167,7 +18229,7 @@ else
   cf_cv_type_of_bool=unknown
 else
   cat >conftest.$ac_ext <<_ACEOF
   cf_cv_type_of_bool=unknown
 else
   cat >conftest.$ac_ext <<_ACEOF

-#line 18170 "configure"
+#line 18232 "configure"

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


@@ -18209,15 +18271,15 @@ main()
 
 _ACEOF
 rm -f conftest$ac_exeext
 
 _ACEOF
 rm -f conftest$ac_exeext

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

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

-  echo "$as_me:18215: \$? = $ac_status" >&5
+  echo "$as_me:18277: \$? = $ac_status" >&5

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

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

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

-  echo "$as_me:18220: \$? = $ac_status" >&5
+  echo "$as_me:18282: \$? = $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


@@ -18235,25 +18297,25 @@ fi
 fi
 
        rm -f cf_test.out
 fi
 
        rm -f cf_test.out

-echo "$as_me:18238: result: $cf_cv_type_of_bool" >&5
+echo "$as_me:18300: 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 #(vi
        .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 #(vi
        .auto|.) NCURSES_BOOL=unsigned;;
        esac

-       { echo "$as_me:18244: WARNING: Assuming $NCURSES_BOOL for type of bool" >&5
+       { echo "$as_me:18306: 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:18250: checking for fallback type of bool" >&5
+                       echo "$as_me:18312: checking for fallback type of bool" >&5

 echo $ECHO_N "checking for fallback type of bool... $ECHO_C" >&6
                        case "$host_cpu" in #(vi
                        i?86)   cf_cv_type_of_bool=char ;; #(vi
                        *)      cf_cv_type_of_bool=int  ;;
                        esac
 echo $ECHO_N "checking for fallback type of bool... $ECHO_C" >&6
                        case "$host_cpu" in #(vi
                        i?86)   cf_cv_type_of_bool=char ;; #(vi
                        *)      cf_cv_type_of_bool=int  ;;
                        esac

-                       echo "$as_me:18256: result: $cf_cv_type_of_bool" >&5
+                       echo "$as_me:18318: 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


@@ -18282,7 +18344,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:18285: WARNING: libtool does not support Ada - disabling feature" >&5
+                       { echo "$as_me:18347: 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


@@ -18293,7 +18355,7 @@ echo "$as_me: WARNING: libtool does not support Ada - disabling feature" >&2;}
 cf_ada_make=gnatmake
 # Extract the first word of "$cf_ada_make", so it can be a program name with args.
 set dummy $cf_ada_make; ac_word=$2
 cf_ada_make=gnatmake
 # Extract the first word of "$cf_ada_make", so it can be a program name with args.
 set dummy $cf_ada_make; ac_word=$2

-echo "$as_me:18296: checking for $ac_word" >&5
+echo "$as_me:18358: checking for $ac_word" >&5

 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_gnat_exists+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_gnat_exists+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6


@@ -18308,7 +18370,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_gnat_exists="yes"
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_gnat_exists="yes"

-echo "$as_me:18311: found $ac_dir/$ac_word" >&5
+echo "$as_me:18373: found $ac_dir/$ac_word" >&5

 break
 done
 
 break
 done
 


@@ -18317,10 +18379,10 @@ fi
 fi
 gnat_exists=$ac_cv_prog_gnat_exists
 if test -n "$gnat_exists"; then
 fi
 gnat_exists=$ac_cv_prog_gnat_exists
 if test -n "$gnat_exists"; then

-  echo "$as_me:18320: result: $gnat_exists" >&5
+  echo "$as_me:18382: result: $gnat_exists" >&5

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

-  echo "$as_me:18323: result: no" >&5
+  echo "$as_me:18385: result: no" >&5

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


@@ -18328,12 +18390,12 @@ if test "$ac_cv_prog_gnat_exists" = no; then
    cf_ada_make=
 else
 
    cf_ada_make=
 else
 

-echo "$as_me:18331: checking for gnat version" >&5
+echo "$as_me:18393: checking for gnat version" >&5

 echo $ECHO_N "checking for gnat version... $ECHO_C" >&6
 cf_gnat_version=`${cf_ada_make:-gnatmake} -v 2>&1 | \
        grep '[0-9].[0-9][0-9]*' |\
     sed -e '2,$d' -e 's/[^0-9 \.]//g' -e 's/^[ ]*//' -e 's/ .*//'`
 echo $ECHO_N "checking for gnat version... $ECHO_C" >&6
 cf_gnat_version=`${cf_ada_make:-gnatmake} -v 2>&1 | \
        grep '[0-9].[0-9][0-9]*' |\
     sed -e '2,$d' -e 's/[^0-9 \.]//g' -e 's/^[ ]*//' -e 's/ .*//'`

-echo "$as_me:18336: result: $cf_gnat_version" >&5
+echo "$as_me:18398: result: $cf_gnat_version" >&5

 echo "${ECHO_T}$cf_gnat_version" >&6
 
 case $cf_gnat_version in #(vi
 echo "${ECHO_T}$cf_gnat_version" >&6
 
 case $cf_gnat_version in #(vi


@@ -18341,7 +18403,7 @@ case $cf_gnat_version in #(vi
        cf_cv_prog_gnat_correct=yes
        ;;
 *)
        cf_cv_prog_gnat_correct=yes
        ;;
 *)

-       { echo "$as_me:18344: WARNING: Unsupported GNAT version $cf_gnat_version. We require 3.11 or better. Disabling Ada95 binding." >&5
+       { echo "$as_me:18406: WARNING: Unsupported GNAT version $cf_gnat_version. We require 3.11 or better. Disabling Ada95 binding." >&5

 echo "$as_me: WARNING: Unsupported GNAT version $cf_gnat_version. We require 3.11 or better. Disabling Ada95 binding." >&2;}
        cf_cv_prog_gnat_correct=no
        ;;
 echo "$as_me: WARNING: Unsupported GNAT version $cf_gnat_version. We require 3.11 or better. Disabling Ada95 binding." >&2;}
        cf_cv_prog_gnat_correct=no
        ;;


@@ -18349,7 +18411,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:18352: checking for $ac_word" >&5
+echo "$as_me:18414: 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


@@ -18364,7 +18426,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:18367: found $ac_dir/$ac_word" >&5
+echo "$as_me:18429: found $ac_dir/$ac_word" >&5

 break
 done
 
 break
 done
 


@@ -18373,10 +18435,10 @@ 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:18376: result: $M4_exists" >&5
+  echo "$as_me:18438: result: $M4_exists" >&5

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

-  echo "$as_me:18379: result: no" >&5
+  echo "$as_me:18441: result: no" >&5

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


@@ -18385,7 +18447,7 @@ fi
       echo Ada95 binding required program m4 not found. Ada95 binding disabled.
    fi
    if test "$cf_cv_prog_gnat_correct" = yes; then
       echo Ada95 binding required program m4 not found. Ada95 binding disabled.
    fi
    if test "$cf_cv_prog_gnat_correct" = yes; then

-      echo "$as_me:18388: checking if GNAT works" >&5
+      echo "$as_me:18450: 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*


@@ -18413,7 +18475,7 @@ else
 fi
 rm -rf conftest* *~conftest*
 
 fi
 rm -rf conftest* *~conftest*
 

-      echo "$as_me:18416: result: $cf_cv_prog_gnat_correct" >&5
+      echo "$as_me:18478: result: $cf_cv_prog_gnat_correct" >&5

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


@@ -18438,7 +18500,7 @@ fi
                                ;;
                        esac
 
                                ;;
                        esac
 

-echo "$as_me:18441: checking if GNAT supports generics" >&5
+echo "$as_me:18503: checking if GNAT supports generics" >&5

 echo $ECHO_N "checking if GNAT supports generics... $ECHO_C" >&6
 case $cf_gnat_version in #(vi
 3.[1-9]*|[4-9].*) #(vi
 echo $ECHO_N "checking if GNAT supports generics... $ECHO_C" >&6
 case $cf_gnat_version in #(vi
 3.[1-9]*|[4-9].*) #(vi


@@ -18448,7 +18510,7 @@ case $cf_gnat_version in #(vi
        cf_gnat_generics=no
        ;;
 esac
        cf_gnat_generics=no
        ;;
 esac

-echo "$as_me:18451: result: $cf_gnat_generics" >&5
+echo "$as_me:18513: 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


@@ -18460,7 +18522,7 @@ else
        cf_generic_objects=
 fi
 
        cf_generic_objects=
 fi
 

-echo "$as_me:18463: checking if GNAT supports SIGINT" >&5
+echo "$as_me:18525: 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


@@ -18508,7 +18570,7 @@ fi
 rm -rf conftest* *~conftest*
 
 fi
 rm -rf conftest* *~conftest*
 
 fi

-echo "$as_me:18511: result: $cf_cv_gnat_sigint" >&5
+echo "$as_me:18573: 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


@@ -18517,7 +18579,7 @@ else
        USE_GNAT_SIGINT="#"
 fi
 
        USE_GNAT_SIGINT="#"
 fi
 

-echo "$as_me:18520: checking if GNAT pragma Unreferenced works" >&5
+echo "$as_me:18582: checking if GNAT pragma Unreferenced works" >&5

 echo $ECHO_N "checking if GNAT pragma Unreferenced works... $ECHO_C" >&6
 if test "${cf_cv_pragma_unreferenced+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 echo $ECHO_N "checking if GNAT pragma Unreferenced works... $ECHO_C" >&6
 if test "${cf_cv_pragma_unreferenced+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6


@@ -18548,7 +18610,7 @@ fi
 rm -rf conftest* *~conftest*
 
 fi
 rm -rf conftest* *~conftest*
 
 fi

-echo "$as_me:18551: result: $cf_cv_pragma_unreferenced" >&5
+echo "$as_me:18613: result: $cf_cv_pragma_unreferenced" >&5

 echo "${ECHO_T}$cf_cv_pragma_unreferenced" >&6
 
 # if the pragma is supported, use it (needed in the Trace code).
 echo "${ECHO_T}$cf_cv_pragma_unreferenced" >&6
 
 # if the pragma is supported, use it (needed in the Trace code).


@@ -18561,7 +18623,7 @@ fi
 cf_gnat_libraries=no
 cf_gnat_projects=no
 
 cf_gnat_libraries=no
 cf_gnat_projects=no
 

-echo "$as_me:18564: checking if GNAT supports project files" >&5
+echo "$as_me:18626: checking if GNAT supports project files" >&5

 echo $ECHO_N "checking if GNAT supports project files... $ECHO_C" >&6
 case $cf_gnat_version in #(vi
 3.[0-9]*) #(vi
 echo $ECHO_N "checking if GNAT supports project files... $ECHO_C" >&6
 case $cf_gnat_version in #(vi
 3.[0-9]*) #(vi


@@ -18629,14 +18691,14 @@ CF_EOF
        esac
        ;;
 esac
        esac
        ;;
 esac

-echo "$as_me:18632: result: $cf_gnat_projects" >&5
+echo "$as_me:18694: result: $cf_gnat_projects" >&5

 echo "${ECHO_T}$cf_gnat_projects" >&6
 
 if test $cf_gnat_projects = yes
 then
 echo "${ECHO_T}$cf_gnat_projects" >&6
 
 if test $cf_gnat_projects = yes
 then

-       echo "$as_me:18637: checking if GNAT supports libraries" >&5
+       echo "$as_me:18699: 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:18639: result: $cf_gnat_libraries" >&5
+       echo "$as_me:18701: result: $cf_gnat_libraries" >&5

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


@@ -18656,7 +18718,7 @@ else
        USE_GNAT_LIBRARIES="#"
 fi
 
        USE_GNAT_LIBRARIES="#"
 fi
 

-echo "$as_me:18659: checking for ada-compiler" >&5
+echo "$as_me:18721: 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.


@@ -18667,12 +18729,12 @@ else
   cf_ada_compiler=gnatmake
 fi;
 
   cf_ada_compiler=gnatmake
 fi;
 

-echo "$as_me:18670: result: $cf_ada_compiler" >&5
+echo "$as_me:18732: 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:18675: checking for ada-include" >&5
+echo "$as_me:18737: 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.


@@ -18708,7 +18770,7 @@ case ".$withval" in #(vi
   withval=`echo $withval | sed -e s%NONE%$cf_path_syntax%`
   ;;
 *)
   withval=`echo $withval | sed -e s%NONE%$cf_path_syntax%`
   ;;
 *)

-  { { echo "$as_me:18711: error: expected a pathname, not \"$withval\"" >&5
+  { { echo "$as_me:18773: 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; }; }
   ;;


@@ -18717,10 +18779,10 @@ esac
 fi
 ADA_INCLUDE="$withval"
 
 fi
 ADA_INCLUDE="$withval"
 

-echo "$as_me:18720: result: $ADA_INCLUDE" >&5
+echo "$as_me:18782: result: $ADA_INCLUDE" >&5

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

-echo "$as_me:18723: checking for ada-objects" >&5
+echo "$as_me:18785: 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.


@@ -18756,7 +18818,7 @@ case ".$withval" in #(vi
   withval=`echo $withval | sed -e s%NONE%$cf_path_syntax%`
   ;;
 *)
   withval=`echo $withval | sed -e s%NONE%$cf_path_syntax%`
   ;;
 *)

-  { { echo "$as_me:18759: error: expected a pathname, not \"$withval\"" >&5
+  { { echo "$as_me:18821: 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; }; }
   ;;


@@ -18765,10 +18827,10 @@ esac
 fi
 ADA_OBJECTS="$withval"
 
 fi
 ADA_OBJECTS="$withval"
 

-echo "$as_me:18768: result: $ADA_OBJECTS" >&5
+echo "$as_me:18830: result: $ADA_OBJECTS" >&5

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

-echo "$as_me:18771: checking if an Ada95 shared-library should be built" >&5
+echo "$as_me:18833: 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.


@@ -18778,7 +18840,7 @@ if test "${with_ada_sharedlib+set}" = set; then
 else
   with_ada_sharedlib=no
 fi;
 else
   with_ada_sharedlib=no
 fi;

-echo "$as_me:18781: result: $with_ada_sharedlib" >&5
+echo "$as_me:18843: result: $with_ada_sharedlib" >&5

 echo "${ECHO_T}$with_ada_sharedlib" >&6
 
 ADA_SHAREDLIB='lib$(LIB_NAME).so.1'
 echo "${ECHO_T}$with_ada_sharedlib" >&6
 
 ADA_SHAREDLIB='lib$(LIB_NAME).so.1'


@@ -18809,7 +18871,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:18812: checking for library subsets" >&5
+echo "$as_me:18874: 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=
 


@@ -18850,7 +18912,7 @@ fi
 test "$with_widec"     = yes && LIB_SUBSETS="${LIB_SUBSETS}+widechar"
 test "$with_ext_funcs" = yes && LIB_SUBSETS="${LIB_SUBSETS}+ext_funcs"
 
 test "$with_widec"     = yes && LIB_SUBSETS="${LIB_SUBSETS}+widechar"
 test "$with_ext_funcs" = yes && LIB_SUBSETS="${LIB_SUBSETS}+ext_funcs"
 

-echo "$as_me:18853: result: $LIB_SUBSETS" >&5
+echo "$as_me:18915: 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


@@ -18888,7 +18950,7 @@ elif test "$includedir" != "/usr/include"; then
 fi
 
 ### Build up pieces for makefile rules
 fi
 
 ### Build up pieces for makefile rules

-echo "$as_me:18891: checking default library suffix" >&5
+echo "$as_me:18953: 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


@@ -18899,10 +18961,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:18902: result: $DFT_ARG_SUFFIX" >&5
+echo "$as_me:18964: result: $DFT_ARG_SUFFIX" >&5

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

-echo "$as_me:18905: checking default library-dependency suffix" >&5
+echo "$as_me:18967: checking default library-dependency suffix" >&5

 echo $ECHO_N "checking default library-dependency suffix... $ECHO_C" >&6
 
        case $DFT_LWR_MODEL in #(vi
 echo $ECHO_N "checking default library-dependency suffix... $ECHO_C" >&6
 
        case $DFT_LWR_MODEL in #(vi


@@ -18955,10 +19017,10 @@ echo $ECHO_N "checking default library-dependency suffix... $ECHO_C" >&6
        esac
        test -n "$LIB_SUFFIX" && DFT_LIB_SUFFIX="${LIB_SUFFIX}${DFT_LIB_SUFFIX}"
        test -n "$LIB_SUFFIX" && DFT_DEP_SUFFIX="${LIB_SUFFIX}${DFT_DEP_SUFFIX}"
        esac
        test -n "$LIB_SUFFIX" && DFT_LIB_SUFFIX="${LIB_SUFFIX}${DFT_LIB_SUFFIX}"
        test -n "$LIB_SUFFIX" && DFT_DEP_SUFFIX="${LIB_SUFFIX}${DFT_DEP_SUFFIX}"

-echo "$as_me:18958: result: $DFT_DEP_SUFFIX" >&5
+echo "$as_me:19020: result: $DFT_DEP_SUFFIX" >&5

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

-echo "$as_me:18961: checking default object directory" >&5
+echo "$as_me:19023: 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


@@ -18974,12 +19036,12 @@ 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:18977: result: $DFT_OBJ_SUBDIR" >&5
+echo "$as_me:19039: result: $DFT_OBJ_SUBDIR" >&5

 echo "${ECHO_T}$DFT_OBJ_SUBDIR" >&6
 
 # libtool thinks it can make c++ shared libraries (perhaps only g++)
 if test "$cf_with_cxx" = yes ; then
 echo "${ECHO_T}$DFT_OBJ_SUBDIR" >&6
 
 # libtool thinks it can make c++ shared libraries (perhaps only g++)
 if test "$cf_with_cxx" = yes ; then

-echo "$as_me:18982: checking c++ library-dependency suffix" >&5
+echo "$as_me:19044: checking c++ library-dependency suffix" >&5

 echo $ECHO_N "checking c++ library-dependency suffix... $ECHO_C" >&6
 if test "$with_libtool" != "no"; then
        CXX_LIB_SUFFIX=$DFT_DEP_SUFFIX
 echo $ECHO_N "checking c++ library-dependency suffix... $ECHO_C" >&6
 if test "$with_libtool" != "no"; then
        CXX_LIB_SUFFIX=$DFT_DEP_SUFFIX


@@ -19036,7 +19098,7 @@ else
        test -n "$LIB_SUFFIX" && CXX_LIB_SUFFIX="${LIB_SUFFIX}${CXX_LIB_SUFFIX}"
        test -n "$LIB_SUFFIX" && CXX_DEP_SUFFIX="${LIB_SUFFIX}${CXX_DEP_SUFFIX}"
 fi
        test -n "$LIB_SUFFIX" && CXX_LIB_SUFFIX="${LIB_SUFFIX}${CXX_LIB_SUFFIX}"
        test -n "$LIB_SUFFIX" && CXX_DEP_SUFFIX="${LIB_SUFFIX}${CXX_DEP_SUFFIX}"
 fi

-echo "$as_me:19039: result: $CXX_LIB_SUFFIX" >&5
+echo "$as_me:19101: result: $CXX_LIB_SUFFIX" >&5

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


@@ -19190,19 +19252,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:19193: checking if linker supports switching between static/dynamic" >&5
+       echo "$as_me:19255: 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 19198 "configure"
+#line 19260 "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:19202: \"$ac_compile\"") >&5
+       if { (eval echo "$as_me:19264: \"$ac_compile\"") >&5

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

-  echo "$as_me:19205: \$? = $ac_status" >&5
+  echo "$as_me:19267: \$? = $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


@@ -19213,10 +19275,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 19216 "configure"
+#line 19278 "configure"

 #include "confdefs.h"
 
 #include "confdefs.h"
 

-#line 19219 "configure"
+#line 19281 "configure"

 #include <stdio.h>
 int cf_ldflags_static(FILE *fp);
 
 #include <stdio.h>
 int cf_ldflags_static(FILE *fp);
 


@@ -19231,16 +19293,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext

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

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

-  echo "$as_me:19237: \$? = $ac_status" >&5
+  echo "$as_me:19299: \$? = $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:19240: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19302: \"$ac_try\"") >&5

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

-  echo "$as_me:19243: \$? = $ac_status" >&5
+  echo "$as_me:19305: \$? = $ac_status" >&5

   (exit $ac_status); }; }; then
   cf_ldflags_static=yes
 else
   (exit $ac_status); }; }; then
   cf_ldflags_static=yes
 else


@@ -19253,7 +19315,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:19256: result: $cf_ldflags_static" >&5
+       echo "$as_me:19318: 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


@@ -19269,12 +19331,12 @@ fi
        ;;
 esac
 
        ;;
 esac
 

-echo "$as_me:19272: checking where we will install curses.h" >&5
+echo "$as_me:19334: checking where we will install curses.h" >&5

 echo $ECHO_N "checking where we will install curses.h... $ECHO_C" >&6
 test "$with_overwrite" = no && \
 test "x$includedir" = 'x${prefix}/include' && \
        includedir='${prefix}/include/ncurses'${LIB_SUFFIX}
 echo $ECHO_N "checking where we will install curses.h... $ECHO_C" >&6
 test "$with_overwrite" = no && \
 test "x$includedir" = 'x${prefix}/include' && \
        includedir='${prefix}/include/ncurses'${LIB_SUFFIX}

-echo "$as_me:19277: result: $includedir" >&5
+echo "$as_me:19339: result: $includedir" >&5

 echo "${ECHO_T}$includedir" >&6
 
 ### Resolve a conflict between normal and wide-curses by forcing applications
 echo "${ECHO_T}$includedir" >&6
 
 ### Resolve a conflict between normal and wide-curses by forcing applications


@@ -19282,7 +19344,7 @@ echo "${ECHO_T}$includedir" >&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:19285: WARNING: Wide-character applications must define HAVE_LIBUTF8_H to include curses.h" >&5
+       { echo "$as_me:19347: 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


@@ -19299,7 +19361,7 @@ EOF
 ### Construct the list of subdirectories for which we'll customize makefiles
 ### with the appropriate compile-rules.
 
 ### Construct the list of subdirectories for which we'll customize makefiles
 ### with the appropriate compile-rules.
 

-echo "$as_me:19302: checking for src modules" >&5
+echo "$as_me:19364: 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


@@ -19362,7 +19424,7 @@ EOF
                fi
        fi
 done
                fi
        fi
 done

-echo "$as_me:19365: result: $cf_cv_src_modules" >&5
+echo "$as_me:19427: 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"


@@ -19568,7 +19630,7 @@ fi
 
 # Extract the first word of "tic", so it can be a program name with args.
 set dummy tic; ac_word=$2
 
 # Extract the first word of "tic", so it can be a program name with args.
 set dummy tic; ac_word=$2

-echo "$as_me:19571: checking for $ac_word" >&5
+echo "$as_me:19633: checking for $ac_word" >&5

 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_path_TIC_PATH+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_path_TIC_PATH+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6


@@ -19585,7 +19647,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_TIC_PATH="$ac_dir/$ac_word"
   test -z "$ac_dir" && ac_dir=.
   if $as_executable_p "$ac_dir/$ac_word"; then
    ac_cv_path_TIC_PATH="$ac_dir/$ac_word"

-   echo "$as_me:19588: found $ac_dir/$ac_word" >&5
+   echo "$as_me:19650: found $ac_dir/$ac_word" >&5

    break
 fi
 done
    break
 fi
 done


@@ -19597,10 +19659,10 @@ fi
 TIC_PATH=$ac_cv_path_TIC_PATH
 
 if test -n "$TIC_PATH"; then
 TIC_PATH=$ac_cv_path_TIC_PATH
 
 if test -n "$TIC_PATH"; then

-  echo "$as_me:19600: result: $TIC_PATH" >&5
+  echo "$as_me:19662: result: $TIC_PATH" >&5

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

-  echo "$as_me:19603: result: no" >&5
+  echo "$as_me:19665: result: no" >&5

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


@@ -19608,7 +19670,7 @@ if test -n "$FALLBACK_LIST"
 then
        if test "$TIC_PATH" = unknown
        then
 then
        if test "$TIC_PATH" = unknown
        then

-               { echo "$as_me:19611: WARNING: no tic program found for fallbacks" >&5
+               { echo "$as_me:19673: WARNING: no tic program found for fallbacks" >&5

 echo "$as_me: WARNING: no tic program found for fallbacks" >&2;}
        fi
 fi
 echo "$as_me: WARNING: no tic program found for fallbacks" >&2;}
        fi
 fi


@@ -19709,7 +19771,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:19712: creating $CONFIG_STATUS" >&5
+{ echo "$as_me:19774: 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


@@ -19885,7 +19947,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:19888: error: ambiguous option: $1
+    { { echo "$as_me:19950: 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;}


@@ -19904,7 +19966,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:19907: error: unrecognized option: $1
+  -*) { { echo "$as_me:19969: 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;}


@@ -20010,7 +20072,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:20013: error: invalid argument: $ac_config_target" >&5
+  *) { { echo "$as_me:20075: 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


@@ -20421,7 +20483,7 @@ done; }
   esac
 
   if test x"$ac_file" != x-; then
   esac
 
   if test x"$ac_file" != x-; then

-    { echo "$as_me:20424: creating $ac_file" >&5
+    { echo "$as_me:20486: 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


@@ -20439,7 +20501,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:20442: error: cannot find input file: $f" >&5
+         test -f "$f" || { { echo "$as_me:20504: 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;;


@@ -20452,7 +20514,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:20455: error: cannot find input file: $f" >&5
+           { { echo "$as_me:20517: 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;;


@@ -20518,7 +20580,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:20521: creating $ac_file" >&5
+  test x"$ac_file" != x- && { echo "$as_me:20583: 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


@@ -20529,7 +20591,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:20532: error: cannot find input file: $f" >&5
+         test -f "$f" || { { echo "$as_me:20594: 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;;


@@ -20542,7 +20604,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:20545: error: cannot find input file: $f" >&5
+           { { echo "$as_me:20607: 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;;


@@ -20600,7 +20662,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:20603: $ac_file is unchanged" >&5
+      { echo "$as_me:20665: $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/dist.mk b/dist.mk
index 618a4b703740bc206de691cdc6a49b1f40f7c3a4..0e33792772b2f52ee5c1d035f1a2f70b41dad744 100644 (file)
--- a/dist.mk
+++ b/dist.mk
@@ -25,7 +25,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.827 2011/07/24 13:21:30 tom Exp $
+# $Id: dist.mk,v 1.829 2011/08/07 15:43:48 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


@@ -37,7 +37,7 @@ SHELL = /bin/sh
 # These define the major/minor/patch versions of ncurses.
 NCURSES_MAJOR = 5
 NCURSES_MINOR = 9
 # These define the major/minor/patch versions of ncurses.
 NCURSES_MAJOR = 5
 NCURSES_MINOR = 9

-NCURSES_PATCH = 20110730
+NCURSES_PATCH = 20110807

 
 # 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/form/Makefile.in b/form/Makefile.in
index 1a07e140d3e94cb585b240ff40a4d0fe7eda53ff..659b8ed093f3f541293dfa39489dd537c391010b 100644 (file)
--- a/form/Makefile.in
+++ b/form/Makefile.in
@@ -1,6 +1,6 @@
-# $Id: Makefile.in,v 1.53 2010/11/27 21:45:27 tom Exp $
+# $Id: Makefile.in,v 1.54 2011/08/07 15:46:50 tom Exp $

 ##############################################################################
 ##############################################################################

-# Copyright (c) 1998-2009,2010 Free Software Foundation, Inc.                #
+# Copyright (c) 1998-2010,2011 Free Software Foundation, Inc.                #

 #                                                                            #
 # Permission is hereby granted, free of charge, to any person obtaining a    #
 # copy of this software and associated documentation files (the "Software"), #
 #                                                                            #
 # Permission is hereby granted, free of charge, to any person obtaining a    #
 # copy of this software and associated documentation files (the "Software"), #


@@ -102,6 +102,7 @@ LDFLAGS             = @LDFLAGS@ @LD_MODEL@ @LIBS@
 SHLIB_DIRS     = -L../lib
 SHLIB_LIST     = $(SHLIB_DIRS) -lncurses@LIB_SUFFIX@ @SHLIB_LIST@
 
 SHLIB_DIRS     = -L../lib
 SHLIB_LIST     = $(SHLIB_DIRS) -lncurses@LIB_SUFFIX@ @SHLIB_LIST@
 

+RPATH_LIST     = @RPATH_LIST@

 MK_SHARED_LIB  = @MK_SHARED_LIB@
 
 NCURSES_MAJOR  = @NCURSES_MAJOR@
 MK_SHARED_LIB  = @MK_SHARED_LIB@
 
 NCURSES_MAJOR  = @NCURSES_MAJOR@

diff --git a/include/ncurses_defs b/include/ncurses_defs
index 151752474ccbec4897856a3c6ad4d012f833bf17..5f84d969f1328ca604c6e68e2f326cf460b0a75a 100644 (file)
--- a/include/ncurses_defs
+++ b/include/ncurses_defs
@@ -1,4 +1,4 @@
-# $Id: ncurses_defs,v 1.49 2011/04/23 22:09:35 tom Exp $
+# $Id: ncurses_defs,v 1.50 2011/08/07 18:36:02 tom Exp $

 ##############################################################################
 # Copyright (c) 2000-2010,2011 Free Software Foundation, Inc.                #
 #                                                                            #
 ##############################################################################
 # Copyright (c) 2000-2010,2011 Free Software Foundation, Inc.                #
 #                                                                            #


@@ -34,6 +34,7 @@
 BROKEN_LINKER
 BSD_TPUTS
 CC_HAS_PROTOS
 BROKEN_LINKER
 BSD_TPUTS
 CC_HAS_PROTOS

+CGETENT_CONST  /* nothing */

 CPP_HAS_PARAM_INIT
 CURSES_ACS_ARRAY       acs_map
 CURSES_WACS_ARRAY      _nc_wacs
 CPP_HAS_PARAM_INIT
 CURSES_ACS_ARRAY       acs_map
 CURSES_WACS_ARRAY      _nc_wacs

diff --git a/man/infocmp.1m b/man/infocmp.1m
index 446ff98d3ebf45a79991a37e6f83670e667e29b7..454d716a3a38a6461fa5b19d81f8600fd339b0f0 100644 (file)
--- a/man/infocmp.1m
+++ b/man/infocmp.1m
@@ -27,7 +27,7 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"

-.\" $Id: infocmp.1m,v 1.48 2011/07/30 22:06:07 tom Exp $
+.\" $Id: infocmp.1m,v 1.49 2011/08/06 17:46:28 tom Exp $

 .TH @INFOCMP@ 1M ""
 .ds n 5
 .ds d @TERMINFO@
 .TH @INFOCMP@ 1M ""
 .ds n 5
 .ds d @TERMINFO@


@@ -209,6 +209,9 @@ databases.  This is useful for comparing descriptions for the same terminal
 created by different people.
 .SS Other Options
 .TP 5
 created by different people.
 .SS Other Options
 .TP 5

+\fB\-0\fR
+causes the fields to be printed on one line, without wrapping.
+.TP 5

 \fB\-1\fR
 causes the fields to be printed out one to a line.  Otherwise,
 the fields will be printed several to a line to a maximum width
 \fB\-1\fR
 causes the fields to be printed out one to a line.  Otherwise,
 the fields will be printed several to a line to a maximum width


@@ -399,6 +402,8 @@ using the \fB\-x\fR option of \fBtic\fP.
 Compiled terminal description database.
 .SH EXTENSIONS
 The
 Compiled terminal description database.
 .SH EXTENSIONS
 The

+\fB\-0\fR,
+\fB\-1\fR,

 \fB\-E\fR,
 \fB\-F\fR,
 \fB\-G\fR,
 \fB\-E\fR,
 \fB\-F\fR,
 \fB\-G\fR,

diff --git a/man/tic.1m b/man/tic.1m
index f9254138977d0251677385e0798e4da9c596c348..38cb19c0562ce0bd19a4f67f00050f1a7f0bd4b5 100644 (file)
--- a/man/tic.1m
+++ b/man/tic.1m
@@ -1,5 +1,5 @@
 .\"***************************************************************************
 .\"***************************************************************************

-.\" Copyright (c) 1998-2006,2010 Free Software Foundation, Inc.              *
+.\" Copyright (c) 1998-2010,2011 Free Software Foundation, Inc.              *

 .\"                                                                          *
 .\" Permission is hereby granted, free of charge, to any person obtaining a  *
 .\" copy of this software and associated documentation files (the            *
 .\"                                                                          *
 .\" Permission is hereby granted, free of charge, to any person obtaining a  *
 .\" copy of this software and associated documentation files (the            *


@@ -26,7 +26,7 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"

-.\" $Id: tic.1m,v 1.48 2011/07/30 21:58:54 tom Exp $
+.\" $Id: tic.1m,v 1.49 2011/08/06 17:49:46 tom Exp $

 .TH @TIC@ 1M ""
 .ds n 5
 .ds d @TERMINFO@
 .TH @TIC@ 1M ""
 .ds n 5
 .ds d @TERMINFO@


@@ -35,6 +35,7 @@
 .SH SYNOPSIS
 \fBtic\fR
 [\fB\-\
 .SH SYNOPSIS
 \fBtic\fR
 [\fB\-\

+0\

 1\
 C\
 G\
 1\
 C\
 G\


@@ -82,6 +83,9 @@ Libraries that read terminfo entries are expected to check for a TERMINFO
 directory first, look at \fI$HOME/.terminfo\fR if TERMINFO is not set, and
 finally look in \fI\*d\fR.
 .TP
 directory first, look at \fI$HOME/.terminfo\fR if TERMINFO is not set, and
 finally look in \fI\*d\fR.
 .TP

+\fB\-0\fR
+restricts the output to a single line
+.TP

 \fB\-1\fR
 restricts the output to a single column
 .TP
 \fB\-1\fR
 restricts the output to a single column
 .TP


@@ -112,9 +116,11 @@ bad use links.
 If you specify \fB\-C\fR (\fB\-I\fR) with this option, the code
 will print warnings about entries which, after use resolution, are more than
 1023 (4096) bytes long.
 If you specify \fB\-C\fR (\fB\-I\fR) with this option, the code
 will print warnings about entries which, after use resolution, are more than
 1023 (4096) bytes long.

-Due to a fixed buffer length in older termcap
-libraries (and a documented limit in terminfo), these entries may cause core
-dumps.
+Due to a fixed buffer length in older termcap libraries,
+as well as buggy checking for the buffer length
+(and a documented limit in terminfo),
+these entries may cause core
+dumps with other implementations.

 .TP
 \fB\-e \fR\fInames\fR
 Limit writes and translations to the following comma-separated list of
 .TP
 \fB\-e \fR\fInames\fR
 Limit writes and translations to the following comma-separated list of


@@ -312,6 +318,8 @@ The error messages from this \fBtic\fR have the same format as GNU C
 error messages, and can be parsed by GNU Emacs's compile facility.
 .PP
 The
 error messages, and can be parsed by GNU Emacs's compile facility.
 .PP
 The

+\fB\-0\fR,
+\fB\-1\fR,

 \fB\-C\fR,
 \fB\-G\fR,
 \fB\-I\fR,
 \fB\-C\fR,
 \fB\-G\fR,
 \fB\-I\fR,

diff --git a/menu/Makefile.in b/menu/Makefile.in
index 253ff4f641944cd1a57a42e7a7d2d19a48097c42..110961696d397807be010b9bc0c3ffd5e9689914 100644 (file)
--- a/menu/Makefile.in
+++ b/menu/Makefile.in
@@ -1,6 +1,6 @@
-# $Id: Makefile.in,v 1.54 2010/11/27 21:45:27 tom Exp $
+# $Id: Makefile.in,v 1.55 2011/08/07 15:46:50 tom Exp $

 ##############################################################################
 ##############################################################################

-# Copyright (c) 1998-2009,2010 Free Software Foundation, Inc.                #
+# Copyright (c) 1998-2010,2011 Free Software Foundation, Inc.                #

 #                                                                            #
 # Permission is hereby granted, free of charge, to any person obtaining a    #
 # copy of this software and associated documentation files (the "Software"), #
 #                                                                            #
 # Permission is hereby granted, free of charge, to any person obtaining a    #
 # copy of this software and associated documentation files (the "Software"), #


@@ -102,6 +102,7 @@ LDFLAGS             = @LDFLAGS@ @LD_MODEL@ @LIBS@
 SHLIB_DIRS     = -L../lib
 SHLIB_LIST     = $(SHLIB_DIRS) -lncurses@LIB_SUFFIX@ @SHLIB_LIST@
 
 SHLIB_DIRS     = -L../lib
 SHLIB_LIST     = $(SHLIB_DIRS) -lncurses@LIB_SUFFIX@ @SHLIB_LIST@
 

+RPATH_LIST     = @RPATH_LIST@

 MK_SHARED_LIB  = @MK_SHARED_LIB@
 
 NCURSES_MAJOR  = @NCURSES_MAJOR@
 MK_SHARED_LIB  = @MK_SHARED_LIB@
 
 NCURSES_MAJOR  = @NCURSES_MAJOR@

diff --git a/misc/terminfo.src b/misc/terminfo.src
index a2885fc822372bfab1e01d1c162e6ea813584952..e8bb05b2fea4d07b82a7106ea403e10305326430 100644 (file)
--- a/misc/terminfo.src
+++ b/misc/terminfo.src
@@ -6,8 +6,8 @@
 # Report bugs and new terminal descriptions to
 #      bug-ncurses@gnu.org
 #
 # Report bugs and new terminal descriptions to
 #      bug-ncurses@gnu.org
 #

-#      $Revision: 1.393 $
-#      $Date: 2011/07/21 09:29:09 $
+#      $Revision: 1.395 $
+#      $Date: 2011/08/06 19:48:29 $

 #
 # The original header is preserved below for reference.  It is noted that there
 # is a "newer" version which differs in some cosmetic details (but actually
 #
 # The original header is preserved below for reference.  It is noted that there
 # is a "newer" version which differs in some cosmetic details (but actually


@@ -12798,7 +12798,6 @@ dg450|dg6134|data general 6134,
 # backspace on all terminals.  This is not so in DG mode.
 # (dg460-ansi: removed obsolete ":kn#6:"; also removed ":mu=\EW:", on the
 # grounds that there is no matching ":ml:"
 # backspace on all terminals.  This is not so in DG mode.
 # (dg460-ansi: removed obsolete ":kn#6:"; also removed ":mu=\EW:", on the
 # grounds that there is no matching ":ml:"

-# fixed garbled ":k9=\E[00\:z:" capability -- esr)

 dg460-ansi|Data General Dasher 460 in ANSI-mode,
        OTbs, am, msgr, ul,
        cols#80, it#8, lines#24,
 dg460-ansi|Data General Dasher 460 in ANSI-mode,
        OTbs, am, msgr, ul,
        cols#80, it#8, lines#24,


@@ -12809,10 +12808,12 @@ dg460-ansi|Data General Dasher 460 in ANSI-mode,
        kcub1=\E[D, kcud1=\E[B, kcuf1=\E[C, kcuu1=\E[A,
        kf0=\E[001z, kf1=\E[002z, kf2=\E[003z, kf3=\E[004z,
        kf4=\E[005z, kf5=\E[006z, kf6=\E[007z, kf7=\E[008z,
        kcub1=\E[D, kcud1=\E[B, kcuf1=\E[C, kcuu1=\E[A,
        kf0=\E[001z, kf1=\E[002z, kf2=\E[003z, kf3=\E[004z,
        kf4=\E[005z, kf5=\E[006z, kf6=\E[007z, kf7=\E[008z,

-       kf8=\E[009z, kf9=\E[010z, khome=\E[H, lf0=f1, lf1=f2, lf2=f3,
-       lf3=f4, lf4=f5, lf5=f6, lf6=f7, lf7=f8, lf9=f10, rev=\E[7m,
-       ri=\E[T, rmso=\E[m, rmul=\E[05, sgr0=\E[m, smso=\E[7m,
-       smul=\E[4m,
+       kf8=\E[009z, kf9=\E[00\:z, khome=\E[H, lf0=f1, lf1=f2,
+       lf2=f3, lf3=f4, lf4=f5, lf5=f6, lf6=f7, lf7=f8, lf9=f10,
+       mc0=\E[i, rev=\E[7m, ri=\E[T, rmso=\E[m, rmul=\E[05,
+       sgr=%?%p9%t\E(0%e\E(B%;\E[0%?%p5%t;2%;%?%p2%t;4%;%?%p4%t;5%;%?%p1%p3%|%t;7%;m,
+       sgr0=\E(B\E[m, smso=\E[7m, smul=\E[4m, u6=\E[%d;%dR,
+       u7=\E[6n, u8=\E[5n, u9=\E[0n,

 # From: Wayne Throop <mcnc!rti-sel!rtp47!throopw> (not official)
 # Data General 605x
 # Ought to work for a Model 6242, Type D210 as well as a 605x.
 # From: Wayne Throop <mcnc!rti-sel!rtp47!throopw> (not official)
 # Data General 605x
 # Ought to work for a Model 6242, Type D210 as well as a 605x.


@@ -22427,4 +22428,7 @@ v3220|LANPAR Vision II model 3220/3221/3222,
 #      * add kich1 to sun (Yuri Pankov)
 #      * use bold rather than reverse for smso in sun-color (Yuri Pankov).
 #
 #      * add kich1 to sun (Yuri Pankov)
 #      * use bold rather than reverse for smso in sun-color (Yuri Pankov).
 #

+# 2011-08-06
+#      * corrected k9 in dg460-ansi, add other features based on manuals -TD
+#

 ######## SHANTIH!  SHANTIH!  SHANTIH!
 ######## SHANTIH!  SHANTIH!  SHANTIH!

diff --git a/ncurses/Makefile.in b/ncurses/Makefile.in
index 45a26b9d7eaa968dbc4645040eb6edc9334a9793..c0b3d824853b11e0eed98f07ae370f125f7ab200 100644 (file)
--- a/ncurses/Makefile.in
+++ b/ncurses/Makefile.in
@@ -1,6 +1,6 @@
-# $Id: Makefile.in,v 1.130 2010/11/27 21:45:27 tom Exp $
+# $Id: Makefile.in,v 1.131 2011/08/07 15:46:50 tom Exp $

 ##############################################################################
 ##############################################################################

-# Copyright (c) 1998-2009,2010 Free Software Foundation, Inc.                #
+# Copyright (c) 1998-2010,2011 Free Software Foundation, Inc.                #

 #                                                                            #
 # Permission is hereby granted, free of charge, to any person obtaining a    #
 # copy of this software and associated documentation files (the "Software"), #
 #                                                                            #
 # Permission is hereby granted, free of charge, to any person obtaining a    #
 # copy of this software and associated documentation files (the "Software"), #


@@ -125,6 +125,7 @@ SHLIB_LIST  = $(SHLIB_DIRS) @SHLIB_LIST@
 TINFO_LIST     = $(SHLIB_DIRS) @TINFO_LIST@
 TICS_LIST      = $(SHLIB_DIRS) @TICS_LIST@
 
 TINFO_LIST     = $(SHLIB_DIRS) @TINFO_LIST@
 TICS_LIST      = $(SHLIB_DIRS) @TICS_LIST@
 

+RPATH_LIST     = @RPATH_LIST@

 MK_SHARED_LIB  = @MK_SHARED_LIB@
 
 NCURSES_MAJOR  = @NCURSES_MAJOR@
 MK_SHARED_LIB  = @MK_SHARED_LIB@
 
 NCURSES_MAJOR  = @NCURSES_MAJOR@

diff --git a/ncurses/tinfo/lib_setup.c b/ncurses/tinfo/lib_setup.c
index b23ea97120d4597674e4df5d768672a81026dfd5..e4edd04fa9f3569d8d7da4a74b8104f1d994b5d1 100644 (file)
--- a/ncurses/tinfo/lib_setup.c
+++ b/ncurses/tinfo/lib_setup.c
@@ -47,7 +47,7 @@
 #include <locale.h>
 #endif
 
 #include <locale.h>
 #endif
 

-MODULE_ID("$Id: lib_setup.c,v 1.138 2011/06/14 22:36:29 tom Exp $")
+MODULE_ID("$Id: lib_setup.c,v 1.139 2011/08/05 21:56:40 tom Exp $")

 
 /****************************************************************************
  *
 
 /****************************************************************************
  *


@@ -479,7 +479,7 @@ _nc_tinfo_cmdch(TERMINAL * termp, char proto)
     if ((tmp = getenv("CC")) != 0 && strlen(tmp) == 1) {
        CC = *tmp;
        for_each_string(i, &(termp->type)) {
     if ((tmp = getenv("CC")) != 0 && strlen(tmp) == 1) {
        CC = *tmp;
        for_each_string(i, &(termp->type)) {

-           for (tmp = termp->type.Strings[i]; *tmp; tmp++) {
+           for (tmp = termp->type.Strings[i]; tmp && *tmp; tmp++) {

                if (*tmp == proto)
                    *tmp = CC;
            }
                if (*tmp == proto)
                    *tmp = CC;
            }

diff --git a/ncurses/tinfo/read_termcap.c b/ncurses/tinfo/read_termcap.c
index 700dd77db46e78dd9a6d1ccda134f10063314e48..f92ed5d4f83cb9c1bf4fc005dc77345fac411b71 100644 (file)
--- a/ncurses/tinfo/read_termcap.c
+++ b/ncurses/tinfo/read_termcap.c
@@ -56,7 +56,7 @@
 #include <sys/types.h>
 #include <tic.h>
 
 #include <sys/types.h>
 #include <tic.h>
 

-MODULE_ID("$Id: read_termcap.c,v 1.79 2011/07/29 00:25:02 tom Exp $")
+MODULE_ID("$Id: read_termcap.c,v 1.81 2011/08/07 18:56:35 tom Exp $")

 
 #if !PURE_TERMINFO
 
 
 #if !PURE_TERMINFO
 


@@ -781,15 +781,16 @@ _nc_tgetent(char *bp, char **sourcename, int *lineno, const char *name)
     register char *p;
     register char *cp;
     char *dummy = NULL;
     register char *p;
     register char *cp;
     char *dummy = NULL;

-    char **fname;
+    const char **fname;

     char *home;
     int i;
     char pathbuf[PBUFSIZ];     /* holds raw path of filenames */
     char *home;
     int i;
     char pathbuf[PBUFSIZ];     /* holds raw path of filenames */

-    char *pathvec[PVECSIZ];    /* to point to names in pathbuf */
-    char **pvec;               /* holds usable tail of path vector */
+    CGETENT_CONST char *pathvec[PVECSIZ];      /* point to names in pathbuf */
+    CGETENT_CONST char **pvec; /* holds usable tail of path vector */

     NCURSES_CONST char *termpath;
     string_desc desc;
 
     NCURSES_CONST char *termpath;
     string_desc desc;
 

+    *lineno = 1;

     fname = pathvec;
     pvec = pathvec;
     tbuf = bp;
     fname = pathvec;
     pvec = pathvec;
     tbuf = bp;

diff --git a/panel/Makefile.in b/panel/Makefile.in
index f0f0a4922bd0315f34f60fd6f2c33e2fcb12f0e3..ed770058f6ac30fdfdc23c039682b3c0e9978691 100644 (file)
--- a/panel/Makefile.in
+++ b/panel/Makefile.in
@@ -1,6 +1,6 @@
-# $Id: Makefile.in,v 1.58 2010/11/27 21:45:27 tom Exp $
+# $Id: Makefile.in,v 1.59 2011/08/07 15:46:50 tom Exp $

 ##############################################################################
 ##############################################################################

-# Copyright (c) 1998-2009,2010 Free Software Foundation, Inc.                #
+# Copyright (c) 1998-2010,2011 Free Software Foundation, Inc.                #

 #                                                                            #
 # Permission is hereby granted, free of charge, to any person obtaining a    #
 # copy of this software and associated documentation files (the "Software"), #
 #                                                                            #
 # Permission is hereby granted, free of charge, to any person obtaining a    #
 # copy of this software and associated documentation files (the "Software"), #


@@ -103,6 +103,7 @@ LDFLAGS             = @LDFLAGS@ @LD_MODEL@ @LIBS@
 SHLIB_DIRS     = -L../lib
 SHLIB_LIST     = $(SHLIB_DIRS) -lncurses@LIB_SUFFIX@ @SHLIB_LIST@
 
 SHLIB_DIRS     = -L../lib
 SHLIB_LIST     = $(SHLIB_DIRS) -lncurses@LIB_SUFFIX@ @SHLIB_LIST@
 

+RPATH_LIST     = @RPATH_LIST@

 MK_SHARED_LIB  = @MK_SHARED_LIB@
 
 NCURSES_MAJOR  = @NCURSES_MAJOR@
 MK_SHARED_LIB  = @MK_SHARED_LIB@
 
 NCURSES_MAJOR  = @NCURSES_MAJOR@

diff --git a/progs/dump_entry.c b/progs/dump_entry.c
index f9eedf905f3afe0c7679f32713b4069a3b8ba33b..12bef2c279f2038b0750ef02091876681e2aaf27 100644 (file)
--- a/progs/dump_entry.c
+++ b/progs/dump_entry.c
@@ -39,7 +39,7 @@
 #include "termsort.c"          /* this C file is generated */
 #include <parametrized.h>      /* so is this */
 
 #include "termsort.c"          /* this C file is generated */
 #include <parametrized.h>      /* so is this */
 

-MODULE_ID("$Id: dump_entry.c,v 1.91 2011/05/14 22:39:21 tom Exp $")
+MODULE_ID("$Id: dump_entry.c,v 1.95 2011/08/07 22:10:17 tom Exp $")

 
 #define INDENT                 8
 #define DISCARD(string) string = ABSENT_STRING
 
 #define INDENT                 8
 #define DISCARD(string) string = ABSENT_STRING


@@ -57,6 +57,7 @@ static int tversion;          /* terminfo version */
 static int outform;            /* output format to use */
 static int sortmode;           /* sort mode to use */
 static int width = 60;         /* max line width for listings */
 static int outform;            /* output format to use */
 static int sortmode;           /* sort mode to use */
 static int width = 60;         /* max line width for listings */

+static int height = 65535;     /* max number of lines for listings */

 static int column;             /* current column, limited by 'width' */
 static int oldcol;             /* last value of column before wrap */
 static bool pretty;            /* true if we format if-then-else strings */
 static int column;             /* current column, limited by 'width' */
 static int oldcol;             /* last value of column before wrap */
 static bool pretty;            /* true if we format if-then-else strings */


@@ -176,11 +177,13 @@ dump_init(const char *version,
          int mode,
          int sort,
          int twidth,
          int mode,
          int sort,
          int twidth,

+         int theight,

          unsigned traceval,
          bool formatted)
 /* set up for entry display */
 {
     width = twidth;
          unsigned traceval,
          bool formatted)
 /* set up for entry display */
 {
     width = twidth;

+    height = theight;

     pretty = formatted;
 
     /* versions */
     pretty = formatted;
 
     /* versions */


@@ -205,7 +208,7 @@ dump_init(const char *version,
        bool_names = boolnames;
        num_names = numnames;
        str_names = strnames;
        bool_names = boolnames;
        num_names = numnames;
        str_names = strnames;

-       separator = twidth ? ", " : ",";
+       separator = (twidth > 0 && theight > 1) ? ", " : ",";

        trailer = "\n\t";
        break;
 
        trailer = "\n\t";
        break;
 


@@ -213,7 +216,7 @@ dump_init(const char *version,
        bool_names = boolfnames;
        num_names = numfnames;
        str_names = strfnames;
        bool_names = boolfnames;
        num_names = numfnames;
        str_names = strfnames;

-       separator = twidth ? ", " : ",";
+       separator = (twidth > 0 && theight > 1) ? ", " : ",";

        trailer = "\n\t";
        break;
 
        trailer = "\n\t";
        break;
 


@@ -597,9 +600,23 @@ fmt_entry(TERMTYPE *tterm,
        column = INDENT;        /* FIXME: workaround to prevent empty lines */
     } else {
        strcpy_DYN(&outbuf, tterm->term_names);
        column = INDENT;        /* FIXME: workaround to prevent empty lines */
     } else {
        strcpy_DYN(&outbuf, tterm->term_names);

+
+       /*
+        * Colon is legal in terminfo descriptions, but not in termcap.
+        */
+       if (!infodump) {
+           char *p = outbuf.text;
+           while (*p) {
+               if (*p == ':') {
+                   *p = '=';
+               }
+               ++p;
+           }
+       }

        strcpy_DYN(&outbuf, separator);
        column = (int) outbuf.used;
        strcpy_DYN(&outbuf, separator);
        column = (int) outbuf.used;

-       force_wrap();
+       if (height > 1)
+           force_wrap();

     }
 
     for_each_boolean(j, tterm) {
     }
 
     for_each_boolean(j, tterm) {


@@ -623,7 +640,7 @@ fmt_entry(TERMTYPE *tterm,
        }
     }
 
        }
     }
 

-    if (column != INDENT)
+    if (column != INDENT && height > 1)

        force_wrap();
 
     for_each_number(j, tterm) {
        force_wrap();
 
     for_each_number(j, tterm) {


@@ -649,7 +666,7 @@ fmt_entry(TERMTYPE *tterm,
        }
     }
 
        }
     }
 

-    if (column != INDENT)
+    if (column != INDENT && height > 1)

        force_wrap();
 
     len += (int) (num_bools
        force_wrap();
 
     len += (int) (num_bools


@@ -1155,7 +1172,30 @@ dump_uses(const char *name, bool infodump)
 int
 show_entry(void)
 {
 int
 show_entry(void)
 {

-    trim_trailing();
+    /*
+     * Trim any remaining whitespace.
+     */
+    if (outbuf.used != 0) {
+       bool infodump = (outform != F_TERMCAP && outform != F_TCONVERR);
+       char delim = infodump ? ',' : ':';
+       int j;
+
+       for (j = (int) outbuf.used - 1; j > 0; --j) {
+           char ch = outbuf.text[j];
+           if (ch == '\n') {
+               ;
+           } else if (isspace(UChar(ch))) {
+               outbuf.used = j;
+           } else if (!infodump && ch == '\\') {
+               outbuf.used = j;
+           } else if (ch == delim && (j == 0 || outbuf.text[j - 1] != '\\')) {
+               outbuf.used = (j + 1);
+           } else {
+               break;
+           }
+       }
+       outbuf.text[outbuf.used] = '\0';
+    }

     (void) fputs(outbuf.text, stdout);
     putchar('\n');
     return (int) outbuf.used;
     (void) fputs(outbuf.text, stdout);
     putchar('\n');
     return (int) outbuf.used;

diff --git a/progs/dump_entry.h b/progs/dump_entry.h
index bfdd0c4b2fea68dc77022547fcf454751b05a30b..807b51c0297ae6a0020c8df8aecdefe7bb9aa44e 100644 (file)
--- a/progs/dump_entry.h
+++ b/progs/dump_entry.h
@@ -33,7 +33,7 @@
  ****************************************************************************/
 
 /*
  ****************************************************************************/
 
 /*

- * $Id: dump_entry.h,v 1.31 2011/05/14 18:00:09 tom Exp $
+ * $Id: dump_entry.h,v 1.32 2011/08/06 16:33:05 tom Exp $

  *
  * Dump control definitions and variables
  */
  *
  * Dump control definitions and variables
  */


@@ -71,7 +71,7 @@ extern int fmt_entry(TERMTYPE *, PredFunc, bool, bool, bool, int);
 extern int show_entry(void);
 extern void compare_entry(PredHook, TERMTYPE *, bool);
 extern void dump_entry(TERMTYPE *, bool, bool, int, PredFunc);
 extern int show_entry(void);
 extern void compare_entry(PredHook, TERMTYPE *, bool);
 extern void dump_entry(TERMTYPE *, bool, bool, int, PredFunc);

-extern void dump_init(const char *, int, int, int, unsigned, bool);
+extern void dump_init(const char *, int, int, int, int, unsigned, bool);

 extern void dump_uses(const char *, bool);
 extern void repair_acsc(TERMTYPE *tp);
 
 extern void dump_uses(const char *, bool);
 extern void repair_acsc(TERMTYPE *tp);
 

diff --git a/progs/infocmp.c b/progs/infocmp.c
index 131771724a91bff07a260338a03b791ce955ace9..8d2cabeed1898e84e854fc27c69c0b8acf694f34 100644 (file)
--- a/progs/infocmp.c
+++ b/progs/infocmp.c
@@ -42,7 +42,7 @@
 
 #include <dump_entry.h>
 
 
 #include <dump_entry.h>
 

-MODULE_ID("$Id: infocmp.c,v 1.107 2011/07/30 21:51:01 tom Exp $")
+MODULE_ID("$Id: infocmp.c,v 1.108 2011/08/06 16:36:06 tom Exp $")

 
 #define L_CURL "{"
 #define R_CURL "}"
 
 #define L_CURL "{"
 #define R_CURL "}"


@@ -72,6 +72,7 @@ static const char *s_cancel = "NULL";
 static const char *tversion;   /* terminfo version selected */
 static unsigned itrace;                /* trace flag for debugging */
 static int mwidth = 60;
 static const char *tversion;   /* terminfo version selected */
 static unsigned itrace;                /* trace flag for debugging */
 static int mwidth = 60;

+static int mheight = 65535;

 static int numbers = 0;                /* format "%'char'" to/from "%{number}" */
 static int outform = F_TERMINFO;       /* output format */
 static int sortmode;           /* sort_mode */
 static int numbers = 0;                /* format "%'char'" to/from "%{number}" */
 static int outform = F_TERMINFO;       /* output format */
 static int sortmode;           /* sort_mode */


@@ -795,7 +796,7 @@ file_comparison(int argc, char *argv[])
     int i, n;
 
     memset(heads, 0, sizeof(heads));
     int i, n;
 
     memset(heads, 0, sizeof(heads));

-    dump_init((char *) 0, F_LITERAL, S_TERMINFO, 0, itrace, FALSE);
+    dump_init((char *) 0, F_LITERAL, S_TERMINFO, 0, 65535, itrace, FALSE);

 
     for (n = 0; n < argc && n < MAXCOMPARE; n++) {
        if (freopen(argv[n], "r", stdin) == 0)
 
     for (n = 0; n < argc && n < MAXCOMPARE; n++) {
        if (freopen(argv[n], "r", stdin) == 0)


@@ -974,6 +975,7 @@ usage(void)
        "Usage: infocmp [options] [-A directory] [-B directory] [termname...]"
        ,""
        ,"Options:"
        "Usage: infocmp [options] [-A directory] [-B directory] [termname...]"
        ,""
        ,"Options:"

+       ,"  -0    print single-row"

        ,"  -1    print single-column"
        ,"  -K    use termcap-names and BSD syntax"
        ,"  -C    use termcap-names"
        ,"  -1    print single-column"
        ,"  -K    use termcap-names and BSD syntax"
        ,"  -C    use termcap-names"


@@ -1300,8 +1302,13 @@ main(int argc, char *argv[])
 
     while ((c = getopt(argc,
                       argv,
 
     while ((c = getopt(argc,
                       argv,

-                      "1A:aB:CcdEeFfGgIiKLlnpqR:rs:TtUuVv:w:x")) != -1) {
+                      "01A:aB:CcdEeFfGgIiKLlnpqR:rs:TtUuVv:w:x")) != -1) {

        switch (c) {
        switch (c) {

+       case '0':
+           mwidth = 65535;
+           mheight = 1;
+           break;
+

        case '1':
            mwidth = 0;
            break;
        case '1':
            mwidth = 0;
            break;


@@ -1483,7 +1490,7 @@ main(int argc, char *argv[])
        sortmode = S_TERMINFO;
 
     /* set up for display */
        sortmode = S_TERMINFO;
 
     /* set up for display */

-    dump_init(tversion, outform, sortmode, mwidth, itrace, formatted);
+    dump_init(tversion, outform, sortmode, mwidth, mheight, itrace, formatted);

 
     /* make sure we have at least one terminal name to work with */
     if (optind >= argc)
 
     /* make sure we have at least one terminal name to work with */
     if (optind >= argc)

diff --git a/progs/tic.c b/progs/tic.c
index be0a36356c2209694d82ce078f261b592e4092b0..1b0e8683e04bb01691afe62048907aa6a4d4e027 100644 (file)
--- a/progs/tic.c
+++ b/progs/tic.c
@@ -44,7 +44,7 @@
 #include <dump_entry.h>
 #include <transform.h>
 
 #include <dump_entry.h>
 #include <transform.h>
 

-MODULE_ID("$Id: tic.c,v 1.151 2011/07/30 21:49:32 tom Exp $")
+MODULE_ID("$Id: tic.c,v 1.152 2011/08/06 17:41:36 tom Exp $")

 
 const char *_nc_progname = "tic";
 
 
 const char *_nc_progname = "tic";
 


@@ -489,6 +489,7 @@ main(int argc, char *argv[])
     int sortmode = S_TERMINFO; /* sort_mode */
 
     int width = 60;
     int sortmode = S_TERMINFO; /* sort_mode */
 
     int width = 60;

+    int height = 65535;

     bool formatted = FALSE;    /* reformat complex strings? */
     bool literal = FALSE;      /* suppress post-processing? */
     int numbers = 0;           /* format "%'char'" to/from "%{number}" */
     bool formatted = FALSE;    /* reformat complex strings? */
     bool literal = FALSE;      /* suppress post-processing? */
     int numbers = 0;           /* format "%'char'" to/from "%{number}" */


@@ -534,10 +535,19 @@ main(int argc, char *argv[])
                width = (width * 10) + (this_opt - '0');
                break;
            default:
                width = (width * 10) + (this_opt - '0');
                break;
            default:

-               if (this_opt != '1')
+               switch (this_opt) {
+               case '0':
+                   last_opt = this_opt;
+                   width = 65535;
+                   height = 1;
+                   break;
+               case '1':
+                   last_opt = this_opt;
+                   width = 0;
+                   break;
+               default:

                    usage();
                    usage();

-               last_opt = this_opt;
-               width = 0;
+               }

            }
            continue;
        }
            }
            continue;
        }


@@ -702,11 +712,11 @@ main(int argc, char *argv[])
                  smart_defaults
                  ? outform
                  : F_LITERAL,
                  smart_defaults
                  ? outform
                  : F_LITERAL,

-                 sortmode, width, debug_level, formatted);
+                 sortmode, width, height, debug_level, formatted);

     else if (capdump)
        dump_init(tversion,
                  outform,
     else if (capdump)
        dump_init(tversion,
                  outform,

-                 sortmode, width, debug_level, FALSE);
+                 sortmode, width, height, debug_level, FALSE);

 
     /* parse entries out of the source file */
     _nc_set_source(source_file);
 
     /* parse entries out of the source file */
     _nc_set_source(source_file);

diff --git a/progs/toe.c b/progs/toe.c
index eff8cc84f24163c50aa6b88107d36cde952be90a..3d35fcd3f08143618d141ec56eeda14da9e483d1 100644 (file)
--- a/progs/toe.c
+++ b/progs/toe.c
@@ -44,7 +44,7 @@
 #include <hashed_db.h>
 #endif
 
 #include <hashed_db.h>
 #endif
 

-MODULE_ID("$Id: toe.c,v 1.54 2011/05/21 18:32:13 tom Exp $")
+MODULE_ID("$Id: toe.c,v 1.58 2011/08/07 18:36:31 tom Exp $")

 
 #define isDotname(name) (!strcmp(name, ".") || !strcmp(name, ".."))
 
 
 #define isDotname(name) (!strcmp(name, ".") || !strcmp(name, ".."))
 


@@ -181,8 +181,10 @@ typelist(int eargc, char *eargv[],
                (void) fprintf(stderr,
                               "%s: can't open terminfo directory %s\n",
                               _nc_progname, eargv[i]);
                (void) fprintf(stderr,
                               "%s: can't open terminfo directory %s\n",
                               _nc_progname, eargv[i]);

-               return (EXIT_FAILURE);
-           } else if (verbosity)
+               continue;
+           }
+
+           if (verbosity)

                (void) printf("#\n#%s:\n#\n", eargv[i]);
 
            while ((subdir = readdir(termdir)) != 0) {
                (void) printf("#\n#%s:\n#\n", eargv[i]);
 
            while ((subdir = readdir(termdir)) != 0) {


@@ -244,12 +246,16 @@ typelist(int eargc, char *eargv[],
            closedir(termdir);
            if (cwd_buf != 0)
                free(cwd_buf);
            closedir(termdir);
            if (cwd_buf != 0)
                free(cwd_buf);

+           continue;

        }
 #if USE_HASHED_DB
        else {
            DB *capdbp;
            char filename[PATH_MAX];
 
        }
 #if USE_HASHED_DB
        else {
            DB *capdbp;
            char filename[PATH_MAX];
 

+           if (verbosity)
+               (void) printf("#\n#%s:\n#\n", eargv[i]);
+

            if (make_db_name(filename, eargv[i], sizeof(filename))) {
                if ((capdbp = _nc_db_open(filename, FALSE)) != 0) {
                    DBT key, data;
            if (make_db_name(filename, eargv[i], sizeof(filename))) {
                if ((capdbp = _nc_db_open(filename, FALSE)) != 0) {
                    DBT key, data;


@@ -275,6 +281,7 @@ typelist(int eargc, char *eargv[],
                    }
 
                    _nc_db_close(capdbp);
                    }
 
                    _nc_db_close(capdbp);

+                   continue;

                }
            }
        }
                }
            }
        }


@@ -282,30 +289,36 @@ typelist(int eargc, char *eargv[],
 #endif
 #if USE_TERMCAP
 #if HAVE_BSD_CGETENT
 #endif
 #if USE_TERMCAP
 #if HAVE_BSD_CGETENT

-       char *db_array[2];
-       char *buffer = 0;
+       {
+           CGETENT_CONST char *db_array[2];
+           char *buffer = 0;

 
 

-       if (verbosity)
-           (void) printf("#\n#%s:\n#\n", eargv[i]);
+           if (verbosity)
+               (void) printf("#\n#%s:\n#\n", eargv[i]);

 
 

-       db_array[0] = eargv[i];
-       db_array[1] = 0;
+           db_array[0] = eargv[i];
+           db_array[1] = 0;

 
 

-       if (cgetfirst(&buffer, db_array)) {
-           show_termcap(buffer, hook);
-           free(buffer);
-           while (cgetnext(&buffer, db_array)) {
+           if (cgetfirst(&buffer, db_array) > 0) {

                show_termcap(buffer, hook);
                free(buffer);
                show_termcap(buffer, hook);
                free(buffer);

+               while (cgetnext(&buffer, db_array) > 0) {
+                   show_termcap(buffer, hook);
+                   free(buffer);
+               }
+               cgetclose();
+               continue;

            }
        }
            }
        }

-       cgetclose();

 #else
        /* scan termcap text-file only */
        if (_nc_is_file_path(eargv[i])) {
            char buffer[2048];
            FILE *fp;
 
 #else
        /* scan termcap text-file only */
        if (_nc_is_file_path(eargv[i])) {
            char buffer[2048];
            FILE *fp;
 

+           if (verbosity)
+               (void) printf("#\n#%s:\n#\n", eargv[i]);
+

            if ((fp = fopen(eargv[i], "r")) != 0) {
                while (fgets(buffer, sizeof(buffer), fp) != 0) {
                    if (*buffer == '#')
            if ((fp = fopen(eargv[i], "r")) != 0) {
                while (fgets(buffer, sizeof(buffer), fp) != 0) {
                    if (*buffer == '#')

diff --git a/test/aclocal.m4 b/test/aclocal.m4
index 29ca2b4ac8ffba329226c320e7c745a63270aa64..037414ecef824db8208c573f9b9ffcbfa71365f6 100644 (file)
--- a/test/aclocal.m4
+++ b/test/aclocal.m4
@@ -26,7 +26,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.63 2011/07/02 20:36:41 tom Exp $
+dnl $Id: aclocal.m4,v 1.64 2011/08/07 00:40:42 tom Exp $

 dnl
 dnl Author: Thomas E. Dickey
 dnl
 dnl
 dnl Author: Thomas E. Dickey
 dnl


@@ -2910,7 +2910,7 @@ AC_TRY_LINK([
 test $cf_cv_need_xopen_extension = yes && CPPFLAGS="$CPPFLAGS -D_XOPEN_SOURCE_EXTENDED"
 ])dnl
 dnl ---------------------------------------------------------------------------
 test $cf_cv_need_xopen_extension = yes && CPPFLAGS="$CPPFLAGS -D_XOPEN_SOURCE_EXTENDED"
 ])dnl
 dnl ---------------------------------------------------------------------------

-dnl CF_XOPEN_SOURCE version: 36 updated: 2011/07/02 15:36:04
+dnl CF_XOPEN_SOURCE version: 37 updated: 2011/08/06 20:32:05

 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,


@@ -2962,7 +2962,7 @@ mirbsd*) #(vi
        # setting _XOPEN_SOURCE or _POSIX_SOURCE breaks <arpa/inet.h>
        ;;
 netbsd*) #(vi
        # setting _XOPEN_SOURCE or _POSIX_SOURCE breaks <arpa/inet.h>
        ;;
 netbsd*) #(vi

-       # setting _XOPEN_SOURCE breaks IPv6 for lynx on NetBSD 1.6, breaks xterm, is not needed for ncursesw
+       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*) #(vi
        # setting _XOPEN_SOURCE breaks xterm on OpenBSD 2.8, is not needed for ncursesw
        ;;
 openbsd*) #(vi
        # setting _XOPEN_SOURCE breaks xterm on OpenBSD 2.8, is not needed for ncursesw


@@ -3153,7 +3153,7 @@ elif test "$cf_x_athena_inc" != default ; then
 fi
 ])
 dnl ---------------------------------------------------------------------------
 fi
 ])
 dnl ---------------------------------------------------------------------------

-dnl CF_X_ATHENA_LIBS version: 10 updated: 2011/02/13 13:31:33
+dnl CF_X_ATHENA_LIBS version: 12 updated: 2011/07/17 19:55:02

 dnl ----------------
 dnl Normally invoked by CF_X_ATHENA, with $1 set to the appropriate flavor of
 dnl the Athena widgets, e.g., Xaw, Xaw3d, neXtaw.
 dnl ----------------
 dnl Normally invoked by CF_X_ATHENA, with $1 set to the appropriate flavor of
 dnl the Athena widgets, e.g., Xaw, Xaw3d, neXtaw.


@@ -3169,19 +3169,24 @@ for cf_path in default \
        /usr/local
 do
        for cf_lib in \
        /usr/local
 do
        for cf_lib in \

-               "-l$cf_x_athena_root -lXmu" \
-               "-l$cf_x_athena_root -lXpm -lXmu" \
-               "-l${cf_x_athena_root}_s -lXmu_s"
+               ${cf_x_athena_root} \
+               ${cf_x_athena_root}7 \
+               ${cf_x_athena_root}6
+       do
+       for cf_libs in \
+               "-l$cf_lib -lXmu" \
+               "-l$cf_lib -lXpm -lXmu" \
+               "-l${cf_lib}_s -lXmu_s"

        do
                if test -z "$cf_x_athena_lib" ; then
                        cf_save="$LIBS"
                        cf_test=XawSimpleMenuAddGlobalActions
                        if test $cf_path != default ; then
        do
                if test -z "$cf_x_athena_lib" ; then
                        cf_save="$LIBS"
                        cf_test=XawSimpleMenuAddGlobalActions
                        if test $cf_path != default ; then

-                               CF_ADD_LIBS(-L$cf_path/lib $cf_lib)
-                               AC_MSG_CHECKING(for $cf_lib in $cf_path)
+                               CF_ADD_LIBS(-L$cf_path/lib $cf_libs)
+                               AC_MSG_CHECKING(for $cf_libs in $cf_path)

                        else
                        else

-                               CF_ADD_LIBS($cf_lib)
-                               AC_MSG_CHECKING(for $cf_test in $cf_lib)
+                               CF_ADD_LIBS($cf_libs)
+                               AC_MSG_CHECKING(for $cf_test in $cf_libs)

                        fi
                        AC_TRY_LINK([
 #include <X11/Intrinsic.h>
                        fi
                        AC_TRY_LINK([
 #include <X11/Intrinsic.h>


@@ -3192,12 +3197,14 @@ $cf_test((XtAppContext) 0)],
                                [cf_result=no])
                        AC_MSG_RESULT($cf_result)
                        if test "$cf_result" = yes ; then
                                [cf_result=no])
                        AC_MSG_RESULT($cf_result)
                        if test "$cf_result" = yes ; then

-                               cf_x_athena_lib="$cf_lib"
+                               cf_x_athena_lib="$cf_libs"

                                break
                        fi
                        LIBS="$cf_save"
                fi
                                break
                        fi
                        LIBS="$cf_save"
                fi

-       done
+       done # cf_libs
+               test -n "$cf_x_athena_lib" && break
+       done # cf_lib

 done
 
 if test -z "$cf_x_athena_lib" ; then
 done
 
 if test -z "$cf_x_athena_lib" ; then

diff --git a/test/configure b/test/configure
index a1e200b42f441d87327f224ba7c54f09f1a4e319..d0b975ae25bb5e8d6264ccf767448da9a1ab9c3c 100755 (executable)
--- a/test/configure
+++ b/test/configure
@@ -3027,7 +3027,7 @@ mirbsd*) #(vi
        # setting _XOPEN_SOURCE or _POSIX_SOURCE breaks <arpa/inet.h>
        ;;
 netbsd*) #(vi
        # setting _XOPEN_SOURCE or _POSIX_SOURCE breaks <arpa/inet.h>
        ;;
 netbsd*) #(vi

-       # setting _XOPEN_SOURCE breaks IPv6 for lynx on NetBSD 1.6, breaks xterm, is not needed for ncursesw
+       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*) #(vi
        # setting _XOPEN_SOURCE breaks xterm on OpenBSD 2.8, is not needed for ncursesw
        ;;
 openbsd*) #(vi
        # setting _XOPEN_SOURCE breaks xterm on OpenBSD 2.8, is not needed for ncursesw


@@ -12034,24 +12034,29 @@ for cf_path in default \
        /usr/local
 do
        for cf_lib in \
        /usr/local
 do
        for cf_lib in \

-               "-l$cf_x_athena_root -lXmu" \
-               "-l$cf_x_athena_root -lXpm -lXmu" \
-               "-l${cf_x_athena_root}_s -lXmu_s"
+               ${cf_x_athena_root} \
+               ${cf_x_athena_root}7 \
+               ${cf_x_athena_root}6
+       do
+       for cf_libs in \
+               "-l$cf_lib -lXmu" \
+               "-l$cf_lib -lXpm -lXmu" \
+               "-l${cf_lib}_s -lXmu_s"

        do
                if test -z "$cf_x_athena_lib" ; then
                        cf_save="$LIBS"
                        cf_test=XawSimpleMenuAddGlobalActions
                        if test $cf_path != default ; then
        do
                if test -z "$cf_x_athena_lib" ; then
                        cf_save="$LIBS"
                        cf_test=XawSimpleMenuAddGlobalActions
                        if test $cf_path != default ; then

-                               LIBS="-L$cf_path/lib $cf_lib $LIBS"
-                               echo "$as_me:12046: checking for $cf_lib in $cf_path" >&5
-echo $ECHO_N "checking for $cf_lib in $cf_path... $ECHO_C" >&6
+                               LIBS="-L$cf_path/lib $cf_libs $LIBS"
+                               echo "$as_me:12051: checking for $cf_libs in $cf_path" >&5
+echo $ECHO_N "checking for $cf_libs in $cf_path... $ECHO_C" >&6

                        else
                        else

-                               LIBS="$cf_lib $LIBS"
-                               echo "$as_me:12050: checking for $cf_test in $cf_lib" >&5
-echo $ECHO_N "checking for $cf_test in $cf_lib... $ECHO_C" >&6
+                               LIBS="$cf_libs $LIBS"
+                               echo "$as_me:12055: checking for $cf_test in $cf_libs" >&5
+echo $ECHO_N "checking for $cf_test in $cf_libs... $ECHO_C" >&6

                        fi
                        cat >conftest.$ac_ext <<_ACEOF
                        fi
                        cat >conftest.$ac_ext <<_ACEOF

-#line 12054 "configure"
+#line 12059 "configure"

 #include "confdefs.h"
 
 #include <X11/Intrinsic.h>
 #include "confdefs.h"
 
 #include <X11/Intrinsic.h>


@@ -12067,16 +12072,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:12070: \"$ac_link\"") >&5
+if { (eval echo "$as_me:12075: \"$ac_link\"") >&5

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

-  echo "$as_me:12073: \$? = $ac_status" >&5
+  echo "$as_me:12078: \$? = $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:12076: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12081: \"$ac_try\"") >&5

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

-  echo "$as_me:12079: \$? = $ac_status" >&5
+  echo "$as_me:12084: \$? = $ac_status" >&5

   (exit $ac_status); }; }; then
   cf_result=yes
 else
   (exit $ac_status); }; }; then
   cf_result=yes
 else


@@ -12085,19 +12090,21 @@ 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:12088: result: $cf_result" >&5
+                       echo "$as_me:12093: 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

-                               cf_x_athena_lib="$cf_lib"
+                               cf_x_athena_lib="$cf_libs"

                                break
                        fi
                        LIBS="$cf_save"
                fi
                                break
                        fi
                        LIBS="$cf_save"
                fi

-       done
+       done # cf_libs
+               test -n "$cf_x_athena_lib" && break
+       done # cf_lib

 done
 
 if test -z "$cf_x_athena_lib" ; then
 done
 
 if test -z "$cf_x_athena_lib" ; then

-       { { echo "$as_me:12100: error: Unable to successfully link Athena library (-l$cf_x_athena_root) with test program" >&5
+       { { echo "$as_me:12107: 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


@@ -12114,7 +12121,7 @@ for ac_prog in xcurses-config
 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:12117: checking for $ac_word" >&5
+echo "$as_me:12124: checking for $ac_word" >&5

 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_path_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_path_XCURSES_CONFIG+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6


@@ -12131,7 +12138,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_XCURSES_CONFIG="$ac_dir/$ac_word"
   test -z "$ac_dir" && ac_dir=.
   if $as_executable_p "$ac_dir/$ac_word"; then
    ac_cv_path_XCURSES_CONFIG="$ac_dir/$ac_word"

-   echo "$as_me:12134: found $ac_dir/$ac_word" >&5
+   echo "$as_me:12141: found $ac_dir/$ac_word" >&5

    break
 fi
 done
    break
 fi
 done


@@ -12142,10 +12149,10 @@ fi
 XCURSES_CONFIG=$ac_cv_path_XCURSES_CONFIG
 
 if test -n "$XCURSES_CONFIG"; then
 XCURSES_CONFIG=$ac_cv_path_XCURSES_CONFIG
 
 if test -n "$XCURSES_CONFIG"; then

-  echo "$as_me:12145: result: $XCURSES_CONFIG" >&5
+  echo "$as_me:12152: result: $XCURSES_CONFIG" >&5

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

-  echo "$as_me:12148: result: no" >&5
+  echo "$as_me:12155: result: no" >&5

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


@@ -12166,7 +12173,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}:12169: testing checking additions to CFLAGS ..." 1>&5
+echo "${as_me:-configure}:12176: testing checking additions to CFLAGS ..." 1>&5

 
 cf_check_cflags="$CFLAGS"
 cf_check_cppflags="$CPPFLAGS"
 
 cf_check_cflags="$CFLAGS"
 cf_check_cppflags="$CPPFLAGS"


@@ -12237,7 +12244,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}:12240: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
+echo "${as_me:-configure}:12247: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5

 
        CFLAGS="$CFLAGS $cf_new_cflags"
 fi
 
        CFLAGS="$CFLAGS $cf_new_cflags"
 fi


@@ -12245,7 +12252,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}:12248: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
+echo "${as_me:-configure}:12255: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5

 
        CPPFLAGS="$CPPFLAGS $cf_new_cppflags"
 fi
 
        CPPFLAGS="$CPPFLAGS $cf_new_cppflags"
 fi


@@ -12253,14 +12260,14 @@ 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}:12256: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5
+echo "${as_me:-configure}:12263: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5

 
        EXTRA_CPPFLAGS="$cf_new_extra_cppflags $EXTRA_CPPFLAGS"
 fi
 
 if test "$cf_check_cflags" != "$CFLAGS" ; then
 cat >conftest.$ac_ext <<_ACEOF
 
        EXTRA_CPPFLAGS="$cf_new_extra_cppflags $EXTRA_CPPFLAGS"
 fi
 
 if test "$cf_check_cflags" != "$CFLAGS" ; then
 cat >conftest.$ac_ext <<_ACEOF

-#line 12263 "configure"
+#line 12270 "configure"

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


@@ -12272,16 +12279,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:12275: \"$ac_link\"") >&5
+if { (eval echo "$as_me:12282: \"$ac_link\"") >&5

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

-  echo "$as_me:12278: \$? = $ac_status" >&5
+  echo "$as_me:12285: \$? = $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:12281: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12288: \"$ac_try\"") >&5

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

-  echo "$as_me:12284: \$? = $ac_status" >&5
+  echo "$as_me:12291: \$? = $ac_status" >&5

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


@@ -12289,12 +12296,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}:12292: testing test-compile failed.  Undoing change to \$CFLAGS ..." 1>&5
+echo "${as_me:-configure}:12299: testing test-compile failed.  Undoing change to \$CFLAGS ..." 1>&5

 
         if test "$cf_check_cppflags" != "$CPPFLAGS" ; then
                 test -n "$verbose" && echo "   but keeping change to \$CPPFLAGS" 1>&6
 
 
         if test "$cf_check_cppflags" != "$CPPFLAGS" ; then
                 test -n "$verbose" && echo "   but keeping change to \$CPPFLAGS" 1>&6
 

-echo "${as_me:-configure}:12297: testing but keeping change to \$CPPFLAGS ..." 1>&5
+echo "${as_me:-configure}:12304: testing but keeping change to \$CPPFLAGS ..." 1>&5

 
         fi
         CFLAGS="$cf_check_flags"
 
         fi
         CFLAGS="$cf_check_flags"


@@ -12302,7 +12309,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:12305: checking for XOpenDisplay in -lX11" >&5
+echo "$as_me:12312: 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


@@ -12310,7 +12317,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 12313 "configure"
+#line 12320 "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.  */


@@ -12329,16 +12336,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:12332: \"$ac_link\"") >&5
+if { (eval echo "$as_me:12339: \"$ac_link\"") >&5

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

-  echo "$as_me:12335: \$? = $ac_status" >&5
+  echo "$as_me:12342: \$? = $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:12338: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12345: \"$ac_try\"") >&5

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

-  echo "$as_me:12341: \$? = $ac_status" >&5
+  echo "$as_me:12348: \$? = $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


@@ -12349,13 +12356,13 @@ 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:12352: result: $ac_cv_lib_X11_XOpenDisplay" >&5
+echo "$as_me:12359: 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
   LIBS="-lX11 $LIBS"
 fi
 
 echo "${ECHO_T}$ac_cv_lib_X11_XOpenDisplay" >&6
 if test $ac_cv_lib_X11_XOpenDisplay = yes; then
   LIBS="-lX11 $LIBS"
 fi
 

-echo "$as_me:12358: checking for XCurses library" >&5
+echo "$as_me:12365: 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


@@ -12363,7 +12370,7 @@ else
 
 LIBS="-lXCurses $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
 
 LIBS="-lXCurses $LIBS"
 cat >conftest.$ac_ext <<_ACEOF

-#line 12366 "configure"
+#line 12373 "configure"

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


@@ -12378,16 +12385,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:12381: \"$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:12384: \$? = $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:12387: \"$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:12390: \$? = $ac_status" >&5
+  echo "$as_me:12397: \$? = $ac_status" >&5

   (exit $ac_status); }; }; then
   cf_cv_lib_XCurses=yes
 else
   (exit $ac_status); }; }; then
   cf_cv_lib_XCurses=yes
 else


@@ -12398,7 +12405,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:12401: result: $cf_cv_lib_XCurses" >&5
+echo "$as_me:12408: result: $cf_cv_lib_XCurses" >&5

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


@@ -12412,23 +12419,23 @@ EOF
 #define XCURSES 1
 EOF
 
 #define XCURSES 1
 EOF
 

-       echo "$as_me:12415: checking for xcurses.h" >&5
+       echo "$as_me:12422: 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 12421 "configure"
+#line 12428 "configure"

 #include "confdefs.h"
 #include <xcurses.h>
 _ACEOF
 #include "confdefs.h"
 #include <xcurses.h>
 _ACEOF

-if { (eval echo "$as_me:12425: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:12432: \"$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:12431: \$? = $ac_status" >&5
+  echo "$as_me:12438: \$? = $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


@@ -12447,7 +12454,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
 fi
 rm -f conftest.err conftest.$ac_ext
 fi

-echo "$as_me:12450: result: $ac_cv_header_xcurses_h" >&5
+echo "$as_me:12457: 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
   cat >>confdefs.h <<\EOF
 echo "${ECHO_T}$ac_cv_header_xcurses_h" >&6
 if test $ac_cv_header_xcurses_h = yes; then
   cat >>confdefs.h <<\EOF


@@ -12457,7 +12464,7 @@ EOF
 fi
 
 else
 fi
 
 else

-       { { echo "$as_me:12460: error: Cannot link with XCurses" >&5
+       { { echo "$as_me:12467: 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


@@ -12472,7 +12479,7 @@ pdcurses) #(vi
        # look for curses-related libraries
 
 as_ac_Lib=`echo "ac_cv_lib_panel$cf_cv_libtype''_new_panel" | $as_tr_sh`
        # look for curses-related libraries
 
 as_ac_Lib=`echo "ac_cv_lib_panel$cf_cv_libtype''_new_panel" | $as_tr_sh`

-echo "$as_me:12475: checking for new_panel in -lpanel$cf_cv_libtype" >&5
+echo "$as_me:12482: checking for new_panel in -lpanel$cf_cv_libtype" >&5

 echo $ECHO_N "checking for new_panel in -lpanel$cf_cv_libtype... $ECHO_C" >&6
 if eval "test \"\${$as_ac_Lib+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 echo $ECHO_N "checking for new_panel in -lpanel$cf_cv_libtype... $ECHO_C" >&6
 if eval "test \"\${$as_ac_Lib+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6


@@ -12480,7 +12487,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lpanel$cf_cv_libtype  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lpanel$cf_cv_libtype  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF

-#line 12483 "configure"
+#line 12490 "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.  */


@@ -12499,16 +12506,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:12502: \"$ac_link\"") >&5
+if { (eval echo "$as_me:12509: \"$ac_link\"") >&5

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

-  echo "$as_me:12505: \$? = $ac_status" >&5
+  echo "$as_me:12512: \$? = $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:12508: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12515: \"$ac_try\"") >&5

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

-  echo "$as_me:12511: \$? = $ac_status" >&5
+  echo "$as_me:12518: \$? = $ac_status" >&5

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


@@ -12519,7 +12526,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:12522: result: `eval echo '${'$as_ac_Lib'}'`" >&5
+echo "$as_me:12529: 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
   cat >>confdefs.h <<EOF
 echo "${ECHO_T}`eval echo '${'$as_ac_Lib'}'`" >&6
 if test `eval echo '${'$as_ac_Lib'}'` = yes; then
   cat >>confdefs.h <<EOF


@@ -12531,7 +12538,7 @@ EOF
 fi
 
 as_ac_Lib=`echo "ac_cv_lib_menu$cf_cv_libtype''_menu_driver" | $as_tr_sh`
 fi
 
 as_ac_Lib=`echo "ac_cv_lib_menu$cf_cv_libtype''_menu_driver" | $as_tr_sh`

-echo "$as_me:12534: checking for menu_driver in -lmenu$cf_cv_libtype" >&5
+echo "$as_me:12541: checking for menu_driver in -lmenu$cf_cv_libtype" >&5

 echo $ECHO_N "checking for menu_driver in -lmenu$cf_cv_libtype... $ECHO_C" >&6
 if eval "test \"\${$as_ac_Lib+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 echo $ECHO_N "checking for menu_driver in -lmenu$cf_cv_libtype... $ECHO_C" >&6
 if eval "test \"\${$as_ac_Lib+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6


@@ -12539,7 +12546,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lmenu$cf_cv_libtype  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lmenu$cf_cv_libtype  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF

-#line 12542 "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.  */


@@ -12558,16 +12565,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:12561: \"$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:12564: \$? = $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:12567: \"$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:12570: \$? = $ac_status" >&5
+  echo "$as_me:12577: \$? = $ac_status" >&5

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


@@ -12578,7 +12585,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:12581: result: `eval echo '${'$as_ac_Lib'}'`" >&5
+echo "$as_me:12588: 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
   cat >>confdefs.h <<EOF
 echo "${ECHO_T}`eval echo '${'$as_ac_Lib'}'`" >&6
 if test `eval echo '${'$as_ac_Lib'}'` = yes; then
   cat >>confdefs.h <<EOF


@@ -12590,7 +12597,7 @@ EOF
 fi
 
 as_ac_Lib=`echo "ac_cv_lib_form$cf_cv_libtype''_form_driver" | $as_tr_sh`
 fi
 
 as_ac_Lib=`echo "ac_cv_lib_form$cf_cv_libtype''_form_driver" | $as_tr_sh`

-echo "$as_me:12593: checking for form_driver in -lform$cf_cv_libtype" >&5
+echo "$as_me:12600: checking for form_driver in -lform$cf_cv_libtype" >&5

 echo $ECHO_N "checking for form_driver in -lform$cf_cv_libtype... $ECHO_C" >&6
 if eval "test \"\${$as_ac_Lib+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 echo $ECHO_N "checking for form_driver in -lform$cf_cv_libtype... $ECHO_C" >&6
 if eval "test \"\${$as_ac_Lib+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6


@@ -12598,7 +12605,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lform$cf_cv_libtype  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lform$cf_cv_libtype  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF

-#line 12601 "configure"
+#line 12608 "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.  */


@@ -12617,16 +12624,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:12620: \"$ac_link\"") >&5
+if { (eval echo "$as_me:12627: \"$ac_link\"") >&5

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

-  echo "$as_me:12623: \$? = $ac_status" >&5
+  echo "$as_me:12630: \$? = $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:12626: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12633: \"$ac_try\"") >&5

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

-  echo "$as_me:12629: \$? = $ac_status" >&5
+  echo "$as_me:12636: \$? = $ac_status" >&5

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


@@ -12637,7 +12644,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:12640: result: `eval echo '${'$as_ac_Lib'}'`" >&5
+echo "$as_me:12647: 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
   cat >>confdefs.h <<EOF
 echo "${ECHO_T}`eval echo '${'$as_ac_Lib'}'`" >&6
 if test `eval echo '${'$as_ac_Lib'}'` = yes; then
   cat >>confdefs.h <<EOF


@@ -12660,23 +12667,23 @@ for ac_header in \
 
 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:12663: checking for $ac_header" >&5
+echo "$as_me:12670: 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 12669 "configure"
+#line 12676 "configure"

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

-if { (eval echo "$as_me:12673: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:12680: \"$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:12679: \$? = $ac_status" >&5
+  echo "$as_me:12686: \$? = $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


@@ -12695,7 +12702,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
 fi
 rm -f conftest.err conftest.$ac_ext
 fi

-echo "$as_me:12698: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:12705: 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


@@ -12708,13 +12715,13 @@ done
        ;;
 esac
 
        ;;
 esac
 

-echo "$as_me:12711: checking return type of signal handlers" >&5
+echo "$as_me:12718: checking return type of signal handlers" >&5

 echo $ECHO_N "checking return type of signal handlers... $ECHO_C" >&6
 if test "${ac_cv_type_signal+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 echo $ECHO_N "checking return type of signal handlers... $ECHO_C" >&6
 if test "${ac_cv_type_signal+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF

-#line 12717 "configure"
+#line 12724 "configure"

 #include "confdefs.h"
 #include <sys/types.h>
 #include <signal.h>
 #include "confdefs.h"
 #include <sys/types.h>
 #include <signal.h>


@@ -12736,16 +12743,16 @@ int i;
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

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

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

-  echo "$as_me:12742: \$? = $ac_status" >&5
+  echo "$as_me:12749: \$? = $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:12745: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12752: \"$ac_try\"") >&5

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

-  echo "$as_me:12748: \$? = $ac_status" >&5
+  echo "$as_me:12755: \$? = $ac_status" >&5

   (exit $ac_status); }; }; then
   ac_cv_type_signal=void
 else
   (exit $ac_status); }; }; then
   ac_cv_type_signal=void
 else


@@ -12755,20 +12762,20 @@ ac_cv_type_signal=int
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi

-echo "$as_me:12758: result: $ac_cv_type_signal" >&5
+echo "$as_me:12765: result: $ac_cv_type_signal" >&5

 echo "${ECHO_T}$ac_cv_type_signal" >&6
 
 cat >>confdefs.h <<EOF
 #define RETSIGTYPE $ac_cv_type_signal
 EOF
 
 echo "${ECHO_T}$ac_cv_type_signal" >&6
 
 cat >>confdefs.h <<EOF
 #define RETSIGTYPE $ac_cv_type_signal
 EOF
 

-echo "$as_me:12765: checking for ANSI C header files" >&5
+echo "$as_me:12772: 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 12771 "configure"
+#line 12778 "configure"

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


@@ -12776,13 +12783,13 @@ else
 #include <float.h>
 
 _ACEOF
 #include <float.h>
 
 _ACEOF

-if { (eval echo "$as_me:12779: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:12786: \"$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:12785: \$? = $ac_status" >&5
+  echo "$as_me:12792: \$? = $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


@@ -12804,7 +12811,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 12807 "configure"
+#line 12814 "configure"

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


@@ -12822,7 +12829,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 12825 "configure"
+#line 12832 "configure"

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


@@ -12843,7 +12850,7 @@ if test $ac_cv_header_stdc = yes; then
   :
 else
   cat >conftest.$ac_ext <<_ACEOF
   :
 else
   cat >conftest.$ac_ext <<_ACEOF

-#line 12846 "configure"
+#line 12853 "configure"

 #include "confdefs.h"
 #include <ctype.h>
 #if ((' ' & 0x0FF) == 0x020)
 #include "confdefs.h"
 #include <ctype.h>
 #if ((' ' & 0x0FF) == 0x020)


@@ -12869,15 +12876,15 @@ main ()
 }
 _ACEOF
 rm -f conftest$ac_exeext
 }
 _ACEOF
 rm -f conftest$ac_exeext

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

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

-  echo "$as_me:12875: \$? = $ac_status" >&5
+  echo "$as_me:12882: \$? = $ac_status" >&5

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

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

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

-  echo "$as_me:12880: \$? = $ac_status" >&5
+  echo "$as_me:12887: \$? = $ac_status" >&5

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


@@ -12890,7 +12897,7 @@ rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 fi
 fi
 fi
 fi
 fi

-echo "$as_me:12893: result: $ac_cv_header_stdc" >&5
+echo "$as_me:12900: 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
 


@@ -12900,13 +12907,13 @@ EOF
 
 fi
 
 
 fi
 

-echo "$as_me:12903: checking whether time.h and sys/time.h may both be included" >&5
+echo "$as_me:12910: 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 12909 "configure"
+#line 12916 "configure"

 #include "confdefs.h"
 #include <sys/types.h>
 #include <sys/time.h>
 #include "confdefs.h"
 #include <sys/types.h>
 #include <sys/time.h>


@@ -12922,16 +12929,16 @@ return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

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

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

-  echo "$as_me:12928: \$? = $ac_status" >&5
+  echo "$as_me:12935: \$? = $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:12931: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12938: \"$ac_try\"") >&5

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

-  echo "$as_me:12934: \$? = $ac_status" >&5
+  echo "$as_me:12941: \$? = $ac_status" >&5

   (exit $ac_status); }; }; then
   ac_cv_header_time=yes
 else
   (exit $ac_status); }; }; then
   ac_cv_header_time=yes
 else


@@ -12941,7 +12948,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:12944: result: $ac_cv_header_time" >&5
+echo "$as_me:12951: 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
 


@@ -12964,23 +12971,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:12967: checking for $ac_header" >&5
+echo "$as_me:12974: 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 12973 "configure"
+#line 12980 "configure"

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

-if { (eval echo "$as_me:12977: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:12984: \"$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:12983: \$? = $ac_status" >&5
+  echo "$as_me:12990: \$? = $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


@@ -12999,7 +13006,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
 fi
 rm -f conftest.err conftest.$ac_ext
 fi

-echo "$as_me:13002: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:13009: 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


@@ -13012,23 +13019,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:13015: checking for $ac_header" >&5
+echo "$as_me:13022: 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 13021 "configure"
+#line 13028 "configure"

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

-if { (eval echo "$as_me:13025: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:13032: \"$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:13031: \$? = $ac_status" >&5
+  echo "$as_me:13038: \$? = $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


@@ -13047,7 +13054,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
 fi
 rm -f conftest.err conftest.$ac_ext
 fi

-echo "$as_me:13050: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:13057: 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


@@ -13057,7 +13064,7 @@ EOF
 fi
 done
 
 fi
 done
 

-echo "$as_me:13060: checking for header declaring getopt variables" >&5
+echo "$as_me:13067: 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


@@ -13067,7 +13074,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 13070 "configure"
+#line 13077 "configure"

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


@@ -13080,16 +13087,16 @@ int x = optind; char *y = optarg
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

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

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

-  echo "$as_me:13086: \$? = $ac_status" >&5
+  echo "$as_me:13093: \$? = $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:13089: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13096: \"$ac_try\"") >&5

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

-  echo "$as_me:13092: \$? = $ac_status" >&5
+  echo "$as_me:13099: \$? = $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


@@ -13101,7 +13108,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 done
 
 fi
 done
 
 fi

-echo "$as_me:13104: result: $cf_cv_getopt_header" >&5
+echo "$as_me:13111: result: $cf_cv_getopt_header" >&5

 echo "${ECHO_T}$cf_cv_getopt_header" >&6
 if test $cf_cv_getopt_header != none ; then
        cat >>confdefs.h <<\EOF
 echo "${ECHO_T}$cf_cv_getopt_header" >&6
 if test $cf_cv_getopt_header != none ; then
        cat >>confdefs.h <<\EOF


@@ -13116,13 +13123,13 @@ strdup \
 
 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:13119: checking for $ac_func" >&5
+echo "$as_me:13126: 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 13125 "configure"
+#line 13132 "configure"

 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */


@@ -13153,16 +13160,16 @@ f = $ac_func;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext

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

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

-  echo "$as_me:13159: \$? = $ac_status" >&5
+  echo "$as_me:13166: \$? = $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:13162: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13169: \"$ac_try\"") >&5

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

-  echo "$as_me:13165: \$? = $ac_status" >&5
+  echo "$as_me:13172: \$? = $ac_status" >&5

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


@@ -13172,7 +13179,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:13175: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "$as_me:13182: 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


@@ -13196,13 +13203,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:13199: checking for $ac_func" >&5
+echo "$as_me:13206: 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 13205 "configure"
+#line 13212 "configure"

 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */


@@ -13233,16 +13240,16 @@ f = $ac_func;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext

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

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

-  echo "$as_me:13239: \$? = $ac_status" >&5
+  echo "$as_me:13246: \$? = $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:13242: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13249: \"$ac_try\"") >&5

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

-  echo "$as_me:13245: \$? = $ac_status" >&5
+  echo "$as_me:13252: \$? = $ac_status" >&5

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


@@ -13252,7 +13259,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:13255: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "$as_me:13262: 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


@@ -13264,14 +13271,14 @@ done
 
 fi
 
 
 fi
 

-echo "$as_me:13267: checking if we must define _XOPEN_SOURCE_EXTENDED" >&5
+echo "$as_me:13274: checking if we must define _XOPEN_SOURCE_EXTENDED" >&5

 echo $ECHO_N "checking if we must define _XOPEN_SOURCE_EXTENDED... $ECHO_C" >&6
 if test "${cf_cv_need_xopen_extension+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 cat >conftest.$ac_ext <<_ACEOF
 echo $ECHO_N "checking if we must define _XOPEN_SOURCE_EXTENDED... $ECHO_C" >&6
 if test "${cf_cv_need_xopen_extension+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 cat >conftest.$ac_ext <<_ACEOF

-#line 13274 "configure"
+#line 13281 "configure"

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


@@ -13293,23 +13300,23 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext

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

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

-  echo "$as_me:13299: \$? = $ac_status" >&5
+  echo "$as_me:13306: \$? = $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:13302: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13309: \"$ac_try\"") >&5

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

-  echo "$as_me:13305: \$? = $ac_status" >&5
+  echo "$as_me:13312: \$? = $ac_status" >&5

   (exit $ac_status); }; }; then
   cf_cv_need_xopen_extension=no
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
 cat >conftest.$ac_ext <<_ACEOF
   (exit $ac_status); }; }; then
   cf_cv_need_xopen_extension=no
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
 cat >conftest.$ac_ext <<_ACEOF

-#line 13312 "configure"
+#line 13319 "configure"

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


@@ -13331,16 +13338,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext

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

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

-  echo "$as_me:13337: \$? = $ac_status" >&5
+  echo "$as_me:13344: \$? = $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:13340: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13347: \"$ac_try\"") >&5

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

-  echo "$as_me:13343: \$? = $ac_status" >&5
+  echo "$as_me:13350: \$? = $ac_status" >&5

   (exit $ac_status); }; }; then
   cf_cv_need_xopen_extension=yes
 else
   (exit $ac_status); }; }; then
   cf_cv_need_xopen_extension=yes
 else


@@ -13352,11 +13359,11 @@ 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:13355: result: $cf_cv_need_xopen_extension" >&5
+echo "$as_me:13362: result: $cf_cv_need_xopen_extension" >&5

 echo "${ECHO_T}$cf_cv_need_xopen_extension" >&6
 test $cf_cv_need_xopen_extension = yes && CPPFLAGS="$CPPFLAGS -D_XOPEN_SOURCE_EXTENDED"
 
 echo "${ECHO_T}$cf_cv_need_xopen_extension" >&6
 test $cf_cv_need_xopen_extension = yes && CPPFLAGS="$CPPFLAGS -D_XOPEN_SOURCE_EXTENDED"
 

-echo "$as_me:13359: checking for term.h" >&5
+echo "$as_me:13366: 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


@@ -13377,7 +13384,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 13380 "configure"
+#line 13387 "configure"

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


@@ -13391,16 +13398,16 @@ WINDOW *x
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

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

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

-  echo "$as_me:13397: \$? = $ac_status" >&5
+  echo "$as_me:13404: \$? = $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:13400: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13407: \"$ac_try\"") >&5

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

-  echo "$as_me:13403: \$? = $ac_status" >&5
+  echo "$as_me:13410: \$? = $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


@@ -13419,7 +13426,7 @@ no)
        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 13422 "configure"
+#line 13429 "configure"

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


@@ -13437,16 +13444,16 @@ WINDOW *x
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

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

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

-  echo "$as_me:13443: \$? = $ac_status" >&5
+  echo "$as_me:13450: \$? = $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:13446: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13453: \"$ac_try\"") >&5

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

-  echo "$as_me:13449: \$? = $ac_status" >&5
+  echo "$as_me:13456: \$? = $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


@@ -13461,7 +13468,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 esac
 
 fi
 esac
 
 fi

-echo "$as_me:13464: result: $cf_cv_term_header" >&5
+echo "$as_me:13471: result: $cf_cv_term_header" >&5

 echo "${ECHO_T}$cf_cv_term_header" >&6
 
 case $cf_cv_term_header in #(vi
 echo "${ECHO_T}$cf_cv_term_header" >&6
 
 case $cf_cv_term_header in #(vi


@@ -13485,7 +13492,7 @@ EOF
        ;;
 esac
 
        ;;
 esac
 

-echo "$as_me:13488: checking for unctrl.h" >&5
+echo "$as_me:13495: 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


@@ -13506,7 +13513,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 13509 "configure"
+#line 13516 "configure"

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


@@ -13520,16 +13527,16 @@ WINDOW *x
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

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

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

-  echo "$as_me:13526: \$? = $ac_status" >&5
+  echo "$as_me:13533: \$? = $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:13529: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13536: \"$ac_try\"") >&5

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

-  echo "$as_me:13532: \$? = $ac_status" >&5
+  echo "$as_me:13539: \$? = $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


@@ -13543,13 +13550,13 @@ done
 
 case $cf_cv_unctrl_header in #(vi
 no)
 
 case $cf_cv_unctrl_header in #(vi
 no)

-       { echo "$as_me:13546: WARNING: unctrl.h header not found" >&5
+       { echo "$as_me:13553: WARNING: unctrl.h header not found" >&5

 echo "$as_me: WARNING: unctrl.h header not found" >&2;}
        ;;
 esac
 
 fi
 echo "$as_me: WARNING: unctrl.h header not found" >&2;}
        ;;
 esac
 
 fi

-echo "$as_me:13552: result: $cf_cv_unctrl_header" >&5
+echo "$as_me:13559: result: $cf_cv_unctrl_header" >&5

 echo "${ECHO_T}$cf_cv_unctrl_header" >&6
 
 case $cf_cv_unctrl_header in #(vi
 echo "${ECHO_T}$cf_cv_unctrl_header" >&6
 
 case $cf_cv_unctrl_header in #(vi


@@ -13614,10 +13621,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:13617: checking for ${cf_func}" >&5
+       echo "$as_me:13624: 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}:13620: testing ${cf_func} ..." 1>&5
+echo "${as_me:-configure}:13627: 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


@@ -13626,7 +13633,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 13629 "configure"
+#line 13636 "configure"

 #include "confdefs.h"
 
 #ifdef HAVE_XCURSES
 #include "confdefs.h"
 
 #ifdef HAVE_XCURSES


@@ -13658,16 +13665,16 @@ if (foo + 1234 > 5678)
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext

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

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

-  echo "$as_me:13664: \$? = $ac_status" >&5
+  echo "$as_me:13671: \$? = $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:13667: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13674: \"$ac_try\"") >&5

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

-  echo "$as_me:13670: \$? = $ac_status" >&5
+  echo "$as_me:13677: \$? = $ac_status" >&5

   (exit $ac_status); }; }; then
   cf_result=yes
 else
   (exit $ac_status); }; }; then
   cf_result=yes
 else


@@ -13683,7 +13690,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:13686: result: $cf_result" >&5
+       echo "$as_me:13693: 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


@@ -13698,10 +13705,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:13701: checking for ${cf_func}" >&5
+       echo "$as_me:13708: 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}:13704: testing ${cf_func} ..." 1>&5
+echo "${as_me:-configure}:13711: 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


@@ -13710,7 +13717,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 13713 "configure"
+#line 13720 "configure"

 #include "confdefs.h"
 
 #ifdef HAVE_XCURSES
 #include "confdefs.h"
 
 #ifdef HAVE_XCURSES


@@ -13742,16 +13749,16 @@ if (foo + 1234 > 5678)
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext

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

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

-  echo "$as_me:13748: \$? = $ac_status" >&5
+  echo "$as_me:13755: \$? = $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:13751: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13758: \"$ac_try\"") >&5

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

-  echo "$as_me:13754: \$? = $ac_status" >&5
+  echo "$as_me:13761: \$? = $ac_status" >&5

   (exit $ac_status); }; }; then
   cf_result=yes
 else
   (exit $ac_status); }; }; then
   cf_result=yes
 else


@@ -13767,7 +13774,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:13770: result: $cf_result" >&5
+       echo "$as_me:13777: 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


@@ -13791,7 +13798,7 @@ then
                                cf_return="return value"
                        fi
                        cat >conftest.$ac_ext <<_ACEOF
                                cf_return="return value"
                        fi
                        cat >conftest.$ac_ext <<_ACEOF

-#line 13794 "configure"
+#line 13801 "configure"

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


@@ -13811,21 +13818,21 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

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

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

-  echo "$as_me:13817: \$? = $ac_status" >&5
+  echo "$as_me:13824: \$? = $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:13820: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13827: \"$ac_try\"") >&5

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

-  echo "$as_me:13823: \$? = $ac_status" >&5
+  echo "$as_me:13830: \$? = $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}:13828: testing prototype $cf_ret func($cf_arg value) ..." 1>&5
+echo "${as_me:-configure}:13835: 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


@@ -13845,14 +13852,14 @@ rm -f conftest.$ac_objext conftest.$ac_ext
        done
 fi
 
        done
 fi
 

-echo "$as_me:13848: checking for ncurses extended functions" >&5
+echo "$as_me:13855: 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 13855 "configure"
+#line 13862 "configure"

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


@@ -13867,16 +13874,16 @@ int x = NCURSES_EXT_FUNCS
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

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

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

-  echo "$as_me:13873: \$? = $ac_status" >&5
+  echo "$as_me:13880: \$? = $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:13876: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13883: \"$ac_try\"") >&5

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

-  echo "$as_me:13879: \$? = $ac_status" >&5
+  echo "$as_me:13886: \$? = $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


@@ -13884,7 +13891,7 @@ else
 cat conftest.$ac_ext >&5
 
 cat >conftest.$ac_ext <<_ACEOF
 cat conftest.$ac_ext >&5
 
 cat >conftest.$ac_ext <<_ACEOF

-#line 13887 "configure"
+#line 13894 "configure"

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


@@ -13909,16 +13916,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext

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

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

-  echo "$as_me:13915: \$? = $ac_status" >&5
+  echo "$as_me:13922: \$? = $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:13918: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13925: \"$ac_try\"") >&5

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

-  echo "$as_me:13921: \$? = $ac_status" >&5
+  echo "$as_me:13928: \$? = $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


@@ -13932,7 +13939,7 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi

-echo "$as_me:13935: result: $cf_cv_ncurses_ext_funcs" >&5
+echo "$as_me:13942: 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
 #define NCURSES_EXT_FUNCS 1
 echo "${ECHO_T}$cf_cv_ncurses_ext_funcs" >&6
 test "$cf_cv_ncurses_ext_funcs" = yes && cat >>confdefs.h <<\EOF
 #define NCURSES_EXT_FUNCS 1


@@ -13940,14 +13947,14 @@ EOF
 
 if test "$cf_enable_widec" = yes
 then
 
 if test "$cf_enable_widec" = yes
 then

-       echo "$as_me:13943: checking for wide-character functions" >&5
+       echo "$as_me:13950: 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 13950 "configure"
+#line 13957 "configure"

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


@@ -13964,16 +13971,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext

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

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

-  echo "$as_me:13970: \$? = $ac_status" >&5
+  echo "$as_me:13977: \$? = $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:13973: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13980: \"$ac_try\"") >&5

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

-  echo "$as_me:13976: \$? = $ac_status" >&5
+  echo "$as_me:13983: \$? = $ac_status" >&5

   (exit $ac_status); }; }; then
   cf_cv_widechar_funcs=yes
 else
   (exit $ac_status); }; }; then
   cf_cv_widechar_funcs=yes
 else


@@ -13984,7 +13991,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:13987: result: $cf_cv_widechar_funcs" >&5
+echo "$as_me:13994: result: $cf_cv_widechar_funcs" >&5

 echo "${ECHO_T}$cf_cv_widechar_funcs" >&6
        if test "$cf_cv_widechar_funcs" != no ; then
                cat >>confdefs.h <<\EOF
 echo "${ECHO_T}$cf_cv_widechar_funcs" >&6
        if test "$cf_cv_widechar_funcs" != no ; then
                cat >>confdefs.h <<\EOF


@@ -14004,14 +14011,14 @@ EOF
 
 fi
 
 
 fi
 

-echo "$as_me:14007: checking if sys/time.h works with sys/select.h" >&5
+echo "$as_me:14014: 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 14014 "configure"
+#line 14021 "configure"

 #include "confdefs.h"
 
 #include <sys/types.h>
 #include "confdefs.h"
 
 #include <sys/types.h>


@@ -14031,16 +14038,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

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

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

-  echo "$as_me:14037: \$? = $ac_status" >&5
+  echo "$as_me:14044: \$? = $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:14040: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14047: \"$ac_try\"") >&5

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

-  echo "$as_me:14043: \$? = $ac_status" >&5
+  echo "$as_me:14050: \$? = $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


@@ -14052,13 +14059,13 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
 
 
 fi
 

-echo "$as_me:14055: result: $cf_cv_sys_time_select" >&5
+echo "$as_me:14062: 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
 #define HAVE_SYS_TIME_SELECT 1
 EOF
 
 echo "${ECHO_T}$cf_cv_sys_time_select" >&6
 test "$cf_cv_sys_time_select" = yes && cat >>confdefs.h <<\EOF
 #define HAVE_SYS_TIME_SELECT 1
 EOF
 

-echo "$as_me:14061: checking for function curses_version" >&5
+echo "$as_me:14068: 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


@@ -14068,7 +14075,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 14071 "configure"
+#line 14078 "configure"

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


@@ -14081,15 +14088,15 @@ int main()
 
 _ACEOF
 rm -f conftest$ac_exeext
 
 _ACEOF
 rm -f conftest$ac_exeext

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

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

-  echo "$as_me:14087: \$? = $ac_status" >&5
+  echo "$as_me:14094: \$? = $ac_status" >&5

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

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

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

-  echo "$as_me:14092: \$? = $ac_status" >&5
+  echo "$as_me:14099: \$? = $ac_status" >&5

   (exit $ac_status); }; }; then
   cf_cv_func_curses_version=yes
 
   (exit $ac_status); }; }; then
   cf_cv_func_curses_version=yes
 


@@ -14104,13 +14111,13 @@ rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 rm -f core
 fi
 fi
 rm -f core
 fi

-echo "$as_me:14107: result: $cf_cv_func_curses_version" >&5
+echo "$as_me:14114: 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:14113: checking for ncurses wrap-prefix" >&5
+echo "$as_me:14120: 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.


@@ -14120,10 +14127,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:14123: result: $NCURSES_WRAP_PREFIX" >&5
+echo "$as_me:14130: result: $NCURSES_WRAP_PREFIX" >&5

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

-echo "$as_me:14126: checking for alternate character set array" >&5
+echo "$as_me:14133: 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


@@ -14133,7 +14140,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 14136 "configure"
+#line 14143 "configure"

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


@@ -14149,16 +14156,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:14152: \"$ac_link\"") >&5
+if { (eval echo "$as_me:14159: \"$ac_link\"") >&5

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

-  echo "$as_me:14155: \$? = $ac_status" >&5
+  echo "$as_me:14162: \$? = $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:14158: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14165: \"$ac_try\"") >&5

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

-  echo "$as_me:14161: \$? = $ac_status" >&5
+  echo "$as_me:14168: \$? = $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


@@ -14169,7 +14176,7 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 done
 
 fi
 done
 
 fi

-echo "$as_me:14172: result: $cf_cv_curses_acs_map" >&5
+echo "$as_me:14179: result: $cf_cv_curses_acs_map" >&5

 echo "${ECHO_T}$cf_cv_curses_acs_map" >&6
 
 test "$cf_cv_curses_acs_map" != unknown && cat >>confdefs.h <<EOF
 echo "${ECHO_T}$cf_cv_curses_acs_map" >&6
 
 test "$cf_cv_curses_acs_map" != unknown && cat >>confdefs.h <<EOF


@@ -14178,7 +14185,7 @@ EOF
 
 if test "$cf_enable_widec" = yes; then
 
 
 if test "$cf_enable_widec" = yes; then
 

-echo "$as_me:14181: checking for wide alternate character set array" >&5
+echo "$as_me:14188: 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


@@ -14188,7 +14195,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 14191 "configure"
+#line 14198 "configure"

 #include "confdefs.h"
 
 #ifndef _XOPEN_SOURCE_EXTENDED
 #include "confdefs.h"
 
 #ifndef _XOPEN_SOURCE_EXTENDED


@@ -14204,16 +14211,16 @@ void *foo = &($name['k'])
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext

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

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

-  echo "$as_me:14210: \$? = $ac_status" >&5
+  echo "$as_me:14217: \$? = $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:14213: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14220: \"$ac_try\"") >&5

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

-  echo "$as_me:14216: \$? = $ac_status" >&5
+  echo "$as_me:14223: \$? = $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


@@ -14224,14 +14231,14 @@ 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:14227: result: $cf_cv_curses_wacs_map" >&5
+echo "$as_me:14234: result: $cf_cv_curses_wacs_map" >&5

 echo "${ECHO_T}$cf_cv_curses_wacs_map" >&6
 
 test "$cf_cv_curses_wacs_map" != unknown && cat >>confdefs.h <<EOF
 #define CURSES_WACS_ARRAY $cf_cv_curses_wacs_map
 EOF
 
 echo "${ECHO_T}$cf_cv_curses_wacs_map" >&6
 
 test "$cf_cv_curses_wacs_map" != unknown && cat >>confdefs.h <<EOF
 #define CURSES_WACS_ARRAY $cf_cv_curses_wacs_map
 EOF
 

-echo "$as_me:14234: checking for wide alternate character constants" >&5
+echo "$as_me:14241: 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


@@ -14241,7 +14248,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 14244 "configure"
+#line 14251 "configure"

 #include "confdefs.h"
 
 #ifndef _XOPEN_SOURCE_EXTENDED
 #include "confdefs.h"
 
 #ifndef _XOPEN_SOURCE_EXTENDED


@@ -14258,16 +14265,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:14261: \"$ac_link\"") >&5
+if { (eval echo "$as_me:14268: \"$ac_link\"") >&5

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

-  echo "$as_me:14264: \$? = $ac_status" >&5
+  echo "$as_me:14271: \$? = $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:14267: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14274: \"$ac_try\"") >&5

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

-  echo "$as_me:14270: \$? = $ac_status" >&5
+  echo "$as_me:14277: \$? = $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


@@ -14277,7 +14284,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 14280 "configure"
+#line 14287 "configure"

 #include "confdefs.h"
 
 #ifndef _XOPEN_SOURCE_EXTENDED
 #include "confdefs.h"
 
 #ifndef _XOPEN_SOURCE_EXTENDED


@@ -14293,16 +14300,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:14296: \"$ac_link\"") >&5
+if { (eval echo "$as_me:14303: \"$ac_link\"") >&5

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

-  echo "$as_me:14299: \$? = $ac_status" >&5
+  echo "$as_me:14306: \$? = $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:14302: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14309: \"$ac_try\"") >&5

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

-  echo "$as_me:14305: \$? = $ac_status" >&5
+  echo "$as_me:14312: \$? = $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


@@ -14313,7 +14320,7 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
 
 fi
 fi
 
 fi

-echo "$as_me:14316: result: $cf_cv_curses_wacs_symbols" >&5
+echo "$as_me:14323: result: $cf_cv_curses_wacs_symbols" >&5

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


@@ -14322,10 +14329,10 @@ EOF
 
 fi
 
 
 fi
 

-echo "$as_me:14325: checking for type attr_t in ${cf_cv_ncurses_header:-curses.h}" >&5
+echo "$as_me:14332: 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 14328 "configure"
+#line 14335 "configure"

 #include "confdefs.h"
 
 #ifndef _XOPEN_SOURCE_EXTENDED
 #include "confdefs.h"
 
 #ifndef _XOPEN_SOURCE_EXTENDED


@@ -14343,16 +14350,16 @@ attr_t foo
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

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

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

-  echo "$as_me:14349: \$? = $ac_status" >&5
+  echo "$as_me:14356: \$? = $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:14352: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14359: \"$ac_try\"") >&5

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

-  echo "$as_me:14355: \$? = $ac_status" >&5
+  echo "$as_me:14362: \$? = $ac_status" >&5

   (exit $ac_status); }; }; then
   cf_result=yes
 else
   (exit $ac_status); }; }; then
   cf_result=yes
 else


@@ -14361,7 +14368,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:14364: result: $cf_result" >&5
+echo "$as_me:14371: 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
 


@@ -14381,14 +14388,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:14384: checking if we must include wchar.h to declare mbstate_t" >&5
+echo "$as_me:14391: 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 14391 "configure"
+#line 14398 "configure"

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


@@ -14406,23 +14413,23 @@ mbstate_t state
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

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

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

-  echo "$as_me:14412: \$? = $ac_status" >&5
+  echo "$as_me:14419: \$? = $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:14415: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14422: \"$ac_try\"") >&5

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

-  echo "$as_me:14418: \$? = $ac_status" >&5
+  echo "$as_me:14425: \$? = $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 14425 "configure"
+#line 14432 "configure"

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


@@ -14441,16 +14448,16 @@ mbstate_t value
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

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

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

-  echo "$as_me:14447: \$? = $ac_status" >&5
+  echo "$as_me:14454: \$? = $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:14450: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14457: \"$ac_try\"") >&5

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

-  echo "$as_me:14453: \$? = $ac_status" >&5
+  echo "$as_me:14460: \$? = $ac_status" >&5

   (exit $ac_status); }; }; then
   cf_cv_mbstate_t=yes
 else
   (exit $ac_status); }; }; then
   cf_cv_mbstate_t=yes
 else


@@ -14462,7 +14469,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:14465: result: $cf_cv_mbstate_t" >&5
+echo "$as_me:14472: 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


@@ -14484,14 +14491,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:14487: checking if we must include wchar.h to declare wchar_t" >&5
+echo "$as_me:14494: 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 14494 "configure"
+#line 14501 "configure"

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


@@ -14509,23 +14516,23 @@ wchar_t state
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

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

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

-  echo "$as_me:14515: \$? = $ac_status" >&5
+  echo "$as_me:14522: \$? = $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:14518: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14525: \"$ac_try\"") >&5

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

-  echo "$as_me:14521: \$? = $ac_status" >&5
+  echo "$as_me:14528: \$? = $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 14528 "configure"
+#line 14535 "configure"

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


@@ -14544,16 +14551,16 @@ wchar_t value
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

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

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

-  echo "$as_me:14550: \$? = $ac_status" >&5
+  echo "$as_me:14557: \$? = $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:14553: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14560: \"$ac_try\"") >&5

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

-  echo "$as_me:14556: \$? = $ac_status" >&5
+  echo "$as_me:14563: \$? = $ac_status" >&5

   (exit $ac_status); }; }; then
   cf_cv_wchar_t=yes
 else
   (exit $ac_status); }; }; then
   cf_cv_wchar_t=yes
 else


@@ -14565,7 +14572,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:14568: result: $cf_cv_wchar_t" >&5
+echo "$as_me:14575: 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


@@ -14587,14 +14594,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:14590: checking if we must include wchar.h to declare wint_t" >&5
+echo "$as_me:14597: 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 14597 "configure"
+#line 14604 "configure"

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


@@ -14612,23 +14619,23 @@ wint_t state
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

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

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

-  echo "$as_me:14618: \$? = $ac_status" >&5
+  echo "$as_me:14625: \$? = $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:14621: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14628: \"$ac_try\"") >&5

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

-  echo "$as_me:14624: \$? = $ac_status" >&5
+  echo "$as_me:14631: \$? = $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 14631 "configure"
+#line 14638 "configure"

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


@@ -14647,16 +14654,16 @@ wint_t value
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

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

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

-  echo "$as_me:14653: \$? = $ac_status" >&5
+  echo "$as_me:14660: \$? = $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:14656: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14663: \"$ac_try\"") >&5

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

-  echo "$as_me:14659: \$? = $ac_status" >&5
+  echo "$as_me:14666: \$? = $ac_status" >&5

   (exit $ac_status); }; }; then
   cf_cv_wint_t=yes
 else
   (exit $ac_status); }; }; then
   cf_cv_wint_t=yes
 else


@@ -14668,7 +14675,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:14671: result: $cf_cv_wint_t" >&5
+echo "$as_me:14678: 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


@@ -14691,10 +14698,10 @@ fi
 
        if test "$NCURSES_OK_MBSTATE_T" = 0 ; then
 
 
        if test "$NCURSES_OK_MBSTATE_T" = 0 ; then
 

-echo "$as_me:14694: checking for type mbstate_t in ${cf_cv_ncurses_header:-curses.h}" >&5
+echo "$as_me:14701: 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 14697 "configure"
+#line 14704 "configure"

 #include "confdefs.h"
 
 #ifndef _XOPEN_SOURCE_EXTENDED
 #include "confdefs.h"
 
 #ifndef _XOPEN_SOURCE_EXTENDED


@@ -14712,16 +14719,16 @@ mbstate_t foo
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

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

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

-  echo "$as_me:14718: \$? = $ac_status" >&5
+  echo "$as_me:14725: \$? = $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:14721: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14728: \"$ac_try\"") >&5

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

-  echo "$as_me:14724: \$? = $ac_status" >&5
+  echo "$as_me:14731: \$? = $ac_status" >&5

   (exit $ac_status); }; }; then
   cf_result=yes
 else
   (exit $ac_status); }; }; then
   cf_result=yes
 else


@@ -14730,7 +14737,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:14733: result: $cf_result" >&5
+echo "$as_me:14740: 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
 


@@ -14751,10 +14758,10 @@ fi
 
        if test "$NCURSES_OK_WCHAR_T" = 0 ; then
 
 
        if test "$NCURSES_OK_WCHAR_T" = 0 ; then
 

-echo "$as_me:14754: checking for type wchar_t in ${cf_cv_ncurses_header:-curses.h}" >&5
+echo "$as_me:14761: 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 14757 "configure"
+#line 14764 "configure"

 #include "confdefs.h"
 
 #ifndef _XOPEN_SOURCE_EXTENDED
 #include "confdefs.h"
 
 #ifndef _XOPEN_SOURCE_EXTENDED


@@ -14772,16 +14779,16 @@ wchar_t foo
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

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

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

-  echo "$as_me:14778: \$? = $ac_status" >&5
+  echo "$as_me:14785: \$? = $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:14781: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14788: \"$ac_try\"") >&5

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

-  echo "$as_me:14784: \$? = $ac_status" >&5
+  echo "$as_me:14791: \$? = $ac_status" >&5

   (exit $ac_status); }; }; then
   cf_result=yes
 else
   (exit $ac_status); }; }; then
   cf_result=yes
 else


@@ -14790,7 +14797,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:14793: result: $cf_result" >&5
+echo "$as_me:14800: 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
 


@@ -14811,10 +14818,10 @@ fi
 
        if test "$NCURSES_OK_WINT_T" = 0 ; then
 
 
        if test "$NCURSES_OK_WINT_T" = 0 ; then
 

-echo "$as_me:14814: checking for type wint_t in ${cf_cv_ncurses_header:-curses.h}" >&5
+echo "$as_me:14821: 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 14817 "configure"
+#line 14824 "configure"

 #include "confdefs.h"
 
 #ifndef _XOPEN_SOURCE_EXTENDED
 #include "confdefs.h"
 
 #ifndef _XOPEN_SOURCE_EXTENDED


@@ -14832,16 +14839,16 @@ wint_t foo
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

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

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

-  echo "$as_me:14838: \$? = $ac_status" >&5
+  echo "$as_me:14845: \$? = $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:14841: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14848: \"$ac_try\"") >&5

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

-  echo "$as_me:14844: \$? = $ac_status" >&5
+  echo "$as_me:14851: \$? = $ac_status" >&5

   (exit $ac_status); }; }; then
   cf_result=yes
 else
   (exit $ac_status); }; }; then
   cf_result=yes
 else


@@ -14850,7 +14857,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:14853: result: $cf_result" >&5
+echo "$as_me:14860: 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
 


@@ -14870,11 +14877,11 @@ fi
        fi
 fi
 
        fi
 fi
 

-echo "$as_me:14873: checking for data boolnames declaration in ${cf_cv_ncurses_header:-curses.h}" >&5
+echo "$as_me:14880: checking for data boolnames declaration in ${cf_cv_ncurses_header:-curses.h}" >&5

 echo $ECHO_N "checking for data boolnames declaration in ${cf_cv_ncurses_header:-curses.h}... $ECHO_C" >&6
 
 cat >conftest.$ac_ext <<_ACEOF
 echo $ECHO_N "checking for data boolnames declaration in ${cf_cv_ncurses_header:-curses.h}... $ECHO_C" >&6
 
 cat >conftest.$ac_ext <<_ACEOF

-#line 14877 "configure"
+#line 14884 "configure"

 #include "confdefs.h"
 
 #ifdef HAVE_XCURSES
 #include "confdefs.h"
 
 #ifdef HAVE_XCURSES


@@ -14902,16 +14909,16 @@ void *foo = &(boolnames)
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

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

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

-  echo "$as_me:14908: \$? = $ac_status" >&5
+  echo "$as_me:14915: \$? = $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:14911: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14918: \"$ac_try\"") >&5

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

-  echo "$as_me:14914: \$? = $ac_status" >&5
+  echo "$as_me:14921: \$? = $ac_status" >&5

   (exit $ac_status); }; }; then
   cf_result=yes
 else
   (exit $ac_status); }; }; then
   cf_result=yes
 else


@@ -14920,7 +14927,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:14923: result: $cf_result" >&5
+echo "$as_me:14930: 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


@@ -14932,14 +14939,14 @@ cf_result=`echo "have_curses_data_boolnames" | sed y%abcdefghijklmnopqrstuvwxyz.
 EOF
 
 else
 EOF
 
 else

-       echo "$as_me:14935: checking for data boolnames in library" >&5
+       echo "$as_me:14942: checking for data boolnames in library" >&5

 echo $ECHO_N "checking for data boolnames in library... $ECHO_C" >&6
        # BSD linkers insist on making weak linkage, but resolve at runtime.
        if test "$cross_compiling" = yes; then
 
        # cross-compiling
        cat >conftest.$ac_ext <<_ACEOF
 echo $ECHO_N "checking for data boolnames in library... $ECHO_C" >&6
        # BSD linkers insist on making weak linkage, but resolve at runtime.
        if test "$cross_compiling" = yes; then
 
        # cross-compiling
        cat >conftest.$ac_ext <<_ACEOF

-#line 14942 "configure"
+#line 14949 "configure"

 #include "confdefs.h"
 
 #ifdef HAVE_XCURSES
 #include "confdefs.h"
 
 #ifdef HAVE_XCURSES


@@ -14971,16 +14978,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext

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

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

-  echo "$as_me:14977: \$? = $ac_status" >&5
+  echo "$as_me:14984: \$? = $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:14980: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14987: \"$ac_try\"") >&5

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

-  echo "$as_me:14983: \$? = $ac_status" >&5
+  echo "$as_me:14990: \$? = $ac_status" >&5

   (exit $ac_status); }; }; then
   cf_result=yes
 else
   (exit $ac_status); }; }; then
   cf_result=yes
 else


@@ -14992,7 +14999,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 14995 "configure"
+#line 15002 "configure"

 #include "confdefs.h"
 
 #ifdef HAVE_XCURSES
 #include "confdefs.h"
 
 #ifdef HAVE_XCURSES


@@ -15017,15 +15024,15 @@ int main(void)
 }
 _ACEOF
 rm -f conftest$ac_exeext
 }
 _ACEOF
 rm -f conftest$ac_exeext

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

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

-  echo "$as_me:15023: \$? = $ac_status" >&5
+  echo "$as_me:15030: \$? = $ac_status" >&5

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

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

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

-  echo "$as_me:15028: \$? = $ac_status" >&5
+  echo "$as_me:15035: \$? = $ac_status" >&5

   (exit $ac_status); }; }; then
   cf_result=yes
 else
   (exit $ac_status); }; }; then
   cf_result=yes
 else


@@ -15036,7 +15043,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:15039: result: $cf_result" >&5
+       echo "$as_me:15046: 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
 


@@ -15049,11 +15056,11 @@ EOF
        fi
 fi
 
        fi
 fi
 

-echo "$as_me:15052: checking for data boolfnames declaration in ${cf_cv_ncurses_header:-curses.h}" >&5
+echo "$as_me:15059: checking for data boolfnames declaration in ${cf_cv_ncurses_header:-curses.h}" >&5

 echo $ECHO_N "checking for data boolfnames declaration in ${cf_cv_ncurses_header:-curses.h}... $ECHO_C" >&6
 
 cat >conftest.$ac_ext <<_ACEOF
 echo $ECHO_N "checking for data boolfnames declaration in ${cf_cv_ncurses_header:-curses.h}... $ECHO_C" >&6
 
 cat >conftest.$ac_ext <<_ACEOF

-#line 15056 "configure"
+#line 15063 "configure"

 #include "confdefs.h"
 
 #ifdef HAVE_XCURSES
 #include "confdefs.h"
 
 #ifdef HAVE_XCURSES


@@ -15081,16 +15088,16 @@ void *foo = &(boolfnames)
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

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

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

-  echo "$as_me:15087: \$? = $ac_status" >&5
+  echo "$as_me:15094: \$? = $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:15090: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15097: \"$ac_try\"") >&5

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

-  echo "$as_me:15093: \$? = $ac_status" >&5
+  echo "$as_me:15100: \$? = $ac_status" >&5

   (exit $ac_status); }; }; then
   cf_result=yes
 else
   (exit $ac_status); }; }; then
   cf_result=yes
 else


@@ -15099,7 +15106,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:15102: result: $cf_result" >&5
+echo "$as_me:15109: 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


@@ -15111,14 +15118,14 @@ cf_result=`echo "have_curses_data_boolfnames" | sed y%abcdefghijklmnopqrstuvwxyz
 EOF
 
 else
 EOF
 
 else

-       echo "$as_me:15114: checking for data boolfnames in library" >&5
+       echo "$as_me:15121: checking for data boolfnames in library" >&5

 echo $ECHO_N "checking for data boolfnames in library... $ECHO_C" >&6
        # BSD linkers insist on making weak linkage, but resolve at runtime.
        if test "$cross_compiling" = yes; then
 
        # cross-compiling
        cat >conftest.$ac_ext <<_ACEOF
 echo $ECHO_N "checking for data boolfnames in library... $ECHO_C" >&6
        # BSD linkers insist on making weak linkage, but resolve at runtime.
        if test "$cross_compiling" = yes; then
 
        # cross-compiling
        cat >conftest.$ac_ext <<_ACEOF

-#line 15121 "configure"
+#line 15128 "configure"

 #include "confdefs.h"
 
 #ifdef HAVE_XCURSES
 #include "confdefs.h"
 
 #ifdef HAVE_XCURSES


@@ -15150,16 +15157,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext

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

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

-  echo "$as_me:15156: \$? = $ac_status" >&5
+  echo "$as_me:15163: \$? = $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:15159: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15166: \"$ac_try\"") >&5

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

-  echo "$as_me:15162: \$? = $ac_status" >&5
+  echo "$as_me:15169: \$? = $ac_status" >&5

   (exit $ac_status); }; }; then
   cf_result=yes
 else
   (exit $ac_status); }; }; then
   cf_result=yes
 else


@@ -15171,7 +15178,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 15174 "configure"
+#line 15181 "configure"

 #include "confdefs.h"
 
 #ifdef HAVE_XCURSES
 #include "confdefs.h"
 
 #ifdef HAVE_XCURSES


@@ -15196,15 +15203,15 @@ int main(void)
 }
 _ACEOF
 rm -f conftest$ac_exeext
 }
 _ACEOF
 rm -f conftest$ac_exeext

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

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

-  echo "$as_me:15202: \$? = $ac_status" >&5
+  echo "$as_me:15209: \$? = $ac_status" >&5

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

-  { (eval echo "$as_me:15204: \"$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:15207: \$? = $ac_status" >&5
+  echo "$as_me:15214: \$? = $ac_status" >&5

   (exit $ac_status); }; }; then
   cf_result=yes
 else
   (exit $ac_status); }; }; then
   cf_result=yes
 else


@@ -15215,7 +15222,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:15218: result: $cf_result" >&5
+       echo "$as_me:15225: 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
 


@@ -15312,7 +15319,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:15315: creating $CONFIG_STATUS" >&5
+{ echo "$as_me:15322: 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


@@ -15488,7 +15495,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:15491: error: ambiguous option: $1
+    { { echo "$as_me:15498: 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;}


@@ -15507,7 +15514,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:15510: error: unrecognized option: $1
+  -*) { { echo "$as_me:15517: 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;}


@@ -15555,7 +15562,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:15558: error: invalid argument: $ac_config_target" >&5
+  *) { { echo "$as_me:15565: 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


@@ -15818,7 +15825,7 @@ done; }
   esac
 
   if test x"$ac_file" != x-; then
   esac
 
   if test x"$ac_file" != x-; then

-    { echo "$as_me:15821: creating $ac_file" >&5
+    { echo "$as_me:15828: 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


@@ -15836,7 +15843,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:15839: error: cannot find input file: $f" >&5
+         test -f "$f" || { { echo "$as_me:15846: 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;;


@@ -15849,7 +15856,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:15852: error: cannot find input file: $f" >&5
+           { { echo "$as_me:15859: 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;;


@@ -15915,7 +15922,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:15918: creating $ac_file" >&5
+  test x"$ac_file" != x- && { echo "$as_me:15925: 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


@@ -15926,7 +15933,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:15929: error: cannot find input file: $f" >&5
+         test -f "$f" || { { echo "$as_me:15936: 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;;


@@ -15939,7 +15946,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:15942: error: cannot find input file: $f" >&5
+           { { echo "$as_me:15949: 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;;


@@ -15997,7 +16004,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:16000: $ac_file is unchanged" >&5
+      { echo "$as_me:16007: $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\(.*[^/]\)//*[^/][^/]*/*$' \| \