ncurses 5.6 - patch 20071124

+ modify configure option --with-hashed-db to accept a parameter which
  is the install-prefix of a given Berkeley Database (prompted by
  pierre4d2 comments).
+ rewrite wrapper for wcrtomb(), making it work on Solaris.  This is
  used in the form library to determine the length of the buffer needed
  by field_buffer (report by Alfred Fung).
+ remove unneeded window-parameter from C++ binding for wresize (report
  by Chris Lee).

diff --git a/INSTALL b/INSTALL
index 9d972ef0275efbb83a0706967ee3018ab74de012..e0b6da6bdd8e2f1c45c1960787ec7aa61c3da6aa 100644 (file)
--- a/INSTALL
+++ b/INSTALL
@@ -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: INSTALL,v 1.120 2007/11/17 22:05:11 tom Exp $
+-- $Id: INSTALL,v 1.121 2007/11/24 20:22:52 tom Exp $

 ---------------------------------------------------------------------
              How to install Ncurses/Terminfo on your system
 ---------------------------------------------------------------------
 ---------------------------------------------------------------------
              How to install Ncurses/Terminfo on your system
 ---------------------------------------------------------------------


@@ -694,7 +694,7 @@ SUMMARY OF CONFIGURE OPTIONS:
 
        See also --without-dlsym
 
 
        See also --without-dlsym
 

-    --with-hashed-db
+    --with-hashed-db[=XXX]

        Use a hashed database for storing terminfo data rather than storing
        each compiled entry in a separate binary file within a directory
        tree.
        Use a hashed database for storing terminfo data rather than storing
        each compiled entry in a separate binary file within a directory
        tree.


@@ -709,6 +709,12 @@ SUMMARY OF CONFIGURE OPTIONS:
        You cannot have a directory containing both hashed-database and
        filesystem-based terminfo entries.
 
        You cannot have a directory containing both hashed-database and
        filesystem-based terminfo entries.
 

+       Use the parameter value to give the install-prefix used for the
+       datbase, e.g.,
+               --with-hashed-db=/usr/local/BigBase
+       to find the corresponding include- and lib-directories under the
+       given directory.
+

        See also the --enable-getcap option.
 
     --with-install-prefix=XXX
        See also the --enable-getcap option.
 
     --with-install-prefix=XXX

diff --git a/NEWS b/NEWS
index 4d3a1ee8900785c945f4d0535c9d2dad18d5217b..18df484e8cd44dfc73daac8b8dec1702c2acaf5f 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.1182 2007/11/17 23:43:07 tom Exp $
+-- $Id: NEWS,v 1.1184 2007/11/25 00:04:31 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,16 @@ 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.
 

+20071124
+       + modify configure option --with-hashed-db to accept a parameter which
+         is the install-prefix of a given Berkeley Database (prompted by
+         pierre4d2 comments).
+       + rewrite wrapper for wcrtomb(), making it work on Solaris.  This is
+         used in the form library to determine the length of the buffer needed
+         by field_buffer (report by Alfred Fung).
+       + remove unneeded window-parameter from C++ binding for wresize (report
+         by Chris Lee).
+

 20071117
        + modify the support for filesystems which do not support mixed-case to
          generate 2-character (hexadecimal) codes for the lower-level of the
 20071117
        + modify the support for filesystems which do not support mixed-case to
          generate 2-character (hexadecimal) codes for the lower-level of the


@@ -92,7 +102,7 @@ it is not possible to add this information.
        + add new functions to lib_trace.c to setup mutex's for the _tracef()
          calls within the ncurses library.
        + for the reentrant model, move _nc_tputs_trace and _nc_outchars into
        + add new functions to lib_trace.c to setup mutex's for the _tracef()
          calls within the ncurses library.
        + for the reentrant model, move _nc_tputs_trace and _nc_outchars into

-         the SCREEN. 
+         the SCREEN.

        + start modifying test/worm.c to provide threading demo (incomplete).
        + separated ifdef's for some BSD-related symbols in tset.c, to make
          it compile on LynxOS (report by Greg Gemmer).
        + start modifying test/worm.c to provide threading demo (incomplete).
        + separated ifdef's for some BSD-related symbols in tset.c, to make
          it compile on LynxOS (report by Greg Gemmer).


@@ -231,7 +241,7 @@ it is not possible to add this information.
          (discussion with Clive Nicolson).
        + add a modification of test/dots.c, i.e., test/dots_mvcur.c to
          illustrate how to use mvcur().
          (discussion with Clive Nicolson).
        + add a modification of test/dots.c, i.e., test/dots_mvcur.c to
          illustrate how to use mvcur().

-       + modify wide-character flavor of SetAttr() to preserve the 
+       + modify wide-character flavor of SetAttr() to preserve the

          WidecExt() value stored in the .attr field, e.g., in case it
          is overwritten by chgat (report by Aleksi Torhamo).
        + correct buffer-size for _nc_viswbuf2n() (report by Aleksi Torhamo).
          WidecExt() value stored in the .attr field, e.g., in case it
          is overwritten by chgat (report by Aleksi Torhamo).
        + correct buffer-size for _nc_viswbuf2n() (report by Aleksi Torhamo).


@@ -301,7 +311,7 @@ it is not possible to add this information.
 
 20070407
        + add man/curs_legacy.3x, man/curs_opaque.3x
 
 20070407
        + add man/curs_legacy.3x, man/curs_opaque.3x

-       + fix acs_map binding for Ada95 when --enable-reentrant is used. 
+       + fix acs_map binding for Ada95 when --enable-reentrant is used.

        + add adacurses-config to the Ada95 install, based on version from
          FreeBSD port, in turn by Juergen Pfeifer in 2000 (prompted by
          comment on comp.lang.ada newsgroup).
        + add adacurses-config to the Ada95 install, based on version from
          FreeBSD port, in turn by Juergen Pfeifer in 2000 (prompted by
          comment on comp.lang.ada newsgroup).

diff --git a/aclocal.m4 b/aclocal.m4
index 14bb7e860e6f4e8986552bc14a530efe837cf96c..32c88f582d62d8a39d2372605974ff8f6fa241a7 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.436 2007/08/11 18:12:19 tom Exp $
+dnl $Id: aclocal.m4,v 1.440 2007/11/25 00:58:01 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


@@ -166,6 +166,99 @@ fi
 
 AC_SUBST(EXTRA_CPPFLAGS)
 
 
 AC_SUBST(EXTRA_CPPFLAGS)
 

+])dnl
+dnl ---------------------------------------------------------------------------
+dnl CF_ADD_INCDIR version: 8 updated: 2007/07/30 19:22:58
+dnl -------------
+dnl Add an include-directory to $CPPFLAGS.  Don't add /usr/include, since it's
+dnl redundant.  We don't normally need to add -I/usr/local/include for gcc,
+dnl but old versions (and some misinstalled ones) need that.  To make things
+dnl worse, gcc 3.x may give error messages if -I/usr/local/include is added to
+dnl the include-path).
+AC_DEFUN([CF_ADD_INCDIR],
+[
+if test -n "$1" ; then
+  for cf_add_incdir in $1
+  do
+       while test $cf_add_incdir != /usr/include
+       do
+         if test -d $cf_add_incdir
+         then
+               cf_have_incdir=no
+               if test -n "$CFLAGS$CPPFLAGS" ; then
+                 # a loop is needed to ensure we can add subdirs of existing dirs
+                 for cf_test_incdir in $CFLAGS $CPPFLAGS ; do
+                       if test ".$cf_test_incdir" = ".-I$cf_add_incdir" ; then
+                         cf_have_incdir=yes; break
+                       fi
+                 done
+               fi
+
+               if test "$cf_have_incdir" = no ; then
+          if test "$cf_add_incdir" = /usr/local/include ; then
+                       if test "$GCC" = yes
+                       then
+                         cf_save_CPPFLAGS=$CPPFLAGS
+                         CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
+                         AC_TRY_COMPILE([#include <stdio.h>],
+                                 [printf("Hello")],
+                                 [],
+                                 [cf_have_incdir=yes])
+                         CPPFLAGS=$cf_save_CPPFLAGS
+                       fi
+                 fi
+               fi
+
+               if test "$cf_have_incdir" = no ; then
+                 AC_VERBOSE(adding $cf_add_incdir to include-path)
+                 ifelse($2,,CPPFLAGS,$2)="-I$cf_add_incdir $ifelse($2,,CPPFLAGS,[$]$2)"
+
+          cf_top_incdir=`echo $cf_add_incdir | sed -e 's%/include/.*$%/include%'`
+          test "$cf_top_incdir" = "$cf_add_incdir" && break
+          cf_add_incdir="$cf_top_incdir"
+               else
+                 break
+               fi
+         fi
+       done
+  done
+fi
+])dnl
+dnl ---------------------------------------------------------------------------
+dnl CF_ADD_LIBDIR version: 5 updated: 2007/07/30 19:12:03
+dnl -------------
+dnl    Adds to the library-path
+dnl
+dnl    Some machines have trouble with multiple -L options.
+dnl
+dnl $1 is the (list of) directory(s) to add
+dnl $2 is the optional name of the variable to update (default LDFLAGS)
+dnl
+AC_DEFUN([CF_ADD_LIBDIR],
+[
+if test -n "$1" ; then
+  for cf_add_libdir in $1
+  do
+    if test $cf_add_libdir = /usr/lib ; then
+      :
+    elif test -d $cf_add_libdir
+    then
+      cf_have_libdir=no
+      if test -n "$LDFLAGS$LIBS" ; then
+        # a loop is needed to ensure we can add subdirs of existing dirs
+        for cf_test_libdir in $LDFLAGS $LIBS ; do
+          if test ".$cf_test_libdir" = ".-L$cf_add_libdir" ; then
+            cf_have_libdir=yes; break
+          fi
+        done
+      fi
+      if test "$cf_have_libdir" = no ; then
+        AC_VERBOSE(adding $cf_add_libdir to library-path)
+        ifelse($2,,LDFLAGS,$2)="-L$cf_add_libdir $ifelse($2,,LDFLAGS,[$]$2)"
+      fi
+    fi
+  done
+fi

 ])dnl
 dnl ---------------------------------------------------------------------------
 dnl CF_ANSI_CC_CHECK version: 9 updated: 2001/12/30 17:53:34
 ])dnl
 dnl ---------------------------------------------------------------------------
 dnl CF_ANSI_CC_CHECK version: 9 updated: 2001/12/30 17:53:34


@@ -1559,11 +1652,24 @@ AC_LANG_RESTORE
 AC_SUBST(EXTRA_CXXFLAGS)
 ])dnl
 dnl ---------------------------------------------------------------------------
 AC_SUBST(EXTRA_CXXFLAGS)
 ])dnl
 dnl ---------------------------------------------------------------------------

-dnl CF_HASHED_DB version: 1 updated: 2006/08/19 09:16:14
+dnl CF_HASHED_DB version: 3 updated: 2007/11/24 17:43:37

 dnl ------------
 dnl Look for an instance of the Berkeley hashed database.
 dnl ------------
 dnl Look for an instance of the Berkeley hashed database.

+dnl
+dnl $1 = optional parameter, to specify install-prefix for the database.

 AC_DEFUN([CF_HASHED_DB],
 [
 AC_DEFUN([CF_HASHED_DB],
 [

+ifelse([$1],,,[
+case $1 in #(vi
+yes|*able*) #(vi
+    ;;
+*)
+    if test -d "$1" ; then
+        CF_ADD_INCDIR($1/include)
+        CF_ADD_LIBDIR($1/lib)
+    fi
+esac
+])

 AC_CHECK_HEADER(db.h,[
 CF_HASHED_DB_VERSION
 if test "$cf_cv_hashed_db_version" = unknown ; then
 AC_CHECK_HEADER(db.h,[
 CF_HASHED_DB_VERSION
 if test "$cf_cv_hashed_db_version" = unknown ; then


@@ -3735,6 +3841,57 @@ define([CF_REMOVE_LIB],
 $1=`echo "$2" | sed -e 's/-l$3[[       ]]//g' -e 's/-l$3[$]//'`
 ])dnl
 dnl ---------------------------------------------------------------------------
 $1=`echo "$2" | sed -e 's/-l$3[[       ]]//g' -e 's/-l$3[$]//'`
 ])dnl
 dnl ---------------------------------------------------------------------------

+dnl CF_RPATH_HACK version: 2 updated: 2007/11/24 19:09:03
+dnl -------------
+AC_DEFUN([CF_RPATH_HACK],
+[
+AC_REQUIRE([CF_SHARED_OPTS])
+AC_MSG_CHECKING(for updated LDFLAGS)
+if test -n "$LDFLAGS" ; then
+AC_MSG_RESULT(maybe)
+CF_VERBOSE(...checking LDFLAGS $LDFLAGS)
+CF_VERBOSE(...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS)
+case "$EXTRA_LDFLAGS" in #(vi
+-Wl,-rpath,*) #(vi
+    cf_rpath_hack="-Wl,-rpath,"
+    ;;
+-R\ *)
+    cf_rpath_hack="-R "
+    ;;
+-R*)
+    cf_rpath_hack="-R"
+    ;;
+*)
+    cf_rpath_hack=
+    ;;
+esac
+cf_rpath_dst=
+for cf_rpath_src in $LDFLAGS
+do
+    CF_VERBOSE(Filtering $cf_rpath_src)
+    case $cf_rpath_src in #(vi
+    -L*) #(vi
+        if test "$cf_rpath_hack" = "-R " ; then
+            cf_rpath_tmp=`echo "$cf_rpath_src" |sed -e 's%-L%-R %'`
+        else
+            cf_rpath_tmp=`echo "$cf_rpath_src" |sed -e s%-L%$cf_rpath_hack%`
+        fi
+        CF_VERBOSE(...Filter $cf_rpath_tmp)
+        EXTRA_LDFLAGS="$cf_rpath_tmp $EXTRA_LDFLAGS"
+        ;;
+    *)
+        cf_rpath_dst="$cf_rpath_dst $cf_rpath_src"
+        ;;
+    esac
+done
+LDFLAGS=$cf_rpath_dst
+CF_VERBOSE(...checked LDFLAGS $LDFLAGS)
+CF_VERBOSE(...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS)
+else
+AC_MSG_RESULT(no)
+fi
+])dnl
+dnl ---------------------------------------------------------------------------

 dnl CF_SHARED_OPTS version: 46 updated: 2007/02/24 18:58:09
 dnl --------------
 dnl --------------
 dnl CF_SHARED_OPTS version: 46 updated: 2007/02/24 18:58:09
 dnl --------------
 dnl --------------

diff --git a/c++/cursesw.h b/c++/cursesw.h
index 170027b85d111505ab37d42e446c60069d4944f7..62c71ea7d0dd7193f827c541a58fb3648015455d 100644 (file)
--- a/c++/cursesw.h
+++ b/c++/cursesw.h
@@ -30,7 +30,7 @@
 #ifndef NCURSES_CURSESW_H_incl
 #define NCURSES_CURSESW_H_incl 1
 
 #ifndef NCURSES_CURSESW_H_incl
 #define NCURSES_CURSESW_H_incl 1
 

-// $Id: cursesw.h,v 1.45 2007/11/17 21:42:06 tom Exp $
+// $Id: cursesw.h,v 1.46 2007/11/24 19:09:09 tom Exp $

 
 #include <etip.h>
 
 
 #include <etip.h>
 


@@ -1218,8 +1218,8 @@ public:
   // Extended functions
   // -------------------------------------------------------------------------
 #ifdef NCURSES_EXT_FUNCS
   // Extended functions
   // -------------------------------------------------------------------------
 #ifdef NCURSES_EXT_FUNCS

-  int            wresize(NCursesWindow& win, int newLines, int newColumns) {
-    return ::wresize(win.w, newLines, newColumns); }
+  int            wresize(int newLines, int newColumns) {
+    return ::wresize(w, newLines, newColumns); }

 #endif
 
   // -------------------------------------------------------------------------
 #endif
 
   // -------------------------------------------------------------------------

diff --git a/configure b/configure
index 3c5d3506a980c7d840d663c17414bee8a8cf243f..e18ab720a2066b20d60008900328217464d8cdd1 100755 (executable)
--- a/configure
+++ b/configure
@@ -1,5 +1,5 @@
 #! /bin/sh
 #! /bin/sh

-# From configure.in Revision: 1.427 .
+# From configure.in Revision: 1.429 .

 # Guess values for system-dependent variables and create Makefiles.
 # Generated by Autoconf 2.52.20061216.
 #
 # Guess values for system-dependent variables and create Makefiles.
 # Generated by Autoconf 2.52.20061216.
 #


@@ -13428,23 +13428,132 @@ if test "$with_hashed_db" != no ; then
 #define USE_HASHED_DB 1
 EOF
 
 #define USE_HASHED_DB 1
 EOF
 

-echo "$as_me:13431: checking for db.h" >&5
+case $with_hashed_db in #(vi
+yes|*able*) #(vi
+    ;;
+*)
+    if test -d "$with_hashed_db" ; then
+
+if test -n "$with_hashed_db/include" ; then
+  for cf_add_incdir in $with_hashed_db/include
+  do
+       while test $cf_add_incdir != /usr/include
+       do
+         if test -d $cf_add_incdir
+         then
+               cf_have_incdir=no
+               if test -n "$CFLAGS$CPPFLAGS" ; then
+                 # a loop is needed to ensure we can add subdirs of existing dirs
+                 for cf_test_incdir in $CFLAGS $CPPFLAGS ; do
+                       if test ".$cf_test_incdir" = ".-I$cf_add_incdir" ; then
+                         cf_have_incdir=yes; break
+                       fi
+                 done
+               fi
+
+               if test "$cf_have_incdir" = no ; then
+          if test "$cf_add_incdir" = /usr/local/include ; then
+                       if test "$GCC" = yes
+                       then
+                         cf_save_CPPFLAGS=$CPPFLAGS
+                         CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
+                         cat >conftest.$ac_ext <<_ACEOF
+#line 13461 "configure"
+#include "confdefs.h"
+#include <stdio.h>
+int
+main ()
+{
+printf("Hello")
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:13473: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  echo "$as_me:13476: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:13479: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:13482: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  :
+else
+  echo "$as_me: failed program was:" >&5
+cat conftest.$ac_ext >&5
+cf_have_incdir=yes
+fi
+rm -f conftest.$ac_objext conftest.$ac_ext
+                         CPPFLAGS=$cf_save_CPPFLAGS
+                       fi
+                 fi
+               fi
+
+               if test "$cf_have_incdir" = no ; then
+                 echo "$as_me:13497: result: adding $cf_add_incdir to include-path" >&5
+echo "${ECHO_T}adding $cf_add_incdir to include-path" >&6
+                 CPPFLAGS="-I$cf_add_incdir $CPPFLAGS"
+
+          cf_top_incdir=`echo $cf_add_incdir | sed -e 's%/include/.*$%/include%'`
+          test "$cf_top_incdir" = "$cf_add_incdir" && break
+          cf_add_incdir="$cf_top_incdir"
+               else
+                 break
+               fi
+         fi
+       done
+  done
+fi
+
+if test -n "$with_hashed_db/lib" ; then
+  for cf_add_libdir in $with_hashed_db/lib
+  do
+    if test $cf_add_libdir = /usr/lib ; then
+      :
+    elif test -d $cf_add_libdir
+    then
+      cf_have_libdir=no
+      if test -n "$LDFLAGS$LIBS" ; then
+        # a loop is needed to ensure we can add subdirs of existing dirs
+        for cf_test_libdir in $LDFLAGS $LIBS ; do
+          if test ".$cf_test_libdir" = ".-L$cf_add_libdir" ; then
+            cf_have_libdir=yes; break
+          fi
+        done
+      fi
+      if test "$cf_have_libdir" = no ; then
+        echo "$as_me:13529: result: adding $cf_add_libdir to library-path" >&5
+echo "${ECHO_T}adding $cf_add_libdir to library-path" >&6
+        LDFLAGS="-L$cf_add_libdir $LDFLAGS"
+      fi
+    fi
+  done
+fi
+
+    fi
+esac
+
+echo "$as_me:13540: 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 13437 "configure"
+#line 13546 "configure"

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

-if { (eval echo "$as_me:13441: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:13550: \"$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:13447: \$? = $ac_status" >&5
+  echo "$as_me:13556: \$? = $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


@@ -13463,11 +13572,11 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
 fi
 rm -f conftest.err conftest.$ac_ext
 fi

-echo "$as_me:13466: result: $ac_cv_header_db_h" >&5
+echo "$as_me:13575: 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:13470: checking for version of db" >&5
+echo "$as_me:13579: 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


@@ -13478,10 +13587,10 @@ cf_cv_hashed_db_version=unknown
 for cf_db_version in 1 2 3 4
 do
 
 for cf_db_version in 1 2 3 4
 do
 

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

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

-#line 13484 "configure"
+#line 13593 "configure"

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


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

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

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

-  echo "$as_me:13517: \$? = $ac_status" >&5
+  echo "$as_me:13626: \$? = $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:13520: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13629: \"$ac_try\"") >&5

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

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


@@ -13534,16 +13643,16 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 done
 
 fi
 done
 
 fi

-echo "$as_me:13537: result: $cf_cv_hashed_db_version" >&5
+echo "$as_me:13646: 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:13541: error: Cannot determine version of db" >&5
+       { { echo "$as_me:13650: 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:13546: checking for db libraries" >&5
+echo "$as_me:13655: 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


@@ -13557,10 +13666,10 @@ do
                LIBS="-l$cf_db_libs $LIBS"
        fi
 
                LIBS="-l$cf_db_libs $LIBS"
        fi
 

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

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

-#line 13563 "configure"
+#line 13672 "configure"

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


@@ -13615,16 +13724,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:13618: \"$ac_link\"") >&5
+if { (eval echo "$as_me:13727: \"$ac_link\"") >&5

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

-  echo "$as_me:13621: \$? = $ac_status" >&5
+  echo "$as_me:13730: \$? = $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:13624: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13733: \"$ac_try\"") >&5

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

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


@@ -13644,11 +13753,11 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 done
 
 fi
 done
 
 fi

-echo "$as_me:13647: result: $cf_cv_hashed_db_libs" >&5
+echo "$as_me:13756: 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:13651: error: Cannot determine library for db" >&5
+               { { echo "$as_me:13760: 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


@@ -13658,7 +13767,7 @@ fi
 
 else
 
 
 else
 

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


@@ -13673,7 +13782,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:13676: checking if we should include stdbool.h" >&5
+echo "$as_me:13785: 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


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

-#line 13684 "configure"
+#line 13793 "configure"

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


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

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

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

-  echo "$as_me:13699: \$? = $ac_status" >&5
+  echo "$as_me:13808: \$? = $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:13702: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13811: \"$ac_try\"") >&5

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

-  echo "$as_me:13705: \$? = $ac_status" >&5
+  echo "$as_me:13814: \$? = $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 13712 "configure"
+#line 13821 "configure"

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


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

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

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

-  echo "$as_me:13731: \$? = $ac_status" >&5
+  echo "$as_me:13840: \$? = $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:13734: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13843: \"$ac_try\"") >&5

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

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


@@ -13748,13 +13857,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:13751: result: yes" >&5
+then   echo "$as_me:13860: result: yes" >&5

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

-else   echo "$as_me:13753: result: no" >&5
+else   echo "$as_me:13862: result: no" >&5

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

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


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

-#line 13765 "configure"
+#line 13874 "configure"

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


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

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

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

-  echo "$as_me:13783: \$? = $ac_status" >&5
+  echo "$as_me:13892: \$? = $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:13786: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13895: \"$ac_try\"") >&5

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

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


@@ -13799,9 +13908,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:13802: result: yes" >&5
+then   echo "$as_me:13911: result: yes" >&5

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

-else   echo "$as_me:13804: result: no" >&5
+else   echo "$as_me:13913: result: no" >&5

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


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

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


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

-#line 13835 "configure"
+#line 13944 "configure"

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


@@ -13848,16 +13957,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:13851: \"$ac_link\"") >&5
+if { (eval echo "$as_me:13960: \"$ac_link\"") >&5

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

-  echo "$as_me:13854: \$? = $ac_status" >&5
+  echo "$as_me:13963: \$? = $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:13857: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13966: \"$ac_try\"") >&5

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

-  echo "$as_me:13860: \$? = $ac_status" >&5
+  echo "$as_me:13969: \$? = $ac_status" >&5

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


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

-echo "$as_me:13872: result: $cf_cv_libstdcpp" >&5
+echo "$as_me:13981: result: $cf_cv_libstdcpp" >&5

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

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


@@ -13890,15 +13999,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:13893: \"$ac_try\"") >&5
+if { (eval echo "$as_me:14002: \"$ac_try\"") >&5

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

-  echo "$as_me:13896: \$? = $ac_status" >&5
+  echo "$as_me:14005: \$? = $ac_status" >&5

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

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

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

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


@@ -13909,10 +14018,10 @@ rm -f 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:13912: result: yes" >&5
+  echo "$as_me:14021: result: yes" >&5

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

-  echo "$as_me:13915: result: no" >&5
+  echo "$as_me:14024: result: no" >&5

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


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

-       echo "$as_me:13935: checking for lib$cf_gpp_libname" >&5
+       echo "$as_me:14044: checking for lib$cf_gpp_libname" >&5

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

-#line 13940 "configure"
+#line 14049 "configure"

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


@@ -13951,16 +14060,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:13954: \"$ac_link\"") >&5
+if { (eval echo "$as_me:14063: \"$ac_link\"") >&5

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

-  echo "$as_me:13957: \$? = $ac_status" >&5
+  echo "$as_me:14066: \$? = $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:13960: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14069: \"$ac_try\"") >&5

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

-  echo "$as_me:13963: \$? = $ac_status" >&5
+  echo "$as_me:14072: \$? = $ac_status" >&5

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


@@ -13979,7 +14088,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 13982 "configure"
+#line 14091 "configure"

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


@@ -13993,16 +14102,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:13996: \"$ac_link\"") >&5
+if { (eval echo "$as_me:14105: \"$ac_link\"") >&5

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

-  echo "$as_me:13999: \$? = $ac_status" >&5
+  echo "$as_me:14108: \$? = $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:14002: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14111: \"$ac_try\"") >&5

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

-  echo "$as_me:14005: \$? = $ac_status" >&5
+  echo "$as_me:14114: \$? = $ac_status" >&5

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


@@ -14019,7 +14128,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:14022: result: $cf_cxx_library" >&5
+       echo "$as_me:14131: result: $cf_cxx_library" >&5

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


@@ -14035,7 +14144,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:14038: checking how to run the C++ preprocessor" >&5
+echo "$as_me:14147: 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


@@ -14052,18 +14161,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 14055 "configure"
+#line 14164 "configure"

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

-if { (eval echo "$as_me:14060: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:14169: \"$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:14066: \$? = $ac_status" >&5
+  echo "$as_me:14175: \$? = $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


@@ -14086,17 +14195,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 14089 "configure"
+#line 14198 "configure"

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

-if { (eval echo "$as_me:14093: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:14202: \"$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:14099: \$? = $ac_status" >&5
+  echo "$as_me:14208: \$? = $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


@@ -14133,7 +14242,7 @@ fi
 else
   ac_cv_prog_CXXCPP=$CXXCPP
 fi
 else
   ac_cv_prog_CXXCPP=$CXXCPP
 fi

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


@@ -14143,18 +14252,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 14146 "configure"
+#line 14255 "configure"

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

-if { (eval echo "$as_me:14151: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:14260: \"$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:14157: \$? = $ac_status" >&5
+  echo "$as_me:14266: \$? = $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


@@ -14177,17 +14286,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 14180 "configure"
+#line 14289 "configure"

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

-if { (eval echo "$as_me:14184: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:14293: \"$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:14190: \$? = $ac_status" >&5
+  echo "$as_me:14299: \$? = $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


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

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


@@ -14230,23 +14339,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:14233: checking for $ac_header" >&5
+echo "$as_me:14342: 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 14239 "configure"
+#line 14348 "configure"

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

-if { (eval echo "$as_me:14243: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:14352: \"$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:14249: \$? = $ac_status" >&5
+  echo "$as_me:14358: \$? = $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


@@ -14265,7 +14374,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
 fi
 rm -f conftest.err conftest.$ac_ext
 fi

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


@@ -14275,7 +14384,7 @@ EOF
 fi
 done
 
 fi
 done
 

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


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

-#line 14286 "configure"
+#line 14395 "configure"

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


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

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

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

-  echo "$as_me:14301: \$? = $ac_status" >&5
+  echo "$as_me:14410: \$? = $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:14304: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14413: \"$ac_try\"") >&5

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

-  echo "$as_me:14307: \$? = $ac_status" >&5
+  echo "$as_me:14416: \$? = $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 14314 "configure"
+#line 14423 "configure"

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


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

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

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

-  echo "$as_me:14333: \$? = $ac_status" >&5
+  echo "$as_me:14442: \$? = $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:14336: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14445: \"$ac_try\"") >&5

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

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


@@ -14350,13 +14459,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:14353: result: yes" >&5
+then   echo "$as_me:14462: result: yes" >&5

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

-else   echo "$as_me:14355: result: no" >&5
+else   echo "$as_me:14464: result: no" >&5

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

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


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

-#line 14367 "configure"
+#line 14476 "configure"

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


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

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

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

-  echo "$as_me:14385: \$? = $ac_status" >&5
+  echo "$as_me:14494: \$? = $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:14388: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14497: \"$ac_try\"") >&5

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

-  echo "$as_me:14391: \$? = $ac_status" >&5
+  echo "$as_me:14500: \$? = $ac_status" >&5

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


@@ -14401,13 +14510,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:14404: result: yes" >&5
+then   echo "$as_me:14513: result: yes" >&5

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

-else   echo "$as_me:14406: result: no" >&5
+else   echo "$as_me:14515: result: no" >&5

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

-echo "$as_me:14410: checking for size of bool" >&5
+echo "$as_me:14519: 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


@@ -14418,7 +14527,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 14421 "configure"
+#line 14530 "configure"

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


@@ -14460,15 +14569,15 @@ main()
 
 _ACEOF
 rm -f conftest$ac_exeext
 
 _ACEOF
 rm -f conftest$ac_exeext

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

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

-  echo "$as_me:14466: \$? = $ac_status" >&5
+  echo "$as_me:14575: \$? = $ac_status" >&5

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

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

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

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


@@ -14486,18 +14595,18 @@ fi
 fi
 
        rm -f cf_test.out
 fi
 
        rm -f cf_test.out

-echo "$as_me:14489: result: $cf_cv_type_of_bool" >&5
+echo "$as_me:14598: 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:14495: WARNING: Assuming $NCURSES_BOOL for type of bool" >&5
+       { echo "$as_me:14604: 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:14500: checking for special defines needed for etip.h" >&5
+echo "$as_me:14609: 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"


@@ -14509,7 +14618,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 14512 "configure"
+#line 14621 "configure"

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


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

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

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

-  echo "$as_me:14529: \$? = $ac_status" >&5
+  echo "$as_me:14638: \$? = $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:14532: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14641: \"$ac_try\"") >&5

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

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


@@ -14553,12 +14662,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:14556: result: $cf_result" >&5
+echo "$as_me:14665: 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:14561: checking if $CXX accepts parameter initialization" >&5
+echo "$as_me:14670: 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


@@ -14575,7 +14684,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 14578 "configure"
+#line 14687 "configure"

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


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

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

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

-  echo "$as_me:14600: \$? = $ac_status" >&5
+  echo "$as_me:14709: \$? = $ac_status" >&5

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

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

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

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


@@ -14621,7 +14730,7 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
 ac_main_return=return
 
 fi
 ac_main_return=return
 
 fi

-echo "$as_me:14624: result: $cf_cv_cpp_param_init" >&5
+echo "$as_me:14733: 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


@@ -14630,7 +14739,7 @@ EOF
 
 if test -n "$CXX"; then
 
 
 if test -n "$CXX"; then
 

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


@@ -14644,7 +14753,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 14647 "configure"
+#line 14756 "configure"

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


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

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

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

-  echo "$as_me:14694: \$? = $ac_status" >&5
+  echo "$as_me:14803: \$? = $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:14697: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14806: \"$ac_try\"") >&5

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

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


@@ -14715,7 +14824,7 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
 ac_main_return=return
 
 fi
 ac_main_return=return
 
 fi

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


@@ -14763,7 +14872,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:14766: checking for size of bool" >&5
+echo "$as_me:14875: 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


@@ -14774,7 +14883,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 14777 "configure"
+#line 14886 "configure"

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


@@ -14816,15 +14925,15 @@ main()
 
 _ACEOF
 rm -f conftest$ac_exeext
 
 _ACEOF
 rm -f conftest$ac_exeext

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

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

-  echo "$as_me:14822: \$? = $ac_status" >&5
+  echo "$as_me:14931: \$? = $ac_status" >&5

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

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

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

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


@@ -14842,25 +14951,25 @@ fi
 fi
 
        rm -f cf_test.out
 fi
 
        rm -f cf_test.out

-echo "$as_me:14845: result: $cf_cv_type_of_bool" >&5
+echo "$as_me:14954: 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:14851: WARNING: Assuming $NCURSES_BOOL for type of bool" >&5
+       { echo "$as_me:14960: 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:14857: checking for fallback type of bool" >&5
+                       echo "$as_me:14966: 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:14863: result: $cf_cv_type_of_bool" >&5
+                       echo "$as_me:14972: 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


@@ -14889,7 +14998,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:14892: WARNING: libtool does not support Ada - disabling feature" >&5
+       { echo "$as_me:15001: 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


@@ -14899,7 +15008,7 @@ if test "$cf_with_ada" != "no" ; then
 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:14902: checking for $ac_word" >&5
+echo "$as_me:15011: 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


@@ -14914,7 +15023,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:14917: found $ac_dir/$ac_word" >&5
+echo "$as_me:15026: found $ac_dir/$ac_word" >&5

 break
 done
 
 break
 done
 


@@ -14923,10 +15032,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:14926: result: $gnat_exists" >&5
+  echo "$as_me:15035: result: $gnat_exists" >&5

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

-  echo "$as_me:14929: result: no" >&5
+  echo "$as_me:15038: result: no" >&5

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


@@ -14934,11 +15043,11 @@ if test "$ac_cv_prog_gnat_exists" = no; then
    cf_ada_make=
 else
 
    cf_ada_make=
 else
 

-echo "$as_me:14937: checking for gnat version" >&5
+echo "$as_me:15046: 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:14941: result: $cf_gnat_version" >&5
+echo "$as_me:15050: result: $cf_gnat_version" >&5

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


@@ -14961,7 +15070,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:14964: checking for $ac_word" >&5
+echo "$as_me:15073: 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


@@ -14976,7 +15085,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:14979: found $ac_dir/$ac_word" >&5
+echo "$as_me:15088: found $ac_dir/$ac_word" >&5

 break
 done
 
 break
 done
 


@@ -14985,10 +15094,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:14988: result: $M4_exists" >&5
+  echo "$as_me:15097: result: $M4_exists" >&5

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

-  echo "$as_me:14991: result: no" >&5
+  echo "$as_me:15100: result: no" >&5

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


@@ -14997,7 +15106,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:15000: checking if GNAT works" >&5
+      echo "$as_me:15109: checking if GNAT works" >&5

 echo $ECHO_N "checking if GNAT works... $ECHO_C" >&6
 
 rm -f conftest*
 echo $ECHO_N "checking if GNAT works... $ECHO_C" >&6
 
 rm -f conftest*


@@ -15025,14 +15134,14 @@ else
 fi
 rm -f conftest*
 
 fi
 rm -f conftest*
 

-      echo "$as_me:15028: result: $cf_cv_prog_gnat_correct" >&5
+      echo "$as_me:15137: result: $cf_cv_prog_gnat_correct" >&5

 echo "${ECHO_T}$cf_cv_prog_gnat_correct" >&6
    fi
 fi
 if test        "$cf_cv_prog_gnat_correct" = yes; then
    ADAFLAGS="-O3 -gnatpn $ADAFLAGS"
 
 echo "${ECHO_T}$cf_cv_prog_gnat_correct" >&6
    fi
 fi
 if test        "$cf_cv_prog_gnat_correct" = yes; then
    ADAFLAGS="-O3 -gnatpn $ADAFLAGS"
 

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

 echo $ECHO_N "checking if GNAT pragma Unreferenced works... $ECHO_C" >&6
 
 rm -f conftest*
 echo $ECHO_N "checking if GNAT pragma Unreferenced works... $ECHO_C" >&6
 
 rm -f conftest*


@@ -15059,7 +15168,7 @@ else
 fi
 rm -f conftest*
 
 fi
 rm -f conftest*
 

-   echo "$as_me:15062: result: $cf_cv_pragma_unreferenced" >&5
+   echo "$as_me:15171: 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).


@@ -15112,7 +15221,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:15115: error: expected a pathname, not \"$withval\"" >&5
+  { { echo "$as_me:15224: 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; }; }
   ;;


@@ -15154,7 +15263,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:15157: error: expected a pathname, not \"$withval\"" >&5
+  { { echo "$as_me:15266: 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; }; }
   ;;


@@ -15179,7 +15288,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:15182: checking for library subsets" >&5
+echo "$as_me:15291: 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=
 


@@ -15204,7 +15313,7 @@ LIB_SUBSETS="${LIB_SUBSETS}base"
 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:15207: result: $LIB_SUBSETS" >&5
+echo "$as_me:15316: 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


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

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


@@ -15253,10 +15362,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:15256: result: $DFT_ARG_SUFFIX" >&5
+echo "$as_me:15365: result: $DFT_ARG_SUFFIX" >&5

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

-echo "$as_me:15259: checking default library-dependency suffix" >&5
+echo "$as_me:15368: checking default library-dependency suffix" >&5

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


@@ -15287,10 +15396,10 @@ if test $DFT_LWR_MODEL = shared ; then
                ;;
        esac
 fi
                ;;
        esac
 fi

-echo "$as_me:15290: result: $DFT_DEP_SUFFIX" >&5
+echo "$as_me:15399: result: $DFT_DEP_SUFFIX" >&5

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

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


@@ -15306,12 +15415,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:15309: result: $DFT_OBJ_SUBDIR" >&5
+echo "$as_me:15418: 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:15314: checking c++ library-dependency suffix" >&5
+echo "$as_me:15423: 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


@@ -15337,7 +15446,7 @@ else
        esac
        test -n "$LIB_SUFFIX" && CXX_LIB_SUFFIX="${LIB_SUFFIX}${CXX_LIB_SUFFIX}"
 fi
        esac
        test -n "$LIB_SUFFIX" && CXX_LIB_SUFFIX="${LIB_SUFFIX}${CXX_LIB_SUFFIX}"
 fi

-echo "$as_me:15340: result: $CXX_LIB_SUFFIX" >&5
+echo "$as_me:15449: result: $CXX_LIB_SUFFIX" >&5

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


@@ -15474,12 +15583,12 @@ fi
        ;;
 esac
 
        ;;
 esac
 

-echo "$as_me:15477: checking where we will install curses.h" >&5
+echo "$as_me:15586: 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:15482: result: $includedir" >&5
+echo "$as_me:15591: 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


@@ -15487,7 +15596,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:15490: WARNING: Wide-character applications must define HAVE_LIBUTF8_H to include curses.h" >&5
+       { echo "$as_me:15599: 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


@@ -15503,7 +15612,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:15506: checking for src modules" >&5
+echo "$as_me:15615: 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


@@ -15566,7 +15675,7 @@ EOF
                fi
        fi
 done
                fi
        fi
 done

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


@@ -15712,6 +15821,77 @@ if test -n "$cf_new_extra_cppflags" ; then
        EXTRA_CPPFLAGS="$cf_new_extra_cppflags $EXTRA_CPPFLAGS"
 fi
 
        EXTRA_CPPFLAGS="$cf_new_extra_cppflags $EXTRA_CPPFLAGS"
 fi
 

+### If we're building with rpath, try to link non-standard libs that way too.
+if test "$DFT_LWR_MODEL" = "shared"; then
+
+echo "$as_me:15827: checking for updated LDFLAGS" >&5
+echo $ECHO_N "checking for updated LDFLAGS... $ECHO_C" >&6
+if test -n "$LDFLAGS" ; then
+echo "$as_me:15830: result: maybe" >&5
+echo "${ECHO_T}maybe" >&6
+test -n "$verbose" && echo "   ...checking LDFLAGS $LDFLAGS" 1>&6
+
+echo "${as_me-configure}:15834: testing ...checking LDFLAGS $LDFLAGS ..." 1>&5
+
+test -n "$verbose" && echo "   ...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS" 1>&6
+
+echo "${as_me-configure}:15838: testing ...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
+
+case "$EXTRA_LDFLAGS" in #(vi
+-Wl,-rpath,*) #(vi
+    cf_rpath_hack="-Wl,-rpath,"
+    ;;
+-R\ *)
+    cf_rpath_hack="-R "
+    ;;
+-R*)
+    cf_rpath_hack="-R"
+    ;;
+*)
+    cf_rpath_hack=
+    ;;
+esac
+cf_rpath_dst=
+for cf_rpath_src in $LDFLAGS
+do
+    test -n "$verbose" && echo "       Filtering $cf_rpath_src" 1>&6
+
+echo "${as_me-configure}:15859: testing Filtering $cf_rpath_src ..." 1>&5
+
+    case $cf_rpath_src in #(vi
+    -L*) #(vi
+        if test "$cf_rpath_hack" = "-R " ; then
+            cf_rpath_tmp=`echo "$cf_rpath_src" |sed -e 's%-L%-R %'`
+        else
+            cf_rpath_tmp=`echo "$cf_rpath_src" |sed -e s%-L%$cf_rpath_hack%`
+        fi
+        test -n "$verbose" && echo "   ...Filter $cf_rpath_tmp" 1>&6
+
+echo "${as_me-configure}:15870: testing ...Filter $cf_rpath_tmp ..." 1>&5
+
+        EXTRA_LDFLAGS="$cf_rpath_tmp $EXTRA_LDFLAGS"
+        ;;
+    *)
+        cf_rpath_dst="$cf_rpath_dst $cf_rpath_src"
+        ;;
+    esac
+done
+LDFLAGS=$cf_rpath_dst
+test -n "$verbose" && echo "   ...checked LDFLAGS $LDFLAGS" 1>&6
+
+echo "${as_me-configure}:15882: testing ...checked LDFLAGS $LDFLAGS ..." 1>&5
+
+test -n "$verbose" && echo "   ...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS" 1>&6
+
+echo "${as_me-configure}:15886: testing ...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
+
+else
+echo "$as_me:15889: result: no" >&5
+echo "${ECHO_T}no" >&6
+fi
+
+fi
+

 ### Define substitutions for header files to avoid name-pollution
 
 if test "$cf_cv_have_tcgetattr" = yes ; then
 ### Define substitutions for header files to avoid name-pollution
 
 if test "$cf_cv_have_tcgetattr" = yes ; then


@@ -15816,7 +15996,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:15819: creating $CONFIG_STATUS" >&5
+{ echo "$as_me:15999: 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


@@ -15992,7 +16172,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:15995: error: ambiguous option: $1
+    { { echo "$as_me:16175: 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;}


@@ -16011,7 +16191,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:16014: error: unrecognized option: $1
+  -*) { { echo "$as_me:16194: 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;}


@@ -16107,7 +16287,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:16110: error: invalid argument: $ac_config_target" >&5
+  *) { { echo "$as_me:16290: 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


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

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


@@ -16506,7 +16686,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:16509: error: cannot find input file: $f" >&5
+         test -f "$f" || { { echo "$as_me:16689: 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;;


@@ -16519,7 +16699,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:16522: error: cannot find input file: $f" >&5
+           { { echo "$as_me:16702: 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;;


@@ -16585,7 +16765,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:16588: creating $ac_file" >&5
+  test x"$ac_file" != x- && { echo "$as_me:16768: 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


@@ -16596,7 +16776,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:16599: error: cannot find input file: $f" >&5
+         test -f "$f" || { { echo "$as_me:16779: 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;;


@@ -16609,7 +16789,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:16612: error: cannot find input file: $f" >&5
+           { { echo "$as_me:16792: 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;;


@@ -16667,7 +16847,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:16670: $ac_file is unchanged" >&5
+      { echo "$as_me:16850: $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/configure.in b/configure.in
index 8a6d719492443deeab0aa5d0f71e96bf0fc8a4c8..50892dd7032086dce4fa85e9dbbdeeda89775285 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -28,14 +28,14 @@ dnl***************************************************************************
 dnl
 dnl Author: Thomas E. Dickey 1995-on
 dnl
 dnl
 dnl Author: Thomas E. Dickey 1995-on
 dnl

-dnl $Id: configure.in,v 1.427 2007/11/18 00:52:38 tom Exp $
+dnl $Id: configure.in,v 1.429 2007/11/24 22:42:43 tom Exp $

 dnl Process this file with autoconf to produce a configure script.
 dnl
 dnl See http://invisible-island.net/autoconf/ for additional information.
 dnl
 dnl ---------------------------------------------------------------------------
 AC_PREREQ(2.13.20020210)
 dnl Process this file with autoconf to produce a configure script.
 dnl
 dnl See http://invisible-island.net/autoconf/ for additional information.
 dnl
 dnl ---------------------------------------------------------------------------
 AC_PREREQ(2.13.20020210)

-AC_REVISION($Revision: 1.427 $)
+AC_REVISION($Revision: 1.429 $)

 AC_INIT(ncurses/base/lib_initscr.c)
 AC_CONFIG_HEADER(include/ncurses_cfg.h:include/ncurses_cfg.hin)
 
 AC_INIT(ncurses/base/lib_initscr.c)
 AC_CONFIG_HEADER(include/ncurses_cfg.h:include/ncurses_cfg.hin)
 


@@ -1244,7 +1244,7 @@ CF_FUNC_POLL
 
 if test "$with_hashed_db" != no ; then
        AC_DEFINE(USE_HASHED_DB)
 
 if test "$with_hashed_db" != no ; then
        AC_DEFINE(USE_HASHED_DB)

-       CF_HASHED_DB
+       CF_HASHED_DB($with_hashed_db)

 fi
 
 dnl We'll do our own -g libraries, unless the user's overridden via $CFLAGS
 fi
 
 dnl We'll do our own -g libraries, unless the user's overridden via $CFLAGS


@@ -1684,6 +1684,11 @@ AC_DEFINE_UNQUOTED(NCURSES_VERSION_STRING, "${NCURSES_MAJOR}.${NCURSES_MINOR}.${
 ### Now that we're done running tests, add the compiler-warnings, if any
 CF_ADD_CFLAGS($EXTRA_CFLAGS)
 
 ### Now that we're done running tests, add the compiler-warnings, if any
 CF_ADD_CFLAGS($EXTRA_CFLAGS)
 

+### If we're building with rpath, try to link non-standard libs that way too.
+if test "$DFT_LWR_MODEL" = "shared"; then
+  CF_RPATH_HACK
+fi
+

 ### Define substitutions for header files to avoid name-pollution
 CF_SUBST_IF(["$cf_cv_have_tcgetattr" = yes], HAVE_TCGETATTR, 1, 0)
 CF_SUBST_IF(["$ac_cv_header_termio_h" = yes], HAVE_TERMIO_H, 1, 0)
 ### Define substitutions for header files to avoid name-pollution
 CF_SUBST_IF(["$cf_cv_have_tcgetattr" = yes], HAVE_TCGETATTR, 1, 0)
 CF_SUBST_IF(["$ac_cv_header_termio_h" = yes], HAVE_TERMIO_H, 1, 0)

diff --git a/dist.mk b/dist.mk
index 0ea948f163ad83cbd362bfc67746efdd075dd975..a8a1d82ac158334b1a949b9d5e159558467053ea 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.616 2007/11/17 20:57:47 tom Exp $
+# $Id: dist.mk,v 1.617 2007/11/24 18:44:07 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 = 6
 # These define the major/minor/patch versions of ncurses.
 NCURSES_MAJOR = 5
 NCURSES_MINOR = 6

-NCURSES_PATCH = 20071117
+NCURSES_PATCH = 20071124

 
 # 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/frm_driver.c b/form/frm_driver.c
index cc7eb6e1af4dc10044ad80eda8ce81a8f2dcdc90..25928c5d108c4afb5fced1a4c2139bb14e40b09a 100644 (file)
--- a/form/frm_driver.c
+++ b/form/frm_driver.c
@@ -32,7 +32,7 @@
 
 #include "form.priv.h"
 
 
 #include "form.priv.h"
 

-MODULE_ID("$Id: frm_driver.c,v 1.84 2007/10/13 19:26:54 tom Exp $")
+MODULE_ID("$Id: frm_driver.c,v 1.85 2007/11/24 21:32:53 tom Exp $")

 
 /*----------------------------------------------------------------------------
   This is the core module of the form library. It contains the majority
 
 /*----------------------------------------------------------------------------
   This is the core module of the form library. It contains the majority


@@ -4459,10 +4459,7 @@ field_buffer(const FIELD *field, int buffer)
              init_mb(state);
              next = _nc_wcrtomb(0, data[n].chars[0], &state);
              if (!isEILSEQ(next))
              init_mb(state);
              next = _nc_wcrtomb(0, data[n].chars[0], &state);
              if (!isEILSEQ(next))

-               {
-                 if (next != 0)
-                   need += next;
-               }
+               need += next;

            }
        }
 
            }
        }
 

diff --git a/ncurses/curses.priv.h b/ncurses/curses.priv.h
index ce335e64ce2c9102256884aedd33ddaa8223d30e..57fd2409aae9ed13a2655fadf0bca4632590275a 100644 (file)
--- a/ncurses/curses.priv.h
+++ b/ncurses/curses.priv.h
@@ -34,7 +34,7 @@
 
 
 /*
 
 
 /*

- * $Id: curses.priv.h,v 1.349 2007/11/17 23:33:18 tom Exp $
+ * $Id: curses.priv.h,v 1.351 2007/11/25 00:57:29 tom Exp $

  *
  *     curses.priv.h
  *
  *
  *     curses.priv.h
  *


@@ -946,7 +946,7 @@ extern NCURSES_EXPORT_VAR(SIG_ATOMIC_T) _nc_have_sigwinch;
 #endif
 
 #if USE_WIDEC_SUPPORT /* { */
 #endif
 
 #if USE_WIDEC_SUPPORT /* { */

-#define isEILSEQ(status) ((status == (size_t)-1) && (errno == EILSEQ))
+#define isEILSEQ(status) (((size_t)status == (size_t)-1) && (errno == EILSEQ))

 
 #define init_mb(state) memset(&state, 0, sizeof(state))
 
 
 #define init_mb(state) memset(&state, 0, sizeof(state))
 


@@ -1530,11 +1530,7 @@ extern NCURSES_EXPORT(void) _nc_scroll_window (WINDOW *, int const, NCURSES_SIZE
 #endif
 
 #if USE_WIDEC_SUPPORT && !defined(USE_TERMLIB)
 #endif
 
 #if USE_WIDEC_SUPPORT && !defined(USE_TERMLIB)

-#ifdef linux

 extern NCURSES_EXPORT(size_t) _nc_wcrtomb (char *, wchar_t, mbstate_t *);
 extern NCURSES_EXPORT(size_t) _nc_wcrtomb (char *, wchar_t, mbstate_t *);

-#else
-#define _nc_wcrtomb(s,wc,ps) wcrtomb(s,wc,ps)
-#endif

 #endif
 
 #if USE_SIZECHANGE
 #endif
 
 #if USE_SIZECHANGE

diff --git a/ncurses/widechar/lib_unget_wch.c b/ncurses/widechar/lib_unget_wch.c
index 62ec89d750142f74d602226b4426d2322c46e922..b2dc7ff96f1b237a4bae40ca8b542a4b1410cdac 100644 (file)
--- a/ncurses/widechar/lib_unget_wch.c
+++ b/ncurses/widechar/lib_unget_wch.c
@@ -1,5 +1,5 @@
 /****************************************************************************
 /****************************************************************************

- * Copyright (c) 2002-2003,2004 Free Software Foundation, Inc.              *
+ * Copyright (c) 2002-2004,2007 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            *


@@ -39,26 +39,30 @@
 
 #include <curses.priv.h>
 
 
 #include <curses.priv.h>
 

-MODULE_ID("$Id: lib_unget_wch.c,v 1.7 2004/12/05 01:21:31 tom Exp $")
+MODULE_ID("$Id: lib_unget_wch.c,v 1.9 2007/11/25 00:57:00 tom Exp $")

 
 

-#ifdef linux

 /*
 /*

- * glibc's wcrtomb() function is broken - does not return the proper value
- * when target is null (noted for glibc 2.3.2).  This is a workaround.
+ * Wrapper for wcrtomb() which obtains the length needed for the given
+ * wide-character 'source'.

  */
 NCURSES_EXPORT(size_t)
 _nc_wcrtomb(char *target, wchar_t source, mbstate_t * state)
 {
  */
 NCURSES_EXPORT(size_t)
 _nc_wcrtomb(char *target, wchar_t source, mbstate_t * state)
 {

+    int result;
+

     if (target == 0) {
        wchar_t temp[2];
        const wchar_t *tempp = temp;
        temp[0] = source;
        temp[1] = 0;
     if (target == 0) {
        wchar_t temp[2];
        const wchar_t *tempp = temp;
        temp[0] = source;
        temp[1] = 0;

-       return wcsrtombs(NULL, &tempp, 0, state);
+       result = wcsrtombs(NULL, &tempp, 0, state);
+    } else {
+       result = wcrtomb(target, source, state);

     }
     }

-    return wcrtomb(target, source, state);
+    if (!isEILSEQ(result) && (result == 0))
+       result = 1;
+    return result;

 }
 }

-#endif

 
 NCURSES_EXPORT(int)
 unget_wch(const wchar_t wch)
 
 NCURSES_EXPORT(int)
 unget_wch(const wchar_t wch)