ncurses 6.0 - patch 20170729

+ update interix entry using tack and SFU on Windows 7 Ultimate -TD
+ use ^? for kdch1 in interix (reported by Jonathan de Boyne Pollard)
+ add "rep" to xterm-new, available since 1997/01/26 -TD
+ move SGR 24 and 27 from vte-2014 to vte-2012 (request by Alain
  Williams) -TD
+ add a check in newline_forces_scroll() in case a program moves the
  cursor outside scrolling margins (report by Robert King).
+ improve _nc_tparm_analyze, using that to extend the checks made by
  tic for reporting inconsistencies between the expected number of
  parameters for a capability and the actual.
+ amend handling of repeat_char capability in EmitRange (adapted from
  report/patch by Dick Wesseling):
  + translate the character to the alternate character set when the
    alternate character set is enabled.
  + do not use repeat_char for characters past 255.
+ document "_nc_free_tinfo" in manual page, because it could be used in
  tack for memory-leak checking.
+ add "--without-tack" configure option to refine "--with-progs"
  configure option.  Normally tack is no longer built in-tree, but
  a few packagers combine it during the build.  If term_entry.h is
  installed, there is no advantage to in-tree builds.
+ adjust configure-script to define HAVE_CURSES_DATA_BOOLNAMES symbol
  needed for tack 1.08 when built in-tree.  Rather than relying upon
  internal "_nc_" functions, tack now uses the boolean, number and
  string capability name-arrays provided by ncurses and SVr4 Unix
  curses.  It still uses term_entry.h for the definitions of the
  extended capability arrays.
+ add an overlooked null-pointer check in mvcur changes from 20170722

diff --git a/INSTALL b/INSTALL
index 2bf47c2028617f50d26a6bdc9c371c67dc13e3b7..87c9e3b145c5b360dbaad422b6b836af763b9f55 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.197 2017/02/12 19:49:52 tom Exp $
+-- $Id: INSTALL,v 1.198 2017/07/27 08:34:34 tom Exp $

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


@@ -1193,7 +1193,7 @@ SUMMARY OF CONFIGURE OPTIONS:
        scripts which build several configurations for each release version,
        checking to see which of the "_nc_" symbols can be made local.  In
        addition to the ncurses libraries and programs, the symbols used
        scripts which build several configurations for each release version,
        checking to see which of the "_nc_" symbols can be made local.  In
        addition to the ncurses libraries and programs, the symbols used

-       by the "tack" program are made global.
+       by the "tack" program before version 1.08 are made global.

 
        These sample ".map" files will not cover all possible combinations.
        In some cases, e.g., when using the --with-weak-symbols option, you
 
        These sample ".map" files will not cover all possible combinations.
        In some cases, e.g., when using the --with-weak-symbols option, you

diff --git a/NEWS b/NEWS
index d237b6fab62ad0ba8e320844597129981ca1508e..34903917ba1c1d9c5a9dffdd4124ad3663fd55f9 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.2893 2017/07/22 23:56:31 tom Exp $
+-- $Id: NEWS,v 1.2903 2017/07/30 00:14:33 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,36 @@ 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.
 

+20170729
+       + update interix entry using tack and SFU on Windows 7 Ultimate -TD
+       + use ^? for kdch1 in interix (reported by Jonathan de Boyne Pollard)
+       + add "rep" to xterm-new, available since 1997/01/26 -TD
+       + move SGR 24 and 27 from vte-2014 to vte-2012 (request by Alain
+         Williams) -TD
+       + add a check in newline_forces_scroll() in case a program moves the
+         cursor outside scrolling margins (report by Robert King).
+       + improve _nc_tparm_analyze, using that to extend the checks made by
+         tic for reporting inconsistencies between the expected number of
+         parameters for a capability and the actual.
+       + amend handling of repeat_char capability in EmitRange (adapted from
+         report/patch by Dick Wesseling):
+         + translate the character to the alternate character set when the
+           alternate character set is enabled.
+         + do not use repeat_char for characters past 255.
+       + document "_nc_free_tinfo" in manual page, because it could be used in
+         tack for memory-leak checking.
+       + add "--without-tack" configure option to refine "--with-progs"
+         configure option.  Normally tack is no longer built in-tree, but
+         a few packagers combine it during the build.  If term_entry.h is
+         installed, there is no advantage to in-tree builds.
+       + adjust configure-script to define HAVE_CURSES_DATA_BOOLNAMES symbol
+         needed for tack 1.08 when built in-tree.  Rather than relying upon
+         internal "_nc_" functions, tack now uses the boolean, number and
+         string capability name-arrays provided by ncurses and SVr4 Unix
+         curses.  It still uses term_entry.h for the definitions of the
+         extended capability arrays.
+       + add an overlooked null-pointer check in mvcur changes from 20170722
+

 20170722
        + improve test-packages for ncurses-examples and AdaCurses for lintian
        + modify logic for endwin-state to be able to detect the case where
 20170722
        + improve test-packages for ncurses-examples and AdaCurses for lintian
        + modify logic for endwin-state to be able to detect the case where

diff --git a/VERSION b/VERSION
index ddfc4dc1602224cdb8867b9f27db053a62fe692e..42a3d166d9ca6afec07007ccee5121fd46e361ce 100644 (file)
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-5:0:9  6.0     20170722
+5:0:9  6.0     20170729

diff --git a/aclocal.m4 b/aclocal.m4
index 722dbc4c296ebab22daeaacbf8d109d039554c19..69702c3bad4ad5828272409561cef3124744ccc4 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.809 2017/04/29 22:41:39 tom Exp $
+dnl $Id: aclocal.m4,v 1.810 2017/07/26 21:08:35 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


@@ -3914,8 +3914,7 @@ CF_EOF
 
 # Special case: tack's manpage lives in its own directory.
 if test "x$cf_with_manpages" = xyes; then
 
 # Special case: tack's manpage lives in its own directory.
 if test "x$cf_with_manpages" = xyes; then

-if test -d tack ; then
-if test -f $srcdir/$tack.h; then
+if test "x$cf_with_tack" = "xyes"; then

 cat >> Makefile <<CF_EOF
 
 install.man \\
 cat >> Makefile <<CF_EOF
 
 install.man \\


@@ -3924,7 +3923,6 @@ uninstall.man ::
 CF_EOF
 fi
 fi
 CF_EOF
 fi
 fi

-fi

 
 dnl If we're installing into a subdirectory of /usr/include, etc., we should
 dnl prepend the subdirectory's name to the "#include" paths.  It won't hurt
 
 dnl If we're installing into a subdirectory of /usr/include, etc., we should
 dnl prepend the subdirectory's name to the "#include" paths.  It won't hurt


@@ -6436,7 +6434,7 @@ do
                # We may/may not have tack in the distribution, though the
                # makefile is.
                if test $cf_dir = tack ; then
                # We may/may not have tack in the distribution, though the
                # makefile is.
                if test $cf_dir = tack ; then

-                       if test ! -f $srcdir/${cf_dir}/${cf_dir}.h; then
+                       if test "x$cf_with_tack" != "xyes"; then

                                continue
                        fi
                fi
                                continue
                        fi
                fi

diff --git a/configure b/configure
index 7d7d2c1c35ab67e312dc22e24e6ba33343051c2e..a118c0bc595a100affb0355f3d0c9c3da2e54a6e 100755 (executable)
--- a/configure
+++ b/configure
@@ -1,5 +1,5 @@
 #! /bin/sh
 #! /bin/sh

-# From configure.in Revision: 1.643 .
+# From configure.in Revision: 1.645 .

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


@@ -709,6 +709,7 @@ Optional Features:
   --disable-db-install    suppress install of terminal database
   --without-manpages      suppress install of manpages
   --without-progs         suppress build/install with programs (e.g., tic)
   --disable-db-install    suppress install of terminal database
   --without-manpages      suppress install of manpages
   --without-progs         suppress build/install with programs (e.g., tic)

+  --without-tack          suppress build/install with tack program

   --without-tests         suppress build/install with test-programs
   --without-curses-h      install curses.h as ncurses.h only
   --with-pkg-config{=path} enable/disable use of pkg-config
   --without-tests         suppress build/install with test-programs
   --without-curses-h      install curses.h as ncurses.h only
   --with-pkg-config{=path} enable/disable use of pkg-config


@@ -1036,7 +1037,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:1039: loading site script $ac_site_file" >&5
+    { echo "$as_me:1040: 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"


@@ -1047,7 +1048,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:1050: loading cache $cache_file" >&5
+    { echo "$as_me:1051: 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;;


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

-  { echo "$as_me:1058: creating cache $cache_file" >&5
+  { echo "$as_me:1059: 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


@@ -1071,21 +1072,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:1074: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
+      { echo "$as_me:1075: 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:1078: error: \`$ac_var' was not set in the previous run" >&5
+      { echo "$as_me:1079: 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:1084: error: \`$ac_var' has changed since the previous run:" >&5
+        { echo "$as_me:1085: 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:1086:   former value:  $ac_old_val" >&5
+        { echo "$as_me:1087:   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:1088:   current value: $ac_new_val" >&5
+        { echo "$as_me:1089:   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;;


@@ -1104,9 +1105,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:1107: error: changes in the environment can compromise the build" >&5
+  { echo "$as_me:1108: 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:1109: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5
+  { { echo "$as_me:1110: 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


@@ -1127,10 +1128,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:1130: PATH=\".;.\"; conftest.sh") >&5
+if { (echo "$as_me:1131: PATH=\".;.\"; conftest.sh") >&5

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

-  echo "$as_me:1133: \$? = $ac_status" >&5
+  echo "$as_me:1134: \$? = $ac_status" >&5

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


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

-echo "$as_me:1146: checking for egrep" >&5
+echo "$as_me:1147: 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


@@ -1153,11 +1154,11 @@ else
                else ac_cv_prog_egrep='egrep'
        fi
 fi
                else ac_cv_prog_egrep='egrep'
        fi
 fi

-echo "$as_me:1156: result: $ac_cv_prog_egrep" >&5
+echo "$as_me:1157: 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:1160: error: No egrep program found" >&5
+       test -z "$EGREP" && { { echo "$as_me:1161: 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; }; }
 


@@ -1167,11 +1168,11 @@ 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:1170: result: Configuring NCURSES $cf_cv_rel_version ABI $cf_cv_abi_version ($cf_cv_timestamp)" >&5
+echo "$as_me:1171: 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
 
 if test -f $srcdir/VERSION ; then
 echo "${ECHO_T}Configuring NCURSES $cf_cv_rel_version ABI $cf_cv_abi_version ($cf_cv_timestamp)" >&6
 
 if test -f $srcdir/VERSION ; then

-       echo "$as_me:1174: checking for package version" >&5
+       echo "$as_me:1175: checking for package version" >&5

 echo $ECHO_N "checking for package version... $ECHO_C" >&6
 
        # if there are not enough fields, cut returns the last one...
 echo $ECHO_N "checking for package version... $ECHO_C" >&6
 
        # if there are not enough fields, cut returns the last one...


@@ -1183,39 +1184,39 @@ echo $ECHO_N "checking for package version... $ECHO_C" >&6
        VERSION="$cf_field1"
 
        VERSION_MAJOR=`echo "$cf_field2" | sed -e 's/\..*//'`
        VERSION="$cf_field1"
 
        VERSION_MAJOR=`echo "$cf_field2" | sed -e 's/\..*//'`

-       test -z "$VERSION_MAJOR" && { { echo "$as_me:1186: error: missing major-version" >&5
+       test -z "$VERSION_MAJOR" && { { echo "$as_me:1187: error: missing major-version" >&5

 echo "$as_me: error: missing major-version" >&2;}
    { (exit 1); exit 1; }; }
 
        VERSION_MINOR=`echo "$cf_field2" | sed -e 's/^[^.]*\.//' -e 's/-.*//'`
 echo "$as_me: error: missing major-version" >&2;}
    { (exit 1); exit 1; }; }
 
        VERSION_MINOR=`echo "$cf_field2" | sed -e 's/^[^.]*\.//' -e 's/-.*//'`

-       test -z "$VERSION_MINOR" && { { echo "$as_me:1191: error: missing minor-version" >&5
+       test -z "$VERSION_MINOR" && { { echo "$as_me:1192: error: missing minor-version" >&5

 echo "$as_me: error: missing minor-version" >&2;}
    { (exit 1); exit 1; }; }
 
 echo "$as_me: error: missing minor-version" >&2;}
    { (exit 1); exit 1; }; }
 

-       echo "$as_me:1195: result: ${VERSION_MAJOR}.${VERSION_MINOR}" >&5
+       echo "$as_me:1196: result: ${VERSION_MAJOR}.${VERSION_MINOR}" >&5

 echo "${ECHO_T}${VERSION_MAJOR}.${VERSION_MINOR}" >&6
 
 echo "${ECHO_T}${VERSION_MAJOR}.${VERSION_MINOR}" >&6
 

-       echo "$as_me:1198: checking for package patch date" >&5
+       echo "$as_me:1199: checking for package patch date" >&5

 echo $ECHO_N "checking for package patch date... $ECHO_C" >&6
        VERSION_PATCH=`echo "$cf_field3" | sed -e 's/^[^-]*-//'`
        case .$VERSION_PATCH in
        (.)
 echo $ECHO_N "checking for package patch date... $ECHO_C" >&6
        VERSION_PATCH=`echo "$cf_field3" | sed -e 's/^[^-]*-//'`
        case .$VERSION_PATCH in
        (.)

-               { { echo "$as_me:1203: error: missing patch-date $VERSION_PATCH" >&5
+               { { echo "$as_me:1204: error: missing patch-date $VERSION_PATCH" >&5

 echo "$as_me: error: missing patch-date $VERSION_PATCH" >&2;}
    { (exit 1); exit 1; }; }
                ;;
        (.[0-9][0-9][0-9][0-9][0-9][0-9][0-9][0-9])
                ;;
        (*)
 echo "$as_me: error: missing patch-date $VERSION_PATCH" >&2;}
    { (exit 1); exit 1; }; }
                ;;
        (.[0-9][0-9][0-9][0-9][0-9][0-9][0-9][0-9])
                ;;
        (*)

-               { { echo "$as_me:1210: error: illegal patch-date $VERSION_PATCH" >&5
+               { { echo "$as_me:1211: error: illegal patch-date $VERSION_PATCH" >&5

 echo "$as_me: error: illegal patch-date $VERSION_PATCH" >&2;}
    { (exit 1); exit 1; }; }
                ;;
        esac
 echo "$as_me: error: illegal patch-date $VERSION_PATCH" >&2;}
    { (exit 1); exit 1; }; }
                ;;
        esac

-       echo "$as_me:1215: result: $VERSION_PATCH" >&5
+       echo "$as_me:1216: result: $VERSION_PATCH" >&5

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

-       { { echo "$as_me:1218: error: did not find $srcdir/VERSION" >&5
+       { { echo "$as_me:1219: error: did not find $srcdir/VERSION" >&5

 echo "$as_me: error: did not find $srcdir/VERSION" >&2;}
    { (exit 1); exit 1; }; }
 fi
 echo "$as_me: error: did not find $srcdir/VERSION" >&2;}
    { (exit 1); exit 1; }; }
 fi


@@ -1223,19 +1224,19 @@ fi
 # show the actual data that we have for versions:
 test -n "$verbose" && echo "   ABI VERSION $VERSION" 1>&6
 
 # show the actual data that we have for versions:
 test -n "$verbose" && echo "   ABI VERSION $VERSION" 1>&6
 

-echo "${as_me:-configure}:1226: testing ABI VERSION $VERSION ..." 1>&5
+echo "${as_me:-configure}:1227: testing ABI VERSION $VERSION ..." 1>&5

 
 test -n "$verbose" && echo "   VERSION_MAJOR $VERSION_MAJOR" 1>&6
 
 
 test -n "$verbose" && echo "   VERSION_MAJOR $VERSION_MAJOR" 1>&6
 

-echo "${as_me:-configure}:1230: testing VERSION_MAJOR $VERSION_MAJOR ..." 1>&5
+echo "${as_me:-configure}:1231: testing VERSION_MAJOR $VERSION_MAJOR ..." 1>&5

 
 test -n "$verbose" && echo "   VERSION_MINOR $VERSION_MINOR" 1>&6
 
 
 test -n "$verbose" && echo "   VERSION_MINOR $VERSION_MINOR" 1>&6
 

-echo "${as_me:-configure}:1234: testing VERSION_MINOR $VERSION_MINOR ..." 1>&5
+echo "${as_me:-configure}:1235: testing VERSION_MINOR $VERSION_MINOR ..." 1>&5

 
 test -n "$verbose" && echo "   VERSION_PATCH $VERSION_PATCH" 1>&6
 
 
 test -n "$verbose" && echo "   VERSION_PATCH $VERSION_PATCH" 1>&6
 

-echo "${as_me:-configure}:1238: testing VERSION_PATCH $VERSION_PATCH ..." 1>&5
+echo "${as_me:-configure}:1239: testing VERSION_PATCH $VERSION_PATCH ..." 1>&5

 
        cf_PACKAGE=NCURSES
        PACKAGE=ncurses
 
        cf_PACKAGE=NCURSES
        PACKAGE=ncurses


@@ -1259,7 +1260,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:1262: WARNING: overriding release version $cf_cv_rel_version to $withval" >&5
+  { echo "$as_me:1263: 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;


@@ -1272,13 +1273,13 @@ if test -n "$NCURSES_MAJOR" ; then
   ([0-9]*)
        ;;
   (*)
   ([0-9]*)
        ;;
   (*)

-       { { echo "$as_me:1275: error: Release major-version is not a number: $NCURSES_MAJOR" >&5
+       { { echo "$as_me:1276: 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:1281: error: Release major-version value is empty" >&5
+  { { echo "$as_me:1282: 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


@@ -1288,13 +1289,13 @@ if test -n "$NCURSES_MINOR" ; then
   ([0-9]*)
        ;;
   (*)
   ([0-9]*)
        ;;
   (*)

-       { { echo "$as_me:1291: error: Release minor-version is not a number: $NCURSES_MINOR" >&5
+       { { echo "$as_me:1292: 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:1297: error: Release minor-version value is empty" >&5
+  { { echo "$as_me:1298: 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


@@ -1307,7 +1308,7 @@ if test "${with_abi_version+set}" = set; then
 
        if test "x$cf_cv_abi_version" != "x$withval"
        then
 
        if test "x$cf_cv_abi_version" != "x$withval"
        then

-               { echo "$as_me:1310: WARNING: overriding ABI version $cf_cv_abi_version to $withval" >&5
+               { echo "$as_me:1311: 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;}
                case $cf_cv_rel_version in
                (5.*)
 echo "$as_me: WARNING: overriding ABI version $cf_cv_abi_version to $withval" >&2;}
                case $cf_cv_rel_version in
                (5.*)


@@ -1326,13 +1327,13 @@ if test -n "$cf_cv_abi_version" ; then
   ([0-9]*)
        ;;
   (*)
   ([0-9]*)
        ;;
   (*)

-       { { echo "$as_me:1329: error: ABI version is not a number: $cf_cv_abi_version" >&5
+       { { echo "$as_me:1330: 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:1335: error: ABI version value is empty" >&5
+  { { echo "$as_me:1336: 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


@@ -1363,7 +1364,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:1366: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&5
+  { { echo "$as_me:1367: 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


@@ -1373,11 +1374,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:1376: error: cannot run $ac_config_sub" >&5
+  { { echo "$as_me:1377: 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:1380: checking build system type" >&5
+echo "$as_me:1381: 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


@@ -1386,23 +1387,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:1389: error: cannot guess build type; you must specify one" >&5
+  { { echo "$as_me:1390: 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:1393: error: $ac_config_sub $ac_cv_build_alias failed." >&5
+  { { echo "$as_me:1394: 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:1398: result: $ac_cv_build" >&5
+echo "$as_me:1399: 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:1405: checking host system type" >&5
+echo "$as_me:1406: 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


@@ -1411,12 +1412,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:1414: error: $ac_config_sub $ac_cv_host_alias failed" >&5
+  { { echo "$as_me:1415: 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:1419: result: $ac_cv_host" >&5
+echo "$as_me:1420: 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/'`


@@ -1424,7 +1425,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:1427: checking target system type" >&5
+       echo "$as_me:1428: 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


@@ -1433,12 +1434,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:1436: error: $ac_config_sub $ac_cv_target_alias failed" >&5
+  { { echo "$as_me:1437: 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:1441: result: $ac_cv_target" >&5
+echo "$as_me:1442: 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/'`


@@ -1470,13 +1471,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:1473: result: Configuring for $cf_cv_system_name" >&5
+test -n "$cf_cv_system_name" && echo "$as_me:1474: 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:1477: result: Cached system name ($system_name) does not agree with actual ($cf_cv_system_name)" >&5
+       echo "$as_me:1478: 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:1479: error: \"Please remove config.cache and try again.\"" >&5
+       { { echo "$as_me:1480: 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


@@ -1484,7 +1485,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:1487: WARNING: overriding system type to $withval" >&5
+  { echo "$as_me:1488: WARNING: overriding system type to $withval" >&5

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


@@ -1496,7 +1497,7 @@ cf_user_CFLAGS="$CFLAGS"
 
 ###    Default install-location
 
 
 ###    Default install-location
 

-echo "$as_me:1499: checking for prefix" >&5
+echo "$as_me:1500: 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


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

-echo "$as_me:1511: result: $prefix" >&5
+echo "$as_me:1512: 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:1515: checking for default include-directory" >&5
+echo "$as_me:1516: 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 \


@@ -1535,7 +1536,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:1538: result: $includedir" >&5
+echo "$as_me:1539: result: $includedir" >&5

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


@@ -1597,7 +1598,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:1600: checking for $ac_word" >&5
+echo "$as_me:1601: 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


@@ -1612,7 +1613,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:1615: found $ac_dir/$ac_word" >&5
+echo "$as_me:1616: found $ac_dir/$ac_word" >&5

 break
 done
 
 break
 done
 


@@ -1620,10 +1621,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:1623: result: $CC" >&5
+  echo "$as_me:1624: result: $CC" >&5

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

-  echo "$as_me:1626: result: no" >&5
+  echo "$as_me:1627: result: no" >&5

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


@@ -1636,7 +1637,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:1639: checking for $ac_word" >&5
+echo "$as_me:1640: 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


@@ -1651,7 +1652,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:1654: found $ac_dir/$ac_word" >&5
+echo "$as_me:1655: found $ac_dir/$ac_word" >&5

 break
 done
 
 break
 done
 


@@ -1659,10 +1660,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:1662: result: $ac_ct_CC" >&5
+  echo "$as_me:1663: result: $ac_ct_CC" >&5

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

-  echo "$as_me:1665: result: no" >&5
+  echo "$as_me:1666: result: no" >&5

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


@@ -1672,32 +1673,32 @@ done
   CC=$ac_ct_CC
 fi
 
   CC=$ac_ct_CC
 fi
 

-test -z "$CC" && { { echo "$as_me:1675: error: no acceptable cc found in \$PATH" >&5
+test -z "$CC" && { { echo "$as_me:1676: 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:1680:" \
+echo "$as_me:1681:" \

      "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:1683: \"$ac_compiler --version </dev/null >&5\"") >&5
+{ (eval echo "$as_me:1684: \"$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:1686: \$? = $ac_status" >&5
+  echo "$as_me:1687: \$? = $ac_status" >&5

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

-{ (eval echo "$as_me:1688: \"$ac_compiler -v </dev/null >&5\"") >&5
+{ (eval echo "$as_me:1689: \"$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:1691: \$? = $ac_status" >&5
+  echo "$as_me:1692: \$? = $ac_status" >&5

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

-{ (eval echo "$as_me:1693: \"$ac_compiler -V </dev/null >&5\"") >&5
+{ (eval echo "$as_me:1694: \"$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:1696: \$? = $ac_status" >&5
+  echo "$as_me:1697: \$? = $ac_status" >&5

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

-#line 1700 "configure"
+#line 1701 "configure"

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


@@ -1713,13 +1714,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:1716: checking for C compiler default output" >&5
+echo "$as_me:1717: 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:1719: \"$ac_link_default\"") >&5
+if { (eval echo "$as_me:1720: \"$ac_link_default\"") >&5

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

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


@@ -1742,34 +1743,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:1745: error: C compiler cannot create executables" >&5
+{ { echo "$as_me:1746: 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:1751: result: $ac_file" >&5
+echo "$as_me:1752: 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:1756: checking whether the C compiler works" >&5
+echo "$as_me:1757: 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:1762: \"$ac_try\"") >&5
+  { (eval echo "$as_me:1763: \"$ac_try\"") >&5

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

-  echo "$as_me:1765: \$? = $ac_status" >&5
+  echo "$as_me:1766: \$? = $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:1772: error: cannot run C compiled programs.
+       { { echo "$as_me:1773: 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;}


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

-echo "$as_me:1780: result: yes" >&5
+echo "$as_me:1781: 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:1787: checking whether we are cross compiling" >&5
+echo "$as_me:1788: 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:1789: result: $cross_compiling" >&5
+echo "$as_me:1790: result: $cross_compiling" >&5

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

-echo "$as_me:1792: checking for executable suffix" >&5
+echo "$as_me:1793: 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:1794: \"$ac_link\"") >&5
+if { (eval echo "$as_me:1795: \"$ac_link\"") >&5

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

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


@@ -1810,25 +1811,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:1813: error: cannot compute EXEEXT: cannot compile and link" >&5
+  { { echo "$as_me:1814: 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:1819: result: $ac_cv_exeext" >&5
+echo "$as_me:1820: 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:1825: checking for object suffix" >&5
+echo "$as_me:1826: 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 1831 "configure"
+#line 1832 "configure"

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


@@ -1840,10 +1841,10 @@ main (void)
 }
 _ACEOF
 rm -f conftest.o conftest.obj
 }
 _ACEOF
 rm -f conftest.o conftest.obj

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

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

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


@@ -1855,24 +1856,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:1858: error: cannot compute OBJEXT: cannot compile" >&5
+{ { echo "$as_me:1859: 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:1865: result: $ac_cv_objext" >&5
+echo "$as_me:1866: 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:1869: checking whether we are using the GNU C compiler" >&5
+echo "$as_me:1870: 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 1875 "configure"
+#line 1876 "configure"

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


@@ -1887,16 +1888,16 @@ main (void)
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

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

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

-  echo "$as_me:1893: \$? = $ac_status" >&5
+  echo "$as_me:1894: \$? = $ac_status" >&5

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

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

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

-  echo "$as_me:1899: \$? = $ac_status" >&5
+  echo "$as_me:1900: \$? = $ac_status" >&5

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


@@ -1908,19 +1909,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:1911: result: $ac_cv_c_compiler_gnu" >&5
+echo "$as_me:1912: 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:1917: checking whether $CC accepts -g" >&5
+echo "$as_me:1918: 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 1923 "configure"
+#line 1924 "configure"

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


@@ -1932,16 +1933,16 @@ main (void)
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

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

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

-  echo "$as_me:1938: \$? = $ac_status" >&5
+  echo "$as_me:1939: \$? = $ac_status" >&5

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

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

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

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


@@ -1951,7 +1952,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:1954: result: $ac_cv_prog_cc_g" >&5
+echo "$as_me:1955: 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


@@ -1978,16 +1979,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:1981: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:1982: \"$ac_compile\"") >&5

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

-  echo "$as_me:1984: \$? = $ac_status" >&5
+  echo "$as_me:1985: \$? = $ac_status" >&5

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

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

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

-  echo "$as_me:1990: \$? = $ac_status" >&5
+  echo "$as_me:1991: \$? = $ac_status" >&5

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


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

-#line 2002 "configure"
+#line 2003 "configure"

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


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

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

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

-  echo "$as_me:2018: \$? = $ac_status" >&5
+  echo "$as_me:2019: \$? = $ac_status" >&5

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

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

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

-  echo "$as_me:2024: \$? = $ac_status" >&5
+  echo "$as_me:2025: \$? = $ac_status" >&5

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


@@ -2031,7 +2032,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 2034 "configure"
+#line 2035 "configure"

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


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

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

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

-  echo "$as_me:2049: \$? = $ac_status" >&5
+  echo "$as_me:2050: \$? = $ac_status" >&5

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

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

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

-  echo "$as_me:2055: \$? = $ac_status" >&5
+  echo "$as_me:2056: \$? = $ac_status" >&5

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


@@ -2082,15 +2083,15 @@ ac_main_return=return
 
 GCC_VERSION=none
 if test "$GCC" = yes ; then
 
 GCC_VERSION=none
 if test "$GCC" = yes ; then

-       echo "$as_me:2085: checking version of $CC" >&5
+       echo "$as_me:2086: checking version of $CC" >&5

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

-       echo "$as_me:2089: result: $GCC_VERSION" >&5
+       echo "$as_me:2090: result: $GCC_VERSION" >&5

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

-echo "$as_me:2093: checking for $CC option to accept ANSI C" >&5
+echo "$as_me:2094: 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


@@ -2098,7 +2099,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 2101 "configure"
+#line 2102 "configure"

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


@@ -2147,16 +2148,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:2150: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:2151: \"$ac_compile\"") >&5

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

-  echo "$as_me:2153: \$? = $ac_status" >&5
+  echo "$as_me:2154: \$? = $ac_status" >&5

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

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

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

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


@@ -2173,10 +2174,10 @@ fi
 
 case "x$ac_cv_prog_cc_stdc" in
   x|xno)
 
 case "x$ac_cv_prog_cc_stdc" in
   x|xno)

-    echo "$as_me:2176: result: none needed" >&5
+    echo "$as_me:2177: result: none needed" >&5

 echo "${ECHO_T}none needed" >&6 ;;
   *)
 echo "${ECHO_T}none needed" >&6 ;;
   *)

-    echo "$as_me:2179: result: $ac_cv_prog_cc_stdc" >&5
+    echo "$as_me:2180: 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


@@ -2184,13 +2185,13 @@ esac
 # This should have been defined by AC_PROG_CC
 : ${CC:=cc}
 
 # This should have been defined by AC_PROG_CC
 : ${CC:=cc}
 

-echo "$as_me:2187: checking \$CC variable" >&5
+echo "$as_me:2188: checking \$CC variable" >&5

 echo $ECHO_N "checking \$CC variable... $ECHO_C" >&6
 case "$CC" in
 (*[\ \ ]-*)
 echo $ECHO_N "checking \$CC variable... $ECHO_C" >&6
 case "$CC" in
 (*[\ \ ]-*)

-       echo "$as_me:2191: result: broken" >&5
+       echo "$as_me:2192: result: broken" >&5

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

-       { echo "$as_me:2193: WARNING: your environment misuses the CC variable to hold CFLAGS/CPPFLAGS options" >&5
+       { echo "$as_me:2194: WARNING: your environment misuses the CC variable to hold CFLAGS/CPPFLAGS options" >&5

 echo "$as_me: WARNING: your environment misuses the CC variable to hold CFLAGS/CPPFLAGS options" >&2;}
        # humor him...
        cf_prog=`echo "$CC" | sed -e 's/        / /g' -e 's/[ ]* / /g' -e 's/[ ]*[ ]-[^ ].*//'`
 echo "$as_me: WARNING: your environment misuses the CC variable to hold CFLAGS/CPPFLAGS options" >&2;}
        # humor him...
        cf_prog=`echo "$CC" | sed -e 's/        / /g' -e 's/[ ]* / /g' -e 's/[ ]*[ ]-[^ ].*//'`


@@ -2307,19 +2308,19 @@ fi
        done
        test -n "$verbose" && echo "    resulting CC: '$CC'" 1>&6
 
        done
        test -n "$verbose" && echo "    resulting CC: '$CC'" 1>&6
 

-echo "${as_me:-configure}:2310: testing resulting CC: '$CC' ..." 1>&5
+echo "${as_me:-configure}:2311: testing resulting CC: '$CC' ..." 1>&5

 
        test -n "$verbose" && echo "    resulting CFLAGS: '$CFLAGS'" 1>&6
 
 
        test -n "$verbose" && echo "    resulting CFLAGS: '$CFLAGS'" 1>&6
 

-echo "${as_me:-configure}:2314: testing resulting CFLAGS: '$CFLAGS' ..." 1>&5
+echo "${as_me:-configure}:2315: testing resulting CFLAGS: '$CFLAGS' ..." 1>&5

 
        test -n "$verbose" && echo "    resulting CPPFLAGS: '$CPPFLAGS'" 1>&6
 
 
        test -n "$verbose" && echo "    resulting CPPFLAGS: '$CPPFLAGS'" 1>&6
 

-echo "${as_me:-configure}:2318: testing resulting CPPFLAGS: '$CPPFLAGS' ..." 1>&5
+echo "${as_me:-configure}:2319: testing resulting CPPFLAGS: '$CPPFLAGS' ..." 1>&5

 
        ;;
 (*)
 
        ;;
 (*)

-       echo "$as_me:2322: result: ok" >&5
+       echo "$as_me:2323: result: ok" >&5

 echo "${ECHO_T}ok" >&6
        ;;
 esac
 echo "${ECHO_T}ok" >&6
        ;;
 esac


@@ -2330,7 +2331,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:2333: checking how to run the C preprocessor" >&5
+echo "$as_me:2334: 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


@@ -2351,18 +2352,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 2354 "configure"
+#line 2355 "configure"

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

-if { (eval echo "$as_me:2359: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:2360: \"$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:2365: \$? = $ac_status" >&5
+  echo "$as_me:2366: \$? = $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


@@ -2385,17 +2386,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 2388 "configure"
+#line 2389 "configure"

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

-if { (eval echo "$as_me:2392: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:2393: \"$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:2398: \$? = $ac_status" >&5
+  echo "$as_me:2399: \$? = $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


@@ -2432,7 +2433,7 @@ fi
 else
   ac_cv_prog_CPP=$CPP
 fi
 else
   ac_cv_prog_CPP=$CPP
 fi

-echo "$as_me:2435: result: $CPP" >&5
+echo "$as_me:2436: 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


@@ -2442,18 +2443,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 2445 "configure"
+#line 2446 "configure"

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

-if { (eval echo "$as_me:2450: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:2451: \"$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:2456: \$? = $ac_status" >&5
+  echo "$as_me:2457: \$? = $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


@@ -2476,17 +2477,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 2479 "configure"
+#line 2480 "configure"

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

-if { (eval echo "$as_me:2483: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:2484: \"$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:2489: \$? = $ac_status" >&5
+  echo "$as_me:2490: \$? = $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


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

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


@@ -2527,14 +2528,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:2530: checking whether $CC needs -traditional" >&5
+    echo "$as_me:2531: 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 2537 "configure"
+#line 2538 "configure"

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


@@ -2549,7 +2550,7 @@ rm -rf 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 2552 "configure"
+#line 2553 "configure"

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


@@ -2562,14 +2563,14 @@ rm -rf conftest*
 
   fi
 fi
 
   fi
 fi

-echo "$as_me:2565: result: $ac_cv_prog_gcc_traditional" >&5
+echo "$as_me:2566: 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:2572: checking whether $CC understands -c and -o together" >&5
+echo "$as_me:2573: 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


@@ -2584,15 +2585,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 $CFLAGS $CPPFLAGS -c conftest.$ac_ext -o conftest2.$ac_objext >&5'
 # We do the test twice because some compilers refuse to overwrite an
 # existing .o file with -o, though they will create one.
 ac_try='$CC $CFLAGS $CPPFLAGS -c conftest.$ac_ext -o conftest2.$ac_objext >&5'

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

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

-  echo "$as_me:2590: \$? = $ac_status" >&5
+  echo "$as_me:2591: \$? = $ac_status" >&5

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

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

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

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


@@ -2603,10 +2604,10 @@ rm -rf 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:2606: result: yes" >&5
+  echo "$as_me:2607: result: yes" >&5

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

-  echo "$as_me:2609: result: no" >&5
+  echo "$as_me:2610: result: no" >&5

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


@@ -2620,7 +2621,7 @@ else
        (*) 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:2623: checking for $ac_word" >&5
+echo "$as_me:2624: 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


@@ -2637,7 +2638,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:2640: found $ac_dir/$ac_word" >&5
+   echo "$as_me:2641: found $ac_dir/$ac_word" >&5

    break
 fi
 done
    break
 fi
 done


@@ -2648,10 +2649,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:2651: result: $LDCONFIG" >&5
+  echo "$as_me:2652: result: $LDCONFIG" >&5

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

-  echo "$as_me:2654: result: no" >&5
+  echo "$as_me:2655: result: no" >&5

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


@@ -2659,7 +2660,7 @@ fi
        esac
 fi
 
        esac
 fi
 

-echo "$as_me:2662: checking if you want to ensure bool is consistent with C++" >&5
+echo "$as_me:2663: 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.


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

-echo "$as_me:2672: result: $cf_with_cxx" >&5
+echo "$as_me:2673: 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=""


@@ -2687,7 +2688,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:2690: checking for $ac_word" >&5
+echo "$as_me:2691: 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


@@ -2702,7 +2703,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:2705: found $ac_dir/$ac_word" >&5
+echo "$as_me:2706: found $ac_dir/$ac_word" >&5

 break
 done
 
 break
 done
 


@@ -2710,10 +2711,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:2713: result: $CXX" >&5
+  echo "$as_me:2714: result: $CXX" >&5

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

-  echo "$as_me:2716: result: no" >&5
+  echo "$as_me:2717: result: no" >&5

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


@@ -2726,7 +2727,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:2729: checking for $ac_word" >&5
+echo "$as_me:2730: 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


@@ -2741,7 +2742,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:2744: found $ac_dir/$ac_word" >&5
+echo "$as_me:2745: found $ac_dir/$ac_word" >&5

 break
 done
 
 break
 done
 


@@ -2749,10 +2750,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:2752: result: $ac_ct_CXX" >&5
+  echo "$as_me:2753: result: $ac_ct_CXX" >&5

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

-  echo "$as_me:2755: result: no" >&5
+  echo "$as_me:2756: result: no" >&5

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


@@ -2764,32 +2765,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:2767:" \
+echo "$as_me:2768:" \

      "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:2770: \"$ac_compiler --version </dev/null >&5\"") >&5
+{ (eval echo "$as_me:2771: \"$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:2773: \$? = $ac_status" >&5
+  echo "$as_me:2774: \$? = $ac_status" >&5

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

-{ (eval echo "$as_me:2775: \"$ac_compiler -v </dev/null >&5\"") >&5
+{ (eval echo "$as_me:2776: \"$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:2778: \$? = $ac_status" >&5
+  echo "$as_me:2779: \$? = $ac_status" >&5

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

-{ (eval echo "$as_me:2780: \"$ac_compiler -V </dev/null >&5\"") >&5
+{ (eval echo "$as_me:2781: \"$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:2783: \$? = $ac_status" >&5
+  echo "$as_me:2784: \$? = $ac_status" >&5

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

-echo "$as_me:2786: checking whether we are using the GNU C++ compiler" >&5
+echo "$as_me:2787: 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 2792 "configure"
+#line 2793 "configure"

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


@@ -2804,16 +2805,16 @@ main (void)
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

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

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

-  echo "$as_me:2810: \$? = $ac_status" >&5
+  echo "$as_me:2811: \$? = $ac_status" >&5

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

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

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

-  echo "$as_me:2816: \$? = $ac_status" >&5
+  echo "$as_me:2817: \$? = $ac_status" >&5

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


@@ -2825,19 +2826,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:2828: result: $ac_cv_cxx_compiler_gnu" >&5
+echo "$as_me:2829: 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:2834: checking whether $CXX accepts -g" >&5
+echo "$as_me:2835: 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 2840 "configure"
+#line 2841 "configure"

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


@@ -2849,16 +2850,16 @@ main (void)
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

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

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

-  echo "$as_me:2855: \$? = $ac_status" >&5
+  echo "$as_me:2856: \$? = $ac_status" >&5

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

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

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

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


@@ -2868,7 +2869,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:2871: result: $ac_cv_prog_cxx_g" >&5
+echo "$as_me:2872: 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


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

-#line 2898 "configure"
+#line 2899 "configure"

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


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

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

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

-  echo "$as_me:2914: \$? = $ac_status" >&5
+  echo "$as_me:2915: \$? = $ac_status" >&5

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

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

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

-  echo "$as_me:2920: \$? = $ac_status" >&5
+  echo "$as_me:2921: \$? = $ac_status" >&5

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


@@ -2927,7 +2928,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 2930 "configure"
+#line 2931 "configure"

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


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

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

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

-  echo "$as_me:2945: \$? = $ac_status" >&5
+  echo "$as_me:2946: \$? = $ac_status" >&5

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

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

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

-  echo "$as_me:2951: \$? = $ac_status" >&5
+  echo "$as_me:2952: \$? = $ac_status" >&5

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


@@ -2982,7 +2983,7 @@ ac_main_return=return
        then
                # Several of the C++ configurations do not work, particularly when
                # cross-compiling (20140913 -TD)
        then
                # Several of the C++ configurations do not work, particularly when
                # cross-compiling (20140913 -TD)

-               echo "$as_me:2985: checking if $CXX works" >&5
+               echo "$as_me:2986: checking if $CXX works" >&5

 echo $ECHO_N "checking if $CXX works... $ECHO_C" >&6
 
                save_CPPFLAGS="$CPPFLAGS"
 echo $ECHO_N "checking if $CXX works... $ECHO_C" >&6
 
                save_CPPFLAGS="$CPPFLAGS"


@@ -2990,7 +2991,7 @@ echo $ECHO_N "checking if $CXX works... $ECHO_C" >&6
                CPPFLAGS="$CPPFLAGS -I${cf_includedir}"
 
 cat >conftest.$ac_ext <<_ACEOF
                CPPFLAGS="$CPPFLAGS -I${cf_includedir}"
 
 cat >conftest.$ac_ext <<_ACEOF

-#line 2993 "configure"
+#line 2994 "configure"

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


@@ -3007,16 +3008,16 @@ main (void)
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

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

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

-  echo "$as_me:3013: \$? = $ac_status" >&5
+  echo "$as_me:3014: \$? = $ac_status" >&5

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

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

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

-  echo "$as_me:3019: \$? = $ac_status" >&5
+  echo "$as_me:3020: \$? = $ac_status" >&5

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


@@ -3027,11 +3028,11 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
                CPPFLAGS="$save_CPPFLAGS"
 
 rm -f conftest.$ac_objext conftest.$ac_ext
                CPPFLAGS="$save_CPPFLAGS"
 

-               echo "$as_me:3030: result: $cf_cxx_works" >&5
+               echo "$as_me:3031: result: $cf_cxx_works" >&5

 echo "${ECHO_T}$cf_cxx_works" >&6
                if test "x$cf_cxx_works" = xno
                then
 echo "${ECHO_T}$cf_cxx_works" >&6
                if test "x$cf_cxx_works" = xno
                then

-                       { echo "$as_me:3034: WARNING: Ignore $CXX, since it cannot compile hello-world." >&5
+                       { echo "$as_me:3035: WARNING: Ignore $CXX, since it cannot compile hello-world." >&5

 echo "$as_me: WARNING: Ignore $CXX, since it cannot compile hello-world." >&2;}
                        cf_with_cxx=no; CXX=""; GXX="";
                fi
 echo "$as_me: WARNING: Ignore $CXX, since it cannot compile hello-world." >&2;}
                        cf_with_cxx=no; CXX=""; GXX="";
                fi


@@ -3047,7 +3048,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:3050: checking for $ac_word" >&5
+echo "$as_me:3051: 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


@@ -3064,7 +3065,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:3067: found $ac_dir/$ac_word" >&5
+   echo "$as_me:3068: found $ac_dir/$ac_word" >&5

    break
 fi
 done
    break
 fi
 done


@@ -3075,17 +3076,17 @@ fi
 CXX=$ac_cv_path_CXX
 
 if test -n "$CXX"; then
 CXX=$ac_cv_path_CXX
 
 if test -n "$CXX"; then

-  echo "$as_me:3078: result: $CXX" >&5
+  echo "$as_me:3079: result: $CXX" >&5

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

-  echo "$as_me:3081: result: no" >&5
+  echo "$as_me:3082: result: no" >&5

 echo "${ECHO_T}no" >&6
 fi
 
        fi
        case "x$CXX" in
        (x|xg++)
 echo "${ECHO_T}no" >&6
 fi
 
        fi
        case "x$CXX" in
        (x|xg++)

-               { echo "$as_me:3088: WARNING: You don't have any C++ compiler, too bad" >&5
+               { echo "$as_me:3089: WARNING: You don't have any C++ compiler, too bad" >&5

 echo "$as_me: WARNING: You don't have any C++ compiler, too bad" >&2;}
                cf_with_cxx=no; CXX=""; GXX="";
                ;;
 echo "$as_me: WARNING: You don't have any C++ compiler, too bad" >&2;}
                cf_with_cxx=no; CXX=""; GXX="";
                ;;


@@ -3094,7 +3095,7 @@ fi
 
 GXX_VERSION=none
 if test "$GXX" = yes; then
 
 GXX_VERSION=none
 if test "$GXX" = yes; then

-       echo "$as_me:3097: checking version of ${CXX:-g++}" >&5
+       echo "$as_me:3098: checking version of ${CXX:-g++}" >&5

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


@@ -3102,7 +3103,7 @@ echo $ECHO_N "checking version of ${CXX:-g++}... $ECHO_C" >&6
                GXX_VERSION=unknown
                GXX=no
        fi
                GXX_VERSION=unknown
                GXX=no
        fi

-       echo "$as_me:3105: result: $GXX_VERSION" >&5
+       echo "$as_me:3106: result: $GXX_VERSION" >&5

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


@@ -3110,12 +3111,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:3113: WARNING: templates do not work" >&5
+       { echo "$as_me:3114: 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:3118: checking if you want to build C++ binding and demo" >&5
+echo "$as_me:3119: 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.


@@ -3125,15 +3126,15 @@ 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:3128: result: $cf_with_cxx_binding" >&5
+echo "$as_me:3129: 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:3131: checking if you want to build with Ada95" >&5
+echo "$as_me:3132: checking if you want to build with Ada95" >&5

 echo $ECHO_N "checking if you want to build with Ada95... $ECHO_C" >&6
 echo $ECHO_N "checking if you want to build with Ada95... $ECHO_C" >&6

-echo "$as_me:3133: result: $cf_with_ada" >&5
+echo "$as_me:3134: result: $cf_with_ada" >&5

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

-echo "$as_me:3136: checking if you want to install terminal database" >&5
+echo "$as_me:3137: checking if you want to install terminal database" >&5

 echo $ECHO_N "checking if you want to install terminal database... $ECHO_C" >&6
 
 # Check whether --enable-db-install or --disable-db-install was given.
 echo $ECHO_N "checking if you want to install terminal database... $ECHO_C" >&6
 
 # Check whether --enable-db-install or --disable-db-install was given.


@@ -3143,10 +3144,10 @@ if test "${enable_db_install+set}" = set; then
 else
   cf_with_db_install=yes
 fi;
 else
   cf_with_db_install=yes
 fi;

-echo "$as_me:3146: result: $cf_with_db_install" >&5
+echo "$as_me:3147: result: $cf_with_db_install" >&5

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

-echo "$as_me:3149: checking if you want to install manpages" >&5
+echo "$as_me:3150: checking if you want to install manpages" >&5

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


@@ -3156,10 +3157,10 @@ if test "${with_manpages+set}" = set; then
 else
   cf_with_manpages=yes
 fi;
 else
   cf_with_manpages=yes
 fi;

-echo "$as_me:3159: result: $cf_with_manpages" >&5
+echo "$as_me:3160: result: $cf_with_manpages" >&5

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

-echo "$as_me:3162: checking if you want to build programs such as tic" >&5
+echo "$as_me:3163: 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.


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

-echo "$as_me:3172: result: $cf_with_progs" >&5
+echo "$as_me:3173: result: $cf_with_progs" >&5

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

-echo "$as_me:3175: checking if you want to build test-programs" >&5
+if test -f $srcdir/tack/tack.h; then
+       if test "x$cross_compiling" = xyes ; then
+               test -n "$verbose" && echo "    ignoring tack because we are cross-compiling" 1>&6
+
+echo "${as_me:-configure}:3180: testing ignoring tack because we are cross-compiling ..." 1>&5
+
+               cf_with_tack=no
+       else
+               echo "$as_me:3184: checking if you want to build the tack program" >&5
+echo $ECHO_N "checking if you want to build the tack program... $ECHO_C" >&6
+
+# Check whether --with-tack or --without-tack was given.
+if test "${with_tack+set}" = set; then
+  withval="$with_tack"
+  cf_with_tack=$withval
+else
+  cf_with_tack=$cf_with_progs
+fi;
+               echo "$as_me:3194: result: $cf_with_tack" >&5
+echo "${ECHO_T}$cf_with_tack" >&6
+       fi
+else
+       cf_with_tack=no
+fi
+
+echo "$as_me:3201: checking if you want to build test-programs" >&5

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


@@ -3182,10 +3208,10 @@ if test "${with_tests+set}" = set; then
 else
   cf_with_tests=yes
 fi;
 else
   cf_with_tests=yes
 fi;

-echo "$as_me:3185: result: $cf_with_tests" >&5
+echo "$as_me:3211: result: $cf_with_tests" >&5

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

-echo "$as_me:3188: checking if you wish to install curses.h" >&5
+echo "$as_me:3214: 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.


@@ -3195,13 +3221,12 @@ if test "${with_curses_h+set}" = set; then
 else
   with_curses_h=yes
 fi;
 else
   with_curses_h=yes
 fi;

-echo "$as_me:3198: result: $with_curses_h" >&5
+echo "$as_me:3224: 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"

-if test "X$cf_with_progs" != Xno ; then
-modules_to_build="$modules_to_build progs tack"
-fi
+test "X$cf_with_progs" != Xno && modules_to_build="$modules_to_build progs"
+test "X$cf_with_tack"  != Xno && modules_to_build="$modules_to_build tack"

 modules_to_build="$modules_to_build panel menu form"
 
 test "$program_prefix" != NONE &&
 modules_to_build="$modules_to_build panel menu form"
 
 test "$program_prefix" != NONE &&


@@ -3221,7 +3246,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:3224: checking for $ac_word" >&5
+echo "$as_me:3249: 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


@@ -3236,7 +3261,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:3239: found $ac_dir/$ac_word" >&5
+echo "$as_me:3264: found $ac_dir/$ac_word" >&5

 break
 done
 
 break
 done
 


@@ -3244,21 +3269,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:3247: result: $AWK" >&5
+  echo "$as_me:3272: result: $AWK" >&5

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

-  echo "$as_me:3250: result: no" >&5
+  echo "$as_me:3275: 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:3257: error: No awk program found" >&5
+test -z "$AWK" && { { echo "$as_me:3282: 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:3261: checking for egrep" >&5
+echo "$as_me:3286: 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


@@ -3268,11 +3293,11 @@ else
                else ac_cv_prog_egrep='egrep'
        fi
 fi
                else ac_cv_prog_egrep='egrep'
        fi
 fi

-echo "$as_me:3271: result: $ac_cv_prog_egrep" >&5
+echo "$as_me:3296: 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:3275: error: No egrep program found" >&5
+       test -z "$EGREP" && { { echo "$as_me:3300: 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; }; }
 


@@ -3288,7 +3313,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:3291: checking for a BSD compatible install" >&5
+echo "$as_me:3316: 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


@@ -3337,7 +3362,7 @@ fi
     INSTALL=$ac_install_sh
   fi
 fi
     INSTALL=$ac_install_sh
   fi
 fi

-echo "$as_me:3340: result: $INSTALL" >&5
+echo "$as_me:3365: 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}.


@@ -3362,7 +3387,7 @@ for ac_prog in lint cppcheck splint
 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:3365: checking for $ac_word" >&5
+echo "$as_me:3390: 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


@@ -3377,7 +3402,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:3380: found $ac_dir/$ac_word" >&5
+echo "$as_me:3405: found $ac_dir/$ac_word" >&5

 break
 done
 
 break
 done
 


@@ -3385,28 +3410,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:3388: result: $LINT" >&5
+  echo "$as_me:3413: result: $LINT" >&5

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

-  echo "$as_me:3391: result: no" >&5
+  echo "$as_me:3416: 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:3398: checking whether ln -s works" >&5
+echo "$as_me:3423: 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:3402: result: yes" >&5
+  echo "$as_me:3427: result: yes" >&5

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

-  echo "$as_me:3405: result: no, using $LN_S" >&5
+  echo "$as_me:3430: 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:3409: checking if $LN_S -f options work" >&5
+echo "$as_me:3434: checking if $LN_S -f options work" >&5

 echo $ECHO_N "checking if $LN_S -f options work... $ECHO_C" >&6
 
 rm -f conf$$.src conf$$dst
 echo $ECHO_N "checking if $LN_S -f options work... $ECHO_C" >&6
 
 rm -f conf$$.src conf$$dst


@@ -3418,12 +3443,12 @@ else
        cf_prog_ln_sf=no
 fi
 rm -f conf$$.dst conf$$src
        cf_prog_ln_sf=no
 fi
 rm -f conf$$.dst conf$$src

-echo "$as_me:3421: result: $cf_prog_ln_sf" >&5
+echo "$as_me:3446: result: $cf_prog_ln_sf" >&5

 echo "${ECHO_T}$cf_prog_ln_sf" >&6
 
 test "$cf_prog_ln_sf" = yes && LN_S="$LN_S -f"
 
 echo "${ECHO_T}$cf_prog_ln_sf" >&6
 
 test "$cf_prog_ln_sf" = yes && LN_S="$LN_S -f"
 

-echo "$as_me:3426: checking for long file names" >&5
+echo "$as_me:3451: 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


@@ -3462,7 +3487,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:3465: result: $ac_cv_sys_long_file_names" >&5
+echo "$as_me:3490: 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
 


@@ -3474,7 +3499,7 @@ fi
 
 # if we find pkg-config, check if we should install the ".pc" files.
 
 
 # if we find pkg-config, check if we should install the ".pc" files.
 

-echo "$as_me:3477: checking if you want to use pkg-config" >&5
+echo "$as_me:3502: checking if you want to use pkg-config" >&5

 echo $ECHO_N "checking if you want to use pkg-config... $ECHO_C" >&6
 
 # Check whether --with-pkg-config or --without-pkg-config was given.
 echo $ECHO_N "checking if you want to use pkg-config... $ECHO_C" >&6
 
 # Check whether --with-pkg-config or --without-pkg-config was given.


@@ -3484,7 +3509,7 @@ if test "${with_pkg_config+set}" = set; then
 else
   cf_pkg_config=yes
 fi;
 else
   cf_pkg_config=yes
 fi;

-echo "$as_me:3487: result: $cf_pkg_config" >&5
+echo "$as_me:3512: result: $cf_pkg_config" >&5

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


@@ -3496,7 +3521,7 @@ case $cf_pkg_config in
 if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args.
 set dummy ${ac_tool_prefix}pkg-config; ac_word=$2
 if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args.
 set dummy ${ac_tool_prefix}pkg-config; ac_word=$2

-echo "$as_me:3499: checking for $ac_word" >&5
+echo "$as_me:3524: checking for $ac_word" >&5

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


@@ -3513,7 +3538,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   if $as_executable_p "$ac_dir/$ac_word"; then
    ac_cv_path_PKG_CONFIG="$ac_dir/$ac_word"
   test -z "$ac_dir" && ac_dir=.
   if $as_executable_p "$ac_dir/$ac_word"; then
    ac_cv_path_PKG_CONFIG="$ac_dir/$ac_word"

-   echo "$as_me:3516: found $ac_dir/$ac_word" >&5
+   echo "$as_me:3541: found $ac_dir/$ac_word" >&5

    break
 fi
 done
    break
 fi
 done


@@ -3524,10 +3549,10 @@ fi
 PKG_CONFIG=$ac_cv_path_PKG_CONFIG
 
 if test -n "$PKG_CONFIG"; then
 PKG_CONFIG=$ac_cv_path_PKG_CONFIG
 
 if test -n "$PKG_CONFIG"; then

-  echo "$as_me:3527: result: $PKG_CONFIG" >&5
+  echo "$as_me:3552: result: $PKG_CONFIG" >&5

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

-  echo "$as_me:3530: result: no" >&5
+  echo "$as_me:3555: result: no" >&5

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


@@ -3536,7 +3561,7 @@ if test -z "$ac_cv_path_PKG_CONFIG"; then
   ac_pt_PKG_CONFIG=$PKG_CONFIG
   # Extract the first word of "pkg-config", so it can be a program name with args.
 set dummy pkg-config; ac_word=$2
   ac_pt_PKG_CONFIG=$PKG_CONFIG
   # Extract the first word of "pkg-config", so it can be a program name with args.
 set dummy pkg-config; ac_word=$2

-echo "$as_me:3539: checking for $ac_word" >&5
+echo "$as_me:3564: checking for $ac_word" >&5

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


@@ -3553,7 +3578,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   if $as_executable_p "$ac_dir/$ac_word"; then
    ac_cv_path_ac_pt_PKG_CONFIG="$ac_dir/$ac_word"
   test -z "$ac_dir" && ac_dir=.
   if $as_executable_p "$ac_dir/$ac_word"; then
    ac_cv_path_ac_pt_PKG_CONFIG="$ac_dir/$ac_word"

-   echo "$as_me:3556: found $ac_dir/$ac_word" >&5
+   echo "$as_me:3581: found $ac_dir/$ac_word" >&5

    break
 fi
 done
    break
 fi
 done


@@ -3565,10 +3590,10 @@ fi
 ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG
 
 if test -n "$ac_pt_PKG_CONFIG"; then
 ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG
 
 if test -n "$ac_pt_PKG_CONFIG"; then

-  echo "$as_me:3568: result: $ac_pt_PKG_CONFIG" >&5
+  echo "$as_me:3593: result: $ac_pt_PKG_CONFIG" >&5

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

-  echo "$as_me:3571: result: no" >&5
+  echo "$as_me:3596: result: no" >&5

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


@@ -3611,24 +3636,24 @@ case ".$PKG_CONFIG" in
        PKG_CONFIG=`echo $PKG_CONFIG | sed -e s%NONE%$cf_path_syntax%`
        ;;
 (*)
        PKG_CONFIG=`echo $PKG_CONFIG | sed -e s%NONE%$cf_path_syntax%`
        ;;
 (*)

-       { { echo "$as_me:3614: error: expected a pathname, not \"$PKG_CONFIG\"" >&5
+       { { echo "$as_me:3639: error: expected a pathname, not \"$PKG_CONFIG\"" >&5

 echo "$as_me: error: expected a pathname, not \"$PKG_CONFIG\"" >&2;}
    { (exit 1); exit 1; }; }
        ;;
 esac
 
 elif test "x$cf_pkg_config" != xno ; then
 echo "$as_me: error: expected a pathname, not \"$PKG_CONFIG\"" >&2;}
    { (exit 1); exit 1; }; }
        ;;
 esac
 
 elif test "x$cf_pkg_config" != xno ; then

-       { echo "$as_me:3621: WARNING: pkg-config is not installed" >&5
+       { echo "$as_me:3646: WARNING: pkg-config is not installed" >&5

 echo "$as_me: WARNING: pkg-config is not installed" >&2;}
 fi
 
 case $PKG_CONFIG in
 (no|none|yes)
 echo "$as_me: WARNING: pkg-config is not installed" >&2;}
 fi
 
 case $PKG_CONFIG in
 (no|none|yes)

-       echo "$as_me:3627: checking for pkg-config library directory" >&5
+       echo "$as_me:3652: checking for pkg-config library directory" >&5

 echo $ECHO_N "checking for pkg-config library directory... $ECHO_C" >&6
        ;;
 (*)
 echo $ECHO_N "checking for pkg-config library directory... $ECHO_C" >&6
        ;;
 (*)

-       echo "$as_me:3631: checking for $PKG_CONFIG library directory" >&5
+       echo "$as_me:3656: checking for $PKG_CONFIG library directory" >&5

 echo $ECHO_N "checking for $PKG_CONFIG library directory... $ECHO_C" >&6
        ;;
 esac
 echo $ECHO_N "checking for $PKG_CONFIG library directory... $ECHO_C" >&6
        ;;
 esac


@@ -3683,18 +3708,18 @@ case x$PKG_CONFIG_LIBDIR in
 
        test -n "$verbose" && echo "    list..." 1>&6
 
 
        test -n "$verbose" && echo "    list..." 1>&6
 

-echo "${as_me:-configure}:3686: testing list... ..." 1>&5
+echo "${as_me:-configure}:3711: testing list... ..." 1>&5

 
        for cf_config in $cf_search_path
        do
                test -n "$verbose" && echo "    checking $cf_config/pkgconfig" 1>&6
 
 
        for cf_config in $cf_search_path
        do
                test -n "$verbose" && echo "    checking $cf_config/pkgconfig" 1>&6
 

-echo "${as_me:-configure}:3692: testing checking $cf_config/pkgconfig ..." 1>&5
+echo "${as_me:-configure}:3717: testing checking $cf_config/pkgconfig ..." 1>&5

 
                if test -d $cf_config/pkgconfig
                then
                        PKG_CONFIG_LIBDIR=$cf_config/pkgconfig
 
                if test -d $cf_config/pkgconfig
                then
                        PKG_CONFIG_LIBDIR=$cf_config/pkgconfig

-                       echo "$as_me:3697: checking done" >&5
+                       echo "$as_me:3722: checking done" >&5

 echo $ECHO_N "checking done... $ECHO_C" >&6
                        break
                fi
 echo $ECHO_N "checking done... $ECHO_C" >&6
                        break
                fi


@@ -3705,16 +3730,16 @@ echo $ECHO_N "checking done... $ECHO_C" >&6
 esac
 
 if test "x$PKG_CONFIG_LIBDIR" != xno ; then
 esac
 
 if test "x$PKG_CONFIG_LIBDIR" != xno ; then

-       echo "$as_me:3708: result: $PKG_CONFIG_LIBDIR" >&5
+       echo "$as_me:3733: result: $PKG_CONFIG_LIBDIR" >&5

 echo "${ECHO_T}$PKG_CONFIG_LIBDIR" >&6
 fi
 
 if test "x$PKG_CONFIG" != xnone
 then
 echo "${ECHO_T}$PKG_CONFIG_LIBDIR" >&6
 fi
 
 if test "x$PKG_CONFIG" != xnone
 then

-       echo "$as_me:3714: checking if we should install .pc files for $PKG_CONFIG" >&5
+       echo "$as_me:3739: checking if we should install .pc files for $PKG_CONFIG" >&5

 echo $ECHO_N "checking if we should install .pc files for $PKG_CONFIG... $ECHO_C" >&6
 else
 echo $ECHO_N "checking if we should install .pc files for $PKG_CONFIG... $ECHO_C" >&6
 else

-       echo "$as_me:3717: checking if we should install .pc files" >&5
+       echo "$as_me:3742: checking if we should install .pc files" >&5

 echo $ECHO_N "checking if we should install .pc files... $ECHO_C" >&6
 fi
 
 echo $ECHO_N "checking if we should install .pc files... $ECHO_C" >&6
 fi
 


@@ -3725,7 +3750,7 @@ if test "${enable_pc_files+set}" = set; then
 else
   enable_pc_files=no
 fi;
 else
   enable_pc_files=no
 fi;

-echo "$as_me:3728: result: $enable_pc_files" >&5
+echo "$as_me:3753: result: $enable_pc_files" >&5

 echo "${ECHO_T}$enable_pc_files" >&6
 
 if test "x$enable_pc_files" != xno
 echo "${ECHO_T}$enable_pc_files" >&6
 
 if test "x$enable_pc_files" != xno


@@ -3733,7 +3758,7 @@ then
        MAKE_PC_FILES=
        case "x$PKG_CONFIG_LIBDIR" in
        (xno|xyes)
        MAKE_PC_FILES=
        case "x$PKG_CONFIG_LIBDIR" in
        (xno|xyes)

-               { echo "$as_me:3736: WARNING: no PKG_CONFIG_LIBDIR was found" >&5
+               { echo "$as_me:3761: WARNING: no PKG_CONFIG_LIBDIR was found" >&5

 echo "$as_me: WARNING: no PKG_CONFIG_LIBDIR was found" >&2;}
                ;;
        (*)
 echo "$as_me: WARNING: no PKG_CONFIG_LIBDIR was found" >&2;}
                ;;
        (*)


@@ -3763,7 +3788,7 @@ case ".$PKG_CONFIG_LIBDIR" in
        PKG_CONFIG_LIBDIR=`echo $PKG_CONFIG_LIBDIR | sed -e s%NONE%$cf_path_syntax%`
        ;;
 (*)
        PKG_CONFIG_LIBDIR=`echo $PKG_CONFIG_LIBDIR | sed -e s%NONE%$cf_path_syntax%`
        ;;
 (*)

-       { { echo "$as_me:3766: error: expected a pathname, not \"$PKG_CONFIG_LIBDIR\"" >&5
+       { { echo "$as_me:3791: error: expected a pathname, not \"$PKG_CONFIG_LIBDIR\"" >&5

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


@@ -3777,7 +3802,7 @@ fi
 
 if test -z "$MAKE_PC_FILES"
 then
 
 if test -z "$MAKE_PC_FILES"
 then

-       echo "$as_me:3780: checking for suffix to add to pc-files" >&5
+       echo "$as_me:3805: checking for suffix to add to pc-files" >&5

 echo $ECHO_N "checking for suffix to add to pc-files... $ECHO_C" >&6
 
 # Check whether --with-pc-suffix or --without-pc-suffix was given.
 echo $ECHO_N "checking for suffix to add to pc-files... $ECHO_C" >&6
 
 # Check whether --with-pc-suffix or --without-pc-suffix was given.


@@ -3792,13 +3817,13 @@ if test "${with_pc_suffix+set}" = set; then
        esac
 fi;
        test -z "$PC_MODULE_SUFFIX" && PC_MODULE_SUFFIX=none
        esac
 fi;
        test -z "$PC_MODULE_SUFFIX" && PC_MODULE_SUFFIX=none

-       echo "$as_me:3795: result: $PC_MODULE_SUFFIX" >&5
+       echo "$as_me:3820: result: $PC_MODULE_SUFFIX" >&5

 echo "${ECHO_T}$PC_MODULE_SUFFIX" >&6
        test "$PC_MODULE_SUFFIX" = none && PC_MODULE_SUFFIX=
 
 fi
 
 echo "${ECHO_T}$PC_MODULE_SUFFIX" >&6
        test "$PC_MODULE_SUFFIX" = none && PC_MODULE_SUFFIX=
 
 fi
 

-echo "$as_me:3801: checking if we should assume mixed-case filenames" >&5
+echo "$as_me:3826: 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.


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

-echo "$as_me:3811: result: $enable_mixedcase" >&5
+echo "$as_me:3836: 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:3815: checking if filesystem supports mixed-case filenames" >&5
+echo "$as_me:3840: 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


@@ -3839,7 +3864,7 @@ else
 fi
 
 fi
 fi
 
 fi

-echo "$as_me:3842: result: $cf_cv_mixedcase" >&5
+echo "$as_me:3867: result: $cf_cv_mixedcase" >&5

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


@@ -3858,7 +3883,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:3861: checking whether ${MAKE-make} sets \${MAKE}" >&5
+echo "$as_me:3886: 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


@@ -3878,11 +3903,11 @@ 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:3881: result: yes" >&5
+  echo "$as_me:3906: result: yes" >&5

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

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

 echo "${ECHO_T}no" >&6
   SET_MAKE="MAKE=${MAKE-make}"
 fi
 echo "${ECHO_T}no" >&6
   SET_MAKE="MAKE=${MAKE-make}"
 fi


@@ -3891,7 +3916,7 @@ for ac_prog in exctags ctags
 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:3894: checking for $ac_word" >&5
+echo "$as_me:3919: checking for $ac_word" >&5

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


@@ -3906,7 +3931,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_CTAGS="$ac_prog"
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_CTAGS="$ac_prog"

-echo "$as_me:3909: found $ac_dir/$ac_word" >&5
+echo "$as_me:3934: found $ac_dir/$ac_word" >&5

 break
 done
 
 break
 done
 


@@ -3914,10 +3939,10 @@ fi
 fi
 CTAGS=$ac_cv_prog_CTAGS
 if test -n "$CTAGS"; then
 fi
 CTAGS=$ac_cv_prog_CTAGS
 if test -n "$CTAGS"; then

-  echo "$as_me:3917: result: $CTAGS" >&5
+  echo "$as_me:3942: result: $CTAGS" >&5

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

-  echo "$as_me:3920: result: no" >&5
+  echo "$as_me:3945: result: no" >&5

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


@@ -3928,7 +3953,7 @@ for ac_prog in exetags etags
 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:3931: checking for $ac_word" >&5
+echo "$as_me:3956: checking for $ac_word" >&5

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


@@ -3943,7 +3968,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_ETAGS="$ac_prog"
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_ETAGS="$ac_prog"

-echo "$as_me:3946: found $ac_dir/$ac_word" >&5
+echo "$as_me:3971: found $ac_dir/$ac_word" >&5

 break
 done
 
 break
 done
 


@@ -3951,10 +3976,10 @@ fi
 fi
 ETAGS=$ac_cv_prog_ETAGS
 if test -n "$ETAGS"; then
 fi
 ETAGS=$ac_cv_prog_ETAGS
 if test -n "$ETAGS"; then

-  echo "$as_me:3954: result: $ETAGS" >&5
+  echo "$as_me:3979: result: $ETAGS" >&5

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

-  echo "$as_me:3957: result: no" >&5
+  echo "$as_me:3982: result: no" >&5

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


@@ -3963,7 +3988,7 @@ done
 
 # Extract the first word of "${CTAGS:-ctags}", so it can be a program name with args.
 set dummy ${CTAGS:-ctags}; ac_word=$2
 
 # Extract the first word of "${CTAGS:-ctags}", so it can be a program name with args.
 set dummy ${CTAGS:-ctags}; ac_word=$2

-echo "$as_me:3966: checking for $ac_word" >&5
+echo "$as_me:3991: 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


@@ -3978,7 +4003,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:3981: found $ac_dir/$ac_word" >&5
+echo "$as_me:4006: found $ac_dir/$ac_word" >&5

 break
 done
 
 break
 done
 


@@ -3987,17 +4012,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:3990: result: $MAKE_LOWER_TAGS" >&5
+  echo "$as_me:4015: result: $MAKE_LOWER_TAGS" >&5

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

-  echo "$as_me:3993: result: no" >&5
+  echo "$as_me:4018: result: no" >&5

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

-echo "$as_me:4000: checking for $ac_word" >&5
+echo "$as_me:4025: 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


@@ -4012,7 +4037,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:4015: found $ac_dir/$ac_word" >&5
+echo "$as_me:4040: found $ac_dir/$ac_word" >&5

 break
 done
 
 break
 done
 


@@ -4021,10 +4046,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:4024: result: $MAKE_UPPER_TAGS" >&5
+  echo "$as_me:4049: result: $MAKE_UPPER_TAGS" >&5

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

-  echo "$as_me:4027: result: no" >&5
+  echo "$as_me:4052: result: no" >&5

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


@@ -4044,7 +4069,7 @@ else
        MAKE_LOWER_TAGS="#"
 fi
 
        MAKE_LOWER_TAGS="#"
 fi
 

-echo "$as_me:4047: checking for makeflags variable" >&5
+echo "$as_me:4072: 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


@@ -4078,13 +4103,13 @@ CF_EOF
        rm -f cf_makeflags.tmp
 
 fi
        rm -f cf_makeflags.tmp
 
 fi

-echo "$as_me:4081: result: $cf_cv_makeflags" >&5
+echo "$as_me:4106: 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:4087: checking for $ac_word" >&5
+echo "$as_me:4112: 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


@@ -4099,7 +4124,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:4102: found $ac_dir/$ac_word" >&5
+echo "$as_me:4127: found $ac_dir/$ac_word" >&5

 break
 done
 
 break
 done
 


@@ -4107,10 +4132,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:4110: result: $RANLIB" >&5
+  echo "$as_me:4135: result: $RANLIB" >&5

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

-  echo "$as_me:4113: result: no" >&5
+  echo "$as_me:4138: result: no" >&5

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


@@ -4119,7 +4144,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:4122: checking for $ac_word" >&5
+echo "$as_me:4147: 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


@@ -4134,7 +4159,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:4137: found $ac_dir/$ac_word" >&5
+echo "$as_me:4162: found $ac_dir/$ac_word" >&5

 break
 done
 
 break
 done
 


@@ -4143,10 +4168,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:4146: result: $ac_ct_RANLIB" >&5
+  echo "$as_me:4171: result: $ac_ct_RANLIB" >&5

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

-  echo "$as_me:4149: result: no" >&5
+  echo "$as_me:4174: result: no" >&5

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


@@ -4158,7 +4183,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:4161: checking for $ac_word" >&5
+echo "$as_me:4186: 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


@@ -4173,7 +4198,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:4176: found $ac_dir/$ac_word" >&5
+echo "$as_me:4201: found $ac_dir/$ac_word" >&5

 break
 done
 
 break
 done
 


@@ -4181,10 +4206,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:4184: result: $LD" >&5
+  echo "$as_me:4209: result: $LD" >&5

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

-  echo "$as_me:4187: result: no" >&5
+  echo "$as_me:4212: result: no" >&5

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


@@ -4193,7 +4218,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:4196: checking for $ac_word" >&5
+echo "$as_me:4221: 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


@@ -4208,7 +4233,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:4211: found $ac_dir/$ac_word" >&5
+echo "$as_me:4236: found $ac_dir/$ac_word" >&5

 break
 done
 
 break
 done
 


@@ -4217,10 +4242,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:4220: result: $ac_ct_LD" >&5
+  echo "$as_me:4245: result: $ac_ct_LD" >&5

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

-  echo "$as_me:4223: result: no" >&5
+  echo "$as_me:4248: result: no" >&5

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


@@ -4232,7 +4257,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:4235: checking for $ac_word" >&5
+echo "$as_me:4260: 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


@@ -4247,7 +4272,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:4250: found $ac_dir/$ac_word" >&5
+echo "$as_me:4275: found $ac_dir/$ac_word" >&5

 break
 done
 
 break
 done
 


@@ -4255,10 +4280,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:4258: result: $AR" >&5
+  echo "$as_me:4283: result: $AR" >&5

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

-  echo "$as_me:4261: result: no" >&5
+  echo "$as_me:4286: result: no" >&5

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


@@ -4267,7 +4292,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:4270: checking for $ac_word" >&5
+echo "$as_me:4295: 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


@@ -4282,7 +4307,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:4285: found $ac_dir/$ac_word" >&5
+echo "$as_me:4310: found $ac_dir/$ac_word" >&5

 break
 done
 
 break
 done
 


@@ -4291,10 +4316,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:4294: result: $ac_ct_AR" >&5
+  echo "$as_me:4319: result: $ac_ct_AR" >&5

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

-  echo "$as_me:4297: result: no" >&5
+  echo "$as_me:4322: result: no" >&5

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


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

-echo "$as_me:4309: checking for $ac_word" >&5
+echo "$as_me:4334: checking for $ac_word" >&5

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


@@ -4321,7 +4346,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_NM="${ac_tool_prefix}nm"
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_NM="${ac_tool_prefix}nm"

-echo "$as_me:4324: found $ac_dir/$ac_word" >&5
+echo "$as_me:4349: found $ac_dir/$ac_word" >&5

 break
 done
 
 break
 done
 


@@ -4329,10 +4354,10 @@ fi
 fi
 NM=$ac_cv_prog_NM
 if test -n "$NM"; then
 fi
 NM=$ac_cv_prog_NM
 if test -n "$NM"; then

-  echo "$as_me:4332: result: $NM" >&5
+  echo "$as_me:4357: result: $NM" >&5

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

-  echo "$as_me:4335: result: no" >&5
+  echo "$as_me:4360: result: no" >&5

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


@@ -4341,7 +4366,7 @@ if test -z "$ac_cv_prog_NM"; then
   ac_ct_NM=$NM
   # Extract the first word of "nm", so it can be a program name with args.
 set dummy nm; ac_word=$2
   ac_ct_NM=$NM
   # Extract the first word of "nm", so it can be a program name with args.
 set dummy nm; ac_word=$2

-echo "$as_me:4344: checking for $ac_word" >&5
+echo "$as_me:4369: checking for $ac_word" >&5

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


@@ -4356,7 +4381,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_NM="nm"
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_ac_ct_NM="nm"

-echo "$as_me:4359: found $ac_dir/$ac_word" >&5
+echo "$as_me:4384: found $ac_dir/$ac_word" >&5

 break
 done
 
 break
 done
 


@@ -4365,10 +4390,10 @@ fi
 fi
 ac_ct_NM=$ac_cv_prog_ac_ct_NM
 if test -n "$ac_ct_NM"; then
 fi
 ac_ct_NM=$ac_cv_prog_ac_ct_NM
 if test -n "$ac_ct_NM"; then

-  echo "$as_me:4368: result: $ac_ct_NM" >&5
+  echo "$as_me:4393: result: $ac_ct_NM" >&5

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

-  echo "$as_me:4371: result: no" >&5
+  echo "$as_me:4396: result: no" >&5

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


@@ -4380,7 +4405,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:4383: checking for $ac_word" >&5
+echo "$as_me:4408: 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


@@ -4395,7 +4420,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:4398: found $ac_dir/$ac_word" >&5
+echo "$as_me:4423: found $ac_dir/$ac_word" >&5

 break
 done
 
 break
 done
 


@@ -4403,10 +4428,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:4406: result: $AR" >&5
+  echo "$as_me:4431: result: $AR" >&5

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

-  echo "$as_me:4409: result: no" >&5
+  echo "$as_me:4434: result: no" >&5

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


@@ -4415,7 +4440,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:4418: checking for $ac_word" >&5
+echo "$as_me:4443: 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


@@ -4430,7 +4455,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:4433: found $ac_dir/$ac_word" >&5
+echo "$as_me:4458: found $ac_dir/$ac_word" >&5

 break
 done
 
 break
 done
 


@@ -4439,10 +4464,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:4442: result: $ac_ct_AR" >&5
+  echo "$as_me:4467: result: $ac_ct_AR" >&5

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

-  echo "$as_me:4445: result: no" >&5
+  echo "$as_me:4470: result: no" >&5

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


@@ -4451,7 +4476,7 @@ else
   AR="$ac_cv_prog_AR"
 fi
 
   AR="$ac_cv_prog_AR"
 fi
 

-echo "$as_me:4454: checking for options to update archives" >&5
+echo "$as_me:4479: checking for options to update archives" >&5

 echo $ECHO_N "checking for options to update archives... $ECHO_C" >&6
 if test "${cf_cv_ar_flags+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 echo $ECHO_N "checking for options to update archives... $ECHO_C" >&6
 if test "${cf_cv_ar_flags+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6


@@ -4474,13 +4499,13 @@ else
                rm -f conftest.a
 
                cat >conftest.$ac_ext <<EOF
                rm -f conftest.a
 
                cat >conftest.$ac_ext <<EOF

-#line 4477 "configure"
+#line 4502 "configure"

 int    testdata[3] = { 123, 456, 789 };
 EOF
 int    testdata[3] = { 123, 456, 789 };
 EOF

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

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

-  echo "$as_me:4483: \$? = $ac_status" >&5
+  echo "$as_me:4508: \$? = $ac_status" >&5

   (exit $ac_status); } ; then
                        echo "$AR $ARFLAGS $cf_ar_flags conftest.a conftest.$ac_cv_objext" >&5
                        $AR $ARFLAGS $cf_ar_flags conftest.a conftest.$ac_cv_objext 2>&5 1>/dev/null
   (exit $ac_status); } ; then
                        echo "$AR $ARFLAGS $cf_ar_flags conftest.a conftest.$ac_cv_objext" >&5
                        $AR $ARFLAGS $cf_ar_flags conftest.a conftest.$ac_cv_objext 2>&5 1>/dev/null


@@ -4491,7 +4516,7 @@ EOF
                else
                        test -n "$verbose" && echo "    cannot compile test-program" 1>&6
 
                else
                        test -n "$verbose" && echo "    cannot compile test-program" 1>&6
 

-echo "${as_me:-configure}:4494: testing cannot compile test-program ..." 1>&5
+echo "${as_me:-configure}:4519: testing cannot compile test-program ..." 1>&5

 
                        break
                fi
 
                        break
                fi


@@ -4499,7 +4524,7 @@ echo "${as_me:-configure}:4494: testing cannot compile test-program ..." 1>&5
        rm -f conftest.a conftest.$ac_ext conftest.$ac_cv_objext
 
 fi
        rm -f conftest.a conftest.$ac_ext conftest.$ac_cv_objext
 
 fi

-echo "$as_me:4502: result: $cf_cv_ar_flags" >&5
+echo "$as_me:4527: result: $cf_cv_ar_flags" >&5

 echo "${ECHO_T}$cf_cv_ar_flags" >&6
 
 if test -n "$ARFLAGS" ; then
 echo "${ECHO_T}$cf_cv_ar_flags" >&6
 
 if test -n "$ARFLAGS" ; then


@@ -4510,7 +4535,7 @@ else
        ARFLAGS=$cf_cv_ar_flags
 fi
 
        ARFLAGS=$cf_cv_ar_flags
 fi
 

-echo "$as_me:4513: checking if you have specified an install-prefix" >&5
+echo "$as_me:4538: 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.


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

-echo "$as_me:4526: result: $DESTDIR" >&5
+echo "$as_me:4551: result: $DESTDIR" >&5

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


@@ -4551,7 +4576,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:4554: checking for $ac_word" >&5
+echo "$as_me:4579: 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


@@ -4566,7 +4591,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:4569: found $ac_dir/$ac_word" >&5
+echo "$as_me:4594: found $ac_dir/$ac_word" >&5

 break
 done
 
 break
 done
 


@@ -4574,10 +4599,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:4577: result: $BUILD_CC" >&5
+  echo "$as_me:4602: result: $BUILD_CC" >&5

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

-  echo "$as_me:4580: result: no" >&5
+  echo "$as_me:4605: result: no" >&5

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


@@ -4585,12 +4610,12 @@ fi
 done
 
 fi;
 done
 
 fi;

-       echo "$as_me:4588: checking for native build C compiler" >&5
+       echo "$as_me:4613: 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:4590: result: $BUILD_CC" >&5
+       echo "$as_me:4615: result: $BUILD_CC" >&5

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

-       echo "$as_me:4593: checking for native build C preprocessor" >&5
+       echo "$as_me:4618: 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.


@@ -4600,10 +4625,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:4603: result: $BUILD_CPP" >&5
+       echo "$as_me:4628: result: $BUILD_CPP" >&5

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

-       echo "$as_me:4606: checking for native build C flags" >&5
+       echo "$as_me:4631: 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.


@@ -4611,10 +4636,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:4614: result: $BUILD_CFLAGS" >&5
+       echo "$as_me:4639: result: $BUILD_CFLAGS" >&5

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

-       echo "$as_me:4617: checking for native build C preprocessor-flags" >&5
+       echo "$as_me:4642: 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.


@@ -4622,10 +4647,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:4625: result: $BUILD_CPPFLAGS" >&5
+       echo "$as_me:4650: result: $BUILD_CPPFLAGS" >&5

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

-       echo "$as_me:4628: checking for native build linker-flags" >&5
+       echo "$as_me:4653: 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.


@@ -4633,10 +4658,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:4636: result: $BUILD_LDFLAGS" >&5
+       echo "$as_me:4661: result: $BUILD_LDFLAGS" >&5

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

-       echo "$as_me:4639: checking for native build linker-libraries" >&5
+       echo "$as_me:4664: 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.


@@ -4644,7 +4669,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:4647: result: $BUILD_LIBS" >&5
+       echo "$as_me:4672: 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.


@@ -4654,7 +4679,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:4657: error: Cross-build requires two compilers.
+               { { echo "$as_me:4682: 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;}


@@ -4679,7 +4704,7 @@ fi
 ### shared, for example.
 cf_list_models=""
 
 ### shared, for example.
 cf_list_models=""
 

-echo "$as_me:4682: checking if libtool -version-number should be used" >&5
+echo "$as_me:4707: checking if libtool -version-number should be used" >&5

 echo $ECHO_N "checking if libtool -version-number should be used... $ECHO_C" >&6
 
 # Check whether --enable-libtool-version or --disable-libtool-version was given.
 echo $ECHO_N "checking if libtool -version-number should be used... $ECHO_C" >&6
 
 # Check whether --enable-libtool-version or --disable-libtool-version was given.


@@ -4696,7 +4721,7 @@ else
        cf_libtool_version=yes
 
 fi;
        cf_libtool_version=yes
 
 fi;

-echo "$as_me:4699: result: $cf_libtool_version" >&5
+echo "$as_me:4724: result: $cf_libtool_version" >&5

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


@@ -4705,25 +4730,25 @@ else
        LIBTOOL_VERSION="-version-info"
        case "x$VERSION" in
        (x)
        LIBTOOL_VERSION="-version-info"
        case "x$VERSION" in
        (x)

-               { echo "$as_me:4708: WARNING: VERSION was not set" >&5
+               { echo "$as_me:4733: WARNING: VERSION was not set" >&5

 echo "$as_me: WARNING: VERSION was not set" >&2;}
                ;;
        (x*.*.*)
                ABI_VERSION="$VERSION"
                test -n "$verbose" && echo "    ABI_VERSION: $ABI_VERSION" 1>&6
 
 echo "$as_me: WARNING: VERSION was not set" >&2;}
                ;;
        (x*.*.*)
                ABI_VERSION="$VERSION"
                test -n "$verbose" && echo "    ABI_VERSION: $ABI_VERSION" 1>&6
 

-echo "${as_me:-configure}:4715: testing ABI_VERSION: $ABI_VERSION ..." 1>&5
+echo "${as_me:-configure}:4740: testing ABI_VERSION: $ABI_VERSION ..." 1>&5

 
                ;;
        (x*:*:*)
                ABI_VERSION=`echo "$VERSION" | sed -e 's/:/./g'`
                test -n "$verbose" && echo "    ABI_VERSION: $ABI_VERSION" 1>&6
 
 
                ;;
        (x*:*:*)
                ABI_VERSION=`echo "$VERSION" | sed -e 's/:/./g'`
                test -n "$verbose" && echo "    ABI_VERSION: $ABI_VERSION" 1>&6
 

-echo "${as_me:-configure}:4722: testing ABI_VERSION: $ABI_VERSION ..." 1>&5
+echo "${as_me:-configure}:4747: testing ABI_VERSION: $ABI_VERSION ..." 1>&5

 
                ;;
        (*)
 
                ;;
        (*)

-               { echo "$as_me:4726: WARNING: unexpected VERSION value: $VERSION" >&5
+               { echo "$as_me:4751: WARNING: unexpected VERSION value: $VERSION" >&5

 echo "$as_me: WARNING: unexpected VERSION value: $VERSION" >&2;}
                ;;
        esac
 echo "$as_me: WARNING: unexpected VERSION value: $VERSION" >&2;}
                ;;
        esac


@@ -4745,7 +4770,7 @@ LIB_LINK='${CC}'
 LIB_INSTALL=
 LIB_UNINSTALL=
 
 LIB_INSTALL=
 LIB_UNINSTALL=
 

-echo "$as_me:4748: checking if you want to build libraries with libtool" >&5
+echo "$as_me:4773: 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.


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

-echo "$as_me:4758: result: $with_libtool" >&5
+echo "$as_me:4783: 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
 


@@ -4786,7 +4811,7 @@ case ".$with_libtool" in
        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:4789: error: expected a pathname, not \"$with_libtool\"" >&5
+       { { echo "$as_me:4814: 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; }; }
        ;;


@@ -4799,7 +4824,7 @@ esac
   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:4802: checking for $ac_word" >&5
+echo "$as_me:4827: checking for $ac_word" >&5

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


@@ -4814,7 +4839,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_LIBTOOL="$ac_tool_prefix$ac_prog"
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_LIBTOOL="$ac_tool_prefix$ac_prog"

-echo "$as_me:4817: found $ac_dir/$ac_word" >&5
+echo "$as_me:4842: found $ac_dir/$ac_word" >&5

 break
 done
 
 break
 done
 


@@ -4822,10 +4847,10 @@ fi
 fi
 LIBTOOL=$ac_cv_prog_LIBTOOL
 if test -n "$LIBTOOL"; then
 fi
 LIBTOOL=$ac_cv_prog_LIBTOOL
 if test -n "$LIBTOOL"; then

-  echo "$as_me:4825: result: $LIBTOOL" >&5
+  echo "$as_me:4850: result: $LIBTOOL" >&5

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

-  echo "$as_me:4828: result: no" >&5
+  echo "$as_me:4853: result: no" >&5

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


@@ -4838,7 +4863,7 @@ if test -z "$LIBTOOL"; 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:4841: checking for $ac_word" >&5
+echo "$as_me:4866: checking for $ac_word" >&5

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


@@ -4853,7 +4878,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_LIBTOOL="$ac_prog"
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_ac_ct_LIBTOOL="$ac_prog"

-echo "$as_me:4856: found $ac_dir/$ac_word" >&5
+echo "$as_me:4881: found $ac_dir/$ac_word" >&5

 break
 done
 
 break
 done
 


@@ -4861,10 +4886,10 @@ fi
 fi
 ac_ct_LIBTOOL=$ac_cv_prog_ac_ct_LIBTOOL
 if test -n "$ac_ct_LIBTOOL"; then
 fi
 ac_ct_LIBTOOL=$ac_cv_prog_ac_ct_LIBTOOL
 if test -n "$ac_ct_LIBTOOL"; then

-  echo "$as_me:4864: result: $ac_ct_LIBTOOL" >&5
+  echo "$as_me:4889: result: $ac_ct_LIBTOOL" >&5

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

-  echo "$as_me:4867: result: no" >&5
+  echo "$as_me:4892: result: no" >&5

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


@@ -4895,7 +4920,7 @@ unset LIBTOOL
   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:4898: checking for $ac_word" >&5
+echo "$as_me:4923: checking for $ac_word" >&5

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


@@ -4910,7 +4935,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_LIBTOOL="$ac_tool_prefix$ac_prog"
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_LIBTOOL="$ac_tool_prefix$ac_prog"

-echo "$as_me:4913: found $ac_dir/$ac_word" >&5
+echo "$as_me:4938: found $ac_dir/$ac_word" >&5

 break
 done
 
 break
 done
 


@@ -4918,10 +4943,10 @@ fi
 fi
 LIBTOOL=$ac_cv_prog_LIBTOOL
 if test -n "$LIBTOOL"; then
 fi
 LIBTOOL=$ac_cv_prog_LIBTOOL
 if test -n "$LIBTOOL"; then

-  echo "$as_me:4921: result: $LIBTOOL" >&5
+  echo "$as_me:4946: result: $LIBTOOL" >&5

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

-  echo "$as_me:4924: result: no" >&5
+  echo "$as_me:4949: result: no" >&5

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


@@ -4934,7 +4959,7 @@ if test -z "$LIBTOOL"; 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:4937: checking for $ac_word" >&5
+echo "$as_me:4962: checking for $ac_word" >&5

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


@@ -4949,7 +4974,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_LIBTOOL="$ac_prog"
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_ac_ct_LIBTOOL="$ac_prog"

-echo "$as_me:4952: found $ac_dir/$ac_word" >&5
+echo "$as_me:4977: found $ac_dir/$ac_word" >&5

 break
 done
 
 break
 done
 


@@ -4957,10 +4982,10 @@ fi
 fi
 ac_ct_LIBTOOL=$ac_cv_prog_ac_ct_LIBTOOL
 if test -n "$ac_ct_LIBTOOL"; then
 fi
 ac_ct_LIBTOOL=$ac_cv_prog_ac_ct_LIBTOOL
 if test -n "$ac_ct_LIBTOOL"; then

-  echo "$as_me:4960: result: $ac_ct_LIBTOOL" >&5
+  echo "$as_me:4985: result: $ac_ct_LIBTOOL" >&5

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

-  echo "$as_me:4963: result: no" >&5
+  echo "$as_me:4988: result: no" >&5

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


@@ -4982,7 +5007,7 @@ test -z "$cf_cv_libtool_version" && unset cf_cv_libtool_version
                fi
        fi
        if test -z "$LIBTOOL" ; then
                fi
        fi
        if test -z "$LIBTOOL" ; then

-               { { echo "$as_me:4985: error: Cannot find libtool" >&5
+               { { echo "$as_me:5010: 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


@@ -4998,7 +5023,7 @@ echo "$as_me: error: Cannot find libtool" >&2;}
 
 if test -n "$LIBTOOL" && test "$LIBTOOL" != none
 then
 
 if test -n "$LIBTOOL" && test "$LIBTOOL" != none
 then

-       echo "$as_me:5001: checking version of $LIBTOOL" >&5
+       echo "$as_me:5026: checking version of $LIBTOOL" >&5

 echo $ECHO_N "checking version of $LIBTOOL... $ECHO_C" >&6
 
 if test -n "$LIBTOOL" && test "$LIBTOOL" != none
 echo $ECHO_N "checking version of $LIBTOOL... $ECHO_C" >&6
 
 if test -n "$LIBTOOL" && test "$LIBTOOL" != none


@@ -5009,15 +5034,15 @@ else
 fi
 test -z "$cf_cv_libtool_version" && unset cf_cv_libtool_version
 
 fi
 test -z "$cf_cv_libtool_version" && unset cf_cv_libtool_version
 

-       echo "$as_me:5012: result: $cf_cv_libtool_version" >&5
+       echo "$as_me:5037: 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:5015: error: This is not GNU libtool" >&5
+               { { echo "$as_me:5040: error: This is not GNU libtool" >&5

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

-       { { echo "$as_me:5020: error: GNU libtool has not been found" >&5
+       { { echo "$as_me:5045: error: GNU libtool has not been found" >&5

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


@@ -5053,7 +5078,7 @@ cf_list_models="$cf_list_models libtool"
 
 else
 
 
 else
 

-echo "$as_me:5056: checking if you want to build shared libraries" >&5
+echo "$as_me:5081: 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.


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

-echo "$as_me:5066: result: $with_shared" >&5
+echo "$as_me:5091: result: $with_shared" >&5

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

-echo "$as_me:5070: checking if you want to build static libraries" >&5
+echo "$as_me:5095: 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.


@@ -5077,11 +5102,11 @@ if test "${with_normal+set}" = set; then
 else
   with_normal=yes
 fi;
 else
   with_normal=yes
 fi;

-echo "$as_me:5080: result: $with_normal" >&5
+echo "$as_me:5105: result: $with_normal" >&5

 echo "${ECHO_T}$with_normal" >&6
 test "x$with_normal" = "xyes" && cf_list_models="$cf_list_models normal"
 
 echo "${ECHO_T}$with_normal" >&6
 test "x$with_normal" = "xyes" && cf_list_models="$cf_list_models normal"
 

-echo "$as_me:5084: checking if you want to build debug libraries" >&5
+echo "$as_me:5109: 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.


@@ -5091,11 +5116,11 @@ if test "${with_debug+set}" = set; then
 else
   with_debug=yes
 fi;
 else
   with_debug=yes
 fi;

-echo "$as_me:5094: result: $with_debug" >&5
+echo "$as_me:5119: result: $with_debug" >&5

 echo "${ECHO_T}$with_debug" >&6
 test "x$with_debug" = "xyes" && cf_list_models="$cf_list_models debug"
 
 echo "${ECHO_T}$with_debug" >&6
 test "x$with_debug" = "xyes" && cf_list_models="$cf_list_models debug"
 

-echo "$as_me:5098: checking if you want to build profiling libraries" >&5
+echo "$as_me:5123: 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.


@@ -5105,7 +5130,7 @@ if test "${with_profile+set}" = set; then
 else
   with_profile=no
 fi;
 else
   with_profile=no
 fi;

-echo "$as_me:5108: result: $with_profile" >&5
+echo "$as_me:5133: result: $with_profile" >&5

 echo "${ECHO_T}$with_profile" >&6
 test "x$with_profile" = "xyes" && cf_list_models="$cf_list_models profile"
 
 echo "${ECHO_T}$with_profile" >&6
 test "x$with_profile" = "xyes" && cf_list_models="$cf_list_models profile"
 


@@ -5113,7 +5138,7 @@ fi
 
 if test "X$cf_with_cxx_binding" != Xno; then
 if test "x$with_shared" = "xyes"; then
 
 if test "X$cf_with_cxx_binding" != Xno; then
 if test "x$with_shared" = "xyes"; then

-echo "$as_me:5116: checking if you want to build C++ shared libraries" >&5
+echo "$as_me:5141: checking if you want to build C++ shared libraries" >&5

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


@@ -5123,26 +5148,26 @@ if test "${with_cxx_shared+set}" = set; then
 else
   with_shared_cxx=no
 fi;
 else
   with_shared_cxx=no
 fi;

-echo "$as_me:5126: result: $with_shared_cxx" >&5
+echo "$as_me:5151: result: $with_shared_cxx" >&5

 echo "${ECHO_T}$with_shared_cxx" >&6
 fi
 fi
 
 ###############################################################################
 
 echo "${ECHO_T}$with_shared_cxx" >&6
 fi
 fi
 
 ###############################################################################
 

-echo "$as_me:5133: checking for specified models" >&5
+echo "$as_me:5158: 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:5137: result: $cf_list_models" >&5
+echo "$as_me:5162: 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:5142: checking for default model" >&5
+echo "$as_me:5167: 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:5145: result: $DFT_LWR_MODEL" >&5
+echo "$as_me:5170: 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___%`


@@ -5156,7 +5181,7 @@ LIB_NAME=ncurses
 LIB_DIR=../lib
 LIB_2ND=../../lib
 
 LIB_DIR=../lib
 LIB_2ND=../../lib
 

-echo "$as_me:5159: checking if you want to have a library-prefix" >&5
+echo "$as_me:5184: checking if you want to have a library-prefix" >&5

 echo $ECHO_N "checking if you want to have a library-prefix... $ECHO_C" >&6
 
 # Check whether --with-lib-prefix or --without-lib-prefix was given.
 echo $ECHO_N "checking if you want to have a library-prefix... $ECHO_C" >&6
 
 # Check whether --with-lib-prefix or --without-lib-prefix was given.


@@ -5166,7 +5191,7 @@ if test "${with_lib_prefix+set}" = set; then
 else
   with_lib_prefix=auto
 fi;
 else
   with_lib_prefix=auto
 fi;

-echo "$as_me:5169: result: $with_lib_prefix" >&5
+echo "$as_me:5194: result: $with_lib_prefix" >&5

 echo "${ECHO_T}$with_lib_prefix" >&6
 
 if test $with_lib_prefix = auto
 echo "${ECHO_T}$with_lib_prefix" >&6
 
 if test $with_lib_prefix = auto


@@ -5194,19 +5219,19 @@ fi
 
 LIB_SUFFIX=
 
 
 LIB_SUFFIX=
 

-       echo "$as_me:5197: checking for PATH separator" >&5
+       echo "$as_me:5222: checking for PATH separator" >&5

 echo $ECHO_N "checking for PATH separator... $ECHO_C" >&6
        case $cf_cv_system_name in
        (os2*)  PATH_SEPARATOR=';'  ;;
        (*)     ${PATH_SEPARATOR:=':'}  ;;
        esac
 
 echo $ECHO_N "checking for PATH separator... $ECHO_C" >&6
        case $cf_cv_system_name in
        (os2*)  PATH_SEPARATOR=';'  ;;
        (*)     ${PATH_SEPARATOR:=':'}  ;;
        esac
 

-       echo "$as_me:5204: result: $PATH_SEPARATOR" >&5
+       echo "$as_me:5229: result: $PATH_SEPARATOR" >&5

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

-echo "$as_me:5209: checking if you want to build a separate terminfo library" >&5
+echo "$as_me:5234: 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.


@@ -5216,10 +5241,10 @@ if test "${with_termlib+set}" = set; then
 else
   with_termlib=no
 fi;
 else
   with_termlib=no
 fi;

-echo "$as_me:5219: result: $with_termlib" >&5
+echo "$as_me:5244: result: $with_termlib" >&5

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

-echo "$as_me:5222: checking if you want to build a separate tic library" >&5
+echo "$as_me:5247: 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.


@@ -5229,13 +5254,13 @@ if test "${with_ticlib+set}" = set; then
 else
   with_ticlib=no
 fi;
 else
   with_ticlib=no
 fi;

-echo "$as_me:5232: result: $with_ticlib" >&5
+echo "$as_me:5257: 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:5238: checking if you want to link with the GPM mouse library" >&5
+echo "$as_me:5263: 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.


@@ -5245,27 +5270,27 @@ if test "${with_gpm+set}" = set; then
 else
   with_gpm=maybe
 fi;
 else
   with_gpm=maybe
 fi;

-echo "$as_me:5248: result: $with_gpm" >&5
+echo "$as_me:5273: 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:5252: checking for gpm.h" >&5
+       echo "$as_me:5277: 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 5258 "configure"
+#line 5283 "configure"

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

-if { (eval echo "$as_me:5262: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:5287: \"$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:5268: \$? = $ac_status" >&5
+  echo "$as_me:5293: \$? = $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


@@ -5284,7 +5309,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
 fi
 rm -f conftest.err conftest.$ac_ext
 fi

-echo "$as_me:5287: result: $ac_cv_header_gpm_h" >&5
+echo "$as_me:5312: 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
 


@@ -5295,7 +5320,7 @@ 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}:5298: testing assuming we really have GPM library ..." 1>&5
+echo "${as_me:-configure}:5323: testing assuming we really have GPM library ..." 1>&5

 
 cat >>confdefs.h <<\EOF
 #define HAVE_LIBGPM 1
 
 cat >>confdefs.h <<\EOF
 #define HAVE_LIBGPM 1


@@ -5303,7 +5328,7 @@ EOF
 
                        with_gpm=yes
                else
 
                        with_gpm=yes
                else

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


@@ -5311,7 +5336,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 5314 "configure"
+#line 5339 "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.  */


@@ -5330,16 +5355,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:5333: \"$ac_link\"") >&5
+if { (eval echo "$as_me:5358: \"$ac_link\"") >&5

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

-  echo "$as_me:5336: \$? = $ac_status" >&5
+  echo "$as_me:5361: \$? = $ac_status" >&5

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

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

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

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


@@ -5350,18 +5375,18 @@ 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:5353: result: $ac_cv_lib_gpm_Gpm_Open" >&5
+echo "$as_me:5378: 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
   with_gpm=yes
 else
 
                                if test "$with_gpm" = maybe; then
 echo "${ECHO_T}$ac_cv_lib_gpm_Gpm_Open" >&6
 if test $ac_cv_lib_gpm_Gpm_Open = yes; then
   with_gpm=yes
 else
 
                                if test "$with_gpm" = maybe; then

-                                       { echo "$as_me:5360: WARNING: Cannot link with GPM library" >&5
+                                       { echo "$as_me:5385: WARNING: Cannot link with GPM library" >&5

 echo "$as_me: WARNING: Cannot link with GPM library" >&2;}
                                        with_gpm=no
                                else
 echo "$as_me: WARNING: Cannot link with GPM library" >&2;}
                                        with_gpm=no
                                else

-                                       { { echo "$as_me:5364: error: Cannot link with GPM library" >&5
+                                       { { echo "$as_me:5389: 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


@@ -5372,7 +5397,7 @@ fi
 
 else
 
 
 else
 

-               test "$with_gpm" != maybe && { echo "$as_me:5375: WARNING: Cannot find GPM header" >&5
+               test "$with_gpm" != maybe && { echo "$as_me:5400: 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
 


@@ -5381,7 +5406,7 @@ fi
 fi
 
 if test "$with_gpm" != no ; then
 fi
 
 if test "$with_gpm" != no ; then

-       echo "$as_me:5384: checking if you want to load GPM dynamically" >&5
+       echo "$as_me:5409: 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.


@@ -5391,18 +5416,18 @@ if test "${with_dlsym+set}" = set; then
 else
   with_dlsym=yes
 fi;
 else
   with_dlsym=yes
 fi;

-       echo "$as_me:5394: result: $with_dlsym" >&5
+       echo "$as_me:5419: result: $with_dlsym" >&5

 echo "${ECHO_T}$with_dlsym" >&6
        if test "x$with_dlsym" = xyes ; then
 
 cf_have_dlsym=no
 echo "${ECHO_T}$with_dlsym" >&6
        if test "x$with_dlsym" = xyes ; then
 
 cf_have_dlsym=no

-echo "$as_me:5399: checking for dlsym" >&5
+echo "$as_me:5424: 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 5405 "configure"
+#line 5430 "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.  */


@@ -5433,16 +5458,16 @@ f = dlsym; /* workaround for ICC 12.0.3 */ if (f == 0) return 1;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext

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

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

-  echo "$as_me:5439: \$? = $ac_status" >&5
+  echo "$as_me:5464: \$? = $ac_status" >&5

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

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

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

-  echo "$as_me:5445: \$? = $ac_status" >&5
+  echo "$as_me:5470: \$? = $ac_status" >&5

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


@@ -5452,14 +5477,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:5455: result: $ac_cv_func_dlsym" >&5
+echo "$as_me:5480: 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:5462: checking for dlsym in -ldl" >&5
+echo "$as_me:5487: 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


@@ -5467,7 +5492,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 5470 "configure"
+#line 5495 "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.  */


@@ -5486,16 +5511,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:5489: \"$ac_link\"") >&5
+if { (eval echo "$as_me:5514: \"$ac_link\"") >&5

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

-  echo "$as_me:5492: \$? = $ac_status" >&5
+  echo "$as_me:5517: \$? = $ac_status" >&5

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

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

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

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


@@ -5506,7 +5531,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:5509: result: $ac_cv_lib_dl_dlsym" >&5
+echo "$as_me:5534: 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
 


@@ -5535,10 +5560,10 @@ done
 LIBS="$cf_add_libs"
  }
 
 LIBS="$cf_add_libs"
  }
 

-       echo "$as_me:5538: checking whether able to link to dl*() functions" >&5
+       echo "$as_me:5563: 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 5541 "configure"
+#line 5566 "configure"

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


@@ -5556,16 +5581,16 @@ main (void)
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext

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

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

-  echo "$as_me:5562: \$? = $ac_status" >&5
+  echo "$as_me:5587: \$? = $ac_status" >&5

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

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

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

-  echo "$as_me:5568: \$? = $ac_status" >&5
+  echo "$as_me:5593: \$? = $ac_status" >&5

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


@@ -5576,15 +5601,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:5579: error: Cannot link test program for libdl" >&5
+               { { echo "$as_me:5604: 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:5584: result: ok" >&5
+       echo "$as_me:5609: result: ok" >&5

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

-       { { echo "$as_me:5587: error: Cannot find dlsym function" >&5
+       { { echo "$as_me:5612: 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


@@ -5592,12 +5617,12 @@ fi
                if test "x$with_gpm" != xyes ; then
                        test -n "$verbose" && echo "    assuming soname for gpm is $with_gpm" 1>&6
 
                if test "x$with_gpm" != xyes ; then
                        test -n "$verbose" && echo "    assuming soname for gpm is $with_gpm" 1>&6
 

-echo "${as_me:-configure}:5595: testing assuming soname for gpm is $with_gpm ..." 1>&5
+echo "${as_me:-configure}:5620: 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:5600: checking for soname of gpm library" >&5
+echo "$as_me:5625: 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


@@ -5631,15 +5656,15 @@ do
 done
 LIBS="$cf_add_libs"
 
 done
 LIBS="$cf_add_libs"
 

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

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

-  echo "$as_me:5637: \$? = $ac_status" >&5
+  echo "$as_me:5662: \$? = $ac_status" >&5

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

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

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

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


@@ -5650,7 +5675,7 @@ LIBS="$cf_save_LIBS"
 fi
 
 fi
 fi
 
 fi

-echo "$as_me:5653: result: $cf_cv_gpm_soname" >&5
+echo "$as_me:5678: result: $cf_cv_gpm_soname" >&5

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


@@ -5685,7 +5710,7 @@ cat >>confdefs.h <<\EOF
 #define HAVE_LIBGPM 1
 EOF
 
 #define HAVE_LIBGPM 1
 EOF
 

-echo "$as_me:5688: checking for Gpm_Wgetch in -lgpm" >&5
+echo "$as_me:5713: 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


@@ -5693,7 +5718,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 5696 "configure"
+#line 5721 "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.  */


@@ -5712,16 +5737,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:5715: \"$ac_link\"") >&5
+if { (eval echo "$as_me:5740: \"$ac_link\"") >&5

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

-  echo "$as_me:5718: \$? = $ac_status" >&5
+  echo "$as_me:5743: \$? = $ac_status" >&5

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

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

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

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


@@ -5732,11 +5757,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:5735: result: $ac_cv_lib_gpm_Gpm_Wgetch" >&5
+echo "$as_me:5760: 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:5739: checking if GPM is weakly bound to curses library" >&5
+echo "$as_me:5764: 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


@@ -5760,15 +5785,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:5763: \"$ac_compile\"") >&5
+       if { (eval echo "$as_me:5788: \"$ac_compile\"") >&5

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

-  echo "$as_me:5766: \$? = $ac_status" >&5
+  echo "$as_me:5791: \$? = $ac_status" >&5

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

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

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

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


@@ -5780,11 +5805,11 @@ CF_EOF
 fi
 
 fi
 fi
 
 fi

-echo "$as_me:5783: result: $cf_cv_check_gpm_wgetch" >&5
+echo "$as_me:5808: 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:5787: WARNING: GPM library is already linked with curses - read the FAQ" >&5
+       { echo "$as_me:5812: 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
 


@@ -5794,7 +5819,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:5797: checking if you want to use sysmouse" >&5
+echo "$as_me:5822: 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.


@@ -5806,7 +5831,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 5809 "configure"
+#line 5834 "configure"

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


@@ -5829,16 +5854,16 @@ main (void)
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

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

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

-  echo "$as_me:5835: \$? = $ac_status" >&5
+  echo "$as_me:5860: \$? = $ac_status" >&5

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

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

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

-  echo "$as_me:5841: \$? = $ac_status" >&5
+  echo "$as_me:5866: \$? = $ac_status" >&5

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


@@ -5848,7 +5873,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:5851: result: $cf_with_sysmouse" >&5
+echo "$as_me:5876: result: $cf_with_sysmouse" >&5

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


@@ -5867,7 +5892,7 @@ if test X"$CXX_G_OPT" = X"" ; then
        test -n "$GXX" && test "x${ac_cv_prog_cxx_g}" != xyes && CXX_G_OPT=''
 fi
 
        test -n "$GXX" && test "x${ac_cv_prog_cxx_g}" != xyes && CXX_G_OPT=''
 fi
 

-echo "$as_me:5870: checking for default loader flags" >&5
+echo "$as_me:5895: 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=''   ;;


@@ -5876,13 +5901,13 @@ case $DFT_LWR_MODEL in
 (profile) LD_MODEL='-pg';;
 (shared)  LD_MODEL=''   ;;
 esac
 (profile) LD_MODEL='-pg';;
 (shared)  LD_MODEL=''   ;;
 esac

-echo "$as_me:5879: result: $LD_MODEL" >&5
+echo "$as_me:5904: 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:5885: checking if rpath option should be used" >&5
+echo "$as_me:5910: 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.


@@ -5892,10 +5917,10 @@ if test "${enable_rpath+set}" = set; then
 else
   cf_cv_enable_rpath=no
 fi;
 else
   cf_cv_enable_rpath=no
 fi;

-echo "$as_me:5895: result: $cf_cv_enable_rpath" >&5
+echo "$as_me:5920: result: $cf_cv_enable_rpath" >&5

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

-echo "$as_me:5898: checking if shared libraries should be relinked during install" >&5
+echo "$as_me:5923: 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.


@@ -5905,7 +5930,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:5908: result: $cf_cv_do_relink" >&5
+echo "$as_me:5933: result: $cf_cv_do_relink" >&5

 echo "${ECHO_T}$cf_cv_do_relink" >&6
        ;;
 esac
 echo "${ECHO_T}$cf_cv_do_relink" >&6
        ;;
 esac


@@ -5914,7 +5939,7 @@ esac
 rel_builddir=..
 
 LD_RPATH_OPT=
 rel_builddir=..
 
 LD_RPATH_OPT=

-echo "$as_me:5917: checking for an rpath option" >&5
+echo "$as_me:5942: checking for an rpath option" >&5

 echo $ECHO_N "checking for an rpath option... $ECHO_C" >&6
 case $cf_cv_system_name in
 (irix*)
 echo $ECHO_N "checking for an rpath option... $ECHO_C" >&6
 case $cf_cv_system_name in
 (irix*)


@@ -5945,12 +5970,12 @@ case $cf_cv_system_name in
 (*)
        ;;
 esac
 (*)
        ;;
 esac

-echo "$as_me:5948: result: $LD_RPATH_OPT" >&5
+echo "$as_me:5973: result: $LD_RPATH_OPT" >&5

 echo "${ECHO_T}$LD_RPATH_OPT" >&6
 
 case "x$LD_RPATH_OPT" in
 (x-R*)
 echo "${ECHO_T}$LD_RPATH_OPT" >&6
 
 case "x$LD_RPATH_OPT" in
 (x-R*)

-       echo "$as_me:5953: checking if we need a space after rpath option" >&5
+       echo "$as_me:5978: checking if we need a space after rpath option" >&5

 echo $ECHO_N "checking if we need a space after rpath option... $ECHO_C" >&6
        cf_save_LIBS="$LIBS"
 
 echo $ECHO_N "checking if we need a space after rpath option... $ECHO_C" >&6
        cf_save_LIBS="$LIBS"
 


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

-#line 5974 "configure"
+#line 5999 "configure"

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


@@ -5983,16 +6008,16 @@ main (void)
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext

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

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

-  echo "$as_me:5989: \$? = $ac_status" >&5
+  echo "$as_me:6014: \$? = $ac_status" >&5

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

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

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

-  echo "$as_me:5995: \$? = $ac_status" >&5
+  echo "$as_me:6020: \$? = $ac_status" >&5

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


@@ -6002,7 +6027,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:6005: result: $cf_rpath_space" >&5
+       echo "$as_me:6030: result: $cf_rpath_space" >&5

 echo "${ECHO_T}$cf_rpath_space" >&6
        test "$cf_rpath_space" = yes && LD_RPATH_OPT="$LD_RPATH_OPT "
        ;;
 echo "${ECHO_T}$cf_rpath_space" >&6
        test "$cf_rpath_space" = yes && LD_RPATH_OPT="$LD_RPATH_OPT "
        ;;


@@ -6023,7 +6048,7 @@ esac
        cf_ld_rpath_opt=
        test "$cf_cv_enable_rpath" = yes && cf_ld_rpath_opt="$LD_RPATH_OPT"
 
        cf_ld_rpath_opt=
        test "$cf_cv_enable_rpath" = yes && cf_ld_rpath_opt="$LD_RPATH_OPT"
 

-       echo "$as_me:6026: checking if release/abi version should be used for shared libs" >&5
+       echo "$as_me:6051: 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.


@@ -6038,9 +6063,9 @@ if test "${with_shlib_version+set}" = set; then
                cf_cv_shlib_version=$withval
                ;;
        (*)
                cf_cv_shlib_version=$withval
                ;;
        (*)

-               echo "$as_me:6041: result: $withval" >&5
+               echo "$as_me:6066: result: $withval" >&5

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

-               { { echo "$as_me:6043: error: option value must be one of: rel, abi, or auto" >&5
+               { { echo "$as_me:6068: error: option value must be one of: rel, abi, or auto" >&5

 echo "$as_me: error: option value must be one of: rel, abi, or auto" >&2;}
    { (exit 1); exit 1; }; }
                ;;
 echo "$as_me: error: option value must be one of: rel, abi, or auto" >&2;}
    { (exit 1); exit 1; }; }
                ;;


@@ -6049,7 +6074,7 @@ echo "$as_me: error: option value must be one of: rel, abi, or auto" >&2;}
 else
   cf_cv_shlib_version=auto
 fi;
 else
   cf_cv_shlib_version=auto
 fi;

-       echo "$as_me:6052: result: $cf_cv_shlib_version" >&5
+       echo "$as_me:6077: 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


@@ -6072,14 +6097,14 @@ echo "${ECHO_T}$cf_cv_shlib_version" >&6
 
        if test "$cf_try_fPIC" = yes
        then
 
        if test "$cf_try_fPIC" = yes
        then

-               echo "$as_me:6075: checking which $CC option to use" >&5
+               echo "$as_me:6100: 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 6082 "configure"
+#line 6107 "configure"

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


@@ -6091,16 +6116,16 @@ int x = 1
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

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

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

-  echo "$as_me:6097: \$? = $ac_status" >&5
+  echo "$as_me:6122: \$? = $ac_status" >&5

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

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

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

-  echo "$as_me:6103: \$? = $ac_status" >&5
+  echo "$as_me:6128: \$? = $ac_status" >&5

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


@@ -6109,7 +6134,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:6112: result: $CC_SHARED_OPTS" >&5
+               echo "$as_me:6137: 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


@@ -6180,7 +6205,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:6183: checking if ld -search_paths_first works" >&5
+               echo "$as_me:6208: 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


@@ -6189,7 +6214,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 6192 "configure"
+#line 6217 "configure"

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


@@ -6201,16 +6226,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:6204: \"$ac_link\"") >&5
+if { (eval echo "$as_me:6229: \"$ac_link\"") >&5

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

-  echo "$as_me:6207: \$? = $ac_status" >&5
+  echo "$as_me:6232: \$? = $ac_status" >&5

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

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

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

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


@@ -6221,7 +6246,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:6224: result: $cf_cv_ldflags_search_paths_first" >&5
+echo "$as_me:6249: 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"


@@ -6446,7 +6471,7 @@ CF_EOF
                        do
                                CFLAGS="$cf_shared_opts $cf_save_CFLAGS"
                                cat >conftest.$ac_ext <<_ACEOF
                        do
                                CFLAGS="$cf_shared_opts $cf_save_CFLAGS"
                                cat >conftest.$ac_ext <<_ACEOF

-#line 6449 "configure"
+#line 6474 "configure"

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


@@ -6458,16 +6483,16 @@ printf("Hello\n");
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

-if { (eval echo "$as_me:6461: \"$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:6464: \$? = $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:6467: \"$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:6470: \$? = $ac_status" >&5
+  echo "$as_me:6495: \$? = $ac_status" >&5

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


@@ -6504,7 +6529,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
                        test "$cf_cv_do_symlinks" = no && cf_cv_do_symlinks=yes
                        ;;
                (*)
                        test "$cf_cv_do_symlinks" = no && cf_cv_do_symlinks=yes
                        ;;
                (*)

-                       { echo "$as_me:6507: WARNING: ignored --with-shlib-version" >&5
+                       { echo "$as_me:6532: 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


@@ -6514,7 +6539,7 @@ echo "$as_me: WARNING: ignored --with-shlib-version" >&2;}
        if test -n "$cf_try_cflags"
        then
 cat > conftest.$ac_ext <<EOF
        if test -n "$cf_try_cflags"
        then
 cat > conftest.$ac_ext <<EOF

-#line 6517 "${as_me:-configure}"
+#line 6542 "${as_me:-configure}"

 #include <stdio.h>
 int main(int argc, char *argv[])
 {
 #include <stdio.h>
 int main(int argc, char *argv[])
 {


@@ -6526,18 +6551,18 @@ EOF
                for cf_opt in $cf_try_cflags
                do
                        CFLAGS="$cf_save_CFLAGS -$cf_opt"
                for cf_opt in $cf_try_cflags
                do
                        CFLAGS="$cf_save_CFLAGS -$cf_opt"

-                       echo "$as_me:6529: checking if CFLAGS option -$cf_opt works" >&5
+                       echo "$as_me:6554: checking if CFLAGS option -$cf_opt works" >&5

 echo $ECHO_N "checking if CFLAGS option -$cf_opt works... $ECHO_C" >&6
 echo $ECHO_N "checking if CFLAGS option -$cf_opt works... $ECHO_C" >&6

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

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

-  echo "$as_me:6534: \$? = $ac_status" >&5
+  echo "$as_me:6559: \$? = $ac_status" >&5

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

-                               echo "$as_me:6536: result: yes" >&5
+                               echo "$as_me:6561: result: yes" >&5

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

-                               echo "$as_me:6540: result: no" >&5
+                               echo "$as_me:6565: result: no" >&5

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


@@ -6552,17 +6577,17 @@ echo "${ECHO_T}no" >&6
 
        test -n "$verbose" && echo "    CC_SHARED_OPTS: $CC_SHARED_OPTS" 1>&6
 
 
        test -n "$verbose" && echo "    CC_SHARED_OPTS: $CC_SHARED_OPTS" 1>&6
 

-echo "${as_me:-configure}:6555: testing CC_SHARED_OPTS: $CC_SHARED_OPTS ..." 1>&5
+echo "${as_me:-configure}:6580: testing CC_SHARED_OPTS: $CC_SHARED_OPTS ..." 1>&5

 
        test -n "$verbose" && echo "    MK_SHARED_LIB:  $MK_SHARED_LIB" 1>&6
 
 
        test -n "$verbose" && echo "    MK_SHARED_LIB:  $MK_SHARED_LIB" 1>&6
 

-echo "${as_me:-configure}:6559: testing MK_SHARED_LIB:  $MK_SHARED_LIB ..." 1>&5
+echo "${as_me:-configure}:6584: testing MK_SHARED_LIB:  $MK_SHARED_LIB ..." 1>&5

 
 for model in $cf_list_models; do
        case $model in
        (libtool)
 
 
 for model in $cf_list_models; do
        case $model in
        (libtool)
 

-echo "$as_me:6565: checking for additional libtool options" >&5
+echo "$as_me:6590: checking for additional libtool options" >&5

 echo $ECHO_N "checking for additional libtool options... $ECHO_C" >&6
 
 # Check whether --with-libtool-opts or --without-libtool-opts was given.
 echo $ECHO_N "checking for additional libtool options... $ECHO_C" >&6
 
 # Check whether --with-libtool-opts or --without-libtool-opts was given.


@@ -6572,7 +6597,7 @@ if test "${with_libtool_opts+set}" = set; then
 else
   with_libtool_opts=no
 fi;
 else
   with_libtool_opts=no
 fi;

-echo "$as_me:6575: result: $with_libtool_opts" >&5
+echo "$as_me:6600: result: $with_libtool_opts" >&5

 echo "${ECHO_T}$with_libtool_opts" >&6
 
 case .$with_libtool_opts in
 echo "${ECHO_T}$with_libtool_opts" >&6
 
 case .$with_libtool_opts in


@@ -6583,7 +6608,7 @@ case .$with_libtool_opts in
        ;;
 esac
 
        ;;
 esac
 

-echo "$as_me:6586: checking if exported-symbols file should be used" >&5
+echo "$as_me:6611: checking if exported-symbols file should be used" >&5

 echo $ECHO_N "checking if exported-symbols file should be used... $ECHO_C" >&6
 
 # Check whether --with-export-syms or --without-export-syms was given.
 echo $ECHO_N "checking if exported-symbols file should be used... $ECHO_C" >&6
 
 # Check whether --with-export-syms or --without-export-syms was given.


@@ -6598,7 +6623,7 @@ then
        with_export_syms='${top_srcdir}/package/${PACKAGE}.sym'
 
 fi
        with_export_syms='${top_srcdir}/package/${PACKAGE}.sym'
 
 fi

-echo "$as_me:6601: result: $with_export_syms" >&5
+echo "$as_me:6626: result: $with_export_syms" >&5

 echo "${ECHO_T}$with_export_syms" >&6
 if test "x$with_export_syms" != xno
 then
 echo "${ECHO_T}$with_export_syms" >&6
 if test "x$with_export_syms" != xno
 then


@@ -6609,15 +6634,15 @@ fi
                ;;
        (shared)
                if test "$CC_SHARED_OPTS" = "unknown"; then
                ;;
        (shared)
                if test "$CC_SHARED_OPTS" = "unknown"; then

-                       { { echo "$as_me:6612: error: Shared libraries are not supported in this version" >&5
+                       { { echo "$as_me:6637: 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
                # workaround for inept transition to PIE vs PIC...
 echo "$as_me: error: Shared libraries are not supported in this version" >&2;}
    { (exit 1); exit 1; }; }
                fi
                # workaround for inept transition to PIE vs PIC...

-               echo "$as_me:6617: checking if current CFLAGS link properly" >&5
+               echo "$as_me:6642: checking if current CFLAGS link properly" >&5

 echo $ECHO_N "checking if current CFLAGS link properly... $ECHO_C" >&6
                cat >conftest.$ac_ext <<_ACEOF
 echo $ECHO_N "checking if current CFLAGS link properly... $ECHO_C" >&6
                cat >conftest.$ac_ext <<_ACEOF

-#line 6620 "configure"
+#line 6645 "configure"

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


@@ -6629,16 +6654,16 @@ printf("Hello work\n");
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext

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

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

-  echo "$as_me:6635: \$? = $ac_status" >&5
+  echo "$as_me:6660: \$? = $ac_status" >&5

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

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

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

-  echo "$as_me:6641: \$? = $ac_status" >&5
+  echo "$as_me:6666: \$? = $ac_status" >&5

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


@@ -6647,18 +6672,18 @@ cat conftest.$ac_ext >&5
 cf_cflags_work=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 cf_cflags_work=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext

-               echo "$as_me:6650: result: $cf_cflags_work" >&5
+               echo "$as_me:6675: result: $cf_cflags_work" >&5

 echo "${ECHO_T}$cf_cflags_work" >&6
                if test "$cf_cflags_work" = no
                then
                        test -n "$verbose" && echo "    try to work around by appending shared-options" 1>&6
 
 echo "${ECHO_T}$cf_cflags_work" >&6
                if test "$cf_cflags_work" = no
                then
                        test -n "$verbose" && echo "    try to work around by appending shared-options" 1>&6
 

-echo "${as_me:-configure}:6656: testing try to work around by appending shared-options ..." 1>&5
+echo "${as_me:-configure}:6681: testing try to work around by appending shared-options ..." 1>&5

 
                        CFLAGS="$CFLAGS $CC_SHARED_OPTS"
                fi
 
 
                        CFLAGS="$CFLAGS $CC_SHARED_OPTS"
                fi
 

-echo "$as_me:6661: checking if versioned-symbols file should be used" >&5
+echo "$as_me:6686: checking if versioned-symbols file should be used" >&5

 echo $ECHO_N "checking if versioned-symbols file should be used... $ECHO_C" >&6
 
 # Check whether --with-versioned-syms or --without-versioned-syms was given.
 echo $ECHO_N "checking if versioned-symbols file should be used... $ECHO_C" >&6
 
 # Check whether --with-versioned-syms or --without-versioned-syms was given.


@@ -6673,7 +6698,7 @@ then
        with_versioned_syms='${top_srcdir}/package/${PACKAGE}.map'
 
 fi
        with_versioned_syms='${top_srcdir}/package/${PACKAGE}.map'
 
 fi

-echo "$as_me:6676: result: $with_versioned_syms" >&5
+echo "$as_me:6701: result: $with_versioned_syms" >&5

 echo "${ECHO_T}$with_versioned_syms" >&6
 
 RESULTING_SYMS=
 echo "${ECHO_T}$with_versioned_syms" >&6
 
 RESULTING_SYMS=


@@ -6689,7 +6714,7 @@ then
                MK_SHARED_LIB=`echo "$MK_SHARED_LIB" | sed -e "s%-Wl,%\\${VERSIONED_SYMS} -Wl,%"`
                test -n "$verbose" && echo "    MK_SHARED_LIB:  $MK_SHARED_LIB" 1>&6
 
                MK_SHARED_LIB=`echo "$MK_SHARED_LIB" | sed -e "s%-Wl,%\\${VERSIONED_SYMS} -Wl,%"`
                test -n "$verbose" && echo "    MK_SHARED_LIB:  $MK_SHARED_LIB" 1>&6
 

-echo "${as_me:-configure}:6692: testing MK_SHARED_LIB:  $MK_SHARED_LIB ..." 1>&5
+echo "${as_me:-configure}:6717: testing MK_SHARED_LIB:  $MK_SHARED_LIB ..." 1>&5

 
                ;;
        (*-dy\ *)
 
                ;;
        (*-dy\ *)


@@ -6697,11 +6722,11 @@ echo "${as_me:-configure}:6692: testing MK_SHARED_LIB:  $MK_SHARED_LIB ..." 1>&5
                MK_SHARED_LIB=`echo "$MK_SHARED_LIB" | sed -e "s%-dy%\\${VERSIONED_SYMS} -dy%"`
                test -n "$verbose" && echo "    MK_SHARED_LIB:  $MK_SHARED_LIB" 1>&6
 
                MK_SHARED_LIB=`echo "$MK_SHARED_LIB" | sed -e "s%-dy%\\${VERSIONED_SYMS} -dy%"`
                test -n "$verbose" && echo "    MK_SHARED_LIB:  $MK_SHARED_LIB" 1>&6
 

-echo "${as_me:-configure}:6700: testing MK_SHARED_LIB:  $MK_SHARED_LIB ..." 1>&5
+echo "${as_me:-configure}:6725: testing MK_SHARED_LIB:  $MK_SHARED_LIB ..." 1>&5

 
                ;;
        (*)
 
                ;;
        (*)

-               { echo "$as_me:6704: WARNING: this system does not support versioned-symbols" >&5
+               { echo "$as_me:6729: WARNING: this system does not support versioned-symbols" >&5

 echo "$as_me: WARNING: this system does not support versioned-symbols" >&2;}
                ;;
        esac
 echo "$as_me: WARNING: this system does not support versioned-symbols" >&2;}
                ;;
        esac


@@ -6713,7 +6738,7 @@ echo "$as_me: WARNING: this system does not support versioned-symbols" >&2;}
        # symbols.
        if test "x$VERSIONED_SYMS" != "x"
        then
        # symbols.
        if test "x$VERSIONED_SYMS" != "x"
        then

-               echo "$as_me:6716: checking if wildcards can be used to selectively omit symbols" >&5
+               echo "$as_me:6741: checking if wildcards can be used to selectively omit symbols" >&5

 echo $ECHO_N "checking if wildcards can be used to selectively omit symbols... $ECHO_C" >&6
                WILDCARD_SYMS=no
 
 echo $ECHO_N "checking if wildcards can be used to selectively omit symbols... $ECHO_C" >&6
                WILDCARD_SYMS=no
 


@@ -6750,7 +6775,7 @@ local:
 } submodule_1.0;
 EOF
                cat >conftest.$ac_ext <<EOF
 } submodule_1.0;
 EOF
                cat >conftest.$ac_ext <<EOF

-#line 6753 "configure"
+#line 6778 "configure"

 int    _ismissing(void) { return 1; }
 int    _localf1(void) { return 1; }
 int    _localf2(void) { return 2; }
 int    _ismissing(void) { return 1; }
 int    _localf1(void) { return 1; }
 int    _localf2(void) { return 2; }


@@ -6781,7 +6806,7 @@ EOF
                        cf_missing=`nm -P conftest.so 2>&5 |fgrep _ismissing | egrep '[         ][DT][  ]'`
                        test -n "$cf_missing" && WILDCARD_SYMS=yes
                fi
                        cf_missing=`nm -P conftest.so 2>&5 |fgrep _ismissing | egrep '[         ][DT][  ]'`
                        test -n "$cf_missing" && WILDCARD_SYMS=yes
                fi

-               echo "$as_me:6784: result: $WILDCARD_SYMS" >&5
+               echo "$as_me:6809: result: $WILDCARD_SYMS" >&5

 echo "${ECHO_T}$WILDCARD_SYMS" >&6
                rm -f conftest.*
        fi
 echo "${ECHO_T}$WILDCARD_SYMS" >&6
                rm -f conftest.*
        fi


@@ -6792,7 +6817,7 @@ fi
 done
 
 # pretend that ncurses==ncursesw==ncursest
 done
 
 # pretend that ncurses==ncursesw==ncursest

-echo "$as_me:6795: checking if you want to disable library suffixes" >&5
+echo "$as_me:6820: checking if you want to disable library suffixes" >&5

 echo $ECHO_N "checking if you want to disable library suffixes... $ECHO_C" >&6
 
 # Check whether --enable-lib-suffixes or --disable-lib-suffixes was given.
 echo $ECHO_N "checking if you want to disable library suffixes... $ECHO_C" >&6
 
 # Check whether --enable-lib-suffixes or --disable-lib-suffixes was given.


@@ -6809,13 +6834,13 @@ else
        disable_lib_suffixes=no
 
 fi;
        disable_lib_suffixes=no
 
 fi;

-echo "$as_me:6812: result: $disable_lib_suffixes" >&5
+echo "$as_me:6837: result: $disable_lib_suffixes" >&5

 echo "${ECHO_T}$disable_lib_suffixes" >&6
 
 ### If we're building with rpath, try to link non-standard libs that way too.
 if test "$DFT_LWR_MODEL" = "shared"; then
 
 echo "${ECHO_T}$disable_lib_suffixes" >&6
 
 ### If we're building with rpath, try to link non-standard libs that way too.
 if test "$DFT_LWR_MODEL" = "shared"; then
 

-echo "$as_me:6818: checking if rpath-hack should be disabled" >&5
+echo "$as_me:6843: checking if rpath-hack should be disabled" >&5

 echo $ECHO_N "checking if rpath-hack should be disabled... $ECHO_C" >&6
 
 # Check whether --enable-rpath-hack or --disable-rpath-hack was given.
 echo $ECHO_N "checking if rpath-hack should be disabled... $ECHO_C" >&6
 
 # Check whether --enable-rpath-hack or --disable-rpath-hack was given.


@@ -6832,21 +6857,21 @@ else
        cf_disable_rpath_hack=no
 
 fi;
        cf_disable_rpath_hack=no
 
 fi;

-echo "$as_me:6835: result: $cf_disable_rpath_hack" >&5
+echo "$as_me:6860: result: $cf_disable_rpath_hack" >&5

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

-echo "$as_me:6839: checking for updated LDFLAGS" >&5
+echo "$as_me:6864: checking for updated LDFLAGS" >&5

 echo $ECHO_N "checking for updated LDFLAGS... $ECHO_C" >&6
 if test -n "$LD_RPATH_OPT" ; then
 echo $ECHO_N "checking for updated LDFLAGS... $ECHO_C" >&6
 if test -n "$LD_RPATH_OPT" ; then

-       echo "$as_me:6842: result: maybe" >&5
+       echo "$as_me:6867: result: maybe" >&5

 echo "${ECHO_T}maybe" >&6
 
        for ac_prog in ldd
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
 echo "${ECHO_T}maybe" >&6
 
        for ac_prog in ldd
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2

-echo "$as_me:6849: checking for $ac_word" >&5
+echo "$as_me:6874: checking for $ac_word" >&5

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


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

-echo "$as_me:6864: found $ac_dir/$ac_word" >&5
+echo "$as_me:6889: found $ac_dir/$ac_word" >&5

 break
 done
 
 break
 done
 


@@ -6869,10 +6894,10 @@ fi
 fi
 cf_ldd_prog=$ac_cv_prog_cf_ldd_prog
 if test -n "$cf_ldd_prog"; then
 fi
 cf_ldd_prog=$ac_cv_prog_cf_ldd_prog
 if test -n "$cf_ldd_prog"; then

-  echo "$as_me:6872: result: $cf_ldd_prog" >&5
+  echo "$as_me:6897: result: $cf_ldd_prog" >&5

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

-  echo "$as_me:6875: result: no" >&5
+  echo "$as_me:6900: result: no" >&5

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


@@ -6886,7 +6911,7 @@ test -n "$cf_ldd_prog" || cf_ldd_prog="no"
                cf_rpath_oops=
 
 cat >conftest.$ac_ext <<_ACEOF
                cf_rpath_oops=
 
 cat >conftest.$ac_ext <<_ACEOF

-#line 6889 "configure"
+#line 6914 "configure"

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


@@ -6898,16 +6923,16 @@ printf("Hello");
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext

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

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

-  echo "$as_me:6904: \$? = $ac_status" >&5
+  echo "$as_me:6929: \$? = $ac_status" >&5

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

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

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

-  echo "$as_me:6910: \$? = $ac_status" >&5
+  echo "$as_me:6935: \$? = $ac_status" >&5

   (exit $ac_status); }; }; then
   cf_rpath_oops=`$cf_ldd_prog conftest$ac_exeext | fgrep ' not found' | sed -e 's% =>.*$%%' |sort | uniq`
                 cf_rpath_list=`$cf_ldd_prog conftest$ac_exeext | fgrep / | sed -e 's%^.*[      ]/%/%' -e 's%/[^/][^/]*$%%' |sort | uniq`
   (exit $ac_status); }; }; then
   cf_rpath_oops=`$cf_ldd_prog conftest$ac_exeext | fgrep ' not found' | sed -e 's% =>.*$%%' |sort | uniq`
                 cf_rpath_list=`$cf_ldd_prog conftest$ac_exeext | fgrep / | sed -e 's%^.*[      ]/%/%' -e 's%/[^/][^/]*$%%' |sort | uniq`


@@ -6935,7 +6960,7 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
                                        then
                                                test -n "$verbose" && echo "    ...adding -L$cf_rpath_dir/lib to LDFLAGS for $cf_rpath_src" 1>&6
 
                                        then
                                                test -n "$verbose" && echo "    ...adding -L$cf_rpath_dir/lib to LDFLAGS for $cf_rpath_src" 1>&6
 

-echo "${as_me:-configure}:6938: testing ...adding -L$cf_rpath_dir/lib to LDFLAGS for $cf_rpath_src ..." 1>&5
+echo "${as_me:-configure}:6963: testing ...adding -L$cf_rpath_dir/lib to LDFLAGS for $cf_rpath_src ..." 1>&5

 
                                                LDFLAGS="$LDFLAGS -L$cf_rpath_dir/lib"
                                                break
 
                                                LDFLAGS="$LDFLAGS -L$cf_rpath_dir/lib"
                                                break


@@ -6947,11 +6972,11 @@ echo "${as_me:-configure}:6938: testing ...adding -L$cf_rpath_dir/lib to LDFLAGS
 
        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}:6950: testing ...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
+echo "${as_me:-configure}:6975: testing ...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5

 
 test -n "$verbose" && echo "   ...checking LDFLAGS $LDFLAGS" 1>&6
 
 
 test -n "$verbose" && echo "   ...checking LDFLAGS $LDFLAGS" 1>&6
 

-echo "${as_me:-configure}:6954: testing ...checking LDFLAGS $LDFLAGS ..." 1>&5
+echo "${as_me:-configure}:6979: testing ...checking LDFLAGS $LDFLAGS ..." 1>&5

 
 cf_rpath_dst=
 for cf_rpath_src in $LDFLAGS
 
 cf_rpath_dst=
 for cf_rpath_src in $LDFLAGS


@@ -6988,7 +7013,7 @@ do
                        then
                                test -n "$verbose" && echo "    ...Filter $cf_rpath_src ->$cf_rpath_tmp" 1>&6
 
                        then
                                test -n "$verbose" && echo "    ...Filter $cf_rpath_src ->$cf_rpath_tmp" 1>&6
 

-echo "${as_me:-configure}:6991: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
+echo "${as_me:-configure}:7016: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5

 
                                EXTRA_LDFLAGS="$cf_rpath_tmp $EXTRA_LDFLAGS"
                        fi
 
                                EXTRA_LDFLAGS="$cf_rpath_tmp $EXTRA_LDFLAGS"
                        fi


@@ -7001,11 +7026,11 @@ LDFLAGS=$cf_rpath_dst
 
 test -n "$verbose" && echo "   ...checked LDFLAGS $LDFLAGS" 1>&6
 
 
 test -n "$verbose" && echo "   ...checked LDFLAGS $LDFLAGS" 1>&6
 

-echo "${as_me:-configure}:7004: testing ...checked LDFLAGS $LDFLAGS ..." 1>&5
+echo "${as_me:-configure}:7029: testing ...checked LDFLAGS $LDFLAGS ..." 1>&5

 
 test -n "$verbose" && echo "   ...checking LIBS $LIBS" 1>&6
 
 
 test -n "$verbose" && echo "   ...checking LIBS $LIBS" 1>&6
 

-echo "${as_me:-configure}:7008: testing ...checking LIBS $LIBS ..." 1>&5
+echo "${as_me:-configure}:7033: testing ...checking LIBS $LIBS ..." 1>&5

 
 cf_rpath_dst=
 for cf_rpath_src in $LIBS
 
 cf_rpath_dst=
 for cf_rpath_src in $LIBS


@@ -7042,7 +7067,7 @@ do
                        then
                                test -n "$verbose" && echo "    ...Filter $cf_rpath_src ->$cf_rpath_tmp" 1>&6
 
                        then
                                test -n "$verbose" && echo "    ...Filter $cf_rpath_src ->$cf_rpath_tmp" 1>&6
 

-echo "${as_me:-configure}:7045: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
+echo "${as_me:-configure}:7070: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5

 
                                EXTRA_LDFLAGS="$cf_rpath_tmp $EXTRA_LDFLAGS"
                        fi
 
                                EXTRA_LDFLAGS="$cf_rpath_tmp $EXTRA_LDFLAGS"
                        fi


@@ -7055,14 +7080,14 @@ LIBS=$cf_rpath_dst
 
 test -n "$verbose" && echo "   ...checked LIBS $LIBS" 1>&6
 
 
 test -n "$verbose" && echo "   ...checked LIBS $LIBS" 1>&6
 

-echo "${as_me:-configure}:7058: testing ...checked LIBS $LIBS ..." 1>&5
+echo "${as_me:-configure}:7083: testing ...checked LIBS $LIBS ..." 1>&5

 
        test -n "$verbose" && echo "    ...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS" 1>&6
 
 
        test -n "$verbose" && echo "    ...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS" 1>&6
 

-echo "${as_me:-configure}:7062: testing ...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
+echo "${as_me:-configure}:7087: testing ...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5

 
 else
 
 else

-       echo "$as_me:7065: result: no" >&5
+       echo "$as_me:7090: result: no" >&5

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


@@ -7073,7 +7098,7 @@ fi
 ###############################################################################
 
 ###    use option --with-extra-suffix to append suffix to headers and libraries
 ###############################################################################
 
 ###    use option --with-extra-suffix to append suffix to headers and libraries

-echo "$as_me:7076: checking if you wish to append extra suffix to header/library paths" >&5
+echo "$as_me:7101: checking if you wish to append extra suffix to header/library paths" >&5

 echo $ECHO_N "checking if you wish to append extra suffix to header/library paths... $ECHO_C" >&6
 EXTRA_SUFFIX=
 
 echo $ECHO_N "checking if you wish to append extra suffix to header/library paths... $ECHO_C" >&6
 EXTRA_SUFFIX=
 


@@ -7092,11 +7117,11 @@ if test "${with_extra_suffix+set}" = set; then
        esac
 
 fi;
        esac
 
 fi;

-echo "$as_me:7095: result: $EXTRA_SUFFIX" >&5
+echo "$as_me:7120: result: $EXTRA_SUFFIX" >&5

 echo "${ECHO_T}$EXTRA_SUFFIX" >&6
 
 ###    use option --disable-overwrite to leave out the link to -lcurses
 echo "${ECHO_T}$EXTRA_SUFFIX" >&6
 
 ###    use option --disable-overwrite to leave out the link to -lcurses

-echo "$as_me:7099: checking if you wish to install ncurses overwriting curses" >&5
+echo "$as_me:7124: 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.


@@ -7106,10 +7131,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:7109: result: $with_overwrite" >&5
+echo "$as_me:7134: result: $with_overwrite" >&5

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

-echo "$as_me:7112: checking if external terminfo-database is used" >&5
+echo "$as_me:7137: 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.


@@ -7119,7 +7144,7 @@ if test "${enable_database+set}" = set; then
 else
   use_database=yes
 fi;
 else
   use_database=yes
 fi;

-echo "$as_me:7122: result: $use_database" >&5
+echo "$as_me:7147: result: $use_database" >&5

 echo "${ECHO_T}$use_database" >&6
 
 case $host_os in
 echo "${ECHO_T}$use_database" >&6
 
 case $host_os in


@@ -7135,7 +7160,7 @@ NCURSES_USE_DATABASE=0
 if test "$use_database" != no ; then
        NCURSES_USE_DATABASE=1
 
 if test "$use_database" != no ; then
        NCURSES_USE_DATABASE=1
 

-       echo "$as_me:7138: checking which terminfo source-file will be installed" >&5
+       echo "$as_me:7163: checking which terminfo source-file will be installed" >&5

 echo $ECHO_N "checking which terminfo source-file will be installed... $ECHO_C" >&6
 
 # Check whether --with-database or --without-database was given.
 echo $ECHO_N "checking which terminfo source-file will be installed... $ECHO_C" >&6
 
 # Check whether --with-database or --without-database was given.


@@ -7143,10 +7168,10 @@ if test "${with_database+set}" = set; then
   withval="$with_database"
   TERMINFO_SRC=$withval
 fi;
   withval="$with_database"
   TERMINFO_SRC=$withval
 fi;

-       echo "$as_me:7146: result: $TERMINFO_SRC" >&5
+       echo "$as_me:7171: result: $TERMINFO_SRC" >&5

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

-       echo "$as_me:7149: checking whether to use hashed database instead of directory/tree" >&5
+       echo "$as_me:7174: 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.


@@ -7156,13 +7181,13 @@ if test "${with_hashed_db+set}" = set; then
 else
   with_hashed_db=no
 fi;
 else
   with_hashed_db=no
 fi;

-       echo "$as_me:7159: result: $with_hashed_db" >&5
+       echo "$as_me:7184: result: $with_hashed_db" >&5

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

-echo "$as_me:7165: checking for list of fallback descriptions" >&5
+echo "$as_me:7190: 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.


@@ -7172,11 +7197,11 @@ if test "${with_fallbacks+set}" = set; then
 else
   with_fallback=
 fi;
 else
   with_fallback=
 fi;

-echo "$as_me:7175: result: $with_fallback" >&5
+echo "$as_me:7200: result: $with_fallback" >&5

 echo "${ECHO_T}$with_fallback" >&6
 FALLBACK_LIST=`test "$with_fallback" != no && echo "$with_fallback" | sed -e 's/,/ /g'`
 
 echo "${ECHO_T}$with_fallback" >&6
 FALLBACK_LIST=`test "$with_fallback" != no && echo "$with_fallback" | sed -e 's/,/ /g'`
 

-echo "$as_me:7179: checking if you want modern xterm or antique" >&5
+echo "$as_me:7204: 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.


@@ -7190,11 +7215,11 @@ 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:7193: result: $with_xterm_new" >&5
+echo "$as_me:7218: 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
 

-echo "$as_me:7197: checking if xterm backspace sends BS or DEL" >&5
+echo "$as_me:7222: checking if xterm backspace sends BS or DEL" >&5

 echo $ECHO_N "checking if xterm backspace sends BS or DEL... $ECHO_C" >&6
 
 # Check whether --with-xterm-kbs or --without-xterm-kbs was given.
 echo $ECHO_N "checking if xterm backspace sends BS or DEL... $ECHO_C" >&6
 
 # Check whether --with-xterm-kbs or --without-xterm-kbs was given.


@@ -7215,7 +7240,7 @@ case x$with_xterm_kbs in
        with_xterm_kbs=$withval
        ;;
 esac
        with_xterm_kbs=$withval
        ;;
 esac

-echo "$as_me:7218: result: $with_xterm_kbs" >&5
+echo "$as_me:7243: result: $with_xterm_kbs" >&5

 echo "${ECHO_T}$with_xterm_kbs" >&6
 XTERM_KBS=$with_xterm_kbs
 
 echo "${ECHO_T}$with_xterm_kbs" >&6
 XTERM_KBS=$with_xterm_kbs
 


@@ -7225,7 +7250,7 @@ if test "$use_database" = no ; then
        MAKE_TERMINFO="#"
 else
 
        MAKE_TERMINFO="#"
 else
 

-echo "$as_me:7228: checking for list of terminfo directories" >&5
+echo "$as_me:7253: 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.


@@ -7265,7 +7290,7 @@ case ".$cf_src_path" in
        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:7268: error: expected a pathname, not \"$cf_src_path\"" >&5
+       { { echo "$as_me:7293: 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; }; }
        ;;


@@ -7288,14 +7313,14 @@ case "x$cf_dst_eval" in
        ;;
 esac
 
        ;;
 esac
 

-echo "$as_me:7291: result: $TERMINFO_DIRS" >&5
+echo "$as_me:7316: 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:7298: checking for default terminfo directory" >&5
+echo "$as_me:7323: 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.


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

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


@@ -7340,7 +7365,7 @@ esac
 fi
 eval TERMINFO="$withval"
 
 fi
 eval TERMINFO="$withval"
 

-echo "$as_me:7343: result: $TERMINFO" >&5
+echo "$as_me:7368: result: $TERMINFO" >&5

 echo "${ECHO_T}$TERMINFO" >&6
 
 cat >>confdefs.h <<EOF
 echo "${ECHO_T}$TERMINFO" >&6
 
 cat >>confdefs.h <<EOF


@@ -7351,7 +7376,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:7354: checking if big-core option selected" >&5
+echo "$as_me:7379: 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.


@@ -7363,7 +7388,7 @@ else
   with_big_core=no
 else
   cat >conftest.$ac_ext <<_ACEOF
   with_big_core=no
 else
   cat >conftest.$ac_ext <<_ACEOF

-#line 7366 "configure"
+#line 7391 "configure"

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


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

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

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

-  echo "$as_me:7383: \$? = $ac_status" >&5
+  echo "$as_me:7408: \$? = $ac_status" >&5

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

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

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

-  echo "$as_me:7388: \$? = $ac_status" >&5
+  echo "$as_me:7413: \$? = $ac_status" >&5

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


@@ -7397,7 +7422,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:7400: result: $with_big_core" >&5
+echo "$as_me:7425: result: $with_big_core" >&5

 echo "${ECHO_T}$with_big_core" >&6
 test "x$with_big_core" = "xyes" &&
 cat >>confdefs.h <<\EOF
 echo "${ECHO_T}$with_big_core" >&6
 test "x$with_big_core" = "xyes" &&
 cat >>confdefs.h <<\EOF


@@ -7407,7 +7432,7 @@ EOF
 ### ISO C only guarantees 512-char strings, we have tables which load faster
 ### when constructed using "big" strings.  More than the C compiler, the awk
 ### program is a limit on most vendor UNIX systems.  Check that we can build.
 ### ISO C only guarantees 512-char strings, we have tables which load faster
 ### when constructed using "big" strings.  More than the C compiler, the awk
 ### program is a limit on most vendor UNIX systems.  Check that we can build.

-echo "$as_me:7410: checking if big-strings option selected" >&5
+echo "$as_me:7435: 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.


@@ -7431,14 +7456,14 @@ else
        esac
 
 fi;
        esac
 
 fi;

-echo "$as_me:7434: result: $with_big_strings" >&5
+echo "$as_me:7459: result: $with_big_strings" >&5

 echo "${ECHO_T}$with_big_strings" >&6
 
 USE_BIG_STRINGS=0
 test "x$with_big_strings" = "xyes" && USE_BIG_STRINGS=1
 
 ###    use option --enable-termcap to compile in the termcap fallback support
 echo "${ECHO_T}$with_big_strings" >&6
 
 USE_BIG_STRINGS=0
 test "x$with_big_strings" = "xyes" && USE_BIG_STRINGS=1
 
 ###    use option --enable-termcap to compile in the termcap fallback support

-echo "$as_me:7441: checking if you want termcap-fallback support" >&5
+echo "$as_me:7466: 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.


@@ -7448,14 +7473,14 @@ if test "${enable_termcap+set}" = set; then
 else
   with_termcap=no
 fi;
 else
   with_termcap=no
 fi;

-echo "$as_me:7451: result: $with_termcap" >&5
+echo "$as_me:7476: result: $with_termcap" >&5

 echo "${ECHO_T}$with_termcap" >&6
 
 NCURSES_USE_TERMCAP=0
 if test "x$with_termcap" != "xyes" ; then
        if test "$use_database" = no ; then
                if test -z "$with_fallback" ; then
 echo "${ECHO_T}$with_termcap" >&6
 
 NCURSES_USE_TERMCAP=0
 if test "x$with_termcap" != "xyes" ; then
        if test "$use_database" = no ; then
                if test -z "$with_fallback" ; then

-                       { { echo "$as_me:7458: error: You have disabled the database w/o specifying fallbacks" >&5
+                       { { echo "$as_me:7483: 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


@@ -7468,13 +7493,13 @@ EOF
 else
 
        if test "$with_ticlib" != no ; then
 else
 
        if test "$with_ticlib" != no ; then

-               { { echo "$as_me:7471: error: Options --with-ticlib and --enable-termcap cannot be combined" >&5
+               { { echo "$as_me:7496: error: Options --with-ticlib and --enable-termcap cannot be combined" >&5

 echo "$as_me: error: Options --with-ticlib and --enable-termcap cannot be combined" >&2;}
    { (exit 1); exit 1; }; }
        fi
 
        NCURSES_USE_TERMCAP=1
 echo "$as_me: error: Options --with-ticlib and --enable-termcap cannot be combined" >&2;}
    { (exit 1); exit 1; }; }
        fi
 
        NCURSES_USE_TERMCAP=1

-       echo "$as_me:7477: checking for list of termcap files" >&5
+       echo "$as_me:7502: 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.


@@ -7514,7 +7539,7 @@ case ".$cf_src_path" in
        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:7517: error: expected a pathname, not \"$cf_src_path\"" >&5
+       { { echo "$as_me:7542: 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; }; }
        ;;


@@ -7537,7 +7562,7 @@ case "x$cf_dst_eval" in
        ;;
 esac
 
        ;;
 esac
 

-       echo "$as_me:7540: result: $TERMPATH" >&5
+       echo "$as_me:7565: result: $TERMPATH" >&5

 echo "${ECHO_T}$TERMPATH" >&6
        test -n "$TERMPATH" &&
 cat >>confdefs.h <<EOF
 echo "${ECHO_T}$TERMPATH" >&6
        test -n "$TERMPATH" &&
 cat >>confdefs.h <<EOF


@@ -7545,7 +7570,7 @@ cat >>confdefs.h <<EOF
 EOF
 
        ###     use option --enable-getcap to use a hacked getcap for reading termcaps
 EOF
 
        ###     use option --enable-getcap to use a hacked getcap for reading termcaps

-       echo "$as_me:7548: checking if fast termcap-loader is needed" >&5
+       echo "$as_me:7573: 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.


@@ -7555,14 +7580,14 @@ if test "${enable_getcap+set}" = set; then
 else
   with_getcap=no
 fi;
 else
   with_getcap=no
 fi;

-       echo "$as_me:7558: result: $with_getcap" >&5
+       echo "$as_me:7583: result: $with_getcap" >&5

 echo "${ECHO_T}$with_getcap" >&6
        test "x$with_getcap" = "xyes" &&
 cat >>confdefs.h <<\EOF
 #define USE_GETCAP 1
 EOF
 
 echo "${ECHO_T}$with_getcap" >&6
        test "x$with_getcap" = "xyes" &&
 cat >>confdefs.h <<\EOF
 #define USE_GETCAP 1
 EOF
 

-       echo "$as_me:7565: checking if translated termcaps will be cached in ~/.terminfo" >&5
+       echo "$as_me:7590: 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.


@@ -7572,7 +7597,7 @@ if test "${enable_getcap_cache+set}" = set; then
 else
   with_getcap_cache=no
 fi;
 else
   with_getcap_cache=no
 fi;

-       echo "$as_me:7575: result: $with_getcap_cache" >&5
+       echo "$as_me:7600: result: $with_getcap_cache" >&5

 echo "${ECHO_T}$with_getcap_cache" >&6
        test "x$with_getcap_cache" = "xyes" &&
 cat >>confdefs.h <<\EOF
 echo "${ECHO_T}$with_getcap_cache" >&6
        test "x$with_getcap_cache" = "xyes" &&
 cat >>confdefs.h <<\EOF


@@ -7582,7 +7607,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:7585: checking if ~/.terminfo is wanted" >&5
+echo "$as_me:7610: 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.


@@ -7592,14 +7617,14 @@ if test "${enable_home_terminfo+set}" = set; then
 else
   with_home_terminfo=yes
 fi;
 else
   with_home_terminfo=yes
 fi;

-echo "$as_me:7595: result: $with_home_terminfo" >&5
+echo "$as_me:7620: result: $with_home_terminfo" >&5

 echo "${ECHO_T}$with_home_terminfo" >&6
 test "x$with_home_terminfo" = "xyes" &&
 cat >>confdefs.h <<\EOF
 #define USE_HOME_TERMINFO 1
 EOF
 
 echo "${ECHO_T}$with_home_terminfo" >&6
 test "x$with_home_terminfo" = "xyes" &&
 cat >>confdefs.h <<\EOF
 #define USE_HOME_TERMINFO 1
 EOF
 

-echo "$as_me:7602: checking if you want to use restricted environment when running as root" >&5
+echo "$as_me:7627: 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.


@@ -7609,7 +7634,7 @@ if test "${enable_root_environ+set}" = set; then
 else
   with_root_environ=yes
 fi;
 else
   with_root_environ=yes
 fi;

-echo "$as_me:7612: result: $with_root_environ" >&5
+echo "$as_me:7637: result: $with_root_environ" >&5

 echo "${ECHO_T}$with_root_environ" >&6
 test "x$with_root_environ" = xyes &&
 cat >>confdefs.h <<\EOF
 echo "${ECHO_T}$with_root_environ" >&6
 test "x$with_root_environ" = xyes &&
 cat >>confdefs.h <<\EOF


@@ -7624,23 +7649,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:7627: checking for $ac_header" >&5
+echo "$as_me:7652: 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 7633 "configure"
+#line 7658 "configure"

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

-if { (eval echo "$as_me:7637: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:7662: \"$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:7643: \$? = $ac_status" >&5
+  echo "$as_me:7668: \$? = $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


@@ -7659,7 +7684,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
 fi
 rm -f conftest.err conftest.$ac_ext
 fi

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


@@ -7674,13 +7699,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:7677: checking for $ac_func" >&5
+echo "$as_me:7702: 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 7683 "configure"
+#line 7708 "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.  */


@@ -7711,16 +7736,16 @@ f = $ac_func; /* workaround for ICC 12.0.3 */ if (f == 0) return 1;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext

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

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

-  echo "$as_me:7717: \$? = $ac_status" >&5
+  echo "$as_me:7742: \$? = $ac_status" >&5

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

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

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

-  echo "$as_me:7723: \$? = $ac_status" >&5
+  echo "$as_me:7748: \$? = $ac_status" >&5

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


@@ -7730,7 +7755,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:7733: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "$as_me:7758: 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


@@ -7747,13 +7772,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:7750: checking for $ac_func" >&5
+echo "$as_me:7775: 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 7756 "configure"
+#line 7781 "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.  */


@@ -7784,16 +7809,16 @@ f = $ac_func; /* workaround for ICC 12.0.3 */ if (f == 0) return 1;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext

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

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

-  echo "$as_me:7790: \$? = $ac_status" >&5
+  echo "$as_me:7815: \$? = $ac_status" >&5

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

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

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

-  echo "$as_me:7796: \$? = $ac_status" >&5
+  echo "$as_me:7821: \$? = $ac_status" >&5

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


@@ -7803,7 +7828,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:7806: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "$as_me:7831: 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


@@ -7814,7 +7839,7 @@ fi
 done
 
 else
 done
 
 else

-       echo "$as_me:7817: checking if link/symlink functions work" >&5
+       echo "$as_me:7842: 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


@@ -7827,7 +7852,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 7830 "configure"
+#line 7855 "configure"

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


@@ -7857,15 +7882,15 @@ int main(void)
 
 _ACEOF
 rm -f conftest$ac_exeext
 
 _ACEOF
 rm -f conftest$ac_exeext

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

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

-  echo "$as_me:7863: \$? = $ac_status" >&5
+  echo "$as_me:7888: \$? = $ac_status" >&5

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

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

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

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


@@ -7883,7 +7908,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:7886: result: $cf_cv_link_funcs" >&5
+echo "$as_me:7911: result: $cf_cv_link_funcs" >&5

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


@@ -7903,7 +7928,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 "x$ac_cv_func_symlink" = xyes ; 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 "x$ac_cv_func_symlink" = xyes ; then

-       echo "$as_me:7906: checking if tic should use symbolic links" >&5
+       echo "$as_me:7931: 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.


@@ -7913,21 +7938,21 @@ if test "${enable_symlinks+set}" = set; then
 else
   with_symlinks=no
 fi;
 else
   with_symlinks=no
 fi;

-       echo "$as_me:7916: result: $with_symlinks" >&5
+       echo "$as_me:7941: 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:7923: checking if tic should use hard links" >&5
+       echo "$as_me:7948: checking if tic should use hard links" >&5

 echo $ECHO_N "checking if tic should use hard links... $ECHO_C" >&6
        if test "x$ac_cv_func_link" = xyes ; then
                with_links=yes
        else
                with_links=no
        fi
 echo $ECHO_N "checking if tic should use hard links... $ECHO_C" >&6
        if test "x$ac_cv_func_link" = xyes ; then
                with_links=yes
        else
                with_links=no
        fi

-       echo "$as_me:7930: result: $with_links" >&5
+       echo "$as_me:7955: result: $with_links" >&5

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


@@ -7942,7 +7967,7 @@ 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:7945: checking if you want broken-linker support code" >&5
+echo "$as_me:7970: 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.


@@ -7952,7 +7977,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:7955: result: $with_broken_linker" >&5
+echo "$as_me:7980: 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


@@ -7974,14 +7999,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}:7977: testing cygwin linker is broken anyway ..." 1>&5
+echo "${as_me:-configure}:8002: 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:7984: checking if tputs should process BSD-style prefix padding" >&5
+echo "$as_me:8009: 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.


@@ -7991,7 +8016,7 @@ if test "${enable_bsdpad+set}" = set; then
 else
   with_bsdpad=no
 fi;
 else
   with_bsdpad=no
 fi;

-echo "$as_me:7994: result: $with_bsdpad" >&5
+echo "$as_me:8019: result: $with_bsdpad" >&5

 echo "${ECHO_T}$with_bsdpad" >&6
 test "x$with_bsdpad" = xyes &&
 cat >>confdefs.h <<\EOF
 echo "${ECHO_T}$with_bsdpad" >&6
 test "x$with_bsdpad" = xyes &&
 cat >>confdefs.h <<\EOF


@@ -8048,14 +8073,14 @@ case $host_os in
        ;;
 (linux*|uclinux*|gnu*|mint*|k*bsd*-gnu|cygwin)
 
        ;;
 (linux*|uclinux*|gnu*|mint*|k*bsd*-gnu|cygwin)
 

-echo "$as_me:8051: checking if we must define _GNU_SOURCE" >&5
+echo "$as_me:8076: 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 8058 "configure"
+#line 8083 "configure"

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


@@ -8070,16 +8095,16 @@ make an error
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

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

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

-  echo "$as_me:8076: \$? = $ac_status" >&5
+  echo "$as_me:8101: \$? = $ac_status" >&5

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

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

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

-  echo "$as_me:8082: \$? = $ac_status" >&5
+  echo "$as_me:8107: \$? = $ac_status" >&5

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


@@ -8088,7 +8113,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 8091 "configure"
+#line 8116 "configure"

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


@@ -8103,16 +8128,16 @@ make an error
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

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

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

-  echo "$as_me:8109: \$? = $ac_status" >&5
+  echo "$as_me:8134: \$? = $ac_status" >&5

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

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

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

-  echo "$as_me:8115: \$? = $ac_status" >&5
+  echo "$as_me:8140: \$? = $ac_status" >&5

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


@@ -8127,12 +8152,12 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi

-echo "$as_me:8130: result: $cf_cv_gnu_source" >&5
+echo "$as_me:8155: result: $cf_cv_gnu_source" >&5

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

-echo "$as_me:8135: checking if we should also define _DEFAULT_SOURCE" >&5
+echo "$as_me:8160: checking if we should also define _DEFAULT_SOURCE" >&5

 echo $ECHO_N "checking if we should also define _DEFAULT_SOURCE... $ECHO_C" >&6
 if test "${cf_cv_default_source+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 echo $ECHO_N "checking if we should also define _DEFAULT_SOURCE... $ECHO_C" >&6
 if test "${cf_cv_default_source+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6


@@ -8140,7 +8165,7 @@ else
 
 CPPFLAGS="$CPPFLAGS -D_GNU_SOURCE"
        cat >conftest.$ac_ext <<_ACEOF
 
 CPPFLAGS="$CPPFLAGS -D_GNU_SOURCE"
        cat >conftest.$ac_ext <<_ACEOF

-#line 8143 "configure"
+#line 8168 "configure"

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


@@ -8155,16 +8180,16 @@ make an error
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

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

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

-  echo "$as_me:8161: \$? = $ac_status" >&5
+  echo "$as_me:8186: \$? = $ac_status" >&5

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

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

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

-  echo "$as_me:8167: \$? = $ac_status" >&5
+  echo "$as_me:8192: \$? = $ac_status" >&5

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


@@ -8175,7 +8200,7 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi

-echo "$as_me:8178: result: $cf_cv_default_source" >&5
+echo "$as_me:8203: result: $cf_cv_default_source" >&5

 echo "${ECHO_T}$cf_cv_default_source" >&6
 test "$cf_cv_default_source" = yes && CPPFLAGS="$CPPFLAGS -D_DEFAULT_SOURCE"
 fi
 echo "${ECHO_T}$cf_cv_default_source" >&6
 test "$cf_cv_default_source" = yes && CPPFLAGS="$CPPFLAGS -D_DEFAULT_SOURCE"
 fi


@@ -8201,16 +8226,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:8204: checking if we should define _POSIX_C_SOURCE" >&5
+echo "$as_me:8229: 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}:8210: testing if the symbol is already defined go no further ..." 1>&5
+echo "${as_me:-configure}:8235: testing if the symbol is already defined go no further ..." 1>&5

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

-#line 8213 "configure"
+#line 8238 "configure"

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


@@ -8225,16 +8250,16 @@ make an error
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

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

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

-  echo "$as_me:8231: \$? = $ac_status" >&5
+  echo "$as_me:8256: \$? = $ac_status" >&5

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

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

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

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


@@ -8255,7 +8280,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 8258 "configure"
+#line 8283 "configure"

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


@@ -8270,16 +8295,16 @@ make an error
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

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

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

-  echo "$as_me:8276: \$? = $ac_status" >&5
+  echo "$as_me:8301: \$? = $ac_status" >&5

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

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

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

-  echo "$as_me:8282: \$? = $ac_status" >&5
+  echo "$as_me:8307: \$? = $ac_status" >&5

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


@@ -8290,15 +8315,15 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
         fi
 
 rm -f conftest.$ac_objext conftest.$ac_ext
         fi
 

-echo "${as_me:-configure}:8293: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
+echo "${as_me:-configure}:8318: 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}:8298: testing if the second compile does not leave our definition intact error ..." 1>&5
+echo "${as_me:-configure}:8323: 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 8301 "configure"
+#line 8326 "configure"

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


@@ -8313,16 +8338,16 @@ make an error
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

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

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

-  echo "$as_me:8319: \$? = $ac_status" >&5
+  echo "$as_me:8344: \$? = $ac_status" >&5

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

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

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

-  echo "$as_me:8325: \$? = $ac_status" >&5
+  echo "$as_me:8350: \$? = $ac_status" >&5

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


@@ -8338,7 +8363,7 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi

-echo "$as_me:8341: result: $cf_cv_posix_c_source" >&5
+echo "$as_me:8366: 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


@@ -8476,14 +8501,14 @@ fi
        ;;
 (*)
 
        ;;
 (*)
 

-echo "$as_me:8479: checking if we should define _XOPEN_SOURCE" >&5
+echo "$as_me:8504: 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 8486 "configure"
+#line 8511 "configure"

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


@@ -8502,16 +8527,16 @@ make an error
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

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

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

-  echo "$as_me:8508: \$? = $ac_status" >&5
+  echo "$as_me:8533: \$? = $ac_status" >&5

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

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

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

-  echo "$as_me:8514: \$? = $ac_status" >&5
+  echo "$as_me:8539: \$? = $ac_status" >&5

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


@@ -8520,7 +8545,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 8523 "configure"
+#line 8548 "configure"

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


@@ -8539,16 +8564,16 @@ make an error
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

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

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

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

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

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

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

-  echo "$as_me:8551: \$? = $ac_status" >&5
+  echo "$as_me:8576: \$? = $ac_status" >&5

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


@@ -8563,7 +8588,7 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi

-echo "$as_me:8566: result: $cf_cv_xopen_source" >&5
+echo "$as_me:8591: 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


@@ -8691,16 +8716,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:8694: checking if we should define _POSIX_C_SOURCE" >&5
+echo "$as_me:8719: 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}:8700: testing if the symbol is already defined go no further ..." 1>&5
+echo "${as_me:-configure}:8725: testing if the symbol is already defined go no further ..." 1>&5

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

-#line 8703 "configure"
+#line 8728 "configure"

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


@@ -8715,16 +8740,16 @@ make an error
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

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

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

-  echo "$as_me:8721: \$? = $ac_status" >&5
+  echo "$as_me:8746: \$? = $ac_status" >&5

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

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

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

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


@@ -8745,7 +8770,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 8748 "configure"
+#line 8773 "configure"

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


@@ -8760,16 +8785,16 @@ make an error
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

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

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

-  echo "$as_me:8766: \$? = $ac_status" >&5
+  echo "$as_me:8791: \$? = $ac_status" >&5

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

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

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

-  echo "$as_me:8772: \$? = $ac_status" >&5
+  echo "$as_me:8797: \$? = $ac_status" >&5

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


@@ -8780,15 +8805,15 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
         fi
 
 rm -f conftest.$ac_objext conftest.$ac_ext
         fi
 

-echo "${as_me:-configure}:8783: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
+echo "${as_me:-configure}:8808: 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}:8788: testing if the second compile does not leave our definition intact error ..." 1>&5
+echo "${as_me:-configure}:8813: 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 8791 "configure"
+#line 8816 "configure"

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


@@ -8803,16 +8828,16 @@ make an error
 }
 _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:8831: \"$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:8834: \$? = $ac_status" >&5

   (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:8837: \"$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:8840: \$? = $ac_status" >&5

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


@@ -8828,7 +8853,7 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi

-echo "$as_me:8831: result: $cf_cv_posix_c_source" >&5
+echo "$as_me:8856: 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


@@ -9020,7 +9045,7 @@ done
 if test -n "$cf_new_cflags" ; then
        test -n "$verbose" && echo "    add to \$CFLAGS $cf_new_cflags" 1>&6
 
 if test -n "$cf_new_cflags" ; then
        test -n "$verbose" && echo "    add to \$CFLAGS $cf_new_cflags" 1>&6
 

-echo "${as_me:-configure}:9023: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
+echo "${as_me:-configure}:9048: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5

 
        test -n "$CFLAGS" && CFLAGS="$CFLAGS "
        CFLAGS="${CFLAGS}$cf_new_cflags"
 
        test -n "$CFLAGS" && CFLAGS="$CFLAGS "
        CFLAGS="${CFLAGS}$cf_new_cflags"


@@ -9030,7 +9055,7 @@ fi
 if test -n "$cf_new_cppflags" ; then
        test -n "$verbose" && echo "    add to \$CPPFLAGS $cf_new_cppflags" 1>&6
 
 if test -n "$cf_new_cppflags" ; then
        test -n "$verbose" && echo "    add to \$CPPFLAGS $cf_new_cppflags" 1>&6
 

-echo "${as_me:-configure}:9033: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
+echo "${as_me:-configure}:9058: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5

 
        test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
        CPPFLAGS="${CPPFLAGS}$cf_new_cppflags"
 
        test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
        CPPFLAGS="${CPPFLAGS}$cf_new_cppflags"


@@ -9040,7 +9065,7 @@ fi
 if test -n "$cf_new_extra_cppflags" ; then
        test -n "$verbose" && echo "    add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags" 1>&6
 
 if test -n "$cf_new_extra_cppflags" ; then
        test -n "$verbose" && echo "    add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags" 1>&6
 

-echo "${as_me:-configure}:9043: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5
+echo "${as_me:-configure}:9068: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5

 
        test -n "$EXTRA_CPPFLAGS" && EXTRA_CPPFLAGS="$EXTRA_CPPFLAGS "
        EXTRA_CPPFLAGS="${EXTRA_CPPFLAGS}$cf_new_extra_cppflags"
 
        test -n "$EXTRA_CPPFLAGS" && EXTRA_CPPFLAGS="$EXTRA_CPPFLAGS "
        EXTRA_CPPFLAGS="${EXTRA_CPPFLAGS}$cf_new_extra_cppflags"


@@ -9050,10 +9075,10 @@ fi
 fi
 
 if test -n "$cf_XOPEN_SOURCE" && test -z "$cf_cv_xopen_source" ; then
 fi
 
 if test -n "$cf_XOPEN_SOURCE" && test -z "$cf_cv_xopen_source" ; then

-       echo "$as_me:9053: checking if _XOPEN_SOURCE really is set" >&5
+       echo "$as_me:9078: checking if _XOPEN_SOURCE really is set" >&5

 echo $ECHO_N "checking if _XOPEN_SOURCE really is set... $ECHO_C" >&6
        cat >conftest.$ac_ext <<_ACEOF
 echo $ECHO_N "checking if _XOPEN_SOURCE really is set... $ECHO_C" >&6
        cat >conftest.$ac_ext <<_ACEOF

-#line 9056 "configure"
+#line 9081 "configure"

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


@@ -9068,16 +9093,16 @@ make an error
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

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

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

-  echo "$as_me:9074: \$? = $ac_status" >&5
+  echo "$as_me:9099: \$? = $ac_status" >&5

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

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

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

-  echo "$as_me:9080: \$? = $ac_status" >&5
+  echo "$as_me:9105: \$? = $ac_status" >&5

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


@@ -9086,12 +9111,12 @@ cat conftest.$ac_ext >&5
 cf_XOPEN_SOURCE_set=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 cf_XOPEN_SOURCE_set=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext

-       echo "$as_me:9089: result: $cf_XOPEN_SOURCE_set" >&5
+       echo "$as_me:9114: result: $cf_XOPEN_SOURCE_set" >&5

 echo "${ECHO_T}$cf_XOPEN_SOURCE_set" >&6
        if test $cf_XOPEN_SOURCE_set = yes
        then
                cat >conftest.$ac_ext <<_ACEOF
 echo "${ECHO_T}$cf_XOPEN_SOURCE_set" >&6
        if test $cf_XOPEN_SOURCE_set = yes
        then
                cat >conftest.$ac_ext <<_ACEOF

-#line 9094 "configure"
+#line 9119 "configure"

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


@@ -9106,16 +9131,16 @@ make an error
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

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

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

-  echo "$as_me:9112: \$? = $ac_status" >&5
+  echo "$as_me:9137: \$? = $ac_status" >&5

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

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

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

-  echo "$as_me:9118: \$? = $ac_status" >&5
+  echo "$as_me:9143: \$? = $ac_status" >&5

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


@@ -9126,19 +9151,19 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
                if test $cf_XOPEN_SOURCE_set_ok = no
                then
 rm -f conftest.$ac_objext conftest.$ac_ext
                if test $cf_XOPEN_SOURCE_set_ok = no
                then

-                       { echo "$as_me:9129: WARNING: _XOPEN_SOURCE is lower than requested" >&5
+                       { echo "$as_me:9154: WARNING: _XOPEN_SOURCE is lower than requested" >&5

 echo "$as_me: WARNING: _XOPEN_SOURCE is lower than requested" >&2;}
                fi
        else
 
 echo "$as_me: WARNING: _XOPEN_SOURCE is lower than requested" >&2;}
                fi
        else
 

-echo "$as_me:9134: checking if we should define _XOPEN_SOURCE" >&5
+echo "$as_me:9159: 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 9141 "configure"
+#line 9166 "configure"

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


@@ -9157,16 +9182,16 @@ make an error
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

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

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

-  echo "$as_me:9163: \$? = $ac_status" >&5
+  echo "$as_me:9188: \$? = $ac_status" >&5

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

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

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

-  echo "$as_me:9169: \$? = $ac_status" >&5
+  echo "$as_me:9194: \$? = $ac_status" >&5

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


@@ -9175,7 +9200,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 9178 "configure"
+#line 9203 "configure"

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


@@ -9194,16 +9219,16 @@ make an error
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

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

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

-  echo "$as_me:9200: \$? = $ac_status" >&5
+  echo "$as_me:9225: \$? = $ac_status" >&5

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

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

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

-  echo "$as_me:9206: \$? = $ac_status" >&5
+  echo "$as_me:9231: \$? = $ac_status" >&5

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


@@ -9218,7 +9243,7 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi

-echo "$as_me:9221: result: $cf_cv_xopen_source" >&5
+echo "$as_me:9246: 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


@@ -9340,14 +9365,14 @@ CPPFLAGS_after_XOPEN="$CPPFLAGS"
 
 # Work around breakage on OS X
 
 
 # Work around breakage on OS X
 

-echo "$as_me:9343: checking if SIGWINCH is defined" >&5
+echo "$as_me:9368: 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 9350 "configure"
+#line 9375 "configure"

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


@@ -9362,23 +9387,23 @@ int x = SIGWINCH
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

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

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

-  echo "$as_me:9368: \$? = $ac_status" >&5
+  echo "$as_me:9393: \$? = $ac_status" >&5

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

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

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

-  echo "$as_me:9374: \$? = $ac_status" >&5
+  echo "$as_me:9399: \$? = $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 9381 "configure"
+#line 9406 "configure"

 #include "confdefs.h"
 
 #undef _XOPEN_SOURCE
 #include "confdefs.h"
 
 #undef _XOPEN_SOURCE


@@ -9396,16 +9421,16 @@ int x = SIGWINCH
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

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

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

-  echo "$as_me:9402: \$? = $ac_status" >&5
+  echo "$as_me:9427: \$? = $ac_status" >&5

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

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

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

-  echo "$as_me:9408: \$? = $ac_status" >&5
+  echo "$as_me:9433: \$? = $ac_status" >&5

   (exit $ac_status); }; }; then
   cf_cv_define_sigwinch=maybe
 else
   (exit $ac_status); }; }; then
   cf_cv_define_sigwinch=maybe
 else


@@ -9419,11 +9444,11 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi

-echo "$as_me:9422: result: $cf_cv_define_sigwinch" >&5
+echo "$as_me:9447: 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:9426: checking for actual SIGWINCH definition" >&5
+echo "$as_me:9451: 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


@@ -9434,7 +9459,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 9437 "configure"
+#line 9462 "configure"

 #include "confdefs.h"
 
 #undef _XOPEN_SOURCE
 #include "confdefs.h"
 
 #undef _XOPEN_SOURCE


@@ -9456,16 +9481,16 @@ int x = SIGWINCH
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

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

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

-  echo "$as_me:9462: \$? = $ac_status" >&5
+  echo "$as_me:9487: \$? = $ac_status" >&5

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

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

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

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


@@ -9479,7 +9504,7 @@ cf_sigwinch=`expr $cf_sigwinch - 1`
 done
 
 fi
 done
 
 fi

-echo "$as_me:9482: result: $cf_cv_fixup_sigwinch" >&5
+echo "$as_me:9507: 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


@@ -9489,13 +9514,13 @@ fi
 
 # Checks for CODESET support.
 
 
 # Checks for CODESET support.
 

-echo "$as_me:9492: checking for nl_langinfo and CODESET" >&5
+echo "$as_me:9517: 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 9498 "configure"
+#line 9523 "configure"

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


@@ -9507,16 +9532,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:9510: \"$ac_link\"") >&5
+if { (eval echo "$as_me:9535: \"$ac_link\"") >&5

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

-  echo "$as_me:9513: \$? = $ac_status" >&5
+  echo "$as_me:9538: \$? = $ac_status" >&5

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

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

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

-  echo "$as_me:9519: \$? = $ac_status" >&5
+  echo "$as_me:9544: \$? = $ac_status" >&5

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


@@ -9527,7 +9552,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:9530: result: $am_cv_langinfo_codeset" >&5
+echo "$as_me:9555: 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
 


@@ -9541,7 +9566,7 @@ EOF
 NCURSES_OK_WCHAR_T=
 NCURSES_OK_WINT_T=
 
 NCURSES_OK_WCHAR_T=
 NCURSES_OK_WINT_T=
 

-echo "$as_me:9544: checking if you want wide-character code" >&5
+echo "$as_me:9569: 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.


@@ -9551,7 +9576,7 @@ if test "${enable_widec+set}" = set; then
 else
   with_widec=no
 fi;
 else
   with_widec=no
 fi;

-echo "$as_me:9554: result: $with_widec" >&5
+echo "$as_me:9579: result: $with_widec" >&5

 echo "${ECHO_T}$with_widec" >&6
 
 NCURSES_WCWIDTH_GRAPHICS=1
 echo "${ECHO_T}$with_widec" >&6
 
 NCURSES_WCWIDTH_GRAPHICS=1


@@ -9575,23 +9600,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:9578: checking for $ac_header" >&5
+echo "$as_me:9603: 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 9584 "configure"
+#line 9609 "configure"

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

-if { (eval echo "$as_me:9588: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:9613: \"$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:9594: \$? = $ac_status" >&5
+  echo "$as_me:9619: \$? = $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


@@ -9610,7 +9635,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
 fi
 rm -f conftest.err conftest.$ac_ext
 fi

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


@@ -9620,14 +9645,14 @@ EOF
 fi
 done
 
 fi
 done
 

-echo "$as_me:9623: checking if wchar.h can be used as is" >&5
+echo "$as_me:9648: checking if wchar.h can be used as is" >&5

 echo $ECHO_N "checking if wchar.h can be used as is... $ECHO_C" >&6
 if test "${cf_cv_wchar_h_okay+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 cat >conftest.$ac_ext <<_ACEOF
 echo $ECHO_N "checking if wchar.h can be used as is... $ECHO_C" >&6
 if test "${cf_cv_wchar_h_okay+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 cat >conftest.$ac_ext <<_ACEOF

-#line 9630 "configure"
+#line 9655 "configure"

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


@@ -9649,16 +9674,16 @@ main (void)
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

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

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

-  echo "$as_me:9655: \$? = $ac_status" >&5
+  echo "$as_me:9680: \$? = $ac_status" >&5

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

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

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

-  echo "$as_me:9661: \$? = $ac_status" >&5
+  echo "$as_me:9686: \$? = $ac_status" >&5

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


@@ -9668,16 +9693,16 @@ cf_cv_wchar_h_okay=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi

-echo "$as_me:9671: result: $cf_cv_wchar_h_okay" >&5
+echo "$as_me:9696: result: $cf_cv_wchar_h_okay" >&5

 echo "${ECHO_T}$cf_cv_wchar_h_okay" >&6
 
 if test $cf_cv_wchar_h_okay = no
 then
 
 echo "${ECHO_T}$cf_cv_wchar_h_okay" >&6
 
 if test $cf_cv_wchar_h_okay = no
 then
 

-echo "$as_me:9677: checking if we must define _XOPEN_SOURCE_EXTENDED" >&5
+echo "$as_me:9702: 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 9680 "configure"
+#line 9705 "configure"

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


@@ -9693,16 +9718,16 @@ make an error
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

-if { (eval echo "$as_me:9696: \"$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:9699: \$? = $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:9702: \"$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:9705: \$? = $ac_status" >&5
+  echo "$as_me:9730: \$? = $ac_status" >&5

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


@@ -9711,16 +9736,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:9714: result: $cf_result" >&5
+echo "$as_me:9739: 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:9720: checking checking for compatible value versus " >&5
+       echo "$as_me:9745: 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 9723 "configure"
+#line 9748 "configure"

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


@@ -9736,16 +9761,16 @@ make an error
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

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

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

-  echo "$as_me:9742: \$? = $ac_status" >&5
+  echo "$as_me:9767: \$? = $ac_status" >&5

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

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

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

-  echo "$as_me:9748: \$? = $ac_status" >&5
+  echo "$as_me:9773: \$? = $ac_status" >&5

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


@@ -9754,7 +9779,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:9757: result: $cf_result" >&5
+       echo "$as_me:9782: 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...


@@ -9764,7 +9789,7 @@ fi
 
 fi
 
 
 fi
 

-echo "$as_me:9767: checking if wcwidth agrees graphics are single-width" >&5
+echo "$as_me:9792: checking if wcwidth agrees graphics are single-width" >&5

 echo $ECHO_N "checking if wcwidth agrees graphics are single-width... $ECHO_C" >&6
 if test "${cf_cv_wcwidth_graphics+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 echo $ECHO_N "checking if wcwidth agrees graphics are single-width... $ECHO_C" >&6
 if test "${cf_cv_wcwidth_graphics+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6


@@ -9835,7 +9860,7 @@ if test "$cross_compiling" = yes; then
   cf_cv_wcwidth_graphics=unknown
 else
   cat >conftest.$ac_ext <<_ACEOF
   cf_cv_wcwidth_graphics=unknown
 else
   cat >conftest.$ac_ext <<_ACEOF

-#line 9838 "configure"
+#line 9863 "configure"

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


@@ -9879,15 +9904,15 @@ main(void)
 
 _ACEOF
 rm -f conftest$ac_exeext
 
 _ACEOF
 rm -f conftest$ac_exeext

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

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

-  echo "$as_me:9885: \$? = $ac_status" >&5
+  echo "$as_me:9910: \$? = $ac_status" >&5

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

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

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

-  echo "$as_me:9890: \$? = $ac_status" >&5
+  echo "$as_me:9915: \$? = $ac_status" >&5

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


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

-echo "$as_me:9903: result: $cf_cv_wcwidth_graphics" >&5
+echo "$as_me:9928: result: $cf_cv_wcwidth_graphics" >&5

 echo "${ECHO_T}$cf_cv_wcwidth_graphics" >&6
 
        test "$cf_cv_wcwidth_graphics" = no && NCURSES_WCWIDTH_GRAPHICS=0
 echo "${ECHO_T}$cf_cv_wcwidth_graphics" >&6
 
        test "$cf_cv_wcwidth_graphics" = no && NCURSES_WCWIDTH_GRAPHICS=0


@@ -9911,13 +9936,13 @@ echo "${ECHO_T}$cf_cv_wcwidth_graphics" >&6
 for ac_func in putwc btowc wctob mbtowc wctomb mblen mbrlen mbrtowc wcsrtombs mbsrtowcs wcstombs mbstowcs
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
 for ac_func in putwc btowc wctob mbtowc wctomb mblen mbrlen mbrtowc wcsrtombs mbsrtowcs wcstombs mbstowcs
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`

-echo "$as_me:9914: checking for $ac_func" >&5
+echo "$as_me:9939: 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 9920 "configure"
+#line 9945 "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.  */


@@ -9948,16 +9973,16 @@ f = $ac_func; /* workaround for ICC 12.0.3 */ if (f == 0) return 1;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext

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

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

-  echo "$as_me:9954: \$? = $ac_status" >&5
+  echo "$as_me:9979: \$? = $ac_status" >&5

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

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

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

-  echo "$as_me:9960: \$? = $ac_status" >&5
+  echo "$as_me:9985: \$? = $ac_status" >&5

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


@@ -9967,7 +9992,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:9970: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "$as_me:9995: 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


@@ -9979,7 +10004,7 @@ done
 
        if test "x$ac_cv_func_putwc" != xyes ; then
 
 
        if test "x$ac_cv_func_putwc" != xyes ; then
 

-echo "$as_me:9982: checking for multibyte character support" >&5
+echo "$as_me:10007: checking for multibyte character support" >&5

 echo $ECHO_N "checking for multibyte character support... $ECHO_C" >&6
 if test "${cf_cv_utf8_lib+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 echo $ECHO_N "checking for multibyte character support... $ECHO_C" >&6
 if test "${cf_cv_utf8_lib+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6


@@ -9987,7 +10012,7 @@ else
 
        cf_save_LIBS="$LIBS"
        cat >conftest.$ac_ext <<_ACEOF
 
        cf_save_LIBS="$LIBS"
        cat >conftest.$ac_ext <<_ACEOF

-#line 9990 "configure"
+#line 10015 "configure"

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


@@ -10000,16 +10025,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:10003: \"$ac_link\"") >&5
+if { (eval echo "$as_me:10028: \"$ac_link\"") >&5

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

-  echo "$as_me:10006: \$? = $ac_status" >&5
+  echo "$as_me:10031: \$? = $ac_status" >&5

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

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

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

-  echo "$as_me:10012: \$? = $ac_status" >&5
+  echo "$as_me:10037: \$? = $ac_status" >&5

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


@@ -10021,12 +10046,12 @@ cat conftest.$ac_ext >&5
 cf_cv_header_path_utf8=
 cf_cv_library_path_utf8=
 
 cf_cv_header_path_utf8=
 cf_cv_library_path_utf8=
 

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

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

-#line 10029 "configure"
+#line 10054 "configure"

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


@@ -10039,16 +10064,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:10042: \"$ac_link\"") >&5
+if { (eval echo "$as_me:10067: \"$ac_link\"") >&5

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

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

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

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

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

-  echo "$as_me:10051: \$? = $ac_status" >&5
+  echo "$as_me:10076: \$? = $ac_status" >&5

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


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

-#line 10065 "configure"
+#line 10090 "configure"

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


@@ -10075,16 +10100,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:10078: \"$ac_link\"") >&5
+if { (eval echo "$as_me:10103: \"$ac_link\"") >&5

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

-  echo "$as_me:10081: \$? = $ac_status" >&5
+  echo "$as_me:10106: \$? = $ac_status" >&5

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

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

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

-  echo "$as_me:10087: \$? = $ac_status" >&5
+  echo "$as_me:10112: \$? = $ac_status" >&5

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


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

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

 
 

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

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


@@ -10194,11 +10219,11 @@ cf_search="$cf_search $cf_header_path_list"
                if test -d $cf_cv_header_path_utf8 ; then
                        test -n "$verbose" && echo "    ... testing $cf_cv_header_path_utf8" 1>&6
 
                if test -d $cf_cv_header_path_utf8 ; then
                        test -n "$verbose" && echo "    ... testing $cf_cv_header_path_utf8" 1>&6
 

-echo "${as_me:-configure}:10197: testing ... testing $cf_cv_header_path_utf8 ..." 1>&5
+echo "${as_me:-configure}:10222: testing ... testing $cf_cv_header_path_utf8 ..." 1>&5

 
                        CPPFLAGS="$cf_save_CPPFLAGS -I$cf_cv_header_path_utf8"
                        cat >conftest.$ac_ext <<_ACEOF
 
                        CPPFLAGS="$cf_save_CPPFLAGS -I$cf_cv_header_path_utf8"
                        cat >conftest.$ac_ext <<_ACEOF

-#line 10201 "configure"
+#line 10226 "configure"

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


@@ -10211,21 +10236,21 @@ putwc(0,0);
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

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

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

-  echo "$as_me:10217: \$? = $ac_status" >&5
+  echo "$as_me:10242: \$? = $ac_status" >&5

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

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

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

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

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

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

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


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

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

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


@@ -10318,13 +10343,13 @@ cf_search="$cf_library_path_list $cf_search"
                                if test -d $cf_cv_library_path_utf8 ; then
                                        test -n "$verbose" && echo "    ... testing $cf_cv_library_path_utf8" 1>&6
 
                                if test -d $cf_cv_library_path_utf8 ; then
                                        test -n "$verbose" && echo "    ... testing $cf_cv_library_path_utf8" 1>&6
 

-echo "${as_me:-configure}:10321: testing ... testing $cf_cv_library_path_utf8 ..." 1>&5
+echo "${as_me:-configure}:10346: testing ... testing $cf_cv_library_path_utf8 ..." 1>&5

 
                                        CPPFLAGS="$cf_test_CPPFLAGS"
                                        LIBS="-lutf8  $cf_save_LIBS"
                                        LDFLAGS="$cf_save_LDFLAGS -L$cf_cv_library_path_utf8"
                                        cat >conftest.$ac_ext <<_ACEOF
 
                                        CPPFLAGS="$cf_test_CPPFLAGS"
                                        LIBS="-lutf8  $cf_save_LIBS"
                                        LDFLAGS="$cf_save_LDFLAGS -L$cf_cv_library_path_utf8"
                                        cat >conftest.$ac_ext <<_ACEOF

-#line 10327 "configure"
+#line 10352 "configure"

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


@@ -10337,21 +10362,21 @@ putwc(0,0);
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext

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

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

-  echo "$as_me:10343: \$? = $ac_status" >&5
+  echo "$as_me:10368: \$? = $ac_status" >&5

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

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

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

-  echo "$as_me:10349: \$? = $ac_status" >&5
+  echo "$as_me:10374: \$? = $ac_status" >&5

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

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

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


@@ -10393,7 +10418,7 @@ fi
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi

-echo "$as_me:10396: result: $cf_cv_utf8_lib" >&5
+echo "$as_me:10421: result: $cf_cv_utf8_lib" >&5

 echo "${ECHO_T}$cf_cv_utf8_lib" >&6
 
 # HAVE_LIBUTF8_H is used by ncurses if curses.h is shared between
 echo "${ECHO_T}$cf_cv_utf8_lib" >&6
 
 # HAVE_LIBUTF8_H is used by ncurses if curses.h is shared between


@@ -10428,7 +10453,7 @@ if test -n "$cf_cv_header_path_utf8" ; 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 10431 "configure"
+#line 10456 "configure"

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


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

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

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

-  echo "$as_me:10446: \$? = $ac_status" >&5
+  echo "$as_me:10471: \$? = $ac_status" >&5

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

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

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

-  echo "$as_me:10452: \$? = $ac_status" >&5
+  echo "$as_me:10477: \$? = $ac_status" >&5

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


@@ -10466,7 +10491,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}:10469: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:10494: testing adding $cf_add_incdir to include-path ..." 1>&5

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


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

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

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


@@ -10534,14 +10559,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:10537: checking if we must include wchar.h to declare mbstate_t" >&5
+echo "$as_me:10562: 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 10544 "configure"
+#line 10569 "configure"

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


@@ -10559,23 +10584,23 @@ mbstate_t state
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

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

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

-  echo "$as_me:10565: \$? = $ac_status" >&5
+  echo "$as_me:10590: \$? = $ac_status" >&5

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

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

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

-  echo "$as_me:10571: \$? = $ac_status" >&5
+  echo "$as_me:10596: \$? = $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 10578 "configure"
+#line 10603 "configure"

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


@@ -10594,16 +10619,16 @@ mbstate_t value
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

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

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

-  echo "$as_me:10600: \$? = $ac_status" >&5
+  echo "$as_me:10625: \$? = $ac_status" >&5

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

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

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

-  echo "$as_me:10606: \$? = $ac_status" >&5
+  echo "$as_me:10631: \$? = $ac_status" >&5

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


@@ -10615,7 +10640,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:10618: result: $cf_cv_mbstate_t" >&5
+echo "$as_me:10643: 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


@@ -10633,14 +10658,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:10636: checking if we must include wchar.h to declare wchar_t" >&5
+echo "$as_me:10661: 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 10643 "configure"
+#line 10668 "configure"

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


@@ -10658,23 +10683,23 @@ wchar_t state
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

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

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

-  echo "$as_me:10664: \$? = $ac_status" >&5
+  echo "$as_me:10689: \$? = $ac_status" >&5

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

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

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

-  echo "$as_me:10670: \$? = $ac_status" >&5
+  echo "$as_me:10695: \$? = $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 10677 "configure"
+#line 10702 "configure"

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


@@ -10693,16 +10718,16 @@ wchar_t value
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

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

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

-  echo "$as_me:10699: \$? = $ac_status" >&5
+  echo "$as_me:10724: \$? = $ac_status" >&5

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

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

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

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

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


@@ -10714,7 +10739,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:10717: result: $cf_cv_wchar_t" >&5
+echo "$as_me:10742: 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


@@ -10737,14 +10762,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:10740: checking if we must include wchar.h to declare wint_t" >&5
+echo "$as_me:10765: 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 10747 "configure"
+#line 10772 "configure"

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


@@ -10762,23 +10787,23 @@ wint_t state
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

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

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

-  echo "$as_me:10768: \$? = $ac_status" >&5
+  echo "$as_me:10793: \$? = $ac_status" >&5

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

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

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

-  echo "$as_me:10774: \$? = $ac_status" >&5
+  echo "$as_me:10799: \$? = $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 10781 "configure"
+#line 10806 "configure"

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


@@ -10797,16 +10822,16 @@ wint_t value
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

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

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

-  echo "$as_me:10803: \$? = $ac_status" >&5
+  echo "$as_me:10828: \$? = $ac_status" >&5

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

-  { (eval echo "$as_me:10806: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10831: \"$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:10834: \$? = $ac_status" >&5

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


@@ -10818,7 +10843,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:10821: result: $cf_cv_wint_t" >&5
+echo "$as_me:10846: 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


@@ -10850,7 +10875,7 @@ EOF
 fi
 
 ###   use option --disable-lp64 to allow long chtype
 fi
 
 ###   use option --disable-lp64 to allow long chtype

-echo "$as_me:10853: checking whether to enable _LP64 definition in curses.h" >&5
+echo "$as_me:10878: 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.


@@ -10860,7 +10885,7 @@ if test "${enable_lp64+set}" = set; then
 else
   with_lp64=$cf_dft_with_lp64
 fi;
 else
   with_lp64=$cf_dft_with_lp64
 fi;

-echo "$as_me:10863: result: $with_lp64" >&5
+echo "$as_me:10888: result: $with_lp64" >&5

 echo "${ECHO_T}$with_lp64" >&6
 
 if test "x$with_lp64" = xyes ; then
 echo "${ECHO_T}$with_lp64" >&6
 
 if test "x$with_lp64" = xyes ; then


@@ -10876,7 +10901,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:10879: checking for special C compiler options needed for large files" >&5
+  echo "$as_me:10904: 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


@@ -10888,7 +10913,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 10891 "configure"
+#line 10916 "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.


@@ -10908,16 +10933,16 @@ main (void)
 }
 _ACEOF
         rm -f conftest.$ac_objext
 }
 _ACEOF
         rm -f conftest.$ac_objext

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

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

-  echo "$as_me:10914: \$? = $ac_status" >&5
+  echo "$as_me:10939: \$? = $ac_status" >&5

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

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

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

-  echo "$as_me:10920: \$? = $ac_status" >&5
+  echo "$as_me:10945: \$? = $ac_status" >&5

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


@@ -10927,16 +10952,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:10930: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:10955: \"$ac_compile\"") >&5

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

-  echo "$as_me:10933: \$? = $ac_status" >&5
+  echo "$as_me:10958: \$? = $ac_status" >&5

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

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

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

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


@@ -10950,13 +10975,13 @@ rm -f conftest.$ac_objext
        rm -f conftest.$ac_ext
     fi
 fi
        rm -f conftest.$ac_ext
     fi
 fi

-echo "$as_me:10953: result: $ac_cv_sys_largefile_CC" >&5
+echo "$as_me:10978: 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:10959: checking for _FILE_OFFSET_BITS value needed for large files" >&5
+  echo "$as_me:10984: 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


@@ -10964,7 +10989,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 10967 "configure"
+#line 10992 "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.


@@ -10984,16 +11009,16 @@ main (void)
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

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

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

-  echo "$as_me:10990: \$? = $ac_status" >&5
+  echo "$as_me:11015: \$? = $ac_status" >&5

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

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

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

-  echo "$as_me:10996: \$? = $ac_status" >&5
+  echo "$as_me:11021: \$? = $ac_status" >&5

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


@@ -11002,7 +11027,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 11005 "configure"
+#line 11030 "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>


@@ -11023,16 +11048,16 @@ main (void)
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

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

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

-  echo "$as_me:11029: \$? = $ac_status" >&5
+  echo "$as_me:11054: \$? = $ac_status" >&5

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

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

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

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


@@ -11043,7 +11068,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
   break
 done
 fi
   break
 done
 fi

-echo "$as_me:11046: result: $ac_cv_sys_file_offset_bits" >&5
+echo "$as_me:11071: 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
 


@@ -11053,7 +11078,7 @@ EOF
 
 fi
 rm -rf conftest*
 
 fi
 rm -rf conftest*

-  echo "$as_me:11056: checking for _LARGE_FILES value needed for large files" >&5
+  echo "$as_me:11081: 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


@@ -11061,7 +11086,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 11064 "configure"
+#line 11089 "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.


@@ -11081,16 +11106,16 @@ main (void)
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

-if { (eval echo "$as_me:11084: \"$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:11087: \$? = $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:11090: \"$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:11093: \$? = $ac_status" >&5
+  echo "$as_me:11118: \$? = $ac_status" >&5

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


@@ -11099,7 +11124,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 11102 "configure"
+#line 11127 "configure"

 #include "confdefs.h"
 #define _LARGE_FILES 1
 #include <sys/types.h>
 #include "confdefs.h"
 #define _LARGE_FILES 1
 #include <sys/types.h>


@@ -11120,16 +11145,16 @@ main (void)
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

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

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

-  echo "$as_me:11126: \$? = $ac_status" >&5
+  echo "$as_me:11151: \$? = $ac_status" >&5

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

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

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

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


@@ -11140,7 +11165,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
   break
 done
 fi
   break
 done
 fi

-echo "$as_me:11143: result: $ac_cv_sys_large_files" >&5
+echo "$as_me:11168: 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
 


@@ -11153,7 +11178,7 @@ rm -rf conftest*
 fi
 
        if test "$enable_largefile" != no ; then
 fi
 
        if test "$enable_largefile" != no ; then

-       echo "$as_me:11156: checking for _LARGEFILE_SOURCE value needed for large files" >&5
+       echo "$as_me:11181: 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


@@ -11161,7 +11186,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 11164 "configure"
+#line 11189 "configure"

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


@@ -11173,16 +11198,16 @@ return !fseeko;
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

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

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

-  echo "$as_me:11179: \$? = $ac_status" >&5
+  echo "$as_me:11204: \$? = $ac_status" >&5

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

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

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

-  echo "$as_me:11185: \$? = $ac_status" >&5
+  echo "$as_me:11210: \$? = $ac_status" >&5

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


@@ -11191,7 +11216,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 11194 "configure"
+#line 11219 "configure"

 #include "confdefs.h"
 #define _LARGEFILE_SOURCE 1
 #include <stdio.h>
 #include "confdefs.h"
 #define _LARGEFILE_SOURCE 1
 #include <stdio.h>


@@ -11204,16 +11229,16 @@ return !fseeko;
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

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

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

-  echo "$as_me:11210: \$? = $ac_status" >&5
+  echo "$as_me:11235: \$? = $ac_status" >&5

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

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

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

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


@@ -11224,7 +11249,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
   break
 done
 fi
   break
 done
 fi

-echo "$as_me:11227: result: $ac_cv_sys_largefile_source" >&5
+echo "$as_me:11252: 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
 


@@ -11238,13 +11263,13 @@ rm -rf conftest*
 # We used to try defining _XOPEN_SOURCE=500 too, to work around a bug
 # in glibc 2.1.3, but that breaks too many other things.
 # If you want fseeko and ftello with glibc, upgrade to a fixed glibc.
 # We used to try defining _XOPEN_SOURCE=500 too, to work around a bug
 # in glibc 2.1.3, but that breaks too many other things.
 # If you want fseeko and ftello with glibc, upgrade to a fixed glibc.

-echo "$as_me:11241: checking for fseeko" >&5
+echo "$as_me:11266: 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 11247 "configure"
+#line 11272 "configure"

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


@@ -11256,16 +11281,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:11259: \"$ac_link\"") >&5
+if { (eval echo "$as_me:11284: \"$ac_link\"") >&5

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

-  echo "$as_me:11262: \$? = $ac_status" >&5
+  echo "$as_me:11287: \$? = $ac_status" >&5

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

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

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

-  echo "$as_me:11268: \$? = $ac_status" >&5
+  echo "$as_me:11293: \$? = $ac_status" >&5

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


@@ -11275,7 +11300,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:11278: result: $ac_cv_func_fseeko" >&5
+echo "$as_me:11303: 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
 


@@ -11296,14 +11321,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:11299: checking whether to use struct dirent64" >&5
+       echo "$as_me:11324: 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 11306 "configure"
+#line 11331 "configure"

 #include "confdefs.h"
 
 #pragma GCC diagnostic error "-Wincompatible-pointer-types"
 #include "confdefs.h"
 
 #pragma GCC diagnostic error "-Wincompatible-pointer-types"


@@ -11325,16 +11350,16 @@ main (void)
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

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

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

-  echo "$as_me:11331: \$? = $ac_status" >&5
+  echo "$as_me:11356: \$? = $ac_status" >&5

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

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

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

-  echo "$as_me:11337: \$? = $ac_status" >&5
+  echo "$as_me:11362: \$? = $ac_status" >&5

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


@@ -11345,7 +11370,7 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi

-echo "$as_me:11348: result: $cf_cv_struct_dirent64" >&5
+echo "$as_me:11373: result: $cf_cv_struct_dirent64" >&5

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


@@ -11355,7 +11380,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:11358: checking if you want tparm not to use X/Open fixed-parameter list" >&5
+echo "$as_me:11383: 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.


@@ -11365,14 +11390,14 @@ if test "${enable_tparm_varargs+set}" = set; then
 else
   with_tparm_varargs=yes
 fi;
 else
   with_tparm_varargs=yes
 fi;

-echo "$as_me:11368: result: $with_tparm_varargs" >&5
+echo "$as_me:11393: result: $with_tparm_varargs" >&5

 echo "${ECHO_T}$with_tparm_varargs" >&6
 NCURSES_TPARM_VARARGS=0
 test "x$with_tparm_varargs" = xyes && NCURSES_TPARM_VARARGS=1
 
 ###   use option --disable-tic-depends to make libtic not explicitly depend on ncurses/ncursesw
 if test "$with_ticlib" != no ; then
 echo "${ECHO_T}$with_tparm_varargs" >&6
 NCURSES_TPARM_VARARGS=0
 test "x$with_tparm_varargs" = xyes && NCURSES_TPARM_VARARGS=1
 
 ###   use option --disable-tic-depends to make libtic not explicitly depend on ncurses/ncursesw
 if test "$with_ticlib" != no ; then

-echo "$as_me:11375: checking if you want tic library to use explicit dependency on ncurses$LIB_SUFFIX library" >&5
+echo "$as_me:11400: checking if you want tic library to use explicit dependency on ncurses$LIB_SUFFIX library" >&5

 echo $ECHO_N "checking if you want tic library to use explicit dependency on ncurses$LIB_SUFFIX library... $ECHO_C" >&6
 
 # Check whether --enable-tic-depends or --disable-tic-depends was given.
 echo $ECHO_N "checking if you want tic library to use explicit dependency on ncurses$LIB_SUFFIX library... $ECHO_C" >&6
 
 # Check whether --enable-tic-depends or --disable-tic-depends was given.


@@ -11382,14 +11407,14 @@ if test "${enable_tic_depends+set}" = set; then
 else
   with_tic_depends=yes
 fi;
 else
   with_tic_depends=yes
 fi;

-echo "$as_me:11385: result: $with_tic_depends" >&5
+echo "$as_me:11410: result: $with_tic_depends" >&5

 echo "${ECHO_T}$with_tic_depends" >&6
 else
        with_tic_depends=no
 fi
 
 ###   use option --disable-wattr-macros to suppress wattr* macros from curses.h
 echo "${ECHO_T}$with_tic_depends" >&6
 else
        with_tic_depends=no
 fi
 
 ###   use option --disable-wattr-macros to suppress wattr* macros from curses.h

-echo "$as_me:11392: checking if you want to suppress wattr* macros to help with ncurses5/ncurses6 transition" >&5
+echo "$as_me:11417: checking if you want to suppress wattr* macros to help with ncurses5/ncurses6 transition" >&5

 echo $ECHO_N "checking if you want to suppress wattr* macros to help with ncurses5/ncurses6 transition... $ECHO_C" >&6
 
 # Check whether --enable-wattr-macros or --disable-wattr-macros was given.
 echo $ECHO_N "checking if you want to suppress wattr* macros to help with ncurses5/ncurses6 transition... $ECHO_C" >&6
 
 # Check whether --enable-wattr-macros or --disable-wattr-macros was given.


@@ -11401,16 +11426,16 @@ else
 fi;
 if [ "x$with_wattr_macros" != xyes ]; then
        NCURSES_WATTR_MACROS=0
 fi;
 if [ "x$with_wattr_macros" != xyes ]; then
        NCURSES_WATTR_MACROS=0

-       echo "$as_me:11404: result: yes" >&5
+       echo "$as_me:11429: result: yes" >&5

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

-       echo "$as_me:11408: result: no" >&5
+       echo "$as_me:11433: result: no" >&5

 echo "${ECHO_T}no" >&6
 fi
 
 ###   use option --with-bool to override bool's type
 echo "${ECHO_T}no" >&6
 fi
 
 ###   use option --with-bool to override bool's type

-echo "$as_me:11413: checking for type of bool" >&5
+echo "$as_me:11438: 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.


@@ -11420,10 +11445,10 @@ if test "${with_bool+set}" = set; then
 else
   NCURSES_BOOL=auto
 fi;
 else
   NCURSES_BOOL=auto
 fi;

-echo "$as_me:11423: result: $NCURSES_BOOL" >&5
+echo "$as_me:11448: result: $NCURSES_BOOL" >&5

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

-echo "$as_me:11426: checking for alternate terminal capabilities file" >&5
+echo "$as_me:11451: 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.


@@ -11434,11 +11459,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:11437: result: $TERMINFO_CAPS" >&5
+echo "$as_me:11462: 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:11441: checking for type of chtype" >&5
+echo "$as_me:11466: 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.


@@ -11448,11 +11473,11 @@ if test "${with_chtype+set}" = set; then
 else
   NCURSES_CHTYPE=$cf_dft_chtype
 fi;
 else
   NCURSES_CHTYPE=$cf_dft_chtype
 fi;

-echo "$as_me:11451: result: $NCURSES_CHTYPE" >&5
+echo "$as_me:11476: 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:11455: checking for type of ospeed" >&5
+echo "$as_me:11480: 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.


@@ -11462,11 +11487,11 @@ if test "${with_ospeed+set}" = set; then
 else
   NCURSES_OSPEED=short
 fi;
 else
   NCURSES_OSPEED=short
 fi;

-echo "$as_me:11465: result: $NCURSES_OSPEED" >&5
+echo "$as_me:11490: 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:11469: checking for type of mmask_t" >&5
+echo "$as_me:11494: 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.


@@ -11476,11 +11501,11 @@ if test "${with_mmask_t+set}" = set; then
 else
   NCURSES_MMASK_T=$cf_dft_mmask_t
 fi;
 else
   NCURSES_MMASK_T=$cf_dft_mmask_t
 fi;

-echo "$as_me:11479: result: $NCURSES_MMASK_T" >&5
+echo "$as_me:11504: result: $NCURSES_MMASK_T" >&5

 echo "${ECHO_T}$NCURSES_MMASK_T" >&6
 
 ###   use option --with-ccharw-max to override CCHARW_MAX size
 echo "${ECHO_T}$NCURSES_MMASK_T" >&6
 
 ###   use option --with-ccharw-max to override CCHARW_MAX size

-echo "$as_me:11483: checking for size CCHARW_MAX" >&5
+echo "$as_me:11508: checking for size CCHARW_MAX" >&5

 echo $ECHO_N "checking for size CCHARW_MAX... $ECHO_C" >&6
 
 # Check whether --with-ccharw-max or --without-ccharw-max was given.
 echo $ECHO_N "checking for size CCHARW_MAX... $ECHO_C" >&6
 
 # Check whether --with-ccharw-max or --without-ccharw-max was given.


@@ -11490,11 +11515,11 @@ if test "${with_ccharw_max+set}" = set; then
 else
   NCURSES_CCHARW_MAX=5
 fi;
 else
   NCURSES_CCHARW_MAX=5
 fi;

-echo "$as_me:11493: result: $NCURSES_CCHARW_MAX" >&5
+echo "$as_me:11518: result: $NCURSES_CCHARW_MAX" >&5

 echo "${ECHO_T}$NCURSES_CCHARW_MAX" >&6
 
 ###   use option --with-tparm-arg to override tparm's argument type
 echo "${ECHO_T}$NCURSES_CCHARW_MAX" >&6
 
 ###   use option --with-tparm-arg to override tparm's argument type

-echo "$as_me:11497: checking for type of tparm args" >&5
+echo "$as_me:11522: checking for type of tparm args" >&5

 echo $ECHO_N "checking for type of tparm args... $ECHO_C" >&6
 
 # Check whether --with-tparm-arg or --without-tparm-arg was given.
 echo $ECHO_N "checking for type of tparm args... $ECHO_C" >&6
 
 # Check whether --with-tparm-arg or --without-tparm-arg was given.


@@ -11504,11 +11529,11 @@ if test "${with_tparm_arg+set}" = set; then
 else
   NCURSES_TPARM_ARG=$cf_dft_tparm_arg
 fi;
 else
   NCURSES_TPARM_ARG=$cf_dft_tparm_arg
 fi;

-echo "$as_me:11507: result: $NCURSES_TPARM_ARG" >&5
+echo "$as_me:11532: result: $NCURSES_TPARM_ARG" >&5

 echo "${ECHO_T}$NCURSES_TPARM_ARG" >&6
 
 ### Enable compiling-in rcs id's
 echo "${ECHO_T}$NCURSES_TPARM_ARG" >&6
 
 ### Enable compiling-in rcs id's

-echo "$as_me:11511: checking if RCS identifiers should be compiled-in" >&5
+echo "$as_me:11536: 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.


@@ -11518,7 +11543,7 @@ if test "${with_rcs_ids+set}" = set; then
 else
   with_rcs_ids=no
 fi;
 else
   with_rcs_ids=no
 fi;

-echo "$as_me:11521: result: $with_rcs_ids" >&5
+echo "$as_me:11546: result: $with_rcs_ids" >&5

 echo "${ECHO_T}$with_rcs_ids" >&6
 test "x$with_rcs_ids" = xyes &&
 cat >>confdefs.h <<\EOF
 echo "${ECHO_T}$with_rcs_ids" >&6
 test "x$with_rcs_ids" = xyes &&
 cat >>confdefs.h <<\EOF


@@ -11527,7 +11552,7 @@ EOF
 
 ###############################################################################
 
 
 ###############################################################################
 

-echo "$as_me:11530: checking format of man-pages" >&5
+echo "$as_me:11555: 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.


@@ -11616,14 +11641,14 @@ case $MANPAGE_FORMAT in
        ;;
 esac
 
        ;;
 esac
 

-echo "$as_me:11619: result: $MANPAGE_FORMAT" >&5
+echo "$as_me:11644: 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:11622: WARNING: Unexpected manpage-format $cf_unknown" >&5
+       { echo "$as_me:11647: 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:11626: checking for manpage renaming" >&5
+echo "$as_me:11651: 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.


@@ -11651,7 +11676,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:11654: error: not a filename: $MANPAGE_RENAMES" >&5
+               { { echo "$as_me:11679: 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


@@ -11665,10 +11690,10 @@ echo "$as_me: error: not a filename: $MANPAGE_RENAMES" >&2;}
        fi
 fi
 
        fi
 fi
 

-echo "$as_me:11668: result: $MANPAGE_RENAMES" >&5
+echo "$as_me:11693: result: $MANPAGE_RENAMES" >&5

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

-echo "$as_me:11671: checking if manpage aliases will be installed" >&5
+echo "$as_me:11696: 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.


@@ -11679,7 +11704,7 @@ else
   MANPAGE_ALIASES=yes
 fi;
 
   MANPAGE_ALIASES=yes
 fi;
 

-echo "$as_me:11682: result: $MANPAGE_ALIASES" >&5
+echo "$as_me:11707: result: $MANPAGE_ALIASES" >&5

 echo "${ECHO_T}$MANPAGE_ALIASES" >&6
 
 case "x$LN_S" in
 echo "${ECHO_T}$MANPAGE_ALIASES" >&6
 
 case "x$LN_S" in


@@ -11693,7 +11718,7 @@ esac
 
 MANPAGE_SYMLINKS=no
 if test "$MANPAGE_ALIASES" = yes ; then
 
 MANPAGE_SYMLINKS=no
 if test "$MANPAGE_ALIASES" = yes ; then

-echo "$as_me:11696: checking if manpage symlinks should be used" >&5
+echo "$as_me:11721: 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.


@@ -11706,17 +11731,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:11709: WARNING: cannot make symlinks" >&5
+       { echo "$as_me:11734: 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:11715: result: $MANPAGE_SYMLINKS" >&5
+echo "$as_me:11740: result: $MANPAGE_SYMLINKS" >&5

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

-echo "$as_me:11719: checking for manpage tbl" >&5
+echo "$as_me:11744: 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.


@@ -11727,7 +11752,7 @@ else
   MANPAGE_TBL=no
 fi;
 
   MANPAGE_TBL=no
 fi;
 

-echo "$as_me:11730: result: $MANPAGE_TBL" >&5
+echo "$as_me:11755: 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


@@ -12060,7 +12085,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:12063: checking if you want to build with function extensions" >&5
+echo "$as_me:12088: 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.


@@ -12070,7 +12095,7 @@ if test "${enable_ext_funcs+set}" = set; then
 else
   with_ext_funcs=yes
 fi;
 else
   with_ext_funcs=yes
 fi;

-echo "$as_me:12073: result: $with_ext_funcs" >&5
+echo "$as_me:12098: result: $with_ext_funcs" >&5

 echo "${ECHO_T}$with_ext_funcs" >&6
 if test "x$with_ext_funcs" = xyes ; then
        NCURSES_EXT_FUNCS=1
 echo "${ECHO_T}$with_ext_funcs" >&6
 if test "x$with_ext_funcs" = xyes ; then
        NCURSES_EXT_FUNCS=1


@@ -12130,7 +12155,7 @@ else
        GENERATED_EXT_FUNCS=
 fi
 
        GENERATED_EXT_FUNCS=
 fi
 

-echo "$as_me:12133: checking if you want to build with SCREEN extensions" >&5
+echo "$as_me:12158: checking if you want to build with SCREEN extensions" >&5

 echo $ECHO_N "checking if you want to build with SCREEN extensions... $ECHO_C" >&6
 
 # Check whether --enable-sp-funcs or --disable-sp-funcs was given.
 echo $ECHO_N "checking if you want to build with SCREEN extensions... $ECHO_C" >&6
 
 # Check whether --enable-sp-funcs or --disable-sp-funcs was given.


@@ -12140,7 +12165,7 @@ if test "${enable_sp_funcs+set}" = set; then
 else
   with_sp_funcs=$cf_dft_ext_spfuncs
 fi;
 else
   with_sp_funcs=$cf_dft_ext_spfuncs
 fi;

-echo "$as_me:12143: result: $with_sp_funcs" >&5
+echo "$as_me:12168: result: $with_sp_funcs" >&5

 echo "${ECHO_T}$with_sp_funcs" >&6
 if test "x$with_sp_funcs" = xyes ; then
        NCURSES_SP_FUNCS=1
 echo "${ECHO_T}$with_sp_funcs" >&6
 if test "x$with_sp_funcs" = xyes ; then
        NCURSES_SP_FUNCS=1


@@ -12159,7 +12184,7 @@ else
        GENERATED_SP_FUNCS=
 fi
 
        GENERATED_SP_FUNCS=
 fi
 

-echo "$as_me:12162: checking if you want to build with terminal-driver" >&5
+echo "$as_me:12187: checking if you want to build with terminal-driver" >&5

 echo $ECHO_N "checking if you want to build with terminal-driver... $ECHO_C" >&6
 
 # Check whether --enable-term-driver or --disable-term-driver was given.
 echo $ECHO_N "checking if you want to build with terminal-driver... $ECHO_C" >&6
 
 # Check whether --enable-term-driver or --disable-term-driver was given.


@@ -12169,7 +12194,7 @@ if test "${enable_term_driver+set}" = set; then
 else
   with_term_driver=no
 fi;
 else
   with_term_driver=no
 fi;

-echo "$as_me:12172: result: $with_term_driver" >&5
+echo "$as_me:12197: result: $with_term_driver" >&5

 echo "${ECHO_T}$with_term_driver" >&6
 if test "x$with_term_driver" = xyes ; then
 
 echo "${ECHO_T}$with_term_driver" >&6
 if test "x$with_term_driver" = xyes ; then
 


@@ -12178,19 +12203,19 @@ cat >>confdefs.h <<\EOF
 EOF
 
        if test "x$with_termlib" != xno ; then
 EOF
 
        if test "x$with_termlib" != xno ; then

-               { { echo "$as_me:12181: error: The term-driver option conflicts with the termlib option" >&5
+               { { echo "$as_me:12206: error: The term-driver option conflicts with the termlib option" >&5

 echo "$as_me: error: The term-driver option conflicts with the termlib option" >&2;}
    { (exit 1); exit 1; }; }
        fi
        if test "x$with_sp_funcs" != xyes ; then
 echo "$as_me: error: The term-driver option conflicts with the termlib option" >&2;}
    { (exit 1); exit 1; }; }
        fi
        if test "x$with_sp_funcs" != xyes ; then

-               { { echo "$as_me:12186: error: The term-driver option relies upon sp-funcs" >&5
+               { { echo "$as_me:12211: error: The term-driver option relies upon sp-funcs" >&5

 echo "$as_me: error: The term-driver option relies upon sp-funcs" >&2;}
    { (exit 1); exit 1; }; }
        fi
 fi
 
 ###   use option --enable-const to turn on use of const beyond that in XSI.
 echo "$as_me: error: The term-driver option relies upon sp-funcs" >&2;}
    { (exit 1); exit 1; }; }
        fi
 fi
 
 ###   use option --enable-const to turn on use of const beyond that in XSI.

-echo "$as_me:12193: checking for extended use of const keyword" >&5
+echo "$as_me:12218: 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.


@@ -12200,7 +12225,7 @@ if test "${enable_const+set}" = set; then
 else
   with_ext_const=$cf_dft_ext_const
 fi;
 else
   with_ext_const=$cf_dft_ext_const
 fi;

-echo "$as_me:12203: result: $with_ext_const" >&5
+echo "$as_me:12228: result: $with_ext_const" >&5

 echo "${ECHO_T}$with_ext_const" >&6
 NCURSES_CONST='/*nothing*/'
 if test "x$with_ext_const" = xyes ; then
 echo "${ECHO_T}$with_ext_const" >&6
 NCURSES_CONST='/*nothing*/'
 if test "x$with_ext_const" = xyes ; then


@@ -12208,7 +12233,7 @@ if test "x$with_ext_const" = xyes ; then
 fi
 
 ###   use option --enable-ext-colors to turn on use of colors beyond 16.
 fi
 
 ###   use option --enable-ext-colors to turn on use of colors beyond 16.

-echo "$as_me:12211: checking if you want to use extended colors" >&5
+echo "$as_me:12236: 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.


@@ -12218,12 +12243,12 @@ if test "${enable_ext_colors+set}" = set; then
 else
   with_ext_colors=$cf_dft_ext_colors
 fi;
 else
   with_ext_colors=$cf_dft_ext_colors
 fi;

-echo "$as_me:12221: result: $with_ext_colors" >&5
+echo "$as_me:12246: result: $with_ext_colors" >&5

 echo "${ECHO_T}$with_ext_colors" >&6
 NCURSES_EXT_COLORS=0
 if test "x$with_ext_colors" = xyes ; then
        if test "x$with_widec" != xyes ; then
 echo "${ECHO_T}$with_ext_colors" >&6
 NCURSES_EXT_COLORS=0
 if test "x$with_ext_colors" = xyes ; then
        if test "x$with_widec" != xyes ; then

-               { echo "$as_me:12226: WARNING: This option applies only to wide-character library" >&5
+               { echo "$as_me:12251: WARNING: This option applies only to wide-character library" >&5

 echo "$as_me: WARNING: This option applies only to wide-character library" >&2;}
        else
                # cannot be ABI 5 since it changes sizeof(cchar_t)
 echo "$as_me: WARNING: This option applies only to wide-character library" >&2;}
        else
                # cannot be ABI 5 since it changes sizeof(cchar_t)


@@ -12233,7 +12258,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:12236: WARNING: overriding ABI version to $cf_cv_abi_version" >&5
+               { echo "$as_me:12261: 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


@@ -12257,7 +12282,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:12260: checking if you want to use extended mouse encoding" >&5
+echo "$as_me:12285: 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.


@@ -12267,7 +12292,7 @@ if test "${enable_ext_mouse+set}" = set; then
 else
   with_ext_mouse=$cf_dft_ext_mouse
 fi;
 else
   with_ext_mouse=$cf_dft_ext_mouse
 fi;

-echo "$as_me:12270: result: $with_ext_mouse" >&5
+echo "$as_me:12295: result: $with_ext_mouse" >&5

 echo "${ECHO_T}$with_ext_mouse" >&6
 NCURSES_MOUSE_VERSION=1
 if test "x$with_ext_mouse" = xyes ; then
 echo "${ECHO_T}$with_ext_mouse" >&6
 NCURSES_MOUSE_VERSION=1
 if test "x$with_ext_mouse" = xyes ; then


@@ -12278,7 +12303,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:12281: WARNING: overriding ABI version to $cf_cv_abi_version" >&5
+               { echo "$as_me:12306: 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


@@ -12287,7 +12312,7 @@ fi
 fi
 
 ###   use option --enable-ext-putwin to turn on extended screendumps
 fi
 
 ###   use option --enable-ext-putwin to turn on extended screendumps

-echo "$as_me:12290: checking if you want to use extended putwin/screendump" >&5
+echo "$as_me:12315: checking if you want to use extended putwin/screendump" >&5

 echo $ECHO_N "checking if you want to use extended putwin/screendump... $ECHO_C" >&6
 
 # Check whether --enable-ext-putwin or --disable-ext-putwin was given.
 echo $ECHO_N "checking if you want to use extended putwin/screendump... $ECHO_C" >&6
 
 # Check whether --enable-ext-putwin or --disable-ext-putwin was given.


@@ -12297,7 +12322,7 @@ if test "${enable_ext_putwin+set}" = set; then
 else
   with_ext_putwin=$cf_dft_ext_putwin
 fi;
 else
   with_ext_putwin=$cf_dft_ext_putwin
 fi;

-echo "$as_me:12300: result: $with_ext_putwin" >&5
+echo "$as_me:12325: result: $with_ext_putwin" >&5

 echo "${ECHO_T}$with_ext_putwin" >&6
 if test "x$with_ext_putwin" = xyes ; then
 
 echo "${ECHO_T}$with_ext_putwin" >&6
 if test "x$with_ext_putwin" = xyes ; then
 


@@ -12307,7 +12332,7 @@ EOF
 
 fi
 
 
 fi
 

-echo "$as_me:12310: checking if you want \$NCURSES_NO_PADDING code" >&5
+echo "$as_me:12335: 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.


@@ -12317,20 +12342,20 @@ 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:12320: result: $with_no_padding" >&5
+echo "$as_me:12345: result: $with_no_padding" >&5

 echo "${ECHO_T}$with_no_padding" >&6
 test "x$with_no_padding" = xyes &&
 cat >>confdefs.h <<\EOF
 #define NCURSES_NO_PADDING 1
 EOF
 
 echo "${ECHO_T}$with_no_padding" >&6
 test "x$with_no_padding" = xyes &&
 cat >>confdefs.h <<\EOF
 #define NCURSES_NO_PADDING 1
 EOF
 

-echo "$as_me:12327: checking for ANSI C header files" >&5
+echo "$as_me:12352: 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 12333 "configure"
+#line 12358 "configure"

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


@@ -12338,13 +12363,13 @@ else
 #include <float.h>
 
 _ACEOF
 #include <float.h>
 
 _ACEOF

-if { (eval echo "$as_me:12341: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:12366: \"$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:12347: \$? = $ac_status" >&5
+  echo "$as_me:12372: \$? = $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


@@ -12366,7 +12391,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 12369 "configure"
+#line 12394 "configure"

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


@@ -12384,7 +12409,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 12387 "configure"
+#line 12412 "configure"

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


@@ -12405,7 +12430,7 @@ if test $ac_cv_header_stdc = yes; then
   :
 else
   cat >conftest.$ac_ext <<_ACEOF
   :
 else
   cat >conftest.$ac_ext <<_ACEOF

-#line 12408 "configure"
+#line 12433 "configure"

 #include "confdefs.h"
 #include <ctype.h>
 #if ((' ' & 0x0FF) == 0x020)
 #include "confdefs.h"
 #include <ctype.h>
 #if ((' ' & 0x0FF) == 0x020)


@@ -12431,15 +12456,15 @@ main (void)
 }
 _ACEOF
 rm -f conftest$ac_exeext
 }
 _ACEOF
 rm -f conftest$ac_exeext

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

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

-  echo "$as_me:12437: \$? = $ac_status" >&5
+  echo "$as_me:12462: \$? = $ac_status" >&5

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

-  { (eval echo "$as_me:12439: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12464: \"$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:12467: \$? = $ac_status" >&5

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


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

-echo "$as_me:12455: result: $ac_cv_header_stdc" >&5
+echo "$as_me:12480: 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
 


@@ -12468,28 +12493,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:12471: checking for $ac_header" >&5
+echo "$as_me:12496: 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 12477 "configure"
+#line 12502 "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:12483: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:12508: \"$ac_compile\"") >&5

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

-  echo "$as_me:12486: \$? = $ac_status" >&5
+  echo "$as_me:12511: \$? = $ac_status" >&5

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

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

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

-  echo "$as_me:12492: \$? = $ac_status" >&5
+  echo "$as_me:12517: \$? = $ac_status" >&5

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


@@ -12499,7 +12524,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:12502: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:12527: 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


@@ -12509,13 +12534,13 @@ EOF
 fi
 done
 
 fi
 done
 

-echo "$as_me:12512: checking for signed char" >&5
+echo "$as_me:12537: 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 12518 "configure"
+#line 12543 "configure"

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


@@ -12530,16 +12555,16 @@ if (sizeof (signed char))
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

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

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

-  echo "$as_me:12536: \$? = $ac_status" >&5
+  echo "$as_me:12561: \$? = $ac_status" >&5

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

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

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

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


@@ -12549,10 +12574,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:12552: result: $ac_cv_type_signed_char" >&5
+echo "$as_me:12577: 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:12555: checking size of signed char" >&5
+echo "$as_me:12580: 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


@@ -12561,7 +12586,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 12564 "configure"
+#line 12589 "configure"

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


@@ -12573,21 +12598,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:12576: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:12601: \"$ac_compile\"") >&5

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

-  echo "$as_me:12579: \$? = $ac_status" >&5
+  echo "$as_me:12604: \$? = $ac_status" >&5

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

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

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

-  echo "$as_me:12585: \$? = $ac_status" >&5
+  echo "$as_me:12610: \$? = $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 12590 "configure"
+#line 12615 "configure"

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


@@ -12599,16 +12624,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:12602: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:12627: \"$ac_compile\"") >&5

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

-  echo "$as_me:12605: \$? = $ac_status" >&5
+  echo "$as_me:12630: \$? = $ac_status" >&5

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

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

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

-  echo "$as_me:12611: \$? = $ac_status" >&5
+  echo "$as_me:12636: \$? = $ac_status" >&5

   (exit $ac_status); }; }; then
   ac_hi=$ac_mid; break
 else
   (exit $ac_status); }; }; then
   ac_hi=$ac_mid; break
 else


@@ -12624,7 +12649,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 12627 "configure"
+#line 12652 "configure"

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


@@ -12636,16 +12661,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:12639: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:12664: \"$ac_compile\"") >&5

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

-  echo "$as_me:12642: \$? = $ac_status" >&5
+  echo "$as_me:12667: \$? = $ac_status" >&5

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

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

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

-  echo "$as_me:12648: \$? = $ac_status" >&5
+  echo "$as_me:12673: \$? = $ac_status" >&5

   (exit $ac_status); }; }; then
   ac_lo=$ac_mid; break
 else
   (exit $ac_status); }; }; then
   ac_lo=$ac_mid; break
 else


@@ -12661,7 +12686,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 12664 "configure"
+#line 12689 "configure"

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


@@ -12673,16 +12698,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:12676: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:12701: \"$ac_compile\"") >&5

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

-  echo "$as_me:12679: \$? = $ac_status" >&5
+  echo "$as_me:12704: \$? = $ac_status" >&5

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

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

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

-  echo "$as_me:12685: \$? = $ac_status" >&5
+  echo "$as_me:12710: \$? = $ac_status" >&5

   (exit $ac_status); }; }; then
   ac_hi=$ac_mid
 else
   (exit $ac_status); }; }; then
   ac_hi=$ac_mid
 else


@@ -12695,12 +12720,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:12698: error: cannot run test program while cross compiling" >&5
+  { { echo "$as_me:12723: 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 12703 "configure"
+#line 12728 "configure"

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


@@ -12716,15 +12741,15 @@ fclose (f);
 }
 _ACEOF
 rm -f conftest$ac_exeext
 }
 _ACEOF
 rm -f conftest$ac_exeext

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

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

-  echo "$as_me:12722: \$? = $ac_status" >&5
+  echo "$as_me:12747: \$? = $ac_status" >&5

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

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

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

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


@@ -12740,7 +12765,7 @@ else
   ac_cv_sizeof_signed_char=0
 fi
 fi
   ac_cv_sizeof_signed_char=0
 fi
 fi

-echo "$as_me:12743: result: $ac_cv_sizeof_signed_char" >&5
+echo "$as_me:12768: 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


@@ -12751,7 +12776,7 @@ if test "$ac_cv_sizeof_signed_char" = 1 ; then
 else
        NCURSES_SBOOL="char"
 fi
 else
        NCURSES_SBOOL="char"
 fi

-echo "$as_me:12754: checking if you want to use signed Boolean array in term.h" >&5
+echo "$as_me:12779: 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.


@@ -12761,12 +12786,12 @@ if test "${enable_signed_char+set}" = set; then
 else
   with_signed_char=no
 fi;
 else
   with_signed_char=no
 fi;

-echo "$as_me:12764: result: $with_signed_char" >&5
+echo "$as_me:12789: result: $with_signed_char" >&5

 echo "${ECHO_T}$with_signed_char" >&6
 test "x$with_signed_char" != xyes && NCURSES_SBOOL="char"
 
 ###   use option --enable-sigwinch to turn on use of SIGWINCH logic
 echo "${ECHO_T}$with_signed_char" >&6
 test "x$with_signed_char" != xyes && NCURSES_SBOOL="char"
 
 ###   use option --enable-sigwinch to turn on use of SIGWINCH logic

-echo "$as_me:12769: checking if you want SIGWINCH handler" >&5
+echo "$as_me:12794: 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.


@@ -12776,7 +12801,7 @@ if test "${enable_sigwinch+set}" = set; then
 else
   with_sigwinch=$with_ext_funcs
 fi;
 else
   with_sigwinch=$with_ext_funcs
 fi;

-echo "$as_me:12779: result: $with_sigwinch" >&5
+echo "$as_me:12804: result: $with_sigwinch" >&5

 echo "${ECHO_T}$with_sigwinch" >&6
 test "x$with_sigwinch" = xyes &&
 cat >>confdefs.h <<\EOF
 echo "${ECHO_T}$with_sigwinch" >&6
 test "x$with_sigwinch" = xyes &&
 cat >>confdefs.h <<\EOF


@@ -12784,7 +12809,7 @@ cat >>confdefs.h <<\EOF
 EOF
 
 ###   use option --enable-tcap-names to allow user to define new capabilities
 EOF
 
 ###   use option --enable-tcap-names to allow user to define new capabilities

-echo "$as_me:12787: checking if you want user-definable terminal capabilities like termcap" >&5
+echo "$as_me:12812: 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.


@@ -12794,14 +12819,14 @@ if test "${enable_tcap_names+set}" = set; then
 else
   with_tcap_names=$with_ext_funcs
 fi;
 else
   with_tcap_names=$with_ext_funcs
 fi;

-echo "$as_me:12797: result: $with_tcap_names" >&5
+echo "$as_me:12822: result: $with_tcap_names" >&5

 echo "${ECHO_T}$with_tcap_names" >&6
 NCURSES_XNAMES=0
 test "x$with_tcap_names" = xyes && NCURSES_XNAMES=1
 
 ##############################################################################
 
 echo "${ECHO_T}$with_tcap_names" >&6
 NCURSES_XNAMES=0
 test "x$with_tcap_names" = xyes && NCURSES_XNAMES=1
 
 ##############################################################################
 

-echo "$as_me:12804: checking if you want to link with the pthread library" >&5
+echo "$as_me:12829: 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.


@@ -12811,27 +12836,27 @@ if test "${with_pthread+set}" = set; then
 else
   with_pthread=no
 fi;
 else
   with_pthread=no
 fi;

-echo "$as_me:12814: result: $with_pthread" >&5
+echo "$as_me:12839: 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:12818: checking for pthread.h" >&5
+       echo "$as_me:12843: 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 12824 "configure"
+#line 12849 "configure"

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

-if { (eval echo "$as_me:12828: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:12853: \"$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:12834: \$? = $ac_status" >&5
+  echo "$as_me:12859: \$? = $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


@@ -12850,7 +12875,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
 fi
 rm -f conftest.err conftest.$ac_ext
 fi

-echo "$as_me:12853: result: $ac_cv_header_pthread_h" >&5
+echo "$as_me:12878: 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
 


@@ -12860,7 +12885,7 @@ EOF
 
        for cf_lib_pthread in pthread c_r
        do
 
        for cf_lib_pthread in pthread c_r
        do

-           echo "$as_me:12863: checking if we can link with the $cf_lib_pthread library" >&5
+           echo "$as_me:12888: checking if we can link with the $cf_lib_pthread library" >&5

 echo $ECHO_N "checking if we can link with the $cf_lib_pthread library... $ECHO_C" >&6
            cf_save_LIBS="$LIBS"
 
 echo $ECHO_N "checking if we can link with the $cf_lib_pthread library... $ECHO_C" >&6
            cf_save_LIBS="$LIBS"
 


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

-#line 12884 "configure"
+#line 12909 "configure"

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


@@ -12898,16 +12923,16 @@ main (void)
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext

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

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

-  echo "$as_me:12904: \$? = $ac_status" >&5
+  echo "$as_me:12929: \$? = $ac_status" >&5

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

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

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

-  echo "$as_me:12910: \$? = $ac_status" >&5
+  echo "$as_me:12935: \$? = $ac_status" >&5

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


@@ -12917,7 +12942,7 @@ with_pthread=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
            LIBS="$cf_save_LIBS"
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
            LIBS="$cf_save_LIBS"

-           echo "$as_me:12920: result: $with_pthread" >&5
+           echo "$as_me:12945: result: $with_pthread" >&5

 echo "${ECHO_T}$with_pthread" >&6
            test "$with_pthread" = yes && break
        done
 echo "${ECHO_T}$with_pthread" >&6
            test "$with_pthread" = yes && break
        done


@@ -12945,7 +12970,7 @@ cat >>confdefs.h <<\EOF
 EOF
 
        else
 EOF
 
        else

-           { { echo "$as_me:12948: error: Cannot link with pthread library" >&5
+           { { echo "$as_me:12973: error: Cannot link with pthread library" >&5

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


@@ -12955,13 +12980,13 @@ fi
 fi
 
 if test "x$with_pthread" != xno; then
 fi
 
 if test "x$with_pthread" != xno; then

-       echo "$as_me:12958: checking for pthread_kill" >&5
+       echo "$as_me:12983: checking for pthread_kill" >&5

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

-#line 12964 "configure"
+#line 12989 "configure"

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


@@ -12992,16 +13017,16 @@ f = pthread_kill; /* workaround for ICC 12.0.3 */ if (f == 0) return 1;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext

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

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

-  echo "$as_me:12998: \$? = $ac_status" >&5
+  echo "$as_me:13023: \$? = $ac_status" >&5

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

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

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

-  echo "$as_me:13004: \$? = $ac_status" >&5
+  echo "$as_me:13029: \$? = $ac_status" >&5

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


@@ -13011,11 +13036,11 @@ ac_cv_func_pthread_kill=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi

-echo "$as_me:13014: result: $ac_cv_func_pthread_kill" >&5
+echo "$as_me:13039: result: $ac_cv_func_pthread_kill" >&5

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

-               echo "$as_me:13018: checking if you want to allow EINTR in wgetch with pthreads" >&5
+               echo "$as_me:13043: checking if you want to allow EINTR in wgetch with pthreads" >&5

 echo $ECHO_N "checking if you want to allow EINTR in wgetch with pthreads... $ECHO_C" >&6
 
 # Check whether --enable-pthreads-eintr or --disable-pthreads-eintr was given.
 echo $ECHO_N "checking if you want to allow EINTR in wgetch with pthreads... $ECHO_C" >&6
 
 # Check whether --enable-pthreads-eintr or --disable-pthreads-eintr was given.


@@ -13025,7 +13050,7 @@ if test "${enable_pthreads_eintr+set}" = set; then
 else
   use_pthreads_eintr=no
 fi;
 else
   use_pthreads_eintr=no
 fi;

-               echo "$as_me:13028: result: $use_pthreads_eintr" >&5
+               echo "$as_me:13053: result: $use_pthreads_eintr" >&5

 echo "${ECHO_T}$use_pthreads_eintr" >&6
                if test "x$use_pthreads_eintr" = xyes ; then
 
 echo "${ECHO_T}$use_pthreads_eintr" >&6
                if test "x$use_pthreads_eintr" = xyes ; then
 


@@ -13036,7 +13061,7 @@ EOF
                fi
 fi
 
                fi
 fi
 

-       echo "$as_me:13039: checking if you want to use weak-symbols for pthreads" >&5
+       echo "$as_me:13064: checking if you want to use weak-symbols for pthreads" >&5

 echo $ECHO_N "checking if you want to use weak-symbols for pthreads... $ECHO_C" >&6
 
 # Check whether --enable-weak-symbols or --disable-weak-symbols was given.
 echo $ECHO_N "checking if you want to use weak-symbols for pthreads... $ECHO_C" >&6
 
 # Check whether --enable-weak-symbols or --disable-weak-symbols was given.


@@ -13046,18 +13071,18 @@ if test "${enable_weak_symbols+set}" = set; then
 else
   use_weak_symbols=no
 fi;
 else
   use_weak_symbols=no
 fi;

-       echo "$as_me:13049: result: $use_weak_symbols" >&5
+       echo "$as_me:13074: result: $use_weak_symbols" >&5

 echo "${ECHO_T}$use_weak_symbols" >&6
        if test "x$use_weak_symbols" = xyes ; then
 
 echo "${ECHO_T}$use_weak_symbols" >&6
        if test "x$use_weak_symbols" = xyes ; then
 

-echo "$as_me:13053: checking if $CC supports weak symbols" >&5
+echo "$as_me:13078: checking if $CC supports weak symbols" >&5

 echo $ECHO_N "checking if $CC supports weak symbols... $ECHO_C" >&6
 if test "${cf_cv_weak_symbols+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 cat >conftest.$ac_ext <<_ACEOF
 echo $ECHO_N "checking if $CC supports weak symbols... $ECHO_C" >&6
 if test "${cf_cv_weak_symbols+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 cat >conftest.$ac_ext <<_ACEOF

-#line 13060 "configure"
+#line 13085 "configure"

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


@@ -13083,16 +13108,16 @@ weak_symbol(fopen);
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

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

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

-  echo "$as_me:13089: \$? = $ac_status" >&5
+  echo "$as_me:13114: \$? = $ac_status" >&5

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

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

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

-  echo "$as_me:13095: \$? = $ac_status" >&5
+  echo "$as_me:13120: \$? = $ac_status" >&5

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


@@ -13103,7 +13128,7 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi

-echo "$as_me:13106: result: $cf_cv_weak_symbols" >&5
+echo "$as_me:13131: result: $cf_cv_weak_symbols" >&5

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


@@ -13136,7 +13161,7 @@ fi
 # opaque outside of that, so there is no --enable-opaque option.  We can use
 # this option without --with-pthreads, but this will be always set for
 # pthreads.
 # opaque outside of that, so there is no --enable-opaque option.  We can use
 # this option without --with-pthreads, but this will be always set for
 # pthreads.

-echo "$as_me:13139: checking if you want reentrant code" >&5
+echo "$as_me:13164: checking if you want reentrant code" >&5

 echo $ECHO_N "checking if you want reentrant code... $ECHO_C" >&6
 
 # Check whether --enable-reentrant or --disable-reentrant was given.
 echo $ECHO_N "checking if you want reentrant code... $ECHO_C" >&6
 
 # Check whether --enable-reentrant or --disable-reentrant was given.


@@ -13146,7 +13171,7 @@ if test "${enable_reentrant+set}" = set; then
 else
   with_reentrant=no
 fi;
 else
   with_reentrant=no
 fi;

-echo "$as_me:13149: result: $with_reentrant" >&5
+echo "$as_me:13174: result: $with_reentrant" >&5

 echo "${ECHO_T}$with_reentrant" >&6
 if test "x$with_reentrant" = xyes ; then
        cf_cv_enable_reentrant=1
 echo "${ECHO_T}$with_reentrant" >&6
 if test "x$with_reentrant" = xyes ; then
        cf_cv_enable_reentrant=1


@@ -13218,7 +13243,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:13221: WARNING: overriding ABI version to $cf_cv_abi_version" >&5
+               { echo "$as_me:13246: 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


@@ -13230,7 +13255,7 @@ else
        NCURSES_SIZE_T=short
 fi
 
        NCURSES_SIZE_T=short
 fi
 

-echo "$as_me:13233: checking if you want opaque curses-library structures" >&5
+echo "$as_me:13258: checking if you want opaque curses-library structures" >&5

 echo $ECHO_N "checking if you want opaque curses-library structures... $ECHO_C" >&6
 
 # Check whether --enable-opaque-curses or --disable-opaque-curses was given.
 echo $ECHO_N "checking if you want opaque curses-library structures... $ECHO_C" >&6
 
 # Check whether --enable-opaque-curses or --disable-opaque-curses was given.


@@ -13252,16 +13277,16 @@ else
         test "$cf_cv_enable_reentrant" = 1 || enable_opaque_curses=no
 
 fi;
         test "$cf_cv_enable_reentrant" = 1 || enable_opaque_curses=no
 
 fi;

-echo "$as_me:13255: result: $enable_opaque_curses" >&5
+echo "$as_me:13280: result: $enable_opaque_curses" >&5

 echo "${ECHO_T}$enable_opaque_curses" >&6
 
 test "$cf_cv_enable_reentrant" = 1 && \
 test "$enable_opaque_curses" = no && \
 echo "${ECHO_T}$enable_opaque_curses" >&6
 
 test "$cf_cv_enable_reentrant" = 1 && \
 test "$enable_opaque_curses" = no && \

-{ { echo "$as_me:13260: error: reentrant configuration requires opaque library" >&5
+{ { echo "$as_me:13285: error: reentrant configuration requires opaque library" >&5

 echo "$as_me: error: reentrant configuration requires opaque library" >&2;}
    { (exit 1); exit 1; }; }
 
 echo "$as_me: error: reentrant configuration requires opaque library" >&2;}
    { (exit 1); exit 1; }; }
 

-echo "$as_me:13264: checking if you want opaque form-library structures" >&5
+echo "$as_me:13289: checking if you want opaque form-library structures" >&5

 echo $ECHO_N "checking if you want opaque form-library structures... $ECHO_C" >&6
 
 # Check whether --enable-opaque-form or --disable-opaque-form was given.
 echo $ECHO_N "checking if you want opaque form-library structures... $ECHO_C" >&6
 
 # Check whether --enable-opaque-form or --disable-opaque-form was given.


@@ -13271,10 +13296,10 @@ if test "${enable_opaque_form+set}" = set; then
 else
   enable_opaque_form=no
 fi;
 else
   enable_opaque_form=no
 fi;

-echo "$as_me:13274: result: $enable_opaque_form" >&5
+echo "$as_me:13299: result: $enable_opaque_form" >&5

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

-echo "$as_me:13277: checking if you want opaque menu-library structures" >&5
+echo "$as_me:13302: checking if you want opaque menu-library structures" >&5

 echo $ECHO_N "checking if you want opaque menu-library structures... $ECHO_C" >&6
 
 # Check whether --enable-opaque-menu or --disable-opaque-menu was given.
 echo $ECHO_N "checking if you want opaque menu-library structures... $ECHO_C" >&6
 
 # Check whether --enable-opaque-menu or --disable-opaque-menu was given.


@@ -13284,10 +13309,10 @@ if test "${enable_opaque_menu+set}" = set; then
 else
   enable_opaque_menu=no
 fi;
 else
   enable_opaque_menu=no
 fi;

-echo "$as_me:13287: result: $enable_opaque_menu" >&5
+echo "$as_me:13312: result: $enable_opaque_menu" >&5

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

-echo "$as_me:13290: checking if you want opaque panel-library structures" >&5
+echo "$as_me:13315: checking if you want opaque panel-library structures" >&5

 echo $ECHO_N "checking if you want opaque panel-library structures... $ECHO_C" >&6
 
 # Check whether --enable-opaque-panel or --disable-opaque-panel was given.
 echo $ECHO_N "checking if you want opaque panel-library structures... $ECHO_C" >&6
 
 # Check whether --enable-opaque-panel or --disable-opaque-panel was given.


@@ -13297,7 +13322,7 @@ if test "${enable_opaque_panel+set}" = set; then
 else
   enable_opaque_panel=no
 fi;
 else
   enable_opaque_panel=no
 fi;

-echo "$as_me:13300: result: $enable_opaque_panel" >&5
+echo "$as_me:13325: result: $enable_opaque_panel" >&5

 echo "${ECHO_T}$enable_opaque_panel" >&6
 
 NCURSES_OPAQUE=0;              test "$enable_opaque_curses" = yes && NCURSES_OPAQUE=1
 echo "${ECHO_T}$enable_opaque_panel" >&6
 
 NCURSES_OPAQUE=0;              test "$enable_opaque_curses" = yes && NCURSES_OPAQUE=1


@@ -13307,7 +13332,7 @@ NCURSES_OPAQUE_PANEL=0; test "$enable_opaque_panel"  = yes && NCURSES_OPAQUE_PAN
 
 ### Allow using a different wrap-prefix
 if test "$cf_cv_enable_reentrant" != 0 || test "$BROKEN_LINKER" = 1 ; then
 
 ### Allow using a different wrap-prefix
 if test "$cf_cv_enable_reentrant" != 0 || test "$BROKEN_LINKER" = 1 ; then

-       echo "$as_me:13310: checking for prefix used to wrap public variables" >&5
+       echo "$as_me:13335: checking for prefix used to wrap public variables" >&5

 echo $ECHO_N "checking for prefix used to wrap public variables... $ECHO_C" >&6
 
 # Check whether --with-wrap-prefix or --without-wrap-prefix was given.
 echo $ECHO_N "checking for prefix used to wrap public variables... $ECHO_C" >&6
 
 # Check whether --with-wrap-prefix or --without-wrap-prefix was given.


@@ -13317,7 +13342,7 @@ if test "${with_wrap_prefix+set}" = set; then
 else
   NCURSES_WRAP_PREFIX=_nc_
 fi;
 else
   NCURSES_WRAP_PREFIX=_nc_
 fi;

-       echo "$as_me:13320: result: $NCURSES_WRAP_PREFIX" >&5
+       echo "$as_me:13345: result: $NCURSES_WRAP_PREFIX" >&5

 echo "${ECHO_T}$NCURSES_WRAP_PREFIX" >&6
 else
        NCURSES_WRAP_PREFIX=_nc_
 echo "${ECHO_T}$NCURSES_WRAP_PREFIX" >&6
 else
        NCURSES_WRAP_PREFIX=_nc_


@@ -13330,7 +13355,7 @@ EOF
 ###############################################################################
 # These options are relatively safe to experiment with.
 
 ###############################################################################
 # These options are relatively safe to experiment with.
 

-echo "$as_me:13333: checking if you want all development code" >&5
+echo "$as_me:13358: 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.


@@ -13340,11 +13365,11 @@ if test "${with_develop+set}" = set; then
 else
   with_develop=no
 fi;
 else
   with_develop=no
 fi;

-echo "$as_me:13343: result: $with_develop" >&5
+echo "$as_me:13368: 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:13347: checking if you want hard-tabs code" >&5
+echo "$as_me:13372: 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.


@@ -13354,7 +13379,7 @@ if test "${enable_hard_tabs+set}" = set; then
 else
   enable_hard_tabs=$with_develop
 fi;
 else
   enable_hard_tabs=$with_develop
 fi;

-echo "$as_me:13357: result: $enable_hard_tabs" >&5
+echo "$as_me:13382: result: $enable_hard_tabs" >&5

 echo "${ECHO_T}$enable_hard_tabs" >&6
 test "x$enable_hard_tabs" = xyes &&
 cat >>confdefs.h <<\EOF
 echo "${ECHO_T}$enable_hard_tabs" >&6
 test "x$enable_hard_tabs" = xyes &&
 cat >>confdefs.h <<\EOF


@@ -13362,7 +13387,7 @@ cat >>confdefs.h <<\EOF
 EOF
 
 ###   use option --enable-xmc-glitch to turn on use of magic-cookie optimize
 EOF
 
 ###   use option --enable-xmc-glitch to turn on use of magic-cookie optimize

-echo "$as_me:13365: checking if you want limited support for xmc" >&5
+echo "$as_me:13390: 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.


@@ -13372,7 +13397,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:13375: result: $enable_xmc_glitch" >&5
+echo "$as_me:13400: result: $enable_xmc_glitch" >&5

 echo "${ECHO_T}$enable_xmc_glitch" >&6
 test "x$enable_xmc_glitch" = xyes &&
 cat >>confdefs.h <<\EOF
 echo "${ECHO_T}$enable_xmc_glitch" >&6
 test "x$enable_xmc_glitch" = xyes &&
 cat >>confdefs.h <<\EOF


@@ -13382,7 +13407,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:13385: checking if you do not want to assume colors are white-on-black" >&5
+echo "$as_me:13410: 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.


@@ -13392,7 +13417,7 @@ if test "${enable_assumed_color+set}" = set; then
 else
   with_assumed_color=yes
 fi;
 else
   with_assumed_color=yes
 fi;

-echo "$as_me:13395: result: $with_assumed_color" >&5
+echo "$as_me:13420: result: $with_assumed_color" >&5

 echo "${ECHO_T}$with_assumed_color" >&6
 test "x$with_assumed_color" = xyes &&
 cat >>confdefs.h <<\EOF
 echo "${ECHO_T}$with_assumed_color" >&6
 test "x$with_assumed_color" = xyes &&
 cat >>confdefs.h <<\EOF


@@ -13400,7 +13425,7 @@ cat >>confdefs.h <<\EOF
 EOF
 
 ###   use option --enable-hashmap to turn on use of hashmap scrolling logic
 EOF
 
 ###   use option --enable-hashmap to turn on use of hashmap scrolling logic

-echo "$as_me:13403: checking if you want hashmap scrolling-optimization code" >&5
+echo "$as_me:13428: 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.


@@ -13410,7 +13435,7 @@ if test "${enable_hashmap+set}" = set; then
 else
   with_hashmap=yes
 fi;
 else
   with_hashmap=yes
 fi;

-echo "$as_me:13413: result: $with_hashmap" >&5
+echo "$as_me:13438: result: $with_hashmap" >&5

 echo "${ECHO_T}$with_hashmap" >&6
 test "x$with_hashmap" = xyes &&
 cat >>confdefs.h <<\EOF
 echo "${ECHO_T}$with_hashmap" >&6
 test "x$with_hashmap" = xyes &&
 cat >>confdefs.h <<\EOF


@@ -13418,7 +13443,7 @@ cat >>confdefs.h <<\EOF
 EOF
 
 ###   use option --enable-colorfgbg to turn on use of $COLORFGBG environment
 EOF
 
 ###   use option --enable-colorfgbg to turn on use of $COLORFGBG environment

-echo "$as_me:13421: checking if you want colorfgbg code" >&5
+echo "$as_me:13446: 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.


@@ -13428,7 +13453,7 @@ if test "${enable_colorfgbg+set}" = set; then
 else
   with_colorfgbg=no
 fi;
 else
   with_colorfgbg=no
 fi;

-echo "$as_me:13431: result: $with_colorfgbg" >&5
+echo "$as_me:13456: result: $with_colorfgbg" >&5

 echo "${ECHO_T}$with_colorfgbg" >&6
 test "x$with_colorfgbg" = xyes &&
 cat >>confdefs.h <<\EOF
 echo "${ECHO_T}$with_colorfgbg" >&6
 test "x$with_colorfgbg" = xyes &&
 cat >>confdefs.h <<\EOF


@@ -13436,7 +13461,7 @@ cat >>confdefs.h <<\EOF
 EOF
 
 ###   use option --enable-interop to turn on use of bindings used for interop
 EOF
 
 ###   use option --enable-interop to turn on use of bindings used for interop

-echo "$as_me:13439: checking if you want interop bindings" >&5
+echo "$as_me:13464: checking if you want interop bindings" >&5

 echo $ECHO_N "checking if you want interop bindings... $ECHO_C" >&6
 
 # Check whether --enable-interop or --disable-interop was given.
 echo $ECHO_N "checking if you want interop bindings... $ECHO_C" >&6
 
 # Check whether --enable-interop or --disable-interop was given.


@@ -13446,13 +13471,13 @@ if test "${enable_interop+set}" = set; then
 else
   with_exp_interop=$cf_dft_interop
 fi;
 else
   with_exp_interop=$cf_dft_interop
 fi;

-echo "$as_me:13449: result: $with_exp_interop" >&5
+echo "$as_me:13474: result: $with_exp_interop" >&5

 echo "${ECHO_T}$with_exp_interop" >&6
 
 NCURSES_INTEROP_FUNCS=0
 test "x$with_exp_interop" = xyes && NCURSES_INTEROP_FUNCS=1
 
 echo "${ECHO_T}$with_exp_interop" >&6
 
 NCURSES_INTEROP_FUNCS=0
 test "x$with_exp_interop" = xyes && NCURSES_INTEROP_FUNCS=1
 

-echo "$as_me:13455: checking if you want experimental safe-sprintf code" >&5
+echo "$as_me:13480: 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.


@@ -13462,7 +13487,7 @@ if test "${enable_safe_sprintf+set}" = set; then
 else
   with_safe_sprintf=no
 fi;
 else
   with_safe_sprintf=no
 fi;

-echo "$as_me:13465: result: $with_safe_sprintf" >&5
+echo "$as_me:13490: result: $with_safe_sprintf" >&5

 echo "${ECHO_T}$with_safe_sprintf" >&6
 test "x$with_safe_sprintf" = xyes &&
 cat >>confdefs.h <<\EOF
 echo "${ECHO_T}$with_safe_sprintf" >&6
 test "x$with_safe_sprintf" = xyes &&
 cat >>confdefs.h <<\EOF


@@ -13472,7 +13497,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:13475: checking if you want to experiment without scrolling-hints code" >&5
+echo "$as_me:13500: 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.


@@ -13482,7 +13507,7 @@ if test "${enable_scroll_hints+set}" = set; then
 else
   with_scroll_hints=yes
 fi;
 else
   with_scroll_hints=yes
 fi;

-echo "$as_me:13485: result: $with_scroll_hints" >&5
+echo "$as_me:13510: result: $with_scroll_hints" >&5

 echo "${ECHO_T}$with_scroll_hints" >&6
 test "x$with_scroll_hints" = xyes &&
 cat >>confdefs.h <<\EOF
 echo "${ECHO_T}$with_scroll_hints" >&6
 test "x$with_scroll_hints" = xyes &&
 cat >>confdefs.h <<\EOF


@@ -13491,7 +13516,7 @@ EOF
 
 fi
 
 
 fi
 

-echo "$as_me:13494: checking if you want wgetch-events code" >&5
+echo "$as_me:13519: checking if you want wgetch-events code" >&5

 echo $ECHO_N "checking if you want wgetch-events code... $ECHO_C" >&6
 
 # Check whether --enable-wgetch-events or --disable-wgetch-events was given.
 echo $ECHO_N "checking if you want wgetch-events code... $ECHO_C" >&6
 
 # Check whether --enable-wgetch-events or --disable-wgetch-events was given.


@@ -13501,7 +13526,7 @@ if test "${enable_wgetch_events+set}" = set; then
 else
   with_wgetch_events=no
 fi;
 else
   with_wgetch_events=no
 fi;

-echo "$as_me:13504: result: $with_wgetch_events" >&5
+echo "$as_me:13529: result: $with_wgetch_events" >&5

 echo "${ECHO_T}$with_wgetch_events" >&6
 test "x$with_wgetch_events" = xyes &&
 cat >>confdefs.h <<\EOF
 echo "${ECHO_T}$with_wgetch_events" >&6
 test "x$with_wgetch_events" = xyes &&
 cat >>confdefs.h <<\EOF


@@ -13512,7 +13537,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:13515: checking if you want to see long compiling messages" >&5
+echo "$as_me:13540: checking if you want to see long compiling messages" >&5

 echo $ECHO_N "checking if you want to see long compiling messages... $ECHO_C" >&6
 
 # Check whether --enable-echo or --disable-echo was given.
 echo $ECHO_N "checking if you want to see long compiling messages... $ECHO_C" >&6
 
 # Check whether --enable-echo or --disable-echo was given.


@@ -13546,7 +13571,7 @@ else
        ECHO_CC=''
 
 fi;
        ECHO_CC=''
 
 fi;

-echo "$as_me:13549: result: $enableval" >&5
+echo "$as_me:13574: result: $enableval" >&5

 echo "${ECHO_T}$enableval" >&6
 
 if test "x$enable_echo" = xyes; then
 echo "${ECHO_T}$enableval" >&6
 
 if test "x$enable_echo" = xyes; then


@@ -13558,7 +13583,7 @@ else
 fi
 
 ###    use option --enable-warnings to turn on all gcc warnings
 fi
 
 ###    use option --enable-warnings to turn on all gcc warnings

-echo "$as_me:13561: checking if you want to see compiler warnings" >&5
+echo "$as_me:13586: 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.


@@ -13566,7 +13591,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:13569: result: $with_warnings" >&5
+echo "$as_me:13594: 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


@@ -13578,12 +13603,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:13581: checking if this is really Intel C compiler" >&5
+               echo "$as_me:13606: 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 13586 "configure"
+#line 13611 "configure"

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


@@ -13600,16 +13625,16 @@ make an error
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

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

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

-  echo "$as_me:13606: \$? = $ac_status" >&5
+  echo "$as_me:13631: \$? = $ac_status" >&5

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

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

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

-  echo "$as_me:13612: \$? = $ac_status" >&5
+  echo "$as_me:13637: \$? = $ac_status" >&5

   (exit $ac_status); }; }; then
   INTEL_COMPILER=yes
 cf_save_CFLAGS="$cf_save_CFLAGS -we147"
   (exit $ac_status); }; }; then
   INTEL_COMPILER=yes
 cf_save_CFLAGS="$cf_save_CFLAGS -we147"


@@ -13620,7 +13645,7 @@ 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:13623: result: $INTEL_COMPILER" >&5
+               echo "$as_me:13648: result: $INTEL_COMPILER" >&5

 echo "${ECHO_T}$INTEL_COMPILER" >&6
                ;;
        esac
 echo "${ECHO_T}$INTEL_COMPILER" >&6
                ;;
        esac


@@ -13629,12 +13654,12 @@ fi
 CLANG_COMPILER=no
 
 if test "$GCC" = yes ; then
 CLANG_COMPILER=no
 
 if test "$GCC" = yes ; then

-       echo "$as_me:13632: checking if this is really Clang C compiler" >&5
+       echo "$as_me:13657: checking if this is really Clang C compiler" >&5

 echo $ECHO_N "checking if this is really Clang C compiler... $ECHO_C" >&6
        cf_save_CFLAGS="$CFLAGS"
        CFLAGS="$CFLAGS -Qunused-arguments"
        cat >conftest.$ac_ext <<_ACEOF
 echo $ECHO_N "checking if this is really Clang C compiler... $ECHO_C" >&6
        cf_save_CFLAGS="$CFLAGS"
        CFLAGS="$CFLAGS -Qunused-arguments"
        cat >conftest.$ac_ext <<_ACEOF

-#line 13637 "configure"
+#line 13662 "configure"

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


@@ -13651,16 +13676,16 @@ make an error
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

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

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

-  echo "$as_me:13657: \$? = $ac_status" >&5
+  echo "$as_me:13682: \$? = $ac_status" >&5

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

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

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

-  echo "$as_me:13663: \$? = $ac_status" >&5
+  echo "$as_me:13688: \$? = $ac_status" >&5

   (exit $ac_status); }; }; then
   CLANG_COMPILER=yes
 cf_save_CFLAGS="$cf_save_CFLAGS -Qunused-arguments"
   (exit $ac_status); }; }; then
   CLANG_COMPILER=yes
 cf_save_CFLAGS="$cf_save_CFLAGS -Qunused-arguments"


@@ -13671,12 +13696,12 @@ 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:13674: result: $CLANG_COMPILER" >&5
+       echo "$as_me:13699: result: $CLANG_COMPILER" >&5

 echo "${ECHO_T}$CLANG_COMPILER" >&6
 fi
 
 cat > conftest.$ac_ext <<EOF
 echo "${ECHO_T}$CLANG_COMPILER" >&6
 fi
 
 cat > conftest.$ac_ext <<EOF

-#line 13679 "${as_me:-configure}"
+#line 13704 "${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
 


@@ -13693,7 +13718,7 @@ then
 # remark #981: operands are evaluated in unspecified order
 # warning #279: controlling expression is constant
 
 # remark #981: operands are evaluated in unspecified order
 # warning #279: controlling expression is constant
 

-       { echo "$as_me:13696: checking for $CC warning options..." >&5
+       { echo "$as_me:13721: 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"


@@ -13709,12 +13734,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:13712: \"$ac_compile\"") >&5
+               if { (eval echo "$as_me:13737: \"$ac_compile\"") >&5

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

-  echo "$as_me:13715: \$? = $ac_status" >&5
+  echo "$as_me:13740: \$? = $ac_status" >&5

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

-                       test -n "$verbose" && echo "$as_me:13717: result: ... -$cf_opt" >&5
+                       test -n "$verbose" && echo "$as_me:13742: 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


@@ -13723,7 +13748,7 @@ echo "${ECHO_T}... -$cf_opt" >&6
 
 elif test "$GCC" = yes
 then
 
 elif test "$GCC" = yes
 then

-       { echo "$as_me:13726: checking for $CC warning options..." >&5
+       { echo "$as_me:13751: checking for $CC warning options..." >&5

 echo "$as_me: checking for $CC warning options..." >&6;}
        cf_save_CFLAGS="$CFLAGS"
        EXTRA_CFLAGS=
 echo "$as_me: checking for $CC warning options..." >&6;}
        cf_save_CFLAGS="$CFLAGS"
        EXTRA_CFLAGS=


@@ -13747,12 +13772,12 @@ echo "$as_me: checking for $CC warning options..." >&6;}
                Wundef $cf_gcc_warnings $cf_warn_CONST Wno-unknown-pragmas Wswitch-enum
        do
                CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt"
                Wundef $cf_gcc_warnings $cf_warn_CONST Wno-unknown-pragmas Wswitch-enum
        do
                CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt"

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

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

-  echo "$as_me:13753: \$? = $ac_status" >&5
+  echo "$as_me:13778: \$? = $ac_status" >&5

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

-                       test -n "$verbose" && echo "$as_me:13755: result: ... -$cf_opt" >&5
+                       test -n "$verbose" && echo "$as_me:13780: result: ... -$cf_opt" >&5

 echo "${ECHO_T}... -$cf_opt" >&6
                        case $cf_opt in
                        (Wcast-qual)
 echo "${ECHO_T}... -$cf_opt" >&6
                        case $cf_opt in
                        (Wcast-qual)


@@ -13763,7 +13788,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}:13766: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
+echo "${as_me:-configure}:13791: testing feature is broken in gcc $GCC_VERSION ..." 1>&5

 
                                        continue;;
                                esac
 
                                        continue;;
                                esac


@@ -13773,7 +13798,7 @@ echo "${as_me:-configure}:13766: testing feature is broken in gcc $GCC_VERSION .
                                ([12].*)
                                        test -n "$verbose" && echo "    feature is broken in gcc $GCC_VERSION" 1>&6
 
                                ([12].*)
                                        test -n "$verbose" && echo "    feature is broken in gcc $GCC_VERSION" 1>&6
 

-echo "${as_me:-configure}:13776: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
+echo "${as_me:-configure}:13801: testing feature is broken in gcc $GCC_VERSION ..." 1>&5

 
                                        continue;;
                                esac
 
                                        continue;;
                                esac


@@ -13793,12 +13818,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:13796: checking if this is really Intel C++ compiler" >&5
+               echo "$as_me:13821: 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 13801 "configure"
+#line 13826 "configure"

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


@@ -13815,16 +13840,16 @@ make an error
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

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

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

-  echo "$as_me:13821: \$? = $ac_status" >&5
+  echo "$as_me:13846: \$? = $ac_status" >&5

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

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

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

-  echo "$as_me:13827: \$? = $ac_status" >&5
+  echo "$as_me:13852: \$? = $ac_status" >&5

   (exit $ac_status); }; }; then
   INTEL_CPLUSPLUS=yes
 cf_save_CFLAGS="$cf_save_CFLAGS -we147"
   (exit $ac_status); }; }; then
   INTEL_CPLUSPLUS=yes
 cf_save_CFLAGS="$cf_save_CFLAGS -we147"


@@ -13835,7 +13860,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:13838: result: $INTEL_CPLUSPLUS" >&5
+               echo "$as_me:13863: result: $INTEL_CPLUSPLUS" >&5

 echo "${ECHO_T}$INTEL_CPLUSPLUS" >&6
                ;;
        esac
 echo "${ECHO_T}$INTEL_CPLUSPLUS" >&6
                ;;
        esac


@@ -13844,12 +13869,12 @@ fi
 CLANG_CPLUSPLUS=no
 
 if test "$GCC" = yes ; then
 CLANG_CPLUSPLUS=no
 
 if test "$GCC" = yes ; then

-       echo "$as_me:13847: checking if this is really Clang C++ compiler" >&5
+       echo "$as_me:13872: checking if this is really Clang C++ compiler" >&5

 echo $ECHO_N "checking if this is really Clang C++ compiler... $ECHO_C" >&6
        cf_save_CFLAGS="$CXXFLAGS"
        CXXFLAGS="$CXXFLAGS -Qunused-arguments"
        cat >conftest.$ac_ext <<_ACEOF
 echo $ECHO_N "checking if this is really Clang C++ compiler... $ECHO_C" >&6
        cf_save_CFLAGS="$CXXFLAGS"
        CXXFLAGS="$CXXFLAGS -Qunused-arguments"
        cat >conftest.$ac_ext <<_ACEOF

-#line 13852 "configure"
+#line 13877 "configure"

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


@@ -13866,16 +13891,16 @@ make an error
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

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

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

-  echo "$as_me:13872: \$? = $ac_status" >&5
+  echo "$as_me:13897: \$? = $ac_status" >&5

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

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

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

-  echo "$as_me:13878: \$? = $ac_status" >&5
+  echo "$as_me:13903: \$? = $ac_status" >&5

   (exit $ac_status); }; }; then
   CLANG_CPLUSPLUS=yes
 cf_save_CFLAGS="$cf_save_CFLAGS -Qunused-arguments"
   (exit $ac_status); }; }; then
   CLANG_CPLUSPLUS=yes
 cf_save_CFLAGS="$cf_save_CFLAGS -Qunused-arguments"


@@ -13886,7 +13911,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:13889: result: $CLANG_CPLUSPLUS" >&5
+       echo "$as_me:13914: result: $CLANG_CPLUSPLUS" >&5

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


@@ -13898,7 +13923,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 13901 "configure"
+#line 13926 "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
 


@@ -13916,7 +13941,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:13919: checking for $CC warning options..." >&5
+       { echo "$as_me:13944: 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"


@@ -13933,12 +13958,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:13936: \"$ac_compile\"") >&5
+               if { (eval echo "$as_me:13961: \"$ac_compile\"") >&5

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

-  echo "$as_me:13939: \$? = $ac_status" >&5
+  echo "$as_me:13964: \$? = $ac_status" >&5

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

-                       test -n "$verbose" && echo "$as_me:13941: result: ... -$cf_opt" >&5
+                       test -n "$verbose" && echo "$as_me:13966: 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


@@ -13947,7 +13972,7 @@ echo "${ECHO_T}... -$cf_opt" >&6
 
 elif test "$GXX" = yes
 then
 
 elif test "$GXX" = yes
 then

-       { echo "$as_me:13950: checking for $CXX warning options..." >&5
+       { echo "$as_me:13975: 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"


@@ -13977,16 +14002,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:13980: \"$ac_compile\"") >&5
+               if { (eval echo "$as_me:14005: \"$ac_compile\"") >&5

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

-  echo "$as_me:13983: \$? = $ac_status" >&5
+  echo "$as_me:14008: \$? = $ac_status" >&5

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

-                       test -n "$verbose" && echo "$as_me:13985: result: ... -$cf_opt" >&5
+                       test -n "$verbose" && echo "$as_me:14010: 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:13989: result: ... no -$cf_opt" >&5
+                       test -n "$verbose" && echo "$as_me:14014: result: ... no -$cf_opt" >&5

 echo "${ECHO_T}... no -$cf_opt" >&6
                fi
        done
 echo "${ECHO_T}... no -$cf_opt" >&6
                fi
        done


@@ -14022,10 +14047,10 @@ cat > conftest.i <<EOF
 EOF
 if test "$GCC" = yes
 then
 EOF
 if test "$GCC" = yes
 then

-       { echo "$as_me:14025: checking for $CC __attribute__ directives..." >&5
+       { echo "$as_me:14050: 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 14028 "${as_me:-configure}"
+#line 14053 "${as_me:-configure}"

 #include "confdefs.h"
 #include "conftest.h"
 #include "conftest.i"
 #include "confdefs.h"
 #include "conftest.h"
 #include "conftest.i"


@@ -14074,12 +14099,12 @@ EOF
                        ;;
                esac
 
                        ;;
                esac
 

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

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

-  echo "$as_me:14080: \$? = $ac_status" >&5
+  echo "$as_me:14105: \$? = $ac_status" >&5

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

-                       test -n "$verbose" && echo "$as_me:14082: result: ... $cf_attribute" >&5
+                       test -n "$verbose" && echo "$as_me:14107: result: ... $cf_attribute" >&5

 echo "${ECHO_T}... $cf_attribute" >&6
                        cat conftest.h >>confdefs.h
                        case $cf_attribute in
 echo "${ECHO_T}... $cf_attribute" >&6
                        cat conftest.h >>confdefs.h
                        case $cf_attribute in


@@ -14138,7 +14163,7 @@ fi
 rm -rf conftest*
 fi
 
 rm -rf conftest*
 fi
 

-echo "$as_me:14141: checking if you want to work around bogus compiler/loader warnings" >&5
+echo "$as_me:14166: checking if you want to work around bogus compiler/loader warnings" >&5

 echo $ECHO_N "checking if you want to work around bogus compiler/loader warnings... $ECHO_C" >&6
 
 # Check whether --enable-string-hacks or --disable-string-hacks was given.
 echo $ECHO_N "checking if you want to work around bogus compiler/loader warnings... $ECHO_C" >&6
 
 # Check whether --enable-string-hacks or --disable-string-hacks was given.


@@ -14148,7 +14173,7 @@ if test "${enable_string_hacks+set}" = set; then
 else
   with_string_hacks=no
 fi;
 else
   with_string_hacks=no
 fi;

-echo "$as_me:14151: result: $with_string_hacks" >&5
+echo "$as_me:14176: result: $with_string_hacks" >&5

 echo "${ECHO_T}$with_string_hacks" >&6
 
 if test "x$with_string_hacks" = "xyes"; then
 echo "${ECHO_T}$with_string_hacks" >&6
 
 if test "x$with_string_hacks" = "xyes"; then


@@ -14157,15 +14182,15 @@ cat >>confdefs.h <<\EOF
 #define USE_STRING_HACKS 1
 EOF
 
 #define USE_STRING_HACKS 1
 EOF
 

-       { echo "$as_me:14160: WARNING: enabling string-hacks to work around bogus compiler/loader warnings" >&5
+       { echo "$as_me:14185: WARNING: enabling string-hacks to work around bogus compiler/loader warnings" >&5

 echo "$as_me: WARNING: enabling string-hacks to work around bogus compiler/loader warnings" >&2;}
 echo "$as_me: WARNING: enabling string-hacks to work around bogus compiler/loader warnings" >&2;}

-       echo "$as_me:14162: checking for strlcat" >&5
+       echo "$as_me:14187: checking for strlcat" >&5

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

-#line 14168 "configure"
+#line 14193 "configure"

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


@@ -14196,16 +14221,16 @@ f = strlcat; /* workaround for ICC 12.0.3 */ if (f == 0) return 1;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext

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

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

-  echo "$as_me:14202: \$? = $ac_status" >&5
+  echo "$as_me:14227: \$? = $ac_status" >&5

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

-  { (eval echo "$as_me:14205: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14230: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:14208: \$? = $ac_status" >&5
+  echo "$as_me:14233: \$? = $ac_status" >&5

   (exit $ac_status); }; }; then
   ac_cv_func_strlcat=yes
 else
   (exit $ac_status); }; }; then
   ac_cv_func_strlcat=yes
 else


@@ -14215,7 +14240,7 @@ ac_cv_func_strlcat=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi

-echo "$as_me:14218: result: $ac_cv_func_strlcat" >&5
+echo "$as_me:14243: result: $ac_cv_func_strlcat" >&5

 echo "${ECHO_T}$ac_cv_func_strlcat" >&6
 if test $ac_cv_func_strlcat = yes; then
 
 echo "${ECHO_T}$ac_cv_func_strlcat" >&6
 if test $ac_cv_func_strlcat = yes; then
 


@@ -14225,7 +14250,7 @@ EOF
 
 else
 
 
 else
 

-               echo "$as_me:14228: checking for strlcat in -lbsd" >&5
+               echo "$as_me:14253: checking for strlcat in -lbsd" >&5

 echo $ECHO_N "checking for strlcat in -lbsd... $ECHO_C" >&6
 if test "${ac_cv_lib_bsd_strlcat+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 echo $ECHO_N "checking for strlcat in -lbsd... $ECHO_C" >&6
 if test "${ac_cv_lib_bsd_strlcat+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6


@@ -14233,7 +14258,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 14236 "configure"
+#line 14261 "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.  */


@@ -14252,16 +14277,16 @@ strlcat ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext

-if { (eval echo "$as_me:14255: \"$ac_link\"") >&5
+if { (eval echo "$as_me:14280: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:14258: \$? = $ac_status" >&5
+  echo "$as_me:14283: \$? = $ac_status" >&5

   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'

-  { (eval echo "$as_me:14261: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14286: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:14264: \$? = $ac_status" >&5
+  echo "$as_me:14289: \$? = $ac_status" >&5

   (exit $ac_status); }; }; then
   ac_cv_lib_bsd_strlcat=yes
 else
   (exit $ac_status); }; }; then
   ac_cv_lib_bsd_strlcat=yes
 else


@@ -14272,7 +14297,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:14275: result: $ac_cv_lib_bsd_strlcat" >&5
+echo "$as_me:14300: result: $ac_cv_lib_bsd_strlcat" >&5

 echo "${ECHO_T}$ac_cv_lib_bsd_strlcat" >&6
 if test $ac_cv_lib_bsd_strlcat = yes; then
 
 echo "${ECHO_T}$ac_cv_lib_bsd_strlcat" >&6
 if test $ac_cv_lib_bsd_strlcat = yes; then
 


@@ -14295,23 +14320,23 @@ LIBS="$cf_add_libs"
 for ac_header in bsd/string.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
 for ac_header in bsd/string.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`

-echo "$as_me:14298: checking for $ac_header" >&5
+echo "$as_me:14323: 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 14304 "configure"
+#line 14329 "configure"

 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF

-if { (eval echo "$as_me:14308: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:14333: \"$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:14314: \$? = $ac_status" >&5
+  echo "$as_me:14339: \$? = $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


@@ -14330,7 +14355,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
 fi
 rm -f conftest.err conftest.$ac_ext
 fi

-echo "$as_me:14333: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:14358: 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


@@ -14351,13 +14376,13 @@ fi
 for ac_func in strlcpy snprintf
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
 for ac_func in strlcpy snprintf
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`

-echo "$as_me:14354: checking for $ac_func" >&5
+echo "$as_me:14379: 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 14360 "configure"
+#line 14385 "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.  */


@@ -14388,16 +14413,16 @@ f = $ac_func; /* workaround for ICC 12.0.3 */ if (f == 0) return 1;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext

-if { (eval echo "$as_me:14391: \"$ac_link\"") >&5
+if { (eval echo "$as_me:14416: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:14394: \$? = $ac_status" >&5
+  echo "$as_me:14419: \$? = $ac_status" >&5

   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'

-  { (eval echo "$as_me:14397: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14422: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:14400: \$? = $ac_status" >&5
+  echo "$as_me:14425: \$? = $ac_status" >&5

   (exit $ac_status); }; }; then
   eval "$as_ac_var=yes"
 else
   (exit $ac_status); }; }; then
   eval "$as_ac_var=yes"
 else


@@ -14407,7 +14432,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:14410: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "$as_me:14435: 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


@@ -14420,7 +14445,7 @@ done
 fi
 
 ###    use option --enable-assertions to turn on generation of assertion code
 fi
 
 ###    use option --enable-assertions to turn on generation of assertion code

-echo "$as_me:14423: checking if you want to enable runtime assertions" >&5
+echo "$as_me:14448: 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.


@@ -14430,7 +14455,7 @@ if test "${enable_assertions+set}" = set; then
 else
   with_assertions=no
 fi;
 else
   with_assertions=no
 fi;

-echo "$as_me:14433: result: $with_assertions" >&5
+echo "$as_me:14458: 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


@@ -14446,7 +14471,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:14449: checking if you want to use dmalloc for testing" >&5
+echo "$as_me:14474: 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.


@@ -14463,7 +14488,7 @@ EOF
 else
   with_dmalloc=
 fi;
 else
   with_dmalloc=
 fi;

-echo "$as_me:14466: result: ${with_dmalloc:-no}" >&5
+echo "$as_me:14491: result: ${with_dmalloc:-no}" >&5

 echo "${ECHO_T}${with_dmalloc:-no}" >&6
 
 case .$with_cflags in
 echo "${ECHO_T}${with_dmalloc:-no}" >&6
 
 case .$with_cflags in


@@ -14577,23 +14602,23 @@ fi
 esac
 
 if test "$with_dmalloc" = yes ; then
 esac
 
 if test "$with_dmalloc" = yes ; then

-       echo "$as_me:14580: checking for dmalloc.h" >&5
+       echo "$as_me:14605: 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 14586 "configure"
+#line 14611 "configure"

 #include "confdefs.h"
 #include <dmalloc.h>
 _ACEOF
 #include "confdefs.h"
 #include <dmalloc.h>
 _ACEOF

-if { (eval echo "$as_me:14590: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:14615: \"$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:14596: \$? = $ac_status" >&5
+  echo "$as_me:14621: \$? = $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


@@ -14612,11 +14637,11 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
 fi
 rm -f conftest.err conftest.$ac_ext
 fi

-echo "$as_me:14615: result: $ac_cv_header_dmalloc_h" >&5
+echo "$as_me:14640: 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:14619: checking for dmalloc_debug in -ldmalloc" >&5
+echo "$as_me:14644: 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


@@ -14624,7 +14649,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 14627 "configure"
+#line 14652 "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.  */


@@ -14643,16 +14668,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:14646: \"$ac_link\"") >&5
+if { (eval echo "$as_me:14671: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:14649: \$? = $ac_status" >&5
+  echo "$as_me:14674: \$? = $ac_status" >&5

   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'

-  { (eval echo "$as_me:14652: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14677: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:14655: \$? = $ac_status" >&5
+  echo "$as_me:14680: \$? = $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


@@ -14663,7 +14688,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:14666: result: $ac_cv_lib_dmalloc_dmalloc_debug" >&5
+echo "$as_me:14691: 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


@@ -14678,7 +14703,7 @@ fi
 
 fi
 
 
 fi
 

-echo "$as_me:14681: checking if you want to use dbmalloc for testing" >&5
+echo "$as_me:14706: 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.


@@ -14695,7 +14720,7 @@ EOF
 else
   with_dbmalloc=
 fi;
 else
   with_dbmalloc=
 fi;

-echo "$as_me:14698: result: ${with_dbmalloc:-no}" >&5
+echo "$as_me:14723: result: ${with_dbmalloc:-no}" >&5

 echo "${ECHO_T}${with_dbmalloc:-no}" >&6
 
 case .$with_cflags in
 echo "${ECHO_T}${with_dbmalloc:-no}" >&6
 
 case .$with_cflags in


@@ -14809,23 +14834,23 @@ fi
 esac
 
 if test "$with_dbmalloc" = yes ; then
 esac
 
 if test "$with_dbmalloc" = yes ; then

-       echo "$as_me:14812: checking for dbmalloc.h" >&5
+       echo "$as_me:14837: 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 14818 "configure"
+#line 14843 "configure"

 #include "confdefs.h"
 #include <dbmalloc.h>
 _ACEOF
 #include "confdefs.h"
 #include <dbmalloc.h>
 _ACEOF

-if { (eval echo "$as_me:14822: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:14847: \"$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:14828: \$? = $ac_status" >&5
+  echo "$as_me:14853: \$? = $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


@@ -14844,11 +14869,11 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
 fi
 rm -f conftest.err conftest.$ac_ext
 fi

-echo "$as_me:14847: result: $ac_cv_header_dbmalloc_h" >&5
+echo "$as_me:14872: 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:14851: checking for debug_malloc in -ldbmalloc" >&5
+echo "$as_me:14876: 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


@@ -14856,7 +14881,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 14859 "configure"
+#line 14884 "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.  */


@@ -14875,16 +14900,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:14878: \"$ac_link\"") >&5
+if { (eval echo "$as_me:14903: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:14881: \$? = $ac_status" >&5
+  echo "$as_me:14906: \$? = $ac_status" >&5

   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'

-  { (eval echo "$as_me:14884: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14909: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:14887: \$? = $ac_status" >&5
+  echo "$as_me:14912: \$? = $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


@@ -14895,7 +14920,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:14898: result: $ac_cv_lib_dbmalloc_debug_malloc" >&5
+echo "$as_me:14923: 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


@@ -14910,7 +14935,7 @@ fi
 
 fi
 
 
 fi
 

-echo "$as_me:14913: checking if you want to use valgrind for testing" >&5
+echo "$as_me:14938: 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.


@@ -14927,7 +14952,7 @@ EOF
 else
   with_valgrind=
 fi;
 else
   with_valgrind=
 fi;

-echo "$as_me:14930: result: ${with_valgrind:-no}" >&5
+echo "$as_me:14955: result: ${with_valgrind:-no}" >&5

 echo "${ECHO_T}${with_valgrind:-no}" >&6
 
 case .$with_cflags in
 echo "${ECHO_T}${with_valgrind:-no}" >&6
 
 case .$with_cflags in


@@ -15040,7 +15065,7 @@ fi
        ;;
 esac
 
        ;;
 esac
 

-echo "$as_me:15043: checking if you want to perform memory-leak testing" >&5
+echo "$as_me:15068: 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.


@@ -15050,7 +15075,7 @@ if test "${enable_leaks+set}" = set; then
 else
   : ${with_no_leaks:=no}
 fi;
 else
   : ${with_no_leaks:=no}
 fi;

-echo "$as_me:15053: result: $with_no_leaks" >&5
+echo "$as_me:15078: 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


@@ -15102,7 +15127,7 @@ case "$CFLAGS $CPPFLAGS" in
        ;;
 esac
 
        ;;
 esac
 

-echo "$as_me:15105: checking whether to add trace feature to all models" >&5
+echo "$as_me:15130: 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.


@@ -15112,7 +15137,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:15115: result: $cf_with_trace" >&5
+echo "$as_me:15140: result: $cf_with_trace" >&5

 echo "${ECHO_T}$cf_with_trace" >&6
 
 if test "x$cf_with_trace" = xyes ; then
 echo "${ECHO_T}$cf_with_trace" >&6
 
 if test "x$cf_with_trace" = xyes ; then


@@ -15226,7 +15251,7 @@ else
        ADA_TRACE=FALSE
 fi
 
        ADA_TRACE=FALSE
 fi
 

-echo "$as_me:15229: checking if we want to use GNAT projects" >&5
+echo "$as_me:15254: checking if we want to use GNAT projects" >&5

 echo $ECHO_N "checking if we want to use GNAT projects... $ECHO_C" >&6
 
 # Check whether --enable-gnat-projects or --disable-gnat-projects was given.
 echo $ECHO_N "checking if we want to use GNAT projects... $ECHO_C" >&6
 
 # Check whether --enable-gnat-projects or --disable-gnat-projects was given.


@@ -15243,7 +15268,7 @@ else
        enable_gnat_projects=yes
 
 fi;
        enable_gnat_projects=yes
 
 fi;

-echo "$as_me:15246: result: $enable_gnat_projects" >&5
+echo "$as_me:15271: result: $enable_gnat_projects" >&5

 echo "${ECHO_T}$enable_gnat_projects" >&6
 
 ###    Checks for libraries.
 echo "${ECHO_T}$enable_gnat_projects" >&6
 
 ###    Checks for libraries.


@@ -15253,13 +15278,13 @@ case $cf_cv_system_name in
        LIBS=" -lpsapi $LIBS"
        ;;
 (*)
        LIBS=" -lpsapi $LIBS"
        ;;
 (*)

-echo "$as_me:15256: checking for gettimeofday" >&5
+echo "$as_me:15281: 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 15262 "configure"
+#line 15287 "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.  */


@@ -15290,16 +15315,16 @@ f = gettimeofday; /* workaround for ICC 12.0.3 */ if (f == 0) return 1;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext

-if { (eval echo "$as_me:15293: \"$ac_link\"") >&5
+if { (eval echo "$as_me:15318: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:15296: \$? = $ac_status" >&5
+  echo "$as_me:15321: \$? = $ac_status" >&5

   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'

-  { (eval echo "$as_me:15299: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15324: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:15302: \$? = $ac_status" >&5
+  echo "$as_me:15327: \$? = $ac_status" >&5

   (exit $ac_status); }; }; then
   ac_cv_func_gettimeofday=yes
 else
   (exit $ac_status); }; }; then
   ac_cv_func_gettimeofday=yes
 else


@@ -15309,7 +15334,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:15312: result: $ac_cv_func_gettimeofday" >&5
+echo "$as_me:15337: result: $ac_cv_func_gettimeofday" >&5

 echo "${ECHO_T}$ac_cv_func_gettimeofday" >&6
 if test $ac_cv_func_gettimeofday = yes; then
 
 echo "${ECHO_T}$ac_cv_func_gettimeofday" >&6
 if test $ac_cv_func_gettimeofday = yes; then
 


@@ -15319,7 +15344,7 @@ EOF
 
 else
 
 
 else
 

-echo "$as_me:15322: checking for gettimeofday in -lbsd" >&5
+echo "$as_me:15347: 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


@@ -15327,7 +15352,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 15330 "configure"
+#line 15355 "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.  */


@@ -15346,16 +15371,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:15349: \"$ac_link\"") >&5
+if { (eval echo "$as_me:15374: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:15352: \$? = $ac_status" >&5
+  echo "$as_me:15377: \$? = $ac_status" >&5

   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'

-  { (eval echo "$as_me:15355: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15380: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:15358: \$? = $ac_status" >&5
+  echo "$as_me:15383: \$? = $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


@@ -15366,7 +15391,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:15369: result: $ac_cv_lib_bsd_gettimeofday" >&5
+echo "$as_me:15394: result: $ac_cv_lib_bsd_gettimeofday" >&5

 echo "${ECHO_T}$ac_cv_lib_bsd_gettimeofday" >&6
 if test $ac_cv_lib_bsd_gettimeofday = yes; then
 
 echo "${ECHO_T}$ac_cv_lib_bsd_gettimeofday" >&6
 if test $ac_cv_lib_bsd_gettimeofday = yes; then
 


@@ -15396,14 +15421,14 @@ fi
        ;;
 esac
 
        ;;
 esac
 

-echo "$as_me:15399: checking if -lm needed for math functions" >&5
+echo "$as_me:15424: 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 15406 "configure"
+#line 15431 "configure"

 #include "confdefs.h"
 
        #include <stdio.h>
 #include "confdefs.h"
 
        #include <stdio.h>


@@ -15419,16 +15444,16 @@ double x = rand(); printf("result = %g\n", pow(sin(x),x))
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext

-if { (eval echo "$as_me:15422: \"$ac_link\"") >&5
+if { (eval echo "$as_me:15447: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:15425: \$? = $ac_status" >&5
+  echo "$as_me:15450: \$? = $ac_status" >&5

   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'

-  { (eval echo "$as_me:15428: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15453: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:15431: \$? = $ac_status" >&5
+  echo "$as_me:15456: \$? = $ac_status" >&5

   (exit $ac_status); }; }; then
   cf_cv_need_libm=no
 else
   (exit $ac_status); }; }; then
   cf_cv_need_libm=no
 else


@@ -15438,7 +15463,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:15441: result: $cf_cv_need_libm" >&5
+echo "$as_me:15466: 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


@@ -15446,13 +15471,13 @@ MATH_LIB=-lm
 fi
 
 ###    Checks for header files.
 fi
 
 ###    Checks for header files.

-echo "$as_me:15449: checking for ANSI C header files" >&5
+echo "$as_me:15474: 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 15455 "configure"
+#line 15480 "configure"

 #include "confdefs.h"
 #include <stdlib.h>
 #include <stdarg.h>
 #include "confdefs.h"
 #include <stdlib.h>
 #include <stdarg.h>


@@ -15460,13 +15485,13 @@ else
 #include <float.h>
 
 _ACEOF
 #include <float.h>
 
 _ACEOF

-if { (eval echo "$as_me:15463: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:15488: \"$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:15469: \$? = $ac_status" >&5
+  echo "$as_me:15494: \$? = $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


@@ -15488,7 +15513,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 15491 "configure"
+#line 15516 "configure"

 #include "confdefs.h"
 #include <string.h>
 
 #include "confdefs.h"
 #include <string.h>
 


@@ -15506,7 +15531,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 15509 "configure"
+#line 15534 "configure"

 #include "confdefs.h"
 #include <stdlib.h>
 
 #include "confdefs.h"
 #include <stdlib.h>
 


@@ -15527,7 +15552,7 @@ if test $ac_cv_header_stdc = yes; then
   :
 else
   cat >conftest.$ac_ext <<_ACEOF
   :
 else
   cat >conftest.$ac_ext <<_ACEOF

-#line 15530 "configure"
+#line 15555 "configure"

 #include "confdefs.h"
 #include <ctype.h>
 #if ((' ' & 0x0FF) == 0x020)
 #include "confdefs.h"
 #include <ctype.h>
 #if ((' ' & 0x0FF) == 0x020)


@@ -15553,15 +15578,15 @@ main (void)
 }
 _ACEOF
 rm -f conftest$ac_exeext
 }
 _ACEOF
 rm -f conftest$ac_exeext

-if { (eval echo "$as_me:15556: \"$ac_link\"") >&5
+if { (eval echo "$as_me:15581: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:15559: \$? = $ac_status" >&5
+  echo "$as_me:15584: \$? = $ac_status" >&5

   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'

-  { (eval echo "$as_me:15561: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15586: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:15564: \$? = $ac_status" >&5
+  echo "$as_me:15589: \$? = $ac_status" >&5

   (exit $ac_status); }; }; then
   :
 else
   (exit $ac_status); }; }; then
   :
 else


@@ -15574,7 +15599,7 @@ rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 fi
 fi
 fi
 fi
 fi

-echo "$as_me:15577: result: $ac_cv_header_stdc" >&5
+echo "$as_me:15602: 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
 


@@ -15587,13 +15612,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:15590: checking for $ac_hdr that defines DIR" >&5
+echo "$as_me:15615: 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 15596 "configure"
+#line 15621 "configure"

 #include "confdefs.h"
 #include <sys/types.h>
 #include <$ac_hdr>
 #include "confdefs.h"
 #include <sys/types.h>
 #include <$ac_hdr>


@@ -15608,16 +15633,16 @@ return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

-if { (eval echo "$as_me:15611: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:15636: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:15614: \$? = $ac_status" >&5
+  echo "$as_me:15639: \$? = $ac_status" >&5

   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'

-  { (eval echo "$as_me:15617: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15642: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:15620: \$? = $ac_status" >&5
+  echo "$as_me:15645: \$? = $ac_status" >&5

   (exit $ac_status); }; }; then
   eval "$as_ac_Header=yes"
 else
   (exit $ac_status); }; }; then
   eval "$as_ac_Header=yes"
 else


@@ -15627,7 +15652,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:15630: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:15655: 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


@@ -15640,7 +15665,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:15643: checking for opendir in -ldir" >&5
+  echo "$as_me:15668: 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


@@ -15648,7 +15673,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 15651 "configure"
+#line 15676 "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.  */


@@ -15667,16 +15692,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:15670: \"$ac_link\"") >&5
+if { (eval echo "$as_me:15695: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:15673: \$? = $ac_status" >&5
+  echo "$as_me:15698: \$? = $ac_status" >&5

   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'

-  { (eval echo "$as_me:15676: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15701: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:15679: \$? = $ac_status" >&5
+  echo "$as_me:15704: \$? = $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


@@ -15687,14 +15712,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:15690: result: $ac_cv_lib_dir_opendir" >&5
+echo "$as_me:15715: 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:15697: checking for opendir in -lx" >&5
+  echo "$as_me:15722: 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


@@ -15702,7 +15727,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 15705 "configure"
+#line 15730 "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.  */


@@ -15721,16 +15746,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:15724: \"$ac_link\"") >&5
+if { (eval echo "$as_me:15749: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:15727: \$? = $ac_status" >&5
+  echo "$as_me:15752: \$? = $ac_status" >&5

   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'

-  { (eval echo "$as_me:15730: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15755: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:15733: \$? = $ac_status" >&5
+  echo "$as_me:15758: \$? = $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


@@ -15741,7 +15766,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:15744: result: $ac_cv_lib_x_opendir" >&5
+echo "$as_me:15769: 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"


@@ -15749,13 +15774,13 @@ fi
 
 fi
 
 
 fi
 

-echo "$as_me:15752: checking whether time.h and sys/time.h may both be included" >&5
+echo "$as_me:15777: 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 15758 "configure"
+#line 15783 "configure"

 #include "confdefs.h"
 #include <sys/types.h>
 #include <sys/time.h>
 #include "confdefs.h"
 #include <sys/types.h>
 #include <sys/time.h>


@@ -15771,16 +15796,16 @@ return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

-if { (eval echo "$as_me:15774: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:15799: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:15777: \$? = $ac_status" >&5
+  echo "$as_me:15802: \$? = $ac_status" >&5

   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'

-  { (eval echo "$as_me:15780: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15805: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:15783: \$? = $ac_status" >&5
+  echo "$as_me:15808: \$? = $ac_status" >&5

   (exit $ac_status); }; }; then
   ac_cv_header_time=yes
 else
   (exit $ac_status); }; }; then
   ac_cv_header_time=yes
 else


@@ -15790,7 +15815,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:15793: result: $ac_cv_header_time" >&5
+echo "$as_me:15818: 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
 


@@ -15809,13 +15834,13 @@ case $host_os in
        ;;
 esac
 
        ;;
 esac
 

-echo "$as_me:15812: checking for regcomp" >&5
+echo "$as_me:15837: checking for regcomp" >&5

 echo $ECHO_N "checking for regcomp... $ECHO_C" >&6
 if test "${ac_cv_func_regcomp+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 echo $ECHO_N "checking for regcomp... $ECHO_C" >&6
 if test "${ac_cv_func_regcomp+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF

-#line 15818 "configure"
+#line 15843 "configure"

 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char regcomp (); below.  */
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char regcomp (); below.  */


@@ -15846,16 +15871,16 @@ f = regcomp; /* workaround for ICC 12.0.3 */ if (f == 0) return 1;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext

-if { (eval echo "$as_me:15849: \"$ac_link\"") >&5
+if { (eval echo "$as_me:15874: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:15852: \$? = $ac_status" >&5
+  echo "$as_me:15877: \$? = $ac_status" >&5

   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'

-  { (eval echo "$as_me:15855: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15880: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:15858: \$? = $ac_status" >&5
+  echo "$as_me:15883: \$? = $ac_status" >&5

   (exit $ac_status); }; }; then
   ac_cv_func_regcomp=yes
 else
   (exit $ac_status); }; }; then
   ac_cv_func_regcomp=yes
 else


@@ -15865,7 +15890,7 @@ ac_cv_func_regcomp=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi

-echo "$as_me:15868: result: $ac_cv_func_regcomp" >&5
+echo "$as_me:15893: result: $ac_cv_func_regcomp" >&5

 echo "${ECHO_T}$ac_cv_func_regcomp" >&6
 if test $ac_cv_func_regcomp = yes; then
   cf_regex_func=regcomp
 echo "${ECHO_T}$ac_cv_func_regcomp" >&6
 if test $ac_cv_func_regcomp = yes; then
   cf_regex_func=regcomp


@@ -15874,7 +15899,7 @@ else
        for cf_regex_lib in $cf_regex_libs
        do
                as_ac_Lib=`echo "ac_cv_lib_$cf_regex_lib''_regcomp" | $as_tr_sh`
        for cf_regex_lib in $cf_regex_libs
        do
                as_ac_Lib=`echo "ac_cv_lib_$cf_regex_lib''_regcomp" | $as_tr_sh`

-echo "$as_me:15877: checking for regcomp in -l$cf_regex_lib" >&5
+echo "$as_me:15902: checking for regcomp in -l$cf_regex_lib" >&5

 echo $ECHO_N "checking for regcomp in -l$cf_regex_lib... $ECHO_C" >&6
 if eval "test \"\${$as_ac_Lib+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 echo $ECHO_N "checking for regcomp in -l$cf_regex_lib... $ECHO_C" >&6
 if eval "test \"\${$as_ac_Lib+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6


@@ -15882,7 +15907,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-l$cf_regex_lib  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-l$cf_regex_lib  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF

-#line 15885 "configure"
+#line 15910 "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.  */


@@ -15901,16 +15926,16 @@ regcomp ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext

-if { (eval echo "$as_me:15904: \"$ac_link\"") >&5
+if { (eval echo "$as_me:15929: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:15907: \$? = $ac_status" >&5
+  echo "$as_me:15932: \$? = $ac_status" >&5

   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'

-  { (eval echo "$as_me:15910: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15935: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:15913: \$? = $ac_status" >&5
+  echo "$as_me:15938: \$? = $ac_status" >&5

   (exit $ac_status); }; }; then
   eval "$as_ac_Lib=yes"
 else
   (exit $ac_status); }; }; then
   eval "$as_ac_Lib=yes"
 else


@@ -15921,7 +15946,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:15924: result: `eval echo '${'$as_ac_Lib'}'`" >&5
+echo "$as_me:15949: result: `eval echo '${'$as_ac_Lib'}'`" >&5

 echo "${ECHO_T}`eval echo '${'$as_ac_Lib'}'`" >&6
 if test `eval echo '${'$as_ac_Lib'}'` = yes; then
 
 echo "${ECHO_T}`eval echo '${'$as_ac_Lib'}'`" >&6
 if test `eval echo '${'$as_ac_Lib'}'` = yes; then
 


@@ -15950,13 +15975,13 @@ fi
 fi
 
 if test "$cf_regex_func" = no ; then
 fi
 
 if test "$cf_regex_func" = no ; then

-       echo "$as_me:15953: checking for compile" >&5
+       echo "$as_me:15978: checking for compile" >&5

 echo $ECHO_N "checking for compile... $ECHO_C" >&6
 if test "${ac_cv_func_compile+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 echo $ECHO_N "checking for compile... $ECHO_C" >&6
 if test "${ac_cv_func_compile+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF

-#line 15959 "configure"
+#line 15984 "configure"

 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char compile (); below.  */
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char compile (); below.  */


@@ -15987,16 +16012,16 @@ f = compile; /* workaround for ICC 12.0.3 */ if (f == 0) return 1;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext

-if { (eval echo "$as_me:15990: \"$ac_link\"") >&5
+if { (eval echo "$as_me:16015: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:15993: \$? = $ac_status" >&5
+  echo "$as_me:16018: \$? = $ac_status" >&5

   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'

-  { (eval echo "$as_me:15996: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16021: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:15999: \$? = $ac_status" >&5
+  echo "$as_me:16024: \$? = $ac_status" >&5

   (exit $ac_status); }; }; then
   ac_cv_func_compile=yes
 else
   (exit $ac_status); }; }; then
   ac_cv_func_compile=yes
 else


@@ -16006,13 +16031,13 @@ ac_cv_func_compile=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi

-echo "$as_me:16009: result: $ac_cv_func_compile" >&5
+echo "$as_me:16034: result: $ac_cv_func_compile" >&5

 echo "${ECHO_T}$ac_cv_func_compile" >&6
 if test $ac_cv_func_compile = yes; then
   cf_regex_func=compile
 else
 
 echo "${ECHO_T}$ac_cv_func_compile" >&6
 if test $ac_cv_func_compile = yes; then
   cf_regex_func=compile
 else
 

-               echo "$as_me:16015: checking for compile in -lgen" >&5
+               echo "$as_me:16040: checking for compile in -lgen" >&5

 echo $ECHO_N "checking for compile in -lgen... $ECHO_C" >&6
 if test "${ac_cv_lib_gen_compile+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 echo $ECHO_N "checking for compile in -lgen... $ECHO_C" >&6
 if test "${ac_cv_lib_gen_compile+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6


@@ -16020,7 +16045,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lgen  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lgen  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF

-#line 16023 "configure"
+#line 16048 "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.  */


@@ -16039,16 +16064,16 @@ compile ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext

-if { (eval echo "$as_me:16042: \"$ac_link\"") >&5
+if { (eval echo "$as_me:16067: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:16045: \$? = $ac_status" >&5
+  echo "$as_me:16070: \$? = $ac_status" >&5

   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'

-  { (eval echo "$as_me:16048: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16073: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:16051: \$? = $ac_status" >&5
+  echo "$as_me:16076: \$? = $ac_status" >&5

   (exit $ac_status); }; }; then
   ac_cv_lib_gen_compile=yes
 else
   (exit $ac_status); }; }; then
   ac_cv_lib_gen_compile=yes
 else


@@ -16059,7 +16084,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:16062: result: $ac_cv_lib_gen_compile" >&5
+echo "$as_me:16087: result: $ac_cv_lib_gen_compile" >&5

 echo "${ECHO_T}$ac_cv_lib_gen_compile" >&6
 if test $ac_cv_lib_gen_compile = yes; then
 
 echo "${ECHO_T}$ac_cv_lib_gen_compile" >&6
 if test $ac_cv_lib_gen_compile = yes; then
 


@@ -16087,11 +16112,11 @@ fi
 fi
 
 if test "$cf_regex_func" = no ; then
 fi
 
 if test "$cf_regex_func" = no ; then

-       { echo "$as_me:16090: WARNING: cannot find regular expression library" >&5
+       { echo "$as_me:16115: WARNING: cannot find regular expression library" >&5

 echo "$as_me: WARNING: cannot find regular expression library" >&2;}
 fi
 
 echo "$as_me: WARNING: cannot find regular expression library" >&2;}
 fi
 

-echo "$as_me:16094: checking for regular-expression headers" >&5
+echo "$as_me:16119: checking for regular-expression headers" >&5

 echo $ECHO_N "checking for regular-expression headers... $ECHO_C" >&6
 if test "${cf_cv_regex_hdrs+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 echo $ECHO_N "checking for regular-expression headers... $ECHO_C" >&6
 if test "${cf_cv_regex_hdrs+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6


@@ -16103,7 +16128,7 @@ case $cf_regex_func in
        for cf_regex_hdr in regexp.h regexpr.h
        do
                cat >conftest.$ac_ext <<_ACEOF
        for cf_regex_hdr in regexp.h regexpr.h
        do
                cat >conftest.$ac_ext <<_ACEOF

-#line 16106 "configure"
+#line 16131 "configure"

 #include "confdefs.h"
 #include <$cf_regex_hdr>
 int
 #include "confdefs.h"
 #include <$cf_regex_hdr>
 int


@@ -16118,16 +16143,16 @@ main (void)
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext

-if { (eval echo "$as_me:16121: \"$ac_link\"") >&5
+if { (eval echo "$as_me:16146: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:16124: \$? = $ac_status" >&5
+  echo "$as_me:16149: \$? = $ac_status" >&5

   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'

-  { (eval echo "$as_me:16127: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16152: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:16130: \$? = $ac_status" >&5
+  echo "$as_me:16155: \$? = $ac_status" >&5

   (exit $ac_status); }; }; then
 
                        cf_cv_regex_hdrs=$cf_regex_hdr
   (exit $ac_status); }; }; then
 
                        cf_cv_regex_hdrs=$cf_regex_hdr


@@ -16144,7 +16169,7 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
        for cf_regex_hdr in regex.h
        do
                cat >conftest.$ac_ext <<_ACEOF
        for cf_regex_hdr in regex.h
        do
                cat >conftest.$ac_ext <<_ACEOF

-#line 16147 "configure"
+#line 16172 "configure"

 #include "confdefs.h"
 #include <sys/types.h>
 #include <$cf_regex_hdr>
 #include "confdefs.h"
 #include <sys/types.h>
 #include <$cf_regex_hdr>


@@ -16162,16 +16187,16 @@ main (void)
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext

-if { (eval echo "$as_me:16165: \"$ac_link\"") >&5
+if { (eval echo "$as_me:16190: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:16168: \$? = $ac_status" >&5
+  echo "$as_me:16193: \$? = $ac_status" >&5

   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'

-  { (eval echo "$as_me:16171: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16196: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:16174: \$? = $ac_status" >&5
+  echo "$as_me:16199: \$? = $ac_status" >&5

   (exit $ac_status); }; }; then
 
                        cf_cv_regex_hdrs=$cf_regex_hdr
   (exit $ac_status); }; }; then
 
                        cf_cv_regex_hdrs=$cf_regex_hdr


@@ -16187,11 +16212,11 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 esac
 
 fi
 esac
 
 fi

-echo "$as_me:16190: result: $cf_cv_regex_hdrs" >&5
+echo "$as_me:16215: result: $cf_cv_regex_hdrs" >&5

 echo "${ECHO_T}$cf_cv_regex_hdrs" >&6
 
 case $cf_cv_regex_hdrs in
 echo "${ECHO_T}$cf_cv_regex_hdrs" >&6
 
 case $cf_cv_regex_hdrs in

-       (no)            { echo "$as_me:16194: WARNING: no regular expression header found" >&5
+       (no)            { echo "$as_me:16219: WARNING: no regular expression header found" >&5

 echo "$as_me: WARNING: no regular expression header found" >&2;} ;;
        (regex.h)
 cat >>confdefs.h <<\EOF
 echo "$as_me: WARNING: no regular expression header found" >&2;} ;;
        (regex.h)
 cat >>confdefs.h <<\EOF


@@ -16230,23 +16255,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:16233: checking for $ac_header" >&5
+echo "$as_me:16258: 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 16239 "configure"
+#line 16264 "configure"

 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF

-if { (eval echo "$as_me:16243: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:16268: \"$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:16249: \$? = $ac_status" >&5
+  echo "$as_me:16274: \$? = $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


@@ -16265,7 +16290,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
 fi
 rm -f conftest.err conftest.$ac_ext
 fi

-echo "$as_me:16268: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:16293: 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


@@ -16278,23 +16303,23 @@ done
 for ac_header in unistd.h getopt.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
 for ac_header in unistd.h getopt.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`

-echo "$as_me:16281: checking for $ac_header" >&5
+echo "$as_me:16306: 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 16287 "configure"
+#line 16312 "configure"

 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF

-if { (eval echo "$as_me:16291: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:16316: \"$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:16297: \$? = $ac_status" >&5
+  echo "$as_me:16322: \$? = $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


@@ -16313,7 +16338,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
 fi
 rm -f conftest.err conftest.$ac_ext
 fi

-echo "$as_me:16316: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:16341: 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


@@ -16323,7 +16348,7 @@ EOF
 fi
 done
 
 fi
 done
 

-echo "$as_me:16326: checking for header declaring getopt variables" >&5
+echo "$as_me:16351: checking for header declaring getopt variables" >&5

 echo $ECHO_N "checking for header declaring getopt variables... $ECHO_C" >&6
 if test "${cf_cv_getopt_header+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 echo $ECHO_N "checking for header declaring getopt variables... $ECHO_C" >&6
 if test "${cf_cv_getopt_header+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6


@@ -16333,7 +16358,7 @@ cf_cv_getopt_header=none
 for cf_header in stdio.h stdlib.h unistd.h getopt.h
 do
 cat >conftest.$ac_ext <<_ACEOF
 for cf_header in stdio.h stdlib.h unistd.h getopt.h
 do
 cat >conftest.$ac_ext <<_ACEOF

-#line 16336 "configure"
+#line 16361 "configure"

 #include "confdefs.h"
 
 #include <$cf_header>
 #include "confdefs.h"
 
 #include <$cf_header>


@@ -16346,16 +16371,16 @@ int x = optind; char *y = optarg
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

-if { (eval echo "$as_me:16349: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:16374: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:16352: \$? = $ac_status" >&5
+  echo "$as_me:16377: \$? = $ac_status" >&5

   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'

-  { (eval echo "$as_me:16355: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16380: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:16358: \$? = $ac_status" >&5
+  echo "$as_me:16383: \$? = $ac_status" >&5

   (exit $ac_status); }; }; then
   cf_cv_getopt_header=$cf_header
  break
   (exit $ac_status); }; }; then
   cf_cv_getopt_header=$cf_header
  break


@@ -16367,7 +16392,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 done
 
 fi
 done
 
 fi

-echo "$as_me:16370: result: $cf_cv_getopt_header" >&5
+echo "$as_me:16395: result: $cf_cv_getopt_header" >&5

 echo "${ECHO_T}$cf_cv_getopt_header" >&6
 if test $cf_cv_getopt_header != none ; then
 
 echo "${ECHO_T}$cf_cv_getopt_header" >&6
 if test $cf_cv_getopt_header != none ; then
 


@@ -16388,7 +16413,7 @@ fi
 # Note: even non-Posix ISC needs <sys/bsdtypes.h> to declare fd_set
 if test "x$ISC" = xyes ; then
 
 # Note: even non-Posix ISC needs <sys/bsdtypes.h> to declare fd_set
 if test "x$ISC" = xyes ; then
 

-echo "$as_me:16391: checking for main in -lcposix" >&5
+echo "$as_me:16416: 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


@@ -16396,7 +16421,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 16399 "configure"
+#line 16424 "configure"

 #include "confdefs.h"
 
 int
 #include "confdefs.h"
 
 int


@@ -16408,16 +16433,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:16411: \"$ac_link\"") >&5
+if { (eval echo "$as_me:16436: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:16414: \$? = $ac_status" >&5
+  echo "$as_me:16439: \$? = $ac_status" >&5

   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'

-  { (eval echo "$as_me:16417: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16442: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:16420: \$? = $ac_status" >&5
+  echo "$as_me:16445: \$? = $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


@@ -16428,7 +16453,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:16431: result: $ac_cv_lib_cposix_main" >&5
+echo "$as_me:16456: 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


@@ -16439,7 +16464,7 @@ EOF
 
 fi
 
 
 fi
 

-       echo "$as_me:16442: checking for bzero in -linet" >&5
+       echo "$as_me:16467: 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


@@ -16447,7 +16472,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 16450 "configure"
+#line 16475 "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.  */


@@ -16466,16 +16491,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:16469: \"$ac_link\"") >&5
+if { (eval echo "$as_me:16494: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:16472: \$? = $ac_status" >&5
+  echo "$as_me:16497: \$? = $ac_status" >&5

   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'

-  { (eval echo "$as_me:16475: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16500: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:16478: \$? = $ac_status" >&5
+  echo "$as_me:16503: \$? = $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


@@ -16486,7 +16511,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:16489: result: $ac_cv_lib_inet_bzero" >&5
+echo "$as_me:16514: 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
 
 echo "${ECHO_T}$ac_cv_lib_inet_bzero" >&6
 if test $ac_cv_lib_inet_bzero = yes; then
 


@@ -16509,14 +16534,14 @@ LIBS="$cf_add_libs"
 fi
 fi
 
 fi
 fi
 

-echo "$as_me:16512: checking if sys/time.h works with sys/select.h" >&5
+echo "$as_me:16537: 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 16519 "configure"
+#line 16544 "configure"

 #include "confdefs.h"
 
 #include <sys/types.h>
 #include "confdefs.h"
 
 #include <sys/types.h>


@@ -16536,16 +16561,16 @@ main (void)
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

-if { (eval echo "$as_me:16539: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:16564: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:16542: \$? = $ac_status" >&5
+  echo "$as_me:16567: \$? = $ac_status" >&5

   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'

-  { (eval echo "$as_me:16545: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16570: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:16548: \$? = $ac_status" >&5
+  echo "$as_me:16573: \$? = $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


@@ -16557,7 +16582,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
 
 
 fi
 

-echo "$as_me:16560: result: $cf_cv_sys_time_select" >&5
+echo "$as_me:16585: result: $cf_cv_sys_time_select" >&5

 echo "${ECHO_T}$cf_cv_sys_time_select" >&6
 test "$cf_cv_sys_time_select" = yes &&
 cat >>confdefs.h <<\EOF
 echo "${ECHO_T}$cf_cv_sys_time_select" >&6
 test "$cf_cv_sys_time_select" = yes &&
 cat >>confdefs.h <<\EOF


@@ -16572,13 +16597,13 @@ 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:16575: checking for an ANSI C-conforming const" >&5
+echo "$as_me:16600: 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 16581 "configure"
+#line 16606 "configure"

 #include "confdefs.h"
 
 int
 #include "confdefs.h"
 
 int


@@ -16636,16 +16661,16 @@ main (void)
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

-if { (eval echo "$as_me:16639: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:16664: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:16642: \$? = $ac_status" >&5
+  echo "$as_me:16667: \$? = $ac_status" >&5

   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'

-  { (eval echo "$as_me:16645: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16670: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:16648: \$? = $ac_status" >&5
+  echo "$as_me:16673: \$? = $ac_status" >&5

   (exit $ac_status); }; }; then
   ac_cv_c_const=yes
 else
   (exit $ac_status); }; }; then
   ac_cv_c_const=yes
 else


@@ -16655,7 +16680,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:16658: result: $ac_cv_c_const" >&5
+echo "$as_me:16683: 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
 


@@ -16665,7 +16690,7 @@ EOF
 
 fi
 
 
 fi
 

-echo "$as_me:16668: checking for inline" >&5
+echo "$as_me:16693: 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


@@ -16673,7 +16698,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 16676 "configure"
+#line 16701 "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; }


@@ -16682,16 +16707,16 @@ $ac_kw int foo () {return 0; }
 
 _ACEOF
 rm -f conftest.$ac_objext
 
 _ACEOF
 rm -f conftest.$ac_objext

-if { (eval echo "$as_me:16685: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:16710: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:16688: \$? = $ac_status" >&5
+  echo "$as_me:16713: \$? = $ac_status" >&5

   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'

-  { (eval echo "$as_me:16691: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16716: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:16694: \$? = $ac_status" >&5
+  echo "$as_me:16719: \$? = $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


@@ -16702,7 +16727,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 done
 
 fi
 done
 
 fi

-echo "$as_me:16705: result: $ac_cv_c_inline" >&5
+echo "$as_me:16730: 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) ;;


@@ -16728,7 +16753,7 @@ if test "$ac_cv_c_inline" != no ; then
                :
        elif test "$GCC" = yes
        then
                :
        elif test "$GCC" = yes
        then

-               echo "$as_me:16731: checking if $CC supports options to tune inlining" >&5
+               echo "$as_me:16756: checking if $CC supports options to tune inlining" >&5

 echo $ECHO_N "checking if $CC supports options to tune inlining... $ECHO_C" >&6
 if test "${cf_cv_gcc_inline+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 echo $ECHO_N "checking if $CC supports options to tune inlining... $ECHO_C" >&6
 if test "${cf_cv_gcc_inline+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6


@@ -16737,7 +16762,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 16740 "configure"
+#line 16765 "configure"

 #include "confdefs.h"
 inline int foo(void) { return 1; }
 int
 #include "confdefs.h"
 inline int foo(void) { return 1; }
 int


@@ -16749,16 +16774,16 @@ ${cf_cv_main_return:-return} foo()
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

-if { (eval echo "$as_me:16752: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:16777: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:16755: \$? = $ac_status" >&5
+  echo "$as_me:16780: \$? = $ac_status" >&5

   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'

-  { (eval echo "$as_me:16758: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16783: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:16761: \$? = $ac_status" >&5
+  echo "$as_me:16786: \$? = $ac_status" >&5

   (exit $ac_status); }; }; then
   cf_cv_gcc_inline=yes
 else
   (exit $ac_status); }; }; then
   cf_cv_gcc_inline=yes
 else


@@ -16770,7 +16795,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
                CFLAGS=$cf_save_CFLAGS
 
 fi
                CFLAGS=$cf_save_CFLAGS
 
 fi

-echo "$as_me:16773: result: $cf_cv_gcc_inline" >&5
+echo "$as_me:16798: 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
 


@@ -16876,7 +16901,7 @@ fi
        fi
 fi
 
        fi
 fi
 

-echo "$as_me:16879: checking for signal global datatype" >&5
+echo "$as_me:16904: 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


@@ -16888,7 +16913,7 @@ else
                "int"
        do
        cat >conftest.$ac_ext <<_ACEOF
                "int"
        do
        cat >conftest.$ac_ext <<_ACEOF

-#line 16891 "configure"
+#line 16916 "configure"

 #include "confdefs.h"
 
 #include <sys/types.h>
 #include "confdefs.h"
 
 #include <sys/types.h>


@@ -16911,16 +16936,16 @@ signal(SIGINT, handler);
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

-if { (eval echo "$as_me:16914: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:16939: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:16917: \$? = $ac_status" >&5
+  echo "$as_me:16942: \$? = $ac_status" >&5

   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'

-  { (eval echo "$as_me:16920: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16945: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:16923: \$? = $ac_status" >&5
+  echo "$as_me:16948: \$? = $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


@@ -16934,7 +16959,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
 
 
 fi
 

-echo "$as_me:16937: result: $cf_cv_sig_atomic_t" >&5
+echo "$as_me:16962: result: $cf_cv_sig_atomic_t" >&5

 echo "${ECHO_T}$cf_cv_sig_atomic_t" >&6
 test "$cf_cv_sig_atomic_t" != no &&
 cat >>confdefs.h <<EOF
 echo "${ECHO_T}$cf_cv_sig_atomic_t" >&6
 test "$cf_cv_sig_atomic_t" != no &&
 cat >>confdefs.h <<EOF


@@ -16943,7 +16968,7 @@ EOF
 
 if test $NCURSES_CHTYPE = auto ; then
 
 
 if test $NCURSES_CHTYPE = auto ; then
 

-echo "$as_me:16946: checking for type of chtype" >&5
+echo "$as_me:16971: 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


@@ -16953,7 +16978,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 16956 "configure"
+#line 16981 "configure"

 #include "confdefs.h"
 
 #define WANT_BITS 31
 #include "confdefs.h"
 
 #define WANT_BITS 31


@@ -16988,15 +17013,15 @@ int main(void)
 
 _ACEOF
 rm -f conftest$ac_exeext
 
 _ACEOF
 rm -f conftest$ac_exeext

-if { (eval echo "$as_me:16991: \"$ac_link\"") >&5
+if { (eval echo "$as_me:17016: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:16994: \$? = $ac_status" >&5
+  echo "$as_me:17019: \$? = $ac_status" >&5

   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'

-  { (eval echo "$as_me:16996: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17021: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:16999: \$? = $ac_status" >&5
+  echo "$as_me:17024: \$? = $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


@@ -17011,7 +17036,7 @@ fi
 
 fi
 
 
 fi
 

-echo "$as_me:17014: result: $cf_cv_typeof_chtype" >&5
+echo "$as_me:17039: 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


@@ -17023,14 +17048,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:17026: checking if unsigned literals are legal" >&5
+echo "$as_me:17051: 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 17033 "configure"
+#line 17058 "configure"

 #include "confdefs.h"
 
 int
 #include "confdefs.h"
 
 int


@@ -17042,16 +17067,16 @@ long x = 1L + 1UL + 1U + 1
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

-if { (eval echo "$as_me:17045: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:17070: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:17048: \$? = $ac_status" >&5
+  echo "$as_me:17073: \$? = $ac_status" >&5

   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'

-  { (eval echo "$as_me:17051: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17076: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:17054: \$? = $ac_status" >&5
+  echo "$as_me:17079: \$? = $ac_status" >&5

   (exit $ac_status); }; }; then
   cf_cv_unsigned_literals=yes
 else
   (exit $ac_status); }; }; then
   cf_cv_unsigned_literals=yes
 else


@@ -17063,7 +17088,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
 
 
 fi
 

-echo "$as_me:17066: result: $cf_cv_unsigned_literals" >&5
+echo "$as_me:17091: 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"


@@ -17079,14 +17104,14 @@ test "$cf_cv_typeof_mmask_t" = unsigned && cf_cv_typeof_mmask_t=""
 
 ###    Checks for external-data
 
 
 ###    Checks for external-data
 

-echo "$as_me:17082: checking if external errno is declared" >&5
+echo "$as_me:17107: 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 17089 "configure"
+#line 17114 "configure"

 #include "confdefs.h"
 
 #ifdef HAVE_STDLIB_H
 #include "confdefs.h"
 
 #ifdef HAVE_STDLIB_H


@@ -17104,16 +17129,16 @@ int x = (int) errno
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

-if { (eval echo "$as_me:17107: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:17132: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:17110: \$? = $ac_status" >&5
+  echo "$as_me:17135: \$? = $ac_status" >&5

   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'

-  { (eval echo "$as_me:17113: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17138: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:17116: \$? = $ac_status" >&5
+  echo "$as_me:17141: \$? = $ac_status" >&5

   (exit $ac_status); }; }; then
   cf_cv_dcl_errno=yes
 else
   (exit $ac_status); }; }; then
   cf_cv_dcl_errno=yes
 else


@@ -17124,7 +17149,7 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi

-echo "$as_me:17127: result: $cf_cv_dcl_errno" >&5
+echo "$as_me:17152: 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


@@ -17139,14 +17164,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:17142: checking if external errno exists" >&5
+echo "$as_me:17167: 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 17149 "configure"
+#line 17174 "configure"

 #include "confdefs.h"
 
 #undef errno
 #include "confdefs.h"
 
 #undef errno


@@ -17161,16 +17186,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:17164: \"$ac_link\"") >&5
+if { (eval echo "$as_me:17189: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:17167: \$? = $ac_status" >&5
+  echo "$as_me:17192: \$? = $ac_status" >&5

   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'

-  { (eval echo "$as_me:17170: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17195: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:17173: \$? = $ac_status" >&5
+  echo "$as_me:17198: \$? = $ac_status" >&5

   (exit $ac_status); }; }; then
   cf_cv_have_errno=yes
 else
   (exit $ac_status); }; }; then
   cf_cv_have_errno=yes
 else


@@ -17181,7 +17206,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:17184: result: $cf_cv_have_errno" >&5
+echo "$as_me:17209: 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


@@ -17194,7 +17219,7 @@ EOF
 
 fi
 
 
 fi
 

-echo "$as_me:17197: checking if data-only library module links" >&5
+echo "$as_me:17222: 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


@@ -17202,20 +17227,20 @@ else
 
        rm -f conftest.a
        cat >conftest.$ac_ext <<EOF
 
        rm -f conftest.a
        cat >conftest.$ac_ext <<EOF

-#line 17205 "configure"
+#line 17230 "configure"

 int    testdata[3] = { 123, 456, 789 };
 EOF
 int    testdata[3] = { 123, 456, 789 };
 EOF

-       if { (eval echo "$as_me:17208: \"$ac_compile\"") >&5
+       if { (eval echo "$as_me:17233: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:17211: \$? = $ac_status" >&5
+  echo "$as_me:17236: \$? = $ac_status" >&5

   (exit $ac_status); } ; then
                mv conftest.o data.o && \
                ( $AR $ARFLAGS conftest.a data.o ) 2>&5 1>/dev/null
        fi
        rm -f conftest.$ac_ext data.o
        cat >conftest.$ac_ext <<EOF
   (exit $ac_status); } ; then
                mv conftest.o data.o && \
                ( $AR $ARFLAGS conftest.a data.o ) 2>&5 1>/dev/null
        fi
        rm -f conftest.$ac_ext data.o
        cat >conftest.$ac_ext <<EOF

-#line 17218 "configure"
+#line 17243 "configure"

 int    testfunc()
 {
 #if defined(NeXT)
 int    testfunc()
 {
 #if defined(NeXT)


@@ -17228,10 +17253,10 @@ int   testfunc()
 #endif
 }
 EOF
 #endif
 }
 EOF

-       if { (eval echo "$as_me:17231: \"$ac_compile\"") >&5
+       if { (eval echo "$as_me:17256: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:17234: \$? = $ac_status" >&5
+  echo "$as_me:17259: \$? = $ac_status" >&5

   (exit $ac_status); }; then
                mv conftest.o func.o && \
                ( $AR $ARFLAGS conftest.a func.o ) 2>&5 1>/dev/null
   (exit $ac_status); }; then
                mv conftest.o func.o && \
                ( $AR $ARFLAGS conftest.a func.o ) 2>&5 1>/dev/null


@@ -17244,7 +17269,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 17247 "configure"
+#line 17272 "configure"

 #include "confdefs.h"
 
        int main(void)
 #include "confdefs.h"
 
        int main(void)


@@ -17255,15 +17280,15 @@ else
 
 _ACEOF
 rm -f conftest$ac_exeext
 
 _ACEOF
 rm -f conftest$ac_exeext

-if { (eval echo "$as_me:17258: \"$ac_link\"") >&5
+if { (eval echo "$as_me:17283: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:17261: \$? = $ac_status" >&5
+  echo "$as_me:17286: \$? = $ac_status" >&5

   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'

-  { (eval echo "$as_me:17263: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17288: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:17266: \$? = $ac_status" >&5
+  echo "$as_me:17291: \$? = $ac_status" >&5

   (exit $ac_status); }; }; then
   cf_cv_link_dataonly=yes
 else
   (exit $ac_status); }; }; then
   cf_cv_link_dataonly=yes
 else


@@ -17278,7 +17303,7 @@ fi
 
 fi
 
 
 fi
 

-echo "$as_me:17281: result: $cf_cv_link_dataonly" >&5
+echo "$as_me:17306: 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


@@ -17317,13 +17342,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:17320: checking for $ac_func" >&5
+echo "$as_me:17345: 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 17326 "configure"
+#line 17351 "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.  */


@@ -17354,16 +17379,16 @@ f = $ac_func; /* workaround for ICC 12.0.3 */ if (f == 0) return 1;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext

-if { (eval echo "$as_me:17357: \"$ac_link\"") >&5
+if { (eval echo "$as_me:17382: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:17360: \$? = $ac_status" >&5
+  echo "$as_me:17385: \$? = $ac_status" >&5

   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'

-  { (eval echo "$as_me:17363: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17388: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:17366: \$? = $ac_status" >&5
+  echo "$as_me:17391: \$? = $ac_status" >&5

   (exit $ac_status); }; }; then
   eval "$as_ac_var=yes"
 else
   (exit $ac_status); }; }; then
   eval "$as_ac_var=yes"
 else


@@ -17373,7 +17398,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:17376: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "$as_me:17401: 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


@@ -17385,21 +17410,21 @@ done
 
 if test "x$ac_cv_func_getopt" = xno && \
    test "x$cf_with_progs$cf_with_tests" != xnono; then
 
 if test "x$ac_cv_func_getopt" = xno && \
    test "x$cf_with_progs$cf_with_tests" != xnono; then

-       { { echo "$as_me:17388: error: getopt is required for building programs" >&5
+       { { echo "$as_me:17413: error: getopt is required for building programs" >&5

 echo "$as_me: error: getopt is required for building programs" >&2;}
    { (exit 1); exit 1; }; }
 fi
 
 if test "x$with_getcap" = "xyes" ; then
 
 echo "$as_me: error: getopt is required for building programs" >&2;}
    { (exit 1); exit 1; }; }
 fi
 
 if test "x$with_getcap" = "xyes" ; then
 

-echo "$as_me:17395: checking for terminal-capability database functions" >&5
+echo "$as_me:17420: 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 17402 "configure"
+#line 17427 "configure"

 #include "confdefs.h"
 
 #include <stdlib.h>
 #include "confdefs.h"
 
 #include <stdlib.h>


@@ -17419,16 +17444,16 @@ main (void)
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext

-if { (eval echo "$as_me:17422: \"$ac_link\"") >&5
+if { (eval echo "$as_me:17447: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:17425: \$? = $ac_status" >&5
+  echo "$as_me:17450: \$? = $ac_status" >&5

   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'

-  { (eval echo "$as_me:17428: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17453: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:17431: \$? = $ac_status" >&5
+  echo "$as_me:17456: \$? = $ac_status" >&5

   (exit $ac_status); }; }; then
   cf_cv_cgetent=yes
 else
   (exit $ac_status); }; }; then
   cf_cv_cgetent=yes
 else


@@ -17439,7 +17464,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:17442: result: $cf_cv_cgetent" >&5
+echo "$as_me:17467: result: $cf_cv_cgetent" >&5

 echo "${ECHO_T}$cf_cv_cgetent" >&6
 
 if test "$cf_cv_cgetent" = yes
 echo "${ECHO_T}$cf_cv_cgetent" >&6
 
 if test "$cf_cv_cgetent" = yes


@@ -17449,14 +17474,14 @@ cat >>confdefs.h <<\EOF
 #define HAVE_BSD_CGETENT 1
 EOF
 
 #define HAVE_BSD_CGETENT 1
 EOF
 

-echo "$as_me:17452: checking if cgetent uses const parameter" >&5
+echo "$as_me:17477: checking if cgetent uses const parameter" >&5

 echo $ECHO_N "checking if cgetent uses const parameter... $ECHO_C" >&6
 if test "${cf_cv_cgetent_const+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 cat >conftest.$ac_ext <<_ACEOF
 echo $ECHO_N "checking if cgetent uses const parameter... $ECHO_C" >&6
 if test "${cf_cv_cgetent_const+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 cat >conftest.$ac_ext <<_ACEOF

-#line 17459 "configure"
+#line 17484 "configure"

 #include "confdefs.h"
 
 #pragma GCC diagnostic error "-Wincompatible-pointer-types-discards-qualifiers"
 #include "confdefs.h"
 
 #pragma GCC diagnostic error "-Wincompatible-pointer-types-discards-qualifiers"


@@ -17479,16 +17504,16 @@ main (void)
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext

-if { (eval echo "$as_me:17482: \"$ac_link\"") >&5
+if { (eval echo "$as_me:17507: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:17485: \$? = $ac_status" >&5
+  echo "$as_me:17510: \$? = $ac_status" >&5

   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'

-  { (eval echo "$as_me:17488: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17513: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:17491: \$? = $ac_status" >&5
+  echo "$as_me:17516: \$? = $ac_status" >&5

   (exit $ac_status); }; }; then
   cf_cv_cgetent_const=yes
 else
   (exit $ac_status); }; }; then
   cf_cv_cgetent_const=yes
 else


@@ -17499,7 +17524,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:17502: result: $cf_cv_cgetent_const" >&5
+echo "$as_me:17527: result: $cf_cv_cgetent_const" >&5

 echo "${ECHO_T}$cf_cv_cgetent_const" >&6
        if test "$cf_cv_cgetent_const" = yes
        then
 echo "${ECHO_T}$cf_cv_cgetent_const" >&6
        if test "$cf_cv_cgetent_const" = yes
        then


@@ -17513,14 +17538,14 @@ fi
 
 fi
 
 
 fi
 

-echo "$as_me:17516: checking for isascii" >&5
+echo "$as_me:17541: 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 17523 "configure"
+#line 17548 "configure"

 #include "confdefs.h"
 #include <ctype.h>
 int
 #include "confdefs.h"
 #include <ctype.h>
 int


@@ -17532,16 +17557,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:17535: \"$ac_link\"") >&5
+if { (eval echo "$as_me:17560: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:17538: \$? = $ac_status" >&5
+  echo "$as_me:17563: \$? = $ac_status" >&5

   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'

-  { (eval echo "$as_me:17541: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17566: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:17544: \$? = $ac_status" >&5
+  echo "$as_me:17569: \$? = $ac_status" >&5

   (exit $ac_status); }; }; then
   cf_cv_have_isascii=yes
 else
   (exit $ac_status); }; }; then
   cf_cv_have_isascii=yes
 else


@@ -17552,7 +17577,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:17555: result: $cf_cv_have_isascii" >&5
+echo "$as_me:17580: result: $cf_cv_have_isascii" >&5

 echo "${ECHO_T}$cf_cv_have_isascii" >&6
 test "$cf_cv_have_isascii" = yes &&
 cat >>confdefs.h <<\EOF
 echo "${ECHO_T}$cf_cv_have_isascii" >&6
 test "$cf_cv_have_isascii" = yes &&
 cat >>confdefs.h <<\EOF


@@ -17560,10 +17585,10 @@ cat >>confdefs.h <<\EOF
 EOF
 
 if test "$ac_cv_func_sigaction" = yes; then
 EOF
 
 if test "$ac_cv_func_sigaction" = yes; then

-echo "$as_me:17563: checking whether sigaction needs _POSIX_SOURCE" >&5
+echo "$as_me:17588: 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 17566 "configure"
+#line 17591 "configure"

 #include "confdefs.h"
 
 #include <sys/types.h>
 #include "confdefs.h"
 
 #include <sys/types.h>


@@ -17577,16 +17602,16 @@ struct sigaction act
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

-if { (eval echo "$as_me:17580: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:17605: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:17583: \$? = $ac_status" >&5
+  echo "$as_me:17608: \$? = $ac_status" >&5

   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'

-  { (eval echo "$as_me:17586: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17611: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:17589: \$? = $ac_status" >&5
+  echo "$as_me:17614: \$? = $ac_status" >&5

   (exit $ac_status); }; }; then
   sigact_bad=no
 else
   (exit $ac_status); }; }; then
   sigact_bad=no
 else


@@ -17594,7 +17619,7 @@ else
 cat conftest.$ac_ext >&5
 
 cat >conftest.$ac_ext <<_ACEOF
 cat conftest.$ac_ext >&5
 
 cat >conftest.$ac_ext <<_ACEOF

-#line 17597 "configure"
+#line 17622 "configure"

 #include "confdefs.h"
 
 #define _POSIX_SOURCE
 #include "confdefs.h"
 
 #define _POSIX_SOURCE


@@ -17609,16 +17634,16 @@ struct sigaction act
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

-if { (eval echo "$as_me:17612: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:17637: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:17615: \$? = $ac_status" >&5
+  echo "$as_me:17640: \$? = $ac_status" >&5

   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'

-  { (eval echo "$as_me:17618: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17643: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:17621: \$? = $ac_status" >&5
+  echo "$as_me:17646: \$? = $ac_status" >&5

   (exit $ac_status); }; }; then
   sigact_bad=yes
 
   (exit $ac_status); }; }; then
   sigact_bad=yes
 


@@ -17634,11 +17659,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:17637: result: $sigact_bad" >&5
+echo "$as_me:17662: result: $sigact_bad" >&5

 echo "${ECHO_T}$sigact_bad" >&6
 fi
 
 echo "${ECHO_T}$sigact_bad" >&6
 fi
 

-echo "$as_me:17641: checking if nanosleep really works" >&5
+echo "$as_me:17666: 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


@@ -17648,7 +17673,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 17651 "configure"
+#line 17676 "configure"

 #include "confdefs.h"
 
 #include <stdio.h>
 #include "confdefs.h"
 
 #include <stdio.h>


@@ -17673,15 +17698,15 @@ int main(void) {
 
 _ACEOF
 rm -f conftest$ac_exeext
 
 _ACEOF
 rm -f conftest$ac_exeext

-if { (eval echo "$as_me:17676: \"$ac_link\"") >&5
+if { (eval echo "$as_me:17701: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:17679: \$? = $ac_status" >&5
+  echo "$as_me:17704: \$? = $ac_status" >&5

   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'

-  { (eval echo "$as_me:17681: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17706: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:17684: \$? = $ac_status" >&5
+  echo "$as_me:17709: \$? = $ac_status" >&5

   (exit $ac_status); }; }; then
   cf_cv_func_nanosleep=yes
 else
   (exit $ac_status); }; }; then
   cf_cv_func_nanosleep=yes
 else


@@ -17693,7 +17718,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:17696: result: $cf_cv_func_nanosleep" >&5
+echo "$as_me:17721: result: $cf_cv_func_nanosleep" >&5

 echo "${ECHO_T}$cf_cv_func_nanosleep" >&6
 
 test "$cf_cv_func_nanosleep" = "yes" &&
 echo "${ECHO_T}$cf_cv_func_nanosleep" >&6
 
 test "$cf_cv_func_nanosleep" = "yes" &&


@@ -17708,23 +17733,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:17711: checking for $ac_header" >&5
+echo "$as_me:17736: 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 17717 "configure"
+#line 17742 "configure"

 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF

-if { (eval echo "$as_me:17721: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:17746: \"$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:17727: \$? = $ac_status" >&5
+  echo "$as_me:17752: \$? = $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


@@ -17743,7 +17768,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
 fi
 rm -f conftest.err conftest.$ac_ext
 fi

-echo "$as_me:17746: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:17771: 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


@@ -17758,23 +17783,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:17761: checking for $ac_header" >&5
+echo "$as_me:17786: 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 17767 "configure"
+#line 17792 "configure"

 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF

-if { (eval echo "$as_me:17771: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:17796: \"$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:17777: \$? = $ac_status" >&5
+  echo "$as_me:17802: \$? = $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


@@ -17793,7 +17818,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
 fi
 rm -f conftest.err conftest.$ac_ext
 fi

-echo "$as_me:17796: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:17821: 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


@@ -17811,10 +17836,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:17814: checking whether termios.h needs _POSIX_SOURCE" >&5
+       echo "$as_me:17839: 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 17817 "configure"
+#line 17842 "configure"

 #include "confdefs.h"
 #include <termios.h>
 int
 #include "confdefs.h"
 #include <termios.h>
 int


@@ -17826,16 +17851,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:17829: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:17854: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:17832: \$? = $ac_status" >&5
+  echo "$as_me:17857: \$? = $ac_status" >&5

   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'

-  { (eval echo "$as_me:17835: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17860: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:17838: \$? = $ac_status" >&5
+  echo "$as_me:17863: \$? = $ac_status" >&5

   (exit $ac_status); }; }; then
   termios_bad=no
 else
   (exit $ac_status); }; }; then
   termios_bad=no
 else


@@ -17843,7 +17868,7 @@ else
 cat conftest.$ac_ext >&5
 
                cat >conftest.$ac_ext <<_ACEOF
 cat conftest.$ac_ext >&5
 
                cat >conftest.$ac_ext <<_ACEOF

-#line 17846 "configure"
+#line 17871 "configure"

 #include "confdefs.h"
 
 #define _POSIX_SOURCE
 #include "confdefs.h"
 
 #define _POSIX_SOURCE


@@ -17857,16 +17882,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:17860: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:17885: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:17863: \$? = $ac_status" >&5
+  echo "$as_me:17888: \$? = $ac_status" >&5

   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'

-  { (eval echo "$as_me:17866: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17891: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:17869: \$? = $ac_status" >&5
+  echo "$as_me:17894: \$? = $ac_status" >&5

   (exit $ac_status); }; }; then
   termios_bad=unknown
 else
   (exit $ac_status); }; }; then
   termios_bad=unknown
 else


@@ -17882,19 +17907,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:17885: result: $termios_bad" >&5
+       echo "$as_me:17910: result: $termios_bad" >&5

 echo "${ECHO_T}$termios_bad" >&6
        fi
 fi
 
 echo "${ECHO_T}$termios_bad" >&6
        fi
 fi
 

-echo "$as_me:17890: checking for tcgetattr" >&5
+echo "$as_me:17915: 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 17897 "configure"
+#line 17922 "configure"

 #include "confdefs.h"
 
 #include <sys/types.h>
 #include "confdefs.h"
 
 #include <sys/types.h>


@@ -17922,16 +17947,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:17925: \"$ac_link\"") >&5
+if { (eval echo "$as_me:17950: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:17928: \$? = $ac_status" >&5
+  echo "$as_me:17953: \$? = $ac_status" >&5

   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'

-  { (eval echo "$as_me:17931: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17956: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:17934: \$? = $ac_status" >&5
+  echo "$as_me:17959: \$? = $ac_status" >&5

   (exit $ac_status); }; }; then
   cf_cv_have_tcgetattr=yes
 else
   (exit $ac_status); }; }; then
   cf_cv_have_tcgetattr=yes
 else


@@ -17941,21 +17966,21 @@ cf_cv_have_tcgetattr=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi

-echo "$as_me:17944: result: $cf_cv_have_tcgetattr" >&5
+echo "$as_me:17969: 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:17951: checking for vsscanf function or workaround" >&5
+echo "$as_me:17976: 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 17958 "configure"
+#line 17983 "configure"

 #include "confdefs.h"
 
 #include <stdarg.h>
 #include "confdefs.h"
 
 #include <stdarg.h>


@@ -17971,16 +17996,16 @@ main (void)
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext

-if { (eval echo "$as_me:17974: \"$ac_link\"") >&5
+if { (eval echo "$as_me:17999: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:17977: \$? = $ac_status" >&5
+  echo "$as_me:18002: \$? = $ac_status" >&5

   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'

-  { (eval echo "$as_me:17980: \"$ac_try\"") >&5
+  { (eval echo "$as_me:18005: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:17983: \$? = $ac_status" >&5
+  echo "$as_me:18008: \$? = $ac_status" >&5

   (exit $ac_status); }; }; then
   cf_cv_func_vsscanf=vsscanf
 else
   (exit $ac_status); }; }; then
   cf_cv_func_vsscanf=vsscanf
 else


@@ -17988,7 +18013,7 @@ else
 cat conftest.$ac_ext >&5
 
 cat >conftest.$ac_ext <<_ACEOF
 cat conftest.$ac_ext >&5
 
 cat >conftest.$ac_ext <<_ACEOF

-#line 17991 "configure"
+#line 18016 "configure"

 #include "confdefs.h"
 
 #include <stdarg.h>
 #include "confdefs.h"
 
 #include <stdarg.h>


@@ -18010,16 +18035,16 @@ main (void)
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext

-if { (eval echo "$as_me:18013: \"$ac_link\"") >&5
+if { (eval echo "$as_me:18038: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:18016: \$? = $ac_status" >&5
+  echo "$as_me:18041: \$? = $ac_status" >&5

   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'

-  { (eval echo "$as_me:18019: \"$ac_try\"") >&5
+  { (eval echo "$as_me:18044: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:18022: \$? = $ac_status" >&5
+  echo "$as_me:18047: \$? = $ac_status" >&5

   (exit $ac_status); }; }; then
   cf_cv_func_vsscanf=vfscanf
 else
   (exit $ac_status); }; }; then
   cf_cv_func_vsscanf=vfscanf
 else


@@ -18027,7 +18052,7 @@ else
 cat conftest.$ac_ext >&5
 
 cat >conftest.$ac_ext <<_ACEOF
 cat conftest.$ac_ext >&5
 
 cat >conftest.$ac_ext <<_ACEOF

-#line 18030 "configure"
+#line 18055 "configure"

 #include "confdefs.h"
 
 #include <stdarg.h>
 #include "confdefs.h"
 
 #include <stdarg.h>


@@ -18049,16 +18074,16 @@ main (void)
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext

-if { (eval echo "$as_me:18052: \"$ac_link\"") >&5
+if { (eval echo "$as_me:18077: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:18055: \$? = $ac_status" >&5
+  echo "$as_me:18080: \$? = $ac_status" >&5

   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'

-  { (eval echo "$as_me:18058: \"$ac_try\"") >&5
+  { (eval echo "$as_me:18083: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:18061: \$? = $ac_status" >&5
+  echo "$as_me:18086: \$? = $ac_status" >&5

   (exit $ac_status); }; }; then
   cf_cv_func_vsscanf=_doscan
 else
   (exit $ac_status); }; }; then
   cf_cv_func_vsscanf=_doscan
 else


@@ -18073,7 +18098,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:18076: result: $cf_cv_func_vsscanf" >&5
+echo "$as_me:18101: result: $cf_cv_func_vsscanf" >&5

 echo "${ECHO_T}$cf_cv_func_vsscanf" >&6
 
 case $cf_cv_func_vsscanf in
 echo "${ECHO_T}$cf_cv_func_vsscanf" >&6
 
 case $cf_cv_func_vsscanf in


@@ -18099,23 +18124,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:18102: checking for $ac_header" >&5
+echo "$as_me:18127: 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 18108 "configure"
+#line 18133 "configure"

 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF

-if { (eval echo "$as_me:18112: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:18137: \"$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:18118: \$? = $ac_status" >&5
+  echo "$as_me:18143: \$? = $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


@@ -18134,7 +18159,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
 fi
 rm -f conftest.err conftest.$ac_ext
 fi

-echo "$as_me:18137: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:18162: 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


@@ -18144,7 +18169,7 @@ EOF
 fi
 done
 
 fi
 done
 

-echo "$as_me:18147: checking for working mkstemp" >&5
+echo "$as_me:18172: 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


@@ -18155,7 +18180,7 @@ if test "$cross_compiling" = yes; then
   cf_cv_func_mkstemp=maybe
 else
   cat >conftest.$ac_ext <<_ACEOF
   cf_cv_func_mkstemp=maybe
 else
   cat >conftest.$ac_ext <<_ACEOF

-#line 18158 "configure"
+#line 18183 "configure"

 #include "confdefs.h"
 
 #include <sys/types.h>
 #include "confdefs.h"
 
 #include <sys/types.h>


@@ -18196,15 +18221,15 @@ int main(void)
 
 _ACEOF
 rm -f conftest$ac_exeext
 
 _ACEOF
 rm -f conftest$ac_exeext

-if { (eval echo "$as_me:18199: \"$ac_link\"") >&5
+if { (eval echo "$as_me:18224: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:18202: \$? = $ac_status" >&5
+  echo "$as_me:18227: \$? = $ac_status" >&5

   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'

-  { (eval echo "$as_me:18204: \"$ac_try\"") >&5
+  { (eval echo "$as_me:18229: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:18207: \$? = $ac_status" >&5
+  echo "$as_me:18232: \$? = $ac_status" >&5

   (exit $ac_status); }; }; then
   cf_cv_func_mkstemp=yes
 
   (exit $ac_status); }; }; then
   cf_cv_func_mkstemp=yes
 


@@ -18219,16 +18244,16 @@ rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 
 fi
 fi
 
 fi

-echo "$as_me:18222: result: $cf_cv_func_mkstemp" >&5
+echo "$as_me:18247: result: $cf_cv_func_mkstemp" >&5

 echo "${ECHO_T}$cf_cv_func_mkstemp" >&6
 if test "x$cf_cv_func_mkstemp" = xmaybe ; then
 echo "${ECHO_T}$cf_cv_func_mkstemp" >&6
 if test "x$cf_cv_func_mkstemp" = xmaybe ; then

-       echo "$as_me:18225: checking for mkstemp" >&5
+       echo "$as_me:18250: 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 18231 "configure"
+#line 18256 "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.  */


@@ -18259,16 +18284,16 @@ f = mkstemp; /* workaround for ICC 12.0.3 */ if (f == 0) return 1;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext

-if { (eval echo "$as_me:18262: \"$ac_link\"") >&5
+if { (eval echo "$as_me:18287: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:18265: \$? = $ac_status" >&5
+  echo "$as_me:18290: \$? = $ac_status" >&5

   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'

-  { (eval echo "$as_me:18268: \"$ac_try\"") >&5
+  { (eval echo "$as_me:18293: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:18271: \$? = $ac_status" >&5
+  echo "$as_me:18296: \$? = $ac_status" >&5

   (exit $ac_status); }; }; then
   ac_cv_func_mkstemp=yes
 else
   (exit $ac_status); }; }; then
   ac_cv_func_mkstemp=yes
 else


@@ -18278,7 +18303,7 @@ ac_cv_func_mkstemp=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi

-echo "$as_me:18281: result: $ac_cv_func_mkstemp" >&5
+echo "$as_me:18306: result: $ac_cv_func_mkstemp" >&5

 echo "${ECHO_T}$ac_cv_func_mkstemp" >&6
 
 fi
 echo "${ECHO_T}$ac_cv_func_mkstemp" >&6
 
 fi


@@ -18299,21 +18324,21 @@ else
 fi
 
 if test "x$cross_compiling" = xyes ; then
 fi
 
 if test "x$cross_compiling" = xyes ; then

-       { echo "$as_me:18302: WARNING: cross compiling: assume setvbuf params not reversed" >&5
+       { echo "$as_me:18327: 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:18305: checking whether setvbuf arguments are reversed" >&5
+       echo "$as_me:18330: 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:18311: error: cannot run test program while cross compiling" >&5
+  { { echo "$as_me:18336: 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 18316 "configure"
+#line 18341 "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. */


@@ -18330,15 +18355,15 @@ main (void)
 }
 _ACEOF
 rm -f conftest$ac_exeext
 }
 _ACEOF
 rm -f conftest$ac_exeext

-if { (eval echo "$as_me:18333: \"$ac_link\"") >&5
+if { (eval echo "$as_me:18358: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:18336: \$? = $ac_status" >&5
+  echo "$as_me:18361: \$? = $ac_status" >&5

   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'

-  { (eval echo "$as_me:18338: \"$ac_try\"") >&5
+  { (eval echo "$as_me:18363: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:18341: \$? = $ac_status" >&5
+  echo "$as_me:18366: \$? = $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


@@ -18351,7 +18376,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:18354: result: $ac_cv_func_setvbuf_reversed" >&5
+echo "$as_me:18379: 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
 


@@ -18362,13 +18387,13 @@ EOF
 fi
 
 fi
 fi
 
 fi

-echo "$as_me:18365: checking for intptr_t" >&5
+echo "$as_me:18390: checking for intptr_t" >&5

 echo $ECHO_N "checking for intptr_t... $ECHO_C" >&6
 if test "${ac_cv_type_intptr_t+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 echo $ECHO_N "checking for intptr_t... $ECHO_C" >&6
 if test "${ac_cv_type_intptr_t+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF

-#line 18371 "configure"
+#line 18396 "configure"

 #include "confdefs.h"
 $ac_includes_default
 int
 #include "confdefs.h"
 $ac_includes_default
 int


@@ -18383,16 +18408,16 @@ if (sizeof (intptr_t))
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

-if { (eval echo "$as_me:18386: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:18411: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:18389: \$? = $ac_status" >&5
+  echo "$as_me:18414: \$? = $ac_status" >&5

   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'

-  { (eval echo "$as_me:18392: \"$ac_try\"") >&5
+  { (eval echo "$as_me:18417: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:18395: \$? = $ac_status" >&5
+  echo "$as_me:18420: \$? = $ac_status" >&5

   (exit $ac_status); }; }; then
   ac_cv_type_intptr_t=yes
 else
   (exit $ac_status); }; }; then
   ac_cv_type_intptr_t=yes
 else


@@ -18402,7 +18427,7 @@ ac_cv_type_intptr_t=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi

-echo "$as_me:18405: result: $ac_cv_type_intptr_t" >&5
+echo "$as_me:18430: result: $ac_cv_type_intptr_t" >&5

 echo "${ECHO_T}$ac_cv_type_intptr_t" >&6
 if test $ac_cv_type_intptr_t = yes; then
   :
 echo "${ECHO_T}$ac_cv_type_intptr_t" >&6
 if test $ac_cv_type_intptr_t = yes; then
   :


@@ -18414,13 +18439,13 @@ EOF
 
 fi
 
 
 fi
 

-echo "$as_me:18417: checking for ssize_t" >&5
+echo "$as_me:18442: checking for ssize_t" >&5

 echo $ECHO_N "checking for ssize_t... $ECHO_C" >&6
 if test "${ac_cv_type_ssize_t+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 echo $ECHO_N "checking for ssize_t... $ECHO_C" >&6
 if test "${ac_cv_type_ssize_t+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF

-#line 18423 "configure"
+#line 18448 "configure"

 #include "confdefs.h"
 $ac_includes_default
 int
 #include "confdefs.h"
 $ac_includes_default
 int


@@ -18435,16 +18460,16 @@ if (sizeof (ssize_t))
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

-if { (eval echo "$as_me:18438: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:18463: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:18441: \$? = $ac_status" >&5
+  echo "$as_me:18466: \$? = $ac_status" >&5

   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'

-  { (eval echo "$as_me:18444: \"$ac_try\"") >&5
+  { (eval echo "$as_me:18469: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:18447: \$? = $ac_status" >&5
+  echo "$as_me:18472: \$? = $ac_status" >&5

   (exit $ac_status); }; }; then
   ac_cv_type_ssize_t=yes
 else
   (exit $ac_status); }; }; then
   ac_cv_type_ssize_t=yes
 else


@@ -18454,7 +18479,7 @@ ac_cv_type_ssize_t=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi

-echo "$as_me:18457: result: $ac_cv_type_ssize_t" >&5
+echo "$as_me:18482: result: $ac_cv_type_ssize_t" >&5

 echo "${ECHO_T}$ac_cv_type_ssize_t" >&6
 if test $ac_cv_type_ssize_t = yes; then
   :
 echo "${ECHO_T}$ac_cv_type_ssize_t" >&6
 if test $ac_cv_type_ssize_t = yes; then
   :


@@ -18466,14 +18491,14 @@ EOF
 
 fi
 
 
 fi
 

-echo "$as_me:18469: checking for type sigaction_t" >&5
+echo "$as_me:18494: 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 18476 "configure"
+#line 18501 "configure"

 #include "confdefs.h"
 
 #include <signal.h>
 #include "confdefs.h"
 
 #include <signal.h>


@@ -18486,16 +18511,16 @@ sigaction_t x
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

-if { (eval echo "$as_me:18489: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:18514: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:18492: \$? = $ac_status" >&5
+  echo "$as_me:18517: \$? = $ac_status" >&5

   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'

-  { (eval echo "$as_me:18495: \"$ac_try\"") >&5
+  { (eval echo "$as_me:18520: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:18498: \$? = $ac_status" >&5
+  echo "$as_me:18523: \$? = $ac_status" >&5

   (exit $ac_status); }; }; then
   cf_cv_type_sigaction=yes
 else
   (exit $ac_status); }; }; then
   cf_cv_type_sigaction=yes
 else


@@ -18506,14 +18531,14 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
 
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
 

-echo "$as_me:18509: result: $cf_cv_type_sigaction" >&5
+echo "$as_me:18534: 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:18516: checking declaration of size-change" >&5
+echo "$as_me:18541: 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


@@ -18528,7 +18553,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 18531 "configure"
+#line 18556 "configure"

 #include "confdefs.h"
 #include <sys/types.h>
 #ifdef HAVE_TERMIOS_H
 #include "confdefs.h"
 #include <sys/types.h>
 #ifdef HAVE_TERMIOS_H


@@ -18572,16 +18597,16 @@ main (void)
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

-if { (eval echo "$as_me:18575: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:18600: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:18578: \$? = $ac_status" >&5
+  echo "$as_me:18603: \$? = $ac_status" >&5

   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'

-  { (eval echo "$as_me:18581: \"$ac_try\"") >&5
+  { (eval echo "$as_me:18606: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:18584: \$? = $ac_status" >&5
+  echo "$as_me:18609: \$? = $ac_status" >&5

   (exit $ac_status); }; }; then
   cf_cv_sizechange=yes
 else
   (exit $ac_status); }; }; then
   cf_cv_sizechange=yes
 else


@@ -18600,7 +18625,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 done
 
 fi
 done
 
 fi

-echo "$as_me:18603: result: $cf_cv_sizechange" >&5
+echo "$as_me:18628: result: $cf_cv_sizechange" >&5

 echo "${ECHO_T}$cf_cv_sizechange" >&6
 if test "$cf_cv_sizechange" != no ; then
 
 echo "${ECHO_T}$cf_cv_sizechange" >&6
 if test "$cf_cv_sizechange" != no ; then
 


@@ -18618,13 +18643,13 @@ EOF
        esac
 fi
 
        esac
 fi
 

-echo "$as_me:18621: checking for memmove" >&5
+echo "$as_me:18646: 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 18627 "configure"
+#line 18652 "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.  */


@@ -18655,16 +18680,16 @@ f = memmove; /* workaround for ICC 12.0.3 */ if (f == 0) return 1;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext

-if { (eval echo "$as_me:18658: \"$ac_link\"") >&5
+if { (eval echo "$as_me:18683: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:18661: \$? = $ac_status" >&5
+  echo "$as_me:18686: \$? = $ac_status" >&5

   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'

-  { (eval echo "$as_me:18664: \"$ac_try\"") >&5
+  { (eval echo "$as_me:18689: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:18667: \$? = $ac_status" >&5
+  echo "$as_me:18692: \$? = $ac_status" >&5

   (exit $ac_status); }; }; then
   ac_cv_func_memmove=yes
 else
   (exit $ac_status); }; }; then
   ac_cv_func_memmove=yes
 else


@@ -18674,19 +18699,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:18677: result: $ac_cv_func_memmove" >&5
+echo "$as_me:18702: 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:18683: checking for bcopy" >&5
+echo "$as_me:18708: 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 18689 "configure"
+#line 18714 "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.  */


@@ -18717,16 +18742,16 @@ f = bcopy; /* workaround for ICC 12.0.3 */ if (f == 0) return 1;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext

-if { (eval echo "$as_me:18720: \"$ac_link\"") >&5
+if { (eval echo "$as_me:18745: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:18723: \$? = $ac_status" >&5
+  echo "$as_me:18748: \$? = $ac_status" >&5

   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'

-  { (eval echo "$as_me:18726: \"$ac_try\"") >&5
+  { (eval echo "$as_me:18751: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:18729: \$? = $ac_status" >&5
+  echo "$as_me:18754: \$? = $ac_status" >&5

   (exit $ac_status); }; }; then
   ac_cv_func_bcopy=yes
 else
   (exit $ac_status); }; }; then
   ac_cv_func_bcopy=yes
 else


@@ -18736,11 +18761,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:18739: result: $ac_cv_func_bcopy" >&5
+echo "$as_me:18764: 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:18743: checking if bcopy does overlapping moves" >&5
+       echo "$as_me:18768: 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


@@ -18750,7 +18775,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 18753 "configure"
+#line 18778 "configure"

 #include "confdefs.h"
 
 int main(void) {
 #include "confdefs.h"
 
 int main(void) {


@@ -18764,15 +18789,15 @@ int main(void) {
 
 _ACEOF
 rm -f conftest$ac_exeext
 
 _ACEOF
 rm -f conftest$ac_exeext

-if { (eval echo "$as_me:18767: \"$ac_link\"") >&5
+if { (eval echo "$as_me:18792: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:18770: \$? = $ac_status" >&5
+  echo "$as_me:18795: \$? = $ac_status" >&5

   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'

-  { (eval echo "$as_me:18772: \"$ac_try\"") >&5
+  { (eval echo "$as_me:18797: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:18775: \$? = $ac_status" >&5
+  echo "$as_me:18800: \$? = $ac_status" >&5

   (exit $ac_status); }; }; then
   cf_cv_good_bcopy=yes
 else
   (exit $ac_status); }; }; then
   cf_cv_good_bcopy=yes
 else


@@ -18785,7 +18810,7 @@ rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 
 fi
 fi
 
 fi

-echo "$as_me:18788: result: $cf_cv_good_bcopy" >&5
+echo "$as_me:18813: result: $cf_cv_good_bcopy" >&5

 echo "${ECHO_T}$cf_cv_good_bcopy" >&6
 
 else
 echo "${ECHO_T}$cf_cv_good_bcopy" >&6
 
 else


@@ -18812,13 +18837,13 @@ tty 2>&1 >/dev/null || {
 for ac_func in posix_openpt
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
 for ac_func in posix_openpt
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`

-echo "$as_me:18815: checking for $ac_func" >&5
+echo "$as_me:18840: 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 18821 "configure"
+#line 18846 "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.  */


@@ -18849,16 +18874,16 @@ f = $ac_func; /* workaround for ICC 12.0.3 */ if (f == 0) return 1;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext

-if { (eval echo "$as_me:18852: \"$ac_link\"") >&5
+if { (eval echo "$as_me:18877: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:18855: \$? = $ac_status" >&5
+  echo "$as_me:18880: \$? = $ac_status" >&5

   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'

-  { (eval echo "$as_me:18858: \"$ac_try\"") >&5
+  { (eval echo "$as_me:18883: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:18861: \$? = $ac_status" >&5
+  echo "$as_me:18886: \$? = $ac_status" >&5

   (exit $ac_status); }; }; then
   eval "$as_ac_var=yes"
 else
   (exit $ac_status); }; }; then
   eval "$as_ac_var=yes"
 else


@@ -18868,7 +18893,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:18871: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "$as_me:18896: 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


@@ -18878,7 +18903,7 @@ EOF
 fi
 done
  }
 fi
 done
  }

-echo "$as_me:18881: checking if poll really works" >&5
+echo "$as_me:18906: 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


@@ -18888,7 +18913,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 18891 "configure"
+#line 18916 "configure"

 #include "confdefs.h"
 
 #include <stdlib.h>
 #include "confdefs.h"
 
 #include <stdlib.h>


@@ -18940,15 +18965,15 @@ int main(void) {
 }
 _ACEOF
 rm -f conftest$ac_exeext
 }
 _ACEOF
 rm -f conftest$ac_exeext

-if { (eval echo "$as_me:18943: \"$ac_link\"") >&5
+if { (eval echo "$as_me:18968: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:18946: \$? = $ac_status" >&5
+  echo "$as_me:18971: \$? = $ac_status" >&5

   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'

-  { (eval echo "$as_me:18948: \"$ac_try\"") >&5
+  { (eval echo "$as_me:18973: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:18951: \$? = $ac_status" >&5
+  echo "$as_me:18976: \$? = $ac_status" >&5

   (exit $ac_status); }; }; then
   cf_cv_working_poll=yes
 else
   (exit $ac_status); }; }; then
   cf_cv_working_poll=yes
 else


@@ -18960,21 +18985,21 @@ fi
 rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 fi
 rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 fi

-echo "$as_me:18963: result: $cf_cv_working_poll" >&5
+echo "$as_me:18988: result: $cf_cv_working_poll" >&5

 echo "${ECHO_T}$cf_cv_working_poll" >&6
 test "$cf_cv_working_poll" = "yes" &&
 cat >>confdefs.h <<\EOF
 #define HAVE_WORKING_POLL 1
 EOF
 
 echo "${ECHO_T}$cf_cv_working_poll" >&6
 test "$cf_cv_working_poll" = "yes" &&
 cat >>confdefs.h <<\EOF
 #define HAVE_WORKING_POLL 1
 EOF
 

-echo "$as_me:18970: checking for va_copy" >&5
+echo "$as_me:18995: checking for va_copy" >&5

 echo $ECHO_N "checking for va_copy... $ECHO_C" >&6
 if test "${cf_cv_have_va_copy+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 cat >conftest.$ac_ext <<_ACEOF
 echo $ECHO_N "checking for va_copy... $ECHO_C" >&6
 if test "${cf_cv_have_va_copy+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 cat >conftest.$ac_ext <<_ACEOF

-#line 18977 "configure"
+#line 19002 "configure"

 #include "confdefs.h"
 
 #include <stdarg.h>
 #include "confdefs.h"
 
 #include <stdarg.h>


@@ -18991,16 +19016,16 @@ main (void)
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext

-if { (eval echo "$as_me:18994: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19019: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:18997: \$? = $ac_status" >&5
+  echo "$as_me:19022: \$? = $ac_status" >&5

   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'

-  { (eval echo "$as_me:19000: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19025: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:19003: \$? = $ac_status" >&5
+  echo "$as_me:19028: \$? = $ac_status" >&5

   (exit $ac_status); }; }; then
   cf_cv_have_va_copy=yes
 else
   (exit $ac_status); }; }; then
   cf_cv_have_va_copy=yes
 else


@@ -19010,7 +19035,7 @@ cf_cv_have_va_copy=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi

-echo "$as_me:19013: result: $cf_cv_have_va_copy" >&5
+echo "$as_me:19038: result: $cf_cv_have_va_copy" >&5

 echo "${ECHO_T}$cf_cv_have_va_copy" >&6
 
 test "$cf_cv_have_va_copy" = yes &&
 echo "${ECHO_T}$cf_cv_have_va_copy" >&6
 
 test "$cf_cv_have_va_copy" = yes &&


@@ -19018,14 +19043,14 @@ cat >>confdefs.h <<\EOF
 #define HAVE_VA_COPY 1
 EOF
 
 #define HAVE_VA_COPY 1
 EOF
 

-echo "$as_me:19021: checking for __va_copy" >&5
+echo "$as_me:19046: checking for __va_copy" >&5

 echo $ECHO_N "checking for __va_copy... $ECHO_C" >&6
 if test "${cf_cv_have___va_copy+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 cat >conftest.$ac_ext <<_ACEOF
 echo $ECHO_N "checking for __va_copy... $ECHO_C" >&6
 if test "${cf_cv_have___va_copy+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 cat >conftest.$ac_ext <<_ACEOF

-#line 19028 "configure"
+#line 19053 "configure"

 #include "confdefs.h"
 
 #include <stdarg.h>
 #include "confdefs.h"
 
 #include <stdarg.h>


@@ -19042,16 +19067,16 @@ main (void)
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext

-if { (eval echo "$as_me:19045: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19070: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:19048: \$? = $ac_status" >&5
+  echo "$as_me:19073: \$? = $ac_status" >&5

   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'

-  { (eval echo "$as_me:19051: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19076: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:19054: \$? = $ac_status" >&5
+  echo "$as_me:19079: \$? = $ac_status" >&5

   (exit $ac_status); }; }; then
   cf_cv_have___va_copy=yes
 else
   (exit $ac_status); }; }; then
   cf_cv_have___va_copy=yes
 else


@@ -19061,7 +19086,7 @@ cf_cv_have___va_copy=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi

-echo "$as_me:19064: result: $cf_cv_have___va_copy" >&5
+echo "$as_me:19089: result: $cf_cv_have___va_copy" >&5

 echo "${ECHO_T}$cf_cv_have___va_copy" >&6
 
 test "$cf_cv_have___va_copy" = yes &&
 echo "${ECHO_T}$cf_cv_have___va_copy" >&6
 
 test "$cf_cv_have___va_copy" = yes &&


@@ -19069,13 +19094,13 @@ cat >>confdefs.h <<\EOF
 #define HAVE___VA_COPY 1
 EOF
 
 #define HAVE___VA_COPY 1
 EOF
 

-echo "$as_me:19072: checking for pid_t" >&5
+echo "$as_me:19097: checking for pid_t" >&5

 echo $ECHO_N "checking for pid_t... $ECHO_C" >&6
 if test "${ac_cv_type_pid_t+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 echo $ECHO_N "checking for pid_t... $ECHO_C" >&6
 if test "${ac_cv_type_pid_t+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF

-#line 19078 "configure"
+#line 19103 "configure"

 #include "confdefs.h"
 $ac_includes_default
 int
 #include "confdefs.h"
 $ac_includes_default
 int


@@ -19090,16 +19115,16 @@ if (sizeof (pid_t))
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

-if { (eval echo "$as_me:19093: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:19118: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:19096: \$? = $ac_status" >&5
+  echo "$as_me:19121: \$? = $ac_status" >&5

   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'

-  { (eval echo "$as_me:19099: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19124: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:19102: \$? = $ac_status" >&5
+  echo "$as_me:19127: \$? = $ac_status" >&5

   (exit $ac_status); }; }; then
   ac_cv_type_pid_t=yes
 else
   (exit $ac_status); }; }; then
   ac_cv_type_pid_t=yes
 else


@@ -19109,7 +19134,7 @@ ac_cv_type_pid_t=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi

-echo "$as_me:19112: result: $ac_cv_type_pid_t" >&5
+echo "$as_me:19137: result: $ac_cv_type_pid_t" >&5

 echo "${ECHO_T}$ac_cv_type_pid_t" >&6
 if test $ac_cv_type_pid_t = yes; then
   :
 echo "${ECHO_T}$ac_cv_type_pid_t" >&6
 if test $ac_cv_type_pid_t = yes; then
   :


@@ -19124,23 +19149,23 @@ fi
 for ac_header in unistd.h vfork.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
 for ac_header in unistd.h vfork.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`

-echo "$as_me:19127: checking for $ac_header" >&5
+echo "$as_me:19152: 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 19133 "configure"
+#line 19158 "configure"

 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF

-if { (eval echo "$as_me:19137: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:19162: \"$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:19143: \$? = $ac_status" >&5
+  echo "$as_me:19168: \$? = $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


@@ -19159,7 +19184,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
 fi
 rm -f conftest.err conftest.$ac_ext
 fi

-echo "$as_me:19162: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:19187: 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


@@ -19172,13 +19197,13 @@ done
 for ac_func in fork vfork
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
 for ac_func in fork vfork
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`

-echo "$as_me:19175: checking for $ac_func" >&5
+echo "$as_me:19200: 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 19181 "configure"
+#line 19206 "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.  */


@@ -19209,16 +19234,16 @@ f = $ac_func; /* workaround for ICC 12.0.3 */ if (f == 0) return 1;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext

-if { (eval echo "$as_me:19212: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19237: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:19215: \$? = $ac_status" >&5
+  echo "$as_me:19240: \$? = $ac_status" >&5

   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'

-  { (eval echo "$as_me:19218: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19243: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:19221: \$? = $ac_status" >&5
+  echo "$as_me:19246: \$? = $ac_status" >&5

   (exit $ac_status); }; }; then
   eval "$as_ac_var=yes"
 else
   (exit $ac_status); }; }; then
   eval "$as_ac_var=yes"
 else


@@ -19228,7 +19253,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:19231: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "$as_me:19256: 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


@@ -19240,7 +19265,7 @@ done
 
 ac_cv_func_fork_works=$ac_cv_func_fork
 if test "x$ac_cv_func_fork" = xyes; then
 
 ac_cv_func_fork_works=$ac_cv_func_fork
 if test "x$ac_cv_func_fork" = xyes; then

-  echo "$as_me:19243: checking for working fork" >&5
+  echo "$as_me:19268: checking for working fork" >&5

 echo $ECHO_N "checking for working fork... $ECHO_C" >&6
 if test "${ac_cv_func_fork_works+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 echo $ECHO_N "checking for working fork... $ECHO_C" >&6
 if test "${ac_cv_func_fork_works+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6


@@ -19263,15 +19288,15 @@ else
       }
 _ACEOF
 rm -f conftest$ac_exeext
       }
 _ACEOF
 rm -f conftest$ac_exeext

-if { (eval echo "$as_me:19266: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19291: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:19269: \$? = $ac_status" >&5
+  echo "$as_me:19294: \$? = $ac_status" >&5

   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'

-  { (eval echo "$as_me:19271: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19296: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:19274: \$? = $ac_status" >&5
+  echo "$as_me:19299: \$? = $ac_status" >&5

   (exit $ac_status); }; }; then
   ac_cv_func_fork_works=yes
 else
   (exit $ac_status); }; }; then
   ac_cv_func_fork_works=yes
 else


@@ -19283,7 +19308,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:19286: result: $ac_cv_func_fork_works" >&5
+echo "$as_me:19311: result: $ac_cv_func_fork_works" >&5

 echo "${ECHO_T}$ac_cv_func_fork_works" >&6
 
 fi
 echo "${ECHO_T}$ac_cv_func_fork_works" >&6
 
 fi


@@ -19297,12 +19322,12 @@ if test "x$ac_cv_func_fork_works" = xcross; then
       ac_cv_func_fork_works=yes
       ;;
   esac
       ac_cv_func_fork_works=yes
       ;;
   esac

-  { echo "$as_me:19300: WARNING: CROSS: Result $ac_cv_func_fork_works guessed due to cross-compiling." >&5
+  { echo "$as_me:19325: WARNING: CROSS: Result $ac_cv_func_fork_works guessed due to cross-compiling." >&5

 echo "$as_me: WARNING: CROSS: Result $ac_cv_func_fork_works guessed due to cross-compiling." >&2;}
 fi
 ac_cv_func_vfork_works=$ac_cv_func_vfork
 if test "x$ac_cv_func_vfork" = xyes; then
 echo "$as_me: WARNING: CROSS: Result $ac_cv_func_fork_works guessed due to cross-compiling." >&2;}
 fi
 ac_cv_func_vfork_works=$ac_cv_func_vfork
 if test "x$ac_cv_func_vfork" = xyes; then

-  echo "$as_me:19305: checking for working vfork" >&5
+  echo "$as_me:19330: checking for working vfork" >&5

 echo $ECHO_N "checking for working vfork... $ECHO_C" >&6
 if test "${ac_cv_func_vfork_works+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 echo $ECHO_N "checking for working vfork... $ECHO_C" >&6
 if test "${ac_cv_func_vfork_works+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6


@@ -19311,7 +19336,7 @@ else
   ac_cv_func_vfork_works=cross
 else
   cat >conftest.$ac_ext <<_ACEOF
   ac_cv_func_vfork_works=cross
 else
   cat >conftest.$ac_ext <<_ACEOF

-#line 19314 "configure"
+#line 19339 "configure"

 #include "confdefs.h"
 /* Thanks to Paul Eggert for this test.  */
 #include <stdio.h>
 #include "confdefs.h"
 /* Thanks to Paul Eggert for this test.  */
 #include <stdio.h>


@@ -19408,15 +19433,15 @@ main (void)
 }
 _ACEOF
 rm -f conftest$ac_exeext
 }
 _ACEOF
 rm -f conftest$ac_exeext

-if { (eval echo "$as_me:19411: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19436: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:19414: \$? = $ac_status" >&5
+  echo "$as_me:19439: \$? = $ac_status" >&5

   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'

-  { (eval echo "$as_me:19416: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19441: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:19419: \$? = $ac_status" >&5
+  echo "$as_me:19444: \$? = $ac_status" >&5

   (exit $ac_status); }; }; then
   ac_cv_func_vfork_works=yes
 else
   (exit $ac_status); }; }; then
   ac_cv_func_vfork_works=yes
 else


@@ -19428,13 +19453,13 @@ fi
 rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 fi
 rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 fi

-echo "$as_me:19431: result: $ac_cv_func_vfork_works" >&5
+echo "$as_me:19456: result: $ac_cv_func_vfork_works" >&5

 echo "${ECHO_T}$ac_cv_func_vfork_works" >&6
 
 fi;
 if test "x$ac_cv_func_fork_works" = xcross; then
   ac_cv_func_vfork_works=ac_cv_func_vfork
 echo "${ECHO_T}$ac_cv_func_vfork_works" >&6
 
 fi;
 if test "x$ac_cv_func_fork_works" = xcross; then
   ac_cv_func_vfork_works=ac_cv_func_vfork

-  { echo "$as_me:19437: WARNING: CROSS: Result $ac_cv_func_vfork_works guessed due to cross-compiling." >&5
+  { echo "$as_me:19462: WARNING: CROSS: Result $ac_cv_func_vfork_works guessed due to cross-compiling." >&5

 echo "$as_me: WARNING: CROSS: Result $ac_cv_func_vfork_works guessed due to cross-compiling." >&2;}
 fi
 
 echo "$as_me: WARNING: CROSS: Result $ac_cv_func_vfork_works guessed due to cross-compiling." >&2;}
 fi
 


@@ -19461,7 +19486,7 @@ fi
 
 # special check for test/ditto.c
 
 
 # special check for test/ditto.c
 

-echo "$as_me:19464: checking for openpty in -lutil" >&5
+echo "$as_me:19489: 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


@@ -19469,7 +19494,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 19472 "configure"
+#line 19497 "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.  */


@@ -19488,16 +19513,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:19491: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19516: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:19494: \$? = $ac_status" >&5
+  echo "$as_me:19519: \$? = $ac_status" >&5

   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'

-  { (eval echo "$as_me:19497: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19522: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:19500: \$? = $ac_status" >&5
+  echo "$as_me:19525: \$? = $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


@@ -19508,7 +19533,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:19511: result: $ac_cv_lib_util_openpty" >&5
+echo "$as_me:19536: 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


@@ -19516,7 +19541,7 @@ else
   cf_cv_lib_util=no
 fi
 
   cf_cv_lib_util=no
 fi
 

-echo "$as_me:19519: checking for openpty header" >&5
+echo "$as_me:19544: 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


@@ -19543,7 +19568,7 @@ LIBS="$cf_add_libs"
        for cf_header in pty.h libutil.h util.h
        do
        cat >conftest.$ac_ext <<_ACEOF
        for cf_header in pty.h libutil.h util.h
        do
        cat >conftest.$ac_ext <<_ACEOF

-#line 19546 "configure"
+#line 19571 "configure"

 #include "confdefs.h"
 
 #include <$cf_header>
 #include "confdefs.h"
 
 #include <$cf_header>


@@ -19560,16 +19585,16 @@ main (void)
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext

-if { (eval echo "$as_me:19563: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19588: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:19566: \$? = $ac_status" >&5
+  echo "$as_me:19591: \$? = $ac_status" >&5

   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'

-  { (eval echo "$as_me:19569: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19594: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:19572: \$? = $ac_status" >&5
+  echo "$as_me:19597: \$? = $ac_status" >&5

   (exit $ac_status); }; }; then
 
                cf_cv_func_openpty=$cf_header
   (exit $ac_status); }; }; then
 
                cf_cv_func_openpty=$cf_header


@@ -19587,7 +19612,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:19590: result: $cf_cv_func_openpty" >&5
+echo "$as_me:19615: 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


@@ -19657,7 +19682,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 19660 "configure"
+#line 19685 "configure"

 #include "confdefs.h"
 #include <stdio.h>
 int
 #include "confdefs.h"
 #include <stdio.h>
 int


@@ -19669,16 +19694,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

-if { (eval echo "$as_me:19672: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:19697: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:19675: \$? = $ac_status" >&5
+  echo "$as_me:19700: \$? = $ac_status" >&5

   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'

-  { (eval echo "$as_me:19678: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19703: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:19681: \$? = $ac_status" >&5
+  echo "$as_me:19706: \$? = $ac_status" >&5

   (exit $ac_status); }; }; then
   :
 else
   (exit $ac_status); }; }; then
   :
 else


@@ -19695,7 +19720,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}:19698: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:19723: testing adding $cf_add_incdir to include-path ..." 1>&5

 
                  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
 
                  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 


@@ -19731,7 +19756,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}:19734: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:19759: testing adding $cf_add_libdir to library-path ..." 1>&5

 
                                LDFLAGS="-L$cf_add_libdir $LDFLAGS"
                        fi
 
                                LDFLAGS="-L$cf_add_libdir $LDFLAGS"
                        fi


@@ -19742,7 +19767,7 @@ fi
        else
                case "$with_hashed_db" in
                (./*|../*|/*)
        else
                case "$with_hashed_db" in
                (./*|../*|/*)

-                       { echo "$as_me:19745: WARNING: no such directory $with_hashed_db" >&5
+                       { echo "$as_me:19770: WARNING: no such directory $with_hashed_db" >&5

 echo "$as_me: WARNING: no such directory $with_hashed_db" >&2;}
                        ;;
                (*)
 echo "$as_me: WARNING: no such directory $with_hashed_db" >&2;}
                        ;;
                (*)


@@ -19811,7 +19836,7 @@ if test -n "$cf_item" ; 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 19814 "configure"
+#line 19839 "configure"

 #include "confdefs.h"
 #include <stdio.h>
 int
 #include "confdefs.h"
 #include <stdio.h>
 int


@@ -19823,16 +19848,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

-if { (eval echo "$as_me:19826: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:19851: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:19829: \$? = $ac_status" >&5
+  echo "$as_me:19854: \$? = $ac_status" >&5

   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'

-  { (eval echo "$as_me:19832: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19857: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:19835: \$? = $ac_status" >&5
+  echo "$as_me:19860: \$? = $ac_status" >&5

   (exit $ac_status); }; }; then
   :
 else
   (exit $ac_status); }; }; then
   :
 else


@@ -19849,7 +19874,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}:19852: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:19877: testing adding $cf_add_incdir to include-path ..." 1>&5

 
                  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
 
                  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 


@@ -19929,7 +19954,7 @@ if test -n "$cf_item" ; then
                        if test "$cf_have_libdir" = no ; then
                                test -n "$verbose" && echo "    adding $cf_add_libdir to library-path" 1>&6
 
                        if test "$cf_have_libdir" = no ; then
                                test -n "$verbose" && echo "    adding $cf_add_libdir to library-path" 1>&6
 

-echo "${as_me:-configure}:19932: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:19957: testing adding $cf_add_libdir to library-path ..." 1>&5

 
                                LDFLAGS="-L$cf_add_libdir $LDFLAGS"
                        fi
 
                                LDFLAGS="-L$cf_add_libdir $LDFLAGS"
                        fi


@@ -19946,23 +19971,23 @@ fi
        fi
 esac
 
        fi
 esac
 

-echo "$as_me:19949: checking for db.h" >&5
+echo "$as_me:19974: 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 19955 "configure"
+#line 19980 "configure"

 #include "confdefs.h"
 #include <db.h>
 _ACEOF
 #include "confdefs.h"
 #include <db.h>
 _ACEOF

-if { (eval echo "$as_me:19959: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:19984: \"$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:19965: \$? = $ac_status" >&5
+  echo "$as_me:19990: \$? = $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


@@ -19981,11 +20006,11 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
 fi
 rm -f conftest.err conftest.$ac_ext
 fi

-echo "$as_me:19984: result: $ac_cv_header_db_h" >&5
+echo "$as_me:20009: 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:19988: checking for version of db" >&5
+echo "$as_me:20013: 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


@@ -19996,10 +20021,10 @@ cf_cv_hashed_db_version=unknown
 for cf_db_version in 1 2 3 4 5 6
 do
 
 for cf_db_version in 1 2 3 4 5 6
 do
 

-echo "${as_me:-configure}:19999: testing checking for db version $cf_db_version ..." 1>&5
+echo "${as_me:-configure}:20024: testing checking for db version $cf_db_version ..." 1>&5

 
        cat >conftest.$ac_ext <<_ACEOF
 
        cat >conftest.$ac_ext <<_ACEOF

-#line 20002 "configure"
+#line 20027 "configure"

 #include "confdefs.h"
 
 $ac_includes_default
 #include "confdefs.h"
 
 $ac_includes_default


@@ -20029,16 +20054,16 @@ DBT *foo = 0
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

-if { (eval echo "$as_me:20032: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:20057: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:20035: \$? = $ac_status" >&5
+  echo "$as_me:20060: \$? = $ac_status" >&5

   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'

-  { (eval echo "$as_me:20038: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20063: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:20041: \$? = $ac_status" >&5
+  echo "$as_me:20066: \$? = $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


@@ -20052,16 +20077,16 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 done
 
 fi
 done
 
 fi

-echo "$as_me:20055: result: $cf_cv_hashed_db_version" >&5
+echo "$as_me:20080: 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:20059: error: Cannot determine version of db" >&5
+       { { echo "$as_me:20084: 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:20064: checking for db libraries" >&5
+echo "$as_me:20089: 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


@@ -20091,10 +20116,10 @@ LIBS="$cf_add_libs"
 
        fi
 
 
        fi
 

-echo "${as_me:-configure}:20094: testing checking for library "$cf_db_libs" ..." 1>&5
+echo "${as_me:-configure}:20119: testing checking for library "$cf_db_libs" ..." 1>&5

 
        cat >conftest.$ac_ext <<_ACEOF
 
        cat >conftest.$ac_ext <<_ACEOF

-#line 20097 "configure"
+#line 20122 "configure"

 #include "confdefs.h"
 
 $ac_includes_default
 #include "confdefs.h"
 
 $ac_includes_default


@@ -20149,16 +20174,16 @@ main (void)
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext

-if { (eval echo "$as_me:20152: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20177: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:20155: \$? = $ac_status" >&5
+  echo "$as_me:20180: \$? = $ac_status" >&5

   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'

-  { (eval echo "$as_me:20158: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20183: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:20161: \$? = $ac_status" >&5
+  echo "$as_me:20186: \$? = $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


@@ -20178,11 +20203,11 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 done
 
 fi
 done
 
 fi

-echo "$as_me:20181: result: $cf_cv_hashed_db_libs" >&5
+echo "$as_me:20206: 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:20185: error: Cannot determine library for db" >&5
+               { { echo "$as_me:20210: 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


@@ -20208,7 +20233,7 @@ fi
 
 else
 
 
 else
 

-       { { echo "$as_me:20211: error: Cannot find db.h" >&5
+       { { echo "$as_me:20236: 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; }; }
 


@@ -20223,7 +20248,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:20226: checking if we should include stdbool.h" >&5
+echo "$as_me:20251: 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


@@ -20231,7 +20256,7 @@ if test "${cf_cv_header_stdbool_h+set}" = set; then
 else
 
        cat >conftest.$ac_ext <<_ACEOF
 else
 
        cat >conftest.$ac_ext <<_ACEOF

-#line 20234 "configure"
+#line 20259 "configure"

 #include "confdefs.h"
 
 int
 #include "confdefs.h"
 
 int


@@ -20243,23 +20268,23 @@ bool foo = false
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

-if { (eval echo "$as_me:20246: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:20271: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:20249: \$? = $ac_status" >&5
+  echo "$as_me:20274: \$? = $ac_status" >&5

   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'

-  { (eval echo "$as_me:20252: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20277: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:20255: \$? = $ac_status" >&5
+  echo "$as_me:20280: \$? = $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 20262 "configure"
+#line 20287 "configure"

 #include "confdefs.h"
 
 #ifndef __BEOS__
 #include "confdefs.h"
 
 #ifndef __BEOS__


@@ -20275,16 +20300,16 @@ bool foo = false
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

-if { (eval echo "$as_me:20278: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:20303: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:20281: \$? = $ac_status" >&5
+  echo "$as_me:20306: \$? = $ac_status" >&5

   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'

-  { (eval echo "$as_me:20284: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20309: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:20287: \$? = $ac_status" >&5
+  echo "$as_me:20312: \$? = $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


@@ -20298,13 +20323,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:20301: result: yes" >&5
+then   echo "$as_me:20326: result: yes" >&5

 echo "${ECHO_T}yes" >&6
 echo "${ECHO_T}yes" >&6

-else   echo "$as_me:20303: result: no" >&5
+else   echo "$as_me:20328: result: no" >&5

 echo "${ECHO_T}no" >&6
 fi
 
 echo "${ECHO_T}no" >&6
 fi
 

-echo "$as_me:20307: checking for builtin bool type" >&5
+echo "$as_me:20332: 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


@@ -20312,7 +20337,7 @@ if test "${cf_cv_cc_bool_type+set}" = set; then
 else
 
        cat >conftest.$ac_ext <<_ACEOF
 else
 
        cat >conftest.$ac_ext <<_ACEOF

-#line 20315 "configure"
+#line 20340 "configure"

 #include "confdefs.h"
 
 #include <stdio.h>
 #include "confdefs.h"
 
 #include <stdio.h>


@@ -20327,16 +20352,16 @@ bool x = false
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

-if { (eval echo "$as_me:20330: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:20355: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:20333: \$? = $ac_status" >&5
+  echo "$as_me:20358: \$? = $ac_status" >&5

   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'

-  { (eval echo "$as_me:20336: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20361: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:20339: \$? = $ac_status" >&5
+  echo "$as_me:20364: \$? = $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


@@ -20349,9 +20374,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:20352: result: yes" >&5
+then   echo "$as_me:20377: result: yes" >&5

 echo "${ECHO_T}yes" >&6
 echo "${ECHO_T}yes" >&6

-else   echo "$as_me:20354: result: no" >&5
+else   echo "$as_me:20379: result: no" >&5

 echo "${ECHO_T}no" >&6
 fi
 
 echo "${ECHO_T}no" >&6
 fi
 


@@ -20368,10 +20393,10 @@ if test -n "$GXX" ; then
 
        cf_save="$LIBS"
        LIBS="$LIBS $CXXLIBS"
 
        cf_save="$LIBS"
        LIBS="$LIBS $CXXLIBS"

-       echo "$as_me:20371: checking if we already have C++ library" >&5
+       echo "$as_me:20396: checking if we already have C++ library" >&5

 echo $ECHO_N "checking if we already have C++ library... $ECHO_C" >&6
        cat >conftest.$ac_ext <<_ACEOF
 echo $ECHO_N "checking if we already have C++ library... $ECHO_C" >&6
        cat >conftest.$ac_ext <<_ACEOF

-#line 20374 "configure"
+#line 20399 "configure"

 #include "confdefs.h"
 
                        #include <iostream>
 #include "confdefs.h"
 
                        #include <iostream>


@@ -20385,16 +20410,16 @@ main (void)
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext

-if { (eval echo "$as_me:20388: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20413: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:20391: \$? = $ac_status" >&5
+  echo "$as_me:20416: \$? = $ac_status" >&5

   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'

-  { (eval echo "$as_me:20394: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20419: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:20397: \$? = $ac_status" >&5
+  echo "$as_me:20422: \$? = $ac_status" >&5

   (exit $ac_status); }; }; then
   cf_have_libstdcpp=yes
 else
   (exit $ac_status); }; }; then
   cf_have_libstdcpp=yes
 else


@@ -20403,7 +20428,7 @@ cat conftest.$ac_ext >&5
 cf_have_libstdcpp=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 cf_have_libstdcpp=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext

-       echo "$as_me:20406: result: $cf_have_libstdcpp" >&5
+       echo "$as_me:20431: result: $cf_have_libstdcpp" >&5

 echo "${ECHO_T}$cf_have_libstdcpp" >&6
        LIBS="$cf_save"
 
 echo "${ECHO_T}$cf_have_libstdcpp" >&6
        LIBS="$cf_save"
 


@@ -20422,7 +20447,7 @@ echo "${ECHO_T}$cf_have_libstdcpp" >&6
                        ;;
                esac
 
                        ;;
                esac
 

-               echo "$as_me:20425: checking for library $cf_stdcpp_libname" >&5
+               echo "$as_me:20450: 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


@@ -20448,7 +20473,7 @@ done
 LIBS="$cf_add_libs"
 
                cat >conftest.$ac_ext <<_ACEOF
 LIBS="$cf_add_libs"
 
                cat >conftest.$ac_ext <<_ACEOF

-#line 20451 "configure"
+#line 20476 "configure"

 #include "confdefs.h"
 
                                #include <iostream>
 #include "confdefs.h"
 
                                #include <iostream>


@@ -20462,16 +20487,16 @@ main (void)
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext

-if { (eval echo "$as_me:20465: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20490: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:20468: \$? = $ac_status" >&5
+  echo "$as_me:20493: \$? = $ac_status" >&5

   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'

-  { (eval echo "$as_me:20471: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20496: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:20474: \$? = $ac_status" >&5
+  echo "$as_me:20499: \$? = $ac_status" >&5

   (exit $ac_status); }; }; then
   cf_cv_libstdcpp=yes
 else
   (exit $ac_status); }; }; then
   cf_cv_libstdcpp=yes
 else


@@ -20483,7 +20508,7 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
                        LIBS="$cf_save"
 
 fi
                        LIBS="$cf_save"
 
 fi

-echo "$as_me:20486: result: $cf_cv_libstdcpp" >&5
+echo "$as_me:20511: result: $cf_cv_libstdcpp" >&5

 echo "${ECHO_T}$cf_cv_libstdcpp" >&6
                test "$cf_cv_libstdcpp" = yes && {
 cf_add_libs="-l$cf_stdcpp_libname"
 echo "${ECHO_T}$cf_cv_libstdcpp" >&6
                test "$cf_cv_libstdcpp" = yes && {
 cf_add_libs="-l$cf_stdcpp_libname"


@@ -20505,7 +20530,7 @@ CXXLIBS="$cf_add_libs"
        fi
 fi
 
        fi
 fi
 

-       echo "$as_me:20508: checking whether $CXX understands -c and -o together" >&5
+       echo "$as_me:20533: 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


@@ -20520,15 +20545,15 @@ CF_EOF
 # We do the test twice because some compilers refuse to overwrite an
 # existing .o file with -o, though they will create one.
 ac_try='$CXX $CXXFLAGS $CPPFLAGS -c conftest.$ac_ext -o conftest2.$ac_objext >&5'
 # We do the test twice because some compilers refuse to overwrite an
 # existing .o file with -o, though they will create one.
 ac_try='$CXX $CXXFLAGS $CPPFLAGS -c conftest.$ac_ext -o conftest2.$ac_objext >&5'

-if { (eval echo "$as_me:20523: \"$ac_try\"") >&5
+if { (eval echo "$as_me:20548: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:20526: \$? = $ac_status" >&5
+  echo "$as_me:20551: \$? = $ac_status" >&5

   (exit $ac_status); } &&
   (exit $ac_status); } &&

-  test -f conftest2.$ac_objext && { (eval echo "$as_me:20528: \"$ac_try\"") >&5
+  test -f conftest2.$ac_objext && { (eval echo "$as_me:20553: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:20531: \$? = $ac_status" >&5
+  echo "$as_me:20556: \$? = $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


@@ -20539,10 +20564,10 @@ rm -rf conftest*
 
 fi
 if test $cf_cv_prog_CXX_c_o = yes; then
 
 fi
 if test $cf_cv_prog_CXX_c_o = yes; then

-  echo "$as_me:20542: result: yes" >&5
+  echo "$as_me:20567: result: yes" >&5

 echo "${ECHO_T}yes" >&6
 else
 echo "${ECHO_T}yes" >&6
 else

-  echo "$as_me:20545: result: no" >&5
+  echo "$as_me:20570: result: no" >&5

 echo "${ECHO_T}no" >&6
 fi
 
 echo "${ECHO_T}no" >&6
 fi
 


@@ -20562,7 +20587,7 @@ case $cf_cv_system_name in
        ;;
 esac
 if test "$GXX" = yes; then
        ;;
 esac
 if test "$GXX" = yes; then

-       echo "$as_me:20565: checking for lib$cf_gpp_libname" >&5
+       echo "$as_me:20590: checking for lib$cf_gpp_libname" >&5

 echo $ECHO_N "checking for lib$cf_gpp_libname... $ECHO_C" >&6
        cf_save="$LIBS"
 
 echo $ECHO_N "checking for lib$cf_gpp_libname... $ECHO_C" >&6
        cf_save="$LIBS"
 


@@ -20583,7 +20608,7 @@ done
 LIBS="$cf_add_libs"
 
        cat >conftest.$ac_ext <<_ACEOF
 LIBS="$cf_add_libs"
 
        cat >conftest.$ac_ext <<_ACEOF

-#line 20586 "configure"
+#line 20611 "configure"

 #include "confdefs.h"
 
 #include <$cf_gpp_libname/builtin.h>
 #include "confdefs.h"
 
 #include <$cf_gpp_libname/builtin.h>


@@ -20597,16 +20622,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:20600: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20625: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:20603: \$? = $ac_status" >&5
+  echo "$as_me:20628: \$? = $ac_status" >&5

   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'

-  { (eval echo "$as_me:20606: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20631: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:20609: \$? = $ac_status" >&5
+  echo "$as_me:20634: \$? = $ac_status" >&5

   (exit $ac_status); }; }; then
   cf_cxx_library=yes
 
   (exit $ac_status); }; }; then
   cf_cxx_library=yes
 


@@ -20643,7 +20668,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 20646 "configure"
+#line 20671 "configure"

 #include "confdefs.h"
 
 #include <builtin.h>
 #include "confdefs.h"
 
 #include <builtin.h>


@@ -20657,16 +20682,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:20660: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20685: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:20663: \$? = $ac_status" >&5
+  echo "$as_me:20688: \$? = $ac_status" >&5

   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'

-  { (eval echo "$as_me:20666: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20691: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:20669: \$? = $ac_status" >&5
+  echo "$as_me:20694: \$? = $ac_status" >&5

   (exit $ac_status); }; }; then
   cf_cxx_library=yes
 
   (exit $ac_status); }; }; then
   cf_cxx_library=yes
 


@@ -20699,7 +20724,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:20702: result: $cf_cxx_library" >&5
+       echo "$as_me:20727: result: $cf_cxx_library" >&5

 echo "${ECHO_T}$cf_cxx_library" >&6
 fi
 
 echo "${ECHO_T}$cf_cxx_library" >&6
 fi
 


@@ -20715,7 +20740,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:20718: checking how to run the C++ preprocessor" >&5
+echo "$as_me:20743: 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


@@ -20732,18 +20757,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 20735 "configure"
+#line 20760 "configure"

 #include "confdefs.h"
 #include <assert.h>
                      Syntax error
 _ACEOF
 #include "confdefs.h"
 #include <assert.h>
                      Syntax error
 _ACEOF

-if { (eval echo "$as_me:20740: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:20765: \"$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:20746: \$? = $ac_status" >&5
+  echo "$as_me:20771: \$? = $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


@@ -20766,17 +20791,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 20769 "configure"
+#line 20794 "configure"

 #include "confdefs.h"
 #include <ac_nonexistent.h>
 _ACEOF
 #include "confdefs.h"
 #include <ac_nonexistent.h>
 _ACEOF

-if { (eval echo "$as_me:20773: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:20798: \"$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:20779: \$? = $ac_status" >&5
+  echo "$as_me:20804: \$? = $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


@@ -20813,7 +20838,7 @@ fi
 else
   ac_cv_prog_CXXCPP=$CXXCPP
 fi
 else
   ac_cv_prog_CXXCPP=$CXXCPP
 fi

-echo "$as_me:20816: result: $CXXCPP" >&5
+echo "$as_me:20841: 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


@@ -20823,18 +20848,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 20826 "configure"
+#line 20851 "configure"

 #include "confdefs.h"
 #include <assert.h>
                      Syntax error
 _ACEOF
 #include "confdefs.h"
 #include <assert.h>
                      Syntax error
 _ACEOF

-if { (eval echo "$as_me:20831: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:20856: \"$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:20837: \$? = $ac_status" >&5
+  echo "$as_me:20862: \$? = $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


@@ -20857,17 +20882,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 20860 "configure"
+#line 20885 "configure"

 #include "confdefs.h"
 #include <ac_nonexistent.h>
 _ACEOF
 #include "confdefs.h"
 #include <ac_nonexistent.h>
 _ACEOF

-if { (eval echo "$as_me:20864: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:20889: \"$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:20870: \$? = $ac_status" >&5
+  echo "$as_me:20895: \$? = $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


@@ -20895,7 +20920,7 @@ rm -f conftest.err conftest.$ac_ext
 if $ac_preproc_ok; then
   :
 else
 if $ac_preproc_ok; then
   :
 else

-  { { echo "$as_me:20898: error: C++ preprocessor \"$CXXCPP\" fails sanity check" >&5
+  { { echo "$as_me:20923: 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


@@ -20910,23 +20935,23 @@ ac_main_return=return
 for ac_header in typeinfo
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
 for ac_header in typeinfo
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`

-echo "$as_me:20913: checking for $ac_header" >&5
+echo "$as_me:20938: 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 20919 "configure"
+#line 20944 "configure"

 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF

-if { (eval echo "$as_me:20923: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:20948: \"$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:20929: \$? = $ac_status" >&5
+  echo "$as_me:20954: \$? = $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


@@ -20945,7 +20970,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
 fi
 rm -f conftest.err conftest.$ac_ext
 fi

-echo "$as_me:20948: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:20973: 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


@@ -20958,23 +20983,23 @@ done
 for ac_header in iostream
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
 for ac_header in iostream
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`

-echo "$as_me:20961: checking for $ac_header" >&5
+echo "$as_me:20986: 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 20967 "configure"
+#line 20992 "configure"

 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF

-if { (eval echo "$as_me:20971: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:20996: \"$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:20977: \$? = $ac_status" >&5
+  echo "$as_me:21002: \$? = $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


@@ -20993,7 +21018,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
 fi
 rm -f conftest.err conftest.$ac_ext
 fi

-echo "$as_me:20996: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:21021: 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


@@ -21004,10 +21029,10 @@ fi
 done
 
 if test x"$ac_cv_header_iostream" = xyes ; then
 done
 
 if test x"$ac_cv_header_iostream" = xyes ; then

-       echo "$as_me:21007: checking if iostream uses std-namespace" >&5
+       echo "$as_me:21032: checking if iostream uses std-namespace" >&5

 echo $ECHO_N "checking if iostream uses std-namespace... $ECHO_C" >&6
        cat >conftest.$ac_ext <<_ACEOF
 echo $ECHO_N "checking if iostream uses std-namespace... $ECHO_C" >&6
        cat >conftest.$ac_ext <<_ACEOF

-#line 21010 "configure"
+#line 21035 "configure"

 #include "confdefs.h"
 
 #include <iostream>
 #include "confdefs.h"
 
 #include <iostream>


@@ -21024,16 +21049,16 @@ cerr << "testing" << endl;
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

-if { (eval echo "$as_me:21027: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:21052: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:21030: \$? = $ac_status" >&5
+  echo "$as_me:21055: \$? = $ac_status" >&5

   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'

-  { (eval echo "$as_me:21033: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21058: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:21036: \$? = $ac_status" >&5
+  echo "$as_me:21061: \$? = $ac_status" >&5

   (exit $ac_status); }; }; then
   cf_iostream_namespace=yes
 else
   (exit $ac_status); }; }; then
   cf_iostream_namespace=yes
 else


@@ -21042,7 +21067,7 @@ cat conftest.$ac_ext >&5
 cf_iostream_namespace=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 cf_iostream_namespace=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext

-       echo "$as_me:21045: result: $cf_iostream_namespace" >&5
+       echo "$as_me:21070: result: $cf_iostream_namespace" >&5

 echo "${ECHO_T}$cf_iostream_namespace" >&6
        if test "$cf_iostream_namespace" = yes ; then
 
 echo "${ECHO_T}$cf_iostream_namespace" >&6
        if test "$cf_iostream_namespace" = yes ; then
 


@@ -21053,7 +21078,7 @@ EOF
        fi
 fi
 
        fi
 fi
 

-echo "$as_me:21056: checking if we should include stdbool.h" >&5
+echo "$as_me:21081: 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


@@ -21061,7 +21086,7 @@ if test "${cf_cv_header_stdbool_h+set}" = set; then
 else
 
        cat >conftest.$ac_ext <<_ACEOF
 else
 
        cat >conftest.$ac_ext <<_ACEOF

-#line 21064 "configure"
+#line 21089 "configure"

 #include "confdefs.h"
 
 int
 #include "confdefs.h"
 
 int


@@ -21073,23 +21098,23 @@ bool foo = false
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

-if { (eval echo "$as_me:21076: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:21101: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:21079: \$? = $ac_status" >&5
+  echo "$as_me:21104: \$? = $ac_status" >&5

   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'

-  { (eval echo "$as_me:21082: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21107: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:21085: \$? = $ac_status" >&5
+  echo "$as_me:21110: \$? = $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 21092 "configure"
+#line 21117 "configure"

 #include "confdefs.h"
 
 #ifndef __BEOS__
 #include "confdefs.h"
 
 #ifndef __BEOS__


@@ -21105,16 +21130,16 @@ bool foo = false
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

-if { (eval echo "$as_me:21108: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:21133: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:21111: \$? = $ac_status" >&5
+  echo "$as_me:21136: \$? = $ac_status" >&5

   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'

-  { (eval echo "$as_me:21114: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21139: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:21117: \$? = $ac_status" >&5
+  echo "$as_me:21142: \$? = $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


@@ -21128,13 +21153,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:21131: result: yes" >&5
+then   echo "$as_me:21156: result: yes" >&5

 echo "${ECHO_T}yes" >&6
 echo "${ECHO_T}yes" >&6

-else   echo "$as_me:21133: result: no" >&5
+else   echo "$as_me:21158: result: no" >&5

 echo "${ECHO_T}no" >&6
 fi
 
 echo "${ECHO_T}no" >&6
 fi
 

-echo "$as_me:21137: checking for builtin bool type" >&5
+echo "$as_me:21162: 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


@@ -21142,7 +21167,7 @@ if test "${cf_cv_builtin_bool+set}" = set; then
 else
 
        cat >conftest.$ac_ext <<_ACEOF
 else
 
        cat >conftest.$ac_ext <<_ACEOF

-#line 21145 "configure"
+#line 21170 "configure"

 #include "confdefs.h"
 
 #include <stdio.h>
 #include "confdefs.h"
 
 #include <stdio.h>


@@ -21157,16 +21182,16 @@ bool x = false
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

-if { (eval echo "$as_me:21160: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:21185: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:21163: \$? = $ac_status" >&5
+  echo "$as_me:21188: \$? = $ac_status" >&5

   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'

-  { (eval echo "$as_me:21166: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21191: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:21169: \$? = $ac_status" >&5
+  echo "$as_me:21194: \$? = $ac_status" >&5

   (exit $ac_status); }; }; then
   cf_cv_builtin_bool=1
 else
   (exit $ac_status); }; }; then
   cf_cv_builtin_bool=1
 else


@@ -21179,13 +21204,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:21182: result: yes" >&5
+then   echo "$as_me:21207: result: yes" >&5

 echo "${ECHO_T}yes" >&6
 echo "${ECHO_T}yes" >&6

-else   echo "$as_me:21184: result: no" >&5
+else   echo "$as_me:21209: result: no" >&5

 echo "${ECHO_T}no" >&6
 fi
 
 echo "${ECHO_T}no" >&6
 fi
 

-echo "$as_me:21188: checking for size of bool" >&5
+echo "$as_me:21213: 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


@@ -21196,7 +21221,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 21199 "configure"
+#line 21224 "configure"

 #include "confdefs.h"
 
 #include <stdlib.h>
 #include "confdefs.h"
 
 #include <stdlib.h>


@@ -21238,15 +21263,15 @@ int main(void)
 
 _ACEOF
 rm -f conftest$ac_exeext
 
 _ACEOF
 rm -f conftest$ac_exeext

-if { (eval echo "$as_me:21241: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21266: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:21244: \$? = $ac_status" >&5
+  echo "$as_me:21269: \$? = $ac_status" >&5

   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'

-  { (eval echo "$as_me:21246: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21271: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:21249: \$? = $ac_status" >&5
+  echo "$as_me:21274: \$? = $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


@@ -21264,18 +21289,18 @@ fi
 fi
 
        rm -f cf_test.out
 fi
 
        rm -f cf_test.out

-echo "$as_me:21267: result: $cf_cv_type_of_bool" >&5
+echo "$as_me:21292: result: $cf_cv_type_of_bool" >&5

 echo "${ECHO_T}$cf_cv_type_of_bool" >&6
 if test "$cf_cv_type_of_bool" = unknown ; then
        case .$NCURSES_BOOL in
        (.auto|.) NCURSES_BOOL=unsigned;;
        esac
 echo "${ECHO_T}$cf_cv_type_of_bool" >&6
 if test "$cf_cv_type_of_bool" = unknown ; then
        case .$NCURSES_BOOL in
        (.auto|.) NCURSES_BOOL=unsigned;;
        esac

-       { echo "$as_me:21273: WARNING: Assuming $NCURSES_BOOL for type of bool" >&5
+       { echo "$as_me:21298: 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:21278: checking for special defines needed for etip.h" >&5
+echo "$as_me:21303: 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"


@@ -21293,7 +21318,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 21296 "configure"
+#line 21321 "configure"

 #include "confdefs.h"
 
 #include <etip.h.in>
 #include "confdefs.h"
 
 #include <etip.h.in>


@@ -21307,16 +21332,16 @@ main (void)
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

-if { (eval echo "$as_me:21310: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:21335: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:21313: \$? = $ac_status" >&5
+  echo "$as_me:21338: \$? = $ac_status" >&5

   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'

-  { (eval echo "$as_me:21316: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21341: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:21319: \$? = $ac_status" >&5
+  echo "$as_me:21344: \$? = $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


@@ -21337,12 +21362,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:21340: result: $cf_result" >&5
+echo "$as_me:21365: 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:21345: checking if $CXX accepts parameter initialization" >&5
+echo "$as_me:21370: 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


@@ -21359,7 +21384,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 21362 "configure"
+#line 21387 "configure"

 #include "confdefs.h"
 
 class TEST {
 #include "confdefs.h"
 
 class TEST {


@@ -21378,15 +21403,15 @@ int main(void) { }
 
 _ACEOF
 rm -f conftest$ac_exeext
 
 _ACEOF
 rm -f conftest$ac_exeext

-if { (eval echo "$as_me:21381: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21406: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:21384: \$? = $ac_status" >&5
+  echo "$as_me:21409: \$? = $ac_status" >&5

   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'

-  { (eval echo "$as_me:21386: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21411: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:21389: \$? = $ac_status" >&5
+  echo "$as_me:21414: \$? = $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


@@ -21405,7 +21430,7 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
 ac_main_return=return
 
 fi
 ac_main_return=return
 
 fi

-echo "$as_me:21408: result: $cf_cv_cpp_param_init" >&5
+echo "$as_me:21433: result: $cf_cv_cpp_param_init" >&5

 echo "${ECHO_T}$cf_cv_cpp_param_init" >&6
 fi
 test "$cf_cv_cpp_param_init" = yes &&
 echo "${ECHO_T}$cf_cv_cpp_param_init" >&6
 fi
 test "$cf_cv_cpp_param_init" = yes &&


@@ -21415,7 +21440,7 @@ EOF
 
 if test -n "$CXX"; then
 
 
 if test -n "$CXX"; then
 

-echo "$as_me:21418: checking if $CXX accepts static_cast" >&5
+echo "$as_me:21443: 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


@@ -21429,7 +21454,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 21432 "configure"
+#line 21457 "configure"

 #include "confdefs.h"
 
 class NCursesPanel
 #include "confdefs.h"
 
 class NCursesPanel


@@ -21473,16 +21498,16 @@ main (void)
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

-if { (eval echo "$as_me:21476: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:21501: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:21479: \$? = $ac_status" >&5
+  echo "$as_me:21504: \$? = $ac_status" >&5

   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'

-  { (eval echo "$as_me:21482: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21507: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:21485: \$? = $ac_status" >&5
+  echo "$as_me:21510: \$? = $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


@@ -21500,7 +21525,7 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
 ac_main_return=return
 
 fi
 ac_main_return=return
 
 fi

-echo "$as_me:21503: result: $cf_cv_cpp_static_cast" >&5
+echo "$as_me:21528: 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


@@ -21549,7 +21574,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:21552: checking for size of bool" >&5
+echo "$as_me:21577: 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


@@ -21560,7 +21585,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 21563 "configure"
+#line 21588 "configure"

 #include "confdefs.h"
 
 #include <stdlib.h>
 #include "confdefs.h"
 
 #include <stdlib.h>


@@ -21602,15 +21627,15 @@ int main(void)
 
 _ACEOF
 rm -f conftest$ac_exeext
 
 _ACEOF
 rm -f conftest$ac_exeext

-if { (eval echo "$as_me:21605: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21630: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:21608: \$? = $ac_status" >&5
+  echo "$as_me:21633: \$? = $ac_status" >&5

   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'

-  { (eval echo "$as_me:21610: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21635: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:21613: \$? = $ac_status" >&5
+  echo "$as_me:21638: \$? = $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


@@ -21628,25 +21653,25 @@ fi
 fi
 
        rm -f cf_test.out
 fi
 
        rm -f cf_test.out

-echo "$as_me:21631: result: $cf_cv_type_of_bool" >&5
+echo "$as_me:21656: result: $cf_cv_type_of_bool" >&5

 echo "${ECHO_T}$cf_cv_type_of_bool" >&6
 if test "$cf_cv_type_of_bool" = unknown ; then
        case .$NCURSES_BOOL in
        (.auto|.) NCURSES_BOOL=unsigned;;
        esac
 echo "${ECHO_T}$cf_cv_type_of_bool" >&6
 if test "$cf_cv_type_of_bool" = unknown ; then
        case .$NCURSES_BOOL in
        (.auto|.) NCURSES_BOOL=unsigned;;
        esac

-       { echo "$as_me:21637: WARNING: Assuming $NCURSES_BOOL for type of bool" >&5
+       { echo "$as_me:21662: 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:21643: checking for fallback type of bool" >&5
+                       echo "$as_me:21668: checking for fallback type of bool" >&5

 echo $ECHO_N "checking for fallback type of bool... $ECHO_C" >&6
                        case "$host_cpu" in
                        (i?86)  cf_cv_type_of_bool=char ;;
                        (*)     cf_cv_type_of_bool=int  ;;
                        esac
 echo $ECHO_N "checking for fallback type of bool... $ECHO_C" >&6
                        case "$host_cpu" in
                        (i?86)  cf_cv_type_of_bool=char ;;
                        (*)     cf_cv_type_of_bool=int  ;;
                        esac

-                       echo "$as_me:21649: result: $cf_cv_type_of_bool" >&5
+                       echo "$as_me:21674: 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


@@ -21675,7 +21700,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:21678: WARNING: libtool does not support Ada - disabling feature" >&5
+                       { echo "$as_me:21703: 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


@@ -21686,7 +21711,7 @@ echo "$as_me: WARNING: libtool does not support Ada - disabling feature" >&2;}
 cf_ada_make=gnatmake
 # Extract the first word of "$cf_ada_make", so it can be a program name with args.
 set dummy $cf_ada_make; ac_word=$2
 cf_ada_make=gnatmake
 # Extract the first word of "$cf_ada_make", so it can be a program name with args.
 set dummy $cf_ada_make; ac_word=$2

-echo "$as_me:21689: checking for $ac_word" >&5
+echo "$as_me:21714: 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


@@ -21701,7 +21726,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:21704: found $ac_dir/$ac_word" >&5
+echo "$as_me:21729: found $ac_dir/$ac_word" >&5

 break
 done
 
 break
 done
 


@@ -21710,10 +21735,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:21713: result: $gnat_exists" >&5
+  echo "$as_me:21738: result: $gnat_exists" >&5

 echo "${ECHO_T}$gnat_exists" >&6
 else
 echo "${ECHO_T}$gnat_exists" >&6
 else

-  echo "$as_me:21716: result: no" >&5
+  echo "$as_me:21741: result: no" >&5

 echo "${ECHO_T}no" >&6
 fi
 
 echo "${ECHO_T}no" >&6
 fi
 


@@ -21722,12 +21747,12 @@ if test "$ac_cv_prog_gnat_exists" = no; then
        cf_cv_prog_gnat_correct=no
 else
 
        cf_cv_prog_gnat_correct=no
 else
 

-echo "$as_me:21725: checking for gnat version" >&5
+echo "$as_me:21750: 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:21730: result: $cf_gnat_version" >&5
+echo "$as_me:21755: 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


@@ -21735,7 +21760,7 @@ case $cf_gnat_version in
        cf_cv_prog_gnat_correct=yes
        ;;
 (*)
        cf_cv_prog_gnat_correct=yes
        ;;
 (*)

-       { echo "$as_me:21738: WARNING: Unsupported GNAT version $cf_gnat_version. We require 3.11 or better. Disabling Ada95 binding." >&5
+       { echo "$as_me:21763: WARNING: Unsupported GNAT version $cf_gnat_version. We require 3.11 or better. Disabling Ada95 binding." >&5

 echo "$as_me: WARNING: Unsupported GNAT version $cf_gnat_version. We require 3.11 or better. Disabling Ada95 binding." >&2;}
        cf_cv_prog_gnat_correct=no
        ;;
 echo "$as_me: WARNING: Unsupported GNAT version $cf_gnat_version. We require 3.11 or better. Disabling Ada95 binding." >&2;}
        cf_cv_prog_gnat_correct=no
        ;;


@@ -21743,7 +21768,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:21746: checking for $ac_word" >&5
+echo "$as_me:21771: 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


@@ -21758,7 +21783,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:21761: found $ac_dir/$ac_word" >&5
+echo "$as_me:21786: found $ac_dir/$ac_word" >&5

 break
 done
 
 break
 done
 


@@ -21767,10 +21792,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:21770: result: $M4_exists" >&5
+  echo "$as_me:21795: result: $M4_exists" >&5

 echo "${ECHO_T}$M4_exists" >&6
 else
 echo "${ECHO_T}$M4_exists" >&6
 else

-  echo "$as_me:21773: result: no" >&5
+  echo "$as_me:21798: result: no" >&5

 echo "${ECHO_T}no" >&6
 fi
 
 echo "${ECHO_T}no" >&6
 fi
 


@@ -21779,7 +21804,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:21782: checking if GNAT works" >&5
+               echo "$as_me:21807: checking if GNAT works" >&5

 echo $ECHO_N "checking if GNAT works... $ECHO_C" >&6
 
 rm -rf conftest* *~conftest*
 echo $ECHO_N "checking if GNAT works... $ECHO_C" >&6
 
 rm -rf conftest* *~conftest*


@@ -21807,7 +21832,7 @@ else
 fi
 rm -rf conftest* *~conftest*
 
 fi
 rm -rf conftest* *~conftest*
 

-               echo "$as_me:21810: result: $cf_cv_prog_gnat_correct" >&5
+               echo "$as_me:21835: result: $cf_cv_prog_gnat_correct" >&5

 echo "${ECHO_T}$cf_cv_prog_gnat_correct" >&6
        fi
 fi
 echo "${ECHO_T}$cf_cv_prog_gnat_correct" >&6
        fi
 fi


@@ -21816,7 +21841,7 @@ fi
 
        ADAFLAGS="$ADAFLAGS -gnatpn"
 
 
        ADAFLAGS="$ADAFLAGS -gnatpn"
 

-       echo "$as_me:21819: checking optimization options for ADAFLAGS" >&5
+       echo "$as_me:21844: checking optimization options for ADAFLAGS" >&5

 echo $ECHO_N "checking optimization options for ADAFLAGS... $ECHO_C" >&6
        case "$CFLAGS" in
        (*-g*)
 echo $ECHO_N "checking optimization options for ADAFLAGS... $ECHO_C" >&6
        case "$CFLAGS" in
        (*-g*)


@@ -21833,10 +21858,10 @@ echo $ECHO_N "checking optimization options for ADAFLAGS... $ECHO_C" >&6
 
                ;;
        esac
 
                ;;
        esac

-       echo "$as_me:21836: result: $ADAFLAGS" >&5
+       echo "$as_me:21861: result: $ADAFLAGS" >&5

 echo "${ECHO_T}$ADAFLAGS" >&6
 
 echo "${ECHO_T}$ADAFLAGS" >&6
 

-echo "$as_me:21839: checking if GNATPREP supports -T option" >&5
+echo "$as_me:21864: checking if GNATPREP supports -T option" >&5

 echo $ECHO_N "checking if GNATPREP supports -T option... $ECHO_C" >&6
 if test "${cf_cv_gnatprep_opt_t+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 echo $ECHO_N "checking if GNATPREP supports -T option... $ECHO_C" >&6
 if test "${cf_cv_gnatprep_opt_t+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6


@@ -21846,11 +21871,11 @@ cf_cv_gnatprep_opt_t=no
 gnatprep -T 2>/dev/null >/dev/null && cf_cv_gnatprep_opt_t=yes
 
 fi
 gnatprep -T 2>/dev/null >/dev/null && cf_cv_gnatprep_opt_t=yes
 
 fi

-echo "$as_me:21849: result: $cf_cv_gnatprep_opt_t" >&5
+echo "$as_me:21874: result: $cf_cv_gnatprep_opt_t" >&5

 echo "${ECHO_T}$cf_cv_gnatprep_opt_t" >&6
 test "$cf_cv_gnatprep_opt_t" = yes && GNATPREP_OPTS="-T $GNATPREP_OPTS"
 
 echo "${ECHO_T}$cf_cv_gnatprep_opt_t" >&6
 test "$cf_cv_gnatprep_opt_t" = yes && GNATPREP_OPTS="-T $GNATPREP_OPTS"
 

-echo "$as_me:21853: checking if GNAT supports generics" >&5
+echo "$as_me:21878: checking if GNAT supports generics" >&5

 echo $ECHO_N "checking if GNAT supports generics... $ECHO_C" >&6
 case $cf_gnat_version in
 (3.[1-9]*|[4-9].*)
 echo $ECHO_N "checking if GNAT supports generics... $ECHO_C" >&6
 case $cf_gnat_version in
 (3.[1-9]*|[4-9].*)


@@ -21860,7 +21885,7 @@ case $cf_gnat_version in
        cf_gnat_generics=no
        ;;
 esac
        cf_gnat_generics=no
        ;;
 esac

-echo "$as_me:21863: result: $cf_gnat_generics" >&5
+echo "$as_me:21888: result: $cf_gnat_generics" >&5

 echo "${ECHO_T}$cf_gnat_generics" >&6
 
 if test "$cf_gnat_generics" = yes
 echo "${ECHO_T}$cf_gnat_generics" >&6
 
 if test "$cf_gnat_generics" = yes


@@ -21872,7 +21897,7 @@ else
        cf_generic_objects=
 fi
 
        cf_generic_objects=
 fi
 

-echo "$as_me:21875: checking if GNAT supports SIGINT" >&5
+echo "$as_me:21900: checking if GNAT supports SIGINT" >&5

 echo $ECHO_N "checking if GNAT supports SIGINT... $ECHO_C" >&6
 if test "${cf_cv_gnat_sigint+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 echo $ECHO_N "checking if GNAT supports SIGINT... $ECHO_C" >&6
 if test "${cf_cv_gnat_sigint+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6


@@ -21920,7 +21945,7 @@ fi
 rm -rf conftest* *~conftest*
 
 fi
 rm -rf conftest* *~conftest*
 
 fi

-echo "$as_me:21923: result: $cf_cv_gnat_sigint" >&5
+echo "$as_me:21948: result: $cf_cv_gnat_sigint" >&5

 echo "${ECHO_T}$cf_cv_gnat_sigint" >&6
 
 if test $cf_cv_gnat_sigint = yes ; then
 echo "${ECHO_T}$cf_cv_gnat_sigint" >&6
 
 if test $cf_cv_gnat_sigint = yes ; then


@@ -21933,7 +21958,7 @@ cf_gnat_libraries=no
 cf_gnat_projects=no
 
 if test "$enable_gnat_projects" != no ; then
 cf_gnat_projects=no
 
 if test "$enable_gnat_projects" != no ; then

-echo "$as_me:21936: checking if GNAT supports project files" >&5
+echo "$as_me:21961: checking if GNAT supports project files" >&5

 echo $ECHO_N "checking if GNAT supports project files... $ECHO_C" >&6
 case $cf_gnat_version in
 (3.[0-9]*)
 echo $ECHO_N "checking if GNAT supports project files... $ECHO_C" >&6
 case $cf_gnat_version in
 (3.[0-9]*)


@@ -21993,15 +22018,15 @@ CF_EOF
        esac
        ;;
 esac
        esac
        ;;
 esac

-echo "$as_me:21996: result: $cf_gnat_projects" >&5
+echo "$as_me:22021: result: $cf_gnat_projects" >&5

 echo "${ECHO_T}$cf_gnat_projects" >&6
 fi # enable_gnat_projects
 
 if test $cf_gnat_projects = yes
 then
 echo "${ECHO_T}$cf_gnat_projects" >&6
 fi # enable_gnat_projects
 
 if test $cf_gnat_projects = yes
 then

-       echo "$as_me:22002: checking if GNAT supports libraries" >&5
+       echo "$as_me:22027: checking if GNAT supports libraries" >&5

 echo $ECHO_N "checking if GNAT supports libraries... $ECHO_C" >&6
 echo $ECHO_N "checking if GNAT supports libraries... $ECHO_C" >&6

-       echo "$as_me:22004: result: $cf_gnat_libraries" >&5
+       echo "$as_me:22029: result: $cf_gnat_libraries" >&5

 echo "${ECHO_T}$cf_gnat_libraries" >&6
 fi
 
 echo "${ECHO_T}$cf_gnat_libraries" >&6
 fi
 


@@ -22021,7 +22046,7 @@ else
        USE_GNAT_LIBRARIES="#"
 fi
 
        USE_GNAT_LIBRARIES="#"
 fi
 

-echo "$as_me:22024: checking for ada-compiler" >&5
+echo "$as_me:22049: checking for ada-compiler" >&5

 echo $ECHO_N "checking for ada-compiler... $ECHO_C" >&6
 
 # Check whether --with-ada-compiler or --without-ada-compiler was given.
 echo $ECHO_N "checking for ada-compiler... $ECHO_C" >&6
 
 # Check whether --with-ada-compiler or --without-ada-compiler was given.


@@ -22032,12 +22057,12 @@ else
   cf_ada_compiler=gnatmake
 fi;
 
   cf_ada_compiler=gnatmake
 fi;
 

-echo "$as_me:22035: result: $cf_ada_compiler" >&5
+echo "$as_me:22060: result: $cf_ada_compiler" >&5

 echo "${ECHO_T}$cf_ada_compiler" >&6
 
                        cf_ada_package=terminal_interface
 
 echo "${ECHO_T}$cf_ada_compiler" >&6
 
                        cf_ada_package=terminal_interface
 

-echo "$as_me:22040: checking for ada-include" >&5
+echo "$as_me:22065: checking for ada-include" >&5

 echo $ECHO_N "checking for ada-include... $ECHO_C" >&6
 
 # Check whether --with-ada-include or --without-ada-include was given.
 echo $ECHO_N "checking for ada-include... $ECHO_C" >&6
 
 # Check whether --with-ada-include or --without-ada-include was given.


@@ -22073,7 +22098,7 @@ case ".$withval" in
        withval=`echo $withval | sed -e s%NONE%$cf_path_syntax%`
        ;;
 (*)
        withval=`echo $withval | sed -e s%NONE%$cf_path_syntax%`
        ;;
 (*)

-       { { echo "$as_me:22076: error: expected a pathname, not \"$withval\"" >&5
+       { { echo "$as_me:22101: 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; }; }
        ;;


@@ -22082,10 +22107,10 @@ esac
 fi
 eval ADA_INCLUDE="$withval"
 
 fi
 eval ADA_INCLUDE="$withval"
 

-echo "$as_me:22085: result: $ADA_INCLUDE" >&5
+echo "$as_me:22110: result: $ADA_INCLUDE" >&5

 echo "${ECHO_T}$ADA_INCLUDE" >&6
 
 echo "${ECHO_T}$ADA_INCLUDE" >&6
 

-echo "$as_me:22088: checking for ada-objects" >&5
+echo "$as_me:22113: checking for ada-objects" >&5

 echo $ECHO_N "checking for ada-objects... $ECHO_C" >&6
 
 # Check whether --with-ada-objects or --without-ada-objects was given.
 echo $ECHO_N "checking for ada-objects... $ECHO_C" >&6
 
 # Check whether --with-ada-objects or --without-ada-objects was given.


@@ -22121,7 +22146,7 @@ case ".$withval" in
        withval=`echo $withval | sed -e s%NONE%$cf_path_syntax%`
        ;;
 (*)
        withval=`echo $withval | sed -e s%NONE%$cf_path_syntax%`
        ;;
 (*)

-       { { echo "$as_me:22124: error: expected a pathname, not \"$withval\"" >&5
+       { { echo "$as_me:22149: 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; }; }
        ;;


@@ -22130,10 +22155,10 @@ esac
 fi
 eval ADA_OBJECTS="$withval"
 
 fi
 eval ADA_OBJECTS="$withval"
 

-echo "$as_me:22133: result: $ADA_OBJECTS" >&5
+echo "$as_me:22158: result: $ADA_OBJECTS" >&5

 echo "${ECHO_T}$ADA_OBJECTS" >&6
 
 echo "${ECHO_T}$ADA_OBJECTS" >&6
 

-echo "$as_me:22136: checking if an Ada95 shared-library should be built" >&5
+echo "$as_me:22161: checking if an Ada95 shared-library should be built" >&5

 echo $ECHO_N "checking if an Ada95 shared-library should be built... $ECHO_C" >&6
 
 # Check whether --with-ada-sharedlib or --without-ada-sharedlib was given.
 echo $ECHO_N "checking if an Ada95 shared-library should be built... $ECHO_C" >&6
 
 # Check whether --with-ada-sharedlib or --without-ada-sharedlib was given.


@@ -22143,7 +22168,7 @@ if test "${with_ada_sharedlib+set}" = set; then
 else
   with_ada_sharedlib=no
 fi;
 else
   with_ada_sharedlib=no
 fi;

-echo "$as_me:22146: result: $with_ada_sharedlib" >&5
+echo "$as_me:22171: result: $with_ada_sharedlib" >&5

 echo "${ECHO_T}$with_ada_sharedlib" >&6
 
 ADA_SHAREDLIB='lib$(LIB_NAME).so.1'
 echo "${ECHO_T}$with_ada_sharedlib" >&6
 
 ADA_SHAREDLIB='lib$(LIB_NAME).so.1'


@@ -22166,13 +22191,13 @@ fi
 
 # do this "late" to avoid conflict with header-checks
 if test "x$with_widec" = xyes ; then
 
 # do this "late" to avoid conflict with header-checks
 if test "x$with_widec" = xyes ; then

-       echo "$as_me:22169: checking for wchar_t" >&5
+       echo "$as_me:22194: checking for wchar_t" >&5

 echo $ECHO_N "checking for wchar_t... $ECHO_C" >&6
 if test "${ac_cv_type_wchar_t+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 echo $ECHO_N "checking for wchar_t... $ECHO_C" >&6
 if test "${ac_cv_type_wchar_t+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF

-#line 22175 "configure"
+#line 22200 "configure"

 #include "confdefs.h"
 $ac_includes_default
 int
 #include "confdefs.h"
 $ac_includes_default
 int


@@ -22187,16 +22212,16 @@ if (sizeof (wchar_t))
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

-if { (eval echo "$as_me:22190: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:22215: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:22193: \$? = $ac_status" >&5
+  echo "$as_me:22218: \$? = $ac_status" >&5

   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'

-  { (eval echo "$as_me:22196: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22221: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:22199: \$? = $ac_status" >&5
+  echo "$as_me:22224: \$? = $ac_status" >&5

   (exit $ac_status); }; }; then
   ac_cv_type_wchar_t=yes
 else
   (exit $ac_status); }; }; then
   ac_cv_type_wchar_t=yes
 else


@@ -22206,10 +22231,10 @@ ac_cv_type_wchar_t=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi

-echo "$as_me:22209: result: $ac_cv_type_wchar_t" >&5
+echo "$as_me:22234: result: $ac_cv_type_wchar_t" >&5

 echo "${ECHO_T}$ac_cv_type_wchar_t" >&6
 
 echo "${ECHO_T}$ac_cv_type_wchar_t" >&6
 

-echo "$as_me:22212: checking size of wchar_t" >&5
+echo "$as_me:22237: checking size of wchar_t" >&5

 echo $ECHO_N "checking size of wchar_t... $ECHO_C" >&6
 if test "${ac_cv_sizeof_wchar_t+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 echo $ECHO_N "checking size of wchar_t... $ECHO_C" >&6
 if test "${ac_cv_sizeof_wchar_t+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6


@@ -22218,7 +22243,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 22221 "configure"
+#line 22246 "configure"

 #include "confdefs.h"
 $ac_includes_default
 int
 #include "confdefs.h"
 $ac_includes_default
 int


@@ -22230,21 +22255,21 @@ int _array_ [1 - 2 * !((sizeof (wchar_t)) >= 0)]
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

-if { (eval echo "$as_me:22233: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:22258: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:22236: \$? = $ac_status" >&5
+  echo "$as_me:22261: \$? = $ac_status" >&5

   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'

-  { (eval echo "$as_me:22239: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22264: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:22242: \$? = $ac_status" >&5
+  echo "$as_me:22267: \$? = $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 22247 "configure"
+#line 22272 "configure"

 #include "confdefs.h"
 $ac_includes_default
 int
 #include "confdefs.h"
 $ac_includes_default
 int


@@ -22256,16 +22281,16 @@ int _array_ [1 - 2 * !((sizeof (wchar_t)) <= $ac_mid)]
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

-if { (eval echo "$as_me:22259: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:22284: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:22262: \$? = $ac_status" >&5
+  echo "$as_me:22287: \$? = $ac_status" >&5

   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'

-  { (eval echo "$as_me:22265: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22290: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:22268: \$? = $ac_status" >&5
+  echo "$as_me:22293: \$? = $ac_status" >&5

   (exit $ac_status); }; }; then
   ac_hi=$ac_mid; break
 else
   (exit $ac_status); }; }; then
   ac_hi=$ac_mid; break
 else


@@ -22281,7 +22306,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 22284 "configure"
+#line 22309 "configure"

 #include "confdefs.h"
 $ac_includes_default
 int
 #include "confdefs.h"
 $ac_includes_default
 int


@@ -22293,16 +22318,16 @@ int _array_ [1 - 2 * !((sizeof (wchar_t)) >= $ac_mid)]
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

-if { (eval echo "$as_me:22296: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:22321: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:22299: \$? = $ac_status" >&5
+  echo "$as_me:22324: \$? = $ac_status" >&5

   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'

-  { (eval echo "$as_me:22302: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22327: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:22305: \$? = $ac_status" >&5
+  echo "$as_me:22330: \$? = $ac_status" >&5

   (exit $ac_status); }; }; then
   ac_lo=$ac_mid; break
 else
   (exit $ac_status); }; }; then
   ac_lo=$ac_mid; break
 else


@@ -22318,7 +22343,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 22321 "configure"
+#line 22346 "configure"

 #include "confdefs.h"
 $ac_includes_default
 int
 #include "confdefs.h"
 $ac_includes_default
 int


@@ -22330,16 +22355,16 @@ int _array_ [1 - 2 * !((sizeof (wchar_t)) <= $ac_mid)]
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

-if { (eval echo "$as_me:22333: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:22358: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:22336: \$? = $ac_status" >&5
+  echo "$as_me:22361: \$? = $ac_status" >&5

   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'

-  { (eval echo "$as_me:22339: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22364: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:22342: \$? = $ac_status" >&5
+  echo "$as_me:22367: \$? = $ac_status" >&5

   (exit $ac_status); }; }; then
   ac_hi=$ac_mid
 else
   (exit $ac_status); }; }; then
   ac_hi=$ac_mid
 else


@@ -22352,12 +22377,12 @@ done
 ac_cv_sizeof_wchar_t=$ac_lo
 else
   if test "$cross_compiling" = yes; then
 ac_cv_sizeof_wchar_t=$ac_lo
 else
   if test "$cross_compiling" = yes; then

-  { { echo "$as_me:22355: error: cannot run test program while cross compiling" >&5
+  { { echo "$as_me:22380: 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 22360 "configure"
+#line 22385 "configure"

 #include "confdefs.h"
 $ac_includes_default
 int
 #include "confdefs.h"
 $ac_includes_default
 int


@@ -22373,15 +22398,15 @@ fclose (f);
 }
 _ACEOF
 rm -f conftest$ac_exeext
 }
 _ACEOF
 rm -f conftest$ac_exeext

-if { (eval echo "$as_me:22376: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22401: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:22379: \$? = $ac_status" >&5
+  echo "$as_me:22404: \$? = $ac_status" >&5

   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'

-  { (eval echo "$as_me:22381: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22406: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:22384: \$? = $ac_status" >&5
+  echo "$as_me:22409: \$? = $ac_status" >&5

   (exit $ac_status); }; }; then
   ac_cv_sizeof_wchar_t=`cat conftest.val`
 else
   (exit $ac_status); }; }; then
   ac_cv_sizeof_wchar_t=`cat conftest.val`
 else


@@ -22397,7 +22422,7 @@ else
   ac_cv_sizeof_wchar_t=0
 fi
 fi
   ac_cv_sizeof_wchar_t=0
 fi
 fi

-echo "$as_me:22400: result: $ac_cv_sizeof_wchar_t" >&5
+echo "$as_me:22425: result: $ac_cv_sizeof_wchar_t" >&5

 echo "${ECHO_T}$ac_cv_sizeof_wchar_t" >&6
 cat >>confdefs.h <<EOF
 #define SIZEOF_WCHAR_T $ac_cv_sizeof_wchar_t
 echo "${ECHO_T}$ac_cv_sizeof_wchar_t" >&6
 cat >>confdefs.h <<EOF
 #define SIZEOF_WCHAR_T $ac_cv_sizeof_wchar_t


@@ -22415,7 +22440,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:22418: checking for library subsets" >&5
+echo "$as_me:22443: 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=
 


@@ -22457,7 +22482,7 @@ fi
 test "x$with_widec"     = xyes && LIB_SUBSETS="${LIB_SUBSETS}+widechar"
 test "x$with_ext_funcs" = xyes && LIB_SUBSETS="${LIB_SUBSETS}+ext_funcs"
 
 test "x$with_widec"     = xyes && LIB_SUBSETS="${LIB_SUBSETS}+widechar"
 test "x$with_ext_funcs" = xyes && LIB_SUBSETS="${LIB_SUBSETS}+ext_funcs"
 

-echo "$as_me:22460: result: $LIB_SUBSETS" >&5
+echo "$as_me:22485: 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


@@ -22488,7 +22513,7 @@ elif test "$includedir" != "/usr/include"; then
 fi
 
 ### Build up pieces for makefile rules
 fi
 
 ### Build up pieces for makefile rules

-echo "$as_me:22491: checking default library suffix" >&5
+echo "$as_me:22516: 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


@@ -22499,10 +22524,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:22502: result: $DFT_ARG_SUFFIX" >&5
+echo "$as_me:22527: result: $DFT_ARG_SUFFIX" >&5

 echo "${ECHO_T}$DFT_ARG_SUFFIX" >&6
 
 echo "${ECHO_T}$DFT_ARG_SUFFIX" >&6
 

-echo "$as_me:22505: checking default library-dependency suffix" >&5
+echo "$as_me:22530: checking default library-dependency suffix" >&5

 echo $ECHO_N "checking default library-dependency suffix... $ECHO_C" >&6
 
        case X$DFT_LWR_MODEL in
 echo $ECHO_N "checking default library-dependency suffix... $ECHO_C" >&6
 
        case X$DFT_LWR_MODEL in


@@ -22560,10 +22585,10 @@ echo $ECHO_N "checking default library-dependency suffix... $ECHO_C" >&6
                DFT_LIB_SUFFIX="${LIB_SUFFIX}${EXTRA_SUFFIX}${DFT_LIB_SUFFIX}"
                DFT_DEP_SUFFIX="${LIB_SUFFIX}${EXTRA_SUFFIX}${DFT_DEP_SUFFIX}"
        fi
                DFT_LIB_SUFFIX="${LIB_SUFFIX}${EXTRA_SUFFIX}${DFT_LIB_SUFFIX}"
                DFT_DEP_SUFFIX="${LIB_SUFFIX}${EXTRA_SUFFIX}${DFT_DEP_SUFFIX}"
        fi

-echo "$as_me:22563: result: $DFT_DEP_SUFFIX" >&5
+echo "$as_me:22588: result: $DFT_DEP_SUFFIX" >&5

 echo "${ECHO_T}$DFT_DEP_SUFFIX" >&6
 
 echo "${ECHO_T}$DFT_DEP_SUFFIX" >&6
 

-echo "$as_me:22566: checking default object directory" >&5
+echo "$as_me:22591: 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


@@ -22579,11 +22604,11 @@ echo $ECHO_N "checking default object directory... $ECHO_C" >&6
                        DFT_OBJ_SUBDIR='obj_s' ;;
                esac
        esac
                        DFT_OBJ_SUBDIR='obj_s' ;;
                esac
        esac

-echo "$as_me:22582: result: $DFT_OBJ_SUBDIR" >&5
+echo "$as_me:22607: result: $DFT_OBJ_SUBDIR" >&5

 echo "${ECHO_T}$DFT_OBJ_SUBDIR" >&6
 
 if test "x$cf_with_cxx" = xyes ; then
 echo "${ECHO_T}$DFT_OBJ_SUBDIR" >&6
 
 if test "x$cf_with_cxx" = xyes ; then

-echo "$as_me:22586: checking c++ library-dependency suffix" >&5
+echo "$as_me:22611: checking c++ library-dependency suffix" >&5

 echo $ECHO_N "checking c++ library-dependency suffix... $ECHO_C" >&6
 if test "$with_libtool" != "no"; then
        # libtool thinks it can make c++ shared libraries (perhaps only g++)
 echo $ECHO_N "checking c++ library-dependency suffix... $ECHO_C" >&6
 if test "$with_libtool" != "no"; then
        # libtool thinks it can make c++ shared libraries (perhaps only g++)


@@ -22651,7 +22676,7 @@ else
        fi
 
 fi
        fi
 
 fi

-echo "$as_me:22654: result: $CXX_LIB_SUFFIX" >&5
+echo "$as_me:22679: result: $CXX_LIB_SUFFIX" >&5

 echo "${ECHO_T}$CXX_LIB_SUFFIX" >&6
 
 fi
 echo "${ECHO_T}$CXX_LIB_SUFFIX" >&6
 
 fi


@@ -22827,19 +22852,19 @@ fi
 
 if test -n "$LDFLAGS_STATIC" && test -n "$LDFLAGS_SHARED"
 then
 
 if test -n "$LDFLAGS_STATIC" && test -n "$LDFLAGS_SHARED"
 then

-       echo "$as_me:22830: checking if linker supports switching between static/dynamic" >&5
+       echo "$as_me:22855: checking if linker supports switching between static/dynamic" >&5

 echo $ECHO_N "checking if linker supports switching between static/dynamic... $ECHO_C" >&6
 
        rm -f libconftest.a
        cat >conftest.$ac_ext <<EOF
 echo $ECHO_N "checking if linker supports switching between static/dynamic... $ECHO_C" >&6
 
        rm -f libconftest.a
        cat >conftest.$ac_ext <<EOF

-#line 22835 "configure"
+#line 22860 "configure"

 #include <stdio.h>
 int cf_ldflags_static(FILE *fp) { return fflush(fp); }
 EOF
 #include <stdio.h>
 int cf_ldflags_static(FILE *fp) { return fflush(fp); }
 EOF

-       if { (eval echo "$as_me:22839: \"$ac_compile\"") >&5
+       if { (eval echo "$as_me:22864: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:22842: \$? = $ac_status" >&5
+  echo "$as_me:22867: \$? = $ac_status" >&5

   (exit $ac_status); } ; then
                ( $AR $ARFLAGS libconftest.a conftest.o ) 2>&5 1>/dev/null
                ( eval $RANLIB libconftest.a ) 2>&5 >/dev/null
   (exit $ac_status); } ; then
                ( $AR $ARFLAGS libconftest.a conftest.o ) 2>&5 1>/dev/null
                ( eval $RANLIB libconftest.a ) 2>&5 >/dev/null


@@ -22850,10 +22875,10 @@ EOF
 
        LIBS="$LDFLAGS_STATIC -L`pwd` -lconftest $LDFLAGS_DYNAMIC $LIBS"
        cat >conftest.$ac_ext <<_ACEOF
 
        LIBS="$LDFLAGS_STATIC -L`pwd` -lconftest $LDFLAGS_DYNAMIC $LIBS"
        cat >conftest.$ac_ext <<_ACEOF

-#line 22853 "configure"
+#line 22878 "configure"

 #include "confdefs.h"
 
 #include "confdefs.h"
 

-#line 22856 "configure"
+#line 22881 "configure"

 #include <stdio.h>
 int cf_ldflags_static(FILE *fp);
 
 #include <stdio.h>
 int cf_ldflags_static(FILE *fp);
 


@@ -22868,16 +22893,16 @@ main (void)
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext

-if { (eval echo "$as_me:22871: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22896: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:22874: \$? = $ac_status" >&5
+  echo "$as_me:22899: \$? = $ac_status" >&5

   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'

-  { (eval echo "$as_me:22877: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22902: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:22880: \$? = $ac_status" >&5
+  echo "$as_me:22905: \$? = $ac_status" >&5

   (exit $ac_status); }; }; then
 
        # some linkers simply ignore the -dynamic
   (exit $ac_status); }; }; then
 
        # some linkers simply ignore the -dynamic


@@ -22900,7 +22925,7 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
        rm -f libconftest.*
        LIBS="$cf_save_LIBS"
 
        rm -f libconftest.*
        LIBS="$cf_save_LIBS"
 

-       echo "$as_me:22903: result: $cf_ldflags_static" >&5
+       echo "$as_me:22928: result: $cf_ldflags_static" >&5

 echo "${ECHO_T}$cf_ldflags_static" >&6
 
        if test $cf_ldflags_static != yes
 echo "${ECHO_T}$cf_ldflags_static" >&6
 
        if test $cf_ldflags_static != yes


@@ -22916,7 +22941,7 @@ fi
        ;;
 esac
 
        ;;
 esac
 

-echo "$as_me:22919: checking where we will install curses.h" >&5
+echo "$as_me:22944: checking where we will install curses.h" >&5

 echo $ECHO_N "checking where we will install curses.h... $ECHO_C" >&6
 
 includesubdir=
 echo $ECHO_N "checking where we will install curses.h... $ECHO_C" >&6
 
 includesubdir=


@@ -22926,7 +22951,7 @@ if test "$with_overwrite" = no && \
 then
        includesubdir="/ncurses${USE_LIB_SUFFIX}"
 fi
 then
        includesubdir="/ncurses${USE_LIB_SUFFIX}"
 fi

-echo "$as_me:22929: result: ${includedir}${includesubdir}" >&5
+echo "$as_me:22954: result: ${includedir}${includesubdir}" >&5

 echo "${ECHO_T}${includedir}${includesubdir}" >&6
 
 ### Resolve a conflict between normal and wide-curses by forcing applications
 echo "${ECHO_T}${includedir}${includesubdir}" >&6
 
 ### Resolve a conflict between normal and wide-curses by forcing applications


@@ -22934,7 +22959,7 @@ echo "${ECHO_T}${includedir}${includesubdir}" >&6
 if test "$with_overwrite" != no ; then
 if test "$NCURSES_LIBUTF8" = 1 ; then
        NCURSES_LIBUTF8='defined(HAVE_LIBUTF8_H)'
 if test "$with_overwrite" != no ; then
 if test "$NCURSES_LIBUTF8" = 1 ; then
        NCURSES_LIBUTF8='defined(HAVE_LIBUTF8_H)'

-       { echo "$as_me:22937: WARNING: Wide-character applications must define HAVE_LIBUTF8_H to include curses.h" >&5
+       { echo "$as_me:22962: 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


@@ -22952,7 +22977,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:22955: checking for src modules" >&5
+echo "$as_me:22980: 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


@@ -22975,7 +23000,7 @@ do
                # We may/may not have tack in the distribution, though the
                # makefile is.
                if test $cf_dir = tack ; then
                # We may/may not have tack in the distribution, though the
                # makefile is.
                if test $cf_dir = tack ; then

-                       if test ! -f $srcdir/${cf_dir}/${cf_dir}.h; then
+                       if test "x$cf_with_tack" != "xyes"; then

                                continue
                        fi
                fi
                                continue
                        fi
                fi


@@ -23017,7 +23042,7 @@ EOF
                fi
        fi
 done
                fi
        fi
 done

-echo "$as_me:23020: result: $cf_cv_src_modules" >&5
+echo "$as_me:23045: 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"


@@ -23254,7 +23279,7 @@ fi
 
 # Extract the first word of "tic", so it can be a program name with args.
 set dummy tic; ac_word=$2
 
 # Extract the first word of "tic", so it can be a program name with args.
 set dummy tic; ac_word=$2

-echo "$as_me:23257: checking for $ac_word" >&5
+echo "$as_me:23282: checking for $ac_word" >&5

 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_path_TIC_PATH+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_path_TIC_PATH+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6


@@ -23271,7 +23296,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   if $as_executable_p "$ac_dir/$ac_word"; then
    ac_cv_path_TIC_PATH="$ac_dir/$ac_word"
   test -z "$ac_dir" && ac_dir=.
   if $as_executable_p "$ac_dir/$ac_word"; then
    ac_cv_path_TIC_PATH="$ac_dir/$ac_word"

-   echo "$as_me:23274: found $ac_dir/$ac_word" >&5
+   echo "$as_me:23299: found $ac_dir/$ac_word" >&5

    break
 fi
 done
    break
 fi
 done


@@ -23283,10 +23308,10 @@ fi
 TIC_PATH=$ac_cv_path_TIC_PATH
 
 if test -n "$TIC_PATH"; then
 TIC_PATH=$ac_cv_path_TIC_PATH
 
 if test -n "$TIC_PATH"; then

-  echo "$as_me:23286: result: $TIC_PATH" >&5
+  echo "$as_me:23311: result: $TIC_PATH" >&5

 echo "${ECHO_T}$TIC_PATH" >&6
 else
 echo "${ECHO_T}$TIC_PATH" >&6
 else

-  echo "$as_me:23289: result: no" >&5
+  echo "$as_me:23314: result: no" >&5

 echo "${ECHO_T}no" >&6
 fi
 
 echo "${ECHO_T}no" >&6
 fi
 


@@ -23294,7 +23319,7 @@ if test -n "$FALLBACK_LIST"
 then
        if test "$TIC_PATH" = unknown
        then
 then
        if test "$TIC_PATH" = unknown
        then

-               { echo "$as_me:23297: WARNING: no tic program found for fallbacks" >&5
+               { echo "$as_me:23322: WARNING: no tic program found for fallbacks" >&5

 echo "$as_me: WARNING: no tic program found for fallbacks" >&2;}
        fi
 fi
 echo "$as_me: WARNING: no tic program found for fallbacks" >&2;}
        fi
 fi


@@ -23330,7 +23355,7 @@ case $cf_cv_system_name in
        (*-D_XOPEN_SOURCE_EXTENDED*)
                test -n "$verbose" && echo "    moving _XOPEN_SOURCE_EXTENDED to work around g++ problem" 1>&6
 
        (*-D_XOPEN_SOURCE_EXTENDED*)
                test -n "$verbose" && echo "    moving _XOPEN_SOURCE_EXTENDED to work around g++ problem" 1>&6
 

-echo "${as_me:-configure}:23333: testing moving _XOPEN_SOURCE_EXTENDED to work around g++ problem ..." 1>&5
+echo "${as_me:-configure}:23358: testing moving _XOPEN_SOURCE_EXTENDED to work around g++ problem ..." 1>&5

 
                CFLAGS="$CFLAGS -D_XOPEN_SOURCE_EXTENDED"
                CPPFLAGS=`echo "x$CPPFLAGS" | sed -e  's/^.//' -e 's/-D_XOPEN_SOURCE_EXTENDED//'`
 
                CFLAGS="$CFLAGS -D_XOPEN_SOURCE_EXTENDED"
                CPPFLAGS=`echo "x$CPPFLAGS" | sed -e  's/^.//' -e 's/-D_XOPEN_SOURCE_EXTENDED//'`


@@ -23341,7 +23366,7 @@ esac
 
 # Help to automatically enable the extended curses features when using either
 # the *-config or the ".pc" files by adding defines.
 
 # Help to automatically enable the extended curses features when using either
 # the *-config or the ".pc" files by adding defines.

-echo "$as_me:23344: checking for defines to add to ncurses${USE_CFG_SUFFIX}-config script" >&5
+echo "$as_me:23369: checking for defines to add to ncurses${USE_CFG_SUFFIX}-config script" >&5

 echo $ECHO_N "checking for defines to add to ncurses${USE_CFG_SUFFIX}-config script... $ECHO_C" >&6
 PKG_CFLAGS=
 for cf_loop1 in $CPPFLAGS_after_XOPEN
 echo $ECHO_N "checking for defines to add to ncurses${USE_CFG_SUFFIX}-config script... $ECHO_C" >&6
 PKG_CFLAGS=
 for cf_loop1 in $CPPFLAGS_after_XOPEN


@@ -23357,7 +23382,7 @@ do
        done
        test "$cf_found" = no && PKG_CFLAGS="$PKG_CFLAGS $cf_loop1"
 done
        done
        test "$cf_found" = no && PKG_CFLAGS="$PKG_CFLAGS $cf_loop1"
 done

-echo "$as_me:23360: result: $PKG_CFLAGS" >&5
+echo "$as_me:23385: result: $PKG_CFLAGS" >&5

 echo "${ECHO_T}$PKG_CFLAGS" >&6
 
 # AC_CHECK_SIZEOF demands a literal parameter, no variables.  So we do this.
 echo "${ECHO_T}$PKG_CFLAGS" >&6
 
 # AC_CHECK_SIZEOF demands a literal parameter, no variables.  So we do this.


@@ -23414,7 +23439,7 @@ then
        cf_filter_syms=$cf_dft_filter_syms
        test -n "$verbose" && echo "    will map symbols to ABI=$cf_cv_abi_version" 1>&6
 
        cf_filter_syms=$cf_dft_filter_syms
        test -n "$verbose" && echo "    will map symbols to ABI=$cf_cv_abi_version" 1>&6
 

-echo "${as_me:-configure}:23417: testing will map symbols to ABI=$cf_cv_abi_version ..." 1>&5
+echo "${as_me:-configure}:23442: testing will map symbols to ABI=$cf_cv_abi_version ..." 1>&5

 
 fi
 
 
 fi
 


@@ -23439,6 +23464,10 @@ else
        CHECK_BUILD=
 fi
 
        CHECK_BUILD=
 fi
 

+cat >>confdefs.h <<\EOF
+#define HAVE_CURSES_DATA_BOOLNAMES 1
+EOF
+

 ac_config_files="$ac_config_files include/MKterm.h.awk include/curses.head:include/curses.h.in include/ncurses_dll.h include/termcap.h include/unctrl.h $SUB_SCRIPTS $SUB_MAKEFILES Makefile"
 ac_config_commands="$ac_config_commands default"
 cat >confcache <<\_ACEOF
 ac_config_files="$ac_config_files include/MKterm.h.awk include/curses.head:include/curses.h.in include/ncurses_dll.h include/termcap.h include/unctrl.h $SUB_SCRIPTS $SUB_MAKEFILES Makefile"
 ac_config_commands="$ac_config_commands default"
 cat >confcache <<\_ACEOF


@@ -23520,7 +23549,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:23523: creating $CONFIG_STATUS" >&5
+{ echo "$as_me:23552: 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


@@ -23696,7 +23725,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:23699: error: ambiguous option: $1
+    { { echo "$as_me:23728: 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;}


@@ -23715,7 +23744,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:23718: error: unrecognized option: $1
+  -*) { { echo "$as_me:23747: 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;}


@@ -23834,7 +23863,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:23837: error: invalid argument: $ac_config_target" >&5
+  *) { { echo "$as_me:23866: 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


@@ -24314,7 +24343,7 @@ done; }
   esac
 
   if test x"$ac_file" != x-; then
   esac
 
   if test x"$ac_file" != x-; then

-    { echo "$as_me:24317: creating $ac_file" >&5
+    { echo "$as_me:24346: 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


@@ -24332,7 +24361,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:24335: error: cannot find input file: $f" >&5
+         test -f "$f" || { { echo "$as_me:24364: 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;;


@@ -24345,7 +24374,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:24348: error: cannot find input file: $f" >&5
+           { { echo "$as_me:24377: 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;;


@@ -24361,7 +24390,7 @@ cat >>$CONFIG_STATUS <<\EOF
       if test -n "$ac_seen"; then
         ac_used=`grep '@datarootdir@' $ac_item`
         if test -z "$ac_used"; then
       if test -n "$ac_seen"; then
         ac_used=`grep '@datarootdir@' $ac_item`
         if test -z "$ac_used"; then

-          { echo "$as_me:24364: WARNING: datarootdir was used implicitly but not set:
+          { echo "$as_me:24393: WARNING: datarootdir was used implicitly but not set:

 $ac_seen" >&5
 echo "$as_me: WARNING: datarootdir was used implicitly but not set:
 $ac_seen" >&2;}
 $ac_seen" >&5
 echo "$as_me: WARNING: datarootdir was used implicitly but not set:
 $ac_seen" >&2;}


@@ -24370,7 +24399,7 @@ $ac_seen" >&2;}
       fi
       ac_seen=`grep '${datarootdir}' $ac_item`
       if test -n "$ac_seen"; then
       fi
       ac_seen=`grep '${datarootdir}' $ac_item`
       if test -n "$ac_seen"; then

-        { echo "$as_me:24373: WARNING: datarootdir was used explicitly but not set:
+        { echo "$as_me:24402: WARNING: datarootdir was used explicitly but not set:

 $ac_seen" >&5
 echo "$as_me: WARNING: datarootdir was used explicitly but not set:
 $ac_seen" >&2;}
 $ac_seen" >&5
 echo "$as_me: WARNING: datarootdir was used explicitly but not set:
 $ac_seen" >&2;}


@@ -24407,7 +24436,7 @@ s,@INSTALL@,$ac_INSTALL,;t t
             ac_init=`egrep '[  ]*'$ac_name'[   ]*=' $ac_file`
             if test -z "$ac_init"; then
               ac_seen=`echo "$ac_seen" |sed -e 's,^,'$ac_file':,'`
             ac_init=`egrep '[  ]*'$ac_name'[   ]*=' $ac_file`
             if test -z "$ac_init"; then
               ac_seen=`echo "$ac_seen" |sed -e 's,^,'$ac_file':,'`

-              { echo "$as_me:24410: WARNING: Variable $ac_name is used but was not set:
+              { echo "$as_me:24439: WARNING: Variable $ac_name is used but was not set:

 $ac_seen" >&5
 echo "$as_me: WARNING: Variable $ac_name is used but was not set:
 $ac_seen" >&2;}
 $ac_seen" >&5
 echo "$as_me: WARNING: Variable $ac_name is used but was not set:
 $ac_seen" >&2;}


@@ -24418,7 +24447,7 @@ $ac_seen" >&2;}
     egrep -n '@[A-Z_][A-Z_0-9]+@' $ac_file >>$tmp/out
     if test -s $tmp/out; then
       ac_seen=`sed -e 's,^,'$ac_file':,' < $tmp/out`
     egrep -n '@[A-Z_][A-Z_0-9]+@' $ac_file >>$tmp/out
     if test -s $tmp/out; then
       ac_seen=`sed -e 's,^,'$ac_file':,' < $tmp/out`

-      { echo "$as_me:24421: WARNING: Some variables may not be substituted:
+      { echo "$as_me:24450: WARNING: Some variables may not be substituted:

 $ac_seen" >&5
 echo "$as_me: WARNING: Some variables may not be substituted:
 $ac_seen" >&2;}
 $ac_seen" >&5
 echo "$as_me: WARNING: Some variables may not be substituted:
 $ac_seen" >&2;}


@@ -24467,7 +24496,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:24470: creating $ac_file" >&5
+  test x"$ac_file" != x- && { echo "$as_me:24499: 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


@@ -24478,7 +24507,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:24481: error: cannot find input file: $f" >&5
+         test -f "$f" || { { echo "$as_me:24510: 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;;


@@ -24491,7 +24520,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:24494: error: cannot find input file: $f" >&5
+           { { echo "$as_me:24523: 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;;


@@ -24549,7 +24578,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:24552: $ac_file is unchanged" >&5
+      { echo "$as_me:24581: $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\(.*[^/]\)//*[^/][^/]*/*$' \| \


@@ -24894,7 +24923,7 @@ cf_ITEM=`echo "$cf_item" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQ
                                (cygdll|msysdll|mingw)
                                        test "x$with_shared_cxx" = xno && test -n "$verbose" && echo "  overriding CXX_MODEL to SHARED" 1>&6
 
                                (cygdll|msysdll|mingw)
                                        test "x$with_shared_cxx" = xno && test -n "$verbose" && echo "  overriding CXX_MODEL to SHARED" 1>&6
 

-echo "${as_me:-configure}:24897: testing overriding CXX_MODEL to SHARED ..." 1>&5
+echo "${as_me:-configure}:24926: testing overriding CXX_MODEL to SHARED ..." 1>&5

 
                                        with_shared_cxx=yes
                                        ;;
 
                                        with_shared_cxx=yes
                                        ;;


@@ -25178,8 +25207,7 @@ CF_EOF
 
 # Special case: tack's manpage lives in its own directory.
 if test "x$cf_with_manpages" = xyes; then
 
 # Special case: tack's manpage lives in its own directory.
 if test "x$cf_with_manpages" = xyes; then

-if test -d tack ; then
-if test -f $srcdir/$tack.h; then
+if test "x$cf_with_tack" = "xyes"; then

 cat >> Makefile <<CF_EOF
 
 install.man \\
 cat >> Makefile <<CF_EOF
 
 install.man \\


@@ -25188,7 +25216,6 @@ uninstall.man ::
 CF_EOF
 fi
 fi
 CF_EOF
 fi
 fi

-fi

 
 rm -f headers.sed headers.sh
 
 
 rm -f headers.sed headers.sh
 

diff --git a/configure.in b/configure.in
index 1d48e8c65b37616bccfc7386a02639e72073d10f..94a36a61a56b1b3b405ba2431d39fa8eff223b65 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.643 2017/06/24 14:19:55 tom Exp $
+dnl $Id: configure.in,v 1.645 2017/07/26 22:24:31 tom Exp $

 dnl Process this file with autoconf to produce a configure script.
 dnl
 dnl See http://invisible-island.net/autoconf/ for additional information.
 dnl
 dnl ---------------------------------------------------------------------------
 AC_PREREQ(2.52.20170501)
 dnl Process this file with autoconf to produce a configure script.
 dnl
 dnl See http://invisible-island.net/autoconf/ for additional information.
 dnl
 dnl ---------------------------------------------------------------------------
 AC_PREREQ(2.52.20170501)

-AC_REVISION($Revision: 1.643 $)
+AC_REVISION($Revision: 1.645 $)

 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)
 


@@ -178,6 +178,22 @@ AC_ARG_WITH(progs,
        [cf_with_progs=yes])
 AC_MSG_RESULT($cf_with_progs)
 
        [cf_with_progs=yes])
 AC_MSG_RESULT($cf_with_progs)
 

+if test -f $srcdir/tack/tack.h; then
+       if test "x$cross_compiling" = xyes ; then
+               CF_VERBOSE(ignoring tack because we are cross-compiling)
+               cf_with_tack=no
+       else
+               AC_MSG_CHECKING(if you want to build the tack program)
+               AC_ARG_WITH(tack,
+                       [  --without-tack          suppress build/install with tack program],
+                       [cf_with_tack=$withval],
+                       [cf_with_tack=$cf_with_progs])
+               AC_MSG_RESULT($cf_with_tack)
+       fi
+else
+       cf_with_tack=no
+fi
+

 AC_MSG_CHECKING(if you want to build test-programs)
 AC_ARG_WITH(tests,
        [  --without-tests         suppress build/install with test-programs],
 AC_MSG_CHECKING(if you want to build test-programs)
 AC_ARG_WITH(tests,
        [  --without-tests         suppress build/install with test-programs],


@@ -193,9 +209,8 @@ AC_ARG_WITH(curses-h,
 AC_MSG_RESULT($with_curses_h)
 
 modules_to_build="ncurses"
 AC_MSG_RESULT($with_curses_h)
 
 modules_to_build="ncurses"

-if test "X$cf_with_progs" != Xno ; then
-modules_to_build="$modules_to_build progs tack"
-fi
+test "X$cf_with_progs" != Xno && modules_to_build="$modules_to_build progs"
+test "X$cf_with_tack"  != Xno && modules_to_build="$modules_to_build tack"

 modules_to_build="$modules_to_build panel menu form"
 
 AC_ARG_PROGRAM
 modules_to_build="$modules_to_build panel menu form"
 
 AC_ARG_PROGRAM


@@ -2276,6 +2291,8 @@ fi
 AC_SUBST(ADAGEN_LDFLAGS)
 AC_SUBST(CHECK_BUILD)
 
 AC_SUBST(ADAGEN_LDFLAGS)
 AC_SUBST(CHECK_BUILD)
 

+AC_DEFINE(HAVE_CURSES_DATA_BOOLNAMES,1,[definition needed for in-tree build of tack])
+

 AC_OUTPUT( \
        include/MKterm.h.awk \
        include/curses.head:include/curses.h.in \
 AC_OUTPUT( \
        include/MKterm.h.awk \
        include/curses.head:include/curses.h.in \

diff --git a/dist.mk b/dist.mk
index e04eebcc7bbd0947b55a95ff9558982c1f1c1c09..521ae3cb4516db10cdd7695be969d468ba99d271 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.1173 2017/07/22 16:49:12 tom Exp $
+# $Id: dist.mk,v 1.1174 2017/07/25 00:17:39 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 = 6
 NCURSES_MINOR = 0
 # These define the major/minor/patch versions of ncurses.
 NCURSES_MAJOR = 6
 NCURSES_MINOR = 0

-NCURSES_PATCH = 20170722
+NCURSES_PATCH = 20170729

 
 # 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/man/curs_memleaks.3x b/man/curs_memleaks.3x
index c93dd28185bfd45d77893cab2b2f33df847aa845..9305edaaa3ca917c65daf76a8c91ac9b79b9b504 100644 (file)
--- a/man/curs_memleaks.3x
+++ b/man/curs_memleaks.3x
@@ -26,13 +26,18 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"

-.\" $Id: curs_memleaks.3x,v 1.4 2017/01/07 19:25:15 tom Exp $
+.\" $Id: curs_memleaks.3x,v 1.5 2017/07/28 00:04:34 tom Exp $

 .TH curs_memleaks 3X ""
 .TH curs_memleaks 3X ""

+.ie \n(.g .ds `` \(lq
+.el       .ds `` ``
+.ie \n(.g .ds '' \(rq
+.el       .ds '' ''

 .na
 .hy 0
 .SH NAME
 \fB_nc_freeall\fP
 .na
 .hy 0
 .SH NAME
 \fB_nc_freeall\fP

-\fB_nc_free_and_exit\fP \- \fBcurses\fR memory-leak checking
+\fB_nc_free_and_exit\fP 
+\fB_nc_free_tinfo\fP \- \fBcurses\fR memory-leak checking

 .ad
 .hy
 .SH SYNOPSIS
 .ad
 .hy
 .SH SYNOPSIS


@@ -41,10 +46,13 @@
 \fBvoid _nc_freeall(void);\fR
 .br
 \fBvoid _nc_free_and_exit(int);\fR
 \fBvoid _nc_freeall(void);\fR
 .br
 \fBvoid _nc_free_and_exit(int);\fR

+.br
+\fBvoid _nc_free_tinfo(int);\fR

 .SH DESCRIPTION
 These functions are used to simplify analysis of memory leaks in the ncurses
 library.
 .SH DESCRIPTION
 These functions are used to simplify analysis of memory leaks in the ncurses
 library.

-They are normally not available; they must be configured into the library
+They are normally not available;
+they must be configured into the library

 at build time using the \fB\-\-disable-leaks\fP option.
 That compiles-in code that frees memory that normally would not be freed.
 .PP
 at build time using the \fB\-\-disable-leaks\fP option.
 That compiles-in code that frees memory that normally would not be freed.
 .PP


@@ -53,17 +61,31 @@ a screen, since (even after calling \fBendwin\fP), it must be available
 for use in the next call to \fBrefresh\fP(3X).
 There are also chunks of memory held for performance reasons.
 That makes it hard to analyze curses applications for memory leaks.
 for use in the next call to \fBrefresh\fP(3X).
 There are also chunks of memory held for performance reasons.
 That makes it hard to analyze curses applications for memory leaks.

-To work around this, one can build a debugging version of the ncurses
-library which frees those chunks which it can, and provides these
-functions to free all of the memory allocated by the ncurses library.
+When using the specially configured debugging version of the ncurses library,
+applications can call functions which free those chunks of memory,
+simplifying the process of memory-leak checking.

 .PP
 .PP

-The \fP_nc_free_and_exit\fP function is the preferred one since
-some of the memory which is freed may be required for the application
-to continue running.
-Its parameter is the code to pass to the \fPexit\fP routine.
+These functions are named with a \*(``_nc_\*('' prefix because they are not
+intended for use in the non-debugging library:
+.TP 5
+\fB_nc_freeall\fP
+This frees (almost) all of the memory allocated by ncurses.
+.TP 5
+\fB_nc_free_and_exit\fP
+This frees the memory allocated by ncurses (like \fB_nc_freeall\fP),
+and exits the program.
+It is preferred over \fB_nc_freeall\fP since some of that memory
+may be required to keep the application running.
+Simply exiting (with the given exit-code) is safer.
+.TP 5
+\fB_nc_free_tinfo\fP
+Use this function if only the low-level terminfo functions (and
+corresponding library) are used.
+Like \fB_nc_free_and_exit\fP, it exits the program after freeing memory.

 .SH RETURN VALUE
 These functions do not return a value.
 .SH PORTABILITY
 .SH RETURN VALUE
 These functions do not return a value.
 .SH PORTABILITY

-These functions are not part of the XSI interface.
+These functions are not part of X/Open Curses;
+nor do other implementations of curses provide a similar feature.

 .SH SEE ALSO
 \fBcurses\fR(3X).
 .SH SEE ALSO
 \fBcurses\fR(3X).

diff --git a/misc/terminfo.src b/misc/terminfo.src
index ee3fab31f89c90a5ac443f226e9fed31ce9a1e70..84838be05f8ccaa31baca6b9f76cc917e3f89dce 100644 (file)
--- a/misc/terminfo.src
+++ b/misc/terminfo.src
@@ -6,8 +6,8 @@
 # Report bugs and new terminal descriptions to
 #      bug-ncurses@gnu.org
 #
 # Report bugs and new terminal descriptions to
 #      bug-ncurses@gnu.org
 #

-#      $Revision: 1.603 $
-#      $Date: 2017/05/14 01:32:04 $
+#      $Revision: 1.607 $
+#      $Date: 2017/07/30 00:10:59 $

 #
 # The original header is preserved below for reference.  It is noted that there
 # is a "newer" version which differs in some cosmetic details (but actually
 #
 # The original header is preserved below for reference.  It is noted that there
 # is a "newer" version which differs in some cosmetic details (but actually


@@ -4180,8 +4180,9 @@ xterm-xfree86|xterm terminal emulator (XFree86),
 xterm-new|modern xterm terminal emulator,
        npc,
        indn=\E[%p1%dS, kb2=\EOE, kcbt=\E[Z, kent=\EOM,
 xterm-new|modern xterm terminal emulator,
        npc,
        indn=\E[%p1%dS, kb2=\EOE, kcbt=\E[Z, kent=\EOM,

-       rin=\E[%p1%dT, use=ansi+enq, use=xterm+pcfkeys,
-       use=xterm+tmux, use=ecma+strikeout, use=xterm-basic,
+       rin=\E[%p1%dT, use=ansi+rep, use=ansi+enq,
+       use=xterm+pcfkeys, use=xterm+tmux, use=ecma+strikeout,
+       use=xterm-basic,

 
 # This fragment is for people who cannot agree on what the backspace key
 # should send.
 
 # This fragment is for people who cannot agree on what the backspace key
 # should send.


@@ -5028,7 +5029,8 @@ gnome-2008|GNOME Terminal snapshot 2.22.3,
 # Testing with tack shows that flash does not/has not worked -TD
 vte-2012|VTE 0.34.1,
        ncv#16,
 # Testing with tack shows that flash does not/has not worked -TD
 vte-2012|VTE 0.34.1,
        ncv#16,

-       dim=\E[2m, flash@, invis=\E[8m, ritm=\E[23m,
+       dim=\E[2m, flash@, invis=\E[8m, ritm=\E[23m, rmso=\E[27m,
+       rmul=\E[24m,

        sgr=\E[0%?%p6%t;1%;%?%p2%t;4%;%?%p5%t;2%;%?%p7%t;8%;%?%p1%p3
            %|%t;7%;m%?%p9%t\016%e\017%;,
        sitm=\E[3m, use=vte-2008,
        sgr=\E[0%?%p6%t;1%;%?%p2%t;4%;%?%p5%t;2%;%?%p7%t;8%;%?%p1%p3
            %|%t;7%;m%?%p9%t\016%e\017%;,
        sitm=\E[3m, use=vte-2008,


@@ -5073,8 +5075,7 @@ vte-2014|VTE 0.35.1,
        ncv@,
        cbt=\E[Z, el1=\E[1K, flash=\E[?5h$<100/>\E[?5l,
        ich=\E[%p1%d@, indn=\E[%p1%dS, kent=\EOM, rin=\E[%p1%dT,
        ncv@,
        cbt=\E[Z, el1=\E[1K, flash=\E[?5h$<100/>\E[?5l,
        ich=\E[%p1%d@, indn=\E[%p1%dS, kent=\EOM, rin=\E[%p1%dT,

-       rmso=\E[27m, rmul=\E[24m, use=xterm+pcfkeys,
-       use=vte-2012,
+       use=xterm+pcfkeys, use=vte-2012,

 
 vte|VTE aka GNOME Terminal,
        use=vte-2014,
 
 vte|VTE aka GNOME Terminal,
        use=vte-2014,


@@ -6385,13 +6386,14 @@ screen+italics|screen cannot support italics,
 # (e)  when screen finds one of these customized entries, it sets $TERM to
 #      match.  Hence, no "screen.xterm" entry is provided, since that would
 #      create heartburn for people running remote xterm's.
 # (e)  when screen finds one of these customized entries, it sets $TERM to
 #      match.  Hence, no "screen.xterm" entry is provided, since that would
 #      create heartburn for people running remote xterm's.

+# (f)   screen does not support rep.

 #
 #      xterm (-xfree86 or -r6) does not normally support kIC, kNXT and kPRV
 #      since the default translations override the built-in keycode
 #      translation.  They are suppressed here to show what is tested by tack.
 screen.xterm-xfree86|screen.xterm-new|screen customized for modern xterm,
        bce@, bw,
 #
 #      xterm (-xfree86 or -r6) does not normally support kIC, kNXT and kPRV
 #      since the default translations override the built-in keycode
 #      translation.  They are suppressed here to show what is tested by tack.
 screen.xterm-xfree86|screen.xterm-new|screen customized for modern xterm,
        bce@, bw,

-       invis@, kIC@, kNXT@, kPRV@, meml@, memu@,
+       invis@, kIC@, kNXT@, kPRV@, meml@, memu@, rep@,

        sgr=%?%p9%t\E(0%e\E(B%;\E[0%?%p6%t;1%;%?%p2%t;4%;%?%p1%p3%|
            %t;7%;%?%p4%t;5%;%?%p5%t;2%;m,
        E3@, use=screen+italics, use=screen+fkeys, use=xterm-new,
        sgr=%?%p9%t\E(0%e\E(B%;\E[0%?%p6%t;1%;%?%p2%t;4%;%?%p1%p3%|
            %t;7%;%?%p4%t;5%;%?%p5%t;2%;m,
        E3@, use=screen+italics, use=screen+fkeys, use=xterm-new,


@@ -7573,41 +7575,53 @@ pcmw|PC running Microsoft Works,
 # Later OpenNT was renamed to Interix.
 #
 # Presently it is distributed by Microsoft as Services For Unix (SFU).
 # Later OpenNT was renamed to Interix.
 #
 # Presently it is distributed by Microsoft as Services For Unix (SFU).

-# The 3.5 beta contains ncurses 4.2 (that is header files and executables,
-# the documentation dates from 1.9.9e) -TD
+# The 3.5 beta contained ncurses 4.2 (that is header files and executables,
+# the documentation dated from 1.9.9e) -TD
+#
+# For a US keyboard, with 12 function-kecbt=\E[Z, ys,
+#      kf1-kf12 are unmodifiedcbt=\E[Z, cbt=\E[Z, 
+#      kf13-kf24 use the shift-key
+#      kf25-kf36 use the left alt-key
+#      kf37-kf38 use the control-key
+#      kf49-kf60 use the shift- and control-keys
+# The shifted cursor keys send the sequences originally used for kf61-kf64:
+#      down=\EF+       (kf61)
+#      up=\EF-         (kf62) 
+#      left=\EF^       (unassigned)
+#      right=\EF$      (kf64) 

 
 interix|opennt|opennt-25|ntconsole|ntconsole-25|OpenNT-term compatible with color,
 
 interix|opennt|opennt-25|ntconsole|ntconsole-25|OpenNT-term compatible with color,

-       am, bw, msgr,
-       colors#8, cols#80, lines#25, ncv#3, pairs#64,
+       am, bce, msgr,
+       cols#80, it#8, lines#25,

        acsc=+\020\,\021-\030.^Y0\333`\004a\261f\370g\361h\260j
             \331k\277l\332m\300n\305o~p\304q\304r\304s_t\303u\264v
             \301w\302x\263y\363z\362{\343|\330}\234~\376,
        acsc=+\020\,\021-\030.^Y0\333`\004a\261f\370g\361h\260j
             \331k\277l\332m\300n\305o~p\304q\304r\304s_t\303u\264v
             \301w\302x\263y\363z\362{\343|\330}\234~\376,

-       bel=^G, bold=\E[1m, cbt=\E[Z, clear=\E[2J, cub=\E[%p1%dD,
+       bel=^G, bold=\E[1m, clear=\E[2J, cr=\r, cub=\E[%p1%dD,

        cub1=\E[D, cud=\E[%p1%dB, cud1=\n, cuf=\E[%p1%dC,
        cuf1=\E[C, cup=\E[%i%p1%d;%p2%dH, cuu=\E[%p1%dA,
        cuu1=\E[A, dl=\E[%p1%dM, dl1=\E[M, ed=\E[J, el=\E[K,
        home=\E[H, ht=^I, il=\E[%p1%dL, il1=\E[L, ind=\E[S,
        cub1=\E[D, cud=\E[%p1%dB, cud1=\n, cuf=\E[%p1%dC,
        cuf1=\E[C, cup=\E[%i%p1%d;%p2%dH, cuu=\E[%p1%dA,
        cuu1=\E[A, dl=\E[%p1%dM, dl1=\E[M, ed=\E[J, el=\E[K,
        home=\E[H, ht=^I, il=\E[%p1%dL, il1=\E[L, ind=\E[S,

-       indn=\E[%p1%dS, kbs=^H, kcbt=\E[Z, kcub1=\E[D, kcud1=\E[B,
-       kcuf1=\E[C, kcuu1=\E[A, kdch1=\E[M, kend=\E[U, kf0=\EFA,
-       kf1=\EF1, kf10=\EFA, kf11=\EFB, kf12=\EFC, kf13=\EFD,
-       kf14=\EFE, kf15=\EFF, kf16=\EFG, kf17=\EFH, kf18=\EFI,
-       kf19=\EFJ, kf2=\EF2, kf20=\EFK, kf21=\EFL, kf22=\EFM,
-       kf23=\EFN, kf24=\EFO, kf25=\EFP, kf26=\EFQ, kf27=\EFR,
-       kf28=\EFS, kf29=\EFT, kf3=\EF3, kf30=\EFU, kf31=\EFV,
-       kf32=\EFW, kf33=\EFX, kf34=\EFY, kf35=\EFZ, kf36=\EFa,
-       kf37=\EFb, kf38=\EFc, kf39=\EFd, kf4=\EF4, kf40=\EFe,
-       kf41=\EFf, kf42=\EFg, kf43=\EFh, kf44=\EFi, kf45=\EFj,
-       kf46=\EFk, kf47=\EFm, kf48=\EFn, kf49=\EFo, kf5=\EF5,
-       kf50=\EFp, kf51=\EFq, kf52=\EFr, kf53=\EFs, kf54=\EFt,
-       kf55=\EFu, kf56=\EFv, kf57=\EFw, kf58=\EFx, kf59=\EFy,
-       kf6=\EF6, kf60=\EFz, kf61=\EF+, kf62=\EF-, kf63=\EF^L,
-       kf7=\EF7, kf8=\EF8, kf9=\EF9, kich1=\E[L, kll=\E[U, knp=\E[T,
-       kpp=\E[S, ll=\E[U, nel=\r\n, op=\E[m, rc=\E[u, rev=\E[7m,
-       ri=\E[T, rin=\E[%p1%dT, rmcup=\E[2b\E[u\r\E[K, rmso=\E[m,
-       rmul=\E[m, rs1=\Ec, sc=\E[s, setab=\E[4%p1%dm,
-       setaf=\E[3%p1%dm, setb=\E[%p1%{40}%+%dm,
-       setf=\E[%p1%{30}%+%dm, sgr0=\E[0m, smcup=\E[s\E[1b,
-       smso=\E[7m, smul=\E[4m, kf64=\EF$,
+       indn=\E[%p1%dS, kLFT=\EF\^, kRIT=\EF$, kbs=^H, kcbt=\E[Z,
+       kcub1=\E[D, kcud1=\E[B, kcuf1=\E[C, kcuu1=\E[A, kdch1=^?,
+       kend=\E[U, kf0=\EFA, kf1=\EF1, kf10=\EFA, kf11=\EFB,
+       kf12=\EFC, kf13=\EFD, kf14=\EFE, kf15=\EFF, kf16=\EFG,
+       kf17=\EFH, kf18=\EFI, kf19=\EFJ, kf2=\EF2, kf20=\EFK,
+       kf21=\EFL, kf22=\EFM, kf23=\EFN, kf24=\EFO, kf25=\EFP,
+       kf26=\EFQ, kf27=\EFR, kf28=\EFS, kf29=\EFT, kf3=\EF3,
+       kf30=\EFU, kf31=\EFV, kf32=\EFW, kf33=\EFX, kf34=\EFY,
+       kf35=\EFZ, kf36=\EFa, kf37=\EFb, kf38=\EFc, kf39=\EFd,
+       kf4=\EF4, kf40=\EFe, kf41=\EFf, kf42=\EFg, kf43=\EFh,
+       kf44=\EFi, kf45=\EFj, kf46=\EFk, kf47=\EFm, kf48=\EFn,
+       kf49=\EFo, kf5=\EF5, kf50=\EFp, kf51=\EFq, kf52=\EFr,
+       kf53=\EFs, kf54=\EFt, kf55=\EFu, kf56=\EFv, kf57=\EFw,
+       kf58=\EFx, kf59=\EFy, kf6=\EF6, kf60=\EFz, kf7=\EF7,
+       kf8=\EF8, kf9=\EF9, khome=\E[H, kich1=\E[L, kind=\EF+,
+       kll=\E[U, knp=\E[T, kpp=\E[S, kri=\EF-, ll=\E[U, nel=\r\n,
+       op=\E[m, rc=\E[u, rev=\E[7m, ri=\E[T, rin=\E[%p1%dT,
+       rmcup=\E[2b\E[u\r\E[K, rmso=\E[m, rmul=\E[m, rs1=\Ec,
+       sc=\E[s, setb=\E[%p1%{40}%+%dm, setf=\E[%p1%{30}%+%dm,
+       sgr0=\E[0m, smcup=\E[s\E[1b, smso=\E[7m, smul=\E[4m,
+       use=ansi+rep, use=klone+color,

 
 opennt-35|ntconsole-35|OpenNT-term35 compatible with color,
        lines#35, use=opennt,
 
 opennt-35|ntconsole-35|OpenNT-term35 compatible with color,
        lines#35, use=opennt,


@@ -25119,4 +25133,11 @@ v3220|LANPAR Vision II model 3220/3221/3222,
 # 2017-05-13
 #      + reformatted using hexadecimal numbers to improve readability -TD
 #
 # 2017-05-13
 #      + reformatted using hexadecimal numbers to improve readability -TD
 #

+# 2017-07-29
+#      + update interix entry using tack and SFU on Windows 7 Ultimate -TD
+#      + use ^? for kdch1 in interix (reported by Jonathan de Boyne Pollard)
+#      + add "rep" to xterm-new, available since 1997/01/26 -TD
+#      + move SGR 24 and 27 from vte-2014 to vte-2012 (request by Alain
+#        Williams) -TD
+#

 ######## SHANTIH!  SHANTIH!  SHANTIH!
 ######## SHANTIH!  SHANTIH!  SHANTIH!

diff --git a/ncurses/base/lib_addch.c b/ncurses/base/lib_addch.c
index 2c0727947f35638f04288bc5226a4ea1b5f93081..ae130ff023746ba81ffce533b140f268878296ee 100644 (file)
--- a/ncurses/base/lib_addch.c
+++ b/ncurses/base/lib_addch.c
@@ -1,5 +1,5 @@
 /****************************************************************************
 /****************************************************************************

- * Copyright (c) 1998-2014,2016 Free Software Foundation, Inc.              *
+ * Copyright (c) 1998-2016,2017 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            *


@@ -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.130 2016/05/28 23:12:00 tom Exp $")
+MODULE_ID("$Id: lib_addch.c,v 1.131 2017/07/29 20:42:02 tom Exp $")

 
 static const NCURSES_CH_T blankchar = NewChar(BLANK_TEXT);
 
 
 static const NCURSES_CH_T blankchar = NewChar(BLANK_TEXT);
 


@@ -117,14 +117,18 @@ _nc_render(WINDOW *win, NCURSES_CH_T ch)
 #endif
 
 static bool
 #endif
 
 static bool

-newline_forces_scroll(WINDOW *win, NCURSES_SIZE_T * ypos)
+newline_forces_scroll(WINDOW *win, NCURSES_SIZE_T *ypos)

 {
     bool result = FALSE;
 
 {
     bool result = FALSE;
 

-    if (*ypos >= win->_regtop && *ypos == win->_regbottom) {
-       *ypos = win->_regbottom;
-       result = TRUE;
-    } else {
+    if (*ypos >= win->_regtop && *ypos <= win->_regbottom) {
+       if (*ypos == win->_regbottom) {
+           *ypos = win->_regbottom;
+           result = TRUE;
+       } else {
+           *ypos = (NCURSES_SIZE_T) (*ypos + 1);
+       }
+    } else if (*ypos < win->_maxy) {

        *ypos = (NCURSES_SIZE_T) (*ypos + 1);
     }
     return result;
        *ypos = (NCURSES_SIZE_T) (*ypos + 1);
     }
     return result;

diff --git a/ncurses/tinfo/lib_tparm.c b/ncurses/tinfo/lib_tparm.c
index 53a36092723aec2dc1b6ef48197946cfc1c6c427..4431f3843d0c327fd99f7959c447ff9372c0a691 100644 (file)
--- a/ncurses/tinfo/lib_tparm.c
+++ b/ncurses/tinfo/lib_tparm.c
@@ -1,5 +1,5 @@
 /****************************************************************************
 /****************************************************************************

- * Copyright (c) 1998-2015,2016 Free Software Foundation, Inc.              *
+ * Copyright (c) 1998-2016,2017 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            *


@@ -42,7 +42,7 @@
 #include <ctype.h>
 #include <tic.h>
 
 #include <ctype.h>
 #include <tic.h>
 

-MODULE_ID("$Id: lib_tparm.c,v 1.95 2016/05/28 23:22:52 tom Exp $")
+MODULE_ID("$Id: lib_tparm.c,v 1.103 2017/07/30 00:13:55 tom Exp $")

 
 /*
  *     char *
 
 /*
  *     char *


@@ -326,6 +326,7 @@ parse_format(const char *s, char *format, int *len)
 
 #define isUPPER(c) ((c) >= 'A' && (c) <= 'Z')
 #define isLOWER(c) ((c) >= 'a' && (c) <= 'z')
 
 #define isUPPER(c) ((c) >= 'A' && (c) <= 'Z')
 #define isLOWER(c) ((c) >= 'a' && (c) <= 'z')

+#define tc_BUMP()  if (level < 0 && number < 2) number++

 
 /*
  * Analyze the string to see how many parameters we need from the varargs list,
 
 /*
  * Analyze the string to see how many parameters we need from the varargs list,


@@ -346,6 +347,7 @@ _nc_tparm_analyze(const char *string, char *p_is_s[NUM_PARM], int *popcount)
     int lastpop = -1;
     int len;
     int number = 0;
     int lastpop = -1;
     int len;
     int number = 0;

+    int level = -1;

     const char *cp = string;
     static char dummy[] = "";
 
     const char *cp = string;
     static char dummy[] = "";
 


@@ -378,22 +380,27 @@ _nc_tparm_analyze(const char *string, char *p_is_s[NUM_PARM], int *popcount)
 #ifdef EXP_XTERM_1005
            case 'u':
 #endif
 #ifdef EXP_XTERM_1005
            case 'u':
 #endif

-               if (lastpop <= 0)
-                   number++;
+               if (lastpop <= 0) {
+                   tc_BUMP();
+               }
+               level -= 1;

                lastpop = -1;
                break;
 
            case 'l':
            case 's':
                lastpop = -1;
                break;
 
            case 'l':
            case 's':

-               if (lastpop > 0)
+               if (lastpop > 0) {
+                   level -= 1;

                    p_is_s[lastpop - 1] = dummy;
                    p_is_s[lastpop - 1] = dummy;

-               ++number;
+               }
+               tc_BUMP();

                break;
 
            case 'p':
                cp++;
                i = (UChar(*cp) - '0');
                if (i >= 0 && i <= NUM_PARM) {
                break;
 
            case 'p':
                cp++;
                i = (UChar(*cp) - '0');
                if (i >= 0 && i <= NUM_PARM) {

+                   ++level;

                    lastpop = i;
                    if (lastpop > *popcount)
                        *popcount = lastpop;
                    lastpop = i;
                    if (lastpop > *popcount)
                        *popcount = lastpop;


@@ -401,20 +408,22 @@ _nc_tparm_analyze(const char *string, char *p_is_s[NUM_PARM], int *popcount)
                break;
 
            case 'P':
                break;
 
            case 'P':

-               ++number;

                ++cp;
                break;
 
            case 'g':
                ++cp;
                break;
 
            case 'g':

+               ++level;

                cp++;
                break;
 
            case S_QUOTE:
                cp++;
                break;
 
            case S_QUOTE:

+               ++level;

                cp += 2;
                lastpop = -1;
                break;
 
            case L_BRACE:
                cp += 2;
                lastpop = -1;
                break;
 
            case L_BRACE:

+               ++level;

                cp++;
                while (isdigit(UChar(*cp))) {
                    cp++;
                cp++;
                while (isdigit(UChar(*cp))) {
                    cp++;


@@ -434,14 +443,15 @@ _nc_tparm_analyze(const char *string, char *p_is_s[NUM_PARM], int *popcount)
            case '=':
            case '<':
            case '>':
            case '=':
            case '<':
            case '>':

+               tc_BUMP();
+               level -= 1;     /* pop 2, operate, push 1 */

                lastpop = -1;
                lastpop = -1;

-               number += 2;

                break;
 
            case '!':
            case '~':
                break;
 
            case '!':
            case '~':

+               tc_BUMP();

                lastpop = -1;
                lastpop = -1;

-               ++number;

                break;
 
            case 'i':
                break;
 
            case 'i':


@@ -537,10 +547,15 @@ tparam_internal(int use_TPARM_ARG, const char *string, va_list ap)
 #ifdef TRACE
     if (USE_TRACEF(TRACE_CALLS)) {
        for (i = 0; i < num_args; i++) {
 #ifdef TRACE
     if (USE_TRACEF(TRACE_CALLS)) {
        for (i = 0; i < num_args; i++) {

-           if (p_is_s[i] != 0)
+           if (p_is_s[i] != 0) {

                save_text(", %s", _nc_visbuf(p_is_s[i]), 0);
                save_text(", %s", _nc_visbuf(p_is_s[i]), 0);

-           else
+           } else if ((long) param[i] > 32767 || (long) param[i] < 0) {
+               _tracef("BUG: problem with tparm parameter #%d of %d",
+                       i + 1, num_args);
+               break;
+           } else {

                save_number(", %d", (int) param[i], 0);
                save_number(", %d", (int) param[i], 0);

+           }

        }
        _tracef(T_CALLED("%s(%s%s)"), TPS(tname), _nc_visbuf(cp), TPS(out_buff));
        TPS(out_used) = 0;
        }
        _tracef(T_CALLED("%s(%s%s)"), TPS(tname), _nc_visbuf(cp), TPS(out_buff));
        TPS(out_used) = 0;

diff --git a/ncurses/tty/lib_mvcur.c b/ncurses/tty/lib_mvcur.c
index 691ecc3e79f3de57e9073b4bf2964a77670678e0..f0b3320cf8b29de6bd4c3ebb241e0c5b0424f916 100644 (file)
--- a/ncurses/tty/lib_mvcur.c
+++ b/ncurses/tty/lib_mvcur.c
@@ -159,7 +159,7 @@
 #define CUR SP_TERMTYPE
 #endif
 
 #define CUR SP_TERMTYPE
 #endif
 

-MODULE_ID("$Id: lib_mvcur.c,v 1.144 2017/07/22 23:59:07 tom Exp $")
+MODULE_ID("$Id: lib_mvcur.c,v 1.145 2017/07/23 00:08:37 tom Exp $")

 
 #define WANT_CHAR(sp, y, x) NewScreen(sp)->_line[y].text[x]    /* desired state */
 
 
 #define WANT_CHAR(sp, y, x) NewScreen(sp)->_line[y].text[x]    /* desired state */
 

diff --git a/ncurses/tty/tty_update.c b/ncurses/tty/tty_update.c
index c08f853f201ecaf568574d1ec5939d95d0d72c48..7623ee3a355aef60444d3f62f4e0273043d2333d 100644 (file)
--- a/ncurses/tty/tty_update.c
+++ b/ncurses/tty/tty_update.c
@@ -84,7 +84,7 @@
 
 #include <ctype.h>
 
 
 #include <ctype.h>
 

-MODULE_ID("$Id: tty_update.c,v 1.290 2017/07/22 23:30:28 tom Exp $")
+MODULE_ID("$Id: tty_update.c,v 1.293 2017/07/29 13:09:05 tom Exp $")

 
 /*
  * This define controls the line-breakout optimization.  Every once in a
 
 /*
  * This define controls the line-breakout optimization.  Every once in a


@@ -666,7 +666,12 @@ EmitRange(NCURSES_SP_DCLx const NCURSES_CH_T * ntext, int num)
                } else {
                    return 1;   /* cursor stays in the middle */
                }
                } else {
                    return 1;   /* cursor stays in the middle */
                }

-           } else if (repeat_char && runcount > SP_PARM->_rep_cost) {
+           } else if (repeat_char != 0 &&
+#if USE_WIDEC_SUPPORT
+                      (CharOf(ntext0) < ACS_LEN) &&
+#endif
+                      runcount > SP_PARM->_rep_cost) {
+               NCURSES_CH_T temp;

                bool wrap_possible = (SP_PARM->_curscol + runcount >=
                                      screen_columns(SP_PARM));
                int rep_count = runcount;
                bool wrap_possible = (SP_PARM->_curscol + runcount >=
                                      screen_columns(SP_PARM));
                int rep_count = runcount;


@@ -675,9 +680,16 @@ EmitRange(NCURSES_SP_DCLx const NCURSES_CH_T * ntext, int num)
                    rep_count--;
 
                UpdateAttrs(SP_PARM, ntext0);
                    rep_count--;
 
                UpdateAttrs(SP_PARM, ntext0);

+               temp = ntext0;
+               if ((AttrOf(temp) & A_ALTCHARSET) &&
+                   SP_PARM->_acs_map != 0) {
+                   SetChar(temp,
+                           SP_PARM->_acs_map[CharOf(temp)],
+                           AttrOf(temp) | A_ALTCHARSET);
+               }

                NCURSES_SP_NAME(tputs) (NCURSES_SP_ARGx
                                        TPARM_2(repeat_char,
                NCURSES_SP_NAME(tputs) (NCURSES_SP_ARGx
                                        TPARM_2(repeat_char,

-                                               CharOf(ntext0),
+                                               CharOf(temp),

                                                rep_count),
                                        1,
                                        NCURSES_SP_NAME(_nc_outch));
                                                rep_count),
                                        1,
                                        NCURSES_SP_NAME(_nc_outch));

diff --git a/package/debian-mingw/changelog b/package/debian-mingw/changelog
index 2fa5e45c78b2b98b0099ff33bb4faf642bf917f8..84f67ca6fc6b6fff7c1cdd70628d89c3add6535f 100644 (file)
--- a/package/debian-mingw/changelog
+++ b/package/debian-mingw/changelog
@@ -1,8 +1,8 @@
-ncurses6 (6.0+20170722) unstable; urgency=low
+ncurses6 (6.0+20170729) unstable; urgency=low

 
   * latest weekly patch
 
 
   * latest weekly patch
 

- -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 22 Jul 2017 12:49:12 -0400
+ -- Thomas E. Dickey <dickey@invisible-island.net>  Mon, 24 Jul 2017 20:17:39 -0400

 
 ncurses6 (5.9-20131005) unstable; urgency=low
 
 
 ncurses6 (5.9-20131005) unstable; urgency=low
 

diff --git a/package/debian-mingw64/changelog b/package/debian-mingw64/changelog
index 2fa5e45c78b2b98b0099ff33bb4faf642bf917f8..84f67ca6fc6b6fff7c1cdd70628d89c3add6535f 100644 (file)
--- a/package/debian-mingw64/changelog
+++ b/package/debian-mingw64/changelog
@@ -1,8 +1,8 @@
-ncurses6 (6.0+20170722) unstable; urgency=low
+ncurses6 (6.0+20170729) unstable; urgency=low

 
   * latest weekly patch
 
 
   * latest weekly patch
 

- -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 22 Jul 2017 12:49:12 -0400
+ -- Thomas E. Dickey <dickey@invisible-island.net>  Mon, 24 Jul 2017 20:17:39 -0400

 
 ncurses6 (5.9-20131005) unstable; urgency=low
 
 
 ncurses6 (5.9-20131005) unstable; urgency=low
 

diff --git a/package/debian/changelog b/package/debian/changelog
index 5234a4c23c85c4b870fc01e81a5e164998d25272..23bdc7aa83a239b2ce03326a0157cae9f810291c 100644 (file)
--- a/package/debian/changelog
+++ b/package/debian/changelog
@@ -1,8 +1,8 @@
-ncurses6 (6.0+20170722) unstable; urgency=low
+ncurses6 (6.0+20170729) unstable; urgency=low

 
   * latest weekly patch
 
 
   * latest weekly patch
 

- -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 22 Jul 2017 12:49:12 -0400
+ -- Thomas E. Dickey <dickey@invisible-island.net>  Mon, 24 Jul 2017 20:17:39 -0400

 
 ncurses6 (5.9-20120608) unstable; urgency=low
 
 
 ncurses6 (5.9-20120608) unstable; urgency=low
 

diff --git a/package/mingw-ncurses.nsi b/package/mingw-ncurses.nsi
index 8b50dd7e713f7802fbab7ed63f6d0eafd60cd071..6747843634a5ce1b3238069ba1b1261f8d3cde02 100644 (file)
--- a/package/mingw-ncurses.nsi
+++ b/package/mingw-ncurses.nsi
@@ -1,4 +1,4 @@
-; $Id: mingw-ncurses.nsi,v 1.221 2017/07/22 16:49:12 tom Exp $\r
+; $Id: mingw-ncurses.nsi,v 1.222 2017/07/25 00:17:39 tom Exp $\r

 \r
 ; TODO add examples\r
 ; TODO bump ABI to 6\r
 \r
 ; TODO add examples\r
 ; TODO bump ABI to 6\r


@@ -10,7 +10,7 @@
 !define VERSION_MAJOR "6"\r
 !define VERSION_MINOR "0"\r
 !define VERSION_YYYY  "2017"\r
 !define VERSION_MAJOR "6"\r
 !define VERSION_MINOR "0"\r
 !define VERSION_YYYY  "2017"\r

-!define VERSION_MMDD  "0722"\r
+!define VERSION_MMDD  "0729"\r

 !define VERSION_PATCH ${VERSION_YYYY}${VERSION_MMDD}\r
 \r
 !define MY_ABI   "5"\r
 !define VERSION_PATCH ${VERSION_YYYY}${VERSION_MMDD}\r
 \r
 !define MY_ABI   "5"\r

diff --git a/package/mingw-ncurses.spec b/package/mingw-ncurses.spec
index a28fa532b77a6250ac8233d34c709eafb313087a..ef8c46afd06835d073ef72246df6448d66c92523 100644 (file)
--- a/package/mingw-ncurses.spec
+++ b/package/mingw-ncurses.spec
@@ -3,7 +3,7 @@
 Summary: shared libraries for terminal handling
 Name: mingw32-ncurses6
 Version: 6.0
 Summary: shared libraries for terminal handling
 Name: mingw32-ncurses6
 Version: 6.0

-Release: 20170722
+Release: 20170729

 License: X11
 Group: Development/Libraries
 Source: ncurses-%{version}-%{release}.tgz
 License: X11
 Group: Development/Libraries
 Source: ncurses-%{version}-%{release}.tgz

diff --git a/package/ncurses.spec b/package/ncurses.spec
index fa3a5b2666622e5b5540822c65925b4526f89543..e918b74b89f04ce1ea47228557497b3502f8c74a 100644 (file)
--- a/package/ncurses.spec
+++ b/package/ncurses.spec
@@ -1,7 +1,7 @@
 Summary: shared libraries for terminal handling
 Name: ncurses6
 Version: 6.0
 Summary: shared libraries for terminal handling
 Name: ncurses6
 Version: 6.0

-Release: 20170722
+Release: 20170729

 License: X11
 Group: Development/Libraries
 Source: ncurses-%{version}-%{release}.tgz
 License: X11
 Group: Development/Libraries
 Source: ncurses-%{version}-%{release}.tgz

diff --git a/progs/tic.c b/progs/tic.c
index c5d78e5a374939179f42ce3490d1f24b41923319..5805c04c5ff31c1affce1f2e31ba85f192d1568c 100644 (file)
--- a/progs/tic.c
+++ b/progs/tic.c
@@ -48,7 +48,7 @@
 #include <parametrized.h>
 #include <transform.h>
 
 #include <parametrized.h>
 #include <transform.h>
 

-MODULE_ID("$Id: tic.c,v 1.233 2017/07/15 17:40:19 tom Exp $")
+MODULE_ID("$Id: tic.c,v 1.240 2017/07/29 16:14:16 tom Exp $")

 
 #define STDIN_NAME "<stdin>"
 
 
 #define STDIN_NAME "<stdin>"
 


@@ -1717,13 +1717,24 @@ expected_params(const char *name)
     return result;
 }
 
     return result;
 }
 

+static int
+is_user_capability(const char *name)
+{
+    int result = 0;
+    if (name[0] == 'u' &&
+       (name[1] >= '0' && name[1] <= '9') &&
+       name[2] == '\0')
+       result = 1;
+    return result;
+}
+

 /*
  * Make a quick sanity check for the parameters which are used in the given
  * strings.  If there are no "%p" tokens, then there should be no other "%"
  * markers.
  */
 static void
 /*
  * Make a quick sanity check for the parameters which are used in the given
  * strings.  If there are no "%p" tokens, then there should be no other "%"
  * markers.
  */
 static void

-check_params(TERMTYPE2 *tp, const char *name, char *value)
+check_params(TERMTYPE2 *tp, const char *name, char *value, int extended)

 {
     int expected = expected_params(name);
     int actual = 0;
 {
     int expected = expected_params(name);
     int actual = 0;


@@ -1760,6 +1771,14 @@ check_params(TERMTYPE2 *tp, const char *name, char *value)
        s++;
     }
 
        s++;
     }
 

+    if (extended) {
+       if (actual > 0) {
+           _nc_warning("extended %s capability has %d parameters",
+                       name, actual);
+           expected = actual;
+       }
+    }
+

     if (params[0]) {
        _nc_warning("%s refers to parameter 0 (%%p0), which is not allowed", name);
     }
     if (params[0]) {
        _nc_warning("%s refers to parameter 0 (%%p0), which is not allowed", name);
     }


@@ -1773,6 +1792,29 @@ check_params(TERMTYPE2 *tp, const char *name, char *value)
                _nc_warning("%s omits parameter %d", name, n);
        }
     }
                _nc_warning("%s omits parameter %d", name, n);
        }
     }

+
+    /*
+     * Counting "%p" markers does not account for termcap expressions which
+     * may not have been fully translated.  Also, tparm does its own analysis.
+     * Report differences here.
+     */
+    if (actual >= 0) {
+       char *p_is_s[NUM_PARM];
+       int popcount;
+       int analyzed = _nc_tparm_analyze(value, p_is_s, &popcount);
+       if (analyzed < popcount) {
+           analyzed = popcount;
+       }
+       if (actual != analyzed && expected != analyzed) {
+           if (is_user_capability(name)) {
+               _nc_warning("tparm will use %d parameters for %s",
+                           analyzed, name);
+           } else {
+               _nc_warning("tparm analyzed %d parameters for %s, expected %d",
+                           analyzed, name, actual);
+           }
+       }
+    }

 }
 
 static bool
 }
 
 static bool


@@ -2399,7 +2441,7 @@ check_conflict(TERMTYPE2 *tp)
        NAME_VALUE *given = get_fkey_list(tp);
 
        if (check == 0)
        NAME_VALUE *given = get_fkey_list(tp);
 
        if (check == 0)

-           failed("check_termtype");
+           failed("check_conflict");

 
        for (j = 0; given[j].keycode; ++j) {
            const char *a = given[j].value;
 
        for (j = 0; given[j].keycode; ++j) {
            const char *a = given[j].value;


@@ -2543,7 +2585,16 @@ check_termtype(TERMTYPE2 *tp, bool literal)
     for_each_string(j, tp) {
        char *a = tp->Strings[j];
        if (VALID_STRING(a)) {
     for_each_string(j, tp) {
        char *a = tp->Strings[j];
        if (VALID_STRING(a)) {

-           check_params(tp, ExtStrname(tp, (int) j, strnames), a);
+           const char *name = ExtStrname(tp, (int) j, strnames);
+           /*
+            * If we expect parameters, or if there might be parameters,
+            * check for consistent number of parameters.
+            */
+           if (j >= SIZEOF(parametrized) ||
+               is_user_capability(name) ||
+               parametrized[j] > 0) {
+               check_params(tp, name, a, (j >= STRCOUNT));
+           }

            check_delays(ExtStrname(tp, (int) j, strnames), a);
            if (capdump) {
                check_infotocap(tp, (int) j, a);
            check_delays(ExtStrname(tp, (int) j, strnames), a);
            if (capdump) {
                check_infotocap(tp, (int) j, a);