ncurses 5.6 - patch 20080816

+ add configure option --enable-weak-symbols to turn on new feature.
+ add configure-check for availability of weak symbols.
+ modify linkage with pthread library to use weak symbols so that
  applications not linked to that library will not use the mutexes,
  etc.  This relies on gcc, and may be platform-specific (patch by Dr
  Werner Fink).
+ add note to INSTALL to document limitation of renaming of tic library
  using the --with-ticlib configure option (report by Dr Werner Fink).
+ document (in manpage) why tputs does not detect I/O errors (prompted
  by comments by Samuel Thibault).
+ fix remaining warnings from Klocwork report.

diff --git a/INSTALL b/INSTALL
index ace4e4c80b37f6a889c0a8f471e24fa6c49505a2..c521c8ba8135556fdcfda7ce473d497d7fa2f861 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.127 2008/07/05 20:17:23 tom Exp $
+-- $Id: INSTALL,v 1.128 2008/08/16 21:12:51 tom Exp $

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


@@ -910,6 +910,12 @@ SUMMARY OF CONFIGURE OPTIONS:
        library.  As in termlib, there is no ABI difference between the
        "wide" libticw.so and libtic.so
 
        library.  As in termlib, there is no ABI difference between the
        "wide" libticw.so and libtic.so
 

+       NOTE: Overriding the name of the tic library may be useful if you are
+       also using the --with-termlib option to rename libtinfo.  If you are
+       not doing that, renaming the tic library can result in conflicting
+       library dependencies for tic and other programs built with the tic
+       library.
+

     --with-trace
        Configure the trace() function as part of the all models of the ncurses
        library.  Normally it is part of the debug (libncurses_g) library only.
     --with-trace
        Configure the trace() function as part of the all models of the ncurses
        library.  Normally it is part of the debug (libncurses_g) library only.

diff --git a/NEWS b/NEWS
index d554a553cbb7f48bcf4eb12776db9ec84b07cced..8c079d29fdc0ae9a06d98ba8ca44384219ccffb1 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.1261 2008/08/04 18:22:11 tom Exp $
+-- $Id: NEWS,v 1.1268 2008/08/17 01:28:30 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,19 @@ 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.
 

+20080816
+       + add configure option --enable-weak-symbols to turn on new feature.
+       + add configure-check for availability of weak symbols.
+       + modify linkage with pthread library to use weak symbols so that
+         applications not linked to that library will not use the mutexes,
+         etc.  This relies on gcc, and may be platform-specific (patch by Dr
+         Werner Fink).
+       + add note to INSTALL to document limitation of renaming of tic library
+         using the --with-ticlib configure option (report by Dr Werner Fink).
+       + document (in manpage) why tputs does not detect I/O errors (prompted
+         by comments by Samuel Thibault).
+       + fix remaining warnings from Klocwork report.
+

 20080804
        + modify _nc_panelhook() data to account for a permanent memory leak.
        + fix memory leaks in test/demo_menus
 20080804
        + modify _nc_panelhook() data to account for a permanent memory leak.
        + fix memory leaks in test/demo_menus

diff --git a/aclocal.m4 b/aclocal.m4
index 0c15200e20bdfc1daf7c0f266b7c0a30d957661c..cc6f03d49a511563f95bed776edbf1c2ff27ae06 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.451 2008/08/04 10:26:11 tom Exp $
+dnl $Id: aclocal.m4,v 1.452 2008/08/16 23:19:46 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


@@ -4862,6 +4862,32 @@ fi
 ])
 ])dnl
 dnl ---------------------------------------------------------------------------
 ])
 ])dnl
 dnl ---------------------------------------------------------------------------

+dnl CF_WEAK_SYMBOLS version: 1 updated: 2008/08/16 19:18:06
+dnl ---------------
+dnl Check for compiler-support for weak symbols.
+dnl This works with "recent" gcc.
+AC_DEFUN([CF_WEAK_SYMBOLS],[
+AC_CACHE_CHECK(if $CC supports weak symbols,cf_cv_weak_symbols,[
+
+AC_TRY_COMPILE([
+#include <stdio.h>],
+[
+#if defined(__GNUC__)
+#  if defined __USE_ISOC99
+#    define _cat_pragma(exp)   _Pragma(#exp)
+#    define _weak_pragma(exp)  _cat_pragma(weak name)
+#  else
+#    define _weak_pragma(exp)
+#  endif
+#  define _declare(name)       __extension__ extern __typeof__(name) name
+#  define weak_symbol(name)    _weak_pragma(name) _declare(name) __attribute__((weak))
+#endif
+
+weak_symbol(fopen);
+],[cf_cv_weak_symbols=yes],[cf_cv_weak_symbols=no])
+])
+])dnl
+dnl ---------------------------------------------------------------------------

 dnl CF_WITH_ABI_VERSION version: 1 updated: 2003/09/20 18:12:49
 dnl -------------------
 dnl Allow library's ABI to be overridden.  Generally this happens when a
 dnl CF_WITH_ABI_VERSION version: 1 updated: 2003/09/20 18:12:49
 dnl -------------------
 dnl Allow library's ABI to be overridden.  Generally this happens when a

diff --git a/c++/cursesapp.cc b/c++/cursesapp.cc
index c85e4f74555d8da85979f25c389b803603af06a6..ddab6fdf9b9dd182e4df8ddce9e0cf3d4c00b6bf 100644 (file)
--- a/c++/cursesapp.cc
+++ b/c++/cursesapp.cc
@@ -1,6 +1,6 @@
 // * this is for making emacs happy: -*-Mode: C++;-*-
 /****************************************************************************
 // * this is for making emacs happy: -*-Mode: C++;-*-
 /****************************************************************************

- * Copyright (c) 1998-2005,2007 Free Software Foundation, Inc.              *
+ * Copyright (c) 1998-2007,2008 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            *


@@ -29,12 +29,13 @@
 
 /****************************************************************************
  *   Author: Juergen Pfeifer, 1997                                          *
 
 /****************************************************************************
  *   Author: Juergen Pfeifer, 1997                                          *

+ *      and: Thomas E. Dickey                                               *

  ****************************************************************************/
 
 #include "internal.h"
 #include "cursesapp.h"
 
  ****************************************************************************/
 
 #include "internal.h"
 #include "cursesapp.h"
 

-MODULE_ID("$Id: cursesapp.cc,v 1.14 2007/01/27 20:16:42 tom Exp $")
+MODULE_ID("$Id: cursesapp.cc,v 1.15 2008/08/16 17:15:35 tom Exp $")

 
 void
 NCursesApplication::init(bool bColors)
 
 void
 NCursesApplication::init(bool bColors)


@@ -108,8 +109,11 @@ bool NCursesApplication::pop()
     SLK_Link* L = slk_stack;
     slk_stack = slk_stack->prev;
     delete L;
     SLK_Link* L = slk_stack;
     slk_stack = slk_stack->prev;
     delete L;

-    if (Root_Window && top())
-      top()->show();
+    if (Root_Window) {
+      Soft_Label_Key_Set* xx = top();
+      if (xx != 0)
+        xx->show();
+    }

   }
   return (slk_stack ? FALSE : TRUE);
 }
   }
   return (slk_stack ? FALSE : TRUE);
 }

diff --git a/c++/cursesp.h b/c++/cursesp.h
index 3d8828cb84e5386d3ed83d13e919fb6933df143e..9b63d6d671bfd6be7ad516a991c31a8f1db311f6 100644 (file)
--- a/c++/cursesp.h
+++ b/c++/cursesp.h
@@ -1,6 +1,6 @@
 // * This makes emacs happy -*-Mode: C++;-*-
 /****************************************************************************
 // * This makes emacs happy -*-Mode: C++;-*-
 /****************************************************************************

- * Copyright (c) 1998-2005,2007 Free Software Foundation, Inc.              *
+ * Copyright (c) 1998-2007,2008 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            *


@@ -34,7 +34,7 @@
 #ifndef NCURSES_CURSESP_H_incl
 #define NCURSES_CURSESP_H_incl 1
 
 #ifndef NCURSES_CURSESP_H_incl
 #define NCURSES_CURSESP_H_incl 1
 

-// $Id: cursesp.h,v 1.27 2007/04/07 17:12:54 tom Exp $
+// $Id: cursesp.h,v 1.29 2008/08/16 17:20:23 tom Exp $

 
 #include <cursesw.h>
 
 
 #include <cursesw.h>
 


@@ -71,16 +71,19 @@ protected:
   void set_user(void *user)
   {
     UserHook* uptr = UserPointer();
   void set_user(void *user)
   {
     UserHook* uptr = UserPointer();

-    assert (uptr != 0 && uptr->m_back==this && uptr->m_owner==p);
-    uptr->m_user = user;
+    if (uptr != 0 && uptr->m_back==this && uptr->m_owner==p) {
+      uptr->m_user = user;
+    }

   }
   // Set the user pointer of the panel.
 
   void *get_user()
   {
     UserHook* uptr = UserPointer();
   }
   // Set the user pointer of the panel.
 
   void *get_user()
   {
     UserHook* uptr = UserPointer();

-    assert (uptr != 0 && uptr->m_back==this && uptr->m_owner==p);
-    return uptr->m_user;
+    void *result = 0;
+    if (uptr != 0 && uptr->m_back==this && uptr->m_owner==p)
+      result = uptr->m_user;
+    return result;

   }
 
   void OnError (int err) const THROWS(NCursesPanelException)
   }
 
   void OnError (int err) const THROWS(NCursesPanelException)

diff --git a/configure b/configure
index 0eee83a2b0085721bece326e553509f9af38a58e..5f10cb5318c1ae912bbd8f20357dfbbf510b6217 100755 (executable)
--- a/configure
+++ b/configure
@@ -1,5 +1,5 @@
 #! /bin/sh
 #! /bin/sh

-# From configure.in Revision: 1.435 .
+# From configure.in Revision: 1.439 .

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


@@ -777,6 +777,7 @@ Experimental Code:
   --disable-hashmap       compile without hashmap scrolling-optimization
   --enable-colorfgbg      compile with $COLORFGBG code
   --with-pthread          use POSIX thread library
   --disable-hashmap       compile without hashmap scrolling-optimization
   --enable-colorfgbg      compile with $COLORFGBG code
   --with-pthread          use POSIX thread library

+  --enable-weak-symbols       enable weak-symbols for pthreads

   --enable-reentrant      compile with experimental reentrant code
   --enable-safe-sprintf   compile with experimental safe-sprintf code
   --disable-scroll-hints  compile without scroll-hints code
   --enable-reentrant      compile with experimental reentrant code
   --enable-safe-sprintf   compile with experimental safe-sprintf code
   --disable-scroll-hints  compile without scroll-hints code


@@ -992,7 +993,7 @@ if test -z "$CONFIG_SITE"; then
 fi
 for ac_site_file in $CONFIG_SITE; do
   if test -r "$ac_site_file"; then
 fi
 for ac_site_file in $CONFIG_SITE; do
   if test -r "$ac_site_file"; then

-    { echo "$as_me:995: loading site script $ac_site_file" >&5
+    { echo "$as_me:996: loading site script $ac_site_file" >&5

 echo "$as_me: loading site script $ac_site_file" >&6;}
     cat "$ac_site_file" >&5
     . "$ac_site_file"
 echo "$as_me: loading site script $ac_site_file" >&6;}
     cat "$ac_site_file" >&5
     . "$ac_site_file"


@@ -1003,7 +1004,7 @@ if test -r "$cache_file"; then
   # Some versions of bash will fail to source /dev/null (special
   # files actually), so we avoid doing that.
   if test -f "$cache_file"; then
   # Some versions of bash will fail to source /dev/null (special
   # files actually), so we avoid doing that.
   if test -f "$cache_file"; then

-    { echo "$as_me:1006: loading cache $cache_file" >&5
+    { echo "$as_me:1007: loading cache $cache_file" >&5

 echo "$as_me: loading cache $cache_file" >&6;}
     case $cache_file in
       [\\/]* | ?:[\\/]* ) . $cache_file;;
 echo "$as_me: loading cache $cache_file" >&6;}
     case $cache_file in
       [\\/]* | ?:[\\/]* ) . $cache_file;;


@@ -1011,7 +1012,7 @@ echo "$as_me: loading cache $cache_file" >&6;}
     esac
   fi
 else
     esac
   fi
 else

-  { echo "$as_me:1014: creating cache $cache_file" >&5
+  { echo "$as_me:1015: creating cache $cache_file" >&5

 echo "$as_me: creating cache $cache_file" >&6;}
   >$cache_file
 fi
 echo "$as_me: creating cache $cache_file" >&6;}
   >$cache_file
 fi


@@ -1027,21 +1028,21 @@ for ac_var in `(set) 2>&1 |
   eval ac_new_val="\$ac_env_${ac_var}_value"
   case $ac_old_set,$ac_new_set in
     set,)
   eval ac_new_val="\$ac_env_${ac_var}_value"
   case $ac_old_set,$ac_new_set in
     set,)

-      { echo "$as_me:1030: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
+      { echo "$as_me:1031: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5

 echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;}
       ac_cache_corrupted=: ;;
     ,set)
 echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;}
       ac_cache_corrupted=: ;;
     ,set)

-      { echo "$as_me:1034: error: \`$ac_var' was not set in the previous run" >&5
+      { echo "$as_me:1035: error: \`$ac_var' was not set in the previous run" >&5

 echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
       ac_cache_corrupted=: ;;
     ,);;
     *)
       if test "x$ac_old_val" != "x$ac_new_val"; then
 echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
       ac_cache_corrupted=: ;;
     ,);;
     *)
       if test "x$ac_old_val" != "x$ac_new_val"; then

-        { echo "$as_me:1040: error: \`$ac_var' has changed since the previous run:" >&5
+        { echo "$as_me:1041: error: \`$ac_var' has changed since the previous run:" >&5

 echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;}
 echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;}

-        { echo "$as_me:1042:   former value:  $ac_old_val" >&5
+        { echo "$as_me:1043:   former value:  $ac_old_val" >&5

 echo "$as_me:   former value:  $ac_old_val" >&2;}
 echo "$as_me:   former value:  $ac_old_val" >&2;}

-        { echo "$as_me:1044:   current value: $ac_new_val" >&5
+        { echo "$as_me:1045:   current value: $ac_new_val" >&5

 echo "$as_me:   current value: $ac_new_val" >&2;}
         ac_cache_corrupted=:
       fi;;
 echo "$as_me:   current value: $ac_new_val" >&2;}
         ac_cache_corrupted=:
       fi;;


@@ -1060,9 +1061,9 @@ echo "$as_me:   current value: $ac_new_val" >&2;}
   fi
 done
 if $ac_cache_corrupted; then
   fi
 done
 if $ac_cache_corrupted; then

-  { echo "$as_me:1063: error: changes in the environment can compromise the build" >&5
+  { echo "$as_me:1064: error: changes in the environment can compromise the build" >&5

 echo "$as_me: error: changes in the environment can compromise the build" >&2;}
 echo "$as_me: error: changes in the environment can compromise the build" >&2;}

-  { { echo "$as_me:1065: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5
+  { { echo "$as_me:1066: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5

 echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;}
    { (exit 1); exit 1; }; }
 fi
 echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;}
    { (exit 1); exit 1; }; }
 fi


@@ -1083,10 +1084,10 @@ esac
 echo "#! $SHELL" >conftest.sh
 echo  "exit 0"   >>conftest.sh
 chmod +x conftest.sh
 echo "#! $SHELL" >conftest.sh
 echo  "exit 0"   >>conftest.sh
 chmod +x conftest.sh

-if { (echo "$as_me:1086: PATH=\".;.\"; conftest.sh") >&5
+if { (echo "$as_me:1087: PATH=\".;.\"; conftest.sh") >&5

   (PATH=".;."; conftest.sh) 2>&5
   ac_status=$?
   (PATH=".;."; conftest.sh) 2>&5
   ac_status=$?

-  echo "$as_me:1089: \$? = $ac_status" >&5
+  echo "$as_me:1090: \$? = $ac_status" >&5

   (exit $ac_status); }; then
   ac_path_separator=';'
 else
   (exit $ac_status); }; then
   ac_path_separator=';'
 else


@@ -1099,7 +1100,7 @@ ac_config_headers="$ac_config_headers include/ncurses_cfg.h:include/ncurses_cfg.
 
 top_builddir=`pwd`
 
 
 top_builddir=`pwd`
 

-echo "$as_me:1102: checking for egrep" >&5
+echo "$as_me:1103: checking for egrep" >&5

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


@@ -1109,11 +1110,11 @@ else
     else ac_cv_prog_egrep='egrep'
     fi
 fi
     else ac_cv_prog_egrep='egrep'
     fi
 fi

-echo "$as_me:1112: result: $ac_cv_prog_egrep" >&5
+echo "$as_me:1113: result: $ac_cv_prog_egrep" >&5

 echo "${ECHO_T}$ac_cv_prog_egrep" >&6
  EGREP=$ac_cv_prog_egrep
 
 echo "${ECHO_T}$ac_cv_prog_egrep" >&6
  EGREP=$ac_cv_prog_egrep
 

-test -z "$EGREP" && { { echo "$as_me:1116: error: No egrep program found" >&5
+test -z "$EGREP" && { { echo "$as_me:1117: error: No egrep program found" >&5

 echo "$as_me: error: No egrep program found" >&2;}
    { (exit 1); exit 1; }; }
 
 echo "$as_me: error: No egrep program found" >&2;}
    { (exit 1); exit 1; }; }
 


@@ -1123,7 +1124,7 @@ NCURSES_PATCH="`$ac_cv_prog_egrep '^NCURSES_PATCH[        ]*=' $srcdir/dist.mk | sed -
 cf_cv_abi_version=${NCURSES_MAJOR}
 cf_cv_rel_version=${NCURSES_MAJOR}.${NCURSES_MINOR}
 cf_cv_timestamp=`date`
 cf_cv_abi_version=${NCURSES_MAJOR}
 cf_cv_rel_version=${NCURSES_MAJOR}.${NCURSES_MINOR}
 cf_cv_timestamp=`date`

-echo "$as_me:1126: result: Configuring NCURSES $cf_cv_rel_version ABI $cf_cv_abi_version ($cf_cv_timestamp)" >&5
+echo "$as_me:1127: result: Configuring NCURSES $cf_cv_rel_version ABI $cf_cv_abi_version ($cf_cv_timestamp)" >&5

 echo "${ECHO_T}Configuring NCURSES $cf_cv_rel_version ABI $cf_cv_abi_version ($cf_cv_timestamp)" >&6
 
 test -z "$cf_cv_rel_version" && cf_cv_rel_version=0.0
 echo "${ECHO_T}Configuring NCURSES $cf_cv_rel_version ABI $cf_cv_abi_version ($cf_cv_timestamp)" >&6
 
 test -z "$cf_cv_rel_version" && cf_cv_rel_version=0.0


@@ -1131,7 +1132,7 @@ test -z "$cf_cv_rel_version" && cf_cv_rel_version=0.0
 # Check whether --with-rel-version or --without-rel-version was given.
 if test "${with_rel_version+set}" = set; then
   withval="$with_rel_version"
 # Check whether --with-rel-version or --without-rel-version was given.
 if test "${with_rel_version+set}" = set; then
   withval="$with_rel_version"

-  { echo "$as_me:1134: WARNING: overriding release version $cf_cv_rel_version to $withval" >&5
+  { echo "$as_me:1135: WARNING: overriding release version $cf_cv_rel_version to $withval" >&5

 echo "$as_me: WARNING: overriding release version $cf_cv_rel_version to $withval" >&2;}
  cf_cv_rel_version=$withval
 fi;
 echo "$as_me: WARNING: overriding release version $cf_cv_rel_version to $withval" >&2;}
  cf_cv_rel_version=$withval
 fi;


@@ -1144,13 +1145,13 @@ if test -n "$NCURSES_MAJOR" ; then
   [0-9]*) #(vi
        ;;
   *)
   [0-9]*) #(vi
        ;;
   *)

-       { { echo "$as_me:1147: error: Release major-version is not a number: $NCURSES_MAJOR" >&5
+       { { echo "$as_me:1148: error: Release major-version is not a number: $NCURSES_MAJOR" >&5

 echo "$as_me: error: Release major-version is not a number: $NCURSES_MAJOR" >&2;}
    { (exit 1); exit 1; }; }
        ;;
   esac
 else
 echo "$as_me: error: Release major-version is not a number: $NCURSES_MAJOR" >&2;}
    { (exit 1); exit 1; }; }
        ;;
   esac
 else

-  { { echo "$as_me:1153: error: Release major-version value is empty" >&5
+  { { echo "$as_me:1154: error: Release major-version value is empty" >&5

 echo "$as_me: error: Release major-version value is empty" >&2;}
    { (exit 1); exit 1; }; }
 fi
 echo "$as_me: error: Release major-version value is empty" >&2;}
    { (exit 1); exit 1; }; }
 fi


@@ -1160,13 +1161,13 @@ if test -n "$NCURSES_MINOR" ; then
   [0-9]*) #(vi
        ;;
   *)
   [0-9]*) #(vi
        ;;
   *)

-       { { echo "$as_me:1163: error: Release minor-version is not a number: $NCURSES_MINOR" >&5
+       { { echo "$as_me:1164: error: Release minor-version is not a number: $NCURSES_MINOR" >&5

 echo "$as_me: error: Release minor-version is not a number: $NCURSES_MINOR" >&2;}
    { (exit 1); exit 1; }; }
        ;;
   esac
 else
 echo "$as_me: error: Release minor-version is not a number: $NCURSES_MINOR" >&2;}
    { (exit 1); exit 1; }; }
        ;;
   esac
 else

-  { { echo "$as_me:1169: error: Release minor-version value is empty" >&5
+  { { echo "$as_me:1170: error: Release minor-version value is empty" >&5

 echo "$as_me: error: Release minor-version value is empty" >&2;}
    { (exit 1); exit 1; }; }
 fi
 echo "$as_me: error: Release minor-version value is empty" >&2;}
    { (exit 1); exit 1; }; }
 fi


@@ -1176,7 +1177,7 @@ test -z "$cf_cv_abi_version" && cf_cv_abi_version=0
 # Check whether --with-abi-version or --without-abi-version was given.
 if test "${with_abi_version+set}" = set; then
   withval="$with_abi_version"
 # Check whether --with-abi-version or --without-abi-version was given.
 if test "${with_abi_version+set}" = set; then
   withval="$with_abi_version"

-  { echo "$as_me:1179: WARNING: overriding ABI version $cf_cv_abi_version to $withval" >&5
+  { echo "$as_me:1180: WARNING: overriding ABI version $cf_cv_abi_version to $withval" >&5

 echo "$as_me: WARNING: overriding ABI version $cf_cv_abi_version to $withval" >&2;}
  cf_cv_abi_version=$withval
 fi;
 echo "$as_me: WARNING: overriding ABI version $cf_cv_abi_version to $withval" >&2;}
  cf_cv_abi_version=$withval
 fi;


@@ -1186,13 +1187,13 @@ if test -n "$cf_cv_abi_version" ; then
   [0-9]*) #(vi
        ;;
   *)
   [0-9]*) #(vi
        ;;
   *)

-       { { echo "$as_me:1189: error: ABI version is not a number: $cf_cv_abi_version" >&5
+       { { echo "$as_me:1190: error: ABI version is not a number: $cf_cv_abi_version" >&5

 echo "$as_me: error: ABI version is not a number: $cf_cv_abi_version" >&2;}
    { (exit 1); exit 1; }; }
        ;;
   esac
 else
 echo "$as_me: error: ABI version is not a number: $cf_cv_abi_version" >&2;}
    { (exit 1); exit 1; }; }
        ;;
   esac
 else

-  { { echo "$as_me:1195: error: ABI version value is empty" >&5
+  { { echo "$as_me:1196: error: ABI version value is empty" >&5

 echo "$as_me: error: ABI version value is empty" >&2;}
    { (exit 1); exit 1; }; }
 fi
 echo "$as_me: error: ABI version value is empty" >&2;}
    { (exit 1); exit 1; }; }
 fi


@@ -1214,7 +1215,7 @@ for ac_dir in $srcdir $srcdir/.. $srcdir/../..; do
   fi
 done
 if test -z "$ac_aux_dir"; then
   fi
 done
 if test -z "$ac_aux_dir"; then

-  { { echo "$as_me:1217: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&5
+  { { echo "$as_me:1218: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&5

 echo "$as_me: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&2;}
    { (exit 1); exit 1; }; }
 fi
 echo "$as_me: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&2;}
    { (exit 1); exit 1; }; }
 fi


@@ -1224,11 +1225,11 @@ ac_configure="$SHELL $ac_aux_dir/configure" # This should be Cygnus configure.
 
 # Make sure we can run config.sub.
 $ac_config_sub sun4 >/dev/null 2>&1 ||
 
 # Make sure we can run config.sub.
 $ac_config_sub sun4 >/dev/null 2>&1 ||

-  { { echo "$as_me:1227: error: cannot run $ac_config_sub" >&5
+  { { echo "$as_me:1228: error: cannot run $ac_config_sub" >&5

 echo "$as_me: error: cannot run $ac_config_sub" >&2;}
    { (exit 1); exit 1; }; }
 
 echo "$as_me: error: cannot run $ac_config_sub" >&2;}
    { (exit 1); exit 1; }; }
 

-echo "$as_me:1231: checking build system type" >&5
+echo "$as_me:1232: checking build system type" >&5

 echo $ECHO_N "checking build system type... $ECHO_C" >&6
 if test "${ac_cv_build+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 echo $ECHO_N "checking build system type... $ECHO_C" >&6
 if test "${ac_cv_build+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6


@@ -1237,23 +1238,23 @@ else
 test -z "$ac_cv_build_alias" &&
   ac_cv_build_alias=`$ac_config_guess`
 test -z "$ac_cv_build_alias" &&
 test -z "$ac_cv_build_alias" &&
   ac_cv_build_alias=`$ac_config_guess`
 test -z "$ac_cv_build_alias" &&

-  { { echo "$as_me:1240: error: cannot guess build type; you must specify one" >&5
+  { { echo "$as_me:1241: error: cannot guess build type; you must specify one" >&5

 echo "$as_me: error: cannot guess build type; you must specify one" >&2;}
    { (exit 1); exit 1; }; }
 ac_cv_build=`$ac_config_sub $ac_cv_build_alias` ||
 echo "$as_me: error: cannot guess build type; you must specify one" >&2;}
    { (exit 1); exit 1; }; }
 ac_cv_build=`$ac_config_sub $ac_cv_build_alias` ||

-  { { echo "$as_me:1244: error: $ac_config_sub $ac_cv_build_alias failed." >&5
+  { { echo "$as_me:1245: error: $ac_config_sub $ac_cv_build_alias failed." >&5

 echo "$as_me: error: $ac_config_sub $ac_cv_build_alias failed." >&2;}
    { (exit 1); exit 1; }; }
 
 fi
 echo "$as_me: error: $ac_config_sub $ac_cv_build_alias failed." >&2;}
    { (exit 1); exit 1; }; }
 
 fi

-echo "$as_me:1249: result: $ac_cv_build" >&5
+echo "$as_me:1250: result: $ac_cv_build" >&5

 echo "${ECHO_T}$ac_cv_build" >&6
 build=$ac_cv_build
 build_cpu=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
 build_vendor=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
 build_os=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
 
 echo "${ECHO_T}$ac_cv_build" >&6
 build=$ac_cv_build
 build_cpu=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
 build_vendor=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
 build_os=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
 

-echo "$as_me:1256: checking host system type" >&5
+echo "$as_me:1257: checking host system type" >&5

 echo $ECHO_N "checking host system type... $ECHO_C" >&6
 if test "${ac_cv_host+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 echo $ECHO_N "checking host system type... $ECHO_C" >&6
 if test "${ac_cv_host+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6


@@ -1262,12 +1263,12 @@ else
 test -z "$ac_cv_host_alias" &&
   ac_cv_host_alias=$ac_cv_build_alias
 ac_cv_host=`$ac_config_sub $ac_cv_host_alias` ||
 test -z "$ac_cv_host_alias" &&
   ac_cv_host_alias=$ac_cv_build_alias
 ac_cv_host=`$ac_config_sub $ac_cv_host_alias` ||

-  { { echo "$as_me:1265: error: $ac_config_sub $ac_cv_host_alias failed" >&5
+  { { echo "$as_me:1266: error: $ac_config_sub $ac_cv_host_alias failed" >&5

 echo "$as_me: error: $ac_config_sub $ac_cv_host_alias failed" >&2;}
    { (exit 1); exit 1; }; }
 
 fi
 echo "$as_me: error: $ac_config_sub $ac_cv_host_alias failed" >&2;}
    { (exit 1); exit 1; }; }
 
 fi

-echo "$as_me:1270: result: $ac_cv_host" >&5
+echo "$as_me:1271: result: $ac_cv_host" >&5

 echo "${ECHO_T}$ac_cv_host" >&6
 host=$ac_cv_host
 host_cpu=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
 echo "${ECHO_T}$ac_cv_host" >&6
 host=$ac_cv_host
 host_cpu=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`


@@ -1275,7 +1276,7 @@ host_vendor=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
 host_os=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
 
 if test -f $srcdir/config.guess || test -f $ac_aux_dir/config.guess ; then
 host_os=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
 
 if test -f $srcdir/config.guess || test -f $ac_aux_dir/config.guess ; then

-       echo "$as_me:1278: checking target system type" >&5
+       echo "$as_me:1279: checking target system type" >&5

 echo $ECHO_N "checking target system type... $ECHO_C" >&6
 if test "${ac_cv_target+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 echo $ECHO_N "checking target system type... $ECHO_C" >&6
 if test "${ac_cv_target+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6


@@ -1284,12 +1285,12 @@ else
 test "x$ac_cv_target_alias" = "x" &&
   ac_cv_target_alias=$ac_cv_host_alias
 ac_cv_target=`$ac_config_sub $ac_cv_target_alias` ||
 test "x$ac_cv_target_alias" = "x" &&
   ac_cv_target_alias=$ac_cv_host_alias
 ac_cv_target=`$ac_config_sub $ac_cv_target_alias` ||

-  { { echo "$as_me:1287: error: $ac_config_sub $ac_cv_target_alias failed" >&5
+  { { echo "$as_me:1288: error: $ac_config_sub $ac_cv_target_alias failed" >&5

 echo "$as_me: error: $ac_config_sub $ac_cv_target_alias failed" >&2;}
    { (exit 1); exit 1; }; }
 
 fi
 echo "$as_me: error: $ac_config_sub $ac_cv_target_alias failed" >&2;}
    { (exit 1); exit 1; }; }
 
 fi

-echo "$as_me:1292: result: $ac_cv_target" >&5
+echo "$as_me:1293: result: $ac_cv_target" >&5

 echo "${ECHO_T}$ac_cv_target" >&6
 target=$ac_cv_target
 target_cpu=`echo $ac_cv_target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
 echo "${ECHO_T}$ac_cv_target" >&6
 target=$ac_cv_target
 target_cpu=`echo $ac_cv_target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`


@@ -1320,13 +1321,13 @@ else
 fi
 
 test -z "$system_name" && system_name="$cf_cv_system_name"
 fi
 
 test -z "$system_name" && system_name="$cf_cv_system_name"

-test -n "$cf_cv_system_name" && echo "$as_me:1323: result: Configuring for $cf_cv_system_name" >&5
+test -n "$cf_cv_system_name" && echo "$as_me:1324: result: Configuring for $cf_cv_system_name" >&5

 echo "${ECHO_T}Configuring for $cf_cv_system_name" >&6
 
 if test ".$system_name" != ".$cf_cv_system_name" ; then
 echo "${ECHO_T}Configuring for $cf_cv_system_name" >&6
 
 if test ".$system_name" != ".$cf_cv_system_name" ; then

-       echo "$as_me:1327: result: Cached system name ($system_name) does not agree with actual ($cf_cv_system_name)" >&5
+       echo "$as_me:1328: result: Cached system name ($system_name) does not agree with actual ($cf_cv_system_name)" >&5

 echo "${ECHO_T}Cached system name ($system_name) does not agree with actual ($cf_cv_system_name)" >&6
 echo "${ECHO_T}Cached system name ($system_name) does not agree with actual ($cf_cv_system_name)" >&6

-       { { echo "$as_me:1329: error: \"Please remove config.cache and try again.\"" >&5
+       { { echo "$as_me:1330: error: \"Please remove config.cache and try again.\"" >&5

 echo "$as_me: error: \"Please remove config.cache and try again.\"" >&2;}
    { (exit 1); exit 1; }; }
 fi
 echo "$as_me: error: \"Please remove config.cache and try again.\"" >&2;}
    { (exit 1); exit 1; }; }
 fi


@@ -1334,7 +1335,7 @@ fi
 # Check whether --with-system-type or --without-system-type was given.
 if test "${with_system_type+set}" = set; then
   withval="$with_system_type"
 # Check whether --with-system-type or --without-system-type was given.
 if test "${with_system_type+set}" = set; then
   withval="$with_system_type"

-  { echo "$as_me:1337: WARNING: overriding system type to $withval" >&5
+  { echo "$as_me:1338: WARNING: overriding system type to $withval" >&5

 echo "$as_me: WARNING: overriding system type to $withval" >&2;}
  cf_cv_system_name=$withval
 fi;
 echo "$as_me: WARNING: overriding system type to $withval" >&2;}
  cf_cv_system_name=$withval
 fi;


@@ -1344,7 +1345,7 @@ cf_user_CFLAGS="$CFLAGS"
 
 ###    Default install-location
 
 
 ###    Default install-location
 

-echo "$as_me:1347: checking for prefix" >&5
+echo "$as_me:1348: checking for prefix" >&5

 echo $ECHO_N "checking for prefix... $ECHO_C" >&6
 if test "x$prefix" = "xNONE" ; then
        case "$cf_cv_system_name" in
 echo $ECHO_N "checking for prefix... $ECHO_C" >&6
 if test "x$prefix" = "xNONE" ; then
        case "$cf_cv_system_name" in


@@ -1356,11 +1357,11 @@ if test "x$prefix" = "xNONE" ; then
                ;;
        esac
 fi
                ;;
        esac
 fi

-echo "$as_me:1359: result: $prefix" >&5
+echo "$as_me:1360: result: $prefix" >&5

 echo "${ECHO_T}$prefix" >&6
 
 if test "x$prefix" = "xNONE" ; then
 echo "${ECHO_T}$prefix" >&6
 
 if test "x$prefix" = "xNONE" ; then

-echo "$as_me:1363: checking for default include-directory" >&5
+echo "$as_me:1364: checking for default include-directory" >&5

 echo $ECHO_N "checking for default include-directory... $ECHO_C" >&6
 test -n "$verbose" && echo 1>&6
 for cf_symbol in \
 echo $ECHO_N "checking for default include-directory... $ECHO_C" >&6
 test -n "$verbose" && echo 1>&6
 for cf_symbol in \


@@ -1383,7 +1384,7 @@ do
        fi
        test -n "$verbose"  && echo "   tested $cf_dir" 1>&6
 done
        fi
        test -n "$verbose"  && echo "   tested $cf_dir" 1>&6
 done

-echo "$as_me:1386: result: $includedir" >&5
+echo "$as_me:1387: result: $includedir" >&5

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


@@ -1397,7 +1398,7 @@ ac_main_return=return
 if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
 set dummy ${ac_tool_prefix}gcc; ac_word=$2
 if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
 set dummy ${ac_tool_prefix}gcc; ac_word=$2

-echo "$as_me:1400: checking for $ac_word" >&5
+echo "$as_me:1401: checking for $ac_word" >&5

 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_CC+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_CC+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6


@@ -1412,7 +1413,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_CC="${ac_tool_prefix}gcc"
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_CC="${ac_tool_prefix}gcc"

-echo "$as_me:1415: found $ac_dir/$ac_word" >&5
+echo "$as_me:1416: found $ac_dir/$ac_word" >&5

 break
 done
 
 break
 done
 


@@ -1420,10 +1421,10 @@ fi
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then

-  echo "$as_me:1423: result: $CC" >&5
+  echo "$as_me:1424: result: $CC" >&5

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

-  echo "$as_me:1426: result: no" >&5
+  echo "$as_me:1427: result: no" >&5

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


@@ -1432,7 +1433,7 @@ if test -z "$ac_cv_prog_CC"; then
   ac_ct_CC=$CC
   # Extract the first word of "gcc", so it can be a program name with args.
 set dummy gcc; ac_word=$2
   ac_ct_CC=$CC
   # Extract the first word of "gcc", so it can be a program name with args.
 set dummy gcc; ac_word=$2

-echo "$as_me:1435: checking for $ac_word" >&5
+echo "$as_me:1436: checking for $ac_word" >&5

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


@@ -1447,7 +1448,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_ac_ct_CC="gcc"
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_ac_ct_CC="gcc"

-echo "$as_me:1450: found $ac_dir/$ac_word" >&5
+echo "$as_me:1451: found $ac_dir/$ac_word" >&5

 break
 done
 
 break
 done
 


@@ -1455,10 +1456,10 @@ fi
 fi
 ac_ct_CC=$ac_cv_prog_ac_ct_CC
 if test -n "$ac_ct_CC"; then
 fi
 ac_ct_CC=$ac_cv_prog_ac_ct_CC
 if test -n "$ac_ct_CC"; then

-  echo "$as_me:1458: result: $ac_ct_CC" >&5
+  echo "$as_me:1459: result: $ac_ct_CC" >&5

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

-  echo "$as_me:1461: result: no" >&5
+  echo "$as_me:1462: result: no" >&5

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


@@ -1471,7 +1472,7 @@ if test -z "$CC"; then
   if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
 set dummy ${ac_tool_prefix}cc; ac_word=$2
   if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
 set dummy ${ac_tool_prefix}cc; ac_word=$2

-echo "$as_me:1474: checking for $ac_word" >&5
+echo "$as_me:1475: checking for $ac_word" >&5

 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_CC+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_CC+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6


@@ -1486,7 +1487,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_CC="${ac_tool_prefix}cc"
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_CC="${ac_tool_prefix}cc"

-echo "$as_me:1489: found $ac_dir/$ac_word" >&5
+echo "$as_me:1490: found $ac_dir/$ac_word" >&5

 break
 done
 
 break
 done
 


@@ -1494,10 +1495,10 @@ fi
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then

-  echo "$as_me:1497: result: $CC" >&5
+  echo "$as_me:1498: result: $CC" >&5

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

-  echo "$as_me:1500: result: no" >&5
+  echo "$as_me:1501: result: no" >&5

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


@@ -1506,7 +1507,7 @@ if test -z "$ac_cv_prog_CC"; then
   ac_ct_CC=$CC
   # Extract the first word of "cc", so it can be a program name with args.
 set dummy cc; ac_word=$2
   ac_ct_CC=$CC
   # Extract the first word of "cc", so it can be a program name with args.
 set dummy cc; ac_word=$2

-echo "$as_me:1509: checking for $ac_word" >&5
+echo "$as_me:1510: checking for $ac_word" >&5

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


@@ -1521,7 +1522,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_ac_ct_CC="cc"
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_ac_ct_CC="cc"

-echo "$as_me:1524: found $ac_dir/$ac_word" >&5
+echo "$as_me:1525: found $ac_dir/$ac_word" >&5

 break
 done
 
 break
 done
 


@@ -1529,10 +1530,10 @@ fi
 fi
 ac_ct_CC=$ac_cv_prog_ac_ct_CC
 if test -n "$ac_ct_CC"; then
 fi
 ac_ct_CC=$ac_cv_prog_ac_ct_CC
 if test -n "$ac_ct_CC"; then

-  echo "$as_me:1532: result: $ac_ct_CC" >&5
+  echo "$as_me:1533: result: $ac_ct_CC" >&5

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

-  echo "$as_me:1535: result: no" >&5
+  echo "$as_me:1536: result: no" >&5

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


@@ -1545,7 +1546,7 @@ fi
 if test -z "$CC"; then
   # Extract the first word of "cc", so it can be a program name with args.
 set dummy cc; ac_word=$2
 if test -z "$CC"; then
   # Extract the first word of "cc", so it can be a program name with args.
 set dummy cc; ac_word=$2

-echo "$as_me:1548: checking for $ac_word" >&5
+echo "$as_me:1549: checking for $ac_word" >&5

 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_CC+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_CC+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6


@@ -1565,7 +1566,7 @@ if test "$ac_dir/$ac_word" = "/usr/ucb/cc"; then
   continue
 fi
 ac_cv_prog_CC="cc"
   continue
 fi
 ac_cv_prog_CC="cc"

-echo "$as_me:1568: found $ac_dir/$ac_word" >&5
+echo "$as_me:1569: found $ac_dir/$ac_word" >&5

 break
 done
 
 break
 done
 


@@ -1587,10 +1588,10 @@ fi
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then

-  echo "$as_me:1590: result: $CC" >&5
+  echo "$as_me:1591: result: $CC" >&5

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

-  echo "$as_me:1593: result: no" >&5
+  echo "$as_me:1594: result: no" >&5

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


@@ -1601,7 +1602,7 @@ if test -z "$CC"; then
   do
     # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
 set dummy $ac_tool_prefix$ac_prog; ac_word=$2
   do
     # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
 set dummy $ac_tool_prefix$ac_prog; ac_word=$2

-echo "$as_me:1604: checking for $ac_word" >&5
+echo "$as_me:1605: checking for $ac_word" >&5

 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_CC+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_CC+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6


@@ -1616,7 +1617,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_CC="$ac_tool_prefix$ac_prog"
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_CC="$ac_tool_prefix$ac_prog"

-echo "$as_me:1619: found $ac_dir/$ac_word" >&5
+echo "$as_me:1620: found $ac_dir/$ac_word" >&5

 break
 done
 
 break
 done
 


@@ -1624,10 +1625,10 @@ fi
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then

-  echo "$as_me:1627: result: $CC" >&5
+  echo "$as_me:1628: result: $CC" >&5

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

-  echo "$as_me:1630: result: no" >&5
+  echo "$as_me:1631: result: no" >&5

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


@@ -1640,7 +1641,7 @@ if test -z "$CC"; then
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2

-echo "$as_me:1643: checking for $ac_word" >&5
+echo "$as_me:1644: checking for $ac_word" >&5

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


@@ -1655,7 +1656,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_ac_ct_CC="$ac_prog"
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_ac_ct_CC="$ac_prog"

-echo "$as_me:1658: found $ac_dir/$ac_word" >&5
+echo "$as_me:1659: found $ac_dir/$ac_word" >&5

 break
 done
 
 break
 done
 


@@ -1663,10 +1664,10 @@ fi
 fi
 ac_ct_CC=$ac_cv_prog_ac_ct_CC
 if test -n "$ac_ct_CC"; then
 fi
 ac_ct_CC=$ac_cv_prog_ac_ct_CC
 if test -n "$ac_ct_CC"; then

-  echo "$as_me:1666: result: $ac_ct_CC" >&5
+  echo "$as_me:1667: result: $ac_ct_CC" >&5

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

-  echo "$as_me:1669: result: no" >&5
+  echo "$as_me:1670: result: no" >&5

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


@@ -1678,32 +1679,32 @@ fi
 
 fi
 
 
 fi
 

-test -z "$CC" && { { echo "$as_me:1681: error: no acceptable cc found in \$PATH" >&5
+test -z "$CC" && { { echo "$as_me:1682: error: no acceptable cc found in \$PATH" >&5

 echo "$as_me: error: no acceptable cc found in \$PATH" >&2;}
    { (exit 1); exit 1; }; }
 
 # Provide some information about the compiler.
 echo "$as_me: error: no acceptable cc found in \$PATH" >&2;}
    { (exit 1); exit 1; }; }
 
 # Provide some information about the compiler.

-echo "$as_me:1686:" \
+echo "$as_me:1687:" \

      "checking for C compiler version" >&5
 ac_compiler=`set X $ac_compile; echo $2`
      "checking for C compiler version" >&5
 ac_compiler=`set X $ac_compile; echo $2`

-{ (eval echo "$as_me:1689: \"$ac_compiler --version </dev/null >&5\"") >&5
+{ (eval echo "$as_me:1690: \"$ac_compiler --version </dev/null >&5\"") >&5

   (eval $ac_compiler --version </dev/null >&5) 2>&5
   ac_status=$?
   (eval $ac_compiler --version </dev/null >&5) 2>&5
   ac_status=$?

-  echo "$as_me:1692: \$? = $ac_status" >&5
+  echo "$as_me:1693: \$? = $ac_status" >&5

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

-{ (eval echo "$as_me:1694: \"$ac_compiler -v </dev/null >&5\"") >&5
+{ (eval echo "$as_me:1695: \"$ac_compiler -v </dev/null >&5\"") >&5

   (eval $ac_compiler -v </dev/null >&5) 2>&5
   ac_status=$?
   (eval $ac_compiler -v </dev/null >&5) 2>&5
   ac_status=$?

-  echo "$as_me:1697: \$? = $ac_status" >&5
+  echo "$as_me:1698: \$? = $ac_status" >&5

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

-{ (eval echo "$as_me:1699: \"$ac_compiler -V </dev/null >&5\"") >&5
+{ (eval echo "$as_me:1700: \"$ac_compiler -V </dev/null >&5\"") >&5

   (eval $ac_compiler -V </dev/null >&5) 2>&5
   ac_status=$?
   (eval $ac_compiler -V </dev/null >&5) 2>&5
   ac_status=$?

-  echo "$as_me:1702: \$? = $ac_status" >&5
+  echo "$as_me:1703: \$? = $ac_status" >&5

   (exit $ac_status); }
 
 cat >conftest.$ac_ext <<_ACEOF
   (exit $ac_status); }
 
 cat >conftest.$ac_ext <<_ACEOF

-#line 1706 "configure"
+#line 1707 "configure"

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


@@ -1719,13 +1720,13 @@ ac_clean_files="$ac_clean_files a.out a.exe"
 # Try to create an executable without -o first, disregard a.out.
 # It will help us diagnose broken compilers, and finding out an intuition
 # of exeext.
 # Try to create an executable without -o first, disregard a.out.
 # It will help us diagnose broken compilers, and finding out an intuition
 # of exeext.

-echo "$as_me:1722: checking for C compiler default output" >&5
+echo "$as_me:1723: checking for C compiler default output" >&5

 echo $ECHO_N "checking for C compiler default output... $ECHO_C" >&6
 ac_link_default=`echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
 echo $ECHO_N "checking for C compiler default output... $ECHO_C" >&6
 ac_link_default=`echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`

-if { (eval echo "$as_me:1725: \"$ac_link_default\"") >&5
+if { (eval echo "$as_me:1726: \"$ac_link_default\"") >&5

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

-  echo "$as_me:1728: \$? = $ac_status" >&5
+  echo "$as_me:1729: \$? = $ac_status" >&5

   (exit $ac_status); }; then
   # Find the output, starting from the most likely.  This scheme is
 # not robust to junk in `.', hence go to wildcards (a.*) only as a last
   (exit $ac_status); }; then
   # Find the output, starting from the most likely.  This scheme is
 # not robust to junk in `.', hence go to wildcards (a.*) only as a last


@@ -1748,34 +1749,34 @@ done
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5

-{ { echo "$as_me:1751: error: C compiler cannot create executables" >&5
+{ { echo "$as_me:1752: error: C compiler cannot create executables" >&5

 echo "$as_me: error: C compiler cannot create executables" >&2;}
    { (exit 77); exit 77; }; }
 fi
 
 ac_exeext=$ac_cv_exeext
 echo "$as_me: error: C compiler cannot create executables" >&2;}
    { (exit 77); exit 77; }; }
 fi
 
 ac_exeext=$ac_cv_exeext

-echo "$as_me:1757: result: $ac_file" >&5
+echo "$as_me:1758: result: $ac_file" >&5

 echo "${ECHO_T}$ac_file" >&6
 
 # Check the compiler produces executables we can run.  If not, either
 # the compiler is broken, or we cross compile.
 echo "${ECHO_T}$ac_file" >&6
 
 # Check the compiler produces executables we can run.  If not, either
 # the compiler is broken, or we cross compile.

-echo "$as_me:1762: checking whether the C compiler works" >&5
+echo "$as_me:1763: checking whether the C compiler works" >&5

 echo $ECHO_N "checking whether the C compiler works... $ECHO_C" >&6
 # FIXME: These cross compiler hacks should be removed for Autoconf 3.0
 # If not cross compiling, check that we can run a simple program.
 if test "$cross_compiling" != yes; then
   if { ac_try='./$ac_file'
 echo $ECHO_N "checking whether the C compiler works... $ECHO_C" >&6
 # FIXME: These cross compiler hacks should be removed for Autoconf 3.0
 # If not cross compiling, check that we can run a simple program.
 if test "$cross_compiling" != yes; then
   if { ac_try='./$ac_file'

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

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

-  echo "$as_me:1771: \$? = $ac_status" >&5
+  echo "$as_me:1772: \$? = $ac_status" >&5

   (exit $ac_status); }; }; then
     cross_compiling=no
   else
     if test "$cross_compiling" = maybe; then
        cross_compiling=yes
     else
   (exit $ac_status); }; }; then
     cross_compiling=no
   else
     if test "$cross_compiling" = maybe; then
        cross_compiling=yes
     else

-       { { echo "$as_me:1778: error: cannot run C compiled programs.
+       { { echo "$as_me:1779: error: cannot run C compiled programs.

 If you meant to cross compile, use \`--host'." >&5
 echo "$as_me: error: cannot run C compiled programs.
 If you meant to cross compile, use \`--host'." >&2;}
 If you meant to cross compile, use \`--host'." >&5
 echo "$as_me: error: cannot run C compiled programs.
 If you meant to cross compile, use \`--host'." >&2;}


@@ -1783,24 +1784,24 @@ If you meant to cross compile, use \`--host'." >&2;}
     fi
   fi
 fi
     fi
   fi
 fi

-echo "$as_me:1786: result: yes" >&5
+echo "$as_me:1787: result: yes" >&5

 echo "${ECHO_T}yes" >&6
 
 rm -f a.out a.exe conftest$ac_cv_exeext
 ac_clean_files=$ac_clean_files_save
 # Check the compiler produces executables we can run.  If not, either
 # the compiler is broken, or we cross compile.
 echo "${ECHO_T}yes" >&6
 
 rm -f a.out a.exe conftest$ac_cv_exeext
 ac_clean_files=$ac_clean_files_save
 # Check the compiler produces executables we can run.  If not, either
 # the compiler is broken, or we cross compile.

-echo "$as_me:1793: checking whether we are cross compiling" >&5
+echo "$as_me:1794: checking whether we are cross compiling" >&5

 echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6
 echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6

-echo "$as_me:1795: result: $cross_compiling" >&5
+echo "$as_me:1796: result: $cross_compiling" >&5

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

-echo "$as_me:1798: checking for executable suffix" >&5
+echo "$as_me:1799: checking for executable suffix" >&5

 echo $ECHO_N "checking for executable suffix... $ECHO_C" >&6
 echo $ECHO_N "checking for executable suffix... $ECHO_C" >&6

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

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

-  echo "$as_me:1803: \$? = $ac_status" >&5
+  echo "$as_me:1804: \$? = $ac_status" >&5

   (exit $ac_status); }; then
   # If both `conftest.exe' and `conftest' are `present' (well, observable)
 # catch `conftest.exe'.  For instance with Cygwin, `ls conftest' will
   (exit $ac_status); }; then
   # If both `conftest.exe' and `conftest' are `present' (well, observable)
 # catch `conftest.exe'.  For instance with Cygwin, `ls conftest' will


@@ -1816,25 +1817,25 @@ for ac_file in `(ls conftest.exe; ls conftest; ls conftest.*) 2>/dev/null`; do
   esac
 done
 else
   esac
 done
 else

-  { { echo "$as_me:1819: error: cannot compute EXEEXT: cannot compile and link" >&5
+  { { echo "$as_me:1820: error: cannot compute EXEEXT: cannot compile and link" >&5

 echo "$as_me: error: cannot compute EXEEXT: cannot compile and link" >&2;}
    { (exit 1); exit 1; }; }
 fi
 
 rm -f conftest$ac_cv_exeext
 echo "$as_me: error: cannot compute EXEEXT: cannot compile and link" >&2;}
    { (exit 1); exit 1; }; }
 fi
 
 rm -f conftest$ac_cv_exeext

-echo "$as_me:1825: result: $ac_cv_exeext" >&5
+echo "$as_me:1826: result: $ac_cv_exeext" >&5

 echo "${ECHO_T}$ac_cv_exeext" >&6
 
 rm -f conftest.$ac_ext
 EXEEXT=$ac_cv_exeext
 ac_exeext=$EXEEXT
 echo "${ECHO_T}$ac_cv_exeext" >&6
 
 rm -f conftest.$ac_ext
 EXEEXT=$ac_cv_exeext
 ac_exeext=$EXEEXT

-echo "$as_me:1831: checking for object suffix" >&5
+echo "$as_me:1832: checking for object suffix" >&5

 echo $ECHO_N "checking for object suffix... $ECHO_C" >&6
 if test "${ac_cv_objext+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 echo $ECHO_N "checking for object suffix... $ECHO_C" >&6
 if test "${ac_cv_objext+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF

-#line 1837 "configure"
+#line 1838 "configure"

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


@@ -1846,10 +1847,10 @@ main ()
 }
 _ACEOF
 rm -f conftest.o conftest.obj
 }
 _ACEOF
 rm -f conftest.o conftest.obj

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

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

-  echo "$as_me:1852: \$? = $ac_status" >&5
+  echo "$as_me:1853: \$? = $ac_status" >&5

   (exit $ac_status); }; then
   for ac_file in `(ls conftest.o conftest.obj; ls conftest.*) 2>/dev/null`; do
   case $ac_file in
   (exit $ac_status); }; then
   for ac_file in `(ls conftest.o conftest.obj; ls conftest.*) 2>/dev/null`; do
   case $ac_file in


@@ -1861,24 +1862,24 @@ done
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5

-{ { echo "$as_me:1864: error: cannot compute OBJEXT: cannot compile" >&5
+{ { echo "$as_me:1865: error: cannot compute OBJEXT: cannot compile" >&5

 echo "$as_me: error: cannot compute OBJEXT: cannot compile" >&2;}
    { (exit 1); exit 1; }; }
 fi
 
 rm -f conftest.$ac_cv_objext conftest.$ac_ext
 fi
 echo "$as_me: error: cannot compute OBJEXT: cannot compile" >&2;}
    { (exit 1); exit 1; }; }
 fi
 
 rm -f conftest.$ac_cv_objext conftest.$ac_ext
 fi

-echo "$as_me:1871: result: $ac_cv_objext" >&5
+echo "$as_me:1872: result: $ac_cv_objext" >&5

 echo "${ECHO_T}$ac_cv_objext" >&6
 OBJEXT=$ac_cv_objext
 ac_objext=$OBJEXT
 echo "${ECHO_T}$ac_cv_objext" >&6
 OBJEXT=$ac_cv_objext
 ac_objext=$OBJEXT

-echo "$as_me:1875: checking whether we are using the GNU C compiler" >&5
+echo "$as_me:1876: checking whether we are using the GNU C compiler" >&5

 echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6
 if test "${ac_cv_c_compiler_gnu+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6
 if test "${ac_cv_c_compiler_gnu+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF

-#line 1881 "configure"
+#line 1882 "configure"

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


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

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

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

-  echo "$as_me:1899: \$? = $ac_status" >&5
+  echo "$as_me:1900: \$? = $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:1902: \"$ac_try\"") >&5
+  { (eval echo "$as_me:1903: \"$ac_try\"") >&5

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

-  echo "$as_me:1905: \$? = $ac_status" >&5
+  echo "$as_me:1906: \$? = $ac_status" >&5

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


@@ -1914,19 +1915,19 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 ac_cv_c_compiler_gnu=$ac_compiler_gnu
 
 fi
 ac_cv_c_compiler_gnu=$ac_compiler_gnu
 
 fi

-echo "$as_me:1917: result: $ac_cv_c_compiler_gnu" >&5
+echo "$as_me:1918: result: $ac_cv_c_compiler_gnu" >&5

 echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6
 GCC=`test $ac_compiler_gnu = yes && echo yes`
 ac_test_CFLAGS=${CFLAGS+set}
 ac_save_CFLAGS=$CFLAGS
 CFLAGS="-g"
 echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6
 GCC=`test $ac_compiler_gnu = yes && echo yes`
 ac_test_CFLAGS=${CFLAGS+set}
 ac_save_CFLAGS=$CFLAGS
 CFLAGS="-g"

-echo "$as_me:1923: checking whether $CC accepts -g" >&5
+echo "$as_me:1924: checking whether $CC accepts -g" >&5

 echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6
 if test "${ac_cv_prog_cc_g+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6
 if test "${ac_cv_prog_cc_g+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF

-#line 1929 "configure"
+#line 1930 "configure"

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


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

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

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

-  echo "$as_me:1944: \$? = $ac_status" >&5
+  echo "$as_me:1945: \$? = $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:1947: \"$ac_try\"") >&5
+  { (eval echo "$as_me:1948: \"$ac_try\"") >&5

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

-  echo "$as_me:1950: \$? = $ac_status" >&5
+  echo "$as_me:1951: \$? = $ac_status" >&5

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


@@ -1957,7 +1958,7 @@ ac_cv_prog_cc_g=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi

-echo "$as_me:1960: result: $ac_cv_prog_cc_g" >&5
+echo "$as_me:1961: result: $ac_cv_prog_cc_g" >&5

 echo "${ECHO_T}$ac_cv_prog_cc_g" >&6
 if test "$ac_test_CFLAGS" = set; then
   CFLAGS=$ac_save_CFLAGS
 echo "${ECHO_T}$ac_cv_prog_cc_g" >&6
 if test "$ac_test_CFLAGS" = set; then
   CFLAGS=$ac_save_CFLAGS


@@ -1984,16 +1985,16 @@ cat >conftest.$ac_ext <<_ACEOF
 #endif
 _ACEOF
 rm -f conftest.$ac_objext
 #endif
 _ACEOF
 rm -f conftest.$ac_objext

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

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

-  echo "$as_me:1990: \$? = $ac_status" >&5
+  echo "$as_me:1991: \$? = $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:1993: \"$ac_try\"") >&5
+  { (eval echo "$as_me:1994: \"$ac_try\"") >&5

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

-  echo "$as_me:1996: \$? = $ac_status" >&5
+  echo "$as_me:1997: \$? = $ac_status" >&5

   (exit $ac_status); }; }; then
   for ac_declaration in \
    ''\
   (exit $ac_status); }; }; then
   for ac_declaration in \
    ''\


@@ -2005,7 +2006,7 @@ if { (eval echo "$as_me:1987: \"$ac_compile\"") >&5
    'void exit (int);'
 do
   cat >conftest.$ac_ext <<_ACEOF
    'void exit (int);'
 do
   cat >conftest.$ac_ext <<_ACEOF

-#line 2008 "configure"
+#line 2009 "configure"

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


@@ -2018,16 +2019,16 @@ exit (42);
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

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

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

-  echo "$as_me:2024: \$? = $ac_status" >&5
+  echo "$as_me:2025: \$? = $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:2027: \"$ac_try\"") >&5
+  { (eval echo "$as_me:2028: \"$ac_try\"") >&5

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

-  echo "$as_me:2030: \$? = $ac_status" >&5
+  echo "$as_me:2031: \$? = $ac_status" >&5

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


@@ -2037,7 +2038,7 @@ continue
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
   cat >conftest.$ac_ext <<_ACEOF
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
   cat >conftest.$ac_ext <<_ACEOF

-#line 2040 "configure"
+#line 2041 "configure"

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


@@ -2049,16 +2050,16 @@ exit (42);
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

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

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

-  echo "$as_me:2055: \$? = $ac_status" >&5
+  echo "$as_me:2056: \$? = $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:2058: \"$ac_try\"") >&5
+  { (eval echo "$as_me:2059: \"$ac_try\"") >&5

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

-  echo "$as_me:2061: \$? = $ac_status" >&5
+  echo "$as_me:2062: \$? = $ac_status" >&5

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


@@ -2088,11 +2089,11 @@ ac_main_return=return
 
 GCC_VERSION=none
 if test "$GCC" = yes ; then
 
 GCC_VERSION=none
 if test "$GCC" = yes ; then

-       echo "$as_me:2091: checking version of $CC" >&5
+       echo "$as_me:2092: checking version of $CC" >&5

 echo $ECHO_N "checking version of $CC... $ECHO_C" >&6
        GCC_VERSION="`${CC} --version| sed -e '2,$d' -e 's/^.*(GCC) //' -e 's/^[^0-9.]*//' -e 's/[^0-9.].*//'`"
        test -z "$GCC_VERSION" && GCC_VERSION=unknown
 echo $ECHO_N "checking version of $CC... $ECHO_C" >&6
        GCC_VERSION="`${CC} --version| sed -e '2,$d' -e 's/^.*(GCC) //' -e 's/^[^0-9.]*//' -e 's/[^0-9.].*//'`"
        test -z "$GCC_VERSION" && GCC_VERSION=unknown

-       echo "$as_me:2095: result: $GCC_VERSION" >&5
+       echo "$as_me:2096: result: $GCC_VERSION" >&5

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


@@ -2102,7 +2103,7 @@ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 ac_main_return=return
 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 ac_main_return=return

-echo "$as_me:2105: checking how to run the C preprocessor" >&5
+echo "$as_me:2106: checking how to run the C preprocessor" >&5

 echo $ECHO_N "checking how to run the C preprocessor... $ECHO_C" >&6
 # On Suns, sometimes $CPP names a directory.
 if test -n "$CPP" && test -d "$CPP"; then
 echo $ECHO_N "checking how to run the C preprocessor... $ECHO_C" >&6
 # On Suns, sometimes $CPP names a directory.
 if test -n "$CPP" && test -d "$CPP"; then


@@ -2123,18 +2124,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 2126 "configure"
+#line 2127 "configure"

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

-if { (eval echo "$as_me:2131: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:2132: \"$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:2137: \$? = $ac_status" >&5
+  echo "$as_me:2138: \$? = $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


@@ -2157,17 +2158,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 2160 "configure"
+#line 2161 "configure"

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

-if { (eval echo "$as_me:2164: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:2165: \"$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:2170: \$? = $ac_status" >&5
+  echo "$as_me:2171: \$? = $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


@@ -2204,7 +2205,7 @@ fi
 else
   ac_cv_prog_CPP=$CPP
 fi
 else
   ac_cv_prog_CPP=$CPP
 fi

-echo "$as_me:2207: result: $CPP" >&5
+echo "$as_me:2208: result: $CPP" >&5

 echo "${ECHO_T}$CPP" >&6
 ac_preproc_ok=false
 for ac_c_preproc_warn_flag in '' yes
 echo "${ECHO_T}$CPP" >&6
 ac_preproc_ok=false
 for ac_c_preproc_warn_flag in '' yes


@@ -2214,18 +2215,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 2217 "configure"
+#line 2218 "configure"

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

-if { (eval echo "$as_me:2222: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:2223: \"$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:2228: \$? = $ac_status" >&5
+  echo "$as_me:2229: \$? = $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


@@ -2248,17 +2249,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 2251 "configure"
+#line 2252 "configure"

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

-if { (eval echo "$as_me:2255: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:2256: \"$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:2261: \$? = $ac_status" >&5
+  echo "$as_me:2262: \$? = $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


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

-  { { echo "$as_me:2289: error: C preprocessor \"$CPP\" fails sanity check" >&5
+  { { echo "$as_me:2290: error: C preprocessor \"$CPP\" fails sanity check" >&5

 echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check" >&2;}
    { (exit 1); exit 1; }; }
 fi
 echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check" >&2;}
    { (exit 1); exit 1; }; }
 fi


@@ -2299,14 +2300,14 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 ac_main_return=return
 
 if test $ac_cv_c_compiler_gnu = yes; then
 ac_main_return=return
 
 if test $ac_cv_c_compiler_gnu = yes; then

-    echo "$as_me:2302: checking whether $CC needs -traditional" >&5
+    echo "$as_me:2303: checking whether $CC needs -traditional" >&5

 echo $ECHO_N "checking whether $CC needs -traditional... $ECHO_C" >&6
 if test "${ac_cv_prog_gcc_traditional+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
     ac_pattern="Autoconf.*'x'"
   cat >conftest.$ac_ext <<_ACEOF
 echo $ECHO_N "checking whether $CC needs -traditional... $ECHO_C" >&6
 if test "${ac_cv_prog_gcc_traditional+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
     ac_pattern="Autoconf.*'x'"
   cat >conftest.$ac_ext <<_ACEOF

-#line 2309 "configure"
+#line 2310 "configure"

 #include "confdefs.h"
 #include <sgtty.h>
 int Autoconf = TIOCGETP;
 #include "confdefs.h"
 #include <sgtty.h>
 int Autoconf = TIOCGETP;


@@ -2321,7 +2322,7 @@ rm -f conftest*
 
   if test $ac_cv_prog_gcc_traditional = no; then
     cat >conftest.$ac_ext <<_ACEOF
 
   if test $ac_cv_prog_gcc_traditional = no; then
     cat >conftest.$ac_ext <<_ACEOF

-#line 2324 "configure"
+#line 2325 "configure"

 #include "confdefs.h"
 #include <termio.h>
 int Autoconf = TCGETA;
 #include "confdefs.h"
 #include <termio.h>
 int Autoconf = TCGETA;


@@ -2334,14 +2335,14 @@ rm -f conftest*
 
   fi
 fi
 
   fi
 fi

-echo "$as_me:2337: result: $ac_cv_prog_gcc_traditional" >&5
+echo "$as_me:2338: result: $ac_cv_prog_gcc_traditional" >&5

 echo "${ECHO_T}$ac_cv_prog_gcc_traditional" >&6
   if test $ac_cv_prog_gcc_traditional = yes; then
     CC="$CC -traditional"
   fi
 fi
 
 echo "${ECHO_T}$ac_cv_prog_gcc_traditional" >&6
   if test $ac_cv_prog_gcc_traditional = yes; then
     CC="$CC -traditional"
   fi
 fi
 

-echo "$as_me:2344: checking whether $CC understands -c and -o together" >&5
+echo "$as_me:2345: checking whether $CC understands -c and -o together" >&5

 echo $ECHO_N "checking whether $CC understands -c and -o together... $ECHO_C" >&6
 if test "${cf_cv_prog_CC_c_o+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 echo $ECHO_N "checking whether $CC understands -c and -o together... $ECHO_C" >&6
 if test "${cf_cv_prog_CC_c_o+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6


@@ -2357,15 +2358,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='$CC -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='$CC -c conftest.$ac_ext -o conftest2.$ac_objext >&5'

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

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

-  echo "$as_me:2363: \$? = $ac_status" >&5
+  echo "$as_me:2364: \$? = $ac_status" >&5

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

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

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

-  echo "$as_me:2368: \$? = $ac_status" >&5
+  echo "$as_me:2369: \$? = $ac_status" >&5

   (exit $ac_status); };
 then
   eval cf_cv_prog_CC_c_o=yes
   (exit $ac_status); };
 then
   eval cf_cv_prog_CC_c_o=yes


@@ -2376,19 +2377,19 @@ rm -f conftest*
 
 fi
 if test $cf_cv_prog_CC_c_o = yes; then
 
 fi
 if test $cf_cv_prog_CC_c_o = yes; then

-  echo "$as_me:2379: result: yes" >&5
+  echo "$as_me:2380: result: yes" >&5

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

-  echo "$as_me:2382: result: no" >&5
+  echo "$as_me:2383: result: no" >&5

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

-echo "$as_me:2386: checking for POSIXized ISC" >&5
+echo "$as_me:2387: checking for POSIXized ISC" >&5

 echo $ECHO_N "checking for POSIXized ISC... $ECHO_C" >&6
 if test -d /etc/conf/kconfig.d &&
    grep _POSIX_VERSION /usr/include/sys/unistd.h >/dev/null 2>&1
 then
 echo $ECHO_N "checking for POSIXized ISC... $ECHO_C" >&6
 if test -d /etc/conf/kconfig.d &&
    grep _POSIX_VERSION /usr/include/sys/unistd.h >/dev/null 2>&1
 then

-  echo "$as_me:2391: result: yes" >&5
+  echo "$as_me:2392: result: yes" >&5

 echo "${ECHO_T}yes" >&6
   ISC=yes # If later tests want to check for ISC.
 
 echo "${ECHO_T}yes" >&6
   ISC=yes # If later tests want to check for ISC.
 


@@ -2402,12 +2403,12 @@ EOF
     CC="$CC -Xp"
   fi
 else
     CC="$CC -Xp"
   fi
 else

-  echo "$as_me:2405: result: no" >&5
+  echo "$as_me:2406: result: no" >&5

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

-echo "$as_me:2410: checking for ${CC-cc} option to accept ANSI C" >&5
+echo "$as_me:2411: checking for ${CC-cc} option to accept ANSI C" >&5

 echo $ECHO_N "checking for ${CC-cc} option to accept ANSI C... $ECHO_C" >&6
 if test "${cf_cv_ansi_cc+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 echo $ECHO_N "checking for ${CC-cc} option to accept ANSI C... $ECHO_C" >&6
 if test "${cf_cv_ansi_cc+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6


@@ -2501,7 +2502,7 @@ if test -n "$cf_new_extra_cppflags" ; then
 fi
 
        cat >conftest.$ac_ext <<_ACEOF
 fi
 
        cat >conftest.$ac_ext <<_ACEOF

-#line 2504 "configure"
+#line 2505 "configure"

 #include "confdefs.h"
 
 #ifndef CC_HAS_PROTOS
 #include "confdefs.h"
 
 #ifndef CC_HAS_PROTOS


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

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

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

-  echo "$as_me:2528: \$? = $ac_status" >&5
+  echo "$as_me:2529: \$? = $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:2531: \"$ac_try\"") >&5
+  { (eval echo "$as_me:2532: \"$ac_try\"") >&5

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

-  echo "$as_me:2534: \$? = $ac_status" >&5
+  echo "$as_me:2535: \$? = $ac_status" >&5

   (exit $ac_status); }; }; then
   cf_cv_ansi_cc="$cf_arg"; break
 else
   (exit $ac_status); }; }; then
   cf_cv_ansi_cc="$cf_arg"; break
 else


@@ -2544,7 +2545,7 @@ CFLAGS="$cf_save_CFLAGS"
 CPPFLAGS="$cf_save_CPPFLAGS"
 
 fi
 CPPFLAGS="$cf_save_CPPFLAGS"
 
 fi

-echo "$as_me:2547: result: $cf_cv_ansi_cc" >&5
+echo "$as_me:2548: result: $cf_cv_ansi_cc" >&5

 echo "${ECHO_T}$cf_cv_ansi_cc" >&6
 
 if test "$cf_cv_ansi_cc" != "no"; then
 echo "${ECHO_T}$cf_cv_ansi_cc" >&6
 
 if test "$cf_cv_ansi_cc" != "no"; then


@@ -2627,7 +2628,7 @@ fi
 fi
 
 if test "$cf_cv_ansi_cc" = "no"; then
 fi
 
 if test "$cf_cv_ansi_cc" = "no"; then

-       { { echo "$as_me:2630: error: Your compiler does not appear to recognize prototypes.
+       { { echo "$as_me:2631: error: Your compiler does not appear to recognize prototypes.

 You have the following choices:
        a. adjust your compiler options
        b. get an up-to-date compiler
 You have the following choices:
        a. adjust your compiler options
        b. get an up-to-date compiler


@@ -2667,7 +2668,7 @@ freebsd*) #(vi
 *) LDPATH=$PATH:/sbin:/usr/sbin
   # Extract the first word of "ldconfig", so it can be a program name with args.
 set dummy ldconfig; ac_word=$2
 *) LDPATH=$PATH:/sbin:/usr/sbin
   # Extract the first word of "ldconfig", so it can be a program name with args.
 set dummy ldconfig; ac_word=$2

-echo "$as_me:2670: checking for $ac_word" >&5
+echo "$as_me:2671: checking for $ac_word" >&5

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


@@ -2684,7 +2685,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   if $as_executable_p "$ac_dir/$ac_word"; then
    ac_cv_path_LDCONFIG="$ac_dir/$ac_word"
   test -z "$ac_dir" && ac_dir=.
   if $as_executable_p "$ac_dir/$ac_word"; then
    ac_cv_path_LDCONFIG="$ac_dir/$ac_word"

-   echo "$as_me:2687: found $ac_dir/$ac_word" >&5
+   echo "$as_me:2688: found $ac_dir/$ac_word" >&5

    break
 fi
 done
    break
 fi
 done


@@ -2695,10 +2696,10 @@ fi
 LDCONFIG=$ac_cv_path_LDCONFIG
 
 if test -n "$LDCONFIG"; then
 LDCONFIG=$ac_cv_path_LDCONFIG
 
 if test -n "$LDCONFIG"; then

-  echo "$as_me:2698: result: $LDCONFIG" >&5
+  echo "$as_me:2699: result: $LDCONFIG" >&5

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

-  echo "$as_me:2701: result: no" >&5
+  echo "$as_me:2702: result: no" >&5

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


@@ -2706,7 +2707,7 @@ fi
 esac
 fi
 
 esac
 fi
 

-echo "$as_me:2709: checking if you want to ensure bool is consistent with C++" >&5
+echo "$as_me:2710: checking if you want to ensure bool is consistent with C++" >&5

 echo $ECHO_N "checking if you want to ensure bool is consistent with C++... $ECHO_C" >&6
 
 # Check whether --with-cxx or --without-cxx was given.
 echo $ECHO_N "checking if you want to ensure bool is consistent with C++... $ECHO_C" >&6
 
 # Check whether --with-cxx or --without-cxx was given.


@@ -2716,7 +2717,7 @@ if test "${with_cxx+set}" = set; then
 else
   cf_with_cxx=yes
 fi;
 else
   cf_with_cxx=yes
 fi;

-echo "$as_me:2719: result: $cf_with_cxx" >&5
+echo "$as_me:2720: result: $cf_with_cxx" >&5

 echo "${ECHO_T}$cf_with_cxx" >&6
 if test "X$cf_with_cxx" = Xno ; then
        CXX=""
 echo "${ECHO_T}$cf_with_cxx" >&6
 if test "X$cf_with_cxx" = Xno ; then
        CXX=""


@@ -2734,7 +2735,7 @@ if test -n "$ac_tool_prefix"; then
   do
     # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
 set dummy $ac_tool_prefix$ac_prog; ac_word=$2
   do
     # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
 set dummy $ac_tool_prefix$ac_prog; ac_word=$2

-echo "$as_me:2737: checking for $ac_word" >&5
+echo "$as_me:2738: checking for $ac_word" >&5

 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_CXX+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_CXX+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6


@@ -2749,7 +2750,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_CXX="$ac_tool_prefix$ac_prog"
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_CXX="$ac_tool_prefix$ac_prog"

-echo "$as_me:2752: found $ac_dir/$ac_word" >&5
+echo "$as_me:2753: found $ac_dir/$ac_word" >&5

 break
 done
 
 break
 done
 


@@ -2757,10 +2758,10 @@ fi
 fi
 CXX=$ac_cv_prog_CXX
 if test -n "$CXX"; then
 fi
 CXX=$ac_cv_prog_CXX
 if test -n "$CXX"; then

-  echo "$as_me:2760: result: $CXX" >&5
+  echo "$as_me:2761: result: $CXX" >&5

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

-  echo "$as_me:2763: result: no" >&5
+  echo "$as_me:2764: result: no" >&5

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


@@ -2773,7 +2774,7 @@ if test -z "$CXX"; then
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2

-echo "$as_me:2776: checking for $ac_word" >&5
+echo "$as_me:2777: checking for $ac_word" >&5

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


@@ -2788,7 +2789,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_ac_ct_CXX="$ac_prog"
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_ac_ct_CXX="$ac_prog"

-echo "$as_me:2791: found $ac_dir/$ac_word" >&5
+echo "$as_me:2792: found $ac_dir/$ac_word" >&5

 break
 done
 
 break
 done
 


@@ -2796,10 +2797,10 @@ fi
 fi
 ac_ct_CXX=$ac_cv_prog_ac_ct_CXX
 if test -n "$ac_ct_CXX"; then
 fi
 ac_ct_CXX=$ac_cv_prog_ac_ct_CXX
 if test -n "$ac_ct_CXX"; then

-  echo "$as_me:2799: result: $ac_ct_CXX" >&5
+  echo "$as_me:2800: result: $ac_ct_CXX" >&5

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

-  echo "$as_me:2802: result: no" >&5
+  echo "$as_me:2803: result: no" >&5

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


@@ -2811,32 +2812,32 @@ test -n "$ac_ct_CXX" || ac_ct_CXX="g++"
 fi
 
 # Provide some information about the compiler.
 fi
 
 # Provide some information about the compiler.

-echo "$as_me:2814:" \
+echo "$as_me:2815:" \

      "checking for C++ compiler version" >&5
 ac_compiler=`set X $ac_compile; echo $2`
      "checking for C++ compiler version" >&5
 ac_compiler=`set X $ac_compile; echo $2`

-{ (eval echo "$as_me:2817: \"$ac_compiler --version </dev/null >&5\"") >&5
+{ (eval echo "$as_me:2818: \"$ac_compiler --version </dev/null >&5\"") >&5

   (eval $ac_compiler --version </dev/null >&5) 2>&5
   ac_status=$?
   (eval $ac_compiler --version </dev/null >&5) 2>&5
   ac_status=$?

-  echo "$as_me:2820: \$? = $ac_status" >&5
+  echo "$as_me:2821: \$? = $ac_status" >&5

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

-{ (eval echo "$as_me:2822: \"$ac_compiler -v </dev/null >&5\"") >&5
+{ (eval echo "$as_me:2823: \"$ac_compiler -v </dev/null >&5\"") >&5

   (eval $ac_compiler -v </dev/null >&5) 2>&5
   ac_status=$?
   (eval $ac_compiler -v </dev/null >&5) 2>&5
   ac_status=$?

-  echo "$as_me:2825: \$? = $ac_status" >&5
+  echo "$as_me:2826: \$? = $ac_status" >&5

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

-{ (eval echo "$as_me:2827: \"$ac_compiler -V </dev/null >&5\"") >&5
+{ (eval echo "$as_me:2828: \"$ac_compiler -V </dev/null >&5\"") >&5

   (eval $ac_compiler -V </dev/null >&5) 2>&5
   ac_status=$?
   (eval $ac_compiler -V </dev/null >&5) 2>&5
   ac_status=$?

-  echo "$as_me:2830: \$? = $ac_status" >&5
+  echo "$as_me:2831: \$? = $ac_status" >&5

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

-echo "$as_me:2833: checking whether we are using the GNU C++ compiler" >&5
+echo "$as_me:2834: checking whether we are using the GNU C++ compiler" >&5

 echo $ECHO_N "checking whether we are using the GNU C++ compiler... $ECHO_C" >&6
 if test "${ac_cv_cxx_compiler_gnu+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 echo $ECHO_N "checking whether we are using the GNU C++ compiler... $ECHO_C" >&6
 if test "${ac_cv_cxx_compiler_gnu+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF

-#line 2839 "configure"
+#line 2840 "configure"

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


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

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

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

-  echo "$as_me:2857: \$? = $ac_status" >&5
+  echo "$as_me:2858: \$? = $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:2860: \"$ac_try\"") >&5
+  { (eval echo "$as_me:2861: \"$ac_try\"") >&5

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

-  echo "$as_me:2863: \$? = $ac_status" >&5
+  echo "$as_me:2864: \$? = $ac_status" >&5

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


@@ -2872,19 +2873,19 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 ac_cv_cxx_compiler_gnu=$ac_compiler_gnu
 
 fi
 ac_cv_cxx_compiler_gnu=$ac_compiler_gnu
 
 fi

-echo "$as_me:2875: result: $ac_cv_cxx_compiler_gnu" >&5
+echo "$as_me:2876: result: $ac_cv_cxx_compiler_gnu" >&5

 echo "${ECHO_T}$ac_cv_cxx_compiler_gnu" >&6
 GXX=`test $ac_compiler_gnu = yes && echo yes`
 ac_test_CXXFLAGS=${CXXFLAGS+set}
 ac_save_CXXFLAGS=$CXXFLAGS
 CXXFLAGS="-g"
 echo "${ECHO_T}$ac_cv_cxx_compiler_gnu" >&6
 GXX=`test $ac_compiler_gnu = yes && echo yes`
 ac_test_CXXFLAGS=${CXXFLAGS+set}
 ac_save_CXXFLAGS=$CXXFLAGS
 CXXFLAGS="-g"

-echo "$as_me:2881: checking whether $CXX accepts -g" >&5
+echo "$as_me:2882: checking whether $CXX accepts -g" >&5

 echo $ECHO_N "checking whether $CXX accepts -g... $ECHO_C" >&6
 if test "${ac_cv_prog_cxx_g+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 echo $ECHO_N "checking whether $CXX accepts -g... $ECHO_C" >&6
 if test "${ac_cv_prog_cxx_g+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF

-#line 2887 "configure"
+#line 2888 "configure"

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


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

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

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

-  echo "$as_me:2902: \$? = $ac_status" >&5
+  echo "$as_me:2903: \$? = $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:2905: \"$ac_try\"") >&5
+  { (eval echo "$as_me:2906: \"$ac_try\"") >&5

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

-  echo "$as_me:2908: \$? = $ac_status" >&5
+  echo "$as_me:2909: \$? = $ac_status" >&5

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


@@ -2915,7 +2916,7 @@ ac_cv_prog_cxx_g=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi

-echo "$as_me:2918: result: $ac_cv_prog_cxx_g" >&5
+echo "$as_me:2919: result: $ac_cv_prog_cxx_g" >&5

 echo "${ECHO_T}$ac_cv_prog_cxx_g" >&6
 if test "$ac_test_CXXFLAGS" = set; then
   CXXFLAGS=$ac_save_CXXFLAGS
 echo "${ECHO_T}$ac_cv_prog_cxx_g" >&6
 if test "$ac_test_CXXFLAGS" = set; then
   CXXFLAGS=$ac_save_CXXFLAGS


@@ -2942,7 +2943,7 @@ for ac_declaration in \
    'void exit (int);'
 do
   cat >conftest.$ac_ext <<_ACEOF
    'void exit (int);'
 do
   cat >conftest.$ac_ext <<_ACEOF

-#line 2945 "configure"
+#line 2946 "configure"

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


@@ -2955,16 +2956,16 @@ exit (42);
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

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

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

-  echo "$as_me:2961: \$? = $ac_status" >&5
+  echo "$as_me:2962: \$? = $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:2964: \"$ac_try\"") >&5
+  { (eval echo "$as_me:2965: \"$ac_try\"") >&5

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

-  echo "$as_me:2967: \$? = $ac_status" >&5
+  echo "$as_me:2968: \$? = $ac_status" >&5

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


@@ -2974,7 +2975,7 @@ continue
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
   cat >conftest.$ac_ext <<_ACEOF
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
   cat >conftest.$ac_ext <<_ACEOF

-#line 2977 "configure"
+#line 2978 "configure"

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


@@ -2986,16 +2987,16 @@ exit (42);
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

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

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

-  echo "$as_me:2992: \$? = $ac_status" >&5
+  echo "$as_me:2993: \$? = $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:2995: \"$ac_try\"") >&5
+  { (eval echo "$as_me:2996: \"$ac_try\"") >&5

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

-  echo "$as_me:2998: \$? = $ac_status" >&5
+  echo "$as_me:2999: \$? = $ac_status" >&5

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


@@ -3022,7 +3023,7 @@ ac_main_return=return
        if test "$CXX" = "g++" ; then
                # Extract the first word of "g++", so it can be a program name with args.
 set dummy g++; ac_word=$2
        if test "$CXX" = "g++" ; then
                # Extract the first word of "g++", so it can be a program name with args.
 set dummy g++; ac_word=$2

-echo "$as_me:3025: checking for $ac_word" >&5
+echo "$as_me:3026: checking for $ac_word" >&5

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


@@ -3039,7 +3040,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   if $as_executable_p "$ac_dir/$ac_word"; then
    ac_cv_path_CXX="$ac_dir/$ac_word"
   test -z "$ac_dir" && ac_dir=.
   if $as_executable_p "$ac_dir/$ac_word"; then
    ac_cv_path_CXX="$ac_dir/$ac_word"

-   echo "$as_me:3042: found $ac_dir/$ac_word" >&5
+   echo "$as_me:3043: found $ac_dir/$ac_word" >&5

    break
 fi
 done
    break
 fi
 done


@@ -3050,16 +3051,16 @@ fi
 CXX=$ac_cv_path_CXX
 
 if test -n "$CXX"; then
 CXX=$ac_cv_path_CXX
 
 if test -n "$CXX"; then

-  echo "$as_me:3053: result: $CXX" >&5
+  echo "$as_me:3054: result: $CXX" >&5

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

-  echo "$as_me:3056: result: no" >&5
+  echo "$as_me:3057: result: no" >&5

 echo "${ECHO_T}no" >&6
 fi
 
        fi
        if test "$CXX" = "g++" ; then
 echo "${ECHO_T}no" >&6
 fi
 
        fi
        if test "$CXX" = "g++" ; then

-               { echo "$as_me:3062: WARNING: ignoring hardcoded g++" >&5
+               { echo "$as_me:3063: WARNING: ignoring hardcoded g++" >&5

 echo "$as_me: WARNING: ignoring hardcoded g++" >&2;}
                cf_with_cxx=no; CXX=""; GXX="";
        fi
 echo "$as_me: WARNING: ignoring hardcoded g++" >&2;}
                cf_with_cxx=no; CXX=""; GXX="";
        fi


@@ -3067,11 +3068,11 @@ fi
 
 GXX_VERSION=none
 if test "$GXX" = yes; then
 
 GXX_VERSION=none
 if test "$GXX" = yes; then

-       echo "$as_me:3070: checking version of g++" >&5
+       echo "$as_me:3071: checking version of g++" >&5

 echo $ECHO_N "checking version of g++... $ECHO_C" >&6
        GXX_VERSION="`${CXX-g++} --version| sed -e '2,$d' -e 's/^.*(GCC) //' -e 's/^[^0-9.]*//' -e 's/[^0-9.].*//'`"
        test -z "$GXX_VERSION" && GXX_VERSION=unknown
 echo $ECHO_N "checking version of g++... $ECHO_C" >&6
        GXX_VERSION="`${CXX-g++} --version| sed -e '2,$d' -e 's/^.*(GCC) //' -e 's/^[^0-9.]*//' -e 's/[^0-9.].*//'`"
        test -z "$GXX_VERSION" && GXX_VERSION=unknown

-       echo "$as_me:3074: result: $GXX_VERSION" >&5
+       echo "$as_me:3075: result: $GXX_VERSION" >&5

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


@@ -3079,12 +3080,12 @@ case $GXX_VERSION in
 1*|2.[0-6]*)
        # GXX=""; CXX=""; ac_cv_prog_gxx=no
        # cf_cxx_library=no
 1*|2.[0-6]*)
        # GXX=""; CXX=""; ac_cv_prog_gxx=no
        # cf_cxx_library=no

-       { echo "$as_me:3082: WARNING: templates do not work" >&5
+       { echo "$as_me:3083: WARNING: templates do not work" >&5

 echo "$as_me: WARNING: templates do not work" >&2;}
        ;;
 esac
 
 echo "$as_me: WARNING: templates do not work" >&2;}
        ;;
 esac
 

-echo "$as_me:3087: checking if you want to build C++ binding and demo" >&5
+echo "$as_me:3088: checking if you want to build C++ binding and demo" >&5

 echo $ECHO_N "checking if you want to build C++ binding and demo... $ECHO_C" >&6
 
 # Check whether --with-cxx-binding or --without-cxx-binding was given.
 echo $ECHO_N "checking if you want to build C++ binding and demo... $ECHO_C" >&6
 
 # Check whether --with-cxx-binding or --without-cxx-binding was given.


@@ -3094,10 +3095,10 @@ if test "${with_cxx_binding+set}" = set; then
 else
   cf_with_cxx_binding=$cf_with_cxx
 fi;
 else
   cf_with_cxx_binding=$cf_with_cxx
 fi;

-echo "$as_me:3097: result: $cf_with_cxx_binding" >&5
+echo "$as_me:3098: result: $cf_with_cxx_binding" >&5

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

-echo "$as_me:3100: checking if you want to build with Ada95" >&5
+echo "$as_me:3101: checking if you want to build with Ada95" >&5

 echo $ECHO_N "checking if you want to build with Ada95... $ECHO_C" >&6
 
 # Check whether --with-ada or --without-ada was given.
 echo $ECHO_N "checking if you want to build with Ada95... $ECHO_C" >&6
 
 # Check whether --with-ada or --without-ada was given.


@@ -3107,10 +3108,10 @@ if test "${with_ada+set}" = set; then
 else
   cf_with_ada=yes
 fi;
 else
   cf_with_ada=yes
 fi;

-echo "$as_me:3110: result: $cf_with_ada" >&5
+echo "$as_me:3111: result: $cf_with_ada" >&5

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

-echo "$as_me:3113: checking if you want to build programs such as tic" >&5
+echo "$as_me:3114: checking if you want to build programs such as tic" >&5

 echo $ECHO_N "checking if you want to build programs such as tic... $ECHO_C" >&6
 
 # Check whether --with-progs or --without-progs was given.
 echo $ECHO_N "checking if you want to build programs such as tic... $ECHO_C" >&6
 
 # Check whether --with-progs or --without-progs was given.


@@ -3120,10 +3121,10 @@ if test "${with_progs+set}" = set; then
 else
   cf_with_progs=yes
 fi;
 else
   cf_with_progs=yes
 fi;

-echo "$as_me:3123: result: $cf_with_progs" >&5
+echo "$as_me:3124: result: $cf_with_progs" >&5

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

-echo "$as_me:3126: checking if you wish to install curses.h" >&5
+echo "$as_me:3127: checking if you wish to install curses.h" >&5

 echo $ECHO_N "checking if you wish to install curses.h... $ECHO_C" >&6
 
 # Check whether --with-curses-h or --without-curses-h was given.
 echo $ECHO_N "checking if you wish to install curses.h... $ECHO_C" >&6
 
 # Check whether --with-curses-h or --without-curses-h was given.


@@ -3133,7 +3134,7 @@ if test "${with_curses_h+set}" = set; then
 else
   with_curses_h=yes
 fi;
 else
   with_curses_h=yes
 fi;

-echo "$as_me:3136: result: $with_curses_h" >&5
+echo "$as_me:3137: result: $with_curses_h" >&5

 echo "${ECHO_T}$with_curses_h" >&6
 
 modules_to_build="ncurses"
 echo "${ECHO_T}$with_curses_h" >&6
 
 modules_to_build="ncurses"


@@ -3159,7 +3160,7 @@ for ac_prog in mawk gawk nawk awk
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2

-echo "$as_me:3162: checking for $ac_word" >&5
+echo "$as_me:3163: checking for $ac_word" >&5

 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_AWK+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_AWK+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6


@@ -3174,7 +3175,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_AWK="$ac_prog"
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_AWK="$ac_prog"

-echo "$as_me:3177: found $ac_dir/$ac_word" >&5
+echo "$as_me:3178: found $ac_dir/$ac_word" >&5

 break
 done
 
 break
 done
 


@@ -3182,21 +3183,21 @@ fi
 fi
 AWK=$ac_cv_prog_AWK
 if test -n "$AWK"; then
 fi
 AWK=$ac_cv_prog_AWK
 if test -n "$AWK"; then

-  echo "$as_me:3185: result: $AWK" >&5
+  echo "$as_me:3186: result: $AWK" >&5

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

-  echo "$as_me:3188: result: no" >&5
+  echo "$as_me:3189: result: no" >&5

 echo "${ECHO_T}no" >&6
 fi
 
   test -n "$AWK" && break
 done
 
 echo "${ECHO_T}no" >&6
 fi
 
   test -n "$AWK" && break
 done
 

-test -z "$AWK" && { { echo "$as_me:3195: error: No awk program found" >&5
+test -z "$AWK" && { { echo "$as_me:3196: error: No awk program found" >&5

 echo "$as_me: error: No awk program found" >&2;}
    { (exit 1); exit 1; }; }
 
 echo "$as_me: error: No awk program found" >&2;}
    { (exit 1); exit 1; }; }
 

-echo "$as_me:3199: checking for egrep" >&5
+echo "$as_me:3200: checking for egrep" >&5

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


@@ -3206,11 +3207,11 @@ else
     else ac_cv_prog_egrep='egrep'
     fi
 fi
     else ac_cv_prog_egrep='egrep'
     fi
 fi

-echo "$as_me:3209: result: $ac_cv_prog_egrep" >&5
+echo "$as_me:3210: result: $ac_cv_prog_egrep" >&5

 echo "${ECHO_T}$ac_cv_prog_egrep" >&6
  EGREP=$ac_cv_prog_egrep
 
 echo "${ECHO_T}$ac_cv_prog_egrep" >&6
  EGREP=$ac_cv_prog_egrep
 

-test -z "$EGREP" && { { echo "$as_me:3213: error: No egrep program found" >&5
+test -z "$EGREP" && { { echo "$as_me:3214: error: No egrep program found" >&5

 echo "$as_me: error: No egrep program found" >&2;}
    { (exit 1); exit 1; }; }
 
 echo "$as_me: error: No egrep program found" >&2;}
    { (exit 1); exit 1; }; }
 


@@ -3226,7 +3227,7 @@ echo "$as_me: error: No egrep program found" >&2;}
 # AFS /usr/afsws/bin/install, which mishandles nonexistent args
 # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
 # ./install, which can be erroneously created by make from ./install.sh.
 # AFS /usr/afsws/bin/install, which mishandles nonexistent args
 # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
 # ./install, which can be erroneously created by make from ./install.sh.

-echo "$as_me:3229: checking for a BSD compatible install" >&5
+echo "$as_me:3230: checking for a BSD compatible install" >&5

 echo $ECHO_N "checking for a BSD compatible install... $ECHO_C" >&6
 if test -z "$INSTALL"; then
 if test "${ac_cv_path_install+set}" = set; then
 echo $ECHO_N "checking for a BSD compatible install... $ECHO_C" >&6
 if test -z "$INSTALL"; then
 if test "${ac_cv_path_install+set}" = set; then


@@ -3275,7 +3276,7 @@ fi
     INSTALL=$ac_install_sh
   fi
 fi
     INSTALL=$ac_install_sh
   fi
 fi

-echo "$as_me:3278: result: $INSTALL" >&5
+echo "$as_me:3279: result: $INSTALL" >&5

 echo "${ECHO_T}$INSTALL" >&6
 
 # Use test -z because SunOS4 sh mishandles braces in ${var-val}.
 echo "${ECHO_T}$INSTALL" >&6
 
 # Use test -z because SunOS4 sh mishandles braces in ${var-val}.


@@ -3300,7 +3301,7 @@ for ac_prog in tdlint lint alint
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2

-echo "$as_me:3303: checking for $ac_word" >&5
+echo "$as_me:3304: checking for $ac_word" >&5

 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_LINT+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_LINT+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6


@@ -3315,7 +3316,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_LINT="$ac_prog"
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_LINT="$ac_prog"

-echo "$as_me:3318: found $ac_dir/$ac_word" >&5
+echo "$as_me:3319: found $ac_dir/$ac_word" >&5

 break
 done
 
 break
 done
 


@@ -3323,28 +3324,28 @@ fi
 fi
 LINT=$ac_cv_prog_LINT
 if test -n "$LINT"; then
 fi
 LINT=$ac_cv_prog_LINT
 if test -n "$LINT"; then

-  echo "$as_me:3326: result: $LINT" >&5
+  echo "$as_me:3327: result: $LINT" >&5

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

-  echo "$as_me:3329: result: no" >&5
+  echo "$as_me:3330: result: no" >&5

 echo "${ECHO_T}no" >&6
 fi
 
   test -n "$LINT" && break
 done
 
 echo "${ECHO_T}no" >&6
 fi
 
   test -n "$LINT" && break
 done
 

-echo "$as_me:3336: checking whether ln -s works" >&5
+echo "$as_me:3337: checking whether ln -s works" >&5

 echo $ECHO_N "checking whether ln -s works... $ECHO_C" >&6
 LN_S=$as_ln_s
 if test "$LN_S" = "ln -s"; then
 echo $ECHO_N "checking whether ln -s works... $ECHO_C" >&6
 LN_S=$as_ln_s
 if test "$LN_S" = "ln -s"; then

-  echo "$as_me:3340: result: yes" >&5
+  echo "$as_me:3341: result: yes" >&5

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

-  echo "$as_me:3343: result: no, using $LN_S" >&5
+  echo "$as_me:3344: result: no, using $LN_S" >&5

 echo "${ECHO_T}no, using $LN_S" >&6
 fi
 
 echo "${ECHO_T}no, using $LN_S" >&6
 fi
 

-echo "$as_me:3347: checking for long file names" >&5
+echo "$as_me:3348: checking for long file names" >&5

 echo $ECHO_N "checking for long file names... $ECHO_C" >&6
 if test "${ac_cv_sys_long_file_names+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 echo $ECHO_N "checking for long file names... $ECHO_C" >&6
 if test "${ac_cv_sys_long_file_names+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6


@@ -3383,7 +3384,7 @@ for ac_dir in  . $ac_tmpdirs `eval echo $prefix/lib $exec_prefix/lib` ; do
   rm -rf $ac_xdir 2>/dev/null
 done
 fi
   rm -rf $ac_xdir 2>/dev/null
 done
 fi

-echo "$as_me:3386: result: $ac_cv_sys_long_file_names" >&5
+echo "$as_me:3387: result: $ac_cv_sys_long_file_names" >&5

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


@@ -3393,7 +3394,7 @@ EOF
 
 fi
 
 
 fi
 

-echo "$as_me:3396: checking if we should assume mixed-case filenames" >&5
+echo "$as_me:3397: checking if we should assume mixed-case filenames" >&5

 echo $ECHO_N "checking if we should assume mixed-case filenames... $ECHO_C" >&6
 
 # Check whether --enable-mixed-case or --disable-mixed-case was given.
 echo $ECHO_N "checking if we should assume mixed-case filenames... $ECHO_C" >&6
 
 # Check whether --enable-mixed-case or --disable-mixed-case was given.


@@ -3403,11 +3404,11 @@ if test "${enable_mixed_case+set}" = set; then
 else
   enable_mixedcase=auto
 fi;
 else
   enable_mixedcase=auto
 fi;

-echo "$as_me:3406: result: $enable_mixedcase" >&5
+echo "$as_me:3407: result: $enable_mixedcase" >&5

 echo "${ECHO_T}$enable_mixedcase" >&6
 if test "$enable_mixedcase" = "auto" ; then
 
 echo "${ECHO_T}$enable_mixedcase" >&6
 if test "$enable_mixedcase" = "auto" ; then
 

-echo "$as_me:3410: checking if filesystem supports mixed-case filenames" >&5
+echo "$as_me:3411: checking if filesystem supports mixed-case filenames" >&5

 echo $ECHO_N "checking if filesystem supports mixed-case filenames... $ECHO_C" >&6
 if test "${cf_cv_mixedcase+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 echo $ECHO_N "checking if filesystem supports mixed-case filenames... $ECHO_C" >&6
 if test "${cf_cv_mixedcase+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6


@@ -3434,7 +3435,7 @@ else
 fi
 
 fi
 fi
 
 fi

-echo "$as_me:3437: result: $cf_cv_mixedcase" >&5
+echo "$as_me:3438: result: $cf_cv_mixedcase" >&5

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


@@ -3451,7 +3452,7 @@ EOF
 fi
 
 # do this after mixed-case option (tags/TAGS is not as important as tic).
 fi
 
 # do this after mixed-case option (tags/TAGS is not as important as tic).

-echo "$as_me:3454: checking whether ${MAKE-make} sets \${MAKE}" >&5
+echo "$as_me:3455: checking whether ${MAKE-make} sets \${MAKE}" >&5

 echo $ECHO_N "checking whether ${MAKE-make} sets \${MAKE}... $ECHO_C" >&6
 set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y,./+-,__p_,'`
 if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\" = set"; then
 echo $ECHO_N "checking whether ${MAKE-make} sets \${MAKE}... $ECHO_C" >&6
 set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y,./+-,__p_,'`
 if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\" = set"; then


@@ -3471,18 +3472,18 @@ fi
 rm -f conftest.make
 fi
 if eval "test \"`echo '$ac_cv_prog_make_'${ac_make}_set`\" = yes"; then
 rm -f conftest.make
 fi
 if eval "test \"`echo '$ac_cv_prog_make_'${ac_make}_set`\" = yes"; then

-  echo "$as_me:3474: result: yes" >&5
+  echo "$as_me:3475: result: yes" >&5

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

-  echo "$as_me:3478: result: no" >&5
+  echo "$as_me:3479: result: no" >&5

 echo "${ECHO_T}no" >&6
   SET_MAKE="MAKE=${MAKE-make}"
 fi
 
 # Extract the first word of "ctags", so it can be a program name with args.
 set dummy ctags; ac_word=$2
 echo "${ECHO_T}no" >&6
   SET_MAKE="MAKE=${MAKE-make}"
 fi
 
 # Extract the first word of "ctags", so it can be a program name with args.
 set dummy ctags; ac_word=$2

-echo "$as_me:3485: checking for $ac_word" >&5
+echo "$as_me:3486: checking for $ac_word" >&5

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


@@ -3497,7 +3498,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_MAKE_LOWER_TAGS="yes"
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_MAKE_LOWER_TAGS="yes"

-echo "$as_me:3500: found $ac_dir/$ac_word" >&5
+echo "$as_me:3501: found $ac_dir/$ac_word" >&5

 break
 done
 
 break
 done
 


@@ -3506,17 +3507,17 @@ fi
 fi
 MAKE_LOWER_TAGS=$ac_cv_prog_MAKE_LOWER_TAGS
 if test -n "$MAKE_LOWER_TAGS"; then
 fi
 MAKE_LOWER_TAGS=$ac_cv_prog_MAKE_LOWER_TAGS
 if test -n "$MAKE_LOWER_TAGS"; then

-  echo "$as_me:3509: result: $MAKE_LOWER_TAGS" >&5
+  echo "$as_me:3510: result: $MAKE_LOWER_TAGS" >&5

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

-  echo "$as_me:3512: result: no" >&5
+  echo "$as_me:3513: result: no" >&5

 echo "${ECHO_T}no" >&6
 fi
 
 if test "$cf_cv_mixedcase" = yes ; then
        # Extract the first word of "etags", so it can be a program name with args.
 set dummy etags; ac_word=$2
 echo "${ECHO_T}no" >&6
 fi
 
 if test "$cf_cv_mixedcase" = yes ; then
        # Extract the first word of "etags", so it can be a program name with args.
 set dummy etags; ac_word=$2

-echo "$as_me:3519: checking for $ac_word" >&5
+echo "$as_me:3520: checking for $ac_word" >&5

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


@@ -3531,7 +3532,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_MAKE_UPPER_TAGS="yes"
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_MAKE_UPPER_TAGS="yes"

-echo "$as_me:3534: found $ac_dir/$ac_word" >&5
+echo "$as_me:3535: found $ac_dir/$ac_word" >&5

 break
 done
 
 break
 done
 


@@ -3540,10 +3541,10 @@ fi
 fi
 MAKE_UPPER_TAGS=$ac_cv_prog_MAKE_UPPER_TAGS
 if test -n "$MAKE_UPPER_TAGS"; then
 fi
 MAKE_UPPER_TAGS=$ac_cv_prog_MAKE_UPPER_TAGS
 if test -n "$MAKE_UPPER_TAGS"; then

-  echo "$as_me:3543: result: $MAKE_UPPER_TAGS" >&5
+  echo "$as_me:3544: result: $MAKE_UPPER_TAGS" >&5

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

-  echo "$as_me:3546: result: no" >&5
+  echo "$as_me:3547: result: no" >&5

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


@@ -3563,7 +3564,7 @@ else
        MAKE_LOWER_TAGS="#"
 fi
 
        MAKE_LOWER_TAGS="#"
 fi
 

-echo "$as_me:3566: checking for makeflags variable" >&5
+echo "$as_me:3567: checking for makeflags variable" >&5

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


@@ -3597,13 +3598,13 @@ CF_EOF
        rm -f cf_makeflags.tmp
 
 fi
        rm -f cf_makeflags.tmp
 
 fi

-echo "$as_me:3600: result: $cf_cv_makeflags" >&5
+echo "$as_me:3601: result: $cf_cv_makeflags" >&5

 echo "${ECHO_T}$cf_cv_makeflags" >&6
 
 if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
 set dummy ${ac_tool_prefix}ranlib; ac_word=$2
 echo "${ECHO_T}$cf_cv_makeflags" >&6
 
 if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
 set dummy ${ac_tool_prefix}ranlib; ac_word=$2

-echo "$as_me:3606: checking for $ac_word" >&5
+echo "$as_me:3607: checking for $ac_word" >&5

 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_RANLIB+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_RANLIB+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6


@@ -3618,7 +3619,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_RANLIB="${ac_tool_prefix}ranlib"
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"

-echo "$as_me:3621: found $ac_dir/$ac_word" >&5
+echo "$as_me:3622: found $ac_dir/$ac_word" >&5

 break
 done
 
 break
 done
 


@@ -3626,10 +3627,10 @@ fi
 fi
 RANLIB=$ac_cv_prog_RANLIB
 if test -n "$RANLIB"; then
 fi
 RANLIB=$ac_cv_prog_RANLIB
 if test -n "$RANLIB"; then

-  echo "$as_me:3629: result: $RANLIB" >&5
+  echo "$as_me:3630: result: $RANLIB" >&5

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

-  echo "$as_me:3632: result: no" >&5
+  echo "$as_me:3633: result: no" >&5

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


@@ -3638,7 +3639,7 @@ if test -z "$ac_cv_prog_RANLIB"; then
   ac_ct_RANLIB=$RANLIB
   # Extract the first word of "ranlib", so it can be a program name with args.
 set dummy ranlib; ac_word=$2
   ac_ct_RANLIB=$RANLIB
   # Extract the first word of "ranlib", so it can be a program name with args.
 set dummy ranlib; ac_word=$2

-echo "$as_me:3641: checking for $ac_word" >&5
+echo "$as_me:3642: checking for $ac_word" >&5

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


@@ -3653,7 +3654,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_ac_ct_RANLIB="ranlib"
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_ac_ct_RANLIB="ranlib"

-echo "$as_me:3656: found $ac_dir/$ac_word" >&5
+echo "$as_me:3657: found $ac_dir/$ac_word" >&5

 break
 done
 
 break
 done
 


@@ -3662,10 +3663,10 @@ fi
 fi
 ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB
 if test -n "$ac_ct_RANLIB"; then
 fi
 ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB
 if test -n "$ac_ct_RANLIB"; then

-  echo "$as_me:3665: result: $ac_ct_RANLIB" >&5
+  echo "$as_me:3666: result: $ac_ct_RANLIB" >&5

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

-  echo "$as_me:3668: result: no" >&5
+  echo "$as_me:3669: result: no" >&5

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


@@ -3677,7 +3678,7 @@ fi
 if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}ld", so it can be a program name with args.
 set dummy ${ac_tool_prefix}ld; ac_word=$2
 if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}ld", so it can be a program name with args.
 set dummy ${ac_tool_prefix}ld; ac_word=$2

-echo "$as_me:3680: checking for $ac_word" >&5
+echo "$as_me:3681: checking for $ac_word" >&5

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


@@ -3692,7 +3693,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_LD="${ac_tool_prefix}ld"
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_LD="${ac_tool_prefix}ld"

-echo "$as_me:3695: found $ac_dir/$ac_word" >&5
+echo "$as_me:3696: found $ac_dir/$ac_word" >&5

 break
 done
 
 break
 done
 


@@ -3700,10 +3701,10 @@ fi
 fi
 LD=$ac_cv_prog_LD
 if test -n "$LD"; then
 fi
 LD=$ac_cv_prog_LD
 if test -n "$LD"; then

-  echo "$as_me:3703: result: $LD" >&5
+  echo "$as_me:3704: result: $LD" >&5

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

-  echo "$as_me:3706: result: no" >&5
+  echo "$as_me:3707: result: no" >&5

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


@@ -3712,7 +3713,7 @@ if test -z "$ac_cv_prog_LD"; then
   ac_ct_LD=$LD
   # Extract the first word of "ld", so it can be a program name with args.
 set dummy ld; ac_word=$2
   ac_ct_LD=$LD
   # Extract the first word of "ld", so it can be a program name with args.
 set dummy ld; ac_word=$2

-echo "$as_me:3715: checking for $ac_word" >&5
+echo "$as_me:3716: checking for $ac_word" >&5

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


@@ -3727,7 +3728,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_ac_ct_LD="ld"
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_ac_ct_LD="ld"

-echo "$as_me:3730: found $ac_dir/$ac_word" >&5
+echo "$as_me:3731: found $ac_dir/$ac_word" >&5

 break
 done
 
 break
 done
 


@@ -3736,10 +3737,10 @@ fi
 fi
 ac_ct_LD=$ac_cv_prog_ac_ct_LD
 if test -n "$ac_ct_LD"; then
 fi
 ac_ct_LD=$ac_cv_prog_ac_ct_LD
 if test -n "$ac_ct_LD"; then

-  echo "$as_me:3739: result: $ac_ct_LD" >&5
+  echo "$as_me:3740: result: $ac_ct_LD" >&5

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

-  echo "$as_me:3742: result: no" >&5
+  echo "$as_me:3743: result: no" >&5

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


@@ -3751,7 +3752,7 @@ fi
 if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
 set dummy ${ac_tool_prefix}ar; ac_word=$2
 if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
 set dummy ${ac_tool_prefix}ar; ac_word=$2

-echo "$as_me:3754: checking for $ac_word" >&5
+echo "$as_me:3755: checking for $ac_word" >&5

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


@@ -3766,7 +3767,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_AR="${ac_tool_prefix}ar"
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_AR="${ac_tool_prefix}ar"

-echo "$as_me:3769: found $ac_dir/$ac_word" >&5
+echo "$as_me:3770: found $ac_dir/$ac_word" >&5

 break
 done
 
 break
 done
 


@@ -3774,10 +3775,10 @@ fi
 fi
 AR=$ac_cv_prog_AR
 if test -n "$AR"; then
 fi
 AR=$ac_cv_prog_AR
 if test -n "$AR"; then

-  echo "$as_me:3777: result: $AR" >&5
+  echo "$as_me:3778: result: $AR" >&5

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

-  echo "$as_me:3780: result: no" >&5
+  echo "$as_me:3781: result: no" >&5

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


@@ -3786,7 +3787,7 @@ if test -z "$ac_cv_prog_AR"; then
   ac_ct_AR=$AR
   # Extract the first word of "ar", so it can be a program name with args.
 set dummy ar; ac_word=$2
   ac_ct_AR=$AR
   # Extract the first word of "ar", so it can be a program name with args.
 set dummy ar; ac_word=$2

-echo "$as_me:3789: checking for $ac_word" >&5
+echo "$as_me:3790: checking for $ac_word" >&5

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


@@ -3801,7 +3802,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_ac_ct_AR="ar"
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_ac_ct_AR="ar"

-echo "$as_me:3804: found $ac_dir/$ac_word" >&5
+echo "$as_me:3805: found $ac_dir/$ac_word" >&5

 break
 done
 
 break
 done
 


@@ -3810,10 +3811,10 @@ fi
 fi
 ac_ct_AR=$ac_cv_prog_ac_ct_AR
 if test -n "$ac_ct_AR"; then
 fi
 ac_ct_AR=$ac_cv_prog_ac_ct_AR
 if test -n "$ac_ct_AR"; then

-  echo "$as_me:3813: result: $ac_ct_AR" >&5
+  echo "$as_me:3814: result: $ac_ct_AR" >&5

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

-  echo "$as_me:3816: result: no" >&5
+  echo "$as_me:3817: result: no" >&5

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


@@ -3826,7 +3827,7 @@ if test "${cf_cv_subst_AR_OPTS+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 

-echo "$as_me:3829: checking for archiver options (symbol AR_OPTS)" >&5
+echo "$as_me:3830: checking for archiver options (symbol AR_OPTS)" >&5

 echo $ECHO_N "checking for archiver options (symbol AR_OPTS)... $ECHO_C" >&6
 
 if test -z "$AR_OPTS" ; then
 echo $ECHO_N "checking for archiver options (symbol AR_OPTS)... $ECHO_C" >&6
 
 if test -z "$AR_OPTS" ; then


@@ -3835,12 +3836,12 @@ if test -z "$AR_OPTS" ; then
 fi
 
 cf_cv_subst_AR_OPTS=$AR_OPTS
 fi
 
 cf_cv_subst_AR_OPTS=$AR_OPTS

-echo "$as_me:3838: result: $AR_OPTS" >&5
+echo "$as_me:3839: result: $AR_OPTS" >&5

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

-echo "$as_me:3843: checking if you have specified an install-prefix" >&5
+echo "$as_me:3844: checking if you have specified an install-prefix" >&5

 echo $ECHO_N "checking if you have specified an install-prefix... $ECHO_C" >&6
 
 # Check whether --with-install-prefix or --without-install-prefix was given.
 echo $ECHO_N "checking if you have specified an install-prefix... $ECHO_C" >&6
 
 # Check whether --with-install-prefix or --without-install-prefix was given.


@@ -3853,7 +3854,7 @@ if test "${with_install_prefix+set}" = set; then
                ;;
        esac
 fi;
                ;;
        esac
 fi;

-echo "$as_me:3856: result: $DESTDIR" >&5
+echo "$as_me:3857: result: $DESTDIR" >&5

 echo "${ECHO_T}$DESTDIR" >&6
 
 ###############################################################################
 echo "${ECHO_T}$DESTDIR" >&6
 
 ###############################################################################


@@ -3881,7 +3882,7 @@ else
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2

-echo "$as_me:3884: checking for $ac_word" >&5
+echo "$as_me:3885: checking for $ac_word" >&5

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


@@ -3896,7 +3897,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_BUILD_CC="$ac_prog"
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_BUILD_CC="$ac_prog"

-echo "$as_me:3899: found $ac_dir/$ac_word" >&5
+echo "$as_me:3900: found $ac_dir/$ac_word" >&5

 break
 done
 
 break
 done
 


@@ -3904,10 +3905,10 @@ fi
 fi
 BUILD_CC=$ac_cv_prog_BUILD_CC
 if test -n "$BUILD_CC"; then
 fi
 BUILD_CC=$ac_cv_prog_BUILD_CC
 if test -n "$BUILD_CC"; then

-  echo "$as_me:3907: result: $BUILD_CC" >&5
+  echo "$as_me:3908: result: $BUILD_CC" >&5

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

-  echo "$as_me:3910: result: no" >&5
+  echo "$as_me:3911: result: no" >&5

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


@@ -3915,12 +3916,12 @@ fi
 done
 
 fi;
 done
 
 fi;

-       echo "$as_me:3918: checking for native build C compiler" >&5
+       echo "$as_me:3919: checking for native build C compiler" >&5

 echo $ECHO_N "checking for native build C compiler... $ECHO_C" >&6
 echo $ECHO_N "checking for native build C compiler... $ECHO_C" >&6

-       echo "$as_me:3920: result: $BUILD_CC" >&5
+       echo "$as_me:3921: result: $BUILD_CC" >&5

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

-       echo "$as_me:3923: checking for native build C preprocessor" >&5
+       echo "$as_me:3924: checking for native build C preprocessor" >&5

 echo $ECHO_N "checking for native build C preprocessor... $ECHO_C" >&6
 
 # Check whether --with-build-cpp or --without-build-cpp was given.
 echo $ECHO_N "checking for native build C preprocessor... $ECHO_C" >&6
 
 # Check whether --with-build-cpp or --without-build-cpp was given.


@@ -3930,10 +3931,10 @@ if test "${with_build_cpp+set}" = set; then
 else
   BUILD_CPP='${BUILD_CC} -E'
 fi;
 else
   BUILD_CPP='${BUILD_CC} -E'
 fi;

-       echo "$as_me:3933: result: $BUILD_CPP" >&5
+       echo "$as_me:3934: result: $BUILD_CPP" >&5

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

-       echo "$as_me:3936: checking for native build C flags" >&5
+       echo "$as_me:3937: checking for native build C flags" >&5

 echo $ECHO_N "checking for native build C flags... $ECHO_C" >&6
 
 # Check whether --with-build-cflags or --without-build-cflags was given.
 echo $ECHO_N "checking for native build C flags... $ECHO_C" >&6
 
 # Check whether --with-build-cflags or --without-build-cflags was given.


@@ -3941,10 +3942,10 @@ if test "${with_build_cflags+set}" = set; then
   withval="$with_build_cflags"
   BUILD_CFLAGS="$withval"
 fi;
   withval="$with_build_cflags"
   BUILD_CFLAGS="$withval"
 fi;

-       echo "$as_me:3944: result: $BUILD_CFLAGS" >&5
+       echo "$as_me:3945: result: $BUILD_CFLAGS" >&5

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

-       echo "$as_me:3947: checking for native build C preprocessor-flags" >&5
+       echo "$as_me:3948: checking for native build C preprocessor-flags" >&5

 echo $ECHO_N "checking for native build C preprocessor-flags... $ECHO_C" >&6
 
 # Check whether --with-build-cppflags or --without-build-cppflags was given.
 echo $ECHO_N "checking for native build C preprocessor-flags... $ECHO_C" >&6
 
 # Check whether --with-build-cppflags or --without-build-cppflags was given.


@@ -3952,10 +3953,10 @@ if test "${with_build_cppflags+set}" = set; then
   withval="$with_build_cppflags"
   BUILD_CPPFLAGS="$withval"
 fi;
   withval="$with_build_cppflags"
   BUILD_CPPFLAGS="$withval"
 fi;

-       echo "$as_me:3955: result: $BUILD_CPPFLAGS" >&5
+       echo "$as_me:3956: result: $BUILD_CPPFLAGS" >&5

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

-       echo "$as_me:3958: checking for native build linker-flags" >&5
+       echo "$as_me:3959: checking for native build linker-flags" >&5

 echo $ECHO_N "checking for native build linker-flags... $ECHO_C" >&6
 
 # Check whether --with-build-ldflags or --without-build-ldflags was given.
 echo $ECHO_N "checking for native build linker-flags... $ECHO_C" >&6
 
 # Check whether --with-build-ldflags or --without-build-ldflags was given.


@@ -3963,10 +3964,10 @@ if test "${with_build_ldflags+set}" = set; then
   withval="$with_build_ldflags"
   BUILD_LDFLAGS="$withval"
 fi;
   withval="$with_build_ldflags"
   BUILD_LDFLAGS="$withval"
 fi;

-       echo "$as_me:3966: result: $BUILD_LDFLAGS" >&5
+       echo "$as_me:3967: result: $BUILD_LDFLAGS" >&5

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

-       echo "$as_me:3969: checking for native build linker-libraries" >&5
+       echo "$as_me:3970: checking for native build linker-libraries" >&5

 echo $ECHO_N "checking for native build linker-libraries... $ECHO_C" >&6
 
 # Check whether --with-build-libs or --without-build-libs was given.
 echo $ECHO_N "checking for native build linker-libraries... $ECHO_C" >&6
 
 # Check whether --with-build-libs or --without-build-libs was given.


@@ -3974,7 +3975,7 @@ if test "${with_build_libs+set}" = set; then
   withval="$with_build_libs"
   BUILD_LIBS="$withval"
 fi;
   withval="$with_build_libs"
   BUILD_LIBS="$withval"
 fi;

-       echo "$as_me:3977: result: $BUILD_LIBS" >&5
+       echo "$as_me:3978: result: $BUILD_LIBS" >&5

 echo "${ECHO_T}$BUILD_LIBS" >&6
 
        # this assumes we're on Unix.
 echo "${ECHO_T}$BUILD_LIBS" >&6
 
        # this assumes we're on Unix.


@@ -3984,7 +3985,7 @@ echo "${ECHO_T}$BUILD_LIBS" >&6
        : ${BUILD_CC:='${CC}'}
 
        if ( test "$BUILD_CC" = "$CC" || test "$BUILD_CC" = '${CC}' ) ; then
        : ${BUILD_CC:='${CC}'}
 
        if ( test "$BUILD_CC" = "$CC" || test "$BUILD_CC" = '${CC}' ) ; then

-               { { echo "$as_me:3987: error: Cross-build requires two compilers.
+               { { echo "$as_me:3988: error: Cross-build requires two compilers.

 Use --with-build-cc to specify the native compiler." >&5
 echo "$as_me: error: Cross-build requires two compilers.
 Use --with-build-cc to specify the native compiler." >&2;}
 Use --with-build-cc to specify the native compiler." >&5
 echo "$as_me: error: Cross-build requires two compilers.
 Use --with-build-cc to specify the native compiler." >&2;}


@@ -4025,7 +4026,7 @@ LIB_LINK='${CC}'
 LIB_INSTALL=
 LIB_UNINSTALL=
 
 LIB_INSTALL=
 LIB_UNINSTALL=
 

-echo "$as_me:4028: checking if you want to build libraries with libtool" >&5
+echo "$as_me:4029: checking if you want to build libraries with libtool" >&5

 echo $ECHO_N "checking if you want to build libraries with libtool... $ECHO_C" >&6
 
 # Check whether --with-libtool or --without-libtool was given.
 echo $ECHO_N "checking if you want to build libraries with libtool... $ECHO_C" >&6
 
 # Check whether --with-libtool or --without-libtool was given.


@@ -4035,7 +4036,7 @@ if test "${with_libtool+set}" = set; then
 else
   with_libtool=no
 fi;
 else
   with_libtool=no
 fi;

-echo "$as_me:4038: result: $with_libtool" >&5
+echo "$as_me:4039: result: $with_libtool" >&5

 echo "${ECHO_T}$with_libtool" >&6
 if test "$with_libtool" != "no"; then
 
 echo "${ECHO_T}$with_libtool" >&6
 if test "$with_libtool" != "no"; then
 


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

-  { { echo "$as_me:4069: error: expected a pathname, not \"$with_libtool\"" >&5
+  { { echo "$as_me:4070: error: expected a pathname, not \"$with_libtool\"" >&5

 echo "$as_me: error: expected a pathname, not \"$with_libtool\"" >&2;}
    { (exit 1); exit 1; }; }
   ;;
 echo "$as_me: error: expected a pathname, not \"$with_libtool\"" >&2;}
    { (exit 1); exit 1; }; }
   ;;


@@ -4076,7 +4077,7 @@ esac
        else
                # Extract the first word of "libtool", so it can be a program name with args.
 set dummy libtool; ac_word=$2
        else
                # Extract the first word of "libtool", so it can be a program name with args.
 set dummy libtool; ac_word=$2

-echo "$as_me:4079: checking for $ac_word" >&5
+echo "$as_me:4080: checking for $ac_word" >&5

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


@@ -4093,7 +4094,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   if $as_executable_p "$ac_dir/$ac_word"; then
    ac_cv_path_LIBTOOL="$ac_dir/$ac_word"
   test -z "$ac_dir" && ac_dir=.
   if $as_executable_p "$ac_dir/$ac_word"; then
    ac_cv_path_LIBTOOL="$ac_dir/$ac_word"

-   echo "$as_me:4096: found $ac_dir/$ac_word" >&5
+   echo "$as_me:4097: found $ac_dir/$ac_word" >&5

    break
 fi
 done
    break
 fi
 done


@@ -4104,16 +4105,16 @@ fi
 LIBTOOL=$ac_cv_path_LIBTOOL
 
 if test -n "$LIBTOOL"; then
 LIBTOOL=$ac_cv_path_LIBTOOL
 
 if test -n "$LIBTOOL"; then

-  echo "$as_me:4107: result: $LIBTOOL" >&5
+  echo "$as_me:4108: result: $LIBTOOL" >&5

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

-  echo "$as_me:4110: result: no" >&5
+  echo "$as_me:4111: result: no" >&5

 echo "${ECHO_T}no" >&6
 fi
 
        fi
        if test -z "$LIBTOOL" ; then
 echo "${ECHO_T}no" >&6
 fi
 
        fi
        if test -z "$LIBTOOL" ; then

-               { { echo "$as_me:4116: error: Cannot find libtool" >&5
+               { { echo "$as_me:4117: error: Cannot find libtool" >&5

 echo "$as_me: error: Cannot find libtool" >&2;}
    { (exit 1); exit 1; }; }
        fi
 echo "$as_me: error: Cannot find libtool" >&2;}
    { (exit 1); exit 1; }; }
        fi


@@ -4128,17 +4129,17 @@ echo "$as_me: error: Cannot find libtool" >&2;}
        LIB_PREP=:
 
        # Show the version of libtool
        LIB_PREP=:
 
        # Show the version of libtool

-       echo "$as_me:4131: checking version of libtool" >&5
+       echo "$as_me:4132: checking version of libtool" >&5

 echo $ECHO_N "checking version of libtool... $ECHO_C" >&6
 
        # Save the version in a cache variable - this is not entirely a good
        # thing, but the version string from libtool is very ugly, and for
        # bug reports it might be useful to have the original string.
        cf_cv_libtool_version=`$LIBTOOL --version 2>&1 | sed -e '/^$/d' |sed -e '2,$d' -e 's/([^)]*)//g' -e 's/^[^1-9]*//' -e 's/[^0-9.].*//'`
 echo $ECHO_N "checking version of libtool... $ECHO_C" >&6
 
        # Save the version in a cache variable - this is not entirely a good
        # thing, but the version string from libtool is very ugly, and for
        # bug reports it might be useful to have the original string.
        cf_cv_libtool_version=`$LIBTOOL --version 2>&1 | sed -e '/^$/d' |sed -e '2,$d' -e 's/([^)]*)//g' -e 's/^[^1-9]*//' -e 's/[^0-9.].*//'`

-       echo "$as_me:4138: result: $cf_cv_libtool_version" >&5
+       echo "$as_me:4139: result: $cf_cv_libtool_version" >&5

 echo "${ECHO_T}$cf_cv_libtool_version" >&6
        if test -z "$cf_cv_libtool_version" ; then
 echo "${ECHO_T}$cf_cv_libtool_version" >&6
        if test -z "$cf_cv_libtool_version" ; then

-               { { echo "$as_me:4141: error: This is not GNU libtool" >&5
+               { { echo "$as_me:4142: error: This is not GNU libtool" >&5

 echo "$as_me: error: This is not GNU libtool" >&2;}
    { (exit 1); exit 1; }; }
        fi
 echo "$as_me: error: This is not GNU libtool" >&2;}
    { (exit 1); exit 1; }; }
        fi


@@ -4166,7 +4167,7 @@ cf_list_models="$cf_list_models libtool"
 
 else
 
 
 else
 

-echo "$as_me:4169: checking if you want to build shared libraries" >&5
+echo "$as_me:4170: checking if you want to build shared libraries" >&5

 echo $ECHO_N "checking if you want to build shared libraries... $ECHO_C" >&6
 
 # Check whether --with-shared or --without-shared was given.
 echo $ECHO_N "checking if you want to build shared libraries... $ECHO_C" >&6
 
 # Check whether --with-shared or --without-shared was given.


@@ -4176,11 +4177,11 @@ if test "${with_shared+set}" = set; then
 else
   with_shared=no
 fi;
 else
   with_shared=no
 fi;

-echo "$as_me:4179: result: $with_shared" >&5
+echo "$as_me:4180: result: $with_shared" >&5

 echo "${ECHO_T}$with_shared" >&6
 test "$with_shared" = "yes" && cf_list_models="$cf_list_models shared"
 
 echo "${ECHO_T}$with_shared" >&6
 test "$with_shared" = "yes" && cf_list_models="$cf_list_models shared"
 

-echo "$as_me:4183: checking if you want to build static libraries" >&5
+echo "$as_me:4184: checking if you want to build static libraries" >&5

 echo $ECHO_N "checking if you want to build static libraries... $ECHO_C" >&6
 
 # Check whether --with-normal or --without-normal was given.
 echo $ECHO_N "checking if you want to build static libraries... $ECHO_C" >&6
 
 # Check whether --with-normal or --without-normal was given.


@@ -4190,11 +4191,11 @@ if test "${with_normal+set}" = set; then
 else
   with_normal=yes
 fi;
 else
   with_normal=yes
 fi;

-echo "$as_me:4193: result: $with_normal" >&5
+echo "$as_me:4194: result: $with_normal" >&5

 echo "${ECHO_T}$with_normal" >&6
 test "$with_normal" = "yes" && cf_list_models="$cf_list_models normal"
 
 echo "${ECHO_T}$with_normal" >&6
 test "$with_normal" = "yes" && cf_list_models="$cf_list_models normal"
 

-echo "$as_me:4197: checking if you want to build debug libraries" >&5
+echo "$as_me:4198: checking if you want to build debug libraries" >&5

 echo $ECHO_N "checking if you want to build debug libraries... $ECHO_C" >&6
 
 # Check whether --with-debug or --without-debug was given.
 echo $ECHO_N "checking if you want to build debug libraries... $ECHO_C" >&6
 
 # Check whether --with-debug or --without-debug was given.


@@ -4204,11 +4205,11 @@ if test "${with_debug+set}" = set; then
 else
   with_debug=yes
 fi;
 else
   with_debug=yes
 fi;

-echo "$as_me:4207: result: $with_debug" >&5
+echo "$as_me:4208: result: $with_debug" >&5

 echo "${ECHO_T}$with_debug" >&6
 test "$with_debug" = "yes" && cf_list_models="$cf_list_models debug"
 
 echo "${ECHO_T}$with_debug" >&6
 test "$with_debug" = "yes" && cf_list_models="$cf_list_models debug"
 

-echo "$as_me:4211: checking if you want to build profiling libraries" >&5
+echo "$as_me:4212: checking if you want to build profiling libraries" >&5

 echo $ECHO_N "checking if you want to build profiling libraries... $ECHO_C" >&6
 
 # Check whether --with-profile or --without-profile was given.
 echo $ECHO_N "checking if you want to build profiling libraries... $ECHO_C" >&6
 
 # Check whether --with-profile or --without-profile was given.


@@ -4218,7 +4219,7 @@ if test "${with_profile+set}" = set; then
 else
   with_profile=no
 fi;
 else
   with_profile=no
 fi;

-echo "$as_me:4221: result: $with_profile" >&5
+echo "$as_me:4222: result: $with_profile" >&5

 echo "${ECHO_T}$with_profile" >&6
 test "$with_profile" = "yes" && cf_list_models="$cf_list_models profile"
 
 echo "${ECHO_T}$with_profile" >&6
 test "$with_profile" = "yes" && cf_list_models="$cf_list_models profile"
 


@@ -4226,19 +4227,19 @@ fi
 
 ###############################################################################
 
 
 ###############################################################################
 

-echo "$as_me:4229: checking for specified models" >&5
+echo "$as_me:4230: checking for specified models" >&5

 echo $ECHO_N "checking for specified models... $ECHO_C" >&6
 test -z "$cf_list_models" && cf_list_models=normal
 test "$with_libtool" != "no" && cf_list_models=libtool
 echo $ECHO_N "checking for specified models... $ECHO_C" >&6
 test -z "$cf_list_models" && cf_list_models=normal
 test "$with_libtool" != "no" && cf_list_models=libtool

-echo "$as_me:4233: result: $cf_list_models" >&5
+echo "$as_me:4234: result: $cf_list_models" >&5

 echo "${ECHO_T}$cf_list_models" >&6
 
 ### Use the first model as the default, and save its suffix for use in building
 ### up test-applications.
 echo "${ECHO_T}$cf_list_models" >&6
 
 ### Use the first model as the default, and save its suffix for use in building
 ### up test-applications.

-echo "$as_me:4238: checking for default model" >&5
+echo "$as_me:4239: checking for default model" >&5

 echo $ECHO_N "checking for default model... $ECHO_C" >&6
 DFT_LWR_MODEL=`echo "$cf_list_models" | $AWK '{print $1}'`
 echo $ECHO_N "checking for default model... $ECHO_C" >&6
 DFT_LWR_MODEL=`echo "$cf_list_models" | $AWK '{print $1}'`

-echo "$as_me:4241: result: $DFT_LWR_MODEL" >&5
+echo "$as_me:4242: result: $DFT_LWR_MODEL" >&5

 echo "${ECHO_T}$DFT_LWR_MODEL" >&6
 
 DFT_UPR_MODEL=`echo "$DFT_LWR_MODEL" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%`
 echo "${ECHO_T}$DFT_LWR_MODEL" >&6
 
 DFT_UPR_MODEL=`echo "$DFT_LWR_MODEL" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%`


@@ -4265,7 +4266,7 @@ LIB_SUFFIX=
 
 ###############################################################################
 
 
 ###############################################################################
 

-echo "$as_me:4268: checking if you want to build a separate terminfo library" >&5
+echo "$as_me:4269: checking if you want to build a separate terminfo library" >&5

 echo $ECHO_N "checking if you want to build a separate terminfo library... $ECHO_C" >&6
 
 # Check whether --with-termlib or --without-termlib was given.
 echo $ECHO_N "checking if you want to build a separate terminfo library... $ECHO_C" >&6
 
 # Check whether --with-termlib or --without-termlib was given.


@@ -4275,10 +4276,10 @@ if test "${with_termlib+set}" = set; then
 else
   with_termlib=no
 fi;
 else
   with_termlib=no
 fi;

-echo "$as_me:4278: result: $with_termlib" >&5
+echo "$as_me:4279: result: $with_termlib" >&5

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

-echo "$as_me:4281: checking if you want to build a separate tic library" >&5
+echo "$as_me:4282: checking if you want to build a separate tic library" >&5

 echo $ECHO_N "checking if you want to build a separate tic library... $ECHO_C" >&6
 
 # Check whether --with-ticlib or --without-ticlib was given.
 echo $ECHO_N "checking if you want to build a separate tic library... $ECHO_C" >&6
 
 # Check whether --with-ticlib or --without-ticlib was given.


@@ -4288,13 +4289,13 @@ if test "${with_ticlib+set}" = set; then
 else
   with_ticlib=no
 fi;
 else
   with_ticlib=no
 fi;

-echo "$as_me:4291: result: $with_ticlib" >&5
+echo "$as_me:4292: result: $with_ticlib" >&5

 echo "${ECHO_T}$with_ticlib" >&6
 
 ### Checks for special libraries, must be done up-front.
 SHLIB_LIST=""
 
 echo "${ECHO_T}$with_ticlib" >&6
 
 ### Checks for special libraries, must be done up-front.
 SHLIB_LIST=""
 

-echo "$as_me:4297: checking if you want to link with the GPM mouse library" >&5
+echo "$as_me:4298: checking if you want to link with the GPM mouse library" >&5

 echo $ECHO_N "checking if you want to link with the GPM mouse library... $ECHO_C" >&6
 
 # Check whether --with-gpm or --without-gpm was given.
 echo $ECHO_N "checking if you want to link with the GPM mouse library... $ECHO_C" >&6
 
 # Check whether --with-gpm or --without-gpm was given.


@@ -4304,27 +4305,27 @@ if test "${with_gpm+set}" = set; then
 else
   with_gpm=maybe
 fi;
 else
   with_gpm=maybe
 fi;

-echo "$as_me:4307: result: $with_gpm" >&5
+echo "$as_me:4308: result: $with_gpm" >&5

 echo "${ECHO_T}$with_gpm" >&6
 
 if test "$with_gpm" != no ; then
 echo "${ECHO_T}$with_gpm" >&6
 
 if test "$with_gpm" != no ; then

-       echo "$as_me:4311: checking for gpm.h" >&5
+       echo "$as_me:4312: checking for gpm.h" >&5

 echo $ECHO_N "checking for gpm.h... $ECHO_C" >&6
 if test "${ac_cv_header_gpm_h+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 echo $ECHO_N "checking for gpm.h... $ECHO_C" >&6
 if test "${ac_cv_header_gpm_h+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF

-#line 4317 "configure"
+#line 4318 "configure"

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

-if { (eval echo "$as_me:4321: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:4322: \"$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:4327: \$? = $ac_status" >&5
+  echo "$as_me:4328: \$? = $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


@@ -4343,7 +4344,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
 fi
 rm -f conftest.err conftest.$ac_ext
 fi

-echo "$as_me:4346: result: $ac_cv_header_gpm_h" >&5
+echo "$as_me:4347: result: $ac_cv_header_gpm_h" >&5

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


@@ -4354,14 +4355,14 @@ EOF
                if test "$with_gpm" != yes && test "$with_gpm" != maybe ; then
                        test -n "$verbose" && echo "    assuming we really have GPM library" 1>&6
 
                if test "$with_gpm" != yes && test "$with_gpm" != maybe ; then
                        test -n "$verbose" && echo "    assuming we really have GPM library" 1>&6
 

-echo "${as_me-configure}:4357: testing assuming we really have GPM library ..." 1>&5
+echo "${as_me-configure}:4358: testing assuming we really have GPM library ..." 1>&5

 
                        cat >>confdefs.h <<\EOF
 #define HAVE_LIBGPM 1
 EOF
 
                else
 
                        cat >>confdefs.h <<\EOF
 #define HAVE_LIBGPM 1
 EOF
 
                else

-                       echo "$as_me:4364: checking for Gpm_Open in -lgpm" >&5
+                       echo "$as_me:4365: checking for Gpm_Open in -lgpm" >&5

 echo $ECHO_N "checking for Gpm_Open in -lgpm... $ECHO_C" >&6
 if test "${ac_cv_lib_gpm_Gpm_Open+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 echo $ECHO_N "checking for Gpm_Open in -lgpm... $ECHO_C" >&6
 if test "${ac_cv_lib_gpm_Gpm_Open+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6


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

-#line 4372 "configure"
+#line 4373 "configure"

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


@@ -4388,16 +4389,16 @@ Gpm_Open ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext

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

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

-  echo "$as_me:4394: \$? = $ac_status" >&5
+  echo "$as_me:4395: \$? = $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:4397: \"$ac_try\"") >&5
+  { (eval echo "$as_me:4398: \"$ac_try\"") >&5

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

-  echo "$as_me:4400: \$? = $ac_status" >&5
+  echo "$as_me:4401: \$? = $ac_status" >&5

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


@@ -4408,13 +4409,13 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi

-echo "$as_me:4411: result: $ac_cv_lib_gpm_Gpm_Open" >&5
+echo "$as_me:4412: result: $ac_cv_lib_gpm_Gpm_Open" >&5

 echo "${ECHO_T}$ac_cv_lib_gpm_Gpm_Open" >&6
 if test $ac_cv_lib_gpm_Gpm_Open = yes; then
   :
 else
 
 echo "${ECHO_T}$ac_cv_lib_gpm_Gpm_Open" >&6
 if test $ac_cv_lib_gpm_Gpm_Open = yes; then
   :
 else
 

-                               { { echo "$as_me:4417: error: Cannot link with GPM library" >&5
+                               { { echo "$as_me:4418: error: Cannot link with GPM library" >&5

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


@@ -4424,7 +4425,7 @@ fi
 
 else
 
 
 else
 

-               test "$with_gpm" != maybe && { echo "$as_me:4427: WARNING: Cannot find GPM header" >&5
+               test "$with_gpm" != maybe && { echo "$as_me:4428: WARNING: Cannot find GPM header" >&5

 echo "$as_me: WARNING: Cannot find GPM header" >&2;}
                with_gpm=no
 
 echo "$as_me: WARNING: Cannot find GPM header" >&2;}
                with_gpm=no
 


@@ -4433,7 +4434,7 @@ fi
 fi
 
 if test "$with_gpm" != no ; then
 fi
 
 if test "$with_gpm" != no ; then

-       echo "$as_me:4436: checking if you want to load GPM dynamically" >&5
+       echo "$as_me:4437: checking if you want to load GPM dynamically" >&5

 echo $ECHO_N "checking if you want to load GPM dynamically... $ECHO_C" >&6
 
 # Check whether --with-dlsym or --without-dlsym was given.
 echo $ECHO_N "checking if you want to load GPM dynamically... $ECHO_C" >&6
 
 # Check whether --with-dlsym or --without-dlsym was given.


@@ -4443,18 +4444,18 @@ if test "${with_dlsym+set}" = set; then
 else
   with_dlsym=yes
 fi;
 else
   with_dlsym=yes
 fi;

-       echo "$as_me:4446: result: $with_dlsym" >&5
+       echo "$as_me:4447: result: $with_dlsym" >&5

 echo "${ECHO_T}$with_dlsym" >&6
        if test "$with_dlsym" = yes ; then
 
 cf_have_dlsym=no
 echo "${ECHO_T}$with_dlsym" >&6
        if test "$with_dlsym" = yes ; then
 
 cf_have_dlsym=no

-echo "$as_me:4451: checking for dlsym" >&5
+echo "$as_me:4452: checking for dlsym" >&5

 echo $ECHO_N "checking for dlsym... $ECHO_C" >&6
 if test "${ac_cv_func_dlsym+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 echo $ECHO_N "checking for dlsym... $ECHO_C" >&6
 if test "${ac_cv_func_dlsym+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF

-#line 4457 "configure"
+#line 4458 "configure"

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


@@ -4485,16 +4486,16 @@ f = dlsym;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext

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

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

-  echo "$as_me:4491: \$? = $ac_status" >&5
+  echo "$as_me:4492: \$? = $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:4494: \"$ac_try\"") >&5
+  { (eval echo "$as_me:4495: \"$ac_try\"") >&5

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

-  echo "$as_me:4497: \$? = $ac_status" >&5
+  echo "$as_me:4498: \$? = $ac_status" >&5

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


@@ -4504,14 +4505,14 @@ ac_cv_func_dlsym=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi

-echo "$as_me:4507: result: $ac_cv_func_dlsym" >&5
+echo "$as_me:4508: result: $ac_cv_func_dlsym" >&5

 echo "${ECHO_T}$ac_cv_func_dlsym" >&6
 if test $ac_cv_func_dlsym = yes; then
   cf_have_dlsym=yes
 else
 
 cf_have_libdl=no
 echo "${ECHO_T}$ac_cv_func_dlsym" >&6
 if test $ac_cv_func_dlsym = yes; then
   cf_have_dlsym=yes
 else
 
 cf_have_libdl=no

-echo "$as_me:4514: checking for dlsym in -ldl" >&5
+echo "$as_me:4515: checking for dlsym in -ldl" >&5

 echo $ECHO_N "checking for dlsym in -ldl... $ECHO_C" >&6
 if test "${ac_cv_lib_dl_dlsym+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 echo $ECHO_N "checking for dlsym in -ldl... $ECHO_C" >&6
 if test "${ac_cv_lib_dl_dlsym+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6


@@ -4519,7 +4520,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldl  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldl  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF

-#line 4522 "configure"
+#line 4523 "configure"

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


@@ -4538,16 +4539,16 @@ dlsym ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext

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

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

-  echo "$as_me:4544: \$? = $ac_status" >&5
+  echo "$as_me:4545: \$? = $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:4547: \"$ac_try\"") >&5
+  { (eval echo "$as_me:4548: \"$ac_try\"") >&5

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

-  echo "$as_me:4550: \$? = $ac_status" >&5
+  echo "$as_me:4551: \$? = $ac_status" >&5

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


@@ -4558,7 +4559,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi

-echo "$as_me:4561: result: $ac_cv_lib_dl_dlsym" >&5
+echo "$as_me:4562: result: $ac_cv_lib_dl_dlsym" >&5

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


@@ -4571,10 +4572,10 @@ fi
 if test "$cf_have_dlsym" = yes ; then
        test "$cf_have_libdl" = yes && LIBS="-ldl $LIBS"
 
 if test "$cf_have_dlsym" = yes ; then
        test "$cf_have_libdl" = yes && LIBS="-ldl $LIBS"
 

-       echo "$as_me:4574: checking whether able to link to dl*() functions" >&5
+       echo "$as_me:4575: checking whether able to link to dl*() functions" >&5

 echo $ECHO_N "checking whether able to link to dl*() functions... $ECHO_C" >&6
        cat >conftest.$ac_ext <<_ACEOF
 echo $ECHO_N "checking whether able to link to dl*() functions... $ECHO_C" >&6
        cat >conftest.$ac_ext <<_ACEOF

-#line 4577 "configure"
+#line 4578 "configure"

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


@@ -4592,16 +4593,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:4595: \"$ac_link\"") >&5
+if { (eval echo "$as_me:4596: \"$ac_link\"") >&5

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

-  echo "$as_me:4598: \$? = $ac_status" >&5
+  echo "$as_me:4599: \$? = $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:4601: \"$ac_try\"") >&5
+  { (eval echo "$as_me:4602: \"$ac_try\"") >&5

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

-  echo "$as_me:4604: \$? = $ac_status" >&5
+  echo "$as_me:4605: \$? = $ac_status" >&5

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


@@ -4612,15 +4613,15 @@ else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
 
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
 

-               { { echo "$as_me:4615: error: Cannot link test program for libdl" >&5
+               { { echo "$as_me:4616: error: Cannot link test program for libdl" >&5

 echo "$as_me: error: Cannot link test program for libdl" >&2;}
    { (exit 1); exit 1; }; }
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 echo "$as_me: error: Cannot link test program for libdl" >&2;}
    { (exit 1); exit 1; }; }
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext

-       echo "$as_me:4620: result: ok" >&5
+       echo "$as_me:4621: result: ok" >&5

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

-       { { echo "$as_me:4623: error: Cannot find dlsym function" >&5
+       { { echo "$as_me:4624: error: Cannot find dlsym function" >&5

 echo "$as_me: error: Cannot find dlsym function" >&2;}
    { (exit 1); exit 1; }; }
 fi
 echo "$as_me: error: Cannot find dlsym function" >&2;}
    { (exit 1); exit 1; }; }
 fi


@@ -4628,12 +4629,12 @@ fi
                if test "$with_gpm" != yes ; then
                        test -n "$verbose" && echo "    assuming soname for gpm is $with_gpm" 1>&6
 
                if test "$with_gpm" != yes ; then
                        test -n "$verbose" && echo "    assuming soname for gpm is $with_gpm" 1>&6
 

-echo "${as_me-configure}:4631: testing assuming soname for gpm is $with_gpm ..." 1>&5
+echo "${as_me-configure}:4632: testing assuming soname for gpm is $with_gpm ..." 1>&5

 
                        cf_cv_gpm_soname="$with_gpm"
                else
 
 
                        cf_cv_gpm_soname="$with_gpm"
                else
 

-echo "$as_me:4636: checking for soname of gpm library" >&5
+echo "$as_me:4637: checking for soname of gpm library" >&5

 echo $ECHO_N "checking for soname of gpm library... $ECHO_C" >&6
 if test "${cf_cv_gpm_soname+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 echo $ECHO_N "checking for soname of gpm library... $ECHO_C" >&6
 if test "${cf_cv_gpm_soname+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6


@@ -4651,15 +4652,15 @@ if (Gpm_Open(0,0)) Gpm_Close();
 CF_EOF
 cf_save_LIBS="$LIBS"
        LIBS="-lgpm $LIBS"
 CF_EOF
 cf_save_LIBS="$LIBS"
        LIBS="-lgpm $LIBS"

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

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

-  echo "$as_me:4657: \$? = $ac_status" >&5
+  echo "$as_me:4658: \$? = $ac_status" >&5

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

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

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

-  echo "$as_me:4662: \$? = $ac_status" >&5
+  echo "$as_me:4663: \$? = $ac_status" >&5

   (exit $ac_status); } ; then
                        cf_cv_gpm_soname=`ldd conftest$ac_exeext 2>/dev/null | sed -e 's,^.*/,,' -e 's, .*$,,' | fgrep libgpm.`
                        test -z "$cf_cv_gpm_soname" && cf_cv_gpm_soname=unknown
   (exit $ac_status); } ; then
                        cf_cv_gpm_soname=`ldd conftest$ac_exeext 2>/dev/null | sed -e 's,^.*/,,' -e 's, .*$,,' | fgrep libgpm.`
                        test -z "$cf_cv_gpm_soname" && cf_cv_gpm_soname=unknown


@@ -4670,7 +4671,7 @@ LIBS="$cf_save_LIBS"
 fi
 
 fi
 fi
 
 fi

-echo "$as_me:4673: result: $cf_cv_gpm_soname" >&5
+echo "$as_me:4674: result: $cf_cv_gpm_soname" >&5

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


@@ -4686,7 +4687,7 @@ EOF
 #define HAVE_LIBGPM 1
 EOF
 
 #define HAVE_LIBGPM 1
 EOF
 

-echo "$as_me:4689: checking for Gpm_Wgetch in -lgpm" >&5
+echo "$as_me:4690: checking for Gpm_Wgetch in -lgpm" >&5

 echo $ECHO_N "checking for Gpm_Wgetch in -lgpm... $ECHO_C" >&6
 if test "${ac_cv_lib_gpm_Gpm_Wgetch+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 echo $ECHO_N "checking for Gpm_Wgetch in -lgpm... $ECHO_C" >&6
 if test "${ac_cv_lib_gpm_Gpm_Wgetch+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6


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

-#line 4697 "configure"
+#line 4698 "configure"

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


@@ -4713,16 +4714,16 @@ Gpm_Wgetch ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext

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

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

-  echo "$as_me:4719: \$? = $ac_status" >&5
+  echo "$as_me:4720: \$? = $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:4722: \"$ac_try\"") >&5
+  { (eval echo "$as_me:4723: \"$ac_try\"") >&5

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

-  echo "$as_me:4725: \$? = $ac_status" >&5
+  echo "$as_me:4726: \$? = $ac_status" >&5

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


@@ -4733,11 +4734,11 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi

-echo "$as_me:4736: result: $ac_cv_lib_gpm_Gpm_Wgetch" >&5
+echo "$as_me:4737: result: $ac_cv_lib_gpm_Gpm_Wgetch" >&5

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

-echo "$as_me:4740: checking if GPM is weakly bound to curses library" >&5
+echo "$as_me:4741: checking if GPM is weakly bound to curses library" >&5

 echo $ECHO_N "checking if GPM is weakly bound to curses library... $ECHO_C" >&6
 if test "${cf_cv_check_gpm_wgetch+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 echo $ECHO_N "checking if GPM is weakly bound to curses library... $ECHO_C" >&6
 if test "${cf_cv_check_gpm_wgetch+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6


@@ -4761,15 +4762,15 @@ CF_EOF
        # to rely on the static library, noting that some packagers may not
        # include it.
        LIBS="-static -lgpm -dynamic $LIBS"
        # to rely on the static library, noting that some packagers may not
        # include it.
        LIBS="-static -lgpm -dynamic $LIBS"

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

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

-  echo "$as_me:4767: \$? = $ac_status" >&5
+  echo "$as_me:4768: \$? = $ac_status" >&5

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

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

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

-  echo "$as_me:4772: \$? = $ac_status" >&5
+  echo "$as_me:4773: \$? = $ac_status" >&5

   (exit $ac_status); } ; then
                        cf_cv_check_gpm_wgetch=`nm conftest$ac_exeext | egrep '\<wgetch\>' | egrep '\<[vVwW]\>'`
                        test -n "$cf_cv_check_gpm_wgetch" && cf_cv_check_gpm_wgetch=yes
   (exit $ac_status); } ; then
                        cf_cv_check_gpm_wgetch=`nm conftest$ac_exeext | egrep '\<wgetch\>' | egrep '\<[vVwW]\>'`
                        test -n "$cf_cv_check_gpm_wgetch" && cf_cv_check_gpm_wgetch=yes


@@ -4781,11 +4782,11 @@ CF_EOF
 fi
 
 fi
 fi
 
 fi

-echo "$as_me:4784: result: $cf_cv_check_gpm_wgetch" >&5
+echo "$as_me:4785: result: $cf_cv_check_gpm_wgetch" >&5

 echo "${ECHO_T}$cf_cv_check_gpm_wgetch" >&6
 
 if test "$cf_cv_check_gpm_wgetch" != yes ; then
 echo "${ECHO_T}$cf_cv_check_gpm_wgetch" >&6
 
 if test "$cf_cv_check_gpm_wgetch" != yes ; then

-       { echo "$as_me:4788: WARNING: GPM library is already linked with curses - read the FAQ" >&5
+       { echo "$as_me:4789: WARNING: GPM library is already linked with curses - read the FAQ" >&5

 echo "$as_me: WARNING: GPM library is already linked with curses - read the FAQ" >&2;}
 fi
 
 echo "$as_me: WARNING: GPM library is already linked with curses - read the FAQ" >&2;}
 fi
 


@@ -4795,7 +4796,7 @@ fi
 
 # not everyone has "test -c"
 if test -c /dev/sysmouse 2>/dev/null ; then
 
 # not everyone has "test -c"
 if test -c /dev/sysmouse 2>/dev/null ; then

-echo "$as_me:4798: checking if you want to use sysmouse" >&5
+echo "$as_me:4799: checking if you want to use sysmouse" >&5

 echo $ECHO_N "checking if you want to use sysmouse... $ECHO_C" >&6
 
 # Check whether --with-sysmouse or --without-sysmouse was given.
 echo $ECHO_N "checking if you want to use sysmouse... $ECHO_C" >&6
 
 # Check whether --with-sysmouse or --without-sysmouse was given.


@@ -4807,7 +4808,7 @@ else
 fi;
        if test "$cf_with_sysmouse" != no ; then
        cat >conftest.$ac_ext <<_ACEOF
 fi;
        if test "$cf_with_sysmouse" != no ; then
        cat >conftest.$ac_ext <<_ACEOF

-#line 4810 "configure"
+#line 4811 "configure"

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


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

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

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

-  echo "$as_me:4836: \$? = $ac_status" >&5
+  echo "$as_me:4837: \$? = $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:4839: \"$ac_try\"") >&5
+  { (eval echo "$as_me:4840: \"$ac_try\"") >&5

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

-  echo "$as_me:4842: \$? = $ac_status" >&5
+  echo "$as_me:4843: \$? = $ac_status" >&5

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


@@ -4849,7 +4850,7 @@ cf_with_sysmouse=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
        fi
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
        fi

-echo "$as_me:4852: result: $cf_with_sysmouse" >&5
+echo "$as_me:4853: result: $cf_with_sysmouse" >&5

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


@@ -4867,7 +4868,7 @@ if test X"$CXX_G_OPT" = X"" ; then
        test -n "$GXX" && test "${ac_cv_prog_cxx_g}" != yes && CXX_G_OPT=''
 fi
 
        test -n "$GXX" && test "${ac_cv_prog_cxx_g}" != yes && CXX_G_OPT=''
 fi
 

-echo "$as_me:4870: checking for default loader flags" >&5
+echo "$as_me:4871: checking for default loader flags" >&5

 echo $ECHO_N "checking for default loader flags... $ECHO_C" >&6
 case $DFT_LWR_MODEL in
 libtool) LD_MODEL=''   ;;
 echo $ECHO_N "checking for default loader flags... $ECHO_C" >&6
 case $DFT_LWR_MODEL in
 libtool) LD_MODEL=''   ;;


@@ -4876,12 +4877,12 @@ debug)   LD_MODEL=$CC_G_OPT ;;
 profile) LD_MODEL='-pg';;
 shared)  LD_MODEL=''   ;;
 esac
 profile) LD_MODEL='-pg';;
 shared)  LD_MODEL=''   ;;
 esac

-echo "$as_me:4879: result: $LD_MODEL" >&5
+echo "$as_me:4880: result: $LD_MODEL" >&5

 echo "${ECHO_T}$LD_MODEL" >&6
 
 case $DFT_LWR_MODEL in
 shared)
 echo "${ECHO_T}$LD_MODEL" >&6
 
 case $DFT_LWR_MODEL in
 shared)

-echo "$as_me:4884: checking if rpath option should be used" >&5
+echo "$as_me:4885: checking if rpath option should be used" >&5

 echo $ECHO_N "checking if rpath option should be used... $ECHO_C" >&6
 
 # Check whether --enable-rpath or --disable-rpath was given.
 echo $ECHO_N "checking if rpath option should be used... $ECHO_C" >&6
 
 # Check whether --enable-rpath or --disable-rpath was given.


@@ -4891,9 +4892,9 @@ if test "${enable_rpath+set}" = set; then
 else
   cf_cv_ld_rpath=no
 fi;
 else
   cf_cv_ld_rpath=no
 fi;

-echo "$as_me:4894: result: $cf_cv_ld_rpath" >&5
+echo "$as_me:4895: result: $cf_cv_ld_rpath" >&5

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

-echo "$as_me:4896: checking if shared libraries should be relinked during install" >&5
+echo "$as_me:4897: checking if shared libraries should be relinked during install" >&5

 echo $ECHO_N "checking if shared libraries should be relinked during install... $ECHO_C" >&6
 
 # Check whether --enable-relink or --disable-relink was given.
 echo $ECHO_N "checking if shared libraries should be relinked during install... $ECHO_C" >&6
 
 # Check whether --enable-relink or --disable-relink was given.


@@ -4903,7 +4904,7 @@ if test "${enable_relink+set}" = set; then
 else
   cf_cv_do_relink=yes
 fi;
 else
   cf_cv_do_relink=yes
 fi;

-echo "$as_me:4906: result: $cf_cv_do_relink" >&5
+echo "$as_me:4907: result: $cf_cv_do_relink" >&5

 echo "${ECHO_T}$cf_cv_do_relink" >&6
        ;;
 esac
 echo "${ECHO_T}$cf_cv_do_relink" >&6
        ;;
 esac


@@ -4915,7 +4916,7 @@ esac
 
        cf_cv_do_symlinks=no
 
 
        cf_cv_do_symlinks=no
 

-       echo "$as_me:4918: checking if release/abi version should be used for shared libs" >&5
+       echo "$as_me:4919: checking if release/abi version should be used for shared libs" >&5

 echo $ECHO_N "checking if release/abi version should be used for shared libs... $ECHO_C" >&6
 
 # Check whether --with-shlib-version or --without-shlib-version was given.
 echo $ECHO_N "checking if release/abi version should be used for shared libs... $ECHO_C" >&6
 
 # Check whether --with-shlib-version or --without-shlib-version was given.


@@ -4930,7 +4931,7 @@ if test "${with_shlib_version+set}" = set; then
                cf_cv_shlib_version=$withval
                ;;
        *)
                cf_cv_shlib_version=$withval
                ;;
        *)

-               { { echo "$as_me:4933: error: option value must be one of: rel, abi, auto or no" >&5
+               { { echo "$as_me:4934: error: option value must be one of: rel, abi, auto or no" >&5

 echo "$as_me: error: option value must be one of: rel, abi, auto or no" >&2;}
    { (exit 1); exit 1; }; }
                ;;
 echo "$as_me: error: option value must be one of: rel, abi, auto or no" >&2;}
    { (exit 1); exit 1; }; }
                ;;


@@ -4939,7 +4940,7 @@ echo "$as_me: error: option value must be one of: rel, abi, auto or no" >&2;}
 else
   cf_cv_shlib_version=auto
 fi;
 else
   cf_cv_shlib_version=auto
 fi;

-       echo "$as_me:4942: result: $cf_cv_shlib_version" >&5
+       echo "$as_me:4943: result: $cf_cv_shlib_version" >&5

 echo "${ECHO_T}$cf_cv_shlib_version" >&6
 
        cf_cv_rm_so_locs=no
 echo "${ECHO_T}$cf_cv_shlib_version" >&6
 
        cf_cv_rm_so_locs=no


@@ -4948,14 +4949,14 @@ echo "${ECHO_T}$cf_cv_shlib_version" >&6
        CC_SHARED_OPTS=
        if test "$GCC" = yes
        then
        CC_SHARED_OPTS=
        if test "$GCC" = yes
        then

-               echo "$as_me:4951: checking which $CC option to use" >&5
+               echo "$as_me:4952: checking which $CC option to use" >&5

 echo $ECHO_N "checking which $CC option to use... $ECHO_C" >&6
                cf_save_CFLAGS="$CFLAGS"
                for CC_SHARED_OPTS in -fPIC -fpic ''
                do
                        CFLAGS="$cf_save_CFLAGS $CC_SHARED_OPTS"
                        cat >conftest.$ac_ext <<_ACEOF
 echo $ECHO_N "checking which $CC option to use... $ECHO_C" >&6
                cf_save_CFLAGS="$CFLAGS"
                for CC_SHARED_OPTS in -fPIC -fpic ''
                do
                        CFLAGS="$cf_save_CFLAGS $CC_SHARED_OPTS"
                        cat >conftest.$ac_ext <<_ACEOF

-#line 4958 "configure"
+#line 4959 "configure"

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


@@ -4967,16 +4968,16 @@ int x = 1
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

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

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

-  echo "$as_me:4973: \$? = $ac_status" >&5
+  echo "$as_me:4974: \$? = $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:4976: \"$ac_try\"") >&5
+  { (eval echo "$as_me:4977: \"$ac_try\"") >&5

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

-  echo "$as_me:4979: \$? = $ac_status" >&5
+  echo "$as_me:4980: \$? = $ac_status" >&5

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


@@ -4985,7 +4986,7 @@ cat conftest.$ac_ext >&5
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
                done
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
                done

-               echo "$as_me:4988: result: $CC_SHARED_OPTS" >&5
+               echo "$as_me:4989: result: $CC_SHARED_OPTS" >&5

 echo "${ECHO_T}$CC_SHARED_OPTS" >&6
                CFLAGS="$cf_save_CFLAGS"
        fi
 echo "${ECHO_T}$CC_SHARED_OPTS" >&6
                CFLAGS="$cf_save_CFLAGS"
        fi


@@ -5021,7 +5022,7 @@ CF_EOF
                MK_SHARED_LIB='${CC} ${CFLAGS} -dynamiclib -install_name ${libdir}/`basename $@` -compatibility_version ${ABI_VERSION} -current_version ${ABI_VERSION} -o $@'
                test "$cf_cv_shlib_version" = auto && cf_cv_shlib_version=abi
                cf_cv_shlib_version_infix=yes
                MK_SHARED_LIB='${CC} ${CFLAGS} -dynamiclib -install_name ${libdir}/`basename $@` -compatibility_version ${ABI_VERSION} -current_version ${ABI_VERSION} -o $@'
                test "$cf_cv_shlib_version" = auto && cf_cv_shlib_version=abi
                cf_cv_shlib_version_infix=yes

-               echo "$as_me:5024: checking if ld -search_paths_first works" >&5
+               echo "$as_me:5025: checking if ld -search_paths_first works" >&5

 echo $ECHO_N "checking if ld -search_paths_first works... $ECHO_C" >&6
 if test "${cf_cv_ldflags_search_paths_first+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 echo $ECHO_N "checking if ld -search_paths_first works... $ECHO_C" >&6
 if test "${cf_cv_ldflags_search_paths_first+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6


@@ -5030,7 +5031,7 @@ else
                        cf_save_LDFLAGS=$LDFLAGS
                        LDFLAGS="$LDFLAGS -Wl,-search_paths_first"
                        cat >conftest.$ac_ext <<_ACEOF
                        cf_save_LDFLAGS=$LDFLAGS
                        LDFLAGS="$LDFLAGS -Wl,-search_paths_first"
                        cat >conftest.$ac_ext <<_ACEOF

-#line 5033 "configure"
+#line 5034 "configure"

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


@@ -5042,16 +5043,16 @@ int i;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext

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

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

-  echo "$as_me:5048: \$? = $ac_status" >&5
+  echo "$as_me:5049: \$? = $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:5051: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5052: \"$ac_try\"") >&5

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

-  echo "$as_me:5054: \$? = $ac_status" >&5
+  echo "$as_me:5055: \$? = $ac_status" >&5

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


@@ -5062,7 +5063,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
                                LDFLAGS=$cf_save_LDFLAGS
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
                                LDFLAGS=$cf_save_LDFLAGS
 fi

-echo "$as_me:5065: result: $cf_cv_ldflags_search_paths_first" >&5
+echo "$as_me:5066: result: $cf_cv_ldflags_search_paths_first" >&5

 echo "${ECHO_T}$cf_cv_ldflags_search_paths_first" >&6
                if test $cf_cv_ldflags_search_paths_first = yes; then
                        LDFLAGS="$LDFLAGS -Wl,-search_paths_first"
 echo "${ECHO_T}$cf_cv_ldflags_search_paths_first" >&6
                if test $cf_cv_ldflags_search_paths_first = yes; then
                        LDFLAGS="$LDFLAGS -Wl,-search_paths_first"


@@ -5261,7 +5262,7 @@ echo "${ECHO_T}$cf_cv_ldflags_search_paths_first" >&6
                        test "$cf_cv_do_symlinks" = no && cf_cv_do_symlinks=yes
                        ;;
                *)
                        test "$cf_cv_do_symlinks" = no && cf_cv_do_symlinks=yes
                        ;;
                *)

-                       { echo "$as_me:5264: WARNING: ignored --with-shlib-version" >&5
+                       { echo "$as_me:5265: WARNING: ignored --with-shlib-version" >&5

 echo "$as_me: WARNING: ignored --with-shlib-version" >&2;}
                        ;;
                esac
 echo "$as_me: WARNING: ignored --with-shlib-version" >&2;}
                        ;;
                esac


@@ -5269,12 +5270,12 @@ echo "$as_me: WARNING: ignored --with-shlib-version" >&2;}
        esac
 
        if test -n "$cf_ld_rpath_opt" ; then
        esac
 
        if test -n "$cf_ld_rpath_opt" ; then

-               echo "$as_me:5272: checking if we need a space after rpath option" >&5
+               echo "$as_me:5273: checking if we need a space after rpath option" >&5

 echo $ECHO_N "checking if we need a space after rpath option... $ECHO_C" >&6
                cf_save_LIBS="$LIBS"
                LIBS="$LIBS ${cf_ld_rpath_opt}$libdir"
                cat >conftest.$ac_ext <<_ACEOF
 echo $ECHO_N "checking if we need a space after rpath option... $ECHO_C" >&6
                cf_save_LIBS="$LIBS"
                LIBS="$LIBS ${cf_ld_rpath_opt}$libdir"
                cat >conftest.$ac_ext <<_ACEOF

-#line 5277 "configure"
+#line 5278 "configure"

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


@@ -5286,16 +5287,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:5289: \"$ac_link\"") >&5
+if { (eval echo "$as_me:5290: \"$ac_link\"") >&5

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

-  echo "$as_me:5292: \$? = $ac_status" >&5
+  echo "$as_me:5293: \$? = $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:5295: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5296: \"$ac_try\"") >&5

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

-  echo "$as_me:5298: \$? = $ac_status" >&5
+  echo "$as_me:5299: \$? = $ac_status" >&5

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


@@ -5305,7 +5306,7 @@ cf_rpath_space=yes
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
                LIBS="$cf_save_LIBS"
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
                LIBS="$cf_save_LIBS"

-               echo "$as_me:5308: result: $cf_rpath_space" >&5
+               echo "$as_me:5309: result: $cf_rpath_space" >&5

 echo "${ECHO_T}$cf_rpath_space" >&6
                test "$cf_rpath_space" = yes && cf_ld_rpath_opt="$cf_ld_rpath_opt "
                MK_SHARED_LIB="$MK_SHARED_LIB $cf_ld_rpath_opt\${libdir}"
 echo "${ECHO_T}$cf_rpath_space" >&6
                test "$cf_rpath_space" = yes && cf_ld_rpath_opt="$cf_ld_rpath_opt "
                MK_SHARED_LIB="$MK_SHARED_LIB $cf_ld_rpath_opt\${libdir}"


@@ -5314,7 +5315,7 @@ echo "${ECHO_T}$cf_rpath_space" >&6
 if test "$CC_SHARED_OPTS" = "unknown"; then
        for model in $cf_list_models; do
                if test "$model" = "shared"; then
 if test "$CC_SHARED_OPTS" = "unknown"; then
        for model in $cf_list_models; do
                if test "$model" = "shared"; then

-                       { { echo "$as_me:5317: error: Shared libraries are not supported in this version" >&5
+                       { { echo "$as_me:5318: error: Shared libraries are not supported in this version" >&5

 echo "$as_me: error: Shared libraries are not supported in this version" >&2;}
    { (exit 1); exit 1; }; }
                fi
 echo "$as_me: error: Shared libraries are not supported in this version" >&2;}
    { (exit 1); exit 1; }; }
                fi


@@ -5324,7 +5325,7 @@ fi
 ###############################################################################
 
 ###    use option --disable-overwrite to leave out the link to -lcurses
 ###############################################################################
 
 ###    use option --disable-overwrite to leave out the link to -lcurses

-echo "$as_me:5327: checking if you wish to install ncurses overwriting curses" >&5
+echo "$as_me:5328: checking if you wish to install ncurses overwriting curses" >&5

 echo $ECHO_N "checking if you wish to install ncurses overwriting curses... $ECHO_C" >&6
 
 # Check whether --enable-overwrite or --disable-overwrite was given.
 echo $ECHO_N "checking if you wish to install ncurses overwriting curses... $ECHO_C" >&6
 
 # Check whether --enable-overwrite or --disable-overwrite was given.


@@ -5334,10 +5335,10 @@ if test "${enable_overwrite+set}" = set; then
 else
   if test "$prefix" = "/usr" ; then with_overwrite=yes; else with_overwrite=no; fi
 fi;
 else
   if test "$prefix" = "/usr" ; then with_overwrite=yes; else with_overwrite=no; fi
 fi;

-echo "$as_me:5337: result: $with_overwrite" >&5
+echo "$as_me:5338: result: $with_overwrite" >&5

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

-echo "$as_me:5340: checking if external terminfo-database is used" >&5
+echo "$as_me:5341: checking if external terminfo-database is used" >&5

 echo $ECHO_N "checking if external terminfo-database is used... $ECHO_C" >&6
 
 # Check whether --enable-database or --disable-database was given.
 echo $ECHO_N "checking if external terminfo-database is used... $ECHO_C" >&6
 
 # Check whether --enable-database or --disable-database was given.


@@ -5347,7 +5348,7 @@ if test "${enable_database+set}" = set; then
 else
   use_database=yes
 fi;
 else
   use_database=yes
 fi;

-echo "$as_me:5350: result: $use_database" >&5
+echo "$as_me:5351: result: $use_database" >&5

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


@@ -5369,7 +5370,7 @@ if test "$use_database" != no ; then
 #define USE_DATABASE 1
 EOF
 
 #define USE_DATABASE 1
 EOF
 

-       echo "$as_me:5372: checking which terminfo source-file will be installed" >&5
+       echo "$as_me:5373: checking which terminfo source-file will be installed" >&5

 echo $ECHO_N "checking which terminfo source-file will be installed... $ECHO_C" >&6
 
 # Check whether --enable-database or --disable-database was given.
 echo $ECHO_N "checking which terminfo source-file will be installed... $ECHO_C" >&6
 
 # Check whether --enable-database or --disable-database was given.


@@ -5377,10 +5378,10 @@ if test "${enable_database+set}" = set; then
   enableval="$enable_database"
   TERMINFO_SRC=$withval
 fi;
   enableval="$enable_database"
   TERMINFO_SRC=$withval
 fi;

-       echo "$as_me:5380: result: $TERMINFO_SRC" >&5
+       echo "$as_me:5381: result: $TERMINFO_SRC" >&5

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

-       echo "$as_me:5383: checking whether to use hashed database instead of directory/tree" >&5
+       echo "$as_me:5384: checking whether to use hashed database instead of directory/tree" >&5

 echo $ECHO_N "checking whether to use hashed database instead of directory/tree... $ECHO_C" >&6
 
 # Check whether --with-hashed-db or --without-hashed-db was given.
 echo $ECHO_N "checking whether to use hashed database instead of directory/tree... $ECHO_C" >&6
 
 # Check whether --with-hashed-db or --without-hashed-db was given.


@@ -5390,11 +5391,11 @@ if test "${with_hashed_db+set}" = set; then
 else
   with_hashed_db=no
 fi;
 else
   with_hashed_db=no
 fi;

-       echo "$as_me:5393: result: $with_hashed_db" >&5
+       echo "$as_me:5394: result: $with_hashed_db" >&5

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

-echo "$as_me:5397: checking for list of fallback descriptions" >&5
+echo "$as_me:5398: checking for list of fallback descriptions" >&5

 echo $ECHO_N "checking for list of fallback descriptions... $ECHO_C" >&6
 
 # Check whether --with-fallbacks or --without-fallbacks was given.
 echo $ECHO_N "checking for list of fallback descriptions... $ECHO_C" >&6
 
 # Check whether --with-fallbacks or --without-fallbacks was given.


@@ -5404,11 +5405,11 @@ if test "${with_fallbacks+set}" = set; then
 else
   with_fallback=
 fi;
 else
   with_fallback=
 fi;

-echo "$as_me:5407: result: $with_fallback" >&5
+echo "$as_me:5408: result: $with_fallback" >&5

 echo "${ECHO_T}$with_fallback" >&6
 FALLBACK_LIST=`echo "$with_fallback" | sed -e 's/,/ /g'`
 
 echo "${ECHO_T}$with_fallback" >&6
 FALLBACK_LIST=`echo "$with_fallback" | sed -e 's/,/ /g'`
 

-echo "$as_me:5411: checking if you want modern xterm or antique" >&5
+echo "$as_me:5412: checking if you want modern xterm or antique" >&5

 echo $ECHO_N "checking if you want modern xterm or antique... $ECHO_C" >&6
 
 # Check whether --with-xterm-new or --without-xterm-new was given.
 echo $ECHO_N "checking if you want modern xterm or antique... $ECHO_C" >&6
 
 # Check whether --with-xterm-new or --without-xterm-new was given.


@@ -5422,7 +5423,7 @@ case $with_xterm_new in
 no)    with_xterm_new=xterm-old;;
 *)     with_xterm_new=xterm-new;;
 esac
 no)    with_xterm_new=xterm-old;;
 *)     with_xterm_new=xterm-new;;
 esac

-echo "$as_me:5425: result: $with_xterm_new" >&5
+echo "$as_me:5426: result: $with_xterm_new" >&5

 echo "${ECHO_T}$with_xterm_new" >&6
 WHICH_XTERM=$with_xterm_new
 
 echo "${ECHO_T}$with_xterm_new" >&6
 WHICH_XTERM=$with_xterm_new
 


@@ -5432,7 +5433,7 @@ if test "$use_database" = no ; then
        MAKE_TERMINFO="#"
 else
 
        MAKE_TERMINFO="#"
 else
 

-echo "$as_me:5435: checking for list of terminfo directories" >&5
+echo "$as_me:5436: checking for list of terminfo directories" >&5

 echo $ECHO_N "checking for list of terminfo directories... $ECHO_C" >&6
 
 # Check whether --with-terminfo-dirs or --without-terminfo-dirs was given.
 echo $ECHO_N "checking for list of terminfo directories... $ECHO_C" >&6
 
 # Check whether --with-terminfo-dirs or --without-terminfo-dirs was given.


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

-  { { echo "$as_me:5475: error: expected a pathname, not \"$cf_src_path\"" >&5
+  { { echo "$as_me:5476: error: expected a pathname, not \"$cf_src_path\"" >&5

 echo "$as_me: error: expected a pathname, not \"$cf_src_path\"" >&2;}
    { (exit 1); exit 1; }; }
   ;;
 echo "$as_me: error: expected a pathname, not \"$cf_src_path\"" >&2;}
    { (exit 1); exit 1; }; }
   ;;


@@ -5485,13 +5486,13 @@ IFS="$ac_save_ifs"
 
 eval 'TERMINFO_DIRS="$cf_dst_path"'
 
 
 eval 'TERMINFO_DIRS="$cf_dst_path"'
 

-echo "$as_me:5488: result: $TERMINFO_DIRS" >&5
+echo "$as_me:5489: result: $TERMINFO_DIRS" >&5

 echo "${ECHO_T}$TERMINFO_DIRS" >&6
 test -n "$TERMINFO_DIRS" && cat >>confdefs.h <<EOF
 #define TERMINFO_DIRS "$TERMINFO_DIRS"
 EOF
 
 echo "${ECHO_T}$TERMINFO_DIRS" >&6
 test -n "$TERMINFO_DIRS" && cat >>confdefs.h <<EOF
 #define TERMINFO_DIRS "$TERMINFO_DIRS"
 EOF
 

-echo "$as_me:5494: checking for default terminfo directory" >&5
+echo "$as_me:5495: checking for default terminfo directory" >&5

 echo $ECHO_N "checking for default terminfo directory... $ECHO_C" >&6
 
 # Check whether --with-default-terminfo-dir or --without-default-terminfo-dir was given.
 echo $ECHO_N "checking for default terminfo directory... $ECHO_C" >&6
 
 # Check whether --with-default-terminfo-dir or --without-default-terminfo-dir was given.


@@ -5527,7 +5528,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:5530: error: expected a pathname, not \"$withval\"" >&5
+  { { echo "$as_me:5531: 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; }; }
   ;;


@@ -5536,7 +5537,7 @@ esac
 fi
 TERMINFO="$withval"
 
 fi
 TERMINFO="$withval"
 

-echo "$as_me:5539: result: $TERMINFO" >&5
+echo "$as_me:5540: result: $TERMINFO" >&5

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


@@ -5546,7 +5547,7 @@ fi
 
 ###    use option --disable-big-core to make tic run on small machines
 ###    We need 4Mb, check if we can allocate 50% more than that.
 
 ###    use option --disable-big-core to make tic run on small machines
 ###    We need 4Mb, check if we can allocate 50% more than that.

-echo "$as_me:5549: checking if big-core option selected" >&5
+echo "$as_me:5550: checking if big-core option selected" >&5

 echo $ECHO_N "checking if big-core option selected... $ECHO_C" >&6
 
 # Check whether --enable-big-core or --disable-big-core was given.
 echo $ECHO_N "checking if big-core option selected... $ECHO_C" >&6
 
 # Check whether --enable-big-core or --disable-big-core was given.


@@ -5558,7 +5559,7 @@ else
   with_big_core=no
 else
   cat >conftest.$ac_ext <<_ACEOF
   with_big_core=no
 else
   cat >conftest.$ac_ext <<_ACEOF

-#line 5561 "configure"
+#line 5562 "configure"

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


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

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

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

-  echo "$as_me:5578: \$? = $ac_status" >&5
+  echo "$as_me:5579: \$? = $ac_status" >&5

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

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

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

-  echo "$as_me:5583: \$? = $ac_status" >&5
+  echo "$as_me:5584: \$? = $ac_status" >&5

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


@@ -5592,7 +5593,7 @@ fi
 rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 fi;
 rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 fi;

-echo "$as_me:5595: result: $with_big_core" >&5
+echo "$as_me:5596: result: $with_big_core" >&5

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


@@ -5600,7 +5601,7 @@ EOF
 
 ### ISO C only guarantees 512-char strings, we have tables which load faster
 ### when constructed using "big" strings.
 
 ### ISO C only guarantees 512-char strings, we have tables which load faster
 ### when constructed using "big" strings.

-echo "$as_me:5603: checking if big-strings option selected" >&5
+echo "$as_me:5604: checking if big-strings option selected" >&5

 echo $ECHO_N "checking if big-strings option selected... $ECHO_C" >&6
 
 # Check whether --enable-big-strings or --disable-big-strings was given.
 echo $ECHO_N "checking if big-strings option selected... $ECHO_C" >&6
 
 # Check whether --enable-big-strings or --disable-big-strings was given.


@@ -5610,14 +5611,14 @@ if test "${enable_big_strings+set}" = set; then
 else
   with_big_strings=yes
 fi;
 else
   with_big_strings=yes
 fi;

-echo "$as_me:5613: result: $with_big_strings" >&5
+echo "$as_me:5614: result: $with_big_strings" >&5

 echo "${ECHO_T}$with_big_strings" >&6
 
 USE_BIG_STRINGS=0
 test "$with_big_strings" = "yes" && USE_BIG_STRINGS=1
 
 ###    use option --enable-termcap to compile in the termcap fallback support
 echo "${ECHO_T}$with_big_strings" >&6
 
 USE_BIG_STRINGS=0
 test "$with_big_strings" = "yes" && USE_BIG_STRINGS=1
 
 ###    use option --enable-termcap to compile in the termcap fallback support

-echo "$as_me:5620: checking if you want termcap-fallback support" >&5
+echo "$as_me:5621: checking if you want termcap-fallback support" >&5

 echo $ECHO_N "checking if you want termcap-fallback support... $ECHO_C" >&6
 
 # Check whether --enable-termcap or --disable-termcap was given.
 echo $ECHO_N "checking if you want termcap-fallback support... $ECHO_C" >&6
 
 # Check whether --enable-termcap or --disable-termcap was given.


@@ -5627,13 +5628,13 @@ if test "${enable_termcap+set}" = set; then
 else
   with_termcap=no
 fi;
 else
   with_termcap=no
 fi;

-echo "$as_me:5630: result: $with_termcap" >&5
+echo "$as_me:5631: result: $with_termcap" >&5

 echo "${ECHO_T}$with_termcap" >&6
 
 if test "$with_termcap" != "yes" ; then
        if test "$use_database" = no ; then
                if test -z "$with_fallback" ; then
 echo "${ECHO_T}$with_termcap" >&6
 
 if test "$with_termcap" != "yes" ; then
        if test "$use_database" = no ; then
                if test -z "$with_fallback" ; then

-                       { { echo "$as_me:5636: error: You have disabled the database w/o specifying fallbacks" >&5
+                       { { echo "$as_me:5637: error: You have disabled the database w/o specifying fallbacks" >&5

 echo "$as_me: error: You have disabled the database w/o specifying fallbacks" >&2;}
    { (exit 1); exit 1; }; }
                fi
 echo "$as_me: error: You have disabled the database w/o specifying fallbacks" >&2;}
    { (exit 1); exit 1; }; }
                fi


@@ -5645,7 +5646,7 @@ EOF
 else
 
 if test "$with_ticlib" != no ; then
 else
 
 if test "$with_ticlib" != no ; then

-       { { echo "$as_me:5648: error: Options --with-ticlib and --enable-termcap cannot be combined" >&5
+       { { echo "$as_me:5649: error: Options --with-ticlib and --enable-termcap cannot be combined" >&5

 echo "$as_me: error: Options --with-ticlib and --enable-termcap cannot be combined" >&2;}
    { (exit 1); exit 1; }; }
 fi
 echo "$as_me: error: Options --with-ticlib and --enable-termcap cannot be combined" >&2;}
    { (exit 1); exit 1; }; }
 fi


@@ -5654,7 +5655,7 @@ cat >>confdefs.h <<\EOF
 #define USE_TERMCAP 1
 EOF
 
 #define USE_TERMCAP 1
 EOF
 

-echo "$as_me:5657: checking for list of termcap files" >&5
+echo "$as_me:5658: checking for list of termcap files" >&5

 echo $ECHO_N "checking for list of termcap files... $ECHO_C" >&6
 
 # Check whether --with-termpath or --without-termpath was given.
 echo $ECHO_N "checking for list of termcap files... $ECHO_C" >&6
 
 # Check whether --with-termpath or --without-termpath was given.


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

-  { { echo "$as_me:5697: error: expected a pathname, not \"$cf_src_path\"" >&5
+  { { echo "$as_me:5698: error: expected a pathname, not \"$cf_src_path\"" >&5

 echo "$as_me: error: expected a pathname, not \"$cf_src_path\"" >&2;}
    { (exit 1); exit 1; }; }
   ;;
 echo "$as_me: error: expected a pathname, not \"$cf_src_path\"" >&2;}
    { (exit 1); exit 1; }; }
   ;;


@@ -5707,14 +5708,14 @@ IFS="$ac_save_ifs"
 
 eval 'TERMPATH="$cf_dst_path"'
 
 
 eval 'TERMPATH="$cf_dst_path"'
 

-echo "$as_me:5710: result: $TERMPATH" >&5
+echo "$as_me:5711: result: $TERMPATH" >&5

 echo "${ECHO_T}$TERMPATH" >&6
 test -n "$TERMPATH" && cat >>confdefs.h <<EOF
 #define TERMPATH "$TERMPATH"
 EOF
 
 ###    use option --enable-getcap to use a hacked getcap for reading termcaps
 echo "${ECHO_T}$TERMPATH" >&6
 test -n "$TERMPATH" && cat >>confdefs.h <<EOF
 #define TERMPATH "$TERMPATH"
 EOF
 
 ###    use option --enable-getcap to use a hacked getcap for reading termcaps

-echo "$as_me:5717: checking if fast termcap-loader is needed" >&5
+echo "$as_me:5718: checking if fast termcap-loader is needed" >&5

 echo $ECHO_N "checking if fast termcap-loader is needed... $ECHO_C" >&6
 
 # Check whether --enable-getcap or --disable-getcap was given.
 echo $ECHO_N "checking if fast termcap-loader is needed... $ECHO_C" >&6
 
 # Check whether --enable-getcap or --disable-getcap was given.


@@ -5724,13 +5725,13 @@ if test "${enable_getcap+set}" = set; then
 else
   with_getcap=no
 fi;
 else
   with_getcap=no
 fi;

-echo "$as_me:5727: result: $with_getcap" >&5
+echo "$as_me:5728: result: $with_getcap" >&5

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

-echo "$as_me:5733: checking if translated termcaps will be cached in ~/.terminfo" >&5
+echo "$as_me:5734: checking if translated termcaps will be cached in ~/.terminfo" >&5

 echo $ECHO_N "checking if translated termcaps will be cached in ~/.terminfo... $ECHO_C" >&6
 
 # Check whether --enable-getcap-cache or --disable-getcap-cache was given.
 echo $ECHO_N "checking if translated termcaps will be cached in ~/.terminfo... $ECHO_C" >&6
 
 # Check whether --enable-getcap-cache or --disable-getcap-cache was given.


@@ -5740,7 +5741,7 @@ if test "${enable_getcap_cache+set}" = set; then
 else
   with_getcap_cache=no
 fi;
 else
   with_getcap_cache=no
 fi;

-echo "$as_me:5743: result: $with_getcap_cache" >&5
+echo "$as_me:5744: result: $with_getcap_cache" >&5

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


@@ -5749,7 +5750,7 @@ EOF
 fi
 
 ###   Use option --disable-home-terminfo to completely remove ~/.terminfo
 fi
 
 ###   Use option --disable-home-terminfo to completely remove ~/.terminfo

-echo "$as_me:5752: checking if ~/.terminfo is wanted" >&5
+echo "$as_me:5753: checking if ~/.terminfo is wanted" >&5

 echo $ECHO_N "checking if ~/.terminfo is wanted... $ECHO_C" >&6
 
 # Check whether --enable-home-terminfo or --disable-home-terminfo was given.
 echo $ECHO_N "checking if ~/.terminfo is wanted... $ECHO_C" >&6
 
 # Check whether --enable-home-terminfo or --disable-home-terminfo was given.


@@ -5759,13 +5760,13 @@ if test "${enable_home_terminfo+set}" = set; then
 else
   with_home_terminfo=yes
 fi;
 else
   with_home_terminfo=yes
 fi;

-echo "$as_me:5762: result: $with_home_terminfo" >&5
+echo "$as_me:5763: result: $with_home_terminfo" >&5

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

-echo "$as_me:5768: checking if you want to use restricted environment when running as root" >&5
+echo "$as_me:5769: checking if you want to use restricted environment when running as root" >&5

 echo $ECHO_N "checking if you want to use restricted environment when running as root... $ECHO_C" >&6
 
 # Check whether --enable-root-environ or --disable-root-environ was given.
 echo $ECHO_N "checking if you want to use restricted environment when running as root... $ECHO_C" >&6
 
 # Check whether --enable-root-environ or --disable-root-environ was given.


@@ -5775,7 +5776,7 @@ if test "${enable_root_environ+set}" = set; then
 else
   with_root_environ=yes
 fi;
 else
   with_root_environ=yes
 fi;

-echo "$as_me:5778: result: $with_root_environ" >&5
+echo "$as_me:5779: result: $with_root_environ" >&5

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


@@ -5789,13 +5790,13 @@ for ac_func in \
        unlink
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
        unlink
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`

-echo "$as_me:5792: checking for $ac_func" >&5
+echo "$as_me:5793: checking for $ac_func" >&5

 echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
 if eval "test \"\${$as_ac_var+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
 if eval "test \"\${$as_ac_var+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF

-#line 5798 "configure"
+#line 5799 "configure"

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


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

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

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

-  echo "$as_me:5832: \$? = $ac_status" >&5
+  echo "$as_me:5833: \$? = $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:5835: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5836: \"$ac_try\"") >&5

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

-  echo "$as_me:5838: \$? = $ac_status" >&5
+  echo "$as_me:5839: \$? = $ac_status" >&5

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


@@ -5845,7 +5846,7 @@ eval "$as_ac_var=no"
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi

-echo "$as_me:5848: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "$as_me:5849: result: `eval echo '${'$as_ac_var'}'`" >&5

 echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
 if test `eval echo '${'$as_ac_var'}'` = yes; then
   cat >>confdefs.h <<EOF
 echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
 if test `eval echo '${'$as_ac_var'}'` = yes; then
   cat >>confdefs.h <<EOF


@@ -5862,13 +5863,13 @@ for ac_func in \
                symlink
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
                symlink
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`

-echo "$as_me:5865: checking for $ac_func" >&5
+echo "$as_me:5866: checking for $ac_func" >&5

 echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
 if eval "test \"\${$as_ac_var+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
 if eval "test \"\${$as_ac_var+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF

-#line 5871 "configure"
+#line 5872 "configure"

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


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

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

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

-  echo "$as_me:5905: \$? = $ac_status" >&5
+  echo "$as_me:5906: \$? = $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:5908: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5909: \"$ac_try\"") >&5

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

-  echo "$as_me:5911: \$? = $ac_status" >&5
+  echo "$as_me:5912: \$? = $ac_status" >&5

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


@@ -5918,7 +5919,7 @@ eval "$as_ac_var=no"
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi

-echo "$as_me:5921: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "$as_me:5922: result: `eval echo '${'$as_ac_var'}'`" >&5

 echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
 if test `eval echo '${'$as_ac_var'}'` = yes; then
   cat >>confdefs.h <<EOF
 echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
 if test `eval echo '${'$as_ac_var'}'` = yes; then
   cat >>confdefs.h <<EOF


@@ -5929,7 +5930,7 @@ fi
 done
 
 else
 done
 
 else

-       echo "$as_me:5932: checking if link/symlink functions work" >&5
+       echo "$as_me:5933: checking if link/symlink functions work" >&5

 echo $ECHO_N "checking if link/symlink functions work... $ECHO_C" >&6
 if test "${cf_cv_link_funcs+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 echo $ECHO_N "checking if link/symlink functions work... $ECHO_C" >&6
 if test "${cf_cv_link_funcs+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6


@@ -5942,7 +5943,7 @@ else
                        eval 'ac_cv_func_'$cf_func'=error'
 else
   cat >conftest.$ac_ext <<_ACEOF
                        eval 'ac_cv_func_'$cf_func'=error'
 else
   cat >conftest.$ac_ext <<_ACEOF

-#line 5945 "configure"
+#line 5946 "configure"

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


@@ -5972,15 +5973,15 @@ int main()
 
 _ACEOF
 rm -f conftest$ac_exeext
 
 _ACEOF
 rm -f conftest$ac_exeext

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

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

-  echo "$as_me:5978: \$? = $ac_status" >&5
+  echo "$as_me:5979: \$? = $ac_status" >&5

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

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

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

-  echo "$as_me:5983: \$? = $ac_status" >&5
+  echo "$as_me:5984: \$? = $ac_status" >&5

   (exit $ac_status); }; }; then
 
                        cf_cv_link_funcs="$cf_cv_link_funcs $cf_func"
   (exit $ac_status); }; }; then
 
                        cf_cv_link_funcs="$cf_cv_link_funcs $cf_func"


@@ -5998,7 +5999,7 @@ fi
                test -z "$cf_cv_link_funcs" && cf_cv_link_funcs=no
 
 fi
                test -z "$cf_cv_link_funcs" && cf_cv_link_funcs=no
 
 fi

-echo "$as_me:6001: result: $cf_cv_link_funcs" >&5
+echo "$as_me:6002: result: $cf_cv_link_funcs" >&5

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


@@ -6016,7 +6017,7 @@ with_symlinks=no
 # soft links (symbolic links) are useful for some systems where hard links do
 # not work, or to make it simpler to copy terminfo trees around.
 if test "$ac_cv_func_symlink" = yes ; then
 # soft links (symbolic links) are useful for some systems where hard links do
 # not work, or to make it simpler to copy terminfo trees around.
 if test "$ac_cv_func_symlink" = yes ; then

-    echo "$as_me:6019: checking if tic should use symbolic links" >&5
+    echo "$as_me:6020: checking if tic should use symbolic links" >&5

 echo $ECHO_N "checking if tic should use symbolic links... $ECHO_C" >&6
 
 # Check whether --enable-symlinks or --disable-symlinks was given.
 echo $ECHO_N "checking if tic should use symbolic links... $ECHO_C" >&6
 
 # Check whether --enable-symlinks or --disable-symlinks was given.


@@ -6026,21 +6027,21 @@ if test "${enable_symlinks+set}" = set; then
 else
   with_symlinks=no
 fi;
 else
   with_symlinks=no
 fi;

-    echo "$as_me:6029: result: $with_symlinks" >&5
+    echo "$as_me:6030: result: $with_symlinks" >&5

 echo "${ECHO_T}$with_symlinks" >&6
 fi
 
 # If we have hard links and did not choose to use soft links instead, there is
 # no reason to make this choice optional - use the hard links.
 if test "$with_symlinks" = no ; then
 echo "${ECHO_T}$with_symlinks" >&6
 fi
 
 # If we have hard links and did not choose to use soft links instead, there is
 # no reason to make this choice optional - use the hard links.
 if test "$with_symlinks" = no ; then

-    echo "$as_me:6036: checking if tic should use hard links" >&5
+    echo "$as_me:6037: checking if tic should use hard links" >&5

 echo $ECHO_N "checking if tic should use hard links... $ECHO_C" >&6
     if test "$ac_cv_func_link" = yes ; then
        with_links=yes
     else
        with_links=no
     fi
 echo $ECHO_N "checking if tic should use hard links... $ECHO_C" >&6
     if test "$ac_cv_func_link" = yes ; then
        with_links=yes
     else
        with_links=no
     fi

-    echo "$as_me:6043: result: $with_links" >&5
+    echo "$as_me:6044: result: $with_links" >&5

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


@@ -6053,7 +6054,7 @@ test "$with_symlinks" = yes && cat >>confdefs.h <<\EOF
 EOF
 
 ###   use option --enable-broken-linker to force on use of broken-linker support
 EOF
 
 ###   use option --enable-broken-linker to force on use of broken-linker support

-echo "$as_me:6056: checking if you want broken-linker support code" >&5
+echo "$as_me:6057: checking if you want broken-linker support code" >&5

 echo $ECHO_N "checking if you want broken-linker support code... $ECHO_C" >&6
 
 # Check whether --enable-broken_linker or --disable-broken_linker was given.
 echo $ECHO_N "checking if you want broken-linker support code... $ECHO_C" >&6
 
 # Check whether --enable-broken_linker or --disable-broken_linker was given.


@@ -6063,7 +6064,7 @@ if test "${enable_broken_linker+set}" = set; then
 else
   with_broken_linker=${BROKEN_LINKER-no}
 fi;
 else
   with_broken_linker=${BROKEN_LINKER-no}
 fi;

-echo "$as_me:6066: result: $with_broken_linker" >&5
+echo "$as_me:6067: result: $with_broken_linker" >&5

 echo "${ECHO_T}$with_broken_linker" >&6
 
 BROKEN_LINKER=0
 echo "${ECHO_T}$with_broken_linker" >&6
 
 BROKEN_LINKER=0


@@ -6083,14 +6084,14 @@ EOF
                BROKEN_LINKER=1
                test -n "$verbose" && echo "    cygwin linker is broken anyway" 1>&6
 
                BROKEN_LINKER=1
                test -n "$verbose" && echo "    cygwin linker is broken anyway" 1>&6
 

-echo "${as_me-configure}:6086: testing cygwin linker is broken anyway ..." 1>&5
+echo "${as_me-configure}:6087: testing cygwin linker is broken anyway ..." 1>&5

 
                ;;
        esac
 fi
 
 ###   use option --enable-bsdpad to have tputs process BSD-style prefix padding
 
                ;;
        esac
 fi
 
 ###   use option --enable-bsdpad to have tputs process BSD-style prefix padding

-echo "$as_me:6093: checking if tputs should process BSD-style prefix padding" >&5
+echo "$as_me:6094: checking if tputs should process BSD-style prefix padding" >&5

 echo $ECHO_N "checking if tputs should process BSD-style prefix padding... $ECHO_C" >&6
 
 # Check whether --enable-bsdpad or --disable-bsdpad was given.
 echo $ECHO_N "checking if tputs should process BSD-style prefix padding... $ECHO_C" >&6
 
 # Check whether --enable-bsdpad or --disable-bsdpad was given.


@@ -6100,7 +6101,7 @@ if test "${enable_bsdpad+set}" = set; then
 else
   with_bsdpad=no
 fi;
 else
   with_bsdpad=no
 fi;

-echo "$as_me:6103: result: $with_bsdpad" >&5
+echo "$as_me:6104: result: $with_bsdpad" >&5

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


@@ -6117,7 +6118,7 @@ NCURSES_WINT_T=0
 
 # Check to define _XOPEN_SOURCE "automatically"
 
 
 # Check to define _XOPEN_SOURCE "automatically"
 

-echo "$as_me:6120: checking if $CC -U and -D options work together" >&5
+echo "$as_me:6121: checking if $CC -U and -D options work together" >&5

 echo $ECHO_N "checking if $CC -U and -D options work together... $ECHO_C" >&6
 if test "${cf_cv_cc_u_d_options+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 echo $ECHO_N "checking if $CC -U and -D options work together... $ECHO_C" >&6
 if test "${cf_cv_cc_u_d_options+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6


@@ -6126,7 +6127,7 @@ else
        cf_save_CPPFLAGS="$CPPFLAGS"
        CPPFLAGS="-UU_D_OPTIONS -DU_D_OPTIONS -DD_U_OPTIONS -UD_U_OPTIONS"
        cat >conftest.$ac_ext <<_ACEOF
        cf_save_CPPFLAGS="$CPPFLAGS"
        CPPFLAGS="-UU_D_OPTIONS -DU_D_OPTIONS -DD_U_OPTIONS -UD_U_OPTIONS"
        cat >conftest.$ac_ext <<_ACEOF

-#line 6129 "configure"
+#line 6130 "configure"

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


@@ -6145,16 +6146,16 @@ make a defined-error
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

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

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

-  echo "$as_me:6151: \$? = $ac_status" >&5
+  echo "$as_me:6152: \$? = $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:6154: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6155: \"$ac_try\"") >&5

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

-  echo "$as_me:6157: \$? = $ac_status" >&5
+  echo "$as_me:6158: \$? = $ac_status" >&5

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


@@ -6168,7 +6169,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
        CPPFLAGS="$cf_save_CPPFLAGS"
 
 fi
        CPPFLAGS="$cf_save_CPPFLAGS"
 
 fi

-echo "$as_me:6171: result: $cf_cv_cc_u_d_options" >&5
+echo "$as_me:6172: result: $cf_cv_cc_u_d_options" >&5

 echo "${ECHO_T}$cf_cv_cc_u_d_options" >&6
 
 cf_XOPEN_SOURCE=500
 echo "${ECHO_T}$cf_cv_cc_u_d_options" >&6
 
 cf_XOPEN_SOURCE=500


@@ -6194,14 +6195,14 @@ irix[56].*) #(vi
        ;;
 linux*|gnu*|k*bsd*-gnu) #(vi
 
        ;;
 linux*|gnu*|k*bsd*-gnu) #(vi
 

-echo "$as_me:6197: checking if we must define _GNU_SOURCE" >&5
+echo "$as_me:6198: checking if we must define _GNU_SOURCE" >&5

 echo $ECHO_N "checking if we must define _GNU_SOURCE... $ECHO_C" >&6
 if test "${cf_cv_gnu_source+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 cat >conftest.$ac_ext <<_ACEOF
 echo $ECHO_N "checking if we must define _GNU_SOURCE... $ECHO_C" >&6
 if test "${cf_cv_gnu_source+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 cat >conftest.$ac_ext <<_ACEOF

-#line 6204 "configure"
+#line 6205 "configure"

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


@@ -6216,16 +6217,16 @@ make an error
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

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

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

-  echo "$as_me:6222: \$? = $ac_status" >&5
+  echo "$as_me:6223: \$? = $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:6225: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6226: \"$ac_try\"") >&5

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

-  echo "$as_me:6228: \$? = $ac_status" >&5
+  echo "$as_me:6229: \$? = $ac_status" >&5

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


@@ -6234,7 +6235,7 @@ cat conftest.$ac_ext >&5
 cf_save="$CPPFLAGS"
         CPPFLAGS="$CPPFLAGS -D_GNU_SOURCE"
         cat >conftest.$ac_ext <<_ACEOF
 cf_save="$CPPFLAGS"
         CPPFLAGS="$CPPFLAGS -D_GNU_SOURCE"
         cat >conftest.$ac_ext <<_ACEOF

-#line 6237 "configure"
+#line 6238 "configure"

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


@@ -6249,16 +6250,16 @@ make an error
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

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

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

-  echo "$as_me:6255: \$? = $ac_status" >&5
+  echo "$as_me:6256: \$? = $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:6258: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6259: \"$ac_try\"") >&5

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

-  echo "$as_me:6261: \$? = $ac_status" >&5
+  echo "$as_me:6262: \$? = $ac_status" >&5

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


@@ -6273,7 +6274,7 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi

-echo "$as_me:6276: result: $cf_cv_gnu_source" >&5
+echo "$as_me:6277: result: $cf_cv_gnu_source" >&5

 echo "${ECHO_T}$cf_cv_gnu_source" >&6
 test "$cf_cv_gnu_source" = yes && CPPFLAGS="$CPPFLAGS -D_GNU_SOURCE"
 
 echo "${ECHO_T}$cf_cv_gnu_source" >&6
 test "$cf_cv_gnu_source" = yes && CPPFLAGS="$CPPFLAGS -D_GNU_SOURCE"
 


@@ -6300,14 +6301,14 @@ solaris*) #(vi
        CPPFLAGS="$CPPFLAGS -D__EXTENSIONS__"
        ;;
 *)
        CPPFLAGS="$CPPFLAGS -D__EXTENSIONS__"
        ;;
 *)

-       echo "$as_me:6303: checking if we should define _XOPEN_SOURCE" >&5
+       echo "$as_me:6304: checking if we should define _XOPEN_SOURCE" >&5

 echo $ECHO_N "checking if we should define _XOPEN_SOURCE... $ECHO_C" >&6
 if test "${cf_cv_xopen_source+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
        cat >conftest.$ac_ext <<_ACEOF
 echo $ECHO_N "checking if we should define _XOPEN_SOURCE... $ECHO_C" >&6
 if test "${cf_cv_xopen_source+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
        cat >conftest.$ac_ext <<_ACEOF

-#line 6310 "configure"
+#line 6311 "configure"

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


@@ -6322,16 +6323,16 @@ make an error
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

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

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

-  echo "$as_me:6328: \$? = $ac_status" >&5
+  echo "$as_me:6329: \$? = $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:6331: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6332: \"$ac_try\"") >&5

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

-  echo "$as_me:6334: \$? = $ac_status" >&5
+  echo "$as_me:6335: \$? = $ac_status" >&5

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


@@ -6340,7 +6341,7 @@ cat conftest.$ac_ext >&5
 cf_save="$CPPFLAGS"
         CPPFLAGS="$CPPFLAGS -D_XOPEN_SOURCE=$cf_XOPEN_SOURCE"
         cat >conftest.$ac_ext <<_ACEOF
 cf_save="$CPPFLAGS"
         CPPFLAGS="$CPPFLAGS -D_XOPEN_SOURCE=$cf_XOPEN_SOURCE"
         cat >conftest.$ac_ext <<_ACEOF

-#line 6343 "configure"
+#line 6344 "configure"

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


@@ -6355,16 +6356,16 @@ make an error
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

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

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

-  echo "$as_me:6361: \$? = $ac_status" >&5
+  echo "$as_me:6362: \$? = $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:6364: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6365: \"$ac_try\"") >&5

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

-  echo "$as_me:6367: \$? = $ac_status" >&5
+  echo "$as_me:6368: \$? = $ac_status" >&5

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


@@ -6379,7 +6380,7 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi

-echo "$as_me:6382: result: $cf_cv_xopen_source" >&5
+echo "$as_me:6383: result: $cf_cv_xopen_source" >&5

 echo "${ECHO_T}$cf_cv_xopen_source" >&6
        if test "$cf_cv_xopen_source" != no ; then
 
 echo "${ECHO_T}$cf_cv_xopen_source" >&6
        if test "$cf_cv_xopen_source" != no ; then
 


@@ -6413,16 +6414,16 @@ cf_trim_CPPFLAGS=`echo "$cf_save_CPPFLAGS" | \
        sed     -e 's/-[UD]_POSIX_C_SOURCE\(=[^         ]*\)\?[         ]/ /g' \
                -e 's/-[UD]_POSIX_C_SOURCE\(=[^         ]*\)\?$//g'`
 
        sed     -e 's/-[UD]_POSIX_C_SOURCE\(=[^         ]*\)\?[         ]/ /g' \
                -e 's/-[UD]_POSIX_C_SOURCE\(=[^         ]*\)\?$//g'`
 

-echo "$as_me:6416: checking if we should define _POSIX_C_SOURCE" >&5
+echo "$as_me:6417: checking if we should define _POSIX_C_SOURCE" >&5

 echo $ECHO_N "checking if we should define _POSIX_C_SOURCE... $ECHO_C" >&6
 if test "${cf_cv_posix_c_source+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 echo $ECHO_N "checking if we should define _POSIX_C_SOURCE... $ECHO_C" >&6
 if test "${cf_cv_posix_c_source+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 

-echo "${as_me-configure}:6422: testing if the symbol is already defined go no further ..." 1>&5
+echo "${as_me-configure}:6423: testing if the symbol is already defined go no further ..." 1>&5

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

-#line 6425 "configure"
+#line 6426 "configure"

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


@@ -6437,16 +6438,16 @@ make an error
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

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

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

-  echo "$as_me:6443: \$? = $ac_status" >&5
+  echo "$as_me:6444: \$? = $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:6446: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6447: \"$ac_try\"") >&5

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

-  echo "$as_me:6449: \$? = $ac_status" >&5
+  echo "$as_me:6450: \$? = $ac_status" >&5

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


@@ -6467,7 +6468,7 @@ cf_want_posix_source=no
         esac
         if test "$cf_want_posix_source" = yes ; then
                cat >conftest.$ac_ext <<_ACEOF
         esac
         if test "$cf_want_posix_source" = yes ; then
                cat >conftest.$ac_ext <<_ACEOF

-#line 6470 "configure"
+#line 6471 "configure"

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


@@ -6482,16 +6483,16 @@ make an error
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

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

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

-  echo "$as_me:6488: \$? = $ac_status" >&5
+  echo "$as_me:6489: \$? = $ac_status" >&5

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

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

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

-  echo "$as_me:6494: \$? = $ac_status" >&5
+  echo "$as_me:6495: \$? = $ac_status" >&5

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


@@ -6502,15 +6503,15 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
         fi
 
 rm -f conftest.$ac_objext conftest.$ac_ext
         fi
 

-echo "${as_me-configure}:6505: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
+echo "${as_me-configure}:6506: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5

 
         CFLAGS="$cf_trim_CFLAGS"
         CPPFLAGS="$cf_trim_CPPFLAGS $cf_cv_posix_c_source"
 
 
         CFLAGS="$cf_trim_CFLAGS"
         CPPFLAGS="$cf_trim_CPPFLAGS $cf_cv_posix_c_source"
 

-echo "${as_me-configure}:6510: testing if the second compile does not leave our definition intact error ..." 1>&5
+echo "${as_me-configure}:6511: testing if the second compile does not leave our definition intact error ..." 1>&5

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

-#line 6513 "configure"
+#line 6514 "configure"

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


@@ -6525,16 +6526,16 @@ make an error
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

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

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

-  echo "$as_me:6531: \$? = $ac_status" >&5
+  echo "$as_me:6532: \$? = $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:6534: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6535: \"$ac_try\"") >&5

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

-  echo "$as_me:6537: \$? = $ac_status" >&5
+  echo "$as_me:6538: \$? = $ac_status" >&5

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


@@ -6550,7 +6551,7 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi

-echo "$as_me:6553: result: $cf_cv_posix_c_source" >&5
+echo "$as_me:6554: result: $cf_cv_posix_c_source" >&5

 echo "${ECHO_T}$cf_cv_posix_c_source" >&6
 
 if test "$cf_cv_posix_c_source" != no ; then
 echo "${ECHO_T}$cf_cv_posix_c_source" >&6
 
 if test "$cf_cv_posix_c_source" != no ; then


@@ -6569,14 +6570,14 @@ esac
 
 # Work around breakage on OS X
 
 
 # Work around breakage on OS X
 

-echo "$as_me:6572: checking if SIGWINCH is defined" >&5
+echo "$as_me:6573: checking if SIGWINCH is defined" >&5

 echo $ECHO_N "checking if SIGWINCH is defined... $ECHO_C" >&6
 if test "${cf_cv_define_sigwinch+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
        cat >conftest.$ac_ext <<_ACEOF
 echo $ECHO_N "checking if SIGWINCH is defined... $ECHO_C" >&6
 if test "${cf_cv_define_sigwinch+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
        cat >conftest.$ac_ext <<_ACEOF

-#line 6579 "configure"
+#line 6580 "configure"

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


@@ -6591,23 +6592,23 @@ int x = SIGWINCH
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

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

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

-  echo "$as_me:6597: \$? = $ac_status" >&5
+  echo "$as_me:6598: \$? = $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:6600: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6601: \"$ac_try\"") >&5

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

-  echo "$as_me:6603: \$? = $ac_status" >&5
+  echo "$as_me:6604: \$? = $ac_status" >&5

   (exit $ac_status); }; }; then
   cf_cv_define_sigwinch=yes
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
 cat >conftest.$ac_ext <<_ACEOF
   (exit $ac_status); }; }; then
   cf_cv_define_sigwinch=yes
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
 cat >conftest.$ac_ext <<_ACEOF

-#line 6610 "configure"
+#line 6611 "configure"

 #include "confdefs.h"
 
 #undef _XOPEN_SOURCE
 #include "confdefs.h"
 
 #undef _XOPEN_SOURCE


@@ -6625,16 +6626,16 @@ int x = SIGWINCH
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

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

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

-  echo "$as_me:6631: \$? = $ac_status" >&5
+  echo "$as_me:6632: \$? = $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:6634: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6635: \"$ac_try\"") >&5

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

-  echo "$as_me:6637: \$? = $ac_status" >&5
+  echo "$as_me:6638: \$? = $ac_status" >&5

   (exit $ac_status); }; }; then
   cf_cv_define_sigwinch=maybe
 else
   (exit $ac_status); }; }; then
   cf_cv_define_sigwinch=maybe
 else


@@ -6648,11 +6649,11 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi

-echo "$as_me:6651: result: $cf_cv_define_sigwinch" >&5
+echo "$as_me:6652: result: $cf_cv_define_sigwinch" >&5

 echo "${ECHO_T}$cf_cv_define_sigwinch" >&6
 
 if test "$cf_cv_define_sigwinch" = maybe ; then
 echo "${ECHO_T}$cf_cv_define_sigwinch" >&6
 
 if test "$cf_cv_define_sigwinch" = maybe ; then

-echo "$as_me:6655: checking for actual SIGWINCH definition" >&5
+echo "$as_me:6656: checking for actual SIGWINCH definition" >&5

 echo $ECHO_N "checking for actual SIGWINCH definition... $ECHO_C" >&6
 if test "${cf_cv_fixup_sigwinch+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 echo $ECHO_N "checking for actual SIGWINCH definition... $ECHO_C" >&6
 if test "${cf_cv_fixup_sigwinch+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6


@@ -6663,7 +6664,7 @@ cf_sigwinch=32
 while test $cf_sigwinch != 1
 do
        cat >conftest.$ac_ext <<_ACEOF
 while test $cf_sigwinch != 1
 do
        cat >conftest.$ac_ext <<_ACEOF

-#line 6666 "configure"
+#line 6667 "configure"

 #include "confdefs.h"
 
 #undef _XOPEN_SOURCE
 #include "confdefs.h"
 
 #undef _XOPEN_SOURCE


@@ -6685,16 +6686,16 @@ int x = SIGWINCH
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

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

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

-  echo "$as_me:6691: \$? = $ac_status" >&5
+  echo "$as_me:6692: \$? = $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:6694: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6695: \"$ac_try\"") >&5

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

-  echo "$as_me:6697: \$? = $ac_status" >&5
+  echo "$as_me:6698: \$? = $ac_status" >&5

   (exit $ac_status); }; }; then
   cf_cv_fixup_sigwinch=$cf_sigwinch
         break
   (exit $ac_status); }; }; then
   cf_cv_fixup_sigwinch=$cf_sigwinch
         break


@@ -6708,7 +6709,7 @@ cf_sigwinch=`expr $cf_sigwinch - 1`
 done
 
 fi
 done
 
 fi

-echo "$as_me:6711: result: $cf_cv_fixup_sigwinch" >&5
+echo "$as_me:6712: result: $cf_cv_fixup_sigwinch" >&5

 echo "${ECHO_T}$cf_cv_fixup_sigwinch" >&6
 
        if test "$cf_cv_fixup_sigwinch" != unknown ; then
 echo "${ECHO_T}$cf_cv_fixup_sigwinch" >&6
 
        if test "$cf_cv_fixup_sigwinch" != unknown ; then


@@ -6718,13 +6719,13 @@ fi
 
 # Checks for CODESET support.
 
 
 # Checks for CODESET support.
 

-  echo "$as_me:6721: checking for nl_langinfo and CODESET" >&5
+  echo "$as_me:6722: checking for nl_langinfo and CODESET" >&5

 echo $ECHO_N "checking for nl_langinfo and CODESET... $ECHO_C" >&6
 if test "${am_cv_langinfo_codeset+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 echo $ECHO_N "checking for nl_langinfo and CODESET... $ECHO_C" >&6
 if test "${am_cv_langinfo_codeset+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF

-#line 6727 "configure"
+#line 6728 "configure"

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


@@ -6736,16 +6737,16 @@ char* cs = nl_langinfo(CODESET);
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext

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

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

-  echo "$as_me:6742: \$? = $ac_status" >&5
+  echo "$as_me:6743: \$? = $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:6745: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6746: \"$ac_try\"") >&5

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

-  echo "$as_me:6748: \$? = $ac_status" >&5
+  echo "$as_me:6749: \$? = $ac_status" >&5

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


@@ -6756,7 +6757,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 
 fi

-echo "$as_me:6759: result: $am_cv_langinfo_codeset" >&5
+echo "$as_me:6760: result: $am_cv_langinfo_codeset" >&5

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


@@ -6770,7 +6771,7 @@ EOF
 NCURSES_OK_WCHAR_T=
 NCURSES_OK_WINT_T=
 
 NCURSES_OK_WCHAR_T=
 NCURSES_OK_WINT_T=
 

-echo "$as_me:6773: checking if you want wide-character code" >&5
+echo "$as_me:6774: checking if you want wide-character code" >&5

 echo $ECHO_N "checking if you want wide-character code... $ECHO_C" >&6
 
 # Check whether --enable-widec or --disable-widec was given.
 echo $ECHO_N "checking if you want wide-character code... $ECHO_C" >&6
 
 # Check whether --enable-widec or --disable-widec was given.


@@ -6780,7 +6781,7 @@ if test "${enable_widec+set}" = set; then
 else
   with_widec=no
 fi;
 else
   with_widec=no
 fi;

-echo "$as_me:6783: result: $with_widec" >&5
+echo "$as_me:6784: result: $with_widec" >&5

 echo "${ECHO_T}$with_widec" >&6
 if test "$with_widec" = yes ; then
        LIB_SUFFIX="w${LIB_SUFFIX}"
 echo "${ECHO_T}$with_widec" >&6
 if test "$with_widec" = yes ; then
        LIB_SUFFIX="w${LIB_SUFFIX}"


@@ -6788,10 +6789,10 @@ if test "$with_widec" = yes ; then
 #define USE_WIDEC_SUPPORT 1
 EOF
 
 #define USE_WIDEC_SUPPORT 1
 EOF
 

-echo "$as_me:6791: checking if we must define _XOPEN_SOURCE_EXTENDED" >&5
+echo "$as_me:6792: checking if we must define _XOPEN_SOURCE_EXTENDED" >&5

 echo $ECHO_N "checking if we must define _XOPEN_SOURCE_EXTENDED... $ECHO_C" >&6
 cat >conftest.$ac_ext <<_ACEOF
 echo $ECHO_N "checking if we must define _XOPEN_SOURCE_EXTENDED... $ECHO_C" >&6
 cat >conftest.$ac_ext <<_ACEOF

-#line 6794 "configure"
+#line 6795 "configure"

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


@@ -6807,16 +6808,16 @@ make an error
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

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

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

-  echo "$as_me:6813: \$? = $ac_status" >&5
+  echo "$as_me:6814: \$? = $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:6816: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6817: \"$ac_try\"") >&5

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

-  echo "$as_me:6819: \$? = $ac_status" >&5
+  echo "$as_me:6820: \$? = $ac_status" >&5

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


@@ -6825,16 +6826,16 @@ cat conftest.$ac_ext >&5
 cf_result=yes
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 cf_result=yes
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext

-echo "$as_me:6828: result: $cf_result" >&5
+echo "$as_me:6829: result: $cf_result" >&5

 echo "${ECHO_T}$cf_result" >&6
 
 if test "$cf_result" = yes ; then
        CPPFLAGS="$CPPFLAGS -D_XOPEN_SOURCE_EXTENDED"
 elif test "x" != "x" ; then
 echo "${ECHO_T}$cf_result" >&6
 
 if test "$cf_result" = yes ; then
        CPPFLAGS="$CPPFLAGS -D_XOPEN_SOURCE_EXTENDED"
 elif test "x" != "x" ; then

-       echo "$as_me:6834: checking checking for compatible value versus " >&5
+       echo "$as_me:6835: checking checking for compatible value versus " >&5

 echo $ECHO_N "checking checking for compatible value versus ... $ECHO_C" >&6
        cat >conftest.$ac_ext <<_ACEOF
 echo $ECHO_N "checking checking for compatible value versus ... $ECHO_C" >&6
        cat >conftest.$ac_ext <<_ACEOF

-#line 6837 "configure"
+#line 6838 "configure"

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


@@ -6850,16 +6851,16 @@ make an error
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

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

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

-  echo "$as_me:6856: \$? = $ac_status" >&5
+  echo "$as_me:6857: \$? = $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:6859: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6860: \"$ac_try\"") >&5

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

-  echo "$as_me:6862: \$? = $ac_status" >&5
+  echo "$as_me:6863: \$? = $ac_status" >&5

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


@@ -6868,7 +6869,7 @@ cat conftest.$ac_ext >&5
 cf_result=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 cf_result=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext

-       echo "$as_me:6871: result: $cf_result" >&5
+       echo "$as_me:6872: result: $cf_result" >&5

 echo "${ECHO_T}$cf_result" >&6
        if test "$cf_result" = no ; then
                # perhaps we can override it - try...
 echo "${ECHO_T}$cf_result" >&6
        if test "$cf_result" = no ; then
                # perhaps we can override it - try...


@@ -6882,13 +6883,13 @@ fi
 for ac_func in putwc btowc wctob mbtowc wctomb mblen mbrlen mbrtowc
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
 for ac_func in putwc btowc wctob mbtowc wctomb mblen mbrlen mbrtowc
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`

-echo "$as_me:6885: checking for $ac_func" >&5
+echo "$as_me:6886: checking for $ac_func" >&5

 echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
 if eval "test \"\${$as_ac_var+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
 if eval "test \"\${$as_ac_var+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF

-#line 6891 "configure"
+#line 6892 "configure"

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


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

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

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

-  echo "$as_me:6925: \$? = $ac_status" >&5
+  echo "$as_me:6926: \$? = $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:6928: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6929: \"$ac_try\"") >&5

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

-  echo "$as_me:6931: \$? = $ac_status" >&5
+  echo "$as_me:6932: \$? = $ac_status" >&5

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


@@ -6938,7 +6939,7 @@ eval "$as_ac_var=no"
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi

-echo "$as_me:6941: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "$as_me:6942: result: `eval echo '${'$as_ac_var'}'`" >&5

 echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
 if test `eval echo '${'$as_ac_var'}'` = yes; then
   cat >>confdefs.h <<EOF
 echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
 if test `eval echo '${'$as_ac_var'}'` = yes; then
   cat >>confdefs.h <<EOF


@@ -6950,7 +6951,7 @@ done
 
        if test "$ac_cv_func_putwc" != yes ; then
 
 
        if test "$ac_cv_func_putwc" != yes ; then
 

-echo "$as_me:6953: checking for putwc in libutf8" >&5
+echo "$as_me:6954: checking for putwc in libutf8" >&5

 echo $ECHO_N "checking for putwc in libutf8... $ECHO_C" >&6
 if test "${cf_cv_libutf8+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 echo $ECHO_N "checking for putwc in libutf8... $ECHO_C" >&6
 if test "${cf_cv_libutf8+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6


@@ -6959,7 +6960,7 @@ else
        cf_save_LIBS="$LIBS"
        LIBS="-lutf8 $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
        cf_save_LIBS="$LIBS"
        LIBS="-lutf8 $LIBS"
 cat >conftest.$ac_ext <<_ACEOF

-#line 6962 "configure"
+#line 6963 "configure"

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


@@ -6972,16 +6973,16 @@ putwc(0,0);
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext

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

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

-  echo "$as_me:6978: \$? = $ac_status" >&5
+  echo "$as_me:6979: \$? = $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:6981: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6982: \"$ac_try\"") >&5

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

-  echo "$as_me:6984: \$? = $ac_status" >&5
+  echo "$as_me:6985: \$? = $ac_status" >&5

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


@@ -6993,7 +6994,7 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
        LIBS="$cf_save_LIBS"
 
 fi
        LIBS="$cf_save_LIBS"
 
 fi

-echo "$as_me:6996: result: $cf_cv_libutf8" >&5
+echo "$as_me:6997: result: $cf_cv_libutf8" >&5

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


@@ -7010,14 +7011,14 @@ fi
        fi
 
 # This is needed on Tru64 5.0 to declare mbstate_t
        fi
 
 # This is needed on Tru64 5.0 to declare mbstate_t

-echo "$as_me:7013: checking if we must include wchar.h to declare mbstate_t" >&5
+echo "$as_me:7014: checking if we must include wchar.h to declare mbstate_t" >&5

 echo $ECHO_N "checking if we must include wchar.h to declare mbstate_t... $ECHO_C" >&6
 if test "${cf_cv_mbstate_t+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 cat >conftest.$ac_ext <<_ACEOF
 echo $ECHO_N "checking if we must include wchar.h to declare mbstate_t... $ECHO_C" >&6
 if test "${cf_cv_mbstate_t+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 cat >conftest.$ac_ext <<_ACEOF

-#line 7020 "configure"
+#line 7021 "configure"

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


@@ -7035,23 +7036,23 @@ mbstate_t state
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

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

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

-  echo "$as_me:7041: \$? = $ac_status" >&5
+  echo "$as_me:7042: \$? = $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:7044: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7045: \"$ac_try\"") >&5

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

-  echo "$as_me:7047: \$? = $ac_status" >&5
+  echo "$as_me:7048: \$? = $ac_status" >&5

   (exit $ac_status); }; }; then
   cf_cv_mbstate_t=no
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
 cat >conftest.$ac_ext <<_ACEOF
   (exit $ac_status); }; }; then
   cf_cv_mbstate_t=no
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
 cat >conftest.$ac_ext <<_ACEOF

-#line 7054 "configure"
+#line 7055 "configure"

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


@@ -7070,16 +7071,16 @@ mbstate_t value
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

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

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

-  echo "$as_me:7076: \$? = $ac_status" >&5
+  echo "$as_me:7077: \$? = $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:7079: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7080: \"$ac_try\"") >&5

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

-  echo "$as_me:7082: \$? = $ac_status" >&5
+  echo "$as_me:7083: \$? = $ac_status" >&5

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


@@ -7091,7 +7092,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi

-echo "$as_me:7094: result: $cf_cv_mbstate_t" >&5
+echo "$as_me:7095: result: $cf_cv_mbstate_t" >&5

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


@@ -7108,14 +7109,14 @@ if test "$cf_cv_mbstate_t" = unknown ; then
 fi
 
 # This is needed on Tru64 5.0 to declare wchar_t
 fi
 
 # This is needed on Tru64 5.0 to declare wchar_t

-echo "$as_me:7111: checking if we must include wchar.h to declare wchar_t" >&5
+echo "$as_me:7112: checking if we must include wchar.h to declare wchar_t" >&5

 echo $ECHO_N "checking if we must include wchar.h to declare wchar_t... $ECHO_C" >&6
 if test "${cf_cv_wchar_t+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 cat >conftest.$ac_ext <<_ACEOF
 echo $ECHO_N "checking if we must include wchar.h to declare wchar_t... $ECHO_C" >&6
 if test "${cf_cv_wchar_t+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 cat >conftest.$ac_ext <<_ACEOF

-#line 7118 "configure"
+#line 7119 "configure"

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


@@ -7133,23 +7134,23 @@ wchar_t state
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

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

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

-  echo "$as_me:7139: \$? = $ac_status" >&5
+  echo "$as_me:7140: \$? = $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:7142: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7143: \"$ac_try\"") >&5

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

-  echo "$as_me:7145: \$? = $ac_status" >&5
+  echo "$as_me:7146: \$? = $ac_status" >&5

   (exit $ac_status); }; }; then
   cf_cv_wchar_t=no
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
 cat >conftest.$ac_ext <<_ACEOF
   (exit $ac_status); }; }; then
   cf_cv_wchar_t=no
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
 cat >conftest.$ac_ext <<_ACEOF

-#line 7152 "configure"
+#line 7153 "configure"

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


@@ -7168,16 +7169,16 @@ wchar_t value
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

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

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

-  echo "$as_me:7174: \$? = $ac_status" >&5
+  echo "$as_me:7175: \$? = $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:7177: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7178: \"$ac_try\"") >&5

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

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

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


@@ -7189,7 +7190,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi

-echo "$as_me:7192: result: $cf_cv_wchar_t" >&5
+echo "$as_me:7193: result: $cf_cv_wchar_t" >&5

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


@@ -7211,14 +7212,14 @@ if test "$cf_cv_wchar_t" != unknown ; then
 fi
 
 # This is needed on Tru64 5.0 to declare wint_t
 fi
 
 # This is needed on Tru64 5.0 to declare wint_t

-echo "$as_me:7214: checking if we must include wchar.h to declare wint_t" >&5
+echo "$as_me:7215: checking if we must include wchar.h to declare wint_t" >&5

 echo $ECHO_N "checking if we must include wchar.h to declare wint_t... $ECHO_C" >&6
 if test "${cf_cv_wint_t+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 cat >conftest.$ac_ext <<_ACEOF
 echo $ECHO_N "checking if we must include wchar.h to declare wint_t... $ECHO_C" >&6
 if test "${cf_cv_wint_t+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 cat >conftest.$ac_ext <<_ACEOF

-#line 7221 "configure"
+#line 7222 "configure"

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


@@ -7236,23 +7237,23 @@ wint_t state
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

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

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

-  echo "$as_me:7242: \$? = $ac_status" >&5
+  echo "$as_me:7243: \$? = $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:7245: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7246: \"$ac_try\"") >&5

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

-  echo "$as_me:7248: \$? = $ac_status" >&5
+  echo "$as_me:7249: \$? = $ac_status" >&5

   (exit $ac_status); }; }; then
   cf_cv_wint_t=no
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
 cat >conftest.$ac_ext <<_ACEOF
   (exit $ac_status); }; }; then
   cf_cv_wint_t=no
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
 cat >conftest.$ac_ext <<_ACEOF

-#line 7255 "configure"
+#line 7256 "configure"

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


@@ -7271,16 +7272,16 @@ wint_t value
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

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

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

-  echo "$as_me:7277: \$? = $ac_status" >&5
+  echo "$as_me:7278: \$? = $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:7280: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7281: \"$ac_try\"") >&5

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

-  echo "$as_me:7283: \$? = $ac_status" >&5
+  echo "$as_me:7284: \$? = $ac_status" >&5

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


@@ -7292,7 +7293,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi

-echo "$as_me:7295: result: $cf_cv_wint_t" >&5
+echo "$as_me:7296: result: $cf_cv_wint_t" >&5

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


@@ -7331,7 +7332,7 @@ case $cf_cv_abi_version in
        ;;
 esac
 
        ;;
 esac
 

-echo "$as_me:7334: checking whether to enable _LP64 definition in curses.h" >&5
+echo "$as_me:7335: checking whether to enable _LP64 definition in curses.h" >&5

 echo $ECHO_N "checking whether to enable _LP64 definition in curses.h... $ECHO_C" >&6
 
 # Check whether --enable-lp64 or --disable-lp64 was given.
 echo $ECHO_N "checking whether to enable _LP64 definition in curses.h... $ECHO_C" >&6
 
 # Check whether --enable-lp64 or --disable-lp64 was given.


@@ -7341,7 +7342,7 @@ if test "${enable_lp64+set}" = set; then
 else
   with_lp64=$default_with_lp64
 fi;
 else
   with_lp64=$default_with_lp64
 fi;

-echo "$as_me:7344: result: $with_lp64" >&5
+echo "$as_me:7345: result: $with_lp64" >&5

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


@@ -7357,7 +7358,7 @@ if test "${enable_largefile+set}" = set; then
 fi;
 if test "$enable_largefile" != no; then
 
 fi;
 if test "$enable_largefile" != no; then
 

-  echo "$as_me:7360: checking for special C compiler options needed for large files" >&5
+  echo "$as_me:7361: checking for special C compiler options needed for large files" >&5

 echo $ECHO_N "checking for special C compiler options needed for large files... $ECHO_C" >&6
 if test "${ac_cv_sys_largefile_CC+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 echo $ECHO_N "checking for special C compiler options needed for large files... $ECHO_C" >&6
 if test "${ac_cv_sys_largefile_CC+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6


@@ -7369,7 +7370,7 @@ else
         # IRIX 6.2 and later do not support large files by default,
         # so use the C compiler's -n32 option if that helps.
          cat >conftest.$ac_ext <<_ACEOF
         # IRIX 6.2 and later do not support large files by default,
         # so use the C compiler's -n32 option if that helps.
          cat >conftest.$ac_ext <<_ACEOF

-#line 7372 "configure"
+#line 7373 "configure"

 #include "confdefs.h"
 #include <sys/types.h>
  /* Check that off_t can represent 2**63 - 1 correctly.
 #include "confdefs.h"
 #include <sys/types.h>
  /* Check that off_t can represent 2**63 - 1 correctly.


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

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

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

-  echo "$as_me:7395: \$? = $ac_status" >&5
+  echo "$as_me:7396: \$? = $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:7398: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7399: \"$ac_try\"") >&5

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

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

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


@@ -7408,16 +7409,16 @@ fi
 rm -f conftest.$ac_objext
         CC="$CC -n32"
         rm -f conftest.$ac_objext
 rm -f conftest.$ac_objext
         CC="$CC -n32"
         rm -f conftest.$ac_objext

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

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

-  echo "$as_me:7414: \$? = $ac_status" >&5
+  echo "$as_me:7415: \$? = $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:7417: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7418: \"$ac_try\"") >&5

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

-  echo "$as_me:7420: \$? = $ac_status" >&5
+  echo "$as_me:7421: \$? = $ac_status" >&5

   (exit $ac_status); }; }; then
   ac_cv_sys_largefile_CC=' -n32'; break
 else
   (exit $ac_status); }; }; then
   ac_cv_sys_largefile_CC=' -n32'; break
 else


@@ -7431,13 +7432,13 @@ rm -f conftest.$ac_objext
        rm -f conftest.$ac_ext
     fi
 fi
        rm -f conftest.$ac_ext
     fi
 fi

-echo "$as_me:7434: result: $ac_cv_sys_largefile_CC" >&5
+echo "$as_me:7435: result: $ac_cv_sys_largefile_CC" >&5

 echo "${ECHO_T}$ac_cv_sys_largefile_CC" >&6
   if test "$ac_cv_sys_largefile_CC" != no; then
     CC=$CC$ac_cv_sys_largefile_CC
   fi
 
 echo "${ECHO_T}$ac_cv_sys_largefile_CC" >&6
   if test "$ac_cv_sys_largefile_CC" != no; then
     CC=$CC$ac_cv_sys_largefile_CC
   fi
 

-  echo "$as_me:7440: checking for _FILE_OFFSET_BITS value needed for large files" >&5
+  echo "$as_me:7441: checking for _FILE_OFFSET_BITS value needed for large files" >&5

 echo $ECHO_N "checking for _FILE_OFFSET_BITS value needed for large files... $ECHO_C" >&6
 if test "${ac_cv_sys_file_offset_bits+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 echo $ECHO_N "checking for _FILE_OFFSET_BITS value needed for large files... $ECHO_C" >&6
 if test "${ac_cv_sys_file_offset_bits+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6


@@ -7445,7 +7446,7 @@ else
   while :; do
   ac_cv_sys_file_offset_bits=no
   cat >conftest.$ac_ext <<_ACEOF
   while :; do
   ac_cv_sys_file_offset_bits=no
   cat >conftest.$ac_ext <<_ACEOF

-#line 7448 "configure"
+#line 7449 "configure"

 #include "confdefs.h"
 #include <sys/types.h>
  /* Check that off_t can represent 2**63 - 1 correctly.
 #include "confdefs.h"
 #include <sys/types.h>
  /* Check that off_t can represent 2**63 - 1 correctly.


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

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

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

-  echo "$as_me:7471: \$? = $ac_status" >&5
+  echo "$as_me:7472: \$? = $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:7474: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7475: \"$ac_try\"") >&5

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

-  echo "$as_me:7477: \$? = $ac_status" >&5
+  echo "$as_me:7478: \$? = $ac_status" >&5

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


@@ -7483,7 +7484,7 @@ cat conftest.$ac_ext >&5
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
   cat >conftest.$ac_ext <<_ACEOF
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
   cat >conftest.$ac_ext <<_ACEOF

-#line 7486 "configure"
+#line 7487 "configure"

 #include "confdefs.h"
 #define _FILE_OFFSET_BITS 64
 #include <sys/types.h>
 #include "confdefs.h"
 #define _FILE_OFFSET_BITS 64
 #include <sys/types.h>


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

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

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

-  echo "$as_me:7510: \$? = $ac_status" >&5
+  echo "$as_me:7511: \$? = $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:7513: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7514: \"$ac_try\"") >&5

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

-  echo "$as_me:7516: \$? = $ac_status" >&5
+  echo "$as_me:7517: \$? = $ac_status" >&5

   (exit $ac_status); }; }; then
   ac_cv_sys_file_offset_bits=64; break
 else
   (exit $ac_status); }; }; then
   ac_cv_sys_file_offset_bits=64; break
 else


@@ -7524,7 +7525,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
   break
 done
 fi
   break
 done
 fi

-echo "$as_me:7527: result: $ac_cv_sys_file_offset_bits" >&5
+echo "$as_me:7528: result: $ac_cv_sys_file_offset_bits" >&5

 echo "${ECHO_T}$ac_cv_sys_file_offset_bits" >&6
 if test "$ac_cv_sys_file_offset_bits" != no; then
 
 echo "${ECHO_T}$ac_cv_sys_file_offset_bits" >&6
 if test "$ac_cv_sys_file_offset_bits" != no; then
 


@@ -7534,7 +7535,7 @@ EOF
 
 fi
 rm -f conftest*
 
 fi
 rm -f conftest*

-  echo "$as_me:7537: checking for _LARGE_FILES value needed for large files" >&5
+  echo "$as_me:7538: checking for _LARGE_FILES value needed for large files" >&5

 echo $ECHO_N "checking for _LARGE_FILES value needed for large files... $ECHO_C" >&6
 if test "${ac_cv_sys_large_files+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 echo $ECHO_N "checking for _LARGE_FILES value needed for large files... $ECHO_C" >&6
 if test "${ac_cv_sys_large_files+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6


@@ -7542,7 +7543,7 @@ else
   while :; do
   ac_cv_sys_large_files=no
   cat >conftest.$ac_ext <<_ACEOF
   while :; do
   ac_cv_sys_large_files=no
   cat >conftest.$ac_ext <<_ACEOF

-#line 7545 "configure"
+#line 7546 "configure"

 #include "confdefs.h"
 #include <sys/types.h>
  /* Check that off_t can represent 2**63 - 1 correctly.
 #include "confdefs.h"
 #include <sys/types.h>
  /* Check that off_t can represent 2**63 - 1 correctly.


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

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

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

-  echo "$as_me:7568: \$? = $ac_status" >&5
+  echo "$as_me:7569: \$? = $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:7571: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7572: \"$ac_try\"") >&5

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

-  echo "$as_me:7574: \$? = $ac_status" >&5
+  echo "$as_me:7575: \$? = $ac_status" >&5

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


@@ -7580,7 +7581,7 @@ cat conftest.$ac_ext >&5
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
   cat >conftest.$ac_ext <<_ACEOF
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
   cat >conftest.$ac_ext <<_ACEOF

-#line 7583 "configure"
+#line 7584 "configure"

 #include "confdefs.h"
 #define _LARGE_FILES 1
 #include <sys/types.h>
 #include "confdefs.h"
 #define _LARGE_FILES 1
 #include <sys/types.h>


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

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

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

-  echo "$as_me:7607: \$? = $ac_status" >&5
+  echo "$as_me:7608: \$? = $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:7610: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7611: \"$ac_try\"") >&5

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

-  echo "$as_me:7613: \$? = $ac_status" >&5
+  echo "$as_me:7614: \$? = $ac_status" >&5

   (exit $ac_status); }; }; then
   ac_cv_sys_large_files=1; break
 else
   (exit $ac_status); }; }; then
   ac_cv_sys_large_files=1; break
 else


@@ -7621,7 +7622,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
   break
 done
 fi
   break
 done
 fi

-echo "$as_me:7624: result: $ac_cv_sys_large_files" >&5
+echo "$as_me:7625: result: $ac_cv_sys_large_files" >&5

 echo "${ECHO_T}$ac_cv_sys_large_files" >&6
 if test "$ac_cv_sys_large_files" != no; then
 
 echo "${ECHO_T}$ac_cv_sys_large_files" >&6
 if test "$ac_cv_sys_large_files" != no; then
 


@@ -7634,7 +7635,7 @@ rm -f conftest*
 fi
 
     if test "$enable_largefile" != no ; then
 fi
 
     if test "$enable_largefile" != no ; then

-       echo "$as_me:7637: checking for _LARGEFILE_SOURCE value needed for large files" >&5
+       echo "$as_me:7638: checking for _LARGEFILE_SOURCE value needed for large files" >&5

 echo $ECHO_N "checking for _LARGEFILE_SOURCE value needed for large files... $ECHO_C" >&6
 if test "${ac_cv_sys_largefile_source+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 echo $ECHO_N "checking for _LARGEFILE_SOURCE value needed for large files... $ECHO_C" >&6
 if test "${ac_cv_sys_largefile_source+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6


@@ -7642,7 +7643,7 @@ else
   while :; do
   ac_cv_sys_largefile_source=no
   cat >conftest.$ac_ext <<_ACEOF
   while :; do
   ac_cv_sys_largefile_source=no
   cat >conftest.$ac_ext <<_ACEOF

-#line 7645 "configure"
+#line 7646 "configure"

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


@@ -7654,16 +7655,16 @@ return !fseeko;
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

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

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

-  echo "$as_me:7660: \$? = $ac_status" >&5
+  echo "$as_me:7661: \$? = $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:7663: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7664: \"$ac_try\"") >&5

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

-  echo "$as_me:7666: \$? = $ac_status" >&5
+  echo "$as_me:7667: \$? = $ac_status" >&5

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


@@ -7672,7 +7673,7 @@ cat conftest.$ac_ext >&5
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
   cat >conftest.$ac_ext <<_ACEOF
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
   cat >conftest.$ac_ext <<_ACEOF

-#line 7675 "configure"
+#line 7676 "configure"

 #include "confdefs.h"
 #define _LARGEFILE_SOURCE 1
 #include <stdio.h>
 #include "confdefs.h"
 #define _LARGEFILE_SOURCE 1
 #include <stdio.h>


@@ -7685,16 +7686,16 @@ return !fseeko;
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

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

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

-  echo "$as_me:7691: \$? = $ac_status" >&5
+  echo "$as_me:7692: \$? = $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:7694: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7695: \"$ac_try\"") >&5

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

-  echo "$as_me:7697: \$? = $ac_status" >&5
+  echo "$as_me:7698: \$? = $ac_status" >&5

   (exit $ac_status); }; }; then
   ac_cv_sys_largefile_source=1; break
 else
   (exit $ac_status); }; }; then
   ac_cv_sys_largefile_source=1; break
 else


@@ -7705,7 +7706,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
   break
 done
 fi
   break
 done
 fi

-echo "$as_me:7708: result: $ac_cv_sys_largefile_source" >&5
+echo "$as_me:7709: result: $ac_cv_sys_largefile_source" >&5

 echo "${ECHO_T}$ac_cv_sys_largefile_source" >&6
 if test "$ac_cv_sys_largefile_source" != no; then
 
 echo "${ECHO_T}$ac_cv_sys_largefile_source" >&6
 if test "$ac_cv_sys_largefile_source" != no; then
 


@@ -7719,13 +7720,13 @@ rm -f conftest*
 # We used to try defining _XOPEN_SOURCE=500 too, to work around a bug
 # in glibc 2.1.3, but that breaks too many other things.
 # If you want fseeko and ftello with glibc, upgrade to a fixed glibc.
 # We used to try defining _XOPEN_SOURCE=500 too, to work around a bug
 # in glibc 2.1.3, but that breaks too many other things.
 # If you want fseeko and ftello with glibc, upgrade to a fixed glibc.

-echo "$as_me:7722: checking for fseeko" >&5
+echo "$as_me:7723: checking for fseeko" >&5

 echo $ECHO_N "checking for fseeko... $ECHO_C" >&6
 if test "${ac_cv_func_fseeko+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 echo $ECHO_N "checking for fseeko... $ECHO_C" >&6
 if test "${ac_cv_func_fseeko+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF

-#line 7728 "configure"
+#line 7729 "configure"

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


@@ -7737,16 +7738,16 @@ return fseeko && fseeko (stdin, 0, 0);
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext

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

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

-  echo "$as_me:7743: \$? = $ac_status" >&5
+  echo "$as_me:7744: \$? = $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:7746: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7747: \"$ac_try\"") >&5

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

-  echo "$as_me:7749: \$? = $ac_status" >&5
+  echo "$as_me:7750: \$? = $ac_status" >&5

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


@@ -7756,7 +7757,7 @@ ac_cv_func_fseeko=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi

-echo "$as_me:7759: result: $ac_cv_func_fseeko" >&5
+echo "$as_me:7760: result: $ac_cv_func_fseeko" >&5

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


@@ -7777,14 +7778,14 @@ fi
        test "$ac_cv_sys_largefile_source" != no && CPPFLAGS="$CPPFLAGS -D_LARGEFILE_SOURCE "
        test "$ac_cv_sys_file_offset_bits" != no && CPPFLAGS="$CPPFLAGS -D_FILE_OFFSET_BITS=$ac_cv_sys_file_offset_bits "
 
        test "$ac_cv_sys_largefile_source" != no && CPPFLAGS="$CPPFLAGS -D_LARGEFILE_SOURCE "
        test "$ac_cv_sys_file_offset_bits" != no && CPPFLAGS="$CPPFLAGS -D_FILE_OFFSET_BITS=$ac_cv_sys_file_offset_bits "
 

-       echo "$as_me:7780: checking whether to use struct dirent64" >&5
+       echo "$as_me:7781: checking whether to use struct dirent64" >&5

 echo $ECHO_N "checking whether to use struct dirent64... $ECHO_C" >&6
 if test "${cf_cv_struct_dirent64+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
                cat >conftest.$ac_ext <<_ACEOF
 echo $ECHO_N "checking whether to use struct dirent64... $ECHO_C" >&6
 if test "${cf_cv_struct_dirent64+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
                cat >conftest.$ac_ext <<_ACEOF

-#line 7787 "configure"
+#line 7788 "configure"

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


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

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

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

-  echo "$as_me:7811: \$? = $ac_status" >&5
+  echo "$as_me:7812: \$? = $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:7814: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7815: \"$ac_try\"") >&5

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

-  echo "$as_me:7817: \$? = $ac_status" >&5
+  echo "$as_me:7818: \$? = $ac_status" >&5

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


@@ -7825,7 +7826,7 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi

-echo "$as_me:7828: result: $cf_cv_struct_dirent64" >&5
+echo "$as_me:7829: result: $cf_cv_struct_dirent64" >&5

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


@@ -7834,7 +7835,7 @@ EOF
     fi
 
 ###   use option --disable-tparm-varargs to make tparm() conform to X/Open
     fi
 
 ###   use option --disable-tparm-varargs to make tparm() conform to X/Open

-echo "$as_me:7837: checking if you want tparm not to use X/Open fixed-parameter list" >&5
+echo "$as_me:7838: checking if you want tparm not to use X/Open fixed-parameter list" >&5

 echo $ECHO_N "checking if you want tparm not to use X/Open fixed-parameter list... $ECHO_C" >&6
 
 # Check whether --enable-tparm-varargs or --disable-tparm-varargs was given.
 echo $ECHO_N "checking if you want tparm not to use X/Open fixed-parameter list... $ECHO_C" >&6
 
 # Check whether --enable-tparm-varargs or --disable-tparm-varargs was given.


@@ -7844,13 +7845,13 @@ if test "${enable_tparm_varargs+set}" = set; then
 else
   with_tparm_varargs=yes
 fi;
 else
   with_tparm_varargs=yes
 fi;

-echo "$as_me:7847: result: $with_tparm_varargs" >&5
+echo "$as_me:7848: result: $with_tparm_varargs" >&5

 echo "${ECHO_T}$with_tparm_varargs" >&6
 NCURSES_TPARM_VARARGS=0
 test "$with_tparm_varargs" = yes && NCURSES_TPARM_VARARGS=1
 
 ###   use option --with-bool to override bool's type
 echo "${ECHO_T}$with_tparm_varargs" >&6
 NCURSES_TPARM_VARARGS=0
 test "$with_tparm_varargs" = yes && NCURSES_TPARM_VARARGS=1
 
 ###   use option --with-bool to override bool's type

-echo "$as_me:7853: checking for type of bool" >&5
+echo "$as_me:7854: checking for type of bool" >&5

 echo $ECHO_N "checking for type of bool... $ECHO_C" >&6
 
 # Check whether --with-bool or --without-bool was given.
 echo $ECHO_N "checking for type of bool... $ECHO_C" >&6
 
 # Check whether --with-bool or --without-bool was given.


@@ -7860,10 +7861,10 @@ if test "${with_bool+set}" = set; then
 else
   NCURSES_BOOL=auto
 fi;
 else
   NCURSES_BOOL=auto
 fi;

-echo "$as_me:7863: result: $NCURSES_BOOL" >&5
+echo "$as_me:7864: result: $NCURSES_BOOL" >&5

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

-echo "$as_me:7866: checking for alternate terminal capabilities file" >&5
+echo "$as_me:7867: checking for alternate terminal capabilities file" >&5

 echo $ECHO_N "checking for alternate terminal capabilities file... $ECHO_C" >&6
 
 # Check whether --with-caps or --without-caps was given.
 echo $ECHO_N "checking for alternate terminal capabilities file... $ECHO_C" >&6
 
 # Check whether --with-caps or --without-caps was given.


@@ -7874,11 +7875,11 @@ else
   TERMINFO_CAPS=Caps
 fi;
 test -f "${srcdir}/include/${TERMINFO_CAPS}" || TERMINFO_CAPS=Caps
   TERMINFO_CAPS=Caps
 fi;
 test -f "${srcdir}/include/${TERMINFO_CAPS}" || TERMINFO_CAPS=Caps

-echo "$as_me:7877: result: $TERMINFO_CAPS" >&5
+echo "$as_me:7878: result: $TERMINFO_CAPS" >&5

 echo "${ECHO_T}$TERMINFO_CAPS" >&6
 
 ###   use option --with-chtype to override chtype's type
 echo "${ECHO_T}$TERMINFO_CAPS" >&6
 
 ###   use option --with-chtype to override chtype's type

-echo "$as_me:7881: checking for type of chtype" >&5
+echo "$as_me:7882: checking for type of chtype" >&5

 echo $ECHO_N "checking for type of chtype... $ECHO_C" >&6
 
 # Check whether --with-chtype or --without-chtype was given.
 echo $ECHO_N "checking for type of chtype... $ECHO_C" >&6
 
 # Check whether --with-chtype or --without-chtype was given.


@@ -7888,11 +7889,11 @@ if test "${with_chtype+set}" = set; then
 else
   NCURSES_CHTYPE=auto
 fi;
 else
   NCURSES_CHTYPE=auto
 fi;

-echo "$as_me:7891: result: $NCURSES_CHTYPE" >&5
+echo "$as_me:7892: result: $NCURSES_CHTYPE" >&5

 echo "${ECHO_T}$NCURSES_CHTYPE" >&6
 
 ###   use option --with-ospeed to override ospeed's type
 echo "${ECHO_T}$NCURSES_CHTYPE" >&6
 
 ###   use option --with-ospeed to override ospeed's type

-echo "$as_me:7895: checking for type of ospeed" >&5
+echo "$as_me:7896: checking for type of ospeed" >&5

 echo $ECHO_N "checking for type of ospeed... $ECHO_C" >&6
 
 # Check whether --with-ospeed or --without-ospeed was given.
 echo $ECHO_N "checking for type of ospeed... $ECHO_C" >&6
 
 # Check whether --with-ospeed or --without-ospeed was given.


@@ -7902,11 +7903,11 @@ if test "${with_ospeed+set}" = set; then
 else
   NCURSES_OSPEED=short
 fi;
 else
   NCURSES_OSPEED=short
 fi;

-echo "$as_me:7905: result: $NCURSES_OSPEED" >&5
+echo "$as_me:7906: result: $NCURSES_OSPEED" >&5

 echo "${ECHO_T}$NCURSES_OSPEED" >&6
 
 ###   use option --with-mmask-t to override mmask_t's type
 echo "${ECHO_T}$NCURSES_OSPEED" >&6
 
 ###   use option --with-mmask-t to override mmask_t's type

-echo "$as_me:7909: checking for type of mmask_t" >&5
+echo "$as_me:7910: checking for type of mmask_t" >&5

 echo $ECHO_N "checking for type of mmask_t... $ECHO_C" >&6
 
 # Check whether --with-mmask-t or --without-mmask-t was given.
 echo $ECHO_N "checking for type of mmask_t... $ECHO_C" >&6
 
 # Check whether --with-mmask-t or --without-mmask-t was given.


@@ -7916,11 +7917,11 @@ if test "${with_mmask_t+set}" = set; then
 else
   NCURSES_MMASK_T=auto
 fi;
 else
   NCURSES_MMASK_T=auto
 fi;

-echo "$as_me:7919: result: $NCURSES_MMASK_T" >&5
+echo "$as_me:7920: result: $NCURSES_MMASK_T" >&5

 echo "${ECHO_T}$NCURSES_MMASK_T" >&6
 
 ### Enable compiling-in rcs id's
 echo "${ECHO_T}$NCURSES_MMASK_T" >&6
 
 ### Enable compiling-in rcs id's

-echo "$as_me:7923: checking if RCS identifiers should be compiled-in" >&5
+echo "$as_me:7924: checking if RCS identifiers should be compiled-in" >&5

 echo $ECHO_N "checking if RCS identifiers should be compiled-in... $ECHO_C" >&6
 
 # Check whether --with-rcs-ids or --without-rcs-ids was given.
 echo $ECHO_N "checking if RCS identifiers should be compiled-in... $ECHO_C" >&6
 
 # Check whether --with-rcs-ids or --without-rcs-ids was given.


@@ -7930,7 +7931,7 @@ if test "${with_rcs_ids+set}" = set; then
 else
   with_rcs_ids=no
 fi;
 else
   with_rcs_ids=no
 fi;

-echo "$as_me:7933: result: $with_rcs_ids" >&5
+echo "$as_me:7934: result: $with_rcs_ids" >&5

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


@@ -7938,7 +7939,7 @@ EOF
 
 ###############################################################################
 
 
 ###############################################################################
 

-echo "$as_me:7941: checking format of man-pages" >&5
+echo "$as_me:7942: checking format of man-pages" >&5

 echo $ECHO_N "checking format of man-pages... $ECHO_C" >&6
 
 # Check whether --with-manpage-format or --without-manpage-format was given.
 echo $ECHO_N "checking format of man-pages... $ECHO_C" >&6
 
 # Check whether --with-manpage-format or --without-manpage-format was given.


@@ -8027,14 +8028,14 @@ unknown)
   ;;
 esac
 
   ;;
 esac
 

-echo "$as_me:8030: result: $MANPAGE_FORMAT" >&5
+echo "$as_me:8031: result: $MANPAGE_FORMAT" >&5

 echo "${ECHO_T}$MANPAGE_FORMAT" >&6
 if test -n "$cf_unknown" ; then
 echo "${ECHO_T}$MANPAGE_FORMAT" >&6
 if test -n "$cf_unknown" ; then

-  { echo "$as_me:8033: WARNING: Unexpected manpage-format $cf_unknown" >&5
+  { echo "$as_me:8034: WARNING: Unexpected manpage-format $cf_unknown" >&5

 echo "$as_me: WARNING: Unexpected manpage-format $cf_unknown" >&2;}
 fi
 
 echo "$as_me: WARNING: Unexpected manpage-format $cf_unknown" >&2;}
 fi
 

-echo "$as_me:8037: checking for manpage renaming" >&5
+echo "$as_me:8038: checking for manpage renaming" >&5

 echo $ECHO_N "checking for manpage renaming... $ECHO_C" >&6
 
 # Check whether --with-manpage-renames or --without-manpage-renames was given.
 echo $ECHO_N "checking for manpage renaming... $ECHO_C" >&6
 
 # Check whether --with-manpage-renames or --without-manpage-renames was given.


@@ -8062,7 +8063,7 @@ if test "$MANPAGE_RENAMES" != no ; then
   if test -f $srcdir/man/$MANPAGE_RENAMES ; then
     MANPAGE_RENAMES=`cd $srcdir/man && pwd`/$MANPAGE_RENAMES
   elif test ! -f $MANPAGE_RENAMES ; then
   if test -f $srcdir/man/$MANPAGE_RENAMES ; then
     MANPAGE_RENAMES=`cd $srcdir/man && pwd`/$MANPAGE_RENAMES
   elif test ! -f $MANPAGE_RENAMES ; then

-    { { echo "$as_me:8065: error: not a filename: $MANPAGE_RENAMES" >&5
+    { { echo "$as_me:8066: error: not a filename: $MANPAGE_RENAMES" >&5

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


@@ -8076,10 +8077,10 @@ echo "$as_me: error: not a filename: $MANPAGE_RENAMES" >&2;}
   fi
 fi
 
   fi
 fi
 

-echo "$as_me:8079: result: $MANPAGE_RENAMES" >&5
+echo "$as_me:8080: result: $MANPAGE_RENAMES" >&5

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

-echo "$as_me:8082: checking if manpage aliases will be installed" >&5
+echo "$as_me:8083: checking if manpage aliases will be installed" >&5

 echo $ECHO_N "checking if manpage aliases will be installed... $ECHO_C" >&6
 
 # Check whether --with-manpage-aliases or --without-manpage-aliases was given.
 echo $ECHO_N "checking if manpage aliases will be installed... $ECHO_C" >&6
 
 # Check whether --with-manpage-aliases or --without-manpage-aliases was given.


@@ -8090,7 +8091,7 @@ else
   MANPAGE_ALIASES=yes
 fi;
 
   MANPAGE_ALIASES=yes
 fi;
 

-echo "$as_me:8093: result: $MANPAGE_ALIASES" >&5
+echo "$as_me:8094: result: $MANPAGE_ALIASES" >&5

 echo "${ECHO_T}$MANPAGE_ALIASES" >&6
 
 if test "$LN_S" = "ln -s"; then
 echo "${ECHO_T}$MANPAGE_ALIASES" >&6
 
 if test "$LN_S" = "ln -s"; then


@@ -8101,7 +8102,7 @@ fi
 
 MANPAGE_SYMLINKS=no
 if test "$MANPAGE_ALIASES" = yes ; then
 
 MANPAGE_SYMLINKS=no
 if test "$MANPAGE_ALIASES" = yes ; then

-echo "$as_me:8104: checking if manpage symlinks should be used" >&5
+echo "$as_me:8105: checking if manpage symlinks should be used" >&5

 echo $ECHO_N "checking if manpage symlinks should be used... $ECHO_C" >&6
 
 # Check whether --with-manpage-symlinks or --without-manpage-symlinks was given.
 echo $ECHO_N "checking if manpage symlinks should be used... $ECHO_C" >&6
 
 # Check whether --with-manpage-symlinks or --without-manpage-symlinks was given.


@@ -8114,17 +8115,17 @@ fi;
 
 if test "$$cf_use_symlinks" = no; then
 if test "$MANPAGE_SYMLINKS" = yes ; then
 
 if test "$$cf_use_symlinks" = no; then
 if test "$MANPAGE_SYMLINKS" = yes ; then

-       { echo "$as_me:8117: WARNING: cannot make symlinks" >&5
+       { echo "$as_me:8118: WARNING: cannot make symlinks" >&5

 echo "$as_me: WARNING: cannot make symlinks" >&2;}
        MANPAGE_SYMLINKS=no
 fi
 fi
 
 echo "$as_me: WARNING: cannot make symlinks" >&2;}
        MANPAGE_SYMLINKS=no
 fi
 fi
 

-echo "$as_me:8123: result: $MANPAGE_SYMLINKS" >&5
+echo "$as_me:8124: result: $MANPAGE_SYMLINKS" >&5

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

-echo "$as_me:8127: checking for manpage tbl" >&5
+echo "$as_me:8128: checking for manpage tbl" >&5

 echo $ECHO_N "checking for manpage tbl... $ECHO_C" >&6
 
 # Check whether --with-manpage-tbl or --without-manpage-tbl was given.
 echo $ECHO_N "checking for manpage tbl... $ECHO_C" >&6
 
 # Check whether --with-manpage-tbl or --without-manpage-tbl was given.


@@ -8135,7 +8136,7 @@ else
   MANPAGE_TBL=no
 fi;
 
   MANPAGE_TBL=no
 fi;
 

-echo "$as_me:8138: result: $MANPAGE_TBL" >&5
+echo "$as_me:8139: result: $MANPAGE_TBL" >&5

 echo "${ECHO_T}$MANPAGE_TBL" >&6
 
   if test "$prefix" = "NONE" ; then
 echo "${ECHO_T}$MANPAGE_TBL" >&6
 
   if test "$prefix" = "NONE" ; then


@@ -8446,7 +8447,7 @@ chmod 755 $cf_edit_man
 ###############################################################################
 
 ### Note that some functions (such as const) are normally disabled anyway.
 ###############################################################################
 
 ### Note that some functions (such as const) are normally disabled anyway.

-echo "$as_me:8449: checking if you want to build with function extensions" >&5
+echo "$as_me:8450: checking if you want to build with function extensions" >&5

 echo $ECHO_N "checking if you want to build with function extensions... $ECHO_C" >&6
 
 # Check whether --enable-ext-funcs or --disable-ext-funcs was given.
 echo $ECHO_N "checking if you want to build with function extensions... $ECHO_C" >&6
 
 # Check whether --enable-ext-funcs or --disable-ext-funcs was given.


@@ -8456,7 +8457,7 @@ if test "${enable_ext_funcs+set}" = set; then
 else
   with_ext_funcs=yes
 fi;
 else
   with_ext_funcs=yes
 fi;

-echo "$as_me:8459: result: $with_ext_funcs" >&5
+echo "$as_me:8460: result: $with_ext_funcs" >&5

 echo "${ECHO_T}$with_ext_funcs" >&6
 if test "$with_ext_funcs" = yes ; then
        NCURSES_EXT_FUNCS=1
 echo "${ECHO_T}$with_ext_funcs" >&6
 if test "$with_ext_funcs" = yes ; then
        NCURSES_EXT_FUNCS=1


@@ -8493,7 +8494,7 @@ else
 fi
 
 ###   use option --enable-const to turn on use of const beyond that in XSI.
 fi
 
 ###   use option --enable-const to turn on use of const beyond that in XSI.

-echo "$as_me:8496: checking for extended use of const keyword" >&5
+echo "$as_me:8497: checking for extended use of const keyword" >&5

 echo $ECHO_N "checking for extended use of const keyword... $ECHO_C" >&6
 
 # Check whether --enable-const or --disable-const was given.
 echo $ECHO_N "checking for extended use of const keyword... $ECHO_C" >&6
 
 # Check whether --enable-const or --disable-const was given.


@@ -8503,7 +8504,7 @@ if test "${enable_const+set}" = set; then
 else
   with_ext_const=no
 fi;
 else
   with_ext_const=no
 fi;

-echo "$as_me:8506: result: $with_ext_const" >&5
+echo "$as_me:8507: result: $with_ext_const" >&5

 echo "${ECHO_T}$with_ext_const" >&6
 NCURSES_CONST='/*nothing*/'
 if test "$with_ext_const" = yes ; then
 echo "${ECHO_T}$with_ext_const" >&6
 NCURSES_CONST='/*nothing*/'
 if test "$with_ext_const" = yes ; then


@@ -8511,7 +8512,7 @@ if test "$with_ext_const" = yes ; then
 fi
 
 ###   use option --enable-ext-colors to turn on use of colors beyond 16.
 fi
 
 ###   use option --enable-ext-colors to turn on use of colors beyond 16.

-echo "$as_me:8514: checking if you want to use extended colors" >&5
+echo "$as_me:8515: checking if you want to use extended colors" >&5

 echo $ECHO_N "checking if you want to use extended colors... $ECHO_C" >&6
 
 # Check whether --enable-ext-colors or --disable-ext-colors was given.
 echo $ECHO_N "checking if you want to use extended colors... $ECHO_C" >&6
 
 # Check whether --enable-ext-colors or --disable-ext-colors was given.


@@ -8521,12 +8522,12 @@ if test "${enable_ext_colors+set}" = set; then
 else
   with_ext_colors=no
 fi;
 else
   with_ext_colors=no
 fi;

-echo "$as_me:8524: result: $with_ext_colors" >&5
+echo "$as_me:8525: result: $with_ext_colors" >&5

 echo "${ECHO_T}$with_ext_colors" >&6
 NCURSES_EXT_COLORS=0
 if test "$with_ext_colors" = yes ; then
        if test "$with_widec" != yes ; then
 echo "${ECHO_T}$with_ext_colors" >&6
 NCURSES_EXT_COLORS=0
 if test "$with_ext_colors" = yes ; then
        if test "$with_widec" != yes ; then

-               { { echo "$as_me:8529: error: This option applies only to wide-character library" >&5
+               { { echo "$as_me:8530: error: This option applies only to wide-character library" >&5

 echo "$as_me: error: This option applies only to wide-character library" >&2;}
    { (exit 1); exit 1; }; }
        else
 echo "$as_me: error: This option applies only to wide-character library" >&2;}
    { (exit 1); exit 1; }; }
        else


@@ -8537,7 +8538,7 @@ if test "${with_abi_version+set}" != set; then
        5.*)
                cf_cv_rel_version=6.0
                cf_cv_abi_version=6
        5.*)
                cf_cv_rel_version=6.0
                cf_cv_abi_version=6

-               { echo "$as_me:8540: WARNING: Overriding ABI version to $cf_cv_abi_version" >&5
+               { echo "$as_me:8541: WARNING: Overriding ABI version to $cf_cv_abi_version" >&5

 echo "$as_me: WARNING: Overriding ABI version to $cf_cv_abi_version" >&2;}
                ;;
        esac
 echo "$as_me: WARNING: Overriding ABI version to $cf_cv_abi_version" >&2;}
                ;;
        esac


@@ -8552,7 +8553,7 @@ EOF
 fi
 
 ###   use option --enable-ext-mouse to modify coding to support 5-button mice
 fi
 
 ###   use option --enable-ext-mouse to modify coding to support 5-button mice

-echo "$as_me:8555: checking if you want to use extended mouse encoding" >&5
+echo "$as_me:8556: checking if you want to use extended mouse encoding" >&5

 echo $ECHO_N "checking if you want to use extended mouse encoding... $ECHO_C" >&6
 
 # Check whether --enable-ext-mouse or --disable-ext-mouse was given.
 echo $ECHO_N "checking if you want to use extended mouse encoding... $ECHO_C" >&6
 
 # Check whether --enable-ext-mouse or --disable-ext-mouse was given.


@@ -8562,7 +8563,7 @@ if test "${enable_ext_mouse+set}" = set; then
 else
   with_ext_mouse=no
 fi;
 else
   with_ext_mouse=no
 fi;

-echo "$as_me:8565: result: $with_ext_mouse" >&5
+echo "$as_me:8566: result: $with_ext_mouse" >&5

 echo "${ECHO_T}$with_ext_mouse" >&6
 NCURSES_MOUSE_VERSION=1
 if test "$with_ext_mouse" = yes ; then
 echo "${ECHO_T}$with_ext_mouse" >&6
 NCURSES_MOUSE_VERSION=1
 if test "$with_ext_mouse" = yes ; then


@@ -8573,7 +8574,7 @@ if test "${with_abi_version+set}" != set; then
        5.*)
                cf_cv_rel_version=6.0
                cf_cv_abi_version=6
        5.*)
                cf_cv_rel_version=6.0
                cf_cv_abi_version=6

-               { echo "$as_me:8576: WARNING: Overriding ABI version to $cf_cv_abi_version" >&5
+               { echo "$as_me:8577: WARNING: Overriding ABI version to $cf_cv_abi_version" >&5

 echo "$as_me: WARNING: Overriding ABI version to $cf_cv_abi_version" >&2;}
                ;;
        esac
 echo "$as_me: WARNING: Overriding ABI version to $cf_cv_abi_version" >&2;}
                ;;
        esac


@@ -8581,7 +8582,7 @@ fi
 
 fi
 
 
 fi
 

-echo "$as_me:8584: checking if you want \$NCURSES_NO_PADDING code" >&5
+echo "$as_me:8585: checking if you want \$NCURSES_NO_PADDING code" >&5

 echo $ECHO_N "checking if you want \$NCURSES_NO_PADDING code... $ECHO_C" >&6
 
 # Check whether --enable-no-padding or --disable-no-padding was given.
 echo $ECHO_N "checking if you want \$NCURSES_NO_PADDING code... $ECHO_C" >&6
 
 # Check whether --enable-no-padding or --disable-no-padding was given.


@@ -8591,19 +8592,19 @@ if test "${enable_no_padding+set}" = set; then
 else
   with_no_padding=$with_ext_funcs
 fi;
 else
   with_no_padding=$with_ext_funcs
 fi;

-echo "$as_me:8594: result: $with_no_padding" >&5
+echo "$as_me:8595: result: $with_no_padding" >&5

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

-echo "$as_me:8600: checking for ANSI C header files" >&5
+echo "$as_me:8601: checking for ANSI C header files" >&5

 echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6
 if test "${ac_cv_header_stdc+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6
 if test "${ac_cv_header_stdc+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF

-#line 8606 "configure"
+#line 8607 "configure"

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


@@ -8611,13 +8612,13 @@ else
 #include <float.h>
 
 _ACEOF
 #include <float.h>
 
 _ACEOF

-if { (eval echo "$as_me:8614: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:8615: \"$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:8620: \$? = $ac_status" >&5
+  echo "$as_me:8621: \$? = $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


@@ -8639,7 +8640,7 @@ rm -f conftest.err conftest.$ac_ext
 if test $ac_cv_header_stdc = yes; then
   # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
   cat >conftest.$ac_ext <<_ACEOF
 if test $ac_cv_header_stdc = yes; then
   # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
   cat >conftest.$ac_ext <<_ACEOF

-#line 8642 "configure"
+#line 8643 "configure"

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


@@ -8657,7 +8658,7 @@ fi
 if test $ac_cv_header_stdc = yes; then
   # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
   cat >conftest.$ac_ext <<_ACEOF
 if test $ac_cv_header_stdc = yes; then
   # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
   cat >conftest.$ac_ext <<_ACEOF

-#line 8660 "configure"
+#line 8661 "configure"

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


@@ -8678,7 +8679,7 @@ if test $ac_cv_header_stdc = yes; then
   :
 else
   cat >conftest.$ac_ext <<_ACEOF
   :
 else
   cat >conftest.$ac_ext <<_ACEOF

-#line 8681 "configure"
+#line 8682 "configure"

 #include "confdefs.h"
 #include <ctype.h>
 #if ((' ' & 0x0FF) == 0x020)
 #include "confdefs.h"
 #include <ctype.h>
 #if ((' ' & 0x0FF) == 0x020)


@@ -8704,15 +8705,15 @@ main ()
 }
 _ACEOF
 rm -f conftest$ac_exeext
 }
 _ACEOF
 rm -f conftest$ac_exeext

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

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

-  echo "$as_me:8710: \$? = $ac_status" >&5
+  echo "$as_me:8711: \$? = $ac_status" >&5

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

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

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

-  echo "$as_me:8715: \$? = $ac_status" >&5
+  echo "$as_me:8716: \$? = $ac_status" >&5

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


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

-echo "$as_me:8728: result: $ac_cv_header_stdc" >&5
+echo "$as_me:8729: result: $ac_cv_header_stdc" >&5

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


@@ -8741,28 +8742,28 @@ for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \
                   inttypes.h stdint.h unistd.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
                   inttypes.h stdint.h unistd.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`

-echo "$as_me:8744: checking for $ac_header" >&5
+echo "$as_me:8745: 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 8750 "configure"
+#line 8751 "configure"

 #include "confdefs.h"
 $ac_includes_default
 #include <$ac_header>
 _ACEOF
 rm -f conftest.$ac_objext
 #include "confdefs.h"
 $ac_includes_default
 #include <$ac_header>
 _ACEOF
 rm -f conftest.$ac_objext

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

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

-  echo "$as_me:8759: \$? = $ac_status" >&5
+  echo "$as_me:8760: \$? = $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:8762: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8763: \"$ac_try\"") >&5

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

-  echo "$as_me:8765: \$? = $ac_status" >&5
+  echo "$as_me:8766: \$? = $ac_status" >&5

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


@@ -8772,7 +8773,7 @@ eval "$as_ac_Header=no"
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi

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


@@ -8782,13 +8783,13 @@ EOF
 fi
 done
 
 fi
 done
 

-echo "$as_me:8785: checking for signed char" >&5
+echo "$as_me:8786: checking for signed char" >&5

 echo $ECHO_N "checking for signed char... $ECHO_C" >&6
 if test "${ac_cv_type_signed_char+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 echo $ECHO_N "checking for signed char... $ECHO_C" >&6
 if test "${ac_cv_type_signed_char+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF

-#line 8791 "configure"
+#line 8792 "configure"

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


@@ -8803,16 +8804,16 @@ if (sizeof (signed char))
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

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

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

-  echo "$as_me:8809: \$? = $ac_status" >&5
+  echo "$as_me:8810: \$? = $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:8812: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8813: \"$ac_try\"") >&5

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

-  echo "$as_me:8815: \$? = $ac_status" >&5
+  echo "$as_me:8816: \$? = $ac_status" >&5

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


@@ -8822,10 +8823,10 @@ ac_cv_type_signed_char=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi

-echo "$as_me:8825: result: $ac_cv_type_signed_char" >&5
+echo "$as_me:8826: result: $ac_cv_type_signed_char" >&5

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

-echo "$as_me:8828: checking size of signed char" >&5
+echo "$as_me:8829: checking size of signed char" >&5

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


@@ -8834,7 +8835,7 @@ else
   if test "$cross_compiling" = yes; then
   # Depending upon the size, compute the lo and hi bounds.
 cat >conftest.$ac_ext <<_ACEOF
   if test "$cross_compiling" = yes; then
   # Depending upon the size, compute the lo and hi bounds.
 cat >conftest.$ac_ext <<_ACEOF

-#line 8837 "configure"
+#line 8838 "configure"

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


@@ -8846,21 +8847,21 @@ int _array_ [1 - 2 * !((sizeof (signed char)) >= 0)]
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

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

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

-  echo "$as_me:8852: \$? = $ac_status" >&5
+  echo "$as_me:8853: \$? = $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:8855: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8856: \"$ac_try\"") >&5

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

-  echo "$as_me:8858: \$? = $ac_status" >&5
+  echo "$as_me:8859: \$? = $ac_status" >&5

   (exit $ac_status); }; }; then
   ac_lo=0 ac_mid=0
   while :; do
     cat >conftest.$ac_ext <<_ACEOF
   (exit $ac_status); }; }; then
   ac_lo=0 ac_mid=0
   while :; do
     cat >conftest.$ac_ext <<_ACEOF

-#line 8863 "configure"
+#line 8864 "configure"

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


@@ -8872,16 +8873,16 @@ int _array_ [1 - 2 * !((sizeof (signed char)) <= $ac_mid)]
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

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

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

-  echo "$as_me:8878: \$? = $ac_status" >&5
+  echo "$as_me:8879: \$? = $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:8881: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8882: \"$ac_try\"") >&5

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

-  echo "$as_me:8884: \$? = $ac_status" >&5
+  echo "$as_me:8885: \$? = $ac_status" >&5

   (exit $ac_status); }; }; then
   ac_hi=$ac_mid; break
 else
   (exit $ac_status); }; }; then
   ac_hi=$ac_mid; break
 else


@@ -8897,7 +8898,7 @@ cat conftest.$ac_ext >&5
 ac_hi=-1 ac_mid=-1
   while :; do
     cat >conftest.$ac_ext <<_ACEOF
 ac_hi=-1 ac_mid=-1
   while :; do
     cat >conftest.$ac_ext <<_ACEOF

-#line 8900 "configure"
+#line 8901 "configure"

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


@@ -8909,16 +8910,16 @@ int _array_ [1 - 2 * !((sizeof (signed char)) >= $ac_mid)]
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

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

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

-  echo "$as_me:8915: \$? = $ac_status" >&5
+  echo "$as_me:8916: \$? = $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:8918: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8919: \"$ac_try\"") >&5

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

-  echo "$as_me:8921: \$? = $ac_status" >&5
+  echo "$as_me:8922: \$? = $ac_status" >&5

   (exit $ac_status); }; }; then
   ac_lo=$ac_mid; break
 else
   (exit $ac_status); }; }; then
   ac_lo=$ac_mid; break
 else


@@ -8934,7 +8935,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 while test "x$ac_lo" != "x$ac_hi"; do
   ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
   cat >conftest.$ac_ext <<_ACEOF
 while test "x$ac_lo" != "x$ac_hi"; do
   ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
   cat >conftest.$ac_ext <<_ACEOF

-#line 8937 "configure"
+#line 8938 "configure"

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


@@ -8946,16 +8947,16 @@ int _array_ [1 - 2 * !((sizeof (signed char)) <= $ac_mid)]
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

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

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

-  echo "$as_me:8952: \$? = $ac_status" >&5
+  echo "$as_me:8953: \$? = $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:8955: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8956: \"$ac_try\"") >&5

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

-  echo "$as_me:8958: \$? = $ac_status" >&5
+  echo "$as_me:8959: \$? = $ac_status" >&5

   (exit $ac_status); }; }; then
   ac_hi=$ac_mid
 else
   (exit $ac_status); }; }; then
   ac_hi=$ac_mid
 else


@@ -8968,12 +8969,12 @@ done
 ac_cv_sizeof_signed_char=$ac_lo
 else
   if test "$cross_compiling" = yes; then
 ac_cv_sizeof_signed_char=$ac_lo
 else
   if test "$cross_compiling" = yes; then

-  { { echo "$as_me:8971: error: cannot run test program while cross compiling" >&5
+  { { echo "$as_me:8972: error: cannot run test program while cross compiling" >&5

 echo "$as_me: error: cannot run test program while cross compiling" >&2;}
    { (exit 1); exit 1; }; }
 else
   cat >conftest.$ac_ext <<_ACEOF
 echo "$as_me: error: cannot run test program while cross compiling" >&2;}
    { (exit 1); exit 1; }; }
 else
   cat >conftest.$ac_ext <<_ACEOF

-#line 8976 "configure"
+#line 8977 "configure"

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


@@ -8989,15 +8990,15 @@ fclose (f);
 }
 _ACEOF
 rm -f conftest$ac_exeext
 }
 _ACEOF
 rm -f conftest$ac_exeext

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

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

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

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

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

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

-  echo "$as_me:9000: \$? = $ac_status" >&5
+  echo "$as_me:9001: \$? = $ac_status" >&5

   (exit $ac_status); }; }; then
   ac_cv_sizeof_signed_char=`cat conftest.val`
 else
   (exit $ac_status); }; }; then
   ac_cv_sizeof_signed_char=`cat conftest.val`
 else


@@ -9013,7 +9014,7 @@ else
   ac_cv_sizeof_signed_char=0
 fi
 fi
   ac_cv_sizeof_signed_char=0
 fi
 fi

-echo "$as_me:9016: result: $ac_cv_sizeof_signed_char" >&5
+echo "$as_me:9017: result: $ac_cv_sizeof_signed_char" >&5

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


@@ -9024,7 +9025,7 @@ if test "$ac_cv_sizeof_signed_char" = 1 ; then
 else
        NCURSES_SBOOL="char"
 fi
 else
        NCURSES_SBOOL="char"
 fi

-echo "$as_me:9027: checking if you want to use signed Boolean array in term.h" >&5
+echo "$as_me:9028: checking if you want to use signed Boolean array in term.h" >&5

 echo $ECHO_N "checking if you want to use signed Boolean array in term.h... $ECHO_C" >&6
 
 # Check whether --enable-signed-char or --disable-signed-char was given.
 echo $ECHO_N "checking if you want to use signed Boolean array in term.h... $ECHO_C" >&6
 
 # Check whether --enable-signed-char or --disable-signed-char was given.


@@ -9034,12 +9035,12 @@ if test "${enable_signed_char+set}" = set; then
 else
   with_signed_char=no
 fi;
 else
   with_signed_char=no
 fi;

-echo "$as_me:9037: result: $with_signed_char" >&5
+echo "$as_me:9038: result: $with_signed_char" >&5

 echo "${ECHO_T}$with_signed_char" >&6
 test "$with_signed_char" != yes && NCURSES_SBOOL="char"
 
 ###   use option --enable-sigwinch to turn on use of SIGWINCH logic
 echo "${ECHO_T}$with_signed_char" >&6
 test "$with_signed_char" != yes && NCURSES_SBOOL="char"
 
 ###   use option --enable-sigwinch to turn on use of SIGWINCH logic

-echo "$as_me:9042: checking if you want SIGWINCH handler" >&5
+echo "$as_me:9043: checking if you want SIGWINCH handler" >&5

 echo $ECHO_N "checking if you want SIGWINCH handler... $ECHO_C" >&6
 
 # Check whether --enable-sigwinch or --disable-sigwinch was given.
 echo $ECHO_N "checking if you want SIGWINCH handler... $ECHO_C" >&6
 
 # Check whether --enable-sigwinch or --disable-sigwinch was given.


@@ -9049,14 +9050,14 @@ if test "${enable_sigwinch+set}" = set; then
 else
   with_sigwinch=$with_ext_funcs
 fi;
 else
   with_sigwinch=$with_ext_funcs
 fi;

-echo "$as_me:9052: result: $with_sigwinch" >&5
+echo "$as_me:9053: result: $with_sigwinch" >&5

 echo "${ECHO_T}$with_sigwinch" >&6
 test "$with_sigwinch" = yes && cat >>confdefs.h <<\EOF
 #define USE_SIGWINCH 1
 EOF
 
 ###   use option --enable-tcap-names to allow user to define new capabilities
 echo "${ECHO_T}$with_sigwinch" >&6
 test "$with_sigwinch" = yes && cat >>confdefs.h <<\EOF
 #define USE_SIGWINCH 1
 EOF
 
 ###   use option --enable-tcap-names to allow user to define new capabilities

-echo "$as_me:9059: checking if you want user-definable terminal capabilities like termcap" >&5
+echo "$as_me:9060: checking if you want user-definable terminal capabilities like termcap" >&5

 echo $ECHO_N "checking if you want user-definable terminal capabilities like termcap... $ECHO_C" >&6
 
 # Check whether --enable-tcap-names or --disable-tcap-names was given.
 echo $ECHO_N "checking if you want user-definable terminal capabilities like termcap... $ECHO_C" >&6
 
 # Check whether --enable-tcap-names or --disable-tcap-names was given.


@@ -9066,7 +9067,7 @@ if test "${enable_tcap_names+set}" = set; then
 else
   with_tcap_names=$with_ext_funcs
 fi;
 else
   with_tcap_names=$with_ext_funcs
 fi;

-echo "$as_me:9069: result: $with_tcap_names" >&5
+echo "$as_me:9070: result: $with_tcap_names" >&5

 echo "${ECHO_T}$with_tcap_names" >&6
 NCURSES_XNAMES=0
 test "$with_tcap_names" = yes && NCURSES_XNAMES=1
 echo "${ECHO_T}$with_tcap_names" >&6
 NCURSES_XNAMES=0
 test "$with_tcap_names" = yes && NCURSES_XNAMES=1


@@ -9074,7 +9075,7 @@ test "$with_tcap_names" = yes && NCURSES_XNAMES=1
 ###############################################################################
 # These options are relatively safe to experiment with.
 
 ###############################################################################
 # These options are relatively safe to experiment with.
 

-echo "$as_me:9077: checking if you want all development code" >&5
+echo "$as_me:9078: checking if you want all development code" >&5

 echo $ECHO_N "checking if you want all development code... $ECHO_C" >&6
 
 # Check whether --with-develop or --without-develop was given.
 echo $ECHO_N "checking if you want all development code... $ECHO_C" >&6
 
 # Check whether --with-develop or --without-develop was given.


@@ -9084,11 +9085,11 @@ if test "${with_develop+set}" = set; then
 else
   with_develop=no
 fi;
 else
   with_develop=no
 fi;

-echo "$as_me:9087: result: $with_develop" >&5
+echo "$as_me:9088: result: $with_develop" >&5

 echo "${ECHO_T}$with_develop" >&6
 
 ###   use option --enable-hard-tabs to turn on use of hard-tabs optimize
 echo "${ECHO_T}$with_develop" >&6
 
 ###   use option --enable-hard-tabs to turn on use of hard-tabs optimize

-echo "$as_me:9091: checking if you want hard-tabs code" >&5
+echo "$as_me:9092: checking if you want hard-tabs code" >&5

 echo $ECHO_N "checking if you want hard-tabs code... $ECHO_C" >&6
 
 # Check whether --enable-hard-tabs or --disable-hard-tabs was given.
 echo $ECHO_N "checking if you want hard-tabs code... $ECHO_C" >&6
 
 # Check whether --enable-hard-tabs or --disable-hard-tabs was given.


@@ -9098,14 +9099,14 @@ if test "${enable_hard_tabs+set}" = set; then
 else
   enable_hard_tabs=$with_develop
 fi;
 else
   enable_hard_tabs=$with_develop
 fi;

-echo "$as_me:9101: result: $enable_hard_tabs" >&5
+echo "$as_me:9102: result: $enable_hard_tabs" >&5

 echo "${ECHO_T}$enable_hard_tabs" >&6
 test "$enable_hard_tabs" = yes && cat >>confdefs.h <<\EOF
 #define USE_HARD_TABS 1
 EOF
 
 ###   use option --enable-xmc-glitch to turn on use of magic-cookie optimize
 echo "${ECHO_T}$enable_hard_tabs" >&6
 test "$enable_hard_tabs" = yes && cat >>confdefs.h <<\EOF
 #define USE_HARD_TABS 1
 EOF
 
 ###   use option --enable-xmc-glitch to turn on use of magic-cookie optimize

-echo "$as_me:9108: checking if you want limited support for xmc" >&5
+echo "$as_me:9109: checking if you want limited support for xmc" >&5

 echo $ECHO_N "checking if you want limited support for xmc... $ECHO_C" >&6
 
 # Check whether --enable-xmc-glitch or --disable-xmc-glitch was given.
 echo $ECHO_N "checking if you want limited support for xmc... $ECHO_C" >&6
 
 # Check whether --enable-xmc-glitch or --disable-xmc-glitch was given.


@@ -9115,7 +9116,7 @@ if test "${enable_xmc_glitch+set}" = set; then
 else
   enable_xmc_glitch=$with_develop
 fi;
 else
   enable_xmc_glitch=$with_develop
 fi;

-echo "$as_me:9118: result: $enable_xmc_glitch" >&5
+echo "$as_me:9119: result: $enable_xmc_glitch" >&5

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


@@ -9124,7 +9125,7 @@ EOF
 ###############################################################################
 # These are just experimental, probably should not be in a package:
 
 ###############################################################################
 # These are just experimental, probably should not be in a package:
 

-echo "$as_me:9127: checking if you do not want to assume colors are white-on-black" >&5
+echo "$as_me:9128: checking if you do not want to assume colors are white-on-black" >&5

 echo $ECHO_N "checking if you do not want to assume colors are white-on-black... $ECHO_C" >&6
 
 # Check whether --enable-assumed-color or --disable-assumed-color was given.
 echo $ECHO_N "checking if you do not want to assume colors are white-on-black... $ECHO_C" >&6
 
 # Check whether --enable-assumed-color or --disable-assumed-color was given.


@@ -9134,14 +9135,14 @@ if test "${enable_assumed_color+set}" = set; then
 else
   with_assumed_color=yes
 fi;
 else
   with_assumed_color=yes
 fi;

-echo "$as_me:9137: result: $with_assumed_color" >&5
+echo "$as_me:9138: result: $with_assumed_color" >&5

 echo "${ECHO_T}$with_assumed_color" >&6
 test "$with_assumed_color" = yes && cat >>confdefs.h <<\EOF
 #define USE_ASSUMED_COLOR 1
 EOF
 
 ###   use option --enable-hashmap to turn on use of hashmap scrolling logic
 echo "${ECHO_T}$with_assumed_color" >&6
 test "$with_assumed_color" = yes && cat >>confdefs.h <<\EOF
 #define USE_ASSUMED_COLOR 1
 EOF
 
 ###   use option --enable-hashmap to turn on use of hashmap scrolling logic

-echo "$as_me:9144: checking if you want hashmap scrolling-optimization code" >&5
+echo "$as_me:9145: checking if you want hashmap scrolling-optimization code" >&5

 echo $ECHO_N "checking if you want hashmap scrolling-optimization code... $ECHO_C" >&6
 
 # Check whether --enable-hashmap or --disable-hashmap was given.
 echo $ECHO_N "checking if you want hashmap scrolling-optimization code... $ECHO_C" >&6
 
 # Check whether --enable-hashmap or --disable-hashmap was given.


@@ -9151,14 +9152,14 @@ if test "${enable_hashmap+set}" = set; then
 else
   with_hashmap=yes
 fi;
 else
   with_hashmap=yes
 fi;

-echo "$as_me:9154: result: $with_hashmap" >&5
+echo "$as_me:9155: result: $with_hashmap" >&5

 echo "${ECHO_T}$with_hashmap" >&6
 test "$with_hashmap" = yes && cat >>confdefs.h <<\EOF
 #define USE_HASHMAP 1
 EOF
 
 ###   use option --enable-colorfgbg to turn on use of $COLORFGBG environment
 echo "${ECHO_T}$with_hashmap" >&6
 test "$with_hashmap" = yes && cat >>confdefs.h <<\EOF
 #define USE_HASHMAP 1
 EOF
 
 ###   use option --enable-colorfgbg to turn on use of $COLORFGBG environment

-echo "$as_me:9161: checking if you want colorfgbg code" >&5
+echo "$as_me:9162: checking if you want colorfgbg code" >&5

 echo $ECHO_N "checking if you want colorfgbg code... $ECHO_C" >&6
 
 # Check whether --enable-colorfgbg or --disable-colorfgbg was given.
 echo $ECHO_N "checking if you want colorfgbg code... $ECHO_C" >&6
 
 # Check whether --enable-colorfgbg or --disable-colorfgbg was given.


@@ -9168,7 +9169,7 @@ if test "${enable_colorfgbg+set}" = set; then
 else
   with_colorfgbg=no
 fi;
 else
   with_colorfgbg=no
 fi;

-echo "$as_me:9171: result: $with_colorfgbg" >&5
+echo "$as_me:9172: result: $with_colorfgbg" >&5

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


@@ -9177,7 +9178,7 @@ EOF
 # This is still experimental (20080329), but should ultimately be moved to
 # the script-block --with-normal, etc.
 
 # This is still experimental (20080329), but should ultimately be moved to
 # the script-block --with-normal, etc.
 

-echo "$as_me:9180: checking if you want to link with the pthread library" >&5
+echo "$as_me:9181: checking if you want to link with the pthread library" >&5

 echo $ECHO_N "checking if you want to link with the pthread library... $ECHO_C" >&6
 
 # Check whether --with-pthread or --without-pthread was given.
 echo $ECHO_N "checking if you want to link with the pthread library... $ECHO_C" >&6
 
 # Check whether --with-pthread or --without-pthread was given.


@@ -9187,27 +9188,27 @@ if test "${with_pthread+set}" = set; then
 else
   with_pthread=no
 fi;
 else
   with_pthread=no
 fi;

-echo "$as_me:9190: result: $with_pthread" >&5
+echo "$as_me:9191: result: $with_pthread" >&5

 echo "${ECHO_T}$with_pthread" >&6
 
 if test "$with_pthread" != no ; then
 echo "${ECHO_T}$with_pthread" >&6
 
 if test "$with_pthread" != no ; then

-    echo "$as_me:9194: checking for pthread.h" >&5
+    echo "$as_me:9195: checking for pthread.h" >&5

 echo $ECHO_N "checking for pthread.h... $ECHO_C" >&6
 if test "${ac_cv_header_pthread_h+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 echo $ECHO_N "checking for pthread.h... $ECHO_C" >&6
 if test "${ac_cv_header_pthread_h+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF

-#line 9200 "configure"
+#line 9201 "configure"

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

-if { (eval echo "$as_me:9204: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:9205: \"$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:9210: \$? = $ac_status" >&5
+  echo "$as_me:9211: \$? = $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


@@ -9226,7 +9227,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
 fi
 rm -f conftest.err conftest.$ac_ext
 fi

-echo "$as_me:9229: result: $ac_cv_header_pthread_h" >&5
+echo "$as_me:9230: result: $ac_cv_header_pthread_h" >&5

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


@@ -9234,7 +9235,7 @@ if test $ac_cv_header_pthread_h = yes; then
 #define HAVE_PTHREADS_H 1
 EOF
 
 #define HAVE_PTHREADS_H 1
 EOF
 

-        echo "$as_me:9237: checking for pthread_create in -lpthread" >&5
+        echo "$as_me:9238: checking for pthread_create in -lpthread" >&5

 echo $ECHO_N "checking for pthread_create in -lpthread... $ECHO_C" >&6
 if test "${ac_cv_lib_pthread_pthread_create+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 echo $ECHO_N "checking for pthread_create in -lpthread... $ECHO_C" >&6
 if test "${ac_cv_lib_pthread_pthread_create+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6


@@ -9242,7 +9243,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lpthread  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lpthread  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF

-#line 9245 "configure"
+#line 9246 "configure"

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


@@ -9261,16 +9262,16 @@ pthread_create ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext

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

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

-  echo "$as_me:9267: \$? = $ac_status" >&5
+  echo "$as_me:9268: \$? = $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:9270: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9271: \"$ac_try\"") >&5

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

-  echo "$as_me:9273: \$? = $ac_status" >&5
+  echo "$as_me:9274: \$? = $ac_status" >&5

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


@@ -9281,7 +9282,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi

-echo "$as_me:9284: result: $ac_cv_lib_pthread_pthread_create" >&5
+echo "$as_me:9285: result: $ac_cv_lib_pthread_pthread_create" >&5

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


@@ -9294,7 +9295,7 @@ EOF
 
 else
 
 
 else
 

-            { { echo "$as_me:9297: error: Cannot link with pthread library" >&5
+            { { echo "$as_me:9298: error: Cannot link with pthread library" >&5

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


@@ -9304,19 +9305,101 @@ fi
 
 fi
 
 
 fi
 

+# Check whether --enable-weak-symbols or --disable-weak-symbols was given.
+if test "${enable_weak_symbols+set}" = set; then
+  enableval="$enable_weak_symbols"
+  use_weak_symbols=$withval
+else
+  use_weak_symbols=no
+fi;
+echo "$as_me:9315: result: $use_weak_symbols" >&5
+echo "${ECHO_T}$use_weak_symbols" >&6
+if test "$use_weak_symbols" = yes ; then
+
+echo "$as_me:9319: checking if $CC supports weak symbols" >&5
+echo $ECHO_N "checking if $CC supports weak symbols... $ECHO_C" >&6
+if test "${cf_cv_weak_symbols+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+
+cat >conftest.$ac_ext <<_ACEOF
+#line 9326 "configure"
+#include "confdefs.h"
+
+#include <stdio.h>
+int
+main ()
+{
+
+#if defined(__GNUC__)
+#  if defined __USE_ISOC99
+#    define _cat_pragma(exp)   _Pragma(#exp)
+#    define _weak_pragma(exp)  _cat_pragma(weak name)
+#  else
+#    define _weak_pragma(exp)
+#  endif
+#  define _declare(name)       __extension__ extern __typeof__(name) name
+#  define weak_symbol(name)    _weak_pragma(name) _declare(name) __attribute__((weak))
+#endif
+
+weak_symbol(fopen);
+
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:9352: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  echo "$as_me:9355: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:9358: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:9361: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  cf_cv_weak_symbols=yes
+else
+  echo "$as_me: failed program was:" >&5
+cat conftest.$ac_ext >&5
+cf_cv_weak_symbols=no
+fi
+rm -f conftest.$ac_objext conftest.$ac_ext
+
+fi
+echo "$as_me:9372: result: $cf_cv_weak_symbols" >&5
+echo "${ECHO_T}$cf_cv_weak_symbols" >&6
+
+else
+    cf_cv_weak_symbols=no
+fi
+
+if test $cf_cv_weak_symbols = yes ; then
+    cat >>confdefs.h <<\EOF
+#define USE_WEAK_SYMBOLS 1
+EOF
+
+fi
+
+PTHREAD=

 if test "$with_pthread" = "yes" ; then
     cat >>confdefs.h <<\EOF
 #define USE_PTHREADS 1
 EOF
 
     enable_reentrant=yes
 if test "$with_pthread" = "yes" ; then
     cat >>confdefs.h <<\EOF
 #define USE_PTHREADS 1
 EOF
 
     enable_reentrant=yes

+    if test $cf_cv_weak_symbols = yes ; then
+        PTHREAD=-lpthread
+    fi

 fi
 
 # Reentrant code has to be opaque; there's little advantage to making ncurses
 # opaque outside of that, so there is no --enable-opaque option.  We can use
 # this option without --with-pthreads, but this will be always set for
 # pthreads.
 fi
 
 # Reentrant code has to be opaque; there's little advantage to making ncurses
 # opaque outside of that, so there is no --enable-opaque option.  We can use
 # this option without --with-pthreads, but this will be always set for
 # pthreads.

-echo "$as_me:9319: checking if you want experimental reentrant code" >&5
+echo "$as_me:9402: checking if you want experimental reentrant code" >&5

 echo $ECHO_N "checking if you want experimental reentrant code... $ECHO_C" >&6
 
 # Check whether --enable-reentrant or --disable-reentrant was given.
 echo $ECHO_N "checking if you want experimental reentrant code... $ECHO_C" >&6
 
 # Check whether --enable-reentrant or --disable-reentrant was given.


@@ -9326,14 +9409,21 @@ if test "${enable_reentrant+set}" = set; then
 else
   with_reentrant=no
 fi;
 else
   with_reentrant=no
 fi;

-echo "$as_me:9329: result: $with_reentrant" >&5
+echo "$as_me:9412: result: $with_reentrant" >&5

 echo "${ECHO_T}$with_reentrant" >&6
 if test "$with_reentrant" = yes ; then
        cf_cv_enable_reentrant=1
        cf_cv_enable_opaque="NCURSES_INTERNALS"
        NCURSES_OPAQUE=1
        NCURSES_SIZE_T=int
 echo "${ECHO_T}$with_reentrant" >&6
 if test "$with_reentrant" = yes ; then
        cf_cv_enable_reentrant=1
        cf_cv_enable_opaque="NCURSES_INTERNALS"
        NCURSES_OPAQUE=1
        NCURSES_SIZE_T=int

-       LIB_SUFFIX="t${LIB_SUFFIX}"
+    if test $cf_cv_weak_symbols = yes ; then
+
+# remove pthread library from $LIBS
+LIBS=`echo "$LIBS" | sed -e 's/-lpthread[      ]//g' -e 's/-lpthread$//'`
+
+    else
+        LIB_SUFFIX="t${LIB_SUFFIX}"
+    fi

        cat >>confdefs.h <<\EOF
 #define USE_REENTRANT 1
 EOF
        cat >>confdefs.h <<\EOF
 #define USE_REENTRANT 1
 EOF


@@ -9343,7 +9433,7 @@ if test "${with_abi_version+set}" != set; then
        5.*)
                cf_cv_rel_version=6.0
                cf_cv_abi_version=6
        5.*)
                cf_cv_rel_version=6.0
                cf_cv_abi_version=6

-               { echo "$as_me:9346: WARNING: Overriding ABI version to $cf_cv_abi_version" >&5
+               { echo "$as_me:9436: WARNING: Overriding ABI version to $cf_cv_abi_version" >&5

 echo "$as_me: WARNING: Overriding ABI version to $cf_cv_abi_version" >&2;}
                ;;
        esac
 echo "$as_me: WARNING: Overriding ABI version to $cf_cv_abi_version" >&2;}
                ;;
        esac


@@ -9356,7 +9446,7 @@ else
        NCURSES_SIZE_T=short
 fi
 
        NCURSES_SIZE_T=short
 fi
 

-echo "$as_me:9359: checking if you want experimental safe-sprintf code" >&5
+echo "$as_me:9449: checking if you want experimental safe-sprintf code" >&5

 echo $ECHO_N "checking if you want experimental safe-sprintf code... $ECHO_C" >&6
 
 # Check whether --enable-safe-sprintf or --disable-safe-sprintf was given.
 echo $ECHO_N "checking if you want experimental safe-sprintf code... $ECHO_C" >&6
 
 # Check whether --enable-safe-sprintf or --disable-safe-sprintf was given.


@@ -9366,7 +9456,7 @@ if test "${enable_safe_sprintf+set}" = set; then
 else
   with_safe_sprintf=no
 fi;
 else
   with_safe_sprintf=no
 fi;

-echo "$as_me:9369: result: $with_safe_sprintf" >&5
+echo "$as_me:9459: result: $with_safe_sprintf" >&5

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


@@ -9375,7 +9465,7 @@ EOF
 ###   use option --disable-scroll-hints to turn off use of scroll-hints scrolling logic
 # when hashmap is used scroll hints are useless
 if test "$with_hashmap" = no ; then
 ###   use option --disable-scroll-hints to turn off use of scroll-hints scrolling logic
 # when hashmap is used scroll hints are useless
 if test "$with_hashmap" = no ; then

-echo "$as_me:9378: checking if you want to experiment without scrolling-hints code" >&5
+echo "$as_me:9468: checking if you want to experiment without scrolling-hints code" >&5

 echo $ECHO_N "checking if you want to experiment without scrolling-hints code... $ECHO_C" >&6
 
 # Check whether --enable-scroll-hints or --disable-scroll-hints was given.
 echo $ECHO_N "checking if you want to experiment without scrolling-hints code... $ECHO_C" >&6
 
 # Check whether --enable-scroll-hints or --disable-scroll-hints was given.


@@ -9385,7 +9475,7 @@ if test "${enable_scroll_hints+set}" = set; then
 else
   with_scroll_hints=yes
 fi;
 else
   with_scroll_hints=yes
 fi;

-echo "$as_me:9388: result: $with_scroll_hints" >&5
+echo "$as_me:9478: result: $with_scroll_hints" >&5

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


@@ -9393,7 +9483,7 @@ EOF
 
 fi
 
 
 fi
 

-echo "$as_me:9396: checking if you want experimental wgetch-events code" >&5
+echo "$as_me:9486: checking if you want experimental wgetch-events code" >&5

 echo $ECHO_N "checking if you want experimental wgetch-events code... $ECHO_C" >&6
 
 # Check whether --enable-wgetch-events or --disable-wgetch-events was given.
 echo $ECHO_N "checking if you want experimental wgetch-events code... $ECHO_C" >&6
 
 # Check whether --enable-wgetch-events or --disable-wgetch-events was given.


@@ -9403,7 +9493,7 @@ if test "${enable_wgetch_events+set}" = set; then
 else
   with_wgetch_events=no
 fi;
 else
   with_wgetch_events=no
 fi;

-echo "$as_me:9406: result: $with_wgetch_events" >&5
+echo "$as_me:9496: result: $with_wgetch_events" >&5

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


@@ -9412,7 +9502,7 @@ EOF
 ###############################################################################
 
 ###    use option --disable-echo to suppress full display compiling commands
 ###############################################################################
 
 ###    use option --disable-echo to suppress full display compiling commands

-echo "$as_me:9415: checking if you want to display full commands during build" >&5
+echo "$as_me:9505: checking if you want to display full commands during build" >&5

 echo $ECHO_N "checking if you want to display full commands during build... $ECHO_C" >&6
 
 # Check whether --enable-echo or --disable-echo was given.
 echo $ECHO_N "checking if you want to display full commands during build... $ECHO_C" >&6
 
 # Check whether --enable-echo or --disable-echo was given.


@@ -9429,11 +9519,11 @@ else
        test -n "$LIBTOOL" && LIBTOOL="$LIBTOOL --silent"
        test -n "$LIBTOOL_CXX" && LIBTOOL_CXX="$LIBTOOL_CXX --silent"
 fi
        test -n "$LIBTOOL" && LIBTOOL="$LIBTOOL --silent"
        test -n "$LIBTOOL_CXX" && LIBTOOL_CXX="$LIBTOOL_CXX --silent"
 fi

-echo "$as_me:9432: result: $with_echo" >&5
+echo "$as_me:9522: result: $with_echo" >&5

 echo "${ECHO_T}$with_echo" >&6
 
 ###    use option --enable-warnings to turn on all gcc warnings
 echo "${ECHO_T}$with_echo" >&6
 
 ###    use option --enable-warnings to turn on all gcc warnings

-echo "$as_me:9436: checking if you want to see compiler warnings" >&5
+echo "$as_me:9526: checking if you want to see compiler warnings" >&5

 echo $ECHO_N "checking if you want to see compiler warnings... $ECHO_C" >&6
 
 # Check whether --enable-warnings or --disable-warnings was given.
 echo $ECHO_N "checking if you want to see compiler warnings... $ECHO_C" >&6
 
 # Check whether --enable-warnings or --disable-warnings was given.


@@ -9441,7 +9531,7 @@ if test "${enable_warnings+set}" = set; then
   enableval="$enable_warnings"
   with_warnings=$enableval
 fi;
   enableval="$enable_warnings"
   with_warnings=$enableval
 fi;

-echo "$as_me:9444: result: $with_warnings" >&5
+echo "$as_me:9534: result: $with_warnings" >&5

 echo "${ECHO_T}$with_warnings" >&6
 
 if test "x$with_warnings" = "xyes"; then
 echo "${ECHO_T}$with_warnings" >&6
 
 if test "x$with_warnings" = "xyes"; then


@@ -9452,12 +9542,12 @@ INTEL_COMPILER=no
 if test "$GCC" = yes ; then
        case $host_os in
        linux*|gnu*)
 if test "$GCC" = yes ; then
        case $host_os in
        linux*|gnu*)

-               echo "$as_me:9455: checking if this is really Intel C compiler" >&5
+               echo "$as_me:9545: checking if this is really Intel C compiler" >&5

 echo $ECHO_N "checking if this is really Intel C compiler... $ECHO_C" >&6
                cf_save_CFLAGS="$CFLAGS"
                CFLAGS="$CFLAGS -no-gcc"
                cat >conftest.$ac_ext <<_ACEOF
 echo $ECHO_N "checking if this is really Intel C compiler... $ECHO_C" >&6
                cf_save_CFLAGS="$CFLAGS"
                CFLAGS="$CFLAGS -no-gcc"
                cat >conftest.$ac_ext <<_ACEOF

-#line 9460 "configure"
+#line 9550 "configure"

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


@@ -9474,16 +9564,16 @@ make an error
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

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

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

-  echo "$as_me:9480: \$? = $ac_status" >&5
+  echo "$as_me:9570: \$? = $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:9483: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9573: \"$ac_try\"") >&5

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

-  echo "$as_me:9486: \$? = $ac_status" >&5
+  echo "$as_me:9576: \$? = $ac_status" >&5

   (exit $ac_status); }; }; then
   INTEL_COMPILER=yes
 cf_save_CFLAGS="$cf_save_CFLAGS -we147 -no-gcc"
   (exit $ac_status); }; }; then
   INTEL_COMPILER=yes
 cf_save_CFLAGS="$cf_save_CFLAGS -we147 -no-gcc"


@@ -9494,14 +9584,14 @@ cat conftest.$ac_ext >&5
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
                CFLAGS="$cf_save_CFLAGS"
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
                CFLAGS="$cf_save_CFLAGS"

-               echo "$as_me:9497: result: $INTEL_COMPILER" >&5
+               echo "$as_me:9587: result: $INTEL_COMPILER" >&5

 echo "${ECHO_T}$INTEL_COMPILER" >&6
                ;;
        esac
 fi
 
 cat > conftest.$ac_ext <<EOF
 echo "${ECHO_T}$INTEL_COMPILER" >&6
                ;;
        esac
 fi
 
 cat > conftest.$ac_ext <<EOF

-#line 9504 "${as_me-configure}"
+#line 9594 "${as_me-configure}"

 int main(int argc, char *argv[]) { return (argv[argc-1] == 0) ; }
 EOF
 
 int main(int argc, char *argv[]) { return (argv[argc-1] == 0) ; }
 EOF
 


@@ -9519,7 +9609,7 @@ then
 # remark #981: operands are evaluated in unspecified order
 # warning #269: invalid format string conversion
 
 # remark #981: operands are evaluated in unspecified order
 # warning #269: invalid format string conversion
 

-       { echo "$as_me:9522: checking for $CC warning options..." >&5
+       { echo "$as_me:9612: checking for $CC warning options..." >&5

 echo "$as_me: checking for $CC warning options..." >&6;}
        cf_save_CFLAGS="$CFLAGS"
        EXTRA_CFLAGS="-Wall"
 echo "$as_me: checking for $CC warning options..." >&6;}
        cf_save_CFLAGS="$CFLAGS"
        EXTRA_CFLAGS="-Wall"


@@ -9536,12 +9626,12 @@ echo "$as_me: checking for $CC warning options..." >&6;}
                wd981
        do
                CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt"
                wd981
        do
                CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt"

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

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

-  echo "$as_me:9542: \$? = $ac_status" >&5
+  echo "$as_me:9632: \$? = $ac_status" >&5

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

-                       test -n "$verbose" && echo "$as_me:9544: result: ... -$cf_opt" >&5
+                       test -n "$verbose" && echo "$as_me:9634: result: ... -$cf_opt" >&5

 echo "${ECHO_T}... -$cf_opt" >&6
                        EXTRA_CFLAGS="$EXTRA_CFLAGS -$cf_opt"
                fi
 echo "${ECHO_T}... -$cf_opt" >&6
                        EXTRA_CFLAGS="$EXTRA_CFLAGS -$cf_opt"
                fi


@@ -9550,7 +9640,7 @@ echo "${ECHO_T}... -$cf_opt" >&6
 
 elif test "$GCC" = yes
 then
 
 elif test "$GCC" = yes
 then

-       { echo "$as_me:9553: checking for $CC warning options..." >&5
+       { echo "$as_me:9643: checking for $CC warning options..." >&5

 echo "$as_me: checking for $CC warning options..." >&6;}
        cf_save_CFLAGS="$CFLAGS"
        EXTRA_CFLAGS="-W -Wall"
 echo "$as_me: checking for $CC warning options..." >&6;}
        cf_save_CFLAGS="$CFLAGS"
        EXTRA_CFLAGS="-W -Wall"


@@ -9570,12 +9660,12 @@ echo "$as_me: checking for $CC warning options..." >&6;}
                Wundef $cf_warn_CONST Wdeclaration-after-statement Wextra Wno-unknown-pragmas Wswitch-enum
        do
                CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt"
                Wundef $cf_warn_CONST Wdeclaration-after-statement Wextra Wno-unknown-pragmas Wswitch-enum
        do
                CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt"

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

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

-  echo "$as_me:9576: \$? = $ac_status" >&5
+  echo "$as_me:9666: \$? = $ac_status" >&5

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

-                       test -n "$verbose" && echo "$as_me:9578: result: ... -$cf_opt" >&5
+                       test -n "$verbose" && echo "$as_me:9668: result: ... -$cf_opt" >&5

 echo "${ECHO_T}... -$cf_opt" >&6
                        case $cf_opt in #(vi
                        Wcast-qual) #(vi
 echo "${ECHO_T}... -$cf_opt" >&6
                        case $cf_opt in #(vi
                        Wcast-qual) #(vi


@@ -9586,7 +9676,7 @@ echo "${ECHO_T}... -$cf_opt" >&6
                                [34].*)
                                        test -n "$verbose" && echo "    feature is broken in gcc $GCC_VERSION" 1>&6
 
                                [34].*)
                                        test -n "$verbose" && echo "    feature is broken in gcc $GCC_VERSION" 1>&6
 

-echo "${as_me-configure}:9589: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
+echo "${as_me-configure}:9679: testing feature is broken in gcc $GCC_VERSION ..." 1>&5

 
                                        continue;;
                                esac
 
                                        continue;;
                                esac


@@ -9606,12 +9696,12 @@ INTEL_CPLUSPLUS=no
 if test "$GCC" = yes ; then
        case $host_os in
        linux*|gnu*)
 if test "$GCC" = yes ; then
        case $host_os in
        linux*|gnu*)

-               echo "$as_me:9609: checking if this is really Intel C++ compiler" >&5
+               echo "$as_me:9699: checking if this is really Intel C++ compiler" >&5

 echo $ECHO_N "checking if this is really Intel C++ compiler... $ECHO_C" >&6
                cf_save_CFLAGS="$CXXFLAGS"
                CXXFLAGS="$CXXFLAGS -no-gcc"
                cat >conftest.$ac_ext <<_ACEOF
 echo $ECHO_N "checking if this is really Intel C++ compiler... $ECHO_C" >&6
                cf_save_CFLAGS="$CXXFLAGS"
                CXXFLAGS="$CXXFLAGS -no-gcc"
                cat >conftest.$ac_ext <<_ACEOF

-#line 9614 "configure"
+#line 9704 "configure"

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


@@ -9628,16 +9718,16 @@ make an error
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

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

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

-  echo "$as_me:9634: \$? = $ac_status" >&5
+  echo "$as_me:9724: \$? = $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:9637: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9727: \"$ac_try\"") >&5

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

-  echo "$as_me:9640: \$? = $ac_status" >&5
+  echo "$as_me:9730: \$? = $ac_status" >&5

   (exit $ac_status); }; }; then
   INTEL_CPLUSPLUS=yes
 cf_save_CFLAGS="$cf_save_CFLAGS -we147 -no-gcc"
   (exit $ac_status); }; }; then
   INTEL_CPLUSPLUS=yes
 cf_save_CFLAGS="$cf_save_CFLAGS -we147 -no-gcc"


@@ -9648,7 +9738,7 @@ cat conftest.$ac_ext >&5
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
                CXXFLAGS="$cf_save_CFLAGS"
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
                CXXFLAGS="$cf_save_CFLAGS"

-               echo "$as_me:9651: result: $INTEL_CPLUSPLUS" >&5
+               echo "$as_me:9741: result: $INTEL_CPLUSPLUS" >&5

 echo "${ECHO_T}$INTEL_CPLUSPLUS" >&6
                ;;
        esac
 echo "${ECHO_T}$INTEL_CPLUSPLUS" >&6
                ;;
        esac


@@ -9662,7 +9752,7 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
 ac_main_return=return
 
 cat > conftest.$ac_ext <<EOF
 ac_main_return=return
 
 cat > conftest.$ac_ext <<EOF

-#line 9665 "configure"
+#line 9755 "configure"

 int main(int argc, char *argv[]) { return (argv[argc-1] == 0) ; }
 EOF
 
 int main(int argc, char *argv[]) { return (argv[argc-1] == 0) ; }
 EOF
 


@@ -9680,7 +9770,7 @@ then
 # remark #981: operands are evaluated in unspecified order
 # warning #269: invalid format string conversion
 
 # remark #981: operands are evaluated in unspecified order
 # warning #269: invalid format string conversion
 

-       { echo "$as_me:9683: checking for $CC warning options..." >&5
+       { echo "$as_me:9773: checking for $CC warning options..." >&5

 echo "$as_me: checking for $CC warning options..." >&6;}
        cf_save_CXXFLAGS="$CXXFLAGS"
        EXTRA_CXXFLAGS="-Wall"
 echo "$as_me: checking for $CC warning options..." >&6;}
        cf_save_CXXFLAGS="$CXXFLAGS"
        EXTRA_CXXFLAGS="-Wall"


@@ -9697,12 +9787,12 @@ echo "$as_me: checking for $CC warning options..." >&6;}
                wd981
        do
                CXXFLAGS="$cf_save_CXXFLAGS $EXTRA_CXXFLAGS -$cf_opt"
                wd981
        do
                CXXFLAGS="$cf_save_CXXFLAGS $EXTRA_CXXFLAGS -$cf_opt"

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

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

-  echo "$as_me:9703: \$? = $ac_status" >&5
+  echo "$as_me:9793: \$? = $ac_status" >&5

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

-                       test -n "$verbose" && echo "$as_me:9705: result: ... -$cf_opt" >&5
+                       test -n "$verbose" && echo "$as_me:9795: result: ... -$cf_opt" >&5

 echo "${ECHO_T}... -$cf_opt" >&6
                        EXTRA_CXXFLAGS="$EXTRA_CXXFLAGS -$cf_opt"
                fi
 echo "${ECHO_T}... -$cf_opt" >&6
                        EXTRA_CXXFLAGS="$EXTRA_CXXFLAGS -$cf_opt"
                fi


@@ -9711,7 +9801,7 @@ echo "${ECHO_T}... -$cf_opt" >&6
 
 elif test "$GXX" = yes
 then
 
 elif test "$GXX" = yes
 then

-       { echo "$as_me:9714: checking for $CXX warning options..." >&5
+       { echo "$as_me:9804: checking for $CXX warning options..." >&5

 echo "$as_me: checking for $CXX warning options..." >&6;}
        cf_save_CXXFLAGS="$CXXFLAGS"
        EXTRA_CXXFLAGS="-W -Wall"
 echo "$as_me: checking for $CXX warning options..." >&6;}
        cf_save_CXXFLAGS="$CXXFLAGS"
        EXTRA_CXXFLAGS="-W -Wall"


@@ -9740,16 +9830,16 @@ echo "$as_me: checking for $CXX warning options..." >&6;}
                Wundef $cf_gxx_extra_warnings Wno-unused
        do
                CXXFLAGS="$cf_save_CXXFLAGS $EXTRA_CXXFLAGS -Werror -$cf_opt"
                Wundef $cf_gxx_extra_warnings Wno-unused
        do
                CXXFLAGS="$cf_save_CXXFLAGS $EXTRA_CXXFLAGS -Werror -$cf_opt"

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

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

-  echo "$as_me:9746: \$? = $ac_status" >&5
+  echo "$as_me:9836: \$? = $ac_status" >&5

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

-                       test -n "$verbose" && echo "$as_me:9748: result: ... -$cf_opt" >&5
+                       test -n "$verbose" && echo "$as_me:9838: result: ... -$cf_opt" >&5

 echo "${ECHO_T}... -$cf_opt" >&6
                        EXTRA_CXXFLAGS="$EXTRA_CXXFLAGS -$cf_opt"
                else
 echo "${ECHO_T}... -$cf_opt" >&6
                        EXTRA_CXXFLAGS="$EXTRA_CXXFLAGS -$cf_opt"
                else

-                       test -n "$verbose" && echo "$as_me:9752: result: ... no -$cf_opt" >&5
+                       test -n "$verbose" && echo "$as_me:9842: result: ... no -$cf_opt" >&5

 echo "${ECHO_T}... no -$cf_opt" >&6
                fi
        done
 echo "${ECHO_T}... no -$cf_opt" >&6
                fi
        done


@@ -9785,10 +9875,10 @@ cat > conftest.i <<EOF
 EOF
 if test "$GCC" = yes
 then
 EOF
 if test "$GCC" = yes
 then

-       { echo "$as_me:9788: checking for $CC __attribute__ directives..." >&5
+       { echo "$as_me:9878: checking for $CC __attribute__ directives..." >&5

 echo "$as_me: checking for $CC __attribute__ directives..." >&6;}
 cat > conftest.$ac_ext <<EOF
 echo "$as_me: checking for $CC __attribute__ directives..." >&6;}
 cat > conftest.$ac_ext <<EOF

-#line 9791 "${as_me-configure}"
+#line 9881 "${as_me-configure}"

 #include "confdefs.h"
 #include "conftest.h"
 #include "conftest.i"
 #include "confdefs.h"
 #include "conftest.h"
 #include "conftest.i"


@@ -9826,12 +9916,12 @@ EOF
 EOF
                        ;;
                esac
 EOF
                        ;;
                esac

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

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

-  echo "$as_me:9832: \$? = $ac_status" >&5
+  echo "$as_me:9922: \$? = $ac_status" >&5

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

-                       test -n "$verbose" && echo "$as_me:9834: result: ... $cf_attribute" >&5
+                       test -n "$verbose" && echo "$as_me:9924: result: ... $cf_attribute" >&5

 echo "${ECHO_T}... $cf_attribute" >&6
                        cat conftest.h >>confdefs.h
                fi
 echo "${ECHO_T}... $cf_attribute" >&6
                        cat conftest.h >>confdefs.h
                fi


@@ -9843,7 +9933,7 @@ rm -rf conftest*
 fi
 
 ###    use option --enable-assertions to turn on generation of assertion code
 fi
 
 ###    use option --enable-assertions to turn on generation of assertion code

-echo "$as_me:9846: checking if you want to enable runtime assertions" >&5
+echo "$as_me:9936: checking if you want to enable runtime assertions" >&5

 echo $ECHO_N "checking if you want to enable runtime assertions... $ECHO_C" >&6
 
 # Check whether --enable-assertions or --disable-assertions was given.
 echo $ECHO_N "checking if you want to enable runtime assertions... $ECHO_C" >&6
 
 # Check whether --enable-assertions or --disable-assertions was given.


@@ -9853,7 +9943,7 @@ if test "${enable_assertions+set}" = set; then
 else
   with_assertions=no
 fi;
 else
   with_assertions=no
 fi;

-echo "$as_me:9856: result: $with_assertions" >&5
+echo "$as_me:9946: result: $with_assertions" >&5

 echo "${ECHO_T}$with_assertions" >&6
 if test -n "$GCC"
 then
 echo "${ECHO_T}$with_assertions" >&6
 if test -n "$GCC"
 then


@@ -9871,7 +9961,7 @@ fi
 
 ###    use option --disable-leaks to suppress "permanent" leaks, for testing
 
 
 ###    use option --disable-leaks to suppress "permanent" leaks, for testing
 

-echo "$as_me:9874: checking if you want to use dmalloc for testing" >&5
+echo "$as_me:9964: checking if you want to use dmalloc for testing" >&5

 echo $ECHO_N "checking if you want to use dmalloc for testing... $ECHO_C" >&6
 
 # Check whether --with-dmalloc or --without-dmalloc was given.
 echo $ECHO_N "checking if you want to use dmalloc for testing... $ECHO_C" >&6
 
 # Check whether --with-dmalloc or --without-dmalloc was given.


@@ -9887,7 +9977,7 @@ EOF
 else
   with_dmalloc=
 fi;
 else
   with_dmalloc=
 fi;

-echo "$as_me:9890: result: ${with_dmalloc:-no}" >&5
+echo "$as_me:9980: result: ${with_dmalloc:-no}" >&5

 echo "${ECHO_T}${with_dmalloc:-no}" >&6
 
 case .$with_cflags in #(vi
 echo "${ECHO_T}${with_dmalloc:-no}" >&6
 
 case .$with_cflags in #(vi


@@ -9971,23 +10061,23 @@ fi
 esac
 
 if test "$with_dmalloc" = yes ; then
 esac
 
 if test "$with_dmalloc" = yes ; then

-       echo "$as_me:9974: checking for dmalloc.h" >&5
+       echo "$as_me:10064: checking for dmalloc.h" >&5

 echo $ECHO_N "checking for dmalloc.h... $ECHO_C" >&6
 if test "${ac_cv_header_dmalloc_h+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 echo $ECHO_N "checking for dmalloc.h... $ECHO_C" >&6
 if test "${ac_cv_header_dmalloc_h+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF

-#line 9980 "configure"
+#line 10070 "configure"

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

-if { (eval echo "$as_me:9984: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:10074: \"$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:9990: \$? = $ac_status" >&5
+  echo "$as_me:10080: \$? = $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


@@ -10006,11 +10096,11 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
 fi
 rm -f conftest.err conftest.$ac_ext
 fi

-echo "$as_me:10009: result: $ac_cv_header_dmalloc_h" >&5
+echo "$as_me:10099: result: $ac_cv_header_dmalloc_h" >&5

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

-echo "$as_me:10013: checking for dmalloc_debug in -ldmalloc" >&5
+echo "$as_me:10103: checking for dmalloc_debug in -ldmalloc" >&5

 echo $ECHO_N "checking for dmalloc_debug in -ldmalloc... $ECHO_C" >&6
 if test "${ac_cv_lib_dmalloc_dmalloc_debug+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 echo $ECHO_N "checking for dmalloc_debug in -ldmalloc... $ECHO_C" >&6
 if test "${ac_cv_lib_dmalloc_dmalloc_debug+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6


@@ -10018,7 +10108,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldmalloc  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldmalloc  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF

-#line 10021 "configure"
+#line 10111 "configure"

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


@@ -10037,16 +10127,16 @@ dmalloc_debug ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext

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

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

-  echo "$as_me:10043: \$? = $ac_status" >&5
+  echo "$as_me:10133: \$? = $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:10046: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10136: \"$ac_try\"") >&5

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

-  echo "$as_me:10049: \$? = $ac_status" >&5
+  echo "$as_me:10139: \$? = $ac_status" >&5

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


@@ -10057,7 +10147,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi

-echo "$as_me:10060: result: $ac_cv_lib_dmalloc_dmalloc_debug" >&5
+echo "$as_me:10150: result: $ac_cv_lib_dmalloc_dmalloc_debug" >&5

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


@@ -10072,7 +10162,7 @@ fi
 
 fi
 
 
 fi
 

-echo "$as_me:10075: checking if you want to use dbmalloc for testing" >&5
+echo "$as_me:10165: checking if you want to use dbmalloc for testing" >&5

 echo $ECHO_N "checking if you want to use dbmalloc for testing... $ECHO_C" >&6
 
 # Check whether --with-dbmalloc or --without-dbmalloc was given.
 echo $ECHO_N "checking if you want to use dbmalloc for testing... $ECHO_C" >&6
 
 # Check whether --with-dbmalloc or --without-dbmalloc was given.


@@ -10088,7 +10178,7 @@ EOF
 else
   with_dbmalloc=
 fi;
 else
   with_dbmalloc=
 fi;

-echo "$as_me:10091: result: ${with_dbmalloc:-no}" >&5
+echo "$as_me:10181: result: ${with_dbmalloc:-no}" >&5

 echo "${ECHO_T}${with_dbmalloc:-no}" >&6
 
 case .$with_cflags in #(vi
 echo "${ECHO_T}${with_dbmalloc:-no}" >&6
 
 case .$with_cflags in #(vi


@@ -10172,23 +10262,23 @@ fi
 esac
 
 if test "$with_dbmalloc" = yes ; then
 esac
 
 if test "$with_dbmalloc" = yes ; then

-       echo "$as_me:10175: checking for dbmalloc.h" >&5
+       echo "$as_me:10265: checking for dbmalloc.h" >&5

 echo $ECHO_N "checking for dbmalloc.h... $ECHO_C" >&6
 if test "${ac_cv_header_dbmalloc_h+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 echo $ECHO_N "checking for dbmalloc.h... $ECHO_C" >&6
 if test "${ac_cv_header_dbmalloc_h+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF

-#line 10181 "configure"
+#line 10271 "configure"

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

-if { (eval echo "$as_me:10185: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:10275: \"$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:10191: \$? = $ac_status" >&5
+  echo "$as_me:10281: \$? = $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


@@ -10207,11 +10297,11 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
 fi
 rm -f conftest.err conftest.$ac_ext
 fi

-echo "$as_me:10210: result: $ac_cv_header_dbmalloc_h" >&5
+echo "$as_me:10300: result: $ac_cv_header_dbmalloc_h" >&5

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

-echo "$as_me:10214: checking for debug_malloc in -ldbmalloc" >&5
+echo "$as_me:10304: checking for debug_malloc in -ldbmalloc" >&5

 echo $ECHO_N "checking for debug_malloc in -ldbmalloc... $ECHO_C" >&6
 if test "${ac_cv_lib_dbmalloc_debug_malloc+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 echo $ECHO_N "checking for debug_malloc in -ldbmalloc... $ECHO_C" >&6
 if test "${ac_cv_lib_dbmalloc_debug_malloc+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6


@@ -10219,7 +10309,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldbmalloc  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldbmalloc  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF

-#line 10222 "configure"
+#line 10312 "configure"

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


@@ -10238,16 +10328,16 @@ debug_malloc ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext

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

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

-  echo "$as_me:10244: \$? = $ac_status" >&5
+  echo "$as_me:10334: \$? = $ac_status" >&5

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

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

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

-  echo "$as_me:10250: \$? = $ac_status" >&5
+  echo "$as_me:10340: \$? = $ac_status" >&5

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


@@ -10258,7 +10348,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi

-echo "$as_me:10261: result: $ac_cv_lib_dbmalloc_debug_malloc" >&5
+echo "$as_me:10351: result: $ac_cv_lib_dbmalloc_debug_malloc" >&5

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


@@ -10273,7 +10363,7 @@ fi
 
 fi
 
 
 fi
 

-echo "$as_me:10276: checking if you want to use valgrind for testing" >&5
+echo "$as_me:10366: checking if you want to use valgrind for testing" >&5

 echo $ECHO_N "checking if you want to use valgrind for testing... $ECHO_C" >&6
 
 # Check whether --with-valgrind or --without-valgrind was given.
 echo $ECHO_N "checking if you want to use valgrind for testing... $ECHO_C" >&6
 
 # Check whether --with-valgrind or --without-valgrind was given.


@@ -10289,7 +10379,7 @@ EOF
 else
   with_valgrind=
 fi;
 else
   with_valgrind=
 fi;

-echo "$as_me:10292: result: ${with_valgrind:-no}" >&5
+echo "$as_me:10382: result: ${with_valgrind:-no}" >&5

 echo "${ECHO_T}${with_valgrind:-no}" >&6
 
 case .$with_cflags in #(vi
 echo "${ECHO_T}${with_valgrind:-no}" >&6
 
 case .$with_cflags in #(vi


@@ -10372,7 +10462,7 @@ fi
        ;;
 esac
 
        ;;
 esac
 

-echo "$as_me:10375: checking if you want to perform memory-leak testing" >&5
+echo "$as_me:10465: checking if you want to perform memory-leak testing" >&5

 echo $ECHO_N "checking if you want to perform memory-leak testing... $ECHO_C" >&6
 
 # Check whether --enable-leaks or --disable-leaks was given.
 echo $ECHO_N "checking if you want to perform memory-leak testing... $ECHO_C" >&6
 
 # Check whether --enable-leaks or --disable-leaks was given.


@@ -10382,7 +10472,7 @@ if test "${enable_leaks+set}" = set; then
 else
   : ${with_no_leaks:=no}
 fi;
 else
   : ${with_no_leaks:=no}
 fi;

-echo "$as_me:10385: result: $with_no_leaks" >&5
+echo "$as_me:10475: result: $with_no_leaks" >&5

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


@@ -10427,7 +10517,7 @@ case "$CFLAGS $CPPFLAGS" in
        ;;
 esac
 
        ;;
 esac
 

-echo "$as_me:10430: checking whether to add trace feature to all models" >&5
+echo "$as_me:10520: checking whether to add trace feature to all models" >&5

 echo $ECHO_N "checking whether to add trace feature to all models... $ECHO_C" >&6
 
 # Check whether --with-trace or --without-trace was given.
 echo $ECHO_N "checking whether to add trace feature to all models... $ECHO_C" >&6
 
 # Check whether --with-trace or --without-trace was given.


@@ -10437,7 +10527,7 @@ if test "${with_trace+set}" = set; then
 else
   cf_with_trace=$cf_all_traces
 fi;
 else
   cf_with_trace=$cf_all_traces
 fi;

-echo "$as_me:10440: result: $cf_with_trace" >&5
+echo "$as_me:10530: result: $cf_with_trace" >&5

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


@@ -10518,13 +10608,13 @@ else
 fi
 
 ###    Checks for libraries.
 fi
 
 ###    Checks for libraries.

-echo "$as_me:10521: checking for gettimeofday" >&5
+echo "$as_me:10611: checking for gettimeofday" >&5

 echo $ECHO_N "checking for gettimeofday... $ECHO_C" >&6
 if test "${ac_cv_func_gettimeofday+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 echo $ECHO_N "checking for gettimeofday... $ECHO_C" >&6
 if test "${ac_cv_func_gettimeofday+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF

-#line 10527 "configure"
+#line 10617 "configure"

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


@@ -10555,16 +10645,16 @@ f = gettimeofday;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext

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

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

-  echo "$as_me:10561: \$? = $ac_status" >&5
+  echo "$as_me:10651: \$? = $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:10564: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10654: \"$ac_try\"") >&5

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

-  echo "$as_me:10567: \$? = $ac_status" >&5
+  echo "$as_me:10657: \$? = $ac_status" >&5

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


@@ -10574,7 +10664,7 @@ ac_cv_func_gettimeofday=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi

-echo "$as_me:10577: result: $ac_cv_func_gettimeofday" >&5
+echo "$as_me:10667: result: $ac_cv_func_gettimeofday" >&5

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


@@ -10583,7 +10673,7 @@ EOF
 
 else
 
 
 else
 

-echo "$as_me:10586: checking for gettimeofday in -lbsd" >&5
+echo "$as_me:10676: checking for gettimeofday in -lbsd" >&5

 echo $ECHO_N "checking for gettimeofday in -lbsd... $ECHO_C" >&6
 if test "${ac_cv_lib_bsd_gettimeofday+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 echo $ECHO_N "checking for gettimeofday in -lbsd... $ECHO_C" >&6
 if test "${ac_cv_lib_bsd_gettimeofday+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6


@@ -10591,7 +10681,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lbsd  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lbsd  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF

-#line 10594 "configure"
+#line 10684 "configure"

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


@@ -10610,16 +10700,16 @@ gettimeofday ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext

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

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

-  echo "$as_me:10616: \$? = $ac_status" >&5
+  echo "$as_me:10706: \$? = $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:10619: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10709: \"$ac_try\"") >&5

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

-  echo "$as_me:10622: \$? = $ac_status" >&5
+  echo "$as_me:10712: \$? = $ac_status" >&5

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


@@ -10630,7 +10720,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi

-echo "$as_me:10633: result: $ac_cv_lib_bsd_gettimeofday" >&5
+echo "$as_me:10723: result: $ac_cv_lib_bsd_gettimeofday" >&5

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


@@ -10642,14 +10732,14 @@ fi
 
 fi
 
 
 fi
 

-echo "$as_me:10645: checking if -lm needed for math functions" >&5
+echo "$as_me:10735: checking if -lm needed for math functions" >&5

 echo $ECHO_N "checking if -lm needed for math functions... $ECHO_C" >&6
 if test "${cf_cv_need_libm+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
        cat >conftest.$ac_ext <<_ACEOF
 echo $ECHO_N "checking if -lm needed for math functions... $ECHO_C" >&6
 if test "${cf_cv_need_libm+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
        cat >conftest.$ac_ext <<_ACEOF

-#line 10652 "configure"
+#line 10742 "configure"

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


@@ -10664,16 +10754,16 @@ double x = rand(); printf("result = %g\n", sin(x))
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext

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

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

-  echo "$as_me:10670: \$? = $ac_status" >&5
+  echo "$as_me:10760: \$? = $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:10673: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10763: \"$ac_try\"") >&5

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

-  echo "$as_me:10676: \$? = $ac_status" >&5
+  echo "$as_me:10766: \$? = $ac_status" >&5

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


@@ -10683,7 +10773,7 @@ cf_cv_need_libm=yes
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi

-echo "$as_me:10686: result: $cf_cv_need_libm" >&5
+echo "$as_me:10776: result: $cf_cv_need_libm" >&5

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


@@ -10691,13 +10781,13 @@ MATH_LIB=-lm
 fi
 
 ###    Checks for header files.
 fi
 
 ###    Checks for header files.

-echo "$as_me:10694: checking for ANSI C header files" >&5
+echo "$as_me:10784: checking for ANSI C header files" >&5

 echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6
 if test "${ac_cv_header_stdc+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6
 if test "${ac_cv_header_stdc+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF

-#line 10700 "configure"
+#line 10790 "configure"

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


@@ -10705,13 +10795,13 @@ else
 #include <float.h>
 
 _ACEOF
 #include <float.h>
 
 _ACEOF

-if { (eval echo "$as_me:10708: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:10798: \"$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:10714: \$? = $ac_status" >&5
+  echo "$as_me:10804: \$? = $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


@@ -10733,7 +10823,7 @@ rm -f conftest.err conftest.$ac_ext
 if test $ac_cv_header_stdc = yes; then
   # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
   cat >conftest.$ac_ext <<_ACEOF
 if test $ac_cv_header_stdc = yes; then
   # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
   cat >conftest.$ac_ext <<_ACEOF

-#line 10736 "configure"
+#line 10826 "configure"

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


@@ -10751,7 +10841,7 @@ fi
 if test $ac_cv_header_stdc = yes; then
   # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
   cat >conftest.$ac_ext <<_ACEOF
 if test $ac_cv_header_stdc = yes; then
   # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
   cat >conftest.$ac_ext <<_ACEOF

-#line 10754 "configure"
+#line 10844 "configure"

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


@@ -10772,7 +10862,7 @@ if test $ac_cv_header_stdc = yes; then
   :
 else
   cat >conftest.$ac_ext <<_ACEOF
   :
 else
   cat >conftest.$ac_ext <<_ACEOF

-#line 10775 "configure"
+#line 10865 "configure"

 #include "confdefs.h"
 #include <ctype.h>
 #if ((' ' & 0x0FF) == 0x020)
 #include "confdefs.h"
 #include <ctype.h>
 #if ((' ' & 0x0FF) == 0x020)


@@ -10798,15 +10888,15 @@ main ()
 }
 _ACEOF
 rm -f conftest$ac_exeext
 }
 _ACEOF
 rm -f conftest$ac_exeext

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

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

-  echo "$as_me:10804: \$? = $ac_status" >&5
+  echo "$as_me:10894: \$? = $ac_status" >&5

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

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

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

-  echo "$as_me:10809: \$? = $ac_status" >&5
+  echo "$as_me:10899: \$? = $ac_status" >&5

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


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

-echo "$as_me:10822: result: $ac_cv_header_stdc" >&5
+echo "$as_me:10912: result: $ac_cv_header_stdc" >&5

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


@@ -10832,13 +10922,13 @@ fi
 ac_header_dirent=no
 for ac_hdr in dirent.h sys/ndir.h sys/dir.h ndir.h; do
   as_ac_Header=`echo "ac_cv_header_dirent_$ac_hdr" | $as_tr_sh`
 ac_header_dirent=no
 for ac_hdr in dirent.h sys/ndir.h sys/dir.h ndir.h; do
   as_ac_Header=`echo "ac_cv_header_dirent_$ac_hdr" | $as_tr_sh`

-echo "$as_me:10835: checking for $ac_hdr that defines DIR" >&5
+echo "$as_me:10925: checking for $ac_hdr that defines DIR" >&5

 echo $ECHO_N "checking for $ac_hdr that defines DIR... $ECHO_C" >&6
 if eval "test \"\${$as_ac_Header+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 echo $ECHO_N "checking for $ac_hdr that defines DIR... $ECHO_C" >&6
 if eval "test \"\${$as_ac_Header+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF

-#line 10841 "configure"
+#line 10931 "configure"

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


@@ -10853,16 +10943,16 @@ return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

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

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

-  echo "$as_me:10859: \$? = $ac_status" >&5
+  echo "$as_me:10949: \$? = $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:10862: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10952: \"$ac_try\"") >&5

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

-  echo "$as_me:10865: \$? = $ac_status" >&5
+  echo "$as_me:10955: \$? = $ac_status" >&5

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


@@ -10872,7 +10962,7 @@ eval "$as_ac_Header=no"
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi

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


@@ -10885,7 +10975,7 @@ fi
 done
 # Two versions of opendir et al. are in -ldir and -lx on SCO Xenix.
 if test $ac_header_dirent = dirent.h; then
 done
 # Two versions of opendir et al. are in -ldir and -lx on SCO Xenix.
 if test $ac_header_dirent = dirent.h; then

-  echo "$as_me:10888: checking for opendir in -ldir" >&5
+  echo "$as_me:10978: checking for opendir in -ldir" >&5

 echo $ECHO_N "checking for opendir in -ldir... $ECHO_C" >&6
 if test "${ac_cv_lib_dir_opendir+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 echo $ECHO_N "checking for opendir in -ldir... $ECHO_C" >&6
 if test "${ac_cv_lib_dir_opendir+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6


@@ -10893,7 +10983,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldir  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldir  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF

-#line 10896 "configure"
+#line 10986 "configure"

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


@@ -10912,16 +11002,16 @@ opendir ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext

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

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

-  echo "$as_me:10918: \$? = $ac_status" >&5
+  echo "$as_me:11008: \$? = $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:10921: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11011: \"$ac_try\"") >&5

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

-  echo "$as_me:10924: \$? = $ac_status" >&5
+  echo "$as_me:11014: \$? = $ac_status" >&5

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


@@ -10932,14 +11022,14 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi

-echo "$as_me:10935: result: $ac_cv_lib_dir_opendir" >&5
+echo "$as_me:11025: result: $ac_cv_lib_dir_opendir" >&5

 echo "${ECHO_T}$ac_cv_lib_dir_opendir" >&6
 if test $ac_cv_lib_dir_opendir = yes; then
   LIBS="$LIBS -ldir"
 fi
 
 else
 echo "${ECHO_T}$ac_cv_lib_dir_opendir" >&6
 if test $ac_cv_lib_dir_opendir = yes; then
   LIBS="$LIBS -ldir"
 fi
 
 else

-  echo "$as_me:10942: checking for opendir in -lx" >&5
+  echo "$as_me:11032: checking for opendir in -lx" >&5

 echo $ECHO_N "checking for opendir in -lx... $ECHO_C" >&6
 if test "${ac_cv_lib_x_opendir+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 echo $ECHO_N "checking for opendir in -lx... $ECHO_C" >&6
 if test "${ac_cv_lib_x_opendir+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6


@@ -10947,7 +11037,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lx  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lx  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF

-#line 10950 "configure"
+#line 11040 "configure"

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


@@ -10966,16 +11056,16 @@ opendir ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext

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

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

-  echo "$as_me:10972: \$? = $ac_status" >&5
+  echo "$as_me:11062: \$? = $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:10975: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11065: \"$ac_try\"") >&5

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

-  echo "$as_me:10978: \$? = $ac_status" >&5
+  echo "$as_me:11068: \$? = $ac_status" >&5

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


@@ -10986,7 +11076,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi

-echo "$as_me:10989: result: $ac_cv_lib_x_opendir" >&5
+echo "$as_me:11079: result: $ac_cv_lib_x_opendir" >&5

 echo "${ECHO_T}$ac_cv_lib_x_opendir" >&6
 if test $ac_cv_lib_x_opendir = yes; then
   LIBS="$LIBS -lx"
 echo "${ECHO_T}$ac_cv_lib_x_opendir" >&6
 if test $ac_cv_lib_x_opendir = yes; then
   LIBS="$LIBS -lx"


@@ -10994,13 +11084,13 @@ fi
 
 fi
 
 
 fi
 

-echo "$as_me:10997: checking whether time.h and sys/time.h may both be included" >&5
+echo "$as_me:11087: checking whether time.h and sys/time.h may both be included" >&5

 echo $ECHO_N "checking whether time.h and sys/time.h may both be included... $ECHO_C" >&6
 if test "${ac_cv_header_time+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 echo $ECHO_N "checking whether time.h and sys/time.h may both be included... $ECHO_C" >&6
 if test "${ac_cv_header_time+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF

-#line 11003 "configure"
+#line 11093 "configure"

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


@@ -11016,16 +11106,16 @@ return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

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

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

-  echo "$as_me:11022: \$? = $ac_status" >&5
+  echo "$as_me:11112: \$? = $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:11025: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11115: \"$ac_try\"") >&5

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

-  echo "$as_me:11028: \$? = $ac_status" >&5
+  echo "$as_me:11118: \$? = $ac_status" >&5

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


@@ -11035,7 +11125,7 @@ ac_cv_header_time=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi

-echo "$as_me:11038: result: $ac_cv_header_time" >&5
+echo "$as_me:11128: result: $ac_cv_header_time" >&5

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


@@ -11045,14 +11135,14 @@ EOF
 
 fi
 
 
 fi
 

-echo "$as_me:11048: checking for regular-expression headers" >&5
+echo "$as_me:11138: checking for regular-expression headers" >&5

 echo $ECHO_N "checking for regular-expression headers... $ECHO_C" >&6
 if test "${cf_cv_regex+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 cat >conftest.$ac_ext <<_ACEOF
 echo $ECHO_N "checking for regular-expression headers... $ECHO_C" >&6
 if test "${cf_cv_regex+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 cat >conftest.$ac_ext <<_ACEOF

-#line 11055 "configure"
+#line 11145 "configure"

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


@@ -11070,16 +11160,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:11073: \"$ac_link\"") >&5
+if { (eval echo "$as_me:11163: \"$ac_link\"") >&5

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

-  echo "$as_me:11076: \$? = $ac_status" >&5
+  echo "$as_me:11166: \$? = $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:11079: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11169: \"$ac_try\"") >&5

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

-  echo "$as_me:11082: \$? = $ac_status" >&5
+  echo "$as_me:11172: \$? = $ac_status" >&5

   (exit $ac_status); }; }; then
   cf_cv_regex="regex.h"
 else
   (exit $ac_status); }; }; then
   cf_cv_regex="regex.h"
 else


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

-#line 11090 "configure"
+#line 11180 "configure"

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


@@ -11102,16 +11192,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:11105: \"$ac_link\"") >&5
+if { (eval echo "$as_me:11195: \"$ac_link\"") >&5

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

-  echo "$as_me:11108: \$? = $ac_status" >&5
+  echo "$as_me:11198: \$? = $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:11111: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11201: \"$ac_try\"") >&5

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

-  echo "$as_me:11114: \$? = $ac_status" >&5
+  echo "$as_me:11204: \$? = $ac_status" >&5

   (exit $ac_status); }; }; then
   cf_cv_regex="regexp.h"
 else
   (exit $ac_status); }; }; then
   cf_cv_regex="regexp.h"
 else


@@ -11121,7 +11211,7 @@ cat conftest.$ac_ext >&5
                cf_save_LIBS="$LIBS"
                LIBS="-lgen $LIBS"
                cat >conftest.$ac_ext <<_ACEOF
                cf_save_LIBS="$LIBS"
                LIBS="-lgen $LIBS"
                cat >conftest.$ac_ext <<_ACEOF

-#line 11124 "configure"
+#line 11214 "configure"

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


@@ -11136,16 +11226,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:11139: \"$ac_link\"") >&5
+if { (eval echo "$as_me:11229: \"$ac_link\"") >&5

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

-  echo "$as_me:11142: \$? = $ac_status" >&5
+  echo "$as_me:11232: \$? = $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:11145: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11235: \"$ac_try\"") >&5

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

-  echo "$as_me:11148: \$? = $ac_status" >&5
+  echo "$as_me:11238: \$? = $ac_status" >&5

   (exit $ac_status); }; }; then
   cf_cv_regex="regexpr.h"
 else
   (exit $ac_status); }; }; then
   cf_cv_regex="regexpr.h"
 else


@@ -11161,7 +11251,7 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 
 fi
 
 
 fi
 

-echo "$as_me:11164: result: $cf_cv_regex" >&5
+echo "$as_me:11254: result: $cf_cv_regex" >&5

 echo "${ECHO_T}$cf_cv_regex" >&6
 case $cf_cv_regex in
        regex.h)   cat >>confdefs.h <<\EOF
 echo "${ECHO_T}$cf_cv_regex" >&6
 case $cf_cv_regex in
        regex.h)   cat >>confdefs.h <<\EOF


@@ -11197,23 +11287,23 @@ wctype.h \
 
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
 
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`

-echo "$as_me:11200: checking for $ac_header" >&5
+echo "$as_me:11290: 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 11206 "configure"
+#line 11296 "configure"

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

-if { (eval echo "$as_me:11210: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:11300: \"$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:11216: \$? = $ac_status" >&5
+  echo "$as_me:11306: \$? = $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


@@ -11232,7 +11322,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
 fi
 rm -f conftest.err conftest.$ac_ext
 fi

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


@@ -11246,7 +11336,7 @@ done
 # Note: even non-Posix ISC needs <sys/bsdtypes.h> to declare fd_set
 if test "$ISC" = yes ; then
 
 # Note: even non-Posix ISC needs <sys/bsdtypes.h> to declare fd_set
 if test "$ISC" = yes ; then
 

-echo "$as_me:11249: checking for main in -lcposix" >&5
+echo "$as_me:11339: checking for main in -lcposix" >&5

 echo $ECHO_N "checking for main in -lcposix... $ECHO_C" >&6
 if test "${ac_cv_lib_cposix_main+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 echo $ECHO_N "checking for main in -lcposix... $ECHO_C" >&6
 if test "${ac_cv_lib_cposix_main+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6


@@ -11254,7 +11344,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lcposix  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lcposix  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF

-#line 11257 "configure"
+#line 11347 "configure"

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


@@ -11266,16 +11356,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:11269: \"$ac_link\"") >&5
+if { (eval echo "$as_me:11359: \"$ac_link\"") >&5

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

-  echo "$as_me:11272: \$? = $ac_status" >&5
+  echo "$as_me:11362: \$? = $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:11275: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11365: \"$ac_try\"") >&5

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

-  echo "$as_me:11278: \$? = $ac_status" >&5
+  echo "$as_me:11368: \$? = $ac_status" >&5

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


@@ -11286,7 +11376,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi

-echo "$as_me:11289: result: $ac_cv_lib_cposix_main" >&5
+echo "$as_me:11379: result: $ac_cv_lib_cposix_main" >&5

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


@@ -11297,7 +11387,7 @@ EOF
 
 fi
 
 
 fi
 

-       echo "$as_me:11300: checking for bzero in -linet" >&5
+       echo "$as_me:11390: checking for bzero in -linet" >&5

 echo $ECHO_N "checking for bzero in -linet... $ECHO_C" >&6
 if test "${ac_cv_lib_inet_bzero+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 echo $ECHO_N "checking for bzero in -linet... $ECHO_C" >&6
 if test "${ac_cv_lib_inet_bzero+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6


@@ -11305,7 +11395,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-linet  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-linet  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF

-#line 11308 "configure"
+#line 11398 "configure"

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


@@ -11324,16 +11414,16 @@ bzero ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext

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

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

-  echo "$as_me:11330: \$? = $ac_status" >&5
+  echo "$as_me:11420: \$? = $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:11333: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11423: \"$ac_try\"") >&5

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

-  echo "$as_me:11336: \$? = $ac_status" >&5
+  echo "$as_me:11426: \$? = $ac_status" >&5

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


@@ -11344,21 +11434,21 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi

-echo "$as_me:11347: result: $ac_cv_lib_inet_bzero" >&5
+echo "$as_me:11437: result: $ac_cv_lib_inet_bzero" >&5

 echo "${ECHO_T}$ac_cv_lib_inet_bzero" >&6
 if test $ac_cv_lib_inet_bzero = yes; then
   LIBS="$LIBS -linet"
 fi
 fi
 
 echo "${ECHO_T}$ac_cv_lib_inet_bzero" >&6
 if test $ac_cv_lib_inet_bzero = yes; then
   LIBS="$LIBS -linet"
 fi
 fi
 

-echo "$as_me:11354: checking if sys/time.h works with sys/select.h" >&5
+echo "$as_me:11444: checking if sys/time.h works with sys/select.h" >&5

 echo $ECHO_N "checking if sys/time.h works with sys/select.h... $ECHO_C" >&6
 if test "${cf_cv_sys_time_select+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 cat >conftest.$ac_ext <<_ACEOF
 echo $ECHO_N "checking if sys/time.h works with sys/select.h... $ECHO_C" >&6
 if test "${cf_cv_sys_time_select+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 cat >conftest.$ac_ext <<_ACEOF

-#line 11361 "configure"
+#line 11451 "configure"

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


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

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

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

-  echo "$as_me:11384: \$? = $ac_status" >&5
+  echo "$as_me:11474: \$? = $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:11387: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11477: \"$ac_try\"") >&5

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

-  echo "$as_me:11390: \$? = $ac_status" >&5
+  echo "$as_me:11480: \$? = $ac_status" >&5

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


@@ -11399,7 +11489,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
 
 
 fi
 

-echo "$as_me:11402: result: $cf_cv_sys_time_select" >&5
+echo "$as_me:11492: result: $cf_cv_sys_time_select" >&5

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


@@ -11413,7 +11503,7 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 ac_main_return=return
 
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 ac_main_return=return
 

-echo "$as_me:11416: checking for $CC option to accept ANSI C" >&5
+echo "$as_me:11506: checking for $CC option to accept ANSI C" >&5

 echo $ECHO_N "checking for $CC option to accept ANSI C... $ECHO_C" >&6
 if test "${ac_cv_prog_cc_stdc+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 echo $ECHO_N "checking for $CC option to accept ANSI C... $ECHO_C" >&6
 if test "${ac_cv_prog_cc_stdc+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6


@@ -11421,7 +11511,7 @@ else
   ac_cv_prog_cc_stdc=no
 ac_save_CC=$CC
 cat >conftest.$ac_ext <<_ACEOF
   ac_cv_prog_cc_stdc=no
 ac_save_CC=$CC
 cat >conftest.$ac_ext <<_ACEOF

-#line 11424 "configure"
+#line 11514 "configure"

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


@@ -11470,16 +11560,16 @@ for ac_arg in "" -qlanglvl=ansi -std1 -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIO
 do
   CC="$ac_save_CC $ac_arg"
   rm -f conftest.$ac_objext
 do
   CC="$ac_save_CC $ac_arg"
   rm -f conftest.$ac_objext

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

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

-  echo "$as_me:11476: \$? = $ac_status" >&5
+  echo "$as_me:11566: \$? = $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:11479: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11569: \"$ac_try\"") >&5

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

-  echo "$as_me:11482: \$? = $ac_status" >&5
+  echo "$as_me:11572: \$? = $ac_status" >&5

   (exit $ac_status); }; }; then
   ac_cv_prog_cc_stdc=$ac_arg
 break
   (exit $ac_status); }; }; then
   ac_cv_prog_cc_stdc=$ac_arg
 break


@@ -11496,21 +11586,21 @@ fi
 
 case "x$ac_cv_prog_cc_stdc" in
   x|xno)
 
 case "x$ac_cv_prog_cc_stdc" in
   x|xno)

-    echo "$as_me:11499: result: none needed" >&5
+    echo "$as_me:11589: result: none needed" >&5

 echo "${ECHO_T}none needed" >&6 ;;
   *)
 echo "${ECHO_T}none needed" >&6 ;;
   *)

-    echo "$as_me:11502: result: $ac_cv_prog_cc_stdc" >&5
+    echo "$as_me:11592: result: $ac_cv_prog_cc_stdc" >&5

 echo "${ECHO_T}$ac_cv_prog_cc_stdc" >&6
     CC="$CC $ac_cv_prog_cc_stdc" ;;
 esac
 
 echo "${ECHO_T}$ac_cv_prog_cc_stdc" >&6
     CC="$CC $ac_cv_prog_cc_stdc" ;;
 esac
 

-echo "$as_me:11507: checking for an ANSI C-conforming const" >&5
+echo "$as_me:11597: checking for an ANSI C-conforming const" >&5

 echo $ECHO_N "checking for an ANSI C-conforming const... $ECHO_C" >&6
 if test "${ac_cv_c_const+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 echo $ECHO_N "checking for an ANSI C-conforming const... $ECHO_C" >&6
 if test "${ac_cv_c_const+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF

-#line 11513 "configure"
+#line 11603 "configure"

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


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

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

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

-  echo "$as_me:11574: \$? = $ac_status" >&5
+  echo "$as_me:11664: \$? = $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:11577: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11667: \"$ac_try\"") >&5

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

-  echo "$as_me:11580: \$? = $ac_status" >&5
+  echo "$as_me:11670: \$? = $ac_status" >&5

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


@@ -11587,7 +11677,7 @@ ac_cv_c_const=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi

-echo "$as_me:11590: result: $ac_cv_c_const" >&5
+echo "$as_me:11680: result: $ac_cv_c_const" >&5

 echo "${ECHO_T}$ac_cv_c_const" >&6
 if test $ac_cv_c_const = no; then
 
 echo "${ECHO_T}$ac_cv_c_const" >&6
 if test $ac_cv_c_const = no; then
 


@@ -11597,7 +11687,7 @@ EOF
 
 fi
 
 
 fi
 

-echo "$as_me:11600: checking for inline" >&5
+echo "$as_me:11690: checking for inline" >&5

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


@@ -11605,7 +11695,7 @@ else
   ac_cv_c_inline=no
 for ac_kw in inline __inline__ __inline; do
   cat >conftest.$ac_ext <<_ACEOF
   ac_cv_c_inline=no
 for ac_kw in inline __inline__ __inline; do
   cat >conftest.$ac_ext <<_ACEOF

-#line 11608 "configure"
+#line 11698 "configure"

 #include "confdefs.h"
 #ifndef __cplusplus
 static $ac_kw int static_foo () {return 0; }
 #include "confdefs.h"
 #ifndef __cplusplus
 static $ac_kw int static_foo () {return 0; }


@@ -11614,16 +11704,16 @@ $ac_kw int foo () {return 0; }
 
 _ACEOF
 rm -f conftest.$ac_objext
 
 _ACEOF
 rm -f conftest.$ac_objext

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

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

-  echo "$as_me:11620: \$? = $ac_status" >&5
+  echo "$as_me:11710: \$? = $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:11623: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11713: \"$ac_try\"") >&5

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

-  echo "$as_me:11626: \$? = $ac_status" >&5
+  echo "$as_me:11716: \$? = $ac_status" >&5

   (exit $ac_status); }; }; then
   ac_cv_c_inline=$ac_kw; break
 else
   (exit $ac_status); }; }; then
   ac_cv_c_inline=$ac_kw; break
 else


@@ -11634,7 +11724,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 done
 
 fi
 done
 
 fi

-echo "$as_me:11637: result: $ac_cv_c_inline" >&5
+echo "$as_me:11727: result: $ac_cv_c_inline" >&5

 echo "${ECHO_T}$ac_cv_c_inline" >&6
 case $ac_cv_c_inline in
   inline | yes) ;;
 echo "${ECHO_T}$ac_cv_c_inline" >&6
 case $ac_cv_c_inline in
   inline | yes) ;;


@@ -11657,7 +11747,7 @@ if test "$ac_cv_c_inline" != no ; then
     :
   elif test "$GCC" = yes
   then
     :
   elif test "$GCC" = yes
   then

-    echo "$as_me:11660: checking if gcc supports options to tune inlining" >&5
+    echo "$as_me:11750: checking if gcc supports options to tune inlining" >&5

 echo $ECHO_N "checking if gcc supports options to tune inlining... $ECHO_C" >&6
 if test "${cf_cv_gcc_inline+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 echo $ECHO_N "checking if gcc supports options to tune inlining... $ECHO_C" >&6
 if test "${cf_cv_gcc_inline+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6


@@ -11666,7 +11756,7 @@ else
       cf_save_CFLAGS=$CFLAGS
       CFLAGS="$CFLAGS --param max-inline-insns-single=1200"
       cat >conftest.$ac_ext <<_ACEOF
       cf_save_CFLAGS=$CFLAGS
       CFLAGS="$CFLAGS --param max-inline-insns-single=1200"
       cat >conftest.$ac_ext <<_ACEOF

-#line 11669 "configure"
+#line 11759 "configure"

 #include "confdefs.h"
 inline int foo(void) { return 1; }
 int
 #include "confdefs.h"
 inline int foo(void) { return 1; }
 int


@@ -11678,16 +11768,16 @@ ${cf_cv_main_return:-return} foo()
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

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

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

-  echo "$as_me:11684: \$? = $ac_status" >&5
+  echo "$as_me:11774: \$? = $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:11687: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11777: \"$ac_try\"") >&5

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

-  echo "$as_me:11690: \$? = $ac_status" >&5
+  echo "$as_me:11780: \$? = $ac_status" >&5

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


@@ -11699,7 +11789,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
       CFLAGS=$cf_save_CFLAGS
 
 fi
       CFLAGS=$cf_save_CFLAGS
 
 fi

-echo "$as_me:11702: result: $cf_cv_gcc_inline" >&5
+echo "$as_me:11792: result: $cf_cv_gcc_inline" >&5

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


@@ -11775,7 +11865,7 @@ fi
   fi
 fi
 
   fi
 fi
 

-echo "$as_me:11778: checking for signal global datatype" >&5
+echo "$as_me:11868: checking for signal global datatype" >&5

 echo $ECHO_N "checking for signal global datatype... $ECHO_C" >&6
 if test "${cf_cv_sig_atomic_t+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 echo $ECHO_N "checking for signal global datatype... $ECHO_C" >&6
 if test "${cf_cv_sig_atomic_t+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6


@@ -11787,7 +11877,7 @@ else
                "int"
        do
        cat >conftest.$ac_ext <<_ACEOF
                "int"
        do
        cat >conftest.$ac_ext <<_ACEOF

-#line 11790 "configure"
+#line 11880 "configure"

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


@@ -11810,16 +11900,16 @@ signal(SIGINT, handler);
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

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

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

-  echo "$as_me:11816: \$? = $ac_status" >&5
+  echo "$as_me:11906: \$? = $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:11819: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11909: \"$ac_try\"") >&5

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

-  echo "$as_me:11822: \$? = $ac_status" >&5
+  echo "$as_me:11912: \$? = $ac_status" >&5

   (exit $ac_status); }; }; then
   cf_cv_sig_atomic_t=$cf_type
 else
   (exit $ac_status); }; }; then
   cf_cv_sig_atomic_t=$cf_type
 else


@@ -11833,7 +11923,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
 
 
 fi
 

-echo "$as_me:11836: result: $cf_cv_sig_atomic_t" >&5
+echo "$as_me:11926: result: $cf_cv_sig_atomic_t" >&5

 echo "${ECHO_T}$cf_cv_sig_atomic_t" >&6
 test "$cf_cv_sig_atomic_t" != no && cat >>confdefs.h <<EOF
 #define SIG_ATOMIC_T $cf_cv_sig_atomic_t
 echo "${ECHO_T}$cf_cv_sig_atomic_t" >&6
 test "$cf_cv_sig_atomic_t" != no && cat >>confdefs.h <<EOF
 #define SIG_ATOMIC_T $cf_cv_sig_atomic_t


@@ -11841,7 +11931,7 @@ EOF
 
 if test $NCURSES_CHTYPE = auto ; then
 
 
 if test $NCURSES_CHTYPE = auto ; then
 

-echo "$as_me:11844: checking for type of chtype" >&5
+echo "$as_me:11934: checking for type of chtype" >&5

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


@@ -11851,7 +11941,7 @@ else
   cf_cv_typeof_chtype=long
 else
   cat >conftest.$ac_ext <<_ACEOF
   cf_cv_typeof_chtype=long
 else
   cat >conftest.$ac_ext <<_ACEOF

-#line 11854 "configure"
+#line 11944 "configure"

 #include "confdefs.h"
 
 #define WANT_BITS 31
 #include "confdefs.h"
 
 #define WANT_BITS 31


@@ -11886,15 +11976,15 @@ int main()
 
 _ACEOF
 rm -f conftest$ac_exeext
 
 _ACEOF
 rm -f conftest$ac_exeext

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

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

-  echo "$as_me:11892: \$? = $ac_status" >&5
+  echo "$as_me:11982: \$? = $ac_status" >&5

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

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

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

-  echo "$as_me:11897: \$? = $ac_status" >&5
+  echo "$as_me:11987: \$? = $ac_status" >&5

   (exit $ac_status); }; }; then
   cf_cv_typeof_chtype=`cat cf_test.out`
 else
   (exit $ac_status); }; }; then
   cf_cv_typeof_chtype=`cat cf_test.out`
 else


@@ -11909,7 +11999,7 @@ fi
 
 fi
 
 
 fi
 

-echo "$as_me:11912: result: $cf_cv_typeof_chtype" >&5
+echo "$as_me:12002: result: $cf_cv_typeof_chtype" >&5

 echo "${ECHO_T}$cf_cv_typeof_chtype" >&6
 
 cat >>confdefs.h <<EOF
 echo "${ECHO_T}$cf_cv_typeof_chtype" >&6
 
 cat >>confdefs.h <<EOF


@@ -11921,14 +12011,14 @@ else
 fi
 test "$cf_cv_typeof_chtype" = unsigned && cf_cv_typeof_chtype=""
 
 fi
 test "$cf_cv_typeof_chtype" = unsigned && cf_cv_typeof_chtype=""
 

-echo "$as_me:11924: checking if unsigned literals are legal" >&5
+echo "$as_me:12014: checking if unsigned literals are legal" >&5

 echo $ECHO_N "checking if unsigned literals are legal... $ECHO_C" >&6
 if test "${cf_cv_unsigned_literals+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
        cat >conftest.$ac_ext <<_ACEOF
 echo $ECHO_N "checking if unsigned literals are legal... $ECHO_C" >&6
 if test "${cf_cv_unsigned_literals+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
        cat >conftest.$ac_ext <<_ACEOF

-#line 11931 "configure"
+#line 12021 "configure"

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


@@ -11940,16 +12030,16 @@ long x = 1L + 1UL + 1U + 1
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

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

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

-  echo "$as_me:11946: \$? = $ac_status" >&5
+  echo "$as_me:12036: \$? = $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:11949: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12039: \"$ac_try\"") >&5

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

-  echo "$as_me:11952: \$? = $ac_status" >&5
+  echo "$as_me:12042: \$? = $ac_status" >&5

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


@@ -11961,7 +12051,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
 
 
 fi
 

-echo "$as_me:11964: result: $cf_cv_unsigned_literals" >&5
+echo "$as_me:12054: result: $cf_cv_unsigned_literals" >&5

 echo "${ECHO_T}$cf_cv_unsigned_literals" >&6
 
 cf_cv_1UL="1"
 echo "${ECHO_T}$cf_cv_unsigned_literals" >&6
 
 cf_cv_1UL="1"


@@ -11977,14 +12067,14 @@ test "$cf_cv_typeof_mmask_t" = unsigned && cf_cv_typeof_mmask_t=""
 
 ###    Checks for external-data
 
 
 ###    Checks for external-data
 

-echo "$as_me:11980: checking if external errno is declared" >&5
+echo "$as_me:12070: checking if external errno is declared" >&5

 echo $ECHO_N "checking if external errno is declared... $ECHO_C" >&6
 if test "${cf_cv_dcl_errno+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
     cat >conftest.$ac_ext <<_ACEOF
 echo $ECHO_N "checking if external errno is declared... $ECHO_C" >&6
 if test "${cf_cv_dcl_errno+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
     cat >conftest.$ac_ext <<_ACEOF

-#line 11987 "configure"
+#line 12077 "configure"

 #include "confdefs.h"
 
 #ifdef HAVE_STDLIB_H
 #include "confdefs.h"
 
 #ifdef HAVE_STDLIB_H


@@ -12002,16 +12092,16 @@ long x = (long) errno
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

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

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

-  echo "$as_me:12008: \$? = $ac_status" >&5
+  echo "$as_me:12098: \$? = $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:12011: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12101: \"$ac_try\"") >&5

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

-  echo "$as_me:12014: \$? = $ac_status" >&5
+  echo "$as_me:12104: \$? = $ac_status" >&5

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


@@ -12022,7 +12112,7 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi

-echo "$as_me:12025: result: $cf_cv_dcl_errno" >&5
+echo "$as_me:12115: result: $cf_cv_dcl_errno" >&5

 echo "${ECHO_T}$cf_cv_dcl_errno" >&6
 
 if test "$cf_cv_dcl_errno" = no ; then
 echo "${ECHO_T}$cf_cv_dcl_errno" >&6
 
 if test "$cf_cv_dcl_errno" = no ; then


@@ -12037,14 +12127,14 @@ fi
 
 # It's possible (for near-UNIX clones) that the data doesn't exist
 
 
 # It's possible (for near-UNIX clones) that the data doesn't exist
 

-echo "$as_me:12040: checking if external errno exists" >&5
+echo "$as_me:12130: checking if external errno exists" >&5

 echo $ECHO_N "checking if external errno exists... $ECHO_C" >&6
 if test "${cf_cv_have_errno+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
     cat >conftest.$ac_ext <<_ACEOF
 echo $ECHO_N "checking if external errno exists... $ECHO_C" >&6
 if test "${cf_cv_have_errno+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
     cat >conftest.$ac_ext <<_ACEOF

-#line 12047 "configure"
+#line 12137 "configure"

 #include "confdefs.h"
 
 #undef errno
 #include "confdefs.h"
 
 #undef errno


@@ -12059,16 +12149,16 @@ errno = 2
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext

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

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

-  echo "$as_me:12065: \$? = $ac_status" >&5
+  echo "$as_me:12155: \$? = $ac_status" >&5

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

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

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

-  echo "$as_me:12071: \$? = $ac_status" >&5
+  echo "$as_me:12161: \$? = $ac_status" >&5

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


@@ -12079,7 +12169,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 
 fi

-echo "$as_me:12082: result: $cf_cv_have_errno" >&5
+echo "$as_me:12172: result: $cf_cv_have_errno" >&5

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


@@ -12092,7 +12182,7 @@ EOF
 
 fi
 
 
 fi
 

-echo "$as_me:12095: checking if data-only library module links" >&5
+echo "$as_me:12185: checking if data-only library module links" >&5

 echo $ECHO_N "checking if data-only library module links... $ECHO_C" >&6
 if test "${cf_cv_link_dataonly+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 echo $ECHO_N "checking if data-only library module links... $ECHO_C" >&6
 if test "${cf_cv_link_dataonly+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6


@@ -12100,20 +12190,20 @@ else
 
        rm -f conftest.a
        cat >conftest.$ac_ext <<EOF
 
        rm -f conftest.a
        cat >conftest.$ac_ext <<EOF

-#line 12103 "configure"
+#line 12193 "configure"

 int    testdata[3] = { 123, 456, 789 };
 EOF
 int    testdata[3] = { 123, 456, 789 };
 EOF

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

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

-  echo "$as_me:12109: \$? = $ac_status" >&5
+  echo "$as_me:12199: \$? = $ac_status" >&5

   (exit $ac_status); } ; then
                mv conftest.o data.o && \
                ( $AR $AR_OPTS conftest.a data.o ) 2>&5 1>/dev/null
        fi
        rm -f conftest.$ac_ext data.o
        cat >conftest.$ac_ext <<EOF
   (exit $ac_status); } ; then
                mv conftest.o data.o && \
                ( $AR $AR_OPTS conftest.a data.o ) 2>&5 1>/dev/null
        fi
        rm -f conftest.$ac_ext data.o
        cat >conftest.$ac_ext <<EOF

-#line 12116 "configure"
+#line 12206 "configure"

 int    testfunc()
 {
 #if defined(NeXT)
 int    testfunc()
 {
 #if defined(NeXT)


@@ -12126,10 +12216,10 @@ int   testfunc()
 #endif
 }
 EOF
 #endif
 }
 EOF

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

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

-  echo "$as_me:12132: \$? = $ac_status" >&5
+  echo "$as_me:12222: \$? = $ac_status" >&5

   (exit $ac_status); }; then
                mv conftest.o func.o && \
                ( $AR $AR_OPTS conftest.a func.o ) 2>&5 1>/dev/null
   (exit $ac_status); }; then
                mv conftest.o func.o && \
                ( $AR $AR_OPTS conftest.a func.o ) 2>&5 1>/dev/null


@@ -12142,7 +12232,7 @@ EOF
   cf_cv_link_dataonly=unknown
 else
   cat >conftest.$ac_ext <<_ACEOF
   cf_cv_link_dataonly=unknown
 else
   cat >conftest.$ac_ext <<_ACEOF

-#line 12145 "configure"
+#line 12235 "configure"

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


@@ -12153,15 +12243,15 @@ else
 
 _ACEOF
 rm -f conftest$ac_exeext
 
 _ACEOF
 rm -f conftest$ac_exeext

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

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

-  echo "$as_me:12159: \$? = $ac_status" >&5
+  echo "$as_me:12249: \$? = $ac_status" >&5

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

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

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

-  echo "$as_me:12164: \$? = $ac_status" >&5
+  echo "$as_me:12254: \$? = $ac_status" >&5

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


@@ -12176,7 +12266,7 @@ fi
 
 fi
 
 
 fi
 

-echo "$as_me:12179: result: $cf_cv_link_dataonly" >&5
+echo "$as_me:12269: result: $cf_cv_link_dataonly" >&5

 echo "${ECHO_T}$cf_cv_link_dataonly" >&6
 
 if test "$cf_cv_link_dataonly" = no ; then
 echo "${ECHO_T}$cf_cv_link_dataonly" >&6
 
 if test "$cf_cv_link_dataonly" = no ; then


@@ -12211,13 +12301,13 @@ vsnprintf \
 
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
 
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`

-echo "$as_me:12214: checking for $ac_func" >&5
+echo "$as_me:12304: checking for $ac_func" >&5

 echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
 if eval "test \"\${$as_ac_var+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
 if eval "test \"\${$as_ac_var+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF

-#line 12220 "configure"
+#line 12310 "configure"

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


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

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

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

-  echo "$as_me:12254: \$? = $ac_status" >&5
+  echo "$as_me:12344: \$? = $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:12257: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12347: \"$ac_try\"") >&5

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

-  echo "$as_me:12260: \$? = $ac_status" >&5
+  echo "$as_me:12350: \$? = $ac_status" >&5

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


@@ -12267,7 +12357,7 @@ eval "$as_ac_var=no"
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi

-echo "$as_me:12270: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "$as_me:12360: result: `eval echo '${'$as_ac_var'}'`" >&5

 echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
 if test `eval echo '${'$as_ac_var'}'` = yes; then
   cat >>confdefs.h <<EOF
 echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
 if test `eval echo '${'$as_ac_var'}'` = yes; then
   cat >>confdefs.h <<EOF


@@ -12279,14 +12369,14 @@ done
 
 if test "$with_getcap" = "yes" ; then
 
 
 if test "$with_getcap" = "yes" ; then
 

-echo "$as_me:12282: checking for terminal-capability database functions" >&5
+echo "$as_me:12372: checking for terminal-capability database functions" >&5

 echo $ECHO_N "checking for terminal-capability database functions... $ECHO_C" >&6
 if test "${cf_cv_cgetent+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 cat >conftest.$ac_ext <<_ACEOF
 echo $ECHO_N "checking for terminal-capability database functions... $ECHO_C" >&6
 if test "${cf_cv_cgetent+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 cat >conftest.$ac_ext <<_ACEOF

-#line 12289 "configure"
+#line 12379 "configure"

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


@@ -12306,16 +12396,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:12309: \"$ac_link\"") >&5
+if { (eval echo "$as_me:12399: \"$ac_link\"") >&5

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

-  echo "$as_me:12312: \$? = $ac_status" >&5
+  echo "$as_me:12402: \$? = $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:12315: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12405: \"$ac_try\"") >&5

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

-  echo "$as_me:12318: \$? = $ac_status" >&5
+  echo "$as_me:12408: \$? = $ac_status" >&5

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


@@ -12327,7 +12417,7 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 
 fi
 
 
 fi
 

-echo "$as_me:12330: result: $cf_cv_cgetent" >&5
+echo "$as_me:12420: result: $cf_cv_cgetent" >&5

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


@@ -12335,14 +12425,14 @@ EOF
 
 fi
 
 
 fi
 

-echo "$as_me:12338: checking for isascii" >&5
+echo "$as_me:12428: checking for isascii" >&5

 echo $ECHO_N "checking for isascii... $ECHO_C" >&6
 if test "${cf_cv_have_isascii+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
        cat >conftest.$ac_ext <<_ACEOF
 echo $ECHO_N "checking for isascii... $ECHO_C" >&6
 if test "${cf_cv_have_isascii+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
        cat >conftest.$ac_ext <<_ACEOF

-#line 12345 "configure"
+#line 12435 "configure"

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


@@ -12354,16 +12444,16 @@ int x = isascii(' ')
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext

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

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

-  echo "$as_me:12360: \$? = $ac_status" >&5
+  echo "$as_me:12450: \$? = $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:12363: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12453: \"$ac_try\"") >&5

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

-  echo "$as_me:12366: \$? = $ac_status" >&5
+  echo "$as_me:12456: \$? = $ac_status" >&5

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


@@ -12374,17 +12464,17 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 
 fi

-echo "$as_me:12377: result: $cf_cv_have_isascii" >&5
+echo "$as_me:12467: result: $cf_cv_have_isascii" >&5

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

-echo "$as_me:12384: checking whether sigaction needs _POSIX_SOURCE" >&5
+echo "$as_me:12474: checking whether sigaction needs _POSIX_SOURCE" >&5

 echo $ECHO_N "checking whether sigaction needs _POSIX_SOURCE... $ECHO_C" >&6
 cat >conftest.$ac_ext <<_ACEOF
 echo $ECHO_N "checking whether sigaction needs _POSIX_SOURCE... $ECHO_C" >&6
 cat >conftest.$ac_ext <<_ACEOF

-#line 12387 "configure"
+#line 12477 "configure"

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


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

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

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

-  echo "$as_me:12404: \$? = $ac_status" >&5
+  echo "$as_me:12494: \$? = $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:12407: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12497: \"$ac_try\"") >&5

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

-  echo "$as_me:12410: \$? = $ac_status" >&5
+  echo "$as_me:12500: \$? = $ac_status" >&5

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


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

-#line 12418 "configure"
+#line 12508 "configure"

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


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

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

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

-  echo "$as_me:12436: \$? = $ac_status" >&5
+  echo "$as_me:12526: \$? = $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:12439: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12529: \"$ac_try\"") >&5

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

-  echo "$as_me:12442: \$? = $ac_status" >&5
+  echo "$as_me:12532: \$? = $ac_status" >&5

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


@@ -12454,11 +12544,11 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext

-echo "$as_me:12457: result: $sigact_bad" >&5
+echo "$as_me:12547: result: $sigact_bad" >&5

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

-echo "$as_me:12461: checking if nanosleep really works" >&5
+echo "$as_me:12551: checking if nanosleep really works" >&5

 echo $ECHO_N "checking if nanosleep really works... $ECHO_C" >&6
 if test "${cf_cv_func_nanosleep+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 echo $ECHO_N "checking if nanosleep really works... $ECHO_C" >&6
 if test "${cf_cv_func_nanosleep+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6


@@ -12468,7 +12558,7 @@ if test "$cross_compiling" = yes; then
   cf_cv_func_nanosleep=unknown
 else
   cat >conftest.$ac_ext <<_ACEOF
   cf_cv_func_nanosleep=unknown
 else
   cat >conftest.$ac_ext <<_ACEOF

-#line 12471 "configure"
+#line 12561 "configure"

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


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

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

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

-  echo "$as_me:12499: \$? = $ac_status" >&5
+  echo "$as_me:12589: \$? = $ac_status" >&5

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

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

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

-  echo "$as_me:12504: \$? = $ac_status" >&5
+  echo "$as_me:12594: \$? = $ac_status" >&5

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


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

-echo "$as_me:12516: result: $cf_cv_func_nanosleep" >&5
+echo "$as_me:12606: result: $cf_cv_func_nanosleep" >&5

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


@@ -12527,23 +12617,23 @@ unistd.h \
 
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
 
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`

-echo "$as_me:12530: checking for $ac_header" >&5
+echo "$as_me:12620: 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 12536 "configure"
+#line 12626 "configure"

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

-if { (eval echo "$as_me:12540: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:12630: \"$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:12546: \$? = $ac_status" >&5
+  echo "$as_me:12636: \$? = $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


@@ -12562,7 +12652,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
 fi
 rm -f conftest.err conftest.$ac_ext
 fi

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


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

-echo "$as_me:12580: checking for $ac_header" >&5
+echo "$as_me:12670: checking for $ac_header" >&5

 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
 if eval "test \"\${$as_ac_Header+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
 if eval "test \"\${$as_ac_Header+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF

-#line 12586 "configure"
+#line 12676 "configure"

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

-if { (eval echo "$as_me:12590: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:12680: \"$ac_cpp conftest.$ac_ext\"") >&5

   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
   ac_status=$?
   egrep -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
   ac_status=$?
   egrep -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5

-  echo "$as_me:12596: \$? = $ac_status" >&5
+  echo "$as_me:12686: \$? = $ac_status" >&5

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


@@ -12612,7 +12702,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
 fi
 rm -f conftest.err conftest.$ac_ext
 fi

-echo "$as_me:12615: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:12705: result: `eval echo '${'$as_ac_Header'}'`" >&5

 echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
 if test `eval echo '${'$as_ac_Header'}'` = yes; then
   cat >>confdefs.h <<EOF
 echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
 if test `eval echo '${'$as_ac_Header'}'` = yes; then
   cat >>confdefs.h <<EOF


@@ -12630,10 +12720,10 @@ if test "$ac_cv_header_termios_h" = yes ; then
        *)      termios_bad=maybe ;;
        esac
        if test "$termios_bad" = maybe ; then
        *)      termios_bad=maybe ;;
        esac
        if test "$termios_bad" = maybe ; then

-       echo "$as_me:12633: checking whether termios.h needs _POSIX_SOURCE" >&5
+       echo "$as_me:12723: checking whether termios.h needs _POSIX_SOURCE" >&5

 echo $ECHO_N "checking whether termios.h needs _POSIX_SOURCE... $ECHO_C" >&6
        cat >conftest.$ac_ext <<_ACEOF
 echo $ECHO_N "checking whether termios.h needs _POSIX_SOURCE... $ECHO_C" >&6
        cat >conftest.$ac_ext <<_ACEOF

-#line 12636 "configure"
+#line 12726 "configure"

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


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

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

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

-  echo "$as_me:12651: \$? = $ac_status" >&5
+  echo "$as_me:12741: \$? = $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:12654: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12744: \"$ac_try\"") >&5

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

-  echo "$as_me:12657: \$? = $ac_status" >&5
+  echo "$as_me:12747: \$? = $ac_status" >&5

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


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

-#line 12665 "configure"
+#line 12755 "configure"

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


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

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

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

-  echo "$as_me:12682: \$? = $ac_status" >&5
+  echo "$as_me:12772: \$? = $ac_status" >&5

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

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

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

-  echo "$as_me:12688: \$? = $ac_status" >&5
+  echo "$as_me:12778: \$? = $ac_status" >&5

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


@@ -12700,19 +12790,19 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext

-       echo "$as_me:12703: result: $termios_bad" >&5
+       echo "$as_me:12793: result: $termios_bad" >&5

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

-echo "$as_me:12708: checking for tcgetattr" >&5
+echo "$as_me:12798: checking for tcgetattr" >&5

 echo $ECHO_N "checking for tcgetattr... $ECHO_C" >&6
 if test "${cf_cv_have_tcgetattr+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 cat >conftest.$ac_ext <<_ACEOF
 echo $ECHO_N "checking for tcgetattr... $ECHO_C" >&6
 if test "${cf_cv_have_tcgetattr+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 cat >conftest.$ac_ext <<_ACEOF

-#line 12715 "configure"
+#line 12805 "configure"

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


@@ -12740,16 +12830,16 @@ tcgetattr(1, &foo);
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext

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

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

-  echo "$as_me:12746: \$? = $ac_status" >&5
+  echo "$as_me:12836: \$? = $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:12749: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12839: \"$ac_try\"") >&5

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

-  echo "$as_me:12752: \$? = $ac_status" >&5
+  echo "$as_me:12842: \$? = $ac_status" >&5

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


@@ -12759,20 +12849,20 @@ cf_cv_have_tcgetattr=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi

-echo "$as_me:12762: result: $cf_cv_have_tcgetattr" >&5
+echo "$as_me:12852: result: $cf_cv_have_tcgetattr" >&5

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

-echo "$as_me:12768: checking for vsscanf function or workaround" >&5
+echo "$as_me:12858: checking for vsscanf function or workaround" >&5

 echo $ECHO_N "checking for vsscanf function or workaround... $ECHO_C" >&6
 if test "${cf_cv_func_vsscanf+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 cat >conftest.$ac_ext <<_ACEOF
 echo $ECHO_N "checking for vsscanf function or workaround... $ECHO_C" >&6
 if test "${cf_cv_func_vsscanf+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 cat >conftest.$ac_ext <<_ACEOF

-#line 12775 "configure"
+#line 12865 "configure"

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


@@ -12788,16 +12878,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:12791: \"$ac_link\"") >&5
+if { (eval echo "$as_me:12881: \"$ac_link\"") >&5

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

-  echo "$as_me:12794: \$? = $ac_status" >&5
+  echo "$as_me:12884: \$? = $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:12797: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12887: \"$ac_try\"") >&5

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

-  echo "$as_me:12800: \$? = $ac_status" >&5
+  echo "$as_me:12890: \$? = $ac_status" >&5

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


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

-#line 12808 "configure"
+#line 12898 "configure"

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


@@ -12827,16 +12917,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:12830: \"$ac_link\"") >&5
+if { (eval echo "$as_me:12920: \"$ac_link\"") >&5

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

-  echo "$as_me:12833: \$? = $ac_status" >&5
+  echo "$as_me:12923: \$? = $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:12836: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12926: \"$ac_try\"") >&5

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

-  echo "$as_me:12839: \$? = $ac_status" >&5
+  echo "$as_me:12929: \$? = $ac_status" >&5

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


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

-#line 12847 "configure"
+#line 12937 "configure"

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


@@ -12866,16 +12956,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:12869: \"$ac_link\"") >&5
+if { (eval echo "$as_me:12959: \"$ac_link\"") >&5

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

-  echo "$as_me:12872: \$? = $ac_status" >&5
+  echo "$as_me:12962: \$? = $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:12875: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12965: \"$ac_try\"") >&5

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

-  echo "$as_me:12878: \$? = $ac_status" >&5
+  echo "$as_me:12968: \$? = $ac_status" >&5

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


@@ -12890,7 +12980,7 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi

-echo "$as_me:12893: result: $cf_cv_func_vsscanf" >&5
+echo "$as_me:12983: result: $cf_cv_func_vsscanf" >&5

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


@@ -12908,7 +12998,7 @@ EOF
 ;;
 esac
 
 ;;
 esac
 

-echo "$as_me:12911: checking for working mkstemp" >&5
+echo "$as_me:13001: checking for working mkstemp" >&5

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


@@ -12916,13 +13006,13 @@ else
 
 rm -f conftest*
 if test "$cross_compiling" = yes; then
 
 rm -f conftest*
 if test "$cross_compiling" = yes; then

-  echo "$as_me:12919: checking for mkstemp" >&5
+  echo "$as_me:13009: checking for mkstemp" >&5

 echo $ECHO_N "checking for mkstemp... $ECHO_C" >&6
 if test "${ac_cv_func_mkstemp+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 echo $ECHO_N "checking for mkstemp... $ECHO_C" >&6
 if test "${ac_cv_func_mkstemp+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF

-#line 12925 "configure"
+#line 13015 "configure"

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


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

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

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

-  echo "$as_me:12959: \$? = $ac_status" >&5
+  echo "$as_me:13049: \$? = $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:12962: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13052: \"$ac_try\"") >&5

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

-  echo "$as_me:12965: \$? = $ac_status" >&5
+  echo "$as_me:13055: \$? = $ac_status" >&5

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


@@ -12972,12 +13062,12 @@ ac_cv_func_mkstemp=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi

-echo "$as_me:12975: result: $ac_cv_func_mkstemp" >&5
+echo "$as_me:13065: result: $ac_cv_func_mkstemp" >&5

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

-#line 12980 "configure"
+#line 13070 "configure"

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


@@ -13015,15 +13105,15 @@ int main()
 
 _ACEOF
 rm -f conftest$ac_exeext
 
 _ACEOF
 rm -f conftest$ac_exeext

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

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

-  echo "$as_me:13021: \$? = $ac_status" >&5
+  echo "$as_me:13111: \$? = $ac_status" >&5

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

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

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

-  echo "$as_me:13026: \$? = $ac_status" >&5
+  echo "$as_me:13116: \$? = $ac_status" >&5

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


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

-echo "$as_me:13041: result: $cf_cv_func_mkstemp" >&5
+echo "$as_me:13131: result: $cf_cv_func_mkstemp" >&5

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


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

-       { echo "$as_me:13059: WARNING: cross compiling: assume setvbuf params not reversed" >&5
+       { echo "$as_me:13149: WARNING: cross compiling: assume setvbuf params not reversed" >&5

 echo "$as_me: WARNING: cross compiling: assume setvbuf params not reversed" >&2;}
 else
 echo "$as_me: WARNING: cross compiling: assume setvbuf params not reversed" >&2;}
 else

-       echo "$as_me:13062: checking whether setvbuf arguments are reversed" >&5
+       echo "$as_me:13152: checking whether setvbuf arguments are reversed" >&5

 echo $ECHO_N "checking whether setvbuf arguments are reversed... $ECHO_C" >&6
 if test "${ac_cv_func_setvbuf_reversed+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   if test "$cross_compiling" = yes; then
 echo $ECHO_N "checking whether setvbuf arguments are reversed... $ECHO_C" >&6
 if test "${ac_cv_func_setvbuf_reversed+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   if test "$cross_compiling" = yes; then

-  { { echo "$as_me:13068: error: cannot run test program while cross compiling" >&5
+  { { echo "$as_me:13158: error: cannot run test program while cross compiling" >&5

 echo "$as_me: error: cannot run test program while cross compiling" >&2;}
    { (exit 1); exit 1; }; }
 else
   cat >conftest.$ac_ext <<_ACEOF
 echo "$as_me: error: cannot run test program while cross compiling" >&2;}
    { (exit 1); exit 1; }; }
 else
   cat >conftest.$ac_ext <<_ACEOF

-#line 13073 "configure"
+#line 13163 "configure"

 #include "confdefs.h"
 #include <stdio.h>
 /* If setvbuf has the reversed format, exit 0. */
 #include "confdefs.h"
 #include <stdio.h>
 /* If setvbuf has the reversed format, exit 0. */


@@ -13087,15 +13177,15 @@ main ()
 }
 _ACEOF
 rm -f conftest$ac_exeext
 }
 _ACEOF
 rm -f conftest$ac_exeext

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

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

-  echo "$as_me:13093: \$? = $ac_status" >&5
+  echo "$as_me:13183: \$? = $ac_status" >&5

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

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

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

-  echo "$as_me:13098: \$? = $ac_status" >&5
+  echo "$as_me:13188: \$? = $ac_status" >&5

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


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

-echo "$as_me:13111: result: $ac_cv_func_setvbuf_reversed" >&5
+echo "$as_me:13201: result: $ac_cv_func_setvbuf_reversed" >&5

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


@@ -13119,13 +13209,13 @@ EOF
 fi
 
 fi
 fi
 
 fi

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

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

-#line 13128 "configure"
+#line 13218 "configure"

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


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

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

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

-  echo "$as_me:13153: \$? = $ac_status" >&5
+  echo "$as_me:13243: \$? = $ac_status" >&5

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

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

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

-  echo "$as_me:13159: \$? = $ac_status" >&5
+  echo "$as_me:13249: \$? = $ac_status" >&5

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


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

-echo "$as_me:13169: result: $ac_cv_type_signal" >&5
+echo "$as_me:13259: result: $ac_cv_type_signal" >&5

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

-echo "$as_me:13176: checking for type sigaction_t" >&5
+echo "$as_me:13266: checking for type sigaction_t" >&5

 echo $ECHO_N "checking for type sigaction_t... $ECHO_C" >&6
 if test "${cf_cv_type_sigaction+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
        cat >conftest.$ac_ext <<_ACEOF
 echo $ECHO_N "checking for type sigaction_t... $ECHO_C" >&6
 if test "${cf_cv_type_sigaction+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
        cat >conftest.$ac_ext <<_ACEOF

-#line 13183 "configure"
+#line 13273 "configure"

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


@@ -13193,16 +13283,16 @@ sigaction_t x
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

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

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

-  echo "$as_me:13199: \$? = $ac_status" >&5
+  echo "$as_me:13289: \$? = $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:13202: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13292: \"$ac_try\"") >&5

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

-  echo "$as_me:13205: \$? = $ac_status" >&5
+  echo "$as_me:13295: \$? = $ac_status" >&5

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


@@ -13213,13 +13303,13 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
 
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
 

-echo "$as_me:13216: result: $cf_cv_type_sigaction" >&5
+echo "$as_me:13306: result: $cf_cv_type_sigaction" >&5

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

-echo "$as_me:13222: checking declaration of size-change" >&5
+echo "$as_me:13312: checking declaration of size-change" >&5

 echo $ECHO_N "checking declaration of size-change... $ECHO_C" >&6
 if test "${cf_cv_sizechange+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 echo $ECHO_N "checking declaration of size-change... $ECHO_C" >&6
 if test "${cf_cv_sizechange+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6


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

-#line 13237 "configure"
+#line 13327 "configure"

 #include "confdefs.h"
 #include <sys/types.h>
 #ifdef HAVE_TERMIOS_H
 #include "confdefs.h"
 #include <sys/types.h>
 #ifdef HAVE_TERMIOS_H


@@ -13278,16 +13368,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

-if { (eval echo "$as_me:13281: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:13371: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:13284: \$? = $ac_status" >&5
+  echo "$as_me:13374: \$? = $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:13287: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13377: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:13290: \$? = $ac_status" >&5
+  echo "$as_me:13380: \$? = $ac_status" >&5

   (exit $ac_status); }; }; then
   cf_cv_sizechange=yes
 else
   (exit $ac_status); }; }; then
   cf_cv_sizechange=yes
 else


@@ -13306,7 +13396,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 done
 
 fi
 done
 
 fi

-echo "$as_me:13309: result: $cf_cv_sizechange" >&5
+echo "$as_me:13399: result: $cf_cv_sizechange" >&5

 echo "${ECHO_T}$cf_cv_sizechange" >&6
 if test "$cf_cv_sizechange" != no ; then
        cat >>confdefs.h <<\EOF
 echo "${ECHO_T}$cf_cv_sizechange" >&6
 if test "$cf_cv_sizechange" != no ; then
        cat >>confdefs.h <<\EOF


@@ -13323,13 +13413,13 @@ EOF
        esac
 fi
 
        esac
 fi
 

-echo "$as_me:13326: checking for memmove" >&5
+echo "$as_me:13416: checking for memmove" >&5

 echo $ECHO_N "checking for memmove... $ECHO_C" >&6
 if test "${ac_cv_func_memmove+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 echo $ECHO_N "checking for memmove... $ECHO_C" >&6
 if test "${ac_cv_func_memmove+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF

-#line 13332 "configure"
+#line 13422 "configure"

 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char memmove (); below.  */
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char memmove (); below.  */


@@ -13360,16 +13450,16 @@ f = memmove;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext

-if { (eval echo "$as_me:13363: \"$ac_link\"") >&5
+if { (eval echo "$as_me:13453: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:13366: \$? = $ac_status" >&5
+  echo "$as_me:13456: \$? = $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:13369: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13459: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:13372: \$? = $ac_status" >&5
+  echo "$as_me:13462: \$? = $ac_status" >&5

   (exit $ac_status); }; }; then
   ac_cv_func_memmove=yes
 else
   (exit $ac_status); }; }; then
   ac_cv_func_memmove=yes
 else


@@ -13379,19 +13469,19 @@ ac_cv_func_memmove=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi

-echo "$as_me:13382: result: $ac_cv_func_memmove" >&5
+echo "$as_me:13472: result: $ac_cv_func_memmove" >&5

 echo "${ECHO_T}$ac_cv_func_memmove" >&6
 if test $ac_cv_func_memmove = yes; then
   :
 else
 
 echo "${ECHO_T}$ac_cv_func_memmove" >&6
 if test $ac_cv_func_memmove = yes; then
   :
 else
 

-echo "$as_me:13388: checking for bcopy" >&5
+echo "$as_me:13478: checking for bcopy" >&5

 echo $ECHO_N "checking for bcopy... $ECHO_C" >&6
 if test "${ac_cv_func_bcopy+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 echo $ECHO_N "checking for bcopy... $ECHO_C" >&6
 if test "${ac_cv_func_bcopy+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF

-#line 13394 "configure"
+#line 13484 "configure"

 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char bcopy (); below.  */
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char bcopy (); below.  */


@@ -13422,16 +13512,16 @@ f = bcopy;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext

-if { (eval echo "$as_me:13425: \"$ac_link\"") >&5
+if { (eval echo "$as_me:13515: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:13428: \$? = $ac_status" >&5
+  echo "$as_me:13518: \$? = $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:13431: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13521: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:13434: \$? = $ac_status" >&5
+  echo "$as_me:13524: \$? = $ac_status" >&5

   (exit $ac_status); }; }; then
   ac_cv_func_bcopy=yes
 else
   (exit $ac_status); }; }; then
   ac_cv_func_bcopy=yes
 else


@@ -13441,11 +13531,11 @@ ac_cv_func_bcopy=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi

-echo "$as_me:13444: result: $ac_cv_func_bcopy" >&5
+echo "$as_me:13534: result: $ac_cv_func_bcopy" >&5

 echo "${ECHO_T}$ac_cv_func_bcopy" >&6
 if test $ac_cv_func_bcopy = yes; then
 
 echo "${ECHO_T}$ac_cv_func_bcopy" >&6
 if test $ac_cv_func_bcopy = yes; then
 

-       echo "$as_me:13448: checking if bcopy does overlapping moves" >&5
+       echo "$as_me:13538: checking if bcopy does overlapping moves" >&5

 echo $ECHO_N "checking if bcopy does overlapping moves... $ECHO_C" >&6
 if test "${cf_cv_good_bcopy+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 echo $ECHO_N "checking if bcopy does overlapping moves... $ECHO_C" >&6
 if test "${cf_cv_good_bcopy+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6


@@ -13455,7 +13545,7 @@ else
   cf_cv_good_bcopy=unknown
 else
   cat >conftest.$ac_ext <<_ACEOF
   cf_cv_good_bcopy=unknown
 else
   cat >conftest.$ac_ext <<_ACEOF

-#line 13458 "configure"
+#line 13548 "configure"

 #include "confdefs.h"
 
 int main() {
 #include "confdefs.h"
 
 int main() {


@@ -13469,15 +13559,15 @@ int main() {
 
 _ACEOF
 rm -f conftest$ac_exeext
 
 _ACEOF
 rm -f conftest$ac_exeext

-if { (eval echo "$as_me:13472: \"$ac_link\"") >&5
+if { (eval echo "$as_me:13562: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:13475: \$? = $ac_status" >&5
+  echo "$as_me:13565: \$? = $ac_status" >&5

   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'

-  { (eval echo "$as_me:13477: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13567: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:13480: \$? = $ac_status" >&5
+  echo "$as_me:13570: \$? = $ac_status" >&5

   (exit $ac_status); }; }; then
   cf_cv_good_bcopy=yes
 else
   (exit $ac_status); }; }; then
   cf_cv_good_bcopy=yes
 else


@@ -13490,7 +13580,7 @@ rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 
 fi
 fi
 
 fi

-echo "$as_me:13493: result: $cf_cv_good_bcopy" >&5
+echo "$as_me:13583: result: $cf_cv_good_bcopy" >&5

 echo "${ECHO_T}$cf_cv_good_bcopy" >&6
 
 else
 echo "${ECHO_T}$cf_cv_good_bcopy" >&6
 
 else


@@ -13511,7 +13601,7 @@ EOF
 
 fi
 
 
 fi
 

-echo "$as_me:13514: checking if poll really works" >&5
+echo "$as_me:13604: checking if poll really works" >&5

 echo $ECHO_N "checking if poll really works... $ECHO_C" >&6
 if test "${cf_cv_working_poll+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 echo $ECHO_N "checking if poll really works... $ECHO_C" >&6
 if test "${cf_cv_working_poll+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6


@@ -13521,7 +13611,7 @@ if test "$cross_compiling" = yes; then
   cf_cv_working_poll=unknown
 else
   cat >conftest.$ac_ext <<_ACEOF
   cf_cv_working_poll=unknown
 else
   cat >conftest.$ac_ext <<_ACEOF

-#line 13524 "configure"
+#line 13614 "configure"

 #include "confdefs.h"
 
 #include <stdio.h>
 #include "confdefs.h"
 
 #include <stdio.h>


@@ -13542,15 +13632,15 @@ int main() {
 }
 _ACEOF
 rm -f conftest$ac_exeext
 }
 _ACEOF
 rm -f conftest$ac_exeext

-if { (eval echo "$as_me:13545: \"$ac_link\"") >&5
+if { (eval echo "$as_me:13635: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:13548: \$? = $ac_status" >&5
+  echo "$as_me:13638: \$? = $ac_status" >&5

   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'

-  { (eval echo "$as_me:13550: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13640: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:13553: \$? = $ac_status" >&5
+  echo "$as_me:13643: \$? = $ac_status" >&5

   (exit $ac_status); }; }; then
   cf_cv_working_poll=yes
 else
   (exit $ac_status); }; }; then
   cf_cv_working_poll=yes
 else


@@ -13562,7 +13652,7 @@ fi
 rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 fi
 rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 fi

-echo "$as_me:13565: result: $cf_cv_working_poll" >&5
+echo "$as_me:13655: result: $cf_cv_working_poll" >&5

 echo "${ECHO_T}$cf_cv_working_poll" >&6
 test "$cf_cv_working_poll" = "yes" && cat >>confdefs.h <<\EOF
 #define HAVE_WORKING_POLL 1
 echo "${ECHO_T}$cf_cv_working_poll" >&6
 test "$cf_cv_working_poll" = "yes" && cat >>confdefs.h <<\EOF
 #define HAVE_WORKING_POLL 1


@@ -13570,7 +13660,7 @@ EOF
 
 # special check for test/ditto.c
 
 
 # special check for test/ditto.c
 

-echo "$as_me:13573: checking for openpty in -lutil" >&5
+echo "$as_me:13663: checking for openpty in -lutil" >&5

 echo $ECHO_N "checking for openpty in -lutil... $ECHO_C" >&6
 if test "${ac_cv_lib_util_openpty+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 echo $ECHO_N "checking for openpty in -lutil... $ECHO_C" >&6
 if test "${ac_cv_lib_util_openpty+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6


@@ -13578,7 +13668,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lutil  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lutil  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF

-#line 13581 "configure"
+#line 13671 "configure"

 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */


@@ -13597,16 +13687,16 @@ openpty ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext

-if { (eval echo "$as_me:13600: \"$ac_link\"") >&5
+if { (eval echo "$as_me:13690: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:13603: \$? = $ac_status" >&5
+  echo "$as_me:13693: \$? = $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:13606: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13696: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:13609: \$? = $ac_status" >&5
+  echo "$as_me:13699: \$? = $ac_status" >&5

   (exit $ac_status); }; }; then
   ac_cv_lib_util_openpty=yes
 else
   (exit $ac_status); }; }; then
   ac_cv_lib_util_openpty=yes
 else


@@ -13617,7 +13707,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi

-echo "$as_me:13620: result: $ac_cv_lib_util_openpty" >&5
+echo "$as_me:13710: result: $ac_cv_lib_util_openpty" >&5

 echo "${ECHO_T}$ac_cv_lib_util_openpty" >&6
 if test $ac_cv_lib_util_openpty = yes; then
   cf_cv_lib_util=yes
 echo "${ECHO_T}$ac_cv_lib_util_openpty" >&6
 if test $ac_cv_lib_util_openpty = yes; then
   cf_cv_lib_util=yes


@@ -13625,7 +13715,7 @@ else
   cf_cv_lib_util=no
 fi
 
   cf_cv_lib_util=no
 fi
 

-echo "$as_me:13628: checking for openpty header" >&5
+echo "$as_me:13718: checking for openpty header" >&5

 echo $ECHO_N "checking for openpty header... $ECHO_C" >&6
 if test "${cf_cv_func_openpty+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 echo $ECHO_N "checking for openpty header... $ECHO_C" >&6
 if test "${cf_cv_func_openpty+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6


@@ -13636,7 +13726,7 @@ else
     for cf_header in pty.h libutil.h util.h
     do
     cat >conftest.$ac_ext <<_ACEOF
     for cf_header in pty.h libutil.h util.h
     do
     cat >conftest.$ac_ext <<_ACEOF

-#line 13639 "configure"
+#line 13729 "configure"

 #include "confdefs.h"
 
 #include <$cf_header>
 #include "confdefs.h"
 
 #include <$cf_header>


@@ -13653,16 +13743,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:13656: \"$ac_link\"") >&5
+if { (eval echo "$as_me:13746: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:13659: \$? = $ac_status" >&5
+  echo "$as_me:13749: \$? = $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:13662: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13752: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:13665: \$? = $ac_status" >&5
+  echo "$as_me:13755: \$? = $ac_status" >&5

   (exit $ac_status); }; }; then
 
         cf_cv_func_openpty=$cf_header
   (exit $ac_status); }; }; then
 
         cf_cv_func_openpty=$cf_header


@@ -13680,7 +13770,7 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
     LIBS="$cf_save_LIBS"
 
 fi
     LIBS="$cf_save_LIBS"
 
 fi

-echo "$as_me:13683: result: $cf_cv_func_openpty" >&5
+echo "$as_me:13773: result: $cf_cv_func_openpty" >&5

 echo "${ECHO_T}$cf_cv_func_openpty" >&6
 
 if test "$cf_cv_func_openpty" != no ; then
 echo "${ECHO_T}$cf_cv_func_openpty" >&6
 
 if test "$cf_cv_func_openpty" != no ; then


@@ -13732,7 +13822,7 @@ if test -n "$with_hashed_db/include" ; then
                          cf_save_CPPFLAGS=$CPPFLAGS
                          CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
                          cat >conftest.$ac_ext <<_ACEOF
                          cf_save_CPPFLAGS=$CPPFLAGS
                          CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
                          cat >conftest.$ac_ext <<_ACEOF

-#line 13735 "configure"
+#line 13825 "configure"

 #include "confdefs.h"
 #include <stdio.h>
 int
 #include "confdefs.h"
 #include <stdio.h>
 int


@@ -13744,16 +13834,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

-if { (eval echo "$as_me:13747: \"$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:13750: \$? = $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:13753: \"$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:13756: \$? = $ac_status" >&5
+  echo "$as_me:13846: \$? = $ac_status" >&5

   (exit $ac_status); }; }; then
   :
 else
   (exit $ac_status); }; }; then
   :
 else


@@ -13770,7 +13860,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
                if test "$cf_have_incdir" = no ; then
                  test -n "$verbose" && echo "  adding $cf_add_incdir to include-path" 1>&6
 
                if test "$cf_have_incdir" = no ; then
                  test -n "$verbose" && echo "  adding $cf_add_incdir to include-path" 1>&6
 

-echo "${as_me-configure}:13773: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me-configure}:13863: testing adding $cf_add_incdir to include-path ..." 1>&5

 
                  CPPFLAGS="-I$cf_add_incdir $CPPFLAGS"
 
 
                  CPPFLAGS="-I$cf_add_incdir $CPPFLAGS"
 


@@ -13804,7 +13894,7 @@ if test -n "$with_hashed_db/lib" ; then
       if test "$cf_have_libdir" = no ; then
         test -n "$verbose" && echo "   adding $cf_add_libdir to library-path" 1>&6
 
       if test "$cf_have_libdir" = no ; then
         test -n "$verbose" && echo "   adding $cf_add_libdir to library-path" 1>&6
 

-echo "${as_me-configure}:13807: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me-configure}:13897: testing adding $cf_add_libdir to library-path ..." 1>&5

 
         LDFLAGS="-L$cf_add_libdir $LDFLAGS"
       fi
 
         LDFLAGS="-L$cf_add_libdir $LDFLAGS"
       fi


@@ -13815,23 +13905,23 @@ fi
     fi
 esac
 
     fi
 esac
 

-echo "$as_me:13818: checking for db.h" >&5
+echo "$as_me:13908: 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 13824 "configure"
+#line 13914 "configure"

 #include "confdefs.h"
 #include <db.h>
 _ACEOF
 #include "confdefs.h"
 #include <db.h>
 _ACEOF

-if { (eval echo "$as_me:13828: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:13918: \"$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:13834: \$? = $ac_status" >&5
+  echo "$as_me:13924: \$? = $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


@@ -13850,11 +13940,11 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
 fi
 rm -f conftest.err conftest.$ac_ext
 fi

-echo "$as_me:13853: result: $ac_cv_header_db_h" >&5
+echo "$as_me:13943: 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:13857: checking for version of db" >&5
+echo "$as_me:13947: 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


@@ -13865,10 +13955,10 @@ cf_cv_hashed_db_version=unknown
 for cf_db_version in 1 2 3 4 5
 do
 
 for cf_db_version in 1 2 3 4 5
 do
 

-echo "${as_me-configure}:13868: testing checking for db version $cf_db_version ..." 1>&5
+echo "${as_me-configure}:13958: testing checking for db version $cf_db_version ..." 1>&5

 
        cat >conftest.$ac_ext <<_ACEOF
 
        cat >conftest.$ac_ext <<_ACEOF

-#line 13871 "configure"
+#line 13961 "configure"

 #include "confdefs.h"
 
 $ac_includes_default
 #include "confdefs.h"
 
 $ac_includes_default


@@ -13898,16 +13988,16 @@ DBT *foo = 0
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

-if { (eval echo "$as_me:13901: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:13991: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:13904: \$? = $ac_status" >&5
+  echo "$as_me:13994: \$? = $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:13907: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13997: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:13910: \$? = $ac_status" >&5
+  echo "$as_me:14000: \$? = $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


@@ -13921,16 +14011,16 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 done
 
 fi
 done
 
 fi

-echo "$as_me:13924: result: $cf_cv_hashed_db_version" >&5
+echo "$as_me:14014: 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:13928: error: Cannot determine version of db" >&5
+       { { echo "$as_me:14018: 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:13933: checking for db libraries" >&5
+echo "$as_me:14023: 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


@@ -13944,10 +14034,10 @@ do
                LIBS="-l$cf_db_libs $LIBS"
        fi
 
                LIBS="-l$cf_db_libs $LIBS"
        fi
 

-echo "${as_me-configure}:13947: testing checking for library "$cf_db_libs" ..." 1>&5
+echo "${as_me-configure}:14037: testing checking for library "$cf_db_libs" ..." 1>&5

 
        cat >conftest.$ac_ext <<_ACEOF
 
        cat >conftest.$ac_ext <<_ACEOF

-#line 13950 "configure"
+#line 14040 "configure"

 #include "confdefs.h"
 
 $ac_includes_default
 #include "confdefs.h"
 
 $ac_includes_default


@@ -14002,16 +14092,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:14005: \"$ac_link\"") >&5
+if { (eval echo "$as_me:14095: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:14008: \$? = $ac_status" >&5
+  echo "$as_me:14098: \$? = $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:14011: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14101: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:14014: \$? = $ac_status" >&5
+  echo "$as_me:14104: \$? = $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


@@ -14031,11 +14121,11 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 done
 
 fi
 done
 
 fi

-echo "$as_me:14034: result: $cf_cv_hashed_db_libs" >&5
+echo "$as_me:14124: 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:14038: error: Cannot determine library for db" >&5
+               { { echo "$as_me:14128: 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


@@ -14045,7 +14135,7 @@ fi
 
 else
 
 
 else
 

-       { { echo "$as_me:14048: error: Cannot find db.h" >&5
+       { { echo "$as_me:14138: 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; }; }
 


@@ -14060,7 +14150,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:14063: checking if we should include stdbool.h" >&5
+echo "$as_me:14153: 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


@@ -14068,7 +14158,7 @@ if test "${cf_cv_header_stdbool_h+set}" = set; then
 else
 
        cat >conftest.$ac_ext <<_ACEOF
 else
 
        cat >conftest.$ac_ext <<_ACEOF

-#line 14071 "configure"
+#line 14161 "configure"

 #include "confdefs.h"
 
 int
 #include "confdefs.h"
 
 int


@@ -14080,23 +14170,23 @@ bool foo = false
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

-if { (eval echo "$as_me:14083: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:14173: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:14086: \$? = $ac_status" >&5
+  echo "$as_me:14176: \$? = $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:14089: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14179: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:14092: \$? = $ac_status" >&5
+  echo "$as_me:14182: \$? = $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 14099 "configure"
+#line 14189 "configure"

 #include "confdefs.h"
 
 #ifndef __BEOS__
 #include "confdefs.h"
 
 #ifndef __BEOS__


@@ -14112,16 +14202,16 @@ bool foo = false
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

-if { (eval echo "$as_me:14115: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:14205: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:14118: \$? = $ac_status" >&5
+  echo "$as_me:14208: \$? = $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:14121: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14211: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:14124: \$? = $ac_status" >&5
+  echo "$as_me:14214: \$? = $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


@@ -14135,13 +14225,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:14138: result: yes" >&5
+then   echo "$as_me:14228: result: yes" >&5

 echo "${ECHO_T}yes" >&6
 echo "${ECHO_T}yes" >&6

-else   echo "$as_me:14140: result: no" >&5
+else   echo "$as_me:14230: result: no" >&5

 echo "${ECHO_T}no" >&6
 fi
 
 echo "${ECHO_T}no" >&6
 fi
 

-echo "$as_me:14144: checking for builtin bool type" >&5
+echo "$as_me:14234: 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


@@ -14149,7 +14239,7 @@ if test "${cf_cv_cc_bool_type+set}" = set; then
 else
 
        cat >conftest.$ac_ext <<_ACEOF
 else
 
        cat >conftest.$ac_ext <<_ACEOF

-#line 14152 "configure"
+#line 14242 "configure"

 #include "confdefs.h"
 
 #include <stdio.h>
 #include "confdefs.h"
 
 #include <stdio.h>


@@ -14164,16 +14254,16 @@ bool x = false
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

-if { (eval echo "$as_me:14167: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:14257: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:14170: \$? = $ac_status" >&5
+  echo "$as_me:14260: \$? = $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:14173: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14263: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:14176: \$? = $ac_status" >&5
+  echo "$as_me:14266: \$? = $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


@@ -14186,9 +14276,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:14189: result: yes" >&5
+then   echo "$as_me:14279: result: yes" >&5

 echo "${ECHO_T}yes" >&6
 echo "${ECHO_T}yes" >&6

-else   echo "$as_me:14191: result: no" >&5
+else   echo "$as_me:14281: result: no" >&5

 echo "${ECHO_T}no" >&6
 fi
 
 echo "${ECHO_T}no" >&6
 fi
 


@@ -14210,7 +14300,7 @@ os2*) #(vi
        cf_stdcpp_libname=stdc++
        ;;
 esac
        cf_stdcpp_libname=stdc++
        ;;
 esac

-echo "$as_me:14213: checking for library $cf_stdcpp_libname" >&5
+echo "$as_me:14303: 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


@@ -14219,7 +14309,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 14222 "configure"
+#line 14312 "configure"

 #include "confdefs.h"
 
 #include <strstream.h>
 #include "confdefs.h"
 
 #include <strstream.h>


@@ -14235,16 +14325,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:14238: \"$ac_link\"") >&5
+if { (eval echo "$as_me:14328: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:14241: \$? = $ac_status" >&5
+  echo "$as_me:14331: \$? = $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:14244: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14334: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:14247: \$? = $ac_status" >&5
+  echo "$as_me:14337: \$? = $ac_status" >&5

   (exit $ac_status); }; }; then
   cf_cv_libstdcpp=yes
 else
   (exit $ac_status); }; }; then
   cf_cv_libstdcpp=yes
 else


@@ -14256,12 +14346,12 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
        LIBS="$cf_save"
 
 fi
        LIBS="$cf_save"
 
 fi

-echo "$as_me:14259: result: $cf_cv_libstdcpp" >&5
+echo "$as_me:14349: 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:14264: checking whether $CXX understands -c and -o together" >&5
+       echo "$as_me:14354: 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


@@ -14277,15 +14367,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:14280: \"$ac_try\"") >&5
+if { (eval echo "$as_me:14370: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:14283: \$? = $ac_status" >&5
+  echo "$as_me:14373: \$? = $ac_status" >&5

   (exit $ac_status); } &&
   (exit $ac_status); } &&

-  test -f conftest2.$ac_objext && { (eval echo "$as_me:14285: \"$ac_try\"") >&5
+  test -f conftest2.$ac_objext && { (eval echo "$as_me:14375: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:14288: \$? = $ac_status" >&5
+  echo "$as_me:14378: \$? = $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


@@ -14296,10 +14386,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:14299: result: yes" >&5
+  echo "$as_me:14389: result: yes" >&5

 echo "${ECHO_T}yes" >&6
 else
 echo "${ECHO_T}yes" >&6
 else

-  echo "$as_me:14302: result: no" >&5
+  echo "$as_me:14392: result: no" >&5

 echo "${ECHO_T}no" >&6
 fi
 
 echo "${ECHO_T}no" >&6
 fi
 


@@ -14319,12 +14409,12 @@ os2*) #(vi
        ;;
 esac
 if test "$GXX" = yes; then
        ;;
 esac
 if test "$GXX" = yes; then

-       echo "$as_me:14322: checking for lib$cf_gpp_libname" >&5
+       echo "$as_me:14412: 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 14327 "configure"
+#line 14417 "configure"

 #include "confdefs.h"
 
 #include <$cf_gpp_libname/builtin.h>
 #include "confdefs.h"
 
 #include <$cf_gpp_libname/builtin.h>


@@ -14338,16 +14428,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:14341: \"$ac_link\"") >&5
+if { (eval echo "$as_me:14431: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:14344: \$? = $ac_status" >&5
+  echo "$as_me:14434: \$? = $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:14347: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14437: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:14350: \$? = $ac_status" >&5
+  echo "$as_me:14440: \$? = $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"


@@ -14366,7 +14456,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 14369 "configure"
+#line 14459 "configure"

 #include "confdefs.h"
 
 #include <builtin.h>
 #include "confdefs.h"
 
 #include <builtin.h>


@@ -14380,16 +14470,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:14383: \"$ac_link\"") >&5
+if { (eval echo "$as_me:14473: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:14386: \$? = $ac_status" >&5
+  echo "$as_me:14476: \$? = $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:14389: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14479: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:14392: \$? = $ac_status" >&5
+  echo "$as_me:14482: \$? = $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"


@@ -14406,7 +14496,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:14409: result: $cf_cxx_library" >&5
+       echo "$as_me:14499: result: $cf_cxx_library" >&5

 echo "${ECHO_T}$cf_cxx_library" >&6
 fi
 
 echo "${ECHO_T}$cf_cxx_library" >&6
 fi
 


@@ -14422,7 +14512,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:14425: checking how to run the C++ preprocessor" >&5
+echo "$as_me:14515: 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


@@ -14439,18 +14529,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 14442 "configure"
+#line 14532 "configure"

 #include "confdefs.h"
 #include <assert.h>
                      Syntax error
 _ACEOF
 #include "confdefs.h"
 #include <assert.h>
                      Syntax error
 _ACEOF

-if { (eval echo "$as_me:14447: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:14537: \"$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:14453: \$? = $ac_status" >&5
+  echo "$as_me:14543: \$? = $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


@@ -14473,17 +14563,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 14476 "configure"
+#line 14566 "configure"

 #include "confdefs.h"
 #include <ac_nonexistent.h>
 _ACEOF
 #include "confdefs.h"
 #include <ac_nonexistent.h>
 _ACEOF

-if { (eval echo "$as_me:14480: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:14570: \"$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:14486: \$? = $ac_status" >&5
+  echo "$as_me:14576: \$? = $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


@@ -14520,7 +14610,7 @@ fi
 else
   ac_cv_prog_CXXCPP=$CXXCPP
 fi
 else
   ac_cv_prog_CXXCPP=$CXXCPP
 fi

-echo "$as_me:14523: result: $CXXCPP" >&5
+echo "$as_me:14613: 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


@@ -14530,18 +14620,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 14533 "configure"
+#line 14623 "configure"

 #include "confdefs.h"
 #include <assert.h>
                      Syntax error
 _ACEOF
 #include "confdefs.h"
 #include <assert.h>
                      Syntax error
 _ACEOF

-if { (eval echo "$as_me:14538: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:14628: \"$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:14544: \$? = $ac_status" >&5
+  echo "$as_me:14634: \$? = $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


@@ -14564,17 +14654,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 14567 "configure"
+#line 14657 "configure"

 #include "confdefs.h"
 #include <ac_nonexistent.h>
 _ACEOF
 #include "confdefs.h"
 #include <ac_nonexistent.h>
 _ACEOF

-if { (eval echo "$as_me:14571: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:14661: \"$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:14577: \$? = $ac_status" >&5
+  echo "$as_me:14667: \$? = $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


@@ -14602,7 +14692,7 @@ rm -f conftest.err conftest.$ac_ext
 if $ac_preproc_ok; then
   :
 else
 if $ac_preproc_ok; then
   :
 else

-  { { echo "$as_me:14605: error: C++ preprocessor \"$CXXCPP\" fails sanity check" >&5
+  { { echo "$as_me:14695: 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


@@ -14617,23 +14707,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:14620: checking for $ac_header" >&5
+echo "$as_me:14710: 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 14626 "configure"
+#line 14716 "configure"

 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF

-if { (eval echo "$as_me:14630: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:14720: \"$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:14636: \$? = $ac_status" >&5
+  echo "$as_me:14726: \$? = $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


@@ -14652,7 +14742,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
 fi
 rm -f conftest.err conftest.$ac_ext
 fi

-echo "$as_me:14655: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:14745: 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


@@ -14662,7 +14752,7 @@ EOF
 fi
 done
 
 fi
 done
 

-echo "$as_me:14665: checking if we should include stdbool.h" >&5
+echo "$as_me:14755: 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


@@ -14670,7 +14760,7 @@ if test "${cf_cv_header_stdbool_h+set}" = set; then
 else
 
        cat >conftest.$ac_ext <<_ACEOF
 else
 
        cat >conftest.$ac_ext <<_ACEOF

-#line 14673 "configure"
+#line 14763 "configure"

 #include "confdefs.h"
 
 int
 #include "confdefs.h"
 
 int


@@ -14682,23 +14772,23 @@ bool foo = false
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

-if { (eval echo "$as_me:14685: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:14775: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:14688: \$? = $ac_status" >&5
+  echo "$as_me:14778: \$? = $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:14691: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14781: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:14694: \$? = $ac_status" >&5
+  echo "$as_me:14784: \$? = $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 14701 "configure"
+#line 14791 "configure"

 #include "confdefs.h"
 
 #ifndef __BEOS__
 #include "confdefs.h"
 
 #ifndef __BEOS__


@@ -14714,16 +14804,16 @@ bool foo = false
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

-if { (eval echo "$as_me:14717: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:14807: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:14720: \$? = $ac_status" >&5
+  echo "$as_me:14810: \$? = $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:14723: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14813: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:14726: \$? = $ac_status" >&5
+  echo "$as_me:14816: \$? = $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


@@ -14737,13 +14827,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:14740: result: yes" >&5
+then   echo "$as_me:14830: result: yes" >&5

 echo "${ECHO_T}yes" >&6
 echo "${ECHO_T}yes" >&6

-else   echo "$as_me:14742: result: no" >&5
+else   echo "$as_me:14832: result: no" >&5

 echo "${ECHO_T}no" >&6
 fi
 
 echo "${ECHO_T}no" >&6
 fi
 

-echo "$as_me:14746: checking for builtin bool type" >&5
+echo "$as_me:14836: 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


@@ -14751,7 +14841,7 @@ if test "${cf_cv_builtin_bool+set}" = set; then
 else
 
        cat >conftest.$ac_ext <<_ACEOF
 else
 
        cat >conftest.$ac_ext <<_ACEOF

-#line 14754 "configure"
+#line 14844 "configure"

 #include "confdefs.h"
 
 #include <stdio.h>
 #include "confdefs.h"
 
 #include <stdio.h>


@@ -14766,16 +14856,16 @@ bool x = false
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

-if { (eval echo "$as_me:14769: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:14859: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:14772: \$? = $ac_status" >&5
+  echo "$as_me:14862: \$? = $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:14775: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14865: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:14778: \$? = $ac_status" >&5
+  echo "$as_me:14868: \$? = $ac_status" >&5

   (exit $ac_status); }; }; then
   cf_cv_builtin_bool=1
 else
   (exit $ac_status); }; }; then
   cf_cv_builtin_bool=1
 else


@@ -14788,13 +14878,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:14791: result: yes" >&5
+then   echo "$as_me:14881: result: yes" >&5

 echo "${ECHO_T}yes" >&6
 echo "${ECHO_T}yes" >&6

-else   echo "$as_me:14793: result: no" >&5
+else   echo "$as_me:14883: result: no" >&5

 echo "${ECHO_T}no" >&6
 fi
 
 echo "${ECHO_T}no" >&6
 fi
 

-echo "$as_me:14797: checking for size of bool" >&5
+echo "$as_me:14887: 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


@@ -14805,7 +14895,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 14808 "configure"
+#line 14898 "configure"

 #include "confdefs.h"
 
 #include <stdlib.h>
 #include "confdefs.h"
 
 #include <stdlib.h>


@@ -14847,15 +14937,15 @@ main()
 
 _ACEOF
 rm -f conftest$ac_exeext
 
 _ACEOF
 rm -f conftest$ac_exeext

-if { (eval echo "$as_me:14850: \"$ac_link\"") >&5
+if { (eval echo "$as_me:14940: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:14853: \$? = $ac_status" >&5
+  echo "$as_me:14943: \$? = $ac_status" >&5

   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'

-  { (eval echo "$as_me:14855: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14945: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:14858: \$? = $ac_status" >&5
+  echo "$as_me:14948: \$? = $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


@@ -14873,18 +14963,18 @@ fi
 fi
 
        rm -f cf_test.out
 fi
 
        rm -f cf_test.out

-echo "$as_me:14876: result: $cf_cv_type_of_bool" >&5
+echo "$as_me:14966: 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:14882: WARNING: Assuming $NCURSES_BOOL for type of bool" >&5
+       { echo "$as_me:14972: 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:14887: checking for special defines needed for etip.h" >&5
+echo "$as_me:14977: 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"


@@ -14896,7 +14986,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 14899 "configure"
+#line 14989 "configure"

 #include "confdefs.h"
 
 #include <etip.h.in>
 #include "confdefs.h"
 
 #include <etip.h.in>


@@ -14910,16 +15000,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

-if { (eval echo "$as_me:14913: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:15003: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:14916: \$? = $ac_status" >&5
+  echo "$as_me:15006: \$? = $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:14919: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15009: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:14922: \$? = $ac_status" >&5
+  echo "$as_me:15012: \$? = $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


@@ -14940,12 +15030,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:14943: result: $cf_result" >&5
+echo "$as_me:15033: 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:14948: checking if $CXX accepts parameter initialization" >&5
+echo "$as_me:15038: 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


@@ -14962,7 +15052,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 14965 "configure"
+#line 15055 "configure"

 #include "confdefs.h"
 
 class TEST {
 #include "confdefs.h"
 
 class TEST {


@@ -14981,15 +15071,15 @@ void main() { }
 
 _ACEOF
 rm -f conftest$ac_exeext
 
 _ACEOF
 rm -f conftest$ac_exeext

-if { (eval echo "$as_me:14984: \"$ac_link\"") >&5
+if { (eval echo "$as_me:15074: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:14987: \$? = $ac_status" >&5
+  echo "$as_me:15077: \$? = $ac_status" >&5

   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'

-  { (eval echo "$as_me:14989: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15079: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:14992: \$? = $ac_status" >&5
+  echo "$as_me:15082: \$? = $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


@@ -15008,7 +15098,7 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
 ac_main_return=return
 
 fi
 ac_main_return=return
 
 fi

-echo "$as_me:15011: result: $cf_cv_cpp_param_init" >&5
+echo "$as_me:15101: 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


@@ -15017,7 +15107,7 @@ EOF
 
 if test -n "$CXX"; then
 
 
 if test -n "$CXX"; then
 

-echo "$as_me:15020: checking if $CXX accepts static_cast" >&5
+echo "$as_me:15110: 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


@@ -15031,7 +15121,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 15034 "configure"
+#line 15124 "configure"

 #include "confdefs.h"
 
 class NCursesPanel
 #include "confdefs.h"
 
 class NCursesPanel


@@ -15075,16 +15165,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

-if { (eval echo "$as_me:15078: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:15168: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:15081: \$? = $ac_status" >&5
+  echo "$as_me:15171: \$? = $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:15084: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15174: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:15087: \$? = $ac_status" >&5
+  echo "$as_me:15177: \$? = $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


@@ -15102,7 +15192,7 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
 ac_main_return=return
 
 fi
 ac_main_return=return
 
 fi

-echo "$as_me:15105: result: $cf_cv_cpp_static_cast" >&5
+echo "$as_me:15195: 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


@@ -15150,7 +15240,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:15153: checking for size of bool" >&5
+echo "$as_me:15243: 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


@@ -15161,7 +15251,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 15164 "configure"
+#line 15254 "configure"

 #include "confdefs.h"
 
 #include <stdlib.h>
 #include "confdefs.h"
 
 #include <stdlib.h>


@@ -15203,15 +15293,15 @@ main()
 
 _ACEOF
 rm -f conftest$ac_exeext
 
 _ACEOF
 rm -f conftest$ac_exeext

-if { (eval echo "$as_me:15206: \"$ac_link\"") >&5
+if { (eval echo "$as_me:15296: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:15209: \$? = $ac_status" >&5
+  echo "$as_me:15299: \$? = $ac_status" >&5

   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'

-  { (eval echo "$as_me:15211: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15301: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:15214: \$? = $ac_status" >&5
+  echo "$as_me:15304: \$? = $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


@@ -15229,25 +15319,25 @@ fi
 fi
 
        rm -f cf_test.out
 fi
 
        rm -f cf_test.out

-echo "$as_me:15232: result: $cf_cv_type_of_bool" >&5
+echo "$as_me:15322: 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:15238: WARNING: Assuming $NCURSES_BOOL for type of bool" >&5
+       { echo "$as_me:15328: 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:15244: checking for fallback type of bool" >&5
+                       echo "$as_me:15334: 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:15250: result: $cf_cv_type_of_bool" >&5
+                       echo "$as_me:15340: 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


@@ -15276,7 +15366,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:15279: WARNING: libtool does not support Ada - disabling feature" >&5
+       { echo "$as_me:15369: 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


@@ -15286,7 +15376,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:15289: checking for $ac_word" >&5
+echo "$as_me:15379: 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


@@ -15301,7 +15391,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:15304: found $ac_dir/$ac_word" >&5
+echo "$as_me:15394: found $ac_dir/$ac_word" >&5

 break
 done
 
 break
 done
 


@@ -15310,10 +15400,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:15313: result: $gnat_exists" >&5
+  echo "$as_me:15403: result: $gnat_exists" >&5

 echo "${ECHO_T}$gnat_exists" >&6
 else
 echo "${ECHO_T}$gnat_exists" >&6
 else

-  echo "$as_me:15316: result: no" >&5
+  echo "$as_me:15406: result: no" >&5

 echo "${ECHO_T}no" >&6
 fi
 
 echo "${ECHO_T}no" >&6
 fi
 


@@ -15321,11 +15411,11 @@ if test "$ac_cv_prog_gnat_exists" = no; then
    cf_ada_make=
 else
 
    cf_ada_make=
 else
 

-echo "$as_me:15324: checking for gnat version" >&5
+echo "$as_me:15414: 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:15328: result: $cf_gnat_version" >&5
+echo "$as_me:15418: 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


@@ -15348,7 +15438,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:15351: checking for $ac_word" >&5
+echo "$as_me:15441: 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


@@ -15363,7 +15453,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:15366: found $ac_dir/$ac_word" >&5
+echo "$as_me:15456: found $ac_dir/$ac_word" >&5

 break
 done
 
 break
 done
 


@@ -15372,10 +15462,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:15375: result: $M4_exists" >&5
+  echo "$as_me:15465: result: $M4_exists" >&5

 echo "${ECHO_T}$M4_exists" >&6
 else
 echo "${ECHO_T}$M4_exists" >&6
 else

-  echo "$as_me:15378: result: no" >&5
+  echo "$as_me:15468: result: no" >&5

 echo "${ECHO_T}no" >&6
 fi
 
 echo "${ECHO_T}no" >&6
 fi
 


@@ -15384,7 +15474,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:15387: checking if GNAT works" >&5
+      echo "$as_me:15477: 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*


@@ -15412,14 +15502,14 @@ else
 fi
 rm -f conftest*
 
 fi
 rm -f conftest*
 

-      echo "$as_me:15415: result: $cf_cv_prog_gnat_correct" >&5
+      echo "$as_me:15505: 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:15422: checking if GNAT pragma Unreferenced works" >&5
+   echo "$as_me:15512: 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*


@@ -15446,7 +15536,7 @@ else
 fi
 rm -f conftest*
 
 fi
 rm -f conftest*
 

-   echo "$as_me:15449: result: $cf_cv_pragma_unreferenced" >&5
+   echo "$as_me:15539: 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).


@@ -15499,7 +15589,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:15502: error: expected a pathname, not \"$withval\"" >&5
+  { { echo "$as_me:15592: 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; }; }
   ;;


@@ -15541,7 +15631,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:15544: error: expected a pathname, not \"$withval\"" >&5
+  { { echo "$as_me:15634: 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; }; }
   ;;


@@ -15566,7 +15656,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:15569: checking for library subsets" >&5
+echo "$as_me:15659: 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=
 


@@ -15591,7 +15681,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:15594: result: $LIB_SUBSETS" >&5
+echo "$as_me:15684: 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


@@ -15629,7 +15719,7 @@ elif test "$includedir" != "/usr/include"; then
 fi
 
 ### Build up pieces for makefile rules
 fi
 
 ### Build up pieces for makefile rules

-echo "$as_me:15632: checking default library suffix" >&5
+echo "$as_me:15722: 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


@@ -15640,10 +15730,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:15643: result: $DFT_ARG_SUFFIX" >&5
+echo "$as_me:15733: result: $DFT_ARG_SUFFIX" >&5

 echo "${ECHO_T}$DFT_ARG_SUFFIX" >&6
 
 echo "${ECHO_T}$DFT_ARG_SUFFIX" >&6
 

-echo "$as_me:15646: checking default library-dependency suffix" >&5
+echo "$as_me:15736: 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


@@ -15674,10 +15764,10 @@ if test $DFT_LWR_MODEL = shared ; then
                ;;
        esac
 fi
                ;;
        esac
 fi

-echo "$as_me:15677: result: $DFT_DEP_SUFFIX" >&5
+echo "$as_me:15767: result: $DFT_DEP_SUFFIX" >&5

 echo "${ECHO_T}$DFT_DEP_SUFFIX" >&6
 
 echo "${ECHO_T}$DFT_DEP_SUFFIX" >&6
 

-echo "$as_me:15680: checking default object directory" >&5
+echo "$as_me:15770: 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


@@ -15693,12 +15783,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:15696: result: $DFT_OBJ_SUBDIR" >&5
+echo "$as_me:15786: 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:15701: checking c++ library-dependency suffix" >&5
+echo "$as_me:15791: 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


@@ -15724,7 +15814,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:15727: result: $CXX_LIB_SUFFIX" >&5
+echo "$as_me:15817: result: $CXX_LIB_SUFFIX" >&5

 echo "${ECHO_T}$CXX_LIB_SUFFIX" >&6
 
 fi
 echo "${ECHO_T}$CXX_LIB_SUFFIX" >&6
 
 fi


@@ -15873,12 +15963,12 @@ fi
        ;;
 esac
 
        ;;
 esac
 

-echo "$as_me:15876: checking where we will install curses.h" >&5
+echo "$as_me:15966: 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:15881: result: $includedir" >&5
+echo "$as_me:15971: 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


@@ -15886,7 +15976,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:15889: WARNING: Wide-character applications must define HAVE_LIBUTF8_H to include curses.h" >&5
+       { echo "$as_me:15979: 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


@@ -15902,7 +15992,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:15905: checking for src modules" >&5
+echo "$as_me:15995: 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


@@ -15965,7 +16055,7 @@ EOF
                fi
        fi
 done
                fi
        fi
 done

-echo "$as_me:15968: result: $cf_cv_src_modules" >&5
+echo "$as_me:16058: 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"


@@ -16114,18 +16204,18 @@ fi
 ### If we're building with rpath, try to link non-standard libs that way too.
 if test "$DFT_LWR_MODEL" = "shared"; then
 
 ### 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:16117: checking for updated LDFLAGS" >&5
+echo "$as_me:16207: checking for updated LDFLAGS" >&5

 echo $ECHO_N "checking for updated LDFLAGS... $ECHO_C" >&6
 if test -n "$LDFLAGS" ; then
 echo $ECHO_N "checking for updated LDFLAGS... $ECHO_C" >&6
 if test -n "$LDFLAGS" ; then

-echo "$as_me:16120: result: maybe" >&5
+echo "$as_me:16210: result: maybe" >&5

 echo "${ECHO_T}maybe" >&6
 test -n "$verbose" && echo "   ...checking LDFLAGS $LDFLAGS" 1>&6
 
 echo "${ECHO_T}maybe" >&6
 test -n "$verbose" && echo "   ...checking LDFLAGS $LDFLAGS" 1>&6
 

-echo "${as_me-configure}:16124: testing ...checking LDFLAGS $LDFLAGS ..." 1>&5
+echo "${as_me-configure}:16214: testing ...checking LDFLAGS $LDFLAGS ..." 1>&5

 
 test -n "$verbose" && echo "   ...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS" 1>&6
 
 
 test -n "$verbose" && echo "   ...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS" 1>&6
 

-echo "${as_me-configure}:16128: testing ...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
+echo "${as_me-configure}:16218: testing ...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5

 
 case "$EXTRA_LDFLAGS" in #(vi
 -Wl,-rpath,*) #(vi
 
 case "$EXTRA_LDFLAGS" in #(vi
 -Wl,-rpath,*) #(vi


@@ -16147,7 +16237,7 @@ if test -n "$cf_rpath_hack" ; then
     do
         test -n "$verbose" && echo "   Filtering $cf_rpath_src" 1>&6
 
     do
         test -n "$verbose" && echo "   Filtering $cf_rpath_src" 1>&6
 

-echo "${as_me-configure}:16150: testing Filtering $cf_rpath_src ..." 1>&5
+echo "${as_me-configure}:16240: testing Filtering $cf_rpath_src ..." 1>&5

 
         case $cf_rpath_src in #(vi
         -L*) #(vi
 
         case $cf_rpath_src in #(vi
         -L*) #(vi


@@ -16158,7 +16248,7 @@ echo "${as_me-configure}:16150: testing Filtering $cf_rpath_src ..." 1>&5
             fi
             test -n "$verbose" && echo "       ...Filter $cf_rpath_tmp" 1>&6
 
             fi
             test -n "$verbose" && echo "       ...Filter $cf_rpath_tmp" 1>&6
 

-echo "${as_me-configure}:16161: testing ...Filter $cf_rpath_tmp ..." 1>&5
+echo "${as_me-configure}:16251: testing ...Filter $cf_rpath_tmp ..." 1>&5

 
             EXTRA_LDFLAGS="$cf_rpath_tmp $EXTRA_LDFLAGS"
             ;;
 
             EXTRA_LDFLAGS="$cf_rpath_tmp $EXTRA_LDFLAGS"
             ;;


@@ -16170,15 +16260,15 @@ echo "${as_me-configure}:16161: testing ...Filter $cf_rpath_tmp ..." 1>&5
     LDFLAGS=$cf_rpath_dst
     test -n "$verbose" && echo "       ...checked LDFLAGS $LDFLAGS" 1>&6
 
     LDFLAGS=$cf_rpath_dst
     test -n "$verbose" && echo "       ...checked LDFLAGS $LDFLAGS" 1>&6
 

-echo "${as_me-configure}:16173: testing ...checked LDFLAGS $LDFLAGS ..." 1>&5
+echo "${as_me-configure}:16263: testing ...checked LDFLAGS $LDFLAGS ..." 1>&5

 
     test -n "$verbose" && echo "       ...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS" 1>&6
 
 
     test -n "$verbose" && echo "       ...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS" 1>&6
 

-echo "${as_me-configure}:16177: testing ...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
+echo "${as_me-configure}:16267: testing ...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5

 
 fi
 else
 
 fi
 else

-echo "$as_me:16181: result: no" >&5
+echo "$as_me:16271: result: no" >&5

 echo "${ECHO_T}no" >&6
 fi
 
 echo "${ECHO_T}no" >&6
 fi
 


@@ -16288,7 +16378,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:16291: creating $CONFIG_STATUS" >&5
+{ echo "$as_me:16381: 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


@@ -16464,7 +16554,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:16467: error: ambiguous option: $1
+    { { echo "$as_me:16557: 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;}


@@ -16483,7 +16573,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:16486: error: unrecognized option: $1
+  -*) { { echo "$as_me:16576: 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;}


@@ -16579,7 +16669,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:16582: error: invalid argument: $ac_config_target" >&5
+  *) { { echo "$as_me:16672: 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


@@ -16785,6 +16875,7 @@ s,@NCURSES_EXT_COLORS@,$NCURSES_EXT_COLORS,;t t
 s,@NCURSES_MOUSE_VERSION@,$NCURSES_MOUSE_VERSION,;t t
 s,@NCURSES_SBOOL@,$NCURSES_SBOOL,;t t
 s,@NCURSES_XNAMES@,$NCURSES_XNAMES,;t t
 s,@NCURSES_MOUSE_VERSION@,$NCURSES_MOUSE_VERSION,;t t
 s,@NCURSES_SBOOL@,$NCURSES_SBOOL,;t t
 s,@NCURSES_XNAMES@,$NCURSES_XNAMES,;t t

+s,@PTHREAD@,$PTHREAD,;t t

 s,@cf_cv_enable_reentrant@,$cf_cv_enable_reentrant,;t t
 s,@cf_cv_enable_opaque@,$cf_cv_enable_opaque,;t t
 s,@NCURSES_OPAQUE@,$NCURSES_OPAQUE,;t t
 s,@cf_cv_enable_reentrant@,$cf_cv_enable_reentrant,;t t
 s,@cf_cv_enable_opaque@,$cf_cv_enable_opaque,;t t
 s,@NCURSES_OPAQUE@,$NCURSES_OPAQUE,;t t


@@ -16961,7 +17052,7 @@ done; }
   esac
 
   if test x"$ac_file" != x-; then
   esac
 
   if test x"$ac_file" != x-; then

-    { echo "$as_me:16964: creating $ac_file" >&5
+    { echo "$as_me:17055: 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


@@ -16979,7 +17070,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:16982: error: cannot find input file: $f" >&5
+         test -f "$f" || { { echo "$as_me:17073: 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;;


@@ -16992,7 +17083,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:16995: error: cannot find input file: $f" >&5
+           { { echo "$as_me:17086: 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;;


@@ -17058,7 +17149,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:17061: creating $ac_file" >&5
+  test x"$ac_file" != x- && { echo "$as_me:17152: 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


@@ -17069,7 +17160,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:17072: error: cannot find input file: $f" >&5
+         test -f "$f" || { { echo "$as_me:17163: 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;;


@@ -17082,7 +17173,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:17085: error: cannot find input file: $f" >&5
+           { { echo "$as_me:17176: 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;;


@@ -17140,7 +17231,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:17143: $ac_file is unchanged" >&5
+      { echo "$as_me:17234: $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 baa4c415ad75ec2a2f40d24e1551e105204ac8fa..d4e86eca3b28909740f6d9b8a3462497ae183ad9 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.435 2008/06/28 15:52:20 tom Exp $
+dnl $Id: configure.in,v 1.439 2008/08/17 01:26:58 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.435 $)
+AC_REVISION($Revision: 1.439 $)

 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)
 


@@ -972,10 +972,31 @@ test "$with_colorfgbg" = yes && AC_DEFINE(USE_COLORFGBG)
 # This is still experimental (20080329), but should ultimately be moved to
 # the script-block --with-normal, etc.
 CF_WITH_PTHREAD
 # This is still experimental (20080329), but should ultimately be moved to
 # the script-block --with-normal, etc.
 CF_WITH_PTHREAD

+
+AC_ARG_ENABLE(weak-symbols,
+    [  --enable-weak-symbols       enable weak-symbols for pthreads],
+    [use_weak_symbols=$withval],
+    [use_weak_symbols=no])
+AC_MSG_RESULT($use_weak_symbols)
+if test "$use_weak_symbols" = yes ; then
+    CF_WEAK_SYMBOLS
+else
+    cf_cv_weak_symbols=no
+fi
+
+if test $cf_cv_weak_symbols = yes ; then
+    AC_DEFINE(USE_WEAK_SYMBOLS)
+fi
+
+PTHREAD=

 if test "$with_pthread" = "yes" ; then
     AC_DEFINE(USE_PTHREADS)
     enable_reentrant=yes
 if test "$with_pthread" = "yes" ; then
     AC_DEFINE(USE_PTHREADS)
     enable_reentrant=yes

+    if test $cf_cv_weak_symbols = yes ; then
+        PTHREAD=-lpthread
+    fi

 fi
 fi

+AC_SUBST(PTHREAD)

 
 # Reentrant code has to be opaque; there's little advantage to making ncurses
 # opaque outside of that, so there is no --enable-opaque option.  We can use
 
 # Reentrant code has to be opaque; there's little advantage to making ncurses
 # opaque outside of that, so there is no --enable-opaque option.  We can use


@@ -992,7 +1013,11 @@ if test "$with_reentrant" = yes ; then
        cf_cv_enable_opaque="NCURSES_INTERNALS"
        NCURSES_OPAQUE=1
        NCURSES_SIZE_T=int
        cf_cv_enable_opaque="NCURSES_INTERNALS"
        NCURSES_OPAQUE=1
        NCURSES_SIZE_T=int

-       LIB_SUFFIX="t${LIB_SUFFIX}"
+    if test $cf_cv_weak_symbols = yes ; then
+        CF_REMOVE_LIB(LIBS,$LIBS,pthread)
+    else
+        LIB_SUFFIX="t${LIB_SUFFIX}"
+    fi

        AC_DEFINE(USE_REENTRANT)
        CF_NCURSES_ABI_6
 else
        AC_DEFINE(USE_REENTRANT)
        CF_NCURSES_ABI_6
 else

diff --git a/dist.mk b/dist.mk
index a17315defa582082eee644e3dea02689d85105f7..a49de81a0aa852eeed1d90aa4f546ddb61d24dfd 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.654 2008/08/04 23:50:26 tom Exp $
+# $Id: dist.mk,v 1.655 2008/08/16 15:58:45 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 = 20080804
+NCURSES_PATCH = 20080816

 
 # 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/include/ncurses_defs b/include/ncurses_defs
index 924c75eb8890d9a63a45efd1942037f0523809c7..bb83cbfea0a06c1465804d313a6bcf4b29a04f38 100644 (file)
--- a/include/ncurses_defs
+++ b/include/ncurses_defs
@@ -1,4 +1,4 @@
-# $Id: ncurses_defs,v 1.38 2008/02/10 00:12:03 tom Exp $
+# $Id: ncurses_defs,v 1.39 2008/08/16 23:12:31 tom Exp $

 ##############################################################################
 # Copyright (c) 2000-2007,2008 Free Software Foundation, Inc.                #
 #                                                                            #
 ##############################################################################
 # Copyright (c) 2000-2007,2008 Free Software Foundation, Inc.                #
 #                                                                            #


@@ -199,5 +199,6 @@ USE_SIGWINCH
 USE_SYMLINKS
 USE_SYSMOUSE
 USE_TERMCAP
 USE_SYMLINKS
 USE_SYSMOUSE
 USE_TERMCAP

+USE_WEAK_SYMBOLS

 USE_WIDEC_SUPPORT
 USE_XMC_SUPPORT
 USE_WIDEC_SUPPORT
 USE_XMC_SUPPORT

diff --git a/include/term_entry.h b/include/term_entry.h
index c880c3a721757dd29e9ff26fe92723e904b7698b..fb875407276fde5385522a62213ec56cc711f116 100644 (file)
--- a/include/term_entry.h
+++ b/include/term_entry.h
@@ -1,5 +1,5 @@
 /****************************************************************************
 /****************************************************************************

- * Copyright (c) 1998-2001,2004 Free Software Foundation, Inc.              *
+ * Copyright (c) 1998-2005,2008 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            *


@@ -29,10 +29,10 @@
 /****************************************************************************
  *  Author: Zeyd M. Ben-Halim <zmbenhal@netcom.com> 1992,1995               *
  *     and: Eric S. Raymond <esr@snark.thyrsus.com>                         *
 /****************************************************************************
  *  Author: Zeyd M. Ben-Halim <zmbenhal@netcom.com> 1992,1995               *
  *     and: Eric S. Raymond <esr@snark.thyrsus.com>                         *

- *     and: Thomas E. Dickey                        1998-2004               *
+ *     and: Thomas E. Dickey                        1998-on                 *

  ****************************************************************************/
 
  ****************************************************************************/
 

-/* $Id: term_entry.h,v 1.34 2005/07/16 21:15:07 tom Exp $ */
+/* $Id: term_entry.h,v 1.35 2008/08/16 16:16:03 tom Exp $ */

 
 /*
  *     term_entry.h -- interface to entry-manipulation code
 
 /*
  *     term_entry.h -- interface to entry-manipulation code


@@ -52,7 +52,7 @@ extern "C" {
 
 typedef struct entry {
        TERMTYPE        tterm;
 
 typedef struct entry {
        TERMTYPE        tterm;

-       int             nuses;
+       unsigned        nuses;

        struct
         {
            char                *name;
        struct
         {
            char                *name;

diff --git a/man/curs_terminfo.3x b/man/curs_terminfo.3x
index 5af0b8fbe27c6bfdfe8808cf28ff13b0a2dfebf4..4412a6a69c354b29f8faf30c8d6d612b340a0ab1 100644 (file)
--- a/man/curs_terminfo.3x
+++ b/man/curs_terminfo.3x
@@ -1,5 +1,5 @@
 .\"***************************************************************************
 .\"***************************************************************************

-.\" Copyright (c) 1999-2006,2007 Free Software Foundation, Inc.              *
+.\" Copyright (c) 1999-2007,2008 Free Software Foundation, Inc.              *

 .\"                                                                          *
 .\" Permission is hereby granted, free of charge, to any person obtaining a  *
 .\" copy of this software and associated documentation files (the            *
 .\"                                                                          *
 .\" Permission is hereby granted, free of charge, to any person obtaining a  *
 .\" copy of this software and associated documentation files (the            *


@@ -26,7 +26,7 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"

-.\" $Id: curs_terminfo.3x,v 1.28 2007/05/26 20:09:06 tom Exp $
+.\" $Id: curs_terminfo.3x,v 1.30 2008/08/16 20:53:27 tom Exp $

 .TH curs_terminfo 3X ""
 .ds n 5
 .na
 .TH curs_terminfo 3X ""
 .ds n 5
 .na


@@ -274,6 +274,9 @@ In this implementation
 returns an error
 if its terminal parameter is null.
 .TP 5
 returns an error
 if its terminal parameter is null.
 .TP 5

+\fBputp\fP
+calls \fBtputs\fP, returning the same error-codes.
+.TP 5

 \fBrestartterm\fP
 returns an error
 if the associated call to \fBsetupterm\fP returns an error.
 \fBrestartterm\fP
 returns an error
 if the associated call to \fBsetupterm\fP returns an error.


@@ -283,6 +286,12 @@ returns an error
 if it cannot allocate enough memory, or
 create the initial windows (stdscr, curscr, newscr).
 Other error conditions are documented above.
 if it cannot allocate enough memory, or
 create the initial windows (stdscr, curscr, newscr).
 Other error conditions are documented above.

+.TP 5
+\fBtputs\fP
+returns an error if the string parameter is null.
+It does not detect I/O errors:
+X/Open states that \fBtputs\fP ignores the return value
+of the output function \fIputc\fP.

 .RE
 .SH NOTES
 The \fBsetupterm\fR routine should be used in place of \fBsetterm\fR.
 .RE
 .SH NOTES
 The \fBsetupterm\fR routine should be used in place of \fBsetterm\fR.


@@ -291,27 +300,30 @@ committing to the allocation of storage involved in \fBinitscr\fR.
 .PP
 Note that \fBvidattr\fR and \fBvidputs\fR may be macros.
 .SH PORTABILITY
 .PP
 Note that \fBvidattr\fR and \fBvidputs\fR may be macros.
 .SH PORTABILITY

-The function \fBsetterm\fR is not described in the XSI Curses standard and must
-be considered non-portable.  All other functions are as described in the XSI
-curses standard.
+The function \fBsetterm\fR is not described by X/Open and must
+be considered non-portable.  All other functions are as described by X/Open.

 .PP
 \fBsetupterm\fP copies the terminal name to the array \fBttytype\fP.
 This is not part of X/Open Curses, but is assumed by some applications.
 .PP
 In System V Release 4, \fBset_curterm\fR has an \fBint\fR return type and
 .PP
 \fBsetupterm\fP copies the terminal name to the array \fBttytype\fP.
 This is not part of X/Open Curses, but is assumed by some applications.
 .PP
 In System V Release 4, \fBset_curterm\fR has an \fBint\fR return type and

-returns \fBOK\fR or \fBERR\fR.  We have chosen to implement the XSI Curses
+returns \fBOK\fR or \fBERR\fR.  We have chosen to implement the X/Open Curses

 semantics.
 .PP
 In System V Release 4, the third argument of \fBtputs\fR has the type
 \fBint (*putc)(char)\fR.
 .PP
 semantics.
 .PP
 In System V Release 4, the third argument of \fBtputs\fR has the type
 \fBint (*putc)(char)\fR.
 .PP

-The XSI Curses standard prototypes \fBtparm\fR with a fixed number of parameters,
+At least one implementation of X/Open Curses (Solaris) returns a value
+other than OK/ERR from \fBtputs\fP.
+That returns the length of the string, and does no error-checking.
+.PP
+X/Open Curses prototypes \fBtparm\fR with a fixed number of parameters,

 rather than a variable argument list.
 This implementation uses a variable argument list.
 Portable applications should provide 9 parameters after the format;
 zeroes are fine for this purpose.
 .PP
 rather than a variable argument list.
 This implementation uses a variable argument list.
 Portable applications should provide 9 parameters after the format;
 zeroes are fine for this purpose.
 .PP

-XSI notes that after calling \fBmvcur\fR, the curses state may not match the
+X/Open notes that after calling \fBmvcur\fR, the curses state may not match the

 actual terminal state, and that an application should touch and refresh
 the window before resuming normal curses calls.
 Both ncurses and System V Release 4 curses implement \fBmvcur\fR using
 actual terminal state, and that an application should touch and refresh
 the window before resuming normal curses calls.
 Both ncurses and System V Release 4 curses implement \fBmvcur\fR using


@@ -319,15 +331,19 @@ the SCREEN data allocated in either \fBinitscr\fR or \fBnewterm\fR.
 So though it is documented as a terminfo function,
 \fBmvcur\fR is really a curses function which is not well specified.
 .PP
 So though it is documented as a terminfo function,
 \fBmvcur\fR is really a curses function which is not well specified.
 .PP

-XSI states that the old location must be given for \fBmvcur\fP.
+X/Open states that the old location must be given for \fBmvcur\fP.

 This implementation allows the caller to use -1's for the old ordinates.
 In that case, the old location is unknown.
 .PP
 Extended terminal capability names, e.g., as defined by \fBtic\ -x\fP,
 are not stored in the arrays described in this section.
 .SH SEE ALSO
 This implementation allows the caller to use -1's for the old ordinates.
 In that case, the old location is unknown.
 .PP
 Extended terminal capability names, e.g., as defined by \fBtic\ -x\fP,
 are not stored in the arrays described in this section.
 .SH SEE ALSO

-\fBcurses\fR(3X), \fBcurs_initscr\fR(3X), \fBcurs_kernel\fR(3X), \fBcurs_termcap\fR(3X),
-\fBputc\fR(3), \fBterminfo\fR(\*n)
+\fBcurses\fR(3X),
+\fBcurs_initscr\fR(3X),
+\fBcurs_kernel\fR(3X),
+\fBcurs_termcap\fR(3X),
+\fBputc\fR(3),
+\fBterminfo\fR(\*n)

 .\"#
 .\"# The following sets edit modes for GNU EMACS
 .\"# Local Variables:
 .\"#
 .\"# The following sets edit modes for GNU EMACS
 .\"# Local Variables:

diff --git a/ncurses/base/lib_addch.c b/ncurses/base/lib_addch.c
index cc3e8781dac801687b52fdd41508a181125a3c11..20a97a01a0112a2595852728d87fd719e44d59a0 100644 (file)
--- a/ncurses/base/lib_addch.c
+++ b/ncurses/base/lib_addch.c
@@ -36,7 +36,7 @@
 #include <curses.priv.h>
 #include <ctype.h>
 
 #include <curses.priv.h>
 #include <ctype.h>
 

-MODULE_ID("$Id: lib_addch.c,v 1.112 2008/05/17 19:08:40 Miroslav.Lichvar Exp $")
+MODULE_ID("$Id: lib_addch.c,v 1.113 2008/08/16 19:20:04 tom Exp $")

 
 static const NCURSES_CH_T blankchar = NewChar(BLANK_TEXT);
 
 
 static const NCURSES_CH_T blankchar = NewChar(BLANK_TEXT);
 


@@ -210,7 +210,7 @@ _nc_build_wch(WINDOW *win, ARG_CH_T ch)
     WINDOW_EXT(win, addch_y) = y;
 
     init_mb(state);
     WINDOW_EXT(win, addch_y) = y;
 
     init_mb(state);

-    buffer[WINDOW_EXT(win, addch_used)] = CharOf(CHDEREF(ch));
+    buffer[WINDOW_EXT(win, addch_used)] = (char) CharOf(CHDEREF(ch));

     WINDOW_EXT(win, addch_used) += 1;
     buffer[WINDOW_EXT(win, addch_used)] = '\0';
     if ((len = mbrtowc(&result,
     WINDOW_EXT(win, addch_used) += 1;
     buffer[WINDOW_EXT(win, addch_used)] = '\0';
     if ((len = mbrtowc(&result,

diff --git a/ncurses/base/lib_getch.c b/ncurses/base/lib_getch.c
index c7ca7aaa43084bc40c0b3d66de092381cbee9860..f17b8336f35bed0214d353f927875a09f3669a5d 100644 (file)
--- a/ncurses/base/lib_getch.c
+++ b/ncurses/base/lib_getch.c
@@ -41,7 +41,7 @@
 
 #include <curses.priv.h>
 
 
 #include <curses.priv.h>
 

-MODULE_ID("$Id: lib_getch.c,v 1.97 2008/08/03 22:56:42 tom Exp $")
+MODULE_ID("$Id: lib_getch.c,v 1.98 2008/08/16 21:20:48 Werner.Fink Exp $")

 
 #include <fifo_defs.h>
 
 
 #include <fifo_defs.h>
 


@@ -260,7 +260,7 @@ recur_wrefresh(WINDOW *win)
 {
 #ifdef USE_PTHREADS
     SCREEN *sp = _nc_screen_of(win);
 {
 #ifdef USE_PTHREADS
     SCREEN *sp = _nc_screen_of(win);

-    if (sp != SP) {
+    if (_nc_use_pthreads && sp != SP) {

        SCREEN *save_SP;
 
        /* temporarily switch to the window's screen to check/refresh */
        SCREEN *save_SP;
 
        /* temporarily switch to the window's screen to check/refresh */


@@ -286,7 +286,7 @@ recur_wgetnstr(WINDOW *win, char *buf)
 
     if (sp != 0) {
 #ifdef USE_PTHREADS
 
     if (sp != 0) {
 #ifdef USE_PTHREADS

-       if (sp != SP) {
+       if (_nc_use_pthreads && sp != SP) {

            SCREEN *save_SP;
 
            /* temporarily switch to the window's screen to get cooked input */
            SCREEN *save_SP;
 
            /* temporarily switch to the window's screen to get cooked input */

diff --git a/ncurses/base/lib_getstr.c b/ncurses/base/lib_getstr.c
index 8ce18b34f1faef3a0f57458751b1f48f9123c4c5..b17df03d2a416bce2ccd98c8cda2c153ec92f990 100644 (file)
--- a/ncurses/base/lib_getstr.c
+++ b/ncurses/base/lib_getstr.c
@@ -41,7 +41,7 @@
 #include <curses.priv.h>
 #include <term.h>
 
 #include <curses.priv.h>
 #include <term.h>
 

-MODULE_ID("$Id: lib_getstr.c,v 1.26 2008/05/31 22:05:15 tom Exp $")
+MODULE_ID("$Id: lib_getstr.c,v 1.27 2008/08/16 19:20:04 tom Exp $")

 
 /*
  * This wipes out the last character, no matter whether it was a tab, control
 
 /*
  * This wipes out the last character, no matter whether it was a tab, control


@@ -146,7 +146,7 @@ wgetnstr_events(WINDOW *win,
                   || (maxlen >= 0 && str - oldstr >= maxlen)) {
            beep();
        } else {
                   || (maxlen >= 0 && str - oldstr >= maxlen)) {
            beep();
        } else {

-           *str++ = ch;
+           *str++ = (char) ch;

            if (oldecho == TRUE) {
                int oldy = win->_cury;
                if (waddch(win, (chtype) ch) == ERR) {
            if (oldecho == TRUE) {
                int oldy = win->_cury;
                if (waddch(win, (chtype) ch) == ERR) {

diff --git a/ncurses/base/lib_initscr.c b/ncurses/base/lib_initscr.c
index 6fc2fb0a00719786247874202abdf9064d29dc0b..b2fef0c1d0854651eb01eb9b39941afa3bb84cb0 100644 (file)
--- a/ncurses/base/lib_initscr.c
+++ b/ncurses/base/lib_initscr.c
@@ -45,7 +45,7 @@
 #include <sys/termio.h>                /* needed for ISC */
 #endif
 
 #include <sys/termio.h>                /* needed for ISC */
 #endif
 

-MODULE_ID("$Id: lib_initscr.c,v 1.37 2008/06/07 14:00:12 tom Exp $")
+MODULE_ID("$Id: lib_initscr.c,v 1.38 2008/08/16 21:20:48 Werner.Fink Exp $")

 
 NCURSES_EXPORT(WINDOW *)
 initscr(void)
 
 NCURSES_EXPORT(WINDOW *)
 initscr(void)


@@ -57,7 +57,9 @@ initscr(void)
     START_TRACE();
     T((T_CALLED("initscr()")));
 
     START_TRACE();
     T((T_CALLED("initscr()")));
 

+    _nc_init_pthreads();

     _nc_lock_global(curses);
     _nc_lock_global(curses);

+

     /* Portable applications must not call initscr() more than once */
     if (!_nc_globals.init_screen) {
        _nc_globals.init_screen = TRUE;
     /* Portable applications must not call initscr() more than once */
     if (!_nc_globals.init_screen) {
        _nc_globals.init_screen = TRUE;

diff --git a/ncurses/base/lib_mouse.c b/ncurses/base/lib_mouse.c
index 0151eb39873928f324e594ed0f1049bd6a048f29..b6229cf4a8a7f2bf5bc88026989352d30385a813 100644 (file)
--- a/ncurses/base/lib_mouse.c
+++ b/ncurses/base/lib_mouse.c
@@ -79,7 +79,7 @@
 
 #include <curses.priv.h>
 
 
 #include <curses.priv.h>
 

-MODULE_ID("$Id: lib_mouse.c,v 1.94 2008/05/31 20:30:10 tom Exp $")
+MODULE_ID("$Id: lib_mouse.c,v 1.97 2008/08/16 18:55:01 tom Exp $")

 
 #include <term.h>
 #include <tic.h>
 
 #include <term.h>
 #include <tic.h>


@@ -160,16 +160,25 @@ static void _nc_mouse_wrap(SCREEN *);
 
 /* maintain a circular list of mouse events */
 
 
 /* maintain a circular list of mouse events */
 

+#define FirstEV(sp)    ((sp)->_mouse_events)
+#define LastEV(sp)     ((sp)->_mouse_events + EV_MAX - 1)
+

 #undef  NEXT
 #undef  NEXT

-#define NEXT(ep)       ((ep == sp->_mouse_events + EV_MAX - 1) \
-                        ? sp->_mouse_events \
+#define NEXT(ep)       ((ep >= LastEV(sp)) \
+                        ? FirstEV(sp) \

                         : ep + 1)
 
 #undef  PREV
                         : ep + 1)
 
 #undef  PREV

-#define PREV(ep)       ((ep == sp->_mouse_events) \
-                        ? sp->_mouse_events + EV_MAX - 1 \
+#define PREV(ep)       ((ep <= FirstEV(sp)) \
+                        ? LastEV(sp) \

                         : ep - 1)
 
                         : ep - 1)
 

+#define IndexEV(sp, ep)        (ep - FirstEV(sp))
+
+#define RunParams(sp, eventp, runp) \
+               (long) IndexEV(sp, runp), \
+               (long) (IndexEV(sp, eventp) + (EV_MAX - 1)) % EV_MAX
+

 #ifdef TRACE
 static void
 _trace_slot(SCREEN *sp, const char *tag)
 #ifdef TRACE
 static void
 _trace_slot(SCREEN *sp, const char *tag)


@@ -178,9 +187,9 @@ _trace_slot(SCREEN *sp, const char *tag)
 
     _tracef(tag);
 
 
     _tracef(tag);
 

-    for (ep = sp->_mouse_events; ep < sp->_mouse_events + EV_MAX; ep++)
+    for (ep = FirstEV(sp); ep <= LastEV(sp); ep++)

        _tracef("mouse event queue slot %ld = %s",
        _tracef("mouse event queue slot %ld = %s",

-               (long) (ep - sp->_mouse_events),
+               (long) IndexEV(sp, ep),

                _nc_tracemouse(sp, ep));
 }
 #endif
                _nc_tracemouse(sp, ep));
 }
 #endif


@@ -383,7 +392,7 @@ enable_gpm_mouse(SCREEN *sp, int enable)
        /* GPM: initialize connection to gpm server */
        sp->_mouse_gpm_connect.eventMask = GPM_DOWN | GPM_UP;
        sp->_mouse_gpm_connect.defaultMask =
        /* GPM: initialize connection to gpm server */
        sp->_mouse_gpm_connect.eventMask = GPM_DOWN | GPM_UP;
        sp->_mouse_gpm_connect.defaultMask =

-           ~(sp->_mouse_gpm_connect.eventMask | GPM_HARD);
+           (unsigned short) (~(sp->_mouse_gpm_connect.eventMask | GPM_HARD));

        sp->_mouse_gpm_connect.minMod = 0;
        sp->_mouse_gpm_connect.maxMod =
            (unsigned short) (~((1 << KG_SHIFT) |
        sp->_mouse_gpm_connect.minMod = 0;
        sp->_mouse_gpm_connect.maxMod =
            (unsigned short) (~((1 << KG_SHIFT) |


@@ -591,7 +600,7 @@ _nc_mouse_init(SCREEN *sp)
 
            TR(MY_TRACE, ("_nc_mouse_init() called"));
 
 
            TR(MY_TRACE, ("_nc_mouse_init() called"));
 

-           sp->_mouse_eventp = sp->_mouse_events;
+           sp->_mouse_eventp = FirstEV(sp);

            for (i = 0; i < EV_MAX; i++)
                sp->_mouse_events[i].id = INVALID_EVENT;
 
            for (i = 0; i < EV_MAX; i++)
                sp->_mouse_events[i].id = INVALID_EVENT;
 


@@ -758,7 +767,7 @@ _nc_mouse_inline(SCREEN *sp)
         * Wheel mice may return buttons 4 and 5 when the wheel is turned.
         * We encode those as button presses.
         */
         * Wheel mice may return buttons 4 and 5 when the wheel is turned.
         * We encode those as button presses.
         */

-       for (grabbed = 0; grabbed < 3; grabbed += res) {
+       for (grabbed = 0; grabbed < 3; grabbed += (size_t) res) {

 
            /* For VIO mouse we add extra bit 64 to disambiguate button-up. */
 #if USE_EMX_MOUSE
 
            /* For VIO mouse we add extra bit 64 to disambiguate button-up. */
 #if USE_EMX_MOUSE


@@ -788,9 +797,9 @@ _nc_mouse_inline(SCREEN *sp)
            eventp->bstate = MASK_RELEASE(n)
 #else
 #define PRESS_POSITION(n) \
            eventp->bstate = MASK_RELEASE(n)
 #else
 #define PRESS_POSITION(n) \

-       eventp->bstate = (prev & MASK_PRESS(n) \
-                       ? REPORT_MOUSE_POSITION \
-                       : MASK_PRESS(n))
+       eventp->bstate = (mmask_t) (prev & MASK_PRESS(n) \
+                                   ? REPORT_MOUSE_POSITION \
+                                   : MASK_PRESS(n))

 #endif
 
        switch (kbuf[0] & 0x3) {
 #endif
 
        switch (kbuf[0] & 0x3) {


@@ -855,7 +864,7 @@ _nc_mouse_inline(SCREEN *sp)
        TR(MY_TRACE,
           ("_nc_mouse_inline: primitive mouse-event %s has slot %ld",
            _nc_tracemouse(sp, eventp),
        TR(MY_TRACE,
           ("_nc_mouse_inline: primitive mouse-event %s has slot %ld",
            _nc_tracemouse(sp, eventp),

-           (long) (eventp - sp->_mouse_events)));
+           (long) IndexEV(sp, eventp)));

 
        /* bump the next-free pointer into the circular list */
        sp->_mouse_eventp = NEXT(eventp);
 
        /* bump the next-free pointer into the circular list */
        sp->_mouse_eventp = NEXT(eventp);


@@ -979,7 +988,7 @@ _nc_mouse_parse(SCREEN *sp, int runcount)
        TR(MY_TRACE,
           ("_nc_mouse_parse: returning simple mouse event %s at slot %ld",
            _nc_tracemouse(sp, prev),
        TR(MY_TRACE,
           ("_nc_mouse_parse: returning simple mouse event %s at slot %ld",
            _nc_tracemouse(sp, prev),

-           (long) (prev - sp->_mouse_events)));
+           (long) IndexEV(sp, prev)));

        return (prev->id >= NORMAL_EVENT)
            ? ((prev->bstate & sp->_mouse_mask) ? TRUE : FALSE)
            : FALSE;
        return (prev->id >= NORMAL_EVENT)
            ? ((prev->bstate & sp->_mouse_mask) ? TRUE : FALSE)
            : FALSE;


@@ -995,8 +1004,7 @@ _nc_mouse_parse(SCREEN *sp, int runcount)
     if (USE_TRACEF(TRACE_IEVENT)) {
        _trace_slot(sp, "before mouse press/release merge:");
        _tracef("_nc_mouse_parse: run starts at %ld, ends at %ld, count %d",
     if (USE_TRACEF(TRACE_IEVENT)) {
        _trace_slot(sp, "before mouse press/release merge:");
        _tracef("_nc_mouse_parse: run starts at %ld, ends at %ld, count %d",

-               (long) (runp - sp->_mouse_events),
-               (long) ((eventp - sp->_mouse_events) + (EV_MAX - 1)) % EV_MAX,
+               RunParams(sp, eventp, runp),

                runcount);
        _nc_unlock_global(tracef);
     }
                runcount);
        _nc_unlock_global(tracef);
     }


@@ -1039,8 +1047,7 @@ _nc_mouse_parse(SCREEN *sp, int runcount)
     if (USE_TRACEF(TRACE_IEVENT)) {
        _trace_slot(sp, "before mouse click merge:");
        _tracef("_nc_mouse_parse: run starts at %ld, ends at %ld, count %d",
     if (USE_TRACEF(TRACE_IEVENT)) {
        _trace_slot(sp, "before mouse click merge:");
        _tracef("_nc_mouse_parse: run starts at %ld, ends at %ld, count %d",

-               (long) (runp - sp->_mouse_events),
-               (long) ((eventp - sp->_mouse_events) + (EV_MAX - 1)) % EV_MAX,
+               RunParams(sp, eventp, runp),

                runcount);
        _nc_unlock_global(tracef);
     }
                runcount);
        _nc_unlock_global(tracef);
     }


@@ -1111,8 +1118,7 @@ _nc_mouse_parse(SCREEN *sp, int runcount)
     if (USE_TRACEF(TRACE_IEVENT)) {
        _trace_slot(sp, "before mouse event queue compaction:");
        _tracef("_nc_mouse_parse: run starts at %ld, ends at %ld, count %d",
     if (USE_TRACEF(TRACE_IEVENT)) {
        _trace_slot(sp, "before mouse event queue compaction:");
        _tracef("_nc_mouse_parse: run starts at %ld, ends at %ld, count %d",

-               (long) (runp - sp->_mouse_events),
-               (long) ((eventp - sp->_mouse_events) + (EV_MAX - 1)) % EV_MAX,
+               RunParams(sp, eventp, runp),

                runcount);
        _nc_unlock_global(tracef);
     }
                runcount);
        _nc_unlock_global(tracef);
     }


@@ -1130,8 +1136,7 @@ _nc_mouse_parse(SCREEN *sp, int runcount)
     if (USE_TRACEF(TRACE_IEVENT)) {
        _trace_slot(sp, "after mouse event queue compaction:");
        _tracef("_nc_mouse_parse: run starts at %ld, ends at %ld, count %d",
     if (USE_TRACEF(TRACE_IEVENT)) {
        _trace_slot(sp, "after mouse event queue compaction:");
        _tracef("_nc_mouse_parse: run starts at %ld, ends at %ld, count %d",

-               (long) (runp - sp->_mouse_events),
-               (long) ((eventp - sp->_mouse_events) + (EV_MAX - 1)) % EV_MAX,
+               RunParams(sp, eventp, runp),

                runcount);
        _nc_unlock_global(tracef);
     }
                runcount);
        _nc_unlock_global(tracef);
     }


@@ -1140,7 +1145,7 @@ _nc_mouse_parse(SCREEN *sp, int runcount)
            TR(MY_TRACE,
               ("_nc_mouse_parse: returning composite mouse event %s at slot %ld",
                _nc_tracemouse(sp, ep),
            TR(MY_TRACE,
               ("_nc_mouse_parse: returning composite mouse event %s at slot %ld",
                _nc_tracemouse(sp, ep),

-               (long) (ep - sp->_mouse_events)));
+               (long) IndexEV(sp, ep)));

 #endif /* TRACE */
 
     /* after all this, do we have a valid event? */
 #endif /* TRACE */
 
     /* after all this, do we have a valid event? */


@@ -1227,7 +1232,7 @@ _nc_getmouse(SCREEN *sp, MEVENT * aevent)
 
        TR(TRACE_IEVENT, ("getmouse: returning event %s from slot %ld",
                          _nc_tracemouse(sp, prev),
 
        TR(TRACE_IEVENT, ("getmouse: returning event %s from slot %ld",
                          _nc_tracemouse(sp, prev),

-                         (long) (prev - sp->_mouse_events)));
+                         (long) IndexEV(sp, prev)));

 
        prev->id = INVALID_EVENT;       /* so the queue slot becomes free */
        returnCode(OK);
 
        prev->id = INVALID_EVENT;       /* so the queue slot becomes free */
        returnCode(OK);


@@ -1302,9 +1307,6 @@ mousemask(mmask_t newmask, mmask_t * oldmask)
                SP->_mouse_mask = result;
            }
        }
                SP->_mouse_mask = result;
            }
        }

-    } else {
-       if (oldmask)
-           *oldmask = SP->_mouse_mask;

     }
     returnBits(result);
 }
     }
     returnBits(result);
 }

diff --git a/ncurses/base/lib_newterm.c b/ncurses/base/lib_newterm.c
index c467a60871ee8a2cc3d4531c875346e9673ffe90..05982b84cee4c9b5cfba85c7b5b2a9f54390ddad 100644 (file)
--- a/ncurses/base/lib_newterm.c
+++ b/ncurses/base/lib_newterm.c
@@ -48,7 +48,7 @@
 #include <term.h>              /* clear_screen, cup & friends, cur_term */
 #include <tic.h>
 
 #include <term.h>              /* clear_screen, cup & friends, cur_term */
 #include <tic.h>
 

-MODULE_ID("$Id: lib_newterm.c,v 1.72 2008/08/03 22:49:49 tom Exp $")
+MODULE_ID("$Id: lib_newterm.c,v 1.73 2008/08/16 21:20:48 Werner.Fink Exp $")

 
 #ifndef ONLCR                  /* Allows compilation under the QNX 4.2 OS */
 #define ONLCR 0
 
 #ifndef ONLCR                  /* Allows compilation under the QNX 4.2 OS */
 #define ONLCR 0


@@ -130,6 +130,7 @@ newterm(NCURSES_CONST char *name, FILE *ofp, FILE *ifp)
     START_TRACE();
     T((T_CALLED("newterm(\"%s\",%p,%p)"), name, ofp, ifp));
 
     START_TRACE();
     T((T_CALLED("newterm(\"%s\",%p,%p)"), name, ofp, ifp));
 

+    _nc_init_pthreads();

     _nc_lock_global(curses);
 
     current = SP;
     _nc_lock_global(curses);
 
     current = SP;

diff --git a/ncurses/base/lib_screen.c b/ncurses/base/lib_screen.c
index e6aecbdaab4782c90742331b1ca3a2c9b3277f9f..4aa58ea2a19c9caa51f9eb29ff7b49361c457d0c 100644 (file)
--- a/ncurses/base/lib_screen.c
+++ b/ncurses/base/lib_screen.c
@@ -1,5 +1,5 @@
 /****************************************************************************
 /****************************************************************************

- * Copyright (c) 1998-2006,2007 Free Software Foundation, Inc.              *
+ * Copyright (c) 1998-2007,2008 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            *


@@ -29,12 +29,14 @@
 /****************************************************************************
  *  Author: Zeyd M. Ben-Halim <zmbenhal@netcom.com> 1992,1995               *
  *     and: Eric S. Raymond <esr@snark.thyrsus.com>                         *
 /****************************************************************************
  *  Author: Zeyd M. Ben-Halim <zmbenhal@netcom.com> 1992,1995               *
  *     and: Eric S. Raymond <esr@snark.thyrsus.com>                         *

- *     and: Thomas E. Dickey 1996 on                                        *
+ *     and: Thomas E. Dickey                        1996 on                 *

  ****************************************************************************/
 
 #include <curses.priv.h>
 
  ****************************************************************************/
 
 #include <curses.priv.h>
 

-MODULE_ID("$Id: lib_screen.c,v 1.30 2007/03/10 23:20:41 tom Exp $")
+MODULE_ID("$Id: lib_screen.c,v 1.31 2008/08/16 19:05:37 tom Exp $")
+
+#define MAX_SIZE 0x3fff                /* 16k is big enough for a window or pad */

 
 NCURSES_EXPORT(WINDOW *)
 getwin(FILE *filep)
 
 NCURSES_EXPORT(WINDOW *)
 getwin(FILE *filep)


@@ -46,7 +48,11 @@ getwin(FILE *filep)
 
     clearerr(filep);
     (void) fread(&tmp, sizeof(WINDOW), 1, filep);
 
     clearerr(filep);
     (void) fread(&tmp, sizeof(WINDOW), 1, filep);

-    if (ferror(filep))
+    if (ferror(filep)
+       || tmp._maxy == 0
+       || tmp._maxy > MAX_SIZE
+       || tmp._maxx == 0
+       || tmp._maxx > MAX_SIZE)

        returnWin(0);
 
     if (tmp._flags & _ISPAD) {
        returnWin(0);
 
     if (tmp._flags & _ISPAD) {


@@ -115,7 +121,7 @@ putwin(WINDOW *win, FILE *filep)
     T((T_CALLED("putwin(%p,%p)"), win, filep));
 
     if (win != 0) {
     T((T_CALLED("putwin(%p,%p)"), win, filep));
 
     if (win != 0) {

-       size_t len = (win->_maxx + 1);
+       size_t len = (size_t) (win->_maxx + 1);

 
        clearerr(filep);
        if (fwrite(win, sizeof(WINDOW), 1, filep) != 1
 
        clearerr(filep);
        if (fwrite(win, sizeof(WINDOW), 1, filep) != 1

diff --git a/ncurses/base/lib_slk.c b/ncurses/base/lib_slk.c
index d45a7d2b3cdb9a20e298145b4c5184f0e20c59ce..fd5c53e07fc4536f6dd8cf50bb06bbf7791a0a10 100644 (file)
--- a/ncurses/base/lib_slk.c
+++ b/ncurses/base/lib_slk.c
@@ -45,7 +45,7 @@
 #include <ctype.h>
 #include <term.h>              /* num_labels, label_*, plab_norm */
 
 #include <ctype.h>
 #include <term.h>              /* num_labels, label_*, plab_norm */
 

-MODULE_ID("$Id: lib_slk.c,v 1.33 2008/05/31 22:05:57 tom Exp $")
+MODULE_ID("$Id: lib_slk.c,v 1.34 2008/08/16 19:20:04 tom Exp $")

 
 /*
  * We'd like to move these into the screen context structure, but cannot,
 
 /*
  * We'd like to move these into the screen context structure, but cannot,


@@ -147,7 +147,7 @@ _nc_slk_initialize(WINDOW *stwin, int cols)
        memset(SP->_slk->ent[i].form_text, 0, used);
 
        memset(SP->_slk->ent[i].form_text, ' ', max_length);
        memset(SP->_slk->ent[i].form_text, 0, used);
 
        memset(SP->_slk->ent[i].form_text, ' ', max_length);

-       SP->_slk->ent[i].visible = (i < SP->_slk->maxlab);
+       SP->_slk->ent[i].visible = (char) (i < SP->_slk->maxlab);

     }
     if (_nc_globals.slk_format >= 3) { /* PC style */
        int gap = (cols - 3 * (3 + 4 * max_length)) / 2;
     }
     if (_nc_globals.slk_format >= 3) { /* PC style */
        int gap = (cols - 3 * (3 + 4 * max_length)) / 2;

diff --git a/ncurses/base/tries.c b/ncurses/base/tries.c
index 54e4d9831ebc97dff0ea0fd543adb1ca8636ec54..c4263c7e50eb22aad5dd88234c837d5e0cabbf3b 100644 (file)
--- a/ncurses/base/tries.c
+++ b/ncurses/base/tries.c
@@ -39,7 +39,7 @@
 
 #include <curses.priv.h>
 
 
 #include <curses.priv.h>
 

-MODULE_ID("$Id: tries.c,v 1.26 2008/05/31 16:54:22 tom Exp $")
+MODULE_ID("$Id: tries.c,v 1.27 2008/08/16 19:22:55 tom Exp $")

 
 /*
  * Expand a keycode into the string that it corresponds to, returning null if
 
 /*
  * Expand a keycode into the string that it corresponds to, returning null if


@@ -68,7 +68,7 @@ _nc_expand_try(TRIES * tree, unsigned code, int *count, size_t len)
        }
     }
     if (result != 0) {
        }
     }
     if (result != 0) {

-       if (ptr != 0 && (result[len] = ptr->ch) == 0)
+       if (ptr != 0 && (result[len] = (char) ptr->ch) == 0)

            *((unsigned char *) (result + len)) = 128;
 #ifdef TRACE
        if (len == 0 && USE_TRACEF(TRACE_MAXIMUM)) {
            *((unsigned char *) (result + len)) = 128;
 #ifdef TRACE
        if (len == 0 && USE_TRACEF(TRACE_MAXIMUM)) {

diff --git a/ncurses/curses.priv.h b/ncurses/curses.priv.h
index 5a39028ff54137acbae25728687fbcaa11a42a27..17a69f25bb9ba98173f4defb11999e42606b42da 100644 (file)
--- a/ncurses/curses.priv.h
+++ b/ncurses/curses.priv.h
@@ -34,7 +34,7 @@
 
 
 /*
 
 
 /*

- * $Id: curses.priv.h,v 1.387 2008/08/03 15:39:29 tom Exp $
+ * $Id: curses.priv.h,v 1.389 2008/08/16 23:14:43 tom Exp $

  *
  *     curses.priv.h
  *
  *
  *     curses.priv.h
  *


@@ -330,6 +330,7 @@ NCURSES_EXPORT(int *) _nc_ptr_Cols (void);
 
 #if USE_REENTRANT
 #include <pthread.h>
 
 #if USE_REENTRANT
 #include <pthread.h>

+extern NCURSES_EXPORT(void) _nc_init_pthreads(void);

 extern NCURSES_EXPORT(void) _nc_mutex_init(pthread_mutex_t *);
 extern NCURSES_EXPORT(int) _nc_mutex_lock(pthread_mutex_t *);
 extern NCURSES_EXPORT(int) _nc_mutex_trylock(pthread_mutex_t *);
 extern NCURSES_EXPORT(void) _nc_mutex_init(pthread_mutex_t *);
 extern NCURSES_EXPORT(int) _nc_mutex_lock(pthread_mutex_t *);
 extern NCURSES_EXPORT(int) _nc_mutex_trylock(pthread_mutex_t *);


@@ -342,6 +343,35 @@ extern NCURSES_EXPORT(int) _nc_mutex_unlock(pthread_mutex_t *);
 #error POSIX threads requires --enable-reentrant option
 #endif
 
 #error POSIX threads requires --enable-reentrant option
 #endif
 

+#if USE_WEAK_SYMBOLS
+#if defined(__GNUC__)
+#  if defined __USE_ISOC99
+#    define _cat_pragma(exp)   _Pragma(#exp)
+#    define _weak_pragma(exp)  _cat_pragma(weak name)
+#  else
+#    define _weak_pragma(exp)
+#  endif
+#  define _declare(name)       __extension__ extern __typeof__(name) name
+#  define weak_symbol(name)    _weak_pragma(name) _declare(name) __attribute__((weak))
+#endif
+#endif
+
+#ifdef USE_PTHREADS
+#  if USE_WEAK_SYMBOLS
+weak_symbol(pthread_sigmask);
+weak_symbol(pthread_self);
+weak_symbol(pthread_equal);
+weak_symbol(pthread_mutex_init);
+weak_symbol(pthread_mutex_lock);
+weak_symbol(pthread_mutex_unlock);
+weak_symbol(pthread_mutex_trylock);
+weak_symbol(pthread_mutexattr_settype);
+extern NCURSES_EXPORT(int) _nc_sigprocmask(int, const sigset_t *, sigset_t *);
+#    undef  sigprocmask
+#    define sigprocmask _nc_sigprocmask
+#  endif
+#endif
+

 #if HAVE_NANOSLEEP
 #undef HAVE_NANOSLEEP
 #define HAVE_NANOSLEEP 0       /* nanosleep suspends all threads */
 #if HAVE_NANOSLEEP
 #undef HAVE_NANOSLEEP
 #define HAVE_NANOSLEEP 0       /* nanosleep suspends all threads */


@@ -349,6 +379,7 @@ extern NCURSES_EXPORT(int) _nc_mutex_unlock(pthread_mutex_t *);
 
 #else /* !USE_PTHREADS */
 
 
 #else /* !USE_PTHREADS */
 

+#define _nc_init_pthreads()    /* nothing */

 #define _nc_mutex_init(obj)    /* nothing */
 
 #define _nc_lock_global(name)  /* nothing */
 #define _nc_mutex_init(obj)    /* nothing */
 
 #define _nc_lock_global(name)  /* nothing */


@@ -616,10 +647,12 @@ typedef struct {
 #endif /* TRACE */
 
 #ifdef USE_PTHREADS
 #endif /* TRACE */
 
 #ifdef USE_PTHREADS

-       pthread_mutex_t mutex_curses;
-       pthread_mutex_t mutex_tst_tracef;
-       pthread_mutex_t mutex_tracef;
-       int             nested_tracef;
+       pthread_mutex_t mutex_curses;
+       pthread_mutex_t mutex_tst_tracef;
+       pthread_mutex_t mutex_tracef;
+       int             nested_tracef;
+       int             use_pthreads;
+#define _nc_use_pthreads       _nc_globals.use_pthreads

 #endif
 } NCURSES_GLOBALS;
 
 #endif
 } NCURSES_GLOBALS;
 

diff --git a/ncurses/tinfo/alloc_entry.c b/ncurses/tinfo/alloc_entry.c
index 1496752f1956ec483b8f7674af61ba5d082d28e3..4638e99c4d58d8eb5a152177e900907f6a5c55bb 100644 (file)
--- a/ncurses/tinfo/alloc_entry.c
+++ b/ncurses/tinfo/alloc_entry.c
@@ -1,5 +1,5 @@
 /****************************************************************************
 /****************************************************************************

- * Copyright (c) 1998-2005,2006 Free Software Foundation, Inc.              *
+ * Copyright (c) 1998-2006,2008 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            *


@@ -48,7 +48,7 @@
 #include <tic.h>
 #include <term_entry.h>
 
 #include <tic.h>
 #include <term_entry.h>
 

-MODULE_ID("$Id: alloc_entry.c,v 1.47 2006/12/16 19:06:58 tom Exp $")
+MODULE_ID("$Id: alloc_entry.c,v 1.48 2008/08/16 16:25:31 tom Exp $")

 
 #define ABSENT_OFFSET    -1
 #define CANCELLED_OFFSET -2
 
 #define ABSENT_OFFSET    -1
 #define CANCELLED_OFFSET -2


@@ -145,7 +145,8 @@ NCURSES_EXPORT(void)
 _nc_wrap_entry(ENTRY * const ep, bool copy_strings)
 /* copy the string parts to allocated storage, preserving pointers to it */
 {
 _nc_wrap_entry(ENTRY * const ep, bool copy_strings)
 /* copy the string parts to allocated storage, preserving pointers to it */
 {

-    int offsets[MAX_ENTRY_SIZE / 2], useoffsets[MAX_USES];
+    int offsets[MAX_ENTRY_SIZE / sizeof(short)];
+    int useoffsets[MAX_USES];

     unsigned i, n;
     unsigned nuses = ep->nuses;
     TERMTYPE *tp = &(ep->tterm);
     unsigned i, n;
     unsigned nuses = ep->nuses;
     TERMTYPE *tp = &(ep->tterm);


@@ -171,14 +172,18 @@ _nc_wrap_entry(ENTRY * const ep, bool copy_strings)
        free(tp->str_table);
     }
 
        free(tp->str_table);
     }
 

-    n = tp->term_names - stringbuf;
+    assert(tp->term_names >= stringbuf);
+    n = (unsigned) (tp->term_names - stringbuf);

     for_each_string(i, &(ep->tterm)) {
     for_each_string(i, &(ep->tterm)) {

-       if (tp->Strings[i] == ABSENT_STRING)
-           offsets[i] = ABSENT_OFFSET;
-       else if (tp->Strings[i] == CANCELLED_STRING)
-           offsets[i] = CANCELLED_OFFSET;
-       else
-           offsets[i] = tp->Strings[i] - stringbuf;
+       if (i < SIZEOF(offsets)) {
+           if (tp->Strings[i] == ABSENT_STRING) {
+               offsets[i] = ABSENT_OFFSET;
+           } else if (tp->Strings[i] == CANCELLED_STRING) {
+               offsets[i] = CANCELLED_OFFSET;
+           } else {
+               offsets[i] = tp->Strings[i] - stringbuf;
+           }
+       }

     }
 
     for (i = 0; i < nuses; i++) {
     }
 
     for (i = 0; i < nuses; i++) {


@@ -194,28 +199,33 @@ _nc_wrap_entry(ENTRY * const ep, bool copy_strings)
 
     tp->term_names = tp->str_table + n;
     for_each_string(i, &(ep->tterm)) {
 
     tp->term_names = tp->str_table + n;
     for_each_string(i, &(ep->tterm)) {

-       if (offsets[i] == ABSENT_OFFSET)
-           tp->Strings[i] = ABSENT_STRING;
-       else if (offsets[i] == CANCELLED_OFFSET)
-           tp->Strings[i] = CANCELLED_STRING;
-       else
-           tp->Strings[i] = tp->str_table + offsets[i];
+       if (i < SIZEOF(offsets)) {
+           if (offsets[i] == ABSENT_OFFSET) {
+               tp->Strings[i] = ABSENT_STRING;
+           } else if (offsets[i] == CANCELLED_OFFSET) {
+               tp->Strings[i] = CANCELLED_STRING;
+           } else {
+               tp->Strings[i] = tp->str_table + offsets[i];
+           }
+       }

     }
 
 #if NCURSES_XNAMES
     if (!copy_strings) {
     }
 
 #if NCURSES_XNAMES
     if (!copy_strings) {

-       if ((n = NUM_EXT_NAMES(tp)) != 0) {
-           unsigned length = 0;
-           for (i = 0; i < n; i++) {
-               length += strlen(tp->ext_Names[i]) + 1;
-               offsets[i] = tp->ext_Names[i] - stringbuf;
-           }
-           if ((tp->ext_str_table = typeMalloc(char, length)) == 0)
-                 _nc_err_abort(MSG_NO_MEMORY);
-           for (i = 0, length = 0; i < n; i++) {
-               tp->ext_Names[i] = tp->ext_str_table + length;
-               strcpy(tp->ext_Names[i], stringbuf + offsets[i]);
-               length += strlen(tp->ext_Names[i]) + 1;
+       if ((n = (unsigned) NUM_EXT_NAMES(tp)) != 0) {
+           if (n < SIZEOF(offsets)) {
+               unsigned length = 0;
+               for (i = 0; i < n; i++) {
+                   length += strlen(tp->ext_Names[i]) + 1;
+                   offsets[i] = tp->ext_Names[i] - stringbuf;
+               }
+               if ((tp->ext_str_table = typeMalloc(char, length)) == 0)
+                     _nc_err_abort(MSG_NO_MEMORY);
+               for (i = 0, length = 0; i < n; i++) {
+                   tp->ext_Names[i] = tp->ext_str_table + length;
+                   strcpy(tp->ext_Names[i], stringbuf + offsets[i]);
+                   length += strlen(tp->ext_Names[i]) + 1;
+               }

            }
        }
     }
            }
        }
     }


@@ -245,13 +255,13 @@ _nc_merge_entry(TERMTYPE *const to, TERMTYPE *const from)
            if (mergebool == CANCELLED_BOOLEAN)
                to->Booleans[i] = FALSE;
            else if (mergebool == TRUE)
            if (mergebool == CANCELLED_BOOLEAN)
                to->Booleans[i] = FALSE;
            else if (mergebool == TRUE)

-               to->Booleans[i] = mergebool;
+               to->Booleans[i] = (char) mergebool;

        }
     }
 
     for_each_number(i, from) {
        if (to->Numbers[i] != CANCELLED_NUMERIC) {
        }
     }
 
     for_each_number(i, from) {
        if (to->Numbers[i] != CANCELLED_NUMERIC) {

-           int mergenum = from->Numbers[i];
+           short mergenum = from->Numbers[i];

 
            if (mergenum == CANCELLED_NUMERIC)
                to->Numbers[i] = ABSENT_NUMERIC;
 
            if (mergenum == CANCELLED_NUMERIC)
                to->Numbers[i] = ABSENT_NUMERIC;

diff --git a/ncurses/tinfo/captoinfo.c b/ncurses/tinfo/captoinfo.c
index ef68b04d5d90f4920a2f0cc82d218cbe0079bcd4..93300c1be3e4b05e333e0f8463ed5494cfba3c1a 100644 (file)
--- a/ncurses/tinfo/captoinfo.c
+++ b/ncurses/tinfo/captoinfo.c
@@ -93,7 +93,7 @@
 #include <ctype.h>
 #include <tic.h>
 
 #include <ctype.h>
 #include <tic.h>
 

-MODULE_ID("$Id: captoinfo.c,v 1.51 2008/08/03 18:35:47 tom Exp $")
+MODULE_ID("$Id: captoinfo.c,v 1.52 2008/08/16 19:24:51 tom Exp $")

 
 #define MAX_PUSHED     16      /* max # args we can push onto the stack */
 
 
 #define MAX_PUSHED     16      /* max # args we can push onto the stack */
 


@@ -183,7 +183,7 @@ cvtchar(register const char *sp)
        case '$':
        case '\\':
        case '%':
        case '$':
        case '\\':
        case '%':

-           c = *sp;
+           c = (unsigned char) (*sp);

            len = 2;
            break;
        case '\0':
            len = 2;
            break;
        case '\0':


@@ -201,7 +201,7 @@ cvtchar(register const char *sp)
            }
            break;
        default:
            }
            break;
        default:

-           c = *sp;
+           c = (unsigned char) (*sp);

            len = 2;
            break;
        }
            len = 2;
            break;
        }


@@ -211,7 +211,7 @@ cvtchar(register const char *sp)
        len = 2;
        break;
     default:
        len = 2;
        break;
     default:

-       c = *sp;
+       c = (unsigned char) (*sp);

        len = 1;
     }
     if (isgraph(c) && c != ',' && c != '\'' && c != '\\' && c != ':') {
        len = 1;
     }
     if (isgraph(c) && c != ',' && c != '\'' && c != '\\' && c != ':') {

diff --git a/ncurses/tinfo/comp_expand.c b/ncurses/tinfo/comp_expand.c
index ef419d84cd2c66680449636a14b598efcb563261..6e79a926b5ac59f33d738523676a3cf654c93449 100644 (file)
--- a/ncurses/tinfo/comp_expand.c
+++ b/ncurses/tinfo/comp_expand.c
@@ -1,5 +1,5 @@
 /****************************************************************************
 /****************************************************************************

- * Copyright (c) 1998-2001,2006 Free Software Foundation, Inc.              *
+ * Copyright (c) 1998-2007,2008 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            *


@@ -35,7 +35,7 @@
 #include <ctype.h>
 #include <tic.h>
 
 #include <ctype.h>
 #include <tic.h>
 

-MODULE_ID("$Id: comp_expand.c,v 1.18 2006/06/17 19:37:14 tom Exp $")
+MODULE_ID("$Id: comp_expand.c,v 1.20 2008/08/16 19:29:42 tom Exp $")

 
 static int
 trailing_spaces(const char *src)
 
 static int
 trailing_spaces(const char *src)


@@ -56,7 +56,7 @@ _nc_tic_expand(const char *srcp, bool tic_format, int numbers)
     static size_t length;
 
     int bufp;
     static size_t length;
 
     int bufp;

-    const char *str = VALID_STRING(srcp) ? srcp : "";
+    const char *str = VALID_STRING(srcp) ? srcp : "\0\0";

     bool islong = (strlen(str) > 3);
     size_t need = (2 + strlen(str)) * 4;
     int ch;
     bool islong = (strlen(str) > 3);
     size_t need = (2 + strlen(str)) * 4;
     int ch;


@@ -119,7 +119,7 @@ _nc_tic_expand(const char *srcp, bool tic_format, int numbers)
                        if (ch == '\\'
                            || ch == S_QUOTE)
                            buffer[bufp++] = '\\';
                        if (ch == '\\'
                            || ch == S_QUOTE)
                            buffer[bufp++] = '\\';

-                       buffer[bufp++] = ch;
+                       buffer[bufp++] = (char) ch;

                        buffer[bufp++] = S_QUOTE;
                        str = dst;
                    } else {
                        buffer[bufp++] = S_QUOTE;
                        str = dst;
                    } else {


@@ -148,13 +148,13 @@ _nc_tic_expand(const char *srcp, bool tic_format, int numbers)
            buffer[bufp++] = 's';
        } else if ((ch == ',' || ch == ':' || ch == '^') && tic_format) {
            buffer[bufp++] = '\\';
            buffer[bufp++] = 's';
        } else if ((ch == ',' || ch == ':' || ch == '^') && tic_format) {
            buffer[bufp++] = '\\';

-           buffer[bufp++] = ch;
+           buffer[bufp++] = (char) ch;

        } else if (REALPRINT(str)
                   && (ch != ','
                       && ch != ':'
                       && !(ch == '!' && !tic_format)
                       && ch != '^'))
        } else if (REALPRINT(str)
                   && (ch != ','
                       && ch != ':'
                       && !(ch == '!' && !tic_format)
                       && ch != '^'))

-           buffer[bufp++] = ch;
+           buffer[bufp++] = (char) ch;

 #if 0                          /* FIXME: this would be more readable (in fact the whole 'islong' logic should be removed) */
        else if (ch == '\b') {
            buffer[bufp++] = '\\';
 #if 0                          /* FIXME: this would be more readable (in fact the whole 'islong' logic should be removed) */
        else if (ch == '\b') {
            buffer[bufp++] = '\\';

diff --git a/ncurses/tinfo/comp_hash.c b/ncurses/tinfo/comp_hash.c
index 8b85eee6ced8d183b11572c6403a51b5ee6d2900..b7fbd06163454d8436e8599ee04d002aeb546e09 100644 (file)
--- a/ncurses/tinfo/comp_hash.c
+++ b/ncurses/tinfo/comp_hash.c
@@ -1,5 +1,5 @@
 /****************************************************************************
 /****************************************************************************

- * Copyright (c) 1998-2005,2007 Free Software Foundation, Inc.              *
+ * Copyright (c) 1998-2007,2008 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            *


@@ -50,7 +50,7 @@
 #define DEBUG(level, params)   /*nothing */
 #endif
 
 #define DEBUG(level, params)   /*nothing */
 #endif
 

-MODULE_ID("$Id: comp_hash.c,v 1.33 2007/08/18 21:42:25 tom Exp $")
+MODULE_ID("$Id: comp_hash.c,v 1.36 2008/08/16 17:06:53 tom Exp $")

 
 static int hash_function(const char *);
 
 
 static int hash_function(const char *);
 


@@ -73,7 +73,7 @@ static void
 _nc_make_hash_table(struct name_table_entry *table,
                    short *hash_table)
 {
 _nc_make_hash_table(struct name_table_entry *table,
                    short *hash_table)
 {

-    int i;
+    short i;

     int hashvalue;
     int collisions = 0;
 
     int hashvalue;
     int collisions = 0;
 


@@ -215,8 +215,9 @@ parse_columns(char *buffer)
                if ((s - buffer) > 1
                    && (*buffer == '"')
                    && (s[-1] == '"')) {        /* strip the quotes */
                if ((s - buffer) > 1
                    && (*buffer == '"')
                    && (s[-1] == '"')) {        /* strip the quotes */

-                   buffer++;
+                   assert(s > buffer + 1);

                    s[-1] = '\0';
                    s[-1] = '\0';

+                   buffer++;

                }
                list[col] = buffer;
                col++;
                }
                list[col] = buffer;
                col++;


@@ -258,7 +259,9 @@ main(int argc, char **argv)
        || (column = atoi(argv[1])) <= 0
        || (column >= MAX_COLUMNS)
        || *(root_name = argv[2]) == 0
        || (column = atoi(argv[1])) <= 0
        || (column >= MAX_COLUMNS)
        || *(root_name = argv[2]) == 0

-       || (bigstring = atoi(argv[3])) < 0) {
+       || (bigstring = atoi(argv[3])) < 0
+       || name_table == 0
+       || hash_table == 0) {

        fprintf(stderr, "usage: make_hash column root_name bigstring\n");
        exit(EXIT_FAILURE);
     }
        fprintf(stderr, "usage: make_hash column root_name bigstring\n");
        exit(EXIT_FAILURE);
     }


@@ -301,7 +304,7 @@ main(int argc, char **argv)
 
        printf("static const char %s_names_text[] = \\\n", root_name);
        for (n = 0; n < CAPTABSIZE; n++) {
 
        printf("static const char %s_names_text[] = \\\n", root_name);
        for (n = 0; n < CAPTABSIZE; n++) {

-           nxt = strlen(name_table[n].nte_name) + 5;
+           nxt = (int) strlen(name_table[n].nte_name) + 5;

            if (nxt + len > 72) {
                printf("\\\n");
                len = 0;
            if (nxt + len > 72) {
                printf("\\\n");
                len = 0;


@@ -322,7 +325,7 @@ main(int argc, char **argv)
                   name_table[n].nte_index,
                   name_table[n].nte_link,
                   n < CAPTABSIZE - 1 ? ',' : ' ');
                   name_table[n].nte_index,
                   name_table[n].nte_link,
                   n < CAPTABSIZE - 1 ? ',' : ' ');

-           len += strlen(name_table[n].nte_name) + 1;
+           len += (int) strlen(name_table[n].nte_name) + 1;

        }
        printf("};\n\n");
        printf("static struct name_table_entry *_nc_%s_table = 0;\n\n", root_name);
        }
        printf("};\n\n");
        printf("static struct name_table_entry *_nc_%s_table = 0;\n\n", root_name);


@@ -361,6 +364,7 @@ main(int argc, char **argv)
     printf("#error\t--> numbers of booleans, numbers and/or strings <--\n");
     printf("#endif\n\n");
 
     printf("#error\t--> numbers of booleans, numbers and/or strings <--\n");
     printf("#endif\n\n");
 

+    free(hash_table);

     return EXIT_SUCCESS;
 }
 #endif
     return EXIT_SUCCESS;
 }
 #endif

diff --git a/ncurses/tinfo/comp_parse.c b/ncurses/tinfo/comp_parse.c
index aa60047b0aadb65649ad13c086b6bc2488d9c61c..3325a0ddae6c7e4660fe9e5a4f83430cdd307bbe 100644 (file)
--- a/ncurses/tinfo/comp_parse.c
+++ b/ncurses/tinfo/comp_parse.c
@@ -1,5 +1,5 @@
 /****************************************************************************
 /****************************************************************************

- * Copyright (c) 1998-2006,2007 Free Software Foundation, Inc.              *
+ * Copyright (c) 1998-2007,2008 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            *


@@ -53,7 +53,7 @@
 #include <tic.h>
 #include <term_entry.h>
 
 #include <tic.h>
 #include <term_entry.h>
 

-MODULE_ID("$Id: comp_parse.c,v 1.68 2007/11/03 20:41:46 tom Exp $")
+MODULE_ID("$Id: comp_parse.c,v 1.69 2008/08/16 21:58:16 tom Exp $")

 
 static void sanity_check2(TERMTYPE *, bool);
 NCURSES_IMPEXP void NCURSES_API(*_nc_check_termtype2) (TERMTYPE *, bool) = sanity_check2;
 
 static void sanity_check2(TERMTYPE *, bool);
 NCURSES_IMPEXP void NCURSES_API(*_nc_check_termtype2) (TERMTYPE *, bool) = sanity_check2;


@@ -183,7 +183,8 @@ _nc_resolve_uses2(bool fullresolve, bool literal)
 {
     ENTRY *qp, *rp, *lastread = 0;
     bool keepgoing;
 {
     ENTRY *qp, *rp, *lastread = 0;
     bool keepgoing;

-    int i, unresolved, total_unresolved, multiples;
+    unsigned i;
+    int unresolved, total_unresolved, multiples;

 
     DEBUG(2, ("RESOLUTION BEGINNING"));
 
 
     DEBUG(2, ("RESOLUTION BEGINNING"));
 

diff --git a/ncurses/tinfo/comp_scan.c b/ncurses/tinfo/comp_scan.c
index 140960a8c239b5f6fcbf799fa79a4fb991e74a73..5ad750f930dd3eafea938bfe9ce573a3dd560cab 100644 (file)
--- a/ncurses/tinfo/comp_scan.c
+++ b/ncurses/tinfo/comp_scan.c
@@ -51,7 +51,7 @@
 #include <term_entry.h>
 #include <tic.h>
 
 #include <term_entry.h>
 #include <tic.h>
 

-MODULE_ID("$Id: comp_scan.c,v 1.82 2008/08/04 20:25:03 tom Exp $")
+MODULE_ID("$Id: comp_scan.c,v 1.83 2008/08/16 19:22:55 tom Exp $")

 
 /*
  * Maximum length of string capability we'll accept before raising an error.
 
 /*
  * Maximum length of string capability we'll accept before raising an error.


@@ -300,7 +300,7 @@ eat_escaped_newline(int ch)
        ((tok_ptr - tok_buf) < (TOK_BUF_SIZE - 2))
 
 #define AddCh(ch) \
        ((tok_ptr - tok_buf) < (TOK_BUF_SIZE - 2))
 
 #define AddCh(ch) \

-       *tok_ptr++ = ch; \
+       *tok_ptr++ = (char) ch; \

        *tok_ptr = '\0'
 
 /*
        *tok_ptr = '\0'
 
 /*


@@ -519,7 +519,7 @@ _nc_get_token(bool silent)
                ch = *after_name;
                *after_name = '\0';
                _nc_set_type(tok_buf);
                ch = *after_name;
                *after_name = '\0';
                _nc_set_type(tok_buf);

-               *after_name = ch;
+               *after_name = (char) ch;

            }
 
            /*
            }
 
            /*


@@ -604,7 +604,7 @@ _nc_get_token(bool silent)
            case '#':
                found = 0;
                while (isalnum(ch = next_char())) {
            case '#':
                found = 0;
                while (isalnum(ch = next_char())) {

-                   numbuf[found++] = ch;
+                   numbuf[found++] = (char) ch;

                    if (found >= sizeof(numbuf) - 1)
                        break;
                }
                    if (found >= sizeof(numbuf) - 1)
                        break;
                }


@@ -868,7 +868,7 @@ _nc_trans_string(char *ptr, char *last)
 
        if (!ignored) {
            if (_nc_curr_col <= 1) {
 
        if (!ignored) {
            if (_nc_curr_col <= 1) {

-               push_back(ch);
+               push_back((char) ch);

                ch = '\n';
                break;
            }
                ch = '\n';
                break;
            }

diff --git a/ncurses/tinfo/lib_acs.c b/ncurses/tinfo/lib_acs.c
index 3f20c43aa08202fbe317eed71d3513f314a6b72e..919e47287a7b9c51860aece5c719968bf9b32002 100644 (file)
--- a/ncurses/tinfo/lib_acs.c
+++ b/ncurses/tinfo/lib_acs.c
@@ -35,7 +35,7 @@
 #include <curses.priv.h>
 #include <term.h>              /* ena_acs, acs_chars */
 
 #include <curses.priv.h>
 #include <term.h>              /* ena_acs, acs_chars */
 

-MODULE_ID("$Id: lib_acs.c,v 1.35 2008/08/03 22:59:48 tom Exp $")
+MODULE_ID("$Id: lib_acs.c,v 1.36 2008/08/16 19:22:55 tom Exp $")

 
 #if BROKEN_LINKER || USE_REENTRANT
 #define MyBuffer _nc_prescreen.real_acs_map
 
 #if BROKEN_LINKER || USE_REENTRANT
 #define MyBuffer _nc_prescreen.real_acs_map


@@ -173,7 +173,7 @@ _nc_init_acs(void)
        for (n = 1, m = 0; n < ACS_LEN; n++) {
            if (real_map[n] != 0) {
                show[m++] = (char) n;
        for (n = 1, m = 0; n < ACS_LEN; n++) {
            if (real_map[n] != 0) {
                show[m++] = (char) n;

-               show[m++] = ChCharOf(real_map[n]);
+               show[m++] = (char) ChCharOf(real_map[n]);

            }
        }
        show[m] = 0;
            }
        }
        show[m] = 0;

diff --git a/ncurses/tinfo/lib_cur_term.c b/ncurses/tinfo/lib_cur_term.c
index ce8868e746f9e16367a87b96dd24e6d008f59d43..626578d5c08b93b8a72738b2228ef2497cf4223e 100644 (file)
--- a/ncurses/tinfo/lib_cur_term.c
+++ b/ncurses/tinfo/lib_cur_term.c
@@ -40,7 +40,7 @@
 #include <term_entry.h>                /* TTY, cur_term */
 #include <termcap.h>           /* ospeed */
 
 #include <term_entry.h>                /* TTY, cur_term */
 #include <termcap.h>           /* ospeed */
 

-MODULE_ID("$Id: lib_cur_term.c,v 1.17 2008/06/28 22:59:22 tom Exp $")
+MODULE_ID("$Id: lib_cur_term.c,v 1.18 2008/08/16 19:22:55 tom Exp $")

 
 #undef CUR
 #define CUR termp->type.
 
 #undef CUR
 #define CUR termp->type.


@@ -74,7 +74,7 @@ set_curterm(TERMINAL * termp)
     if (termp != 0) {
        ospeed = _nc_ospeed(termp->_baudrate);
        if (termp->type.Strings) {
     if (termp != 0) {
        ospeed = _nc_ospeed(termp->_baudrate);
        if (termp->type.Strings) {

-           PC = (pad_char != NULL) ? pad_char[0] : 0;
+           PC = (char) ((pad_char != NULL) ? pad_char[0] : 0);

        }
     }
     _nc_unlock_global(curses);
        }
     }
     _nc_unlock_global(curses);

diff --git a/ncurses/tinfo/lib_data.c b/ncurses/tinfo/lib_data.c
index d959509e69f3beb76afb99dbd01049134de9613c..7e77ec014bb59862235c68ed1015e31f0ad9cf3f 100644 (file)
--- a/ncurses/tinfo/lib_data.c
+++ b/ncurses/tinfo/lib_data.c
@@ -41,7 +41,7 @@
 
 #include <curses.priv.h>
 
 
 #include <curses.priv.h>
 

-MODULE_ID("$Id: lib_data.c,v 1.49 2008/06/28 12:46:53 tom Exp $")
+MODULE_ID("$Id: lib_data.c,v 1.51 2008/08/16 23:13:52 tom Exp $")

 
 /*
  * OS/2's native linker complains if we don't initialize public data when
 
 /*
  * OS/2's native linker complains if we don't initialize public data when


@@ -181,6 +181,7 @@ NCURSES_EXPORT_VAR(NCURSES_GLOBALS) _nc_globals = {
     PTHREAD_MUTEX_INITIALIZER, /* mutex_tst_tracef */
     PTHREAD_MUTEX_INITIALIZER, /* mutex_tracef */
     0,                         /* nested_tracef */
     PTHREAD_MUTEX_INITIALIZER, /* mutex_tst_tracef */
     PTHREAD_MUTEX_INITIALIZER, /* mutex_tracef */
     0,                         /* nested_tracef */

+    0,                         /* use_pthreads */

 #endif
 };
 
 #endif
 };
 


@@ -248,6 +249,27 @@ init_global_mutexes(void)
     }
 }
 
     }
 }
 

+NCURSES_EXPORT(void)
+_nc_init_pthreads(void)
+{
+    if (_nc_use_pthreads)
+       return;
+# if USE_WEAK_SYMBOLS
+    if ((pthread_mutex_init) == 0)
+       return;
+    if ((pthread_mutex_lock) == 0)
+       return;
+    if ((pthread_mutex_unlock) == 0)
+       return;
+    if ((pthread_mutex_trylock) == 0)
+       return;
+    if ((pthread_mutexattr_settype) == 0)
+       return;
+# endif
+    _nc_use_pthreads = 1;
+    init_global_mutexes();
+}
+

 /*
  * Use recursive mutexes if we have them - they're part of Unix98.
  * For the cases where we do not, _nc_mutex_trylock() is used to avoid a
 /*
  * Use recursive mutexes if we have them - they're part of Unix98.
  * For the cases where we do not, _nc_mutex_trylock() is used to avoid a


@@ -262,6 +284,8 @@ _nc_mutex_init(pthread_mutex_t * obj)
 {
     pthread_mutexattr_t recattr;
 
 {
     pthread_mutexattr_t recattr;
 

+    if (_nc_use_pthreads == 0)
+       return;

     memset(&recattr, 0, sizeof(recattr));
     pthread_mutexattr_settype(&recattr, PTHREAD_MUTEX_RECURSIVE);
     pthread_mutex_init(obj, &recattr);
     memset(&recattr, 0, sizeof(recattr));
     pthread_mutexattr_settype(&recattr, PTHREAD_MUTEX_RECURSIVE);
     pthread_mutex_init(obj, &recattr);


@@ -270,21 +294,39 @@ _nc_mutex_init(pthread_mutex_t * obj)
 NCURSES_EXPORT(int)
 _nc_mutex_lock(pthread_mutex_t * obj)
 {
 NCURSES_EXPORT(int)
 _nc_mutex_lock(pthread_mutex_t * obj)
 {

-    init_global_mutexes();
+    if (_nc_use_pthreads == 0)
+       return 0;

     return pthread_mutex_lock(obj);
 }
 
 NCURSES_EXPORT(int)
 _nc_mutex_trylock(pthread_mutex_t * obj)
 {
     return pthread_mutex_lock(obj);
 }
 
 NCURSES_EXPORT(int)
 _nc_mutex_trylock(pthread_mutex_t * obj)
 {

-    init_global_mutexes();
+    if (_nc_use_pthreads == 0)
+       return 0;

     return pthread_mutex_trylock(obj);
 }
 
 NCURSES_EXPORT(int)
 _nc_mutex_unlock(pthread_mutex_t * obj)
 {
     return pthread_mutex_trylock(obj);
 }
 
 NCURSES_EXPORT(int)
 _nc_mutex_unlock(pthread_mutex_t * obj)
 {

-    init_global_mutexes();
+    if (_nc_use_pthreads == 0)
+       return 0;

     return pthread_mutex_unlock(obj);
 }
     return pthread_mutex_unlock(obj);
 }

+
+#if USE_WEAK_SYMBOLS
+/*
+ * NB: sigprocmask(2) is global but pthread_sigmask(3p)
+ * only for the calling thread.
+ */
+NCURSES_EXPORT(int)
+_nc_sigprocmask(int how, const sigset_t * newmask, sigset_t * oldmask)
+{
+    if ((pthread_sigmask))
+       return pthread_sigmask(how, newmask, oldmask);
+    else
+       return sigprocmask(how, newmask, oldmask);
+}
+#endif

 #endif /* USE_PTHREADS */
 #endif /* USE_PTHREADS */

diff --git a/ncurses/tinfo/lib_options.c b/ncurses/tinfo/lib_options.c
index eb170354f4dc630e15509c8799edd4d4ac26f797..f3b1485bf11133947656e959d40c1eec4c655b74 100644 (file)
--- a/ncurses/tinfo/lib_options.c
+++ b/ncurses/tinfo/lib_options.c
@@ -43,7 +43,7 @@
 
 #include <term.h>
 
 
 #include <term.h>
 

-MODULE_ID("$Id: lib_options.c,v 1.57 2008/06/28 23:31:15 tom Exp $")
+MODULE_ID("$Id: lib_options.c,v 1.58 2008/08/16 21:20:48 Werner.Fink Exp $")

 
 static int _nc_curs_set(SCREEN *, int);
 static int _nc_meta(SCREEN *, bool);
 
 static int _nc_curs_set(SCREEN *, int);
 static int _nc_meta(SCREEN *, bool);


@@ -245,7 +245,7 @@ _nc_keypad(SCREEN *sp, bool flag)
         * has wgetch() reading in more than one thread.  putp() and below
         * may use SP explicitly.
         */
         * has wgetch() reading in more than one thread.  putp() and below
         * may use SP explicitly.
         */

-       if (sp != SP) {
+       if (_nc_use_pthreads && sp != SP) {

            SCREEN *save_sp;
 
            /* cannot use use_screen(), since that is not in tinfo library */
            SCREEN *save_sp;
 
            /* cannot use use_screen(), since that is not in tinfo library */

diff --git a/ncurses/tinfo/lib_termcap.c b/ncurses/tinfo/lib_termcap.c
index 0d1a5ec23dbadfaa9a524eca5de12c2d63cc7274..2d245ffbb61f345db2ca0741134ca3c7c6804f84 100644 (file)
--- a/ncurses/tinfo/lib_termcap.c
+++ b/ncurses/tinfo/lib_termcap.c
@@ -45,7 +45,7 @@
 
 #include <term_entry.h>
 
 
 #include <term_entry.h>
 

-MODULE_ID("$Id: lib_termcap.c,v 1.62 2008/06/28 13:33:08 tom Exp $")
+MODULE_ID("$Id: lib_termcap.c,v 1.63 2008/08/16 19:22:55 tom Exp $")

 
 NCURSES_EXPORT_VAR(char *) UP = 0;
 NCURSES_EXPORT_VAR(char *) BC = 0;
 
 NCURSES_EXPORT_VAR(char *) UP = 0;
 NCURSES_EXPORT_VAR(char *) BC = 0;


@@ -142,7 +142,7 @@ tgetent(char *bufp, const char *name)
     if (errcode == 1) {
 
        if (cursor_left)
     if (errcode == 1) {
 
        if (cursor_left)

-           if ((backspaces_with_bs = !strcmp(cursor_left, "\b")) == 0)
+           if ((backspaces_with_bs = (char) !strcmp(cursor_left, "\b")) == 0)

                backspace_if_not_bs = cursor_left;
 
        /* we're required to export these */
                backspace_if_not_bs = cursor_left;
 
        /* we're required to export these */

diff --git a/ncurses/tinfo/lib_tgoto.c b/ncurses/tinfo/lib_tgoto.c
index 37553f712394c2718ac6260db5c787adc6cd9cf2..e07f4643138bd2f129e3aa0568f1431df734146e 100644 (file)
--- a/ncurses/tinfo/lib_tgoto.c
+++ b/ncurses/tinfo/lib_tgoto.c
@@ -1,5 +1,5 @@
 /****************************************************************************
 /****************************************************************************

- * Copyright (c) 2000-2003,2006 Free Software Foundation, Inc.              *
+ * Copyright (c) 2000-2006,2008 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            *


@@ -35,7 +35,7 @@
 #include <ctype.h>
 #include <termcap.h>
 
 #include <ctype.h>
 #include <termcap.h>
 

-MODULE_ID("$Id: lib_tgoto.c,v 1.12 2006/11/26 00:26:24 tom Exp $")
+MODULE_ID("$Id: lib_tgoto.c,v 1.13 2008/08/16 19:29:32 tom Exp $")

 
 #if !PURE_TERMINFO
 static bool
 
 #if !PURE_TERMINFO
 static bool


@@ -128,7 +128,7 @@ tgoto_internal(const char *string, int x, int y)
                        *value = 0200;  /* tputs will treat this as \0 */
                    }
                }
                        *value = 0200;  /* tputs will treat this as \0 */
                    }
                }

-               result[used++] = *value++;
+               result[used++] = (char) *value++;

                break;
            case '%':
                result[used++] = *string;
                break;
            case '%':
                result[used++] = *string;

diff --git a/ncurses/tinfo/lib_tparm.c b/ncurses/tinfo/lib_tparm.c
index dce6973af02dc365510473243fbb064ca02934dc..ba2a8404030edda6b0df1d2c60353c561a4a4745 100644 (file)
--- a/ncurses/tinfo/lib_tparm.c
+++ b/ncurses/tinfo/lib_tparm.c
@@ -43,7 +43,7 @@
 #include <term.h>
 #include <tic.h>
 
 #include <term.h>
 #include <tic.h>
 

-MODULE_ID("$Id: lib_tparm.c,v 1.75 2008/08/03 22:37:22 tom Exp $")
+MODULE_ID("$Id: lib_tparm.c,v 1.76 2008/08/16 19:22:55 tom Exp $")

 
 /*
  *     char *
 
 /*
  *     char *


@@ -166,7 +166,7 @@ save_char(int c)
     if (c == 0)
        c = 0200;
     get_space(1);
     if (c == 0)
        c = 0200;
     get_space(1);

-    TPS(out_buff)[TPS(out_used)++] = c;
+    TPS(out_buff)[TPS(out_used)++] = (char) c;

 }
 
 static NCURSES_INLINE void
 }
 
 static NCURSES_INLINE void

diff --git a/ncurses/tinfo/parse_entry.c b/ncurses/tinfo/parse_entry.c
index 45f9c64c26ab1b99f5f63e33baa93d9bb3f5ffc5..cf7a5f409d7c372dc689e3abf9d4a843c7d6553f 100644 (file)
--- a/ncurses/tinfo/parse_entry.c
+++ b/ncurses/tinfo/parse_entry.c
@@ -48,7 +48,7 @@
 #include <tic.h>
 #include <term_entry.h>
 
 #include <tic.h>
 #include <term_entry.h>
 

-MODULE_ID("$Id: parse_entry.c,v 1.67 2008/08/03 20:10:45 tom Exp $")
+MODULE_ID("$Id: parse_entry.c,v 1.69 2008/08/16 21:52:03 tom Exp $")

 
 #ifdef LINT
 static short const parametrized[] =
 
 #ifdef LINT
 static short const parametrized[] =


@@ -459,7 +459,7 @@ _nc_parse_entry(struct entry *entryp, int literal, bool silent)
            default:
                if (!silent)
                    _nc_warning("unknown token type");
            default:
                if (!silent)
                    _nc_warning("unknown token type");

-               _nc_panic_mode((_nc_syntax == SYN_TERMCAP) ? ':' : ',');
+               _nc_panic_mode((char) ((_nc_syntax == SYN_TERMCAP) ? ':' : ','));

                continue;
            }
        }                       /* end else cur_token.name != "use" */
                continue;
            }
        }                       /* end else cur_token.name != "use" */


@@ -479,7 +479,7 @@ _nc_parse_entry(struct entry *entryp, int literal, bool silent)
     if (!literal) {
        if (_nc_syntax == SYN_TERMCAP) {
            bool has_base_entry = FALSE;
     if (!literal) {
        if (_nc_syntax == SYN_TERMCAP) {
            bool has_base_entry = FALSE;

-           int i;
+           unsigned i;

 
            /*
             * Don't insert defaults if this is a `+' entry meant only
 
            /*
             * Don't insert defaults if this is a `+' entry meant only


@@ -554,8 +554,8 @@ append_acs0(string_desc * dst, int code, int src)
 {
     if (src != 0) {
        char temp[3];
 {
     if (src != 0) {
        char temp[3];

-       temp[0] = code;
-       temp[1] = src;
+       temp[0] = (char) code;
+       temp[1] = (char) src;

        temp[2] = 0;
        _nc_safe_strcat(dst, temp);
     }
        temp[2] = 0;
        _nc_safe_strcat(dst, temp);
     }

diff --git a/ncurses/trace/lib_trace.c b/ncurses/trace/lib_trace.c
index da4e5dce0cd3f500e5fe4c025aa82d960b2ca966..202dc382b0b48b9b8ed86f2e6d3f8c2e47df37ac 100644 (file)
--- a/ncurses/trace/lib_trace.c
+++ b/ncurses/trace/lib_trace.c
@@ -46,7 +46,7 @@
 
 #include <ctype.h>
 
 
 #include <ctype.h>
 

-MODULE_ID("$Id: lib_trace.c,v 1.68 2008/08/03 22:22:57 tom Exp $")
+MODULE_ID("$Id: lib_trace.c,v 1.70 2008/08/16 23:13:52 tom Exp $")

 
 NCURSES_EXPORT_VAR(unsigned) _nc_tracing = 0; /* always define this */
 
 
 NCURSES_EXPORT_VAR(unsigned) _nc_tracing = 0; /* always define this */
 


@@ -180,7 +180,10 @@ _nc_va_tracef(const char *fmt, va_list ap)
         * Rather than add the complication of a per-thread stack, just
         * show the thread-id in each line of the trace.
         */
         * Rather than add the complication of a per-thread stack, just
         * show the thread-id in each line of the trace.
         */

-       fprintf(TraceFP, "%#lx:", (long) pthread_self());
+# if USE_WEAK_SYMBOLS
+       if ((pthread_self))
+# endif
+           fprintf(TraceFP, "%#lx:", (long) pthread_self());

 #endif
        if (before || after) {
            int n;
 #endif
        if (before || after) {
            int n;

diff --git a/ncurses/trace/lib_tracedmp.c b/ncurses/trace/lib_tracedmp.c
index 6fd795c3d91faae2e1fe880369d1e9b15bcf126c..58732a06c24623397dabeddafe81410fa88ad726 100644 (file)
--- a/ncurses/trace/lib_tracedmp.c
+++ b/ncurses/trace/lib_tracedmp.c
@@ -39,7 +39,7 @@
 #include <curses.priv.h>
 #include <ctype.h>
 
 #include <curses.priv.h>
 #include <ctype.h>
 

-MODULE_ID("$Id: lib_tracedmp.c,v 1.30 2008/08/03 15:44:31 tom Exp $")
+MODULE_ID("$Id: lib_tracedmp.c,v 1.31 2008/08/16 19:30:56 tom Exp $")

 
 #ifdef TRACE
 
 
 #ifdef TRACE
 


@@ -83,15 +83,15 @@ _tracedump(const char *name, WINDOW *win)
         */
        for (j = 0; j < width; ++j) {
            chtype test = CharOf(win->_line[n].text[j]);
         */
        for (j = 0; j < width; ++j) {
            chtype test = CharOf(win->_line[n].text[j]);

-           ep[j] = (UChar(test) == test
+           ep[j] = (char) ((UChar(test) == test

 #if USE_WIDEC_SUPPORT
 #if USE_WIDEC_SUPPORT

-                    && (win->_line[n].text[j].chars[1] == 0)
+                            && (win->_line[n].text[j].chars[1] == 0)

 #endif
 #endif

-               )
-               ? (iscntrl(UChar(test))
-                  ? '.'
-                  : UChar(test))
-               : '?';
+                           )
+                           ? (iscntrl(UChar(test))
+                              ? '.'
+                              : UChar(test))
+                           : '?');

        }
        ep[j] = '\0';
        _tracef("%s[%2d] %3ld%3ld ='%s'",
        }
        ep[j] = '\0';
        _tracef("%s[%2d] %3ld%3ld ='%s'",


@@ -113,7 +113,7 @@ _tracedump(const char *name, WINDOW *win)
                for (j = 0; j < width; ++j) {
                    int test = WidecExt(win->_line[n].text[j]);
                    if (test) {
                for (j = 0; j < width; ++j) {
                    int test = WidecExt(win->_line[n].text[j]);
                    if (test) {

-                       ep[j] = test + '0';
+                       ep[j] = (char) (test + '0');

                    } else {
                        ep[j] = ' ';
                    }
                    } else {
                        ep[j] = ' ';
                    }


@@ -138,11 +138,11 @@ _tracedump(const char *name, WINDOW *win)
                if (pair >= 52)
                    ep[j] = '?';
                else if (pair >= 36)
                if (pair >= 52)
                    ep[j] = '?';
                else if (pair >= 36)

-                   ep[j] = pair + 'A';
+                   ep[j] = (char) (pair + 'A');

                else if (pair >= 10)
                else if (pair >= 10)

-                   ep[j] = pair + 'a';
+                   ep[j] = (char) (pair + 'a');

                else if (pair >= 1)
                else if (pair >= 1)

-                   ep[j] = pair + '0';
+                   ep[j] = (char) (pair + '0');

                else
                    ep[j] = ' ';
            }
                else
                    ep[j] = ' ';
            }

diff --git a/ncurses/tty/lib_mvcur.c b/ncurses/tty/lib_mvcur.c
index 530de327e4e8d5baba4a2dbfe586202ca1eb59b9..8e66fa3bf64cefe16e175cd2c6a65945f133535b 100644 (file)
--- a/ncurses/tty/lib_mvcur.c
+++ b/ncurses/tty/lib_mvcur.c
@@ -155,7 +155,7 @@
 #include <term.h>
 #include <ctype.h>
 
 #include <term.h>
 #include <ctype.h>
 

-MODULE_ID("$Id: lib_mvcur.c,v 1.112 2008/06/28 12:50:46 tom Exp $")
+MODULE_ID("$Id: lib_mvcur.c,v 1.113 2008/08/16 19:30:58 tom Exp $")

 
 #define WANT_CHAR(y, x)        SP->_newscr->_line[y].text[x]   /* desired state */
 #define BAUDRATE       cur_term->_baudrate     /* bits per second */
 
 #define WANT_CHAR(y, x)        SP->_newscr->_line[y].text[x]   /* desired state */
 #define BAUDRATE       cur_term->_baudrate     /* bits per second */


@@ -631,7 +631,8 @@ relative_move(string_desc * target, int from_y, int from_x, int to_y, int
                    int i;
 
                    for (i = 0; i < n; i++)
                    int i;
 
                    for (i = 0; i < n; i++)

-                       *check.s_tail++ = CharOf(WANT_CHAR(to_y, from_x + i));
+                       *check.s_tail++ = (char) CharOf(WANT_CHAR(to_y,
+                                                                 from_x + i));

                    *check.s_tail = '\0';
                    check.s_size -= n;
                    lhcost += n * SP->_char_padding;
                    *check.s_tail = '\0';
                    check.s_size -= n;
                    lhcost += n * SP->_char_padding;

diff --git a/ncurses/widechar/lib_get_wch.c b/ncurses/widechar/lib_get_wch.c
index 149d3bad13d17ecb150e0c5a359ea8d034f7a77c..6cf3129f2d18f962a0f4efaf14287056584db1d8 100644 (file)
--- a/ncurses/widechar/lib_get_wch.c
+++ b/ncurses/widechar/lib_get_wch.c
@@ -40,7 +40,7 @@
 #include <curses.priv.h>
 #include <ctype.h>
 
 #include <curses.priv.h>
 #include <ctype.h>
 

-MODULE_ID("$Id: lib_get_wch.c,v 1.16 2008/06/07 15:14:33 tom Exp $")
+MODULE_ID("$Id: lib_get_wch.c,v 1.17 2008/08/16 19:22:55 tom Exp $")

 
 #if HAVE_MBTOWC && HAVE_MBLEN
 #define reset_mbytes(state) mblen(NULL, 0), mbtowc(NULL, NULL, 0)
 
 #if HAVE_MBTOWC && HAVE_MBLEN
 #define reset_mbytes(state) mblen(NULL, 0), mbtowc(NULL, NULL, 0)


@@ -104,7 +104,7 @@ wget_wch(WINDOW *win, wint_t *result)
                code = ERR;
                break;
            } else {
                code = ERR;
                break;
            } else {

-               buffer[count++] = UChar(value);
+               buffer[count++] = (char) UChar(value);

                reset_mbytes(state);
                status = count_mbytes(buffer, count, state);
                if (status >= 0) {
                reset_mbytes(state);
                status = count_mbytes(buffer, count, state);
                if (status >= 0) {

diff --git a/ncurses/widechar/lib_get_wstr.c b/ncurses/widechar/lib_get_wstr.c
index 513cd284ef98aca755fda6d7c09cb625f14d54f3..baa70a5a53f966caeeb99ec248967e07130c9b47 100644 (file)
--- a/ncurses/widechar/lib_get_wstr.c
+++ b/ncurses/widechar/lib_get_wstr.c
@@ -40,7 +40,7 @@
 #include <curses.priv.h>
 #include <term.h>
 
 #include <curses.priv.h>
 #include <term.h>
 

-MODULE_ID("$Id: lib_get_wstr.c,v 1.9 2008/06/07 14:50:11 tom Exp $")
+MODULE_ID("$Id: lib_get_wstr.c,v 1.10 2008/08/16 19:25:33 tom Exp $")

 
 static int
 wadd_wint(WINDOW *win, wint_t *src)
 
 static int
 wadd_wint(WINDOW *win, wint_t *src)


@@ -48,7 +48,7 @@ wadd_wint(WINDOW *win, wint_t *src)
     cchar_t tmp;
     wchar_t wch[2];
 
     cchar_t tmp;
     wchar_t wch[2];
 

-    wch[0] = *src;
+    wch[0] = (wchar_t) (*src);

     wch[1] = 0;
     setcchar(&tmp, wch, A_NORMAL, 0, NULL);
     return wadd_wch(win, &tmp);
     wch[1] = 0;
     setcchar(&tmp, wch, A_NORMAL, 0, NULL);
     return wadd_wch(win, &tmp);


@@ -112,8 +112,8 @@ wgetn_wstr(WINDOW *win, wint_t *str, int maxlen)
     noraw();
     cbreak();
 
     noraw();
     cbreak();
 

-    erasec = erasechar();
-    killc = killchar();
+    erasec = (wint_t) erasechar();
+    killc = (wint_t) killchar();

 
     getyx(win, y, x);
 
 
     getyx(win, y, x);
 

diff --git a/progs/infocmp.c b/progs/infocmp.c
index a34153edbe98b4d84394b03e252848dce36812aa..84989ffc63d44cbff7e321feb7ba00d623f2b401 100644 (file)
--- a/progs/infocmp.c
+++ b/progs/infocmp.c
@@ -42,7 +42,7 @@
 
 #include <dump_entry.h>
 
 
 #include <dump_entry.h>
 

-MODULE_ID("$Id: infocmp.c,v 1.102 2008/08/04 13:05:18 tom Exp $")
+MODULE_ID("$Id: infocmp.c,v 1.103 2008/08/16 22:04:56 tom Exp $")

 
 #define L_CURL "{"
 #define R_CURL "}"
 
 #define L_CURL "{"
 #define R_CURL "}"


@@ -221,7 +221,7 @@ static bool
 useeq(ENTRY * e1, ENTRY * e2)
 /* are the use references in two entries equivalent? */
 {
 useeq(ENTRY * e1, ENTRY * e2)
 /* are the use references in two entries equivalent? */
 {

-    int i, j;
+    unsigned i, j;

 
     if (e1->nuses != e2->nuses)
        return (FALSE);
 
     if (e1->nuses != e2->nuses)
        return (FALSE);


@@ -271,7 +271,7 @@ static void
 print_uses(ENTRY * ep, FILE *fp)
 /* print an entry's use references */
 {
 print_uses(ENTRY * ep, FILE *fp)
 /* print an entry's use references */
 {

-    int i;
+    unsigned i;

 
     if (!ep->nuses)
        fputs("NULL", fp);
 
     if (!ep->nuses)
        fputs("NULL", fp);


@@ -659,7 +659,7 @@ analyze_string(const char *name, const char *cap, TERMTYPE *tp)
        if (!expansion) {
            csi = skip_csi(sp);
            for (ap = std_caps; ap->from; ap++) {
        if (!expansion) {
            csi = skip_csi(sp);
            for (ap = std_caps; ap->from; ap++) {

-               size_t adj = (size_t)(csi ? 2 : 0);
+               size_t adj = (size_t) (csi ? 2 : 0);

 
                len = strlen(ap->from);
                if (csi && skip_csi(ap->from) != csi)
 
                len = strlen(ap->from);
                if (csi && skip_csi(ap->from) != csi)


@@ -1284,7 +1284,7 @@ main(int argc, char *argv[])
     _nc_progname = _nc_rootname(argv[0]);
 
     /* make sure we have enough space to add two terminal entries */
     _nc_progname = _nc_rootname(argv[0]);
 
     /* make sure we have enough space to add two terminal entries */

-    myargv = typeCalloc(char *, (size_t)(argc + 3));
+    myargv = typeCalloc(char *, (size_t) (argc + 3));

     memcpy(myargv, argv, (sizeof(char *) * (size_t) argc));
     argv = myargv;
 
     memcpy(myargv, argv, (sizeof(char *) * (size_t) argc));
     argv = myargv;
 

diff --git a/progs/tic.c b/progs/tic.c
index 31045a63a2a2d6a104d979798b74ca681a44aabe..d2cf207c5bf10658dbb9633cc0f2d6409443923f 100644 (file)
--- a/progs/tic.c
+++ b/progs/tic.c
@@ -44,7 +44,7 @@
 #include <dump_entry.h>
 #include <transform.h>
 
 #include <dump_entry.h>
 #include <transform.h>
 

-MODULE_ID("$Id: tic.c,v 1.135 2008/08/04 12:43:40 tom Exp $")
+MODULE_ID("$Id: tic.c,v 1.136 2008/08/16 21:52:36 tom Exp $")

 
 const char *_nc_progname = "tic";
 
 
 const char *_nc_progname = "tic";
 


@@ -759,7 +759,7 @@ main(int argc, char *argv[])
 
                    dump_entry(&qp->tterm, suppress_untranslatable,
                               limited, numbers, NULL);
 
                    dump_entry(&qp->tterm, suppress_untranslatable,
                               limited, numbers, NULL);

-                   for (j = 0; j < qp->nuses; j++)
+                   for (j = 0; j < (int) qp->nuses; j++)

                        dump_uses(qp->uses[j].name, !capdump);
                    len = show_entry();
                    if (debug_level != 0 && !limited)
                        dump_uses(qp->uses[j].name, !capdump);
                    len = show_entry();
                    if (debug_level != 0 && !limited)

diff --git a/progs/toe.c b/progs/toe.c
index 855fb2955cd648e57f6793b90b80382dc8692ba9..8af6f371b77b7adb5bb881338af79a5fe0f9b74e 100644 (file)
--- a/progs/toe.c
+++ b/progs/toe.c
@@ -44,7 +44,7 @@
 #include <hashed_db.h>
 #endif
 
 #include <hashed_db.h>
 #endif
 

-MODULE_ID("$Id: toe.c,v 1.50 2008/08/03 17:12:05 tom Exp $")
+MODULE_ID("$Id: toe.c,v 1.51 2008/08/16 21:53:25 tom Exp $")

 
 #define isDotname(name) (!strcmp(name, ".") || !strcmp(name, ".."))
 
 
 #define isDotname(name) (!strcmp(name, ".") || !strcmp(name, ".."))
 


@@ -330,7 +330,7 @@ main(int argc, char *argv[])
     bool invert_dependencies = FALSE;
     bool header = FALSE;
     char *report_file = 0;
     bool invert_dependencies = FALSE;
     bool header = FALSE;
     char *report_file = 0;

-    int i;
+    unsigned i;

     int code;
     int this_opt, last_opt = '?';
     int v_opt = 0;
     int code;
     int this_opt, last_opt = '?';
     int v_opt = 0;


@@ -399,7 +399,7 @@ main(int argc, char *argv[])
 
        for_entry_list(qp) {
            if (qp->nuses) {
 
        for_entry_list(qp) {
            if (qp->nuses) {

-               int j;
+               unsigned j;

 
                (void) printf("%s:", _nc_first_name(qp->tterm.term_names));
                for (j = 0; j < qp->nuses; j++)
 
                (void) printf("%s:", _nc_first_name(qp->tterm.term_names));
                for (j = 0; j < qp->nuses; j++)

diff --git a/test/Makefile.in b/test/Makefile.in
index 787b3deb0586daab0873534f8ca2230809e1c34a..9066f7d31f533aa8acb43538a0933aeb16ca511c 100644 (file)
--- a/test/Makefile.in
+++ b/test/Makefile.in
@@ -1,4 +1,4 @@
-# $Id: Makefile.in,v 1.98 2008/04/12 20:44:47 tom Exp $
+# $Id: Makefile.in,v 1.100 2008/08/16 21:51:16 tom Exp $

 ##############################################################################
 # Copyright (c) 1998-2007,2008 Free Software Foundation, Inc.                #
 #                                                                            #
 ##############################################################################
 # Copyright (c) 1998-2007,2008 Free Software Foundation, Inc.                #
 #                                                                            #


@@ -94,6 +94,10 @@ TEST_ARGS    = @LDFLAGS_STATIC@ @TEST_ARGS@ @LDFLAGS_SHARED@
 LIBS_DEFAULT   = $(TEST_ARGS) @LIBS@ $(TEST_LIBS) $(MATH_LIB)
 LDFLAGS_DEFAULT        = $(LDFLAGS_@DFT_UPR_MODEL@) $(LIBS_DEFAULT)
 
 LIBS_DEFAULT   = $(TEST_ARGS) @LIBS@ $(TEST_LIBS) $(MATH_LIB)
 LDFLAGS_DEFAULT        = $(LDFLAGS_@DFT_UPR_MODEL@) $(LIBS_DEFAULT)
 

+# use these for linking with the (n)curses library and possibly pthreads
+LIBS_THREADS   = `echo "$(TEST_ARGS) @LIBS@" | sed -e 's/-lform.*-lpanel[^ ]*//'` $(TEST_LIBS) $(MATH_LIB) @PTHREAD@
+LDFLAGS_THREADS        = $(LDFLAGS_@DFT_UPR_MODEL@) $(LIBS_THREADS)
+

 # use these for linking with the (n)curses library
 LIBS_CURSES    = `echo "$(TEST_ARGS) @LIBS@" | sed -e 's/-lform.*-lpanel[^ ]*//'` $(TEST_LIBS) $(MATH_LIB)
 LDFLAGS_CURSES = $(LDFLAGS_@DFT_UPR_MODEL@) $(LIBS_CURSES)
 # use these for linking with the (n)curses library
 LIBS_CURSES    = `echo "$(TEST_ARGS) @LIBS@" | sed -e 's/-lform.*-lpanel[^ ]*//'` $(TEST_LIBS) $(MATH_LIB)
 LDFLAGS_CURSES = $(LDFLAGS_@DFT_UPR_MODEL@) $(LIBS_CURSES)

diff --git a/test/hashtest.c b/test/hashtest.c
index 737731ea61298dfae2f687259bcd2d74f00dc891..6e1b00b5785b7a55627608ec396741248c21b7ff 100644 (file)
--- a/test/hashtest.c
+++ b/test/hashtest.c
@@ -30,7 +30,7 @@
  *
  * Generate timing statistics for vertical-motion optimization.
  *
  *
  * Generate timing statistics for vertical-motion optimization.
  *

- * $Id: hashtest.c,v 1.28 2008/02/23 23:02:41 tom Exp $
+ * $Id: hashtest.c,v 1.29 2008/08/16 17:26:44 tom Exp $

  */
 
 #include <test.priv.h>
  */
 
 #include <test.priv.h>


@@ -195,6 +195,7 @@ main(int argc, char *argv[])
            break;
        case 'l':
            test_loops = atoi(optarg);
            break;
        case 'l':
            test_loops = atoi(optarg);

+           assert(test_loops >= 0);

            break;
        case 'n':
            test_normal = TRUE;
            break;
        case 'n':
            test_normal = TRUE;

diff --git a/test/programs b/test/programs
index d92bd684073957a95d403402971169546c2457f8..9949a4c32a5a5d32031be94c4b0f34ae12967ddb 100644 (file)
--- a/test/programs
+++ b/test/programs
@@ -1,6 +1,6 @@
-# $Id: programs,v 1.13 2007/08/18 17:57:00 tom Exp $
+# $Id: programs,v 1.14 2008/08/16 21:47:39 tom Exp $

 ##############################################################################
 ##############################################################################

-# Copyright (c) 2006,2007 Free Software Foundation, Inc.                     #
+# Copyright (c) 2006-2007,2008 Free Software Foundation, Inc.                #

 #                                                                            #
 # Permission is hereby granted, free of charge, to any person obtaining a    #
 # copy of this software and associated documentation files (the "Software"), #
 #                                                                            #
 # Permission is hereby granted, free of charge, to any person obtaining a    #
 # copy of this software and associated documentation files (the "Software"), #


@@ -43,7 +43,7 @@ demo_keyok    $(LDFLAGS_CURSES)       $(LOCAL_LIBS)   demo_keyok
 demo_menus     $(LDFLAGS_DEFAULT)      $(LOCAL_LIBS)   demo_menus
 demo_panels    $(LDFLAGS_DEFAULT)      $(LOCAL_LIBS)   demo_panels
 demo_termcap   $(LDFLAGS_TINFO)        $(LOCAL_LIBS)   demo_termcap
 demo_menus     $(LDFLAGS_DEFAULT)      $(LOCAL_LIBS)   demo_menus
 demo_panels    $(LDFLAGS_DEFAULT)      $(LOCAL_LIBS)   demo_panels
 demo_termcap   $(LDFLAGS_TINFO)        $(LOCAL_LIBS)   demo_termcap

-ditto          $(LDFLAGS_CURSES)       $(LOCAL_LIBS)   ditto
+ditto          $(LDFLAGS_THREADS)      $(LOCAL_LIBS)   ditto

 dots           $(LDFLAGS_TINFO)        $(LOCAL_LIBS)   dots
 dots_mvcur     $(LDFLAGS_CURSES)       $(LOCAL_LIBS)   dots_mvcur
 echochar       $(LDFLAGS_CURSES)       $(LOCAL_LIBS)   echochar
 dots           $(LDFLAGS_TINFO)        $(LOCAL_LIBS)   dots
 dots_mvcur     $(LDFLAGS_CURSES)       $(LOCAL_LIBS)   dots_mvcur
 echochar       $(LDFLAGS_CURSES)       $(LOCAL_LIBS)   echochar


@@ -66,7 +66,7 @@ movewindow    $(LDFLAGS_CURSES)       $(LOCAL_LIBS)   movewindow
 ncurses                $(LDFLAGS_DEFAULT)      $(LOCAL_LIBS)   ncurses
 newdemo                $(LDFLAGS_CURSES)       $(LOCAL_LIBS)   newdemo
 railroad       $(LDFLAGS_TINFO)        $(LOCAL_LIBS)   railroad
 ncurses                $(LDFLAGS_DEFAULT)      $(LOCAL_LIBS)   ncurses
 newdemo                $(LDFLAGS_CURSES)       $(LOCAL_LIBS)   newdemo
 railroad       $(LDFLAGS_TINFO)        $(LOCAL_LIBS)   railroad

-rain           $(LDFLAGS_CURSES)       $(LOCAL_LIBS)   rain
+rain           $(LDFLAGS_THREADS)      $(LOCAL_LIBS)   rain

 redraw         $(LDFLAGS_CURSES)       $(LOCAL_LIBS)   redraw
 savescreen     $(LDFLAGS_CURSES)       $(LOCAL_LIBS)   savescreen
 tclock         $(LDFLAGS_CURSES)       $(LOCAL_LIBS)   tclock
 redraw         $(LDFLAGS_CURSES)       $(LOCAL_LIBS)   redraw
 savescreen     $(LDFLAGS_CURSES)       $(LOCAL_LIBS)   savescreen
 tclock         $(LDFLAGS_CURSES)       $(LOCAL_LIBS)   tclock


@@ -80,7 +80,7 @@ testaddch     $(LDFLAGS_CURSES)       $(LOCAL_LIBS)   testaddch
 testcurs       $(LDFLAGS_CURSES)       $(LOCAL_LIBS)   testcurs
 testscanw      $(LDFLAGS_CURSES)       $(LOCAL_LIBS)   testscanw
 view           $(LDFLAGS_CURSES)       $(LOCAL_LIBS)   view
 testcurs       $(LDFLAGS_CURSES)       $(LOCAL_LIBS)   testcurs
 testscanw      $(LDFLAGS_CURSES)       $(LOCAL_LIBS)   testscanw
 view           $(LDFLAGS_CURSES)       $(LOCAL_LIBS)   view

-worm           $(LDFLAGS_CURSES)       $(LOCAL_LIBS)   worm
+worm           $(LDFLAGS_THREADS)      $(LOCAL_LIBS)   worm

 xmas           $(LDFLAGS_CURSES)       $(LOCAL_LIBS)   xmas
 
 # vile:makemode
 xmas           $(LDFLAGS_CURSES)       $(LOCAL_LIBS)   xmas
 
 # vile:makemode