ncurses 6.3 - patch 20211113

[ncurses.git] / configure

diff --git a/configure b/configure
index 5074c7ca1c6962289864dbeff6fb94f01de02cf8..ffde18f5a1155cdfac3a441c9e361453359a5bdf 100755 (executable)
--- a/configure
+++ b/configure
@@ -1,5 +1,5 @@
 #! /bin/sh
 #! /bin/sh

-# From configure.in Revision: 1.733 .
+# From configure.in Revision: 1.737 .

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


@@ -793,7 +793,7 @@ Fine-Tuning Your Configuration:
   --disable-largefile     omit support for large files
   --disable-tparm-varargs compile tparm() without varargs interface
   --disable-tic-depends   link tic library without explicit dependency on ncurses library
   --disable-largefile     omit support for large files
   --disable-tparm-varargs compile tparm() without varargs interface
   --disable-tic-depends   link tic library without explicit dependency on ncurses library

-  --disable-wattr-macros  suppress wattr* macros to help with ncurses5/ncurses6 transition
+  --enable-wattr-macros   enable wattr* macros

   --with-x11-rgb=FILE   file containing X11 rgb information (EPREFIX/lib/X11/rgb.txt)
   --with-bool=TYPE        override fallback type of bool variable
   --with-caps=alt         compile with alternate Caps file
   --with-x11-rgb=FILE   file containing X11 rgb information (EPREFIX/lib/X11/rgb.txt)
   --with-bool=TYPE        override fallback type of bool variable
   --with-caps=alt         compile with alternate Caps file


@@ -4138,88 +4138,115 @@ echo $ECHO_N "checking for $PKG_CONFIG library directory... $ECHO_C" >&6
        ;;
 esac
 
        ;;
 esac
 

-PKG_CONFIG_LIBDIR=no
+cf_search_path=`echo "$PKG_CONFIG_LIBDIR" | sed -e 's/:/ /g' -e 's,^[  ]*,,'`

 
 # Check whether --with-pkg-config-libdir or --without-pkg-config-libdir was given.
 if test "${with_pkg_config_libdir+set}" = set; then
   withval="$with_pkg_config_libdir"
 
 # Check whether --with-pkg-config-libdir or --without-pkg-config-libdir was given.
 if test "${with_pkg_config_libdir+set}" = set; then
   withval="$with_pkg_config_libdir"

-  PKG_CONFIG_LIBDIR=$withval
+  cf_search_path=$withval

 else
 else

-  test "x$PKG_CONFIG" != xnone && PKG_CONFIG_LIBDIR=yes
+  test "x$PKG_CONFIG" != xnone && cf_search_path=yes

 fi;
 
 fi;
 

-case x$PKG_CONFIG_LIBDIR in
+case x$cf_search_path in

 (x/*)
        ;;
 (xyes)
 (x/*)
        ;;
 (xyes)

+       cf_search_path=
+       test -n "$verbose" && echo "    auto..." 1>&6
+
+echo "${as_me:-configure}:4158: testing auto... ..." 1>&5
+

        # Look for the library directory using the same prefix as the executable
        # Look for the library directory using the same prefix as the executable

-       if test "x$PKG_CONFIG" = xnone
+       echo "$as_me:4161: checking for search-list" >&5
+echo $ECHO_N "checking for search-list... $ECHO_C" >&6
+       if test "x$PKG_CONFIG" != xnone

        then
        then

-               cf_path=$prefix
-       else
-               cf_path=`echo "$PKG_CONFIG" | sed -e 's,/[^/]*/[^/]*$,,'`
+               # works for pkg-config since version 0.24 (2009)
+               # works for pkgconf since version 0.8.3 (2012)
+               for cf_pkg_program in \
+                       `echo "$PKG_CONFIG" | sed -e 's,^.*/,,'` \
+                       pkg-config \
+                       pkgconf
+               do
+                       cf_search_path=`"$PKG_CONFIG" --variable=pc_path "$cf_pkg_program" 2>/dev/null | tr : ' '`
+                       test -n "$cf_search_path" && break
+               done
+
+               # works for pkg-config since import in 2005 of original 2001 HP code.
+               test -z "$cf_search_path" && \
+               cf_search_path=`
+               "$PKG_CONFIG" --debug --exists no-such-package 2>&1 | $AWK "\
+/^Scanning directory (#[1-9][0-9]* )?'.*'$/{ \
+       sub(\"^[^']*'\",\"\"); \
+       sub(\"'.*\",\"\"); \
+       printf \" %s\", \\$0; } \
+{ next; } \
+"`

        fi
 
        fi
 

-       # If you don't like using the default architecture, you have to specify the
-       # intended library directory and corresponding compiler/linker options.
-       #
-       # This case allows for Debian's 2014-flavor of multiarch, along with the
-       # most common variations before that point.  Some other variants spell the
-       # directory differently, e.g., "pkg-config", and put it in unusual places.
-       # pkg-config has always been poorly standardized, which is ironic...
-       case x`(arch) 2>/dev/null` in
-       (*64)
-               cf_search_path="\
-                       $cf_path/lib/*64-linux-gnu \
-                       $cf_path/share \
-                       $cf_path/lib64 \
-                       $cf_path/lib32 \
-                       $cf_path/lib"
-               ;;
-       (*)
-               cf_search_path="\
-                       $cf_path/lib/*-linux-gnu \
-                       $cf_path/share \
-                       $cf_path/lib32 \
-                       $cf_path/lib \
-                       $cf_path/libdata"
-               ;;
-       esac
+       echo "$as_me:4188: result: $cf_search_path" >&5
+echo "${ECHO_T}$cf_search_path" >&6

 
 

-       test -n "$verbose" && echo "    list..." 1>&6
+       ;;
+(*)
+       ;;
+esac
+
+echo "$as_me:4196: checking for first directory" >&5
+echo $ECHO_N "checking for first directory... $ECHO_C" >&6
+cf_pkg_config_path=none
+for cf_config in $cf_search_path
+do
+       if test -d "$cf_config"
+       then
+               cf_pkg_config_path=$cf_config
+               break
+       fi
+done
+echo "$as_me:4207: result: $cf_pkg_config_path" >&5
+echo "${ECHO_T}$cf_pkg_config_path" >&6

 
 

-echo "${as_me:-configure}:4191: testing list... ..." 1>&5
+if test "x$cf_pkg_config_path" != xnone ; then
+       # limit this to the first directory found
+       PKG_CONFIG_LIBDIR="$cf_pkg_config_path"
+fi

 
 

+if test -z "$PKG_CONFIG_LIBDIR" && test -n "$cf_search_path"
+then
+       echo "$as_me:4217: checking for workaround" >&5
+echo $ECHO_N "checking for workaround... $ECHO_C" >&6
+       if test "$prefix" = "NONE" ; then
+               cf_prefix="$ac_default_prefix"
+       else
+               cf_prefix="$prefix"
+       fi
+       eval cf_libdir=$libdir
+       cf_libdir=`echo "$cf_libdir" | sed -e "s,^NONE,$cf_prefix,"`
+       cf_backup=

        for cf_config in $cf_search_path
        do
        for cf_config in $cf_search_path
        do

-               test -n "$verbose" && echo "    checking $cf_config/pkgconfig" 1>&6
-
-echo "${as_me:-configure}:4197: testing checking $cf_config/pkgconfig ..." 1>&5
-
-               if test -d "$cf_config/pkgconfig"
-               then
-                       PKG_CONFIG_LIBDIR=$cf_config/pkgconfig
-                       echo "$as_me:4202: checking done" >&5
-echo $ECHO_N "checking done... $ECHO_C" >&6
+               case $cf_config in
+               $cf_libdir/pkgconfig)
+                       PKG_CONFIG_LIBDIR=$cf_libdir/pkgconfig

                        break
                        break

-               fi
+                       ;;
+               *)
+                       test -z "$cf_backup" && cf_backup=$cf_config
+                       ;;
+               esac

        done
        done

-       ;;
-(*)
-       ;;
-esac
-
-if test "x$PKG_CONFIG_LIBDIR" != xno ; then
-       echo "$as_me:4213: result: $PKG_CONFIG_LIBDIR" >&5
+       test -z "$PKG_CONFIG_LIBDIR" && PKG_CONFIG_LIBDIR=$cf_backup
+       echo "$as_me:4240: 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:4219: checking if we should install .pc files for $PKG_CONFIG" >&5
+       echo "$as_me:4246: 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:4222: checking if we should install .pc files" >&5
+       echo "$as_me:4249: 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
 


@@ -4230,15 +4257,15 @@ if test "${enable_pc_files+set}" = set; then
 else
   enable_pc_files=no
 fi;
 else
   enable_pc_files=no
 fi;

-echo "$as_me:4233: result: $enable_pc_files" >&5
+echo "$as_me:4260: result: $enable_pc_files" >&5

 echo "${ECHO_T}$enable_pc_files" >&6
 
 if test "x$enable_pc_files" != xno
 then
        MAKE_PC_FILES=
        case "x$PKG_CONFIG_LIBDIR" in
 echo "${ECHO_T}$enable_pc_files" >&6
 
 if test "x$enable_pc_files" != xno
 then
        MAKE_PC_FILES=
        case "x$PKG_CONFIG_LIBDIR" in

-       (xno|xyes)
-               { echo "$as_me:4241: WARNING: no PKG_CONFIG_LIBDIR was found" >&5
+       (xno|xnone|xyes|x)
+               { echo "$as_me:4268: 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;}
                ;;
        (*)


@@ -4268,7 +4295,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:4271: error: expected a pathname, not \"$PKG_CONFIG_LIBDIR\"" >&5
+       { { echo "$as_me:4298: 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; }; }
        ;;


@@ -4282,7 +4309,7 @@ fi
 
 if test -z "$MAKE_PC_FILES"
 then
 
 if test -z "$MAKE_PC_FILES"
 then

-       echo "$as_me:4285: checking for suffix to add to pc-files" >&5
+       echo "$as_me:4312: 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.


@@ -4297,13 +4324,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:4300: result: $PC_MODULE_SUFFIX" >&5
+       echo "$as_me:4327: 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:4306: checking if we should assume mixed-case filenames" >&5
+echo "$as_me:4333: 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.


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

-echo "$as_me:4316: result: $enable_mixedcase" >&5
+echo "$as_me:4343: 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:4320: checking if filesystem supports mixed-case filenames" >&5
+echo "$as_me:4347: 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


@@ -4344,7 +4371,7 @@ else
 fi
 
 fi
 fi
 
 fi

-echo "$as_me:4347: result: $cf_cv_mixedcase" >&5
+echo "$as_me:4374: 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


@@ -4363,7 +4390,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:4366: checking whether ${MAKE-make} sets \${MAKE}" >&5
+echo "$as_me:4393: 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


@@ -4383,20 +4410,82 @@ 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:4386: result: yes" >&5
+  echo "$as_me:4413: result: yes" >&5

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

-  echo "$as_me:4390: result: no" >&5
+  echo "$as_me:4417: 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
 

+echo "$as_me:4422: checking for \".PHONY\" make-support" >&5
+echo $ECHO_N "checking for \".PHONY\" make-support... $ECHO_C" >&6
+if test "${cf_cv_make_PHONY+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+
+       rm -rf conftest*
+       (
+               mkdir conftest || exit 1
+               cd conftest
+               cat >makefile <<'CF_EOF'
+.PHONY: always
+DATA=0
+always:        always.out
+       @echo "** making $@ $(DATA)"
+once: once.out
+       @echo "** making $@ $(DATA)"
+always.out:
+       @echo "** making $@ $(DATA)"
+       echo $(DATA) > $@
+once.out:
+       @echo "** making $@ $(DATA)"
+       echo $(DATA) > $@
+CF_EOF
+               for cf_data in 1 2 3
+               do
+                       ${MAKE:-make} always DATA=$cf_data
+                       ${MAKE:-make} once   DATA=$cf_data
+                       ${MAKE:-make} -t always once
+                       if test -f always ; then
+                               echo "no (case 1)" > ../conftest.tmp
+                       elif test ! -f always.out ; then
+                               echo "no (case 2)" > ../conftest.tmp
+                       elif test ! -f once.out ; then
+                               echo "no (case 3)" > ../conftest.tmp
+                       elif ! cmp -s always.out once.out ; then
+                               echo "no (case 4)" > ../conftest.tmp
+                               diff always.out once.out
+                       else
+                               cf_check="`cat always.out`"
+                               if test "x$cf_check" != "x$cf_data" ; then
+                                       echo "no (case 5)" > ../conftest.tmp
+                               else
+                                       echo yes > ../conftest.tmp
+                                       rm -f ./*.out
+                                       continue
+                               fi
+                       fi
+                       break
+               done
+       ) >&5 2>&1
+       cf_cv_make_PHONY="`cat conftest.tmp`"
+       rm -rf conftest*
+
+fi
+echo "$as_me:4477: result: $cf_cv_make_PHONY" >&5
+echo "${ECHO_T}$cf_cv_make_PHONY" >&6
+MAKE_NO_PHONY="#"
+MAKE_PHONY="#"
+test "x$cf_cv_make_PHONY" = xyes && MAKE_PHONY=
+test "x$cf_cv_make_PHONY" != xyes && MAKE_NO_PHONY=
+

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

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


@@ -4411,7 +4500,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:4414: found $ac_dir/$ac_word" >&5
+echo "$as_me:4503: found $ac_dir/$ac_word" >&5

 break
 done
 
 break
 done
 


@@ -4419,10 +4508,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:4422: result: $CTAGS" >&5
+  echo "$as_me:4511: result: $CTAGS" >&5

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

-  echo "$as_me:4425: result: no" >&5
+  echo "$as_me:4514: result: no" >&5

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


@@ -4433,7 +4522,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:4436: checking for $ac_word" >&5
+echo "$as_me:4525: 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


@@ -4448,7 +4537,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:4451: found $ac_dir/$ac_word" >&5
+echo "$as_me:4540: found $ac_dir/$ac_word" >&5

 break
 done
 
 break
 done
 


@@ -4456,10 +4545,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:4459: result: $ETAGS" >&5
+  echo "$as_me:4548: result: $ETAGS" >&5

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

-  echo "$as_me:4462: result: no" >&5
+  echo "$as_me:4551: result: no" >&5

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


@@ -4468,7 +4557,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:4471: checking for $ac_word" >&5
+echo "$as_me:4560: 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


@@ -4483,7 +4572,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:4486: found $ac_dir/$ac_word" >&5
+echo "$as_me:4575: found $ac_dir/$ac_word" >&5

 break
 done
 
 break
 done
 


@@ -4492,17 +4581,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:4495: result: $MAKE_LOWER_TAGS" >&5
+  echo "$as_me:4584: result: $MAKE_LOWER_TAGS" >&5

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

-  echo "$as_me:4498: result: no" >&5
+  echo "$as_me:4587: 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:4505: checking for $ac_word" >&5
+echo "$as_me:4594: 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


@@ -4517,7 +4606,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:4520: found $ac_dir/$ac_word" >&5
+echo "$as_me:4609: found $ac_dir/$ac_word" >&5

 break
 done
 
 break
 done
 


@@ -4526,10 +4615,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:4529: result: $MAKE_UPPER_TAGS" >&5
+  echo "$as_me:4618: result: $MAKE_UPPER_TAGS" >&5

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

-  echo "$as_me:4532: result: no" >&5
+  echo "$as_me:4621: result: no" >&5

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


@@ -4549,7 +4638,7 @@ else
        MAKE_LOWER_TAGS="#"
 fi
 
        MAKE_LOWER_TAGS="#"
 fi
 

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


@@ -4579,7 +4668,7 @@ CF_EOF
                        ;;
                (*)
 
                        ;;
                (*)
 

-echo "${as_me:-configure}:4582: testing given option \"$cf_option\",no match \"$cf_result\" ..." 1>&5
+echo "${as_me:-configure}:4671: testing given option \"$cf_option\",no match \"$cf_result\" ..." 1>&5

 
                        ;;
                esac
 
                        ;;
                esac


@@ -4587,13 +4676,13 @@ echo "${as_me:-configure}:4582: testing given option \"$cf_option\",no match \"$
        rm -f cf_makeflags.tmp
 
 fi
        rm -f cf_makeflags.tmp
 
 fi

-echo "$as_me:4590: result: $cf_cv_makeflags" >&5
+echo "$as_me:4679: 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:4596: checking for $ac_word" >&5
+echo "$as_me:4685: 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


@@ -4608,7 +4697,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:4611: found $ac_dir/$ac_word" >&5
+echo "$as_me:4700: found $ac_dir/$ac_word" >&5

 break
 done
 
 break
 done
 


@@ -4616,10 +4705,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:4619: result: $RANLIB" >&5
+  echo "$as_me:4708: result: $RANLIB" >&5

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

-  echo "$as_me:4622: result: no" >&5
+  echo "$as_me:4711: result: no" >&5

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


@@ -4628,7 +4717,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:4631: checking for $ac_word" >&5
+echo "$as_me:4720: 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


@@ -4643,7 +4732,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:4646: found $ac_dir/$ac_word" >&5
+echo "$as_me:4735: found $ac_dir/$ac_word" >&5

 break
 done
 
 break
 done
 


@@ -4652,10 +4741,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:4655: result: $ac_ct_RANLIB" >&5
+  echo "$as_me:4744: result: $ac_ct_RANLIB" >&5

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

-  echo "$as_me:4658: result: no" >&5
+  echo "$as_me:4747: result: no" >&5

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


@@ -4667,7 +4756,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:4670: checking for $ac_word" >&5
+echo "$as_me:4759: 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


@@ -4682,7 +4771,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:4685: found $ac_dir/$ac_word" >&5
+echo "$as_me:4774: found $ac_dir/$ac_word" >&5

 break
 done
 
 break
 done
 


@@ -4690,10 +4779,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:4693: result: $LD" >&5
+  echo "$as_me:4782: result: $LD" >&5

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

-  echo "$as_me:4696: result: no" >&5
+  echo "$as_me:4785: result: no" >&5

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


@@ -4702,7 +4791,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:4705: checking for $ac_word" >&5
+echo "$as_me:4794: 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


@@ -4717,7 +4806,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:4720: found $ac_dir/$ac_word" >&5
+echo "$as_me:4809: found $ac_dir/$ac_word" >&5

 break
 done
 
 break
 done
 


@@ -4726,10 +4815,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:4729: result: $ac_ct_LD" >&5
+  echo "$as_me:4818: result: $ac_ct_LD" >&5

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

-  echo "$as_me:4732: result: no" >&5
+  echo "$as_me:4821: result: no" >&5

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


@@ -4741,7 +4830,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:4744: checking for $ac_word" >&5
+echo "$as_me:4833: 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


@@ -4756,7 +4845,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:4759: found $ac_dir/$ac_word" >&5
+echo "$as_me:4848: found $ac_dir/$ac_word" >&5

 break
 done
 
 break
 done
 


@@ -4764,10 +4853,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:4767: result: $AR" >&5
+  echo "$as_me:4856: result: $AR" >&5

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

-  echo "$as_me:4770: result: no" >&5
+  echo "$as_me:4859: result: no" >&5

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


@@ -4776,7 +4865,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:4779: checking for $ac_word" >&5
+echo "$as_me:4868: 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


@@ -4791,7 +4880,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:4794: found $ac_dir/$ac_word" >&5
+echo "$as_me:4883: found $ac_dir/$ac_word" >&5

 break
 done
 
 break
 done
 


@@ -4800,10 +4889,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:4803: result: $ac_ct_AR" >&5
+  echo "$as_me:4892: result: $ac_ct_AR" >&5

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

-  echo "$as_me:4806: result: no" >&5
+  echo "$as_me:4895: result: no" >&5

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


@@ -4815,7 +4904,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:4818: checking for $ac_word" >&5
+echo "$as_me:4907: 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


@@ -4830,7 +4919,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:4833: found $ac_dir/$ac_word" >&5
+echo "$as_me:4922: found $ac_dir/$ac_word" >&5

 break
 done
 
 break
 done
 


@@ -4838,10 +4927,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:4841: result: $NM" >&5
+  echo "$as_me:4930: result: $NM" >&5

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

-  echo "$as_me:4844: result: no" >&5
+  echo "$as_me:4933: result: no" >&5

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


@@ -4850,7 +4939,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:4853: checking for $ac_word" >&5
+echo "$as_me:4942: 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


@@ -4865,7 +4954,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:4868: found $ac_dir/$ac_word" >&5
+echo "$as_me:4957: found $ac_dir/$ac_word" >&5

 break
 done
 
 break
 done
 


@@ -4874,10 +4963,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:4877: result: $ac_ct_NM" >&5
+  echo "$as_me:4966: result: $ac_ct_NM" >&5

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

-  echo "$as_me:4880: result: no" >&5
+  echo "$as_me:4969: result: no" >&5

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


@@ -4889,7 +4978,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:4892: checking for $ac_word" >&5
+echo "$as_me:4981: 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


@@ -4904,7 +4993,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:4907: found $ac_dir/$ac_word" >&5
+echo "$as_me:4996: found $ac_dir/$ac_word" >&5

 break
 done
 
 break
 done
 


@@ -4912,10 +5001,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:4915: result: $AR" >&5
+  echo "$as_me:5004: result: $AR" >&5

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

-  echo "$as_me:4918: result: no" >&5
+  echo "$as_me:5007: result: no" >&5

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


@@ -4924,7 +5013,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:4927: checking for $ac_word" >&5
+echo "$as_me:5016: 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


@@ -4939,7 +5028,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:4942: found $ac_dir/$ac_word" >&5
+echo "$as_me:5031: found $ac_dir/$ac_word" >&5

 break
 done
 
 break
 done
 


@@ -4948,10 +5037,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:4951: result: $ac_ct_AR" >&5
+  echo "$as_me:5040: result: $ac_ct_AR" >&5

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

-  echo "$as_me:4954: result: no" >&5
+  echo "$as_me:5043: result: no" >&5

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


@@ -4960,7 +5049,7 @@ else
   AR="$ac_cv_prog_AR"
 fi
 
   AR="$ac_cv_prog_AR"
 fi
 

-echo "$as_me:4963: checking for options to update archives" >&5
+echo "$as_me:5052: 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


@@ -4997,13 +5086,13 @@ else
                        rm -f conftest.a
 
                        cat >"conftest.$ac_ext" <<EOF
                        rm -f conftest.a
 
                        cat >"conftest.$ac_ext" <<EOF

-#line 5000 "configure"
+#line 5089 "configure"

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

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

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

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


@@ -5014,7 +5103,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}:5017: testing cannot compile test-program ..." 1>&5
+echo "${as_me:-configure}:5106: testing cannot compile test-program ..." 1>&5

 
                                break
                        fi
 
                                break
                        fi


@@ -5024,7 +5113,7 @@ echo "${as_me:-configure}:5017: testing cannot compile test-program ..." 1>&5
        esac
 
 fi
        esac
 
 fi

-echo "$as_me:5027: result: $cf_cv_ar_flags" >&5
+echo "$as_me:5116: 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


@@ -5035,7 +5124,7 @@ else
        ARFLAGS=$cf_cv_ar_flags
 fi
 
        ARFLAGS=$cf_cv_ar_flags
 fi
 

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


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

-echo "$as_me:5051: result: $DESTDIR" >&5
+echo "$as_me:5140: result: $DESTDIR" >&5

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


@@ -5083,7 +5172,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:5086: checking for $ac_word" >&5
+echo "$as_me:5175: 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


@@ -5098,7 +5187,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:5101: found $ac_dir/$ac_word" >&5
+echo "$as_me:5190: found $ac_dir/$ac_word" >&5

 break
 done
 
 break
 done
 


@@ -5106,10 +5195,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:5109: result: $BUILD_CC" >&5
+  echo "$as_me:5198: result: $BUILD_CC" >&5

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

-  echo "$as_me:5112: result: no" >&5
+  echo "$as_me:5201: result: no" >&5

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


@@ -5118,12 +5207,12 @@ done
 test -n "$BUILD_CC" || BUILD_CC="none"
 
 fi;
 test -n "$BUILD_CC" || BUILD_CC="none"
 
 fi;

-       echo "$as_me:5121: checking for native build C compiler" >&5
+       echo "$as_me:5210: 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:5123: result: $BUILD_CC" >&5
+       echo "$as_me:5212: result: $BUILD_CC" >&5

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

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


@@ -5133,10 +5222,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:5136: result: $BUILD_CPP" >&5
+       echo "$as_me:5225: result: $BUILD_CPP" >&5

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

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


@@ -5144,10 +5233,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:5147: result: $BUILD_CFLAGS" >&5
+       echo "$as_me:5236: result: $BUILD_CFLAGS" >&5

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

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


@@ -5155,10 +5244,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:5158: result: $BUILD_CPPFLAGS" >&5
+       echo "$as_me:5247: result: $BUILD_CPPFLAGS" >&5

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

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


@@ -5166,10 +5255,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:5169: result: $BUILD_LDFLAGS" >&5
+       echo "$as_me:5258: result: $BUILD_LDFLAGS" >&5

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

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


@@ -5177,7 +5266,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:5180: result: $BUILD_LIBS" >&5
+       echo "$as_me:5269: 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.


@@ -5187,7 +5276,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:5190: error: Cross-build requires two compilers.
+               { { echo "$as_me:5279: 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;}


@@ -5212,7 +5301,7 @@ fi
 ### shared, for example.
 cf_list_models=""
 
 ### shared, for example.
 cf_list_models=""
 

-echo "$as_me:5215: checking if libtool -version-number should be used" >&5
+echo "$as_me:5304: 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.


@@ -5229,7 +5318,7 @@ else
        cf_libtool_version=yes
 
 fi;
        cf_libtool_version=yes
 
 fi;

-echo "$as_me:5232: result: $cf_libtool_version" >&5
+echo "$as_me:5321: 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


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

-               { echo "$as_me:5241: WARNING: VERSION was not set" >&5
+               { echo "$as_me:5330: 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}:5248: testing ABI_VERSION: $ABI_VERSION ..." 1>&5
+echo "${as_me:-configure}:5337: 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}:5255: testing ABI_VERSION: $ABI_VERSION ..." 1>&5
+echo "${as_me:-configure}:5344: testing ABI_VERSION: $ABI_VERSION ..." 1>&5

 
                ;;
        (*)
 
                ;;
        (*)

-               { echo "$as_me:5259: WARNING: unexpected VERSION value: $VERSION" >&5
+               { echo "$as_me:5348: 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


@@ -5278,7 +5367,7 @@ LIB_LINK='${CC}'
 LIB_INSTALL=
 LIB_UNINSTALL=
 
 LIB_INSTALL=
 LIB_UNINSTALL=
 

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


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

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


@@ -5319,7 +5408,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:5322: error: expected a pathname, not \"$with_libtool\"" >&5
+       { { echo "$as_me:5411: 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; }; }
        ;;


@@ -5332,7 +5421,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:5335: checking for $ac_word" >&5
+echo "$as_me:5424: 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


@@ -5347,7 +5436,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:5350: found $ac_dir/$ac_word" >&5
+echo "$as_me:5439: found $ac_dir/$ac_word" >&5

 break
 done
 
 break
 done
 


@@ -5355,10 +5444,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:5358: result: $LIBTOOL" >&5
+  echo "$as_me:5447: result: $LIBTOOL" >&5

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

-  echo "$as_me:5361: result: no" >&5
+  echo "$as_me:5450: result: no" >&5

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


@@ -5371,7 +5460,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:5374: checking for $ac_word" >&5
+echo "$as_me:5463: 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


@@ -5386,7 +5475,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:5389: found $ac_dir/$ac_word" >&5
+echo "$as_me:5478: found $ac_dir/$ac_word" >&5

 break
 done
 
 break
 done
 


@@ -5394,10 +5483,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:5397: result: $ac_ct_LIBTOOL" >&5
+  echo "$as_me:5486: result: $ac_ct_LIBTOOL" >&5

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

-  echo "$as_me:5400: result: no" >&5
+  echo "$as_me:5489: result: no" >&5

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


@@ -5428,7 +5517,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:5431: checking for $ac_word" >&5
+echo "$as_me:5520: 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


@@ -5443,7 +5532,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:5446: found $ac_dir/$ac_word" >&5
+echo "$as_me:5535: found $ac_dir/$ac_word" >&5

 break
 done
 
 break
 done
 


@@ -5451,10 +5540,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:5454: result: $LIBTOOL" >&5
+  echo "$as_me:5543: result: $LIBTOOL" >&5

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

-  echo "$as_me:5457: result: no" >&5
+  echo "$as_me:5546: result: no" >&5

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


@@ -5467,7 +5556,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:5470: checking for $ac_word" >&5
+echo "$as_me:5559: 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


@@ -5482,7 +5571,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:5485: found $ac_dir/$ac_word" >&5
+echo "$as_me:5574: found $ac_dir/$ac_word" >&5

 break
 done
 
 break
 done
 


@@ -5490,10 +5579,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:5493: result: $ac_ct_LIBTOOL" >&5
+  echo "$as_me:5582: result: $ac_ct_LIBTOOL" >&5

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

-  echo "$as_me:5496: result: no" >&5
+  echo "$as_me:5585: result: no" >&5

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


@@ -5515,7 +5604,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:5518: error: Cannot find libtool" >&5
+               { { echo "$as_me:5607: 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


@@ -5531,7 +5620,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:5534: checking version of $LIBTOOL" >&5
+       echo "$as_me:5623: 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


@@ -5542,7 +5631,7 @@ 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:5545: result: $cf_cv_libtool_version" >&5
+       echo "$as_me:5634: result: $cf_cv_libtool_version" >&5

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


@@ -5551,18 +5640,18 @@ echo "${ECHO_T}$cf_cv_libtool_version" >&6
                (*...GNU-libtool...*)
                        ;;
                (*)
                (*...GNU-libtool...*)
                        ;;
                (*)

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

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

-               { { echo "$as_me:5560: error: No version found for $LIBTOOL" >&5
+               { { echo "$as_me:5649: error: No version found for $LIBTOOL" >&5

 echo "$as_me: error: No version found for $LIBTOOL" >&2;}
    { (exit 1); exit 1; }; }
        fi
 else
 echo "$as_me: error: No version found for $LIBTOOL" >&2;}
    { (exit 1); exit 1; }; }
        fi
 else

-       { { echo "$as_me:5565: error: GNU libtool has not been found" >&5
+       { { echo "$as_me:5654: 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


@@ -5598,7 +5687,7 @@ cf_list_models="$cf_list_models libtool"
 
 else
 
 
 else
 

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


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

-echo "$as_me:5611: result: $with_shared" >&5
+echo "$as_me:5700: 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:5615: checking if you want to build static libraries" >&5
+echo "$as_me:5704: 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.


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

-echo "$as_me:5625: result: $with_normal" >&5
+echo "$as_me:5714: 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:5629: checking if you want to build debug libraries" >&5
+echo "$as_me:5718: 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.


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

-echo "$as_me:5639: result: $with_debug" >&5
+echo "$as_me:5728: 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:5643: checking if you want to build profiling libraries" >&5
+echo "$as_me:5732: 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.


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

-echo "$as_me:5653: result: $with_profile" >&5
+echo "$as_me:5742: 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"
 


@@ -5658,7 +5747,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:5661: checking if you want to build C++ shared libraries" >&5
+echo "$as_me:5750: 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.


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

-echo "$as_me:5671: result: $with_shared_cxx" >&5
+echo "$as_me:5760: 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:5678: checking for specified models" >&5
+echo "$as_me:5767: 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:5682: result: $cf_list_models" >&5
+echo "$as_me:5771: 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:5687: checking for default model" >&5
+echo "$as_me:5776: 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:5690: result: $DFT_LWR_MODEL" >&5
+echo "$as_me:5779: 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___%`


@@ -5701,7 +5790,7 @@ LIB_NAME=ncurses
 LIB_DIR=../lib
 LIB_2ND=../../lib
 
 LIB_DIR=../lib
 LIB_2ND=../../lib
 

-echo "$as_me:5704: checking if you want to have a library-prefix" >&5
+echo "$as_me:5793: 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.


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

-echo "$as_me:5714: result: $with_lib_prefix" >&5
+echo "$as_me:5803: 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


@@ -5742,19 +5831,19 @@ fi
 
 LIB_SUFFIX=
 
 
 LIB_SUFFIX=
 

-       echo "$as_me:5745: checking for PATH separator" >&5
+       echo "$as_me:5834: 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:5752: result: $PATH_SEPARATOR" >&5
+       echo "$as_me:5841: result: $PATH_SEPARATOR" >&5

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

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


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

-echo "$as_me:5767: result: $with_termlib" >&5
+echo "$as_me:5856: result: $with_termlib" >&5

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

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


@@ -5777,7 +5866,7 @@ if test "${with_ticlib+set}" = set; then
 else
   with_ticlib=no
 fi;
 else
   with_ticlib=no
 fi;

-echo "$as_me:5780: result: $with_ticlib" >&5
+echo "$as_me:5869: result: $with_ticlib" >&5

 echo "${ECHO_T}$with_ticlib" >&6
 
 if test X"$CC_G_OPT" = X"" ; then
 echo "${ECHO_T}$with_ticlib" >&6
 
 if test X"$CC_G_OPT" = X"" ; then


@@ -5790,7 +5879,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:5793: checking for default loader flags" >&5
+echo "$as_me:5882: 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=''   ;;


@@ -5799,13 +5888,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:5802: result: $LD_MODEL" >&5
+echo "$as_me:5891: 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:5808: checking if rpath option should be used" >&5
+echo "$as_me:5897: 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.


@@ -5815,10 +5904,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:5818: result: $cf_cv_enable_rpath" >&5
+echo "$as_me:5907: 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:5821: checking if shared libraries should be relinked during install" >&5
+echo "$as_me:5910: 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.


@@ -5828,7 +5917,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:5831: result: $cf_cv_do_relink" >&5
+echo "$as_me:5920: result: $cf_cv_do_relink" >&5

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


@@ -5839,7 +5928,7 @@ rel_builddir=..
 LD_RPATH_OPT=
 if test "x$cf_cv_enable_rpath" != xno
 then
 LD_RPATH_OPT=
 if test "x$cf_cv_enable_rpath" != xno
 then

-       echo "$as_me:5842: checking for an rpath option" >&5
+       echo "$as_me:5931: 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*)


@@ -5870,12 +5959,12 @@ echo $ECHO_N "checking for an rpath option... $ECHO_C" >&6
        (*)
                ;;
        esac
        (*)
                ;;
        esac

-       echo "$as_me:5873: result: $LD_RPATH_OPT" >&5
+       echo "$as_me:5962: 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:5878: checking if we need a space after rpath option" >&5
+               echo "$as_me:5967: 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"
 


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

-#line 5899 "configure"
+#line 5988 "configure"

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


@@ -5908,16 +5997,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:5911: \"$ac_link\"") >&5
+if { (eval echo "$as_me:6000: \"$ac_link\"") >&5

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

-  echo "$as_me:5914: \$? = $ac_status" >&5
+  echo "$as_me:6003: \$? = $ac_status" >&5

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

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

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

-  echo "$as_me:5920: \$? = $ac_status" >&5
+  echo "$as_me:6009: \$? = $ac_status" >&5

   (exit "$ac_status"); }; }; then
   cf_rpath_space=no
 else
   (exit "$ac_status"); }; }; then
   cf_rpath_space=no
 else


@@ -5927,7 +6016,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:5930: result: $cf_rpath_space" >&5
+               echo "$as_me:6019: 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 "
                ;;


@@ -5949,7 +6038,7 @@ fi
        cf_ld_rpath_opt=
        test "$cf_cv_enable_rpath" = yes && cf_ld_rpath_opt="$LD_RPATH_OPT"
 
        cf_ld_rpath_opt=
        test "$cf_cv_enable_rpath" = yes && cf_ld_rpath_opt="$LD_RPATH_OPT"
 

-       echo "$as_me:5952: checking if release/abi version should be used for shared libs" >&5
+       echo "$as_me:6041: 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.


@@ -5964,9 +6053,9 @@ if test "${with_shlib_version+set}" = set; then
                cf_cv_shlib_version=$withval
                ;;
        (*)
                cf_cv_shlib_version=$withval
                ;;
        (*)

-               echo "$as_me:5967: result: $withval" >&5
+               echo "$as_me:6056: result: $withval" >&5

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

-               { { echo "$as_me:5969: error: option value must be one of: rel, abi, or auto" >&5
+               { { echo "$as_me:6058: 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; }; }
                ;;


@@ -5975,7 +6064,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:5978: result: $cf_cv_shlib_version" >&5
+       echo "$as_me:6067: 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


@@ -5998,14 +6087,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:6001: checking which $CC option to use" >&5
+               echo "$as_me:6090: 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 6008 "configure"
+#line 6097 "configure"

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


@@ -6017,16 +6106,16 @@ int x = 1
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
 }
 _ACEOF
 rm -f "conftest.$ac_objext"

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

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

-  echo "$as_me:6023: \$? = $ac_status" >&5
+  echo "$as_me:6112: \$? = $ac_status" >&5

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

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

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

-  echo "$as_me:6029: \$? = $ac_status" >&5
+  echo "$as_me:6118: \$? = $ac_status" >&5

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


@@ -6035,7 +6124,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:6038: result: $CC_SHARED_OPTS" >&5
+               echo "$as_me:6127: 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


@@ -6106,7 +6195,7 @@ CF_EOF
                MK_SHARED_LIB='${CC} ${LDFLAGS} ${CFLAGS} -dynamiclib -install_name ${libdir}/`basename $@` -compatibility_version ${ABI_VERSION} -current_version ${ABI_VERSION} -o $@'
                test "$cf_cv_shlib_version" = auto && cf_cv_shlib_version=abi
                cf_cv_shlib_version_infix=yes
                MK_SHARED_LIB='${CC} ${LDFLAGS} ${CFLAGS} -dynamiclib -install_name ${libdir}/`basename $@` -compatibility_version ${ABI_VERSION} -current_version ${ABI_VERSION} -o $@'
                test "$cf_cv_shlib_version" = auto && cf_cv_shlib_version=abi
                cf_cv_shlib_version_infix=yes

-               echo "$as_me:6109: checking if ld -search_paths_first works" >&5
+               echo "$as_me:6198: 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


@@ -6115,7 +6204,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 6118 "configure"
+#line 6207 "configure"

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


@@ -6127,16 +6216,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:6130: \"$ac_link\"") >&5
+if { (eval echo "$as_me:6219: \"$ac_link\"") >&5

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

-  echo "$as_me:6133: \$? = $ac_status" >&5
+  echo "$as_me:6222: \$? = $ac_status" >&5

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

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

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

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


@@ -6147,12 +6236,23 @@ 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:6150: result: $cf_cv_ldflags_search_paths_first" >&5
+echo "$as_me:6239: 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"
                fi
                ;;
 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"
                fi
                ;;

+       (haiku*)
+
+       test "$cf_cv_shlib_version" = auto && cf_cv_shlib_version=rel
+       if test "$cf_cv_shlib_version" = rel; then
+               cf_cv_shared_soname='`basename $@ .${REL_VERSION}`.${ABI_VERSION}'
+       else
+               cf_cv_shared_soname='`basename $@`'
+       fi
+
+               MK_SHARED_LIB='${CC} ${LDFLAGS} ${CFLAGS} -shared -Wl,-soname,'$cf_cv_shared_soname',-stats,-lc -o $@'
+               ;;

        (hpux[7-8]*)
                # HP-UX 8.07 ld lacks "+b" option used for libdir search-list
                if test "$GCC" != yes; then
        (hpux[7-8]*)
                # HP-UX 8.07 ld lacks "+b" option used for libdir search-list
                if test "$GCC" != yes; then


@@ -6486,7 +6586,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 6489 "configure"
+#line 6589 "configure"

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


@@ -6498,16 +6598,16 @@ printf("Hello\\n");
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
 }
 _ACEOF
 rm -f "conftest.$ac_objext"

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

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

-  echo "$as_me:6504: \$? = $ac_status" >&5
+  echo "$as_me:6604: \$? = $ac_status" >&5

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

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

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

-  echo "$as_me:6510: \$? = $ac_status" >&5
+  echo "$as_me:6610: \$? = $ac_status" >&5

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


@@ -6544,7 +6644,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:6547: WARNING: ignored --with-shlib-version" >&5
+                       { echo "$as_me:6647: 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


@@ -6554,7 +6654,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 6557 "${as_me:-configure}"
+#line 6657 "${as_me:-configure}"

 #include <stdio.h>
 int main(int argc, char *argv[])
 {
 #include <stdio.h>
 int main(int argc, char *argv[])
 {


@@ -6566,18 +6666,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:6569: checking if CFLAGS option -$cf_opt works" >&5
+                       echo "$as_me:6669: 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:6571: \"$ac_compile\"") >&5
+                       if { (eval echo "$as_me:6671: \"$ac_compile\"") >&5

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

-  echo "$as_me:6574: \$? = $ac_status" >&5
+  echo "$as_me:6674: \$? = $ac_status" >&5

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

-                               echo "$as_me:6576: result: yes" >&5
+                               echo "$as_me:6676: 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:6580: result: no" >&5
+                               echo "$as_me:6680: result: no" >&5

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


@@ -6592,17 +6692,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}:6595: testing CC_SHARED_OPTS: $CC_SHARED_OPTS ..." 1>&5
+echo "${as_me:-configure}:6695: 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}:6599: testing MK_SHARED_LIB:  $MK_SHARED_LIB ..." 1>&5
+echo "${as_me:-configure}:6699: 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:6605: checking for additional libtool options" >&5
+echo "$as_me:6705: 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.


@@ -6612,7 +6712,7 @@ if test "${with_libtool_opts+set}" = set; then
 else
   with_libtool_opts=no
 fi;
 else
   with_libtool_opts=no
 fi;

-echo "$as_me:6615: result: $with_libtool_opts" >&5
+echo "$as_me:6715: 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


@@ -6623,7 +6723,7 @@ case .$with_libtool_opts in
        ;;
 esac
 
        ;;
 esac
 

-echo "$as_me:6626: checking if exported-symbols file should be used" >&5
+echo "$as_me:6726: 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.


@@ -6638,7 +6738,7 @@ then
        with_export_syms='${top_srcdir}/package/${PACKAGE}.sym'
 
 fi
        with_export_syms='${top_srcdir}/package/${PACKAGE}.sym'
 
 fi

-echo "$as_me:6641: result: $with_export_syms" >&5
+echo "$as_me:6741: 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


@@ -6649,15 +6749,15 @@ fi
                ;;
        (shared)
                if test "$CC_SHARED_OPTS" = "unknown"; then
                ;;
        (shared)
                if test "$CC_SHARED_OPTS" = "unknown"; then

-                       { { echo "$as_me:6652: error: Shared libraries are not supported in this version" >&5
+                       { { echo "$as_me:6752: 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:6657: checking if current CFLAGS link properly" >&5
+               echo "$as_me:6757: 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 6660 "configure"
+#line 6760 "configure"

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


@@ -6669,16 +6769,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:6672: \"$ac_link\"") >&5
+if { (eval echo "$as_me:6772: \"$ac_link\"") >&5

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

-  echo "$as_me:6675: \$? = $ac_status" >&5
+  echo "$as_me:6775: \$? = $ac_status" >&5

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

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

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

-  echo "$as_me:6681: \$? = $ac_status" >&5
+  echo "$as_me:6781: \$? = $ac_status" >&5

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


@@ -6687,18 +6787,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:6690: result: $cf_cflags_work" >&5
+               echo "$as_me:6790: 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}:6696: testing try to work around by appending shared-options ..." 1>&5
+echo "${as_me:-configure}:6796: 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:6701: checking if versioned-symbols file should be used" >&5
+echo "$as_me:6801: 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.


@@ -6716,18 +6816,18 @@ case "x$with_versioned_syms" in
 (xno)
        ;;
 (x/*)
 (xno)
        ;;
 (x/*)

-       test -f "$with_versioned_syms" || { { echo "$as_me:6719: error: expected a filename: $with_versioned_syms" >&5
+       test -f "$with_versioned_syms" || { { echo "$as_me:6819: error: expected a filename: $with_versioned_syms" >&5

 echo "$as_me: error: expected a filename: $with_versioned_syms" >&2;}
    { (exit 1); exit 1; }; }
        ;;
 (*)
 echo "$as_me: error: expected a filename: $with_versioned_syms" >&2;}
    { (exit 1); exit 1; }; }
        ;;
 (*)

-       test -f "$with_versioned_syms" || { { echo "$as_me:6724: error: expected a filename: $with_versioned_syms" >&5
+       test -f "$with_versioned_syms" || { { echo "$as_me:6824: error: expected a filename: $with_versioned_syms" >&5

 echo "$as_me: error: expected a filename: $with_versioned_syms" >&2;}
    { (exit 1); exit 1; }; }
        with_versioned_syms=`pwd`/"$with_versioned_syms"
        ;;
 esac
 echo "$as_me: error: expected a filename: $with_versioned_syms" >&2;}
    { (exit 1); exit 1; }; }
        with_versioned_syms=`pwd`/"$with_versioned_syms"
        ;;
 esac

-echo "$as_me:6730: result: $with_versioned_syms" >&5
+echo "$as_me:6830: result: $with_versioned_syms" >&5

 echo "${ECHO_T}$with_versioned_syms" >&6
 
 RESULTING_SYMS=
 echo "${ECHO_T}$with_versioned_syms" >&6
 
 RESULTING_SYMS=


@@ -6743,7 +6843,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}:6746: testing MK_SHARED_LIB:  $MK_SHARED_LIB ..." 1>&5
+echo "${as_me:-configure}:6846: testing MK_SHARED_LIB:  $MK_SHARED_LIB ..." 1>&5

 
                ;;
        (*-dy\ *)
 
                ;;
        (*-dy\ *)


@@ -6751,11 +6851,11 @@ echo "${as_me:-configure}:6746: 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}:6754: testing MK_SHARED_LIB:  $MK_SHARED_LIB ..." 1>&5
+echo "${as_me:-configure}:6854: testing MK_SHARED_LIB:  $MK_SHARED_LIB ..." 1>&5

 
                ;;
        (*)
 
                ;;
        (*)

-               { echo "$as_me:6758: WARNING: this system does not support versioned-symbols" >&5
+               { echo "$as_me:6858: 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


@@ -6767,7 +6867,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:6770: checking if wildcards can be used to selectively omit symbols" >&5
+               echo "$as_me:6870: 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
 


@@ -6804,7 +6904,7 @@ local:
 } submodule_1.0;
 EOF
                cat >conftest.$ac_ext <<EOF
 } submodule_1.0;
 EOF
                cat >conftest.$ac_ext <<EOF

-#line 6807 "configure"
+#line 6907 "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; }


@@ -6835,7 +6935,7 @@ EOF
                        cf_missing="`nm -P conftest.so 2>&5 |${FGREP-fgrep} _ismissing | ${EGREP-egrep} '[      ][DT][  ]'`"
                        test -n "$cf_missing" && WILDCARD_SYMS=yes
                fi
                        cf_missing="`nm -P conftest.so 2>&5 |${FGREP-fgrep} _ismissing | ${EGREP-egrep} '[      ][DT][  ]'`"
                        test -n "$cf_missing" && WILDCARD_SYMS=yes
                fi

-               echo "$as_me:6838: result: $WILDCARD_SYMS" >&5
+               echo "$as_me:6938: result: $WILDCARD_SYMS" >&5

 echo "${ECHO_T}$WILDCARD_SYMS" >&6
                rm -f conftest.*
        fi
 echo "${ECHO_T}$WILDCARD_SYMS" >&6
                rm -f conftest.*
        fi


@@ -6848,7 +6948,7 @@ done
 ### Checks for special libraries, must be done up-front.
 SHLIB_LIST=""
 
 ### Checks for special libraries, must be done up-front.
 SHLIB_LIST=""
 

-echo "$as_me:6851: checking if you want to link with the GPM mouse library" >&5
+echo "$as_me:6951: 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.


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

-echo "$as_me:6861: result: $with_gpm" >&5
+echo "$as_me:6961: 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:6865: checking for gpm.h" >&5
+       echo "$as_me:6965: 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 6871 "configure"
+#line 6971 "configure"

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

-if { (eval echo "$as_me:6875: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:6975: \"$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:6881: \$? = $ac_status" >&5
+  echo "$as_me:6981: \$? = $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


@@ -6897,7 +6997,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi

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


@@ -6908,7 +7008,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}:6911: testing assuming we really have GPM library ..." 1>&5
+echo "${as_me:-configure}:7011: 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


@@ -6916,7 +7016,7 @@ EOF
 
                        with_gpm=yes
                else
 
                        with_gpm=yes
                else

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


@@ -6924,7 +7024,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 6927 "configure"
+#line 7027 "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.  */


@@ -6943,16 +7043,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:6946: \"$ac_link\"") >&5
+if { (eval echo "$as_me:7046: \"$ac_link\"") >&5

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

-  echo "$as_me:6949: \$? = $ac_status" >&5
+  echo "$as_me:7049: \$? = $ac_status" >&5

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

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

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

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


@@ -6963,18 +7063,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:6966: result: $ac_cv_lib_gpm_Gpm_Open" >&5
+echo "$as_me:7066: 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:6973: WARNING: Cannot link with GPM library" >&5
+                                       { echo "$as_me:7073: 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:6977: error: Cannot link with GPM library" >&5
+                                       { { echo "$as_me:7077: 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


@@ -6985,7 +7085,7 @@ fi
 
 else
 
 
 else
 

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


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

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


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

-       echo "$as_me:7007: result: $with_dlsym" >&5
+       echo "$as_me:7107: 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:7012: checking for dlsym" >&5
+echo "$as_me:7112: 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 7018 "configure"
+#line 7118 "configure"

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


@@ -7046,16 +7146,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:7049: \"$ac_link\"") >&5
+if { (eval echo "$as_me:7149: \"$ac_link\"") >&5

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

-  echo "$as_me:7052: \$? = $ac_status" >&5
+  echo "$as_me:7152: \$? = $ac_status" >&5

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

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

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

-  echo "$as_me:7058: \$? = $ac_status" >&5
+  echo "$as_me:7158: \$? = $ac_status" >&5

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


@@ -7065,14 +7165,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:7068: result: $ac_cv_func_dlsym" >&5
+echo "$as_me:7168: 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:7075: checking for dlsym in -ldl" >&5
+echo "$as_me:7175: 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


@@ -7080,7 +7180,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 7083 "configure"
+#line 7183 "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.  */


@@ -7099,16 +7199,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:7102: \"$ac_link\"") >&5
+if { (eval echo "$as_me:7202: \"$ac_link\"") >&5

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

-  echo "$as_me:7105: \$? = $ac_status" >&5
+  echo "$as_me:7205: \$? = $ac_status" >&5

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

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

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

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


@@ -7119,7 +7219,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:7122: result: $ac_cv_lib_dl_dlsym" >&5
+echo "$as_me:7222: 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
 


@@ -7148,10 +7248,10 @@ done
 LIBS="$cf_add_libs"
  }
 
 LIBS="$cf_add_libs"
  }
 

-       echo "$as_me:7151: checking whether able to link to dl*() functions" >&5
+       echo "$as_me:7251: 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 7154 "configure"
+#line 7254 "configure"

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


@@ -7169,16 +7269,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:7172: \"$ac_link\"") >&5
+if { (eval echo "$as_me:7272: \"$ac_link\"") >&5

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

-  echo "$as_me:7175: \$? = $ac_status" >&5
+  echo "$as_me:7275: \$? = $ac_status" >&5

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

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

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

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

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


@@ -7189,15 +7289,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:7192: error: Cannot link test program for libdl" >&5
+               { { echo "$as_me:7292: 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:7197: result: ok" >&5
+       echo "$as_me:7297: result: ok" >&5

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

-       { { echo "$as_me:7200: error: Cannot find dlsym function" >&5
+       { { echo "$as_me:7300: 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


@@ -7205,12 +7305,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}:7208: testing assuming soname for gpm is $with_gpm ..." 1>&5
+echo "${as_me:-configure}:7308: 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:7213: checking for soname of gpm library" >&5
+echo "$as_me:7313: 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


@@ -7244,15 +7344,15 @@ for cf_add_1lib in $cf_add_0lib; do
 done
 LIBS="$cf_add_libs"
 
 done
 LIBS="$cf_add_libs"
 

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

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

-  echo "$as_me:7250: \$? = $ac_status" >&5
+  echo "$as_me:7350: \$? = $ac_status" >&5

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

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

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

-  echo "$as_me:7255: \$? = $ac_status" >&5
+  echo "$as_me:7355: \$? = $ac_status" >&5

   (exit "$ac_status"); } ; then
                        cf_cv_gpm_soname="`ldd \"conftest$ac_exeext\" 2>/dev/null | sed -e 's,^.*/,,' -e 's, .*$,,' | ${FGREP-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-fgrep} libgpm.`"
                        test -z "$cf_cv_gpm_soname" && cf_cv_gpm_soname=unknown


@@ -7263,7 +7363,7 @@ LIBS="$cf_save_LIBS"
 fi
 
 fi
 fi
 
 fi

-echo "$as_me:7266: result: $cf_cv_gpm_soname" >&5
+echo "$as_me:7366: result: $cf_cv_gpm_soname" >&5

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


@@ -7331,7 +7431,7 @@ cat >>confdefs.h <<\EOF
 #define HAVE_LIBGPM 1
 EOF
 
 #define HAVE_LIBGPM 1
 EOF
 

-echo "$as_me:7334: checking for Gpm_Wgetch in -lgpm" >&5
+echo "$as_me:7434: 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


@@ -7339,7 +7439,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 7342 "configure"
+#line 7442 "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.  */


@@ -7358,16 +7458,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:7361: \"$ac_link\"") >&5
+if { (eval echo "$as_me:7461: \"$ac_link\"") >&5

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

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

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

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

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

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


@@ -7378,11 +7478,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:7381: result: $ac_cv_lib_gpm_Gpm_Wgetch" >&5
+echo "$as_me:7481: 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:7385: checking if GPM is weakly bound to curses library" >&5
+echo "$as_me:7485: 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


@@ -7406,15 +7506,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:7409: \"$ac_compile\"") >&5
+       if { (eval echo "$as_me:7509: \"$ac_compile\"") >&5

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

-  echo "$as_me:7412: \$? = $ac_status" >&5
+  echo "$as_me:7512: \$? = $ac_status" >&5

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

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

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

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

   (exit "$ac_status"); } ; then
                        cf_cv_check_gpm_wgetch="`nm \"conftest$ac_exeext\" | ${EGREP-egrep} '\<wgetch\>' | ${EGREP-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-egrep} '\<wgetch\>' | ${EGREP-egrep} '\<[vVwW]\>'`"
                        test -n "$cf_cv_check_gpm_wgetch" && cf_cv_check_gpm_wgetch=yes


@@ -7426,11 +7526,11 @@ CF_EOF
 fi
 
 fi
 fi
 
 fi

-echo "$as_me:7429: result: $cf_cv_check_gpm_wgetch" >&5
+echo "$as_me:7529: 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:7433: WARNING: GPM library is already linked with curses - read the FAQ" >&5
+       { echo "$as_me:7533: 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
 


@@ -7438,7 +7538,7 @@ fi
 
 fi
 
 
 fi
 

-echo "$as_me:7441: checking if you want to use PCRE2 for regular-expressions" >&5
+echo "$as_me:7541: checking if you want to use PCRE2 for regular-expressions" >&5

 echo $ECHO_N "checking if you want to use PCRE2 for regular-expressions... $ECHO_C" >&6
 
 # Check whether --with-pcre2 or --without-pcre2 was given.
 echo $ECHO_N "checking if you want to use PCRE2 for regular-expressions... $ECHO_C" >&6
 
 # Check whether --with-pcre2 or --without-pcre2 was given.


@@ -7447,7 +7547,7 @@ if test "${with_pcre2+set}" = set; then
 
 fi;
 test -z "$with_pcre2" && with_pcre2=no
 
 fi;
 test -z "$with_pcre2" && with_pcre2=no

-echo "$as_me:7450: result: $with_pcre2" >&5
+echo "$as_me:7550: result: $with_pcre2" >&5

 echo "${ECHO_T}$with_pcre2" >&6
 
 if test "x$with_pcre2" != xno ; then
 echo "${ECHO_T}$with_pcre2" >&6
 
 if test "x$with_pcre2" != xno ; then


@@ -7458,17 +7558,17 @@ if test "x$with_pcre2" != xno ; then
 if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists "$cf_with_pcre2"; then
        test -n "$verbose" && echo "    found package $cf_with_pcre2" 1>&6
 
 if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists "$cf_with_pcre2"; then
        test -n "$verbose" && echo "    found package $cf_with_pcre2" 1>&6
 

-echo "${as_me:-configure}:7461: testing found package $cf_with_pcre2 ..." 1>&5
+echo "${as_me:-configure}:7561: testing found package $cf_with_pcre2 ..." 1>&5

 
        cf_pkgconfig_incs="`$PKG_CONFIG --cflags "$cf_with_pcre2" 2>/dev/null`"
        cf_pkgconfig_libs="`$PKG_CONFIG --libs   "$cf_with_pcre2" 2>/dev/null`"
        test -n "$verbose" && echo "    package $cf_with_pcre2 CFLAGS: $cf_pkgconfig_incs" 1>&6
 
 
        cf_pkgconfig_incs="`$PKG_CONFIG --cflags "$cf_with_pcre2" 2>/dev/null`"
        cf_pkgconfig_libs="`$PKG_CONFIG --libs   "$cf_with_pcre2" 2>/dev/null`"
        test -n "$verbose" && echo "    package $cf_with_pcre2 CFLAGS: $cf_pkgconfig_incs" 1>&6
 

-echo "${as_me:-configure}:7467: testing package $cf_with_pcre2 CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+echo "${as_me:-configure}:7567: testing package $cf_with_pcre2 CFLAGS: $cf_pkgconfig_incs ..." 1>&5

 
        test -n "$verbose" && echo "    package $cf_with_pcre2 LIBS: $cf_pkgconfig_libs" 1>&6
 
 
        test -n "$verbose" && echo "    package $cf_with_pcre2 LIBS: $cf_pkgconfig_libs" 1>&6
 

-echo "${as_me:-configure}:7471: testing package $cf_with_pcre2 LIBS: $cf_pkgconfig_libs ..." 1>&5
+echo "${as_me:-configure}:7571: testing package $cf_with_pcre2 LIBS: $cf_pkgconfig_libs ..." 1>&5

 
 cf_fix_cppflags=no
 cf_new_cflags=
 
 cf_fix_cppflags=no
 cf_new_cflags=


@@ -7592,7 +7692,7 @@ else
 fi
 
        done
 fi
 
        done

-       cf_with_pcre2_ok=yes || { { echo "$as_me:7595: error: Cannot find PCRE2 library" >&5
+       cf_with_pcre2_ok=yes || { { echo "$as_me:7695: error: Cannot find PCRE2 library" >&5

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


@@ -7605,7 +7705,7 @@ EOF
        (*pcre2-posix*|*pcreposix*)
                ;;
        (*)
        (*pcre2-posix*|*pcreposix*)
                ;;
        (*)

-               echo "$as_me:7608: checking for regcomp in -lpcre2-posix" >&5
+               echo "$as_me:7708: checking for regcomp in -lpcre2-posix" >&5

 echo $ECHO_N "checking for regcomp in -lpcre2-posix... $ECHO_C" >&6
 if test "${ac_cv_lib_pcre2_posix_regcomp+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 echo $ECHO_N "checking for regcomp in -lpcre2-posix... $ECHO_C" >&6
 if test "${ac_cv_lib_pcre2_posix_regcomp+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6


@@ -7613,7 +7713,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lpcre2-posix  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lpcre2-posix  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF

-#line 7616 "configure"
+#line 7716 "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.  */


@@ -7632,16 +7732,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:7635: \"$ac_link\"") >&5
+if { (eval echo "$as_me:7735: \"$ac_link\"") >&5

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

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

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

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

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

-  echo "$as_me:7644: \$? = $ac_status" >&5
+  echo "$as_me:7744: \$? = $ac_status" >&5

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


@@ -7652,7 +7752,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:7655: result: $ac_cv_lib_pcre2_posix_regcomp" >&5
+echo "$as_me:7755: result: $ac_cv_lib_pcre2_posix_regcomp" >&5

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


@@ -7673,7 +7773,7 @@ done
 LIBS="$cf_add_libs"
 
 else
 LIBS="$cf_add_libs"
 
 else

-  echo "$as_me:7676: checking for regcomp in -lpcreposix" >&5
+  echo "$as_me:7776: checking for regcomp in -lpcreposix" >&5

 echo $ECHO_N "checking for regcomp in -lpcreposix... $ECHO_C" >&6
 if test "${ac_cv_lib_pcreposix_regcomp+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 echo $ECHO_N "checking for regcomp in -lpcreposix... $ECHO_C" >&6
 if test "${ac_cv_lib_pcreposix_regcomp+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6


@@ -7681,7 +7781,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lpcreposix  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lpcreposix  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF

-#line 7684 "configure"
+#line 7784 "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.  */


@@ -7700,16 +7800,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:7703: \"$ac_link\"") >&5
+if { (eval echo "$as_me:7803: \"$ac_link\"") >&5

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

-  echo "$as_me:7706: \$? = $ac_status" >&5
+  echo "$as_me:7806: \$? = $ac_status" >&5

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

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

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

-  echo "$as_me:7712: \$? = $ac_status" >&5
+  echo "$as_me:7812: \$? = $ac_status" >&5

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


@@ -7720,7 +7820,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:7723: result: $ac_cv_lib_pcreposix_regcomp" >&5
+echo "$as_me:7823: result: $ac_cv_lib_pcreposix_regcomp" >&5

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


@@ -7741,7 +7841,7 @@ done
 LIBS="$cf_add_libs"
 
 else
 LIBS="$cf_add_libs"
 
 else

-  { { echo "$as_me:7744: error: Cannot find PCRE2 POSIX library" >&5
+  { { echo "$as_me:7844: error: Cannot find PCRE2 POSIX library" >&5

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


@@ -7756,23 +7856,23 @@ fi
 for ac_header in pcre2posix.h pcreposix.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
 for ac_header in pcre2posix.h pcreposix.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`

-echo "$as_me:7759: checking for $ac_header" >&5
+echo "$as_me:7859: 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 7765 "configure"
+#line 7865 "configure"

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

-if { (eval echo "$as_me:7769: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:7869: \"$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:7775: \$? = $ac_status" >&5
+  echo "$as_me:7875: \$? = $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


@@ -7791,7 +7891,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi

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


@@ -7801,11 +7901,80 @@ EOF
 fi
 done
 
 fi
 done
 

+for ac_func in PCRE2regcomp
+do
+as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+echo "$as_me:7907: 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
+#line 7913 "configure"
+#include "confdefs.h"
+#define $ac_func autoconf_temporary
+#include <limits.h>    /* least-intrusive standard header which defines gcc2 __stub macros */
+#undef $ac_func
+
+#ifdef __cplusplus
+extern "C"
+#endif
+
+/* We use char because int might match the return type of a gcc2
+   builtin and then its argument prototype would still apply.  */
+char $ac_func (void);
+
+int
+main (void)
+{
+
+/* The GNU C library defines stubs for functions which it implements
+    to always fail with ENOSYS.  Some functions are actually named
+    something starting with __ and the normal name is an alias.  */
+#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
+#error found stub for $ac_func
+#endif
+
+       return $ac_func ();
+  ;
+  return 0;
+}
+_ACEOF
+rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+if { (eval echo "$as_me:7944: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:7947: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest$ac_exeext"'
+  { (eval echo "$as_me:7950: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:7953: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then
+  eval "$as_ac_var=yes"
+else
+  echo "$as_me: failed program was:" >&5
+cat "conftest.$ac_ext" >&5
+eval "$as_ac_var=no"
+fi
+rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+fi
+echo "$as_me:7963: 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
+#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+EOF
+
+fi
+done
+

 fi
 
 # not everyone has "test -c"
 if test -c /dev/sysmouse 2>/dev/null ; then
 fi
 
 # not everyone has "test -c"
 if test -c /dev/sysmouse 2>/dev/null ; then

-echo "$as_me:7808: checking if you want to use sysmouse" >&5
+echo "$as_me:7977: 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.


@@ -7817,7 +7986,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 7820 "configure"
+#line 7989 "configure"

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


@@ -7840,16 +8009,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
 }
 _ACEOF
 rm -f "conftest.$ac_objext"

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

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

-  echo "$as_me:7846: \$? = $ac_status" >&5
+  echo "$as_me:8015: \$? = $ac_status" >&5

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

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

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

-  echo "$as_me:7852: \$? = $ac_status" >&5
+  echo "$as_me:8021: \$? = $ac_status" >&5

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


@@ -7859,7 +8028,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:7862: result: $cf_with_sysmouse" >&5
+echo "$as_me:8031: 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


@@ -7869,7 +8038,7 @@ EOF
 fi
 
 # pretend that ncurses==ncursesw==ncursest
 fi
 
 # pretend that ncurses==ncursesw==ncursest

-echo "$as_me:7872: checking if you want to disable library suffixes" >&5
+echo "$as_me:8041: 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.


@@ -7886,13 +8055,13 @@ else
        disable_lib_suffixes=no
 
 fi;
        disable_lib_suffixes=no
 
 fi;

-echo "$as_me:7889: result: $disable_lib_suffixes" >&5
+echo "$as_me:8058: 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" && test "x$cf_cv_enable_rpath" != xno; 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" && test "x$cf_cv_enable_rpath" != xno; then
 

-echo "$as_me:7895: checking if rpath-hack should be disabled" >&5
+echo "$as_me:8064: 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.


@@ -7910,22 +8079,22 @@ else
 
 fi;
 if test "x$enable_rpath_hack" = xno; then cf_disable_rpath_hack=yes; else cf_disable_rpath_hack=no; fi
 
 fi;
 if test "x$enable_rpath_hack" = xno; then cf_disable_rpath_hack=yes; else cf_disable_rpath_hack=no; fi

-echo "$as_me:7913: result: $cf_disable_rpath_hack" >&5
+echo "$as_me:8082: result: $cf_disable_rpath_hack" >&5

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

-echo "$as_me:7918: checking for updated LDFLAGS" >&5
+echo "$as_me:8087: 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:7921: result: maybe" >&5
+       echo "$as_me:8090: 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:7928: checking for $ac_word" >&5
+echo "$as_me:8097: 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


@@ -7940,7 +8109,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:7943: found $ac_dir/$ac_word" >&5
+echo "$as_me:8112: found $ac_dir/$ac_word" >&5

 break
 done
 
 break
 done
 


@@ -7948,10 +8117,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:7951: result: $cf_ldd_prog" >&5
+  echo "$as_me:8120: result: $cf_ldd_prog" >&5

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

-  echo "$as_me:7954: result: no" >&5
+  echo "$as_me:8123: result: no" >&5

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


@@ -7965,7 +8134,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 7968 "configure"
+#line 8137 "configure"

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


@@ -7977,16 +8146,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:7980: \"$ac_link\"") >&5
+if { (eval echo "$as_me:8149: \"$ac_link\"") >&5

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

-  echo "$as_me:7983: \$? = $ac_status" >&5
+  echo "$as_me:8152: \$? = $ac_status" >&5

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

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

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

-  echo "$as_me:7989: \$? = $ac_status" >&5
+  echo "$as_me:8158: \$? = $ac_status" >&5

   (exit "$ac_status"); }; }; then
   cf_rpath_oops=`"$cf_ldd_prog" "conftest$ac_exeext" | ${FGREP-fgrep} ' not found' | sed -e 's% =>.*$%%' |sort | uniq`
                 cf_rpath_list=`"$cf_ldd_prog" "conftest$ac_exeext" | ${FGREP-fgrep} / | sed -e 's%^.*[         ]/%/%' -e 's%/[^/][^/]*$%%' |sort | uniq`
   (exit "$ac_status"); }; }; then
   cf_rpath_oops=`"$cf_ldd_prog" "conftest$ac_exeext" | ${FGREP-fgrep} ' not found' | sed -e 's% =>.*$%%' |sort | uniq`
                 cf_rpath_list=`"$cf_ldd_prog" "conftest$ac_exeext" | ${FGREP-fgrep} / | sed -e 's%^.*[         ]/%/%' -e 's%/[^/][^/]*$%%' |sort | uniq`


@@ -8014,7 +8183,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}:8017: testing ...adding -L$cf_rpath_dir/lib to LDFLAGS for $cf_rpath_src ..." 1>&5
+echo "${as_me:-configure}:8186: 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


@@ -8026,11 +8195,11 @@ echo "${as_me:-configure}:8017: 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}:8029: testing ...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
+echo "${as_me:-configure}:8198: 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}:8033: testing ...checking LDFLAGS $LDFLAGS ..." 1>&5
+echo "${as_me:-configure}:8202: testing ...checking LDFLAGS $LDFLAGS ..." 1>&5

 
 cf_rpath_dst=
 for cf_rpath_src in $LDFLAGS
 
 cf_rpath_dst=
 for cf_rpath_src in $LDFLAGS


@@ -8067,7 +8236,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}:8070: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
+echo "${as_me:-configure}:8239: 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


@@ -8080,11 +8249,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}:8083: testing ...checked LDFLAGS $LDFLAGS ..." 1>&5
+echo "${as_me:-configure}:8252: 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}:8087: testing ...checking LIBS $LIBS ..." 1>&5
+echo "${as_me:-configure}:8256: testing ...checking LIBS $LIBS ..." 1>&5

 
 cf_rpath_dst=
 for cf_rpath_src in $LIBS
 
 cf_rpath_dst=
 for cf_rpath_src in $LIBS


@@ -8121,7 +8290,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}:8124: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
+echo "${as_me:-configure}:8293: 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


@@ -8134,14 +8303,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}:8137: testing ...checked LIBS $LIBS ..." 1>&5
+echo "${as_me:-configure}:8306: 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}:8141: testing ...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
+echo "${as_me:-configure}:8310: testing ...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5

 
 else
 
 else

-       echo "$as_me:8144: result: no" >&5
+       echo "$as_me:8313: result: no" >&5

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


@@ -8155,7 +8324,7 @@ fi
 EXTRA_PKG_LDFLAGS="$LDFLAGS $EXTRA_LDFLAGS"
 if test -n "$EXTRA_PKG_LDFLAGS"
 then
 EXTRA_PKG_LDFLAGS="$LDFLAGS $EXTRA_LDFLAGS"
 if test -n "$EXTRA_PKG_LDFLAGS"
 then

-       echo "$as_me:8158: checking if you want to disable extra LDFLAGS for package-scripts" >&5
+       echo "$as_me:8327: checking if you want to disable extra LDFLAGS for package-scripts" >&5

 echo $ECHO_N "checking if you want to disable extra LDFLAGS for package-scripts... $ECHO_C" >&6
 
 # Check whether --enable-pkg-ldflags or --disable-pkg-ldflags was given.
 echo $ECHO_N "checking if you want to disable extra LDFLAGS for package-scripts... $ECHO_C" >&6
 
 # Check whether --enable-pkg-ldflags or --disable-pkg-ldflags was given.


@@ -8172,7 +8341,7 @@ else
        disable_pkg_ldflags=no
 
 fi;
        disable_pkg_ldflags=no
 
 fi;

-       echo "$as_me:8175: result: $disable_pkg_ldflags" >&5
+       echo "$as_me:8344: result: $disable_pkg_ldflags" >&5

 echo "${ECHO_T}$disable_pkg_ldflags" >&6
        test "$disable_pkg_ldflags" = yes && EXTRA_PKG_LDFLAGS=
 fi
 echo "${ECHO_T}$disable_pkg_ldflags" >&6
        test "$disable_pkg_ldflags" = yes && EXTRA_PKG_LDFLAGS=
 fi


@@ -8180,7 +8349,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:8183: checking if you wish to append extra suffix to header/library paths" >&5
+echo "$as_me:8352: 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=
 


@@ -8199,11 +8368,11 @@ if test "${with_extra_suffix+set}" = set; then
        esac
 
 fi;
        esac
 
 fi;

-echo "$as_me:8202: result: $EXTRA_SUFFIX" >&5
+echo "$as_me:8371: 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:8206: checking if you wish to install ncurses overwriting curses" >&5
+echo "$as_me:8375: 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.


@@ -8213,10 +8382,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:8216: result: $with_overwrite" >&5
+echo "$as_me:8385: result: $with_overwrite" >&5

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

-echo "$as_me:8219: checking if external terminfo-database is used" >&5
+echo "$as_me:8388: 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.


@@ -8226,7 +8395,7 @@ if test "${enable_database+set}" = set; then
 else
   use_database=yes
 fi;
 else
   use_database=yes
 fi;

-echo "$as_me:8229: result: $use_database" >&5
+echo "$as_me:8398: result: $use_database" >&5

 echo "${ECHO_T}$use_database" >&6
 
 case "$host_os" in
 echo "${ECHO_T}$use_database" >&6
 
 case "$host_os" in


@@ -8242,7 +8411,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:8245: checking which terminfo source-file will be installed" >&5
+       echo "$as_me:8414: 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.


@@ -8250,10 +8419,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:8253: result: $TERMINFO_SRC" >&5
+       echo "$as_me:8422: result: $TERMINFO_SRC" >&5

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

-       echo "$as_me:8256: checking whether to use hashed database instead of directory/tree" >&5
+       echo "$as_me:8425: 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.


@@ -8263,13 +8432,13 @@ if test "${with_hashed_db+set}" = set; then
 else
   with_hashed_db=no
 fi;
 else
   with_hashed_db=no
 fi;

-       echo "$as_me:8266: result: $with_hashed_db" >&5
+       echo "$as_me:8435: 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:8272: checking for list of fallback descriptions" >&5
+echo "$as_me:8441: 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.


@@ -8279,7 +8448,7 @@ if test "${with_fallbacks+set}" = set; then
 else
   with_fallback=
 fi;
 else
   with_fallback=
 fi;

-echo "$as_me:8282: result: $with_fallback" >&5
+echo "$as_me:8451: result: $with_fallback" >&5

 echo "${ECHO_T}$with_fallback" >&6
 
 case ".$with_fallback" in
 echo "${ECHO_T}$with_fallback" >&6
 
 case ".$with_fallback" in


@@ -8287,7 +8456,7 @@ case ".$with_fallback" in
        FALLBACK_LIST=
        ;;
 (.yes)
        FALLBACK_LIST=
        ;;
 (.yes)

-       { echo "$as_me:8290: WARNING: expected a list of terminal descriptions" >&5
+       { echo "$as_me:8459: WARNING: expected a list of terminal descriptions" >&5

 echo "$as_me: WARNING: expected a list of terminal descriptions" >&2;}
        ;;
 (*)
 echo "$as_me: WARNING: expected a list of terminal descriptions" >&2;}
        ;;
 (*)


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

-echo "$as_me:8306: checking for $ac_word" >&5
+echo "$as_me:8475: checking for $ac_word" >&5

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


@@ -8318,7 +8487,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_TIC="${ac_tool_prefix}tic"
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_TIC="${ac_tool_prefix}tic"

-echo "$as_me:8321: found $ac_dir/$ac_word" >&5
+echo "$as_me:8490: found $ac_dir/$ac_word" >&5

 break
 done
 
 break
 done
 


@@ -8326,10 +8495,10 @@ fi
 fi
 TIC=$ac_cv_prog_TIC
 if test -n "$TIC"; then
 fi
 TIC=$ac_cv_prog_TIC
 if test -n "$TIC"; then

-  echo "$as_me:8329: result: $TIC" >&5
+  echo "$as_me:8498: result: $TIC" >&5

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

-  echo "$as_me:8332: result: no" >&5
+  echo "$as_me:8501: result: no" >&5

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


@@ -8338,7 +8507,7 @@ if test -z "$ac_cv_prog_TIC"; then
   ac_ct_TIC=$TIC
   # Extract the first word of "tic", so it can be a program name with args.
 set dummy tic; ac_word=$2
   ac_ct_TIC=$TIC
   # Extract the first word of "tic", so it can be a program name with args.
 set dummy tic; ac_word=$2

-echo "$as_me:8341: checking for $ac_word" >&5
+echo "$as_me:8510: checking for $ac_word" >&5

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


@@ -8353,7 +8522,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_TIC="tic"
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_ac_ct_TIC="tic"

-echo "$as_me:8356: found $ac_dir/$ac_word" >&5
+echo "$as_me:8525: found $ac_dir/$ac_word" >&5

 break
 done
 
 break
 done
 


@@ -8361,10 +8530,10 @@ fi
 fi
 ac_ct_TIC=$ac_cv_prog_ac_ct_TIC
 if test -n "$ac_ct_TIC"; then
 fi
 ac_ct_TIC=$ac_cv_prog_ac_ct_TIC
 if test -n "$ac_ct_TIC"; then

-  echo "$as_me:8364: result: $ac_ct_TIC" >&5
+  echo "$as_me:8533: result: $ac_ct_TIC" >&5

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

-  echo "$as_me:8367: result: no" >&5
+  echo "$as_me:8536: result: no" >&5

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


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

-echo "$as_me:8379: checking for $ac_word" >&5
+echo "$as_me:8548: checking for $ac_word" >&5

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


@@ -8391,7 +8560,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_INFOCMP="${ac_tool_prefix}infocmp"
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_INFOCMP="${ac_tool_prefix}infocmp"

-echo "$as_me:8394: found $ac_dir/$ac_word" >&5
+echo "$as_me:8563: found $ac_dir/$ac_word" >&5

 break
 done
 
 break
 done
 


@@ -8399,10 +8568,10 @@ fi
 fi
 INFOCMP=$ac_cv_prog_INFOCMP
 if test -n "$INFOCMP"; then
 fi
 INFOCMP=$ac_cv_prog_INFOCMP
 if test -n "$INFOCMP"; then

-  echo "$as_me:8402: result: $INFOCMP" >&5
+  echo "$as_me:8571: result: $INFOCMP" >&5

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

-  echo "$as_me:8405: result: no" >&5
+  echo "$as_me:8574: result: no" >&5

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


@@ -8411,7 +8580,7 @@ if test -z "$ac_cv_prog_INFOCMP"; then
   ac_ct_INFOCMP=$INFOCMP
   # Extract the first word of "infocmp", so it can be a program name with args.
 set dummy infocmp; ac_word=$2
   ac_ct_INFOCMP=$INFOCMP
   # Extract the first word of "infocmp", so it can be a program name with args.
 set dummy infocmp; ac_word=$2

-echo "$as_me:8414: checking for $ac_word" >&5
+echo "$as_me:8583: checking for $ac_word" >&5

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


@@ -8426,7 +8595,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_INFOCMP="infocmp"
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_ac_ct_INFOCMP="infocmp"

-echo "$as_me:8429: found $ac_dir/$ac_word" >&5
+echo "$as_me:8598: found $ac_dir/$ac_word" >&5

 break
 done
 
 break
 done
 


@@ -8434,10 +8603,10 @@ fi
 fi
 ac_ct_INFOCMP=$ac_cv_prog_ac_ct_INFOCMP
 if test -n "$ac_ct_INFOCMP"; then
 fi
 ac_ct_INFOCMP=$ac_cv_prog_ac_ct_INFOCMP
 if test -n "$ac_ct_INFOCMP"; then

-  echo "$as_me:8437: result: $ac_ct_INFOCMP" >&5
+  echo "$as_me:8606: result: $ac_ct_INFOCMP" >&5

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

-  echo "$as_me:8440: result: no" >&5
+  echo "$as_me:8609: result: no" >&5

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


@@ -8452,10 +8621,10 @@ then
 # Check whether --with-tic-path or --without-tic-path was given.
 if test "${with_tic_path+set}" = set; then
   withval="$with_tic_path"
 # Check whether --with-tic-path or --without-tic-path was given.
 if test "${with_tic_path+set}" = set; then
   withval="$with_tic_path"

-  echo "$as_me:8455: checking for tic program for fallbacks" >&5
+  echo "$as_me:8624: checking for tic program for fallbacks" >&5

 echo $ECHO_N "checking for tic program for fallbacks... $ECHO_C" >&6
                TIC=$withval
 echo $ECHO_N "checking for tic program for fallbacks... $ECHO_C" >&6
                TIC=$withval

-               echo "$as_me:8458: result: $TIC" >&5
+               echo "$as_me:8627: result: $TIC" >&5

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


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

-       { { echo "$as_me:8486: error: expected a pathname, not \"$TIC\"" >&5
+       { { echo "$as_me:8655: error: expected a pathname, not \"$TIC\"" >&5

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


@@ -8496,7 +8665,7 @@ for ac_prog in $TIC tic
 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:8499: checking for $ac_word" >&5
+echo "$as_me:8668: checking for $ac_word" >&5

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


@@ -8513,7 +8682,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="$ac_dir/$ac_word"
   test -z "$ac_dir" && ac_dir=.
   if $as_executable_p "$ac_dir/$ac_word"; then
    ac_cv_path_TIC="$ac_dir/$ac_word"

-   echo "$as_me:8516: found $ac_dir/$ac_word" >&5
+   echo "$as_me:8685: found $ac_dir/$ac_word" >&5

    break
 fi
 done
    break
 fi
 done


@@ -8524,10 +8693,10 @@ fi
 TIC=$ac_cv_path_TIC
 
 if test -n "$TIC"; then
 TIC=$ac_cv_path_TIC
 
 if test -n "$TIC"; then

-  echo "$as_me:8527: result: $TIC" >&5
+  echo "$as_me:8696: result: $TIC" >&5

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

-  echo "$as_me:8530: result: no" >&5
+  echo "$as_me:8699: result: no" >&5

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


@@ -8586,7 +8755,7 @@ IFS="$cf_save_ifs"
 
 if test -n "$cf_path_prog" ; then
 
 
 if test -n "$cf_path_prog" ; then
 

-echo "${as_me:-configure}:8589: testing defining path for ${cf_path_prog} ..." 1>&5
+echo "${as_me:-configure}:8758: testing defining path for ${cf_path_prog} ..." 1>&5

 
 cat >>confdefs.h <<EOF
 #define TIC_PATH "$cf_path_prog"
 
 cat >>confdefs.h <<EOF
 #define TIC_PATH "$cf_path_prog"


@@ -8601,7 +8770,7 @@ fi
 
                if test -z "$TIC"
                then
 
                if test -z "$TIC"
                then

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

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


@@ -8610,10 +8779,10 @@ fi;
 # Check whether --with-infocmp-path or --without-infocmp-path was given.
 if test "${with_infocmp_path+set}" = set; then
   withval="$with_infocmp_path"
 # Check whether --with-infocmp-path or --without-infocmp-path was given.
 if test "${with_infocmp_path+set}" = set; then
   withval="$with_infocmp_path"

-  echo "$as_me:8613: checking for infocmp program for fallbacks" >&5
+  echo "$as_me:8782: checking for infocmp program for fallbacks" >&5

 echo $ECHO_N "checking for infocmp program for fallbacks... $ECHO_C" >&6
                INFOCMP=$withval
 echo $ECHO_N "checking for infocmp program for fallbacks... $ECHO_C" >&6
                INFOCMP=$withval

-               echo "$as_me:8616: result: $INFOCMP" >&5
+               echo "$as_me:8785: result: $INFOCMP" >&5

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


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

-       { { echo "$as_me:8644: error: expected a pathname, not \"$INFOCMP\"" >&5
+       { { echo "$as_me:8813: error: expected a pathname, not \"$INFOCMP\"" >&5

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


@@ -8654,7 +8823,7 @@ for ac_prog in $INFOCMP infocmp
 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:8657: checking for $ac_word" >&5
+echo "$as_me:8826: checking for $ac_word" >&5

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


@@ -8671,7 +8840,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_INFOCMP="$ac_dir/$ac_word"
   test -z "$ac_dir" && ac_dir=.
   if $as_executable_p "$ac_dir/$ac_word"; then
    ac_cv_path_INFOCMP="$ac_dir/$ac_word"

-   echo "$as_me:8674: found $ac_dir/$ac_word" >&5
+   echo "$as_me:8843: found $ac_dir/$ac_word" >&5

    break
 fi
 done
    break
 fi
 done


@@ -8682,10 +8851,10 @@ fi
 INFOCMP=$ac_cv_path_INFOCMP
 
 if test -n "$INFOCMP"; then
 INFOCMP=$ac_cv_path_INFOCMP
 
 if test -n "$INFOCMP"; then

-  echo "$as_me:8685: result: $INFOCMP" >&5
+  echo "$as_me:8854: result: $INFOCMP" >&5

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

-  echo "$as_me:8688: result: no" >&5
+  echo "$as_me:8857: result: no" >&5

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


@@ -8744,7 +8913,7 @@ IFS="$cf_save_ifs"
 
 if test -n "$cf_path_prog" ; then
 
 
 if test -n "$cf_path_prog" ; then
 

-echo "${as_me:-configure}:8747: testing defining path for ${cf_path_prog} ..." 1>&5
+echo "${as_me:-configure}:8916: testing defining path for ${cf_path_prog} ..." 1>&5

 
 cat >>confdefs.h <<EOF
 #define INFOCMP_PATH "$cf_path_prog"
 
 cat >>confdefs.h <<EOF
 #define INFOCMP_PATH "$cf_path_prog"


@@ -8759,7 +8928,7 @@ fi
 
                if test -z "$INFOCMP"
                then
 
                if test -z "$INFOCMP"
                then

-                       { echo "$as_me:8762: WARNING: no infocmp program found for fallbacks" >&5
+                       { echo "$as_me:8931: WARNING: no infocmp program found for fallbacks" >&5

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


@@ -8769,7 +8938,7 @@ fi;
        test -z "$INFOCMP" && FALLBACK_LIST=
        if test -z "$FALLBACK_LIST"
        then
        test -z "$INFOCMP" && FALLBACK_LIST=
        if test -z "$FALLBACK_LIST"
        then

-               { echo "$as_me:8772: WARNING: ignoring fallback option because tic/infocmp are not available" >&5
+               { echo "$as_me:8941: WARNING: ignoring fallback option because tic/infocmp are not available" >&5

 echo "$as_me: WARNING: ignoring fallback option because tic/infocmp are not available" >&2;}
        fi
 fi
 echo "$as_me: WARNING: ignoring fallback option because tic/infocmp are not available" >&2;}
        fi
 fi


@@ -8777,7 +8946,7 @@ fi
 USE_FALLBACKS=
 test -z "$FALLBACK_LIST" && USE_FALLBACKS="#"
 
 USE_FALLBACKS=
 test -z "$FALLBACK_LIST" && USE_FALLBACKS="#"
 

-echo "$as_me:8780: checking if you want modern xterm or antique" >&5
+echo "$as_me:8949: 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.


@@ -8791,11 +8960,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:8794: result: $with_xterm_new" >&5
+echo "$as_me:8963: 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:8798: checking if xterm backspace sends BS or DEL" >&5
+echo "$as_me:8967: 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.


@@ -8816,7 +8985,7 @@ case x$with_xterm_kbs in
        with_xterm_kbs=$withval
        ;;
 esac
        with_xterm_kbs=$withval
        ;;
 esac

-echo "$as_me:8819: result: $with_xterm_kbs" >&5
+echo "$as_me:8988: 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
 


@@ -8826,7 +8995,7 @@ if test "$use_database" = no ; then
        MAKE_TERMINFO="#"
 else
 
        MAKE_TERMINFO="#"
 else
 

-echo "$as_me:8829: checking for list of terminfo directories" >&5
+echo "$as_me:8998: 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.


@@ -8866,7 +9035,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:8869: error: expected a pathname, not \"$cf_src_path\"" >&5
+       { { echo "$as_me:9038: 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; }; }
        ;;


@@ -8889,7 +9058,7 @@ case "x$cf_dst_eval" in
        ;;
 esac
 
        ;;
 esac
 

-echo "$as_me:8892: result: $TERMINFO_DIRS" >&5
+echo "$as_me:9061: result: $TERMINFO_DIRS" >&5

 echo "${ECHO_T}$TERMINFO_DIRS" >&6
 test -n "$TERMINFO_DIRS" &&
 cat >>confdefs.h <<EOF
 echo "${ECHO_T}$TERMINFO_DIRS" >&6
 test -n "$TERMINFO_DIRS" &&
 cat >>confdefs.h <<EOF


@@ -8898,13 +9067,13 @@ EOF
 
 case "x$TERMINFO" in
 x???:*)
 
 case "x$TERMINFO" in
 x???:*)

-       { echo "$as_me:8901: WARNING: ignoring non-directory/file TERMINFO value" >&5
+       { echo "$as_me:9070: WARNING: ignoring non-directory/file TERMINFO value" >&5

 echo "$as_me: WARNING: ignoring non-directory/file TERMINFO value" >&2;}
        unset TERMINFO
        ;;
 esac
 
 echo "$as_me: WARNING: ignoring non-directory/file TERMINFO value" >&2;}
        unset TERMINFO
        ;;
 esac
 

-echo "$as_me:8907: checking for default terminfo directory" >&5
+echo "$as_me:9076: 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.


@@ -8940,7 +9109,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:8943: error: expected a pathname, not \"$withval\"" >&5
+       { { echo "$as_me:9112: 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; }; }
        ;;


@@ -8949,7 +9118,7 @@ esac
 fi
 eval TERMINFO="$withval"
 
 fi
 eval TERMINFO="$withval"
 

-echo "$as_me:8952: result: $TERMINFO" >&5
+echo "$as_me:9121: result: $TERMINFO" >&5

 echo "${ECHO_T}$TERMINFO" >&6
 
 cat >>confdefs.h <<EOF
 echo "${ECHO_T}$TERMINFO" >&6
 
 cat >>confdefs.h <<EOF


@@ -8960,7 +9129,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:8963: checking if big-core option selected" >&5
+echo "$as_me:9132: 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.


@@ -8972,7 +9141,7 @@ else
   with_big_core=no
 else
   cat >"conftest.$ac_ext" <<_ACEOF
   with_big_core=no
 else
   cat >"conftest.$ac_ext" <<_ACEOF

-#line 8975 "configure"
+#line 9144 "configure"

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


@@ -8986,15 +9155,15 @@ int main() {
 }
 _ACEOF
 rm -f "conftest$ac_exeext"
 }
 _ACEOF
 rm -f "conftest$ac_exeext"

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

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

-  echo "$as_me:8992: \$? = $ac_status" >&5
+  echo "$as_me:9161: \$? = $ac_status" >&5

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

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

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

-  echo "$as_me:8997: \$? = $ac_status" >&5
+  echo "$as_me:9166: \$? = $ac_status" >&5

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


@@ -9006,7 +9175,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:9009: result: $with_big_core" >&5
+echo "$as_me:9178: 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


@@ -9016,7 +9185,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:9019: checking if big-strings option selected" >&5
+echo "$as_me:9188: 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.


@@ -9040,14 +9209,14 @@ else
        esac
 
 fi;
        esac
 
 fi;

-echo "$as_me:9043: result: $with_big_strings" >&5
+echo "$as_me:9212: 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:9050: checking if you want termcap-fallback support" >&5
+echo "$as_me:9219: 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.


@@ -9057,14 +9226,14 @@ if test "${enable_termcap+set}" = set; then
 else
   with_termcap=no
 fi;
 else
   with_termcap=no
 fi;

-echo "$as_me:9060: result: $with_termcap" >&5
+echo "$as_me:9229: 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:9067: error: You have disabled the database w/o specifying fallbacks" >&5
+                       { { echo "$as_me:9236: 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


@@ -9077,13 +9246,13 @@ EOF
 else
 
        if test "$with_ticlib" != no ; then
 else
 
        if test "$with_ticlib" != no ; then

-               { { echo "$as_me:9080: error: Options --with-ticlib and --enable-termcap cannot be combined" >&5
+               { { echo "$as_me:9249: 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:9086: checking for list of termcap files" >&5
+       echo "$as_me:9255: 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.


@@ -9123,7 +9292,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:9126: error: expected a pathname, not \"$cf_src_path\"" >&5
+       { { echo "$as_me:9295: 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; }; }
        ;;


@@ -9146,7 +9315,7 @@ case "x$cf_dst_eval" in
        ;;
 esac
 
        ;;
 esac
 

-       echo "$as_me:9149: result: $TERMPATH" >&5
+       echo "$as_me:9318: 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


@@ -9154,7 +9323,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:9157: checking if fast termcap-loader is needed" >&5
+       echo "$as_me:9326: 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.


@@ -9164,14 +9333,14 @@ if test "${enable_getcap+set}" = set; then
 else
   with_getcap=no
 fi;
 else
   with_getcap=no
 fi;

-       echo "$as_me:9167: result: $with_getcap" >&5
+       echo "$as_me:9336: 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:9174: checking if translated termcaps will be cached in ~/.terminfo" >&5
+       echo "$as_me:9343: 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.


@@ -9181,7 +9350,7 @@ if test "${enable_getcap_cache+set}" = set; then
 else
   with_getcap_cache=no
 fi;
 else
   with_getcap_cache=no
 fi;

-       echo "$as_me:9184: result: $with_getcap_cache" >&5
+       echo "$as_me:9353: 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


@@ -9191,7 +9360,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:9194: checking if ~/.terminfo is wanted" >&5
+echo "$as_me:9363: 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.


@@ -9201,14 +9370,14 @@ if test "${enable_home_terminfo+set}" = set; then
 else
   with_home_terminfo=yes
 fi;
 else
   with_home_terminfo=yes
 fi;

-echo "$as_me:9204: result: $with_home_terminfo" >&5
+echo "$as_me:9373: 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:9211: checking if you want to permit root to use ncurses environment variables" >&5
+echo "$as_me:9380: checking if you want to permit root to use ncurses environment variables" >&5

 echo $ECHO_N "checking if you want to permit root to use ncurses environment variables... $ECHO_C" >&6
 
 # Check whether --enable-root-environ or --disable-root-environ was given.
 echo $ECHO_N "checking if you want to permit root to use ncurses environment variables... $ECHO_C" >&6
 
 # Check whether --enable-root-environ or --disable-root-environ was given.


@@ -9218,14 +9387,14 @@ if test "${enable_root_environ+set}" = set; then
 else
   with_root_environ=yes
 fi;
 else
   with_root_environ=yes
 fi;

-echo "$as_me:9221: result: $with_root_environ" >&5
+echo "$as_me:9390: result: $with_root_environ" >&5

 echo "${ECHO_T}$with_root_environ" >&6
 test "x$with_root_environ" = xyes &&
 cat >>confdefs.h <<\EOF
 #define USE_ROOT_ENVIRON 1
 EOF
 
 echo "${ECHO_T}$with_root_environ" >&6
 test "x$with_root_environ" = xyes &&
 cat >>confdefs.h <<\EOF
 #define USE_ROOT_ENVIRON 1
 EOF
 

-echo "$as_me:9228: checking if you want to permit setuid programs to access all files" >&5
+echo "$as_me:9397: checking if you want to permit setuid programs to access all files" >&5

 echo $ECHO_N "checking if you want to permit setuid programs to access all files... $ECHO_C" >&6
 
 # Check whether --enable-root-environ or --disable-root-environ was given.
 echo $ECHO_N "checking if you want to permit setuid programs to access all files... $ECHO_C" >&6
 
 # Check whether --enable-root-environ or --disable-root-environ was given.


@@ -9235,7 +9404,7 @@ if test "${enable_root_environ+set}" = set; then
 else
   with_root_access=yes
 fi;
 else
   with_root_access=yes
 fi;

-echo "$as_me:9238: result: $with_root_access" >&5
+echo "$as_me:9407: result: $with_root_access" >&5

 echo "${ECHO_T}$with_root_access" >&6
 test "x$with_root_access" = xyes &&
 cat >>confdefs.h <<\EOF
 echo "${ECHO_T}$with_root_access" >&6
 test "x$with_root_access" = xyes &&
 cat >>confdefs.h <<\EOF


@@ -9250,23 +9419,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:9253: checking for $ac_header" >&5
+echo "$as_me:9422: 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 9259 "configure"
+#line 9428 "configure"

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

-if { (eval echo "$as_me:9263: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:9432: \"$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:9269: \$? = $ac_status" >&5
+  echo "$as_me:9438: \$? = $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


@@ -9285,7 +9454,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi

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


@@ -9300,13 +9469,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:9303: checking for $ac_func" >&5
+echo "$as_me:9472: 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 9309 "configure"
+#line 9478 "configure"

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


@@ -9337,16 +9506,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:9340: \"$ac_link\"") >&5
+if { (eval echo "$as_me:9509: \"$ac_link\"") >&5

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

-  echo "$as_me:9343: \$? = $ac_status" >&5
+  echo "$as_me:9512: \$? = $ac_status" >&5

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

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

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

-  echo "$as_me:9349: \$? = $ac_status" >&5
+  echo "$as_me:9518: \$? = $ac_status" >&5

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


@@ -9356,7 +9525,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:9359: result: `eval echo '${'"$as_ac_var"'}'`" >&5
+echo "$as_me:9528: 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


@@ -9373,13 +9542,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:9376: checking for $ac_func" >&5
+echo "$as_me:9545: 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 9382 "configure"
+#line 9551 "configure"

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


@@ -9410,16 +9579,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:9413: \"$ac_link\"") >&5
+if { (eval echo "$as_me:9582: \"$ac_link\"") >&5

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

-  echo "$as_me:9416: \$? = $ac_status" >&5
+  echo "$as_me:9585: \$? = $ac_status" >&5

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

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

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

-  echo "$as_me:9422: \$? = $ac_status" >&5
+  echo "$as_me:9591: \$? = $ac_status" >&5

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


@@ -9429,7 +9598,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:9432: result: `eval echo '${'"$as_ac_var"'}'`" >&5
+echo "$as_me:9601: 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


@@ -9440,7 +9609,7 @@ fi
 done
 
 else
 done
 
 else

-       echo "$as_me:9443: checking if link/symlink functions work" >&5
+       echo "$as_me:9612: 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


@@ -9453,7 +9622,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 9456 "configure"
+#line 9625 "configure"

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


@@ -9491,15 +9660,15 @@ int main(void)
 
 _ACEOF
 rm -f "conftest$ac_exeext"
 
 _ACEOF
 rm -f "conftest$ac_exeext"

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

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

-  echo "$as_me:9497: \$? = $ac_status" >&5
+  echo "$as_me:9666: \$? = $ac_status" >&5

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

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

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

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


@@ -9517,7 +9686,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:9520: result: $cf_cv_link_funcs" >&5
+echo "$as_me:9689: 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


@@ -9537,7 +9706,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:9540: checking if tic should use symbolic links" >&5
+       echo "$as_me:9709: 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.


@@ -9547,21 +9716,21 @@ if test "${enable_symlinks+set}" = set; then
 else
   with_symlinks=no
 fi;
 else
   with_symlinks=no
 fi;

-       echo "$as_me:9550: result: $with_symlinks" >&5
+       echo "$as_me:9719: 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:9557: checking if tic should use hard links" >&5
+       echo "$as_me:9726: 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:9564: result: $with_links" >&5
+       echo "$as_me:9733: result: $with_links" >&5

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


@@ -9577,7 +9746,7 @@ EOF
 
 ###   use option --enable-broken-linker to force on use of broken-linker support
 
 
 ###   use option --enable-broken-linker to force on use of broken-linker support
 

-echo "$as_me:9580: checking if you want broken-linker support code" >&5
+echo "$as_me:9749: 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.


@@ -9587,7 +9756,7 @@ if test "${enable_broken_linker+set}" = set; then
 else
   with_broken_linker=no
 fi;
 else
   with_broken_linker=no
 fi;

-echo "$as_me:9590: result: $with_broken_linker" >&5
+echo "$as_me:9759: 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}"


@@ -9601,7 +9770,7 @@ EOF
 fi
 
 ###   use option --enable-bsdpad to have tputs process BSD-style prefix padding
 fi
 
 ###   use option --enable-bsdpad to have tputs process BSD-style prefix padding

-echo "$as_me:9604: checking if tputs should process BSD-style prefix padding" >&5
+echo "$as_me:9773: 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.


@@ -9611,7 +9780,7 @@ if test "${enable_bsdpad+set}" = set; then
 else
   with_bsdpad=no
 fi;
 else
   with_bsdpad=no
 fi;

-echo "$as_me:9614: result: $with_bsdpad" >&5
+echo "$as_me:9783: 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


@@ -9630,14 +9799,14 @@ NCURSES_WINT_T=0
 # Check to define _XOPEN_SOURCE "automatically"
 CPPFLAGS_before_XOPEN="$CPPFLAGS"
 
 # Check to define _XOPEN_SOURCE "automatically"
 CPPFLAGS_before_XOPEN="$CPPFLAGS"
 

-echo "$as_me:9633: checking if the POSIX test-macros are already defined" >&5
+echo "$as_me:9802: checking if the POSIX test-macros are already defined" >&5

 echo $ECHO_N "checking if the POSIX test-macros are already defined... $ECHO_C" >&6
 if test "${cf_cv_posix_visible+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 cat >"conftest.$ac_ext" <<_ACEOF
 echo $ECHO_N "checking if the POSIX test-macros are already defined... $ECHO_C" >&6
 if test "${cf_cv_posix_visible+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 cat >"conftest.$ac_ext" <<_ACEOF

-#line 9640 "configure"
+#line 9809 "configure"

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


@@ -9656,16 +9825,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
 }
 _ACEOF
 rm -f "conftest.$ac_objext"

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

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

-  echo "$as_me:9662: \$? = $ac_status" >&5
+  echo "$as_me:9831: \$? = $ac_status" >&5

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

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

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

-  echo "$as_me:9668: \$? = $ac_status" >&5
+  echo "$as_me:9837: \$? = $ac_status" >&5

   (exit "$ac_status"); }; }; then
   cf_cv_posix_visible=no
 else
   (exit "$ac_status"); }; }; then
   cf_cv_posix_visible=no
 else


@@ -9676,7 +9845,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi

-echo "$as_me:9679: result: $cf_cv_posix_visible" >&5
+echo "$as_me:9848: result: $cf_cv_posix_visible" >&5

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


@@ -9721,14 +9890,14 @@ case "$host_os" in
 
 cf_gnu_xopen_source=$cf_XOPEN_SOURCE
 
 
 cf_gnu_xopen_source=$cf_XOPEN_SOURCE
 

-echo "$as_me:9724: checking if this is the GNU C library" >&5
+echo "$as_me:9893: checking if this is the GNU C library" >&5

 echo $ECHO_N "checking if this is the GNU C library... $ECHO_C" >&6
 if test "${cf_cv_gnu_library+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 cat >"conftest.$ac_ext" <<_ACEOF
 echo $ECHO_N "checking if this is the GNU C library... $ECHO_C" >&6
 if test "${cf_cv_gnu_library+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 cat >"conftest.$ac_ext" <<_ACEOF

-#line 9731 "configure"
+#line 9900 "configure"

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


@@ -9747,16 +9916,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
 }
 _ACEOF
 rm -f "conftest.$ac_objext"

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

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

-  echo "$as_me:9753: \$? = $ac_status" >&5
+  echo "$as_me:9922: \$? = $ac_status" >&5

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

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

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

-  echo "$as_me:9759: \$? = $ac_status" >&5
+  echo "$as_me:9928: \$? = $ac_status" >&5

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


@@ -9767,7 +9936,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi

-echo "$as_me:9770: result: $cf_cv_gnu_library" >&5
+echo "$as_me:9939: result: $cf_cv_gnu_library" >&5

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


@@ -9775,7 +9944,7 @@ if test x$cf_cv_gnu_library = xyes; then
        # With glibc 2.19 (13 years after this check was begun), _DEFAULT_SOURCE
        # was changed to help a little.  newlib incorporated the change about 4
        # years later.
        # With glibc 2.19 (13 years after this check was begun), _DEFAULT_SOURCE
        # was changed to help a little.  newlib incorporated the change about 4
        # years later.

-       echo "$as_me:9778: checking if _DEFAULT_SOURCE can be used as a basis" >&5
+       echo "$as_me:9947: checking if _DEFAULT_SOURCE can be used as a basis" >&5

 echo $ECHO_N "checking if _DEFAULT_SOURCE can be used as a basis... $ECHO_C" >&6
 if test "${cf_cv_gnu_library_219+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 echo $ECHO_N "checking if _DEFAULT_SOURCE can be used as a basis... $ECHO_C" >&6
 if test "${cf_cv_gnu_library_219+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6


@@ -9787,7 +9956,7 @@ else
        CPPFLAGS="${CPPFLAGS}-D_DEFAULT_SOURCE"
 
                cat >"conftest.$ac_ext" <<_ACEOF
        CPPFLAGS="${CPPFLAGS}-D_DEFAULT_SOURCE"
 
                cat >"conftest.$ac_ext" <<_ACEOF

-#line 9790 "configure"
+#line 9959 "configure"

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


@@ -9806,16 +9975,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
 }
 _ACEOF
 rm -f "conftest.$ac_objext"

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

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

-  echo "$as_me:9812: \$? = $ac_status" >&5
+  echo "$as_me:9981: \$? = $ac_status" >&5

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

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

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

-  echo "$as_me:9818: \$? = $ac_status" >&5
+  echo "$as_me:9987: \$? = $ac_status" >&5

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


@@ -9827,12 +9996,12 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
                CPPFLAGS="$cf_save"
 
 fi
                CPPFLAGS="$cf_save"
 
 fi

-echo "$as_me:9830: result: $cf_cv_gnu_library_219" >&5
+echo "$as_me:9999: result: $cf_cv_gnu_library_219" >&5

 echo "${ECHO_T}$cf_cv_gnu_library_219" >&6
 
        if test "x$cf_cv_gnu_library_219" = xyes; then
                cf_save="$CPPFLAGS"
 echo "${ECHO_T}$cf_cv_gnu_library_219" >&6
 
        if test "x$cf_cv_gnu_library_219" = xyes; then
                cf_save="$CPPFLAGS"

-               echo "$as_me:9835: checking if _XOPEN_SOURCE=$cf_gnu_xopen_source works with _DEFAULT_SOURCE" >&5
+               echo "$as_me:10004: checking if _XOPEN_SOURCE=$cf_gnu_xopen_source works with _DEFAULT_SOURCE" >&5

 echo $ECHO_N "checking if _XOPEN_SOURCE=$cf_gnu_xopen_source works with _DEFAULT_SOURCE... $ECHO_C" >&6
 if test "${cf_cv_gnu_dftsrc_219+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 echo $ECHO_N "checking if _XOPEN_SOURCE=$cf_gnu_xopen_source works with _DEFAULT_SOURCE... $ECHO_C" >&6
 if test "${cf_cv_gnu_dftsrc_219+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6


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

-#line 9940 "configure"
+#line 10109 "configure"

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


@@ -9957,16 +10126,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
 }
 _ACEOF
 rm -f "conftest.$ac_objext"

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

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

-  echo "$as_me:9963: \$? = $ac_status" >&5
+  echo "$as_me:10132: \$? = $ac_status" >&5

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

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

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

-  echo "$as_me:9969: \$? = $ac_status" >&5
+  echo "$as_me:10138: \$? = $ac_status" >&5

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


@@ -9977,7 +10146,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi

-echo "$as_me:9980: result: $cf_cv_gnu_dftsrc_219" >&5
+echo "$as_me:10149: result: $cf_cv_gnu_dftsrc_219" >&5

 echo "${ECHO_T}$cf_cv_gnu_dftsrc_219" >&6
                test "x$cf_cv_gnu_dftsrc_219" = "xyes" || CPPFLAGS="$cf_save"
        else
 echo "${ECHO_T}$cf_cv_gnu_dftsrc_219" >&6
                test "x$cf_cv_gnu_dftsrc_219" = "xyes" || CPPFLAGS="$cf_save"
        else


@@ -9986,14 +10155,14 @@ echo "${ECHO_T}$cf_cv_gnu_dftsrc_219" >&6
 
        if test "x$cf_cv_gnu_dftsrc_219" != xyes; then
 
 
        if test "x$cf_cv_gnu_dftsrc_219" != xyes; then
 

-               echo "$as_me:9989: checking if we must define _GNU_SOURCE" >&5
+               echo "$as_me:10158: 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 9996 "configure"
+#line 10165 "configure"

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


@@ -10008,16 +10177,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
 }
 _ACEOF
 rm -f "conftest.$ac_objext"

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

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

-  echo "$as_me:10014: \$? = $ac_status" >&5
+  echo "$as_me:10183: \$? = $ac_status" >&5

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

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

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

-  echo "$as_me:10020: \$? = $ac_status" >&5
+  echo "$as_me:10189: \$? = $ac_status" >&5

   (exit "$ac_status"); }; }; then
   cf_cv_gnu_source=no
 else
   (exit "$ac_status"); }; }; then
   cf_cv_gnu_source=no
 else


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

-#line 10127 "configure"
+#line 10296 "configure"

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


@@ -10139,16 +10308,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
 }
 _ACEOF
 rm -f "conftest.$ac_objext"

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

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

-  echo "$as_me:10145: \$? = $ac_status" >&5
+  echo "$as_me:10314: \$? = $ac_status" >&5

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

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

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

-  echo "$as_me:10151: \$? = $ac_status" >&5
+  echo "$as_me:10320: \$? = $ac_status" >&5

   (exit "$ac_status"); }; }; then
   cf_cv_gnu_source=no
 else
   (exit "$ac_status"); }; }; then
   cf_cv_gnu_source=no
 else


@@ -10163,12 +10332,12 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi

-echo "$as_me:10166: result: $cf_cv_gnu_source" >&5
+echo "$as_me:10335: 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:10171: checking if we should also define _DEFAULT_SOURCE" >&5
+               echo "$as_me:10340: 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


@@ -10178,7 +10347,7 @@ else
        CPPFLAGS="${CPPFLAGS}-D_GNU_SOURCE"
 
                        cat >"conftest.$ac_ext" <<_ACEOF
        CPPFLAGS="${CPPFLAGS}-D_GNU_SOURCE"
 
                        cat >"conftest.$ac_ext" <<_ACEOF

-#line 10181 "configure"
+#line 10350 "configure"

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


@@ -10193,16 +10362,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
 }
 _ACEOF
 rm -f "conftest.$ac_objext"

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

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

-  echo "$as_me:10199: \$? = $ac_status" >&5
+  echo "$as_me:10368: \$? = $ac_status" >&5

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

-  { (eval echo "$as_me:10202: \"$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:10205: \$? = $ac_status" >&5
+  echo "$as_me:10374: \$? = $ac_status" >&5

   (exit "$ac_status"); }; }; then
   cf_cv_default_source=no
 else
   (exit "$ac_status"); }; }; then
   cf_cv_default_source=no
 else


@@ -10213,7 +10382,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi

-echo "$as_me:10216: result: $cf_cv_default_source" >&5
+echo "$as_me:10385: result: $cf_cv_default_source" >&5

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


@@ -10250,16 +10419,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:10253: checking if we should define _POSIX_C_SOURCE" >&5
+echo "$as_me:10422: 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}:10259: testing if the symbol is already defined go no further ..." 1>&5
+echo "${as_me:-configure}:10428: testing if the symbol is already defined go no further ..." 1>&5

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

-#line 10262 "configure"
+#line 10431 "configure"

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


@@ -10274,16 +10443,16 @@ make an error
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
 }
 _ACEOF
 rm -f "conftest.$ac_objext"

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

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

-  echo "$as_me:10280: \$? = $ac_status" >&5
+  echo "$as_me:10449: \$? = $ac_status" >&5

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

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

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

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


@@ -10304,7 +10473,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 10307 "configure"
+#line 10476 "configure"

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


@@ -10319,16 +10488,16 @@ make an error
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
 }
 _ACEOF
 rm -f "conftest.$ac_objext"

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

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

-  echo "$as_me:10325: \$? = $ac_status" >&5
+  echo "$as_me:10494: \$? = $ac_status" >&5

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

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

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

-  echo "$as_me:10331: \$? = $ac_status" >&5
+  echo "$as_me:10500: \$? = $ac_status" >&5

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


@@ -10339,7 +10508,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
         fi
 
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
         fi
 

-echo "${as_me:-configure}:10342: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
+echo "${as_me:-configure}:10511: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5

 
         CFLAGS="$cf_trim_CFLAGS"
         CPPFLAGS="$cf_trim_CPPFLAGS"
 
         CFLAGS="$cf_trim_CFLAGS"
         CPPFLAGS="$cf_trim_CPPFLAGS"


@@ -10347,10 +10516,10 @@ echo "${as_me:-configure}:10342: testing ifdef from value $cf_POSIX_C_SOURCE ...
        test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
        CPPFLAGS="${CPPFLAGS}$cf_cv_posix_c_source"
 
        test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
        CPPFLAGS="${CPPFLAGS}$cf_cv_posix_c_source"
 

-echo "${as_me:-configure}:10350: testing if the second compile does not leave our definition intact error ..." 1>&5
+echo "${as_me:-configure}:10519: 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 10353 "configure"
+#line 10522 "configure"

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


@@ -10365,16 +10534,16 @@ make an error
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
 }
 _ACEOF
 rm -f "conftest.$ac_objext"

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

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

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

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

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

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

-  echo "$as_me:10377: \$? = $ac_status" >&5
+  echo "$as_me:10546: \$? = $ac_status" >&5

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


@@ -10390,7 +10559,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi

-echo "$as_me:10393: result: $cf_cv_posix_c_source" >&5
+echo "$as_me:10562: 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


@@ -10507,7 +10676,7 @@ fi # cf_cv_posix_visible
        # OpenBSD 6.x has broken locale support, both compile-time and runtime.
        # see https://www.mail-archive.com/bugs@openbsd.org/msg13200.html
        # Abusing the conformance level is a workaround.
        # OpenBSD 6.x has broken locale support, both compile-time and runtime.
        # see https://www.mail-archive.com/bugs@openbsd.org/msg13200.html
        # Abusing the conformance level is a workaround.

-       { echo "$as_me:10510: WARNING: this system does not provide usable locale support" >&5
+       { echo "$as_me:10679: WARNING: this system does not provide usable locale support" >&5

 echo "$as_me: WARNING: this system does not provide usable locale support" >&2;}
        cf_xopen_source="-D_BSD_SOURCE"
        cf_XOPEN_SOURCE=700
 echo "$as_me: WARNING: this system does not provide usable locale support" >&2;}
        cf_xopen_source="-D_BSD_SOURCE"
        cf_XOPEN_SOURCE=700


@@ -10539,14 +10708,14 @@ echo "$as_me: WARNING: this system does not provide usable locale support" >&2;}
        ;;
 (*)
 
        ;;
 (*)
 

-echo "$as_me:10542: checking if we should define _XOPEN_SOURCE" >&5
+echo "$as_me:10711: 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 10549 "configure"
+#line 10718 "configure"

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


@@ -10565,16 +10734,16 @@ make an error
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
 }
 _ACEOF
 rm -f "conftest.$ac_objext"

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

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

-  echo "$as_me:10571: \$? = $ac_status" >&5
+  echo "$as_me:10740: \$? = $ac_status" >&5

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

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

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

-  echo "$as_me:10577: \$? = $ac_status" >&5
+  echo "$as_me:10746: \$? = $ac_status" >&5

   (exit "$ac_status"); }; }; then
   cf_cv_xopen_source=no
 else
   (exit "$ac_status"); }; }; then
   cf_cv_xopen_source=no
 else


@@ -10586,7 +10755,7 @@ cf_save="$CPPFLAGS"
        CPPFLAGS="${CPPFLAGS}-D_XOPEN_SOURCE=$cf_XOPEN_SOURCE"
 
         cat >"conftest.$ac_ext" <<_ACEOF
        CPPFLAGS="${CPPFLAGS}-D_XOPEN_SOURCE=$cf_XOPEN_SOURCE"
 
         cat >"conftest.$ac_ext" <<_ACEOF

-#line 10589 "configure"
+#line 10758 "configure"

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


@@ -10605,16 +10774,16 @@ make an error
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
 }
 _ACEOF
 rm -f "conftest.$ac_objext"

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

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

-  echo "$as_me:10611: \$? = $ac_status" >&5
+  echo "$as_me:10780: \$? = $ac_status" >&5

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

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

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

-  echo "$as_me:10617: \$? = $ac_status" >&5
+  echo "$as_me:10786: \$? = $ac_status" >&5

   (exit "$ac_status"); }; }; then
   cf_cv_xopen_source=no
 else
   (exit "$ac_status"); }; }; then
   cf_cv_xopen_source=no
 else


@@ -10629,7 +10798,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi

-echo "$as_me:10632: result: $cf_cv_xopen_source" >&5
+echo "$as_me:10801: 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


@@ -10644,12 +10813,38 @@ CPPFLAGS=`echo "$CPPFLAGS" | \
 
        cf_temp_xopen_source="-D_XOPEN_SOURCE=$cf_cv_xopen_source"
 
 
        cf_temp_xopen_source="-D_XOPEN_SOURCE=$cf_cv_xopen_source"
 

+for cf_add_cflags in $cf_temp_xopen_source
+do
+       case "x$cf_add_cflags" in
+       (x-[DU]*)
+
+cf_tmp_cflag=`echo "x$cf_add_cflags" | sed -e 's/^.//' -e 's/=.*//'`
+while true
+do
+       cf_old_cflag=`echo "x$CFLAGS" | sed -e 's/^.//' -e 's/[         ][      ]*-/ -/g' -e "s%$cf_tmp_cflag\\(=[^     ][^     ]*\\)\?%%" -e 's/^[     ]*//' -e 's%[ ][ ]*-D% -D%g' -e 's%[ ][ ]*-I% -I%g'`
+       test "$CFLAGS" != "$cf_old_cflag" || break
+
+       CFLAGS="$cf_old_cflag"
+done
+
+cf_tmp_cflag=`echo "x$cf_add_cflags" | sed -e 's/^.//' -e 's/=.*//'`
+while true
+do
+       cf_old_cflag=`echo "x$CPPFLAGS" | sed -e 's/^.//' -e 's/[       ][      ]*-/ -/g' -e "s%$cf_tmp_cflag\\(=[^     ][^     ]*\\)\?%%" -e 's/^[     ]*//' -e 's%[ ][ ]*-D% -D%g' -e 's%[ ][ ]*-I% -I%g'`
+       test "$CPPFLAGS" != "$cf_old_cflag" || break
+
+       CPPFLAGS="$cf_old_cflag"
+done
+
+               ;;
+       esac
+

 cf_fix_cppflags=no
 cf_new_cflags=
 cf_new_cppflags=
 cf_new_extra_cppflags=
 
 cf_fix_cppflags=no
 cf_new_cflags=
 cf_new_cppflags=
 cf_new_extra_cppflags=
 

-for cf_add_cflags in $cf_temp_xopen_source
+for cf_add_cflags in $cf_add_cflags

 do
 case "$cf_fix_cppflags" in
 (no)
 do
 case "$cf_fix_cppflags" in
 (no)


@@ -10742,6 +10937,8 @@ if test -n "$cf_new_extra_cppflags" ; then
 
 fi
 
 
 fi
 

+done
+

 fi
 
 if test "$cf_cv_posix_visible" = no; then
 fi
 
 if test "$cf_cv_posix_visible" = no; then


@@ -10759,16 +10956,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:10762: checking if we should define _POSIX_C_SOURCE" >&5
+echo "$as_me:10959: 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}:10768: testing if the symbol is already defined go no further ..." 1>&5
+echo "${as_me:-configure}:10965: testing if the symbol is already defined go no further ..." 1>&5

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

-#line 10771 "configure"
+#line 10968 "configure"

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


@@ -10783,16 +10980,16 @@ make an error
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
 }
 _ACEOF
 rm -f "conftest.$ac_objext"

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

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

-  echo "$as_me:10789: \$? = $ac_status" >&5
+  echo "$as_me:10986: \$? = $ac_status" >&5

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

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

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

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


@@ -10813,7 +11010,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 10816 "configure"
+#line 11013 "configure"

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


@@ -10828,16 +11025,16 @@ make an error
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
 }
 _ACEOF
 rm -f "conftest.$ac_objext"

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

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

-  echo "$as_me:10834: \$? = $ac_status" >&5
+  echo "$as_me:11031: \$? = $ac_status" >&5

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

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

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

-  echo "$as_me:10840: \$? = $ac_status" >&5
+  echo "$as_me:11037: \$? = $ac_status" >&5

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


@@ -10848,7 +11045,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
         fi
 
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
         fi
 

-echo "${as_me:-configure}:10851: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
+echo "${as_me:-configure}:11048: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5

 
         CFLAGS="$cf_trim_CFLAGS"
         CPPFLAGS="$cf_trim_CPPFLAGS"
 
         CFLAGS="$cf_trim_CFLAGS"
         CPPFLAGS="$cf_trim_CPPFLAGS"


@@ -10856,10 +11053,10 @@ echo "${as_me:-configure}:10851: testing ifdef from value $cf_POSIX_C_SOURCE ...
        test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
        CPPFLAGS="${CPPFLAGS}$cf_cv_posix_c_source"
 
        test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
        CPPFLAGS="${CPPFLAGS}$cf_cv_posix_c_source"
 

-echo "${as_me:-configure}:10859: testing if the second compile does not leave our definition intact error ..." 1>&5
+echo "${as_me:-configure}:11056: 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 10862 "configure"
+#line 11059 "configure"

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


@@ -10874,16 +11071,16 @@ make an error
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
 }
 _ACEOF
 rm -f "conftest.$ac_objext"

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

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

-  echo "$as_me:10880: \$? = $ac_status" >&5
+  echo "$as_me:11077: \$? = $ac_status" >&5

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

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

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

-  echo "$as_me:10886: \$? = $ac_status" >&5
+  echo "$as_me:11083: \$? = $ac_status" >&5

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


@@ -10899,7 +11096,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi

-echo "$as_me:10902: result: $cf_cv_posix_c_source" >&5
+echo "$as_me:11099: 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


@@ -11013,12 +11210,44 @@ esac
 
 if test -n "$cf_xopen_source" ; then
 
 
 if test -n "$cf_xopen_source" ; then
 

+for cf_add_cflags in $cf_xopen_source
+do
+       case "x$cf_add_cflags" in
+       (x-[DU]*)
+
+cf_tmp_cflag=`echo "x$cf_add_cflags" | sed -e 's/^.//' -e 's/=.*//'`
+while true
+do
+       cf_old_cflag=`echo "x$CFLAGS" | sed -e 's/^.//' -e 's/[         ][      ]*-/ -/g' -e "s%$cf_tmp_cflag\\(=[^     ][^     ]*\\)\?%%" -e 's/^[     ]*//' -e 's%[ ][ ]*-D% -D%g' -e 's%[ ][ ]*-I% -I%g'`
+       test "$CFLAGS" != "$cf_old_cflag" || break
+       test -n "$verbose" && echo "    removing old option $cf_add_cflags from CFLAGS" 1>&6
+
+echo "${as_me:-configure}:11225: testing removing old option $cf_add_cflags from CFLAGS ..." 1>&5
+
+       CFLAGS="$cf_old_cflag"
+done
+
+cf_tmp_cflag=`echo "x$cf_add_cflags" | sed -e 's/^.//' -e 's/=.*//'`
+while true
+do
+       cf_old_cflag=`echo "x$CPPFLAGS" | sed -e 's/^.//' -e 's/[       ][      ]*-/ -/g' -e "s%$cf_tmp_cflag\\(=[^     ][^     ]*\\)\?%%" -e 's/^[     ]*//' -e 's%[ ][ ]*-D% -D%g' -e 's%[ ][ ]*-I% -I%g'`
+       test "$CPPFLAGS" != "$cf_old_cflag" || break
+       test -n "$verbose" && echo "    removing old option $cf_add_cflags from CPPFLAGS" 1>&6
+
+echo "${as_me:-configure}:11237: testing removing old option $cf_add_cflags from CPPFLAGS ..." 1>&5
+
+       CPPFLAGS="$cf_old_cflag"
+done
+
+               ;;
+       esac
+

 cf_fix_cppflags=no
 cf_new_cflags=
 cf_new_cppflags=
 cf_new_extra_cppflags=
 
 cf_fix_cppflags=no
 cf_new_cflags=
 cf_new_cppflags=
 cf_new_extra_cppflags=
 

-for cf_add_cflags in $cf_xopen_source
+for cf_add_cflags in $cf_add_cflags

 do
 case "$cf_fix_cppflags" in
 (no)
 do
 case "$cf_fix_cppflags" in
 (no)


@@ -11093,7 +11322,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}:11096: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
+echo "${as_me:-configure}:11325: 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"


@@ -11103,7 +11332,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}:11106: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
+echo "${as_me:-configure}:11335: 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"


@@ -11113,20 +11342,22 @@ 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}:11116: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5
+echo "${as_me:-configure}:11345: 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"
 
 fi
 
 
        test -n "$EXTRA_CPPFLAGS" && EXTRA_CPPFLAGS="$EXTRA_CPPFLAGS "
        EXTRA_CPPFLAGS="${EXTRA_CPPFLAGS}$cf_new_extra_cppflags"
 
 fi
 

+done
+

 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:11126: checking if _XOPEN_SOURCE really is set" >&5
+       echo "$as_me:11357: 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 11129 "configure"
+#line 11360 "configure"

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


@@ -11141,16 +11372,16 @@ make an error
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
 }
 _ACEOF
 rm -f "conftest.$ac_objext"

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

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

-  echo "$as_me:11147: \$? = $ac_status" >&5
+  echo "$as_me:11378: \$? = $ac_status" >&5

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

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

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

-  echo "$as_me:11153: \$? = $ac_status" >&5
+  echo "$as_me:11384: \$? = $ac_status" >&5

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


@@ -11159,12 +11390,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:11162: result: $cf_XOPEN_SOURCE_set" >&5
+       echo "$as_me:11393: 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 11167 "configure"
+#line 11398 "configure"

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


@@ -11179,16 +11410,16 @@ make an error
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
 }
 _ACEOF
 rm -f "conftest.$ac_objext"

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

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

-  echo "$as_me:11185: \$? = $ac_status" >&5
+  echo "$as_me:11416: \$? = $ac_status" >&5

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

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

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

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


@@ -11199,19 +11430,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:11202: WARNING: _XOPEN_SOURCE is lower than requested" >&5
+                       { echo "$as_me:11433: 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:11207: checking if we should define _XOPEN_SOURCE" >&5
+echo "$as_me:11438: 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 11214 "configure"
+#line 11445 "configure"

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


@@ -11230,16 +11461,16 @@ make an error
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
 }
 _ACEOF
 rm -f "conftest.$ac_objext"

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

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

-  echo "$as_me:11236: \$? = $ac_status" >&5
+  echo "$as_me:11467: \$? = $ac_status" >&5

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

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

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

-  echo "$as_me:11242: \$? = $ac_status" >&5
+  echo "$as_me:11473: \$? = $ac_status" >&5

   (exit "$ac_status"); }; }; then
   cf_cv_xopen_source=no
 else
   (exit "$ac_status"); }; }; then
   cf_cv_xopen_source=no
 else


@@ -11251,7 +11482,7 @@ cf_save="$CPPFLAGS"
        CPPFLAGS="${CPPFLAGS}-D_XOPEN_SOURCE=$cf_XOPEN_SOURCE"
 
         cat >"conftest.$ac_ext" <<_ACEOF
        CPPFLAGS="${CPPFLAGS}-D_XOPEN_SOURCE=$cf_XOPEN_SOURCE"
 
         cat >"conftest.$ac_ext" <<_ACEOF

-#line 11254 "configure"
+#line 11485 "configure"

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


@@ -11270,16 +11501,16 @@ make an error
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
 }
 _ACEOF
 rm -f "conftest.$ac_objext"

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

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

-  echo "$as_me:11276: \$? = $ac_status" >&5
+  echo "$as_me:11507: \$? = $ac_status" >&5

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

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

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

-  echo "$as_me:11282: \$? = $ac_status" >&5
+  echo "$as_me:11513: \$? = $ac_status" >&5

   (exit "$ac_status"); }; }; then
   cf_cv_xopen_source=no
 else
   (exit "$ac_status"); }; }; then
   cf_cv_xopen_source=no
 else


@@ -11294,7 +11525,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi

-echo "$as_me:11297: result: $cf_cv_xopen_source" >&5
+echo "$as_me:11528: 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


@@ -11309,12 +11540,38 @@ CPPFLAGS=`echo "$CPPFLAGS" | \
 
        cf_temp_xopen_source="-D_XOPEN_SOURCE=$cf_cv_xopen_source"
 
 
        cf_temp_xopen_source="-D_XOPEN_SOURCE=$cf_cv_xopen_source"
 

+for cf_add_cflags in $cf_temp_xopen_source
+do
+       case "x$cf_add_cflags" in
+       (x-[DU]*)
+
+cf_tmp_cflag=`echo "x$cf_add_cflags" | sed -e 's/^.//' -e 's/=.*//'`
+while true
+do
+       cf_old_cflag=`echo "x$CFLAGS" | sed -e 's/^.//' -e 's/[         ][      ]*-/ -/g' -e "s%$cf_tmp_cflag\\(=[^     ][^     ]*\\)\?%%" -e 's/^[     ]*//' -e 's%[ ][ ]*-D% -D%g' -e 's%[ ][ ]*-I% -I%g'`
+       test "$CFLAGS" != "$cf_old_cflag" || break
+
+       CFLAGS="$cf_old_cflag"
+done
+
+cf_tmp_cflag=`echo "x$cf_add_cflags" | sed -e 's/^.//' -e 's/=.*//'`
+while true
+do
+       cf_old_cflag=`echo "x$CPPFLAGS" | sed -e 's/^.//' -e 's/[       ][      ]*-/ -/g' -e "s%$cf_tmp_cflag\\(=[^     ][^     ]*\\)\?%%" -e 's/^[     ]*//' -e 's%[ ][ ]*-D% -D%g' -e 's%[ ][ ]*-I% -I%g'`
+       test "$CPPFLAGS" != "$cf_old_cflag" || break
+
+       CPPFLAGS="$cf_old_cflag"
+done
+
+               ;;
+       esac
+

 cf_fix_cppflags=no
 cf_new_cflags=
 cf_new_cppflags=
 cf_new_extra_cppflags=
 
 cf_fix_cppflags=no
 cf_new_cflags=
 cf_new_cppflags=
 cf_new_extra_cppflags=
 

-for cf_add_cflags in $cf_temp_xopen_source
+for cf_add_cflags in $cf_add_cflags

 do
 case "$cf_fix_cppflags" in
 (no)
 do
 case "$cf_fix_cppflags" in
 (no)


@@ -11407,6 +11664,8 @@ if test -n "$cf_new_extra_cppflags" ; then
 
 fi
 
 
 fi
 

+done
+

 fi
 
        fi
 fi
 
        fi


@@ -11417,14 +11676,14 @@ CPPFLAGS_after_XOPEN="$CPPFLAGS"
 
 # Work around breakage on OS X
 
 
 # Work around breakage on OS X
 

-echo "$as_me:11420: checking if SIGWINCH is defined" >&5
+echo "$as_me:11679: 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 11427 "configure"
+#line 11686 "configure"

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


@@ -11439,23 +11698,23 @@ int x = SIGWINCH; (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
 }
 _ACEOF
 rm -f "conftest.$ac_objext"

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

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

-  echo "$as_me:11445: \$? = $ac_status" >&5
+  echo "$as_me:11704: \$? = $ac_status" >&5

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

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

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

-  echo "$as_me:11451: \$? = $ac_status" >&5
+  echo "$as_me:11710: \$? = $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 11458 "configure"
+#line 11717 "configure"

 #include "confdefs.h"
 
 #undef _XOPEN_SOURCE
 #include "confdefs.h"
 
 #undef _XOPEN_SOURCE


@@ -11473,16 +11732,16 @@ int x = SIGWINCH; (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
 }
 _ACEOF
 rm -f "conftest.$ac_objext"

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

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

-  echo "$as_me:11479: \$? = $ac_status" >&5
+  echo "$as_me:11738: \$? = $ac_status" >&5

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

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

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

-  echo "$as_me:11485: \$? = $ac_status" >&5
+  echo "$as_me:11744: \$? = $ac_status" >&5

   (exit "$ac_status"); }; }; then
   cf_cv_define_sigwinch=maybe
 else
   (exit "$ac_status"); }; }; then
   cf_cv_define_sigwinch=maybe
 else


@@ -11496,11 +11755,11 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi

-echo "$as_me:11499: result: $cf_cv_define_sigwinch" >&5
+echo "$as_me:11758: 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:11503: checking for actual SIGWINCH definition" >&5
+echo "$as_me:11762: 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


@@ -11511,7 +11770,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 11514 "configure"
+#line 11773 "configure"

 #include "confdefs.h"
 
 #undef _XOPEN_SOURCE
 #include "confdefs.h"
 
 #undef _XOPEN_SOURCE


@@ -11533,16 +11792,16 @@ int x = SIGWINCH; (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
 }
 _ACEOF
 rm -f "conftest.$ac_objext"

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

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

-  echo "$as_me:11539: \$? = $ac_status" >&5
+  echo "$as_me:11798: \$? = $ac_status" >&5

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

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

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

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


@@ -11556,7 +11815,7 @@ cf_sigwinch="`expr "$cf_sigwinch" - 1`"
 done
 
 fi
 done
 
 fi

-echo "$as_me:11559: result: $cf_cv_fixup_sigwinch" >&5
+echo "$as_me:11818: 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


@@ -11566,13 +11825,13 @@ fi
 
 # Checks for CODESET support.
 
 
 # Checks for CODESET support.
 

-echo "$as_me:11569: checking for nl_langinfo and CODESET" >&5
+echo "$as_me:11828: 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 11575 "configure"
+#line 11834 "configure"

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


@@ -11584,16 +11843,16 @@ char* cs = nl_langinfo(CODESET); (void)cs
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"

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

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

-  echo "$as_me:11590: \$? = $ac_status" >&5
+  echo "$as_me:11849: \$? = $ac_status" >&5

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

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

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

-  echo "$as_me:11596: \$? = $ac_status" >&5
+  echo "$as_me:11855: \$? = $ac_status" >&5

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


@@ -11604,7 +11863,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:11607: result: $am_cv_langinfo_codeset" >&5
+echo "$as_me:11866: 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
 


@@ -11618,7 +11877,7 @@ EOF
 NCURSES_OK_WCHAR_T=
 NCURSES_OK_WINT_T=
 
 NCURSES_OK_WCHAR_T=
 NCURSES_OK_WINT_T=
 

-echo "$as_me:11621: checking if you want wide-character code" >&5
+echo "$as_me:11880: 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.


@@ -11628,7 +11887,7 @@ if test "${enable_widec+set}" = set; then
 else
   with_widec=no
 fi;
 else
   with_widec=no
 fi;

-echo "$as_me:11631: result: $with_widec" >&5
+echo "$as_me:11890: result: $with_widec" >&5

 echo "${ECHO_T}$with_widec" >&6
 
 NCURSES_WCWIDTH_GRAPHICS=1
 echo "${ECHO_T}$with_widec" >&6
 
 NCURSES_WCWIDTH_GRAPHICS=1


@@ -11652,23 +11911,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:11655: checking for $ac_header" >&5
+echo "$as_me:11914: 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 11661 "configure"
+#line 11920 "configure"

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

-if { (eval echo "$as_me:11665: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:11924: \"$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:11671: \$? = $ac_status" >&5
+  echo "$as_me:11930: \$? = $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


@@ -11687,7 +11946,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi

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


@@ -11697,14 +11956,14 @@ EOF
 fi
 done
 
 fi
 done
 

-echo "$as_me:11700: checking if wchar.h can be used as is" >&5
+echo "$as_me:11959: 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 11707 "configure"
+#line 11966 "configure"

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


@@ -11726,16 +11985,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
 }
 _ACEOF
 rm -f "conftest.$ac_objext"

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

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

-  echo "$as_me:11732: \$? = $ac_status" >&5
+  echo "$as_me:11991: \$? = $ac_status" >&5

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

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

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

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


@@ -11745,16 +12004,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:11748: result: $cf_cv_wchar_h_okay" >&5
+echo "$as_me:12007: 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:11754: checking if we must define _XOPEN_SOURCE_EXTENDED" >&5
+echo "$as_me:12013: 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 11757 "configure"
+#line 12016 "configure"

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


@@ -11770,16 +12029,16 @@ make an error
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
 }
 _ACEOF
 rm -f "conftest.$ac_objext"

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

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

-  echo "$as_me:11776: \$? = $ac_status" >&5
+  echo "$as_me:12035: \$? = $ac_status" >&5

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

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

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

-  echo "$as_me:11782: \$? = $ac_status" >&5
+  echo "$as_me:12041: \$? = $ac_status" >&5

   (exit "$ac_status"); }; }; then
   cf_result=no
 else
   (exit "$ac_status"); }; }; then
   cf_result=no
 else


@@ -11788,16 +12047,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:11791: result: $cf_result" >&5
+echo "$as_me:12050: 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:11797: checking checking for compatible value versus " >&5
+       echo "$as_me:12056: 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 11800 "configure"
+#line 12059 "configure"

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


@@ -11813,16 +12072,16 @@ make an error
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
 }
 _ACEOF
 rm -f "conftest.$ac_objext"

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

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

-  echo "$as_me:11819: \$? = $ac_status" >&5
+  echo "$as_me:12078: \$? = $ac_status" >&5

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

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

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

-  echo "$as_me:11825: \$? = $ac_status" >&5
+  echo "$as_me:12084: \$? = $ac_status" >&5

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


@@ -11831,7 +12090,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:11834: result: $cf_result" >&5
+       echo "$as_me:12093: 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...


@@ -11841,7 +12100,7 @@ fi
 
 fi
 
 
 fi
 

-echo "$as_me:11844: checking if wcwidth agrees graphics are single-width" >&5
+echo "$as_me:12103: 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


@@ -11912,7 +12171,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 11915 "configure"
+#line 12174 "configure"

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


@@ -11956,15 +12215,15 @@ main(void)
 
 _ACEOF
 rm -f "conftest$ac_exeext"
 
 _ACEOF
 rm -f "conftest$ac_exeext"

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

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

-  echo "$as_me:11962: \$? = $ac_status" >&5
+  echo "$as_me:12221: \$? = $ac_status" >&5

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

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

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

-  echo "$as_me:11967: \$? = $ac_status" >&5
+  echo "$as_me:12226: \$? = $ac_status" >&5

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


@@ -11977,7 +12236,7 @@ rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftes
 fi
 
 fi
 fi
 
 fi

-echo "$as_me:11980: result: $cf_cv_wcwidth_graphics" >&5
+echo "$as_me:12239: 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


@@ -11988,13 +12247,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:11991: checking for $ac_func" >&5
+echo "$as_me:12250: 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 11997 "configure"
+#line 12256 "configure"

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


@@ -12025,16 +12284,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:12028: \"$ac_link\"") >&5
+if { (eval echo "$as_me:12287: \"$ac_link\"") >&5

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

-  echo "$as_me:12031: \$? = $ac_status" >&5
+  echo "$as_me:12290: \$? = $ac_status" >&5

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

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

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

-  echo "$as_me:12037: \$? = $ac_status" >&5
+  echo "$as_me:12296: \$? = $ac_status" >&5

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


@@ -12044,7 +12303,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:12047: result: `eval echo '${'"$as_ac_var"'}'`" >&5
+echo "$as_me:12306: 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


@@ -12059,23 +12318,23 @@ done
 for ac_header in wchar.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
 for ac_header in wchar.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`

-echo "$as_me:12062: checking for $ac_header" >&5
+echo "$as_me:12321: 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 12068 "configure"
+#line 12327 "configure"

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

-if { (eval echo "$as_me:12072: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:12331: \"$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:12078: \$? = $ac_status" >&5
+  echo "$as_me:12337: \$? = $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


@@ -12094,7 +12353,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi

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


@@ -12104,7 +12363,7 @@ EOF
 fi
 done
 
 fi
 done
 

-echo "$as_me:12107: checking for multibyte character support" >&5
+echo "$as_me:12366: 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


@@ -12112,7 +12371,7 @@ else
 
        cf_save_LIBS="$LIBS"
        cat >"conftest.$ac_ext" <<_ACEOF
 
        cf_save_LIBS="$LIBS"
        cat >"conftest.$ac_ext" <<_ACEOF

-#line 12115 "configure"
+#line 12374 "configure"

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


@@ -12130,16 +12389,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:12133: \"$ac_link\"") >&5
+if { (eval echo "$as_me:12392: \"$ac_link\"") >&5

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

-  echo "$as_me:12136: \$? = $ac_status" >&5
+  echo "$as_me:12395: \$? = $ac_status" >&5

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

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

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

-  echo "$as_me:12142: \$? = $ac_status" >&5
+  echo "$as_me:12401: \$? = $ac_status" >&5

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


@@ -12151,12 +12410,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}:12154: testing Starting FIND_LINKAGE(utf8,) ..." 1>&5
+echo "${as_me:-configure}:12413: 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 12159 "configure"
+#line 12418 "configure"

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


@@ -12169,16 +12428,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:12172: \"$ac_link\"") >&5
+if { (eval echo "$as_me:12431: \"$ac_link\"") >&5

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

-  echo "$as_me:12175: \$? = $ac_status" >&5
+  echo "$as_me:12434: \$? = $ac_status" >&5

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

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

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

-  echo "$as_me:12181: \$? = $ac_status" >&5
+  echo "$as_me:12440: \$? = $ac_status" >&5

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


@@ -12192,7 +12451,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 12195 "configure"
+#line 12454 "configure"

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


@@ -12205,16 +12464,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:12208: \"$ac_link\"") >&5
+if { (eval echo "$as_me:12467: \"$ac_link\"") >&5

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

-  echo "$as_me:12211: \$? = $ac_status" >&5
+  echo "$as_me:12470: \$? = $ac_status" >&5

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

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

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

-  echo "$as_me:12217: \$? = $ac_status" >&5
+  echo "$as_me:12476: \$? = $ac_status" >&5

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


@@ -12231,9 +12490,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}:12234: testing find linkage for utf8 library ..." 1>&5
+echo "${as_me:-configure}:12493: testing find linkage for utf8 library ..." 1>&5

 
 

-echo "${as_me:-configure}:12236: testing Searching for headers in FIND_LINKAGE(utf8,) ..." 1>&5
+echo "${as_me:-configure}:12495: 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"


@@ -12324,7 +12583,7 @@ cf_search="$cf_search $cf_header_path_list"
                if test -d "$cf_cv_header_path_utf8" ; then
                        test -n "$verbose" && echo "    ... testing $cf_cv_header_path_utf8" 1>&6
 
                if test -d "$cf_cv_header_path_utf8" ; then
                        test -n "$verbose" && echo "    ... testing $cf_cv_header_path_utf8" 1>&6
 

-echo "${as_me:-configure}:12327: testing ... testing $cf_cv_header_path_utf8 ..." 1>&5
+echo "${as_me:-configure}:12586: testing ... testing $cf_cv_header_path_utf8 ..." 1>&5

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


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

-#line 12335 "configure"
+#line 12594 "configure"

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


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

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

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

-  echo "$as_me:12351: \$? = $ac_status" >&5
+  echo "$as_me:12610: \$? = $ac_status" >&5

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

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

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

-  echo "$as_me:12357: \$? = $ac_status" >&5
+  echo "$as_me:12616: \$? = $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}:12362: testing ... found utf8 headers in $cf_cv_header_path_utf8 ..." 1>&5
+echo "${as_me:-configure}:12621: 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"


@@ -12377,7 +12636,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}:12380: testing Searching for utf8 library in FIND_LINKAGE(utf8,) ..." 1>&5
+echo "${as_me:-configure}:12639: 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"


@@ -12452,13 +12711,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}:12455: testing ... testing $cf_cv_library_path_utf8 ..." 1>&5
+echo "${as_me:-configure}:12714: 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 12461 "configure"
+#line 12720 "configure"

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


@@ -12471,21 +12730,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:12474: \"$ac_link\"") >&5
+if { (eval echo "$as_me:12733: \"$ac_link\"") >&5

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

-  echo "$as_me:12477: \$? = $ac_status" >&5
+  echo "$as_me:12736: \$? = $ac_status" >&5

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

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

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

-  echo "$as_me:12483: \$? = $ac_status" >&5
+  echo "$as_me:12742: \$? = $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}:12488: testing ... found utf8 library in $cf_cv_library_path_utf8 ..." 1>&5
+echo "${as_me:-configure}:12747: 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"


@@ -12527,7 +12786,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:12530: result: $cf_cv_utf8_lib" >&5
+echo "$as_me:12789: 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


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

-#line 12568 "configure"
+#line 12827 "configure"

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


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

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

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

-  echo "$as_me:12583: \$? = $ac_status" >&5
+  echo "$as_me:12842: \$? = $ac_status" >&5

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

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

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

-  echo "$as_me:12589: \$? = $ac_status" >&5
+  echo "$as_me:12848: \$? = $ac_status" >&5

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


@@ -12603,7 +12862,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}:12606: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:12865: testing adding $cf_add_incdir to include-path ..." 1>&5

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


@@ -12639,7 +12898,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}:12642: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:12901: testing adding $cf_add_libdir to library-path ..." 1>&5

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


@@ -12671,14 +12930,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:12674: checking if we must include wchar.h to declare mbstate_t" >&5
+echo "$as_me:12933: 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 12681 "configure"
+#line 12940 "configure"

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


@@ -12696,23 +12955,23 @@ mbstate_t state
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
 }
 _ACEOF
 rm -f "conftest.$ac_objext"

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

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

-  echo "$as_me:12702: \$? = $ac_status" >&5
+  echo "$as_me:12961: \$? = $ac_status" >&5

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

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

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

-  echo "$as_me:12708: \$? = $ac_status" >&5
+  echo "$as_me:12967: \$? = $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 12715 "configure"
+#line 12974 "configure"

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


@@ -12731,16 +12990,16 @@ mbstate_t value
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
 }
 _ACEOF
 rm -f "conftest.$ac_objext"

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

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

-  echo "$as_me:12737: \$? = $ac_status" >&5
+  echo "$as_me:12996: \$? = $ac_status" >&5

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

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

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

-  echo "$as_me:12743: \$? = $ac_status" >&5
+  echo "$as_me:13002: \$? = $ac_status" >&5

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


@@ -12752,7 +13011,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:12755: result: $cf_cv_mbstate_t" >&5
+echo "$as_me:13014: 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


@@ -12770,14 +13029,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:12773: checking if we must include wchar.h to declare wchar_t" >&5
+echo "$as_me:13032: 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 12780 "configure"
+#line 13039 "configure"

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


@@ -12795,23 +13054,23 @@ wchar_t state
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
 }
 _ACEOF
 rm -f "conftest.$ac_objext"

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

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

-  echo "$as_me:12801: \$? = $ac_status" >&5
+  echo "$as_me:13060: \$? = $ac_status" >&5

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

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

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

-  echo "$as_me:12807: \$? = $ac_status" >&5
+  echo "$as_me:13066: \$? = $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 12814 "configure"
+#line 13073 "configure"

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


@@ -12830,16 +13089,16 @@ wchar_t value
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
 }
 _ACEOF
 rm -f "conftest.$ac_objext"

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

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

-  echo "$as_me:12836: \$? = $ac_status" >&5
+  echo "$as_me:13095: \$? = $ac_status" >&5

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

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

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

-  echo "$as_me:12842: \$? = $ac_status" >&5
+  echo "$as_me:13101: \$? = $ac_status" >&5

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


@@ -12851,7 +13110,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:12854: result: $cf_cv_wchar_t" >&5
+echo "$as_me:13113: 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


@@ -12874,14 +13133,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:12877: checking if we must include wchar.h to declare wint_t" >&5
+echo "$as_me:13136: 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 12884 "configure"
+#line 13143 "configure"

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


@@ -12899,23 +13158,23 @@ wint_t state
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
 }
 _ACEOF
 rm -f "conftest.$ac_objext"

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

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

-  echo "$as_me:12905: \$? = $ac_status" >&5
+  echo "$as_me:13164: \$? = $ac_status" >&5

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

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

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

-  echo "$as_me:12911: \$? = $ac_status" >&5
+  echo "$as_me:13170: \$? = $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 12918 "configure"
+#line 13177 "configure"

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


@@ -12934,16 +13193,16 @@ wint_t value
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
 }
 _ACEOF
 rm -f "conftest.$ac_objext"

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

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

-  echo "$as_me:12940: \$? = $ac_status" >&5
+  echo "$as_me:13199: \$? = $ac_status" >&5

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

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

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

-  echo "$as_me:12946: \$? = $ac_status" >&5
+  echo "$as_me:13205: \$? = $ac_status" >&5

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


@@ -12955,7 +13214,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:12958: result: $cf_cv_wint_t" >&5
+echo "$as_me:13217: 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


@@ -12987,7 +13246,7 @@ EOF
 fi
 
 ###   use option --disable-lp64 to allow long chtype
 fi
 
 ###   use option --disable-lp64 to allow long chtype

-echo "$as_me:12990: checking whether to enable _LP64 definition in curses.h" >&5
+echo "$as_me:13249: 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.


@@ -12997,7 +13256,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:13000: result: $with_lp64" >&5
+echo "$as_me:13259: 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


@@ -13013,7 +13272,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:13016: checking for special C compiler options needed for large files" >&5
+  echo "$as_me:13275: 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


@@ -13025,7 +13284,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 13028 "configure"
+#line 13287 "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.


@@ -13045,16 +13304,16 @@ main (void)
 }
 _ACEOF
         rm -f "conftest.$ac_objext"
 }
 _ACEOF
         rm -f "conftest.$ac_objext"

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

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

-  echo "$as_me:13051: \$? = $ac_status" >&5
+  echo "$as_me:13310: \$? = $ac_status" >&5

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

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

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

-  echo "$as_me:13057: \$? = $ac_status" >&5
+  echo "$as_me:13316: \$? = $ac_status" >&5

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


@@ -13064,16 +13323,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:13067: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:13326: \"$ac_compile\"") >&5

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

-  echo "$as_me:13070: \$? = $ac_status" >&5
+  echo "$as_me:13329: \$? = $ac_status" >&5

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

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

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

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


@@ -13087,13 +13346,13 @@ rm -f "conftest.$ac_objext"
        rm -f "conftest.$ac_ext"
     fi
 fi
        rm -f "conftest.$ac_ext"
     fi
 fi

-echo "$as_me:13090: result: $ac_cv_sys_largefile_CC" >&5
+echo "$as_me:13349: 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:13096: checking for _FILE_OFFSET_BITS value needed for large files" >&5
+  echo "$as_me:13355: 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


@@ -13101,7 +13360,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 13104 "configure"
+#line 13363 "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.


@@ -13121,16 +13380,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
 }
 _ACEOF
 rm -f "conftest.$ac_objext"

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

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

-  echo "$as_me:13127: \$? = $ac_status" >&5
+  echo "$as_me:13386: \$? = $ac_status" >&5

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

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

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

-  echo "$as_me:13133: \$? = $ac_status" >&5
+  echo "$as_me:13392: \$? = $ac_status" >&5

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


@@ -13139,7 +13398,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 13142 "configure"
+#line 13401 "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>


@@ -13160,16 +13419,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
 }
 _ACEOF
 rm -f "conftest.$ac_objext"

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

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

-  echo "$as_me:13166: \$? = $ac_status" >&5
+  echo "$as_me:13425: \$? = $ac_status" >&5

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

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

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

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


@@ -13180,7 +13439,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
   break
 done
 fi
   break
 done
 fi

-echo "$as_me:13183: result: $ac_cv_sys_file_offset_bits" >&5
+echo "$as_me:13442: 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
 


@@ -13190,7 +13449,7 @@ EOF
 
 fi
 rm -rf conftest*
 
 fi
 rm -rf conftest*

-  echo "$as_me:13193: checking for _LARGE_FILES value needed for large files" >&5
+  echo "$as_me:13452: 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


@@ -13198,7 +13457,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 13201 "configure"
+#line 13460 "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.


@@ -13218,16 +13477,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
 }
 _ACEOF
 rm -f "conftest.$ac_objext"

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

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

-  echo "$as_me:13224: \$? = $ac_status" >&5
+  echo "$as_me:13483: \$? = $ac_status" >&5

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

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

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

-  echo "$as_me:13230: \$? = $ac_status" >&5
+  echo "$as_me:13489: \$? = $ac_status" >&5

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


@@ -13236,7 +13495,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 13239 "configure"
+#line 13498 "configure"

 #include "confdefs.h"
 #define _LARGE_FILES 1
 #include <sys/types.h>
 #include "confdefs.h"
 #define _LARGE_FILES 1
 #include <sys/types.h>


@@ -13257,16 +13516,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
 }
 _ACEOF
 rm -f "conftest.$ac_objext"

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

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

-  echo "$as_me:13263: \$? = $ac_status" >&5
+  echo "$as_me:13522: \$? = $ac_status" >&5

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

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

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

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


@@ -13277,7 +13536,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
   break
 done
 fi
   break
 done
 fi

-echo "$as_me:13280: result: $ac_cv_sys_large_files" >&5
+echo "$as_me:13539: 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
 


@@ -13290,7 +13549,7 @@ rm -rf conftest*
 fi
 
        if test "$enable_largefile" != no ; then
 fi
 
        if test "$enable_largefile" != no ; then

-       echo "$as_me:13293: checking for _LARGEFILE_SOURCE value needed for large files" >&5
+       echo "$as_me:13552: 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


@@ -13298,7 +13557,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 13301 "configure"
+#line 13560 "configure"

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


@@ -13310,16 +13569,16 @@ return !fseeko;
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
 }
 _ACEOF
 rm -f "conftest.$ac_objext"

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

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

-  echo "$as_me:13316: \$? = $ac_status" >&5
+  echo "$as_me:13575: \$? = $ac_status" >&5

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

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

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

-  echo "$as_me:13322: \$? = $ac_status" >&5
+  echo "$as_me:13581: \$? = $ac_status" >&5

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


@@ -13328,7 +13587,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 13331 "configure"
+#line 13590 "configure"

 #include "confdefs.h"
 #define _LARGEFILE_SOURCE 1
 #include <stdio.h>
 #include "confdefs.h"
 #define _LARGEFILE_SOURCE 1
 #include <stdio.h>


@@ -13341,16 +13600,16 @@ return !fseeko;
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
 }
 _ACEOF
 rm -f "conftest.$ac_objext"

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

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

-  echo "$as_me:13347: \$? = $ac_status" >&5
+  echo "$as_me:13606: \$? = $ac_status" >&5

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

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

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

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


@@ -13361,7 +13620,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
   break
 done
 fi
   break
 done
 fi

-echo "$as_me:13364: result: $ac_cv_sys_largefile_source" >&5
+echo "$as_me:13623: 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
 


@@ -13375,13 +13634,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:13378: checking for fseeko" >&5
+echo "$as_me:13637: 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 13384 "configure"
+#line 13643 "configure"

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


@@ -13393,16 +13652,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:13396: \"$ac_link\"") >&5
+if { (eval echo "$as_me:13655: \"$ac_link\"") >&5

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

-  echo "$as_me:13399: \$? = $ac_status" >&5
+  echo "$as_me:13658: \$? = $ac_status" >&5

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

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

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

-  echo "$as_me:13405: \$? = $ac_status" >&5
+  echo "$as_me:13664: \$? = $ac_status" >&5

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


@@ -13412,7 +13671,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:13415: result: $ac_cv_func_fseeko" >&5
+echo "$as_me:13674: 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
 


@@ -13451,14 +13710,14 @@ fi
 
        fi
 
 
        fi
 

-       echo "$as_me:13454: checking whether to use struct dirent64" >&5
+       echo "$as_me:13713: 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 13461 "configure"
+#line 13720 "configure"

 #include "confdefs.h"
 
 #pragma GCC diagnostic error "-Wincompatible-pointer-types"
 #include "confdefs.h"
 
 #pragma GCC diagnostic error "-Wincompatible-pointer-types"


@@ -13481,16 +13740,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
 }
 _ACEOF
 rm -f "conftest.$ac_objext"

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

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

-  echo "$as_me:13487: \$? = $ac_status" >&5
+  echo "$as_me:13746: \$? = $ac_status" >&5

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

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

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

-  echo "$as_me:13493: \$? = $ac_status" >&5
+  echo "$as_me:13752: \$? = $ac_status" >&5

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


@@ -13501,7 +13760,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi

-echo "$as_me:13504: result: $cf_cv_struct_dirent64" >&5
+echo "$as_me:13763: 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


@@ -13511,7 +13770,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:13514: checking if you want tparm not to use X/Open fixed-parameter list" >&5
+echo "$as_me:13773: 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.


@@ -13521,14 +13780,14 @@ if test "${enable_tparm_varargs+set}" = set; then
 else
   with_tparm_varargs=yes
 fi;
 else
   with_tparm_varargs=yes
 fi;

-echo "$as_me:13524: result: $with_tparm_varargs" >&5
+echo "$as_me:13783: 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:13531: checking if you want tic library to use explicit dependency on ncurses$LIB_SUFFIX library" >&5
+echo "$as_me:13790: 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.


@@ -13538,34 +13797,34 @@ if test "${enable_tic_depends+set}" = set; then
 else
   with_tic_depends=yes
 fi;
 else
   with_tic_depends=yes
 fi;

-echo "$as_me:13541: result: $with_tic_depends" >&5
+echo "$as_me:13800: result: $with_tic_depends" >&5

 echo "${ECHO_T}$with_tic_depends" >&6
 else
        with_tic_depends=no
 fi
 
 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:13548: 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
+###   use option --enable-wattr-macros to enable wattr* macros in curses.h
+echo "$as_me:13807: checking if you want to enable wattr* macros" >&5
+echo $ECHO_N "checking if you want to enable wattr* macros... $ECHO_C" >&6

 
 # Check whether --enable-wattr-macros or --disable-wattr-macros was given.
 if test "${enable_wattr_macros+set}" = set; then
   enableval="$enable_wattr_macros"
   with_wattr_macros=$enableval
 else
 
 # Check whether --enable-wattr-macros or --disable-wattr-macros was given.
 if test "${enable_wattr_macros+set}" = set; then
   enableval="$enable_wattr_macros"
   with_wattr_macros=$enableval
 else

-  with_wattr_macros=yes
+  with_wattr_macros=no

 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:13560: result: yes" >&5
-echo "${ECHO_T}yes" >&6
+       echo "$as_me:13819: result: no" >&5
+echo "${ECHO_T}no" >&6

 else
        NCURSES_WATTR_MACROS=1
 else
        NCURSES_WATTR_MACROS=1

-       echo "$as_me:13564: result: no" >&5
-echo "${ECHO_T}no" >&6
+       echo "$as_me:13823: result: yes" >&5
+echo "${ECHO_T}yes" >&6

 fi
 
 fi
 

-echo "$as_me:13568: checking for X11 rgb file" >&5
+echo "$as_me:13827: checking for X11 rgb file" >&5

 echo $ECHO_N "checking for X11 rgb file... $ECHO_C" >&6
 
 # Check whether --with-x11-rgb or --without-x11-rgb was given.
 echo $ECHO_N "checking for X11 rgb file... $ECHO_C" >&6
 
 # Check whether --with-x11-rgb or --without-x11-rgb was given.


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

-       { { echo "$as_me:13632: error: expected a pathname, not \"$cf_path\"" >&5
+       { { echo "$as_me:13891: error: expected a pathname, not \"$cf_path\"" >&5

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


@@ -13637,7 +13896,7 @@ esac
 
 fi
 
 
 fi
 

-echo "$as_me:13640: result: $RGB_PATH" >&5
+echo "$as_me:13899: result: $RGB_PATH" >&5

 echo "${ECHO_T}$RGB_PATH" >&6
 
 cat >>confdefs.h <<EOF
 echo "${ECHO_T}$RGB_PATH" >&6
 
 cat >>confdefs.h <<EOF


@@ -13651,7 +13910,7 @@ then
 fi
 
 ###   use option --with-bool to override bool's type
 fi
 
 ###   use option --with-bool to override bool's type

-echo "$as_me:13654: checking for type of bool" >&5
+echo "$as_me:13913: 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.


@@ -13661,10 +13920,10 @@ if test "${with_bool+set}" = set; then
 else
   NCURSES_BOOL=auto
 fi;
 else
   NCURSES_BOOL=auto
 fi;

-echo "$as_me:13664: result: $NCURSES_BOOL" >&5
+echo "$as_me:13923: result: $NCURSES_BOOL" >&5

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

-echo "$as_me:13667: checking for alternate terminal capabilities file" >&5
+echo "$as_me:13926: 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.


@@ -13675,11 +13934,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:13678: result: $TERMINFO_CAPS" >&5
+echo "$as_me:13937: 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:13682: checking for type of chtype" >&5
+echo "$as_me:13941: 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.


@@ -13689,11 +13948,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:13692: result: $NCURSES_CHTYPE" >&5
+echo "$as_me:13951: 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:13696: checking for type of ospeed" >&5
+echo "$as_me:13955: 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.


@@ -13703,11 +13962,11 @@ if test "${with_ospeed+set}" = set; then
 else
   NCURSES_OSPEED=short
 fi;
 else
   NCURSES_OSPEED=short
 fi;

-echo "$as_me:13706: result: $NCURSES_OSPEED" >&5
+echo "$as_me:13965: 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:13710: checking for type of mmask_t" >&5
+echo "$as_me:13969: 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.


@@ -13717,11 +13976,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:13720: result: $NCURSES_MMASK_T" >&5
+echo "$as_me:13979: 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:13724: checking for size CCHARW_MAX" >&5
+echo "$as_me:13983: 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.


@@ -13731,16 +13990,16 @@ if test "${with_ccharw_max+set}" = set; then
 else
   NCURSES_CCHARW_MAX=5
 fi;
 else
   NCURSES_CCHARW_MAX=5
 fi;

-echo "$as_me:13734: result: $NCURSES_CCHARW_MAX" >&5
+echo "$as_me:13993: result: $NCURSES_CCHARW_MAX" >&5

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

-echo "$as_me:13737: checking for ANSI C header files" >&5
+echo "$as_me:13996: 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 13743 "configure"
+#line 14002 "configure"

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


@@ -13748,13 +14007,13 @@ else
 #include <float.h>
 
 _ACEOF
 #include <float.h>
 
 _ACEOF

-if { (eval echo "$as_me:13751: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:14010: \"$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:13757: \$? = $ac_status" >&5
+  echo "$as_me:14016: \$? = $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


@@ -13776,7 +14035,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 13779 "configure"
+#line 14038 "configure"

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


@@ -13794,7 +14053,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 13797 "configure"
+#line 14056 "configure"

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


@@ -13815,7 +14074,7 @@ if test $ac_cv_header_stdc = yes; then
   :
 else
   cat >"conftest.$ac_ext" <<_ACEOF
   :
 else
   cat >"conftest.$ac_ext" <<_ACEOF

-#line 13818 "configure"
+#line 14077 "configure"

 #include "confdefs.h"
 #include <ctype.h>
 #if ((' ' & 0x0FF) == 0x020)
 #include "confdefs.h"
 #include <ctype.h>
 #if ((' ' & 0x0FF) == 0x020)


@@ -13841,15 +14100,15 @@ main (void)
 }
 _ACEOF
 rm -f "conftest$ac_exeext"
 }
 _ACEOF
 rm -f "conftest$ac_exeext"

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

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

-  echo "$as_me:13847: \$? = $ac_status" >&5
+  echo "$as_me:14106: \$? = $ac_status" >&5

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

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

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

-  echo "$as_me:13852: \$? = $ac_status" >&5
+  echo "$as_me:14111: \$? = $ac_status" >&5

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


@@ -13862,7 +14121,7 @@ rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftes
 fi
 fi
 fi
 fi
 fi
 fi

-echo "$as_me:13865: result: $ac_cv_header_stdc" >&5
+echo "$as_me:14124: 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
 


@@ -13878,28 +14137,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:13881: checking for $ac_header" >&5
+echo "$as_me:14140: 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 13887 "configure"
+#line 14146 "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:13893: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:14152: \"$ac_compile\"") >&5

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

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

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

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

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

-  echo "$as_me:13902: \$? = $ac_status" >&5
+  echo "$as_me:14161: \$? = $ac_status" >&5

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


@@ -13909,7 +14168,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:13912: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:14171: 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


@@ -13919,13 +14178,13 @@ EOF
 fi
 done
 
 fi
 done
 

-echo "$as_me:13922: checking for signed char" >&5
+echo "$as_me:14181: 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 13928 "configure"
+#line 14187 "configure"

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


@@ -13940,16 +14199,16 @@ if (sizeof (signed char))
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
 }
 _ACEOF
 rm -f "conftest.$ac_objext"

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

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

-  echo "$as_me:13946: \$? = $ac_status" >&5
+  echo "$as_me:14205: \$? = $ac_status" >&5

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

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

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

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


@@ -13959,10 +14218,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:13962: result: $ac_cv_type_signed_char" >&5
+echo "$as_me:14221: 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:13965: checking size of signed char" >&5
+echo "$as_me:14224: 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


@@ -13971,7 +14230,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 13974 "configure"
+#line 14233 "configure"

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


@@ -13983,21 +14242,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:13986: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:14245: \"$ac_compile\"") >&5

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

-  echo "$as_me:13989: \$? = $ac_status" >&5
+  echo "$as_me:14248: \$? = $ac_status" >&5

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

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

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

-  echo "$as_me:13995: \$? = $ac_status" >&5
+  echo "$as_me:14254: \$? = $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 14000 "configure"
+#line 14259 "configure"

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


@@ -14009,16 +14268,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:14012: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:14271: \"$ac_compile\"") >&5

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

-  echo "$as_me:14015: \$? = $ac_status" >&5
+  echo "$as_me:14274: \$? = $ac_status" >&5

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

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

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

-  echo "$as_me:14021: \$? = $ac_status" >&5
+  echo "$as_me:14280: \$? = $ac_status" >&5

   (exit "$ac_status"); }; }; then
   ac_hi=$ac_mid; break
 else
   (exit "$ac_status"); }; }; then
   ac_hi=$ac_mid; break
 else


@@ -14034,7 +14293,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 14037 "configure"
+#line 14296 "configure"

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


@@ -14046,16 +14305,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:14049: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:14308: \"$ac_compile\"") >&5

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

-  echo "$as_me:14052: \$? = $ac_status" >&5
+  echo "$as_me:14311: \$? = $ac_status" >&5

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

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

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

-  echo "$as_me:14058: \$? = $ac_status" >&5
+  echo "$as_me:14317: \$? = $ac_status" >&5

   (exit "$ac_status"); }; }; then
   ac_lo=$ac_mid; break
 else
   (exit "$ac_status"); }; }; then
   ac_lo=$ac_mid; break
 else


@@ -14071,7 +14330,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 14074 "configure"
+#line 14333 "configure"

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


@@ -14083,16 +14342,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:14086: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:14345: \"$ac_compile\"") >&5

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

-  echo "$as_me:14089: \$? = $ac_status" >&5
+  echo "$as_me:14348: \$? = $ac_status" >&5

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

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

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

-  echo "$as_me:14095: \$? = $ac_status" >&5
+  echo "$as_me:14354: \$? = $ac_status" >&5

   (exit "$ac_status"); }; }; then
   ac_hi=$ac_mid
 else
   (exit "$ac_status"); }; }; then
   ac_hi=$ac_mid
 else


@@ -14105,12 +14364,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:14108: error: cannot run test program while cross compiling" >&5
+  { { echo "$as_me:14367: 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 14113 "configure"
+#line 14372 "configure"

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


@@ -14126,15 +14385,15 @@ fclose (f);
 }
 _ACEOF
 rm -f "conftest$ac_exeext"
 }
 _ACEOF
 rm -f "conftest$ac_exeext"

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

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

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

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

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

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

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


@@ -14150,7 +14409,7 @@ else
   ac_cv_sizeof_signed_char=0
 fi
 fi
   ac_cv_sizeof_signed_char=0
 fi
 fi

-echo "$as_me:14153: result: $ac_cv_sizeof_signed_char" >&5
+echo "$as_me:14412: 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


@@ -14161,7 +14420,7 @@ if test "$ac_cv_sizeof_signed_char" = 1 ; then
 else
        NCURSES_SBOOL="char"
 fi
 else
        NCURSES_SBOOL="char"
 fi

-echo "$as_me:14164: checking if you want to use signed Boolean array in term.h" >&5
+echo "$as_me:14423: 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.


@@ -14171,12 +14430,12 @@ if test "${enable_signed_char+set}" = set; then
 else
   with_signed_char=no
 fi;
 else
   with_signed_char=no
 fi;

-echo "$as_me:14174: result: $with_signed_char" >&5
+echo "$as_me:14433: result: $with_signed_char" >&5

 echo "${ECHO_T}$with_signed_char" >&6
 test "x$with_signed_char" != xyes && NCURSES_SBOOL="char"
 
 ###   use option --with-tparm-arg to override tparm's argument type
 echo "${ECHO_T}$with_signed_char" >&6
 test "x$with_signed_char" != xyes && NCURSES_SBOOL="char"
 
 ###   use option --with-tparm-arg to override tparm's argument type

-echo "$as_me:14179: checking for type of tparm args" >&5
+echo "$as_me:14438: 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.


@@ -14186,11 +14445,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:14189: result: $NCURSES_TPARM_ARG" >&5
+echo "$as_me:14448: 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:14193: checking if RCS identifiers should be compiled-in" >&5
+echo "$as_me:14452: 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.


@@ -14200,7 +14459,7 @@ if test "${with_rcs_ids+set}" = set; then
 else
   with_rcs_ids=no
 fi;
 else
   with_rcs_ids=no
 fi;

-echo "$as_me:14203: result: $with_rcs_ids" >&5
+echo "$as_me:14462: 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


@@ -14209,7 +14468,7 @@ EOF
 
 ###############################################################################
 
 
 ###############################################################################
 

-echo "$as_me:14212: checking format of man-pages" >&5
+echo "$as_me:14471: 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.


@@ -14231,7 +14490,7 @@ case "$MANPAGE_FORMAT" in
                MANPATH="/usr/man:/usr/share/man"
        fi
 
                MANPATH="/usr/man:/usr/share/man"
        fi
 

-       # look for the 'date' man-page (it's most likely to be installed!)
+       # look for the 'date' man-page (it is most likely to be installed!)

        MANPAGE_FORMAT=
        cf_preform="no"
        cf_catonly="yes"
        MANPAGE_FORMAT=
        cf_preform="no"
        cf_catonly="yes"


@@ -14298,14 +14557,14 @@ case "$MANPAGE_FORMAT" in
        ;;
 esac
 
        ;;
 esac
 

-echo "$as_me:14301: result: $MANPAGE_FORMAT" >&5
+echo "$as_me:14560: 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:14304: WARNING: Unexpected manpage-format $cf_unknown" >&5
+       { echo "$as_me:14563: 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:14308: checking for manpage renaming" >&5
+echo "$as_me:14567: 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.


@@ -14333,7 +14592,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:14336: error: not a filename: $MANPAGE_RENAMES" >&5
+               { { echo "$as_me:14595: 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


@@ -14347,10 +14606,10 @@ echo "$as_me: error: not a filename: $MANPAGE_RENAMES" >&2;}
        fi
 fi
 
        fi
 fi
 

-echo "$as_me:14350: result: $MANPAGE_RENAMES" >&5
+echo "$as_me:14609: result: $MANPAGE_RENAMES" >&5

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

-echo "$as_me:14353: checking if manpage aliases will be installed" >&5
+echo "$as_me:14612: 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.


@@ -14361,7 +14620,7 @@ else
   MANPAGE_ALIASES=yes
 fi;
 
   MANPAGE_ALIASES=yes
 fi;
 

-echo "$as_me:14364: result: $MANPAGE_ALIASES" >&5
+echo "$as_me:14623: 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


@@ -14375,7 +14634,7 @@ esac
 
 MANPAGE_SYMLINKS=no
 if test "$MANPAGE_ALIASES" = yes ; then
 
 MANPAGE_SYMLINKS=no
 if test "$MANPAGE_ALIASES" = yes ; then

-echo "$as_me:14378: checking if manpage symlinks should be used" >&5
+echo "$as_me:14637: 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.


@@ -14388,17 +14647,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:14391: WARNING: cannot make symlinks" >&5
+       { echo "$as_me:14650: 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:14397: result: $MANPAGE_SYMLINKS" >&5
+echo "$as_me:14656: result: $MANPAGE_SYMLINKS" >&5

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

-echo "$as_me:14401: checking for manpage tbl" >&5
+echo "$as_me:14660: 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.


@@ -14409,7 +14668,7 @@ else
   MANPAGE_TBL=no
 fi;
 
   MANPAGE_TBL=no
 fi;
 

-echo "$as_me:14412: result: $MANPAGE_TBL" >&5
+echo "$as_me:14671: 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


@@ -14742,7 +15001,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:14745: checking if you want to build with function extensions" >&5
+echo "$as_me:15004: 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.


@@ -14752,7 +15011,7 @@ if test "${enable_ext_funcs+set}" = set; then
 else
   with_ext_funcs=yes
 fi;
 else
   with_ext_funcs=yes
 fi;

-echo "$as_me:14755: result: $with_ext_funcs" >&5
+echo "$as_me:15014: 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


@@ -14812,7 +15071,7 @@ else
        GENERATED_EXT_FUNCS=
 fi
 
        GENERATED_EXT_FUNCS=
 fi
 

-echo "$as_me:14815: checking if you want to build with SCREEN extensions" >&5
+echo "$as_me:15074: 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.


@@ -14822,7 +15081,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:14825: result: $with_sp_funcs" >&5
+echo "$as_me:15084: 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


@@ -14841,7 +15100,7 @@ else
        GENERATED_SP_FUNCS=
 fi
 
        GENERATED_SP_FUNCS=
 fi
 

-echo "$as_me:14844: checking if you want to build with terminal-driver" >&5
+echo "$as_me:15103: 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.


@@ -14851,7 +15110,7 @@ if test "${enable_term_driver+set}" = set; then
 else
   with_term_driver=no
 fi;
 else
   with_term_driver=no
 fi;

-echo "$as_me:14854: result: $with_term_driver" >&5
+echo "$as_me:15113: 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
 


@@ -14860,19 +15119,19 @@ cat >>confdefs.h <<\EOF
 EOF
 
        if test "x$with_termlib" != xno ; then
 EOF
 
        if test "x$with_termlib" != xno ; then

-               { { echo "$as_me:14863: error: The term-driver option conflicts with the termlib option" >&5
+               { { echo "$as_me:15122: 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:14868: error: The term-driver option relies upon sp-funcs" >&5
+               { { echo "$as_me:15127: 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:14875: checking for extended use of const keyword" >&5
+echo "$as_me:15134: 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.


@@ -14882,7 +15141,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:14885: result: $with_ext_const" >&5
+echo "$as_me:15144: 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


@@ -14890,7 +15149,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:14893: checking if you want to use extended colors" >&5
+echo "$as_me:15152: 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.


@@ -14900,12 +15159,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:14903: result: $with_ext_colors" >&5
+echo "$as_me:15162: 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:14908: WARNING: This option applies only to wide-character library" >&5
+               { echo "$as_me:15167: 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)


@@ -14915,7 +15174,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:14918: WARNING: overriding ABI version to $cf_cv_abi_version" >&5
+               { echo "$as_me:15177: 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


@@ -14943,7 +15202,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:14946: checking if you want to use extended mouse encoding" >&5
+echo "$as_me:15205: 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.


@@ -14953,7 +15212,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:14956: result: $with_ext_mouse" >&5
+echo "$as_me:15215: 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


@@ -14964,7 +15223,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:14967: WARNING: overriding ABI version to $cf_cv_abi_version" >&5
+               { echo "$as_me:15226: 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


@@ -14973,7 +15232,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:14976: checking if you want to use extended putwin/screendump" >&5
+echo "$as_me:15235: 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.


@@ -14983,7 +15242,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:14986: result: $with_ext_putwin" >&5
+echo "$as_me:15245: 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
 


@@ -14993,7 +15252,7 @@ EOF
 
 fi
 
 
 fi
 

-echo "$as_me:14996: checking if you want \$NCURSES_NO_PADDING code" >&5
+echo "$as_me:15255: 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.


@@ -15003,7 +15262,7 @@ if test "${enable_no_padding+set}" = set; then
 else
   with_no_padding=$with_ext_funcs
 fi;
 else
   with_no_padding=$with_ext_funcs
 fi;

-echo "$as_me:15006: result: $with_no_padding" >&5
+echo "$as_me:15265: result: $with_no_padding" >&5

 echo "${ECHO_T}$with_no_padding" >&6
 test "x$with_no_padding" = xyes &&
 cat >>confdefs.h <<\EOF
 echo "${ECHO_T}$with_no_padding" >&6
 test "x$with_no_padding" = xyes &&
 cat >>confdefs.h <<\EOF


@@ -15011,7 +15270,7 @@ cat >>confdefs.h <<\EOF
 EOF
 
 ###   use option --enable-sigwinch to turn on use of SIGWINCH logic
 EOF
 
 ###   use option --enable-sigwinch to turn on use of SIGWINCH logic

-echo "$as_me:15014: checking if you want SIGWINCH handler" >&5
+echo "$as_me:15273: 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.


@@ -15021,7 +15280,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:15024: result: $with_sigwinch" >&5
+echo "$as_me:15283: 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


@@ -15029,7 +15288,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:15032: checking if you want user-definable terminal capabilities like termcap" >&5
+echo "$as_me:15291: 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.


@@ -15039,14 +15298,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:15042: result: $with_tcap_names" >&5
+echo "$as_me:15301: 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:15049: checking if you want to link with the pthread library" >&5
+echo "$as_me:15308: 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.


@@ -15056,27 +15315,27 @@ if test "${with_pthread+set}" = set; then
 else
   with_pthread=no
 fi;
 else
   with_pthread=no
 fi;

-echo "$as_me:15059: result: $with_pthread" >&5
+echo "$as_me:15318: 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:15063: checking for pthread.h" >&5
+       echo "$as_me:15322: 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 15069 "configure"
+#line 15328 "configure"

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

-if { (eval echo "$as_me:15073: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:15332: \"$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:15079: \$? = $ac_status" >&5
+  echo "$as_me:15338: \$? = $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


@@ -15095,7 +15354,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi

-echo "$as_me:15098: result: $ac_cv_header_pthread_h" >&5
+echo "$as_me:15357: 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
 


@@ -15105,7 +15364,7 @@ EOF
 
        for cf_lib_pthread in pthread c_r
        do
 
        for cf_lib_pthread in pthread c_r
        do

-           echo "$as_me:15108: checking if we can link with the $cf_lib_pthread library" >&5
+           echo "$as_me:15367: 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"
 


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

-#line 15129 "configure"
+#line 15388 "configure"

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


@@ -15143,16 +15402,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:15146: \"$ac_link\"") >&5
+if { (eval echo "$as_me:15405: \"$ac_link\"") >&5

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

-  echo "$as_me:15149: \$? = $ac_status" >&5
+  echo "$as_me:15408: \$? = $ac_status" >&5

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

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

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

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

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


@@ -15162,7 +15421,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:15165: result: $with_pthread" >&5
+           echo "$as_me:15424: 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


@@ -15190,7 +15449,7 @@ cat >>confdefs.h <<\EOF
 EOF
 
        else
 EOF
 
        else

-           { { echo "$as_me:15193: error: Cannot link with pthread library" >&5
+           { { echo "$as_me:15452: 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


@@ -15200,13 +15459,13 @@ fi
 fi
 
 if test "x$with_pthread" != xno; then
 fi
 
 if test "x$with_pthread" != xno; then

-       echo "$as_me:15203: checking for pthread_kill" >&5
+       echo "$as_me:15462: 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 15209 "configure"
+#line 15468 "configure"

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


@@ -15237,16 +15496,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:15240: \"$ac_link\"") >&5
+if { (eval echo "$as_me:15499: \"$ac_link\"") >&5

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

-  echo "$as_me:15243: \$? = $ac_status" >&5
+  echo "$as_me:15502: \$? = $ac_status" >&5

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

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

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

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


@@ -15256,11 +15515,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:15259: result: $ac_cv_func_pthread_kill" >&5
+echo "$as_me:15518: 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:15263: checking if you want to allow EINTR in wgetch with pthreads" >&5
+               echo "$as_me:15522: 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.


@@ -15270,7 +15529,7 @@ if test "${enable_pthreads_eintr+set}" = set; then
 else
   use_pthreads_eintr=no
 fi;
 else
   use_pthreads_eintr=no
 fi;

-               echo "$as_me:15273: result: $use_pthreads_eintr" >&5
+               echo "$as_me:15532: 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
 


@@ -15281,7 +15540,7 @@ EOF
                fi
 fi
 
                fi
 fi
 

-       echo "$as_me:15284: checking if you want to use weak-symbols for pthreads" >&5
+       echo "$as_me:15543: 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.


@@ -15291,18 +15550,18 @@ if test "${enable_weak_symbols+set}" = set; then
 else
   use_weak_symbols=no
 fi;
 else
   use_weak_symbols=no
 fi;

-       echo "$as_me:15294: result: $use_weak_symbols" >&5
+       echo "$as_me:15553: 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:15298: checking if $CC supports weak symbols" >&5
+echo "$as_me:15557: 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 15305 "configure"
+#line 15564 "configure"

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


@@ -15328,16 +15587,16 @@ weak_symbol(fopen);
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
 }
 _ACEOF
 rm -f "conftest.$ac_objext"

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

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

-  echo "$as_me:15334: \$? = $ac_status" >&5
+  echo "$as_me:15593: \$? = $ac_status" >&5

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

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

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

-  echo "$as_me:15340: \$? = $ac_status" >&5
+  echo "$as_me:15599: \$? = $ac_status" >&5

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


@@ -15348,7 +15607,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi

-echo "$as_me:15351: result: $cf_cv_weak_symbols" >&5
+echo "$as_me:15610: result: $cf_cv_weak_symbols" >&5

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


@@ -15398,7 +15657,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:15401: checking if you want reentrant code" >&5
+echo "$as_me:15660: 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.


@@ -15408,7 +15667,7 @@ if test "${enable_reentrant+set}" = set; then
 else
   with_reentrant=no
 fi;
 else
   with_reentrant=no
 fi;

-echo "$as_me:15411: result: $with_reentrant" >&5
+echo "$as_me:15670: 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


@@ -15496,7 +15755,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:15499: WARNING: overriding ABI version to $cf_cv_abi_version" >&5
+               { echo "$as_me:15758: 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


@@ -15508,7 +15767,7 @@ else
        NCURSES_SIZE_T=short
 fi
 
        NCURSES_SIZE_T=short
 fi
 

-echo "$as_me:15511: checking if you want opaque curses-library structures" >&5
+echo "$as_me:15770: 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.


@@ -15530,16 +15789,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:15533: result: $enable_opaque_curses" >&5
+echo "$as_me:15792: 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:15538: error: reentrant configuration requires opaque library" >&5
+{ { echo "$as_me:15797: 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:15542: checking if you want opaque form-library structures" >&5
+echo "$as_me:15801: 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.


@@ -15549,10 +15808,10 @@ if test "${enable_opaque_form+set}" = set; then
 else
   enable_opaque_form=no
 fi;
 else
   enable_opaque_form=no
 fi;

-echo "$as_me:15552: result: $enable_opaque_form" >&5
+echo "$as_me:15811: result: $enable_opaque_form" >&5

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

-echo "$as_me:15555: checking if you want opaque menu-library structures" >&5
+echo "$as_me:15814: 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.


@@ -15562,10 +15821,10 @@ if test "${enable_opaque_menu+set}" = set; then
 else
   enable_opaque_menu=no
 fi;
 else
   enable_opaque_menu=no
 fi;

-echo "$as_me:15565: result: $enable_opaque_menu" >&5
+echo "$as_me:15824: result: $enable_opaque_menu" >&5

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

-echo "$as_me:15568: checking if you want opaque panel-library structures" >&5
+echo "$as_me:15827: 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.


@@ -15575,7 +15834,7 @@ if test "${enable_opaque_panel+set}" = set; then
 else
   enable_opaque_panel=no
 fi;
 else
   enable_opaque_panel=no
 fi;

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


@@ -15585,7 +15844,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:15588: checking for prefix used to wrap public variables" >&5
+       echo "$as_me:15847: 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.


@@ -15595,7 +15854,7 @@ if test "${with_wrap_prefix+set}" = set; then
 else
   NCURSES_WRAP_PREFIX=_nc_
 fi;
 else
   NCURSES_WRAP_PREFIX=_nc_
 fi;

-       echo "$as_me:15598: result: $NCURSES_WRAP_PREFIX" >&5
+       echo "$as_me:15857: 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_


@@ -15608,7 +15867,7 @@ EOF
 ###############################################################################
 # These options are relatively safe to experiment with.
 
 ###############################################################################
 # These options are relatively safe to experiment with.
 

-echo "$as_me:15611: checking if you want all development code" >&5
+echo "$as_me:15870: 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.


@@ -15618,11 +15877,11 @@ if test "${with_develop+set}" = set; then
 else
   with_develop=no
 fi;
 else
   with_develop=no
 fi;

-echo "$as_me:15621: result: $with_develop" >&5
+echo "$as_me:15880: 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:15625: checking if you want hard-tabs code" >&5
+echo "$as_me:15884: 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.


@@ -15632,7 +15891,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:15635: result: $enable_hard_tabs" >&5
+echo "$as_me:15894: 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


@@ -15640,7 +15899,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:15643: checking if you want limited support for xmc" >&5
+echo "$as_me:15902: 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.


@@ -15650,7 +15909,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:15653: result: $enable_xmc_glitch" >&5
+echo "$as_me:15912: 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


@@ -15660,7 +15919,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:15663: checking if you do not want to assume colors are white-on-black" >&5
+echo "$as_me:15922: 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.


@@ -15670,7 +15929,7 @@ if test "${enable_assumed_color+set}" = set; then
 else
   with_assumed_color=yes
 fi;
 else
   with_assumed_color=yes
 fi;

-echo "$as_me:15673: result: $with_assumed_color" >&5
+echo "$as_me:15932: 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


@@ -15678,7 +15937,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:15681: checking if you want hashmap scrolling-optimization code" >&5
+echo "$as_me:15940: 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.


@@ -15688,7 +15947,7 @@ if test "${enable_hashmap+set}" = set; then
 else
   with_hashmap=yes
 fi;
 else
   with_hashmap=yes
 fi;

-echo "$as_me:15691: result: $with_hashmap" >&5
+echo "$as_me:15950: 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


@@ -15696,7 +15955,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:15699: checking if you want colorfgbg code" >&5
+echo "$as_me:15958: 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.


@@ -15706,7 +15965,7 @@ if test "${enable_colorfgbg+set}" = set; then
 else
   with_colorfgbg=no
 fi;
 else
   with_colorfgbg=no
 fi;

-echo "$as_me:15709: result: $with_colorfgbg" >&5
+echo "$as_me:15968: 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


@@ -15714,7 +15973,7 @@ cat >>confdefs.h <<\EOF
 EOF
 
 ###   use option --enable-fvisibility to turn on use of gcc-specific feature
 EOF
 
 ###   use option --enable-fvisibility to turn on use of gcc-specific feature

-echo "$as_me:15717: checking if you want to use gcc -fvisibility option" >&5
+echo "$as_me:15976: checking if you want to use gcc -fvisibility option" >&5

 echo $ECHO_N "checking if you want to use gcc -fvisibility option... $ECHO_C" >&6
 
 # Check whether --enable-fvisibility or --disable-fvisibility was given.
 echo $ECHO_N "checking if you want to use gcc -fvisibility option... $ECHO_C" >&6
 
 # Check whether --enable-fvisibility or --disable-fvisibility was given.


@@ -15724,14 +15983,14 @@ if test "${enable_fvisibility+set}" = set; then
 else
   cf_with_fvisibility=no
 fi;
 else
   cf_with_fvisibility=no
 fi;

-echo "$as_me:15727: result: $cf_with_fvisibility" >&5
+echo "$as_me:15986: result: $cf_with_fvisibility" >&5

 echo "${ECHO_T}$cf_with_fvisibility" >&6
 
 NCURSES_IMPEXP=
 NCURSES_CXX_IMPEXP=
 if test "x$cf_with_fvisibility" = xyes; then
 
 echo "${ECHO_T}$cf_with_fvisibility" >&6
 
 NCURSES_IMPEXP=
 NCURSES_CXX_IMPEXP=
 if test "x$cf_with_fvisibility" = xyes; then
 

-echo "$as_me:15734: checking if $CC -fvisibility=hidden option works" >&5
+echo "$as_me:15993: checking if $CC -fvisibility=hidden option works" >&5

 echo $ECHO_N "checking if $CC -fvisibility=hidden option works... $ECHO_C" >&6
 if test "${cf_cv_fvisibility_hidden+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 echo $ECHO_N "checking if $CC -fvisibility=hidden option works... $ECHO_C" >&6
 if test "${cf_cv_fvisibility_hidden+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6


@@ -15740,7 +15999,7 @@ else
     cf_save_cflags="$CFLAGS"
     CFLAGS="$CFLAGS -fvisibility=hidden"
     cat >"conftest.$ac_ext" <<_ACEOF
     cf_save_cflags="$CFLAGS"
     CFLAGS="$CFLAGS -fvisibility=hidden"
     cat >"conftest.$ac_ext" <<_ACEOF

-#line 15743 "configure"
+#line 16002 "configure"

 #include "confdefs.h"
 
 __attribute__ ((visibility("default"))) int somefunc() {return 42;}
 #include "confdefs.h"
 
 __attribute__ ((visibility("default"))) int somefunc() {return 42;}


@@ -15756,16 +16015,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:15759: \"$ac_link\"") >&5
+if { (eval echo "$as_me:16018: \"$ac_link\"") >&5

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

-  echo "$as_me:15762: \$? = $ac_status" >&5
+  echo "$as_me:16021: \$? = $ac_status" >&5

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

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

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

-  echo "$as_me:15768: \$? = $ac_status" >&5
+  echo "$as_me:16027: \$? = $ac_status" >&5

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


@@ -15777,7 +16036,7 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
     CFLAGS=$cf_save_cflags
 
 fi
     CFLAGS=$cf_save_cflags
 
 fi

-echo "$as_me:15780: result: $cf_cv_fvisibility_hidden" >&5
+echo "$as_me:16039: result: $cf_cv_fvisibility_hidden" >&5

 echo "${ECHO_T}$cf_cv_fvisibility_hidden" >&6
 
        if test "x$cf_cv_fvisibility_hidden" = xyes
 echo "${ECHO_T}$cf_cv_fvisibility_hidden" >&6
 
        if test "x$cf_cv_fvisibility_hidden" = xyes


@@ -15892,7 +16151,7 @@ ac_link='$CXX -o "conftest$ac_exeext" $CXXFLAGS $CPPFLAGS $LDFLAGS "conftest.$ac
 ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
 ac_main_return="return"
 
 ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
 ac_main_return="return"
 

-echo "$as_me:15895: checking if $CXX -fvisibility=hidden option works" >&5
+echo "$as_me:16154: checking if $CXX -fvisibility=hidden option works" >&5

 echo $ECHO_N "checking if $CXX -fvisibility=hidden option works... $ECHO_C" >&6
 if test "${cf_cv_fvisibility_hidden2+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 echo $ECHO_N "checking if $CXX -fvisibility=hidden option works... $ECHO_C" >&6
 if test "${cf_cv_fvisibility_hidden2+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6


@@ -15901,7 +16160,7 @@ else
     cf_save_cflags="$CXXFLAGS"
     CXXFLAGS="$CXXFLAGS -fvisibility=hidden"
     cat >"conftest.$ac_ext" <<_ACEOF
     cf_save_cflags="$CXXFLAGS"
     CXXFLAGS="$CXXFLAGS -fvisibility=hidden"
     cat >"conftest.$ac_ext" <<_ACEOF

-#line 15904 "configure"
+#line 16163 "configure"

 #include "confdefs.h"
 
 __attribute__ ((visibility("default"))) int somefunc() {return 42;}
 #include "confdefs.h"
 
 __attribute__ ((visibility("default"))) int somefunc() {return 42;}


@@ -15917,16 +16176,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:15920: \"$ac_link\"") >&5
+if { (eval echo "$as_me:16179: \"$ac_link\"") >&5

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

-  echo "$as_me:15923: \$? = $ac_status" >&5
+  echo "$as_me:16182: \$? = $ac_status" >&5

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

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

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

-  echo "$as_me:15929: \$? = $ac_status" >&5
+  echo "$as_me:16188: \$? = $ac_status" >&5

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


@@ -15938,7 +16197,7 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
     CXXFLAGS=$cf_save_cflags
 
 fi
     CXXFLAGS=$cf_save_cflags
 
 fi

-echo "$as_me:15941: result: $cf_cv_fvisibility_hidden2" >&5
+echo "$as_me:16200: result: $cf_cv_fvisibility_hidden2" >&5

 echo "${ECHO_T}$cf_cv_fvisibility_hidden2" >&6
 
                if test "x$cf_cv_fvisibility_hidden2" = xyes
 echo "${ECHO_T}$cf_cv_fvisibility_hidden2" >&6
 
                if test "x$cf_cv_fvisibility_hidden2" = xyes


@@ -16061,7 +16320,7 @@ ac_main_return="return"
 fi
 
 ###   use option --enable-interop to turn on use of bindings used for interop
 fi
 
 ###   use option --enable-interop to turn on use of bindings used for interop

-echo "$as_me:16064: checking if you want interop bindings" >&5
+echo "$as_me:16323: 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.


@@ -16071,13 +16330,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:16074: result: $with_exp_interop" >&5
+echo "$as_me:16333: 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:16080: checking if you want experimental safe-sprintf code" >&5
+echo "$as_me:16339: 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.


@@ -16087,13 +16346,13 @@ if test "${enable_safe_sprintf+set}" = set; then
 else
   with_safe_sprintf=no
 fi;
 else
   with_safe_sprintf=no
 fi;

-echo "$as_me:16090: result: $with_safe_sprintf" >&5
+echo "$as_me:16349: result: $with_safe_sprintf" >&5

 echo "${ECHO_T}$with_safe_sprintf" >&6
 
 ###   use option --disable-scroll-hints to turn off use of scroll-hints scrolling logic
 # when hashmap is used scroll hints are useless
 if test "$with_hashmap" = no ; then
 echo "${ECHO_T}$with_safe_sprintf" >&6
 
 ###   use option --disable-scroll-hints to turn off use of scroll-hints scrolling logic
 # when hashmap is used scroll hints are useless
 if test "$with_hashmap" = no ; then

-echo "$as_me:16096: checking if you want to experiment without scrolling-hints code" >&5
+echo "$as_me:16355: 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.


@@ -16103,7 +16362,7 @@ if test "${enable_scroll_hints+set}" = set; then
 else
   with_scroll_hints=yes
 fi;
 else
   with_scroll_hints=yes
 fi;

-echo "$as_me:16106: result: $with_scroll_hints" >&5
+echo "$as_me:16365: 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


@@ -16112,7 +16371,7 @@ EOF
 
 fi
 
 
 fi
 

-echo "$as_me:16115: checking if you want wgetch-events code" >&5
+echo "$as_me:16374: 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.


@@ -16122,7 +16381,7 @@ if test "${enable_wgetch_events+set}" = set; then
 else
   with_wgetch_events=no
 fi;
 else
   with_wgetch_events=no
 fi;

-echo "$as_me:16125: result: $with_wgetch_events" >&5
+echo "$as_me:16384: result: $with_wgetch_events" >&5

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


@@ -16137,7 +16396,7 @@ fi
 
 case "$cf_cv_system_name" in
 (*mingw32*|*mingw64*|*-msvc*)
 
 case "$cf_cv_system_name" in
 (*mingw32*|*mingw64*|*-msvc*)

-       echo "$as_me:16140: checking if you want experimental-Windows driver" >&5
+       echo "$as_me:16399: checking if you want experimental-Windows driver" >&5

 echo $ECHO_N "checking if you want experimental-Windows driver... $ECHO_C" >&6
 
 # Check whether --enable-exp-win32 or --disable-exp-win32 was given.
 echo $ECHO_N "checking if you want experimental-Windows driver... $ECHO_C" >&6
 
 # Check whether --enable-exp-win32 or --disable-exp-win32 was given.


@@ -16147,7 +16406,7 @@ if test "${enable_exp_win32+set}" = set; then
 else
   with_exp_win32=no
 fi;
 else
   with_exp_win32=no
 fi;

-       echo "$as_me:16150: result: $with_exp_win32" >&5
+       echo "$as_me:16409: result: $with_exp_win32" >&5

 echo "${ECHO_T}$with_exp_win32" >&6
        if test "x$with_exp_win32" = xyes
        then
 echo "${ECHO_T}$with_exp_win32" >&6
        if test "x$with_exp_win32" = xyes
        then


@@ -16173,7 +16432,7 @@ esac
 
 ###    use option --disable-echo to suppress full display compiling commands
 
 
 ###    use option --disable-echo to suppress full display compiling commands
 

-echo "$as_me:16176: checking if you want to see long compiling messages" >&5
+echo "$as_me:16435: 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.


@@ -16207,7 +16466,7 @@ else
        ECHO_CC=''
 
 fi;
        ECHO_CC=''
 
 fi;

-echo "$as_me:16210: result: $enableval" >&5
+echo "$as_me:16469: 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


@@ -16220,7 +16479,7 @@ fi
 
 # --disable-stripping is used for debugging
 
 
 # --disable-stripping is used for debugging
 

-echo "$as_me:16223: checking if you want to install stripped executables" >&5
+echo "$as_me:16482: checking if you want to install stripped executables" >&5

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


@@ -16237,7 +16496,7 @@ else
        enable_stripping=yes
 
 fi;
        enable_stripping=yes
 
 fi;

-echo "$as_me:16240: result: $enable_stripping" >&5
+echo "$as_me:16499: result: $enable_stripping" >&5

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


@@ -16248,7 +16507,7 @@ else
 fi
 
 : "${INSTALL:=install}"
 fi
 
 : "${INSTALL:=install}"

-echo "$as_me:16251: checking if install accepts -p option" >&5
+echo "$as_me:16510: checking if install accepts -p option" >&5

 echo $ECHO_N "checking if install accepts -p option... $ECHO_C" >&6
 if test "${cf_cv_install_p+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 echo $ECHO_N "checking if install accepts -p option... $ECHO_C" >&6
 if test "${cf_cv_install_p+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6


@@ -16279,10 +16538,10 @@ else
        rm -rf ./conftest*
 
 fi
        rm -rf ./conftest*
 
 fi

-echo "$as_me:16282: result: $cf_cv_install_p" >&5
+echo "$as_me:16541: result: $cf_cv_install_p" >&5

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

-echo "$as_me:16285: checking if install needs to be told about ownership" >&5
+echo "$as_me:16544: checking if install needs to be told about ownership" >&5

 echo $ECHO_N "checking if install needs to be told about ownership... $ECHO_C" >&6
 case `$ac_config_guess` in
 (*minix)
 echo $ECHO_N "checking if install needs to be told about ownership... $ECHO_C" >&6
 case `$ac_config_guess` in
 (*minix)


@@ -16293,7 +16552,7 @@ case `$ac_config_guess` in
        ;;
 esac
 
        ;;
 esac
 

-echo "$as_me:16296: result: $with_install_o" >&5
+echo "$as_me:16555: result: $with_install_o" >&5

 echo "${ECHO_T}$with_install_o" >&6
 if test "x$with_install_o" = xyes
 then
 echo "${ECHO_T}$with_install_o" >&6
 if test "x$with_install_o" = xyes
 then


@@ -16318,7 +16577,7 @@ fi
 
 ###    use option --enable-warnings to turn on all gcc warnings
 
 
 ###    use option --enable-warnings to turn on all gcc warnings
 

-echo "$as_me:16321: checking if you want to use C11 _Noreturn feature" >&5
+echo "$as_me:16580: checking if you want to use C11 _Noreturn feature" >&5

 echo $ECHO_N "checking if you want to use C11 _Noreturn feature... $ECHO_C" >&6
 
 # Check whether --enable-stdnoreturn or --disable-stdnoreturn was given.
 echo $ECHO_N "checking if you want to use C11 _Noreturn feature... $ECHO_C" >&6
 
 # Check whether --enable-stdnoreturn or --disable-stdnoreturn was given.


@@ -16335,17 +16594,17 @@ else
        enable_stdnoreturn=no
 
 fi;
        enable_stdnoreturn=no
 
 fi;

-echo "$as_me:16338: result: $enable_stdnoreturn" >&5
+echo "$as_me:16597: result: $enable_stdnoreturn" >&5

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

-echo "$as_me:16342: checking for C11 _Noreturn feature" >&5
+echo "$as_me:16601: checking for C11 _Noreturn feature" >&5

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

-#line 16348 "configure"
+#line 16607 "configure"

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


@@ -16362,16 +16621,16 @@ if (feof(stdin)) giveup()
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
 }
 _ACEOF
 rm -f "conftest.$ac_objext"

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

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

-  echo "$as_me:16368: \$? = $ac_status" >&5
+  echo "$as_me:16627: \$? = $ac_status" >&5

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

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

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

-  echo "$as_me:16374: \$? = $ac_status" >&5
+  echo "$as_me:16633: \$? = $ac_status" >&5

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


@@ -16382,7 +16641,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi

-echo "$as_me:16385: result: $cf_cv_c11_noreturn" >&5
+echo "$as_me:16644: result: $cf_cv_c11_noreturn" >&5

 echo "${ECHO_T}$cf_cv_c11_noreturn" >&6
 else
        cf_cv_c11_noreturn=no,
 echo "${ECHO_T}$cf_cv_c11_noreturn" >&6
 else
        cf_cv_c11_noreturn=no,


@@ -16412,7 +16671,7 @@ then
        (*-Werror=*)
                test -n "$verbose" && echo "    repairing CFLAGS: $CFLAGS" 1>&6
 
        (*-Werror=*)
                test -n "$verbose" && echo "    repairing CFLAGS: $CFLAGS" 1>&6
 

-echo "${as_me:-configure}:16415: testing repairing CFLAGS: $CFLAGS ..." 1>&5
+echo "${as_me:-configure}:16674: testing repairing CFLAGS: $CFLAGS ..." 1>&5

 
                cf_temp_flags=
                for cf_temp_scan in $CFLAGS
 
                cf_temp_flags=
                for cf_temp_scan in $CFLAGS


@@ -16435,11 +16694,11 @@ echo "${as_me:-configure}:16415: testing repairing CFLAGS: $CFLAGS ..." 1>&5
                CFLAGS="$cf_temp_flags"
                test -n "$verbose" && echo "    ... fixed $CFLAGS" 1>&6
 
                CFLAGS="$cf_temp_flags"
                test -n "$verbose" && echo "    ... fixed $CFLAGS" 1>&6
 

-echo "${as_me:-configure}:16438: testing ... fixed $CFLAGS ..." 1>&5
+echo "${as_me:-configure}:16697: testing ... fixed $CFLAGS ..." 1>&5

 
                test -n "$verbose" && echo "    ... extra $EXTRA_CFLAGS" 1>&6
 
 
                test -n "$verbose" && echo "    ... extra $EXTRA_CFLAGS" 1>&6
 

-echo "${as_me:-configure}:16442: testing ... extra $EXTRA_CFLAGS ..." 1>&5
+echo "${as_me:-configure}:16701: testing ... extra $EXTRA_CFLAGS ..." 1>&5

 
                ;;
        esac
 
                ;;
        esac


@@ -16451,7 +16710,7 @@ then
        (*-Werror=*)
                test -n "$verbose" && echo "    repairing CPPFLAGS: $CPPFLAGS" 1>&6
 
        (*-Werror=*)
                test -n "$verbose" && echo "    repairing CPPFLAGS: $CPPFLAGS" 1>&6
 

-echo "${as_me:-configure}:16454: testing repairing CPPFLAGS: $CPPFLAGS ..." 1>&5
+echo "${as_me:-configure}:16713: testing repairing CPPFLAGS: $CPPFLAGS ..." 1>&5

 
                cf_temp_flags=
                for cf_temp_scan in $CPPFLAGS
 
                cf_temp_flags=
                for cf_temp_scan in $CPPFLAGS


@@ -16474,11 +16733,11 @@ echo "${as_me:-configure}:16454: testing repairing CPPFLAGS: $CPPFLAGS ..." 1>&5
                CPPFLAGS="$cf_temp_flags"
                test -n "$verbose" && echo "    ... fixed $CPPFLAGS" 1>&6
 
                CPPFLAGS="$cf_temp_flags"
                test -n "$verbose" && echo "    ... fixed $CPPFLAGS" 1>&6
 

-echo "${as_me:-configure}:16477: testing ... fixed $CPPFLAGS ..." 1>&5
+echo "${as_me:-configure}:16736: testing ... fixed $CPPFLAGS ..." 1>&5

 
                test -n "$verbose" && echo "    ... extra $EXTRA_CFLAGS" 1>&6
 
 
                test -n "$verbose" && echo "    ... extra $EXTRA_CFLAGS" 1>&6
 

-echo "${as_me:-configure}:16481: testing ... extra $EXTRA_CFLAGS ..." 1>&5
+echo "${as_me:-configure}:16740: testing ... extra $EXTRA_CFLAGS ..." 1>&5

 
                ;;
        esac
 
                ;;
        esac


@@ -16490,7 +16749,7 @@ then
        (*-Werror=*)
                test -n "$verbose" && echo "    repairing LDFLAGS: $LDFLAGS" 1>&6
 
        (*-Werror=*)
                test -n "$verbose" && echo "    repairing LDFLAGS: $LDFLAGS" 1>&6
 

-echo "${as_me:-configure}:16493: testing repairing LDFLAGS: $LDFLAGS ..." 1>&5
+echo "${as_me:-configure}:16752: testing repairing LDFLAGS: $LDFLAGS ..." 1>&5

 
                cf_temp_flags=
                for cf_temp_scan in $LDFLAGS
 
                cf_temp_flags=
                for cf_temp_scan in $LDFLAGS


@@ -16513,17 +16772,17 @@ echo "${as_me:-configure}:16493: testing repairing LDFLAGS: $LDFLAGS ..." 1>&5
                LDFLAGS="$cf_temp_flags"
                test -n "$verbose" && echo "    ... fixed $LDFLAGS" 1>&6
 
                LDFLAGS="$cf_temp_flags"
                test -n "$verbose" && echo "    ... fixed $LDFLAGS" 1>&6
 

-echo "${as_me:-configure}:16516: testing ... fixed $LDFLAGS ..." 1>&5
+echo "${as_me:-configure}:16775: testing ... fixed $LDFLAGS ..." 1>&5

 
                test -n "$verbose" && echo "    ... extra $EXTRA_CFLAGS" 1>&6
 
 
                test -n "$verbose" && echo "    ... extra $EXTRA_CFLAGS" 1>&6
 

-echo "${as_me:-configure}:16520: testing ... extra $EXTRA_CFLAGS ..." 1>&5
+echo "${as_me:-configure}:16779: testing ... extra $EXTRA_CFLAGS ..." 1>&5

 
                ;;
        esac
 fi
 
 
                ;;
        esac
 fi
 

-echo "$as_me:16526: checking if you want to turn on gcc warnings" >&5
+echo "$as_me:16785: checking if you want to turn on gcc warnings" >&5

 echo $ECHO_N "checking if you want to turn on gcc warnings... $ECHO_C" >&6
 
 # Check whether --enable-warnings or --disable-warnings was given.
 echo $ECHO_N "checking if you want to turn on gcc warnings... $ECHO_C" >&6
 
 # Check whether --enable-warnings or --disable-warnings was given.


@@ -16540,7 +16799,7 @@ else
        enable_warnings=no
 
 fi;
        enable_warnings=no
 
 fi;

-echo "$as_me:16543: result: $enable_warnings" >&5
+echo "$as_me:16802: result: $enable_warnings" >&5

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


@@ -16564,7 +16823,7 @@ do
 done
 
 cat >"conftest.$ac_ext" <<_ACEOF
 done
 
 cat >"conftest.$ac_ext" <<_ACEOF

-#line 16567 "configure"
+#line 16826 "configure"

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


@@ -16579,26 +16838,26 @@ String foo = malloc(1); free((void*)foo)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
 }
 _ACEOF
 rm -f "conftest.$ac_objext"

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

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

-  echo "$as_me:16585: \$? = $ac_status" >&5
+  echo "$as_me:16844: \$? = $ac_status" >&5

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

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

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

-  echo "$as_me:16591: \$? = $ac_status" >&5
+  echo "$as_me:16850: \$? = $ac_status" >&5

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

-echo "$as_me:16594: checking for X11/Xt const-feature" >&5
+echo "$as_me:16853: checking for X11/Xt const-feature" >&5

 echo $ECHO_N "checking for X11/Xt const-feature... $ECHO_C" >&6
 if test "${cf_cv_const_x_string+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
        cat >"conftest.$ac_ext" <<_ACEOF
 echo $ECHO_N "checking for X11/Xt const-feature... $ECHO_C" >&6
 if test "${cf_cv_const_x_string+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
        cat >"conftest.$ac_ext" <<_ACEOF

-#line 16601 "configure"
+#line 16860 "configure"

 #include "confdefs.h"
 
 #define _CONST_X_STRING        /* X11R7.8 (perhaps) */
 #include "confdefs.h"
 
 #define _CONST_X_STRING        /* X11R7.8 (perhaps) */


@@ -16615,16 +16874,16 @@ String foo = malloc(1); *foo = 0
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
 }
 _ACEOF
 rm -f "conftest.$ac_objext"

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

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

-  echo "$as_me:16621: \$? = $ac_status" >&5
+  echo "$as_me:16880: \$? = $ac_status" >&5

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

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

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

-  echo "$as_me:16627: \$? = $ac_status" >&5
+  echo "$as_me:16886: \$? = $ac_status" >&5

   (exit "$ac_status"); }; }; then
 
                        cf_cv_const_x_string=no
   (exit "$ac_status"); }; }; then
 
                        cf_cv_const_x_string=no


@@ -16639,7 +16898,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi

-echo "$as_me:16642: result: $cf_cv_const_x_string" >&5
+echo "$as_me:16901: result: $cf_cv_const_x_string" >&5

 echo "${ECHO_T}$cf_cv_const_x_string" >&6
 
 LIBS="$cf_save_LIBS_CF_CONST_X_STRING"
 echo "${ECHO_T}$cf_cv_const_x_string" >&6
 
 LIBS="$cf_save_LIBS_CF_CONST_X_STRING"


@@ -16668,7 +16927,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
  fi
 cat > "conftest.$ac_ext" <<EOF
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
  fi
 cat > "conftest.$ac_ext" <<EOF

-#line 16671 "${as_me:-configure}"
+#line 16930 "${as_me:-configure}"

 int main(int argc, char *argv[]) { return (argv[argc-1] == 0) ; }
 EOF
 if test "$INTEL_COMPILER" = yes
 int main(int argc, char *argv[]) { return (argv[argc-1] == 0) ; }
 EOF
 if test "$INTEL_COMPILER" = yes


@@ -16684,7 +16943,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:16687: checking for $CC warning options..." >&5
+       { echo "$as_me:16946: checking for $CC warning options..." >&5

 echo "$as_me: checking for $CC warning options..." >&6;}
        cf_save_CFLAGS="$CFLAGS"
        EXTRA_CFLAGS="$EXTRA_CFLAGS -Wall"
 echo "$as_me: checking for $CC warning options..." >&6;}
        cf_save_CFLAGS="$CFLAGS"
        EXTRA_CFLAGS="$EXTRA_CFLAGS -Wall"


@@ -16700,12 +16959,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:16703: \"$ac_compile\"") >&5
+               if { (eval echo "$as_me:16962: \"$ac_compile\"") >&5

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

-  echo "$as_me:16706: \$? = $ac_status" >&5
+  echo "$as_me:16965: \$? = $ac_status" >&5

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

-                       test -n "$verbose" && echo "$as_me:16708: result: ... -$cf_opt" >&5
+                       test -n "$verbose" && echo "$as_me:16967: 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


@@ -16713,7 +16972,7 @@ echo "${ECHO_T}... -$cf_opt" >&6
        CFLAGS="$cf_save_CFLAGS"
 elif test "$GCC" = yes && test "$GCC_VERSION" != "unknown"
 then
        CFLAGS="$cf_save_CFLAGS"
 elif test "$GCC" = yes && test "$GCC_VERSION" != "unknown"
 then

-       { echo "$as_me:16716: checking for $CC warning options..." >&5
+       { echo "$as_me:16975: checking for $CC warning options..." >&5

 echo "$as_me: checking for $CC warning options..." >&6;}
        cf_save_CFLAGS="$CFLAGS"
        cf_warn_CONST=""
 echo "$as_me: checking for $CC warning options..." >&6;}
        cf_save_CFLAGS="$CFLAGS"
        cf_warn_CONST=""


@@ -16736,12 +16995,12 @@ echo "$as_me: checking for $CC warning options..." >&6;}
                Wundef Wno-inline $cf_gcc_warnings $cf_warn_CONST Wno-unknown-pragmas Wswitch-enum
        do
                CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt"
                Wundef Wno-inline $cf_gcc_warnings $cf_warn_CONST Wno-unknown-pragmas Wswitch-enum
        do
                CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt"

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

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

-  echo "$as_me:16742: \$? = $ac_status" >&5
+  echo "$as_me:17001: \$? = $ac_status" >&5

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

-                       test -n "$verbose" && echo "$as_me:16744: result: ... -$cf_opt" >&5
+                       test -n "$verbose" && echo "$as_me:17003: result: ... -$cf_opt" >&5

 echo "${ECHO_T}... -$cf_opt" >&6
                        case "$cf_opt" in
                        (Winline)
 echo "${ECHO_T}... -$cf_opt" >&6
                        case "$cf_opt" in
                        (Winline)


@@ -16749,7 +17008,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}:16752: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
+echo "${as_me:-configure}:17011: testing feature is broken in gcc $GCC_VERSION ..." 1>&5

 
                                        continue;;
                                esac
 
                                        continue;;
                                esac


@@ -16759,7 +17018,7 @@ echo "${as_me:-configure}:16752: 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}:16762: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
+echo "${as_me:-configure}:17021: testing feature is broken in gcc $GCC_VERSION ..." 1>&5

 
                                        continue;;
                                esac
 
                                        continue;;
                                esac


@@ -16792,10 +17051,10 @@ cat > conftest.i <<EOF
 EOF
 if test "$GCC" = yes
 then
 EOF
 if test "$GCC" = yes
 then

-       { echo "$as_me:16795: checking for $CC __attribute__ directives..." >&5
+       { echo "$as_me:17054: 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 16798 "${as_me:-configure}"
+#line 17057 "${as_me:-configure}"

 #include "confdefs.h"
 #include "conftest.h"
 #include "conftest.i"
 #include "confdefs.h"
 #include "conftest.h"
 #include "conftest.i"


@@ -16844,12 +17103,12 @@ EOF
                        ;;
                esac
 
                        ;;
                esac
 

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

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

-  echo "$as_me:16850: \$? = $ac_status" >&5
+  echo "$as_me:17109: \$? = $ac_status" >&5

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

-                       test -n "$verbose" && echo "$as_me:16852: result: ... $cf_attribute" >&5
+                       test -n "$verbose" && echo "$as_me:17111: 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


@@ -16921,12 +17180,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:16924: checking if this is really Intel C++ compiler" >&5
+               echo "$as_me:17183: 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 16929 "configure"
+#line 17188 "configure"

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


@@ -16943,16 +17202,16 @@ make an error
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
 }
 _ACEOF
 rm -f "conftest.$ac_objext"

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

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

-  echo "$as_me:16949: \$? = $ac_status" >&5
+  echo "$as_me:17208: \$? = $ac_status" >&5

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

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

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

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


@@ -16963,7 +17222,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:16966: result: $INTEL_CPLUSPLUS" >&5
+               echo "$as_me:17225: result: $INTEL_CPLUSPLUS" >&5

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


@@ -16972,11 +17231,11 @@ fi
 CLANG_CPLUSPLUS=no
 
 if test "$GCC" = yes ; then
 CLANG_CPLUSPLUS=no
 
 if test "$GCC" = yes ; then

-       echo "$as_me:16975: checking if this is really Clang C++ compiler" >&5
+       echo "$as_me:17234: checking if this is really Clang C++ compiler" >&5

 echo $ECHO_N "checking if this is really Clang C++ compiler... $ECHO_C" >&6
        cf_save_CFLAGS="$CXXFLAGS"
        cat >"conftest.$ac_ext" <<_ACEOF
 echo $ECHO_N "checking if this is really Clang C++ compiler... $ECHO_C" >&6
        cf_save_CFLAGS="$CXXFLAGS"
        cat >"conftest.$ac_ext" <<_ACEOF

-#line 16979 "configure"
+#line 17238 "configure"

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


@@ -16993,16 +17252,16 @@ make an error
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
 }
 _ACEOF
 rm -f "conftest.$ac_objext"

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

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

-  echo "$as_me:16999: \$? = $ac_status" >&5
+  echo "$as_me:17258: \$? = $ac_status" >&5

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

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

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

-  echo "$as_me:17005: \$? = $ac_status" >&5
+  echo "$as_me:17264: \$? = $ac_status" >&5

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


@@ -17012,7 +17271,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:17015: result: $CLANG_CPLUSPLUS" >&5
+       echo "$as_me:17274: result: $CLANG_CPLUSPLUS" >&5

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


@@ -17021,30 +17280,30 @@ CLANG_VERSION=none
 if test "x$CLANG_CPLUSPLUS" = "xyes" ; then
        case "$CC" in
        (c[1-9][0-9]|*/c[1-9][0-9])
 if test "x$CLANG_CPLUSPLUS" = "xyes" ; then
        case "$CC" in
        (c[1-9][0-9]|*/c[1-9][0-9])

-               { echo "$as_me:17024: WARNING: replacing broken compiler alias $CC" >&5
+               { echo "$as_me:17283: WARNING: replacing broken compiler alias $CC" >&5

 echo "$as_me: WARNING: replacing broken compiler alias $CC" >&2;}
                CFLAGS="$CFLAGS -std=`echo "$CC" | sed -e 's%.*/%%'`"
                CC=clang
                ;;
        esac
 
 echo "$as_me: WARNING: replacing broken compiler alias $CC" >&2;}
                CFLAGS="$CFLAGS -std=`echo "$CC" | sed -e 's%.*/%%'`"
                CC=clang
                ;;
        esac
 

-       echo "$as_me:17031: checking version of $CC" >&5
+       echo "$as_me:17290: checking version of $CC" >&5

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

-       echo "$as_me:17035: result: $CLANG_VERSION" >&5
+       echo "$as_me:17294: result: $CLANG_VERSION" >&5

 echo "${ECHO_T}$CLANG_VERSION" >&6
 
        for cf_clang_opt in \
                -Qunused-arguments \
                -Wno-error=implicit-function-declaration
        do
 echo "${ECHO_T}$CLANG_VERSION" >&6
 
        for cf_clang_opt in \
                -Qunused-arguments \
                -Wno-error=implicit-function-declaration
        do

-               echo "$as_me:17042: checking if option $cf_clang_opt works" >&5
+               echo "$as_me:17301: checking if option $cf_clang_opt works" >&5

 echo $ECHO_N "checking if option $cf_clang_opt works... $ECHO_C" >&6
                cf_save_CFLAGS="$CFLAGS"
                CFLAGS="$CFLAGS $cf_clang_opt"
                cat >"conftest.$ac_ext" <<_ACEOF
 echo $ECHO_N "checking if option $cf_clang_opt works... $ECHO_C" >&6
                cf_save_CFLAGS="$CFLAGS"
                CFLAGS="$CFLAGS $cf_clang_opt"
                cat >"conftest.$ac_ext" <<_ACEOF

-#line 17047 "configure"
+#line 17306 "configure"

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


@@ -17058,16 +17317,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:17061: \"$ac_link\"") >&5
+if { (eval echo "$as_me:17320: \"$ac_link\"") >&5

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

-  echo "$as_me:17064: \$? = $ac_status" >&5
+  echo "$as_me:17323: \$? = $ac_status" >&5

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

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

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

-  echo "$as_me:17070: \$? = $ac_status" >&5
+  echo "$as_me:17329: \$? = $ac_status" >&5

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


@@ -17078,13 +17337,13 @@ cat "conftest.$ac_ext" >&5
                        cf_clang_optok=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
                        cf_clang_optok=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"

-               echo "$as_me:17081: result: $cf_clang_optok" >&5
+               echo "$as_me:17340: result: $cf_clang_optok" >&5

 echo "${ECHO_T}$cf_clang_optok" >&6
                CFLAGS="$cf_save_CFLAGS"
                if test "$cf_clang_optok" = yes; then
                        test -n "$verbose" && echo "    adding option $cf_clang_opt" 1>&6
 
 echo "${ECHO_T}$cf_clang_optok" >&6
                CFLAGS="$cf_save_CFLAGS"
                if test "$cf_clang_optok" = yes; then
                        test -n "$verbose" && echo "    adding option $cf_clang_opt" 1>&6
 

-echo "${as_me:-configure}:17087: testing adding option $cf_clang_opt ..." 1>&5
+echo "${as_me:-configure}:17346: testing adding option $cf_clang_opt ..." 1>&5

 
        test -n "$CFLAGS" && CFLAGS="$CFLAGS "
        CFLAGS="${CFLAGS}$cf_clang_opt"
 
        test -n "$CFLAGS" && CFLAGS="$CFLAGS "
        CFLAGS="${CFLAGS}$cf_clang_opt"


@@ -17101,7 +17360,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 17104 "configure"
+#line 17363 "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
 


@@ -17119,7 +17378,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:17122: checking for $CC warning options..." >&5
+       { echo "$as_me:17381: 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"


@@ -17136,12 +17395,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:17139: \"$ac_compile\"") >&5
+               if { (eval echo "$as_me:17398: \"$ac_compile\"") >&5

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

-  echo "$as_me:17142: \$? = $ac_status" >&5
+  echo "$as_me:17401: \$? = $ac_status" >&5

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

-                       test -n "$verbose" && echo "$as_me:17144: result: ... -$cf_opt" >&5
+                       test -n "$verbose" && echo "$as_me:17403: 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


@@ -17150,7 +17409,7 @@ echo "${ECHO_T}... -$cf_opt" >&6
 
 elif test "$GXX" = yes
 then
 
 elif test "$GXX" = yes
 then

-       { echo "$as_me:17153: checking for $CXX warning options..." >&5
+       { echo "$as_me:17412: 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"


@@ -17180,16 +17439,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:17183: \"$ac_compile\"") >&5
+               if { (eval echo "$as_me:17442: \"$ac_compile\"") >&5

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

-  echo "$as_me:17186: \$? = $ac_status" >&5
+  echo "$as_me:17445: \$? = $ac_status" >&5

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

-                       test -n "$verbose" && echo "$as_me:17188: result: ... -$cf_opt" >&5
+                       test -n "$verbose" && echo "$as_me:17447: 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:17192: result: ... no -$cf_opt" >&5
+                       test -n "$verbose" && echo "$as_me:17451: result: ... no -$cf_opt" >&5

 echo "${ECHO_T}... no -$cf_opt" >&6
                fi
        done
 echo "${ECHO_T}... no -$cf_opt" >&6
                fi
        done


@@ -17207,7 +17466,7 @@ ac_main_return="return"
        fi
 fi
 
        fi
 fi
 

-echo "$as_me:17210: checking if you want to work around bogus compiler/loader warnings" >&5
+echo "$as_me:17469: 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.


@@ -17217,7 +17476,7 @@ if test "${enable_string_hacks+set}" = set; then
 else
   enable_string_hacks=no
 fi;
 else
   enable_string_hacks=no
 fi;

-echo "$as_me:17220: result: $enable_string_hacks" >&5
+echo "$as_me:17479: result: $enable_string_hacks" >&5

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


@@ -17226,15 +17485,15 @@ cat >>confdefs.h <<\EOF
 #define USE_STRING_HACKS 1
 EOF
 
 #define USE_STRING_HACKS 1
 EOF
 

-       { echo "$as_me:17229: WARNING: enabling string-hacks to work around bogus compiler/loader warnings" >&5
+       { echo "$as_me:17488: 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:17231: checking for strlcat" >&5
+       echo "$as_me:17490: 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 17237 "configure"
+#line 17496 "configure"

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


@@ -17265,16 +17524,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:17268: \"$ac_link\"") >&5
+if { (eval echo "$as_me:17527: \"$ac_link\"") >&5

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

-  echo "$as_me:17271: \$? = $ac_status" >&5
+  echo "$as_me:17530: \$? = $ac_status" >&5

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

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

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

-  echo "$as_me:17277: \$? = $ac_status" >&5
+  echo "$as_me:17536: \$? = $ac_status" >&5

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


@@ -17284,7 +17543,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:17287: result: $ac_cv_func_strlcat" >&5
+echo "$as_me:17546: 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
 


@@ -17294,7 +17553,7 @@ EOF
 
 else
 
 
 else
 

-               echo "$as_me:17297: checking for strlcat in -lbsd" >&5
+               echo "$as_me:17556: 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


@@ -17302,7 +17561,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 17305 "configure"
+#line 17564 "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.  */


@@ -17321,16 +17580,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:17324: \"$ac_link\"") >&5
+if { (eval echo "$as_me:17583: \"$ac_link\"") >&5

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

-  echo "$as_me:17327: \$? = $ac_status" >&5
+  echo "$as_me:17586: \$? = $ac_status" >&5

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

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

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

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


@@ -17341,7 +17600,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:17344: result: $ac_cv_lib_bsd_strlcat" >&5
+echo "$as_me:17603: 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
 


@@ -17364,23 +17623,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:17367: checking for $ac_header" >&5
+echo "$as_me:17626: 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 17373 "configure"
+#line 17632 "configure"

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

-if { (eval echo "$as_me:17377: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:17636: \"$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:17383: \$? = $ac_status" >&5
+  echo "$as_me:17642: \$? = $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


@@ -17399,7 +17658,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi

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


@@ -17420,13 +17679,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:17423: checking for $ac_func" >&5
+echo "$as_me:17682: 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 17429 "configure"
+#line 17688 "configure"

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


@@ -17457,16 +17716,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:17460: \"$ac_link\"") >&5
+if { (eval echo "$as_me:17719: \"$ac_link\"") >&5

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

-  echo "$as_me:17463: \$? = $ac_status" >&5
+  echo "$as_me:17722: \$? = $ac_status" >&5

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

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

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

-  echo "$as_me:17469: \$? = $ac_status" >&5
+  echo "$as_me:17728: \$? = $ac_status" >&5

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


@@ -17476,7 +17735,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:17479: result: `eval echo '${'"$as_ac_var"'}'`" >&5
+echo "$as_me:17738: 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


@@ -17489,7 +17748,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:17492: checking if you want to enable runtime assertions" >&5
+echo "$as_me:17751: 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.


@@ -17499,7 +17758,7 @@ if test "${enable_assertions+set}" = set; then
 else
   with_assertions=no
 fi;
 else
   with_assertions=no
 fi;

-echo "$as_me:17502: result: $with_assertions" >&5
+echo "$as_me:17761: 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


@@ -17515,7 +17774,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:17518: checking if you want to use dmalloc for testing" >&5
+echo "$as_me:17777: 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.


@@ -17537,7 +17796,7 @@ EOF
 else
   with_dmalloc=
 fi;
 else
   with_dmalloc=
 fi;

-echo "$as_me:17540: result: ${with_dmalloc:-no}" >&5
+echo "$as_me:17799: 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


@@ -17651,23 +17910,23 @@ fi
 esac
 
 if test "$with_dmalloc" = yes ; then
 esac
 
 if test "$with_dmalloc" = yes ; then

-       echo "$as_me:17654: checking for dmalloc.h" >&5
+       echo "$as_me:17913: 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 17660 "configure"
+#line 17919 "configure"

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

-if { (eval echo "$as_me:17664: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:17923: \"$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:17670: \$? = $ac_status" >&5
+  echo "$as_me:17929: \$? = $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


@@ -17686,11 +17945,11 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi

-echo "$as_me:17689: result: $ac_cv_header_dmalloc_h" >&5
+echo "$as_me:17948: 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:17693: checking for dmalloc_debug in -ldmalloc" >&5
+echo "$as_me:17952: 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


@@ -17698,7 +17957,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 17701 "configure"
+#line 17960 "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.  */


@@ -17717,16 +17976,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:17720: \"$ac_link\"") >&5
+if { (eval echo "$as_me:17979: \"$ac_link\"") >&5

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

-  echo "$as_me:17723: \$? = $ac_status" >&5
+  echo "$as_me:17982: \$? = $ac_status" >&5

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

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

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

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


@@ -17737,7 +17996,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:17740: result: $ac_cv_lib_dmalloc_dmalloc_debug" >&5
+echo "$as_me:17999: 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


@@ -17752,7 +18011,7 @@ fi
 
 fi
 
 
 fi
 

-echo "$as_me:17755: checking if you want to use dbmalloc for testing" >&5
+echo "$as_me:18014: 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.


@@ -17774,7 +18033,7 @@ EOF
 else
   with_dbmalloc=
 fi;
 else
   with_dbmalloc=
 fi;

-echo "$as_me:17777: result: ${with_dbmalloc:-no}" >&5
+echo "$as_me:18036: 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


@@ -17888,23 +18147,23 @@ fi
 esac
 
 if test "$with_dbmalloc" = yes ; then
 esac
 
 if test "$with_dbmalloc" = yes ; then

-       echo "$as_me:17891: checking for dbmalloc.h" >&5
+       echo "$as_me:18150: 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 17897 "configure"
+#line 18156 "configure"

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

-if { (eval echo "$as_me:17901: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:18160: \"$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:17907: \$? = $ac_status" >&5
+  echo "$as_me:18166: \$? = $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


@@ -17923,11 +18182,11 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi

-echo "$as_me:17926: result: $ac_cv_header_dbmalloc_h" >&5
+echo "$as_me:18185: 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:17930: checking for debug_malloc in -ldbmalloc" >&5
+echo "$as_me:18189: 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


@@ -17935,7 +18194,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 17938 "configure"
+#line 18197 "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.  */


@@ -17954,16 +18213,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:17957: \"$ac_link\"") >&5
+if { (eval echo "$as_me:18216: \"$ac_link\"") >&5

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

-  echo "$as_me:17960: \$? = $ac_status" >&5
+  echo "$as_me:18219: \$? = $ac_status" >&5

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

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

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

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


@@ -17974,7 +18233,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:17977: result: $ac_cv_lib_dbmalloc_debug_malloc" >&5
+echo "$as_me:18236: 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


@@ -17989,7 +18248,7 @@ fi
 
 fi
 
 
 fi
 

-echo "$as_me:17992: checking if you want to use valgrind for testing" >&5
+echo "$as_me:18251: 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.


@@ -18011,7 +18270,7 @@ EOF
 else
   with_valgrind=
 fi;
 else
   with_valgrind=
 fi;

-echo "$as_me:18014: result: ${with_valgrind:-no}" >&5
+echo "$as_me:18273: 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


@@ -18124,7 +18383,7 @@ fi
        ;;
 esac
 
        ;;
 esac
 

-echo "$as_me:18127: checking if you want to perform memory-leak testing" >&5
+echo "$as_me:18386: 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.


@@ -18135,7 +18394,7 @@ else
   enable_leaks=yes
 fi;
 if test "x$enable_leaks" = xno; then with_no_leaks=yes; else with_no_leaks=no; fi
   enable_leaks=yes
 fi;
 if test "x$enable_leaks" = xno; then with_no_leaks=yes; else with_no_leaks=no; fi

-echo "$as_me:18138: result: $with_no_leaks" >&5
+echo "$as_me:18397: result: $with_no_leaks" >&5

 echo "${ECHO_T}$with_no_leaks" >&6
 
 if test "$enable_leaks" = no ; then
 echo "${ECHO_T}$with_no_leaks" >&6
 
 if test "$enable_leaks" = no ; then


@@ -18187,7 +18446,7 @@ case "$CFLAGS $CPPFLAGS" in
        ;;
 esac
 
        ;;
 esac
 

-echo "$as_me:18190: checking whether to add trace feature to all models" >&5
+echo "$as_me:18449: 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.


@@ -18197,7 +18456,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:18200: result: $cf_with_trace" >&5
+echo "$as_me:18459: 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


@@ -18311,7 +18570,7 @@ else
        ADA_TRACE=FALSE
 fi
 
        ADA_TRACE=FALSE
 fi
 

-echo "$as_me:18314: checking if we want to use GNAT projects" >&5
+echo "$as_me:18573: 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.


@@ -18328,27 +18587,135 @@ else
        enable_gnat_projects=yes
 
 fi;
        enable_gnat_projects=yes
 
 fi;

-echo "$as_me:18331: result: $enable_gnat_projects" >&5
+echo "$as_me:18590: result: $enable_gnat_projects" >&5

 echo "${ECHO_T}$enable_gnat_projects" >&6
 
 ###    Checks for libraries.
 case "$cf_cv_system_name" in
 (*mingw32*|*mingw64*)
 echo "${ECHO_T}$enable_gnat_projects" >&6
 
 ###    Checks for libraries.
 case "$cf_cv_system_name" in
 (*mingw32*|*mingw64*)

+       # Note: WINVER may be a problem with Windows 10

        if test "x$with_exp_win32" = xyes ; then
        if test "x$with_exp_win32" = xyes ; then

-       CPPFLAGS="$CPPFLAGS -DWINVER=0x0600 -DWIN32_LEAN_AND_MEAN"
+               CPPFLAGS="$CPPFLAGS -DWINVER=0x0600 -DWIN32_LEAN_AND_MEAN"

        else
        else

-       CPPFLAGS="$CPPFLAGS -DWINVER=0x0501 -DWIN32_LEAN_AND_MEAN"
+               CPPFLAGS="$CPPFLAGS -DWINVER=0x0501 -DWIN32_LEAN_AND_MEAN"

        fi
        fi

-       # Note: WINVER may be a problem with Windows 10
+
+echo "$as_me:18603: checking if ssp library is needed" >&5
+echo $ECHO_N "checking if ssp library is needed... $ECHO_C" >&6
+if test "${cf_cv_need_libssp+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+
+cat >"conftest.$ac_ext" <<_ACEOF
+#line 18610 "configure"
+#include "confdefs.h"
+
+#include <sys/types.h>
+#include <dirent.h>
+
+int
+main (void)
+{
+
+       DIR *dp = opendir(".");
+
+  ;
+  return 0;
+}
+_ACEOF
+rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+if { (eval echo "$as_me:18627: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:18630: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest$ac_exeext"'
+  { (eval echo "$as_me:18633: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:18636: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then
+  cf_cv_need_libssp=no
+else
+  echo "$as_me: failed program was:" >&5
+cat "conftest.$ac_ext" >&5
+
+       cf_save_LIBS="$LIBS"
+       LIBS="$LIBS -lssp"
+       cat >"conftest.$ac_ext" <<_ACEOF
+#line 18646 "configure"
+#include "confdefs.h"
+
+#include <sys/types.h>
+#include <dirent.h>
+
+int
+main (void)
+{
+
+                  DIR *dp = opendir(".");
+
+  ;
+  return 0;
+}
+_ACEOF
+rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+if { (eval echo "$as_me:18663: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:18666: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest$ac_exeext"'
+  { (eval echo "$as_me:18669: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:18672: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then
+  cf_cv_need_libssp=yes
+else
+  echo "$as_me: failed program was:" >&5
+cat "conftest.$ac_ext" >&5
+cf_cv_need_libssp=maybe
+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"
+fi
+echo "$as_me:18686: result: $cf_cv_need_libssp" >&5
+echo "${ECHO_T}$cf_cv_need_libssp" >&6
+
+if test "x$cf_cv_need_libssp" = xyes
+then
+
+cf_add_libs="$LIBS"
+# reverse order
+cf_add_0lib=
+for cf_add_1lib in -lssp; do cf_add_0lib="$cf_add_1lib $cf_add_0lib"; done
+# filter duplicates
+for cf_add_1lib in $cf_add_0lib; do
+       for cf_add_2lib in $cf_add_libs; do
+               if test "x$cf_add_1lib" = "x$cf_add_2lib"; then
+                       cf_add_1lib=
+                       break
+               fi
+       done
+       test -n "$cf_add_1lib" && cf_add_libs="$cf_add_1lib $cf_add_libs"
+done
+LIBS="$cf_add_libs"
+
+fi
+

        ;;
 (*)
        ;;
 (*)

-echo "$as_me:18345: checking for gettimeofday" >&5
+echo "$as_me:18712: 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 18351 "configure"
+#line 18718 "configure"

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


@@ -18379,16 +18746,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:18382: \"$ac_link\"") >&5
+if { (eval echo "$as_me:18749: \"$ac_link\"") >&5

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

-  echo "$as_me:18385: \$? = $ac_status" >&5
+  echo "$as_me:18752: \$? = $ac_status" >&5

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

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

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

-  echo "$as_me:18391: \$? = $ac_status" >&5
+  echo "$as_me:18758: \$? = $ac_status" >&5

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


@@ -18398,7 +18765,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:18401: result: $ac_cv_func_gettimeofday" >&5
+echo "$as_me:18768: 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
 


@@ -18408,7 +18775,7 @@ EOF
 
 else
 
 
 else
 

-echo "$as_me:18411: checking for gettimeofday in -lbsd" >&5
+echo "$as_me:18778: 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


@@ -18416,7 +18783,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 18419 "configure"
+#line 18786 "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.  */


@@ -18435,16 +18802,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:18438: \"$ac_link\"") >&5
+if { (eval echo "$as_me:18805: \"$ac_link\"") >&5

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

-  echo "$as_me:18441: \$? = $ac_status" >&5
+  echo "$as_me:18808: \$? = $ac_status" >&5

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

-  { (eval echo "$as_me:18444: \"$ac_try\"") >&5
+  { (eval echo "$as_me:18811: \"$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:18814: \$? = $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


@@ -18455,7 +18822,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:18458: result: $ac_cv_lib_bsd_gettimeofday" >&5
+echo "$as_me:18825: 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
 


@@ -18485,14 +18852,14 @@ fi
        ;;
 esac
 
        ;;
 esac
 

-echo "$as_me:18488: checking if -lm needed for math functions" >&5
+echo "$as_me:18855: 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 18495 "configure"
+#line 18862 "configure"

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


@@ -18508,16 +18875,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:18511: \"$ac_link\"") >&5
+if { (eval echo "$as_me:18878: \"$ac_link\"") >&5

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

-  echo "$as_me:18514: \$? = $ac_status" >&5
+  echo "$as_me:18881: \$? = $ac_status" >&5

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

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

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

-  echo "$as_me:18520: \$? = $ac_status" >&5
+  echo "$as_me:18887: \$? = $ac_status" >&5

   (exit "$ac_status"); }; }; then
   cf_cv_need_libm=no
 else
   (exit "$ac_status"); }; }; then
   cf_cv_need_libm=no
 else


@@ -18527,7 +18894,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:18530: result: $cf_cv_need_libm" >&5
+echo "$as_me:18897: 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


@@ -18535,13 +18902,13 @@ MATH_LIB=-lm
 fi
 
 ###    Checks for header files.
 fi
 
 ###    Checks for header files.

-echo "$as_me:18538: checking for ANSI C header files" >&5
+echo "$as_me:18905: 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 18544 "configure"
+#line 18911 "configure"

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


@@ -18549,13 +18916,13 @@ else
 #include <float.h>
 
 _ACEOF
 #include <float.h>
 
 _ACEOF

-if { (eval echo "$as_me:18552: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:18919: \"$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:18558: \$? = $ac_status" >&5
+  echo "$as_me:18925: \$? = $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


@@ -18577,7 +18944,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 18580 "configure"
+#line 18947 "configure"

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


@@ -18595,7 +18962,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 18598 "configure"
+#line 18965 "configure"

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


@@ -18616,7 +18983,7 @@ if test $ac_cv_header_stdc = yes; then
   :
 else
   cat >"conftest.$ac_ext" <<_ACEOF
   :
 else
   cat >"conftest.$ac_ext" <<_ACEOF

-#line 18619 "configure"
+#line 18986 "configure"

 #include "confdefs.h"
 #include <ctype.h>
 #if ((' ' & 0x0FF) == 0x020)
 #include "confdefs.h"
 #include <ctype.h>
 #if ((' ' & 0x0FF) == 0x020)


@@ -18642,15 +19009,15 @@ main (void)
 }
 _ACEOF
 rm -f "conftest$ac_exeext"
 }
 _ACEOF
 rm -f "conftest$ac_exeext"

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

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

-  echo "$as_me:18648: \$? = $ac_status" >&5
+  echo "$as_me:19015: \$? = $ac_status" >&5

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

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

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

-  echo "$as_me:18653: \$? = $ac_status" >&5
+  echo "$as_me:19020: \$? = $ac_status" >&5

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


@@ -18663,7 +19030,7 @@ rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftes
 fi
 fi
 fi
 fi
 fi
 fi

-echo "$as_me:18666: result: $ac_cv_header_stdc" >&5
+echo "$as_me:19033: 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
 


@@ -18676,13 +19043,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:18679: checking for $ac_hdr that defines DIR" >&5
+echo "$as_me:19046: 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 18685 "configure"
+#line 19052 "configure"

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


@@ -18697,16 +19064,16 @@ return 0;
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
 }
 _ACEOF
 rm -f "conftest.$ac_objext"

-if { (eval echo "$as_me:18700: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:19067: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:18703: \$? = $ac_status" >&5
+  echo "$as_me:19070: \$? = $ac_status" >&5

   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'

-  { (eval echo "$as_me:18706: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19073: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:18709: \$? = $ac_status" >&5
+  echo "$as_me:19076: \$? = $ac_status" >&5

   (exit "$ac_status"); }; }; then
   eval "$as_ac_Header=yes"
 else
   (exit "$ac_status"); }; }; then
   eval "$as_ac_Header=yes"
 else


@@ -18716,7 +19083,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:18719: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:19086: 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


@@ -18729,7 +19096,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:18732: checking for opendir in -ldir" >&5
+  echo "$as_me:19099: 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


@@ -18737,7 +19104,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 18740 "configure"
+#line 19107 "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.  */


@@ -18756,16 +19123,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:18759: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19126: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:18762: \$? = $ac_status" >&5
+  echo "$as_me:19129: \$? = $ac_status" >&5

   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'

-  { (eval echo "$as_me:18765: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19132: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:18768: \$? = $ac_status" >&5
+  echo "$as_me:19135: \$? = $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


@@ -18776,14 +19143,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:18779: result: $ac_cv_lib_dir_opendir" >&5
+echo "$as_me:19146: 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:18786: checking for opendir in -lx" >&5
+  echo "$as_me:19153: 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


@@ -18791,7 +19158,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 18794 "configure"
+#line 19161 "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.  */


@@ -18810,16 +19177,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:18813: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19180: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:18816: \$? = $ac_status" >&5
+  echo "$as_me:19183: \$? = $ac_status" >&5

   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'

-  { (eval echo "$as_me:18819: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19186: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:18822: \$? = $ac_status" >&5
+  echo "$as_me:19189: \$? = $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


@@ -18830,7 +19197,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:18833: result: $ac_cv_lib_x_opendir" >&5
+echo "$as_me:19200: 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"


@@ -18838,13 +19205,13 @@ fi
 
 fi
 
 
 fi
 

-echo "$as_me:18841: checking whether time.h and sys/time.h may both be included" >&5
+echo "$as_me:19208: 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 18847 "configure"
+#line 19214 "configure"

 #include "confdefs.h"
 #include <sys/types.h>
 #include <sys/time.h>
 #include "confdefs.h"
 #include <sys/types.h>
 #include <sys/time.h>


@@ -18860,16 +19227,16 @@ return 0;
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
 }
 _ACEOF
 rm -f "conftest.$ac_objext"

-if { (eval echo "$as_me:18863: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:19230: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:18866: \$? = $ac_status" >&5
+  echo "$as_me:19233: \$? = $ac_status" >&5

   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'

-  { (eval echo "$as_me:18869: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19236: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:18872: \$? = $ac_status" >&5
+  echo "$as_me:19239: \$? = $ac_status" >&5

   (exit "$ac_status"); }; }; then
   ac_cv_header_time=yes
 else
   (exit "$ac_status"); }; }; then
   ac_cv_header_time=yes
 else


@@ -18879,7 +19246,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:18882: result: $ac_cv_header_time" >&5
+echo "$as_me:19249: 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
 


@@ -18894,7 +19261,7 @@ cf_regex_libs=
 case "$host_os" in
 (mingw*)
        # -lsystre -ltre -lintl -liconv
 case "$host_os" in
 (mingw*)
        # -lsystre -ltre -lintl -liconv

-       echo "$as_me:18897: checking for regcomp in -lsystre" >&5
+       echo "$as_me:19264: checking for regcomp in -lsystre" >&5

 echo $ECHO_N "checking for regcomp in -lsystre... $ECHO_C" >&6
 if test "${ac_cv_lib_systre_regcomp+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 echo $ECHO_N "checking for regcomp in -lsystre... $ECHO_C" >&6
 if test "${ac_cv_lib_systre_regcomp+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6


@@ -18902,7 +19269,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lsystre  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lsystre  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF

-#line 18905 "configure"
+#line 19272 "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.  */


@@ -18921,16 +19288,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:18924: \"$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:18927: \$? = $ac_status" >&5
+  echo "$as_me:19294: \$? = $ac_status" >&5

   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'

-  { (eval echo "$as_me:18930: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19297: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:18933: \$? = $ac_status" >&5
+  echo "$as_me:19300: \$? = $ac_status" >&5

   (exit "$ac_status"); }; }; then
   ac_cv_lib_systre_regcomp=yes
 else
   (exit "$ac_status"); }; }; then
   ac_cv_lib_systre_regcomp=yes
 else


@@ -18941,11 +19308,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:18944: result: $ac_cv_lib_systre_regcomp" >&5
+echo "$as_me:19311: result: $ac_cv_lib_systre_regcomp" >&5

 echo "${ECHO_T}$ac_cv_lib_systre_regcomp" >&6
 if test "$ac_cv_lib_systre_regcomp" = yes; then
 
 echo "${ECHO_T}$ac_cv_lib_systre_regcomp" >&6
 if test "$ac_cv_lib_systre_regcomp" = yes; then
 

-               echo "$as_me:18948: checking for libiconv_open in -liconv" >&5
+               echo "$as_me:19315: checking for libiconv_open in -liconv" >&5

 echo $ECHO_N "checking for libiconv_open in -liconv... $ECHO_C" >&6
 if test "${ac_cv_lib_iconv_libiconv_open+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 echo $ECHO_N "checking for libiconv_open in -liconv... $ECHO_C" >&6
 if test "${ac_cv_lib_iconv_libiconv_open+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6


@@ -18953,7 +19320,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-liconv  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-liconv  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF

-#line 18956 "configure"
+#line 19323 "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.  */


@@ -18972,16 +19339,16 @@ libiconv_open ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"

-if { (eval echo "$as_me:18975: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19342: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:18978: \$? = $ac_status" >&5
+  echo "$as_me:19345: \$? = $ac_status" >&5

   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'

-  { (eval echo "$as_me:18981: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19348: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:18984: \$? = $ac_status" >&5
+  echo "$as_me:19351: \$? = $ac_status" >&5

   (exit "$ac_status"); }; }; then
   ac_cv_lib_iconv_libiconv_open=yes
 else
   (exit "$ac_status"); }; }; then
   ac_cv_lib_iconv_libiconv_open=yes
 else


@@ -18992,7 +19359,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:18995: result: $ac_cv_lib_iconv_libiconv_open" >&5
+echo "$as_me:19362: result: $ac_cv_lib_iconv_libiconv_open" >&5

 echo "${ECHO_T}$ac_cv_lib_iconv_libiconv_open" >&6
 if test "$ac_cv_lib_iconv_libiconv_open" = yes; then
 
 echo "${ECHO_T}$ac_cv_lib_iconv_libiconv_open" >&6
 if test "$ac_cv_lib_iconv_libiconv_open" = yes; then
 


@@ -19014,7 +19381,7 @@ LIBS="$cf_add_libs"
 
 fi
 
 
 fi
 

-               echo "$as_me:19017: checking for libintl_gettext in -lintl" >&5
+               echo "$as_me:19384: checking for libintl_gettext in -lintl" >&5

 echo $ECHO_N "checking for libintl_gettext in -lintl... $ECHO_C" >&6
 if test "${ac_cv_lib_intl_libintl_gettext+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 echo $ECHO_N "checking for libintl_gettext in -lintl... $ECHO_C" >&6
 if test "${ac_cv_lib_intl_libintl_gettext+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6


@@ -19022,7 +19389,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lintl  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lintl  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF

-#line 19025 "configure"
+#line 19392 "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.  */


@@ -19041,16 +19408,16 @@ libintl_gettext ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"

-if { (eval echo "$as_me:19044: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19411: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:19047: \$? = $ac_status" >&5
+  echo "$as_me:19414: \$? = $ac_status" >&5

   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'

-  { (eval echo "$as_me:19050: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19417: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:19053: \$? = $ac_status" >&5
+  echo "$as_me:19420: \$? = $ac_status" >&5

   (exit "$ac_status"); }; }; then
   ac_cv_lib_intl_libintl_gettext=yes
 else
   (exit "$ac_status"); }; }; then
   ac_cv_lib_intl_libintl_gettext=yes
 else


@@ -19061,7 +19428,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:19064: result: $ac_cv_lib_intl_libintl_gettext" >&5
+echo "$as_me:19431: result: $ac_cv_lib_intl_libintl_gettext" >&5

 echo "${ECHO_T}$ac_cv_lib_intl_libintl_gettext" >&6
 if test "$ac_cv_lib_intl_libintl_gettext" = yes; then
 
 echo "${ECHO_T}$ac_cv_lib_intl_libintl_gettext" >&6
 if test "$ac_cv_lib_intl_libintl_gettext" = yes; then
 


@@ -19083,7 +19450,7 @@ LIBS="$cf_add_libs"
 
 fi
 
 
 fi
 

-               echo "$as_me:19086: checking for tre_regcomp in -ltre" >&5
+               echo "$as_me:19453: checking for tre_regcomp in -ltre" >&5

 echo $ECHO_N "checking for tre_regcomp in -ltre... $ECHO_C" >&6
 if test "${ac_cv_lib_tre_tre_regcomp+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 echo $ECHO_N "checking for tre_regcomp in -ltre... $ECHO_C" >&6
 if test "${ac_cv_lib_tre_tre_regcomp+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6


@@ -19091,7 +19458,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ltre  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ltre  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF

-#line 19094 "configure"
+#line 19461 "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.  */


@@ -19110,16 +19477,16 @@ tre_regcomp ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"

-if { (eval echo "$as_me:19113: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19480: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:19116: \$? = $ac_status" >&5
+  echo "$as_me:19483: \$? = $ac_status" >&5

   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'

-  { (eval echo "$as_me:19119: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19486: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:19122: \$? = $ac_status" >&5
+  echo "$as_me:19489: \$? = $ac_status" >&5

   (exit "$ac_status"); }; }; then
   ac_cv_lib_tre_tre_regcomp=yes
 else
   (exit "$ac_status"); }; }; then
   ac_cv_lib_tre_tre_regcomp=yes
 else


@@ -19130,7 +19497,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:19133: result: $ac_cv_lib_tre_tre_regcomp" >&5
+echo "$as_me:19500: result: $ac_cv_lib_tre_tre_regcomp" >&5

 echo "${ECHO_T}$ac_cv_lib_tre_tre_regcomp" >&6
 if test "$ac_cv_lib_tre_tre_regcomp" = yes; then
 
 echo "${ECHO_T}$ac_cv_lib_tre_tre_regcomp" >&6
 if test "$ac_cv_lib_tre_tre_regcomp" = yes; then
 


@@ -19172,7 +19539,7 @@ LIBS="$cf_add_libs"
 
 else
 
 
 else
 

-               echo "$as_me:19175: checking for regcomp in -lgnurx" >&5
+               echo "$as_me:19542: checking for regcomp in -lgnurx" >&5

 echo $ECHO_N "checking for regcomp in -lgnurx... $ECHO_C" >&6
 if test "${ac_cv_lib_gnurx_regcomp+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 echo $ECHO_N "checking for regcomp in -lgnurx... $ECHO_C" >&6
 if test "${ac_cv_lib_gnurx_regcomp+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6


@@ -19180,7 +19547,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lgnurx  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lgnurx  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF

-#line 19183 "configure"
+#line 19550 "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.  */


@@ -19199,16 +19566,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:19202: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19569: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:19205: \$? = $ac_status" >&5
+  echo "$as_me:19572: \$? = $ac_status" >&5

   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'

-  { (eval echo "$as_me:19208: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19575: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:19211: \$? = $ac_status" >&5
+  echo "$as_me:19578: \$? = $ac_status" >&5

   (exit "$ac_status"); }; }; then
   ac_cv_lib_gnurx_regcomp=yes
 else
   (exit "$ac_status"); }; }; then
   ac_cv_lib_gnurx_regcomp=yes
 else


@@ -19219,7 +19586,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:19222: result: $ac_cv_lib_gnurx_regcomp" >&5
+echo "$as_me:19589: result: $ac_cv_lib_gnurx_regcomp" >&5

 echo "${ECHO_T}$ac_cv_lib_gnurx_regcomp" >&6
 if test "$ac_cv_lib_gnurx_regcomp" = yes; then
 
 echo "${ECHO_T}$ac_cv_lib_gnurx_regcomp" >&6
 if test "$ac_cv_lib_gnurx_regcomp" = yes; then
 


@@ -19247,13 +19614,13 @@ fi
        ;;
 (*)
        cf_regex_libs="regex re"
        ;;
 (*)
        cf_regex_libs="regex re"

-       echo "$as_me:19250: checking for regcomp" >&5
+       echo "$as_me:19617: 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 19256 "configure"
+#line 19623 "configure"

 #include "confdefs.h"
 #define regcomp autoconf_temporary
 #include <limits.h>    /* least-intrusive standard header which defines gcc2 __stub macros */
 #include "confdefs.h"
 #define regcomp autoconf_temporary
 #include <limits.h>    /* least-intrusive standard header which defines gcc2 __stub macros */


@@ -19284,16 +19651,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:19287: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19654: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:19290: \$? = $ac_status" >&5
+  echo "$as_me:19657: \$? = $ac_status" >&5

   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'

-  { (eval echo "$as_me:19293: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19660: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:19296: \$? = $ac_status" >&5
+  echo "$as_me:19663: \$? = $ac_status" >&5

   (exit "$ac_status"); }; }; then
   ac_cv_func_regcomp=yes
 else
   (exit "$ac_status"); }; }; then
   ac_cv_func_regcomp=yes
 else


@@ -19303,7 +19670,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:19306: result: $ac_cv_func_regcomp" >&5
+echo "$as_me:19673: 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


@@ -19312,7 +19679,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:19315: checking for regcomp in -l$cf_regex_lib" >&5
+echo "$as_me:19682: 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


@@ -19320,7 +19687,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 19323 "configure"
+#line 19690 "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.  */


@@ -19339,16 +19706,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:19342: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19709: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:19345: \$? = $ac_status" >&5
+  echo "$as_me:19712: \$? = $ac_status" >&5

   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'

-  { (eval echo "$as_me:19348: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19715: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:19351: \$? = $ac_status" >&5
+  echo "$as_me:19718: \$? = $ac_status" >&5

   (exit "$ac_status"); }; }; then
   eval "$as_ac_Lib=yes"
 else
   (exit "$ac_status"); }; }; then
   eval "$as_ac_Lib=yes"
 else


@@ -19359,7 +19726,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:19362: result: `eval echo '${'"$as_ac_Lib"'}'`" >&5
+echo "$as_me:19729: 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
 


@@ -19391,13 +19758,13 @@ fi
 esac
 
 if test "$cf_regex_func" = no ; then
 esac
 
 if test "$cf_regex_func" = no ; then

-       echo "$as_me:19394: checking for compile" >&5
+       echo "$as_me:19761: 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 19400 "configure"
+#line 19767 "configure"

 #include "confdefs.h"
 #define compile autoconf_temporary
 #include <limits.h>    /* least-intrusive standard header which defines gcc2 __stub macros */
 #include "confdefs.h"
 #define compile autoconf_temporary
 #include <limits.h>    /* least-intrusive standard header which defines gcc2 __stub macros */


@@ -19428,16 +19795,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:19431: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19798: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:19434: \$? = $ac_status" >&5
+  echo "$as_me:19801: \$? = $ac_status" >&5

   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'

-  { (eval echo "$as_me:19437: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19804: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:19440: \$? = $ac_status" >&5
+  echo "$as_me:19807: \$? = $ac_status" >&5

   (exit "$ac_status"); }; }; then
   ac_cv_func_compile=yes
 else
   (exit "$ac_status"); }; }; then
   ac_cv_func_compile=yes
 else


@@ -19447,13 +19814,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:19450: result: $ac_cv_func_compile" >&5
+echo "$as_me:19817: 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:19456: checking for compile in -lgen" >&5
+               echo "$as_me:19823: 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


@@ -19461,7 +19828,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 19464 "configure"
+#line 19831 "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.  */


@@ -19480,16 +19847,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:19483: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19850: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:19486: \$? = $ac_status" >&5
+  echo "$as_me:19853: \$? = $ac_status" >&5

   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'

-  { (eval echo "$as_me:19489: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19856: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:19492: \$? = $ac_status" >&5
+  echo "$as_me:19859: \$? = $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


@@ -19500,7 +19867,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:19503: result: $ac_cv_lib_gen_compile" >&5
+echo "$as_me:19870: 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
 


@@ -19528,11 +19895,11 @@ fi
 fi
 
 if test "$cf_regex_func" = no ; then
 fi
 
 if test "$cf_regex_func" = no ; then

-       { echo "$as_me:19531: WARNING: cannot find regular expression library" >&5
+       { echo "$as_me:19898: 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:19535: checking for regular-expression headers" >&5
+echo "$as_me:19902: 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


@@ -19544,7 +19911,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 19547 "configure"
+#line 19914 "configure"

 #include "confdefs.h"
 #include <$cf_regex_hdr>
 int
 #include "confdefs.h"
 #include <$cf_regex_hdr>
 int


@@ -19561,16 +19928,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:19564: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19931: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:19567: \$? = $ac_status" >&5
+  echo "$as_me:19934: \$? = $ac_status" >&5

   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'

-  { (eval echo "$as_me:19570: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19937: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:19573: \$? = $ac_status" >&5
+  echo "$as_me:19940: \$? = $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


@@ -19587,7 +19954,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 19590 "configure"
+#line 19957 "configure"

 #include "confdefs.h"
 #include <sys/types.h>
 #include <$cf_regex_hdr>
 #include "confdefs.h"
 #include <sys/types.h>
 #include <$cf_regex_hdr>


@@ -19607,16 +19974,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:19610: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19977: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:19613: \$? = $ac_status" >&5
+  echo "$as_me:19980: \$? = $ac_status" >&5

   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'

-  { (eval echo "$as_me:19616: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19983: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:19619: \$? = $ac_status" >&5
+  echo "$as_me:19986: \$? = $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


@@ -19632,11 +19999,11 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 esac
 
 fi
 esac
 
 fi

-echo "$as_me:19635: result: $cf_cv_regex_hdrs" >&5
+echo "$as_me:20002: 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:19639: WARNING: no regular expression header found" >&5
+       (no)            { echo "$as_me:20006: 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


@@ -19674,23 +20041,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:19677: checking for $ac_header" >&5
+echo "$as_me:20044: 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 19683 "configure"
+#line 20050 "configure"

 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF

-if { (eval echo "$as_me:19687: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:20054: \"$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:19693: \$? = $ac_status" >&5
+  echo "$as_me:20060: \$? = $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


@@ -19709,7 +20076,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi

-echo "$as_me:19712: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:20079: 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


@@ -19722,23 +20089,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:19725: checking for $ac_header" >&5
+echo "$as_me:20092: 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 19731 "configure"
+#line 20098 "configure"

 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF

-if { (eval echo "$as_me:19735: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:20102: \"$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:19741: \$? = $ac_status" >&5
+  echo "$as_me:20108: \$? = $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


@@ -19757,7 +20124,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi

-echo "$as_me:19760: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:20127: 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


@@ -19767,7 +20134,7 @@ EOF
 fi
 done
 
 fi
 done
 

-echo "$as_me:19770: checking for header declaring getopt variables" >&5
+echo "$as_me:20137: 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


@@ -19777,7 +20144,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 19780 "configure"
+#line 20147 "configure"

 #include "confdefs.h"
 
 #include <$cf_header>
 #include "confdefs.h"
 
 #include <$cf_header>


@@ -19790,16 +20157,16 @@ int x = optind; char *y = optarg; (void)x; (void)y
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
 }
 _ACEOF
 rm -f "conftest.$ac_objext"

-if { (eval echo "$as_me:19793: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:20160: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:19796: \$? = $ac_status" >&5
+  echo "$as_me:20163: \$? = $ac_status" >&5

   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'

-  { (eval echo "$as_me:19799: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20166: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:19802: \$? = $ac_status" >&5
+  echo "$as_me:20169: \$? = $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


@@ -19811,7 +20178,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 done
 
 fi
 done
 
 fi

-echo "$as_me:19814: result: $cf_cv_getopt_header" >&5
+echo "$as_me:20181: 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
 


@@ -19828,14 +20195,14 @@ EOF
 
 fi
 
 
 fi
 

-echo "$as_me:19831: checking if external environ is declared" >&5
+echo "$as_me:20198: checking if external environ is declared" >&5

 echo $ECHO_N "checking if external environ is declared... $ECHO_C" >&6
 if test "${cf_cv_dcl_environ+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
     cat >"conftest.$ac_ext" <<_ACEOF
 echo $ECHO_N "checking if external environ is declared... $ECHO_C" >&6
 if test "${cf_cv_dcl_environ+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
     cat >"conftest.$ac_ext" <<_ACEOF

-#line 19838 "configure"
+#line 20205 "configure"

 #include "confdefs.h"
 
 #ifdef HAVE_STDLIB_H
 #include "confdefs.h"
 
 #ifdef HAVE_STDLIB_H


@@ -19851,16 +20218,16 @@ int x = (int) environ
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
 }
 _ACEOF
 rm -f "conftest.$ac_objext"

-if { (eval echo "$as_me:19854: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:20221: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:19857: \$? = $ac_status" >&5
+  echo "$as_me:20224: \$? = $ac_status" >&5

   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'

-  { (eval echo "$as_me:19860: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20227: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:19863: \$? = $ac_status" >&5
+  echo "$as_me:20230: \$? = $ac_status" >&5

   (exit "$ac_status"); }; }; then
   cf_cv_dcl_environ=yes
 else
   (exit "$ac_status"); }; }; then
   cf_cv_dcl_environ=yes
 else


@@ -19871,7 +20238,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi

-echo "$as_me:19874: result: $cf_cv_dcl_environ" >&5
+echo "$as_me:20241: result: $cf_cv_dcl_environ" >&5

 echo "${ECHO_T}$cf_cv_dcl_environ" >&6
 
 if test "$cf_cv_dcl_environ" = no ; then
 echo "${ECHO_T}$cf_cv_dcl_environ" >&6
 
 if test "$cf_cv_dcl_environ" = no ; then


@@ -19886,14 +20253,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:19889: checking if external environ exists" >&5
+echo "$as_me:20256: checking if external environ exists" >&5

 echo $ECHO_N "checking if external environ exists... $ECHO_C" >&6
 if test "${cf_cv_have_environ+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
        cat >"conftest.$ac_ext" <<_ACEOF
 echo $ECHO_N "checking if external environ exists... $ECHO_C" >&6
 if test "${cf_cv_have_environ+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
        cat >"conftest.$ac_ext" <<_ACEOF

-#line 19896 "configure"
+#line 20263 "configure"

 #include "confdefs.h"
 
 #undef environ
 #include "confdefs.h"
 
 #undef environ


@@ -19908,16 +20275,16 @@ environ = 2
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"

-if { (eval echo "$as_me:19911: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20278: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:19914: \$? = $ac_status" >&5
+  echo "$as_me:20281: \$? = $ac_status" >&5

   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'

-  { (eval echo "$as_me:19917: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20284: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:19920: \$? = $ac_status" >&5
+  echo "$as_me:20287: \$? = $ac_status" >&5

   (exit "$ac_status"); }; }; then
   cf_cv_have_environ=yes
 else
   (exit "$ac_status"); }; }; then
   cf_cv_have_environ=yes
 else


@@ -19928,7 +20295,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:19931: result: $cf_cv_have_environ" >&5
+echo "$as_me:20298: result: $cf_cv_have_environ" >&5

 echo "${ECHO_T}$cf_cv_have_environ" >&6
 
 if test "$cf_cv_have_environ" = yes ; then
 echo "${ECHO_T}$cf_cv_have_environ" >&6
 
 if test "$cf_cv_have_environ" = yes ; then


@@ -19941,13 +20308,13 @@ EOF
 
 fi
 
 
 fi
 

-echo "$as_me:19944: checking for getenv" >&5
+echo "$as_me:20311: checking for getenv" >&5

 echo $ECHO_N "checking for getenv... $ECHO_C" >&6
 if test "${ac_cv_func_getenv+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >"conftest.$ac_ext" <<_ACEOF
 echo $ECHO_N "checking for getenv... $ECHO_C" >&6
 if test "${ac_cv_func_getenv+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >"conftest.$ac_ext" <<_ACEOF

-#line 19950 "configure"
+#line 20317 "configure"

 #include "confdefs.h"
 #define getenv autoconf_temporary
 #include <limits.h>    /* least-intrusive standard header which defines gcc2 __stub macros */
 #include "confdefs.h"
 #define getenv autoconf_temporary
 #include <limits.h>    /* least-intrusive standard header which defines gcc2 __stub macros */


@@ -19978,16 +20345,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:19981: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20348: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:19984: \$? = $ac_status" >&5
+  echo "$as_me:20351: \$? = $ac_status" >&5

   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'

-  { (eval echo "$as_me:19987: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20354: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:19990: \$? = $ac_status" >&5
+  echo "$as_me:20357: \$? = $ac_status" >&5

   (exit "$ac_status"); }; }; then
   ac_cv_func_getenv=yes
 else
   (exit "$ac_status"); }; }; then
   ac_cv_func_getenv=yes
 else


@@ -19997,19 +20364,19 @@ ac_cv_func_getenv=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi

-echo "$as_me:20000: result: $ac_cv_func_getenv" >&5
+echo "$as_me:20367: result: $ac_cv_func_getenv" >&5

 echo "${ECHO_T}$ac_cv_func_getenv" >&6
 
 for ac_func in putenv setenv strdup
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
 echo "${ECHO_T}$ac_cv_func_getenv" >&6
 
 for ac_func in putenv setenv strdup
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`

-echo "$as_me:20006: checking for $ac_func" >&5
+echo "$as_me:20373: 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 20012 "configure"
+#line 20379 "configure"

 #include "confdefs.h"
 #define $ac_func autoconf_temporary
 #include <limits.h>    /* least-intrusive standard header which defines gcc2 __stub macros */
 #include "confdefs.h"
 #define $ac_func autoconf_temporary
 #include <limits.h>    /* least-intrusive standard header which defines gcc2 __stub macros */


@@ -20040,16 +20407,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:20043: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20410: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:20046: \$? = $ac_status" >&5
+  echo "$as_me:20413: \$? = $ac_status" >&5

   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'

-  { (eval echo "$as_me:20049: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20416: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:20052: \$? = $ac_status" >&5
+  echo "$as_me:20419: \$? = $ac_status" >&5

   (exit "$ac_status"); }; }; then
   eval "$as_ac_var=yes"
 else
   (exit "$ac_status"); }; }; then
   eval "$as_ac_var=yes"
 else


@@ -20059,7 +20426,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:20062: result: `eval echo '${'"$as_ac_var"'}'`" >&5
+echo "$as_me:20429: 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


@@ -20069,7 +20436,7 @@ EOF
 fi
 done
 
 fi
 done
 

-echo "$as_me:20072: checking if getenv returns consistent values" >&5
+echo "$as_me:20439: checking if getenv returns consistent values" >&5

 echo $ECHO_N "checking if getenv returns consistent values... $ECHO_C" >&6
 if test "${cf_cv_consistent_getenv+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 echo $ECHO_N "checking if getenv returns consistent values... $ECHO_C" >&6
 if test "${cf_cv_consistent_getenv+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6


@@ -20079,7 +20446,7 @@ if test "$cross_compiling" = yes; then
   cf_cv_consistent_getenv=unknown
 else
   cat >"conftest.$ac_ext" <<_ACEOF
   cf_cv_consistent_getenv=unknown
 else
   cat >"conftest.$ac_ext" <<_ACEOF

-#line 20082 "configure"
+#line 20449 "configure"

 #include "confdefs.h"
 
 #include <stdlib.h>
 #include "confdefs.h"
 
 #include <stdlib.h>


@@ -20188,15 +20555,15 @@ int main(void)
 
 _ACEOF
 rm -f "conftest$ac_exeext"
 
 _ACEOF
 rm -f "conftest$ac_exeext"

-if { (eval echo "$as_me:20191: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20558: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:20194: \$? = $ac_status" >&5
+  echo "$as_me:20561: \$? = $ac_status" >&5

   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'

-  { (eval echo "$as_me:20196: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20563: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:20199: \$? = $ac_status" >&5
+  echo "$as_me:20566: \$? = $ac_status" >&5

   (exit "$ac_status"); }; }; then
   cf_cv_consistent_getenv=yes
 else
   (exit "$ac_status"); }; }; then
   cf_cv_consistent_getenv=yes
 else


@@ -20209,7 +20576,7 @@ rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftes
 fi
 
 fi
 fi
 
 fi

-echo "$as_me:20212: result: $cf_cv_consistent_getenv" >&5
+echo "$as_me:20579: result: $cf_cv_consistent_getenv" >&5

 echo "${ECHO_T}$cf_cv_consistent_getenv" >&6
 
 if test "x$cf_cv_consistent_getenv" = xno
 echo "${ECHO_T}$cf_cv_consistent_getenv" >&6
 
 if test "x$cf_cv_consistent_getenv" = xno


@@ -20224,18 +20591,18 @@ fi
 if test "x$cf_cv_consistent_getenv" = xno && \
        test "x$cf_with_trace" = xyes
 then
 if test "x$cf_cv_consistent_getenv" = xno && \
        test "x$cf_with_trace" = xyes
 then

-       { echo "$as_me:20227: WARNING: The NCURSES_TRACE environment variable is not supported with this configuration" >&5
+       { echo "$as_me:20594: WARNING: The NCURSES_TRACE environment variable is not supported with this configuration" >&5

 echo "$as_me: WARNING: The NCURSES_TRACE environment variable is not supported with this configuration" >&2;}
 fi
 
 echo "$as_me: WARNING: The NCURSES_TRACE environment variable is not supported with this configuration" >&2;}
 fi
 

-echo "$as_me:20231: checking if sys/time.h works with sys/select.h" >&5
+echo "$as_me:20598: 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 20238 "configure"
+#line 20605 "configure"

 #include "confdefs.h"
 
 #include <sys/types.h>
 #include "confdefs.h"
 
 #include <sys/types.h>


@@ -20255,16 +20622,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
 }
 _ACEOF
 rm -f "conftest.$ac_objext"

-if { (eval echo "$as_me:20258: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:20625: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:20261: \$? = $ac_status" >&5
+  echo "$as_me:20628: \$? = $ac_status" >&5

   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'

-  { (eval echo "$as_me:20264: \"$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:20267: \$? = $ac_status" >&5
+  echo "$as_me:20634: \$? = $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


@@ -20276,7 +20643,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
 
 
 fi
 

-echo "$as_me:20279: result: $cf_cv_sys_time_select" >&5
+echo "$as_me:20646: 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


@@ -20291,13 +20658,13 @@ ac_link='$CC -o "conftest$ac_exeext" $CFLAGS $CPPFLAGS $LDFLAGS "conftest.$ac_ex
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 ac_main_return="return"
 
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 ac_main_return="return"
 

-echo "$as_me:20294: checking for an ANSI C-conforming const" >&5
+echo "$as_me:20661: 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 20300 "configure"
+#line 20667 "configure"

 #include "confdefs.h"
 
 int
 #include "confdefs.h"
 
 int


@@ -20355,16 +20722,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
 }
 _ACEOF
 rm -f "conftest.$ac_objext"

-if { (eval echo "$as_me:20358: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:20725: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:20361: \$? = $ac_status" >&5
+  echo "$as_me:20728: \$? = $ac_status" >&5

   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'

-  { (eval echo "$as_me:20364: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20731: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:20367: \$? = $ac_status" >&5
+  echo "$as_me:20734: \$? = $ac_status" >&5

   (exit "$ac_status"); }; }; then
   ac_cv_c_const=yes
 else
   (exit "$ac_status"); }; }; then
   ac_cv_c_const=yes
 else


@@ -20374,7 +20741,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:20377: result: $ac_cv_c_const" >&5
+echo "$as_me:20744: 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
 


@@ -20384,7 +20751,7 @@ EOF
 
 fi
 
 
 fi
 

-echo "$as_me:20387: checking for inline" >&5
+echo "$as_me:20754: 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


@@ -20392,7 +20759,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 20395 "configure"
+#line 20762 "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; }


@@ -20401,16 +20768,16 @@ $ac_kw int foo () {return 0; }
 
 _ACEOF
 rm -f "conftest.$ac_objext"
 
 _ACEOF
 rm -f "conftest.$ac_objext"

-if { (eval echo "$as_me:20404: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:20771: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:20407: \$? = $ac_status" >&5
+  echo "$as_me:20774: \$? = $ac_status" >&5

   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'

-  { (eval echo "$as_me:20410: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20777: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:20413: \$? = $ac_status" >&5
+  echo "$as_me:20780: \$? = $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


@@ -20421,7 +20788,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 done
 
 fi
 done
 
 fi

-echo "$as_me:20424: result: $ac_cv_c_inline" >&5
+echo "$as_me:20791: 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) ;;


@@ -20447,7 +20814,7 @@ if test "$ac_cv_c_inline" != no ; then
                :
        elif test "$GCC" = yes
        then
                :
        elif test "$GCC" = yes
        then

-               echo "$as_me:20450: checking if $CC supports options to tune inlining" >&5
+               echo "$as_me:20817: 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


@@ -20456,7 +20823,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 20459 "configure"
+#line 20826 "configure"

 #include "confdefs.h"
 inline int foo(void) { return 1; }
 int
 #include "confdefs.h"
 inline int foo(void) { return 1; }
 int


@@ -20468,16 +20835,16 @@ ${cf_cv_main_return:-return} foo()
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
 }
 _ACEOF
 rm -f "conftest.$ac_objext"

-if { (eval echo "$as_me:20471: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:20838: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:20474: \$? = $ac_status" >&5
+  echo "$as_me:20841: \$? = $ac_status" >&5

   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'

-  { (eval echo "$as_me:20477: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20844: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:20480: \$? = $ac_status" >&5
+  echo "$as_me:20847: \$? = $ac_status" >&5

   (exit "$ac_status"); }; }; then
   cf_cv_gcc_inline=yes
 else
   (exit "$ac_status"); }; }; then
   cf_cv_gcc_inline=yes
 else


@@ -20489,7 +20856,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
                CFLAGS=$cf_save_CFLAGS
 
 fi
                CFLAGS=$cf_save_CFLAGS
 
 fi

-echo "$as_me:20492: result: $cf_cv_gcc_inline" >&5
+echo "$as_me:20859: 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
 


@@ -20595,7 +20962,7 @@ fi
        fi
 fi
 
        fi
 fi
 

-echo "$as_me:20598: checking for signal global datatype" >&5
+echo "$as_me:20965: 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


@@ -20607,7 +20974,7 @@ else
                "int"
        do
        cat >"conftest.$ac_ext" <<_ACEOF
                "int"
        do
        cat >"conftest.$ac_ext" <<_ACEOF

-#line 20610 "configure"
+#line 20977 "configure"

 #include "confdefs.h"
 
 #include <sys/types.h>
 #include "confdefs.h"
 
 #include <sys/types.h>


@@ -20631,16 +20998,16 @@ signal(SIGINT, handler);
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
 }
 _ACEOF
 rm -f "conftest.$ac_objext"

-if { (eval echo "$as_me:20634: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:21001: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:20637: \$? = $ac_status" >&5
+  echo "$as_me:21004: \$? = $ac_status" >&5

   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'

-  { (eval echo "$as_me:20640: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21007: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:20643: \$? = $ac_status" >&5
+  echo "$as_me:21010: \$? = $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


@@ -20654,7 +21021,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
 
 
 fi
 

-echo "$as_me:20657: result: $cf_cv_sig_atomic_t" >&5
+echo "$as_me:21024: 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


@@ -20663,7 +21030,7 @@ EOF
 
 if test "$NCURSES_CHTYPE" = auto ; then
 
 
 if test "$NCURSES_CHTYPE" = auto ; then
 

-echo "$as_me:20666: checking for type of chtype" >&5
+echo "$as_me:21033: 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


@@ -20673,7 +21040,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 20676 "configure"
+#line 21043 "configure"

 #include "confdefs.h"
 
 #define WANT_BITS 31
 #include "confdefs.h"
 
 #define WANT_BITS 31


@@ -20708,15 +21075,15 @@ int main(void)
 
 _ACEOF
 rm -f "conftest$ac_exeext"
 
 _ACEOF
 rm -f "conftest$ac_exeext"

-if { (eval echo "$as_me:20711: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21078: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:20714: \$? = $ac_status" >&5
+  echo "$as_me:21081: \$? = $ac_status" >&5

   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'

-  { (eval echo "$as_me:20716: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21083: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:20719: \$? = $ac_status" >&5
+  echo "$as_me:21086: \$? = $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


@@ -20731,7 +21098,7 @@ fi
 
 fi
 
 
 fi
 

-echo "$as_me:20734: result: $cf_cv_typeof_chtype" >&5
+echo "$as_me:21101: 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


@@ -20743,14 +21110,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:20746: checking if unsigned literals are legal" >&5
+echo "$as_me:21113: 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 20753 "configure"
+#line 21120 "configure"

 #include "confdefs.h"
 
 int
 #include "confdefs.h"
 
 int


@@ -20762,16 +21129,16 @@ long x = 1L + 1UL + 1U + 1
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
 }
 _ACEOF
 rm -f "conftest.$ac_objext"

-if { (eval echo "$as_me:20765: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:21132: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:20768: \$? = $ac_status" >&5
+  echo "$as_me:21135: \$? = $ac_status" >&5

   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'

-  { (eval echo "$as_me:20771: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21138: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:20774: \$? = $ac_status" >&5
+  echo "$as_me:21141: \$? = $ac_status" >&5

   (exit "$ac_status"); }; }; then
   cf_cv_unsigned_literals=yes
 else
   (exit "$ac_status"); }; }; then
   cf_cv_unsigned_literals=yes
 else


@@ -20783,7 +21150,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
 
 
 fi
 

-echo "$as_me:20786: result: $cf_cv_unsigned_literals" >&5
+echo "$as_me:21153: 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"


@@ -20799,14 +21166,14 @@ test "$cf_cv_typeof_mmask_t" = unsigned && cf_cv_typeof_mmask_t=""
 
 ###    Checks for external-data
 
 
 ###    Checks for external-data
 

-echo "$as_me:20802: checking if external errno is declared" >&5
+echo "$as_me:21169: 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 20809 "configure"
+#line 21176 "configure"

 #include "confdefs.h"
 
 #ifdef HAVE_STDLIB_H
 #include "confdefs.h"
 
 #ifdef HAVE_STDLIB_H


@@ -20824,16 +21191,16 @@ int x = (int) errno; (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
 }
 _ACEOF
 rm -f "conftest.$ac_objext"

-if { (eval echo "$as_me:20827: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:21194: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:20830: \$? = $ac_status" >&5
+  echo "$as_me:21197: \$? = $ac_status" >&5

   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'

-  { (eval echo "$as_me:20833: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21200: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:20836: \$? = $ac_status" >&5
+  echo "$as_me:21203: \$? = $ac_status" >&5

   (exit "$ac_status"); }; }; then
   cf_cv_dcl_errno=yes
 else
   (exit "$ac_status"); }; }; then
   cf_cv_dcl_errno=yes
 else


@@ -20844,7 +21211,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi

-echo "$as_me:20847: result: $cf_cv_dcl_errno" >&5
+echo "$as_me:21214: 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


@@ -20859,14 +21226,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:20862: checking if external errno exists" >&5
+echo "$as_me:21229: 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 20869 "configure"
+#line 21236 "configure"

 #include "confdefs.h"
 
 #undef errno
 #include "confdefs.h"
 
 #undef errno


@@ -20881,16 +21248,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:20884: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21251: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:20887: \$? = $ac_status" >&5
+  echo "$as_me:21254: \$? = $ac_status" >&5

   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'

-  { (eval echo "$as_me:20890: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21257: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:20893: \$? = $ac_status" >&5
+  echo "$as_me:21260: \$? = $ac_status" >&5

   (exit "$ac_status"); }; }; then
   cf_cv_have_errno=yes
 else
   (exit "$ac_status"); }; }; then
   cf_cv_have_errno=yes
 else


@@ -20901,7 +21268,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:20904: result: $cf_cv_have_errno" >&5
+echo "$as_me:21271: 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


@@ -20914,7 +21281,7 @@ EOF
 
 fi
 
 
 fi
 

-echo "$as_me:20917: checking if data-only library module links" >&5
+echo "$as_me:21284: 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


@@ -20922,20 +21289,20 @@ else
 
        rm -f conftest.a
        cat >conftest.$ac_ext <<EOF
 
        rm -f conftest.a
        cat >conftest.$ac_ext <<EOF

-#line 20925 "configure"
+#line 21292 "configure"

 int    testdata[3] = { 123, 456, 789 };
 EOF
 int    testdata[3] = { 123, 456, 789 };
 EOF

-       if { (eval echo "$as_me:20928: \"$ac_compile\"") >&5
+       if { (eval echo "$as_me:21295: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:20931: \$? = $ac_status" >&5
+  echo "$as_me:21298: \$? = $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 20938 "configure"
+#line 21305 "configure"

 int    testfunc(void)
 {
 #if defined(NeXT)
 int    testfunc(void)
 {
 #if defined(NeXT)


@@ -20948,10 +21315,10 @@ int   testfunc(void)
 #endif
 }
 EOF
 #endif
 }
 EOF

-       if { (eval echo "$as_me:20951: \"$ac_compile\"") >&5
+       if { (eval echo "$as_me:21318: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:20954: \$? = $ac_status" >&5
+  echo "$as_me:21321: \$? = $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


@@ -20964,7 +21331,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 20967 "configure"
+#line 21334 "configure"

 #include "confdefs.h"
 
        int main(void)
 #include "confdefs.h"
 
        int main(void)


@@ -20975,15 +21342,15 @@ else
 
 _ACEOF
 rm -f "conftest$ac_exeext"
 
 _ACEOF
 rm -f "conftest$ac_exeext"

-if { (eval echo "$as_me:20978: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21345: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:20981: \$? = $ac_status" >&5
+  echo "$as_me:21348: \$? = $ac_status" >&5

   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'

-  { (eval echo "$as_me:20983: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21350: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:20986: \$? = $ac_status" >&5
+  echo "$as_me:21353: \$? = $ac_status" >&5

   (exit "$ac_status"); }; }; then
   cf_cv_link_dataonly=yes
 else
   (exit "$ac_status"); }; }; then
   cf_cv_link_dataonly=yes
 else


@@ -20998,7 +21365,7 @@ fi
 
 fi
 
 
 fi
 

-echo "$as_me:21001: result: $cf_cv_link_dataonly" >&5
+echo "$as_me:21368: 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


@@ -21042,13 +21409,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:21045: checking for $ac_func" >&5
+echo "$as_me:21412: 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 21051 "configure"
+#line 21418 "configure"

 #include "confdefs.h"
 #define $ac_func autoconf_temporary
 #include <limits.h>    /* least-intrusive standard header which defines gcc2 __stub macros */
 #include "confdefs.h"
 #define $ac_func autoconf_temporary
 #include <limits.h>    /* least-intrusive standard header which defines gcc2 __stub macros */


@@ -21079,16 +21446,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:21082: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21449: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:21085: \$? = $ac_status" >&5
+  echo "$as_me:21452: \$? = $ac_status" >&5

   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'

-  { (eval echo "$as_me:21088: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21455: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:21091: \$? = $ac_status" >&5
+  echo "$as_me:21458: \$? = $ac_status" >&5

   (exit "$ac_status"); }; }; then
   eval "$as_ac_var=yes"
 else
   (exit "$ac_status"); }; }; then
   eval "$as_ac_var=yes"
 else


@@ -21098,7 +21465,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:21101: result: `eval echo '${'"$as_ac_var"'}'`" >&5
+echo "$as_me:21468: 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


@@ -21110,7 +21477,7 @@ done
 
 if test "x$ac_cv_func_getopt" = xno && \
    test "x$cf_with_progs$cf_with_tests" != xnono; then
 
 if test "x$ac_cv_func_getopt" = xno && \
    test "x$cf_with_progs$cf_with_tests" != xnono; then

-       { { echo "$as_me:21113: error: getopt is required for building programs" >&5
+       { { echo "$as_me:21480: error: getopt is required for building programs" >&5

 echo "$as_me: error: getopt is required for building programs" >&2;}
    { (exit 1); exit 1; }; }
 fi
 echo "$as_me: error: getopt is required for building programs" >&2;}
    { (exit 1); exit 1; }; }
 fi


@@ -21119,7 +21486,7 @@ if test "x$with_safe_sprintf" = xyes
 then
        if test "x$ac_cv_func_vsnprintf" = xyes
        then
 then
        if test "x$ac_cv_func_vsnprintf" = xyes
        then

-               { echo "$as_me:21122: WARNING: will use vsnprintf instead of safe-sprintf option" >&5
+               { echo "$as_me:21489: WARNING: will use vsnprintf instead of safe-sprintf option" >&5

 echo "$as_me: WARNING: will use vsnprintf instead of safe-sprintf option" >&2;}
        else
 
 echo "$as_me: WARNING: will use vsnprintf instead of safe-sprintf option" >&2;}
        else
 


@@ -21132,14 +21499,14 @@ fi
 
 if test "x$with_getcap" = "xyes" ; then
 
 
 if test "x$with_getcap" = "xyes" ; then
 

-echo "$as_me:21135: checking for terminal-capability database functions" >&5
+echo "$as_me:21502: 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 21142 "configure"
+#line 21509 "configure"

 #include "confdefs.h"
 
 #include <stdlib.h>
 #include "confdefs.h"
 
 #include <stdlib.h>


@@ -21159,16 +21526,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:21162: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21529: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:21165: \$? = $ac_status" >&5
+  echo "$as_me:21532: \$? = $ac_status" >&5

   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'

-  { (eval echo "$as_me:21168: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21535: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:21171: \$? = $ac_status" >&5
+  echo "$as_me:21538: \$? = $ac_status" >&5

   (exit "$ac_status"); }; }; then
   cf_cv_cgetent=yes
 else
   (exit "$ac_status"); }; }; then
   cf_cv_cgetent=yes
 else


@@ -21179,7 +21546,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:21182: result: $cf_cv_cgetent" >&5
+echo "$as_me:21549: 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


@@ -21189,14 +21556,14 @@ cat >>confdefs.h <<\EOF
 #define HAVE_BSD_CGETENT 1
 EOF
 
 #define HAVE_BSD_CGETENT 1
 EOF
 

-echo "$as_me:21192: checking if cgetent uses const parameter" >&5
+echo "$as_me:21559: 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 21199 "configure"
+#line 21566 "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"


@@ -21219,16 +21586,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:21222: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21589: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:21225: \$? = $ac_status" >&5
+  echo "$as_me:21592: \$? = $ac_status" >&5

   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'

-  { (eval echo "$as_me:21228: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21595: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:21231: \$? = $ac_status" >&5
+  echo "$as_me:21598: \$? = $ac_status" >&5

   (exit "$ac_status"); }; }; then
   cf_cv_cgetent_const=yes
 else
   (exit "$ac_status"); }; }; then
   cf_cv_cgetent_const=yes
 else


@@ -21239,7 +21606,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:21242: result: $cf_cv_cgetent_const" >&5
+echo "$as_me:21609: 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


@@ -21253,14 +21620,14 @@ fi
 
 fi
 
 
 fi
 

-echo "$as_me:21256: checking for isascii" >&5
+echo "$as_me:21623: 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 21263 "configure"
+#line 21630 "configure"

 #include "confdefs.h"
 #include <ctype.h>
 int
 #include "confdefs.h"
 #include <ctype.h>
 int


@@ -21272,16 +21639,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:21275: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21642: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:21278: \$? = $ac_status" >&5
+  echo "$as_me:21645: \$? = $ac_status" >&5

   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'

-  { (eval echo "$as_me:21281: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21648: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:21284: \$? = $ac_status" >&5
+  echo "$as_me:21651: \$? = $ac_status" >&5

   (exit "$ac_status"); }; }; then
   cf_cv_have_isascii=yes
 else
   (exit "$ac_status"); }; }; then
   cf_cv_have_isascii=yes
 else


@@ -21292,7 +21659,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:21295: result: $cf_cv_have_isascii" >&5
+echo "$as_me:21662: 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


@@ -21300,10 +21667,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:21303: checking whether sigaction needs _POSIX_SOURCE" >&5
+echo "$as_me:21670: 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 21306 "configure"
+#line 21673 "configure"

 #include "confdefs.h"
 
 #include <sys/types.h>
 #include "confdefs.h"
 
 #include <sys/types.h>


@@ -21317,16 +21684,16 @@ struct sigaction act
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
 }
 _ACEOF
 rm -f "conftest.$ac_objext"

-if { (eval echo "$as_me:21320: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:21687: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:21323: \$? = $ac_status" >&5
+  echo "$as_me:21690: \$? = $ac_status" >&5

   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'

-  { (eval echo "$as_me:21326: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21693: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:21329: \$? = $ac_status" >&5
+  echo "$as_me:21696: \$? = $ac_status" >&5

   (exit "$ac_status"); }; }; then
   sigact_bad=no
 else
   (exit "$ac_status"); }; }; then
   sigact_bad=no
 else


@@ -21334,7 +21701,7 @@ else
 cat "conftest.$ac_ext" >&5
 
 cat >"conftest.$ac_ext" <<_ACEOF
 cat "conftest.$ac_ext" >&5
 
 cat >"conftest.$ac_ext" <<_ACEOF

-#line 21337 "configure"
+#line 21704 "configure"

 #include "confdefs.h"
 
 #define _POSIX_SOURCE
 #include "confdefs.h"
 
 #define _POSIX_SOURCE


@@ -21349,16 +21716,16 @@ struct sigaction act
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
 }
 _ACEOF
 rm -f "conftest.$ac_objext"

-if { (eval echo "$as_me:21352: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:21719: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:21355: \$? = $ac_status" >&5
+  echo "$as_me:21722: \$? = $ac_status" >&5

   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'

-  { (eval echo "$as_me:21358: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21725: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:21361: \$? = $ac_status" >&5
+  echo "$as_me:21728: \$? = $ac_status" >&5

   (exit "$ac_status"); }; }; then
   sigact_bad=yes
 
   (exit "$ac_status"); }; }; then
   sigact_bad=yes
 


@@ -21374,11 +21741,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:21377: result: $sigact_bad" >&5
+echo "$as_me:21744: result: $sigact_bad" >&5

 echo "${ECHO_T}$sigact_bad" >&6
 fi
 
 echo "${ECHO_T}$sigact_bad" >&6
 fi
 

-echo "$as_me:21381: checking if nanosleep really works" >&5
+echo "$as_me:21748: 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


@@ -21388,7 +21755,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 21391 "configure"
+#line 21758 "configure"

 #include "confdefs.h"
 
 #include <stdio.h>
 #include "confdefs.h"
 
 #include <stdio.h>


@@ -21413,15 +21780,15 @@ int main(void) {
 
 _ACEOF
 rm -f "conftest$ac_exeext"
 
 _ACEOF
 rm -f "conftest$ac_exeext"

-if { (eval echo "$as_me:21416: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21783: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:21419: \$? = $ac_status" >&5
+  echo "$as_me:21786: \$? = $ac_status" >&5

   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'

-  { (eval echo "$as_me:21421: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21788: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:21424: \$? = $ac_status" >&5
+  echo "$as_me:21791: \$? = $ac_status" >&5

   (exit "$ac_status"); }; }; then
   cf_cv_func_nanosleep=yes
 else
   (exit "$ac_status"); }; }; then
   cf_cv_func_nanosleep=yes
 else


@@ -21433,7 +21800,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:21436: result: $cf_cv_func_nanosleep" >&5
+echo "$as_me:21803: 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" &&


@@ -21450,23 +21817,23 @@ sys/termio.h \
 
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
 
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`

-echo "$as_me:21453: checking for $ac_header" >&5
+echo "$as_me:21820: 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 21459 "configure"
+#line 21826 "configure"

 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF

-if { (eval echo "$as_me:21463: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:21830: \"$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:21469: \$? = $ac_status" >&5
+  echo "$as_me:21836: \$? = $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


@@ -21485,7 +21852,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi

-echo "$as_me:21488: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:21855: 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


@@ -21502,10 +21869,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:21505: checking whether termios.h needs _POSIX_SOURCE" >&5
+       echo "$as_me:21872: 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 21508 "configure"
+#line 21875 "configure"

 #include "confdefs.h"
 #include <termios.h>
 int
 #include "confdefs.h"
 #include <termios.h>
 int


@@ -21517,16 +21884,16 @@ struct termios foo; int x = foo.c_iflag = 1; (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
 }
 _ACEOF
 rm -f "conftest.$ac_objext"

-if { (eval echo "$as_me:21520: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:21887: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:21523: \$? = $ac_status" >&5
+  echo "$as_me:21890: \$? = $ac_status" >&5

   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'

-  { (eval echo "$as_me:21526: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21893: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:21529: \$? = $ac_status" >&5
+  echo "$as_me:21896: \$? = $ac_status" >&5

   (exit "$ac_status"); }; }; then
   termios_bad=no
 else
   (exit "$ac_status"); }; }; then
   termios_bad=no
 else


@@ -21534,7 +21901,7 @@ else
 cat "conftest.$ac_ext" >&5
 
                cat >"conftest.$ac_ext" <<_ACEOF
 cat "conftest.$ac_ext" >&5
 
                cat >"conftest.$ac_ext" <<_ACEOF

-#line 21537 "configure"
+#line 21904 "configure"

 #include "confdefs.h"
 
 #define _POSIX_SOURCE
 #include "confdefs.h"
 
 #define _POSIX_SOURCE


@@ -21548,16 +21915,16 @@ struct termios foo; int x = foo.c_iflag = 2; (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
 }
 _ACEOF
 rm -f "conftest.$ac_objext"

-if { (eval echo "$as_me:21551: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:21918: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:21554: \$? = $ac_status" >&5
+  echo "$as_me:21921: \$? = $ac_status" >&5

   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'

-  { (eval echo "$as_me:21557: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21924: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:21560: \$? = $ac_status" >&5
+  echo "$as_me:21927: \$? = $ac_status" >&5

   (exit "$ac_status"); }; }; then
   termios_bad=unknown
 else
   (exit "$ac_status"); }; }; then
   termios_bad=unknown
 else


@@ -21573,19 +21940,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:21576: result: $termios_bad" >&5
+       echo "$as_me:21943: result: $termios_bad" >&5

 echo "${ECHO_T}$termios_bad" >&6
        fi
 fi
 
 echo "${ECHO_T}$termios_bad" >&6
        fi
 fi
 

-echo "$as_me:21581: checking for tcgetattr" >&5
+echo "$as_me:21948: 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 21588 "configure"
+#line 21955 "configure"

 #include "confdefs.h"
 
 #include <sys/types.h>
 #include "confdefs.h"
 
 #include <sys/types.h>


@@ -21613,16 +21980,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:21616: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21983: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:21619: \$? = $ac_status" >&5
+  echo "$as_me:21986: \$? = $ac_status" >&5

   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'

-  { (eval echo "$as_me:21622: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21989: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:21625: \$? = $ac_status" >&5
+  echo "$as_me:21992: \$? = $ac_status" >&5

   (exit "$ac_status"); }; }; then
   cf_cv_have_tcgetattr=yes
 else
   (exit "$ac_status"); }; }; then
   cf_cv_have_tcgetattr=yes
 else


@@ -21632,21 +21999,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:21635: result: $cf_cv_have_tcgetattr" >&5
+echo "$as_me:22002: 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:21642: checking for vsscanf function or workaround" >&5
+echo "$as_me:22009: 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 21649 "configure"
+#line 22016 "configure"

 #include "confdefs.h"
 
 #include <stdarg.h>
 #include "confdefs.h"
 
 #include <stdarg.h>


@@ -21662,16 +22029,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:21665: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22032: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:21668: \$? = $ac_status" >&5
+  echo "$as_me:22035: \$? = $ac_status" >&5

   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'

-  { (eval echo "$as_me:21671: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22038: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:21674: \$? = $ac_status" >&5
+  echo "$as_me:22041: \$? = $ac_status" >&5

   (exit "$ac_status"); }; }; then
   cf_cv_func_vsscanf=vsscanf
 else
   (exit "$ac_status"); }; }; then
   cf_cv_func_vsscanf=vsscanf
 else


@@ -21679,7 +22046,7 @@ else
 cat "conftest.$ac_ext" >&5
 
 cat >"conftest.$ac_ext" <<_ACEOF
 cat "conftest.$ac_ext" >&5
 
 cat >"conftest.$ac_ext" <<_ACEOF

-#line 21682 "configure"
+#line 22049 "configure"

 #include "confdefs.h"
 
 #include <stdarg.h>
 #include "confdefs.h"
 
 #include <stdarg.h>


@@ -21701,16 +22068,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:21704: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22071: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:21707: \$? = $ac_status" >&5
+  echo "$as_me:22074: \$? = $ac_status" >&5

   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'

-  { (eval echo "$as_me:21710: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22077: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:21713: \$? = $ac_status" >&5
+  echo "$as_me:22080: \$? = $ac_status" >&5

   (exit "$ac_status"); }; }; then
   cf_cv_func_vsscanf=vfscanf
 else
   (exit "$ac_status"); }; }; then
   cf_cv_func_vsscanf=vfscanf
 else


@@ -21718,7 +22085,7 @@ else
 cat "conftest.$ac_ext" >&5
 
 cat >"conftest.$ac_ext" <<_ACEOF
 cat "conftest.$ac_ext" >&5
 
 cat >"conftest.$ac_ext" <<_ACEOF

-#line 21721 "configure"
+#line 22088 "configure"

 #include "confdefs.h"
 
 #include <stdarg.h>
 #include "confdefs.h"
 
 #include <stdarg.h>


@@ -21740,16 +22107,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:21743: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22110: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:21746: \$? = $ac_status" >&5
+  echo "$as_me:22113: \$? = $ac_status" >&5

   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'

-  { (eval echo "$as_me:21749: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22116: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:21752: \$? = $ac_status" >&5
+  echo "$as_me:22119: \$? = $ac_status" >&5

   (exit "$ac_status"); }; }; then
   cf_cv_func_vsscanf=_doscan
 else
   (exit "$ac_status"); }; }; then
   cf_cv_func_vsscanf=_doscan
 else


@@ -21764,7 +22131,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:21767: result: $cf_cv_func_vsscanf" >&5
+echo "$as_me:22134: 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


@@ -21790,23 +22157,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:21793: checking for $ac_header" >&5
+echo "$as_me:22160: 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 21799 "configure"
+#line 22166 "configure"

 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF

-if { (eval echo "$as_me:21803: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:22170: \"$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:21809: \$? = $ac_status" >&5
+  echo "$as_me:22176: \$? = $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


@@ -21825,7 +22192,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi

-echo "$as_me:21828: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:22195: 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


@@ -21835,7 +22202,7 @@ EOF
 fi
 done
 
 fi
 done
 

-echo "$as_me:21838: checking for working mkstemp" >&5
+echo "$as_me:22205: 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


@@ -21846,7 +22213,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 21849 "configure"
+#line 22216 "configure"

 #include "confdefs.h"
 
 #include <sys/types.h>
 #include "confdefs.h"
 
 #include <sys/types.h>


@@ -21887,15 +22254,15 @@ int main(void)
 
 _ACEOF
 rm -f "conftest$ac_exeext"
 
 _ACEOF
 rm -f "conftest$ac_exeext"

-if { (eval echo "$as_me:21890: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22257: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:21893: \$? = $ac_status" >&5
+  echo "$as_me:22260: \$? = $ac_status" >&5

   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'

-  { (eval echo "$as_me:21895: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22262: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:21898: \$? = $ac_status" >&5
+  echo "$as_me:22265: \$? = $ac_status" >&5

   (exit "$ac_status"); }; }; then
   cf_cv_func_mkstemp=yes
 
   (exit "$ac_status"); }; }; then
   cf_cv_func_mkstemp=yes
 


@@ -21910,16 +22277,16 @@ rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftes
 fi
 
 fi
 fi
 
 fi

-echo "$as_me:21913: result: $cf_cv_func_mkstemp" >&5
+echo "$as_me:22280: 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:21916: checking for mkstemp" >&5
+       echo "$as_me:22283: 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 21922 "configure"
+#line 22289 "configure"

 #include "confdefs.h"
 #define mkstemp autoconf_temporary
 #include <limits.h>    /* least-intrusive standard header which defines gcc2 __stub macros */
 #include "confdefs.h"
 #define mkstemp autoconf_temporary
 #include <limits.h>    /* least-intrusive standard header which defines gcc2 __stub macros */


@@ -21950,16 +22317,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:21953: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22320: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:21956: \$? = $ac_status" >&5
+  echo "$as_me:22323: \$? = $ac_status" >&5

   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'

-  { (eval echo "$as_me:21959: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22326: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:21962: \$? = $ac_status" >&5
+  echo "$as_me:22329: \$? = $ac_status" >&5

   (exit "$ac_status"); }; }; then
   ac_cv_func_mkstemp=yes
 else
   (exit "$ac_status"); }; }; then
   ac_cv_func_mkstemp=yes
 else


@@ -21969,7 +22336,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:21972: result: $ac_cv_func_mkstemp" >&5
+echo "$as_me:22339: result: $ac_cv_func_mkstemp" >&5

 echo "${ECHO_T}$ac_cv_func_mkstemp" >&6
 
 fi
 echo "${ECHO_T}$ac_cv_func_mkstemp" >&6
 
 fi


@@ -21990,21 +22357,21 @@ else
 fi
 
 if test "x$cross_compiling" = xyes ; then
 fi
 
 if test "x$cross_compiling" = xyes ; then

-       { echo "$as_me:21993: WARNING: cross compiling: assume setvbuf params not reversed" >&5
+       { echo "$as_me:22360: 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:21996: checking whether setvbuf arguments are reversed" >&5
+       echo "$as_me:22363: 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:22002: error: cannot run test program while cross compiling" >&5
+  { { echo "$as_me:22369: 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 22007 "configure"
+#line 22374 "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. */


@@ -22021,15 +22388,15 @@ main (void)
 }
 _ACEOF
 rm -f "conftest$ac_exeext"
 }
 _ACEOF
 rm -f "conftest$ac_exeext"

-if { (eval echo "$as_me:22024: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22391: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:22027: \$? = $ac_status" >&5
+  echo "$as_me:22394: \$? = $ac_status" >&5

   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'

-  { (eval echo "$as_me:22029: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22396: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:22032: \$? = $ac_status" >&5
+  echo "$as_me:22399: \$? = $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


@@ -22042,7 +22409,7 @@ rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftes
 fi
 rm -f core ./core.* ./*.core
 fi
 fi
 rm -f core ./core.* ./*.core
 fi

-echo "$as_me:22045: result: $ac_cv_func_setvbuf_reversed" >&5
+echo "$as_me:22412: 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
 


@@ -22053,13 +22420,13 @@ EOF
 fi
 
 fi
 fi
 
 fi

-echo "$as_me:22056: checking for intptr_t" >&5
+echo "$as_me:22423: 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 22062 "configure"
+#line 22429 "configure"

 #include "confdefs.h"
 $ac_includes_default
 int
 #include "confdefs.h"
 $ac_includes_default
 int


@@ -22074,16 +22441,16 @@ if (sizeof (intptr_t))
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
 }
 _ACEOF
 rm -f "conftest.$ac_objext"

-if { (eval echo "$as_me:22077: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:22444: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:22080: \$? = $ac_status" >&5
+  echo "$as_me:22447: \$? = $ac_status" >&5

   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'

-  { (eval echo "$as_me:22083: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22450: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:22086: \$? = $ac_status" >&5
+  echo "$as_me:22453: \$? = $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


@@ -22093,7 +22460,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:22096: result: $ac_cv_type_intptr_t" >&5
+echo "$as_me:22463: 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
   :


@@ -22105,13 +22472,13 @@ EOF
 
 fi
 
 
 fi
 

-echo "$as_me:22108: checking for ssize_t" >&5
+echo "$as_me:22475: 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 22114 "configure"
+#line 22481 "configure"

 #include "confdefs.h"
 $ac_includes_default
 int
 #include "confdefs.h"
 $ac_includes_default
 int


@@ -22126,16 +22493,16 @@ if (sizeof (ssize_t))
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
 }
 _ACEOF
 rm -f "conftest.$ac_objext"

-if { (eval echo "$as_me:22129: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:22496: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:22132: \$? = $ac_status" >&5
+  echo "$as_me:22499: \$? = $ac_status" >&5

   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'

-  { (eval echo "$as_me:22135: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22502: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:22138: \$? = $ac_status" >&5
+  echo "$as_me:22505: \$? = $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


@@ -22145,7 +22512,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:22148: result: $ac_cv_type_ssize_t" >&5
+echo "$as_me:22515: 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
   :


@@ -22157,14 +22524,14 @@ EOF
 
 fi
 
 
 fi
 

-echo "$as_me:22160: checking for type sigaction_t" >&5
+echo "$as_me:22527: 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 22167 "configure"
+#line 22534 "configure"

 #include "confdefs.h"
 
 #include <signal.h>
 #include "confdefs.h"
 
 #include <signal.h>


@@ -22177,16 +22544,16 @@ sigaction_t x
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
 }
 _ACEOF
 rm -f "conftest.$ac_objext"

-if { (eval echo "$as_me:22180: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:22547: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:22183: \$? = $ac_status" >&5
+  echo "$as_me:22550: \$? = $ac_status" >&5

   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'

-  { (eval echo "$as_me:22186: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22553: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:22189: \$? = $ac_status" >&5
+  echo "$as_me:22556: \$? = $ac_status" >&5

   (exit "$ac_status"); }; }; then
   cf_cv_type_sigaction=yes
 else
   (exit "$ac_status"); }; }; then
   cf_cv_type_sigaction=yes
 else


@@ -22197,14 +22564,14 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 

-echo "$as_me:22200: result: $cf_cv_type_sigaction" >&5
+echo "$as_me:22567: 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:22207: checking declaration of size-change" >&5
+echo "$as_me:22574: 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


@@ -22225,7 +22592,7 @@ do
 
        fi
        cat >"conftest.$ac_ext" <<_ACEOF
 
        fi
        cat >"conftest.$ac_ext" <<_ACEOF

-#line 22228 "configure"
+#line 22595 "configure"

 #include "confdefs.h"
 #include <sys/types.h>
 #ifdef HAVE_TERMIOS_H
 #include "confdefs.h"
 #include <sys/types.h>
 #ifdef HAVE_TERMIOS_H


@@ -22238,7 +22605,7 @@ do
 
 #ifdef NEED_PTEM_H
 /* This is a workaround for SCO:  they neglected to define struct winsize in
 
 #ifdef NEED_PTEM_H
 /* This is a workaround for SCO:  they neglected to define struct winsize in

- * termios.h -- it's only in termio.h and ptem.h
+ * termios.h -- it is only in termio.h and ptem.h

  */
 #include <sys/stream.h>
 #include <sys/ptem.h>
  */
 #include <sys/stream.h>
 #include <sys/ptem.h>


@@ -22275,16 +22642,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
 }
 _ACEOF
 rm -f "conftest.$ac_objext"

-if { (eval echo "$as_me:22278: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:22645: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:22281: \$? = $ac_status" >&5
+  echo "$as_me:22648: \$? = $ac_status" >&5

   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'

-  { (eval echo "$as_me:22284: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22651: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:22287: \$? = $ac_status" >&5
+  echo "$as_me:22654: \$? = $ac_status" >&5

   (exit "$ac_status"); }; }; then
   cf_cv_sizechange=yes
 else
   (exit "$ac_status"); }; }; then
   cf_cv_sizechange=yes
 else


@@ -22303,7 +22670,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 done
 
 fi
 done
 
 fi

-echo "$as_me:22306: result: $cf_cv_sizechange" >&5
+echo "$as_me:22673: 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
 


@@ -22321,13 +22688,13 @@ EOF
        esac
 fi
 
        esac
 fi
 

-echo "$as_me:22324: checking for memmove" >&5
+echo "$as_me:22691: 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 22330 "configure"
+#line 22697 "configure"

 #include "confdefs.h"
 #define memmove autoconf_temporary
 #include <limits.h>    /* least-intrusive standard header which defines gcc2 __stub macros */
 #include "confdefs.h"
 #define memmove autoconf_temporary
 #include <limits.h>    /* least-intrusive standard header which defines gcc2 __stub macros */


@@ -22358,16 +22725,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:22361: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22728: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:22364: \$? = $ac_status" >&5
+  echo "$as_me:22731: \$? = $ac_status" >&5

   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'

-  { (eval echo "$as_me:22367: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22734: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:22370: \$? = $ac_status" >&5
+  echo "$as_me:22737: \$? = $ac_status" >&5

   (exit "$ac_status"); }; }; then
   ac_cv_func_memmove=yes
 else
   (exit "$ac_status"); }; }; then
   ac_cv_func_memmove=yes
 else


@@ -22377,19 +22744,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:22380: result: $ac_cv_func_memmove" >&5
+echo "$as_me:22747: 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:22386: checking for bcopy" >&5
+echo "$as_me:22753: 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 22392 "configure"
+#line 22759 "configure"

 #include "confdefs.h"
 #define bcopy autoconf_temporary
 #include <limits.h>    /* least-intrusive standard header which defines gcc2 __stub macros */
 #include "confdefs.h"
 #define bcopy autoconf_temporary
 #include <limits.h>    /* least-intrusive standard header which defines gcc2 __stub macros */


@@ -22420,16 +22787,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:22423: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22790: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:22426: \$? = $ac_status" >&5
+  echo "$as_me:22793: \$? = $ac_status" >&5

   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'

-  { (eval echo "$as_me:22429: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22796: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:22432: \$? = $ac_status" >&5
+  echo "$as_me:22799: \$? = $ac_status" >&5

   (exit "$ac_status"); }; }; then
   ac_cv_func_bcopy=yes
 else
   (exit "$ac_status"); }; }; then
   ac_cv_func_bcopy=yes
 else


@@ -22439,11 +22806,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:22442: result: $ac_cv_func_bcopy" >&5
+echo "$as_me:22809: 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:22446: checking if bcopy does overlapping moves" >&5
+       echo "$as_me:22813: 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


@@ -22453,7 +22820,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 22456 "configure"
+#line 22823 "configure"

 #include "confdefs.h"
 
 int main(void) {
 #include "confdefs.h"
 
 int main(void) {


@@ -22467,15 +22834,15 @@ int main(void) {
 
 _ACEOF
 rm -f "conftest$ac_exeext"
 
 _ACEOF
 rm -f "conftest$ac_exeext"

-if { (eval echo "$as_me:22470: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22837: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:22473: \$? = $ac_status" >&5
+  echo "$as_me:22840: \$? = $ac_status" >&5

   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'

-  { (eval echo "$as_me:22475: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22842: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:22478: \$? = $ac_status" >&5
+  echo "$as_me:22845: \$? = $ac_status" >&5

   (exit "$ac_status"); }; }; then
   cf_cv_good_bcopy=yes
 else
   (exit "$ac_status"); }; }; then
   cf_cv_good_bcopy=yes
 else


@@ -22488,7 +22855,7 @@ rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftes
 fi
 
 fi
 fi
 
 fi

-echo "$as_me:22491: result: $cf_cv_good_bcopy" >&5
+echo "$as_me:22858: result: $cf_cv_good_bcopy" >&5

 echo "${ECHO_T}$cf_cv_good_bcopy" >&6
 
 else
 echo "${ECHO_T}$cf_cv_good_bcopy" >&6
 
 else


@@ -22515,13 +22882,13 @@ tty >/dev/null 2>&1 || {
 for ac_func in posix_openpt
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
 for ac_func in posix_openpt
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`

-echo "$as_me:22518: checking for $ac_func" >&5
+echo "$as_me:22885: 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 22524 "configure"
+#line 22891 "configure"

 #include "confdefs.h"
 #define $ac_func autoconf_temporary
 #include <limits.h>    /* least-intrusive standard header which defines gcc2 __stub macros */
 #include "confdefs.h"
 #define $ac_func autoconf_temporary
 #include <limits.h>    /* least-intrusive standard header which defines gcc2 __stub macros */


@@ -22552,16 +22919,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:22555: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22922: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:22558: \$? = $ac_status" >&5
+  echo "$as_me:22925: \$? = $ac_status" >&5

   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'

-  { (eval echo "$as_me:22561: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22928: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:22564: \$? = $ac_status" >&5
+  echo "$as_me:22931: \$? = $ac_status" >&5

   (exit "$ac_status"); }; }; then
   eval "$as_ac_var=yes"
 else
   (exit "$ac_status"); }; }; then
   eval "$as_ac_var=yes"
 else


@@ -22571,7 +22938,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:22574: result: `eval echo '${'"$as_ac_var"'}'`" >&5
+echo "$as_me:22941: 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


@@ -22581,7 +22948,7 @@ EOF
 fi
 done
  }
 fi
 done
  }

-echo "$as_me:22584: checking if poll really works" >&5
+echo "$as_me:22951: 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


@@ -22591,7 +22958,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 22594 "configure"
+#line 22961 "configure"

 #include "confdefs.h"
 
 #include <stdlib.h>
 #include "confdefs.h"
 
 #include <stdlib.h>


@@ -22643,15 +23010,15 @@ int main(void) {
 }
 _ACEOF
 rm -f "conftest$ac_exeext"
 }
 _ACEOF
 rm -f "conftest$ac_exeext"

-if { (eval echo "$as_me:22646: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23013: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:22649: \$? = $ac_status" >&5
+  echo "$as_me:23016: \$? = $ac_status" >&5

   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'

-  { (eval echo "$as_me:22651: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23018: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:22654: \$? = $ac_status" >&5
+  echo "$as_me:23021: \$? = $ac_status" >&5

   (exit "$ac_status"); }; }; then
   cf_cv_working_poll=yes
 else
   (exit "$ac_status"); }; }; then
   cf_cv_working_poll=yes
 else


@@ -22663,21 +23030,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:22666: result: $cf_cv_working_poll" >&5
+echo "$as_me:23033: 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:22673: checking for va_copy" >&5
+echo "$as_me:23040: 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 22680 "configure"
+#line 23047 "configure"

 #include "confdefs.h"
 
 #include <stdarg.h>
 #include "confdefs.h"
 
 #include <stdarg.h>


@@ -22694,16 +23061,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:22697: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23064: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:22700: \$? = $ac_status" >&5
+  echo "$as_me:23067: \$? = $ac_status" >&5

   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'

-  { (eval echo "$as_me:22703: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23070: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:22706: \$? = $ac_status" >&5
+  echo "$as_me:23073: \$? = $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


@@ -22713,7 +23080,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:22716: result: $cf_cv_have_va_copy" >&5
+echo "$as_me:23083: result: $cf_cv_have_va_copy" >&5

 echo "${ECHO_T}$cf_cv_have_va_copy" >&6
 
 if test "$cf_cv_have_va_copy" = yes;
 echo "${ECHO_T}$cf_cv_have_va_copy" >&6
 
 if test "$cf_cv_have_va_copy" = yes;


@@ -22725,14 +23092,14 @@ EOF
 
 else # !cf_cv_have_va_copy
 
 
 else # !cf_cv_have_va_copy
 

-echo "$as_me:22728: checking for __va_copy" >&5
+echo "$as_me:23095: 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 22735 "configure"
+#line 23102 "configure"

 #include "confdefs.h"
 
 #include <stdarg.h>
 #include "confdefs.h"
 
 #include <stdarg.h>


@@ -22749,16 +23116,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:22752: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23119: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:22755: \$? = $ac_status" >&5
+  echo "$as_me:23122: \$? = $ac_status" >&5

   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'

-  { (eval echo "$as_me:22758: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23125: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:22761: \$? = $ac_status" >&5
+  echo "$as_me:23128: \$? = $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


@@ -22768,7 +23135,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:22771: result: $cf_cv_have___va_copy" >&5
+echo "$as_me:23138: result: $cf_cv_have___va_copy" >&5

 echo "${ECHO_T}$cf_cv_have___va_copy" >&6
 
 if test "$cf_cv_have___va_copy" = yes
 echo "${ECHO_T}$cf_cv_have___va_copy" >&6
 
 if test "$cf_cv_have___va_copy" = yes


@@ -22780,14 +23147,14 @@ EOF
 
 else # !cf_cv_have___va_copy
 
 
 else # !cf_cv_have___va_copy
 

-echo "$as_me:22783: checking for __builtin_va_copy" >&5
+echo "$as_me:23150: checking for __builtin_va_copy" >&5

 echo $ECHO_N "checking for __builtin_va_copy... $ECHO_C" >&6
 if test "${cf_cv_have___builtin_va_copy+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 cat >"conftest.$ac_ext" <<_ACEOF
 echo $ECHO_N "checking for __builtin_va_copy... $ECHO_C" >&6
 if test "${cf_cv_have___builtin_va_copy+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 cat >"conftest.$ac_ext" <<_ACEOF

-#line 22790 "configure"
+#line 23157 "configure"

 #include "confdefs.h"
 
 #include <stdarg.h>
 #include "confdefs.h"
 
 #include <stdarg.h>


@@ -22804,16 +23171,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:22807: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23174: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:22810: \$? = $ac_status" >&5
+  echo "$as_me:23177: \$? = $ac_status" >&5

   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'

-  { (eval echo "$as_me:22813: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23180: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:22816: \$? = $ac_status" >&5
+  echo "$as_me:23183: \$? = $ac_status" >&5

   (exit "$ac_status"); }; }; then
   cf_cv_have___builtin_va_copy=yes
 else
   (exit "$ac_status"); }; }; then
   cf_cv_have___builtin_va_copy=yes
 else


@@ -22823,7 +23190,7 @@ cf_cv_have___builtin_va_copy=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi

-echo "$as_me:22826: result: $cf_cv_have___builtin_va_copy" >&5
+echo "$as_me:23193: result: $cf_cv_have___builtin_va_copy" >&5

 echo "${ECHO_T}$cf_cv_have___builtin_va_copy" >&6
 
 test "$cf_cv_have___builtin_va_copy" = yes &&
 echo "${ECHO_T}$cf_cv_have___builtin_va_copy" >&6
 
 test "$cf_cv_have___builtin_va_copy" = yes &&


@@ -22841,14 +23208,14 @@ case "${cf_cv_have_va_copy}${cf_cv_have___va_copy}${cf_cv_have___builtin_va_copy
        ;;
 
 (*)
        ;;
 
 (*)

-       echo "$as_me:22844: checking if we can simply copy va_list" >&5
+       echo "$as_me:23211: checking if we can simply copy va_list" >&5

 echo $ECHO_N "checking if we can simply copy va_list... $ECHO_C" >&6
 if test "${cf_cv_pointer_va_list+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 cat >"conftest.$ac_ext" <<_ACEOF
 echo $ECHO_N "checking if we can simply copy va_list... $ECHO_C" >&6
 if test "${cf_cv_pointer_va_list+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 cat >"conftest.$ac_ext" <<_ACEOF

-#line 22851 "configure"
+#line 23218 "configure"

 #include "confdefs.h"
 
 #include <stdarg.h>
 #include "confdefs.h"
 
 #include <stdarg.h>


@@ -22865,16 +23232,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:22868: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23235: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:22871: \$? = $ac_status" >&5
+  echo "$as_me:23238: \$? = $ac_status" >&5

   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'

-  { (eval echo "$as_me:22874: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23241: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:22877: \$? = $ac_status" >&5
+  echo "$as_me:23244: \$? = $ac_status" >&5

   (exit "$ac_status"); }; }; then
   cf_cv_pointer_va_list=yes
 else
   (exit "$ac_status"); }; }; then
   cf_cv_pointer_va_list=yes
 else


@@ -22884,19 +23251,19 @@ cf_cv_pointer_va_list=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi

-echo "$as_me:22887: result: $cf_cv_pointer_va_list" >&5
+echo "$as_me:23254: result: $cf_cv_pointer_va_list" >&5

 echo "${ECHO_T}$cf_cv_pointer_va_list" >&6
 
        if test "$cf_cv_pointer_va_list" = no
        then
 echo "${ECHO_T}$cf_cv_pointer_va_list" >&6
 
        if test "$cf_cv_pointer_va_list" = no
        then

-               echo "$as_me:22892: checking if we can copy va_list indirectly" >&5
+               echo "$as_me:23259: checking if we can copy va_list indirectly" >&5

 echo $ECHO_N "checking if we can copy va_list indirectly... $ECHO_C" >&6
 if test "${cf_cv_array_va_list+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 cat >"conftest.$ac_ext" <<_ACEOF
 echo $ECHO_N "checking if we can copy va_list indirectly... $ECHO_C" >&6
 if test "${cf_cv_array_va_list+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 cat >"conftest.$ac_ext" <<_ACEOF

-#line 22899 "configure"
+#line 23266 "configure"

 #include "confdefs.h"
 
 #include <stdarg.h>
 #include "confdefs.h"
 
 #include <stdarg.h>


@@ -22913,16 +23280,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:22916: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23283: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:22919: \$? = $ac_status" >&5
+  echo "$as_me:23286: \$? = $ac_status" >&5

   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'

-  { (eval echo "$as_me:22922: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23289: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:22925: \$? = $ac_status" >&5
+  echo "$as_me:23292: \$? = $ac_status" >&5

   (exit "$ac_status"); }; }; then
   cf_cv_array_va_list=yes
 else
   (exit "$ac_status"); }; }; then
   cf_cv_array_va_list=yes
 else


@@ -22932,7 +23299,7 @@ cf_cv_array_va_list=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi

-echo "$as_me:22935: result: $cf_cv_array_va_list" >&5
+echo "$as_me:23302: result: $cf_cv_array_va_list" >&5

 echo "${ECHO_T}$cf_cv_array_va_list" >&6
                test "$cf_cv_array_va_list" = yes &&
 cat >>confdefs.h <<\EOF
 echo "${ECHO_T}$cf_cv_array_va_list" >&6
                test "$cf_cv_array_va_list" = yes &&
 cat >>confdefs.h <<\EOF


@@ -22943,13 +23310,13 @@ EOF
        ;;
 esac
 
        ;;
 esac
 

-echo "$as_me:22946: checking for pid_t" >&5
+echo "$as_me:23313: 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 22952 "configure"
+#line 23319 "configure"

 #include "confdefs.h"
 $ac_includes_default
 int
 #include "confdefs.h"
 $ac_includes_default
 int


@@ -22964,16 +23331,16 @@ if (sizeof (pid_t))
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
 }
 _ACEOF
 rm -f "conftest.$ac_objext"

-if { (eval echo "$as_me:22967: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:23334: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:22970: \$? = $ac_status" >&5
+  echo "$as_me:23337: \$? = $ac_status" >&5

   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'

-  { (eval echo "$as_me:22973: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23340: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:22976: \$? = $ac_status" >&5
+  echo "$as_me:23343: \$? = $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


@@ -22983,7 +23350,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:22986: result: $ac_cv_type_pid_t" >&5
+echo "$as_me:23353: 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
   :


@@ -22998,23 +23365,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:23001: checking for $ac_header" >&5
+echo "$as_me:23368: 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 23007 "configure"
+#line 23374 "configure"

 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF

-if { (eval echo "$as_me:23011: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:23378: \"$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:23017: \$? = $ac_status" >&5
+  echo "$as_me:23384: \$? = $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


@@ -23033,7 +23400,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi

-echo "$as_me:23036: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:23403: 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


@@ -23046,13 +23413,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:23049: checking for $ac_func" >&5
+echo "$as_me:23416: 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 23055 "configure"
+#line 23422 "configure"

 #include "confdefs.h"
 #define $ac_func autoconf_temporary
 #include <limits.h>    /* least-intrusive standard header which defines gcc2 __stub macros */
 #include "confdefs.h"
 #define $ac_func autoconf_temporary
 #include <limits.h>    /* least-intrusive standard header which defines gcc2 __stub macros */


@@ -23083,16 +23450,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:23086: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23453: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:23089: \$? = $ac_status" >&5
+  echo "$as_me:23456: \$? = $ac_status" >&5

   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'

-  { (eval echo "$as_me:23092: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23459: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:23095: \$? = $ac_status" >&5
+  echo "$as_me:23462: \$? = $ac_status" >&5

   (exit "$ac_status"); }; }; then
   eval "$as_ac_var=yes"
 else
   (exit "$ac_status"); }; }; then
   eval "$as_ac_var=yes"
 else


@@ -23102,7 +23469,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:23105: result: `eval echo '${'"$as_ac_var"'}'`" >&5
+echo "$as_me:23472: 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


@@ -23114,7 +23481,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:23117: checking for working fork" >&5
+  echo "$as_me:23484: 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


@@ -23137,15 +23504,15 @@ else
       }
 _ACEOF
 rm -f "conftest$ac_exeext"
       }
 _ACEOF
 rm -f "conftest$ac_exeext"

-if { (eval echo "$as_me:23140: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23507: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:23143: \$? = $ac_status" >&5
+  echo "$as_me:23510: \$? = $ac_status" >&5

   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'

-  { (eval echo "$as_me:23145: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23512: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:23148: \$? = $ac_status" >&5
+  echo "$as_me:23515: \$? = $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


@@ -23157,7 +23524,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:23160: result: $ac_cv_func_fork_works" >&5
+echo "$as_me:23527: 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


@@ -23171,12 +23538,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:23174: WARNING: CROSS: Result $ac_cv_func_fork_works guessed due to cross-compiling." >&5
+  { echo "$as_me:23541: 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:23179: checking for working vfork" >&5
+  echo "$as_me:23546: 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


@@ -23185,7 +23552,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 23188 "configure"
+#line 23555 "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>


@@ -23282,15 +23649,15 @@ main (void)
 }
 _ACEOF
 rm -f "conftest$ac_exeext"
 }
 _ACEOF
 rm -f "conftest$ac_exeext"

-if { (eval echo "$as_me:23285: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23652: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:23288: \$? = $ac_status" >&5
+  echo "$as_me:23655: \$? = $ac_status" >&5

   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'

-  { (eval echo "$as_me:23290: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23657: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:23293: \$? = $ac_status" >&5
+  echo "$as_me:23660: \$? = $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


@@ -23302,13 +23669,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:23305: result: $ac_cv_func_vfork_works" >&5
+echo "$as_me:23672: 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:23311: WARNING: CROSS: Result $ac_cv_func_vfork_works guessed due to cross-compiling." >&5
+  { echo "$as_me:23678: 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
 


@@ -23333,7 +23700,7 @@ EOF
 
 fi
 
 
 fi
 

-echo "$as_me:23336: checking if fopen accepts explicit binary mode" >&5
+echo "$as_me:23703: checking if fopen accepts explicit binary mode" >&5

 echo $ECHO_N "checking if fopen accepts explicit binary mode... $ECHO_C" >&6
 if test "${cf_cv_fopen_bin_r+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 echo $ECHO_N "checking if fopen accepts explicit binary mode... $ECHO_C" >&6
 if test "${cf_cv_fopen_bin_r+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6


@@ -23343,7 +23710,7 @@ else
   cf_cv_fopen_bin_r=unknown
 else
   cat >"conftest.$ac_ext" <<_ACEOF
   cf_cv_fopen_bin_r=unknown
 else
   cat >"conftest.$ac_ext" <<_ACEOF

-#line 23346 "configure"
+#line 23713 "configure"

 #include "confdefs.h"
 
 #include <stdio.h>
 #include "confdefs.h"
 
 #include <stdio.h>


@@ -23376,15 +23743,15 @@ int main(void) {
 
 _ACEOF
 rm -f "conftest$ac_exeext"
 
 _ACEOF
 rm -f "conftest$ac_exeext"

-if { (eval echo "$as_me:23379: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23746: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:23382: \$? = $ac_status" >&5
+  echo "$as_me:23749: \$? = $ac_status" >&5

   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'

-  { (eval echo "$as_me:23384: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23751: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:23387: \$? = $ac_status" >&5
+  echo "$as_me:23754: \$? = $ac_status" >&5

   (exit "$ac_status"); }; }; then
   cf_cv_fopen_bin_r=yes
 else
   (exit "$ac_status"); }; }; then
   cf_cv_fopen_bin_r=yes
 else


@@ -23397,7 +23764,7 @@ rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftes
 fi
 
 fi
 fi
 
 fi

-echo "$as_me:23400: result: $cf_cv_fopen_bin_r" >&5
+echo "$as_me:23767: result: $cf_cv_fopen_bin_r" >&5

 echo "${ECHO_T}$cf_cv_fopen_bin_r" >&6
 test "x$cf_cv_fopen_bin_r" != xno &&
 cat >>confdefs.h <<\EOF
 echo "${ECHO_T}$cf_cv_fopen_bin_r" >&6
 test "x$cf_cv_fopen_bin_r" != xno &&
 cat >>confdefs.h <<\EOF


@@ -23406,7 +23773,7 @@ EOF
 
 # special check for test/ditto.c
 
 
 # special check for test/ditto.c
 

-echo "$as_me:23409: checking for openpty in -lutil" >&5
+echo "$as_me:23776: 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


@@ -23414,7 +23781,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 23417 "configure"
+#line 23784 "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.  */


@@ -23433,16 +23800,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:23436: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23803: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:23439: \$? = $ac_status" >&5
+  echo "$as_me:23806: \$? = $ac_status" >&5

   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'

-  { (eval echo "$as_me:23442: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23809: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:23445: \$? = $ac_status" >&5
+  echo "$as_me:23812: \$? = $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


@@ -23453,7 +23820,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:23456: result: $ac_cv_lib_util_openpty" >&5
+echo "$as_me:23823: 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


@@ -23461,7 +23828,7 @@ else
   cf_cv_lib_util=no
 fi
 
   cf_cv_lib_util=no
 fi
 

-echo "$as_me:23464: checking for openpty header" >&5
+echo "$as_me:23831: 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


@@ -23488,7 +23855,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 23491 "configure"
+#line 23858 "configure"

 #include "confdefs.h"
 
 #include <$cf_header>
 #include "confdefs.h"
 
 #include <$cf_header>


@@ -23505,16 +23872,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:23508: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23875: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:23511: \$? = $ac_status" >&5
+  echo "$as_me:23878: \$? = $ac_status" >&5

   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'

-  { (eval echo "$as_me:23514: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23881: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:23517: \$? = $ac_status" >&5
+  echo "$as_me:23884: \$? = $ac_status" >&5

   (exit "$ac_status"); }; }; then
 
                cf_cv_func_openpty=$cf_header
   (exit "$ac_status"); }; }; then
 
                cf_cv_func_openpty=$cf_header


@@ -23532,7 +23899,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:23535: result: $cf_cv_func_openpty" >&5
+echo "$as_me:23902: 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


@@ -23605,7 +23972,7 @@ if test -n "$with_hashed_db/include" ; then
        CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
 
                          cat >"conftest.$ac_ext" <<_ACEOF
        CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
 
                          cat >"conftest.$ac_ext" <<_ACEOF

-#line 23608 "configure"
+#line 23975 "configure"

 #include "confdefs.h"
 #include <stdio.h>
 int
 #include "confdefs.h"
 #include <stdio.h>
 int


@@ -23617,16 +23984,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
 }
 _ACEOF
 rm -f "conftest.$ac_objext"

-if { (eval echo "$as_me:23620: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:23987: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:23623: \$? = $ac_status" >&5
+  echo "$as_me:23990: \$? = $ac_status" >&5

   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'

-  { (eval echo "$as_me:23626: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23993: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:23629: \$? = $ac_status" >&5
+  echo "$as_me:23996: \$? = $ac_status" >&5

   (exit "$ac_status"); }; }; then
   :
 else
   (exit "$ac_status"); }; }; then
   :
 else


@@ -23643,7 +24010,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}:23646: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:24013: testing adding $cf_add_incdir to include-path ..." 1>&5

 
                  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
 
                  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 


@@ -23679,7 +24046,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}:23682: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:24049: testing adding $cf_add_libdir to library-path ..." 1>&5

 
                                LDFLAGS="-L$cf_add_libdir $LDFLAGS"
                        fi
 
                                LDFLAGS="-L$cf_add_libdir $LDFLAGS"
                        fi


@@ -23690,7 +24057,7 @@ fi
        else
                case "$with_hashed_db" in
                (./*|../*|/*)
        else
                case "$with_hashed_db" in
                (./*|../*|/*)

-                       { echo "$as_me:23693: WARNING: no such directory $with_hashed_db" >&5
+                       { echo "$as_me:24060: 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;}
                        ;;
                (*)


@@ -23762,7 +24129,7 @@ if test -n "$cf_item" ; then
        CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
 
                          cat >"conftest.$ac_ext" <<_ACEOF
        CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
 
                          cat >"conftest.$ac_ext" <<_ACEOF

-#line 23765 "configure"
+#line 24132 "configure"

 #include "confdefs.h"
 #include <stdio.h>
 int
 #include "confdefs.h"
 #include <stdio.h>
 int


@@ -23774,16 +24141,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
 }
 _ACEOF
 rm -f "conftest.$ac_objext"

-if { (eval echo "$as_me:23777: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:24144: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:23780: \$? = $ac_status" >&5
+  echo "$as_me:24147: \$? = $ac_status" >&5

   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'

-  { (eval echo "$as_me:23783: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24150: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:23786: \$? = $ac_status" >&5
+  echo "$as_me:24153: \$? = $ac_status" >&5

   (exit "$ac_status"); }; }; then
   :
 else
   (exit "$ac_status"); }; }; then
   :
 else


@@ -23800,7 +24167,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}:23803: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:24170: testing adding $cf_add_incdir to include-path ..." 1>&5

 
                  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
 
                  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 


@@ -23880,7 +24247,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}:23883: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:24250: testing adding $cf_add_libdir to library-path ..." 1>&5

 
                                LDFLAGS="-L$cf_add_libdir $LDFLAGS"
                        fi
 
                                LDFLAGS="-L$cf_add_libdir $LDFLAGS"
                        fi


@@ -23897,23 +24264,23 @@ fi
        fi
 esac
 
        fi
 esac
 

-echo "$as_me:23900: checking for db.h" >&5
+echo "$as_me:24267: 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 23906 "configure"
+#line 24273 "configure"

 #include "confdefs.h"
 #include <db.h>
 _ACEOF
 #include "confdefs.h"
 #include <db.h>
 _ACEOF

-if { (eval echo "$as_me:23910: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:24277: \"$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:23916: \$? = $ac_status" >&5
+  echo "$as_me:24283: \$? = $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


@@ -23932,11 +24299,11 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi

-echo "$as_me:23935: result: $ac_cv_header_db_h" >&5
+echo "$as_me:24302: 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:23939: checking for version of db" >&5
+echo "$as_me:24306: 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


@@ -23947,10 +24314,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}:23950: testing checking for db version $cf_db_version ..." 1>&5
+echo "${as_me:-configure}:24317: testing checking for db version $cf_db_version ..." 1>&5

 
        cat >"conftest.$ac_ext" <<_ACEOF
 
        cat >"conftest.$ac_ext" <<_ACEOF

-#line 23953 "configure"
+#line 24320 "configure"

 #include "confdefs.h"
 
 $ac_includes_default
 #include "confdefs.h"
 
 $ac_includes_default


@@ -23980,16 +24347,16 @@ DBT *foo = 0
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
 }
 _ACEOF
 rm -f "conftest.$ac_objext"

-if { (eval echo "$as_me:23983: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:24350: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:23986: \$? = $ac_status" >&5
+  echo "$as_me:24353: \$? = $ac_status" >&5

   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'

-  { (eval echo "$as_me:23989: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24356: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:23992: \$? = $ac_status" >&5
+  echo "$as_me:24359: \$? = $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


@@ -24003,16 +24370,16 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 done
 
 fi
 done
 
 fi

-echo "$as_me:24006: result: $cf_cv_hashed_db_version" >&5
+echo "$as_me:24373: 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:24010: error: Cannot determine version of db" >&5
+       { { echo "$as_me:24377: 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:24015: checking for db libraries" >&5
+echo "$as_me:24382: 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


@@ -24042,10 +24409,10 @@ LIBS="$cf_add_libs"
 
        fi
 
 
        fi
 

-echo "${as_me:-configure}:24045: testing checking for library $cf_db_libs ..." 1>&5
+echo "${as_me:-configure}:24412: testing checking for library $cf_db_libs ..." 1>&5

 
        cat >"conftest.$ac_ext" <<_ACEOF
 
        cat >"conftest.$ac_ext" <<_ACEOF

-#line 24048 "configure"
+#line 24415 "configure"

 #include "confdefs.h"
 
 $ac_includes_default
 #include "confdefs.h"
 
 $ac_includes_default


@@ -24100,16 +24467,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:24103: \"$ac_link\"") >&5
+if { (eval echo "$as_me:24470: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:24106: \$? = $ac_status" >&5
+  echo "$as_me:24473: \$? = $ac_status" >&5

   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'

-  { (eval echo "$as_me:24109: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24476: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:24112: \$? = $ac_status" >&5
+  echo "$as_me:24479: \$? = $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


@@ -24129,11 +24496,11 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 done
 
 fi
 done
 
 fi

-echo "$as_me:24132: result: $cf_cv_hashed_db_libs" >&5
+echo "$as_me:24499: 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:24136: error: Cannot determine library for db" >&5
+               { { echo "$as_me:24503: 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


@@ -24159,7 +24526,7 @@ fi
 
 else
 
 
 else
 

-       { { echo "$as_me:24162: error: Cannot find db.h" >&5
+       { { echo "$as_me:24529: 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; }; }
 


@@ -24174,7 +24541,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:24177: checking if we should include stdbool.h" >&5
+echo "$as_me:24544: 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


@@ -24182,7 +24549,7 @@ if test "${cf_cv_header_stdbool_h+set}" = set; then
 else
 
        cat >"conftest.$ac_ext" <<_ACEOF
 else
 
        cat >"conftest.$ac_ext" <<_ACEOF

-#line 24185 "configure"
+#line 24552 "configure"

 #include "confdefs.h"
 
 int
 #include "confdefs.h"
 
 int


@@ -24194,23 +24561,23 @@ bool foo = false
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
 }
 _ACEOF
 rm -f "conftest.$ac_objext"

-if { (eval echo "$as_me:24197: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:24564: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:24200: \$? = $ac_status" >&5
+  echo "$as_me:24567: \$? = $ac_status" >&5

   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'

-  { (eval echo "$as_me:24203: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24570: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:24206: \$? = $ac_status" >&5
+  echo "$as_me:24573: \$? = $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 24213 "configure"
+#line 24580 "configure"

 #include "confdefs.h"
 
 #ifndef __BEOS__
 #include "confdefs.h"
 
 #ifndef __BEOS__


@@ -24226,16 +24593,16 @@ bool foo = false
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
 }
 _ACEOF
 rm -f "conftest.$ac_objext"

-if { (eval echo "$as_me:24229: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:24596: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:24232: \$? = $ac_status" >&5
+  echo "$as_me:24599: \$? = $ac_status" >&5

   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'

-  { (eval echo "$as_me:24235: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24602: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:24238: \$? = $ac_status" >&5
+  echo "$as_me:24605: \$? = $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


@@ -24249,13 +24616,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:24252: result: yes" >&5
+then   echo "$as_me:24619: result: yes" >&5

 echo "${ECHO_T}yes" >&6
 echo "${ECHO_T}yes" >&6

-else   echo "$as_me:24254: result: no" >&5
+else   echo "$as_me:24621: result: no" >&5

 echo "${ECHO_T}no" >&6
 fi
 
 echo "${ECHO_T}no" >&6
 fi
 

-echo "$as_me:24258: checking for builtin bool type" >&5
+echo "$as_me:24625: 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


@@ -24263,7 +24630,7 @@ if test "${cf_cv_cc_bool_type+set}" = set; then
 else
 
        cat >"conftest.$ac_ext" <<_ACEOF
 else
 
        cat >"conftest.$ac_ext" <<_ACEOF

-#line 24266 "configure"
+#line 24633 "configure"

 #include "confdefs.h"
 
 #include <stdio.h>
 #include "confdefs.h"
 
 #include <stdio.h>


@@ -24278,16 +24645,16 @@ bool x = false
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
 }
 _ACEOF
 rm -f "conftest.$ac_objext"

-if { (eval echo "$as_me:24281: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:24648: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:24284: \$? = $ac_status" >&5
+  echo "$as_me:24651: \$? = $ac_status" >&5

   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'

-  { (eval echo "$as_me:24287: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24654: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:24290: \$? = $ac_status" >&5
+  echo "$as_me:24657: \$? = $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


@@ -24300,9 +24667,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:24303: result: yes" >&5
+then   echo "$as_me:24670: result: yes" >&5

 echo "${ECHO_T}yes" >&6
 echo "${ECHO_T}yes" >&6

-else   echo "$as_me:24305: result: no" >&5
+else   echo "$as_me:24672: result: no" >&5

 echo "${ECHO_T}no" >&6
 fi
 
 echo "${ECHO_T}no" >&6
 fi
 


@@ -24319,10 +24686,10 @@ if test -n "$GXX" ; then
 
        cf_save="$LIBS"
        LIBS="$LIBS $CXXLIBS"
 
        cf_save="$LIBS"
        LIBS="$LIBS $CXXLIBS"

-       echo "$as_me:24322: checking if we already have C++ library" >&5
+       echo "$as_me:24689: 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 24325 "configure"
+#line 24692 "configure"

 #include "confdefs.h"
 
                        #include <iostream>
 #include "confdefs.h"
 
                        #include <iostream>


@@ -24336,16 +24703,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:24339: \"$ac_link\"") >&5
+if { (eval echo "$as_me:24706: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:24342: \$? = $ac_status" >&5
+  echo "$as_me:24709: \$? = $ac_status" >&5

   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'

-  { (eval echo "$as_me:24345: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24712: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:24348: \$? = $ac_status" >&5
+  echo "$as_me:24715: \$? = $ac_status" >&5

   (exit "$ac_status"); }; }; then
   cf_have_libstdcpp=yes
 else
   (exit "$ac_status"); }; }; then
   cf_have_libstdcpp=yes
 else


@@ -24354,7 +24721,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:24357: result: $cf_have_libstdcpp" >&5
+       echo "$as_me:24724: 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"
 


@@ -24373,7 +24740,7 @@ echo "${ECHO_T}$cf_have_libstdcpp" >&6
                        ;;
                esac
 
                        ;;
                esac
 

-               echo "$as_me:24376: checking for library $cf_stdcpp_libname" >&5
+               echo "$as_me:24743: 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


@@ -24399,7 +24766,7 @@ done
 LIBS="$cf_add_libs"
 
                cat >"conftest.$ac_ext" <<_ACEOF
 LIBS="$cf_add_libs"
 
                cat >"conftest.$ac_ext" <<_ACEOF

-#line 24402 "configure"
+#line 24769 "configure"

 #include "confdefs.h"
 
                                #include <iostream>
 #include "confdefs.h"
 
                                #include <iostream>


@@ -24413,16 +24780,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:24416: \"$ac_link\"") >&5
+if { (eval echo "$as_me:24783: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:24419: \$? = $ac_status" >&5
+  echo "$as_me:24786: \$? = $ac_status" >&5

   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'

-  { (eval echo "$as_me:24422: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24789: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:24425: \$? = $ac_status" >&5
+  echo "$as_me:24792: \$? = $ac_status" >&5

   (exit "$ac_status"); }; }; then
   cf_cv_libstdcpp=yes
 else
   (exit "$ac_status"); }; }; then
   cf_cv_libstdcpp=yes
 else


@@ -24434,7 +24801,7 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
                        LIBS="$cf_save"
 
 fi
                        LIBS="$cf_save"
 
 fi

-echo "$as_me:24437: result: $cf_cv_libstdcpp" >&5
+echo "$as_me:24804: result: $cf_cv_libstdcpp" >&5

 echo "${ECHO_T}$cf_cv_libstdcpp" >&6
                test "$cf_cv_libstdcpp" = yes && {
 cf_add_libs="$CXXLIBS"
 echo "${ECHO_T}$cf_cv_libstdcpp" >&6
                test "$cf_cv_libstdcpp" = yes && {
 cf_add_libs="$CXXLIBS"


@@ -24456,7 +24823,7 @@ CXXLIBS="$cf_add_libs"
        fi
 fi
 
        fi
 fi
 

-       echo "$as_me:24459: checking whether $CXX understands -c and -o together" >&5
+       echo "$as_me:24826: 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


@@ -24471,15 +24838,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:24474: \"$ac_try\"") >&5
+if { (eval echo "$as_me:24841: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:24477: \$? = $ac_status" >&5
+  echo "$as_me:24844: \$? = $ac_status" >&5

   (exit "$ac_status"); } &&
   (exit "$ac_status"); } &&

-  test -f conftest2.$ac_objext && { (eval echo "$as_me:24479: \"$ac_try\"") >&5
+  test -f conftest2.$ac_objext && { (eval echo "$as_me:24846: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:24482: \$? = $ac_status" >&5
+  echo "$as_me:24849: \$? = $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


@@ -24490,10 +24857,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:24493: result: yes" >&5
+  echo "$as_me:24860: result: yes" >&5

 echo "${ECHO_T}yes" >&6
 else
 echo "${ECHO_T}yes" >&6
 else

-  echo "$as_me:24496: result: no" >&5
+  echo "$as_me:24863: result: no" >&5

 echo "${ECHO_T}no" >&6
 fi
 
 echo "${ECHO_T}no" >&6
 fi
 


@@ -24513,7 +24880,7 @@ case "$cf_cv_system_name" in
        ;;
 esac
 if test "$GXX" = yes; then
        ;;
 esac
 if test "$GXX" = yes; then

-       echo "$as_me:24516: checking for lib$cf_gpp_libname" >&5
+       echo "$as_me:24883: 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"
 


@@ -24534,7 +24901,7 @@ done
 LIBS="$cf_add_libs"
 
        cat >"conftest.$ac_ext" <<_ACEOF
 LIBS="$cf_add_libs"
 
        cat >"conftest.$ac_ext" <<_ACEOF

-#line 24537 "configure"
+#line 24904 "configure"

 #include "confdefs.h"
 
 #include <$cf_gpp_libname/builtin.h>
 #include "confdefs.h"
 
 #include <$cf_gpp_libname/builtin.h>


@@ -24548,16 +24915,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:24551: \"$ac_link\"") >&5
+if { (eval echo "$as_me:24918: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:24554: \$? = $ac_status" >&5
+  echo "$as_me:24921: \$? = $ac_status" >&5

   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'

-  { (eval echo "$as_me:24557: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24924: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:24560: \$? = $ac_status" >&5
+  echo "$as_me:24927: \$? = $ac_status" >&5

   (exit "$ac_status"); }; }; then
   cf_cxx_library=yes
 
   (exit "$ac_status"); }; }; then
   cf_cxx_library=yes
 


@@ -24594,7 +24961,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 24597 "configure"
+#line 24964 "configure"

 #include "confdefs.h"
 
 #include <builtin.h>
 #include "confdefs.h"
 
 #include <builtin.h>


@@ -24608,16 +24975,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:24611: \"$ac_link\"") >&5
+if { (eval echo "$as_me:24978: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:24614: \$? = $ac_status" >&5
+  echo "$as_me:24981: \$? = $ac_status" >&5

   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'

-  { (eval echo "$as_me:24617: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24984: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:24620: \$? = $ac_status" >&5
+  echo "$as_me:24987: \$? = $ac_status" >&5

   (exit "$ac_status"); }; }; then
   cf_cxx_library=yes
 
   (exit "$ac_status"); }; }; then
   cf_cxx_library=yes
 


@@ -24650,7 +25017,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:24653: result: $cf_cxx_library" >&5
+       echo "$as_me:25020: result: $cf_cxx_library" >&5

 echo "${ECHO_T}$cf_cxx_library" >&6
 fi
 
 echo "${ECHO_T}$cf_cxx_library" >&6
 fi
 


@@ -24666,7 +25033,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:24669: checking how to run the C++ preprocessor" >&5
+echo "$as_me:25036: 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


@@ -24683,18 +25050,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 24686 "configure"
+#line 25053 "configure"

 #include "confdefs.h"
 #include <assert.h>
                      Syntax error
 _ACEOF
 #include "confdefs.h"
 #include <assert.h>
                      Syntax error
 _ACEOF

-if { (eval echo "$as_me:24691: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:25058: \"$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:24697: \$? = $ac_status" >&5
+  echo "$as_me:25064: \$? = $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


@@ -24717,17 +25084,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 24720 "configure"
+#line 25087 "configure"

 #include "confdefs.h"
 #include <ac_nonexistent.h>
 _ACEOF
 #include "confdefs.h"
 #include <ac_nonexistent.h>
 _ACEOF

-if { (eval echo "$as_me:24724: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:25091: \"$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:24730: \$? = $ac_status" >&5
+  echo "$as_me:25097: \$? = $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


@@ -24764,7 +25131,7 @@ fi
 else
   ac_cv_prog_CXXCPP=$CXXCPP
 fi
 else
   ac_cv_prog_CXXCPP=$CXXCPP
 fi

-echo "$as_me:24767: result: $CXXCPP" >&5
+echo "$as_me:25134: 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


@@ -24774,18 +25141,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 24777 "configure"
+#line 25144 "configure"

 #include "confdefs.h"
 #include <assert.h>
                      Syntax error
 _ACEOF
 #include "confdefs.h"
 #include <assert.h>
                      Syntax error
 _ACEOF

-if { (eval echo "$as_me:24782: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:25149: \"$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:24788: \$? = $ac_status" >&5
+  echo "$as_me:25155: \$? = $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


@@ -24808,17 +25175,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 24811 "configure"
+#line 25178 "configure"

 #include "confdefs.h"
 #include <ac_nonexistent.h>
 _ACEOF
 #include "confdefs.h"
 #include <ac_nonexistent.h>
 _ACEOF

-if { (eval echo "$as_me:24815: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:25182: \"$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:24821: \$? = $ac_status" >&5
+  echo "$as_me:25188: \$? = $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


@@ -24846,7 +25213,7 @@ rm -f conftest.err "conftest.$ac_ext"
 if $ac_preproc_ok; then
   :
 else
 if $ac_preproc_ok; then
   :
 else

-  { { echo "$as_me:24849: error: C++ preprocessor \"$CXXCPP\" fails sanity check" >&5
+  { { echo "$as_me:25216: 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


@@ -24861,23 +25228,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:24864: checking for $ac_header" >&5
+echo "$as_me:25231: 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 24870 "configure"
+#line 25237 "configure"

 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF

-if { (eval echo "$as_me:24874: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:25241: \"$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:24880: \$? = $ac_status" >&5
+  echo "$as_me:25247: \$? = $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


@@ -24896,7 +25263,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi

-echo "$as_me:24899: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:25266: 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


@@ -24909,23 +25276,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:24912: checking for $ac_header" >&5
+echo "$as_me:25279: 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 24918 "configure"
+#line 25285 "configure"

 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF

-if { (eval echo "$as_me:24922: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:25289: \"$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:24928: \$? = $ac_status" >&5
+  echo "$as_me:25295: \$? = $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


@@ -24944,7 +25311,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi

-echo "$as_me:24947: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:25314: 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


@@ -24955,10 +25322,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:24958: checking if iostream uses std-namespace" >&5
+       echo "$as_me:25325: 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 24961 "configure"
+#line 25328 "configure"

 #include "confdefs.h"
 
 #include <iostream>
 #include "confdefs.h"
 
 #include <iostream>


@@ -24975,16 +25342,16 @@ cerr << "testing" << endl;
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
 }
 _ACEOF
 rm -f "conftest.$ac_objext"

-if { (eval echo "$as_me:24978: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:25345: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:24981: \$? = $ac_status" >&5
+  echo "$as_me:25348: \$? = $ac_status" >&5

   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'

-  { (eval echo "$as_me:24984: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25351: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:24987: \$? = $ac_status" >&5
+  echo "$as_me:25354: \$? = $ac_status" >&5

   (exit "$ac_status"); }; }; then
   cf_iostream_namespace=yes
 else
   (exit "$ac_status"); }; }; then
   cf_iostream_namespace=yes
 else


@@ -24993,7 +25360,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:24996: result: $cf_iostream_namespace" >&5
+       echo "$as_me:25363: 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
 


@@ -25004,7 +25371,7 @@ EOF
        fi
 fi
 
        fi
 fi
 

-echo "$as_me:25007: checking if we should include stdbool.h" >&5
+echo "$as_me:25374: 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


@@ -25012,7 +25379,7 @@ if test "${cf_cv_header_stdbool_h+set}" = set; then
 else
 
        cat >"conftest.$ac_ext" <<_ACEOF
 else
 
        cat >"conftest.$ac_ext" <<_ACEOF

-#line 25015 "configure"
+#line 25382 "configure"

 #include "confdefs.h"
 
 int
 #include "confdefs.h"
 
 int


@@ -25024,23 +25391,23 @@ bool foo = false
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
 }
 _ACEOF
 rm -f "conftest.$ac_objext"

-if { (eval echo "$as_me:25027: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:25394: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:25030: \$? = $ac_status" >&5
+  echo "$as_me:25397: \$? = $ac_status" >&5

   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'

-  { (eval echo "$as_me:25033: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25400: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:25036: \$? = $ac_status" >&5
+  echo "$as_me:25403: \$? = $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 25043 "configure"
+#line 25410 "configure"

 #include "confdefs.h"
 
 #ifndef __BEOS__
 #include "confdefs.h"
 
 #ifndef __BEOS__


@@ -25056,16 +25423,16 @@ bool foo = false
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
 }
 _ACEOF
 rm -f "conftest.$ac_objext"

-if { (eval echo "$as_me:25059: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:25426: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:25062: \$? = $ac_status" >&5
+  echo "$as_me:25429: \$? = $ac_status" >&5

   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'

-  { (eval echo "$as_me:25065: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25432: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:25068: \$? = $ac_status" >&5
+  echo "$as_me:25435: \$? = $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


@@ -25079,13 +25446,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:25082: result: yes" >&5
+then   echo "$as_me:25449: result: yes" >&5

 echo "${ECHO_T}yes" >&6
 echo "${ECHO_T}yes" >&6

-else   echo "$as_me:25084: result: no" >&5
+else   echo "$as_me:25451: result: no" >&5

 echo "${ECHO_T}no" >&6
 fi
 
 echo "${ECHO_T}no" >&6
 fi
 

-echo "$as_me:25088: checking for builtin bool type" >&5
+echo "$as_me:25455: 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


@@ -25093,7 +25460,7 @@ if test "${cf_cv_builtin_bool+set}" = set; then
 else
 
        cat >"conftest.$ac_ext" <<_ACEOF
 else
 
        cat >"conftest.$ac_ext" <<_ACEOF

-#line 25096 "configure"
+#line 25463 "configure"

 #include "confdefs.h"
 
 #include <stdio.h>
 #include "confdefs.h"
 
 #include <stdio.h>


@@ -25108,16 +25475,16 @@ bool x = false
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
 }
 _ACEOF
 rm -f "conftest.$ac_objext"

-if { (eval echo "$as_me:25111: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:25478: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:25114: \$? = $ac_status" >&5
+  echo "$as_me:25481: \$? = $ac_status" >&5

   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'

-  { (eval echo "$as_me:25117: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25484: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:25120: \$? = $ac_status" >&5
+  echo "$as_me:25487: \$? = $ac_status" >&5

   (exit "$ac_status"); }; }; then
   cf_cv_builtin_bool=1
 else
   (exit "$ac_status"); }; }; then
   cf_cv_builtin_bool=1
 else


@@ -25130,19 +25497,19 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 
 if test "$cf_cv_builtin_bool" = 1
 fi
 
 if test "$cf_cv_builtin_bool" = 1

-then   echo "$as_me:25133: result: yes" >&5
+then   echo "$as_me:25500: result: yes" >&5

 echo "${ECHO_T}yes" >&6
 echo "${ECHO_T}yes" >&6

-else   echo "$as_me:25135: result: no" >&5
+else   echo "$as_me:25502: result: no" >&5

 echo "${ECHO_T}no" >&6
 fi
 
 echo "${ECHO_T}no" >&6
 fi
 

-echo "$as_me:25139: checking for bool" >&5
+echo "$as_me:25506: checking for bool" >&5

 echo $ECHO_N "checking for bool... $ECHO_C" >&6
 if test "${ac_cv_type_bool+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >"conftest.$ac_ext" <<_ACEOF
 echo $ECHO_N "checking for bool... $ECHO_C" >&6
 if test "${ac_cv_type_bool+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >"conftest.$ac_ext" <<_ACEOF

-#line 25145 "configure"
+#line 25512 "configure"

 #include "confdefs.h"
 
 #include <stdlib.h>
 #include "confdefs.h"
 
 #include <stdlib.h>


@@ -25178,16 +25545,16 @@ if (sizeof (bool))
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
 }
 _ACEOF
 rm -f "conftest.$ac_objext"

-if { (eval echo "$as_me:25181: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:25548: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:25184: \$? = $ac_status" >&5
+  echo "$as_me:25551: \$? = $ac_status" >&5

   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'

-  { (eval echo "$as_me:25187: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25554: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:25190: \$? = $ac_status" >&5
+  echo "$as_me:25557: \$? = $ac_status" >&5

   (exit "$ac_status"); }; }; then
   ac_cv_type_bool=yes
 else
   (exit "$ac_status"); }; }; then
   ac_cv_type_bool=yes
 else


@@ -25197,10 +25564,10 @@ ac_cv_type_bool=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi

-echo "$as_me:25200: result: $ac_cv_type_bool" >&5
+echo "$as_me:25567: result: $ac_cv_type_bool" >&5

 echo "${ECHO_T}$ac_cv_type_bool" >&6
 
 echo "${ECHO_T}$ac_cv_type_bool" >&6
 

-echo "$as_me:25203: checking size of bool" >&5
+echo "$as_me:25570: checking size of bool" >&5

 echo $ECHO_N "checking size of bool... $ECHO_C" >&6
 if test "${ac_cv_sizeof_bool+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 echo $ECHO_N "checking size of bool... $ECHO_C" >&6
 if test "${ac_cv_sizeof_bool+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6


@@ -25209,7 +25576,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 25212 "configure"
+#line 25579 "configure"

 #include "confdefs.h"
 
 #include <stdlib.h>
 #include "confdefs.h"
 
 #include <stdlib.h>


@@ -25242,21 +25609,21 @@ int _array_ [1 - 2 * !((sizeof (bool)) >= 0)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
 }
 _ACEOF
 rm -f "conftest.$ac_objext"

-if { (eval echo "$as_me:25245: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:25612: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:25248: \$? = $ac_status" >&5
+  echo "$as_me:25615: \$? = $ac_status" >&5

   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'

-  { (eval echo "$as_me:25251: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25618: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:25254: \$? = $ac_status" >&5
+  echo "$as_me:25621: \$? = $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 25259 "configure"
+#line 25626 "configure"

 #include "confdefs.h"
 
 #include <stdlib.h>
 #include "confdefs.h"
 
 #include <stdlib.h>


@@ -25289,16 +25656,16 @@ int _array_ [1 - 2 * !((sizeof (bool)) <= $ac_mid)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
 }
 _ACEOF
 rm -f "conftest.$ac_objext"

-if { (eval echo "$as_me:25292: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:25659: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:25295: \$? = $ac_status" >&5
+  echo "$as_me:25662: \$? = $ac_status" >&5

   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'

-  { (eval echo "$as_me:25298: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25665: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:25301: \$? = $ac_status" >&5
+  echo "$as_me:25668: \$? = $ac_status" >&5

   (exit "$ac_status"); }; }; then
   ac_hi=$ac_mid; break
 else
   (exit "$ac_status"); }; }; then
   ac_hi=$ac_mid; break
 else


@@ -25314,7 +25681,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 25317 "configure"
+#line 25684 "configure"

 #include "confdefs.h"
 
 #include <stdlib.h>
 #include "confdefs.h"
 
 #include <stdlib.h>


@@ -25347,16 +25714,16 @@ int _array_ [1 - 2 * !((sizeof (bool)) >= $ac_mid)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
 }
 _ACEOF
 rm -f "conftest.$ac_objext"

-if { (eval echo "$as_me:25350: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:25717: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:25353: \$? = $ac_status" >&5
+  echo "$as_me:25720: \$? = $ac_status" >&5

   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'

-  { (eval echo "$as_me:25356: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25723: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:25359: \$? = $ac_status" >&5
+  echo "$as_me:25726: \$? = $ac_status" >&5

   (exit "$ac_status"); }; }; then
   ac_lo=$ac_mid; break
 else
   (exit "$ac_status"); }; }; then
   ac_lo=$ac_mid; break
 else


@@ -25372,7 +25739,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 25375 "configure"
+#line 25742 "configure"

 #include "confdefs.h"
 
 #include <stdlib.h>
 #include "confdefs.h"
 
 #include <stdlib.h>


@@ -25405,16 +25772,16 @@ int _array_ [1 - 2 * !((sizeof (bool)) <= $ac_mid)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
 }
 _ACEOF
 rm -f "conftest.$ac_objext"

-if { (eval echo "$as_me:25408: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:25775: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:25411: \$? = $ac_status" >&5
+  echo "$as_me:25778: \$? = $ac_status" >&5

   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'

-  { (eval echo "$as_me:25414: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25781: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:25417: \$? = $ac_status" >&5
+  echo "$as_me:25784: \$? = $ac_status" >&5

   (exit "$ac_status"); }; }; then
   ac_hi=$ac_mid
 else
   (exit "$ac_status"); }; }; then
   ac_hi=$ac_mid
 else


@@ -25427,12 +25794,12 @@ done
 ac_cv_sizeof_bool=$ac_lo
 else
   if test "$cross_compiling" = yes; then
 ac_cv_sizeof_bool=$ac_lo
 else
   if test "$cross_compiling" = yes; then

-  { { echo "$as_me:25430: error: cannot run test program while cross compiling" >&5
+  { { echo "$as_me:25797: 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 25435 "configure"
+#line 25802 "configure"

 #include "confdefs.h"
 
 #include <stdlib.h>
 #include "confdefs.h"
 
 #include <stdlib.h>


@@ -25469,15 +25836,15 @@ fclose (f);
 }
 _ACEOF
 rm -f "conftest$ac_exeext"
 }
 _ACEOF
 rm -f "conftest$ac_exeext"

-if { (eval echo "$as_me:25472: \"$ac_link\"") >&5
+if { (eval echo "$as_me:25839: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:25475: \$? = $ac_status" >&5
+  echo "$as_me:25842: \$? = $ac_status" >&5

   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'

-  { (eval echo "$as_me:25477: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25844: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:25480: \$? = $ac_status" >&5
+  echo "$as_me:25847: \$? = $ac_status" >&5

   (exit "$ac_status"); }; }; then
   ac_cv_sizeof_bool=`cat conftest.val`
 else
   (exit "$ac_status"); }; }; then
   ac_cv_sizeof_bool=`cat conftest.val`
 else


@@ -25493,13 +25860,13 @@ else
   ac_cv_sizeof_bool=0
 fi
 fi
   ac_cv_sizeof_bool=0
 fi
 fi

-echo "$as_me:25496: result: $ac_cv_sizeof_bool" >&5
+echo "$as_me:25863: result: $ac_cv_sizeof_bool" >&5

 echo "${ECHO_T}$ac_cv_sizeof_bool" >&6
 cat >>confdefs.h <<EOF
 #define SIZEOF_BOOL $ac_cv_sizeof_bool
 EOF
 
 echo "${ECHO_T}$ac_cv_sizeof_bool" >&6
 cat >>confdefs.h <<EOF
 #define SIZEOF_BOOL $ac_cv_sizeof_bool
 EOF
 

-echo "$as_me:25502: checking for type of bool" >&5
+echo "$as_me:25869: checking for type of bool" >&5

 echo $ECHO_N "checking for type of bool... $ECHO_C" >&6
 if test "${cf_cv_type_of_bool+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 echo $ECHO_N "checking for type of bool... $ECHO_C" >&6
 if test "${cf_cv_type_of_bool+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6


@@ -25518,7 +25885,7 @@ else
 
 else
   cat >"conftest.$ac_ext" <<_ACEOF
 
 else
   cat >"conftest.$ac_ext" <<_ACEOF

-#line 25521 "configure"
+#line 25888 "configure"

 #include "confdefs.h"
 
 #include <stdlib.h>
 #include "confdefs.h"
 
 #include <stdlib.h>


@@ -25560,15 +25927,15 @@ int main(void)
 
 _ACEOF
 rm -f "conftest$ac_exeext"
 
 _ACEOF
 rm -f "conftest$ac_exeext"

-if { (eval echo "$as_me:25563: \"$ac_link\"") >&5
+if { (eval echo "$as_me:25930: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:25566: \$? = $ac_status" >&5
+  echo "$as_me:25933: \$? = $ac_status" >&5

   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'

-  { (eval echo "$as_me:25568: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25935: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:25571: \$? = $ac_status" >&5
+  echo "$as_me:25938: \$? = $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


@@ -25585,19 +25952,19 @@ fi
        rm -f cf_test.out
 
 fi
        rm -f cf_test.out
 
 fi

-echo "$as_me:25588: result: $cf_cv_type_of_bool" >&5
+echo "$as_me:25955: 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:25595: WARNING: Assuming $NCURSES_BOOL for type of bool" >&5
+       { echo "$as_me:25962: 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:25600: checking for special defines needed for etip.h" >&5
+echo "$as_me:25967: 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"


@@ -25615,7 +25982,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 25618 "configure"
+#line 25985 "configure"

 #include "confdefs.h"
 
 #include <etip.h.in>
 #include "confdefs.h"
 
 #include <etip.h.in>


@@ -25629,16 +25996,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
 }
 _ACEOF
 rm -f "conftest.$ac_objext"

-if { (eval echo "$as_me:25632: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:25999: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:25635: \$? = $ac_status" >&5
+  echo "$as_me:26002: \$? = $ac_status" >&5

   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'

-  { (eval echo "$as_me:25638: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26005: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:25641: \$? = $ac_status" >&5
+  echo "$as_me:26008: \$? = $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


@@ -25659,12 +26026,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:25662: result: $cf_result" >&5
+echo "$as_me:26029: 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:25667: checking if $CXX accepts parameter initialization" >&5
+echo "$as_me:26034: 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


@@ -25681,7 +26048,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 25684 "configure"
+#line 26051 "configure"

 #include "confdefs.h"
 
 class TEST {
 #include "confdefs.h"
 
 class TEST {


@@ -25700,15 +26067,15 @@ int main(void) { }
 
 _ACEOF
 rm -f "conftest$ac_exeext"
 
 _ACEOF
 rm -f "conftest$ac_exeext"

-if { (eval echo "$as_me:25703: \"$ac_link\"") >&5
+if { (eval echo "$as_me:26070: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:25706: \$? = $ac_status" >&5
+  echo "$as_me:26073: \$? = $ac_status" >&5

   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'

-  { (eval echo "$as_me:25708: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26075: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:25711: \$? = $ac_status" >&5
+  echo "$as_me:26078: \$? = $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


@@ -25727,7 +26094,7 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
 ac_main_return="return"
 
 fi
 ac_main_return="return"
 
 fi

-echo "$as_me:25730: result: $cf_cv_cpp_param_init" >&5
+echo "$as_me:26097: 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 &&


@@ -25737,7 +26104,7 @@ EOF
 
 if test -n "$CXX"; then
 
 
 if test -n "$CXX"; then
 

-echo "$as_me:25740: checking if $CXX accepts static_cast" >&5
+echo "$as_me:26107: 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


@@ -25751,7 +26118,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 25754 "configure"
+#line 26121 "configure"

 #include "confdefs.h"
 
 class NCursesPanel
 #include "confdefs.h"
 
 class NCursesPanel


@@ -25795,16 +26162,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
 }
 _ACEOF
 rm -f "conftest.$ac_objext"

-if { (eval echo "$as_me:25798: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:26165: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:25801: \$? = $ac_status" >&5
+  echo "$as_me:26168: \$? = $ac_status" >&5

   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'

-  { (eval echo "$as_me:25804: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26171: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:25807: \$? = $ac_status" >&5
+  echo "$as_me:26174: \$? = $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


@@ -25822,7 +26189,7 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
 ac_main_return="return"
 
 fi
 ac_main_return="return"
 
 fi

-echo "$as_me:25825: result: $cf_cv_cpp_static_cast" >&5
+echo "$as_me:26192: 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


@@ -25871,13 +26238,13 @@ else
        else
                if test "$cf_cv_header_stdbool_h" = 1 ; then
 
        else
                if test "$cf_cv_header_stdbool_h" = 1 ; then
 

-echo "$as_me:25874: checking for bool" >&5
+echo "$as_me:26241: checking for bool" >&5

 echo $ECHO_N "checking for bool... $ECHO_C" >&6
 if test "${ac_cv_type_bool+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >"conftest.$ac_ext" <<_ACEOF
 echo $ECHO_N "checking for bool... $ECHO_C" >&6
 if test "${ac_cv_type_bool+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >"conftest.$ac_ext" <<_ACEOF

-#line 25880 "configure"
+#line 26247 "configure"

 #include "confdefs.h"
 
 #include <stdlib.h>
 #include "confdefs.h"
 
 #include <stdlib.h>


@@ -25913,16 +26280,16 @@ if (sizeof (bool))
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
 }
 _ACEOF
 rm -f "conftest.$ac_objext"

-if { (eval echo "$as_me:25916: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:26283: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:25919: \$? = $ac_status" >&5
+  echo "$as_me:26286: \$? = $ac_status" >&5

   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'

-  { (eval echo "$as_me:25922: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26289: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:25925: \$? = $ac_status" >&5
+  echo "$as_me:26292: \$? = $ac_status" >&5

   (exit "$ac_status"); }; }; then
   ac_cv_type_bool=yes
 else
   (exit "$ac_status"); }; }; then
   ac_cv_type_bool=yes
 else


@@ -25932,10 +26299,10 @@ ac_cv_type_bool=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi

-echo "$as_me:25935: result: $ac_cv_type_bool" >&5
+echo "$as_me:26302: result: $ac_cv_type_bool" >&5

 echo "${ECHO_T}$ac_cv_type_bool" >&6
 
 echo "${ECHO_T}$ac_cv_type_bool" >&6
 

-echo "$as_me:25938: checking size of bool" >&5
+echo "$as_me:26305: checking size of bool" >&5

 echo $ECHO_N "checking size of bool... $ECHO_C" >&6
 if test "${ac_cv_sizeof_bool+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 echo $ECHO_N "checking size of bool... $ECHO_C" >&6
 if test "${ac_cv_sizeof_bool+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6


@@ -25944,7 +26311,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 25947 "configure"
+#line 26314 "configure"

 #include "confdefs.h"
 
 #include <stdlib.h>
 #include "confdefs.h"
 
 #include <stdlib.h>


@@ -25977,21 +26344,21 @@ int _array_ [1 - 2 * !((sizeof (bool)) >= 0)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
 }
 _ACEOF
 rm -f "conftest.$ac_objext"

-if { (eval echo "$as_me:25980: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:26347: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:25983: \$? = $ac_status" >&5
+  echo "$as_me:26350: \$? = $ac_status" >&5

   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'

-  { (eval echo "$as_me:25986: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26353: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:25989: \$? = $ac_status" >&5
+  echo "$as_me:26356: \$? = $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 25994 "configure"
+#line 26361 "configure"

 #include "confdefs.h"
 
 #include <stdlib.h>
 #include "confdefs.h"
 
 #include <stdlib.h>


@@ -26024,16 +26391,16 @@ int _array_ [1 - 2 * !((sizeof (bool)) <= $ac_mid)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
 }
 _ACEOF
 rm -f "conftest.$ac_objext"

-if { (eval echo "$as_me:26027: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:26394: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:26030: \$? = $ac_status" >&5
+  echo "$as_me:26397: \$? = $ac_status" >&5

   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'

-  { (eval echo "$as_me:26033: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26400: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:26036: \$? = $ac_status" >&5
+  echo "$as_me:26403: \$? = $ac_status" >&5

   (exit "$ac_status"); }; }; then
   ac_hi=$ac_mid; break
 else
   (exit "$ac_status"); }; }; then
   ac_hi=$ac_mid; break
 else


@@ -26049,7 +26416,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 26052 "configure"
+#line 26419 "configure"

 #include "confdefs.h"
 
 #include <stdlib.h>
 #include "confdefs.h"
 
 #include <stdlib.h>


@@ -26082,16 +26449,16 @@ int _array_ [1 - 2 * !((sizeof (bool)) >= $ac_mid)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
 }
 _ACEOF
 rm -f "conftest.$ac_objext"

-if { (eval echo "$as_me:26085: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:26452: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:26088: \$? = $ac_status" >&5
+  echo "$as_me:26455: \$? = $ac_status" >&5

   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'

-  { (eval echo "$as_me:26091: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26458: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:26094: \$? = $ac_status" >&5
+  echo "$as_me:26461: \$? = $ac_status" >&5

   (exit "$ac_status"); }; }; then
   ac_lo=$ac_mid; break
 else
   (exit "$ac_status"); }; }; then
   ac_lo=$ac_mid; break
 else


@@ -26107,7 +26474,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 26110 "configure"
+#line 26477 "configure"

 #include "confdefs.h"
 
 #include <stdlib.h>
 #include "confdefs.h"
 
 #include <stdlib.h>


@@ -26140,16 +26507,16 @@ int _array_ [1 - 2 * !((sizeof (bool)) <= $ac_mid)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
 }
 _ACEOF
 rm -f "conftest.$ac_objext"

-if { (eval echo "$as_me:26143: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:26510: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:26146: \$? = $ac_status" >&5
+  echo "$as_me:26513: \$? = $ac_status" >&5

   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'

-  { (eval echo "$as_me:26149: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26516: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:26152: \$? = $ac_status" >&5
+  echo "$as_me:26519: \$? = $ac_status" >&5

   (exit "$ac_status"); }; }; then
   ac_hi=$ac_mid
 else
   (exit "$ac_status"); }; }; then
   ac_hi=$ac_mid
 else


@@ -26162,12 +26529,12 @@ done
 ac_cv_sizeof_bool=$ac_lo
 else
   if test "$cross_compiling" = yes; then
 ac_cv_sizeof_bool=$ac_lo
 else
   if test "$cross_compiling" = yes; then

-  { { echo "$as_me:26165: error: cannot run test program while cross compiling" >&5
+  { { echo "$as_me:26532: 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 26170 "configure"
+#line 26537 "configure"

 #include "confdefs.h"
 
 #include <stdlib.h>
 #include "confdefs.h"
 
 #include <stdlib.h>


@@ -26204,15 +26571,15 @@ fclose (f);
 }
 _ACEOF
 rm -f "conftest$ac_exeext"
 }
 _ACEOF
 rm -f "conftest$ac_exeext"

-if { (eval echo "$as_me:26207: \"$ac_link\"") >&5
+if { (eval echo "$as_me:26574: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:26210: \$? = $ac_status" >&5
+  echo "$as_me:26577: \$? = $ac_status" >&5

   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'

-  { (eval echo "$as_me:26212: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26579: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:26215: \$? = $ac_status" >&5
+  echo "$as_me:26582: \$? = $ac_status" >&5

   (exit "$ac_status"); }; }; then
   ac_cv_sizeof_bool=`cat conftest.val`
 else
   (exit "$ac_status"); }; }; then
   ac_cv_sizeof_bool=`cat conftest.val`
 else


@@ -26228,13 +26595,13 @@ else
   ac_cv_sizeof_bool=0
 fi
 fi
   ac_cv_sizeof_bool=0
 fi
 fi

-echo "$as_me:26231: result: $ac_cv_sizeof_bool" >&5
+echo "$as_me:26598: result: $ac_cv_sizeof_bool" >&5

 echo "${ECHO_T}$ac_cv_sizeof_bool" >&6
 cat >>confdefs.h <<EOF
 #define SIZEOF_BOOL $ac_cv_sizeof_bool
 EOF
 
 echo "${ECHO_T}$ac_cv_sizeof_bool" >&6
 cat >>confdefs.h <<EOF
 #define SIZEOF_BOOL $ac_cv_sizeof_bool
 EOF
 

-echo "$as_me:26237: checking for type of bool" >&5
+echo "$as_me:26604: checking for type of bool" >&5

 echo $ECHO_N "checking for type of bool... $ECHO_C" >&6
 if test "${cf_cv_type_of_bool+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 echo $ECHO_N "checking for type of bool... $ECHO_C" >&6
 if test "${cf_cv_type_of_bool+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6


@@ -26253,7 +26620,7 @@ else
 
 else
   cat >"conftest.$ac_ext" <<_ACEOF
 
 else
   cat >"conftest.$ac_ext" <<_ACEOF

-#line 26256 "configure"
+#line 26623 "configure"

 #include "confdefs.h"
 
 #include <stdlib.h>
 #include "confdefs.h"
 
 #include <stdlib.h>


@@ -26295,15 +26662,15 @@ int main(void)
 
 _ACEOF
 rm -f "conftest$ac_exeext"
 
 _ACEOF
 rm -f "conftest$ac_exeext"

-if { (eval echo "$as_me:26298: \"$ac_link\"") >&5
+if { (eval echo "$as_me:26665: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:26301: \$? = $ac_status" >&5
+  echo "$as_me:26668: \$? = $ac_status" >&5

   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'

-  { (eval echo "$as_me:26303: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26670: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:26306: \$? = $ac_status" >&5
+  echo "$as_me:26673: \$? = $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


@@ -26320,26 +26687,26 @@ fi
        rm -f cf_test.out
 
 fi
        rm -f cf_test.out
 
 fi

-echo "$as_me:26323: result: $cf_cv_type_of_bool" >&5
+echo "$as_me:26690: 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:26330: WARNING: Assuming $NCURSES_BOOL for type of bool" >&5
+       { echo "$as_me:26697: 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:26336: checking for fallback type of bool" >&5
+                       echo "$as_me:26703: 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:26342: result: $cf_cv_type_of_bool" >&5
+                       echo "$as_me:26709: 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


@@ -26368,7 +26735,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:26371: WARNING: libtool does not support Ada - disabling feature" >&5
+                       { echo "$as_me:26738: 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


@@ -26385,7 +26752,7 @@ cf_upper_prog_gnat=`echo "${cf_prog_gnat}" | sed y%abcdefghijklmnopqrstuvwxyz./-
        unset cf_TEMP_gnat
        # Extract the first word of "$cf_prog_gnat", so it can be a program name with args.
 set dummy $cf_prog_gnat; ac_word=$2
        unset cf_TEMP_gnat
        # Extract the first word of "$cf_prog_gnat", so it can be a program name with args.
 set dummy $cf_prog_gnat; ac_word=$2

-echo "$as_me:26388: checking for $ac_word" >&5
+echo "$as_me:26755: checking for $ac_word" >&5

 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_path_cf_TEMP_gnat+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_path_cf_TEMP_gnat+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6


@@ -26402,7 +26769,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   if $as_executable_p "$ac_dir/$ac_word"; then
    ac_cv_path_cf_TEMP_gnat="$ac_dir/$ac_word"
   test -z "$ac_dir" && ac_dir=.
   if $as_executable_p "$ac_dir/$ac_word"; then
    ac_cv_path_cf_TEMP_gnat="$ac_dir/$ac_word"

-   echo "$as_me:26405: found $ac_dir/$ac_word" >&5
+   echo "$as_me:26772: found $ac_dir/$ac_word" >&5

    break
 fi
 done
    break
 fi
 done


@@ -26414,10 +26781,10 @@ fi
 cf_TEMP_gnat=$ac_cv_path_cf_TEMP_gnat
 
 if test -n "$cf_TEMP_gnat"; then
 cf_TEMP_gnat=$ac_cv_path_cf_TEMP_gnat
 
 if test -n "$cf_TEMP_gnat"; then

-  echo "$as_me:26417: result: $cf_TEMP_gnat" >&5
+  echo "$as_me:26784: result: $cf_TEMP_gnat" >&5

 echo "${ECHO_T}$cf_TEMP_gnat" >&6
 else
 echo "${ECHO_T}$cf_TEMP_gnat" >&6
 else

-  echo "$as_me:26420: result: no" >&5
+  echo "$as_me:26787: result: no" >&5

 echo "${ECHO_T}no" >&6
 fi
 
 echo "${ECHO_T}no" >&6
 fi
 


@@ -26427,7 +26794,7 @@ fi
                unset cf_cv_gnat_version
                unset cf_TEMP_gnat
 
                unset cf_cv_gnat_version
                unset cf_TEMP_gnat
 

-echo "$as_me:26430: checking for $cf_prog_gnat version" >&5
+echo "$as_me:26797: checking for $cf_prog_gnat version" >&5

 echo $ECHO_N "checking for $cf_prog_gnat version... $ECHO_C" >&6
 if test "${cf_cv_gnat_version+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 echo $ECHO_N "checking for $cf_prog_gnat version... $ECHO_C" >&6
 if test "${cf_cv_gnat_version+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6


@@ -26438,7 +26805,7 @@ cf_cv_gnat_version=`$cf_prog_gnat --version 2>&1 | \
        sed -e '2,$d' -e 's/[^0-9 \.]//g' -e 's/^[ ]*//' -e 's/ .*//'`
 
 fi
        sed -e '2,$d' -e 's/[^0-9 \.]//g' -e 's/^[ ]*//' -e 's/ .*//'`
 
 fi

-echo "$as_me:26441: result: $cf_cv_gnat_version" >&5
+echo "$as_me:26808: result: $cf_cv_gnat_version" >&5

 echo "${ECHO_T}$cf_cv_gnat_version" >&6
 test -z "$cf_cv_gnat_version" && cf_cv_gnat_version=no
 eval cf_TEMP_gnat=$cf_cv_gnat_version; unset cf_cv_gnat_version
 echo "${ECHO_T}$cf_cv_gnat_version" >&6
 test -z "$cf_cv_gnat_version" && cf_cv_gnat_version=no
 eval cf_TEMP_gnat=$cf_cv_gnat_version; unset cf_cv_gnat_version


@@ -26467,7 +26834,7 @@ else
                        cd conftest.src
                        for cf_gprconfig in Ada C
                        do
                        cd conftest.src
                        for cf_gprconfig in Ada C
                        do

-                               echo "$as_me:26470: checking for gprconfig name for $cf_gprconfig" >&5
+                               echo "$as_me:26837: checking for gprconfig name for $cf_gprconfig" >&5

 echo $ECHO_N "checking for gprconfig name for $cf_gprconfig... $ECHO_C" >&6
                                if test "$cf_gprconfig" = C
                                then
 echo $ECHO_N "checking for gprconfig name for $cf_gprconfig... $ECHO_C" >&6
                                if test "$cf_gprconfig" = C
                                then


@@ -26486,10 +26853,10 @@ echo $ECHO_N "checking for gprconfig name for $cf_gprconfig... $ECHO_C" >&6
                                if test -n "$cf_gprconfig_value"
                                then
                                        eval "cf_ada_config_$cf_gprconfig=$cf_gprconfig_value"
                                if test -n "$cf_gprconfig_value"
                                then
                                        eval "cf_ada_config_$cf_gprconfig=$cf_gprconfig_value"

-                                       echo "$as_me:26489: result: $cf_gprconfig_value" >&5
+                                       echo "$as_me:26856: result: $cf_gprconfig_value" >&5

 echo "${ECHO_T}$cf_gprconfig_value" >&6
                                else
 echo "${ECHO_T}$cf_gprconfig_value" >&6
                                else

-                                       echo "$as_me:26492: result: missing" >&5
+                                       echo "$as_me:26859: result: missing" >&5

 echo "${ECHO_T}missing" >&6
                                        cf_ada_config="#"
                                        break
 echo "${ECHO_T}missing" >&6
                                        cf_ada_config="#"
                                        break


@@ -26502,7 +26869,7 @@ echo "${ECHO_T}missing" >&6
        if test "x$cf_ada_config" != "x#"
        then
 
        if test "x$cf_ada_config" != "x#"
        then
 

-echo "$as_me:26505: checking for gnat version" >&5
+echo "$as_me:26872: checking for gnat version" >&5

 echo $ECHO_N "checking for gnat version... $ECHO_C" >&6
 if test "${cf_cv_gnat_version+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 echo $ECHO_N "checking for gnat version... $ECHO_C" >&6
 if test "${cf_cv_gnat_version+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6


@@ -26513,7 +26880,7 @@ cf_cv_gnat_version=`${cf_ada_make:-gnatmake} --version 2>&1 | \
        sed -e '2,$d' -e 's/[^0-9 \.]//g' -e 's/^[ ]*//' -e 's/ .*//'`
 
 fi
        sed -e '2,$d' -e 's/[^0-9 \.]//g' -e 's/^[ ]*//' -e 's/ .*//'`
 
 fi

-echo "$as_me:26516: result: $cf_cv_gnat_version" >&5
+echo "$as_me:26883: result: $cf_cv_gnat_version" >&5

 echo "${ECHO_T}$cf_cv_gnat_version" >&6
 test -z "$cf_cv_gnat_version" && cf_cv_gnat_version=no
 
 echo "${ECHO_T}$cf_cv_gnat_version" >&6
 test -z "$cf_cv_gnat_version" && cf_cv_gnat_version=no
 


@@ -26522,7 +26889,7 @@ case "$cf_cv_gnat_version" in
        cf_cv_prog_gnat_correct=yes
        ;;
 (*)
        cf_cv_prog_gnat_correct=yes
        ;;
 (*)

-       { echo "$as_me:26525: WARNING: Unsupported GNAT version $cf_cv_gnat_version. We require 3.11 or better. Disabling Ada95 binding." >&5
+       { echo "$as_me:26892: WARNING: Unsupported GNAT version $cf_cv_gnat_version. We require 3.11 or better. Disabling Ada95 binding." >&5

 echo "$as_me: WARNING: Unsupported GNAT version $cf_cv_gnat_version. We require 3.11 or better. Disabling Ada95 binding." >&2;}
        cf_cv_prog_gnat_correct=no
        ;;
 echo "$as_me: WARNING: Unsupported GNAT version $cf_cv_gnat_version. We require 3.11 or better. Disabling Ada95 binding." >&2;}
        cf_cv_prog_gnat_correct=no
        ;;


@@ -26530,7 +26897,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:26533: checking for $ac_word" >&5
+echo "$as_me:26900: 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


@@ -26545,7 +26912,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:26548: found $ac_dir/$ac_word" >&5
+echo "$as_me:26915: found $ac_dir/$ac_word" >&5

 break
 done
 
 break
 done
 


@@ -26554,20 +26921,20 @@ fi
 fi
 M4_exists=$ac_cv_prog_M4_exists
 if test -n "$M4_exists"; then
 fi
 M4_exists=$ac_cv_prog_M4_exists
 if test -n "$M4_exists"; then

-  echo "$as_me:26557: result: $M4_exists" >&5
+  echo "$as_me:26924: result: $M4_exists" >&5

 echo "${ECHO_T}$M4_exists" >&6
 else
 echo "${ECHO_T}$M4_exists" >&6
 else

-  echo "$as_me:26560: result: no" >&5
+  echo "$as_me:26927: result: no" >&5

 echo "${ECHO_T}no" >&6
 fi
 
                if test "$ac_cv_prog_M4_exists" = no; then
                        cf_cv_prog_gnat_correct=no
 echo "${ECHO_T}no" >&6
 fi
 
                if test "$ac_cv_prog_M4_exists" = no; then
                        cf_cv_prog_gnat_correct=no

-                       { echo "$as_me:26566: WARNING: Ada95 binding required program m4 not found. Ada95 binding disabled" >&5
+                       { echo "$as_me:26933: WARNING: Ada95 binding required program m4 not found. Ada95 binding disabled" >&5

 echo "$as_me: WARNING: Ada95 binding required program m4 not found. Ada95 binding disabled" >&2;}
                fi
                if test "$cf_cv_prog_gnat_correct" = yes; then
 echo "$as_me: WARNING: Ada95 binding required program m4 not found. Ada95 binding disabled" >&2;}
                fi
                if test "$cf_cv_prog_gnat_correct" = yes; then

-                       echo "$as_me:26570: checking if GNAT works" >&5
+                       echo "$as_me:26937: 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*


@@ -26595,7 +26962,7 @@ else
 fi
 rm -rf ./conftest* ./*~conftest*
 
 fi
 rm -rf ./conftest* ./*~conftest*
 

-                       echo "$as_me:26598: result: $cf_cv_prog_gnat_correct" >&5
+                       echo "$as_me:26965: result: $cf_cv_prog_gnat_correct" >&5

 echo "${ECHO_T}$cf_cv_prog_gnat_correct" >&6
                fi
        else
 echo "${ECHO_T}$cf_cv_prog_gnat_correct" >&6
                fi
        else


@@ -26607,7 +26974,7 @@ fi
 
        ADAFLAGS="$ADAFLAGS -gnatpn"
 
 
        ADAFLAGS="$ADAFLAGS -gnatpn"
 

-       echo "$as_me:26610: checking optimization options for ADAFLAGS" >&5
+       echo "$as_me:26977: 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*)


@@ -26624,10 +26991,10 @@ echo $ECHO_N "checking optimization options for ADAFLAGS... $ECHO_C" >&6
 
                ;;
        esac
 
                ;;
        esac

-       echo "$as_me:26627: result: $ADAFLAGS" >&5
+       echo "$as_me:26994: result: $ADAFLAGS" >&5

 echo "${ECHO_T}$ADAFLAGS" >&6
 
 echo "${ECHO_T}$ADAFLAGS" >&6
 

-echo "$as_me:26630: checking if GNATPREP supports -T option" >&5
+echo "$as_me:26997: 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


@@ -26637,11 +27004,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:26640: result: $cf_cv_gnatprep_opt_t" >&5
+echo "$as_me:27007: 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:26644: checking if GNAT supports generics" >&5
+echo "$as_me:27011: checking if GNAT supports generics" >&5

 echo $ECHO_N "checking if GNAT supports generics... $ECHO_C" >&6
 case "$cf_cv_gnat_version" in
 (3.1[1-9]*|3.[2-9]*|[4-9].*|[1-9][0-9].[0-9]*|20[0-9][0-9])
 echo $ECHO_N "checking if GNAT supports generics... $ECHO_C" >&6
 case "$cf_cv_gnat_version" in
 (3.1[1-9]*|3.[2-9]*|[4-9].*|[1-9][0-9].[0-9]*|20[0-9][0-9])


@@ -26651,7 +27018,7 @@ case "$cf_cv_gnat_version" in
        cf_gnat_generics=no
        ;;
 esac
        cf_gnat_generics=no
        ;;
 esac

-echo "$as_me:26654: result: $cf_gnat_generics" >&5
+echo "$as_me:27021: 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


@@ -26663,7 +27030,7 @@ else
        cf_generic_objects=
 fi
 
        cf_generic_objects=
 fi
 

-echo "$as_me:26666: checking if GNAT supports SIGINT" >&5
+echo "$as_me:27033: 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


@@ -26711,7 +27078,7 @@ fi
 rm -rf ./conftest* ./*~conftest*
 
 fi
 rm -rf ./conftest* ./*~conftest*
 
 fi

-echo "$as_me:26714: result: $cf_cv_gnat_sigint" >&5
+echo "$as_me:27081: 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


@@ -26724,7 +27091,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:26727: checking if GNAT supports project files" >&5
+echo "$as_me:27094: checking if GNAT supports project files" >&5

 echo $ECHO_N "checking if GNAT supports project files... $ECHO_C" >&6
 case "$cf_cv_gnat_version" in
 (3.[0-9]*)
 echo $ECHO_N "checking if GNAT supports project files... $ECHO_C" >&6
 case "$cf_cv_gnat_version" in
 (3.[0-9]*)


@@ -26787,15 +27154,15 @@ CF_EOF
        esac
        ;;
 esac
        esac
        ;;
 esac

-echo "$as_me:26790: result: $cf_gnat_projects" >&5
+echo "$as_me:27157: 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:26796: checking if GNAT supports libraries" >&5
+       echo "$as_me:27163: 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:26798: result: $cf_gnat_libraries" >&5
+       echo "$as_me:27165: result: $cf_gnat_libraries" >&5

 echo "${ECHO_T}$cf_gnat_libraries" >&6
 fi
 
 echo "${ECHO_T}$cf_gnat_libraries" >&6
 fi
 


@@ -26815,7 +27182,7 @@ then
        then
                USE_GNAT_MAKE_GPR=""
        else
        then
                USE_GNAT_MAKE_GPR=""
        else

-               { echo "$as_me:26818: WARNING: use old makefile rules since tools are missing" >&5
+               { echo "$as_me:27185: WARNING: use old makefile rules since tools are missing" >&5

 echo "$as_me: WARNING: use old makefile rules since tools are missing" >&2;}
        fi
 fi
 echo "$as_me: WARNING: use old makefile rules since tools are missing" >&2;}
        fi
 fi


@@ -26827,7 +27194,7 @@ else
        USE_GNAT_LIBRARIES="#"
 fi
 
        USE_GNAT_LIBRARIES="#"
 fi
 

-echo "$as_me:26830: checking for ada-compiler" >&5
+echo "$as_me:27197: 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.


@@ -26838,12 +27205,12 @@ else
   cf_ada_compiler=gnatmake
 fi;
 
   cf_ada_compiler=gnatmake
 fi;
 

-echo "$as_me:26841: result: $cf_ada_compiler" >&5
+echo "$as_me:27208: 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:26846: checking for ada-include" >&5
+echo "$as_me:27213: 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.


@@ -26879,7 +27246,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:26882: error: expected a pathname, not \"$withval\"" >&5
+       { { echo "$as_me:27249: 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; }; }
        ;;


@@ -26888,10 +27255,10 @@ esac
 fi
 eval ADA_INCLUDE="$withval"
 
 fi
 eval ADA_INCLUDE="$withval"
 

-echo "$as_me:26891: result: $ADA_INCLUDE" >&5
+echo "$as_me:27258: result: $ADA_INCLUDE" >&5

 echo "${ECHO_T}$ADA_INCLUDE" >&6
 
 echo "${ECHO_T}$ADA_INCLUDE" >&6
 

-echo "$as_me:26894: checking for ada-objects" >&5
+echo "$as_me:27261: 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.


@@ -26927,7 +27294,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:26930: error: expected a pathname, not \"$withval\"" >&5
+       { { echo "$as_me:27297: 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; }; }
        ;;


@@ -26936,10 +27303,10 @@ esac
 fi
 eval ADA_OBJECTS="$withval"
 
 fi
 eval ADA_OBJECTS="$withval"
 

-echo "$as_me:26939: result: $ADA_OBJECTS" >&5
+echo "$as_me:27306: result: $ADA_OBJECTS" >&5

 echo "${ECHO_T}$ADA_OBJECTS" >&6
 
 echo "${ECHO_T}$ADA_OBJECTS" >&6
 

-echo "$as_me:26942: checking if an Ada95 shared-library should be built" >&5
+echo "$as_me:27309: 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.


@@ -26949,14 +27316,14 @@ if test "${with_ada_sharedlib+set}" = set; then
 else
   with_ada_sharedlib=no
 fi;
 else
   with_ada_sharedlib=no
 fi;

-echo "$as_me:26952: result: $with_ada_sharedlib" >&5
+echo "$as_me:27319: result: $with_ada_sharedlib" >&5

 echo "${ECHO_T}$with_ada_sharedlib" >&6
 
 if test "x$with_ada_sharedlib" != xno
 then
        if test "x$cf_gnat_projects" != xyes
        then
 echo "${ECHO_T}$with_ada_sharedlib" >&6
 
 if test "x$with_ada_sharedlib" != xno
 then
        if test "x$cf_gnat_projects" != xyes
        then

-               { echo "$as_me:26959: WARNING: disabling shared-library since GNAT projects are not supported" >&5
+               { echo "$as_me:27326: WARNING: disabling shared-library since GNAT projects are not supported" >&5

 echo "$as_me: WARNING: disabling shared-library since GNAT projects are not supported" >&2;}
                with_ada_sharedlib=no
        fi
 echo "$as_me: WARNING: disabling shared-library since GNAT projects are not supported" >&2;}
                with_ada_sharedlib=no
        fi


@@ -26976,7 +27343,7 @@ fi
 
                        # allow the Ada binding to be renamed
 
 
                        # allow the Ada binding to be renamed
 

-echo "$as_me:26979: checking for ada-libname" >&5
+echo "$as_me:27346: checking for ada-libname" >&5

 echo $ECHO_N "checking for ada-libname... $ECHO_C" >&6
 
 # Check whether --with-ada-libname or --without-ada-libname was given.
 echo $ECHO_N "checking for ada-libname... $ECHO_C" >&6
 
 # Check whether --with-ada-libname or --without-ada-libname was given.


@@ -26992,7 +27359,7 @@ case "x$ADA_LIBNAME" in
        ;;
 esac
 
        ;;
 esac
 

-echo "$as_me:26995: result: $ADA_LIBNAME" >&5
+echo "$as_me:27362: result: $ADA_LIBNAME" >&5

 echo "${ECHO_T}$ADA_LIBNAME" >&6
 
                fi
 echo "${ECHO_T}$ADA_LIBNAME" >&6
 
                fi


@@ -27003,13 +27370,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:27006: checking for wchar_t" >&5
+       echo "$as_me:27373: 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 27012 "configure"
+#line 27379 "configure"

 #include "confdefs.h"
 $ac_includes_default
 int
 #include "confdefs.h"
 $ac_includes_default
 int


@@ -27024,16 +27391,16 @@ if (sizeof (wchar_t))
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
 }
 _ACEOF
 rm -f "conftest.$ac_objext"

-if { (eval echo "$as_me:27027: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:27394: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:27030: \$? = $ac_status" >&5
+  echo "$as_me:27397: \$? = $ac_status" >&5

   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'

-  { (eval echo "$as_me:27033: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27400: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:27036: \$? = $ac_status" >&5
+  echo "$as_me:27403: \$? = $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


@@ -27043,10 +27410,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:27046: result: $ac_cv_type_wchar_t" >&5
+echo "$as_me:27413: 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:27049: checking size of wchar_t" >&5
+echo "$as_me:27416: 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


@@ -27055,7 +27422,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 27058 "configure"
+#line 27425 "configure"

 #include "confdefs.h"
 $ac_includes_default
 int
 #include "confdefs.h"
 $ac_includes_default
 int


@@ -27067,21 +27434,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:27070: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:27437: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:27073: \$? = $ac_status" >&5
+  echo "$as_me:27440: \$? = $ac_status" >&5

   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'

-  { (eval echo "$as_me:27076: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27443: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:27079: \$? = $ac_status" >&5
+  echo "$as_me:27446: \$? = $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 27084 "configure"
+#line 27451 "configure"

 #include "confdefs.h"
 $ac_includes_default
 int
 #include "confdefs.h"
 $ac_includes_default
 int


@@ -27093,16 +27460,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:27096: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:27463: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:27099: \$? = $ac_status" >&5
+  echo "$as_me:27466: \$? = $ac_status" >&5

   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'

-  { (eval echo "$as_me:27102: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27469: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:27105: \$? = $ac_status" >&5
+  echo "$as_me:27472: \$? = $ac_status" >&5

   (exit "$ac_status"); }; }; then
   ac_hi=$ac_mid; break
 else
   (exit "$ac_status"); }; }; then
   ac_hi=$ac_mid; break
 else


@@ -27118,7 +27485,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 27121 "configure"
+#line 27488 "configure"

 #include "confdefs.h"
 $ac_includes_default
 int
 #include "confdefs.h"
 $ac_includes_default
 int


@@ -27130,16 +27497,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:27133: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:27500: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:27136: \$? = $ac_status" >&5
+  echo "$as_me:27503: \$? = $ac_status" >&5

   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'

-  { (eval echo "$as_me:27139: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27506: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:27142: \$? = $ac_status" >&5
+  echo "$as_me:27509: \$? = $ac_status" >&5

   (exit "$ac_status"); }; }; then
   ac_lo=$ac_mid; break
 else
   (exit "$ac_status"); }; }; then
   ac_lo=$ac_mid; break
 else


@@ -27155,7 +27522,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 27158 "configure"
+#line 27525 "configure"

 #include "confdefs.h"
 $ac_includes_default
 int
 #include "confdefs.h"
 $ac_includes_default
 int


@@ -27167,16 +27534,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:27170: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:27537: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:27173: \$? = $ac_status" >&5
+  echo "$as_me:27540: \$? = $ac_status" >&5

   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'

-  { (eval echo "$as_me:27176: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27543: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:27179: \$? = $ac_status" >&5
+  echo "$as_me:27546: \$? = $ac_status" >&5

   (exit "$ac_status"); }; }; then
   ac_hi=$ac_mid
 else
   (exit "$ac_status"); }; }; then
   ac_hi=$ac_mid
 else


@@ -27189,12 +27556,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:27192: error: cannot run test program while cross compiling" >&5
+  { { echo "$as_me:27559: 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 27197 "configure"
+#line 27564 "configure"

 #include "confdefs.h"
 $ac_includes_default
 int
 #include "confdefs.h"
 $ac_includes_default
 int


@@ -27210,15 +27577,15 @@ fclose (f);
 }
 _ACEOF
 rm -f "conftest$ac_exeext"
 }
 _ACEOF
 rm -f "conftest$ac_exeext"

-if { (eval echo "$as_me:27213: \"$ac_link\"") >&5
+if { (eval echo "$as_me:27580: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:27216: \$? = $ac_status" >&5
+  echo "$as_me:27583: \$? = $ac_status" >&5

   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'

-  { (eval echo "$as_me:27218: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27585: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:27221: \$? = $ac_status" >&5
+  echo "$as_me:27588: \$? = $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


@@ -27234,7 +27601,7 @@ else
   ac_cv_sizeof_wchar_t=0
 fi
 fi
   ac_cv_sizeof_wchar_t=0
 fi
 fi

-echo "$as_me:27237: result: $ac_cv_sizeof_wchar_t" >&5
+echo "$as_me:27604: 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


@@ -27247,7 +27614,7 @@ EOF
        then
                test -n "$verbose" && echo "    test failed (assume 2)" 1>&6
 
        then
                test -n "$verbose" && echo "    test failed (assume 2)" 1>&6
 

-echo "${as_me:-configure}:27250: testing test failed (assume 2) ..." 1>&5
+echo "${as_me:-configure}:27617: testing test failed (assume 2) ..." 1>&5

 
                sed /SIZEOF_WCHAR_T/d confdefs.h >confdefs.tmp
                mv confdefs.tmp confdefs.h
 
                sed /SIZEOF_WCHAR_T/d confdefs.h >confdefs.tmp
                mv confdefs.tmp confdefs.h


@@ -27265,7 +27632,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:27268: checking for library subsets" >&5
+echo "$as_me:27635: 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=
 


@@ -27319,7 +27686,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:27322: result: $LIB_SUBSETS" >&5
+echo "$as_me:27689: 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


@@ -27350,7 +27717,7 @@ elif test "$includedir" != "/usr/include"; then
 fi
 
 ### Build up pieces for makefile rules
 fi
 
 ### Build up pieces for makefile rules

-echo "$as_me:27353: checking default library suffix" >&5
+echo "$as_me:27720: 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


@@ -27361,10 +27728,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:27364: result: $DFT_ARG_SUFFIX" >&5
+echo "$as_me:27731: result: $DFT_ARG_SUFFIX" >&5

 echo "${ECHO_T}$DFT_ARG_SUFFIX" >&6
 
 echo "${ECHO_T}$DFT_ARG_SUFFIX" >&6
 

-echo "$as_me:27367: checking default library-dependency suffix" >&5
+echo "$as_me:27734: 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


@@ -27447,10 +27814,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:27450: result: $DFT_DEP_SUFFIX" >&5
+echo "$as_me:27817: result: $DFT_DEP_SUFFIX" >&5

 echo "${ECHO_T}$DFT_DEP_SUFFIX" >&6
 
 echo "${ECHO_T}$DFT_DEP_SUFFIX" >&6
 

-echo "$as_me:27453: checking default object directory" >&5
+echo "$as_me:27820: 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


@@ -27466,11 +27833,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:27469: result: $DFT_OBJ_SUBDIR" >&5
+echo "$as_me:27836: 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:27473: checking c++ library-dependency suffix" >&5
+echo "$as_me:27840: 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++)


@@ -27563,7 +27930,7 @@ else
        fi
 
 fi
        fi
 
 fi

-echo "$as_me:27566: result: $CXX_LIB_SUFFIX" >&5
+echo "$as_me:27933: result: $CXX_LIB_SUFFIX" >&5

 echo "${ECHO_T}$CXX_LIB_SUFFIX" >&6
 
 fi
 echo "${ECHO_T}$CXX_LIB_SUFFIX" >&6
 
 fi


@@ -27739,19 +28106,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:27742: checking if linker supports switching between static/dynamic" >&5
+       echo "$as_me:28109: 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 27747 "configure"
+#line 28114 "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:27751: \"$ac_compile\"") >&5
+       if { (eval echo "$as_me:28118: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:27754: \$? = $ac_status" >&5
+  echo "$as_me:28121: \$? = $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


@@ -27762,10 +28129,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 27765 "configure"
+#line 28132 "configure"

 #include "confdefs.h"
 
 #include "confdefs.h"
 

-#line 27768 "configure"
+#line 28135 "configure"

 #include <stdio.h>
 int cf_ldflags_static(FILE *fp);
 
 #include <stdio.h>
 int cf_ldflags_static(FILE *fp);
 


@@ -27780,16 +28147,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:27783: \"$ac_link\"") >&5
+if { (eval echo "$as_me:28150: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:27786: \$? = $ac_status" >&5
+  echo "$as_me:28153: \$? = $ac_status" >&5

   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'

-  { (eval echo "$as_me:27789: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28156: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:27792: \$? = $ac_status" >&5
+  echo "$as_me:28159: \$? = $ac_status" >&5

   (exit "$ac_status"); }; }; then
 
        # some linkers simply ignore the -dynamic
   (exit "$ac_status"); }; }; then
 
        # some linkers simply ignore the -dynamic


@@ -27812,7 +28179,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:27815: result: $cf_ldflags_static" >&5
+       echo "$as_me:28182: 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


@@ -27828,7 +28195,7 @@ fi
        ;;
 esac
 
        ;;
 esac
 

-echo "$as_me:27831: checking where we will install curses.h" >&5
+echo "$as_me:28198: 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=


@@ -27838,7 +28205,7 @@ if test "$with_overwrite" = no && \
 then
        includesubdir="/ncurses${USE_LIB_SUFFIX}"
 fi
 then
        includesubdir="/ncurses${USE_LIB_SUFFIX}"
 fi

-echo "$as_me:27841: result: ${includedir}${includesubdir}" >&5
+echo "$as_me:28208: 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


@@ -27846,7 +28213,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:27849: WARNING: Wide-character applications must define HAVE_LIBUTF8_H to include curses.h" >&5
+       { echo "$as_me:28216: 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


@@ -27874,7 +28241,7 @@ EOF
 
 # pkgsrc uses these
 
 
 # pkgsrc uses these
 

-echo "$as_me:27877: checking for desired basename for form library" >&5
+echo "$as_me:28244: checking for desired basename for form library" >&5

 echo $ECHO_N "checking for desired basename for form library... $ECHO_C" >&6
 
 # Check whether --with-form-libname or --without-form-libname was given.
 echo $ECHO_N "checking for desired basename for form library... $ECHO_C" >&6
 
 # Check whether --with-form-libname or --without-form-libname was given.


@@ -27894,10 +28261,10 @@ case "x$FORM_NAME" in
        ;;
 esac
 
        ;;
 esac
 

-echo "$as_me:27897: result: $FORM_NAME" >&5
+echo "$as_me:28264: result: $FORM_NAME" >&5

 echo "${ECHO_T}$FORM_NAME" >&6
 
 echo "${ECHO_T}$FORM_NAME" >&6
 

-echo "$as_me:27900: checking for desired basename for menu library" >&5
+echo "$as_me:28267: checking for desired basename for menu library" >&5

 echo $ECHO_N "checking for desired basename for menu library... $ECHO_C" >&6
 
 # Check whether --with-menu-libname or --without-menu-libname was given.
 echo $ECHO_N "checking for desired basename for menu library... $ECHO_C" >&6
 
 # Check whether --with-menu-libname or --without-menu-libname was given.


@@ -27917,10 +28284,10 @@ case "x$MENU_NAME" in
        ;;
 esac
 
        ;;
 esac
 

-echo "$as_me:27920: result: $MENU_NAME" >&5
+echo "$as_me:28287: result: $MENU_NAME" >&5

 echo "${ECHO_T}$MENU_NAME" >&6
 
 echo "${ECHO_T}$MENU_NAME" >&6
 

-echo "$as_me:27923: checking for desired basename for panel library" >&5
+echo "$as_me:28290: checking for desired basename for panel library" >&5

 echo $ECHO_N "checking for desired basename for panel library... $ECHO_C" >&6
 
 # Check whether --with-panel-libname or --without-panel-libname was given.
 echo $ECHO_N "checking for desired basename for panel library... $ECHO_C" >&6
 
 # Check whether --with-panel-libname or --without-panel-libname was given.


@@ -27940,10 +28307,10 @@ case "x$PANEL_NAME" in
        ;;
 esac
 
        ;;
 esac
 

-echo "$as_me:27943: result: $PANEL_NAME" >&5
+echo "$as_me:28310: result: $PANEL_NAME" >&5

 echo "${ECHO_T}$PANEL_NAME" >&6
 
 echo "${ECHO_T}$PANEL_NAME" >&6
 

-echo "$as_me:27946: checking for desired basename for cxx library" >&5
+echo "$as_me:28313: checking for desired basename for cxx library" >&5

 echo $ECHO_N "checking for desired basename for cxx library... $ECHO_C" >&6
 
 # Check whether --with-cxx-libname or --without-cxx-libname was given.
 echo $ECHO_N "checking for desired basename for cxx library... $ECHO_C" >&6
 
 # Check whether --with-cxx-libname or --without-cxx-libname was given.


@@ -27963,13 +28330,13 @@ case "x$CXX_NAME" in
        ;;
 esac
 
        ;;
 esac
 

-echo "$as_me:27966: result: $CXX_NAME" >&5
+echo "$as_me:28333: result: $CXX_NAME" >&5

 echo "${ECHO_T}$CXX_NAME" >&6
 
 ### Construct the list of subdirectories for which we'll customize makefiles
 ### with the appropriate compile-rules.
 
 echo "${ECHO_T}$CXX_NAME" >&6
 
 ### Construct the list of subdirectories for which we'll customize makefiles
 ### with the appropriate compile-rules.
 

-echo "$as_me:27972: checking for src modules" >&5
+echo "$as_me:28339: 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


@@ -28038,7 +28405,7 @@ eval TEST_ROOT="\$${cf_map_lib_basename}_NAME"
                fi
        fi
 done
                fi
        fi
 done

-echo "$as_me:28041: result: $cf_cv_src_modules" >&5
+echo "$as_me:28408: 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"


@@ -28199,7 +28566,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}:28202: testing moving _XOPEN_SOURCE_EXTENDED to work around g++ problem ..." 1>&5
+echo "${as_me:-configure}:28569: 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//'`


@@ -28210,7 +28577,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:28213: checking for defines to add to ncurses${USE_CFG_SUFFIX}-config script" >&5
+echo "$as_me:28580: 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


@@ -28226,7 +28593,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:28229: result: $PKG_CFLAGS" >&5
+echo "$as_me:28596: 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.


@@ -28287,7 +28654,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}:28290: testing will map symbols to ABI=$cf_cv_abi_version ..." 1>&5
+echo "${as_me:-configure}:28657: testing will map symbols to ABI=$cf_cv_abi_version ..." 1>&5

 
 fi
 
 
 fi
 


@@ -28314,7 +28681,7 @@ fi
 
 # This is used for the *-config script and *.pc data files.
 
 
 # This is used for the *-config script and *.pc data files.
 

-echo "$as_me:28317: checking for linker search path" >&5
+echo "$as_me:28684: checking for linker search path" >&5

 echo $ECHO_N "checking for linker search path... $ECHO_C" >&6
 if test "${cf_cv_ld_searchpath+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 echo $ECHO_N "checking for linker search path... $ECHO_C" >&6
 if test "${cf_cv_ld_searchpath+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6


@@ -28362,7 +28729,7 @@ then
                        cf_pathlist="$cf_pathlist /lib /usr/lib"
                        ;;
                (*)
                        cf_pathlist="$cf_pathlist /lib /usr/lib"
                        ;;
                (*)

-                       { echo "$as_me:28365: WARNING: problem with Solaris architecture" >&5
+                       { echo "$as_me:28732: WARNING: problem with Solaris architecture" >&5

 echo "$as_me: WARNING: problem with Solaris architecture" >&2;}
                        ;;
                esac
 echo "$as_me: WARNING: problem with Solaris architecture" >&2;}
                        ;;
                esac


@@ -28403,7 +28770,7 @@ done
 test -z "$cf_cv_ld_searchpath" && cf_cv_ld_searchpath=/usr/lib
 
 fi
 test -z "$cf_cv_ld_searchpath" && cf_cv_ld_searchpath=/usr/lib
 
 fi

-echo "$as_me:28406: result: $cf_cv_ld_searchpath" >&5
+echo "$as_me:28773: result: $cf_cv_ld_searchpath" >&5

 echo "${ECHO_T}$cf_cv_ld_searchpath" >&6
 
 LD_SEARCHPATH=`echo "$cf_cv_ld_searchpath"|sed -e 's/ /|/g'`
 echo "${ECHO_T}$cf_cv_ld_searchpath" >&6
 
 LD_SEARCHPATH=`echo "$cf_cv_ld_searchpath"|sed -e 's/ /|/g'`


@@ -28493,7 +28860,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:28496: creating $CONFIG_STATUS" >&5
+{ echo "$as_me:28863: 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


@@ -28672,7 +29039,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:28675: error: ambiguous option: $1
+    { { echo "$as_me:29042: 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;}


@@ -28691,7 +29058,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:28694: error: unrecognized option: $1
+  -*) { { echo "$as_me:29061: 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;}


@@ -28781,6 +29148,7 @@ cf_cv_do_reranlib="$cf_cv_do_reranlib"
 cf_cv_do_symlinks="$cf_cv_do_symlinks"
 cf_cv_enable_lp64="$cf_cv_enable_lp64"
 cf_cv_enable_opaque="$cf_cv_enable_opaque"
 cf_cv_do_symlinks="$cf_cv_do_symlinks"
 cf_cv_enable_lp64="$cf_cv_enable_lp64"
 cf_cv_enable_opaque="$cf_cv_enable_opaque"

+cf_cv_make_PHONY="$cf_cv_make_PHONY"

 cf_cv_prog_CC_c_o=$cf_cv_prog_CC_c_o
 cf_cv_prog_CXX_c_o=$cf_cv_prog_CXX_c_o
 cf_cv_prog_gnat_correct=$cf_cv_prog_gnat_correct
 cf_cv_prog_CC_c_o=$cf_cv_prog_CC_c_o
 cf_cv_prog_CXX_c_o=$cf_cv_prog_CXX_c_o
 cf_cv_prog_gnat_correct=$cf_cv_prog_gnat_correct


@@ -28816,7 +29184,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:28819: error: invalid argument: $ac_config_target" >&5
+  *) { { echo "$as_me:29187: 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


@@ -28956,6 +29324,8 @@ s,@PKG_CONFIG_LIBDIR@,$PKG_CONFIG_LIBDIR,;t t
 s,@MAKE_PC_FILES@,$MAKE_PC_FILES,;t t
 s,@PC_MODULE_SUFFIX@,$PC_MODULE_SUFFIX,;t t
 s,@SET_MAKE@,$SET_MAKE,;t t
 s,@MAKE_PC_FILES@,$MAKE_PC_FILES,;t t
 s,@PC_MODULE_SUFFIX@,$PC_MODULE_SUFFIX,;t t
 s,@SET_MAKE@,$SET_MAKE,;t t

+s,@MAKE_NO_PHONY@,$MAKE_NO_PHONY,;t t
+s,@MAKE_PHONY@,$MAKE_PHONY,;t t

 s,@CTAGS@,$CTAGS,;t t
 s,@ETAGS@,$ETAGS,;t t
 s,@MAKE_LOWER_TAGS@,$MAKE_LOWER_TAGS,;t t
 s,@CTAGS@,$CTAGS,;t t
 s,@ETAGS@,$ETAGS,;t t
 s,@MAKE_LOWER_TAGS@,$MAKE_LOWER_TAGS,;t t


@@ -29326,7 +29696,7 @@ done; }
   esac
 
   if test x"$ac_file" != x-; then
   esac
 
   if test x"$ac_file" != x-; then

-    { echo "$as_me:29329: creating $ac_file" >&5
+    { echo "$as_me:29699: 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


@@ -29344,7 +29714,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:29347: error: cannot find input file: $f" >&5
+         test -f "$f" || { { echo "$as_me:29717: 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;;


@@ -29357,7 +29727,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:29360: error: cannot find input file: $f" >&5
+           { { echo "$as_me:29730: 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;;


@@ -29373,7 +29743,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:29376: WARNING: datarootdir was used implicitly but not set:
+          { echo "$as_me:29746: 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;}


@@ -29382,7 +29752,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:29385: WARNING: datarootdir was used explicitly but not set:
+        { echo "$as_me:29755: 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;}


@@ -29419,7 +29789,7 @@ s,@INSTALL@,$ac_INSTALL,;t t
             ac_init=`${EGREP-egrep} '[         ]*'$ac_name'[   ]*=' "$ac_file"`
             if test -z "$ac_init"; then
               ac_seen=`echo "$ac_seen" |sed -e 's,^,'$ac_file':,'`
             ac_init=`${EGREP-egrep} '[         ]*'$ac_name'[   ]*=' "$ac_file"`
             if test -z "$ac_init"; then
               ac_seen=`echo "$ac_seen" |sed -e 's,^,'$ac_file':,'`

-              { echo "$as_me:29422: WARNING: Variable $ac_name is used but was not set:
+              { echo "$as_me:29792: 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;}


@@ -29430,7 +29800,7 @@ $ac_seen" >&2;}
     ${EGREP-egrep} -n '@[A-Z_][A-Z_0-9]+@' "$ac_file" >>$tmp/out
     if test -s $tmp/out; then
       ac_seen=`sed -e 's,^,'$ac_file':,' < $tmp/out`
     ${EGREP-egrep} -n '@[A-Z_][A-Z_0-9]+@' "$ac_file" >>$tmp/out
     if test -s $tmp/out; then
       ac_seen=`sed -e 's,^,'$ac_file':,' < $tmp/out`

-      { echo "$as_me:29433: WARNING: Some variables may not be substituted:
+      { echo "$as_me:29803: 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;}


@@ -29479,7 +29849,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:29482: creating $ac_file" >&5
+  test x"$ac_file" != x- && { echo "$as_me:29852: 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


@@ -29490,7 +29860,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:29493: error: cannot find input file: $f" >&5
+         test -f "$f" || { { echo "$as_me:29863: 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;;


@@ -29503,7 +29873,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:29506: error: cannot find input file: $f" >&5
+           { { echo "$as_me:29876: 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;;


@@ -29561,7 +29931,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:29564: $ac_file is unchanged" >&5
+      { echo "$as_me:29934: $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\(.*[^/]\)//*[^/][^/]*/*$' \| \


@@ -29948,7 +30318,7 @@ cf_ITEM=`echo "$cf_item" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQ
                                (cygdll|msysdll|mingw|msvcdll)
                                        test "x$with_shared_cxx" = xno && test -n "$verbose" && echo "  overriding CXX_MODEL to SHARED" 1>&6
 
                                (cygdll|msysdll|mingw|msvcdll)
                                        test "x$with_shared_cxx" = xno && test -n "$verbose" && echo "  overriding CXX_MODEL to SHARED" 1>&6
 

-echo "${as_me:-configure}:29951: testing overriding CXX_MODEL to SHARED ..." 1>&5
+echo "${as_me:-configure}:30321: testing overriding CXX_MODEL to SHARED ..." 1>&5

 
                                        with_shared_cxx=yes
                                        ;;
 
                                        with_shared_cxx=yes
                                        ;;


@@ -30136,6 +30506,9 @@ eval cf_libname="\$${cf_map_lib_basename}_NAME"
                                traces=$LIB_TRACING \
                                MODEL=$cf_ITEM \
                                CXX_MODEL=$CXX_MODEL \
                                traces=$LIB_TRACING \
                                MODEL=$cf_ITEM \
                                CXX_MODEL=$CXX_MODEL \

+                               LIB_SUFFIX=$LIB_SUFFIX \
+                               USE_LIB_SUFFIX=$USE_LIB_SUFFIX \
+                               make_phony="${cf_cv_make_PHONY:-no}" \

                                model=$cf_subdir \
                                prefix=$cf_prefix \
                                suffix=$cf_suffix \
                                model=$cf_subdir \
                                prefix=$cf_prefix \
                                suffix=$cf_suffix \


@@ -30183,6 +30556,21 @@ eval cf_libname="\$${cf_map_lib_basename}_NAME"
        echo '  ( cd '$cf_dir' && ${MAKE} ${TOP_MFLAGS} $@ )' >>Makefile
 done
 
        echo '  ( cd '$cf_dir' && ${MAKE} ${TOP_MFLAGS} $@ )' >>Makefile
 done
 

+echo >> Makefile
+echo '# generated by CF_LIB_RULES' >> Makefile
+
+if test "x$cf_cv_make_PHONY" = xyes ; then
+       cat >> Makefile <<-CF_EOF
+
+       .PHONY :        libs
+       .PHONY :        lintlib
+       .PHONY :        install.includes
+       .PHONY :        uninstall.includes
+       .PHONY :        install.libs
+       .PHONY :        uninstall.libs
+CF_EOF
+fi
+

 for cf_dir in $SRC_SUBDIRS
 do
        if test ! -d "$srcdir/$cf_dir" ; then
 for cf_dir in $SRC_SUBDIRS
 do
        if test ! -d "$srcdir/$cf_dir" ; then


@@ -30201,6 +30589,15 @@ do
        fi
 
        if test -f "$srcdir/$cf_dir/modules" ; then
        fi
 
        if test -f "$srcdir/$cf_dir/modules" ; then

+
+               if test "x$cf_cv_make_PHONY" = xyes ; then
+                       cat >> Makefile <<-CF_EOF
+
+                       .PHONY :        install.$cf_dir
+                       .PHONY :        uninstall.$cf_dir
+CF_EOF
+               fi
+

                echo >> Makefile
                if test -f "$srcdir/$cf_dir/headers" ; then
 cat >> Makefile <<CF_EOF
                echo >> Makefile
                if test -f "$srcdir/$cf_dir/headers" ; then
 cat >> Makefile <<CF_EOF


@@ -30209,9 +30606,8 @@ uninstall.includes \\
 CF_EOF
                fi
 
 CF_EOF
                fi
 

-echo 'lint \' >> Makefile
-

 cat >> Makefile <<CF_EOF
 cat >> Makefile <<CF_EOF

+lint \\

 libs \\
 lintlib \\
 install.libs \\
 libs \\
 lintlib \\
 install.libs \\


@@ -30233,6 +30629,14 @@ CF_EOF
 fi
 done
 
 fi
 done
 

+if test "x$cf_cv_make_PHONY" = xyes ; then
+       cat >> Makefile <<-CF_EOF
+
+       .PHONY :        install.data
+       .PHONY :        uninstall.data
+CF_EOF
+fi
+

 if test "x$cf_with_db_install" = xyes; then
 cat >> Makefile <<CF_EOF
 
 if test "x$cf_with_db_install" = xyes; then
 cat >> Makefile <<CF_EOF
 


@@ -30249,6 +30653,15 @@ CF_EOF
 fi
 
 if test "x$cf_with_manpages" = xyes; then
 fi
 
 if test "x$cf_with_manpages" = xyes; then

+
+if test "x$cf_cv_make_PHONY" = xyes ; then
+       cat >> Makefile <<-CF_EOF
+
+       .PHONY :        install.man
+       .PHONY :        uninstall.man
+CF_EOF
+fi
+

 cat >> Makefile <<CF_EOF
 
 install.man \\
 cat >> Makefile <<CF_EOF
 
 install.man \\


@@ -30374,6 +30787,13 @@ do
 
        if test -f "$srcdir/$cf_dir/modules" ; then
                if test "$cf_dir" != "c++" ; then
 
        if test -f "$srcdir/$cf_dir/modules" ; then
                if test "$cf_dir" != "c++" ; then

+                       if test "x$cf_cv_make_PHONY" = xyes ; then
+                               cat >> $cf_dir/Makefile <<-CF_EOF
+
+                               .PHONY :        depend
+CF_EOF
+                       fi
+

                        cat >>$cf_dir/Makefile <<"CF_EOF"
 depend : ${AUTO_SRC}
        makedepend -- ${CPPFLAGS} -- ${C_SRC}
                        cat >>$cf_dir/Makefile <<"CF_EOF"
 depend : ${AUTO_SRC}
        makedepend -- ${CPPFLAGS} -- ${C_SRC}